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

Introduced simple propagation of nullability on loading Java.

Browse Source 
#KT-2776 in progress
This commit is contained in:
Evgeny Gerashchenko
2012-11-02 15:12:24 +04:00
parent 961fde3c8a
commit 1f4d994480
21 changed files with 367 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
+55 -1
View File
@@ -234,7 +234,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
}
@TestMetadata("compiler/testData/loadJava/kotlinSignature")
@InnerTestClasses({KotlinSignature.Error.class})
@InnerTestClasses({KotlinSignature.Error.class, KotlinSignature.Propagation.class})
public static class KotlinSignature extends AbstractLoadJavaTest {
public void testAllFilesPresentInKotlinSignature() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature"), "java", true);
@@ -433,10 +433,64 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
}
@TestMetadata("compiler/testData/loadJava/kotlinSignature/propagation")
@InnerTestClasses({Propagation.Return.class})
public static class Propagation extends AbstractLoadJavaTest {
public void testAllFilesPresentInPropagation() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/propagation"), "java", true);
}
@TestMetadata("compiler/testData/loadJava/kotlinSignature/propagation/return")
public static class Return extends AbstractLoadJavaTest {
@TestMetadata("AddNotNullJavaSubtype.java")
public void testAddNotNullJavaSubtype() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.java");
}
@TestMetadata("AddNotNullSameJavaType.java")
public void testAddNotNullSameJavaType() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.java");
}
@TestMetadata("AddNullabilityJavaSubtype.java")
public void testAddNullabilityJavaSubtype() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java");
}
@TestMetadata("AddNullabilitySameJavaType.java")
public void testAddNullabilitySameJavaType() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.java");
}
public void testAllFilesPresentInReturn() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/propagation/return"), "java", true);
}
@TestMetadata("InheritNullabilityJavaSubtype.java")
public void testInheritNullabilityJavaSubtype() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.java");
}
@TestMetadata("InheritNullabilitySameJavaType.java")
public void testInheritNullabilitySameJavaType() throws Exception {
doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.java");
}
}
public static Test innerSuite() {
TestSuite suite = new TestSuite("Propagation");
suite.addTestSuite(Propagation.class);
suite.addTestSuite(Return.class);
return suite;
}
}
public static Test innerSuite() {
TestSuite suite = new TestSuite("KotlinSignature");
suite.addTestSuite(KotlinSignature.class);
suite.addTestSuite(Error.class);
suite.addTest(Propagation.innerSuite());
return suite;
}
}
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
+55 -1
View File
@@ -1129,7 +1129,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
}
@TestMetadata("compiler/testData/loadJava/kotlinSignature")
@InnerTestClasses({KotlinSignature.Error.class})
@InnerTestClasses({KotlinSignature.Error.class, KotlinSignature.Propagation.class})
public static class KotlinSignature extends AbstractLazyResolveNamespaceComparingTest {
public void testAllFilesPresentInKotlinSignature() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature"), "kt", true);
@@ -1328,10 +1328,64 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
}
@TestMetadata("compiler/testData/loadJava/kotlinSignature/propagation")
@InnerTestClasses({Propagation.Return.class})
public static class Propagation extends AbstractLazyResolveNamespaceComparingTest {
public void testAllFilesPresentInPropagation() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/propagation"), "kt", true);
}
@TestMetadata("compiler/testData/loadJava/kotlinSignature/propagation/return")
public static class Return extends AbstractLazyResolveNamespaceComparingTest {
@TestMetadata("AddNotNullJavaSubtype.kt")
public void testAddNotNullJavaSubtype() throws Exception {
doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt");
}
@TestMetadata("AddNotNullSameJavaType.kt")
public void testAddNotNullSameJavaType() throws Exception {
doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt");
}
@TestMetadata("AddNullabilityJavaSubtype.kt")
public void testAddNullabilityJavaSubtype() throws Exception {
doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt");
}
@TestMetadata("AddNullabilitySameJavaType.kt")
public void testAddNullabilitySameJavaType() throws Exception {
doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt");
}
public void testAllFilesPresentInReturn() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/propagation/return"), "kt", true);
}
@TestMetadata("InheritNullabilityJavaSubtype.kt")
public void testInheritNullabilityJavaSubtype() throws Exception {
doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt");
}
@TestMetadata("InheritNullabilitySameJavaType.kt")
public void testInheritNullabilitySameJavaType() throws Exception {
doTestSinglePackage("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt");
}
}
public static Test innerSuite() {
TestSuite suite = new TestSuite("Propagation");
suite.addTestSuite(Propagation.class);
suite.addTestSuite(Return.class);
return suite;
}
}
public static Test innerSuite() {
TestSuite suite = new TestSuite("KotlinSignature");
suite.addTestSuite(KotlinSignature.class);
suite.addTestSuite(Error.class);
suite.addTest(Propagation.innerSuite());
return suite;
}
}