Rename CompileKotlinAgainstCustomJava test

It's not against Java per se, but rather any binaries

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"));
 

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;

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(