Move tests to 'test' package

Author: lrytz

src/test/scala/scala/collection/BuildFromTest.scala renamed to src/test/scala/test/scala/collection/BuildFromTest.scala

@@ -1,10 +1,11 @@
-package scala.collection
+package test.scala.collection
 
 import org.junit.Test
 
 import scala.collection.compat._
-import scala.collection.immutable.{HashMap, List, TreeMap, TreeSet}
+import scala.collection.immutable.{HashMap, TreeMap, TreeSet}
 import scala.collection.mutable.{ArrayBuffer, Builder, ListBuffer}
+import scala.collection.{BitSet, BuildFrom, SortedMap, SortedSet, immutable, mutable}
 
 // Tests copied from the 2.13 scala-library
 class BuildFromTest {

src/test/scala/scala/collection/CollectionTest.scala renamed to src/test/scala/test/scala/collection/CollectionTest.scala

@@ -1,10 +1,10 @@
-package scala.collection
+package test.scala.collection
 
 import org.junit.Assert._
 import org.junit.Test
 
 import scala.collection.compat._
-import scala.collection.immutable.{BitSet => BS} // importing BitSet doesn't work, scala.collection.BitSet shadows it
+import scala.collection.immutable.BitSet
 
 class CollectionTest {
   @Test
@@ -18,9 +18,9 @@ class CollectionTest {
     val aT: Array[Int] = a
     assertEquals(Vector(1,2,3), a.toVector)
 
-    val b = xs.to(BS) // we can fake a type constructor for the 2 standard BitSet types
+    val b = xs.to(BitSet) // we can fake a type constructor for the 2 standard BitSet types
     val bT: BitSet = b
-    assertEquals(BS(1,2,3), b)
+    assertEquals(BitSet(1,2,3), b)
 
     val ys = List(1 -> "a", 2 -> "b")
     val m = ys.to(Map)
@@ -37,9 +37,9 @@ class CollectionTest {
     val vT: Vector[Int] = v
     assertEquals(Vector(1,2,3), v)
 
-    val b = BS.fromSpecific(xs)
-    val bT: BS = b
-    assertEquals(BS(1,2,3), b)
+    val b = BitSet.fromSpecific(xs)
+    val bT: BitSet = b
+    assertEquals(BitSet(1,2,3), b)
 
     val ys = List(1 -> "a", 2 -> "b")
     val m = Map.from(ys)

src/test/scala/scala/collection/FactoryTest.scala renamed to src/test/scala/test/scala/collection/FactoryTest.scala

@@ -1,14 +1,15 @@
-package scala.collection
+package test.scala.collection
 
 import org.junit.{Assert, Test}
 
 import scala.collection.compat._
+import scala.collection.{BitSet, Factory, immutable, mutable}
 
 class FactoryTest {
 
   implicitly[Factory[Char, String]]
   implicitly[Factory[Char, Array[Char]]]
-  implicitly[Factory[Int, BitSet]]
+  implicitly[Factory[Int, collection.BitSet]]
   implicitly[Factory[Int, mutable.BitSet]]
   implicitly[Factory[Int, immutable.BitSet]]
 

src/test/scala/scala/collection/ImmutableArrayTest.scala renamed to src/test/scala/test/scala/collection/ImmutableArrayTest.scala

@@ -1,4 +1,4 @@
-package scala.collection
+package test.scala.collection
 
 import org.junit.{Assert, Test}
 

src/test/scala/scala/collection/StreamTest.scala renamed to src/test/scala/test/scala/collection/StreamTest.scala

@@ -1,4 +1,4 @@
-package scala.collection
+package test.scala.collection
 
 import org.junit.Test
 

src/test/scala/scala/collection/generic/SortedTest.scala renamed to src/test/scala/test/scala/collection/generic/SortedTest.scala

@@ -1,7 +1,7 @@
-package scala.collection.generic
+package test.scala.collection.generic
 
-import org.junit.Test
 import org.junit.Assert._
+import org.junit.Test
 
 import scala.collection.compat._
 import scala.collection.{immutable => i, mutable => m}