From 9a11564d2724d24ea292adbb28e32624e4c390e9 Mon Sep 17 00:00:00 2001
From: Maxim Shafirov <max@jetbrains.com>
Date: Fri, 30 Dec 2011 19:39:35 +0400
Subject: [PATCH] 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<ArrayList<String>>{it.toArrayList()}
+    val list = sample().useLines{it.toArrayList()}
+    val list = sample().useLines<ArrayList<String>>{it.toArrayList()}
 
     assertEquals(arrayList("Hello", "World"), list)
     */
@@ -35,7 +36,7 @@ class IoTest() : TestSupport() {
   fun testUse() {
     /**
     val list = ArrayList<String>()
-    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
         }
     }