diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractReadJavaBinaryClassTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java similarity index 89% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractReadJavaBinaryClassTest.java rename to compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java index 1572e1c216a..ea21dadb259 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractReadJavaBinaryClassTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java @@ -36,7 +36,10 @@ import static org.jetbrains.jet.test.util.NamespaceComparator.compareNamespaces; /** * @author Stepan Koltsov */ -public abstract class AbstractReadJavaBinaryClassTest extends TestCaseWithTmpdir { +/* + The generated test compares namespace descriptors loaded from kotlin sources and read from compiled java. +*/ +public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { public void doTest(@NotNull String javaFileName) throws Exception { Assert.assertTrue("A java file expected: " + javaFileName, javaFileName.endsWith(".java")); @@ -55,12 +58,12 @@ public abstract class AbstractReadJavaBinaryClassTest extends TestCaseWithTmpdir new TestGenerator( "compiler/tests/", aPackage, - "ReadJavaBinaryClassTestGenerated", - AbstractReadJavaBinaryClassTest.class, + "LoadJavaTestGenerated", + AbstractLoadJavaTest.class, Arrays.asList( new SimpleTestClassModel(new File("compiler/testData/readJavaBinaryClass"), true, extension, "doTest") ), - AbstractReadJavaBinaryClassTest.class + AbstractLoadJavaTest.class ).generateAndSave(); } } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadKotlinDescriptorsTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinCustomTest.java similarity index 87% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/LoadKotlinDescriptorsTest.java rename to compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinCustomTest.java index f4e81b97c9a..b74a10289cf 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadKotlinDescriptorsTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinCustomTest.java @@ -29,7 +29,11 @@ import static org.jetbrains.jet.test.util.NamespaceComparator.compareNamespaces; /** * @author Pavel Talanov */ -public final class LoadKotlinDescriptorsTest extends TestCaseWithTmpdir { +/* + This test should be implemented via LoadCompiledKotlinTest. + Atm it's not possible due to enums being loaded differently from binaries (in contrast to from sources). + */ +public final class LoadCompiledKotlinCustomTest extends TestCaseWithTmpdir { @NotNull private static final String PATH = "compiler/testData/loadKotlinDescriptors"; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadKotlinBinaryClassTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTest.java similarity index 93% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/ReadKotlinBinaryClassTest.java rename to compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTest.java index c5770a03aa1..2b99c19ffd6 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadKotlinBinaryClassTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTest.java @@ -38,7 +38,7 @@ import static org.jetbrains.jet.test.util.NamespaceComparator.compareNamespaces; * @author Stepan Koltsov */ @SuppressWarnings("JUnitTestCaseWithNoTests") -public final class ReadKotlinBinaryClassTest extends TestCaseWithTmpdir { +public final class LoadCompiledKotlinTest extends TestCaseWithTmpdir { @NotNull private final File testFile; @@ -46,7 +46,7 @@ public final class ReadKotlinBinaryClassTest extends TestCaseWithTmpdir { private final File txtFile; @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors") - public ReadKotlinBinaryClassTest(@NotNull File testFile) { + public LoadCompiledKotlinTest(@NotNull File testFile) { this.testFile = testFile; this.txtFile = new File(testFile.getPath().replaceFirst("\\.kt$", ".txt")); setName(testFile.getName()); @@ -69,7 +69,7 @@ public final class ReadKotlinBinaryClassTest extends TestCaseWithTmpdir { @NotNull @Override public Test createTest(@NotNull String dataPath, @NotNull String name, @NotNull File file) { - return new ReadKotlinBinaryClassTest(file); + return new LoadCompiledKotlinTest(file); } }); } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaDescriptorsTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java similarity index 94% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaDescriptorsTest.java rename to compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java index dbef2712386..8a4e8af8aaa 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaDescriptorsTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaCustomTest.java @@ -35,7 +35,10 @@ import static org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.compileJavaAndEx /** * @author Pavel Talanov */ -public final class LoadJavaDescriptorsTest extends KotlinTestWithEnvironment { +/* + LoadJavaTestGenerated should be used instead if possible. + */ +public final class LoadJavaCustomTest extends KotlinTestWithEnvironment { @NotNull private static final String PATH = "compiler/testData/loadJavaDescriptors"; @@ -81,6 +84,7 @@ public final class LoadJavaDescriptorsTest extends KotlinTestWithEnvironment { PATH + "/" + getTestName(false) + ".java"); } + //TODO: move to LoadJavaTestGenerated when possible public void testEnum() throws Exception { String dir = PATH + "/enum"; String javaDir = dir + "/java"; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java similarity index 88% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTestGenerated.java rename to compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java index 221bbecafae..03d4a5e0e4e 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java @@ -13,23 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.jetbrains.jet.jvm.compiler; -import junit.framework.Assert; import junit.framework.Test; import junit.framework.TestSuite; - -import java.io.File; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.TestMetadata; -import org.jetbrains.jet.jvm.compiler.AbstractReadJavaBinaryClassTest; +import java.io.File; -/** This class is generated by {@link org.jetbrains.jet.jvm.compiler.AbstractReadJavaBinaryClassTest}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest}. DO NOT MODIFY MANUALLY */ @TestMetadata("compiler/testData/readJavaBinaryClass") -public class ReadJavaBinaryClassTestGenerated extends AbstractReadJavaBinaryClassTest { +public class LoadJavaTestGenerated extends AbstractLoadJavaTest { public void testAllFilesPresentInReadJavaBinaryClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractReadJavaBinaryClassTest", new File("compiler/testData/readJavaBinaryClass"), "java", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass"), "java", false); } @TestMetadata("ArrayTypeVariance.java") @@ -148,9 +146,9 @@ public class ReadJavaBinaryClassTestGenerated extends AbstractReadJavaBinaryClas } @TestMetadata("compiler/testData/readJavaBinaryClass/annotation") - public static class Annotation extends AbstractReadJavaBinaryClassTest { + public static class Annotation extends AbstractLoadJavaTest { public void testAllFilesPresentInAnnotation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractReadJavaBinaryClassTest", new File("compiler/testData/readJavaBinaryClass/annotation"), "java", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass/annotation"), "java", false); } @TestMetadata("AnnotatedAnnotation.java") @@ -171,9 +169,9 @@ public class ReadJavaBinaryClassTestGenerated extends AbstractReadJavaBinaryClas } @TestMetadata("compiler/testData/readJavaBinaryClass/constructor") - public static class Constructor extends AbstractReadJavaBinaryClassTest { + public static class Constructor extends AbstractLoadJavaTest { public void testAllFilesPresentInConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractReadJavaBinaryClassTest", new File("compiler/testData/readJavaBinaryClass/constructor"), "java", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass/constructor"), "java", false); } @TestMetadata("ConstructorGenericDeep.java") @@ -194,9 +192,9 @@ public class ReadJavaBinaryClassTestGenerated extends AbstractReadJavaBinaryClas } @TestMetadata("compiler/testData/readJavaBinaryClass/javaBean") - public static class JavaBean extends AbstractReadJavaBinaryClassTest { + public static class JavaBean extends AbstractLoadJavaTest { public void testAllFilesPresentInJavaBean() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractReadJavaBinaryClassTest", new File("compiler/testData/readJavaBinaryClass/javaBean"), "java", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass/javaBean"), "java", false); } @TestMetadata("DifferentGetterAndSetter.java") @@ -232,9 +230,9 @@ public class ReadJavaBinaryClassTestGenerated extends AbstractReadJavaBinaryClas } @TestMetadata("compiler/testData/readJavaBinaryClass/kotlinSignature") - public static class KotlinSignature extends AbstractReadJavaBinaryClassTest { + public static class KotlinSignature extends AbstractLoadJavaTest { public void testAllFilesPresentInKotlinSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractReadJavaBinaryClassTest", new File("compiler/testData/readJavaBinaryClass/kotlinSignature"), "java", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass/kotlinSignature"), "java", false); } @TestMetadata("MethodWithFunctionTypes.java") @@ -263,14 +261,14 @@ public class ReadJavaBinaryClassTestGenerated extends AbstractReadJavaBinaryClas } @TestMetadata("compiler/testData/readJavaBinaryClass/kotlinSignature/error") - public static class Error extends AbstractReadJavaBinaryClassTest { + public static class Error extends AbstractLoadJavaTest { @TestMetadata("AddingNullability.java") public void testAddingNullability() throws Exception { doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/AddingNullability.java"); } public void testAllFilesPresentInError() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractReadJavaBinaryClassTest", new File("compiler/testData/readJavaBinaryClass/kotlinSignature/error"), "java", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass/kotlinSignature/error"), "java", false); } @TestMetadata("ExtraUpperBound.java") @@ -374,9 +372,9 @@ public class ReadJavaBinaryClassTestGenerated extends AbstractReadJavaBinaryClas } @TestMetadata("compiler/testData/readJavaBinaryClass/modality") - public static class Modality extends AbstractReadJavaBinaryClassTest { + public static class Modality extends AbstractLoadJavaTest { public void testAllFilesPresentInModality() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractReadJavaBinaryClassTest", new File("compiler/testData/readJavaBinaryClass/modality"), "java", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass/modality"), "java", false); } @TestMetadata("ModalityOfFakeOverrides.java") @@ -387,9 +385,9 @@ public class ReadJavaBinaryClassTestGenerated extends AbstractReadJavaBinaryClas } @TestMetadata("compiler/testData/readJavaBinaryClass/notNull") - public static class NotNull extends AbstractReadJavaBinaryClassTest { + public static class NotNull extends AbstractLoadJavaTest { public void testAllFilesPresentInNotNull() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractReadJavaBinaryClassTest", new File("compiler/testData/readJavaBinaryClass/notNull"), "java", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass/notNull"), "java", false); } @TestMetadata("NotNullField.java") @@ -410,9 +408,9 @@ public class ReadJavaBinaryClassTestGenerated extends AbstractReadJavaBinaryClas } @TestMetadata("compiler/testData/readJavaBinaryClass/vararg") - public static class Vararg extends AbstractReadJavaBinaryClassTest { + public static class Vararg extends AbstractLoadJavaTest { public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractReadJavaBinaryClassTest", new File("compiler/testData/readJavaBinaryClass/vararg"), "java", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass/vararg"), "java", false); } @TestMetadata("VarargInt.java") @@ -428,8 +426,8 @@ public class ReadJavaBinaryClassTestGenerated extends AbstractReadJavaBinaryClas } public static Test suite() { - TestSuite suite = new TestSuite("ReadJavaBinaryClassTestGenerated"); - suite.addTestSuite(ReadJavaBinaryClassTestGenerated.class); + TestSuite suite = new TestSuite("LoadJavaTestGenerated"); + suite.addTestSuite(LoadJavaTestGenerated.class); suite.addTestSuite(Annotation.class); suite.addTestSuite(Constructor.class); suite.addTestSuite(JavaBean.class);