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

Removed js.jar dependency.

Browse Source
This commit is contained in:
pTalanov
2012-03-01 14:47:46 +04:00
parent 61b4c1db55
commit 60732c734d
18 changed files with 32 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/k2js/test/ArrayListTest.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.k2js.test;
import org.mozilla.javascript.JavaScriptException;
import sun.org.mozilla.javascript.internal.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);
testFunctionOutput("initializersOfBasicClassExecute.kt", "foo", "box", 3.0);
}
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 org.mozilla.javascript.JavaScriptException;
import sun.org.mozilla.javascript.internal.JavaScriptException;
/**
* @author Pavel Talanov
js/js.tests/test/org/jetbrains/k2js/test/FunctionTest.java
+1
View File
@@ -95,6 +95,7 @@ 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 org.mozilla.javascript.Context;
import org.mozilla.javascript.Scriptable;
import sun.org.mozilla.javascript.internal.Context;
import sun.org.mozilla.javascript.internal.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);
testFunctionOutput("localProperty.jet", "foo", "box", 50.0);
}
public void testIntRange() throws Exception {
js/js.tests/test/org/jetbrains/k2js/test/PatternMatchingTest.java
+2 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.k2js.test;
import org.mozilla.javascript.JavaScriptException;
import sun.org.mozilla.javascript.internal.JavaScriptException;
/**
* @author Pavel Talanov
@@ -80,6 +80,7 @@ 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
+3 -3
View File
@@ -17,8 +17,8 @@
package org.jetbrains.k2js.test;
import org.jetbrains.annotations.Nullable;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.Scriptable;
import sun.org.mozilla.javascript.internal.Context;
import sun.org.mozilla.javascript.internal.Scriptable;
import static org.junit.Assert.assertTrue;
@@ -45,7 +45,7 @@ public final class RhinoFunctionResultChecker implements RhinoResultChecker {
public void runChecks(Context context, Scriptable scope) throws Exception {
Object result = evaluateFunction(context, scope);
assertTrue("Result is not what expected! Expected: " + expectedResult + " Evaluated : " + result,
result.equals(expectedResult));
result.equals(expectedResult));
String report = namespaceName + "." + functionName + "() = " + Context.toString(result);
System.out.println(report);
}
js/js.tests/test/org/jetbrains/k2js/test/RhinoPropertyTypesChecker.java
+9 -5
View File
@@ -16,9 +16,10 @@
package org.jetbrains.k2js.test;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.NativeObject;
import org.mozilla.javascript.Scriptable;
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 java.util.Map;
@@ -48,9 +49,12 @@ public final class RhinoPropertyTypesChecker implements RhinoResultChecker {
for (Map.Entry<String, Class<? extends Scriptable>> entry : nameToClassMap.entrySet()) {
String name = entry.getKey();
Class expectedClass = entry.getValue();
assertTrue(object + " must contain key " + name, object.containsKey(name));
Object property = ScriptableObject.getProperty(object, name);
assertTrue(object + " must contain key " + name, property != null);
assertTrue(object + "'s property " + name + " must be of type " + expectedClass,
expectedClass.isInstance(object.get(name)));
expectedClass.isInstance(property
));
}
}
js/js.tests/test/org/jetbrains/k2js/test/RhinoResultChecker.java
+3 -3
View File
@@ -16,12 +16,12 @@
package org.jetbrains.k2js.test;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.Scriptable;
import sun.org.mozilla.javascript.internal.Context;
import sun.org.mozilla.javascript.internal.Scriptable;
/**
* @author Pavel Talanov
*/
public interface RhinoResultChecker {
public void runChecks(Context context, Scriptable scope) throws Exception;
void runChecks(Context context, Scriptable scope) throws Exception;
}
js/js.tests/test/org/jetbrains/k2js/test/RhinoSystemOutputChecker.java
+3 -3
View File
@@ -18,8 +18,8 @@ package org.jetbrains.k2js.test;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.k2js.utils.GenerationUtils;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.Scriptable;
import sun.org.mozilla.javascript.internal.Context;
import sun.org.mozilla.javascript.internal.Scriptable;
import java.util.List;
@@ -48,7 +48,7 @@ public final class RhinoSystemOutputChecker implements RhinoResultChecker {
// System.out.println(trimmedActual);
// System.out.println(trimmedExpected);
assertTrue("Returned:\n" + trimmedActual + "END_OF_RETURNED\nExpected:\n" + trimmedExpected
+ "END_OF_EXPECTED\n", trimmedExpected.equals(trimmedActual));
+ "END_OF_EXPECTED\n", trimmedExpected.equals(trimmedActual));
}
private String getSystemOutput(@NotNull Context context, @NotNull Scriptable scope) {
js/js.tests/test/org/jetbrains/k2js/test/RhinoUtils.java
+2 -2
View File
@@ -16,8 +16,8 @@
package org.jetbrains.k2js.test;
import org.mozilla.javascript.NativeObject;
import org.mozilla.javascript.Scriptable;
import sun.org.mozilla.javascript.internal.NativeObject;
import sun.org.mozilla.javascript.internal.Scriptable;
import static org.junit.Assert.assertTrue;
js/js.tests/test/org/jetbrains/k2js/test/TranslationTest.java
+2 -2
View File
@@ -21,8 +21,8 @@ import com.intellij.openapi.util.io.FileUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.k2js.facade.K2JSTranslator;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.Scriptable;
import sun.org.mozilla.javascript.internal.Context;
import sun.org.mozilla.javascript.internal.Scriptable;
import java.io.File;
import java.io.FileInputStream;