Use kotlin.test.Test instead of org.junit.Test in common stdlib tests

(and in jvm-only and js-only tests also)
This commit is contained in:
Ilya Gorbunov
2017-10-12 07:23:13 +03:00
parent f002493218
commit 20b122c1dd
67 changed files with 16 additions and 92 deletions
@@ -19,7 +19,6 @@ package test.collections
import test.collections.behaviors.*
import test.comparisons.STRING_CASE_INSENSITIVE_ORDER
import kotlin.test.*
import org.junit.Test
import kotlin.comparisons.*
fun <T> assertArrayNotSameButEquals(expected: Array<out T>, actual: Array<out T>, message: String = "") { assertTrue(expected !== actual && expected contentEquals actual, message) }
@@ -9,7 +9,6 @@ import kotlin.test.*
import kotlin.comparisons.*
import java.util.*
import org.junit.Test
import test.io.deserializeFromHex
import test.io.serializeAndDeserialize
@@ -17,7 +17,6 @@
package test.collections
import kotlin.test.*
import org.junit.Test
import test.collections.behaviors.*
import test.comparisons.STRING_CASE_INSENSITIVE_ORDER
import kotlin.comparisons.*
@@ -1,6 +1,5 @@
package test.collections
import org.junit.Test
import kotlin.test.*
class GroupingTest {
@@ -16,7 +16,6 @@
package test.collections
import org.junit.Test
import test.*
import kotlin.test.*
@@ -1,7 +1,6 @@
@file:kotlin.jvm.JvmVersion
package test.collections
import org.junit.Test
import kotlin.test.*
import java.util.*
@@ -1,7 +1,6 @@
package test.collections
import kotlin.test.*
import org.junit.Test
class IteratorsTest {
@Test fun iterationOverIterator() {
@@ -1,7 +1,6 @@
package test.collections.binarySearch
import org.junit.Test
import kotlin.test.assertEquals
import kotlin.test.*
import kotlin.comparisons.*
class ListBinarySearchTest {
@@ -1,7 +1,6 @@
package test.collections
import kotlin.test.*
import org.junit.Test
class ListSpecificTest {
val data = listOf("foo", "bar")
@@ -3,10 +3,7 @@ package test.collections
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.ConcurrentMap
import kotlin.test.assertEquals
import kotlin.test.assertFails
import kotlin.test.expect
import org.junit.Test
import kotlin.test.*
import kotlin.comparisons.*
class MapJVMTest {
@@ -2,7 +2,6 @@ package test.collections
import kotlin.test.*
import test.*
import org.junit.Test
class MapTest {
@@ -2,7 +2,6 @@ package test.collections
import kotlin.test.*
import org.junit.Test
class MutableCollectionTest {
fun <T, C: MutableCollection<T>> testOperation(before: List<T>, after: List<T>, expectedModified: Boolean, toMutableCollection: (List<T>) -> C)
@@ -18,10 +18,7 @@ package test.collections
import test.collections.behaviors.listBehavior
import test.collections.compare
import kotlin.test.assertEquals
import kotlin.test.assertFalse
import kotlin.test.assertTrue
import org.junit.Test
import kotlin.test.*
class ReversedViewsTest {
@@ -1,8 +1,7 @@
@file:kotlin.jvm.JvmVersion
package test.collections
import org.junit.Test
import kotlin.test.assertEquals
import kotlin.test.*
class SequenceJVMTest {
@@ -16,7 +16,6 @@
package test.collections
import org.junit.Test
import kotlin.test.*
import kotlin.comparisons.*
@@ -1,7 +1,6 @@
package test.collections
import kotlin.test.*
import org.junit.Test
class SetOperationsTest {
@Test fun distinct() {