From c5a208f3ebe8164c5ab9db7bf5edb56f7d7f3046 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 17 Jun 2016 00:13:05 +0300 Subject: [PATCH] Rearrange stdlib unit tests across packages. Rearrange JS stdlib unit tests. --- .../tests/GenerateRangesCodegenTestData.java | 4 +-- .../StdLibBitwiseOperationsTest.java | 4 +-- .../semantics/StdLibJsArrayScriptTest.java | 6 ++--- ...Test.java => StdLibJsCollectionsTest.java} | 6 ++--- .../js/test/semantics/StdLibTestToJSTest.java | 7 +++-- .../{ExceptionTest.kt => ExceptionJVMTest.kt} | 5 ++-- libraries/stdlib/test/OrderingTest.kt | 2 +- .../stdlib/test/collections/ArraysTest.kt | 2 +- .../test/collections/CollectionJVMTest.kt | 4 +-- .../stdlib/test/collections/CollectionTest.kt | 7 +++-- .../collections/MutableCollectionsTest.kt | 2 +- .../test/collections/ReversedViewsJVMTest.kt | 2 +- .../test/collections/ReversedViewsTest.kt | 2 +- libraries/stdlib/test/js/JsArrayScript.kt | 2 +- libraries/stdlib/test/js/JsArrayTest.kt | 2 +- ...ollectionsTest.kt => JsCollectionsTest.kt} | 4 +-- libraries/stdlib/test/js/MapJsTest.kt | 8 +++--- libraries/stdlib/test/js/SetJsTest.kt | 5 ++-- .../EscapedTestNamesTest.kt} | 4 +-- .../BitwiseOperationsTest.kt | 3 ++- .../CompanionIntrinsicObjectsJVMTest.kt} | 2 +- .../{MathTest.kt => numbers/MathJVMTest.kt} | 2 +- .../stdlib/test/numbers/NumbersJVMTest.kt | 2 +- libraries/stdlib/test/numbers/NumbersTest.kt | 2 +- .../test/{numbers => ranges}/CoercionTest.kt | 2 +- .../ProgressionLastElementTest.kt | 2 +- .../RangeIterationJVMTest.kt | 3 +-- .../RangeIterationTest.kt | 3 +-- .../test/{language => ranges}/RangeJVMTest.kt | 3 +-- .../test/{language => ranges}/RangeTest.kt | 3 +-- .../test/{ => reflection}/AnnotationsTest.kt | 2 +- .../PreconditionsJVMTest.kt} | 4 +-- libraries/tools/kotlin-js-tests/pom.xml | 26 +++---------------- 33 files changed, 57 insertions(+), 80 deletions(-) rename js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/{StdLibJavaUtilCollectionsTest.java => StdLibJsCollectionsTest.java} (84%) rename libraries/stdlib/test/{ExceptionTest.kt => ExceptionJVMTest.kt} (92%) rename libraries/stdlib/test/js/{javautilCollectionsTest.kt => JsCollectionsTest.kt} (97%) rename libraries/stdlib/test/{NaturalLanguageTest.kt => language/EscapedTestNamesTest.kt} (82%) rename libraries/stdlib/test/{language => numbers}/BitwiseOperationsTest.kt (87%) rename libraries/stdlib/test/{DefaultIntrinsicObjectsJVMTest.kt => numbers/CompanionIntrinsicObjectsJVMTest.kt} (98%) rename libraries/stdlib/test/{MathTest.kt => numbers/MathJVMTest.kt} (97%) rename libraries/stdlib/test/{numbers => ranges}/CoercionTest.kt (99%) rename libraries/stdlib/test/{language => ranges}/ProgressionLastElementTest.kt (99%) rename libraries/stdlib/test/{language => ranges}/RangeIterationJVMTest.kt (99%) rename libraries/stdlib/test/{language => ranges}/RangeIterationTest.kt (99%) rename libraries/stdlib/test/{language => ranges}/RangeJVMTest.kt (97%) rename libraries/stdlib/test/{language => ranges}/RangeTest.kt (99%) rename libraries/stdlib/test/{ => reflection}/AnnotationsTest.kt (96%) rename libraries/stdlib/test/{PreconditionsTest.kt => utils/PreconditionsJVMTest.kt} (98%) diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java index 719551c48c8..002cbc493dd 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java @@ -36,8 +36,8 @@ public class GenerateRangesCodegenTestData { private static final File AS_LITERAL_DIR = new File(TEST_DATA_DIR, "literal"); private static final File AS_EXPRESSION_DIR = new File(TEST_DATA_DIR, "expression"); private static final File[] SOURCE_TEST_FILES = { - new File("libraries/stdlib/test/language/RangeIterationTest.kt"), - new File("libraries/stdlib/test/language/RangeIterationJVMTest.kt") + new File("libraries/stdlib/test/ranges/RangeIterationTest.kt"), + new File("libraries/stdlib/test/ranges/RangeIterationJVMTest.kt") }; private static final Pattern TEST_FUN_PATTERN = Pattern.compile("test fun (\\w+)\\(\\) \\{.+?}", Pattern.DOTALL); diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibBitwiseOperationsTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibBitwiseOperationsTest.java index 6e139329393..a87333f3b0f 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibBitwiseOperationsTest.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibBitwiseOperationsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,6 @@ import junit.framework.Test; @SuppressWarnings("JUnitTestCaseWithNoTests") public final class StdLibBitwiseOperationsTest extends JsUnitTestBase { public static Test suite() throws Exception { - return createTestSuiteForFile("libraries/stdlib/test/language/BitwiseOperationsTest.kt"); + return createTestSuiteForFile("libraries/stdlib/test/numbers/BitwiseOperationsTest.kt"); } } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibJsArrayScriptTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibJsArrayScriptTest.java index a446bf64dbe..017c4ebdbf8 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibJsArrayScriptTest.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibJsArrayScriptTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,8 +30,8 @@ public class StdLibJsArrayScriptTest extends StdLibTestBase { @Override protected RhinoResultChecker getResultChecker() { return new CompositeRhinoResultsChecker( - new RhinoFunctionResultChecker(TEST_MODULE, "jstest", "testSize", 3.0), - new RhinoFunctionResultChecker(TEST_MODULE, "jstest", "testToListToString", "[]-[foo]-[foo, bar]") + new RhinoFunctionResultChecker(TEST_MODULE, "test.collections.js", "testSize", 3.0), + new RhinoFunctionResultChecker(TEST_MODULE, "test.collections.js", "testToListToString", "[]-[foo]-[foo, bar]") ); } } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibJavaUtilCollectionsTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibJsCollectionsTest.java similarity index 84% rename from js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibJavaUtilCollectionsTest.java rename to js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibJsCollectionsTest.java index f5e5b082d60..61643b4072f 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibJavaUtilCollectionsTest.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibJsCollectionsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.js.test.semantics; import junit.framework.Test; @SuppressWarnings("JUnitTestCaseWithNoTests") -public final class StdLibJavaUtilCollectionsTest extends JsUnitTestBase { +public final class StdLibJsCollectionsTest extends JsUnitTestBase { public static Test suite() throws Exception { - return createTestSuiteForFile("libraries/stdlib/test/js/javautilCollectionsTest.kt"); + return createTestSuiteForFile("libraries/stdlib/test/js/JsCollectionsTest.kt"); } } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTestToJSTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTestToJSTest.java index c9277a771cc..25d4a46f8b1 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTestToJSTest.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/StdLibTestToJSTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,6 @@ public class StdLibTestToJSTest extends StdLibQUnitTestSupport { "libraries/stdlib/test", "js/JsArrayTest.kt", "js/MapJsTest.kt", - "GetOrElseTest.kt", "collections/ListSpecificTest.kt", "collections/IteratorsTest.kt", "collections/CollectionBehaviors.kt", @@ -38,8 +37,8 @@ public class StdLibTestToJSTest extends StdLibQUnitTestSupport { "collections/SequenceTest.kt", "collections/IterableTests.kt", "collections/ArraysTest.kt", - "language/RangeTest.kt", - "language/RangeIterationTest.kt" + "ranges/RangeTest.kt", + "ranges/RangeIterationTest.kt" ); } diff --git a/libraries/stdlib/test/ExceptionTest.kt b/libraries/stdlib/test/ExceptionJVMTest.kt similarity index 92% rename from libraries/stdlib/test/ExceptionTest.kt rename to libraries/stdlib/test/ExceptionJVMTest.kt index 17e0f903a2b..aadac29e292 100644 --- a/libraries/stdlib/test/ExceptionTest.kt +++ b/libraries/stdlib/test/ExceptionJVMTest.kt @@ -1,12 +1,13 @@ -package test.collections +package test.exceptions import kotlin.test.* +import test.collections.assertArrayNotSameButEquals import org.junit.Test as test import java.io.PrintWriter import java.io.* -class ExceptionTest { +class ExceptionJVMTest { @test fun printStackTraceOnRuntimeException() { assertPrintStackTrace(RuntimeException("Crikey!")) diff --git a/libraries/stdlib/test/OrderingTest.kt b/libraries/stdlib/test/OrderingTest.kt index 7d52494d8bf..3ff88f07504 100644 --- a/libraries/stdlib/test/OrderingTest.kt +++ b/libraries/stdlib/test/OrderingTest.kt @@ -1,4 +1,4 @@ -package test.compare +package test.comparisons import java.util.* import kotlin.test.* diff --git a/libraries/stdlib/test/collections/ArraysTest.kt b/libraries/stdlib/test/collections/ArraysTest.kt index 74fe5960f5e..bebc641042a 100644 --- a/libraries/stdlib/test/collections/ArraysTest.kt +++ b/libraries/stdlib/test/collections/ArraysTest.kt @@ -17,7 +17,7 @@ package test.collections import test.collections.behaviors.listBehavior -import test.compare.STRING_CASE_INSENSITIVE_ORDER +import test.comparisons.STRING_CASE_INSENSITIVE_ORDER import java.util.* import kotlin.test.* import org.junit.Test as test diff --git a/libraries/stdlib/test/collections/CollectionJVMTest.kt b/libraries/stdlib/test/collections/CollectionJVMTest.kt index d49ea434f04..875d9217593 100644 --- a/libraries/stdlib/test/collections/CollectionJVMTest.kt +++ b/libraries/stdlib/test/collections/CollectionJVMTest.kt @@ -22,11 +22,11 @@ class CollectionJVMTest { @test fun removeAllWithDifferentEquality() { val data = listOf(IdentityData(1), IdentityData(1)) - val list = data.toArrayList() + val list = data.toMutableList() list -= identitySetOf(data[0]) as Iterable assertTrue(list.single() === data[1], "Identity contains should be used") - val list2 = data.toArrayList() + val list2 = data.toMutableList() list2 -= hashSetOf(data[0]) as Iterable assertTrue(list2.isEmpty(), "Equality contains should be used") diff --git a/libraries/stdlib/test/collections/CollectionTest.kt b/libraries/stdlib/test/collections/CollectionTest.kt index 0648ce604ae..daa45684c2a 100644 --- a/libraries/stdlib/test/collections/CollectionTest.kt +++ b/libraries/stdlib/test/collections/CollectionTest.kt @@ -20,8 +20,7 @@ import java.util.* import kotlin.test.* import org.junit.Test as test import test.collections.behaviors.* -import test.compare.STRING_CASE_INSENSITIVE_ORDER -import java.io.Serializable +import test.comparisons.STRING_CASE_INSENSITIVE_ORDER import kotlin.comparisons.* class CollectionTest { @@ -762,11 +761,11 @@ class CollectionTest { @test fun sortInPlace() { val data = listOf(11, 3, 7) - val asc = data.toArrayList() + val asc = data.toMutableList() asc.sort() assertEquals(listOf(3, 7, 11), asc) - val desc = data.toArrayList() + val desc = data.toMutableList() desc.sortDescending() assertEquals(listOf(11, 7, 3), desc) } diff --git a/libraries/stdlib/test/collections/MutableCollectionsTest.kt b/libraries/stdlib/test/collections/MutableCollectionsTest.kt index 0653a74f82a..a0013b80def 100644 --- a/libraries/stdlib/test/collections/MutableCollectionsTest.kt +++ b/libraries/stdlib/test/collections/MutableCollectionsTest.kt @@ -15,7 +15,7 @@ class MutableCollectionTest { } fun testOperation(before: List, after: List, expectedModified: Boolean) - = testOperation(before, after, expectedModified, { it.toArrayList() }) + = testOperation(before, after, expectedModified, { it.toMutableList() }) @test fun addAll() { diff --git a/libraries/stdlib/test/collections/ReversedViewsJVMTest.kt b/libraries/stdlib/test/collections/ReversedViewsJVMTest.kt index e2986a3e316..9d78e7d609b 100644 --- a/libraries/stdlib/test/collections/ReversedViewsJVMTest.kt +++ b/libraries/stdlib/test/collections/ReversedViewsJVMTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package collections +package test.collections import kotlin.test.assertEquals import org.junit.Test as test diff --git a/libraries/stdlib/test/collections/ReversedViewsTest.kt b/libraries/stdlib/test/collections/ReversedViewsTest.kt index 84b80479a17..3d0c5cfd3bb 100644 --- a/libraries/stdlib/test/collections/ReversedViewsTest.kt +++ b/libraries/stdlib/test/collections/ReversedViewsTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package collections +package test.collections import test.collections.behaviors.listBehavior import test.collections.compare diff --git a/libraries/stdlib/test/js/JsArrayScript.kt b/libraries/stdlib/test/js/JsArrayScript.kt index 639daee3ea1..811ee564903 100644 --- a/libraries/stdlib/test/js/JsArrayScript.kt +++ b/libraries/stdlib/test/js/JsArrayScript.kt @@ -1,5 +1,5 @@ // this package referenced from testArrayScriptTest -package jstest +package test.collections.js fun testSize(): Int { val a1 = arrayOf() diff --git a/libraries/stdlib/test/js/JsArrayTest.kt b/libraries/stdlib/test/js/JsArrayTest.kt index 5d181f894de..c6dd4d9cbc4 100644 --- a/libraries/stdlib/test/js/JsArrayTest.kt +++ b/libraries/stdlib/test/js/JsArrayTest.kt @@ -1,4 +1,4 @@ -package test.collections +package test.collections.js import org.junit.Test as test import kotlin.test.* diff --git a/libraries/stdlib/test/js/javautilCollectionsTest.kt b/libraries/stdlib/test/js/JsCollectionsTest.kt similarity index 97% rename from libraries/stdlib/test/js/javautilCollectionsTest.kt rename to libraries/stdlib/test/js/JsCollectionsTest.kt index 053fed4cd75..071c16cedfa 100644 --- a/libraries/stdlib/test/js/javautilCollectionsTest.kt +++ b/libraries/stdlib/test/js/JsCollectionsTest.kt @@ -1,4 +1,4 @@ -package test.collections +package test.collections.js import java.util.* @@ -8,7 +8,7 @@ import kotlin.comparisons.* fun List.toArrayList() = this.toCollection(ArrayList()) -class JavautilCollectionsTest { +class JsCollectionsTest { val TEST_LIST = arrayOf(2, 0, 9, 7, 1).toList() val SORTED_TEST_LIST = arrayOf(0, 1, 2, 7, 9).toList() val MAX_ELEMENT = 9 diff --git a/libraries/stdlib/test/js/MapJsTest.kt b/libraries/stdlib/test/js/MapJsTest.kt index c1f03a626f0..7d516a561f7 100644 --- a/libraries/stdlib/test/js/MapJsTest.kt +++ b/libraries/stdlib/test/js/MapJsTest.kt @@ -1,10 +1,10 @@ -package test.collections +package test.collections.js -import test.collections.behaviors.mapBehavior import kotlin.test.* - -import java.util.* import org.junit.Test as test +import java.util.* +import test.collections.* +import test.collections.behaviors.* class ComplexMapJsTest : MapJsTest() { // Helper function with generic parameter to force to use ComlpexHashMap diff --git a/libraries/stdlib/test/js/SetJsTest.kt b/libraries/stdlib/test/js/SetJsTest.kt index a6047c0493f..0858c4a87f6 100644 --- a/libraries/stdlib/test/js/SetJsTest.kt +++ b/libraries/stdlib/test/js/SetJsTest.kt @@ -1,8 +1,9 @@ -package test.collections +package test.collections.js import kotlin.test.* import org.junit.Test -import test.collections.behaviors.setBehavior +import test.collections.* +import test.collections.behaviors.* import java.util.HashSet import java.util.LinkedHashSet diff --git a/libraries/stdlib/test/NaturalLanguageTest.kt b/libraries/stdlib/test/language/EscapedTestNamesTest.kt similarity index 82% rename from libraries/stdlib/test/NaturalLanguageTest.kt rename to libraries/stdlib/test/language/EscapedTestNamesTest.kt index fb2a3965113..7cb7bfc6102 100644 --- a/libraries/stdlib/test/NaturalLanguageTest.kt +++ b/libraries/stdlib/test/language/EscapedTestNamesTest.kt @@ -1,9 +1,9 @@ -package test.collections +package test.language import org.junit.Test as test import kotlin.test.* -class NaturalLanguageTest { +class EscapedTestNamesTest { @test fun `strings equal`() { val actual = "abc" diff --git a/libraries/stdlib/test/language/BitwiseOperationsTest.kt b/libraries/stdlib/test/numbers/BitwiseOperationsTest.kt similarity index 87% rename from libraries/stdlib/test/language/BitwiseOperationsTest.kt rename to libraries/stdlib/test/numbers/BitwiseOperationsTest.kt index 544fc6c53bc..c1d8610fb9c 100644 --- a/libraries/stdlib/test/language/BitwiseOperationsTest.kt +++ b/libraries/stdlib/test/numbers/BitwiseOperationsTest.kt @@ -1,8 +1,9 @@ -package test +package test.numbers import kotlin.test.* import org.junit.Test as test +// TODO: Run these tests during compiler test only (JVM & JS) class BitwiseOperationsTest { @test fun orForInt() { assertEquals(3, 2 or 1) diff --git a/libraries/stdlib/test/DefaultIntrinsicObjectsJVMTest.kt b/libraries/stdlib/test/numbers/CompanionIntrinsicObjectsJVMTest.kt similarity index 98% rename from libraries/stdlib/test/DefaultIntrinsicObjectsJVMTest.kt rename to libraries/stdlib/test/numbers/CompanionIntrinsicObjectsJVMTest.kt index 2bdbb420521..56095b1612f 100644 --- a/libraries/stdlib/test/DefaultIntrinsicObjectsJVMTest.kt +++ b/libraries/stdlib/test/numbers/CompanionIntrinsicObjectsJVMTest.kt @@ -20,7 +20,7 @@ import kotlin.test.* import org.junit.Test as test -class CompanionObjectsExtensionsTest { +class CompanionIntrinsicObjectsJVMTest { @test fun intTest() { val i = Int diff --git a/libraries/stdlib/test/MathTest.kt b/libraries/stdlib/test/numbers/MathJVMTest.kt similarity index 97% rename from libraries/stdlib/test/MathTest.kt rename to libraries/stdlib/test/numbers/MathJVMTest.kt index a03eff3e3d2..a8851a1ac51 100644 --- a/libraries/stdlib/test/MathTest.kt +++ b/libraries/stdlib/test/numbers/MathJVMTest.kt @@ -1,4 +1,4 @@ -package test.collections +package test.numbers import java.math.BigInteger import java.math.BigDecimal diff --git a/libraries/stdlib/test/numbers/NumbersJVMTest.kt b/libraries/stdlib/test/numbers/NumbersJVMTest.kt index adb8f5578e3..30b75188215 100644 --- a/libraries/stdlib/test/numbers/NumbersJVMTest.kt +++ b/libraries/stdlib/test/numbers/NumbersJVMTest.kt @@ -1,4 +1,4 @@ -package numbers +package test.numbers import java.math.BigDecimal import org.junit.Test as test diff --git a/libraries/stdlib/test/numbers/NumbersTest.kt b/libraries/stdlib/test/numbers/NumbersTest.kt index d9be372e885..c24ee1fdbd2 100644 --- a/libraries/stdlib/test/numbers/NumbersTest.kt +++ b/libraries/stdlib/test/numbers/NumbersTest.kt @@ -1,4 +1,4 @@ -package numbers +package test.numbers import org.junit.Test as test import kotlin.test.* diff --git a/libraries/stdlib/test/numbers/CoercionTest.kt b/libraries/stdlib/test/ranges/CoercionTest.kt similarity index 99% rename from libraries/stdlib/test/numbers/CoercionTest.kt rename to libraries/stdlib/test/ranges/CoercionTest.kt index 7fa9362aee1..9660bf681fd 100644 --- a/libraries/stdlib/test/numbers/CoercionTest.kt +++ b/libraries/stdlib/test/ranges/CoercionTest.kt @@ -1,4 +1,4 @@ -package numbers +package test.ranges import org.junit.Test import org.junit.Test as test diff --git a/libraries/stdlib/test/language/ProgressionLastElementTest.kt b/libraries/stdlib/test/ranges/ProgressionLastElementTest.kt similarity index 99% rename from libraries/stdlib/test/language/ProgressionLastElementTest.kt rename to libraries/stdlib/test/ranges/ProgressionLastElementTest.kt index e40befc992d..4c6b7767d6d 100644 --- a/libraries/stdlib/test/language/ProgressionLastElementTest.kt +++ b/libraries/stdlib/test/ranges/ProgressionLastElementTest.kt @@ -1,4 +1,4 @@ -package language +package test.ranges import org.junit.Test import kotlin.test.assertEquals diff --git a/libraries/stdlib/test/language/RangeIterationJVMTest.kt b/libraries/stdlib/test/ranges/RangeIterationJVMTest.kt similarity index 99% rename from libraries/stdlib/test/language/RangeIterationJVMTest.kt rename to libraries/stdlib/test/ranges/RangeIterationJVMTest.kt index 4dddaca34a8..a7ef5c317fd 100644 --- a/libraries/stdlib/test/language/RangeIterationJVMTest.kt +++ b/libraries/stdlib/test/ranges/RangeIterationJVMTest.kt @@ -1,5 +1,4 @@ -@file: Suppress("DEPRECATION_ERROR") -package language +package test.ranges import java.lang.Integer.MAX_VALUE as MaxI import java.lang.Integer.MIN_VALUE as MinI diff --git a/libraries/stdlib/test/language/RangeIterationTest.kt b/libraries/stdlib/test/ranges/RangeIterationTest.kt similarity index 99% rename from libraries/stdlib/test/language/RangeIterationTest.kt rename to libraries/stdlib/test/ranges/RangeIterationTest.kt index 37dfc1d4edd..c3b8679832b 100644 --- a/libraries/stdlib/test/language/RangeIterationTest.kt +++ b/libraries/stdlib/test/ranges/RangeIterationTest.kt @@ -1,5 +1,4 @@ -@file: Suppress("DEPRECATION_ERROR") -package language +package test.ranges import org.junit.Test as test import kotlin.test.* diff --git a/libraries/stdlib/test/language/RangeJVMTest.kt b/libraries/stdlib/test/ranges/RangeJVMTest.kt similarity index 97% rename from libraries/stdlib/test/language/RangeJVMTest.kt rename to libraries/stdlib/test/ranges/RangeJVMTest.kt index 35ffa07d312..45b05e5ebd4 100644 --- a/libraries/stdlib/test/language/RangeJVMTest.kt +++ b/libraries/stdlib/test/ranges/RangeJVMTest.kt @@ -1,5 +1,4 @@ -@file: Suppress("DEPRECATION_ERROR") -package language +package test.ranges import kotlin.ranges.LongProgression.Companion import java.lang.Double as jDouble diff --git a/libraries/stdlib/test/language/RangeTest.kt b/libraries/stdlib/test/ranges/RangeTest.kt similarity index 99% rename from libraries/stdlib/test/language/RangeTest.kt rename to libraries/stdlib/test/ranges/RangeTest.kt index 4f7a26a1fb9..75360b7e18a 100644 --- a/libraries/stdlib/test/language/RangeTest.kt +++ b/libraries/stdlib/test/ranges/RangeTest.kt @@ -1,5 +1,4 @@ -@file: Suppress("DEPRECATION_ERROR") -package language +package test.ranges import kotlin.test.* import org.junit.Test as test diff --git a/libraries/stdlib/test/AnnotationsTest.kt b/libraries/stdlib/test/reflection/AnnotationsTest.kt similarity index 96% rename from libraries/stdlib/test/AnnotationsTest.kt rename to libraries/stdlib/test/reflection/AnnotationsTest.kt index d5bc7f31674..aa2db872409 100644 --- a/libraries/stdlib/test/AnnotationsTest.kt +++ b/libraries/stdlib/test/reflection/AnnotationsTest.kt @@ -1,4 +1,4 @@ -package test.annotations +package test.reflection import kotlin.test.* import org.junit.Test as test diff --git a/libraries/stdlib/test/PreconditionsTest.kt b/libraries/stdlib/test/utils/PreconditionsJVMTest.kt similarity index 98% rename from libraries/stdlib/test/PreconditionsTest.kt rename to libraries/stdlib/test/utils/PreconditionsJVMTest.kt index 4af505558ca..16b5571036d 100644 --- a/libraries/stdlib/test/PreconditionsTest.kt +++ b/libraries/stdlib/test/utils/PreconditionsJVMTest.kt @@ -1,9 +1,9 @@ -package test.collections +package test.utils import org.junit.Test as test import kotlin.test.* -class PreconditionsTest() { +class PreconditionsJVMTest() { @test fun passingRequire() { require(true) diff --git a/libraries/tools/kotlin-js-tests/pom.xml b/libraries/tools/kotlin-js-tests/pom.xml index 9bc22b873ee..9493d790da7 100644 --- a/libraries/tools/kotlin-js-tests/pom.xml +++ b/libraries/tools/kotlin-js-tests/pom.xml @@ -48,30 +48,10 @@ + - - - - - - - - - - - - - - - - - - - - - - - + +