Got rid of "namespace" word in test data.

This commit is contained in:
Evgeny Gerashchenko
2014-01-10 23:42:19 +04:00
parent ee3312fb00
commit 958f7c862d
102 changed files with 302 additions and 306 deletions
@@ -64,7 +64,7 @@ public class SpecialFiles {
excludedFiles.add("nestedInPackage.kt"); // Cannot change package name
excludedFiles.add("importNestedClass.kt"); // Cannot change package name
excludedFiles.add("namespaceQualifiedMethod.kt"); // Cannot change package name
excludedFiles.add("packageQualifiedMethod.kt"); // Cannot change package name
excludedFiles.add("classObjectToString.kt"); // Cannot change package name
excludedFiles.add("kt326.kt"); // Commented
@@ -1,5 +1,5 @@
// FILE: b.kt
package MyNamespace
package MyPackage
//properties
<!MUST_BE_INITIALIZED!>val a: Int<!>
val a1: Int = 1
@@ -31,7 +31,7 @@ fun Any?.vars(<!UNUSED_PARAMETER!>a<!>: Any?) : Int {
if (example.ns.y is Int) {
b = <!UNUSED_VALUE, DEBUG_INFO_AUTOCAST!>example.ns.y<!>
}
// if (namespace.bottles.ns.y is Int) {
// if (package.bottles.ns.y is Int) {
// b = ns.y
// }
if (Obj.y is Int) {
@@ -1,4 +1,4 @@
//namespace override
package override
trait T {
fun foo()
@@ -107,7 +107,7 @@ class TestBackingFieldsVisibility() {
<!INACCESSIBLE_BACKING_FIELD!>a.$a<!> = 3
}
val x = <!INACCESSIBLE_BACKING_FIELD!>$namespaceLevelVar<!>
val x = <!INACCESSIBLE_BACKING_FIELD!>$topLevelVar<!>
inner class Inner() {
val z = this@TestBackingFieldsVisibility.$x
@@ -117,7 +117,7 @@ class TestBackingFieldsVisibility() {
get() = $w //test there is no second error here
}
val namespaceLevelVar = 11
val topLevelVar = 11
class T() {
val z : Int get() = 42
@@ -1,13 +1,13 @@
// FILE: ns1.kt
// check no error in overload in different namespaces
// FILE: pkg1.kt
// check no error in overload in different packages
package ns1
package pkg1
fun e() = 1
// FILE: ns2.kt
package ns2
// FILE: pkg2.kt
package pkg2
fun e() = 1
// FILE: ns3ns1.kt
package ns3.ns1
// FILE: pkg3pkg1.kt
package pkg3.pkg1
fun e() = 1
@@ -14,7 +14,7 @@ class A() {
val x = { <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>x<!> }
}
//in a namespace
//in a package
val x = { <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>x<!> }
//KT-787 AssertionError on code 'val x = x'
@@ -1,4 +1,4 @@
JetFile: NamespaceBlockFirst.kt
JetFile: PackageBlockFirst.kt
PACKAGE_DIRECTIVE
<empty list>
PsiErrorElement:Expecting package directive or top level declaration
@@ -1,4 +1,4 @@
JetFile: NamespaceModifiers.kt
JetFile: PackageModifiers.kt
PACKAGE_DIRECTIVE
MODIFIER_LIST
PsiElement(public)('public')
+1 -1
View File
@@ -1,4 +1,4 @@
[`return`] fun `namespace`() {
[`return`] fun `package`() {
`class`()
}
+1 -1
View File
@@ -15,7 +15,7 @@ JetFile: QuotedIdentifiers.kt
PsiWhiteSpace(' ')
PsiElement(fun)('fun')
PsiWhiteSpace(' ')
PsiElement(IDENTIFIER)('`namespace`')
PsiElement(IDENTIFIER)('`package`')
VALUE_PARAMETER_LIST
PsiElement(LPAR)('(')
PsiElement(RPAR)(')')
@@ -6,7 +6,7 @@ package n {
}
abstract class XXX() {
abstract val a : Int
abstract val a1 : namespace.Int
abstract val a1 : package.Int
abstract val a2 : n.B
abstract val a3 : (A)
abstract val a31 : (n.B)
@@ -74,9 +74,7 @@ JetFile: functionTypes.kt
PsiWhiteSpace(' ')
TYPE_REFERENCE
USER_TYPE
USER_TYPE
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('namespace')
PsiElement(package)('package')
PsiElement(DOT)('.')
REFERENCE_EXPRESSION
PsiElement(IDENTIFIER)('Int')
@@ -309,11 +309,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
doTest("compiler/testData/diagnostics/tests/NamedArgumentsAndDefaultValues.kt");
}
@TestMetadata("NamespaceQualified.kt")
public void testNamespaceQualified() throws Exception {
doTest("compiler/testData/diagnostics/tests/NamespaceQualified.kt");
}
@TestMetadata("Nullability.kt")
public void testNullability() throws Exception {
doTest("compiler/testData/diagnostics/tests/Nullability.kt");
@@ -344,6 +339,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
doTest("compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt");
}
@TestMetadata("PackageQualified.kt")
public void testPackageQualified() throws Exception {
doTest("compiler/testData/diagnostics/tests/PackageQualified.kt");
}
@TestMetadata("PrimaryConstructors.kt")
public void testPrimaryConstructors() throws Exception {
doTest("compiler/testData/diagnostics/tests/PrimaryConstructors.kt");
@@ -404,9 +404,9 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
doTest("compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.kt");
}
@TestMetadata("SafeCallOnFakeNamespace.kt")
public void testSafeCallOnFakeNamespace() throws Exception {
doTest("compiler/testData/diagnostics/tests/SafeCallOnFakeNamespace.kt");
@TestMetadata("SafeCallOnFakePackage.kt")
public void testSafeCallOnFakePackage() throws Exception {
doTest("compiler/testData/diagnostics/tests/SafeCallOnFakePackage.kt");
}
@TestMetadata("ShiftFunctionTypes.kt")
@@ -688,9 +688,9 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
doTest("compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.kt");
}
@TestMetadata("kt782namespaceLevel.kt")
public void testKt782namespaceLevel() throws Exception {
doTest("compiler/testData/diagnostics/tests/backingField/kt782namespaceLevel.kt");
@TestMetadata("kt782packageLevel.kt")
public void testKt782packageLevel() throws Exception {
doTest("compiler/testData/diagnostics/tests/backingField/kt782packageLevel.kt");
}
@TestMetadata("qualifiedWithThis.kt")
@@ -2652,9 +2652,9 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
doTest("compiler/testData/diagnostics/tests/enum/classObjectOfPrivateEnum.kt");
}
@TestMetadata("dontCreateNamespaceTypeForEnumEntry.kt")
public void testDontCreateNamespaceTypeForEnumEntry() throws Exception {
doTest("compiler/testData/diagnostics/tests/enum/dontCreateNamespaceTypeForEnumEntry.kt");
@TestMetadata("dontCreatePackageTypeForEnumEntry.kt")
public void testDontCreatePackageTypeForEnumEntry() throws Exception {
doTest("compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.kt");
}
@TestMetadata("entryShouldBeOfEnumType.kt")
@@ -46,9 +46,9 @@ public class TopLevelMembersInvocationTestGenerated extends AbstractTopLevelMemb
doTest("compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage");
}
@TestMetadata("functionInMultiFileNamespace")
public void testFunctionInMultiFileNamespace() throws Exception {
doTest("compiler/testData/codegen/topLevelMemberInvocation/functionInMultiFileNamespace");
@TestMetadata("functionInMultiFilePackage")
public void testFunctionInMultiFilePackage() throws Exception {
doTest("compiler/testData/codegen/topLevelMemberInvocation/functionInMultiFilePackage");
}
@TestMetadata("functionSamePackage")
@@ -31,7 +31,7 @@ import org.jetbrains.jet.codegen.generated.AbstractBlackBoxCodegenTest;
/** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/codegen/box")
@InnerTestClasses({BlackBoxCodegenTestGenerated.Arrays.class, BlackBoxCodegenTestGenerated.BinaryOp.class, BlackBoxCodegenTestGenerated.Bridges.class, BlackBoxCodegenTestGenerated.BuiltinStubMethods.class, BlackBoxCodegenTestGenerated.CallableReference.class, BlackBoxCodegenTestGenerated.Casts.class, BlackBoxCodegenTestGenerated.Classes.class, BlackBoxCodegenTestGenerated.Closures.class, BlackBoxCodegenTestGenerated.Constants.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.FakeOverride.class, BlackBoxCodegenTestGenerated.FieldRename.class, BlackBoxCodegenTestGenerated.Finally.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.SamConstructors.class, BlackBoxCodegenTestGenerated.Strings.class, BlackBoxCodegenTestGenerated.Super.class, BlackBoxCodegenTestGenerated.ToArray.class, BlackBoxCodegenTestGenerated.Traits.class, BlackBoxCodegenTestGenerated.TypeInfo.class, BlackBoxCodegenTestGenerated.TypeMapping.class, BlackBoxCodegenTestGenerated.UnaryOp.class, BlackBoxCodegenTestGenerated.Unit.class, BlackBoxCodegenTestGenerated.Vararg.class, BlackBoxCodegenTestGenerated.When.class})
@InnerTestClasses({BlackBoxCodegenTestGenerated.Arrays.class, BlackBoxCodegenTestGenerated.BinaryOp.class, BlackBoxCodegenTestGenerated.Bridges.class, BlackBoxCodegenTestGenerated.BuiltinStubMethods.class, BlackBoxCodegenTestGenerated.CallableReference.class, BlackBoxCodegenTestGenerated.Casts.class, BlackBoxCodegenTestGenerated.Classes.class, BlackBoxCodegenTestGenerated.Closures.class, BlackBoxCodegenTestGenerated.Constants.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.FakeOverride.class, BlackBoxCodegenTestGenerated.FieldRename.class, BlackBoxCodegenTestGenerated.Finally.class, BlackBoxCodegenTestGenerated.Functions.class, BlackBoxCodegenTestGenerated.InnerNested.class, BlackBoxCodegenTestGenerated.Instructions.class, BlackBoxCodegenTestGenerated.Intrinsics.class, BlackBoxCodegenTestGenerated.Labels.class, BlackBoxCodegenTestGenerated.LocalClasses.class, BlackBoxCodegenTestGenerated.MultiDecl.class, BlackBoxCodegenTestGenerated.Objects.class, BlackBoxCodegenTestGenerated.OperatorConventions.class, BlackBoxCodegenTestGenerated.Package.class, BlackBoxCodegenTestGenerated.PrimitiveTypes.class, BlackBoxCodegenTestGenerated.Properties.class, BlackBoxCodegenTestGenerated.Reflection.class, BlackBoxCodegenTestGenerated.SafeCall.class, BlackBoxCodegenTestGenerated.SamConstructors.class, BlackBoxCodegenTestGenerated.Strings.class, BlackBoxCodegenTestGenerated.Super.class, BlackBoxCodegenTestGenerated.ToArray.class, BlackBoxCodegenTestGenerated.Traits.class, BlackBoxCodegenTestGenerated.TypeInfo.class, BlackBoxCodegenTestGenerated.TypeMapping.class, BlackBoxCodegenTestGenerated.UnaryOp.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.TestsPackage", new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2506,9 +2506,9 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
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("inPackage.kt")
public void testInPackage() throws Exception {
doTest("compiler/testData/codegen/box/fieldRename/inPackage.kt");
}
@TestMetadata("simple.kt")
@@ -3837,49 +3837,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
}
}
@TestMetadata("compiler/testData/codegen/box/namespace")
public static class Namespace extends AbstractBlackBoxCodegenTest {
public void testAllFilesPresentInNamespace() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/box/namespace"), Pattern.compile("^(.+)\\.kt$"), true);
}
@TestMetadata("boxPrimitiveTypeInClinit.kt")
public void testBoxPrimitiveTypeInClinit() throws Exception {
doTest("compiler/testData/codegen/box/namespace/boxPrimitiveTypeInClinit.kt");
}
@TestMetadata("checkCast.kt")
public void testCheckCast() throws Exception {
doTest("compiler/testData/codegen/box/namespace/checkCast.kt");
}
@TestMetadata("incrementProperty.kt")
public void testIncrementProperty() throws Exception {
doTest("compiler/testData/codegen/box/namespace/incrementProperty.kt");
}
@TestMetadata("invokespecial.kt")
public void testInvokespecial() throws Exception {
doTest("compiler/testData/codegen/box/namespace/invokespecial.kt");
}
@TestMetadata("namespaceQualifiedMethod.kt")
public void testNamespaceQualifiedMethod() throws Exception {
doTest("compiler/testData/codegen/box/namespace/namespaceQualifiedMethod.kt");
}
@TestMetadata("nullablePrimitiveNoFieldInitializer.kt")
public void testNullablePrimitiveNoFieldInitializer() throws Exception {
doTest("compiler/testData/codegen/box/namespace/nullablePrimitiveNoFieldInitializer.kt");
}
@TestMetadata("privateTopLevelPropAndVarInInner.kt")
public void testPrivateTopLevelPropAndVarInInner() throws Exception {
doTest("compiler/testData/codegen/box/namespace/privateTopLevelPropAndVarInInner.kt");
}
}
@TestMetadata("compiler/testData/codegen/box/objects")
public static class Objects extends AbstractBlackBoxCodegenTest {
public void testAllFilesPresentInObjects() throws Exception {
@@ -4116,6 +4073,49 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
}
}
@TestMetadata("compiler/testData/codegen/box/package")
public static class Package extends AbstractBlackBoxCodegenTest {
public void testAllFilesPresentInPackage() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/box/package"), Pattern.compile("^(.+)\\.kt$"), true);
}
@TestMetadata("boxPrimitiveTypeInClinit.kt")
public void testBoxPrimitiveTypeInClinit() throws Exception {
doTest("compiler/testData/codegen/box/package/boxPrimitiveTypeInClinit.kt");
}
@TestMetadata("checkCast.kt")
public void testCheckCast() throws Exception {
doTest("compiler/testData/codegen/box/package/checkCast.kt");
}
@TestMetadata("incrementProperty.kt")
public void testIncrementProperty() throws Exception {
doTest("compiler/testData/codegen/box/package/incrementProperty.kt");
}
@TestMetadata("invokespecial.kt")
public void testInvokespecial() throws Exception {
doTest("compiler/testData/codegen/box/package/invokespecial.kt");
}
@TestMetadata("nullablePrimitiveNoFieldInitializer.kt")
public void testNullablePrimitiveNoFieldInitializer() throws Exception {
doTest("compiler/testData/codegen/box/package/nullablePrimitiveNoFieldInitializer.kt");
}
@TestMetadata("packageQualifiedMethod.kt")
public void testPackageQualifiedMethod() throws Exception {
doTest("compiler/testData/codegen/box/package/packageQualifiedMethod.kt");
}
@TestMetadata("privateTopLevelPropAndVarInInner.kt")
public void testPrivateTopLevelPropAndVarInInner() throws Exception {
doTest("compiler/testData/codegen/box/package/privateTopLevelPropAndVarInInner.kt");
}
}
@TestMetadata("compiler/testData/codegen/box/primitiveTypes")
public static class PrimitiveTypes extends AbstractBlackBoxCodegenTest {
public void testAllFilesPresentInPrimitiveTypes() throws Exception {
@@ -5246,9 +5246,9 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
suite.addTestSuite(Labels.class);
suite.addTestSuite(LocalClasses.class);
suite.addTest(MultiDecl.innerSuite());
suite.addTestSuite(Namespace.class);
suite.addTestSuite(Objects.class);
suite.addTest(OperatorConventions.innerSuite());
suite.addTestSuite(Package.class);
suite.addTestSuite(PrimitiveTypes.class);
suite.addTestSuite(Properties.class);
suite.addTestSuite(Reflection.class);
@@ -267,16 +267,6 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
doParsingTest("compiler/testData/psi/MultiVariableDeclarations.kt");
}
@TestMetadata("NamespaceBlockFirst.kt")
public void testNamespaceBlockFirst() throws Exception {
doParsingTest("compiler/testData/psi/NamespaceBlockFirst.kt");
}
@TestMetadata("NamespaceModifiers.kt")
public void testNamespaceModifiers() throws Exception {
doParsingTest("compiler/testData/psi/NamespaceModifiers.kt");
}
@TestMetadata("NestedComments.kt")
public void testNestedComments() throws Exception {
doParsingTest("compiler/testData/psi/NestedComments.kt");
@@ -302,6 +292,16 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
doParsingTest("compiler/testData/psi/ObjectLiteralAsStatement.kt");
}
@TestMetadata("PackageBlockFirst.kt")
public void testPackageBlockFirst() throws Exception {
doParsingTest("compiler/testData/psi/PackageBlockFirst.kt");
}
@TestMetadata("PackageModifiers.kt")
public void testPackageModifiers() throws Exception {
doParsingTest("compiler/testData/psi/PackageModifiers.kt");
}
@TestMetadata("ParameterNameMising.kt")
public void testParameterNameMising() throws Exception {
doParsingTest("compiler/testData/psi/ParameterNameMising.kt");
@@ -82,11 +82,6 @@ public class ResolveTestGenerated extends AbstractResolveTest {
doTest("compiler/testData/resolve/LocalObjects.resolve");
}
@TestMetadata("Namespaces.resolve")
public void testNamespaces() throws Exception {
doTest("compiler/testData/resolve/Namespaces.resolve");
}
@TestMetadata("NestedObjects.resolve")
public void testNestedObjects() throws Exception {
doTest("compiler/testData/resolve/NestedObjects.resolve");
@@ -102,6 +97,11 @@ public class ResolveTestGenerated extends AbstractResolveTest {
doTest("compiler/testData/resolve/Objects.resolve");
}
@TestMetadata("Packages.resolve")
public void testPackages() throws Exception {
doTest("compiler/testData/resolve/Packages.resolve");
}
@TestMetadata("PrimaryConstructorParameters.resolve")
public void testPrimaryConstructorParameters() throws Exception {
doTest("compiler/testData/resolve/PrimaryConstructorParameters.resolve");