Simplify test package structure

ilya-g · ilya-g · commit 58ea3c2ef1d9 · 2019-08-27T22:05:42.000+03:00
Use 'tests' as a common package prefix
diff --git a/core/commonTest/src/contract/CollectionBehaviors.kt b/core/commonTest/src/contract/CollectionBehaviors.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.contractTests
+package tests.contract
 
 public fun <T> CompareContext<List<T>>.listBehavior() {
     equalityBehavior()
diff --git a/core/commonTest/src/contract/ComparisonDSL.kt b/core/commonTest/src/contract/ComparisonDSL.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.contractTests
+package tests.contract
 
-import kotlinx.collections.immutable.tests.assertTypeEquals
+import tests.assertTypeEquals
 import kotlin.test.*
 
 public fun <T> compare(expected: T, actual: T, block: CompareContext<T>.() -> Unit) {
diff --git a/core/commonTest/src/contract/list/ImmutableListTest.kt b/core/commonTest/src/contract/list/ImmutableListTest.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.contractTests.immutableList
+package tests.contract.list
 
 import kotlinx.collections.immutable.*
-import kotlinx.collections.immutable.contractTests.compare
-import kotlinx.collections.immutable.contractTests.listBehavior
-import kotlinx.collections.immutable.tests.*
+import tests.contract.compare
+import tests.contract.listBehavior
+import tests.*
 import kotlin.test.*
 
 class ImmutableListTest {
diff --git a/core/commonTest/src/contract/map/ImmutableMapTest.kt b/core/commonTest/src/contract/map/ImmutableMapTest.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.contractTests.immutableMap
+package tests.contract.map
 
 import kotlinx.collections.immutable.*
-import kotlinx.collections.immutable.contractTests.collectionBehavior
-import kotlinx.collections.immutable.contractTests.compare
-import kotlinx.collections.immutable.contractTests.mapBehavior
-import kotlinx.collections.immutable.contractTests.setBehavior
+import tests.contract.collectionBehavior
+import tests.contract.compare
+import tests.contract.mapBehavior
+import tests.contract.setBehavior
 import kotlin.test.*
 
 class ImmutableHashMapTest : ImmutableMapTest() {
diff --git a/core/commonTest/src/contract/set/ImmutableSetTest.kt b/core/commonTest/src/contract/set/ImmutableSetTest.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.contractTests.immutableSet
+package tests.contract.set
 
 import kotlinx.collections.immutable.*
-import kotlinx.collections.immutable.contractTests.compare
-import kotlinx.collections.immutable.contractTests.setBehavior
-import kotlinx.collections.immutable.tests.isDigit
-import kotlinx.collections.immutable.tests.isUpperCase
+import tests.contract.compare
+import tests.contract.setBehavior
+import tests.isDigit
+import tests.isUpperCase
 import kotlin.test.*
 
 class ImmutableHashSetTest : ImmutableSetTestBase() {
diff --git a/core/commonTest/src/implementations/list/BufferIteratorTest.kt b/core/commonTest/src/implementations/list/BufferIteratorTest.kt
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.implementations.immutableList
+package tests.implementations.list
 
+import kotlinx.collections.immutable.implementations.immutableList.*
 import kotlin.test.*
 
 class BufferIteratorTest {
diff --git a/core/commonTest/src/implementations/list/TrieIteratorTest.kt b/core/commonTest/src/implementations/list/TrieIteratorTest.kt
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.implementations.immutableList
+package tests.implementations.list
 
+import kotlinx.collections.immutable.implementations.immutableList.*
 import kotlinx.collections.immutable.internal.assert
 import kotlin.math.pow
 import kotlin.random.*
diff --git a/core/commonTest/src/stress/ObjectWrapper.kt b/core/commonTest/src/stress/ObjectWrapper.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.stressTests
+package tests.stress
 
 import kotlinx.collections.immutable.internal.assert
 import kotlin.js.JsName
diff --git a/core/commonTest/src/stress/WrapperGenerator.kt b/core/commonTest/src/stress/WrapperGenerator.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.stressTests
+package tests.stress
 
 import kotlin.random.Random
 
diff --git a/core/commonTest/src/stress/list/PersistentListBuilderTest.kt b/core/commonTest/src/stress/list/PersistentListBuilderTest.kt
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.stressTests.immutableList
+package tests.stress.list
 
 import kotlinx.collections.immutable.PersistentList
-import kotlinx.collections.immutable.contractTests.compare
-import kotlinx.collections.immutable.contractTests.listIteratorProperties
 import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.tests.*
+import tests.*
+import tests.contract.compare
+import tests.contract.listIteratorProperties
 import kotlin.random.Random
 import kotlin.test.*
 
diff --git a/core/commonTest/src/stress/list/PersistentListTest.kt b/core/commonTest/src/stress/list/PersistentListTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.stressTests.immutableList
+package tests.stress.list
 
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.persistentListOf
diff --git a/core/commonTest/src/stress/map/PersistentHashMapBuilderTest.kt b/core/commonTest/src/stress/map/PersistentHashMapBuilderTest.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.stressTests.immutableMap
+package tests.stress.map
 
-import kotlinx.collections.immutable.stressTests.ObjectWrapper
-import kotlinx.collections.immutable.stressTests.WrapperGenerator
 import kotlinx.collections.immutable.persistentHashMapOf
-import kotlinx.collections.immutable.tests.remove
+import tests.stress.ObjectWrapper
+import tests.stress.WrapperGenerator
+import tests.remove
 import kotlin.random.Random
 import kotlin.test.*
 
diff --git a/core/commonTest/src/stress/map/PersistentHashMapTest.kt b/core/commonTest/src/stress/map/PersistentHashMapTest.kt
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.stressTests.immutableMap
+package tests.stress.map
 
-import kotlinx.collections.immutable.stressTests.ObjectWrapper
-import kotlinx.collections.immutable.stressTests.WrapperGenerator
 import kotlinx.collections.immutable.persistentHashMapOf
-import kotlinx.collections.immutable.tests.remove
+import tests.stress.ObjectWrapper
+import tests.stress.WrapperGenerator
+import tests.remove
 import kotlin.random.Random
 import kotlin.test.*
 
diff --git a/core/commonTest/src/stress/set/PersistentHashSetBuilderTest.kt b/core/commonTest/src/stress/set/PersistentHashSetBuilderTest.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.stressTests.immutableSet
+package tests.stress.set
 
-import kotlinx.collections.immutable.stressTests.ObjectWrapper
-import kotlinx.collections.immutable.stressTests.WrapperGenerator
 import kotlinx.collections.immutable.persistentHashSetOf
+import tests.stress.ObjectWrapper
+import tests.stress.WrapperGenerator
 import kotlin.random.Random
 import kotlin.test.*
 
diff --git a/core/commonTest/src/stress/set/PersistentHashSetTest.kt b/core/commonTest/src/stress/set/PersistentHashSetTest.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.stressTests.immutableSet
+package tests.stress.set
 
-import kotlinx.collections.immutable.stressTests.ObjectWrapper
-import kotlinx.collections.immutable.stressTests.WrapperGenerator
 import kotlinx.collections.immutable.persistentHashSetOf
+import tests.stress.ObjectWrapper
+import tests.stress.WrapperGenerator
 import kotlin.random.Random
 import kotlin.test.*
 
diff --git a/core/commonTest/src/testUtils.kt b/core/commonTest/src/testUtils.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.tests
+package tests
 
 
 internal fun Char.isUpperCase(): Boolean = this in 'A'..'Z'
diff --git a/core/jsTest/src/testUtilsJs.kt b/core/jsTest/src/testUtilsJs.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.tests
+package tests
 
 import kotlin.test.assertEquals
 
diff --git a/core/jvmTest/src/contract/GuavaImmutableCollectionBaseTest.kt b/core/jvmTest/src/contract/GuavaImmutableCollectionBaseTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.contractTests
+package tests.contract
 
 import com.google.common.collect.testing.testers.CollectionClearTester
 import com.google.common.collect.testing.testers.ListRemoveAtIndexTester
diff --git a/core/jvmTest/src/contract/list/GuavaImmutableListTest.kt b/core/jvmTest/src/contract/list/GuavaImmutableListTest.kt
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.contractTests.immutableList
+package tests.contract.list
 
 import com.google.common.collect.testing.ListTestSuiteBuilder
 import com.google.common.collect.testing.TestListGenerator
 import com.google.common.collect.testing.features.CollectionFeature
 import com.google.common.collect.testing.features.CollectionSize
 import com.google.common.collect.testing.features.ListFeature
-import kotlinx.collections.immutable.contractTests.GuavaImmutableCollectionBaseTest
-import kotlinx.collections.immutable.contractTests.immutableList.PersistentListGenerator.PList
+import tests.contract.GuavaImmutableCollectionBaseTest
+import tests.contract.list.PersistentListGenerator.PList
 import kotlin.test.Test
 
 class GuavaImmutableListTest: GuavaImmutableCollectionBaseTest() {
diff --git a/core/jvmTest/src/contract/list/PersistentListGenerator.kt b/core/jvmTest/src/contract/list/PersistentListGenerator.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.contractTests.immutableList
+package tests.contract.list
 
 import com.google.common.collect.testing.TestStringListGenerator
 import kotlinx.collections.immutable.mutate
diff --git a/core/jvmTest/src/contract/map/GuavaImmutableMapTest.kt b/core/jvmTest/src/contract/map/GuavaImmutableMapTest.kt
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.contractTests.immutableMap
+package tests.contract.map
 
 import com.google.common.collect.testing.MapTestSuiteBuilder
 import com.google.common.collect.testing.TestMapGenerator
 import com.google.common.collect.testing.features.CollectionFeature
 import com.google.common.collect.testing.features.CollectionSize
 import com.google.common.collect.testing.features.Feature
 import com.google.common.collect.testing.features.MapFeature
-import kotlinx.collections.immutable.contractTests.GuavaImmutableCollectionBaseTest
-import kotlinx.collections.immutable.contractTests.immutableMap.PersistentMapGenerator.HashMap
-import kotlinx.collections.immutable.contractTests.immutableMap.PersistentMapGenerator.OrderedMap
+import tests.contract.GuavaImmutableCollectionBaseTest
+import tests.contract.map.PersistentMapGenerator.HashMap
+import tests.contract.map.PersistentMapGenerator.OrderedMap
 import kotlin.test.Test
 
 class GuavaImmutableMapTest: GuavaImmutableCollectionBaseTest() {
diff --git a/core/jvmTest/src/contract/map/PersistentMapGenerator.kt b/core/jvmTest/src/contract/map/PersistentMapGenerator.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.contractTests.immutableMap
+package tests.contract.map
 
 import com.google.common.collect.testing.TestStringMapGenerator
 import kotlinx.collections.immutable.mutate
diff --git a/core/jvmTest/src/contract/set/GuavaImmutableSetTest.kt b/core/jvmTest/src/contract/set/GuavaImmutableSetTest.kt
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.contractTests.immutableSet
+package tests.contract.set
 
 import com.google.common.collect.testing.SetTestSuiteBuilder
 import com.google.common.collect.testing.TestSetGenerator
 import com.google.common.collect.testing.features.CollectionFeature
 import com.google.common.collect.testing.features.CollectionSize
 import com.google.common.collect.testing.features.Feature
-import kotlinx.collections.immutable.contractTests.GuavaImmutableCollectionBaseTest
-import kotlinx.collections.immutable.contractTests.immutableSet.PersistentSetGenerator.HashSet
-import kotlinx.collections.immutable.contractTests.immutableSet.PersistentSetGenerator.OrderedSet
+import tests.contract.GuavaImmutableCollectionBaseTest
+import tests.contract.set.PersistentSetGenerator.HashSet
+import tests.contract.set.PersistentSetGenerator.OrderedSet
 import kotlin.test.Test
 
 class GuavaImmutableSetTest: GuavaImmutableCollectionBaseTest() {
diff --git a/core/jvmTest/src/contract/set/PersistentSetGenerator.kt b/core/jvmTest/src/contract/set/PersistentSetGenerator.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.contractTests.immutableSet
+package tests.contract.set
 
 import com.google.common.collect.testing.TestStringSetGenerator
 import kotlinx.collections.immutable.mutate
diff --git a/core/jvmTest/src/testUtilsJvm.kt b/core/jvmTest/src/testUtilsJvm.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.tests
+package tests
 
 import kotlin.test.assertEquals
 
diff --git a/core/nativeTest/src/testUtilsNative.kt b/core/nativeTest/src/testUtilsNative.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.tests
+package tests
 
 import kotlin.test.assertTrue
 
