azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build fix attempt: reverted dropping dependency.

Browse Source
This commit is contained in:
pTalanov
2012-03-01 19:28:26 +04:00
parent 6315c03ea8
commit 5dcd3c493d
16 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/libraries/js_libs.xml
Generated
+2 -4
View File
@@ -4,11 +4,9 @@
<root url="jar://$PROJECT_DIR$/js/js.translator/lib/dartc.jar!/" />
<root url="jar://$PROJECT_DIR$/js/js.translator/lib/args4j-2.0.12.jar!/" />
<root url="jar://$PROJECT_DIR$/js/js.translator/lib/json.jar!/" />
<root url="jar://$PROJECT_DIR$/js/js.translator/lib/js-1.7R2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://$PROJECT_DIR$/js/js.translator/lib" />
</SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/js/js.translator/lib" recursive="false" type="SOURCES" />
<SOURCES />
</library>
</component>
js/js.tests/js.tests.iml
+3 -2
View File
@@ -9,10 +9,11 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="js.translator" />
<orderEntry type="module" module-name="compiler-tests" />
<orderEntry type="library" name="idea-full" level="project" />
<orderEntry type="library" name="js-libs" level="project" />
<orderEntry type="module" module-name="frontend" />
<orderEntry type="module" module-name="cli" />
<orderEntry type="library" name="intellij-core" level="project" />
<orderEntry type="library" name="js-libs" level="project" />
<orderEntry type="library" name="idea-full" level="project" />
</component>
</module>
js/js.tests/test/org/jetbrains/k2js/test/ArrayListTest.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.k2js.test;
import sun.org.mozilla.javascript.internal.JavaScriptException;
import org.mozilla.javascript.JavaScriptException;
/**
* @author Pavel Talanov
js/js.tests/test/org/jetbrains/k2js/test/ClassInheritanceTest.java
+1 -1
View File
@@ -29,7 +29,7 @@ public final class ClassInheritanceTest extends TranslationTest {
}
public void testInitializersOfBasicClassExecute() throws Exception {
testFunctionOutput("initializersOfBasicClassExecute.kt", "foo", "box", 3.0);
testFunctionOutput("initializersOfBasicClassExecute.kt", "foo", "box", 3);
}
public void testMethodOverride() throws Exception {
js/js.tests/test/org/jetbrains/k2js/test/ConditionalTest.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.k2js.test;
import sun.org.mozilla.javascript.internal.JavaScriptException;
import org.mozilla.javascript.JavaScriptException;
/**
* @author Pavel Talanov
js/js.tests/test/org/jetbrains/k2js/test/FunctionTest.java
-1
View File
@@ -95,7 +95,6 @@ public class FunctionTest extends AbstractExpressionTest {
}
//TODO: this test passes even if does nothing
public void testkt921() throws Exception {
try {
checkOutput("KT-921.kt", "");
js/js.tests/test/org/jetbrains/k2js/test/KotlinLibTest.java
+2 -2
View File
@@ -16,8 +16,8 @@
package org.jetbrains.k2js.test;
import sun.org.mozilla.javascript.internal.Context;
import sun.org.mozilla.javascript.internal.Scriptable;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.Scriptable;
import java.util.Arrays;
import java.util.HashMap;
js/js.tests/test/org/jetbrains/k2js/test/MiscTest.java
+1 -1
View File
@@ -31,7 +31,7 @@ public final class MiscTest extends AbstractExpressionTest {
}
public void testLocalPropertys() throws Exception {
testFunctionOutput("localProperty.jet", "foo", "box", 50.0);
testFunctionOutput("localProperty.jet", "foo", "box", 50);
}
public void testIntRange() throws Exception {
js/js.tests/test/org/jetbrains/k2js/test/PatternMatchingTest.java
+1 -2
View File
@@ -16,7 +16,7 @@
package org.jetbrains.k2js.test;
import sun.org.mozilla.javascript.internal.JavaScriptException;
import org.mozilla.javascript.JavaScriptException;
/**
* @author Pavel Talanov
@@ -80,7 +80,6 @@ public final class PatternMatchingTest extends TranslationTest {
checkFooBoxIsTrue("whenAsExpression.kt");
}
//TODO:
public void whenAsExpressionWithThrow() throws Exception {
try {
checkFooBoxIsTrue("whenAsExpressionWithThrow.kt");
js/js.tests/test/org/jetbrains/k2js/test/RhinoFunctionResultChecker.java
+2 -2
View File
@@ -17,8 +17,8 @@
package org.jetbrains.k2js.test;
import org.jetbrains.annotations.Nullable;
import sun.org.mozilla.javascript.internal.Context;
import sun.org.mozilla.javascript.internal.Scriptable;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.Scriptable;
import static org.junit.Assert.assertTrue;
js/js.tests/test/org/jetbrains/k2js/test/RhinoPropertyTypesChecker.java
+5 -5
View File
@@ -16,10 +16,10 @@
package org.jetbrains.k2js.test;
import sun.org.mozilla.javascript.internal.Context;
import sun.org.mozilla.javascript.internal.NativeObject;
import sun.org.mozilla.javascript.internal.Scriptable;
import sun.org.mozilla.javascript.internal.ScriptableObject;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.NativeObject;
import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.ScriptableObject;
import java.util.Map;
@@ -44,7 +44,7 @@ public final class RhinoPropertyTypesChecker implements RhinoResultChecker {
verifyObjectHasExpectedPropertiesOfExpectedTypes(object, propertyToType);
}
private void verifyObjectHasExpectedPropertiesOfExpectedTypes
private static void verifyObjectHasExpectedPropertiesOfExpectedTypes
(NativeObject object, Map<String, Class<? extends Scriptable>> nameToClassMap) {
for (Map.Entry<String, Class<? extends Scriptable>> entry : nameToClassMap.entrySet()) {
String name = entry.getKey();
js/js.tests/test/org/jetbrains/k2js/test/RhinoResultChecker.java
+3 -3
View File
@@ -16,12 +16,12 @@
package org.jetbrains.k2js.test;
import sun.org.mozilla.javascript.internal.Context;
import sun.org.mozilla.javascript.internal.Scriptable;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.Scriptable;
/**
* @author Pavel Talanov
*/
public interface RhinoResultChecker {
void runChecks(Context context, Scriptable scope) throws Exception;
public void runChecks(Context context, Scriptable scope) throws Exception;
}
js/js.tests/test/org/jetbrains/k2js/test/RhinoSystemOutputChecker.java
+2 -2
View File
@@ -18,8 +18,8 @@ package org.jetbrains.k2js.test;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.k2js.utils.GenerationUtils;
import sun.org.mozilla.javascript.internal.Context;
import sun.org.mozilla.javascript.internal.Scriptable;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.Scriptable;
import java.util.List;
js/js.tests/test/org/jetbrains/k2js/test/RhinoUtils.java
+2 -2
View File
@@ -16,8 +16,8 @@
package org.jetbrains.k2js.test;
import sun.org.mozilla.javascript.internal.NativeObject;
import sun.org.mozilla.javascript.internal.Scriptable;
import org.mozilla.javascript.NativeObject;
import org.mozilla.javascript.Scriptable;
import static org.junit.Assert.assertTrue;
js/js.tests/test/org/jetbrains/k2js/test/TranslationTest.java
+2 -2
View File
@@ -22,8 +22,8 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.k2js.config.TestConfig;
import org.jetbrains.k2js.facade.K2JSTranslator;
import sun.org.mozilla.javascript.internal.Context;
import sun.org.mozilla.javascript.internal.Scriptable;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.Scriptable;
import java.io.File;
import java.io.FileInputStream;
js/js.translator/lib/js-1.7R2.jar
BIN
View File
Binary file not shown.