Fix deprecated Range and Progression usages in testData

This commit is contained in:
Ilya Gorbunov
2016-01-15 18:28:35 +03:00
parent d48ec7e296
commit b97e436a50
9 changed files with 17 additions and 24 deletions
@@ -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?) -> <v0>
w(s|<v0>)
2 mark({ s?.start })
mark(s?.start)
2 mark({ s?.first })
mark(s?.first)
r(s) -> <v1>
r(start|<v1>) -> <v2>
r(first|<v1>) -> <v2>
L1:
1 <END> NEXT:[<SINK>]
error:
+1 -1
View File
@@ -1,3 +1,3 @@
fun test(s: IntProgression?) {
s?.start
s?.first
}
+6 -6
View File
@@ -1,11 +1,11 @@
== test ==
fun test(s: IntProgression?) {
s?.start
s?.first
}
---------------------
<v0>: {<: IntProgression?} NEW: magic[FAKE_INITIALIZER](s: IntProgression?) -> <v0>
s <v1>: {<: Progression<Int>?} NEW: r(s) -> <v1>
start <v2>: * NEW: r(start|<v1>) -> <v2>
s?.start <v2>: * COPY
{ s?.start } <v2>: * COPY
<v0>: {<: IntProgression?} NEW: magic[FAKE_INITIALIZER](s: IntProgression?) -> <v0>
s <v1>: {<: IntProgression?} NEW: r(s) -> <v1>
first <v2>: * NEW: r(first|<v1>) -> <v2>
s?.first <v2>: * COPY
{ s?.first } <v2>: * COPY
=====================
+2 -2
View File
@@ -1,7 +1,7 @@
class MyRange1() : Range<Int> {
class MyRange1() : ClosedRange<Int> {
override val start: Int
get() = 0
override val end: Int
override val endInclusive: Int
get() = 0
override fun contains(item: Int) = true
}
@@ -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"
}
@@ -54,7 +54,7 @@ class CodeFragmentCompletionInLibraryTest : AbstractJvmBasicCompletionTest() {
}
fun testSecondCompletionInCustomLibrary() {
testCompletionInLibraryCodeFragment("Sh<caret>", "EXIST: ShortRange", "EXIST: Short", "INVOCATION_COUNT: 2")
testCompletionInLibraryCodeFragment("Ch<caret>", "EXIST: CharRange", "EXIST: Char", "INVOCATION_COUNT: 2")
}
fun testExtensionCompletionInCustomLibrary() {
@@ -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
}
+1 -1
View File
@@ -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) {
+1 -1
View File
@@ -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) {