From b97e436a5008ec5b42fe6018755f680b0b409a24 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 15 Jan 2016 18:28:35 +0300 Subject: [PATCH] Fix deprecated Range and Progression usages in testData --- .../cfg/expressions/propertySafeCall.instructions | 8 ++++---- .../testData/cfg/expressions/propertySafeCall.kt | 2 +- .../testData/cfg/expressions/propertySafeCall.values | 12 ++++++------ .../testData/codegen/box/controlStructures/kt299.kt | 4 ++-- .../box/intrinsics/longRangeWithExplicitDot.kt | 2 +- .../evaluate/CodeFragmentCompletionInLibraryTest.kt | 2 +- .../testData/range/cases/creatingProgressions.kt | 7 ------- .../testData/range/cases/explicitRange.kt | 2 +- .../testData/range/cases/rangeSugarSyntax.kt | 2 +- 9 files changed, 17 insertions(+), 24 deletions(-) diff --git a/compiler/testData/cfg/expressions/propertySafeCall.instructions b/compiler/testData/cfg/expressions/propertySafeCall.instructions index 4f75eab602e..112dff4302e 100644 --- a/compiler/testData/cfg/expressions/propertySafeCall.instructions +++ b/compiler/testData/cfg/expressions/propertySafeCall.instructions @@ -1,6 +1,6 @@ == test == fun test(s: IntProgression?) { - s?.start + s?.first } --------------------- L0: @@ -8,10 +8,10 @@ L0: v(s: IntProgression?) magic[FAKE_INITIALIZER](s: IntProgression?) -> w(s|) - 2 mark({ s?.start }) - mark(s?.start) + 2 mark({ s?.first }) + mark(s?.first) r(s) -> - r(start|) -> + r(first|) -> L1: 1 NEXT:[] error: diff --git a/compiler/testData/cfg/expressions/propertySafeCall.kt b/compiler/testData/cfg/expressions/propertySafeCall.kt index 48423ce9389..ce8a1011550 100644 --- a/compiler/testData/cfg/expressions/propertySafeCall.kt +++ b/compiler/testData/cfg/expressions/propertySafeCall.kt @@ -1,3 +1,3 @@ fun test(s: IntProgression?) { - s?.start + s?.first } diff --git a/compiler/testData/cfg/expressions/propertySafeCall.values b/compiler/testData/cfg/expressions/propertySafeCall.values index 38cac8833b7..53b809eaa8c 100644 --- a/compiler/testData/cfg/expressions/propertySafeCall.values +++ b/compiler/testData/cfg/expressions/propertySafeCall.values @@ -1,11 +1,11 @@ == test == fun test(s: IntProgression?) { - s?.start + s?.first } --------------------- - : {<: IntProgression?} NEW: magic[FAKE_INITIALIZER](s: IntProgression?) -> -s : {<: Progression?} NEW: r(s) -> -start : * NEW: r(start|) -> -s?.start : * COPY -{ s?.start } : * COPY + : {<: IntProgression?} NEW: magic[FAKE_INITIALIZER](s: IntProgression?) -> +s : {<: IntProgression?} NEW: r(s) -> +first : * NEW: r(first|) -> +s?.first : * COPY +{ s?.first } : * COPY ===================== diff --git a/compiler/testData/codegen/box/controlStructures/kt299.kt b/compiler/testData/codegen/box/controlStructures/kt299.kt index d96a0551680..9cb4628e7da 100644 --- a/compiler/testData/codegen/box/controlStructures/kt299.kt +++ b/compiler/testData/codegen/box/controlStructures/kt299.kt @@ -1,7 +1,7 @@ -class MyRange1() : Range { +class MyRange1() : ClosedRange { override val start: Int get() = 0 - override val end: Int + override val endInclusive: Int get() = 0 override fun contains(item: Int) = true } diff --git a/compiler/testData/codegen/box/intrinsics/longRangeWithExplicitDot.kt b/compiler/testData/codegen/box/intrinsics/longRangeWithExplicitDot.kt index 5663f07ec66..1ecc929824d 100644 --- a/compiler/testData/codegen/box/intrinsics/longRangeWithExplicitDot.kt +++ b/compiler/testData/codegen/box/intrinsics/longRangeWithExplicitDot.kt @@ -2,5 +2,5 @@ fun box(): String { val l: Long = 1 val l2: Long = 2 val r = l.rangeTo(l2) - return if (r.start == l && r.end == l2) "OK" else "fail" + return if (r.start == l && r.endInclusive == l2) "OK" else "fail" } \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt index bdb3a34f41b..e54bad76208 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt @@ -54,7 +54,7 @@ class CodeFragmentCompletionInLibraryTest : AbstractJvmBasicCompletionTest() { } fun testSecondCompletionInCustomLibrary() { - testCompletionInLibraryCodeFragment("Sh", "EXIST: ShortRange", "EXIST: Short", "INVOCATION_COUNT: 2") + testCompletionInLibraryCodeFragment("Ch", "EXIST: CharRange", "EXIST: Char", "INVOCATION_COUNT: 2") } fun testExtensionCompletionInCustomLibrary() { diff --git a/js/js.translator/testData/range/cases/creatingProgressions.kt b/js/js.translator/testData/range/cases/creatingProgressions.kt index f1e10c543a8..92697a584be 100644 --- a/js/js.translator/testData/range/cases/creatingProgressions.kt +++ b/js/js.translator/testData/range/cases/creatingProgressions.kt @@ -11,12 +11,5 @@ fun box(): Boolean { val charProgression = CharProgression.fromClosedRange('a', 'z', 2) assertEquals('y', charProgression.last) - // deprecated - val byteProgression = ByteProgression.fromClosedRange(1, 127, 2) - assertEquals(127.toByte(), byteProgression.last) - - val shortProgression = ShortProgression.fromClosedRange(1, 32767, 2) - assertEquals(32767.toShort(), shortProgression.last) - return true } diff --git a/js/js.translator/testData/range/cases/explicitRange.kt b/js/js.translator/testData/range/cases/explicitRange.kt index f7332c903b6..05c48adbee5 100644 --- a/js/js.translator/testData/range/cases/explicitRange.kt +++ b/js/js.translator/testData/range/cases/explicitRange.kt @@ -14,7 +14,7 @@ fun box(): Boolean { if (!twoToFive.contains(4)) return false; if (!twoToFive.contains(5)) return false; if (!(twoToFive.start == 2)) return false; - if (!(twoToFive.end == 5)) return false; + if (!(twoToFive.endInclusive == 5)) return false; var sum = 0; for (i in twoToFive) { diff --git a/js/js.translator/testData/range/cases/rangeSugarSyntax.kt b/js/js.translator/testData/range/cases/rangeSugarSyntax.kt index be5367d9649..d1227a01829 100644 --- a/js/js.translator/testData/range/cases/rangeSugarSyntax.kt +++ b/js/js.translator/testData/range/cases/rangeSugarSyntax.kt @@ -14,7 +14,7 @@ fun box(): Boolean { if (!twoToFive.contains(4)) return false; if (!twoToFive.contains(5)) return false; if (!(twoToFive.start == 2)) return false; - if (!(twoToFive.end == 5)) return false; + if (!(twoToFive.endInclusive == 5)) return false; var sum = 0; for (i in twoToFive) {