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

Added tests with SAM adapter inherited in Kotlin class.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-06-20 20:47:21 +04:00
parent 5c3577dfed
commit f4c3a89408
7 changed files with 61 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java
+5
View File
@@ -150,6 +150,11 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege
doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/fileFilter.kt");
}
@TestMetadata("inheritedInKotlin.kt")
public void testInheritedInKotlin() throws Exception {
doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/inheritedInKotlin.kt");
}
@TestMetadata("inheritedOverriddenAdapter.kt")
public void testInheritedOverriddenAdapter() throws Exception {
doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/inheritedOverriddenAdapter.kt");
compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
+21 -1
View File
@@ -1409,12 +1409,31 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
}
@TestMetadata("compiler/testData/loadJava/javaAgainstKotlin")
@InnerTestClasses({JavaAgainstKotlin.SignaturePropagation.class, JavaAgainstKotlin.Visibility.class})
@InnerTestClasses({JavaAgainstKotlin.SamAdapters.class, JavaAgainstKotlin.SignaturePropagation.class, JavaAgainstKotlin.Visibility.class})
public static class JavaAgainstKotlin extends AbstractLoadJavaTest {
public void testAllFilesPresentInJavaAgainstKotlin() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/javaAgainstKotlin"), Pattern.compile("^(.+)\\.txt$"), true);
}
@TestMetadata("compiler/testData/loadJava/javaAgainstKotlin/samAdapters")
@InnerTestClasses({})
public static class SamAdapters extends AbstractLoadJavaTest {
public void testAllFilesPresentInSamAdapters() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/javaAgainstKotlin/samAdapters"), Pattern.compile("^(.+)\\.txt$"), true);
}
@TestMetadata("InheritSamAdapterInKotlin.txt")
public void testInheritSamAdapterInKotlin() throws Exception {
doTestJavaAgainstKotlin("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritSamAdapterInKotlin.txt");
}
public static Test innerSuite() {
TestSuite suite = new TestSuite("SamAdapters");
suite.addTestSuite(SamAdapters.class);
return suite;
}
}
@TestMetadata("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation")
@InnerTestClasses({})
public static class SignaturePropagation extends AbstractLoadJavaTest {
@@ -1481,6 +1500,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
public static Test innerSuite() {
TestSuite suite = new TestSuite("JavaAgainstKotlin");
suite.addTestSuite(JavaAgainstKotlin.class);
suite.addTest(SamAdapters.innerSuite());
suite.addTest(SignaturePropagation.innerSuite());
suite.addTest(Visibility.innerSuite());
return suite;