Basic support for resolving top-level SAM interfaces.

This commit is contained in:
Evgeny Gerashchenko
2013-03-12 18:58:37 +04:00
parent 282c69eb6b
commit 2718f7698c
10 changed files with 168 additions and 15 deletions
@@ -178,6 +178,11 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT
doTestWithAccessors("compiler/testData/loadKotlin/class/NestedGenericClass.kt");
}
@TestMetadata("SingleAbstractMethod.kt")
public void testSingleAbstractMethod() throws Exception {
doTestWithAccessors("compiler/testData/loadKotlin/class/SingleAbstractMethod.kt");
}
@TestMetadata("Trait.kt")
public void testTrait() throws Exception {
doTestWithAccessors("compiler/testData/loadKotlin/class/Trait.kt");
@@ -971,7 +971,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
}
@TestMetadata("compiler/testData/loadJava/compiledJava")
@InnerTestClasses({CompiledJava.Annotations.class, CompiledJava.ProtectedPackage.class, CompiledJava.ProtectedStatic.class, CompiledJava.SignaturePropagation.class, CompiledJava.Static.class})
@InnerTestClasses({CompiledJava.Annotations.class, CompiledJava.ProtectedPackage.class, CompiledJava.ProtectedStatic.class, CompiledJava.SignaturePropagation.class, CompiledJava.SingleAbstractMethod.class, CompiledJava.Static.class})
public static class CompiledJava extends AbstractLoadJavaTest {
public void testAllFilesPresentInCompiledJava() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJava"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1124,6 +1124,19 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
}
@TestMetadata("compiler/testData/loadJava/compiledJava/singleAbstractMethod")
public static class SingleAbstractMethod extends AbstractLoadJavaTest {
public void testAllFilesPresentInSingleAbstractMethod() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJava/singleAbstractMethod"), Pattern.compile("^(.+)\\.java$"), true);
}
@TestMetadata("Runnable.java")
public void testRunnable() throws Exception {
doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/Runnable.java");
}
}
@TestMetadata("compiler/testData/loadJava/compiledJava/static")
public static class Static extends AbstractLoadJavaTest {
public void testAllFilesPresentInStatic() throws Exception {
@@ -1169,6 +1182,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
suite.addTestSuite(ProtectedPackage.class);
suite.addTestSuite(ProtectedStatic.class);
suite.addTestSuite(SignaturePropagation.class);
suite.addTestSuite(SingleAbstractMethod.class);
suite.addTestSuite(Static.class);
return suite;
}
@@ -180,6 +180,11 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/class/NestedGenericClass.kt");
}
@TestMetadata("SingleAbstractMethod.kt")
public void testSingleAbstractMethod() throws Exception {
doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/class/SingleAbstractMethod.kt");
}
@TestMetadata("Trait.kt")
public void testTrait() throws Exception {
doTestCheckingPrimaryConstructorsAndAccessors("compiler/testData/loadKotlin/class/Trait.kt");