Rename test files to scripts to trigger proper scripting initialization

fix generation config accordingly
This commit is contained in:
Ilya Chernikov
2019-02-04 14:56:23 +01:00
parent 2b67dbe8dd
commit 2c02ee3d29
10 changed files with 308 additions and 352 deletions
File diff suppressed because it is too large Load Diff
@@ -2512,11 +2512,6 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW
runTest("compiler/testData/diagnostics/testsWithStdLib/experimental/overrideDifferentExperimentalities.kt");
}
@TestMetadata("scripts.kt")
public void testScripts() throws Exception {
runTest("compiler/testData/diagnostics/testsWithStdLib/experimental/scripts.kt");
}
@TestMetadata("topLevel.kt")
public void testTopLevel() throws Exception {
runTest("compiler/testData/diagnostics/testsWithStdLib/experimental/topLevel.kt");
@@ -2512,11 +2512,6 @@ public class DiagnosticsTestWithStdLibUsingJavacGenerated extends AbstractDiagno
runTest("compiler/testData/diagnostics/testsWithStdLib/experimental/overrideDifferentExperimentalities.kt");
}
@TestMetadata("scripts.kt")
public void testScripts() throws Exception {
runTest("compiler/testData/diagnostics/testsWithStdLib/experimental/scripts.kt");
}
@TestMetadata("topLevel.kt")
public void testTopLevel() throws Exception {
runTest("compiler/testData/diagnostics/testsWithStdLib/experimental/topLevel.kt");
@@ -858,11 +858,6 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
runTest("compiler/testData/diagnostics/tests/annotations/ConstructorCall.kt");
}
@TestMetadata("DanglingInScript.kt")
public void testDanglingInScript() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/DanglingInScript.kt");
}
@TestMetadata("DanglingMixed.kt")
public void testDanglingMixed() throws Exception {
runTest("compiler/testData/diagnostics/tests/annotations/DanglingMixed.kt");
@@ -16172,11 +16167,6 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
runTest("compiler/testData/diagnostics/tests/redeclarations/RedeclaringPrivateToFile.kt");
}
@TestMetadata("ScriptAndClassConflict.kt")
public void testScriptAndClassConflict() throws Exception {
runTest("compiler/testData/diagnostics/tests/redeclarations/ScriptAndClassConflict.kt");
}
@TestMetadata("SingletonAndFunctionSameName.kt")
public void testSingletonAndFunctionSameName() throws Exception {
runTest("compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.kt");
@@ -18449,11 +18439,6 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
public void testAllFilesPresentInScript() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/script"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
}
@TestMetadata("varInScript.kt")
public void testVarInScript() throws Exception {
runTest("compiler/testData/diagnostics/tests/script/varInScript.kt");
}
}
@TestMetadata("compiler/testData/diagnostics/tests/sealed")
@@ -20921,11 +20906,6 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
runTest("compiler/testData/diagnostics/tests/sourceCompatibility/noLocalDelegatedProperty.kt");
}
@TestMetadata("noLocalDelegatedPropertyInScript.kt")
public void testNoLocalDelegatedPropertyInScript() throws Exception {
runTest("compiler/testData/diagnostics/tests/sourceCompatibility/noLocalDelegatedPropertyInScript.kt");
}
@TestMetadata("noMultiplatformProjects.kt")
public void testNoMultiplatformProjects() throws Exception {
runTest("compiler/testData/diagnostics/tests/sourceCompatibility/noMultiplatformProjects.kt");
@@ -54,8 +54,7 @@ fun main(args: Array<String>) {
testGroup("compiler/tests", "compiler/testData") {
testClass<AbstractDiagnosticsTest> {
model("diagnostics/tests")
model("diagnostics/tests/script", extension = "kts")
model("diagnostics/tests", pattern = "^(.*)\\.kts?$")
model("codegen/box/diagnostics")
}