From 6ef8f04a0182b1b86a76e21c29bbf6a1e3a77597 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 31 Jul 2013 15:02:06 +0400 Subject: [PATCH] Generate tests for type parameters Conflicts: generators/org/jetbrains/jet/generators/tests/GenerateTests.java --- .../jet/generators/tests/GenerateTests.java | 2 +- .../JetSafeDeleteTestGenerated.java | 96 ++++++++++++++++++- 2 files changed, 96 insertions(+), 2 deletions(-) diff --git a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java index 471ab8964eb..16022e193a3 100644 --- a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java +++ b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java @@ -419,7 +419,7 @@ public class GenerateTests { testModel("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava", "doPropertyTestWithJava"), testModel("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin", "doJavaPropertyTest"), testModel("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter", "doTypeParameterTest"), - testModel("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter", "doValueParameterTest") + testModel("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava", "doTypeParameterTestWithJava") ); generateTest( diff --git a/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java b/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java index 9b86ba7d0dc..f7d6a684df6 100644 --- a/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.safeDelete.AbstractJetSafeDeleteTest; /** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({JetSafeDeleteTestGenerated.KotlinClass.class, JetSafeDeleteTestGenerated.KotlinObject.class, JetSafeDeleteTestGenerated.KotlinFunction.class, JetSafeDeleteTestGenerated.KotlinFunctionWithJava.class, JetSafeDeleteTestGenerated.JavaFunctionWithKotlin.class, JetSafeDeleteTestGenerated.KotlinProperty.class, JetSafeDeleteTestGenerated.KotlinPropertyWithJava.class, JetSafeDeleteTestGenerated.JavaPropertyWithKotlin.class, JetSafeDeleteTestGenerated.KotlinTypeParameter.class}) +@InnerTestClasses({JetSafeDeleteTestGenerated.KotlinClass.class, JetSafeDeleteTestGenerated.KotlinObject.class, JetSafeDeleteTestGenerated.KotlinFunction.class, JetSafeDeleteTestGenerated.KotlinFunctionWithJava.class, JetSafeDeleteTestGenerated.JavaFunctionWithKotlin.class, JetSafeDeleteTestGenerated.KotlinProperty.class, JetSafeDeleteTestGenerated.KotlinPropertyWithJava.class, JetSafeDeleteTestGenerated.JavaPropertyWithKotlin.class, JetSafeDeleteTestGenerated.KotlinTypeParameter.class, JetSafeDeleteTestGenerated.KotlinTypeParameterWithJava.class}) public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteClass/kotlinClass") public static class KotlinClass extends AbstractJetSafeDeleteTest { @@ -539,6 +539,99 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { } + @TestMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava") + public static class KotlinTypeParameterWithJava extends AbstractJetSafeDeleteTest { + public void testAllFilesPresentInKotlinTypeParameterWithJava() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("internalUsages1.kt") + public void testInternalUsages1() throws Exception { + doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.kt"); + } + + @TestMetadata("internalUsages2.kt") + public void testInternalUsages2() throws Exception { + doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.kt"); + } + + @TestMetadata("internalUsages3.kt") + public void testInternalUsages3() throws Exception { + doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.kt"); + } + + @TestMetadata("internalUsages4.kt") + public void testInternalUsages4() throws Exception { + doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.kt"); + } + + @TestMetadata("internalUsages5.kt") + public void testInternalUsages5() throws Exception { + doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt"); + } + + @TestMetadata("rawType.kt") + public void testRawType() throws Exception { + doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.kt"); + } + + @TestMetadata("safeUsagesWithConstraint1.kt") + public void testSafeUsagesWithConstraint1() throws Exception { + doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.kt"); + } + + @TestMetadata("safeUsagesWithConstraint2.kt") + public void testSafeUsagesWithConstraint2() throws Exception { + doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.kt"); + } + + @TestMetadata("subclass1.kt") + public void testSubclass1() throws Exception { + doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.kt"); + } + + @TestMetadata("subclass2.kt") + public void testSubclass2() throws Exception { + doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.kt"); + } + + @TestMetadata("subst1.kt") + public void testSubst1() throws Exception { + doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.kt"); + } + + @TestMetadata("subst2.kt") + public void testSubst2() throws Exception { + doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.kt"); + } + + @TestMetadata("subst3.kt") + public void testSubst3() throws Exception { + doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.kt"); + } + + @TestMetadata("subst4.kt") + public void testSubst4() throws Exception { + doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt"); + } + + @TestMetadata("subst5.kt") + public void testSubst5() throws Exception { + doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt"); + } + + @TestMetadata("subst6.kt") + public void testSubst6() throws Exception { + doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.kt"); + } + + @TestMetadata("subst7.kt") + public void testSubst7() throws Exception { + doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.kt"); + } + + } + public static Test suite() { TestSuite suite = new TestSuite("JetSafeDeleteTestGenerated"); suite.addTestSuite(KotlinClass.class); @@ -550,6 +643,7 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { suite.addTestSuite(KotlinPropertyWithJava.class); suite.addTestSuite(JavaPropertyWithKotlin.class); suite.addTestSuite(KotlinTypeParameter.class); + suite.addTestSuite(KotlinTypeParameterWithJava.class); return suite; } }