Library paths updated after migration to new stdlib generators

js/js.tests/test/org/jetbrains/k2js/test/semantics/ArraysTest.java

@@ -21,6 +21,6 @@ import junit.framework.Test;
 @SuppressWarnings("JUnitTestCaseWithNoTests")
 public final class ArraysTest extends JsUnitTestBase {
     public static Test suite() throws Exception {
-        return createTestSuiteForFile("libraries/stdlib/test/ArraysTest.kt");
+        return createTestSuiteForFile("libraries/stdlib/test/collections/ArraysTest.kt");
     }
 }

js/js.tests/test/org/jetbrains/k2js/test/semantics/CompileMavenGeneratedJSLibrary.java

@@ -56,16 +56,16 @@ public class CompileMavenGeneratedJSLibrary extends SingleFileTranslationTest {
         if (generatedJsLibraryDir.exists() && generatedJsLibraryDir.isDirectory()) {
             generateJavaScriptFiles(DEFAULT_ECMA_VERSIONS,
                                     "libraries/stdlib/test",
-                                    "ArraysTest.kt",
+                                    "collections/ArraysTest.kt",
                                     "dom/DomTest.kt",
                                     "js/MapTest.kt",
                                     "js/JsDomTest.kt",
-                                    "iterators/FunctionIteratorTest.kt",
-                                    "iterators/IteratorsTest.kt",
+                                    "collections/FunctionIteratorTest.kt",
+                                    "collections/IteratorsTest.kt",
                                     "GetOrElseTest.kt",
-                                    "ListTest.kt",
-                                    "SetTest.kt",
-                                    "StringTest.kt");
+                                    "collections/ListTest.kt",
+                                    "collections/SetTest.kt",
+                                    "text/StringTest.kt");
 
         } else {
             System.out.println("Warning " + generatedJsLibraryDir + " does not exist - I guess you've not run the maven build in library/ yet?");

js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibIterableTest.java

@@ -19,11 +19,9 @@ package org.jetbrains.k2js.test.semantics;
 import junit.framework.Test;
 
 @SuppressWarnings("JUnitTestCaseWithNoTests")
-public final class StdLibSetTest extends JsUnitTestBase {
+public final class StdLibIterableTest extends JsUnitTestBase {
     public static Test suite() throws Exception {
-        return createTestSuiteForFile("libraries/stdlib/test/SetTest.kt",
-                                      "SetTest.filter",
-                                      "SetTest.find");
+        return createTestSuiteForFile("libraries/stdlib/test/collections/IterableTests.kt");
     }
 }
 

js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibIteratorsTest.java

@@ -22,7 +22,6 @@ import junit.framework.Test;
 @SuppressWarnings("JUnitTestCaseWithNoTests")
 public final class StdLibIteratorsTest extends JsUnitTestBase {
     public static Test suite() throws Exception {
-        return createTestSuiteForFile("libraries/stdlib/test/iterators/IteratorsTest.kt",
-                                      "IteratorsTest.requireNoNulls");
+        return createTestSuiteForFile("libraries/stdlib/test/collections/IteratorsTest.kt");
     }
 }

js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibListTest.java

@@ -22,6 +22,6 @@ import junit.framework.Test;
 @SuppressWarnings("JUnitTestCaseWithNoTests")
 public final class StdLibListTest extends JsUnitTestBase {
     public static Test suite() throws Exception {
-        return createTestSuiteForFile("libraries/stdlib/test/ListTest.kt");
+        return createTestSuiteForFile("libraries/stdlib/test/collections/ListSpecificTest.kt");
     }
 }

js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestToJSTest.java

@@ -25,11 +25,11 @@ public class StdLibTestToJSTest extends StdLibTestBase {
                           "dom/DomTest.kt",
                           "js/MapJsTest.kt",
                           "js/JsDomTest.kt",
-                          "iterators/FunctionIteratorTest.kt",
-                          "iterators/IteratorsTest.kt",
+                          "collections/StreamTest.kt",
+                          "collections/IteratorsTest.kt",
                           "GetOrElseTest.kt",
-                          "ListTest.kt",
-                          "SetTest.kt",
-                          "StringTest.kt");
+                          "collections/ListSpecificTest.kt",
+                          "collections/IterableTests.kt",
+                          "text/StringTest.kt");
     }
 }