From ff74f8217bc83686379a23acdda33d4d9e3ca20a Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Wed, 18 Jan 2012 12:08:11 +0400
Subject: [PATCH] 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     | 2 +-
 testlib/test/CollectionTest.kt         | 4 ++--
 testlib/test/GenerateStandardLib.kt    | 2 +-
 testlib/test/IoTest.kt                 | 2 +-
 testlib/test/ListTest.kt               | 4 ++--
 testlib/test/MapTest.kt                | 4 ++--
 testlib/test/OldStdlibTest.kt          | 2 +-
 testlib/test/SetTest.kt                | 4 ++--
 testlib/test/StandardCollectionTest.kt | 4 ++--
 testlib/test/Test.kt                   | 4 ++--
 testlib/test/TestDslExample.kt         | 2 +-
 11 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/testlib/test/CollectionApiCheck.kt b/testlib/test/CollectionApiCheck.kt
index 8035f455fba..ba9970fa7f5 100644
--- a/testlib/test/CollectionApiCheck.kt
+++ b/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 {
 }
 
-*/
\ No newline at end of file
+*/
diff --git a/testlib/test/CollectionTest.kt b/testlib/test/CollectionTest.kt
index d977e68595e..5d2260fbc4d 100644
--- a/testlib/test/CollectionTest.kt
+++ b/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))
   }
-}
\ No newline at end of file
+}
diff --git a/testlib/test/GenerateStandardLib.kt b/testlib/test/GenerateStandardLib.kt
index 3903cf717d5..0907fd1bd77 100644
--- a/testlib/test/GenerateStandardLib.kt
+++ b/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)", "")
   }
-}
\ No newline at end of file
+}
diff --git a/testlib/test/IoTest.kt b/testlib/test/IoTest.kt
index 29d3f8671a4..b910831195a 100644
--- a/testlib/test/IoTest.kt
+++ b/testlib/test/IoTest.kt
@@ -1,6 +1,6 @@
 package test.collections
 
-import std.test.*
+import stdhack.test.*
 
 import std.io.*
 import std.util.*
diff --git a/testlib/test/ListTest.kt b/testlib/test/ListTest.kt
index 91cf6ff367d..e45177d4d91 100644
--- a/testlib/test/ListTest.kt
+++ b/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)
   }
-}
\ No newline at end of file
+}
diff --git a/testlib/test/MapTest.kt b/testlib/test/MapTest.kt
index 6b8e41495de..035e9e01269 100644
--- a/testlib/test/MapTest.kt
+++ b/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"])
   }
-}
\ No newline at end of file
+}
diff --git a/testlib/test/OldStdlibTest.kt b/testlib/test/OldStdlibTest.kt
index 1feb24c45f3..9ea2f7aeeae 100644
--- a/testlib/test/OldStdlibTest.kt
+++ b/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.*
 
diff --git a/testlib/test/SetTest.kt b/testlib/test/SetTest.kt
index ee03be580a6..5d8eb61a4ad 100644
--- a/testlib/test/SetTest.kt
+++ b/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)
   }
 
-}
\ No newline at end of file
+}
diff --git a/testlib/test/StandardCollectionTest.kt b/testlib/test/StandardCollectionTest.kt
index b1c554ce133..8d8631c186a 100644
--- a/testlib/test/StandardCollectionTest.kt
+++ b/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() {
     }
   }
   */
-}
\ No newline at end of file
+}
diff --git a/testlib/test/Test.kt b/testlib/test/Test.kt
index 7c433ccae60..7267920168f 100644
--- a/testlib/test/Test.kt
+++ b/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() {
-}
\ No newline at end of file
+}
diff --git a/testlib/test/TestDslExample.kt b/testlib/test/TestDslExample.kt
index 3f8c1b59aff..1f94fe05e14 100644
--- a/testlib/test/TestDslExample.kt
+++ b/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