From f80ad4c35a46adbbd0f329490114a267a76ca5ce Mon Sep 17 00:00:00 2001
From: Maxim Shafirov <max@jetbrains.com>
Date: Mon, 6 Feb 2012 15:01:54 +0400
Subject: [PATCH] Yet another attempt to fix tests

---
 .../org/jetbrains/jet/codegen/TestlibTest.java      |  2 +-
 testlib/test/test/collections/TestAll.java          | 13 -------------
 testlib/testlib.iml                                 |  9 ---------
 3 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 testlib/test/test/collections/TestAll.java

diff --git a/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java b/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java
index 9d23ba0f595..37c22255208 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java
@@ -78,7 +78,7 @@ public class TestlibTest extends CodegenTestCase {
 
             final GeneratedClassLoader loader = new GeneratedClassLoader(
                     classFileFactory,
-                    new URLClassLoader(new URL[]{ForTestCompileStdlib.stdlibJarForTests().toURI().toURL()},
+                    new URLClassLoader(new URL[]{ForTestCompileStdlib.stdlibJarForTests().toURI().toURL(), junitJar.toURI().toURL()},
                                        TestCase.class.getClassLoader()));
 
             JetTypeMapper typeMapper = new JetTypeMapper(classFileFactory.state.getStandardLibrary(), session.getMyBindingContext());
diff --git a/testlib/test/test/collections/TestAll.java b/testlib/test/test/collections/TestAll.java
deleted file mode 100644
index ce55e8e6c9c..00000000000
--- a/testlib/test/test/collections/TestAll.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package test.collections;
-
-import junit.framework.TestSuite;
-
-/**
- */
-public class TestAll {
-//  public static TestSuite suite() {
-//    TestSuite suite = new TestSuite(StandardCollectionTest.class, CollectionTest.class, IoTest.class, ListTest.class, MapTest.class, SetTest.class, OldStdlibTest.class, MathTest.class);
-//    suite.addTest(testDslExample.namespace.getSuite());
-//    return suite;
-//  }
-}
diff --git a/testlib/testlib.iml b/testlib/testlib.iml
index d1780f417e7..a76c6e35f2d 100644
--- a/testlib/testlib.iml
+++ b/testlib/testlib.iml
@@ -8,15 +8,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library" exported="">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/junit-4.9.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module" module-name="stdlib" exported="" />
   </component>
 </module>