From b69970d6216b8930d0ac9dd3ff1e9723ee069af3 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 5 Sep 2013 18:21:35 +0400 Subject: [PATCH] Rename CompileKotlinAgainstCustomJava test It's not against Java per se, but rather any binaries --- .../duplicateLibraries/DuplicateLibTest-1.jar | Bin .../duplicateLibraries/DuplicateLibTest-2.jar | Bin .../duplicateLibraries/DuplicateLibraries.kt | 0 .../duplicateLibraries/DuplicateLibraries.txt | 0 .../duplicateLibraries/DuplicateTest.kt.txt | 0 .../MissingEnum.jar | Bin .../MissingEnum.kt.txt | 0 .../MissingEnumReferencedInAnnotation.kt | 0 .../MissingEnumReferencedInAnnotation.txt | 0 ...mpileKotlinAgainstCustomBinariesTest.java} | 2 +- ...KotlinAgainstCustomBinariesGenerated.java} | 32 +++++++++--------- .../jet/generators/tests/GenerateTests.java | 6 ++-- 12 files changed, 20 insertions(+), 20 deletions(-) rename compiler/testData/{compileKotlinAgainstCustomJava => compileKotlinAgainstCustomBinaries}/duplicateLibraries/DuplicateLibTest-1.jar (100%) rename compiler/testData/{compileKotlinAgainstCustomJava => compileKotlinAgainstCustomBinaries}/duplicateLibraries/DuplicateLibTest-2.jar (100%) rename compiler/testData/{compileKotlinAgainstCustomJava => compileKotlinAgainstCustomBinaries}/duplicateLibraries/DuplicateLibraries.kt (100%) rename compiler/testData/{compileKotlinAgainstCustomJava => compileKotlinAgainstCustomBinaries}/duplicateLibraries/DuplicateLibraries.txt (100%) rename compiler/testData/{compileKotlinAgainstCustomJava => compileKotlinAgainstCustomBinaries}/duplicateLibraries/DuplicateTest.kt.txt (100%) rename compiler/testData/{compileKotlinAgainstCustomJava => compileKotlinAgainstCustomBinaries}/missingEnumReferencedInAnnotation/MissingEnum.jar (100%) rename compiler/testData/{compileKotlinAgainstCustomJava => compileKotlinAgainstCustomBinaries}/missingEnumReferencedInAnnotation/MissingEnum.kt.txt (100%) rename compiler/testData/{compileKotlinAgainstCustomJava => compileKotlinAgainstCustomBinaries}/missingEnumReferencedInAnnotation/MissingEnumReferencedInAnnotation.kt (100%) rename compiler/testData/{compileKotlinAgainstCustomJava => compileKotlinAgainstCustomBinaries}/missingEnumReferencedInAnnotation/MissingEnumReferencedInAnnotation.txt (100%) rename compiler/tests/org/jetbrains/jet/jvm/compiler/{AbstractCompileKotlinAgainstCustomJavaTest.java => AbstractCompileKotlinAgainstCustomBinariesTest.java} (97%) rename compiler/tests/org/jetbrains/jet/jvm/compiler/{CompileKotlinAgainstCustomJavaGenerated.java => CompileKotlinAgainstCustomBinariesGenerated.java} (65%) diff --git a/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibTest-1.jar b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-1.jar similarity index 100% rename from compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibTest-1.jar rename to compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-1.jar diff --git a/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibTest-2.jar b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-2.jar similarity index 100% rename from compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibTest-2.jar rename to compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibTest-2.jar diff --git a/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibraries.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibraries.kt similarity index 100% rename from compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibraries.kt rename to compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibraries.kt diff --git a/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibraries.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibraries.txt similarity index 100% rename from compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibraries.txt rename to compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibraries.txt diff --git a/compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateTest.kt.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateTest.kt.txt similarity index 100% rename from compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateTest.kt.txt rename to compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateTest.kt.txt diff --git a/compiler/testData/compileKotlinAgainstCustomJava/missingEnumReferencedInAnnotation/MissingEnum.jar b/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnum.jar similarity index 100% rename from compiler/testData/compileKotlinAgainstCustomJava/missingEnumReferencedInAnnotation/MissingEnum.jar rename to compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnum.jar diff --git a/compiler/testData/compileKotlinAgainstCustomJava/missingEnumReferencedInAnnotation/MissingEnum.kt.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnum.kt.txt similarity index 100% rename from compiler/testData/compileKotlinAgainstCustomJava/missingEnumReferencedInAnnotation/MissingEnum.kt.txt rename to compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnum.kt.txt diff --git a/compiler/testData/compileKotlinAgainstCustomJava/missingEnumReferencedInAnnotation/MissingEnumReferencedInAnnotation.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnumReferencedInAnnotation.kt similarity index 100% rename from compiler/testData/compileKotlinAgainstCustomJava/missingEnumReferencedInAnnotation/MissingEnumReferencedInAnnotation.kt rename to compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnumReferencedInAnnotation.kt diff --git a/compiler/testData/compileKotlinAgainstCustomJava/missingEnumReferencedInAnnotation/MissingEnumReferencedInAnnotation.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnumReferencedInAnnotation.txt similarity index 100% rename from compiler/testData/compileKotlinAgainstCustomJava/missingEnumReferencedInAnnotation/MissingEnumReferencedInAnnotation.txt rename to compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnumReferencedInAnnotation.txt diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstCustomJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstCustomBinariesTest.java similarity index 97% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstCustomJavaTest.java rename to compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstCustomBinariesTest.java index e0fc544af53..a16320c1873 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstCustomJavaTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstCustomBinariesTest.java @@ -47,7 +47,7 @@ import java.util.regex.Pattern; import static org.jetbrains.jet.test.util.NamespaceComparator.validateAndCompareNamespaceWithFile; -public abstract class AbstractCompileKotlinAgainstCustomJavaTest extends TestCaseWithTmpdir { +public abstract class AbstractCompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { protected void doTest(String ktFilePath) throws Exception { Assert.assertTrue(ktFilePath.endsWith(".kt")); diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomJavaGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesGenerated.java similarity index 65% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomJavaGenerated.java rename to compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesGenerated.java index 5d7afaeb7e7..4a24808fbf4 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomJavaGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesGenerated.java @@ -26,46 +26,46 @@ import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; -import org.jetbrains.jet.jvm.compiler.AbstractCompileKotlinAgainstCustomJavaTest; +import org.jetbrains.jet.jvm.compiler.AbstractCompileKotlinAgainstCustomBinariesTest; /** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("compiler/testData/compileKotlinAgainstCustomJava") -@InnerTestClasses({CompileKotlinAgainstCustomJavaGenerated.DuplicateLibraries.class, CompileKotlinAgainstCustomJavaGenerated.MissingEnumReferencedInAnnotation.class}) -public class CompileKotlinAgainstCustomJavaGenerated extends AbstractCompileKotlinAgainstCustomJavaTest { - public void testAllFilesPresentInCompileKotlinAgainstCustomJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/compileKotlinAgainstCustomJava"), Pattern.compile("^(.+)\\.kt$"), true); +@TestMetadata("compiler/testData/compileKotlinAgainstCustomBinaries") +@InnerTestClasses({CompileKotlinAgainstCustomBinariesGenerated.DuplicateLibraries.class, CompileKotlinAgainstCustomBinariesGenerated.MissingEnumReferencedInAnnotation.class}) +public class CompileKotlinAgainstCustomBinariesGenerated extends AbstractCompileKotlinAgainstCustomBinariesTest { + public void testAllFilesPresentInCompileKotlinAgainstCustomBinaries() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/compileKotlinAgainstCustomBinaries"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries") - public static class DuplicateLibraries extends AbstractCompileKotlinAgainstCustomJavaTest { + @TestMetadata("compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries") + public static class DuplicateLibraries extends AbstractCompileKotlinAgainstCustomBinariesTest { public void testAllFilesPresentInDuplicateLibraries() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DuplicateLibraries.kt") public void testDuplicateLibraries() throws Exception { - doTest("compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries/DuplicateLibraries.kt"); + doTest("compiler/testData/compileKotlinAgainstCustomBinaries/duplicateLibraries/DuplicateLibraries.kt"); } } - @TestMetadata("compiler/testData/compileKotlinAgainstCustomJava/missingEnumReferencedInAnnotation") - public static class MissingEnumReferencedInAnnotation extends AbstractCompileKotlinAgainstCustomJavaTest { + @TestMetadata("compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation") + public static class MissingEnumReferencedInAnnotation extends AbstractCompileKotlinAgainstCustomBinariesTest { public void testAllFilesPresentInMissingEnumReferencedInAnnotation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/compileKotlinAgainstCustomJava/missingEnumReferencedInAnnotation"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MissingEnumReferencedInAnnotation.kt") public void testMissingEnumReferencedInAnnotation() throws Exception { - doTest("compiler/testData/compileKotlinAgainstCustomJava/missingEnumReferencedInAnnotation/MissingEnumReferencedInAnnotation.kt"); + doTest("compiler/testData/compileKotlinAgainstCustomBinaries/missingEnumReferencedInAnnotation/MissingEnumReferencedInAnnotation.kt"); } } public static Test suite() { - TestSuite suite = new TestSuite("CompileKotlinAgainstCustomJavaGenerated"); - suite.addTestSuite(CompileKotlinAgainstCustomJavaGenerated.class); + TestSuite suite = new TestSuite("CompileKotlinAgainstCustomBinariesGenerated"); + suite.addTestSuite(CompileKotlinAgainstCustomBinariesGenerated.class); suite.addTestSuite(DuplicateLibraries.class); suite.addTestSuite(MissingEnumReferencedInAnnotation.class); return suite; diff --git a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java index 8a90f1d6e6c..b1d5af9db16 100644 --- a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java +++ b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java @@ -197,9 +197,9 @@ public class GenerateTests { generateTest( "compiler/tests/", - "CompileKotlinAgainstCustomJavaGenerated", - AbstractCompileKotlinAgainstCustomJavaTest.class, - testModel("compiler/testData/compileKotlinAgainstCustomJava") + "CompileKotlinAgainstCustomBinariesGenerated", + AbstractCompileKotlinAgainstCustomBinariesTest.class, + testModel("compiler/testData/compileKotlinAgainstCustomBinaries") ); generateTest(