From a89e26b3ac52ba8f10d480885ec96d7fb5a97e75 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Sat, 24 Mar 2012 08:13:57 +0100
Subject: [PATCH] Fixed test paths in JS tests

---
 .idea/runConfigurations/Js_backend_tests.xml                    | 2 +-
 js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java         | 2 +-
 js/js.tests/test/org/jetbrains/k2js/test/config/TestConfig.java | 2 +-
 js/js.translator/src/org/jetbrains/k2js/config/Config.java      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.idea/runConfigurations/Js_backend_tests.xml b/.idea/runConfigurations/Js_backend_tests.xml
index 011469a460a..f743bf7dde6 100644
--- a/.idea/runConfigurations/Js_backend_tests.xml
+++ b/.idea/runConfigurations/Js_backend_tests.xml
@@ -10,7 +10,7 @@
     <option name="TEST_OBJECT" value="package" />
     <option name="VM_PARAMETERS" value="-ea" />
     <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/js" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
     <option name="ENV_VARIABLES" />
     <option name="PASS_PARENT_ENVS" value="true" />
     <option name="TEST_SEARCH_SCOPE">
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java b/js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java
index 1c42a1c5f35..d0efbc59e82 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java
@@ -33,7 +33,7 @@ import static org.jetbrains.k2js.test.utils.JsTestUtils.convertFileNameToDotJsFi
 public abstract class BasicTest extends TestWithEnvironment {
 
     private static final boolean DELETE_OUT = false;
-    private static final String TEST_FILES = "js.translator/testFiles/";
+    private static final String TEST_FILES = "js/js.translator/testFiles/";
     private static final String CASES = "cases/";
     private static final String OUT = "out/";
     private static final String KOTLIN_JS_LIB = pathToTestFilesRoot() + "kotlin_lib.js";
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/config/TestConfig.java b/js/js.tests/test/org/jetbrains/k2js/test/config/TestConfig.java
index efc0425c4bc..e5e7c66d310 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/config/TestConfig.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/config/TestConfig.java
@@ -63,7 +63,7 @@ public final class TestConfig extends Config {
                 libFiles.add(file);
             } catch (FileNotFoundException e) {
                 //TODO: throw generic expception
-                throw new AssertionError("Lib files not found.");
+                throw new IllegalStateException(e);
             }
 
         }
diff --git a/js/js.translator/src/org/jetbrains/k2js/config/Config.java b/js/js.translator/src/org/jetbrains/k2js/config/Config.java
index 2a870dc73ef..2d85c160eea 100644
--- a/js/js.translator/src/org/jetbrains/k2js/config/Config.java
+++ b/js/js.translator/src/org/jetbrains/k2js/config/Config.java
@@ -46,7 +46,7 @@ public abstract class Config {
             "/html5/image.kt"
     );
 
-    protected static final String LIBRARIES_LOCATION = "js.libraries/src";
+    protected static final String LIBRARIES_LOCATION = "js/js.libraries/src";
 
     @NotNull
     private final Project project;