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

Remove patch.

Browse Source 
Refactor tests.
This commit is contained in:
pTalanov
2012-03-02 13:00:42 +04:00
parent 956865b830
commit c1b9efa8bf
10 changed files with 23 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/Web_demo_config_and_facade.patch
-242
View File
@@ -1,242 +0,0 @@
Index: js/js.translator/src/org/jetbrains/k2js/facade/WebDemoTranslatorFacade.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- js/js.translator/src/org/jetbrains/k2js/facade/WebDemoTranslatorFacade.java (revision )
+++ js/js.translator/src/org/jetbrains/k2js/facade/WebDemoTranslatorFacade.java (revision )
@@ -0,0 +1,89 @@
+/*
+* Copyright 2000-2012 JetBrains s.r.o.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.jetbrains.k2js.facade;
+
+import com.intellij.openapi.project.Project;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.jet.lang.resolve.BindingContext;
+import org.jetbrains.k2js.analyze.AnalyzerFacade;
+import org.jetbrains.k2js.config.WebDemoConfig;
+import org.jetbrains.k2js.utils.JetFileUtils;
+
+import java.util.Arrays;
+
+/**
+ * @author Pavel Talanov
+ */
+@SuppressWarnings("UnusedDeclaration")
+public final class WebDemoTranslatorFacade {
+
+ @SuppressWarnings("FieldCanBeLocal")
+ private static String EXCEPTION = "exception=";
+
+ private WebDemoTranslatorFacade() {
+ }
+
+ @SuppressWarnings("UnusedDeclaration")
+ @Nullable
+ public static BindingContext analyzeProgramCode(@NotNull Project project, @NotNull String programText) {
+ try {
+ JetFile file = JetFileUtils.createPsiFile("test", programText, project);
+ return AnalyzerFacade.analyzeFiles(Arrays.asList(file), new WebDemoConfig(project));
+ } catch (Throwable e) {
+ reportException(e);
+ return null;
+ }
+ }
+
+
+ @SuppressWarnings("UnusedDeclaration")
+ @NotNull
+ public static String translateStringWithCallToMain(@NotNull Project project,
+ @NotNull String programText, @NotNull String argumentsString) {
+ try {
+ return doTranslate(project, programText, argumentsString);
+
+ } catch (AssertionError e) {
+ reportException(e);
+ return EXCEPTION + "Translation error.";
+ } catch (UnsupportedOperationException e) {
+ reportException(e);
+ return EXCEPTION + "Unsupported feature.";
+ } catch (Throwable e) {
+ reportException(e);
+ return EXCEPTION + "Unexpected exception.";
+ }
+ }
+
+ @NotNull
+ private static String doTranslate(@NotNull Project project, @NotNull String programText,
+ @NotNull String argumentsString) {
+ K2JSTranslator translator = new K2JSTranslator(new WebDemoConfig(project));
+ JetFile file = JetFileUtils.createPsiFile("test", programText, project);
+ String programCode = translator.generateProgramCode(file) + "\n";
+ String flushOutput = "Kotlin.System.flush();\n";
+ String callToMain = K2JSTranslator.generateCallToMain(file, argumentsString);
+ String programOutput = "Kotlin.System.output();\n";
+ return programCode + flushOutput + callToMain + programOutput;
+ }
+
+ private static void reportException(@NotNull Throwable e) {
+ //TODO:
+ }
+}
Index: js/js.libraries/src/org/jetbrains/k2js/config/Loader.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- js/js.libraries/src/org/jetbrains/k2js/config/Loader.java (revision )
+++ js/js.libraries/src/org/jetbrains/k2js/config/Loader.java (revision )
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.k2js.config;
+
+/**
+ * @author Pavel Talanov
+ */
+//TODO: delegate loading to this class
+//NOTE: this class is for loading resources
+public final class Loader {
+}
Index: js/js.translator/src/org/jetbrains/k2js/config/WebDemoConfig.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- js/js.translator/src/org/jetbrains/k2js/config/WebDemoConfig.java (revision )
+++ js/js.translator/src/org/jetbrains/k2js/config/WebDemoConfig.java (revision )
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.k2js.config;
+
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.io.FileUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.k2js.utils.JetFileUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Pavel Talanov
+ */
+//TODO: dup with TestConfig
+public final class WebDemoConfig extends Config {
+
+ @Nullable
+ private /*var*/ List<JetFile> jsLibFiles = null;
+
+ public WebDemoConfig(@NotNull Project project) {
+ super(project);
+ }
+
+ @NotNull
+ private static List<JetFile> initLibFiles(@NotNull Project project) {
+ List<JetFile> libFiles = new ArrayList<JetFile>();
+ for (String libFileName : LIB_FILE_NAMES) {
+ JetFile file = null;
+ //TODO: close stream?
+ @SuppressWarnings("IOResourceOpenedButNotSafelyClosed")
+ InputStream stream = Loader.class.getResourceAsStream(libFileName);
+ try {
+ String text = FileUtil.loadTextAndClose(stream);
+ file = JetFileUtils.createPsiFile(libFileName, text, project);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ libFiles.add(file);
+ }
+ return libFiles;
+ }
+
+ @NotNull
+ public List<JetFile> getLibFiles() {
+ if (jsLibFiles == null) {
+ jsLibFiles = initLibFiles(getProject());
+ }
+ return jsLibFiles;
+ }
+}
Index: .idea/modules.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<project version=\"4\">\n <component name=\"ProjectModuleManager\">\n <modules>\n <module fileurl=\"file://$PROJECT_DIR$/Jet.iml\" filepath=\"$PROJECT_DIR$/Jet.iml\" />\n <module fileurl=\"file://$PROJECT_DIR$/compiler/backend/backend.iml\" filepath=\"$PROJECT_DIR$/compiler/backend/backend.iml\" />\n <module fileurl=\"file://$PROJECT_DIR$/build-tools/build-tools.iml\" filepath=\"$PROJECT_DIR$/build-tools/build-tools.iml\" />\n <module fileurl=\"file://$PROJECT_DIR$/compiler/cli/cli.iml\" filepath=\"$PROJECT_DIR$/compiler/cli/cli.iml\" />\n <module fileurl=\"file://$PROJECT_DIR$/compiler/tests/compiler-tests.iml\" filepath=\"$PROJECT_DIR$/compiler/tests/compiler-tests.iml\" />\n <module fileurl=\"file://$PROJECT_DIR$/examples/example-vfs/example-vfs.iml\" filepath=\"$PROJECT_DIR$/examples/example-vfs/example-vfs.iml\" />\n <module fileurl=\"file://$PROJECT_DIR$/examples/examples.iml\" filepath=\"$PROJECT_DIR$/examples/examples.iml\" />\n <module fileurl=\"file://$PROJECT_DIR$/compiler/frontend/frontend.iml\" filepath=\"$PROJECT_DIR$/compiler/frontend/frontend.iml\" />\n <module fileurl=\"file://$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml\" filepath=\"$PROJECT_DIR$/compiler/frontend.java/frontend.java.iml\" />\n <module fileurl=\"file://$PROJECT_DIR$/grammar/grammar.iml\" filepath=\"$PROJECT_DIR$/grammar/grammar.iml\" />\n <module fileurl=\"file://$PROJECT_DIR$/idea/idea.iml\" filepath=\"$PROJECT_DIR$/idea/idea.iml\" />\n <module fileurl=\"file://$PROJECT_DIR$/idea_runner/idea_runner.iml\" filepath=\"$PROJECT_DIR$/idea_runner/idea_runner.iml\" />\n <module fileurl=\"file://$PROJECT_DIR$/j2k/j2k.iml\" filepath=\"$PROJECT_DIR$/j2k/j2k.iml\" />\n <module fileurl=\"file://$PROJECT_DIR$/j2k/tests/j2k-tests.iml\" filepath=\"$PROJECT_DIR$/j2k/tests/j2k-tests.iml\" />\n <module fileurl=\"file://$PROJECT_DIR$/compiler/jet.as.java.psi/jet.as.java.psi.iml\" filepath=\"$PROJECT_DIR$/compiler/jet.as.java.psi/jet.as.java.psi.iml\" />\n <module fileurl=\"file://$PROJECT_DIR$/js/js.tests/js.tests.iml\" filepath=\"$PROJECT_DIR$/js/js.tests/js.tests.iml\" />\n <module fileurl=\"file://$PROJECT_DIR$/js/js.translator/js.translator.iml\" filepath=\"$PROJECT_DIR$/js/js.translator/js.translator.iml\" />\n <module fileurl=\"file://$PROJECT_DIR$/stdlib/stdlib.iml\" filepath=\"$PROJECT_DIR$/stdlib/stdlib.iml\" />\n <module fileurl=\"file://$PROJECT_DIR$/compiler/util/util.iml\" filepath=\"$PROJECT_DIR$/compiler/util/util.iml\" />\n </modules>\n </component>\n</project>\n\n
===================================================================
--- .idea/modules.xml (date 1330610502000)
+++ .idea/modules.xml (revision )
@@ -17,6 +17,7 @@
<module fileurl="file://$PROJECT_DIR$/j2k/j2k.iml" filepath="$PROJECT_DIR$/j2k/j2k.iml" />
<module fileurl="file://$PROJECT_DIR$/j2k/tests/j2k-tests.iml" filepath="$PROJECT_DIR$/j2k/tests/j2k-tests.iml" />
<module fileurl="file://$PROJECT_DIR$/compiler/jet.as.java.psi/jet.as.java.psi.iml" filepath="$PROJECT_DIR$/compiler/jet.as.java.psi/jet.as.java.psi.iml" />
+ <module fileurl="file://$PROJECT_DIR$/js/js.libraries/js.libraries.iml" filepath="$PROJECT_DIR$/js/js.libraries/js.libraries.iml" />
<module fileurl="file://$PROJECT_DIR$/js/js.tests/js.tests.iml" filepath="$PROJECT_DIR$/js/js.tests/js.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/js/js.translator/js.translator.iml" filepath="$PROJECT_DIR$/js/js.translator/js.translator.iml" />
<module fileurl="file://$PROJECT_DIR$/stdlib/stdlib.iml" filepath="$PROJECT_DIR$/stdlib/stdlib.iml" />
Index: js/js.translator/js.translator.iml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<module type=\"JAVA_MODULE\" version=\"4\">\n <component name=\"NewModuleRootManager\" inherit-compiler-output=\"true\">\n <exclude-output />\n <content url=\"file://$MODULE_DIR$\">\n <sourceFolder url=\"file://$MODULE_DIR$/src\" isTestSource=\"false\" />\n </content>\n <orderEntry type=\"inheritedJdk\" />\n <orderEntry type=\"sourceFolder\" forTests=\"false\" />\n <orderEntry type=\"module\" module-name=\"frontend\" />\n <orderEntry type=\"library\" name=\"js-libs\" level=\"project\" />\n <orderEntry type=\"library\" scope=\"PROVIDED\" name=\"intellij-core\" level=\"project\" />\n </component>\n</module>\n\n
===================================================================
--- js/js.translator/js.translator.iml (date 1330610502000)
+++ js/js.translator/js.translator.iml (revision )
@@ -10,6 +10,7 @@
<orderEntry type="module" module-name="frontend" />
<orderEntry type="library" name="js-libs" level="project" />
<orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
+ <orderEntry type="module" module-name="js.libraries" />
</component>
</module>
js/js.tests/test/org/jetbrains/k2js/test/BasicClassTest.java
-35
View File
@@ -1,35 +0,0 @@
/*
* Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.k2js.test;
/**
* @author Pavel Talanov
*/
//TODO: remove class
public class BasicClassTest extends TranslationTest {
final private static String MAIN = "class/";
@Override
protected String mainDirectory() {
return MAIN;
}
public void testClassWithoutNamespace() throws Exception {
testFunctionOutput("classWithoutNamespace.kt", "Anonymous", "box", true);
}
}
js/js.tests/test/org/jetbrains/k2js/test/ExampleTestSuite.java → js/js.tests/test/org/jetbrains/k2js/test/ExamplesTest.java
+2 -1
View File
@@ -20,7 +20,8 @@ import com.intellij.testFramework.UsefulTestCase;
import junit.framework.Test; import junit.framework.Test;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public final class ExampleTestSuite extends UsefulTestCase { @SuppressWarnings("JUnitTestCaseWithNoTests")
public final class ExamplesTest extends UsefulTestCase {
public static Test suite() { public static Test suite() {
return Suite.suiteForDirectory("examples/", new Suite.SingleFileTester() { return Suite.suiteForDirectory("examples/", new Suite.SingleFileTester() {
js/js.tests/test/org/jetbrains/k2js/test/ForTest.java → js/js.tests/test/org/jetbrains/k2js/test/ForeachTest.java
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.k2js.test;
/** /**
* @author Pavel Talanov * @author Pavel Talanov
*/ */
public final class ForTest extends AbstractExpressionTest { public final class ForeachTest extends AbstractExpressionTest {
final private static String MAIN = "for/"; final private static String MAIN = "for/";
js/js.tests/test/org/jetbrains/k2js/test/FunctionTest.java
+1 -1
View File
@@ -95,7 +95,7 @@ public class FunctionTest extends AbstractExpressionTest {
} }
public void testkt921() throws Exception { public void testKT921() throws Exception {
try { try {
checkOutput("KT-921.kt", ""); checkOutput("KT-921.kt", "");
} catch (Throwable e) { } catch (Throwable e) {
js/js.tests/test/org/jetbrains/k2js/test/JavaClassesTest.java
+1 -1
View File
@@ -22,7 +22,7 @@ package org.jetbrains.k2js.test;
@SuppressWarnings("FieldCanBeLocal") @SuppressWarnings("FieldCanBeLocal")
public abstract class JavaClassesTest extends TranslationTest { public abstract class JavaClassesTest extends TranslationTest {
private final String SUITE = "java/"; private static final String SUITE = "java/";
@Override @Override
protected String suiteDirectoryName() { protected String suiteDirectoryName() {
js/js.tests/test/org/jetbrains/k2js/test/KotlinLibTest.java
+14 -42
View File
@@ -16,12 +16,11 @@
package org.jetbrains.k2js.test; package org.jetbrains.k2js.test;
import org.jetbrains.annotations.NotNull;
import org.mozilla.javascript.Context; import org.mozilla.javascript.Context;
import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.Scriptable;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
/** /**
* @author Pavel Talanov * @author Pavel Talanov
@@ -35,12 +34,6 @@ public final class KotlinLibTest extends TranslationTest {
return MAIN; return MAIN;
} }
private void runPropertyTypeCheck(String objectName, Map<String, Class<? extends Scriptable>> propertyToType)
throws Exception {
runRhinoTest(Arrays.asList(kotlinLibraryPath()), new RhinoPropertyTypesChecker(objectName, propertyToType));
}
public void testKotlinJsLibRunsWithRhino() throws Exception { public void testKotlinJsLibRunsWithRhino() throws Exception {
runRhinoTest(Arrays.asList(kotlinLibraryPath()), new RhinoResultChecker() { runRhinoTest(Arrays.asList(kotlinLibraryPath()), new RhinoResultChecker() {
@Override @Override
@@ -50,68 +43,47 @@ public final class KotlinLibTest extends TranslationTest {
}); });
} }
//TODO: refactor
public void testCreatedTraitIsJSObject() throws Exception {
final Map<String, Class<? extends Scriptable>> propertyToType
= new HashMap<String, Class<? extends Scriptable>>();
runRhinoTest(Arrays.asList(kotlinLibraryPath(), cases("trait.js")),
new RhinoPropertyTypesChecker("foo", propertyToType));
}
public void testCreatedNamespaceIsJSObject() throws Exception {
final Map<String, Class<? extends Scriptable>> propertyToType
= new HashMap<String, Class<? extends Scriptable>>();
runRhinoTest(Arrays.asList(kotlinLibraryPath(), cases("namespace.js")),
new RhinoPropertyTypesChecker("foo", propertyToType));
}
//
// TODO:Refactor calls to function result checker with test
public void testNamespaceHasDeclaredFunction() throws Exception { public void testNamespaceHasDeclaredFunction() throws Exception {
runRhinoTest(Arrays.asList(kotlinLibraryPath(), cases("namespace.js")), runJavascriptTest("namespace.js");
new RhinoFunctionResultChecker("test", true));
} }
public void testNamespaceHasDeclaredClasses() throws Exception { public void testNamespaceHasDeclaredClasses() throws Exception {
runRhinoTest(Arrays.asList(kotlinLibraryPath(), cases("namespaceWithClasses.js")), runJavascriptTest("namespaceWithClasses.js");
new RhinoFunctionResultChecker("test", true));
} }
public void testIsSameType() throws Exception { public void testIsSameType() throws Exception {
runRhinoTest(Arrays.asList(kotlinLibraryPath(), cases("isSameType.js")), runJavascriptTest("isSameType.js");
new RhinoFunctionResultChecker("test", true));
} }
public void testIsAncestorType() throws Exception { public void testIsAncestorType() throws Exception {
runRhinoTest(Arrays.asList(kotlinLibraryPath(), cases("isAncestorType.js")), runJavascriptTest("isAncestorType.js");
new RhinoFunctionResultChecker("test", true));
} }
public void testIsComplexTest() throws Exception { public void testIsComplexTest() throws Exception {
runRhinoTest(Arrays.asList(kotlinLibraryPath(), cases("isComplexTest.js")), runJavascriptTest("isComplexTest.js");
new RhinoFunctionResultChecker("test", true));
} }
public void testCommaExpression() throws Exception { public void testCommaExpression() throws Exception {
runRhinoTest(Arrays.asList(kotlinLibraryPath(), cases("commaExpression.js")), runJavascriptTest("commaExpression.js");
new RhinoFunctionResultChecker("test", true));
} }
public void testArray() throws Exception { public void testArray() throws Exception {
runRhinoTest(Arrays.asList(kotlinLibraryPath(), cases("array.js")), runJavascriptTest("array.js");
new RhinoFunctionResultChecker("test", true));
} }
public void testHashMap() throws Exception { public void testHashMap() throws Exception {
runRhinoTest(Arrays.asList(kotlinLibraryPath(), cases("hashMap.js")), runJavascriptTest("hashMap.js");
}
private void runJavascriptTest(@NotNull String filename) throws Exception {
runRhinoTest(Arrays.asList(kotlinLibraryPath(), cases(filename)),
new RhinoFunctionResultChecker("test", true)); new RhinoFunctionResultChecker("test", true));
} }
js/js.tests/test/org/jetbrains/k2js/test/MiscTest.java
+4 -1
View File
@@ -35,7 +35,6 @@ public final class MiscTest extends AbstractExpressionTest {
} }
public void testIntRange() throws Exception { public void testIntRange() throws Exception {
// checkOutput("intRange.kt", " ");
checkFooBoxIsTrue("intRange.kt"); checkFooBoxIsTrue("intRange.kt");
} }
@@ -43,4 +42,8 @@ public final class MiscTest extends AbstractExpressionTest {
public void testSafecallComputesExpressionOnlyOnce() throws Exception { public void testSafecallComputesExpressionOnlyOnce() throws Exception {
checkFooBoxIsTrue("safecallComputesExpressionOnlyOnce.kt"); checkFooBoxIsTrue("safecallComputesExpressionOnlyOnce.kt");
} }
public void testClassWithoutNamespace() throws Exception {
testFunctionOutput("classWithoutNamespace.kt", "Anonymous", "box", true);
}
} }
js/js.translator/testFiles/class/cases/classWithoutNamespace.kt → js/js.translator/testFiles/expression/misc/cases/classWithoutNamespace.kt
View File
js/js.translator/testFiles/expression/misc/cases/jquery.kt
-8
View File
@@ -1,8 +0,0 @@
package foo
import jquery.*;
fun box() : String {
val aa = jq("a").attr("a");
return "OK"
}