azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/test/js/JsArrayTest.kt
+2 -2
View File
@@ -6,7 +6,7 @@ import java.util.ArrayList;
class JsArrayTest {
test fun arraySizeAndToList() {
@test fun arraySizeAndToList() {
val a1 = arrayOf<String>()
val a2 = arrayOf("foo")
val a3 = arrayOf("foo", "bar")
@@ -21,7 +21,7 @@ class JsArrayTest {
}
test fun arrayListFromCollection() {
@test fun arrayListFromCollection() {
var c: Collection<String> = arrayOf("A", "B", "C").toList()
var a = ArrayList(c)
libraries/stdlib/test/js/JsDomTest.kt
+12 -12
View File
@@ -9,7 +9,7 @@ import org.junit.Test as test
class JsDomTest {
test fun testCreateDocument() {
@test fun testCreateDocument() {
var doc = document
assertNotNull(doc, "Should have created a document")
@@ -25,7 +25,7 @@ class JsDomTest {
assertCssClass(e, "bar")
}
test fun addText() {
@test fun addText() {
var doc = document
assertNotNull(doc, "Should have created a document")
@@ -38,7 +38,7 @@ class JsDomTest {
assertEquals("hello", e.textContent)
}
test fun testAddClassMissing() {
@test fun testAddClassMissing() {
val e = document.createElement("e")!!
assertNotNull(e)
@@ -49,7 +49,7 @@ class JsDomTest {
assertEquals("class1 class2", e.classes)
}
test fun testAddClassPresent() {
@test fun testAddClassPresent() {
val e = document.createElement("e")!!
assertNotNull(e)
@@ -60,13 +60,13 @@ class JsDomTest {
assertEquals("class2 class1", e.classes)
}
test fun testAddClassUndefinedClasses() {
@test fun testAddClassUndefinedClasses() {
val e = document.createElement("e")!!
e.addClass("class1")
assertEquals("class1", e.classes)
}
test fun testRemoveClassMissing() {
@test fun testRemoveClassMissing() {
val e = document.createElement("e")!!
assertNotNull(e)
@@ -77,7 +77,7 @@ class JsDomTest {
assertEquals("class2 class1", e.classes)
}
test fun testRemoveClassPresent1() {
@test fun testRemoveClassPresent1() {
val e = document.createElement("e")!!
assertNotNull(e)
@@ -88,7 +88,7 @@ class JsDomTest {
assertEquals("class1", e.classes)
}
test fun testRemoveClassPresent2() {
@test fun testRemoveClassPresent2() {
val e = document.createElement("e")!!
assertNotNull(e)
@@ -99,7 +99,7 @@ class JsDomTest {
assertEquals("class2", e.classes)
}
test fun testRemoveClassPresent3() {
@test fun testRemoveClassPresent3() {
val e = document.createElement("e")!!
assertNotNull(e)
@@ -110,13 +110,13 @@ class JsDomTest {
assertEquals("class2 class3", e.classes)
}
test fun testRemoveClassUndefinedClasses() {
@test fun testRemoveClassUndefinedClasses() {
val e = document.createElement("e")!!
e.removeClass("class1")
assertEquals("", e.classes)
}
test fun testRemoveFromParent() {
@test fun testRemoveFromParent() {
val doc = document
val parent = doc.createElement("pp")
@@ -135,7 +135,7 @@ class JsDomTest {
assertNull(child.parentNode)
}
test fun testRemoveFromParentOrphanNode() {
@test fun testRemoveFromParentOrphanNode() {
val child = document.createElement("cc")
child.removeFromParent()
libraries/stdlib/test/js/MapJsTest.kt
+31 -31
View File
@@ -17,7 +17,7 @@ class ComplexMapJsTest : MapJsTest() {
assertEquals(KEYS.toNormalizedList(), map.keySet().toNormalizedList())
assertEquals(VALUES.toNormalizedList(), map.values().toNormalizedList())
}
test override fun constructors() {
@test override fun constructors() {
doTest<String>()
}
@@ -28,7 +28,7 @@ class ComplexMapJsTest : MapJsTest() {
}
class PrimitiveMapJsTest : MapJsTest() {
test override fun constructors() {
@test override fun constructors() {
HashMap<String, Int>()
HashMap<String, Int>(3)
HashMap<String, Int>(3, 0.5f)
@@ -43,7 +43,7 @@ class PrimitiveMapJsTest : MapJsTest() {
override fun emptyMutableMap(): MutableMap<String, Int> = HashMap()
override fun emptyMutableMapWithNullableKeyValue(): MutableMap<String?, Int?> = HashMap()
test fun compareBehavior() {
@test fun compareBehavior() {
val specialJsStringMap = HashMap<String, Any>()
specialJsStringMap.put("k1", "v1")
compare(genericHashMapOf("k1" to "v1"), specialJsStringMap) { mapBehavior() }
@@ -55,7 +55,7 @@ class PrimitiveMapJsTest : MapJsTest() {
}
class LinkedHashMapTest : MapJsTest() {
test override fun constructors() {
@test override fun constructors() {
LinkedHashMap<String, Int>()
LinkedHashMap<String, Int>(3)
LinkedHashMap<String, Int>(3, 0.5f)
@@ -77,7 +77,7 @@ abstract class MapJsTest {
val SPECIAL_NAMES = arrayOf("__proto__", "constructor", "toString", "toLocaleString", "valueOf", "hasOwnProperty", "isPrototypeOf", "propertyIsEnumerable")
test fun getOrElse() {
@test fun getOrElse() {
val data = emptyMap()
val a = data.getOrElse("foo"){2}
assertEquals(2, a)
@@ -87,7 +87,7 @@ abstract class MapJsTest {
assertEquals(0, data.size())
}
test fun getOrPut() {
@test fun getOrPut() {
val data = emptyMutableMap()
val a = data.getOrPut("foo"){2}
assertEquals(2, a)
@@ -98,13 +98,13 @@ abstract class MapJsTest {
assertEquals(1, data.size())
}
test fun emptyMapGet() {
@test fun emptyMapGet() {
val map = emptyMap()
assertEquals(null, map.get("foo"), """failed on map.get("foo")""")
assertEquals(null, map["bar"], """failed on map["bar"]""")
}
test fun mapGet() {
@test fun mapGet() {
val map = createTestMap()
for (i in KEYS.indices) {
assertEquals(VALUES[i], map.get(KEYS[i]), """failed on map.get(KEYS[$i])""")
@@ -114,7 +114,7 @@ abstract class MapJsTest {
assertEquals(null, map.get("foo"))
}
test fun mapPut() {
@test fun mapPut() {
val map = emptyMutableMap()
map.put("foo", 1)
@@ -130,7 +130,7 @@ abstract class MapJsTest {
assertEquals(2, map["bar"])
}
test fun sizeAndEmptyForEmptyMap() {
@test fun sizeAndEmptyForEmptyMap() {
val data = emptyMap()
assertTrue(data.isEmpty())
@@ -140,7 +140,7 @@ abstract class MapJsTest {
assertEquals(0, data.size())
}
test fun sizeAndEmpty() {
@test fun sizeAndEmpty() {
val data = createTestMap()
assertFalse(data.isEmpty())
@@ -150,22 +150,22 @@ abstract class MapJsTest {
}
// #KT-3035
test fun emptyMapValues() {
@test fun emptyMapValues() {
val emptyMap = emptyMap()
assertTrue(emptyMap.values().isEmpty())
}
test fun mapValues() {
@test fun mapValues() {
val map = createTestMap()
assertEquals(VALUES.toNormalizedList(), map.values().toNormalizedList())
}
test fun mapKeySet() {
@test fun mapKeySet() {
val map = createTestMap()
assertEquals(KEYS.toNormalizedList(), map.keySet().toNormalizedList())
}
test fun mapEntrySet() {
@test fun mapEntrySet() {
val map = createTestMap()
val actualKeys = ArrayList<String>()
@@ -179,7 +179,7 @@ abstract class MapJsTest {
assertEquals(VALUES.toNormalizedList(), actualValues.toNormalizedList())
}
test fun mapContainsKey() {
@test fun mapContainsKey() {
val map = createTestMap()
assertTrue(map.containsKey(KEYS[0]) &&
@@ -191,7 +191,7 @@ abstract class MapJsTest {
map.containsKey(1))
}
test fun mapContainsValue() {
@test fun mapContainsValue() {
val map = createTestMap()
assertTrue(map.containsValue(VALUES[0]) &&
@@ -203,14 +203,14 @@ abstract class MapJsTest {
map.containsValue(5))
}
test fun mapPutAll() {
@test fun mapPutAll() {
val map = createTestMap()
val newMap = emptyMutableMap()
newMap.putAll(map)
assertEquals(KEYS.size(), newMap.size())
}
test fun mapRemove() {
@test fun mapRemove() {
val map = createTestMutableMap()
val last = KEYS.size() - 1
val first = 0
@@ -227,14 +227,14 @@ abstract class MapJsTest {
assertEquals(KEYS.size() - 3, map.size())
}
test fun mapClear() {
@test fun mapClear() {
val map = createTestMutableMap()
assertFalse(map.isEmpty())
map.clear()
assertTrue(map.isEmpty())
}
test fun nullAsKey() {
@test fun nullAsKey() {
val map = emptyMutableMapWithNullableKeyValue()
assertTrue(map.isEmpty())
@@ -247,7 +247,7 @@ abstract class MapJsTest {
assertEquals(null, map[null])
}
test fun nullAsValue() {
@test fun nullAsValue() {
val map = emptyMutableMapWithNullableKeyValue()
val KEY = "Key"
@@ -260,7 +260,7 @@ abstract class MapJsTest {
assertTrue(map.isEmpty())
}
test fun setViaIndexOperators() {
@test fun setViaIndexOperators() {
val map = HashMap<String, String>()
assertTrue{ map.isEmpty() }
assertEquals(map.size(), 0)
@@ -272,21 +272,21 @@ abstract class MapJsTest {
assertEquals("James", map["name"])
}
test fun createUsingPairs() {
@test fun createUsingPairs() {
val map = mapOf(Pair("a", 1), Pair("b", 2))
assertEquals(2, map.size())
assertEquals(1, map.get("a"))
assertEquals(2, map.get("b"))
}
test fun createUsingTo() {
@test fun createUsingTo() {
val map = mapOf("a" to 1, "b" to 2)
assertEquals(2, map.size())
assertEquals(1, map.get("a"))
assertEquals(2, map.get("b"))
}
test fun mapIteratorImplicitly() {
@test fun mapIteratorImplicitly() {
val map = createTestMap()
val actualKeys = ArrayList<String>()
@@ -300,7 +300,7 @@ abstract class MapJsTest {
assertEquals(VALUES.toNormalizedList(), actualValues.toNormalizedList())
}
test fun mapIteratorExplicitly() {
@test fun mapIteratorExplicitly() {
val map = createTestMap()
val actualKeys = ArrayList<String>()
@@ -315,7 +315,7 @@ abstract class MapJsTest {
assertEquals(VALUES.toNormalizedList(), actualValues.toNormalizedList())
}
test fun specialNamesNotContainsInEmptyMap() {
@test fun specialNamesNotContainsInEmptyMap() {
val map = emptyMap()
for (key in SPECIAL_NAMES) {
@@ -323,7 +323,7 @@ abstract class MapJsTest {
}
}
test fun specialNamesNotContainsInNonEmptyMap() {
@test fun specialNamesNotContainsInNonEmptyMap() {
val map = createTestMap()
for (key in SPECIAL_NAMES) {
@@ -331,7 +331,7 @@ abstract class MapJsTest {
}
}
test fun putAndGetSpecialNamesToMap() {
@test fun putAndGetSpecialNamesToMap() {
val map = createTestMutableMap()
var value = 0
@@ -351,7 +351,7 @@ abstract class MapJsTest {
}
}
test abstract fun constructors()
@test abstract fun constructors()
/*
test fun createLinkedMap() {
libraries/stdlib/test/js/SetJsTest.kt
+40 -20
View File
@@ -18,7 +18,8 @@ class ComplexSetJsTest : SetJsTest() {
assertEquals(data, set)
}
Test override fun constructors() {
@Test
override fun constructors() {
doTest<String>()
}
@@ -32,7 +33,8 @@ class ComplexSetJsTest : SetJsTest() {
class PrimitiveSetJsTest : SetJsTest() {
override fun createEmptyMutableSet(): MutableSet<String> = HashSet()
override fun createEmptyMutableSetWithNullableValues(): MutableSet<String?> = HashSet()
Test override fun constructors() {
@Test
override fun constructors() {
HashSet<String>()
HashSet<String>(3)
HashSet<String>(3, 0.5f)
@@ -42,7 +44,8 @@ class PrimitiveSetJsTest : SetJsTest() {
assertEquals(data, set)
}
Test fun compareBehavior() {
@Test
fun compareBehavior() {
val specialJsStringSet = HashSet<String>()
specialJsStringSet.add("kotlin")
compare(genericHashSetOf("kotlin"), specialJsStringSet) { setBehavior() }
@@ -57,7 +60,8 @@ class PrimitiveSetJsTest : SetJsTest() {
class LinkedHashSetJsTest : SetJsTest() {
override fun createEmptyMutableSet(): MutableSet<String> = LinkedHashSet()
override fun createEmptyMutableSetWithNullableValues(): MutableSet<String?> = LinkedHashSet()
Test override fun constructors() {
@Test
override fun constructors() {
LinkedHashSet<String>()
LinkedHashSet<String>(3)
LinkedHashSet<String>(3, 0.5f)
@@ -74,24 +78,28 @@ abstract class SetJsTest {
val SPECIAL_NAMES = arrayOf("__proto__", "constructor", "toString", "toLocaleString", "valueOf", "hasOwnProperty", "isPrototypeOf", "propertyIsEnumerable")
Test fun size() {
@Test
fun size() {
assertEquals(2, data.size())
assertEquals(0, empty.size())
}
Test fun isEmpty() {
@Test
fun isEmpty() {
assertFalse(data.isEmpty())
assertTrue(empty.isEmpty())
}
Test fun equals() {
@Test
fun equals() {
assertNotEquals(createEmptyMutableSet(), data)
assertNotEquals(data, empty)
assertEquals(createEmptyMutableSet(), empty)
assertEquals(createTestMutableSetReversed(), data)
}
Test fun contains() {
@Test
fun contains() {
assertTrue(data.contains("foo"))
assertTrue(data.contains("bar"))
assertFalse(data.contains("baz"))
@@ -102,7 +110,8 @@ abstract class SetJsTest {
assertFalse(empty.contains(1))
}
Test fun iterator() {
@Test
fun iterator() {
var result = ""
for (e in data) {
result += e
@@ -111,14 +120,16 @@ abstract class SetJsTest {
assertTrue(result == "foobar" || result == "barfoo")
}
Test fun containsAll() {
@Test
fun containsAll() {
assertTrue(data.containsAll(arrayListOf("foo", "bar")))
assertTrue(data.containsAll(arrayListOf<String>()))
assertFalse(data.containsAll(arrayListOf("foo", "bar", "baz")))
assertFalse(data.containsAll(arrayListOf("baz")))
}
Test fun add() {
@Test
fun add() {
val data = createTestMutableSet()
assertTrue(data.add("baz"))
assertEquals(3, data.size())
@@ -127,7 +138,8 @@ abstract class SetJsTest {
assertTrue(data.containsAll(arrayListOf("foo", "bar", "baz")))
}
Test fun remove() {
@Test
fun remove() {
val data = createTestMutableSet()
assertTrue(data.remove("foo"))
assertEquals(1, data.size())
@@ -136,7 +148,8 @@ abstract class SetJsTest {
assertTrue(data.contains("bar"))
}
Test fun addAll() {
@Test
fun addAll() {
val data = createTestMutableSet()
assertTrue(data.addAll(arrayListOf("foo", "bar", "baz", "boo")))
assertEquals(4, data.size())
@@ -145,7 +158,8 @@ abstract class SetJsTest {
assertTrue(data.containsAll(arrayListOf("foo", "bar", "baz", "boo")))
}
Test fun removeAll() {
@Test
fun removeAll() {
val data = createTestMutableSet()
assertFalse(data.removeAll(arrayListOf("baz")))
assertTrue(data.containsAll(arrayListOf("foo", "bar")))
@@ -161,7 +175,8 @@ abstract class SetJsTest {
assertTrue(data.isEmpty())
}
Test fun retainAll() {
@Test
fun retainAll() {
val data1 = createTestMutableSet()
assertTrue(data1.retainAll(arrayListOf("baz")))
assertTrue(data1.isEmpty())
@@ -172,7 +187,8 @@ abstract class SetJsTest {
assertEquals(1, data2.size())
}
Test fun clear() {
@Test
fun clear() {
val data = createTestMutableSet()
data.clear()
assertTrue(data.isEmpty())
@@ -181,19 +197,22 @@ abstract class SetJsTest {
assertTrue(data.isEmpty())
}
Test fun specialNamesNotContainsInEmptySet() {
@Test
fun specialNamesNotContainsInEmptySet() {
for (element in SPECIAL_NAMES) {
assertFalse(empty.contains(element), "unexpected element: $element")
}
}
Test fun specialNamesNotContainsInNonEmptySet() {
@Test
fun specialNamesNotContainsInNonEmptySet() {
for (element in SPECIAL_NAMES) {
assertFalse(data.contains(element), "unexpected element: $element")
}
}
Test fun putAndGetSpecialNamesToSet() {
@Test
fun putAndGetSpecialNamesToSet() {
val s = createTestMutableSet()
for (element in SPECIAL_NAMES) {
@@ -209,7 +228,8 @@ abstract class SetJsTest {
abstract fun constructors()
Test fun nullAsValue() {
@Test
fun nullAsValue() {
val set = createEmptyMutableSetWithNullableValues()
assertTrue(set.isEmpty(), "Set should be empty")
libraries/stdlib/test/js/SimpleTest.kt
+1 -1
View File
@@ -11,7 +11,7 @@ class SimpleTest {
assertEquals("hello world!", message)
}
test fun cheese() {
@test fun cheese() {
val name = "world"
val message = "bye $name!"
assertEquals("bye world!", message)
libraries/stdlib/test/js/javautilCollectionsTest.kt
+4 -4
View File
@@ -14,23 +14,23 @@ class JavautilCollectionsTest {
val MAX_ELEMENT = 9
val COMPARATOR = comparator { x: Int, y: Int -> if (x > y) 1 else if (x < y) -1 else 0 }
test fun maxWithComparator() {
@test fun maxWithComparator() {
assertEquals(MAX_ELEMENT, Collections.max(TEST_LIST, COMPARATOR))
}
test fun sort() {
@test fun sort() {
val list = TEST_LIST.toArrayList()
Collections.sort(list)
assertEquals(SORTED_TEST_LIST, list)
}
test fun sortWithComparator() {
@test fun sortWithComparator() {
val list = TEST_LIST.toArrayList()
Collections.sort(list, COMPARATOR)
assertEquals(SORTED_TEST_LIST, list)
}
test fun collectionToArray() {
@test fun collectionToArray() {
val array = TEST_LIST.toTypedArray()
assertEquals(array.toList(), TEST_LIST)
}