From eebe66e0419031e349ddb10ee8a196dda140d7e4 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Tue, 15 Sep 2015 12:39:49 +0300 Subject: [PATCH] Minor. Fix test with obsolete enum syntax --- compiler/testData/asJava/findClasses/FromEnumEntry.kt | 4 ++-- .../testData/evaluate/usesVariableAsConstant/OtherTypes.kt | 2 +- compiler/testData/renderer/Enum.kt | 2 +- compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.kt | 3 +-- compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.txt | 3 +-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/compiler/testData/asJava/findClasses/FromEnumEntry.kt b/compiler/testData/asJava/findClasses/FromEnumEntry.kt index b1955a07301..6a1056cc26b 100644 --- a/compiler/testData/asJava/findClasses/FromEnumEntry.kt +++ b/compiler/testData/asJava/findClasses/FromEnumEntry.kt @@ -1,12 +1,12 @@ enum class Direction { - NORTH + NORTH, SOUTH(val x : Int) { fun again() : String { return "Hello" } class Hello - } + }, WEST { class Some { fun test() : Int { diff --git a/compiler/testData/evaluate/usesVariableAsConstant/OtherTypes.kt b/compiler/testData/evaluate/usesVariableAsConstant/OtherTypes.kt index a4e735bf812..2fce589d08a 100644 --- a/compiler/testData/evaluate/usesVariableAsConstant/OtherTypes.kt +++ b/compiler/testData/evaluate/usesVariableAsConstant/OtherTypes.kt @@ -1,6 +1,6 @@ package test -enum class MyEnum { A;B } +enum class MyEnum { A, B } fun foo(): Boolean = true diff --git a/compiler/testData/renderer/Enum.kt b/compiler/testData/renderer/Enum.kt index f2f73a00ad1..6433e6d2872 100644 --- a/compiler/testData/renderer/Enum.kt +++ b/compiler/testData/renderer/Enum.kt @@ -1,7 +1,7 @@ package rendererTest private enum class TheEnum(val rgb: Int) { - VAL1: TheEnum(0xFF0000) + VAL1(0xFF0000) } //package rendererTest diff --git a/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.kt b/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.kt index 021a2156b8c..456634356bd 100644 --- a/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.kt +++ b/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.kt @@ -1,6 +1,5 @@ enum class A { - ONE - TWO + ONE, TWO fun invoke(i: Int) = i } diff --git a/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.txt b/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.txt index 1ed172b3c7c..98a7daa98bb 100644 --- a/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.txt +++ b/compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.txt @@ -1,6 +1,5 @@ enum class A { - ONE - TWO + ONE, TWO fun invoke(i: Int) = i }