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

Move 'writeFlags' java 8 tests to common

Browse Source
This commit is contained in:
Mikhael Bogdanov
2018-10-22 17:17:45 +02:00
parent 37c38b6e43
commit 4284c19a16
10 changed files with 74 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/java8/writeFlags/defaults/compatibility/propertyAccessors.kt → compiler/testData/writeFlags/jvm8/defaults/compatibility/propertyAccessors.kt
Vendored
View File
compiler/testData/codegen/java8/writeFlags/defaults/compatibility/propertyAnnotation.kt → compiler/testData/writeFlags/jvm8/defaults/compatibility/propertyAnnotation.kt
Vendored
View File
compiler/testData/codegen/java8/writeFlags/defaults/defaultMethod.kt → compiler/testData/writeFlags/jvm8/defaults/defaultMethod.kt
Vendored
View File
compiler/testData/codegen/java8/writeFlags/defaults/defaultProperty.kt → compiler/testData/writeFlags/jvm8/defaults/defaultProperty.kt
Vendored
View File
compiler/testData/codegen/java8/writeFlags/defaults/propertyAnnotation.kt → compiler/testData/writeFlags/jvm8/defaults/propertyAnnotation.kt
Vendored
View File
compiler/testData/codegen/java8/writeFlags/interfaceMethod.kt → compiler/testData/writeFlags/jvm8/interfaceMethod.kt
Vendored
View File
compiler/testData/codegen/java8/writeFlags/interfaceProperty.kt → compiler/testData/writeFlags/jvm8/interfaceProperty.kt
Vendored
View File
compiler/tests-java8/tests/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java
Generated
-92
View File
@@ -1,92 +0,0 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.codegen.flags;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.TargetBackend;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.runner.RunWith;
import java.io.File;
import java.util.regex.Pattern;
/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/codegen/java8/writeFlags")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
}
public void testAllFilesPresentInWriteFlags() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/java8/writeFlags"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
}
@TestMetadata("interfaceMethod.kt")
public void testInterfaceMethod() throws Exception {
runTest("compiler/testData/codegen/java8/writeFlags/interfaceMethod.kt");
}
@TestMetadata("interfaceProperty.kt")
public void testInterfaceProperty() throws Exception {
runTest("compiler/testData/codegen/java8/writeFlags/interfaceProperty.kt");
}
@TestMetadata("compiler/testData/codegen/java8/writeFlags/defaults")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class Defaults extends AbstractWriteFlagsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
}
public void testAllFilesPresentInDefaults() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/java8/writeFlags/defaults"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
}
@TestMetadata("defaultMethod.kt")
public void testDefaultMethod() throws Exception {
runTest("compiler/testData/codegen/java8/writeFlags/defaults/defaultMethod.kt");
}
@TestMetadata("defaultProperty.kt")
public void testDefaultProperty() throws Exception {
runTest("compiler/testData/codegen/java8/writeFlags/defaults/defaultProperty.kt");
}
@TestMetadata("propertyAnnotation.kt")
public void testPropertyAnnotation() throws Exception {
runTest("compiler/testData/codegen/java8/writeFlags/defaults/propertyAnnotation.kt");
}
@TestMetadata("compiler/testData/codegen/java8/writeFlags/defaults/compatibility")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class Compatibility extends AbstractWriteFlagsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
}
public void testAllFilesPresentInCompatibility() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/java8/writeFlags/defaults/compatibility"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
}
@TestMetadata("propertyAccessors.kt")
public void testPropertyAccessors() throws Exception {
runTest("compiler/testData/codegen/java8/writeFlags/defaults/compatibility/propertyAccessors.kt");
}
@TestMetadata("propertyAnnotation.kt")
public void testPropertyAnnotation() throws Exception {
runTest("compiler/testData/codegen/java8/writeFlags/defaults/compatibility/propertyAnnotation.kt");
}
}
}
}
compiler/tests-java8/tests/org/jetbrains/kotlin/generators/tests/GenerateJava8Tests.kt
-4
View File
@@ -71,10 +71,6 @@ fun main(args: Array<String>) {
model("codegen/java8/compileKotlinAgainstKotlin")
}
testClass<AbstractWriteFlagsTest> {
model("codegen/java8/writeFlags")
}
testClass<AbstractBytecodeTextTest>("BytecodeTextJava8TestGenerated") {
model("codegen/java8/bytecodeText")
}
compiler/tests/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java
Generated
+74
View File
@@ -707,6 +707,80 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
}
}
@TestMetadata("compiler/testData/writeFlags/jvm8")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class Jvm8 extends AbstractWriteFlagsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
}
public void testAllFilesPresentInJvm8() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/jvm8"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
}
@TestMetadata("interfaceMethod.kt")
public void testInterfaceMethod() throws Exception {
runTest("compiler/testData/writeFlags/jvm8/interfaceMethod.kt");
}
@TestMetadata("interfaceProperty.kt")
public void testInterfaceProperty() throws Exception {
runTest("compiler/testData/writeFlags/jvm8/interfaceProperty.kt");
}
@TestMetadata("compiler/testData/writeFlags/jvm8/defaults")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class Defaults extends AbstractWriteFlagsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
}
public void testAllFilesPresentInDefaults() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
}
@TestMetadata("defaultMethod.kt")
public void testDefaultMethod() throws Exception {
runTest("compiler/testData/writeFlags/jvm8/defaults/defaultMethod.kt");
}
@TestMetadata("defaultProperty.kt")
public void testDefaultProperty() throws Exception {
runTest("compiler/testData/writeFlags/jvm8/defaults/defaultProperty.kt");
}
@TestMetadata("propertyAnnotation.kt")
public void testPropertyAnnotation() throws Exception {
runTest("compiler/testData/writeFlags/jvm8/defaults/propertyAnnotation.kt");
}
@TestMetadata("compiler/testData/writeFlags/jvm8/defaults/compatibility")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class Compatibility extends AbstractWriteFlagsTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
}
public void testAllFilesPresentInCompatibility() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/jvm8/defaults/compatibility"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
}
@TestMetadata("propertyAccessors.kt")
public void testPropertyAccessors() throws Exception {
runTest("compiler/testData/writeFlags/jvm8/defaults/compatibility/propertyAccessors.kt");
}
@TestMetadata("propertyAnnotation.kt")
public void testPropertyAnnotation() throws Exception {
runTest("compiler/testData/writeFlags/jvm8/defaults/compatibility/propertyAnnotation.kt");
}
}
}
}
@TestMetadata("compiler/testData/writeFlags/lambda")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)