Minor, move old Java nullability assertion tests under oldLanguageVersions/
Also drop the (now confusing) "_lv12" suffix from newer tests
This commit is contained in:
+64
-38
@@ -14316,24 +14316,14 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
|
||||
runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/functionWithBigArity.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("incWithNullabilityAssertionOnExtensionReceiverInPrivateOperator_lv11.kt")
|
||||
public void testIncWithNullabilityAssertionOnExtensionReceiverInPrivateOperator_lv11() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiverInPrivateOperator_lv11.kt");
|
||||
@TestMetadata("incWithNullabilityAssertionOnExtensionReceiver.kt")
|
||||
public void testIncWithNullabilityAssertionOnExtensionReceiver() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiver.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("incWithNullabilityAssertionOnExtensionReceiverInPrivateOperator_lv12.kt")
|
||||
public void testIncWithNullabilityAssertionOnExtensionReceiverInPrivateOperator_lv12() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiverInPrivateOperator_lv12.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("incWithNullabilityAssertionOnExtensionReceiver_lv11.kt")
|
||||
public void testIncWithNullabilityAssertionOnExtensionReceiver_lv11() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiver_lv11.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("incWithNullabilityAssertionOnExtensionReceiver_lv12.kt")
|
||||
public void testIncWithNullabilityAssertionOnExtensionReceiver_lv12() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiver_lv12.kt");
|
||||
@TestMetadata("incWithNullabilityAssertionOnExtensionReceiverInPrivateOperator.kt")
|
||||
public void testIncWithNullabilityAssertionOnExtensionReceiverInPrivateOperator() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiverInPrivateOperator.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("localEntities.kt")
|
||||
@@ -14346,34 +14336,24 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
|
||||
runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/mapPut.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("nullabilityAssertionOnExtensionReceiver_lv11.kt")
|
||||
public void testNullabilityAssertionOnExtensionReceiver_lv11() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/nullabilityAssertionOnExtensionReceiver_lv11.kt");
|
||||
@TestMetadata("nullabilityAssertionOnExtensionReceiver.kt")
|
||||
public void testNullabilityAssertionOnExtensionReceiver() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/nullabilityAssertionOnExtensionReceiver.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("nullabilityAssertionOnExtensionReceiver_lv12.kt")
|
||||
public void testNullabilityAssertionOnExtensionReceiver_lv12() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/nullabilityAssertionOnExtensionReceiver_lv12.kt");
|
||||
@TestMetadata("nullabilityAssertionOnInlineFunExtensionReceiver.kt")
|
||||
public void testNullabilityAssertionOnInlineFunExtensionReceiver() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/nullabilityAssertionOnInlineFunExtensionReceiver.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("nullabilityAssertionOnInlineFunExtensionReceiver_lv11.kt")
|
||||
public void testNullabilityAssertionOnInlineFunExtensionReceiver_lv11() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/nullabilityAssertionOnInlineFunExtensionReceiver_lv11.kt");
|
||||
@TestMetadata("nullabilityAssertionOnMemberExtensionReceiver.kt")
|
||||
public void testNullabilityAssertionOnMemberExtensionReceiver() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/nullabilityAssertionOnMemberExtensionReceiver.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("nullabilityAssertionOnInlineFunExtensionReceiver_lv12.kt")
|
||||
public void testNullabilityAssertionOnInlineFunExtensionReceiver_lv12() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/nullabilityAssertionOnInlineFunExtensionReceiver_lv12.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("nullabilityAssertionOnMemberExtensionReceiver_lv12.kt")
|
||||
public void testNullabilityAssertionOnMemberExtensionReceiver_lv12() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/nullabilityAssertionOnMemberExtensionReceiver_lv12.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("nullabilityAssertionOnPrivateMemberExtensionReceiver_lv12.kt")
|
||||
public void testNullabilityAssertionOnPrivateMemberExtensionReceiver_lv12() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/nullabilityAssertionOnPrivateMemberExtensionReceiver_lv12.kt");
|
||||
@TestMetadata("nullabilityAssertionOnPrivateMemberExtensionReceiver.kt")
|
||||
public void testNullabilityAssertionOnPrivateMemberExtensionReceiver() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/javaInterop/notNullAssertions/nullabilityAssertionOnPrivateMemberExtensionReceiver.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("paramAssertionMessage.kt")
|
||||
@@ -17643,6 +17623,52 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
|
||||
}
|
||||
}
|
||||
|
||||
@TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/javaInterop")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
@RunWith(JUnit3RunnerWithInners.class)
|
||||
public static class JavaInterop extends AbstractBlackBoxCodegenTest {
|
||||
private void runTest(String testDataFilePath) throws Exception {
|
||||
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
|
||||
}
|
||||
|
||||
public void testAllFilesPresentInJavaInterop() throws Exception {
|
||||
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/javaInterop"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true);
|
||||
}
|
||||
|
||||
@TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
@RunWith(JUnit3RunnerWithInners.class)
|
||||
public static class NotNullAssertions extends AbstractBlackBoxCodegenTest {
|
||||
private void runTest(String testDataFilePath) throws Exception {
|
||||
KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
|
||||
}
|
||||
|
||||
public void testAllFilesPresentInNotNullAssertions() throws Exception {
|
||||
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JVM, true);
|
||||
}
|
||||
|
||||
@TestMetadata("incWithNullabilityAssertionOnExtensionReceiverInPrivateOperator_lv11.kt")
|
||||
public void testIncWithNullabilityAssertionOnExtensionReceiverInPrivateOperator_lv11() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiverInPrivateOperator_lv11.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("incWithNullabilityAssertionOnExtensionReceiver_lv11.kt")
|
||||
public void testIncWithNullabilityAssertionOnExtensionReceiver_lv11() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions/incWithNullabilityAssertionOnExtensionReceiver_lv11.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("nullabilityAssertionOnExtensionReceiver_lv11.kt")
|
||||
public void testNullabilityAssertionOnExtensionReceiver_lv11() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions/nullabilityAssertionOnExtensionReceiver_lv11.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("nullabilityAssertionOnInlineFunExtensionReceiver_lv11.kt")
|
||||
public void testNullabilityAssertionOnInlineFunExtensionReceiver_lv11() throws Exception {
|
||||
runTest("compiler/testData/codegen/box/oldLanguageVersions/javaInterop/notNullAssertions/nullabilityAssertionOnInlineFunExtensionReceiver_lv11.kt");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@TestMetadata("compiler/testData/codegen/box/oldLanguageVersions/operatorConventions")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
@RunWith(JUnit3RunnerWithInners.class)
|
||||
|
||||
Reference in New Issue
Block a user