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

Unify script file extensions to "kts" so that IDEA, compiler and tests agree when to parse as SCRIPT.

Browse Source 
Include kt* files into formatter test generation, to test scripting formatting
This commit is contained in:
Ilya Ryzhenkov
2014-03-19 11:14:03 +04:00
committed by Andrey Breslav
parent 4ba423ee16
commit 98c54f39bb
49 changed files with 58 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/JetTestCaseBuilder.java
+1 -1
View File
@@ -34,7 +34,7 @@ import static com.intellij.openapi.util.io.FileUtil.toSystemIndependentName;
public abstract class JetTestCaseBuilder {
public static final FilenameFilter KOTLIN_FILTER = filterByExtension("kt", JetParserDefinition.KTSCRIPT_FILE_SUFFIX);
public static final FilenameFilter KOTLIN_FILTER = filterByExtension("kt", JetParserDefinition.STD_SCRIPT_SUFFIX);
@NotNull
public static FilenameFilter filterByExtension(@NotNull final String... extensions) {
compiler/tests/org/jetbrains/jet/ScriptTest.java
+2 -2
View File
@@ -44,14 +44,14 @@ import java.util.List;
public class ScriptTest {
@Test
public void testScript() throws Exception {
Class<?> aClass = compileScript("fib.ktscript", numIntParam(), Collections.<JetScriptDefinition>emptyList());
Class<?> aClass = compileScript("fib.kts", numIntParam(), Collections.<JetScriptDefinition>emptyList());
Assert.assertNotNull(aClass);
aClass.getConstructor(int.class).newInstance(4);
}
@Test
public void testScriptWithPackage() throws Exception {
Class<?> aClass = compileScript("fib.pkg.ktscript", numIntParam(), Collections.<JetScriptDefinition>emptyList());
Class<?> aClass = compileScript("fib.pkg.kts", numIntParam(), Collections.<JetScriptDefinition>emptyList());
Assert.assertNotNull(aClass);
aClass.getConstructor(int.class).newInstance(4);
}
compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+9 -9
View File
@@ -7124,28 +7124,28 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests/script")
public static class Script extends AbstractJetDiagnosticsTest {
@TestMetadata("AccessForwardDeclarationInScript.ktscript")
@TestMetadata("AccessForwardDeclarationInScript.kts")
public void testAccessForwardDeclarationInScript() throws Exception {
doTest("compiler/testData/diagnostics/tests/script/AccessForwardDeclarationInScript.ktscript");
doTest("compiler/testData/diagnostics/tests/script/AccessForwardDeclarationInScript.kts");
}
public void testAllFilesPresentInScript() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/script"), Pattern.compile("^(.+)\\.ktscript$"), true);
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/diagnostics/tests/script"), Pattern.compile("^(.+)\\.kts$"), true);
}
@TestMetadata("ComplexScript.ktscript")
@TestMetadata("ComplexScript.kts")
public void testComplexScript() throws Exception {
doTest("compiler/testData/diagnostics/tests/script/ComplexScript.ktscript");
doTest("compiler/testData/diagnostics/tests/script/ComplexScript.kts");
}
@TestMetadata("imports.ktscript")
@TestMetadata("imports.kts")
public void testImports() throws Exception {
doTest("compiler/testData/diagnostics/tests/script/imports.ktscript");
doTest("compiler/testData/diagnostics/tests/script/imports.kts");
}
@TestMetadata("SimpleScript.ktscript")
@TestMetadata("SimpleScript.kts")
public void testSimpleScript() throws Exception {
doTest("compiler/testData/diagnostics/tests/script/SimpleScript.ktscript");
doTest("compiler/testData/diagnostics/tests/script/SimpleScript.kts");
}
}
compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java
+14 -14
View File
@@ -97,58 +97,58 @@ public class ScriptGenTest extends CodegenTestCase {
}
public void testHelloWorld() {
blackBoxScript("script/helloWorld.ktscript");
blackBoxScript("script/helloWorld.kts");
}
public void testString() {
blackBoxScript("script/string.ktscript");
blackBoxScript("script/string.kts");
}
public void testTopLevelFunction() throws Exception {
blackBoxScript("script/topLevelFunction.ktscript");
blackBoxScript("script/topLevelFunction.kts");
Method method = scriptInstance.getClass().getMethod("factorial", new Class<?>[]{ int.class });
Object r = method.invoke(scriptInstance, 4);
assertEquals(24, r);
}
public void testTopLevelFunctionClosure() {
blackBoxScript("script/topLevelFunctionClosure.ktscript");
blackBoxScript("script/topLevelFunctionClosure.kts");
}
public void testSecondLevelFunction() {
blackBoxScript("script/secondLevelFunction.ktscript");
blackBoxScript("script/secondLevelFunction.kts");
}
public void testSecondLevelFunctionClosure() {
blackBoxScript("script/secondLevelFunctionClosure.ktscript");
blackBoxScript("script/secondLevelFunctionClosure.kts");
}
public void testSecondLevelVal() {
blackBoxScript("script/secondLevelVal.ktscript");
blackBoxScript("script/secondLevelVal.kts");
}
public void testTopLevelProperty() {
blackBoxScript("script/topLevelProperty.ktscript");
blackBoxScript("script/topLevelProperty.kts");
}
public void testScriptParameter() {
blackBoxScript("script/parameter.ktscript");
blackBoxScript("script/parameter.kts");
}
public void testScriptParameterLong() {
blackBoxScript("script/parameterLong.ktscript");
blackBoxScript("script/parameterLong.kts");
}
public void testScriptParameterArray() {
blackBoxScript("script/parameterArray.ktscript");
blackBoxScript("script/parameterArray.kts");
}
public void testScriptParameterClosure() {
blackBoxScript("script/parameterClosure.ktscript");
blackBoxScript("script/parameterClosure.kts");
}
public void testEmpty() {
blackBoxScript("script/empty.ktscript");
blackBoxScript("script/empty.kts");
}
public void testLanguage() {
@@ -185,7 +185,7 @@ public class ScriptGenTest extends CodegenTestCase {
public void testDependentScripts() {
JetScriptDefinitionProvider.getInstance(myEnvironment.getProject()).addScriptDefinition(FIB_SCRIPT_DEFINITION);
loadFiles("script/fibwp.lang.kt", "script/fibwprunner.ktscript");
loadFiles("script/fibwp.lang.kt", "script/fibwprunner.kts");
Class aClass = generateClass("Fibwprunner");
try {
Constructor constructor = aClass.getConstructor();
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDiagnosticsTest.java
+1 -1
View File
@@ -47,7 +47,7 @@ public abstract class AbstractLazyResolveDiagnosticsTest extends BaseDiagnostics
PackageViewDescriptor expected = eagerModule.getPackage(FqName.ROOT);
PackageViewDescriptor actual = lazyModule.getPackage(FqName.ROOT);
String txtFileRelativePath = path.replaceAll("\\.kt$|\\.ktscript", ".txt");
String txtFileRelativePath = path.replaceAll("\\.kt$|\\.kts$", ".txt");
File txtFile = new File("compiler/testData/lazyResolve/diagnostics/" + txtFileRelativePath);
// Only recurse into those packages mentioned in the files