From b8590ada4f954741f5252e1366d1517365d46980 Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Fri, 30 Dec 2011 19:29:29 +0400 Subject: [PATCH 1/3] Move close to other stdlib tests --- .../testData/codegen/inputStreamIterator.jet | 18 ---------- .../org/jetbrains/jet/codegen/StdlibTest.java | 17 ---------- testlib/test/OldStdlibTest.kt | 34 +++++++++++++++++++ testlib/test/test/collections/TestAll.java | 4 +-- 4 files changed, 36 insertions(+), 37 deletions(-) delete mode 100644 compiler/testData/codegen/inputStreamIterator.jet create mode 100644 testlib/test/OldStdlibTest.kt diff --git a/compiler/testData/codegen/inputStreamIterator.jet b/compiler/testData/codegen/inputStreamIterator.jet deleted file mode 100644 index 85ff66b2ba7..00000000000 --- a/compiler/testData/codegen/inputStreamIterator.jet +++ /dev/null @@ -1,18 +0,0 @@ -import std.* -import std.io.* - -import java.io.* - -fun box() : String { - val x = ByteArray (10) - - for(index in 0..9) { - x [index] = index.byt - } - - for(b in x.inputStream) { - System.out?.println(b) - } - - return "OK" -} diff --git a/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java b/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java index 50e8f8b2e20..f16bdf4617b 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java @@ -50,11 +50,6 @@ public class StdlibTest extends CodegenTestCase { } } - public void testInputStreamIterator () { - blackBoxFile("inputStreamIterator.jet"); -// System.out.println(generateToText()); - } - public void testKt533 () { blackBoxFile("regressions/kt533.kt"); } @@ -74,16 +69,4 @@ public class StdlibTest extends CodegenTestCase { public void testKt828 () { blackBoxFile("regressions/kt828.kt"); } - - public void testCollectionSize () throws Exception { - loadText("import std.util.*; fun box() = if(java.util.Arrays.asList(0, 1, 2)?.size == 3) \"OK\" else \"fail\""); -// System.out.println(generateToText()); - blackBox(); - } - - public void testCollectionEmpty () throws Exception { - loadText("import std.util.*; fun box() = if(java.util.Arrays.asList(0, 1, 2)?.empty ?: false) \"OK\" else \"fail\""); -// System.out.println(generateToText()); - blackBox(); - } } diff --git a/testlib/test/OldStdlibTest.kt b/testlib/test/OldStdlibTest.kt new file mode 100644 index 00000000000..edafe9745e2 --- /dev/null +++ b/testlib/test/OldStdlibTest.kt @@ -0,0 +1,34 @@ +package test.collections + +import std.* +import std.io.* +import std.util.* +import std.test.* +import java.util.* +import java.io.* + +class OldStdlibTest() : TestSupport() { + fun testCollectionEmpty() { + assert { + Arrays.asList(0, 1, 2)?.empty ?: false + } + } + + fun testCollectionSize() { + assert { + Arrays.asList(0, 1, 2)?.size == 3 + } + } + + fun testInputStreamIterator() { + val x = ByteArray (10) + + for(index in 0..9) { + x [index] = index.byt + } + + for(b in x.inputStream) { + System.out?.println(b) + } + } +} diff --git a/testlib/test/test/collections/TestAll.java b/testlib/test/test/collections/TestAll.java index 7d465c5b03e..6003899551e 100644 --- a/testlib/test/test/collections/TestAll.java +++ b/testlib/test/test/collections/TestAll.java @@ -6,8 +6,8 @@ import junit.framework.TestSuite; */ public class TestAll { public static TestSuite suite() { - TestSuite suite = new TestSuite(CollectionTest.class, IoTest.class, ListTest.class, MapTest.class, SetTest.class); + TestSuite suite = new TestSuite(CollectionTest.class, IoTest.class, ListTest.class, MapTest.class, SetTest.class, OldStdlibTest.class); suite.addTest(testDslExample.namespace.getSuite()); return suite; } -} \ No newline at end of file +} From 9a11564d2724d24ea292adbb28e32624e4c390e9 Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Fri, 30 Dec 2011 19:39:35 +0400 Subject: [PATCH 2/3] fixing tests --- testlib/test/IoTest.kt | 17 +++++++++-------- testlib/test/OldStdlibTest.kt | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/testlib/test/IoTest.kt b/testlib/test/IoTest.kt index 450779e7d60..fd673bde1b2 100644 --- a/testlib/test/IoTest.kt +++ b/testlib/test/IoTest.kt @@ -8,10 +8,8 @@ import java.io.* import java.util.* class IoTest() : TestSupport() { - val file = File("test/HelloWorld.txt") - fun testLineIteratorWithManualClose() { - val reader = FileReader(file).buffered() + val reader = sample().buffered() try { val list = reader.lineIterator().toArrayList() assertEquals(arrayList("Hello", "World"), list) @@ -19,14 +17,17 @@ class IoTest() : TestSupport() { reader.close() } } - + + fun sample() : Reader { + return InputStreamReader(getClass().getClassLoader().getResourceAsStream("test/HelloWorld.txt")) + } fun testLineIterator() { /* // TODO compiler error // both these expressions causes java.lang.NoClassDefFoundError: collections/namespace - val list = FileReader(file).useLines{it.toArrayList()} - val list = FileReader(file).useLines>{it.toArrayList()} + val list = sample().useLines{it.toArrayList()} + val list = sample().useLines>{it.toArrayList()} assertEquals(arrayList("Hello", "World"), list) */ @@ -35,7 +36,7 @@ class IoTest() : TestSupport() { fun testUse() { /** val list = ArrayList() - val reader = FileReader(file).buffered() + val reader = sample().buffered() TODO compiler error? reader.use{ @@ -48,4 +49,4 @@ class IoTest() : TestSupport() { assertEquals(arrayList("Hello", "World"), list) */ } -} \ No newline at end of file +} diff --git a/testlib/test/OldStdlibTest.kt b/testlib/test/OldStdlibTest.kt index edafe9745e2..1feb24c45f3 100644 --- a/testlib/test/OldStdlibTest.kt +++ b/testlib/test/OldStdlibTest.kt @@ -9,7 +9,7 @@ import java.io.* class OldStdlibTest() : TestSupport() { fun testCollectionEmpty() { - assert { + assertNot { Arrays.asList(0, 1, 2)?.empty ?: false } } From 1cfdbf9406bc0b445204232d5daddfd8141e5715 Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Fri, 30 Dec 2011 19:48:35 +0400 Subject: [PATCH 3/3] fixing tests --- testlib/test/IoTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testlib/test/IoTest.kt b/testlib/test/IoTest.kt index fd673bde1b2..914c41a6d5b 100644 --- a/testlib/test/IoTest.kt +++ b/testlib/test/IoTest.kt @@ -19,7 +19,7 @@ class IoTest() : TestSupport() { } fun sample() : Reader { - return InputStreamReader(getClass().getClassLoader().getResourceAsStream("test/HelloWorld.txt")) + return InputStreamReader((this as java.lang.Object).getClass()?.getClassLoader()?.getResourceAsStream("test/HelloWorld.txt")) } fun testLineIterator() {