Split tests to stress and contract tests

Author: Abduqodiri Qurbonzoda

kotlinx-collections-immutable/tests/src/main/kotlin/ImmutableArrayList.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2016-2019 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.
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-package test.collections.behaviors
-
-import test.collections.CompareContext
+package kotlinx.collections.immutable.contractTests
 
 public fun <T> CompareContext<List<T>>.listBehavior() {
     equalityBehavior()

kotlinx-collections-immutable/tests/src/test/kotlin/kotlinx.collections.immutable/ImmutableListJavaTest.java

@@ -1,8 +1,24 @@
-package test.collections
+/*
+ * Copyright 2016-2019 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package kotlinx.collections.immutable.contractTests
 
 import kotlin.test.*
 
-public fun <T> compare(expected: T, actual: T, block:CompareContext<T>.() -> Unit) {
+public fun <T> compare(expected: T, actual: T, block: CompareContext<T>.() -> Unit) {
     CompareContext(expected, actual).block()
 }
 

kotlinx-collections-immutable/tests/src/test/kotlin/CollectionBehaviors.kt renamed to kotlinx-collections-immutable/tests/src/test/kotlin/kotlinx.collections.immutable/contractTests/CollectionBehaviors.kt

@@ -1,8 +1,25 @@
-package kotlinx.collections.immutable
-
+/*
+ * Copyright 2016-2019 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package kotlinx.collections.immutable.contractTests.immutableList
+
+import kotlinx.collections.immutable.*
+import kotlinx.collections.immutable.contractTests.compare
+import kotlinx.collections.immutable.contractTests.listBehavior
 import org.junit.Test
-import test.collections.behaviors.listBehavior
-import test.collections.compare
 import kotlin.test.*
 
 class ImmutableListTest {

kotlinx-collections-immutable/tests/src/test/kotlin/ComparisonDSL.kt renamed to kotlinx-collections-immutable/tests/src/test/kotlin/kotlinx.collections.immutable/contractTests/ComparisonDSL.kt

@@ -1,16 +1,35 @@
-package kotlinx.collections.immutable
-
+/*
+ * Copyright 2016-2019 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package kotlinx.collections.immutable.contractTests.immutableMap
+
+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 org.junit.Test
-import test.collections.behaviors.*
-import test.collections.compare
 import java.util.*
 import kotlin.test.*
 
 class ImmutableHashMapTest : ImmutableMapTest() {
-    override fun <K, V> immutableMapOf(vararg pairs: Pair<K, V>): PersistentMap<K, V> = kotlinx.collections.immutable.persistentHashMapOf(*pairs)
+    override fun <K, V> immutableMapOf(vararg pairs: Pair<K, V>): PersistentMap<K, V> = persistentHashMapOf(*pairs)
 }
 class ImmutableOrderedMapTest : ImmutableMapTest() {
-    override fun <K, V> immutableMapOf(vararg pairs: Pair<K, V>): PersistentMap<K, V> = kotlinx.collections.immutable.persistentMapOf(*pairs)
+    override fun <K, V> immutableMapOf(vararg pairs: Pair<K, V>): PersistentMap<K, V> = persistentMapOf(*pairs)
     override fun <K, V> compareMaps(expected: Map<K, V>, actual: Map<K, V>) = compare(expected, actual) { mapBehavior(ordered = true) }
 
     @Test fun iterationOrder() {

kotlinx-collections-immutable/tests/src/test/kotlin/kotlinx.collections.immutable/ImmutableListTest.kt renamed to kotlinx-collections-immutable/tests/src/test/kotlin/kotlinx.collections.immutable/contractTests/immutableList/ImmutableListTest.kt

@@ -1,14 +1,31 @@
-package kotlinx.collections.immutable
-
+/*
+ * Copyright 2016-2019 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package kotlinx.collections.immutable.contractTests.immutableSet
+
+import kotlinx.collections.immutable.*
 import org.junit.Test
 import kotlin.test.*
 
 class ImmutableSetTest : ImmutableSetTestBase() {
-    override fun <T> immutableSetOf(vararg elements: T) = kotlinx.collections.immutable.persistentSetOf(*elements)
+    override fun <T> immutableSetOf(vararg elements: T) = persistentSetOf(*elements)
 }
 
 class ImmutableHashSetTest : ImmutableSetTestBase() {
-    override fun <T> immutableSetOf(vararg elements: T) = kotlinx.collections.immutable.persistentHashSetOf(*elements)
+    override fun <T> immutableSetOf(vararg elements: T) = persistentHashSetOf(*elements)
 
     override fun empty() {
         val empty1 = immutableSetOf<Int>()

kotlinx-collections-immutable/tests/src/test/kotlin/kotlinx.collections.immutable/ImmutableMapTest.kt renamed to kotlinx-collections-immutable/tests/src/test/kotlin/kotlinx.collections.immutable/contractTests/immutableMap/ImmutableMapTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 JetBrains s.r.o.
+ * Copyright 2016-2019 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.implementations
+package kotlinx.collections.immutable.stressTests
 
 class ObjectWrapper<K: Comparable<K>>(val obj: K, val hashCode: Int) : Comparable<ObjectWrapper<K>> {
     override fun hashCode(): Int {

kotlinx-collections-immutable/tests/src/test/kotlin/kotlinx.collections.immutable/ImmutableSetTest.kt renamed to kotlinx-collections-immutable/tests/src/test/kotlin/kotlinx.collections.immutable/contractTests/immutableSet/ImmutableSetTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 JetBrains s.r.o.
+ * Copyright 2016-2019 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.implementations
+package kotlinx.collections.immutable.stressTests
 
 import java.util.*
 

kotlinx-collections-immutable/tests/src/test/kotlin/kotlinx.collections.immutable/implementations/ObjectWrapper.kt renamed to kotlinx-collections-immutable/tests/src/test/kotlin/kotlinx.collections.immutable/stressTests/ObjectWrapper.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package kotlinx.collections.immutable.implementations.immutableList
+package kotlinx.collections.immutable.stressTests.immutableList
 
 import kotlinx.collections.immutable.persistentListOf
 import org.junit.Test