From fbc0ca1b77eb6dbd498247dfff5e7a615a8d5a0f Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Tue, 4 Sep 2012 19:35:02 +0400 Subject: [PATCH] Gererated tests now check that all the relevant directories are present We only checked test data files before --- .../tests/org/jetbrains/jet/JetTestUtils.java | 62 ++++++++++++-- .../checkers/JetDiagnosticsTestGenerated.java | 83 ++++++++++--------- .../jet/codegen/IntrinsicsTestGenerated.java | 3 +- .../jet/codegen/MultiDeclTestGenerated.java | 45 ++++++---- .../jvm/compiler/LoadJavaTestGenerated.java | 23 ++--- ...esolveDescriptorRendererTestGenerated.java | 13 ++- ...esolveNamespaceComparingTestGenerated.java | 76 +++++++++++------ .../jetbrains/jet/test/InnerTestClasses.java | 33 ++++++++ .../test/generator/SimpleTestClassModel.java | 2 +- .../jet/test/generator/TestGenerator.java | 18 +++- .../checkers/JetPsiCheckerTestGenerated.java | 6 +- 11 files changed, 257 insertions(+), 107 deletions(-) create mode 100644 compiler/tests/org/jetbrains/jet/test/InnerTestClasses.java diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java index 05d161a6c80..6911aeb9d19 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java @@ -43,6 +43,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; import org.jetbrains.jet.plugin.JetLanguage; +import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; import org.jetbrains.jet.util.slicedmap.ReadOnlySlice; import org.jetbrains.jet.util.slicedmap.SlicedMap; @@ -168,6 +169,9 @@ public class JetTestUtils { } }; + @SuppressWarnings("unchecked") + private static final Class[] NO_INNER_CLASSES = new Class[0]; + private JetTestUtils() { } @@ -385,19 +389,17 @@ public class JetTestUtils { if (files != null) { for (File file : files) { if (file.isDirectory()) { - if (recursive) { - assertAllTestsPresentByMetadata(testCaseClass, generatorClassFqName, file, extension, recursive); + if (recursive && containsTestData(file, extension)) { + assertTestClassPresentByMetadata(testCaseClass, generatorClassFqName, file); } } else { if (file.getName().endsWith("." + extension)) { String relativePath = FileUtil.getRelativePath(rootFile, file); if (!filePaths.contains(relativePath)) { - String generatorClassSimpleName = generatorClassFqName.substring(generatorClassFqName.lastIndexOf(".") + 1); Assert.fail("Test data file missing from the generated test class: " + - file + - "\nPlease re-run the generator: " + generatorClassFqName + - "(" + generatorClassSimpleName + ".java:1)"); + file + + pleaseReRunGenerator(generatorClassFqName)); } } } @@ -405,4 +407,52 @@ public class JetTestUtils { } } + private static boolean containsTestData(File dir, String extension) { + File[] files = dir.listFiles(); + assert files != null; + for (File file : files) { + if (file.isDirectory()) { + if (containsTestData(file, extension)) { + return true; + } + } + else { + if (FileUtil.getExtension(file.getName()).equals(extension)) { + return true; + } + } + } + return false; + } + + private static void assertTestClassPresentByMetadata( + @NotNull Class outerClass, + @NotNull String generatorClassFqName, + @NotNull File testDataDir + ) { + InnerTestClasses innerClassesAnnotation = outerClass.getAnnotation(InnerTestClasses.class); + Class[] innerClasses = innerClassesAnnotation == null ? NO_INNER_CLASSES : innerClassesAnnotation.value(); + for (Class innerClass : innerClasses) { + TestMetadata testMetadata = innerClass.getAnnotation(TestMetadata.class); + if (testMetadata != null && testMetadata.value().equals(testDataDir.getPath())) { + return; + } + } + Assert.fail("Test data directory missing from the generated test class: " + + testDataDir + + pleaseReRunGenerator(generatorClassFqName)); + } + + private static String pleaseReRunGenerator(String generatorClassFqName) { + return "\nPlease re-run the generator: " + generatorClassFqName + + getLocationFormattedForConsole(generatorClassFqName); + } + + private static String getLocationFormattedForConsole(String generatorClassFqName) { + return "(" + getSimpleName(generatorClassFqName) + ".java:1)"; + } + + private static String getSimpleName(String generatorClassFqName) { + return generatorClassFqName.substring(generatorClassFqName.lastIndexOf(".") + 1); + } } diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java index fdb87af915b..dc1472f5fdf 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java @@ -15,19 +15,19 @@ */ package org.jetbrains.jet.checkers; -import junit.framework.Assert; import junit.framework.Test; import junit.framework.TestSuite; - -import java.io.File; import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; -import org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve; +import java.io.File; /** This class is generated by {@link org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve}. DO NOT MODIFY MANUALLY */ +@InnerTestClasses({JetDiagnosticsTestGenerated.Tests.class, JetDiagnosticsTestGenerated.Script.class, }) public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEagerResolve { @TestMetadata("compiler/testData/diagnostics/tests") + @InnerTestClasses({Tests.Annotations.class, Tests.BackingField.class, Tests.Cast.class, Tests.CheckArguments.class, Tests.ControlFlowAnalysis.class, Tests.ControlStructures.class, Tests.DataFlow.class, Tests.DataFlowInfoTraversal.class, Tests.DeclarationChecks.class, Tests.Enum.class, Tests.Extensions.class, Tests.Generics.class, Tests.IncompleteCode.class, Tests.Inference.class, Tests.Infos.class, Tests.J_k.class, Tests.Jdk_annotations.class, Tests.Library.class, Tests.NullabilityAndAutoCasts.class, Tests.Objects.class, Tests.OperatorsOverloading.class, Tests.Overload.class, Tests.Override.class, Tests.Redeclarations.class, Tests.Regressions.class, Tests.Scopes.class, Tests.Shadowing.class, Tests.Substitutions.class, Tests.Subtyping.class, Tests.Tuples.class, Tests.Varargs.class, }) public static class Tests extends AbstractDiagnosticsTestWithEagerResolve { @TestMetadata("Abstract.kt") public void testAbstract() throws Exception { @@ -60,7 +60,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage } public void testAllFilesPresentInTests() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests"), "kt", true); } @TestMetadata("AnonymousInitializerVarAndConstructor.kt") @@ -506,7 +506,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/annotations"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/annotations"), "kt", true); } @TestMetadata("AmbigiousAnnotationConstructor.kt") @@ -564,7 +564,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/backingField"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/backingField"), "kt", true); } @TestMetadata("CustomGetSet.kt") @@ -672,7 +672,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/cast"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/cast"), "kt", true); } @TestMetadata("AsErasedError.kt") @@ -750,7 +750,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/checkArguments"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/checkArguments"), "kt", true); } @TestMetadata("kt1897_diagnostic_part.kt") @@ -773,7 +773,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/controlFlowAnalysis"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/controlFlowAnalysis"), "kt", true); } @TestMetadata("checkInnerLocalDeclarations.kt") @@ -881,7 +881,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/controlStructures"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/controlStructures"), "kt", true); } @TestMetadata("forLoopWithNullableRange.kt") @@ -939,7 +939,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/dataFlow"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/dataFlow"), "kt", true); } @TestMetadata("CalleeExpression.kt") @@ -962,7 +962,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/dataFlowInfoTraversal"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/dataFlowInfoTraversal"), "kt", true); } @TestMetadata("AndOr.kt") @@ -1068,9 +1068,10 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage } @TestMetadata("compiler/testData/diagnostics/tests/declarationChecks") + @InnerTestClasses({DeclarationChecks.MultiDeclarations.class, }) public static class DeclarationChecks extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInDeclarationChecks() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/declarationChecks"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/declarationChecks"), "kt", true); } @TestMetadata("ComponentFunctionReturnTypeMismatch.kt") @@ -1161,7 +1162,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations"), "kt", true); } @TestMetadata("DoubleDeclForLoop.kt") @@ -1217,7 +1218,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/enum") public static class Enum extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInEnum() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/enum"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/enum"), "kt", true); } @TestMetadata("enumStarImport.kt") @@ -1265,7 +1266,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/extensions"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/extensions"), "kt", true); } @TestMetadata("ExtensionFunctions.kt") @@ -1308,7 +1309,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/generics"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/generics"), "kt", true); } @TestMetadata("kt1575-Class.kt") @@ -1344,9 +1345,10 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage } @TestMetadata("compiler/testData/diagnostics/tests/incompleteCode") + @InnerTestClasses({IncompleteCode.DiagnosticWithSyntaxError.class, }) public static class IncompleteCode extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInIncompleteCode() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/incompleteCode"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/incompleteCode"), "kt", true); } @TestMetadata("arrayBracketsRange.kt") @@ -1392,7 +1394,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError"), "kt", true); } @TestMetadata("checkBackingFieldException.kt") @@ -1441,9 +1443,10 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage } @TestMetadata("compiler/testData/diagnostics/tests/inference") + @InnerTestClasses({Inference.Regressions.class, }) public static class Inference extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInInference() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/inference"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/inference"), "kt", true); } @TestMetadata("arrayConstructor.kt") @@ -1539,7 +1542,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/inference/regressions"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/inference/regressions"), "kt", true); } @TestMetadata("kt1029.kt") @@ -1695,7 +1698,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/infos"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/infos"), "kt", true); } @TestMetadata("Autocasts.kt") @@ -1713,7 +1716,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/j+k"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/j+k"), "kt", true); } @TestMetadata("kt1402.kt") @@ -1786,7 +1789,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/jdk-annotations") public static class Jdk_annotations extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInJdk_annotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/jdk-annotations"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/jdk-annotations"), "kt", true); } @TestMetadata("ArrayListAndMap.kt") @@ -1809,7 +1812,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/library"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/library"), "kt", true); } @TestMetadata("kt828.kt") @@ -1822,7 +1825,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts"), "kt", true); } @TestMetadata("AssertNotNull.kt") @@ -1945,7 +1948,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/objects"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/objects"), "kt", true); } @TestMetadata("kt2240.kt") @@ -1978,7 +1981,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/operatorsOverloading"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/operatorsOverloading"), "kt", true); } @TestMetadata("AssignOperatorAmbiguity.kt") @@ -2001,7 +2004,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/overload"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/overload"), "kt", true); } @TestMetadata("ConflictingOverloadsFunsDifferentReturnInClass.kt") @@ -2099,7 +2102,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage } public void testAllFilesPresentInOverride() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/override"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/override"), "kt", true); } @TestMetadata("AllPrivateFromSuperTypes.kt") @@ -2242,7 +2245,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/redeclarations"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/redeclarations"), "kt", true); } @TestMetadata("ConflictingExtensionProperties.kt") @@ -2295,7 +2298,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/regressions"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/regressions"), "kt", true); } @TestMetadata("AmbiguityOnLazyTypeComputation.kt") @@ -2773,7 +2776,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/scopes"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/scopes"), "kt", true); } @TestMetadata("ImportFromCurrentWithDifferentName.kt") @@ -2976,7 +2979,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/shadowing"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/shadowing"), "kt", true); } @TestMetadata("ShadowParameterInFunctionBody.kt") @@ -3029,7 +3032,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/substitutions"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/substitutions"), "kt", true); } @TestMetadata("kt1558-short.kt") @@ -3042,7 +3045,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/subtyping"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/subtyping"), "kt", true); } @TestMetadata("kt2069.kt") @@ -3065,7 +3068,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/tuples"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/tuples"), "kt", true); } @TestMetadata("BasicTuples.kt") @@ -3078,7 +3081,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.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/varargs"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/varargs"), "kt", true); } @TestMetadata("AmbiguousVararg.kt") @@ -3174,7 +3177,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage } public void testAllFilesPresentInScript() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/script"), "ktscript", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve", new File("compiler/testData/diagnostics/tests/script"), "ktscript", true); } @TestMetadata("ComplexScript.ktscript") diff --git a/compiler/tests/org/jetbrains/jet/codegen/IntrinsicsTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/IntrinsicsTestGenerated.java index dfafb42c92c..d86e4c516db 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/IntrinsicsTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/IntrinsicsTestGenerated.java @@ -21,6 +21,7 @@ import junit.framework.TestSuite; import java.io.File; import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; import org.jetbrains.jet.codegen.AbstractIntrinsicsTestCase; @@ -29,7 +30,7 @@ import org.jetbrains.jet.codegen.AbstractIntrinsicsTestCase; @TestMetadata("compiler/testData/codegen/intrinsics") public class IntrinsicsTestGenerated extends AbstractIntrinsicsTestCase { public void testAllFilesPresentInIntrinsics() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.codegen.AbstractIntrinsicsTestCase", new File("compiler/testData/codegen/intrinsics"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.codegen.AbstractIntrinsicsTestCase", 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 390a3f875da..d28ede2c8fb 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/MultiDeclTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/MultiDeclTestGenerated.java @@ -13,21 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.jetbrains.jet.codegen; +import junit.framework.Assert; import junit.framework.Test; import junit.framework.TestSuite; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.TestMetadata; import java.io.File; +import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.test.InnerTestClasses; +import org.jetbrains.jet.test.TestMetadata; + +import org.jetbrains.jet.codegen.AbstractMultiDeclTestCase; /** This class is generated by {@link org.jetbrains.jet.codegen.AbstractMultiDeclTestCase}. 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.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl"), "kt", true); } @TestMetadata("ComplexInitializer.kt") @@ -86,9 +90,10 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { } @TestMetadata("compiler/testData/codegen/multiDecl/forArray") + @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.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forArray"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forArray"), "kt", true); } @TestMetadata("MultiDeclFor.kt") @@ -119,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.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forArray/int"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forArray/int"), "kt", true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -147,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.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forArray/long"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forArray/long"), "kt", true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -182,9 +187,10 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { } @TestMetadata("compiler/testData/codegen/multiDecl/forIterator") + @InnerTestClasses({ForIterator.LongIterator.class, }) public static class ForIterator extends AbstractMultiDeclTestCase { public void testAllFilesPresentInForIterator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forIterator"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forIterator"), "kt", true); } @TestMetadata("MultiDeclFor.kt") @@ -215,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.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forIterator/longIterator"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forIterator/longIterator"), "kt", true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -249,9 +255,10 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { } @TestMetadata("compiler/testData/codegen/multiDecl/forRange") + @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.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forRange"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forRange"), "kt", true); } @TestMetadata("MultiDeclFor.kt") @@ -280,9 +287,10 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { } @TestMetadata("compiler/testData/codegen/multiDecl/forRange/explicitRangeTo") + @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.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeTo"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeTo"), "kt", true); } @TestMetadata("MultiDeclFor.kt") @@ -313,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.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeTo/int"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeTo/int"), "kt", true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -341,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.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeTo/long"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeTo/long"), "kt", true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -376,9 +384,10 @@ public class MultiDeclTestGenerated extends AbstractMultiDeclTestCase { } @TestMetadata("compiler/testData/codegen/multiDecl/forRange/explicitRangeToWithDot") + @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.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeToWithDot"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeToWithDot"), "kt", true); } @TestMetadata("MultiDeclFor.kt") @@ -409,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.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeToWithDot/int"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeToWithDot/int"), "kt", true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -437,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.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeToWithDot/long"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forRange/explicitRangeToWithDot/long"), "kt", true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -474,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.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forRange/int"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forRange/int"), "kt", true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -502,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.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forRange/long"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.codegen.AbstractMultiDeclTestCase", new File("compiler/testData/codegen/multiDecl/forRange/long"), "kt", true); } @TestMetadata("MultiDeclForComponentExtensions.kt") diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java index a06b836b460..bdda4fc32d8 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java @@ -21,15 +21,17 @@ import junit.framework.TestSuite; import java.io.File; import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; import org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest; /** This class is generated by {@link org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest}. 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.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava"), "java", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava"), "java", true); } @TestMetadata("ArrayTypeVariance.java") @@ -150,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.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/annotation"), "java", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/annotation"), "java", true); } @TestMetadata("AnnotatedAnnotation.java") @@ -173,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.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/constructor"), "java", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/constructor"), "java", true); } @TestMetadata("ConstructorGenericDeep.java") @@ -196,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.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/javaBean"), "java", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/javaBean"), "java", true); } @TestMetadata("DifferentGetterAndSetter.java") @@ -232,9 +234,10 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { } @TestMetadata("compiler/testData/loadJava/kotlinSignature") + @InnerTestClasses({KotlinSignature.Error.class, }) public static class KotlinSignature extends AbstractLoadJavaTest { public void testAllFilesPresentInKotlinSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/kotlinSignature"), "java", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/kotlinSignature"), "java", true); } @TestMetadata("MethodWithFunctionTypes.java") @@ -270,7 +273,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { } public void testAllFilesPresentInError() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/kotlinSignature/error"), "java", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/kotlinSignature/error"), "java", true); } @TestMetadata("ExtraUpperBound.java") @@ -376,7 +379,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.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/library"), "java", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/library"), "java", true); } @TestMetadata("LoadIterable.java") @@ -394,7 +397,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.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/modality"), "java", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/modality"), "java", true); } @TestMetadata("ModalityOfFakeOverrides.java") @@ -407,7 +410,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.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/notNull"), "java", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/notNull"), "java", true); } @TestMetadata("NotNullField.java") @@ -430,7 +433,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.jvm.compiler.AbstractLoadJavaTest", new File("compiler/testData/loadJava/vararg"), "java", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest", 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 363aedfbac9..eec089d738a 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java @@ -15,19 +15,24 @@ */ package org.jetbrains.jet.lang.resolve.lazy; +import junit.framework.Assert; import junit.framework.Test; import junit.framework.TestSuite; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.TestMetadata; import java.io.File; +import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.test.InnerTestClasses; +import org.jetbrains.jet.test.TestMetadata; + +import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveDescriptorRendererTest; /** This class is generated by {@link org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveDescriptorRendererTest}. 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.lang.resolve.lazy.AbstractLazyResolveDescriptorRendererTest", new File("compiler/testData/renderer"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveDescriptorRendererTest", new File("compiler/testData/renderer"), "kt", true); } @TestMetadata("Classes.kt") @@ -75,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.lang.resolve.lazy.AbstractLazyResolveDescriptorRendererTest", new File("compiler/testData/lazyResolve/descriptorRenderer"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveDescriptorRendererTest", 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 b1768e6532a..f903ddf828c 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java @@ -15,25 +15,31 @@ */ package org.jetbrains.jet.lang.resolve.lazy; +import junit.framework.Assert; import junit.framework.Test; import junit.framework.TestSuite; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.TestMetadata; import java.io.File; +import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.test.InnerTestClasses; +import org.jetbrains.jet.test.TestMetadata; + +import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest; /** This class is generated by {@link org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest}. 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.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.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", 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.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/class"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/class"), "kt", true); } @TestMetadata("Class.kt") @@ -141,7 +147,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.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/classFun"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/classFun"), "kt", true); } @TestMetadata("ClassInParamUsedInFun.kt") @@ -179,7 +185,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.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/classObject"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/classObject"), "kt", true); } @TestMetadata("ClassObjectDeclaresVal.kt") @@ -212,7 +218,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.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/constructor"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/constructor"), "kt", true); } @TestMetadata("Constructor0.kt") @@ -263,15 +269,16 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadKotlin/fun") + @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.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/fun"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", 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.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/fun/genericWithTypeVariables"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/fun/genericWithTypeVariables"), "kt", true); } @TestMetadata("FunGenericParam.kt") @@ -354,7 +361,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.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/fun/genericWithoutTypeVariables"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/fun/genericWithoutTypeVariables"), "kt", true); } @TestMetadata("FunClassParamNotNull.kt") @@ -387,7 +394,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.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/fun/nonGeneric"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/fun/nonGeneric"), "kt", true); } @TestMetadata("ClassFun.kt") @@ -485,7 +492,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.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/prop"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/prop"), "kt", true); } @TestMetadata("ClassVal.kt") @@ -643,7 +650,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.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/type"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/type"), "kt", true); } @TestMetadata("Any.kt") @@ -781,7 +788,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.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/visibility"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadKotlin/visibility"), "kt", true); } @TestMetadata("InternalAbstractTraitMembersOverridden.kt") @@ -852,9 +859,10 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava") + @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.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava"), "kt", true); } @TestMetadata("ArrayTypeVariance.kt") @@ -975,7 +983,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.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/annotation"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/annotation"), "kt", true); } @TestMetadata("AnnotatedAnnotation.kt") @@ -998,7 +1006,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.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/constructor"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/constructor"), "kt", true); } @TestMetadata("ConstructorGenericDeep.kt") @@ -1021,7 +1029,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.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/javaBean"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/javaBean"), "kt", true); } @TestMetadata("DifferentGetterAndSetter.kt") @@ -1057,9 +1065,10 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } @TestMetadata("compiler/testData/loadJava/kotlinSignature") + @InnerTestClasses({KotlinSignature.Error.class, }) public static class KotlinSignature extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInKotlinSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/kotlinSignature"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/kotlinSignature"), "kt", true); } @TestMetadata("MethodWithFunctionTypes.kt") @@ -1095,7 +1104,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } public void testAllFilesPresentInError() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/kotlinSignature/error"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/kotlinSignature/error"), "kt", true); } @TestMetadata("ExtraUpperBound.kt") @@ -1198,10 +1207,28 @@ 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.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/library"), "kt", true); + } + + @TestMetadata("LoadIterable.kt") + public void testLoadIterable() throws Exception { + doTestSinglePackage("compiler/testData/loadJava/library/LoadIterable.kt"); + } + + @TestMetadata("LoadIterator.kt") + public void testLoadIterator() throws Exception { + doTestSinglePackage("compiler/testData/loadJava/library/LoadIterator.kt"); + } + + } + @TestMetadata("compiler/testData/loadJava/modality") public static class Modality extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInModality() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/modality"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/modality"), "kt", true); } @TestMetadata("ModalityOfFakeOverrides.kt") @@ -1214,7 +1241,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.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/notNull"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/notNull"), "kt", true); } @TestMetadata("NotNullField.kt") @@ -1237,7 +1264,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.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/vararg"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/loadJava/vararg"), "kt", true); } @TestMetadata("VarargInt.kt") @@ -1259,6 +1286,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso suite.addTestSuite(Constructor.class); suite.addTestSuite(JavaBean.class); suite.addTest(KotlinSignature.innerSuite()); + suite.addTestSuite(Library.class); suite.addTestSuite(Modality.class); suite.addTestSuite(NotNull.class); suite.addTestSuite(Vararg.class); @@ -1269,7 +1297,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.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/lazyResolve/namespaceComparator"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest", new File("compiler/testData/lazyResolve/namespaceComparator"), "kt", true); } @TestMetadata("enum.kt") diff --git a/compiler/tests/org/jetbrains/jet/test/InnerTestClasses.java b/compiler/tests/org/jetbrains/jet/test/InnerTestClasses.java new file mode 100644 index 00000000000..2108e7d4044 --- /dev/null +++ b/compiler/tests/org/jetbrains/jet/test/InnerTestClasses.java @@ -0,0 +1,33 @@ +/* + * Copyright 2010-2012 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.test; + +import junit.framework.TestCase; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * @author abreslav + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface InnerTestClasses { + Class[] value() default {}; +} diff --git a/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestClassModel.java b/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestClassModel.java index fa12603fd73..6c2a4ae361d 100644 --- a/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestClassModel.java +++ b/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestClassModel.java @@ -134,7 +134,7 @@ public class SimpleTestClassModel implements TestClassModel { "\"", generatorClassFqName, "\", " + "new File(\"", JetTestUtils.getFilePath(rootFile) + "\"), \"", extension, - "\", ", false, + "\", ", recursive, ");"); } diff --git a/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java b/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java index ec888cb0a51..dd0eee492e3 100644 --- a/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java +++ b/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java @@ -76,6 +76,7 @@ public class TestGenerator { p.println("import java.io.File;"); p.println("import org.jetbrains.jet.JetTestUtils;"); + p.println("import org.jetbrains.jet.test.InnerTestClasses;"); p.println("import org.jetbrains.jet.test.TestMetadata;"); p.println(); @@ -132,6 +133,9 @@ public class TestGenerator { private void generateTestClass(Printer p, TestClassModel testClassModel, boolean isStatic) { String staticModifier = isStatic ? "static " : ""; generateMetadata(p, testClassModel); + + generateInnerClassesAnnotation(p, testClassModel); + p.println("public " + staticModifier + "class ", testClassModel.getName(), " extends ", baseTestClassName, " {"); p.pushIndent(); @@ -196,10 +200,22 @@ public class TestGenerator { p.println("}"); } - private void generateMetadata(Printer p, TestEntityModel testDataSource) { + private static void generateMetadata(Printer p, TestEntityModel testDataSource) { String dataString = testDataSource.getDataString(); if (dataString != null) { p.println("@TestMetadata(\"", dataString, "\")"); } } + + private static void generateInnerClassesAnnotation(Printer p, TestClassModel testClassModel) { + Collection innerTestClasses = testClassModel.getInnerTestClasses(); + if (innerTestClasses.isEmpty()) return; + p.print("@InnerTestClasses({"); + for (TestClassModel innerTestClass : innerTestClasses) { + if (!innerTestClass.isEmpty()) { + p.printWithNoIndent(testClassModel.getName(), ".", innerTestClass.getName(), ".class, "); + } + } + p.printlnWithNoIndent("})"); + } } diff --git a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java b/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java index e21e498fc3f..34b48b2f1e3 100644 --- a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java @@ -18,11 +18,13 @@ package org.jetbrains.jet.checkers; import junit.framework.Test; import junit.framework.TestSuite; import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; import java.io.File; /** This class is generated by {@link org.jetbrains.jet.checkers.AbstractJetPsiCheckerTest}. DO NOT MODIFY MANUALLY */ +@InnerTestClasses({JetPsiCheckerTestGenerated.Checker.class, JetPsiCheckerTestGenerated.Regression.class, JetPsiCheckerTestGenerated.Infos.class, }) public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { @TestMetadata("idea/testData/checker") public static class Checker extends AbstractJetPsiCheckerTest { @@ -261,7 +263,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.checkers.AbstractJetPsiCheckerTest", new File("idea/testData/checker/regression"), "jet", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractJetPsiCheckerTest", new File("idea/testData/checker/regression"), "jet", true); } @TestMetadata("AmbiguityOnLazyTypeComputation.jet") @@ -384,7 +386,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.checkers.AbstractJetPsiCheckerTest", new File("idea/testData/checker/infos"), "jet", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.checkers.AbstractJetPsiCheckerTest", new File("idea/testData/checker/infos"), "jet", true); } @TestMetadata("Autocasts.jet")