diff --git a/build.xml b/build.xml index 856726f97e9..86d83fed8fd 100644 --- a/build.xml +++ b/build.xml @@ -85,13 +85,14 @@ + - + diff --git a/compiler/backend/src/org/jetbrains/jet/di/InjectorForJvmCodegen.java b/compiler/backend/src/org/jetbrains/jet/di/InjectorForJvmCodegen.java index 4e1414fe621..a6d47ceda43 100644 --- a/compiler/backend/src/org/jetbrains/jet/di/InjectorForJvmCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/di/InjectorForJvmCodegen.java @@ -33,7 +33,7 @@ import org.jetbrains.jet.codegen.ClassFileFactory; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; -/* This file is generated by org.jetbrains.jet.generators.GenerateInjectors. DO NOT EDIT! */ +/* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */ public class InjectorForJvmCodegen { private final JetTypeMapper jetTypeMapper; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java index cdb46b17d7d..e9664817474 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java @@ -40,7 +40,7 @@ import org.jetbrains.jet.lang.resolve.java.resolver.JavaPropertyResolver; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; -/* This file is generated by org.jetbrains.jet.generators.GenerateInjectors. DO NOT EDIT! */ +/* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */ public class InjectorForJavaDescriptorResolver { private final Project project; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java index 424d9e66d19..e030c4aae1d 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java @@ -40,7 +40,7 @@ import org.jetbrains.jet.lang.resolve.java.resolver.JavaPropertyResolver; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; -/* This file is generated by org.jetbrains.jet.generators.GenerateInjectors. DO NOT EDIT! */ +/* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */ public class InjectorForJavaSemanticServices { private JavaSemanticServices javaSemanticServices; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java index a16a5af5a6f..dd193e892bf 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java @@ -62,7 +62,7 @@ import org.jetbrains.jet.lang.resolve.java.resolver.JavaPropertyResolver; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; -/* This file is generated by org.jetbrains.jet.generators.GenerateInjectors. DO NOT EDIT! */ +/* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnalyzer { private TopDownAnalyzer topDownAnalyzer; diff --git a/compiler/frontend/src/jet/ExtensionFunctions.jet b/compiler/frontend/src/jet/ExtensionFunctions.jet index 6bda816d59b..1613f44ba88 100644 --- a/compiler/frontend/src/jet/ExtensionFunctions.jet +++ b/compiler/frontend/src/jet/ExtensionFunctions.jet @@ -1,4 +1,4 @@ -// Generated by org.jetbrains.jet.generators.GenerateTuplesAndFunctions +// Generated by org.jetbrains.jet.generators.runtime.GenerateTuplesAndFunctions package jet diff --git a/compiler/frontend/src/jet/Functions.jet b/compiler/frontend/src/jet/Functions.jet index 503ad178477..2faac1d5a03 100644 --- a/compiler/frontend/src/jet/Functions.jet +++ b/compiler/frontend/src/jet/Functions.jet @@ -1,4 +1,4 @@ -// Generated by org.jetbrains.jet.generators.GenerateTuplesAndFunctions +// Generated by org.jetbrains.jet.generators.runtime.GenerateTuplesAndFunctions package jet diff --git a/compiler/frontend/src/jet/Tuples.jet b/compiler/frontend/src/jet/Tuples.jet index 638ce7f15cd..624b702b373 100644 --- a/compiler/frontend/src/jet/Tuples.jet +++ b/compiler/frontend/src/jet/Tuples.jet @@ -1,4 +1,4 @@ -// Generated by org.jetbrains.jet.generators.GenerateTuplesAndFunctions +// Generated by org.jetbrains.jet.generators.runtime.GenerateTuplesAndFunctions package jet diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java index bfb08b2b459..76bd4e4304b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java @@ -37,7 +37,7 @@ import org.jetbrains.jet.lang.resolve.TopDownAnalysisContext; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; -/* This file is generated by org.jetbrains.jet.generators.GenerateInjectors. DO NOT EDIT! */ +/* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */ public class InjectorForBodyResolve { private BodyResolver bodyResolver; diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java index 5bcda25876a..95630948fee 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java @@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.resolve.calls.CandidateResolver; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; -/* This file is generated by org.jetbrains.jet.generators.GenerateInjectors. DO NOT EDIT! */ +/* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */ public class InjectorForLazyResolve { private final Project project; diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java index d0d1bde0019..aadc8e04c4b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java @@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; -/* This file is generated by org.jetbrains.jet.generators.GenerateInjectors. DO NOT EDIT! */ +/* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */ public class InjectorForMacros { private ExpressionTypingServices expressionTypingServices; diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java index 95938cda6e8..22e0607d89e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java @@ -46,7 +46,7 @@ import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; -/* This file is generated by org.jetbrains.jet.generators.GenerateInjectors. DO NOT EDIT! */ +/* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */ public class InjectorForTopDownAnalyzerBasic { private TopDownAnalyzer topDownAnalyzer; diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java index ae55b9381ee..02d12798bab 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.test.TestMetadata; import org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve; -/** This class is generated by {@link org.jetbrains.jet.generators.GenerateTests}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @InnerTestClasses({JetDiagnosticsTestGenerated.Tests.class, JetDiagnosticsTestGenerated.Script.class}) public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEagerResolve { @TestMetadata("compiler/testData/diagnostics/tests") @@ -63,7 +63,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage } public void testAllFilesPresentInTests() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests"), "kt", true); } @TestMetadata("AnonymousInitializerVarAndConstructor.kt") @@ -519,7 +519,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/annotations") public static class Annotations extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/annotations"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/annotations"), "kt", true); } @TestMetadata("AmbigiousAnnotationConstructor.kt") @@ -582,7 +582,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/backingField") public static class BackingField extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInBackingField() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/backingField"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/backingField"), "kt", true); } @TestMetadata("CustomGetSet.kt") @@ -690,7 +690,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/cast") public static class Cast extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInCast() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/cast"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/cast"), "kt", true); } @TestMetadata("AsErasedError.kt") @@ -798,7 +798,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/checkArguments") public static class CheckArguments extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInCheckArguments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/checkArguments"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/checkArguments"), "kt", true); } @TestMetadata("kt1897_diagnostic_part.kt") @@ -821,7 +821,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis") public static class ControlFlowAnalysis extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInControlFlowAnalysis() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/controlFlowAnalysis"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/controlFlowAnalysis"), "kt", true); } @TestMetadata("checkInnerLocalDeclarations.kt") @@ -934,7 +934,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/controlStructures") public static class ControlStructures extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInControlStructures() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/controlStructures"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/controlStructures"), "kt", true); } @TestMetadata("forLoopWithNullableRange.kt") @@ -992,7 +992,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/dataClasses") public static class DataClasses extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInDataClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/dataClasses"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/dataClasses"), "kt", true); } @TestMetadata("bothParamsAreNotProperties.kt") @@ -1105,7 +1105,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/dataFlow") public static class DataFlow extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInDataFlow() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/dataFlow"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/dataFlow"), "kt", true); } @TestMetadata("CalleeExpression.kt") @@ -1128,7 +1128,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal") public static class DataFlowInfoTraversal extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInDataFlowInfoTraversal() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/dataFlowInfoTraversal"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/dataFlowInfoTraversal"), "kt", true); } @TestMetadata("AndOr.kt") @@ -1237,7 +1237,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @InnerTestClasses({DeclarationChecks.MultiDeclarations.class}) public static class DeclarationChecks extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInDeclarationChecks() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/declarationChecks"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/declarationChecks"), "kt", true); } @TestMetadata("ComponentFunctionReturnTypeMismatch.kt") @@ -1328,7 +1328,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations") public static class MultiDeclarations extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInMultiDeclarations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations"), "kt", true); } @TestMetadata("DoubleDeclForLoop.kt") @@ -1390,7 +1390,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @InnerTestClasses({Enum.Inner.class}) public static class Enum extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInEnum() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/enum"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/enum"), "kt", true); } @TestMetadata("enumInheritance.kt") @@ -1456,7 +1456,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/enum/inner") public static class Inner extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInInner() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/enum/inner"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/enum/inner"), "kt", true); } @TestMetadata("existingClassObject.kt") @@ -1527,7 +1527,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/extensions") public static class Extensions extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInExtensions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/extensions"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/extensions"), "kt", true); } @TestMetadata("ExtensionFunctions.kt") @@ -1570,7 +1570,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/functionLiterals") public static class FunctionLiterals extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInFunctionLiterals() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/functionLiterals"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/functionLiterals"), "kt", true); } @TestMetadata("kt2906.kt") @@ -1583,7 +1583,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/generics") public static class Generics extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInGenerics() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/generics"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/generics"), "kt", true); } @TestMetadata("kt1575-Class.kt") @@ -1622,7 +1622,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @InnerTestClasses({IncompleteCode.DiagnosticWithSyntaxError.class}) public static class IncompleteCode extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInIncompleteCode() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/incompleteCode"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/incompleteCode"), "kt", true); } @TestMetadata("arrayBracketsRange.kt") @@ -1668,7 +1668,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError") public static class DiagnosticWithSyntaxError extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInDiagnosticWithSyntaxError() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError"), "kt", true); } @TestMetadata("checkBackingFieldException.kt") @@ -1725,7 +1725,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @InnerTestClasses({Inference.Regressions.class, Inference.Varargs.class}) public static class Inference extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInInference() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/inference"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/inference"), "kt", true); } @TestMetadata("arrayConstructor.kt") @@ -1846,7 +1846,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/inference/regressions") public static class Regressions extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInRegressions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/inference/regressions"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/inference/regressions"), "kt", true); } @TestMetadata("kt1029.kt") @@ -2019,7 +2019,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/inference/varargs") public static class Varargs extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInVarargs() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/inference/varargs"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/inference/varargs"), "kt", true); } @TestMetadata("varargsAndPair.kt") @@ -2041,7 +2041,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/infos") public static class Infos extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInInfos() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/infos"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/infos"), "kt", true); } @TestMetadata("Autocasts.kt") @@ -2059,7 +2059,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/j+k") public static class J_k extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInJ_k() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/j+k"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/j+k"), "kt", true); } @TestMetadata("kt1402.kt") @@ -2143,7 +2143,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @InnerTestClasses({Jdk_annotations.Sql.class}) public static class Jdk_annotations extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInJdk_annotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/jdk-annotations"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/jdk-annotations"), "kt", true); } @TestMetadata("ArrayListAndMap.kt") @@ -2164,7 +2164,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/jdk-annotations/sql") public static class Sql extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInSql() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/jdk-annotations/sql"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/jdk-annotations/sql"), "kt", true); } @TestMetadata("DriverManager.kt") @@ -2195,7 +2195,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/library") public static class Library extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInLibrary() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/library"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/library"), "kt", true); } @TestMetadata("Collections.kt") @@ -2213,7 +2213,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts") public static class NullabilityAndAutoCasts extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInNullabilityAndAutoCasts() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts"), "kt", true); } @TestMetadata("AssertNotNull.kt") @@ -2346,7 +2346,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/nullableTypes") public static class NullableTypes extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInNullableTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/nullableTypes"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/nullableTypes"), "kt", true); } @TestMetadata("baseWithNullableUpperBound.kt") @@ -2379,7 +2379,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/objects") public static class Objects extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInObjects() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/objects"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/objects"), "kt", true); } @TestMetadata("kt2240.kt") @@ -2412,7 +2412,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/operatorsOverloading") public static class OperatorsOverloading extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInOperatorsOverloading() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/operatorsOverloading"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/operatorsOverloading"), "kt", true); } @TestMetadata("AssignOperatorAmbiguity.kt") @@ -2435,7 +2435,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/overload") public static class Overload extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInOverload() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/overload"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/overload"), "kt", true); } @TestMetadata("ConflictingOverloadsFunsDifferentReturnInClass.kt") @@ -2533,7 +2533,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage } public void testAllFilesPresentInOverride() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/override"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/override"), "kt", true); } @TestMetadata("AllPrivateFromSuperTypes.kt") @@ -2686,7 +2686,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/redeclarations") public static class Redeclarations extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInRedeclarations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/redeclarations"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/redeclarations"), "kt", true); } @TestMetadata("ConflictingExtensionProperties.kt") @@ -2744,7 +2744,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/regressions") public static class Regressions extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInRegressions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/regressions"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/regressions"), "kt", true); } @TestMetadata("AmbiguityOnLazyTypeComputation.kt") @@ -3222,7 +3222,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/scopes") public static class Scopes extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInScopes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/scopes"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/scopes"), "kt", true); } @TestMetadata("ImportFromCurrentWithDifferentName.kt") @@ -3425,7 +3425,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/senselessComparison") public static class SenselessComparison extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInSenselessComparison() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/senselessComparison"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/senselessComparison"), "kt", true); } @TestMetadata("parenthesized.kt") @@ -3438,7 +3438,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/shadowing") public static class Shadowing extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInShadowing() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/shadowing"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/shadowing"), "kt", true); } @TestMetadata("ShadowMultiDeclarationWithFunParameter.kt") @@ -3496,7 +3496,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/substitutions") public static class Substitutions extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInSubstitutions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/substitutions"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/substitutions"), "kt", true); } @TestMetadata("kt1558-short.kt") @@ -3519,7 +3519,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/subtyping") public static class Subtyping extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInSubtyping() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/subtyping"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/subtyping"), "kt", true); } @TestMetadata("kt2069.kt") @@ -3547,7 +3547,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/thisAndSuper") public static class ThisAndSuper extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInThisAndSuper() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/thisAndSuper"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/thisAndSuper"), "kt", true); } @TestMetadata("ambigousLabelOnThis.kt") @@ -3610,7 +3610,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/tuples") public static class Tuples extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInTuples() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/tuples"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/tuples"), "kt", true); } @TestMetadata("UnitValue.kt") @@ -3623,7 +3623,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/varargs") public static class Varargs extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInVarargs() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/varargs"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/varargs"), "kt", true); } @TestMetadata("AmbiguousVararg.kt") @@ -3724,7 +3724,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage } public void testAllFilesPresentInScript() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/diagnostics/tests/script"), "ktscript", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/script"), "ktscript", true); } @TestMetadata("ComplexScript.ktscript") diff --git a/compiler/tests/org/jetbrains/jet/codegen/DataClassCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/DataClassCodegenTestGenerated.java index 5a1bf1a4bc6..bac0047e950 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/DataClassCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/DataClassCodegenTestGenerated.java @@ -26,12 +26,12 @@ import org.jetbrains.jet.test.TestMetadata; import org.jetbrains.jet.codegen.AbstractDataClassCodegenTest; -/** This class is generated by {@link org.jetbrains.jet.generators.GenerateTests}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @TestMetadata("compiler/testData/codegen/dataClasses") @InnerTestClasses({DataClassCodegenTestGenerated.Copy.class, DataClassCodegenTestGenerated.Equals.class, DataClassCodegenTestGenerated.Hashcode.class, DataClassCodegenTestGenerated.Tostring.class}) public class DataClassCodegenTestGenerated extends AbstractDataClassCodegenTest { public void testAllFilesPresentInDataClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/codegen/dataClasses"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/dataClasses"), "kt", true); } @TestMetadata("arrayParams.kt") @@ -87,7 +87,7 @@ public class DataClassCodegenTestGenerated extends AbstractDataClassCodegenTest @TestMetadata("compiler/testData/codegen/dataClasses/copy") public static class Copy extends AbstractDataClassCodegenTest { public void testAllFilesPresentInCopy() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/codegen/dataClasses/copy"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/dataClasses/copy"), "kt", true); } @TestMetadata("constructorWithDefaultParam.kt") @@ -135,7 +135,7 @@ public class DataClassCodegenTestGenerated extends AbstractDataClassCodegenTest @TestMetadata("compiler/testData/codegen/dataClasses/equals") public static class Equals extends AbstractDataClassCodegenTest { public void testAllFilesPresentInEquals() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/codegen/dataClasses/equals"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/dataClasses/equals"), "kt", true); } @TestMetadata("alreadyDeclared.kt") @@ -178,7 +178,7 @@ public class DataClassCodegenTestGenerated extends AbstractDataClassCodegenTest @TestMetadata("compiler/testData/codegen/dataClasses/hashcode") public static class Hashcode extends AbstractDataClassCodegenTest { public void testAllFilesPresentInHashcode() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/codegen/dataClasses/hashcode"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/dataClasses/hashcode"), "kt", true); } @TestMetadata("alreadyDeclared.kt") @@ -246,7 +246,7 @@ public class DataClassCodegenTestGenerated extends AbstractDataClassCodegenTest @TestMetadata("compiler/testData/codegen/dataClasses/tostring") public static class Tostring extends AbstractDataClassCodegenTest { public void testAllFilesPresentInTostring() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/codegen/dataClasses/tostring"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/dataClasses/tostring"), "kt", true); } @TestMetadata("alreadyDeclared.kt") diff --git a/compiler/tests/org/jetbrains/jet/codegen/IntrinsicsTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/IntrinsicsTestGenerated.java index d73d6727546..dc246505a33 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/IntrinsicsTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/IntrinsicsTestGenerated.java @@ -26,11 +26,11 @@ import org.jetbrains.jet.test.TestMetadata; import org.jetbrains.jet.codegen.AbstractIntrinsicsTestCase; -/** This class is generated by {@link org.jetbrains.jet.generators.GenerateTests}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @TestMetadata("compiler/testData/codegen/intrinsics") public class IntrinsicsTestGenerated extends AbstractIntrinsicsTestCase { public void testAllFilesPresentInIntrinsics() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/codegen/intrinsics"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/intrinsics"), "kt", true); } @TestMetadata("longRangeWithExplicitDot.kt") diff --git a/compiler/tests/org/jetbrains/jet/codegen/MultiDeclTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/MultiDeclTestGenerated.java index 6a78212995d..d9ae1bcc29b 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/MultiDeclTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/MultiDeclTestGenerated.java @@ -26,12 +26,12 @@ import org.jetbrains.jet.test.TestMetadata; import org.jetbrains.jet.codegen.AbstractMultiDeclTestCase; -/** This class is generated by {@link org.jetbrains.jet.generators.GenerateTests}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @TestMetadata("compiler/testData/codegen/multiDecl") @InnerTestClasses({MultiDeclTestGenerated.ForArray.class, MultiDeclTestGenerated.ForIterator.class, MultiDeclTestGenerated.ForRange.class}) public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { public void testAllFilesPresentInMultiDecl() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/codegen/multiDecl"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/multiDecl"), "kt", true); } @TestMetadata("ComplexInitializer.kt") @@ -93,7 +93,7 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { @InnerTestClasses({ForArray.Int.class, ForArray.Long.class}) public static class ForArray extends AbstractMultiDeclTestCase { public void testAllFilesPresentInForArray() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/codegen/multiDecl/forArray"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/multiDecl/forArray"), "kt", true); } @TestMetadata("MultiDeclFor.kt") @@ -124,7 +124,7 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { @TestMetadata("compiler/testData/codegen/multiDecl/forArray/int") public static class Int extends AbstractMultiDeclTestCase { public void testAllFilesPresentInInt() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/codegen/multiDecl/forArray/int"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/multiDecl/forArray/int"), "kt", true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -152,7 +152,7 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { @TestMetadata("compiler/testData/codegen/multiDecl/forArray/long") public static class Long extends AbstractMultiDeclTestCase { public void testAllFilesPresentInLong() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/codegen/multiDecl/forArray/long"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/multiDecl/forArray/long"), "kt", true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -190,7 +190,7 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { @InnerTestClasses({ForIterator.LongIterator.class}) public static class ForIterator extends AbstractMultiDeclTestCase { public void testAllFilesPresentInForIterator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/codegen/multiDecl/forIterator"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/multiDecl/forIterator"), "kt", true); } @TestMetadata("MultiDeclFor.kt") @@ -221,7 +221,7 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { @TestMetadata("compiler/testData/codegen/multiDecl/forIterator/longIterator") public static class LongIterator extends AbstractMultiDeclTestCase { public void testAllFilesPresentInLongIterator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/codegen/multiDecl/forIterator/longIterator"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/multiDecl/forIterator/longIterator"), "kt", true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -258,7 +258,7 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { @InnerTestClasses({ForRange.ExplicitRangeTo.class, ForRange.ExplicitRangeToWithDot.class, ForRange.Int.class, ForRange.Long.class}) public static class ForRange extends AbstractMultiDeclTestCase { public void testAllFilesPresentInForRange() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/codegen/multiDecl/forRange"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/multiDecl/forRange"), "kt", true); } @TestMetadata("MultiDeclFor.kt") @@ -290,7 +290,7 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { @InnerTestClasses({ExplicitRangeTo.Int.class, ExplicitRangeTo.Long.class}) public static class ExplicitRangeTo extends AbstractMultiDeclTestCase { public void testAllFilesPresentInExplicitRangeTo() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeTo"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeTo"), "kt", true); } @TestMetadata("MultiDeclFor.kt") @@ -321,7 +321,7 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { @TestMetadata("compiler/testData/codegen/multiDecl/forRange/explicitRangeTo/int") public static class Int extends AbstractMultiDeclTestCase { public void testAllFilesPresentInInt() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeTo/int"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeTo/int"), "kt", true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -349,7 +349,7 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { @TestMetadata("compiler/testData/codegen/multiDecl/forRange/explicitRangeTo/long") public static class Long extends AbstractMultiDeclTestCase { public void testAllFilesPresentInLong() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeTo/long"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeTo/long"), "kt", true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -387,7 +387,7 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { @InnerTestClasses({ExplicitRangeToWithDot.Int.class, ExplicitRangeToWithDot.Long.class}) public static class ExplicitRangeToWithDot extends AbstractMultiDeclTestCase { public void testAllFilesPresentInExplicitRangeToWithDot() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeToWithDot"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeToWithDot"), "kt", true); } @TestMetadata("MultiDeclFor.kt") @@ -418,7 +418,7 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { @TestMetadata("compiler/testData/codegen/multiDecl/forRange/explicitRangeToWithDot/int") public static class Int extends AbstractMultiDeclTestCase { public void testAllFilesPresentInInt() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeToWithDot/int"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeToWithDot/int"), "kt", true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -446,7 +446,7 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { @TestMetadata("compiler/testData/codegen/multiDecl/forRange/explicitRangeToWithDot/long") public static class Long extends AbstractMultiDeclTestCase { public void testAllFilesPresentInLong() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeToWithDot/long"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeToWithDot/long"), "kt", true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -483,7 +483,7 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { @TestMetadata("compiler/testData/codegen/multiDecl/forRange/int") public static class Int extends AbstractMultiDeclTestCase { public void testAllFilesPresentInInt() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/codegen/multiDecl/forRange/int"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/multiDecl/forRange/int"), "kt", true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -511,7 +511,7 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { @TestMetadata("compiler/testData/codegen/multiDecl/forRange/long") public static class Long extends AbstractMultiDeclTestCase { public void testAllFilesPresentInLong() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/codegen/multiDecl/forRange/long"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/multiDecl/forRange/long"), "kt", true); } @TestMetadata("MultiDeclForComponentExtensions.kt") diff --git a/compiler/tests/org/jetbrains/jet/codegen/flags/WriteFlagsTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/flags/WriteFlagsTestGenerated.java index afb9255cc2d..f6119aaf3c5 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/flags/WriteFlagsTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/flags/WriteFlagsTestGenerated.java @@ -26,25 +26,25 @@ import org.jetbrains.jet.test.TestMetadata; import org.jetbrains.jet.codegen.flags.AbstractWriteFlagsTest; -/** This class is generated by {@link org.jetbrains.jet.generators.GenerateTests}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @TestMetadata("compiler/testData/writeFlags") @InnerTestClasses({WriteFlagsTestGenerated.Class.class, WriteFlagsTestGenerated.Function.class, WriteFlagsTestGenerated.Property.class}) public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { public void testAllFilesPresentInWriteFlags() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/writeFlags"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags"), "kt", true); } @TestMetadata("compiler/testData/writeFlags/class") @InnerTestClasses({Class.AccessFlags.class, Class.DeprecatedFlag.class}) public static class Class extends AbstractWriteFlagsTest { public void testAllFilesPresentInClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/writeFlags/class"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/class"), "kt", true); } @TestMetadata("compiler/testData/writeFlags/class/accessFlags") public static class AccessFlags extends AbstractWriteFlagsTest { public void testAllFilesPresentInAccessFlags() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/writeFlags/class/accessFlags"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/class/accessFlags"), "kt", true); } @TestMetadata("publicFinalClass.kt") @@ -72,7 +72,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/class/deprecatedFlag") public static class DeprecatedFlag extends AbstractWriteFlagsTest { public void testAllFilesPresentInDeprecatedFlag() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/writeFlags/class/deprecatedFlag"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/class/deprecatedFlag"), "kt", true); } @TestMetadata("class.kt") @@ -115,13 +115,13 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @InnerTestClasses({Function.DeprecatedFlag.class}) public static class Function extends AbstractWriteFlagsTest { public void testAllFilesPresentInFunction() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/writeFlags/function"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/function"), "kt", true); } @TestMetadata("compiler/testData/writeFlags/function/deprecatedFlag") public static class DeprecatedFlag extends AbstractWriteFlagsTest { public void testAllFilesPresentInDeprecatedFlag() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/writeFlags/function/deprecatedFlag"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/function/deprecatedFlag"), "kt", true); } @TestMetadata("emptyGetter.kt") @@ -198,13 +198,13 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @InnerTestClasses({Property.DeprecatedFlag.class}) public static class Property extends AbstractWriteFlagsTest { public void testAllFilesPresentInProperty() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/writeFlags/property"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/property"), "kt", true); } @TestMetadata("compiler/testData/writeFlags/property/deprecatedFlag") public static class DeprecatedFlag extends AbstractWriteFlagsTest { public void testAllFilesPresentInDeprecatedFlag() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/writeFlags/property/deprecatedFlag"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/property/deprecatedFlag"), "kt", true); } @TestMetadata("propertyInClass.kt") diff --git a/compiler/tests/org/jetbrains/jet/codegen/labels/LabelGenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/labels/LabelGenTestGenerated.java index 861a776f842..0e339cd0f08 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/labels/LabelGenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/labels/LabelGenTestGenerated.java @@ -26,11 +26,11 @@ import org.jetbrains.jet.test.TestMetadata; import org.jetbrains.jet.codegen.labels.AbstractLabelGenTest; -/** This class is generated by {@link org.jetbrains.jet.generators.GenerateTests}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @TestMetadata("compiler/testData/codegen/label") public class LabelGenTestGenerated extends AbstractLabelGenTest { public void testAllFilesPresentInLabel() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/codegen/label"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/label"), "kt", true); } @TestMetadata("propertyAccessor.kt") diff --git a/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java b/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java index 312150136c7..723cf3cb3e0 100644 --- a/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java +++ b/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.resolve.calls.CandidateResolver; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; -/* This file is generated by org.jetbrains.jet.generators.GenerateInjectors. DO NOT EDIT! */ +/* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */ public class InjectorForTests { private DescriptorResolver descriptorResolver; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java index 938bc01a17e..bd6b39d916e 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java @@ -26,18 +26,18 @@ import org.jetbrains.jet.test.TestMetadata; import org.jetbrains.jet.jvm.compiler.AbstractLoadCompiledKotlinTest; -/** This class is generated by {@link org.jetbrains.jet.generators.GenerateTests}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @TestMetadata("compiler/testData/loadKotlin") @InnerTestClasses({LoadCompiledKotlinTestGenerated.Class.class, LoadCompiledKotlinTestGenerated.ClassFun.class, LoadCompiledKotlinTestGenerated.ClassObject.class, LoadCompiledKotlinTestGenerated.Constructor.class, LoadCompiledKotlinTestGenerated.DataClass.class, LoadCompiledKotlinTestGenerated.Fun.class, LoadCompiledKotlinTestGenerated.Prop.class, LoadCompiledKotlinTestGenerated.Type.class, LoadCompiledKotlinTestGenerated.Visibility.class}) public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinTest { public void testAllFilesPresentInLoadKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin"), "kt", true); } @TestMetadata("compiler/testData/loadKotlin/class") public static class Class extends AbstractLoadCompiledKotlinTest { public void testAllFilesPresentInClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin/class"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/class"), "kt", true); } @TestMetadata("Class.kt") @@ -165,7 +165,7 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT @TestMetadata("compiler/testData/loadKotlin/classFun") public static class ClassFun extends AbstractLoadCompiledKotlinTest { public void testAllFilesPresentInClassFun() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin/classFun"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/classFun"), "kt", true); } @TestMetadata("ClassInParamUsedInFun.kt") @@ -203,7 +203,7 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT @TestMetadata("compiler/testData/loadKotlin/classObject") public static class ClassObject extends AbstractLoadCompiledKotlinTest { public void testAllFilesPresentInClassObject() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin/classObject"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/classObject"), "kt", true); } @TestMetadata("ClassObjectDeclaresVal.kt") @@ -236,7 +236,7 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT @TestMetadata("compiler/testData/loadKotlin/constructor") public static class Constructor extends AbstractLoadCompiledKotlinTest { public void testAllFilesPresentInConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin/constructor"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/constructor"), "kt", true); } @TestMetadata("Constructor0.kt") @@ -289,7 +289,7 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT @TestMetadata("compiler/testData/loadKotlin/dataClass") public static class DataClass extends AbstractLoadCompiledKotlinTest { public void testAllFilesPresentInDataClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin/dataClass"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/dataClass"), "kt", true); } @TestMetadata("MixedComponents.kt") @@ -333,13 +333,13 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT @InnerTestClasses({Fun.GenericWithTypeVariables.class, Fun.GenericWithoutTypeVariables.class, Fun.NonGeneric.class}) public static class Fun extends AbstractLoadCompiledKotlinTest { public void testAllFilesPresentInFun() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin/fun"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/fun"), "kt", true); } @TestMetadata("compiler/testData/loadKotlin/fun/genericWithTypeVariables") public static class GenericWithTypeVariables extends AbstractLoadCompiledKotlinTest { public void testAllFilesPresentInGenericWithTypeVariables() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin/fun/genericWithTypeVariables"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/fun/genericWithTypeVariables"), "kt", true); } @TestMetadata("FunGenericParam.kt") @@ -422,7 +422,7 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT @TestMetadata("compiler/testData/loadKotlin/fun/genericWithoutTypeVariables") public static class GenericWithoutTypeVariables extends AbstractLoadCompiledKotlinTest { public void testAllFilesPresentInGenericWithoutTypeVariables() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin/fun/genericWithoutTypeVariables"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/fun/genericWithoutTypeVariables"), "kt", true); } @TestMetadata("FunClassParamNotNull.kt") @@ -455,7 +455,7 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT @TestMetadata("compiler/testData/loadKotlin/fun/nonGeneric") public static class NonGeneric extends AbstractLoadCompiledKotlinTest { public void testAllFilesPresentInNonGeneric() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin/fun/nonGeneric"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/fun/nonGeneric"), "kt", true); } @TestMetadata("ClassFun.kt") @@ -553,7 +553,7 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT @TestMetadata("compiler/testData/loadKotlin/prop") public static class Prop extends AbstractLoadCompiledKotlinTest { public void testAllFilesPresentInProp() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin/prop"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/prop"), "kt", true); } @TestMetadata("ClassVal.kt") @@ -711,7 +711,7 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT @TestMetadata("compiler/testData/loadKotlin/type") public static class Type extends AbstractLoadCompiledKotlinTest { public void testAllFilesPresentInType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin/type"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/type"), "kt", true); } @TestMetadata("Any.kt") @@ -849,7 +849,7 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT @TestMetadata("compiler/testData/loadKotlin/visibility") public static class Visibility extends AbstractLoadCompiledKotlinTest { public void testAllFilesPresentInVisibility() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin/visibility"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/visibility"), "kt", true); } @TestMetadata("InternalAbstractTraitMembersOverridden.kt") diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java index a53b9fd3af2..0a6c0963bcf 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java @@ -26,12 +26,12 @@ import org.jetbrains.jet.test.TestMetadata; import org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest; -/** This class is generated by {@link org.jetbrains.jet.generators.GenerateTests}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @TestMetadata("compiler/testData/loadJava") @InnerTestClasses({LoadJavaTestGenerated.Annotation.class, LoadJavaTestGenerated.Constructor.class, LoadJavaTestGenerated.JavaBean.class, LoadJavaTestGenerated.KotlinSignature.class, LoadJavaTestGenerated.Library.class, LoadJavaTestGenerated.Modality.class, LoadJavaTestGenerated.NotNull.class, LoadJavaTestGenerated.Vararg.class}) public class LoadJavaTestGenerated extends AbstractLoadJavaTest { public void testAllFilesPresentInLoadJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadJava"), "java", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava"), "java", true); } @TestMetadata("ArrayTypeVariance.java") @@ -152,7 +152,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/annotation") public static class Annotation extends AbstractLoadJavaTest { public void testAllFilesPresentInAnnotation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadJava/annotation"), "java", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/annotation"), "java", true); } @TestMetadata("AnnotatedAnnotation.java") @@ -175,7 +175,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/constructor") public static class Constructor extends AbstractLoadJavaTest { public void testAllFilesPresentInConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadJava/constructor"), "java", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/constructor"), "java", true); } @TestMetadata("ConstructorGenericDeep.java") @@ -198,7 +198,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/javaBean") public static class JavaBean extends AbstractLoadJavaTest { public void testAllFilesPresentInJavaBean() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadJava/javaBean"), "java", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/javaBean"), "java", true); } @TestMetadata("DifferentGetterAndSetter.java") @@ -237,7 +237,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @InnerTestClasses({KotlinSignature.Error.class}) public static class KotlinSignature extends AbstractLoadJavaTest { public void testAllFilesPresentInKotlinSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature"), "java", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature"), "java", true); } @TestMetadata("ConstructorWithNewTypeParams.java") @@ -308,7 +308,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { } public void testAllFilesPresentInError() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/error"), "java", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/error"), "java", true); } @TestMetadata("ExplicitFieldGettersAndSetters.java") @@ -444,7 +444,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/library") public static class Library extends AbstractLoadJavaTest { public void testAllFilesPresentInLibrary() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadJava/library"), "java", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/library"), "java", true); } @TestMetadata("LoadIterable.java") @@ -462,7 +462,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/modality") public static class Modality extends AbstractLoadJavaTest { public void testAllFilesPresentInModality() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadJava/modality"), "java", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/modality"), "java", true); } @TestMetadata("ModalityOfFakeOverrides.java") @@ -475,7 +475,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/notNull") public static class NotNull extends AbstractLoadJavaTest { public void testAllFilesPresentInNotNull() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadJava/notNull"), "java", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/notNull"), "java", true); } @TestMetadata("NotNullField.java") @@ -498,7 +498,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/vararg") public static class Vararg extends AbstractLoadJavaTest { public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadJava/vararg"), "java", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/vararg"), "java", true); } @TestMetadata("VarargInt.java") diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java index 433aaf5ab3a..e7e3a46b2b8 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java @@ -26,13 +26,13 @@ import org.jetbrains.jet.test.TestMetadata; import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveDescriptorRendererTest; -/** This class is generated by {@link org.jetbrains.jet.generators.GenerateTests}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @InnerTestClasses({LazyResolveDescriptorRendererTestGenerated.Renderer.class, LazyResolveDescriptorRendererTestGenerated.DescriptorRenderer.class}) public class LazyResolveDescriptorRendererTestGenerated extends AbstractLazyResolveDescriptorRendererTest { @TestMetadata("compiler/testData/renderer") public static class Renderer extends AbstractLazyResolveDescriptorRendererTest { public void testAllFilesPresentInRenderer() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/renderer"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/renderer"), "kt", true); } @TestMetadata("Classes.kt") @@ -80,7 +80,7 @@ public class LazyResolveDescriptorRendererTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/lazyResolve/descriptorRenderer") public static class DescriptorRenderer extends AbstractLazyResolveDescriptorRendererTest { public void testAllFilesPresentInDescriptorRenderer() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/lazyResolve/descriptorRenderer"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/lazyResolve/descriptorRenderer"), "kt", true); } @TestMetadata("ClassObject.kt") diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java index db587aa7016..21f64219f5f 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java @@ -26,20 +26,20 @@ import org.jetbrains.jet.test.TestMetadata; import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest; -/** This class is generated by {@link org.jetbrains.jet.generators.GenerateTests}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @InnerTestClasses({LazyResolveNamespaceComparingTestGenerated.LoadKotlin.class, LazyResolveNamespaceComparingTestGenerated.LoadJava.class, LazyResolveNamespaceComparingTestGenerated.NamespaceComparator.class}) public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyResolveNamespaceComparingTest { @TestMetadata("compiler/testData/loadKotlin") @InnerTestClasses({LoadKotlin.Class.class, LoadKotlin.ClassFun.class, LoadKotlin.ClassObject.class, LoadKotlin.Constructor.class, LoadKotlin.DataClass.class, LoadKotlin.Fun.class, LoadKotlin.Prop.class, LoadKotlin.Type.class, LoadKotlin.Visibility.class}) public static class LoadKotlin extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInLoadKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin"), "kt", true); } @TestMetadata("compiler/testData/loadKotlin/class") public static class Class extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin/class"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/class"), "kt", true); } @TestMetadata("Class.kt") @@ -167,7 +167,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadKotlin/classFun") public static class ClassFun extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInClassFun() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin/classFun"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/classFun"), "kt", true); } @TestMetadata("ClassInParamUsedInFun.kt") @@ -205,7 +205,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadKotlin/classObject") public static class ClassObject extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInClassObject() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin/classObject"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/classObject"), "kt", true); } @TestMetadata("ClassObjectDeclaresVal.kt") @@ -238,7 +238,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadKotlin/constructor") public static class Constructor extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin/constructor"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/constructor"), "kt", true); } @TestMetadata("Constructor0.kt") @@ -291,7 +291,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadKotlin/dataClass") public static class DataClass extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInDataClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin/dataClass"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/dataClass"), "kt", true); } @TestMetadata("MixedComponents.kt") @@ -335,13 +335,13 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @InnerTestClasses({Fun.GenericWithTypeVariables.class, Fun.GenericWithoutTypeVariables.class, Fun.NonGeneric.class}) public static class Fun extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInFun() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin/fun"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/fun"), "kt", true); } @TestMetadata("compiler/testData/loadKotlin/fun/genericWithTypeVariables") public static class GenericWithTypeVariables extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInGenericWithTypeVariables() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin/fun/genericWithTypeVariables"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/fun/genericWithTypeVariables"), "kt", true); } @TestMetadata("FunGenericParam.kt") @@ -424,7 +424,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadKotlin/fun/genericWithoutTypeVariables") public static class GenericWithoutTypeVariables extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInGenericWithoutTypeVariables() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin/fun/genericWithoutTypeVariables"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/fun/genericWithoutTypeVariables"), "kt", true); } @TestMetadata("FunClassParamNotNull.kt") @@ -457,7 +457,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadKotlin/fun/nonGeneric") public static class NonGeneric extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInNonGeneric() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin/fun/nonGeneric"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/fun/nonGeneric"), "kt", true); } @TestMetadata("ClassFun.kt") @@ -555,7 +555,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadKotlin/prop") public static class Prop extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInProp() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin/prop"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/prop"), "kt", true); } @TestMetadata("ClassVal.kt") @@ -713,7 +713,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadKotlin/type") public static class Type extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin/type"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/type"), "kt", true); } @TestMetadata("Any.kt") @@ -851,7 +851,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadKotlin/visibility") public static class Visibility extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInVisibility() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadKotlin/visibility"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/visibility"), "kt", true); } @TestMetadata("InternalAbstractTraitMembersOverridden.kt") @@ -926,7 +926,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @InnerTestClasses({LoadJava.Annotation.class, LoadJava.Constructor.class, LoadJava.JavaBean.class, LoadJava.KotlinSignature.class, LoadJava.Library.class, LoadJava.Modality.class, LoadJava.NotNull.class, LoadJava.Vararg.class}) public static class LoadJava extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInLoadJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadJava"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava"), "kt", true); } @TestMetadata("ArrayTypeVariance.kt") @@ -1047,7 +1047,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/annotation") public static class Annotation extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInAnnotation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadJava/annotation"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/annotation"), "kt", true); } @TestMetadata("AnnotatedAnnotation.kt") @@ -1070,7 +1070,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/constructor") public static class Constructor extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadJava/constructor"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/constructor"), "kt", true); } @TestMetadata("ConstructorGenericDeep.kt") @@ -1093,7 +1093,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/javaBean") public static class JavaBean extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInJavaBean() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadJava/javaBean"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/javaBean"), "kt", true); } @TestMetadata("DifferentGetterAndSetter.kt") @@ -1132,7 +1132,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @InnerTestClasses({KotlinSignature.Error.class}) public static class KotlinSignature extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInKotlinSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature"), "kt", true); } @TestMetadata("ConstructorWithNewTypeParams.kt") @@ -1203,7 +1203,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } public void testAllFilesPresentInError() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/error"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/error"), "kt", true); } @TestMetadata("ExplicitFieldGettersAndSetters.kt") @@ -1339,7 +1339,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/library") public static class Library extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInLibrary() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadJava/library"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/library"), "kt", true); } @TestMetadata("LoadIterable.kt") @@ -1357,7 +1357,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/modality") public static class Modality extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInModality() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadJava/modality"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/modality"), "kt", true); } @TestMetadata("ModalityOfFakeOverrides.kt") @@ -1370,7 +1370,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/notNull") public static class NotNull extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInNotNull() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadJava/notNull"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/notNull"), "kt", true); } @TestMetadata("NotNullField.kt") @@ -1393,7 +1393,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/vararg") public static class Vararg extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/loadJava/vararg"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/vararg"), "kt", true); } @TestMetadata("VarargInt.kt") @@ -1426,7 +1426,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/lazyResolve/namespaceComparator") public static class NamespaceComparator extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInNamespaceComparator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("compiler/testData/lazyResolve/namespaceComparator"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/lazyResolve/namespaceComparator"), "kt", true); } @TestMetadata("classObjectAnnotation.kt") diff --git a/generators/org/jetbrains/jet/generators/GenerateInjectors.java b/generators/org/jetbrains/jet/generators/injectors/GenerateInjectors.java similarity index 99% rename from generators/org/jetbrains/jet/generators/GenerateInjectors.java rename to generators/org/jetbrains/jet/generators/injectors/GenerateInjectors.java index 7483bb71985..8c4befd36be 100644 --- a/generators/org/jetbrains/jet/generators/GenerateInjectors.java +++ b/generators/org/jetbrains/jet/generators/injectors/GenerateInjectors.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.generators; +package org.jetbrains.jet.generators.injectors; import com.intellij.openapi.project.Project; import org.jetbrains.jet.codegen.*; diff --git a/generators/org/jetbrains/jet/generators/GenerateRanges.java b/generators/org/jetbrains/jet/generators/runtime/GenerateRanges.java similarity index 98% rename from generators/org/jetbrains/jet/generators/GenerateRanges.java rename to generators/org/jetbrains/jet/generators/runtime/GenerateRanges.java index 8c853b4f6fc..1ba37f79020 100644 --- a/generators/org/jetbrains/jet/generators/GenerateRanges.java +++ b/generators/org/jetbrains/jet/generators/runtime/GenerateRanges.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.generators; +package org.jetbrains.jet.generators.runtime; import com.intellij.openapi.util.io.FileUtil; diff --git a/generators/org/jetbrains/jet/generators/GenerateTuplesAndFunctions.java b/generators/org/jetbrains/jet/generators/runtime/GenerateTuplesAndFunctions.java similarity index 98% rename from generators/org/jetbrains/jet/generators/GenerateTuplesAndFunctions.java rename to generators/org/jetbrains/jet/generators/runtime/GenerateTuplesAndFunctions.java index 258416820db..eebec3bc4e6 100644 --- a/generators/org/jetbrains/jet/generators/GenerateTuplesAndFunctions.java +++ b/generators/org/jetbrains/jet/generators/runtime/GenerateTuplesAndFunctions.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.generators; +package org.jetbrains.jet.generators.runtime; import java.io.File; import java.io.FileNotFoundException; diff --git a/generators/org/jetbrains/jet/generators/GenerateTests.java b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java similarity index 99% rename from generators/org/jetbrains/jet/generators/GenerateTests.java rename to generators/org/jetbrains/jet/generators/tests/GenerateTests.java index 67c18472466..b426338ad2a 100644 --- a/generators/org/jetbrains/jet/generators/GenerateTests.java +++ b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.generators; +package org.jetbrains.jet.generators.tests; import junit.framework.TestCase; import org.jetbrains.annotations.NotNull; diff --git a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java b/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java index ba5749a392a..98b06c17be3 100644 --- a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.test.TestMetadata; import org.jetbrains.jet.checkers.AbstractJetPsiCheckerTest; -/** This class is generated by {@link org.jetbrains.jet.generators.GenerateTests}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @InnerTestClasses({JetPsiCheckerTestGenerated.Checker.class, JetPsiCheckerTestGenerated.Regression.class, JetPsiCheckerTestGenerated.Rendering.class, JetPsiCheckerTestGenerated.Infos.class}) public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { @TestMetadata("idea/testData/checker") @@ -37,7 +37,7 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { } public void testAllFilesPresentInChecker() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("idea/testData/checker"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/checker"), "kt", false); } @TestMetadata("AnonymousInitializers.kt") @@ -265,7 +265,7 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { @TestMetadata("idea/testData/checker/regression") public static class Regression extends AbstractJetPsiCheckerTest { public void testAllFilesPresentInRegression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("idea/testData/checker/regression"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/checker/regression"), "kt", true); } @TestMetadata("AmbiguityOnLazyTypeComputation.kt") @@ -388,7 +388,7 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { @TestMetadata("idea/testData/checker/rendering") public static class Rendering extends AbstractJetPsiCheckerTest { public void testAllFilesPresentInRendering() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("idea/testData/checker/rendering"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/checker/rendering"), "kt", true); } @TestMetadata("TypeInferenceError.kt") @@ -401,7 +401,7 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { @TestMetadata("idea/testData/checker/infos") public static class Infos extends AbstractJetPsiCheckerTest { public void testAllFilesPresentInInfos() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("idea/testData/checker/infos"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/checker/infos"), "kt", true); } @TestMetadata("Autocasts.kt") diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/DeprecatedHighlightingTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/highlighter/DeprecatedHighlightingTestGenerated.java index 6af423810fd..1ce41f57e9c 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/DeprecatedHighlightingTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/DeprecatedHighlightingTestGenerated.java @@ -26,11 +26,11 @@ import org.jetbrains.jet.test.TestMetadata; import org.jetbrains.jet.plugin.highlighter.AbstractDeprecatedHighlightingTest; -/** This class is generated by {@link org.jetbrains.jet.generators.GenerateTests}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @TestMetadata("idea/testData/highlighter/deprecated") public class DeprecatedHighlightingTestGenerated extends AbstractDeprecatedHighlightingTest { public void testAllFilesPresentInDeprecated() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.GenerateTests", new File("idea/testData/highlighter/deprecated"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/highlighter/deprecated"), "kt", true); } @TestMetadata("Class.kt") diff --git a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java index d0b7742ad6b..9c0afebd76f 100644 --- a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java +++ b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java @@ -46,7 +46,7 @@ import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; -/* This file is generated by org.jetbrains.jet.generators.GenerateInjectors. DO NOT EDIT! */ +/* This file is generated by org.jetbrains.jet.generators.injectors.GenerateInjectors. DO NOT EDIT! */ public class InjectorForTopDownAnalyzerForJs { private TopDownAnalyzer topDownAnalyzer; diff --git a/runtime/src/jet/runtime/Ranges.java b/runtime/src/jet/runtime/Ranges.java index 33306d46f1d..d4d0d665879 100644 --- a/runtime/src/jet/runtime/Ranges.java +++ b/runtime/src/jet/runtime/Ranges.java @@ -19,7 +19,7 @@ package jet.runtime; import jet.*; -/* This file is generated by org.jetbrains.jet.generators.GenerateRanges. DO NOT EDIT! */ +/* This file is generated by org.jetbrains.jet.generators.runtime.GenerateRanges. DO NOT EDIT! */ public class Ranges { public static ByteRange rangeTo(byte from, byte to) { if (from > to) {