Rename test data folder according to the new test naming convention.
This commit is contained in:
Pavel V. Talanov
@@ -61,7 +61,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
|
||||
"LoadJavaTestGenerated",
|
||||
AbstractLoadJavaTest.class,
|
||||
Arrays.asList(
|
||||
new SimpleTestClassModel(new File("compiler/testData/readJavaBinaryClass"), true, extension, "doTest")
|
||||
new SimpleTestClassModel(new File("compiler/testData/loadJava"), true, extension, "doTest")
|
||||
),
|
||||
AbstractLoadJavaTest.class
|
||||
).generateAndSave();
|
||||
|
||||
@@ -35,7 +35,7 @@ import static org.jetbrains.jet.test.util.NamespaceComparator.compareNamespaces;
|
||||
*/
|
||||
public final class LoadCompiledKotlinCustomTest extends TestCaseWithTmpdir {
|
||||
@NotNull
|
||||
private static final String PATH = "compiler/testData/loadKotlinDescriptors";
|
||||
private static final String PATH = "compiler/testData/loadKotlinCustom";
|
||||
|
||||
private void doTest(@NotNull String expectedFileName, @NotNull String kotlinFileName) throws Exception {
|
||||
NamespaceDescriptor namespaceFromClass =
|
||||
|
||||
@@ -65,7 +65,7 @@ public final class LoadCompiledKotlinTest extends TestCaseWithTmpdir {
|
||||
}
|
||||
|
||||
public static Test suite() {
|
||||
return JetTestCaseBuilder.suiteForDirectory(JetTestCaseBuilder.getTestDataPathBase(), "/readKotlinBinaryClass", true, new JetTestCaseBuilder.NamedTestFactory() {
|
||||
return JetTestCaseBuilder.suiteForDirectory(JetTestCaseBuilder.getTestDataPathBase(), "/loadKotlin", true, new JetTestCaseBuilder.NamedTestFactory() {
|
||||
@NotNull
|
||||
@Override
|
||||
public Test createTest(@NotNull String dataPath, @NotNull String name, @NotNull File file) {
|
||||
|
||||
@@ -40,7 +40,7 @@ import static org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.compileJavaAndEx
|
||||
*/
|
||||
public final class LoadJavaCustomTest extends KotlinTestWithEnvironment {
|
||||
@NotNull
|
||||
private static final String PATH = "compiler/testData/loadJavaDescriptors";
|
||||
private static final String PATH = "compiler/testData/loadJavaCustom";
|
||||
|
||||
@Override
|
||||
protected JetCoreEnvironment createEnvironment() {
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.jetbrains.jet.jvm.compiler;
|
||||
|
||||
import junit.framework.Test;
|
||||
@@ -24,341 +23,341 @@ import org.jetbrains.jet.test.TestMetadata;
|
||||
import java.io.File;
|
||||
|
||||
/** This class is generated by {@link org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest}. DO NOT MODIFY MANUALLY */
|
||||
@TestMetadata("compiler/testData/readJavaBinaryClass")
|
||||
@TestMetadata("compiler/testData/loadJava")
|
||||
public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
|
||||
public void testAllFilesPresentInReadJavaBinaryClass() throws Exception {
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass"), "java", false);
|
||||
public void testAllFilesPresentInLoadJava() throws Exception {
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava"), "java", false);
|
||||
}
|
||||
|
||||
@TestMetadata("ArrayTypeVariance.java")
|
||||
public void testArrayTypeVariance() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/ArrayTypeVariance.java");
|
||||
doTest("compiler/testData/loadJava/ArrayTypeVariance.java");
|
||||
}
|
||||
|
||||
@TestMetadata("ClassDoesNotOverrideMethod.java")
|
||||
public void testClassDoesNotOverrideMethod() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/ClassDoesNotOverrideMethod.java");
|
||||
doTest("compiler/testData/loadJava/ClassDoesNotOverrideMethod.java");
|
||||
}
|
||||
|
||||
@TestMetadata("ClassWithTypeP.java")
|
||||
public void testClassWithTypeP() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/ClassWithTypeP.java");
|
||||
doTest("compiler/testData/loadJava/ClassWithTypeP.java");
|
||||
}
|
||||
|
||||
@TestMetadata("ClassWithTypePExtendsIterableP.java")
|
||||
public void testClassWithTypePExtendsIterableP() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/ClassWithTypePExtendsIterableP.java");
|
||||
doTest("compiler/testData/loadJava/ClassWithTypePExtendsIterableP.java");
|
||||
}
|
||||
|
||||
@TestMetadata("ClassWithTypePP.java")
|
||||
public void testClassWithTypePP() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/ClassWithTypePP.java");
|
||||
doTest("compiler/testData/loadJava/ClassWithTypePP.java");
|
||||
}
|
||||
|
||||
@TestMetadata("ClassWithTypePRefNext.java")
|
||||
public void testClassWithTypePRefNext() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/ClassWithTypePRefNext.java");
|
||||
doTest("compiler/testData/loadJava/ClassWithTypePRefNext.java");
|
||||
}
|
||||
|
||||
@TestMetadata("ClassWithTypePRefSelf.java")
|
||||
public void testClassWithTypePRefSelf() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/ClassWithTypePRefSelf.java");
|
||||
doTest("compiler/testData/loadJava/ClassWithTypePRefSelf.java");
|
||||
}
|
||||
|
||||
@TestMetadata("FieldAsVar.java")
|
||||
public void testFieldAsVar() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/FieldAsVar.java");
|
||||
doTest("compiler/testData/loadJava/FieldAsVar.java");
|
||||
}
|
||||
|
||||
@TestMetadata("FieldOfArrayType.java")
|
||||
public void testFieldOfArrayType() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/FieldOfArrayType.java");
|
||||
doTest("compiler/testData/loadJava/FieldOfArrayType.java");
|
||||
}
|
||||
|
||||
@TestMetadata("FinalFieldAsVal.java")
|
||||
public void testFinalFieldAsVal() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/FinalFieldAsVal.java");
|
||||
doTest("compiler/testData/loadJava/FinalFieldAsVal.java");
|
||||
}
|
||||
|
||||
@TestMetadata("InnerClass.java")
|
||||
public void testInnerClass() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/InnerClass.java");
|
||||
doTest("compiler/testData/loadJava/InnerClass.java");
|
||||
}
|
||||
|
||||
@TestMetadata("InnerClassReferencesOuterTP.java")
|
||||
public void testInnerClassReferencesOuterTP() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/InnerClassReferencesOuterTP.java");
|
||||
doTest("compiler/testData/loadJava/InnerClassReferencesOuterTP.java");
|
||||
}
|
||||
|
||||
@TestMetadata("InnerClassesInGeneric.java")
|
||||
public void testInnerClassesInGeneric() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/InnerClassesInGeneric.java");
|
||||
doTest("compiler/testData/loadJava/InnerClassesInGeneric.java");
|
||||
}
|
||||
|
||||
@TestMetadata("MethodReferencesOuterClassTP.java")
|
||||
public void testMethodReferencesOuterClassTP() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/MethodReferencesOuterClassTP.java");
|
||||
doTest("compiler/testData/loadJava/MethodReferencesOuterClassTP.java");
|
||||
}
|
||||
|
||||
@TestMetadata("MethodTypePOneUpperBound.java")
|
||||
public void testMethodTypePOneUpperBound() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/MethodTypePOneUpperBound.java");
|
||||
doTest("compiler/testData/loadJava/MethodTypePOneUpperBound.java");
|
||||
}
|
||||
|
||||
@TestMetadata("MethodTypePTwoUpperBounds.java")
|
||||
public void testMethodTypePTwoUpperBounds() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/MethodTypePTwoUpperBounds.java");
|
||||
doTest("compiler/testData/loadJava/MethodTypePTwoUpperBounds.java");
|
||||
}
|
||||
|
||||
@TestMetadata("MethodWithTypeP.java")
|
||||
public void testMethodWithTypeP() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/MethodWithTypeP.java");
|
||||
doTest("compiler/testData/loadJava/MethodWithTypeP.java");
|
||||
}
|
||||
|
||||
@TestMetadata("MethodWithTypePP.java")
|
||||
public void testMethodWithTypePP() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/MethodWithTypePP.java");
|
||||
doTest("compiler/testData/loadJava/MethodWithTypePP.java");
|
||||
}
|
||||
|
||||
@TestMetadata("MethodWithTypePRefClassP.java")
|
||||
public void testMethodWithTypePRefClassP() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/MethodWithTypePRefClassP.java");
|
||||
doTest("compiler/testData/loadJava/MethodWithTypePRefClassP.java");
|
||||
}
|
||||
|
||||
@TestMetadata("MethosWithPRefTP.java")
|
||||
public void testMethosWithPRefTP() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/MethosWithPRefTP.java");
|
||||
doTest("compiler/testData/loadJava/MethosWithPRefTP.java");
|
||||
}
|
||||
|
||||
@TestMetadata("MyException.java")
|
||||
public void testMyException() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/MyException.java");
|
||||
doTest("compiler/testData/loadJava/MyException.java");
|
||||
}
|
||||
|
||||
@TestMetadata("Simple.java")
|
||||
public void testSimple() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/Simple.java");
|
||||
doTest("compiler/testData/loadJava/Simple.java");
|
||||
}
|
||||
|
||||
@TestMetadata("TwoFields.java")
|
||||
public void testTwoFields() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/TwoFields.java");
|
||||
doTest("compiler/testData/loadJava/TwoFields.java");
|
||||
}
|
||||
|
||||
@TestMetadata("compiler/testData/readJavaBinaryClass/annotation")
|
||||
@TestMetadata("compiler/testData/loadJava/annotation")
|
||||
public static class Annotation extends AbstractLoadJavaTest {
|
||||
public void testAllFilesPresentInAnnotation() throws Exception {
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass/annotation"), "java", false);
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/annotation"), "java", false);
|
||||
}
|
||||
|
||||
@TestMetadata("AnnotatedAnnotation.java")
|
||||
public void testAnnotatedAnnotation() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/annotation/AnnotatedAnnotation.java");
|
||||
doTest("compiler/testData/loadJava/annotation/AnnotatedAnnotation.java");
|
||||
}
|
||||
|
||||
@TestMetadata("AnnotatedMethod.java")
|
||||
public void testAnnotatedMethod() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/annotation/AnnotatedMethod.java");
|
||||
doTest("compiler/testData/loadJava/annotation/AnnotatedMethod.java");
|
||||
}
|
||||
|
||||
@TestMetadata("SimpleAnnotation.java")
|
||||
public void testSimpleAnnotation() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/annotation/SimpleAnnotation.java");
|
||||
doTest("compiler/testData/loadJava/annotation/SimpleAnnotation.java");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@TestMetadata("compiler/testData/readJavaBinaryClass/constructor")
|
||||
@TestMetadata("compiler/testData/loadJava/constructor")
|
||||
public static class Constructor extends AbstractLoadJavaTest {
|
||||
public void testAllFilesPresentInConstructor() throws Exception {
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass/constructor"), "java", false);
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/constructor"), "java", false);
|
||||
}
|
||||
|
||||
@TestMetadata("ConstructorGenericDeep.java")
|
||||
public void testConstructorGenericDeep() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.java");
|
||||
doTest("compiler/testData/loadJava/constructor/ConstructorGenericDeep.java");
|
||||
}
|
||||
|
||||
@TestMetadata("ConstructorGenericSimple.java")
|
||||
public void testConstructorGenericSimple() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.java");
|
||||
doTest("compiler/testData/loadJava/constructor/ConstructorGenericSimple.java");
|
||||
}
|
||||
|
||||
@TestMetadata("ConstructorGenericUpperBound.java")
|
||||
public void testConstructorGenericUpperBound() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.java");
|
||||
doTest("compiler/testData/loadJava/constructor/ConstructorGenericUpperBound.java");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@TestMetadata("compiler/testData/readJavaBinaryClass/javaBean")
|
||||
@TestMetadata("compiler/testData/loadJava/javaBean")
|
||||
public static class JavaBean extends AbstractLoadJavaTest {
|
||||
public void testAllFilesPresentInJavaBean() throws Exception {
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass/javaBean"), "java", false);
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/javaBean"), "java", false);
|
||||
}
|
||||
|
||||
@TestMetadata("DifferentGetterAndSetter.java")
|
||||
public void testDifferentGetterAndSetter() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/javaBean/DifferentGetterAndSetter.java");
|
||||
doTest("compiler/testData/loadJava/javaBean/DifferentGetterAndSetter.java");
|
||||
}
|
||||
|
||||
@TestMetadata("JavaBeanAbstractGetter.java")
|
||||
public void testJavaBeanAbstractGetter() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/javaBean/JavaBeanAbstractGetter.java");
|
||||
doTest("compiler/testData/loadJava/javaBean/JavaBeanAbstractGetter.java");
|
||||
}
|
||||
|
||||
@TestMetadata("JavaBeanVal.java")
|
||||
public void testJavaBeanVal() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVal.java");
|
||||
doTest("compiler/testData/loadJava/javaBean/JavaBeanVal.java");
|
||||
}
|
||||
|
||||
@TestMetadata("JavaBeanVar.java")
|
||||
public void testJavaBeanVar() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVar.java");
|
||||
doTest("compiler/testData/loadJava/javaBean/JavaBeanVar.java");
|
||||
}
|
||||
|
||||
@TestMetadata("JavaBeanVarOfGenericType.java")
|
||||
public void testJavaBeanVarOfGenericType() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/javaBean/JavaBeanVarOfGenericType.java");
|
||||
doTest("compiler/testData/loadJava/javaBean/JavaBeanVarOfGenericType.java");
|
||||
}
|
||||
|
||||
@TestMetadata("TwoSetters.java")
|
||||
public void testTwoSetters() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/javaBean/TwoSetters.java");
|
||||
doTest("compiler/testData/loadJava/javaBean/TwoSetters.java");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@TestMetadata("compiler/testData/readJavaBinaryClass/kotlinSignature")
|
||||
@TestMetadata("compiler/testData/loadJava/kotlinSignature")
|
||||
public static class KotlinSignature extends AbstractLoadJavaTest {
|
||||
public void testAllFilesPresentInKotlinSignature() throws Exception {
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass/kotlinSignature"), "java", false);
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/kotlinSignature"), "java", false);
|
||||
}
|
||||
|
||||
@TestMetadata("MethodWithFunctionTypes.java")
|
||||
public void testMethodWithFunctionTypes() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithFunctionTypes.java");
|
||||
doTest("compiler/testData/loadJava/kotlinSignature/MethodWithFunctionTypes.java");
|
||||
}
|
||||
|
||||
@TestMetadata("MethodWithGenerics.java")
|
||||
public void testMethodWithGenerics() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithGenerics.java");
|
||||
doTest("compiler/testData/loadJava/kotlinSignature/MethodWithGenerics.java");
|
||||
}
|
||||
|
||||
@TestMetadata("MethodWithTupleType.java")
|
||||
public void testMethodWithTupleType() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTupleType.java");
|
||||
doTest("compiler/testData/loadJava/kotlinSignature/MethodWithTupleType.java");
|
||||
}
|
||||
|
||||
@TestMetadata("MethodWithTypeParameters.java")
|
||||
public void testMethodWithTypeParameters() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithTypeParameters.java");
|
||||
doTest("compiler/testData/loadJava/kotlinSignature/MethodWithTypeParameters.java");
|
||||
}
|
||||
|
||||
@TestMetadata("MethodWithVararg.java")
|
||||
public void testMethodWithVararg() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/MethodWithVararg.java");
|
||||
doTest("compiler/testData/loadJava/kotlinSignature/MethodWithVararg.java");
|
||||
}
|
||||
|
||||
@TestMetadata("compiler/testData/readJavaBinaryClass/kotlinSignature/error")
|
||||
@TestMetadata("compiler/testData/loadJava/kotlinSignature/error")
|
||||
public static class Error extends AbstractLoadJavaTest {
|
||||
@TestMetadata("AddingNullability.java")
|
||||
public void testAddingNullability() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/AddingNullability.java");
|
||||
doTest("compiler/testData/loadJava/kotlinSignature/error/AddingNullability.java");
|
||||
}
|
||||
|
||||
public void testAllFilesPresentInError() throws Exception {
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass/kotlinSignature/error"), "java", false);
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/kotlinSignature/error"), "java", false);
|
||||
}
|
||||
|
||||
@TestMetadata("ExtraUpperBound.java")
|
||||
public void testExtraUpperBound() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/ExtraUpperBound.java");
|
||||
doTest("compiler/testData/loadJava/kotlinSignature/error/ExtraUpperBound.java");
|
||||
}
|
||||
|
||||
@TestMetadata("MissingUpperBound.java")
|
||||
public void testMissingUpperBound() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/MissingUpperBound.java");
|
||||
doTest("compiler/testData/loadJava/kotlinSignature/error/MissingUpperBound.java");
|
||||
}
|
||||
|
||||
@TestMetadata("NotVarargReplacedWithVararg.java")
|
||||
public void testNotVarargReplacedWithVararg() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/NotVarargReplacedWithVararg.java");
|
||||
doTest("compiler/testData/loadJava/kotlinSignature/error/NotVarargReplacedWithVararg.java");
|
||||
}
|
||||
|
||||
@TestMetadata("ReturnTypeMissing.java")
|
||||
public void testReturnTypeMissing() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/ReturnTypeMissing.java");
|
||||
doTest("compiler/testData/loadJava/kotlinSignature/error/ReturnTypeMissing.java");
|
||||
}
|
||||
|
||||
@TestMetadata("SyntaxError.java")
|
||||
public void testSyntaxError() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/SyntaxError.java");
|
||||
doTest("compiler/testData/loadJava/kotlinSignature/error/SyntaxError.java");
|
||||
}
|
||||
|
||||
@TestMetadata("VarargReplacedWithNotVararg.java")
|
||||
public void testVarargReplacedWithNotVararg() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/VarargReplacedWithNotVararg.java");
|
||||
doTest("compiler/testData/loadJava/kotlinSignature/error/VarargReplacedWithNotVararg.java");
|
||||
}
|
||||
|
||||
@TestMetadata("WrongMethodName.java")
|
||||
public void testWrongMethodName() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongMethodName.java");
|
||||
doTest("compiler/testData/loadJava/kotlinSignature/error/WrongMethodName.java");
|
||||
}
|
||||
|
||||
@TestMetadata("WrongReturnTypeStructure.java")
|
||||
public void testWrongReturnTypeStructure() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongReturnTypeStructure.java");
|
||||
doTest("compiler/testData/loadJava/kotlinSignature/error/WrongReturnTypeStructure.java");
|
||||
}
|
||||
|
||||
@TestMetadata("WrongTypeName1.java")
|
||||
public void testWrongTypeName1() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName1.java");
|
||||
doTest("compiler/testData/loadJava/kotlinSignature/error/WrongTypeName1.java");
|
||||
}
|
||||
|
||||
@TestMetadata("WrongTypeName2.java")
|
||||
public void testWrongTypeName2() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName2.java");
|
||||
doTest("compiler/testData/loadJava/kotlinSignature/error/WrongTypeName2.java");
|
||||
}
|
||||
|
||||
@TestMetadata("WrongTypeName3.java")
|
||||
public void testWrongTypeName3() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeName3.java");
|
||||
doTest("compiler/testData/loadJava/kotlinSignature/error/WrongTypeName3.java");
|
||||
}
|
||||
|
||||
@TestMetadata("WrongTypeParameterBoundStructure1.java")
|
||||
public void testWrongTypeParameterBoundStructure1() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParameterBoundStructure1.java");
|
||||
doTest("compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java");
|
||||
}
|
||||
|
||||
@TestMetadata("WrongTypeParameterBoundStructure2.java")
|
||||
public void testWrongTypeParameterBoundStructure2() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParameterBoundStructure2.java");
|
||||
doTest("compiler/testData/loadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java");
|
||||
}
|
||||
|
||||
@TestMetadata("WrongTypeParametersCount.java")
|
||||
public void testWrongTypeParametersCount() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeParametersCount.java");
|
||||
doTest("compiler/testData/loadJava/kotlinSignature/error/WrongTypeParametersCount.java");
|
||||
}
|
||||
|
||||
@TestMetadata("WrongTypeVariance.java")
|
||||
public void testWrongTypeVariance() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongTypeVariance.java");
|
||||
doTest("compiler/testData/loadJava/kotlinSignature/error/WrongTypeVariance.java");
|
||||
}
|
||||
|
||||
@TestMetadata("WrongValueParameterStructure1.java")
|
||||
public void testWrongValueParameterStructure1() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParameterStructure1.java");
|
||||
doTest("compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure1.java");
|
||||
}
|
||||
|
||||
@TestMetadata("WrongValueParameterStructure2.java")
|
||||
public void testWrongValueParameterStructure2() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParameterStructure2.java");
|
||||
doTest("compiler/testData/loadJava/kotlinSignature/error/WrongValueParameterStructure2.java");
|
||||
}
|
||||
|
||||
@TestMetadata("WrongValueParametersCount.java")
|
||||
public void testWrongValueParametersCount() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/kotlinSignature/error/WrongValueParametersCount.java");
|
||||
doTest("compiler/testData/loadJava/kotlinSignature/error/WrongValueParametersCount.java");
|
||||
}
|
||||
|
||||
}
|
||||
@@ -371,56 +370,56 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
|
||||
}
|
||||
}
|
||||
|
||||
@TestMetadata("compiler/testData/readJavaBinaryClass/modality")
|
||||
@TestMetadata("compiler/testData/loadJava/modality")
|
||||
public static class Modality extends AbstractLoadJavaTest {
|
||||
public void testAllFilesPresentInModality() throws Exception {
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass/modality"), "java", false);
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/modality"), "java", false);
|
||||
}
|
||||
|
||||
@TestMetadata("ModalityOfFakeOverrides.java")
|
||||
public void testModalityOfFakeOverrides() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/modality/ModalityOfFakeOverrides.java");
|
||||
doTest("compiler/testData/loadJava/modality/ModalityOfFakeOverrides.java");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@TestMetadata("compiler/testData/readJavaBinaryClass/notNull")
|
||||
@TestMetadata("compiler/testData/loadJava/notNull")
|
||||
public static class NotNull extends AbstractLoadJavaTest {
|
||||
public void testAllFilesPresentInNotNull() throws Exception {
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass/notNull"), "java", false);
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/notNull"), "java", false);
|
||||
}
|
||||
|
||||
@TestMetadata("NotNullField.java")
|
||||
public void testNotNullField() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/notNull/NotNullField.java");
|
||||
doTest("compiler/testData/loadJava/notNull/NotNullField.java");
|
||||
}
|
||||
|
||||
@TestMetadata("NotNullMethod.java")
|
||||
public void testNotNullMethod() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/notNull/NotNullMethod.java");
|
||||
doTest("compiler/testData/loadJava/notNull/NotNullMethod.java");
|
||||
}
|
||||
|
||||
@TestMetadata("NotNullParameter.java")
|
||||
public void testNotNullParameter() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/notNull/NotNullParameter.java");
|
||||
doTest("compiler/testData/loadJava/notNull/NotNullParameter.java");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@TestMetadata("compiler/testData/readJavaBinaryClass/vararg")
|
||||
@TestMetadata("compiler/testData/loadJava/vararg")
|
||||
public static class Vararg extends AbstractLoadJavaTest {
|
||||
public void testAllFilesPresentInVararg() throws Exception {
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/readJavaBinaryClass/vararg"), "java", false);
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/vararg"), "java", false);
|
||||
}
|
||||
|
||||
@TestMetadata("VarargInt.java")
|
||||
public void testVarargInt() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/vararg/VarargInt.java");
|
||||
doTest("compiler/testData/loadJava/vararg/VarargInt.java");
|
||||
}
|
||||
|
||||
@TestMetadata("VarargString.java")
|
||||
public void testVarargString() throws Exception {
|
||||
doTest("compiler/testData/readJavaBinaryClass/vararg/VarargString.java");
|
||||
doTest("compiler/testData/loadJava/vararg/VarargString.java");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+2
-2
@@ -87,11 +87,11 @@ public abstract class AbstractLazyResolveNamespaceComparingTest extends KotlinTe
|
||||
"LazyResolveNamespaceComparingTestGenerated",
|
||||
AbstractLazyResolveNamespaceComparingTest.class,
|
||||
Arrays.asList(
|
||||
new SimpleTestClassModel(new File("compiler/testData/readKotlinBinaryClass"),
|
||||
new SimpleTestClassModel(new File("compiler/testData/loadKotlin"),
|
||||
true,
|
||||
extension,
|
||||
"doTestSinglePackage"),
|
||||
new SimpleTestClassModel(new File("compiler/testData/readJavaBinaryClass"),
|
||||
new SimpleTestClassModel(new File("compiler/testData/loadJava"),
|
||||
true,
|
||||
extension,
|
||||
"doTestSinglePackage"),
|
||||
|
||||
+259
-259
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user