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

Move java8 'compileKotlinAgainstKotlin' test under 'codegen/java8/compileKotlinAgainstKotlin/jvm6' folder

Browse Source
This commit is contained in:
Mikhael Bogdanov
2016-05-17 16:27:45 +03:00
parent 0169f10bf3
commit 77a386a266
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/compileKotlinAgainstKotlinJava8/jdk8Against6.kt → compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm6/jdk8Against6.kt
Vendored
View File
compiler/tests-java8/tests/org/jetbrains/kotlin/codegen/CompileKotlinAgainstKotlinTestGenerated.java
+16 -7
View File
@@ -27,17 +27,26 @@ import java.util.regex.Pattern;
/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all") @SuppressWarnings("all")
@TestMetadata("compiler/testData/compileKotlinAgainstKotlinJava8") @TestMetadata("compiler/testData/codegen/java8/compileKotlinAgainstKotlin")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)
public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotlinAgainstKotlinTest { public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotlinAgainstKotlinTest {
public void testAllFilesPresentInCompileKotlinAgainstKotlinJava8() throws Exception { public void testAllFilesPresentInCompileKotlinAgainstKotlin() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileKotlinAgainstKotlinJava8"), Pattern.compile("^(.+)\\.kt$"), true); KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/java8/compileKotlinAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), true);
} }
@TestMetadata("jdk8Against6.kt") @TestMetadata("compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm6")
public void testJdk8Against6() throws Exception { @TestDataPath("$PROJECT_ROOT")
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlinJava8/jdk8Against6.kt"); @RunWith(JUnit3RunnerWithInners.class)
doTest(fileName); public static class Jvm6 extends AbstractCompileKotlinAgainstKotlinTest {
public void testAllFilesPresentInJvm6() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm6"), Pattern.compile("^(.+)\\.kt$"), true);
}
@TestMetadata("jdk8Against6.kt")
public void testJdk8Against6() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm6/jdk8Against6.kt");
doTest(fileName);
}
} }
} }
generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+1 -1
View File
@@ -374,7 +374,7 @@ fun main(args: Array<String>) {
} }
testClass<AbstractCompileKotlinAgainstKotlinTest>() { testClass<AbstractCompileKotlinAgainstKotlinTest>() {
model("compileKotlinAgainstKotlinJava8") model("codegen/java8/compileKotlinAgainstKotlin")
} }
testClass<AbstractJava8WriteSignatureTest>() { testClass<AbstractJava8WriteSignatureTest>() {