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

(and in jvm-only and js-only tests also)

js/js.libraries/test/core/JsonTest.kt

@@ -2,11 +2,10 @@ package test.js
 
 import kotlin.js.*
 import kotlin.test.*
-import org.junit.Test as test
 
 class JsonTest {
 
-    @test fun createJsonFromPairs() {
+    @Test fun createJsonFromPairs() {
         var obj = json(Pair("firstName", "John"), Pair("lastName", "Doe"), Pair("age", 30))
         assertEquals("John", obj["firstName"], "firstName")
         assertEquals("Doe", obj["lastName"], "lastName")

js/js.libraries/test/core/NumbersJsTest.kt

@@ -1,23 +1,22 @@
 package test.js
 
-import org.junit.Test as test
 import kotlin.test.*
 
 class NumbersJsTest {
 
-    @test fun longMinMaxValues() {
+    @Test fun longMinMaxValues() {
         assertEquals(js("Kotlin.Long.MIN_VALUE"), Long.MIN_VALUE)
         assertEquals(js("Kotlin.Long.MAX_VALUE"), Long.MAX_VALUE)
     }
 
-    @test fun doubleMinMaxValues() {
+    @Test fun doubleMinMaxValues() {
         assertEquals(js("Number.MIN_VALUE"), Double.MIN_VALUE)
         assertEquals(js("Number.MAX_VALUE"), Double.MAX_VALUE)
         assertEquals(js("Number.POSITIVE_INFINITY"), Double.POSITIVE_INFINITY)
         assertEquals(js("Number.NEGATIVE_INFINITY"), Double.NEGATIVE_INFINITY)
     }
 
-    @test fun floatMinMaxValues() {
+    @Test fun floatMinMaxValues() {
         assertEquals(js("Number.MIN_VALUE"), Float.MIN_VALUE)
         assertEquals(js("Number.MAX_VALUE"), Float.MAX_VALUE)
         assertEquals(js("Number.POSITIVE_INFINITY"), Float.POSITIVE_INFINITY)

js/js.libraries/test/core/RegExpTest.kt

@@ -19,17 +19,16 @@ package test.js
 import kotlin.js.*
 
 import kotlin.test.*
-import org.junit.Test as test
 
 class RegExpTest {
 
-    @test fun regExpToString() {
+    @Test fun regExpToString() {
         val pattern = "q(\\d+)d"
         val re = RegExp(pattern, "i")
         assertEquals("/$pattern/i", re.toString())
     }
 
-    @test fun regExpProperties() {
+    @Test fun regExpProperties() {
         val re1 = RegExp("[a-z]", "img")
         assertTrue(re1.global)
         assertTrue(re1.ignoreCase)
@@ -40,7 +39,7 @@ class RegExpTest {
         assertFalse(re2.multiline)
     }
 
-    @test fun regExpTest() {
+    @Test fun regExpTest() {
         val pattern = "q(\\d+)d"
         val re = RegExp(pattern, "i")
 
@@ -51,7 +50,7 @@ class RegExpTest {
     }
 
 
-    @test fun regExpExec() {
+    @Test fun regExpExec() {
         val string = "R2D2 beats A5D5 "
         var re = RegExp("""(\w\d)(\w\d)""", "g")
         val m1 = re.exec(string)!!

libraries/stdlib/test/ExceptionJVMTest.kt

@@ -4,7 +4,6 @@ package test.exceptions
 import kotlin.test.*
 import test.collections.assertArrayNotSameButEquals
 
-import org.junit.Test
 import java.io.PrintWriter
 import java.io.*
 import java.nio.charset.Charset

libraries/stdlib/test/OrderingTest.kt

@@ -1,7 +1,6 @@
 package test.comparisons
 
 import kotlin.test.*
-import org.junit.Test
 import kotlin.comparisons.*
 
 data class Item(val name: String, val rating: Int) : Comparable<Item> {

libraries/stdlib/test/TuplesTest.kt

@@ -1,9 +1,6 @@
 package test.tuples
 
-import org.junit.Test
+import kotlin.test.*
-import kotlin.test.assertTrue
-import kotlin.test.assertEquals
-import kotlin.test.assertNotEquals
 
 class PairTest {
     val p = Pair(1, "a")

libraries/stdlib/test/collections/ArraysTest.kt

@@ -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) }

libraries/stdlib/test/collections/CollectionJVMTest.kt

@@ -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
 

libraries/stdlib/test/collections/CollectionTest.kt

@@ -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.*

libraries/stdlib/test/collections/GroupingTest.kt

@@ -1,6 +1,5 @@
 package test.collections
 
-import org.junit.Test
 import kotlin.test.*
 
 class GroupingTest {

libraries/stdlib/test/collections/IterableTests.kt

@@ -16,7 +16,6 @@
 
 package test.collections
 
-import org.junit.Test
 import test.*
 import kotlin.test.*
 

libraries/stdlib/test/collections/IteratorsJVMTest.kt

@@ -1,7 +1,6 @@
 @file:kotlin.jvm.JvmVersion
 package test.collections
 
-import org.junit.Test
 import kotlin.test.*
 import java.util.*
 

libraries/stdlib/test/collections/IteratorsTest.kt

@@ -1,7 +1,6 @@
 package test.collections
 
 import kotlin.test.*
-import org.junit.Test
 
 class IteratorsTest {
     @Test fun iterationOverIterator() {

libraries/stdlib/test/collections/ListBinarySearchTest.kt

@@ -1,7 +1,6 @@
 package test.collections.binarySearch
 
-import org.junit.Test
+import kotlin.test.*
-import kotlin.test.assertEquals
 import kotlin.comparisons.*
 
 class ListBinarySearchTest {

libraries/stdlib/test/collections/ListSpecificTest.kt

@@ -1,7 +1,6 @@
 package test.collections
 
 import kotlin.test.*
-import org.junit.Test
 
 class ListSpecificTest {
     val data = listOf("foo", "bar")

libraries/stdlib/test/collections/MapJVMTest.kt

@@ -3,10 +3,7 @@ package test.collections
 
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.ConcurrentMap
-import kotlin.test.assertEquals
+import kotlin.test.*
-import kotlin.test.assertFails
-import kotlin.test.expect
-import org.junit.Test
 import kotlin.comparisons.*
 
 class MapJVMTest {

libraries/stdlib/test/collections/MapTest.kt

@@ -2,7 +2,6 @@ package test.collections
 
 import kotlin.test.*
 import test.*
-import org.junit.Test
 
 class MapTest {
 

libraries/stdlib/test/collections/MutableCollectionsTest.kt

@@ -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)

libraries/stdlib/test/collections/ReversedViewsTest.kt

@@ -18,10 +18,7 @@ package test.collections
 
 import test.collections.behaviors.listBehavior
 import test.collections.compare
-import kotlin.test.assertEquals
+import kotlin.test.*
-import kotlin.test.assertFalse
-import kotlin.test.assertTrue
-import org.junit.Test
 
 class ReversedViewsTest {
 

libraries/stdlib/test/collections/SequenceJVMTest.kt

@@ -1,8 +1,7 @@
 @file:kotlin.jvm.JvmVersion
 package test.collections
 
-import org.junit.Test
+import kotlin.test.*
-import kotlin.test.assertEquals
 
 class SequenceJVMTest {
 

libraries/stdlib/test/collections/SequenceTest.kt

@@ -16,7 +16,6 @@
 
 package test.collections
 
-import org.junit.Test
 import kotlin.test.*
 import kotlin.comparisons.*
 

libraries/stdlib/test/collections/SetOperationsTest.kt

@@ -1,7 +1,6 @@
 package test.collections
 
 import kotlin.test.*
-import org.junit.Test
 
 class SetOperationsTest {
     @Test fun distinct() {

libraries/stdlib/test/concurrent/ThreadTest.kt

@@ -4,7 +4,6 @@ package test.concurrent
 import kotlin.concurrent.*
 import kotlin.test.*
 
-import org.junit.Test
 
 import java.util.concurrent.*
 import java.util.concurrent.TimeUnit.*

libraries/stdlib/test/concurrent/TimerTest.kt

@@ -7,7 +7,6 @@ import kotlin.test.*
 import java.util.concurrent.atomic.AtomicInteger
 import java.util.Timer
 
-import org.junit.Test
 
 class TimerTest {
     @Test fun scheduledTask() {

libraries/stdlib/test/coroutines/CoroutineContextTest.kt

@@ -17,7 +17,6 @@
 package test.coroutines
 
 import kotlin.test.*
-import org.junit.Test
 import kotlin.coroutines.experimental.*
 
 class CoroutineContextTest {

libraries/stdlib/test/coroutines/CoroutinesReferenceValuesTest.kt

@@ -17,7 +17,6 @@
 package test.coroutines
 
 import kotlin.test.*
-import org.junit.Test
 import kotlin.coroutines.experimental.*
 
 /**

libraries/stdlib/test/coroutines/SequenceBuilderTest.kt

@@ -16,7 +16,6 @@
 
 package test.coroutines
 
-import org.junit.Test
 import kotlin.test.*
 import kotlin.coroutines.experimental.buildSequence
 import kotlin.coroutines.experimental.buildIterator

libraries/stdlib/test/io/FileTreeWalks.kt

@@ -1,7 +1,6 @@
 @file:kotlin.jvm.JvmVersion
 package test.io
 
-import org.junit.Test
 import java.io.File
 import java.io.IOException
 import java.util.*

libraries/stdlib/test/io/Files.kt

@@ -3,7 +3,6 @@ package test.io
 
 import java.io.*
 import java.util.*
-import org.junit.Test
 import kotlin.io.walkTopDown
 import kotlin.test.*
 

libraries/stdlib/test/io/IOStreams.kt

@@ -1,7 +1,6 @@
 @file:kotlin.jvm.JvmVersion
 package test.io
 
-import org.junit.Test
 import kotlin.test.*
 import java.io.Writer
 import java.io.BufferedReader

libraries/stdlib/test/io/ReadWrite.kt

@@ -1,15 +1,12 @@
 @file:kotlin.jvm.JvmVersion
 package test.io
 
-import org.junit.Test
+import kotlin.test.*
 import java.io.File
-import kotlin.test.assertEquals
 import java.io.Reader
 import java.io.StringReader
 import java.net.URL
 import java.util.ArrayList
-import kotlin.test.assertFalse
-import kotlin.test.assertTrue
 
 fun sample(): Reader = StringReader("Hello\nWorld");
 

libraries/stdlib/test/io/SerializableTest.kt

@@ -2,7 +2,6 @@
 package test.io
 
 import java.io.*
-import org.junit.Test
 import kotlin.test.*
 
 private class Serial(val name: String) : Serializable {

libraries/stdlib/test/js/JsArrayTest.kt

@@ -16,7 +16,6 @@
 
 package test.collections.js
 
-import org.junit.Test
 import kotlin.test.*
 
 class JsArrayTest {

libraries/stdlib/test/js/JsCollectionsTest.kt

@@ -2,7 +2,6 @@ package test.collections.js
 
 import kotlin.test.*
 import kotlin.comparisons.*
-import org.junit.Test
 
 class JsCollectionsTest {
     val TEST_LIST = arrayOf(2, 0, 9, 7, 1).toList()

libraries/stdlib/test/js/MapJsTest.kt

@@ -1,7 +1,6 @@
 package test.collections.js
 
 import kotlin.test.*
-import org.junit.Test
 import test.collections.*
 import test.collections.behaviors.*
 

libraries/stdlib/test/js/SetJsTest.kt

@@ -1,7 +1,6 @@
 package test.collections.js
 
 import kotlin.test.*
-import org.junit.Test
 import test.collections.*
 import test.collections.behaviors.*
 

libraries/stdlib/test/language/EscapedTestNamesTest.kt

@@ -1,7 +1,6 @@
 @file:kotlin.jvm.JvmVersion // TODO: Can't run in JS: spaces in function name KT-4160
 package test.language
 
-import org.junit.Test
 import kotlin.test.*
 
 class EscapedTestNamesTest {

libraries/stdlib/test/numbers/BigNumbersTest.kt

@@ -5,7 +5,6 @@ import java.math.BigInteger
 import java.math.BigDecimal
 
 import kotlin.test.*
-import org.junit.Test
 import java.math.MathContext
 import java.math.RoundingMode
 

libraries/stdlib/test/numbers/BitwiseOperationsTest.kt

@@ -1,7 +1,6 @@
 package test.numbers
 
 import kotlin.test.*
-import org.junit.Test
 
 // TODO: Run these tests during compiler test only (JVM & JS)
 class BitwiseOperationsTest {

libraries/stdlib/test/numbers/CompanionIntrinsicObjectsJVMTest.kt

@@ -19,7 +19,6 @@ package test.numbers
 
 import kotlin.test.*
 
-import org.junit.Test
 
 class CompanionIntrinsicObjectsJVMTest {
     @Test fun intTest() {

libraries/stdlib/test/numbers/MathJVMTest.kt

@@ -2,7 +2,6 @@
 package test.numbers
 
 import kotlin.test.*
-import org.junit.Test
 import kotlin.math.*
 
 class MathJVMTest {

libraries/stdlib/test/numbers/MathTest.kt

@@ -16,7 +16,6 @@
 
 package test.numbers
 
-import org.junit.Test
 import kotlin.math.*
 import kotlin.test.*
 

libraries/stdlib/test/numbers/NaNPropagationTest.kt

@@ -1,9 +1,7 @@
 package numbers
 
-import org.junit.Test
+import kotlin.test.*
-import kotlin.test.assertTrue
 import kotlin.comparisons.*
-import kotlin.test.assertEquals
 
 val Double.Companion.values get() = listOf(0.0, NEGATIVE_INFINITY, MIN_VALUE, MAX_VALUE, POSITIVE_INFINITY, NaN)
 val Float.Companion.values get() = listOf(0.0f, NEGATIVE_INFINITY, MIN_VALUE, MAX_VALUE, POSITIVE_INFINITY, NaN)

libraries/stdlib/test/numbers/NumbersJVMTest.kt

@@ -2,7 +2,6 @@
 package test.numbers
 
 import java.math.BigDecimal
-import org.junit.Test
 import kotlin.test.*
 
 class NumbersJVMTest {

libraries/stdlib/test/numbers/NumbersTest.kt

@@ -1,6 +1,5 @@
 package test.numbers
 
-import org.junit.Test
 import kotlin.test.*
 
 object NumbersTestConstants {

libraries/stdlib/test/properties/delegation/DelegationTest.kt

@@ -1,6 +1,5 @@
 package test.properties.delegation
 
-import org.junit.Test
 import kotlin.test.*
 import kotlin.properties.*
 

libraries/stdlib/test/properties/delegation/MapAccessorsTest.kt

@@ -1,7 +1,6 @@
 package test.properties.delegation.map
 
 import kotlin.test.*
-import org.junit.Test
 
 class ValByMapExtensionsTest {
     val map: Map<String, String> = hashMapOf("a" to "all", "b" to "bar", "c" to "code")

libraries/stdlib/test/properties/delegation/lazy/LazyValuesTest.kt

@@ -1,6 +1,5 @@
 package test.properties.delegation.lazy
 
-import org.junit.Test
 import kotlin.properties.*
 import kotlin.test.*
 

libraries/stdlib/test/ranges/CoercionTest.kt

@@ -1,6 +1,5 @@
 package test.ranges
 
-import org.junit.Test
 import kotlin.test.*
 
 class CoercionTest {

libraries/stdlib/test/ranges/ProgressionLastElementTest.kt

@@ -1,8 +1,7 @@
 package test.ranges
 
-import org.junit.Test
 import kotlin.comparisons.*
-import kotlin.test.assertEquals
+import kotlin.test.*
 
 
 class ProgressionLastElementTest  {

libraries/stdlib/test/ranges/RangeIterationJVMTest.kt

@@ -11,7 +11,6 @@ import java.lang.Long.MAX_VALUE as MaxL
 import java.lang.Long.MIN_VALUE as MinL
 import java.lang.Character.MAX_VALUE as MaxC
 import java.lang.Character.MIN_VALUE as MinC
-import org.junit.Test
 import kotlin.test.*
 
 // Test data for codegen is generated from this class. If you change it, rerun GenerateTests

libraries/stdlib/test/ranges/RangeIterationTest.kt

@@ -1,6 +1,5 @@
 package test.ranges
 
-import org.junit.Test
 import test.collections.behaviors.iteratorBehavior
 import test.collections.compare
 import kotlin.test.*

libraries/stdlib/test/ranges/RangeTest.kt

@@ -1,7 +1,6 @@
 package test.ranges
 
 import kotlin.test.*
-import org.junit.Test
 
 public class RangeTest {
     @Test fun intRange() {

libraries/stdlib/test/reflection/AnnotationsTest.kt

@@ -3,7 +3,6 @@
 package test.reflection
 
 import kotlin.test.*
-import org.junit.Test
 
 @Retention(AnnotationRetention.RUNTIME)
 annotation class MyAnno

libraries/stdlib/test/text/CharJVMTest.kt

@@ -2,7 +2,6 @@
 package test.text
 
 import kotlin.test.*
-import org.junit.Test
 
 class CharJVMTest {
 

libraries/stdlib/test/text/RegexJVMTest.kt

@@ -18,7 +18,6 @@
 package test.text
 
 import kotlin.test.*
-import org.junit.Test
 import test.collections.compare
 import test.io.*
 import java.util.regex.Pattern

libraries/stdlib/test/text/RegexTest.kt

@@ -3,7 +3,6 @@ package test.text
 import kotlin.text.*
 
 import kotlin.test.*
-import org.junit.Test
 
 class RegexTest {
 

libraries/stdlib/test/text/StringBuilderJVMTest.kt

@@ -2,7 +2,6 @@
 package test.text
 
 import kotlin.test.*
-import org.junit.Test
 
 class StringBuilderJVMTest() {
 

libraries/stdlib/test/text/StringBuilderTest.kt

@@ -1,7 +1,6 @@
 package test.text
 
 import kotlin.test.*
-import org.junit.Test
 
 class StringBuilderTest {
 

libraries/stdlib/test/text/StringJVMTest.kt

@@ -5,7 +5,6 @@ import test.collections.assertArrayNotSameButEquals
 import java.util.*
 import kotlin.test.*
 
-import org.junit.Test
 
 class StringJVMTest {
 

libraries/stdlib/test/text/StringNumberConversionTest.kt

@@ -1,7 +1,6 @@
 package test.text
 
 import kotlin.test.*
-import org.junit.Test
 
 class StringNumberConversionTest {
 

libraries/stdlib/test/text/StringTest.kt

@@ -18,7 +18,6 @@ package test.text
 
 import kotlin.test.*
 import test.*
-import org.junit.Test
 import test.collections.behaviors.iteratorBehavior
 import test.collections.compare
 

libraries/stdlib/test/utils/KotlinVersionTest.kt

@@ -1,6 +1,5 @@
 package test.utils
 
-import org.junit.Test
 import kotlin.test.*
 
 

libraries/stdlib/test/utils/LazyJVMTest.kt

@@ -8,7 +8,6 @@ import java.io.*
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicInteger
 import kotlin.concurrent.thread
-import org.junit.Test
 import test.io.serializeAndDeserialize
 
 class LazyJVMTest {

libraries/stdlib/test/utils/LazyTest.kt

@@ -2,7 +2,6 @@ package test.utils
 
 import kotlin.*
 import kotlin.test.*
-import org.junit.Test
 
 class LazyTest {
 

libraries/stdlib/test/utils/PreconditionsTest.kt

@@ -1,6 +1,5 @@
 package test.utils
 
-import org.junit.Test
 import kotlin.test.*
 
 class PreconditionsTest() {

libraries/stdlib/test/utils/TODOTest.kt

@@ -18,7 +18,6 @@ package test.utils
 
 import kotlin.*
 import kotlin.test.*
-import org.junit.Test
 
 class TODOTest {
     private class PartiallyImplementedClass {