Tests for renamed fields
This commit is contained in:
@@ -105,7 +105,7 @@ public abstract class AbstractWriteFlagsTest extends UsefulTestCase {
|
||||
int expectedAccess = getExpectedFlags(testedObject.textData);
|
||||
|
||||
if (isObjectExists) {
|
||||
assertEquals("Wrong access flag \n" + factory.asText(className), expectedAccess, classVisitor.getAccess());
|
||||
assertEquals("Wrong access flag for " + testedObject + " \n" + factory.asText(className), expectedAccess, classVisitor.getAccess());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -473,7 +473,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
|
||||
}
|
||||
|
||||
@TestMetadata("compiler/testData/writeFlags/property/classObject")
|
||||
@InnerTestClasses({ClassObject.Class.class, ClassObject.Trait.class})
|
||||
@InnerTestClasses({ClassObject.Class.class, ClassObject.Rename.class, ClassObject.Trait.class})
|
||||
public static class ClassObject extends AbstractWriteFlagsTest {
|
||||
public void testAllFilesPresentInClassObject() throws Exception {
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/property/classObject"), Pattern.compile("^(.+)\\.kt$"), true);
|
||||
@@ -582,6 +582,44 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
|
||||
|
||||
}
|
||||
|
||||
@TestMetadata("compiler/testData/writeFlags/property/classObject/rename")
|
||||
public static class Rename extends AbstractWriteFlagsTest {
|
||||
public void testAllFilesPresentInRename() throws Exception {
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/property/classObject/rename"), Pattern.compile("^(.+)\\.kt$"), true);
|
||||
}
|
||||
|
||||
@TestMetadata("constructorAndClassObject.kt")
|
||||
public void testConstructorAndClassObject() throws Exception {
|
||||
doTest("compiler/testData/writeFlags/property/classObject/rename/constructorAndClassObject.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("delegatedAndDelegated.kt")
|
||||
public void testDelegatedAndDelegated() throws Exception {
|
||||
doTest("compiler/testData/writeFlags/property/classObject/rename/delegatedAndDelegated.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("delegatedAndProperty.kt")
|
||||
public void testDelegatedAndProperty() throws Exception {
|
||||
doTest("compiler/testData/writeFlags/property/classObject/rename/delegatedAndProperty.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("extensionAndExtension.kt")
|
||||
public void testExtensionAndExtension() throws Exception {
|
||||
doTest("compiler/testData/writeFlags/property/classObject/rename/extensionAndExtension.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("extensionAndProperty.kt")
|
||||
public void testExtensionAndProperty() throws Exception {
|
||||
doTest("compiler/testData/writeFlags/property/classObject/rename/extensionAndProperty.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("propertyAndProperty.kt")
|
||||
public void testPropertyAndProperty() throws Exception {
|
||||
doTest("compiler/testData/writeFlags/property/classObject/rename/propertyAndProperty.kt");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@TestMetadata("compiler/testData/writeFlags/property/classObject/trait")
|
||||
public static class Trait extends AbstractWriteFlagsTest {
|
||||
public void testAllFilesPresentInTrait() throws Exception {
|
||||
@@ -689,6 +727,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
|
||||
TestSuite suite = new TestSuite("ClassObject");
|
||||
suite.addTestSuite(ClassObject.class);
|
||||
suite.addTestSuite(Class.class);
|
||||
suite.addTestSuite(Rename.class);
|
||||
suite.addTestSuite(Trait.class);
|
||||
return suite;
|
||||
}
|
||||
|
||||
+37
-3
@@ -31,7 +31,7 @@ import org.jetbrains.jet.codegen.generated.AbstractBlackBoxCodegenTest;
|
||||
/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
|
||||
@SuppressWarnings("all")
|
||||
@TestMetadata("compiler/testData/codegen/box")
|
||||
@InnerTestClasses({BlackBoxCodegenTestGenerated.Arrays.class, BlackBoxCodegenTestGenerated.Bridges.class, BlackBoxCodegenTestGenerated.CallableReference.class, BlackBoxCodegenTestGenerated.Casts.class, BlackBoxCodegenTestGenerated.Classes.class, BlackBoxCodegenTestGenerated.Closures.class, BlackBoxCodegenTestGenerated.ControlStructures.class, BlackBoxCodegenTestGenerated.DefaultArguments.class, BlackBoxCodegenTestGenerated.DelegatedProperty.class, BlackBoxCodegenTestGenerated.Elvis.class, BlackBoxCodegenTestGenerated.Enum.class, BlackBoxCodegenTestGenerated.ExclExcl.class, BlackBoxCodegenTestGenerated.ExtensionFunctions.class, BlackBoxCodegenTestGenerated.ExtensionProperties.class, BlackBoxCodegenTestGenerated.Functions.class, BlackBoxCodegenTestGenerated.InnerNested.class, BlackBoxCodegenTestGenerated.Instructions.class, BlackBoxCodegenTestGenerated.Intrinsics.class, BlackBoxCodegenTestGenerated.Labels.class, BlackBoxCodegenTestGenerated.LocalClasses.class, BlackBoxCodegenTestGenerated.MultiDecl.class, BlackBoxCodegenTestGenerated.Namespace.class, BlackBoxCodegenTestGenerated.Objects.class, BlackBoxCodegenTestGenerated.OperatorConventions.class, BlackBoxCodegenTestGenerated.PrimitiveTypes.class, BlackBoxCodegenTestGenerated.Properties.class, BlackBoxCodegenTestGenerated.Reflection.class, BlackBoxCodegenTestGenerated.SafeCall.class, BlackBoxCodegenTestGenerated.Sam.class, BlackBoxCodegenTestGenerated.Strings.class, BlackBoxCodegenTestGenerated.Super.class, BlackBoxCodegenTestGenerated.Traits.class, BlackBoxCodegenTestGenerated.TypeInfo.class, BlackBoxCodegenTestGenerated.Unit.class, BlackBoxCodegenTestGenerated.Vararg.class, BlackBoxCodegenTestGenerated.When.class})
|
||||
@InnerTestClasses({BlackBoxCodegenTestGenerated.Arrays.class, BlackBoxCodegenTestGenerated.Bridges.class, BlackBoxCodegenTestGenerated.CallableReference.class, BlackBoxCodegenTestGenerated.Casts.class, BlackBoxCodegenTestGenerated.Classes.class, BlackBoxCodegenTestGenerated.Closures.class, BlackBoxCodegenTestGenerated.ControlStructures.class, BlackBoxCodegenTestGenerated.DefaultArguments.class, BlackBoxCodegenTestGenerated.DelegatedProperty.class, BlackBoxCodegenTestGenerated.Elvis.class, BlackBoxCodegenTestGenerated.Enum.class, BlackBoxCodegenTestGenerated.ExclExcl.class, BlackBoxCodegenTestGenerated.ExtensionFunctions.class, BlackBoxCodegenTestGenerated.ExtensionProperties.class, BlackBoxCodegenTestGenerated.FieldRename.class, BlackBoxCodegenTestGenerated.Functions.class, BlackBoxCodegenTestGenerated.InnerNested.class, BlackBoxCodegenTestGenerated.Instructions.class, BlackBoxCodegenTestGenerated.Intrinsics.class, BlackBoxCodegenTestGenerated.Labels.class, BlackBoxCodegenTestGenerated.LocalClasses.class, BlackBoxCodegenTestGenerated.MultiDecl.class, BlackBoxCodegenTestGenerated.Namespace.class, BlackBoxCodegenTestGenerated.Objects.class, BlackBoxCodegenTestGenerated.OperatorConventions.class, BlackBoxCodegenTestGenerated.PrimitiveTypes.class, BlackBoxCodegenTestGenerated.Properties.class, BlackBoxCodegenTestGenerated.Reflection.class, BlackBoxCodegenTestGenerated.SafeCall.class, BlackBoxCodegenTestGenerated.Sam.class, BlackBoxCodegenTestGenerated.Strings.class, BlackBoxCodegenTestGenerated.Super.class, BlackBoxCodegenTestGenerated.Traits.class, BlackBoxCodegenTestGenerated.TypeInfo.class, BlackBoxCodegenTestGenerated.Unit.class, BlackBoxCodegenTestGenerated.Vararg.class, BlackBoxCodegenTestGenerated.When.class})
|
||||
public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
|
||||
public void testAllFilesPresentInBox() throws Exception {
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), true);
|
||||
@@ -1551,8 +1551,8 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
|
||||
doTest("compiler/testData/codegen/box/defaultArguments/constructor/kt2852.kt");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@TestMetadata("compiler/testData/codegen/box/defaultArguments/function")
|
||||
public static class Function extends AbstractBlackBoxCodegenTest {
|
||||
public void testAllFilesPresentInFunction() throws Exception {
|
||||
@@ -2038,6 +2038,39 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
|
||||
|
||||
}
|
||||
|
||||
@TestMetadata("compiler/testData/codegen/box/fieldRename")
|
||||
public static class FieldRename extends AbstractBlackBoxCodegenTest {
|
||||
public void testAllFilesPresentInFieldRename() throws Exception {
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/fieldRename"), Pattern.compile("^(.+)\\.kt$"), true);
|
||||
}
|
||||
|
||||
@TestMetadata("constructorAndClassObject.kt")
|
||||
public void testConstructorAndClassObject() throws Exception {
|
||||
doTest("compiler/testData/codegen/box/fieldRename/constructorAndClassObject.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("delegates.kt")
|
||||
public void testDelegates() throws Exception {
|
||||
doTest("compiler/testData/codegen/box/fieldRename/delegates.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("genericPropertyWithItself.kt")
|
||||
public void testGenericPropertyWithItself() throws Exception {
|
||||
doTest("compiler/testData/codegen/box/fieldRename/genericPropertyWithItself.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("inNamespace.kt")
|
||||
public void testInNamespace() throws Exception {
|
||||
doTest("compiler/testData/codegen/box/fieldRename/inNamespace.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("simple.kt")
|
||||
public void testSimple() throws Exception {
|
||||
doTest("compiler/testData/codegen/box/fieldRename/simple.kt");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@TestMetadata("compiler/testData/codegen/box/functions")
|
||||
@InnerTestClasses({Functions.LocalFunctions.class})
|
||||
public static class Functions extends AbstractBlackBoxCodegenTest {
|
||||
@@ -4093,6 +4126,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
|
||||
suite.addTestSuite(ExclExcl.class);
|
||||
suite.addTestSuite(ExtensionFunctions.class);
|
||||
suite.addTestSuite(ExtensionProperties.class);
|
||||
suite.addTestSuite(FieldRename.class);
|
||||
suite.addTest(Functions.innerSuite());
|
||||
suite.addTestSuite(InnerNested.class);
|
||||
suite.addTest(Instructions.innerSuite());
|
||||
|
||||
Reference in New Issue
Block a user