Get rid of deprecated annotations and modifiers in stdlib (besides JS)

This commit is contained in:
Denis Zharkov
2015-09-14 16:35:30 +03:00
parent 9c4564a5a6
commit 5cecaa6f87
133 changed files with 1203 additions and 1085 deletions
+14 -14
View File
@@ -8,22 +8,22 @@ import kotlin.test.assertNotEquals
class PairTest {
val p = Pair(1, "a")
test fun pairFirstAndSecond() {
@test fun pairFirstAndSecond() {
assertEquals(1, p.first)
assertEquals("a", p.second)
}
test fun pairMultiAssignment() {
@test fun pairMultiAssignment() {
val (a, b) = p
assertEquals(1, a)
assertEquals("a", b)
}
test fun pairToString() {
@test fun pairToString() {
assertEquals("(1, a)", p.toString())
}
test fun pairEquals() {
@test fun pairEquals() {
assertEquals(Pair(1, "a"), p)
assertNotEquals(Pair(2, "a"), p)
assertNotEquals(Pair(1, "b"), p)
@@ -31,7 +31,7 @@ class PairTest {
assertNotEquals("", (p : Any))
}
test fun pairHashCode() {
@test fun pairHashCode() {
assertEquals(Pair(1, "a").hashCode(), p.hashCode())
assertNotEquals(Pair(2, "a").hashCode(), p.hashCode())
assertNotEquals(0, Pair(null, "b").hashCode())
@@ -39,13 +39,13 @@ class PairTest {
assertEquals(0, Pair(null, null).hashCode())
}
test fun pairHashSet() {
@test fun pairHashSet() {
val s = hashSetOf(Pair(1, "a"), Pair(1, "b"), Pair(1, "a"))
assertEquals(2, s.size())
assertTrue(s.contains(p))
}
test fun pairToList() {
@test fun pairToList() {
assertEquals(listOf(1, 2), (1 to 2).toList())
assertEquals(listOf(1, null), (1 to null).toList())
assertEquals(listOf(1, "2"), (1 to "2").toList())
@@ -55,24 +55,24 @@ class PairTest {
class TripleTest {
val t = Triple(1, "a", 0.07)
test fun tripleFirstAndSecond() {
@test fun tripleFirstAndSecond() {
assertEquals(1, t.first)
assertEquals("a", t.second)
assertEquals(0.07, t.third)
}
test fun tripleMultiAssignment() {
@test fun tripleMultiAssignment() {
val (a, b, c) = t
assertEquals(1, a)
assertEquals("a", b)
assertEquals(0.07, c)
}
test fun tripleToString() {
@test fun tripleToString() {
assertEquals("(1, a, 0.07)", t.toString())
}
test fun tripleEquals() {
@test fun tripleEquals() {
assertEquals(Triple(1, "a", 0.07), t)
assertNotEquals(Triple(2, "a", 0.07), t)
assertNotEquals(Triple(1, "b", 0.07), t)
@@ -81,7 +81,7 @@ class TripleTest {
assertNotEquals("", (t : Any))
}
test fun tripleHashCode() {
@test fun tripleHashCode() {
assertEquals(Triple(1, "a", 0.07).hashCode(), t.hashCode())
assertNotEquals(Triple(2, "a", 0.07).hashCode(), t.hashCode())
assertNotEquals(0, Triple(null, "b", 0.07).hashCode())
@@ -90,13 +90,13 @@ class TripleTest {
assertEquals(0, Triple(null, null, null).hashCode())
}
test fun tripleHashSet() {
@test fun tripleHashSet() {
val s = hashSetOf(Triple(1, "a", 0.07), Triple(1, "b", 0.07), Triple(1, "a", 0.07))
assertEquals(2, s.size())
assertTrue(s.contains(t))
}
test fun tripleToList() {
@test fun tripleToList() {
assertEquals(listOf(1, 2, 3), (Triple(1, 2, 3)).toList())
assertEquals(listOf(1, null, 3), (Triple(1, null, 3)).toList())
assertEquals(listOf(1, 2, "3"), (Triple(1, 2, "3")).toList())