another "temporary" hack

I heard of some package merging problems, testlib declares std.test package,
and stdlib.jar has std package

testlib/test/CollectionApiCheck.kt

@@ -32,4 +32,4 @@ TODO try use delegation here to make sure we implement all the methods in the Tr
 class ListImpl<T>(coll: ArrayList<out T>) : Traversable<T> by coll {
 }
 
-*/
+*/

testlib/test/CollectionTest.kt

@@ -5,7 +5,7 @@ package test.collections
 import std.*
 import std.io.*
 import std.util.*
-import std.test.*
+import stdhack.test.*
 import java.util.*
 
 class CollectionTest() : TestSupport() {
@@ -268,4 +268,4 @@ class CollectionTest() : TestSupport() {
 //    assertTrue(IterableWrapper(hashSet(45, 14, 13)).contains(14))
 //    assertFalse(IterableWrapper(linkedList<Int>()).contains(15))
   }
-}
+}

testlib/test/GenerateStandardLib.kt

@@ -80,4 +80,4 @@ fun main(args: Array<String>) {
   generateFile(File(outDir, "StandardFromJavaCollections.kt"), "package std", File(srcDir, "JavaCollections.kt")) {
     it.replaceAll("java.util.Collection<T>", "Iterable<T>").replaceAll("(this.size)", "")
   }
-}
+}

testlib/test/IoTest.kt

@@ -1,6 +1,6 @@
 package test.collections
 
-import std.test.*
+import stdhack.test.*
 
 import std.io.*
 import std.util.*

testlib/test/ListTest.kt

@@ -1,6 +1,6 @@
 package test.collections
 
-import std.test.*
+import stdhack.test.*
 
 // TODO can we avoid importing all this stuff by default I wonder?
 // e.g. making println and the collection builder methods public by default?
@@ -27,4 +27,4 @@ class ListTest() : TestSupport() {
     val t = data.last
     assertEquals("bar", t)
   }
-}
+}

testlib/test/MapTest.kt

@@ -1,6 +1,6 @@
 package test.collections
 
-import std.test.*
+import stdhack.test.*
 
 // TODO can we avoid importing all this stuff by default I wonder?
 // e.g. making println and the collection builder methods public by default?
@@ -49,4 +49,4 @@ class MapTest() : TestSupport() {
     assertEquals(map.size(), 1)
     assertEquals("James", map["name"])
   }
-}
+}

testlib/test/OldStdlibTest.kt

@@ -3,7 +3,7 @@ package test.collections
 import std.*
 import std.io.*
 import std.util.*
-import std.test.*
+import stdhack.test.*
 import java.util.*
 import java.io.*
 

testlib/test/SetTest.kt

@@ -3,7 +3,7 @@ package test.collections
 import std.*
 import std.io.*
 import std.util.*
-import std.test.*
+import stdhack.test.*
 import java.util.*
 
 class SetTest() : TestSupport() {
@@ -67,4 +67,4 @@ class SetTest() : TestSupport() {
     assertEquals(arrayList(3, 3), lengths)
   }
 
-}
+}

testlib/test/StandardCollectionTest.kt

@@ -1,7 +1,7 @@
 package test.collections
 
 import std.*
-import std.test.*
+import stdhack.test.*
 
 class StandardCollectionTest() : TestSupport() {
 
@@ -21,4 +21,4 @@ class StandardCollectionTest() : TestSupport() {
     }
   }
   */
-}
+}

testlib/test/Test.kt

@@ -1,4 +1,4 @@
-package std.test
+package stdhack.test
 
 import std.io.*
 import std.util.*
@@ -149,4 +149,4 @@ class KotlinTestRunner() : Runner() {
 // TODO no annotations yet?
 //@RunWith(KotlinTestRunner)
 abstract class TestSupport() : TestCase() {
-}
+}

testlib/test/TestDslExample.kt

@@ -1,7 +1,7 @@
 package testDslExample
 
 import std.io.*
-import std.test.*
+import stdhack.test.*
 
 import junit.framework.*
 import junit.textui.TestRunner