From d79a35a2c59465f84443528c7f01c164d2156962 Mon Sep 17 00:00:00 2001 From: James Strachan Date: Sat, 3 Mar 2012 06:43:24 +0000 Subject: [PATCH] refactored kool.test -> kotlin.test --- kunit/src/main/kotlin/Test.kt | 2 +- testlib/test/CollectionTest.kt | 2 +- testlib/test/EnymerationIteratorTest.kt | 2 +- testlib/test/GetOrElseTest.kt | 2 +- testlib/test/IoTest.kt | 2 +- testlib/test/JavaClassTest.kt | 2 +- testlib/test/ListTest.kt | 2 +- testlib/test/MapTest.kt | 2 +- testlib/test/MathTest.kt | 2 +- testlib/test/OldStdlibTest.kt | 2 +- testlib/test/SetTest.kt | 2 +- testlib/test/StandardCollectionTest.kt | 2 +- testlib/test/StdLibIssuesTest.kt | 2 +- testlib/test/StringTest.kt | 2 +- testlib/test/dom/DomBuilderTest.kt | 2 +- testlib/test/dom/DomTest.kt | 2 +- testlib/test/language/NullableCollectionsTest.kt | 2 +- testlib/test/properties/PropertiesTest.kt | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/kunit/src/main/kotlin/Test.kt b/kunit/src/main/kotlin/Test.kt index 3789573874e..94cd78c3e38 100644 --- a/kunit/src/main/kotlin/Test.kt +++ b/kunit/src/main/kotlin/Test.kt @@ -1,7 +1,7 @@ /** * A number of helper methods for writing Kool unit tests */ -package kool.test +package kotlin.test import org.junit.Assert import junit.framework.TestCase diff --git a/testlib/test/CollectionTest.kt b/testlib/test/CollectionTest.kt index d6427678b56..aeb5543aee8 100644 --- a/testlib/test/CollectionTest.kt +++ b/testlib/test/CollectionTest.kt @@ -1,6 +1,6 @@ package test.collections -import kool.test.* +import kotlin.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? diff --git a/testlib/test/EnymerationIteratorTest.kt b/testlib/test/EnymerationIteratorTest.kt index 45663d09cf6..f4a714224ad 100644 --- a/testlib/test/EnymerationIteratorTest.kt +++ b/testlib/test/EnymerationIteratorTest.kt @@ -1,7 +1,7 @@ import java.util.Vector import junit.framework.TestCase -import kool.test.assertEquals +import kotlin.test.assertEquals class EnumerationIteratorTest() : TestCase() { fun testIteration () { diff --git a/testlib/test/GetOrElseTest.kt b/testlib/test/GetOrElseTest.kt index 6223877fc63..6b43b80e3e6 100644 --- a/testlib/test/GetOrElseTest.kt +++ b/testlib/test/GetOrElseTest.kt @@ -1,7 +1,7 @@ package test.standard import std.* -import kool.test.* +import kotlin.test.* class GetOrElseTest() : TestSupport() { val v1: String? = "hello" diff --git a/testlib/test/IoTest.kt b/testlib/test/IoTest.kt index a2a9043cc4f..cf5ef86e3d3 100644 --- a/testlib/test/IoTest.kt +++ b/testlib/test/IoTest.kt @@ -1,6 +1,6 @@ package test.collections -import kool.test.* +import kotlin.test.* import std.io.* import std.util.* diff --git a/testlib/test/JavaClassTest.kt b/testlib/test/JavaClassTest.kt index 06e4eb0eb9b..137fb5890b0 100644 --- a/testlib/test/JavaClassTest.kt +++ b/testlib/test/JavaClassTest.kt @@ -1,6 +1,6 @@ package testjc -import kool.test.* +import kotlin.test.* class C() diff --git a/testlib/test/ListTest.kt b/testlib/test/ListTest.kt index 531b5e97508..2d8ecf8cc39 100644 --- a/testlib/test/ListTest.kt +++ b/testlib/test/ListTest.kt @@ -1,6 +1,6 @@ package test.collections -import kool.test.* +import kotlin.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? diff --git a/testlib/test/MapTest.kt b/testlib/test/MapTest.kt index ea3a44cbebe..d57b3ecc107 100644 --- a/testlib/test/MapTest.kt +++ b/testlib/test/MapTest.kt @@ -1,6 +1,6 @@ package test.collections -import kool.test.* +import kotlin.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? diff --git a/testlib/test/MathTest.kt b/testlib/test/MathTest.kt index 434d0a55f5d..bad3ba757f4 100644 --- a/testlib/test/MathTest.kt +++ b/testlib/test/MathTest.kt @@ -4,7 +4,7 @@ import std.math.* import java.math.BigInteger import java.math.BigDecimal -import kool.test.* +import kotlin.test.* class MathTest : TestSupport() { fun testBigInteger() { diff --git a/testlib/test/OldStdlibTest.kt b/testlib/test/OldStdlibTest.kt index 62b901555e8..d88637ec876 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 kool.test.* +import kotlin.test.* import java.util.* import java.io.* diff --git a/testlib/test/SetTest.kt b/testlib/test/SetTest.kt index cfa4ecd6abd..8727b99a06e 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 kool.test.* +import kotlin.test.* import java.util.* class SetTest() : TestSupport() { diff --git a/testlib/test/StandardCollectionTest.kt b/testlib/test/StandardCollectionTest.kt index 7677873f0ef..2b75f44cd9f 100644 --- a/testlib/test/StandardCollectionTest.kt +++ b/testlib/test/StandardCollectionTest.kt @@ -1,7 +1,7 @@ package test.collections import std.* -import kool.test.* +import kotlin.test.* class StandardCollectionTest() : TestSupport() { diff --git a/testlib/test/StdLibIssuesTest.kt b/testlib/test/StdLibIssuesTest.kt index 203031fc28d..425671f163a 100644 --- a/testlib/test/StdLibIssuesTest.kt +++ b/testlib/test/StdLibIssuesTest.kt @@ -2,7 +2,7 @@ package test.stdlib.issues import java.util.List import std.util.* -import kool.test.* +import kotlin.test.* private fun listDifference(first : List, second : List) : List { return first.filter{ !second.contains(it) }.toList() diff --git a/testlib/test/StringTest.kt b/testlib/test/StringTest.kt index 2e51feda4dd..020dc2baa97 100644 --- a/testlib/test/StringTest.kt +++ b/testlib/test/StringTest.kt @@ -1,7 +1,7 @@ package testString import std.io.* -import kool.test.* +import kotlin.test.* import junit.framework.* diff --git a/testlib/test/dom/DomBuilderTest.kt b/testlib/test/dom/DomBuilderTest.kt index f61341672bd..2d5de2ab619 100644 --- a/testlib/test/dom/DomBuilderTest.kt +++ b/testlib/test/dom/DomBuilderTest.kt @@ -3,7 +3,7 @@ package test.dom import std.* import std.dom.* import std.util.* -import kool.test.* +import kotlin.test.* import org.w3c.dom.* class DomBuilderTest() : TestSupport() { diff --git a/testlib/test/dom/DomTest.kt b/testlib/test/dom/DomTest.kt index 558d0f99f94..ad51bf71065 100644 --- a/testlib/test/dom/DomTest.kt +++ b/testlib/test/dom/DomTest.kt @@ -2,7 +2,7 @@ package test.dom import std.* import std.dom.* -import kool.test.* +import kotlin.test.* import org.w3c.dom.* class DomTest() : TestSupport() { diff --git a/testlib/test/language/NullableCollectionsTest.kt b/testlib/test/language/NullableCollectionsTest.kt index 9fee997c321..f81e02624a8 100644 --- a/testlib/test/language/NullableCollectionsTest.kt +++ b/testlib/test/language/NullableCollectionsTest.kt @@ -2,7 +2,7 @@ package test.language import junit.framework.TestCase import java.util.Collection -import kool.test.* +import kotlin.test.* class NullableCollectionsTest : TestCase() { diff --git a/testlib/test/properties/PropertiesTest.kt b/testlib/test/properties/PropertiesTest.kt index 3b5f92c04f1..cb9052894a0 100644 --- a/testlib/test/properties/PropertiesTest.kt +++ b/testlib/test/properties/PropertiesTest.kt @@ -3,7 +3,7 @@ package test.properties import std.* import std.properties.* import std.util.* -import kool.test.* +import kotlin.test.* import java.util.* import junit.framework.TestCase