From e65ca47d9892ed6060e84e56fe1fea0861022c11 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 4 Feb 2013 19:54:36 +0400 Subject: [PATCH] Regenerated tests. --- .../checkers/JetDiagnosticsTestGenerated.java | 104 ++++++++--------- ...CheckLocalVariablesTableTestGenerated.java | 3 +- .../DataClassCodegenTestGenerated.java | 11 +- .../codegen/JavaVisibilityTestGenerated.java | 7 +- ...faultArgumentsReflectionTestGenerated.java | 3 +- .../flags/WriteFlagsTestGenerated.java | 31 +++--- .../BlackBoxCodegenTestGenerated.java | 105 +++++++++--------- .../BlackBoxWithJavaCodegenTestGenerated.java | 11 +- .../generated/RangesCodegenTestGenerated.java | 7 +- ...CompileJavaAgainstKotlinTestGenerated.java | 7 +- ...mpileKotlinAgainstCustomJavaGenerated.java | 5 +- ...mpileKotlinAgainstKotlinTestGenerated.java | 13 ++- .../LoadCompiledKotlinTestGenerated.java | 31 +++--- .../jvm/compiler/LoadJavaTestGenerated.java | 29 ++--- ...esolveDescriptorRendererTestGenerated.java | 3 +- .../lazy/LazyResolveFullTestGenerated.java | 4 +- ...esolveNamespaceComparingTestGenerated.java | 61 +++++----- .../lazy/LazyResolveTestGenerated.java | 3 +- .../checkers/JetPsiCheckerTestGenerated.java | 9 +- .../DeprecatedHighlightingTestGenerated.java | 3 +- 20 files changed, 237 insertions(+), 213 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java index 590af93ef55..5eaf3379aff 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java @@ -16,13 +16,17 @@ package org.jetbrains.jet.checkers; +import junit.framework.Assert; import junit.framework.Test; import junit.framework.TestSuite; + +import java.io.File; +import java.util.regex.Pattern; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; -import java.io.File; +import org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve; /** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @@ -62,7 +66,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage } public void testAllFilesPresentInTests() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AnonymousInitializerVarAndConstructor.kt") @@ -518,7 +522,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AmbigiousAnnotationConstructor.kt") @@ -581,7 +585,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("CustomGetSet.kt") @@ -689,7 +693,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AsErasedError.kt") @@ -802,7 +806,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt1897_diagnostic_part.kt") @@ -825,7 +829,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("backingFieldInsideGetter.kt") @@ -993,7 +997,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("forLoopWithNullableRange.kt") @@ -1051,7 +1055,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("bothParamsAreNotProperties.kt") @@ -1164,7 +1168,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("CalleeExpression.kt") @@ -1187,7 +1191,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AndOr.kt") @@ -1436,7 +1440,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ComponentFunctionReturnTypeMismatch.kt") @@ -1542,7 +1546,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DoubleDeclForLoop.kt") @@ -1603,7 +1607,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/deparenthesize") public static class Deparenthesize extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInDeparenthesize() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/deparenthesize"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/deparenthesize"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ArrayAccessAssignment.kt") @@ -1617,7 +1621,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("enumInheritance.kt") @@ -1683,7 +1687,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("existingClassObject.kt") @@ -1754,7 +1758,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ExtensionFunctions.kt") @@ -1797,7 +1801,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ExpectedParameterTypeMismatchVariance.kt") @@ -1820,7 +1824,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt1575-Class.kt") @@ -1874,7 +1878,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arrayBracketsRange.kt") @@ -1930,7 +1934,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("checkBackingFieldException.kt") @@ -1992,7 +1996,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @InnerTestClasses({Inference.Regressions.class, Inference.ReportingImprovements.class, Inference.Varargs.class}) public static class Inference extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInInference() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arrayConstructor.kt") @@ -2118,7 +2122,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt1029.kt") @@ -2331,7 +2335,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/inference/reportingImprovements") public static class ReportingImprovements extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInReportingImprovements() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/inference/reportingImprovements"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/inference/reportingImprovements"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("cannotInferParameterTypeWithInference.kt") @@ -2364,7 +2368,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("varargsAndPair.kt") @@ -2387,7 +2391,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Autocasts.kt") @@ -2406,7 +2410,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @InnerTestClasses({Inner.QualifiedExpression.class}) public static class Inner extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInInner() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/inner"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/inner"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("constructorAccess.kt") @@ -2502,7 +2506,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression") public static class QualifiedExpression extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInQualifiedExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/inner/qualifiedExpression"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/inner/qualifiedExpression"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classObjectOfNestedClass.kt") @@ -2568,7 +2572,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("innerNestedClassFromJava.kt") @@ -2687,7 +2691,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ArrayListAndMap.kt") @@ -2708,7 +2712,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DriverManager.kt") @@ -2739,7 +2743,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("BooleanIsNotComparable.kt") @@ -2762,7 +2766,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AssertNotNull.kt") @@ -2895,7 +2899,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("baseWithNullableUpperBound.kt") @@ -2928,7 +2932,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt2240.kt") @@ -2961,7 +2965,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AssignOperatorAmbiguity.kt") @@ -2984,7 +2988,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ConflictingOverloadsFunsDifferentReturnInClass.kt") @@ -3082,7 +3086,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage } public void testAllFilesPresentInOverride() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AllPrivateFromSuperTypes.kt") @@ -3235,7 +3239,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ConflictingExtensionProperties.kt") @@ -3293,7 +3297,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AmbiguityOnLazyTypeComputation.kt") @@ -3786,7 +3790,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage @TestMetadata("compiler/testData/diagnostics/tests/resolve") public static class Resolve extends AbstractDiagnosticsTestWithEagerResolve { public void testAllFilesPresentInResolve() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/resolve"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/diagnostics/tests/resolve"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("resolveWithFunctionLiterals.kt") @@ -3814,7 +3818,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AmbiguityBetweenRootAndPackage.kt") @@ -4022,7 +4026,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("parenthesized.kt") @@ -4035,7 +4039,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ShadowMultiDeclarationWithFunParameter.kt") @@ -4093,7 +4097,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt1558-short.kt") @@ -4116,7 +4120,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt2069.kt") @@ -4149,7 +4153,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ambigousLabelOnThis.kt") @@ -4212,7 +4216,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("UnitValue.kt") @@ -4225,7 +4229,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AmbiguousVararg.kt") @@ -4334,7 +4338,7 @@ public class JetDiagnosticsTestGenerated extends AbstractDiagnosticsTestWithEage } public void testAllFilesPresentInScript() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.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"), Pattern.compile("^(.+)\\.ktscript$"), true); } @TestMetadata("ComplexScript.ktscript") diff --git a/compiler/tests/org/jetbrains/jet/codegen/CheckLocalVariablesTableTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/CheckLocalVariablesTableTestGenerated.java index 4a769bfd1ce..6160d07978e 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/CheckLocalVariablesTableTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/CheckLocalVariablesTableTestGenerated.java @@ -21,6 +21,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import java.io.File; +import java.util.regex.Pattern; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; @@ -32,7 +33,7 @@ import org.jetbrains.jet.codegen.AbstractCheckLocalVariablesTableTest; @TestMetadata("compiler/testData/checkLocalVariablesTable") public class CheckLocalVariablesTableTestGenerated extends AbstractCheckLocalVariablesTableTest { public void testAllFilesPresentInCheckLocalVariablesTable() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/checkLocalVariablesTable"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/checkLocalVariablesTable"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("someClass.kt") diff --git a/compiler/tests/org/jetbrains/jet/codegen/DataClassCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/DataClassCodegenTestGenerated.java index ce8c33e95e5..93794f5dc19 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/DataClassCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/DataClassCodegenTestGenerated.java @@ -21,6 +21,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import java.io.File; +import java.util.regex.Pattern; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; @@ -33,7 +34,7 @@ import org.jetbrains.jet.codegen.AbstractDataClassCodegenTest; @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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arrayParams.kt") @@ -89,7 +90,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("constructorWithDefaultParam.kt") @@ -137,7 +138,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("alreadyDeclared.kt") @@ -180,7 +181,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("alreadyDeclared.kt") @@ -253,7 +254,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("alreadyDeclared.kt") diff --git a/compiler/tests/org/jetbrains/jet/codegen/JavaVisibilityTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/JavaVisibilityTestGenerated.java index 3236029c716..45cc59961ae 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/JavaVisibilityTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/JavaVisibilityTestGenerated.java @@ -21,6 +21,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import java.io.File; +import java.util.regex.Pattern; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; @@ -33,13 +34,13 @@ import org.jetbrains.jet.codegen.AbstractJavaVisibilityTest; @InnerTestClasses({JavaVisibilityTestGenerated.Package.class, JavaVisibilityTestGenerated.Protected_and_package.class}) public class JavaVisibilityTestGenerated extends AbstractJavaVisibilityTest { public void testAllFilesPresentInVisibility() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/visibility"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/visibility"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/codegen/visibility/package") public static class Package extends AbstractJavaVisibilityTest { public void testAllFilesPresentInPackage() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/visibility/package"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/visibility/package"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("packageClass.kt") @@ -62,7 +63,7 @@ public class JavaVisibilityTestGenerated extends AbstractJavaVisibilityTest { @TestMetadata("compiler/testData/codegen/visibility/protected_and_package") public static class Protected_and_package extends AbstractJavaVisibilityTest { public void testAllFilesPresentInProtected_and_package() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/visibility/protected_and_package"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/visibility/protected_and_package"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("overrideProtectedFunInPackage.kt") diff --git a/compiler/tests/org/jetbrains/jet/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java index f52aad2b260..a4d584048b0 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java @@ -21,6 +21,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import java.io.File; +import java.util.regex.Pattern; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; @@ -32,7 +33,7 @@ import org.jetbrains.jet.codegen.defaultConstructor.AbstractDefaultConstructorCo @TestMetadata("compiler/testData/codegen/defaultArguments/reflection") public class DefaultArgumentsReflectionTestGenerated extends AbstractDefaultConstructorCodegenTest { public void testAllFilesPresentInReflection() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/defaultArguments/reflection"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/defaultArguments/reflection"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classInClassObject.kt") diff --git a/compiler/tests/org/jetbrains/jet/codegen/flags/WriteFlagsTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/flags/WriteFlagsTestGenerated.java index d2b4d56d97d..0ef9a9a1feb 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/flags/WriteFlagsTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/flags/WriteFlagsTestGenerated.java @@ -21,6 +21,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import java.io.File; +import java.util.regex.Pattern; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; @@ -33,20 +34,20 @@ import org.jetbrains.jet.codegen.flags.AbstractWriteFlagsTest; @InnerTestClasses({WriteFlagsTestGenerated.Class.class, WriteFlagsTestGenerated.Function.class, WriteFlagsTestGenerated.InnerClass.class, WriteFlagsTestGenerated.Property.class}) public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { public void testAllFilesPresentInWriteFlags() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/writeFlags/class") @InnerTestClasses({Class.AccessFlags.class, Class.DeprecatedFlag.class, Class.Visibility.class}) public static class Class extends AbstractWriteFlagsTest { public void testAllFilesPresentInClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.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"), Pattern.compile("^(.+)\\.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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("publicFinalClass.kt") @@ -74,7 +75,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("class.kt") @@ -108,13 +109,13 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @InnerTestClasses({Visibility.Internal.class, Visibility.Private.class, Visibility.Public.class}) public static class Visibility extends AbstractWriteFlagsTest { public void testAllFilesPresentInVisibility() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/class/visibility"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/class/visibility"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/writeFlags/class/visibility/internal") public static class Internal extends AbstractWriteFlagsTest { public void testAllFilesPresentInInternal() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/class/visibility/internal"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/class/visibility/internal"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("class.kt") @@ -162,7 +163,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/class/visibility/private") public static class Private extends AbstractWriteFlagsTest { public void testAllFilesPresentInPrivate() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/class/visibility/private"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/class/visibility/private"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("class.kt") @@ -210,7 +211,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/class/visibility/public") public static class Public extends AbstractWriteFlagsTest { public void testAllFilesPresentInPublic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/class/visibility/public"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/class/visibility/public"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("class.kt") @@ -279,13 +280,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.tests.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"), Pattern.compile("^(.+)\\.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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("emptyGetter.kt") @@ -362,13 +363,13 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @InnerTestClasses({InnerClass.Visibility.class}) public static class InnerClass extends AbstractWriteFlagsTest { public void testAllFilesPresentInInnerClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/innerClass"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/innerClass"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/writeFlags/innerClass/visibility") public static class Visibility extends AbstractWriteFlagsTest { public void testAllFilesPresentInVisibility() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/innerClass/visibility"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/innerClass/visibility"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("internal.kt") @@ -415,13 +416,13 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @InnerTestClasses({Property.DeprecatedFlag.class, Property.Visibility.class}) public static class Property extends AbstractWriteFlagsTest { public void testAllFilesPresentInProperty() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.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"), Pattern.compile("^(.+)\\.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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("propertyInClass.kt") @@ -439,7 +440,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/property/visibility") public static class Visibility extends AbstractWriteFlagsTest { public void testAllFilesPresentInVisibility() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/property/visibility"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/writeFlags/property/visibility"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("internal.kt") diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java index f5cab31b52c..67f1d10bce6 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java @@ -21,6 +21,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import java.io.File; +import java.util.regex.Pattern; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; @@ -33,13 +34,13 @@ import org.jetbrains.jet.codegen.generated.AbstractBlackBoxCodegenTest; @InnerTestClasses({BlackBoxCodegenTestGenerated.Arrays.class, BlackBoxCodegenTestGenerated.Bridges.class, BlackBoxCodegenTestGenerated.Casts.class, BlackBoxCodegenTestGenerated.Classes.class, BlackBoxCodegenTestGenerated.Closures.class, BlackBoxCodegenTestGenerated.ControlStructures.class, BlackBoxCodegenTestGenerated.DefaultArguments.class, BlackBoxCodegenTestGenerated.Elvis.class, BlackBoxCodegenTestGenerated.Enum.class, BlackBoxCodegenTestGenerated.ExclExcl.class, BlackBoxCodegenTestGenerated.ExtensionFunctions.class, BlackBoxCodegenTestGenerated.ExtensionProperties.class, BlackBoxCodegenTestGenerated.Functions.class, BlackBoxCodegenTestGenerated.InnerNested.class, BlackBoxCodegenTestGenerated.Instructions.class, BlackBoxCodegenTestGenerated.Intrinsics.class, BlackBoxCodegenTestGenerated.Labels.class, BlackBoxCodegenTestGenerated.LocalClasses.class, BlackBoxCodegenTestGenerated.MultiDecl.class, BlackBoxCodegenTestGenerated.Namespace.class, BlackBoxCodegenTestGenerated.Objects.class, BlackBoxCodegenTestGenerated.OperatorConventions.class, BlackBoxCodegenTestGenerated.PrimitiveTypes.class, BlackBoxCodegenTestGenerated.Properties.class, BlackBoxCodegenTestGenerated.SafeCall.class, BlackBoxCodegenTestGenerated.Strings.class, BlackBoxCodegenTestGenerated.Super.class, BlackBoxCodegenTestGenerated.Traits.class, BlackBoxCodegenTestGenerated.TypeInfo.class, BlackBoxCodegenTestGenerated.Unit.class, BlackBoxCodegenTestGenerated.Vararg.class, BlackBoxCodegenTestGenerated.When.class}) public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBox() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/codegen/box/arrays") public static class Arrays extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInArrays() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/arrays"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/arrays"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("arrayGetAssignMultiIndex.kt") @@ -232,7 +233,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/bridges") public static class Bridges extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBridges() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/bridges"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/bridges"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("delegation.kt") @@ -420,7 +421,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/casts") public static class Casts extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInCasts() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/casts"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/casts"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("as.kt") @@ -453,7 +454,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/classes") public static class Classes extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/classes"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/classes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classObject.kt") @@ -897,7 +898,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @InnerTestClasses({Closures.ClosureInsideClosure.class}) public static class Closures extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInClosures() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/closures"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/closures"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("closureWithParameter.kt") @@ -953,7 +954,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/closures/closureInsideClosure") public static class ClosureInsideClosure extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInClosureInsideClosure() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/closures/closureInsideClosure"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/closures/closureInsideClosure"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("localFunInsideLocalFun.kt") @@ -994,7 +995,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/controlStructures") public static class ControlStructures extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInControlStructures() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/controlStructures"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compareBoxedIntegerToZero.kt") @@ -1248,13 +1249,13 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @InnerTestClasses({DefaultArguments.Constructor.class, DefaultArguments.Function.class}) public static class DefaultArguments extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInDefaultArguments() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/defaultArguments"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/defaultArguments"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/codegen/box/defaultArguments/constructor") public static class Constructor extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/defaultArguments/constructor"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/defaultArguments/constructor"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("annotation.kt") @@ -1312,7 +1313,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/defaultArguments/function") public static class Function extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFunction() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/defaultArguments/function"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/defaultArguments/function"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("extentionFunction.kt") @@ -1384,7 +1385,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/elvis") public static class Elvis extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInElvis() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/elvis"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/elvis"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("genericNull.kt") @@ -1412,7 +1413,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } public void testAllFilesPresentInEnum() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/enum"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/enum"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("asReturnExpression.kt") @@ -1495,7 +1496,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/exclExcl") public static class ExclExcl extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInExclExcl() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/exclExcl"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/exclExcl"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("genericNull.kt") @@ -1513,7 +1514,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/extensionFunctions") public static class ExtensionFunctions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInExtensionFunctions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/extensionFunctions"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/extensionFunctions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt1061.kt") @@ -1586,7 +1587,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/extensionProperties") public static class ExtensionProperties extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInExtensionProperties() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/extensionProperties"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/extensionProperties"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("inClass.kt") @@ -1654,7 +1655,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/functions") public static class Functions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFunctions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/functions"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/functions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("defaultargs.kt") @@ -1812,7 +1813,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/innerNested") public static class InnerNested extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInnerNested() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/innerNested"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/innerNested"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("createNestedClass.kt") @@ -1896,13 +1897,13 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @InnerTestClasses({Instructions.Swap.class}) public static class Instructions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInstructions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/instructions"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/instructions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/codegen/box/instructions/swap") public static class Swap extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSwap() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/instructions/swap"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/instructions/swap"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("swapRefToSharedVarInt.kt") @@ -1928,7 +1929,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/intrinsics") public static class Intrinsics extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInIntrinsics() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/intrinsics"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/intrinsics"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compareTo.kt") @@ -1956,7 +1957,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/labels") public static class Labels extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLabels() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/labels"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/labels"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("propertyAccessor.kt") @@ -1989,7 +1990,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/localClasses") public static class LocalClasses extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLocalClasses() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/localClasses"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/localClasses"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("enum.kt") @@ -2018,7 +2019,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @InnerTestClasses({MultiDecl.ForArray.class, MultiDecl.ForIterator.class, MultiDecl.ForRange.class}) public static class MultiDecl extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInMultiDecl() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ComplexInitializer.kt") @@ -2080,7 +2081,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @InnerTestClasses({ForArray.Int.class, ForArray.Long.class}) public static class ForArray extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInForArray() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forArray"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forArray"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclFor.kt") @@ -2111,7 +2112,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl/forArray/int") public static class Int extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInt() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forArray/int"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forArray/int"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -2139,7 +2140,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl/forArray/long") public static class Long extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLong() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forArray/long"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forArray/long"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -2177,7 +2178,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @InnerTestClasses({ForIterator.LongIterator.class}) public static class ForIterator extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInForIterator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forIterator"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forIterator"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclFor.kt") @@ -2208,7 +2209,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl/forIterator/longIterator") public static class LongIterator extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLongIterator() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forIterator/longIterator"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forIterator/longIterator"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -2245,7 +2246,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @InnerTestClasses({ForRange.ExplicitRangeTo.class, ForRange.ExplicitRangeToWithDot.class, ForRange.Int.class, ForRange.Long.class}) public static class ForRange extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInForRange() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forRange"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forRange"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclFor.kt") @@ -2277,7 +2278,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @InnerTestClasses({ExplicitRangeTo.Int.class, ExplicitRangeTo.Long.class}) public static class ExplicitRangeTo extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInExplicitRangeTo() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclFor.kt") @@ -2308,7 +2309,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int") public static class Int extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInt() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -2336,7 +2337,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long") public static class Long extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLong() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -2374,7 +2375,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @InnerTestClasses({ExplicitRangeToWithDot.Int.class, ExplicitRangeToWithDot.Long.class}) public static class ExplicitRangeToWithDot extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInExplicitRangeToWithDot() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclFor.kt") @@ -2405,7 +2406,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int") public static class Int extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInt() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -2433,7 +2434,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long") public static class Long extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLong() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -2470,7 +2471,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/int") public static class Int extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInt() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forRange/int"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forRange/int"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -2498,7 +2499,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/long") public static class Long extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLong() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forRange/long"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/multiDecl/forRange/long"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MultiDeclForComponentExtensions.kt") @@ -2547,7 +2548,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/namespace") public static class Namespace extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInNamespace() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/namespace"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/namespace"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("checkCast.kt") @@ -2580,7 +2581,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/objects") public static class Objects extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInObjects() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/objects"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/objects"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("flist.kt") @@ -2704,13 +2705,13 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @InnerTestClasses({OperatorConventions.CompareTo.class}) public static class OperatorConventions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInOperatorConventions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/operatorConventions"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/operatorConventions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/codegen/box/operatorConventions/compareTo") public static class CompareTo extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInCompareTo() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/operatorConventions/compareTo"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/operatorConventions/compareTo"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("comparable.kt") @@ -2771,7 +2772,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/primitiveTypes") public static class PrimitiveTypes extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInPrimitiveTypes() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/primitiveTypes"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/primitiveTypes"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ea35963.kt") @@ -2959,7 +2960,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } public void testAllFilesPresentInProperties() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/properties"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/properties"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt1159.kt") @@ -3047,7 +3048,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/safeCall") public static class SafeCall extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSafeCall() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/safeCall"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/safeCall"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("genericNull.kt") @@ -3085,7 +3086,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/strings") public static class Strings extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInStrings() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/strings"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/strings"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ea35743.kt") @@ -3123,7 +3124,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/super") public static class Super extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSuper() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/super"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/super"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("basicmethodSuperClass.kt") @@ -3176,7 +3177,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/traits") public static class Traits extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInTraits() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/traits"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/traits"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("finalMethod.kt") @@ -3264,7 +3265,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/typeInfo") public static class TypeInfo extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInTypeInfo() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/typeInfo"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/typeInfo"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("asInLoop.kt") @@ -3297,7 +3298,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/unit") public static class Unit extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInUnit() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/unit"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/unit"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("UnitValue.kt") @@ -3310,7 +3311,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/vararg") public static class Vararg extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/vararg"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/vararg"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt1978.kt") @@ -3338,7 +3339,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/when") public static class When extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInWhen() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/when"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/when"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("callProperty.kt") diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java index 28ae72541b3..b64015daca9 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java @@ -21,6 +21,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import java.io.File; +import java.util.regex.Pattern; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; @@ -33,13 +34,13 @@ import org.jetbrains.jet.codegen.generated.AbstractBlackBoxCodegenTest; @InnerTestClasses({BlackBoxWithJavaCodegenTestGenerated.Enum.class, BlackBoxWithJavaCodegenTestGenerated.Functions.class, BlackBoxWithJavaCodegenTestGenerated.ProtectedStatic.class, BlackBoxWithJavaCodegenTestGenerated.StaticFun.class}) public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBoxWithJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithJava"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithJava"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/codegen/boxWithJava/enum") public static class Enum extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInEnum() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithJava/enum"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithJava/enum"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("simpleJavaEnum.kt") @@ -67,7 +68,7 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege @TestMetadata("compiler/testData/codegen/boxWithJava/functions") public static class Functions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFunctions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithJava/functions"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithJava/functions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("referencesStaticInnerClassMethod.kt") @@ -90,7 +91,7 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege @TestMetadata("compiler/testData/codegen/boxWithJava/protectedStatic") public static class ProtectedStatic extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInProtectedStatic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithJava/protectedStatic"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithJava/protectedStatic"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("funCallInConstructor.kt") @@ -158,7 +159,7 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege @TestMetadata("compiler/testData/codegen/boxWithJava/staticFun") public static class StaticFun extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInStaticFun() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithJava/staticFun"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithJava/staticFun"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classWithNestedEnum.kt") diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/RangesCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/RangesCodegenTestGenerated.java index 6f36d1c97d9..7220c307c6e 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/RangesCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/RangesCodegenTestGenerated.java @@ -21,6 +21,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import java.io.File; +import java.util.regex.Pattern; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; @@ -33,13 +34,13 @@ import org.jetbrains.jet.codegen.generated.AbstractRangesCodegenTest; @InnerTestClasses({RangesCodegenTestGenerated.Expression.class, RangesCodegenTestGenerated.Literal.class}) public class RangesCodegenTestGenerated extends AbstractRangesCodegenTest { public void testAllFilesPresentInRanges() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/ranges"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/ranges"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/codegen/ranges/expression") public static class Expression extends AbstractRangesCodegenTest { public void testAllFilesPresentInExpression() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/ranges/expression"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/ranges/expression"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("emptyDownto.kt") @@ -127,7 +128,7 @@ public class RangesCodegenTestGenerated extends AbstractRangesCodegenTest { @TestMetadata("compiler/testData/codegen/ranges/literal") public static class Literal extends AbstractRangesCodegenTest { public void testAllFilesPresentInLiteral() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/ranges/literal"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/ranges/literal"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("emptyDownto.kt") diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java index 2f41ba76b69..5b9307d78ca 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java @@ -21,6 +21,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import java.io.File; +import java.util.regex.Pattern; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; @@ -33,13 +34,13 @@ import org.jetbrains.jet.jvm.compiler.AbstractCompileJavaAgainstKotlinTest; @InnerTestClasses({CompileJavaAgainstKotlinTestGenerated.Class.class, CompileJavaAgainstKotlinTestGenerated.Method.class}) public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInCompileJavaAgainstKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/compileJavaAgainstKotlin"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/compileJavaAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/compileJavaAgainstKotlin/class") public static class Class extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/compileJavaAgainstKotlin/class"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/compileJavaAgainstKotlin/class"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DefaultConstructor.kt") @@ -77,7 +78,7 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method") public static class Method extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInMethod() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/compileJavaAgainstKotlin/method"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/compileJavaAgainstKotlin/method"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Any.kt") diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomJavaGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomJavaGenerated.java index f2dd6453bd5..81c3b875e9f 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomJavaGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomJavaGenerated.java @@ -21,6 +21,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import java.io.File; +import java.util.regex.Pattern; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; @@ -33,13 +34,13 @@ import org.jetbrains.jet.jvm.compiler.AbstractCompileKotlinAgainstCustomJavaTest @InnerTestClasses({CompileKotlinAgainstCustomJavaGenerated.DuplicateLibraries.class}) public class CompileKotlinAgainstCustomJavaGenerated extends AbstractCompileKotlinAgainstCustomJavaTest { public void testAllFilesPresentInCompileKotlinAgainstCustomJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/compileKotlinAgainstCustomJava"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/compileKotlinAgainstCustomJava"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries") public static class DuplicateLibraries extends AbstractCompileKotlinAgainstCustomJavaTest { public void testAllFilesPresentInDuplicateLibraries() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/compileKotlinAgainstCustomJava/duplicateLibraries"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DuplicateLibraries.kt") diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java index 200b897f672..85c06266d3f 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java @@ -21,6 +21,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import java.io.File; +import java.util.regex.Pattern; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; @@ -32,31 +33,31 @@ import org.jetbrains.jet.jvm.compiler.AbstractCompileKotlinAgainstKotlinTest; @TestMetadata("compiler/testData/compileKotlinAgainstKotlin") public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotlinAgainstKotlinTest { public void testAllFilesPresentInCompileKotlinAgainstKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/compileKotlinAgainstKotlin"), "A.kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/compileKotlinAgainstKotlin"), Pattern.compile("^(.+)\\.A.kt$"), true); } @TestMetadata("ClassObjectMember.A.kt") - public void testClassObjectMember_A() throws Exception { + public void testClassObjectMember() throws Exception { doTest("compiler/testData/compileKotlinAgainstKotlin/ClassObjectMember.A.kt"); } @TestMetadata("ConstructorVararg.A.kt") - public void testConstructorVararg_A() throws Exception { + public void testConstructorVararg() throws Exception { doTest("compiler/testData/compileKotlinAgainstKotlin/ConstructorVararg.A.kt"); } @TestMetadata("DefaultConstructor.A.kt") - public void testDefaultConstructor_A() throws Exception { + public void testDefaultConstructor() throws Exception { doTest("compiler/testData/compileKotlinAgainstKotlin/DefaultConstructor.A.kt"); } @TestMetadata("ImportObject.A.kt") - public void testImportObject_A() throws Exception { + public void testImportObject() throws Exception { doTest("compiler/testData/compileKotlinAgainstKotlin/ImportObject.A.kt"); } @TestMetadata("Simple.A.kt") - public void testSimple_A() throws Exception { + public void testSimple() throws Exception { doTest("compiler/testData/compileKotlinAgainstKotlin/Simple.A.kt"); } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java index cfa2bef52a6..8d4c85fedb0 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadCompiledKotlinTestGenerated.java @@ -21,6 +21,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import java.io.File; +import java.util.regex.Pattern; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; @@ -33,13 +34,13 @@ import org.jetbrains.jet.jvm.compiler.AbstractLoadCompiledKotlinTest; @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.tests.GenerateTests", new File("compiler/testData/loadKotlin"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin"), Pattern.compile("^(.+)\\.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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Class.kt") @@ -187,7 +188,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassInParamUsedInFun.kt") @@ -225,7 +226,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassObjectDeclaresVal.kt") @@ -259,7 +260,7 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT @InnerTestClasses({Constructor.Vararg.class}) public static class Constructor extends AbstractLoadCompiledKotlinTest { public void testAllFilesPresentInConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Constructor0.kt") @@ -330,7 +331,7 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT @TestMetadata("compiler/testData/loadKotlin/constructor/vararg") public static class Vararg extends AbstractLoadCompiledKotlinTest { public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/constructor/vararg"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/constructor/vararg"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ConstructorNonLastVararg.kt") @@ -356,7 +357,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MixedComponents.kt") @@ -400,7 +401,7 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT @InnerTestClasses({Fun.GenericWithTypeVariables.class, Fun.GenericWithoutTypeVariables.class, Fun.NonGeneric.class, Fun.Vararg.class}) public static class Fun extends AbstractLoadCompiledKotlinTest { public void testAllFilesPresentInFun() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("PropagateSubclassOfComparable.kt") @@ -411,7 +412,7 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT @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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("FunGenericParam.kt") @@ -469,7 +470,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("FunClassParamNotNull.kt") @@ -502,7 +503,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassFun.kt") @@ -590,7 +591,7 @@ public class LoadCompiledKotlinTestGenerated extends AbstractLoadCompiledKotlinT @TestMetadata("compiler/testData/loadKotlin/fun/vararg") public static class Vararg extends AbstractLoadCompiledKotlinTest { public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/fun/vararg"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/fun/vararg"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("nonLastVararg.kt") @@ -614,7 +615,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassVal.kt") @@ -772,7 +773,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Any.kt") @@ -925,7 +926,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.tests.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"), Pattern.compile("^(.+)\\.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 4861745c39c..3ea854aa10b 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java @@ -21,6 +21,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import java.io.File; +import java.util.regex.Pattern; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; @@ -33,7 +34,7 @@ import org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest; @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.tests.GenerateTests", new File("compiler/testData/loadJava"), "java", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ArrayTypeVariance.java") @@ -169,7 +170,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.tests.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"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("AnnotatedAnnotation.java") @@ -192,7 +193,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.tests.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"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ConstructorGenericDeep.java") @@ -215,7 +216,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.tests.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"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("DifferentGetterAndSetter.java") @@ -254,7 +255,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @InnerTestClasses({KotlinSignature.Error.class, KotlinSignature.Propagation.class}) public static class KotlinSignature extends AbstractLoadJavaTest { public void testAllFilesPresentInKotlinSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.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"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ArrayType.java") @@ -340,7 +341,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { } public void testAllFilesPresentInError() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.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"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ConflictingProjectionKind.java") @@ -479,7 +480,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @InnerTestClasses({Propagation.Parameter.class, Propagation.Return.class, Propagation.TypeParameter.class}) public static class Propagation extends AbstractLoadJavaTest { public void testAllFilesPresentInPropagation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/propagation"), "java", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/propagation"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("PropagateTypeArgumentNullable.java") @@ -490,7 +491,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/kotlinSignature/propagation/parameter") public static class Parameter extends AbstractLoadJavaTest { public void testAllFilesPresentInParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/propagation/parameter"), "java", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ChangeProjectionKind1.java") @@ -653,7 +654,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { } public void testAllFilesPresentInReturn() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/propagation/return"), "java", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/propagation/return"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("CantMakeImmutableInSubclass.java") @@ -801,7 +802,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter") public static class TypeParameter extends AbstractLoadJavaTest { public void testAllFilesPresentInTypeParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter"), "java", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("InheritMutability.java") @@ -873,7 +874,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.tests.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"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("LoadIterable.java") @@ -891,7 +892,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.tests.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"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("ModalityOfFakeOverrides.java") @@ -904,7 +905,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.tests.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"), Pattern.compile("^(.+)\\.java$"), true); } @TestMetadata("NotNullField.java") @@ -927,7 +928,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.tests.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"), Pattern.compile("^(.+)\\.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 581e47df71e..c2f49b6d26e 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java @@ -21,6 +21,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import java.io.File; +import java.util.regex.Pattern; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; @@ -32,7 +33,7 @@ import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveDescriptorRenderer @TestMetadata("compiler/testData/renderer") public class LazyResolveDescriptorRendererTestGenerated extends AbstractLazyResolveDescriptorRendererTest { public void testAllFilesPresentInRenderer() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/renderer"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/renderer"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Classes.kt") diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveFullTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveFullTestGenerated.java index ae67c10aeab..4f8ba630fb4 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveFullTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveFullTestGenerated.java @@ -21,6 +21,8 @@ import junit.framework.Test; import junit.framework.TestSuite; import java.io.File; +import java.util.regex.Pattern; + import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; @@ -32,7 +34,7 @@ import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveTest; @TestMetadata("compiler/testData/resolve/imports") public class LazyResolveFullTestGenerated extends AbstractLazyResolveTest { public void testAllFilesPresentInImports() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/resolve/imports"), "resolve", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/resolve/imports"), Pattern.compile("^(\\w+)\\.java$"), false); } @TestMetadata("ImportConflictAllPackage.resolve") 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 d1bbb8b546e..a5deff0392b 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java @@ -21,6 +21,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import java.io.File; +import java.util.regex.Pattern; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; @@ -35,13 +36,13 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @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.tests.GenerateTests", new File("compiler/testData/loadKotlin"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin"), Pattern.compile("^(.+)\\.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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Class.kt") @@ -189,7 +190,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassInParamUsedInFun.kt") @@ -227,7 +228,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassObjectDeclaresVal.kt") @@ -261,7 +262,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @InnerTestClasses({Constructor.Vararg.class}) public static class Constructor extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Constructor0.kt") @@ -332,7 +333,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadKotlin/constructor/vararg") public static class Vararg extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/constructor/vararg"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/constructor/vararg"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ConstructorNonLastVararg.kt") @@ -358,7 +359,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("MixedComponents.kt") @@ -402,7 +403,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @InnerTestClasses({Fun.GenericWithTypeVariables.class, Fun.GenericWithoutTypeVariables.class, Fun.NonGeneric.class, Fun.Vararg.class}) public static class Fun extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInFun() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("PropagateSubclassOfComparable.kt") @@ -413,7 +414,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("FunGenericParam.kt") @@ -471,7 +472,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("FunClassParamNotNull.kt") @@ -504,7 +505,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassFun.kt") @@ -592,7 +593,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadKotlin/fun/vararg") public static class Vararg extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInVararg() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/fun/vararg"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadKotlin/fun/vararg"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("nonLastVararg.kt") @@ -616,7 +617,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassVal.kt") @@ -774,7 +775,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Any.kt") @@ -927,7 +928,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("InternalAbstractTraitMembersOverridden.kt") @@ -1002,7 +1003,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.tests.GenerateTests", new File("compiler/testData/loadJava"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ArrayTypeVariance.kt") @@ -1138,7 +1139,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AnnotatedAnnotation.kt") @@ -1161,7 +1162,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ConstructorGenericDeep.kt") @@ -1184,7 +1185,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("DifferentGetterAndSetter.kt") @@ -1223,7 +1224,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @InnerTestClasses({KotlinSignature.Error.class, KotlinSignature.Propagation.class}) public static class KotlinSignature extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInKotlinSignature() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ArrayType.kt") @@ -1309,7 +1310,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } public void testAllFilesPresentInError() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ConflictingProjectionKind.kt") @@ -1448,7 +1449,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @InnerTestClasses({Propagation.Parameter.class, Propagation.Return.class, Propagation.TypeParameter.class}) public static class Propagation extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInPropagation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/propagation"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/propagation"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("PropagateTypeArgumentNullable.kt") @@ -1459,7 +1460,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/kotlinSignature/propagation/parameter") public static class Parameter extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/propagation/parameter"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ChangeProjectionKind1.kt") @@ -1622,7 +1623,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso } public void testAllFilesPresentInReturn() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/propagation/return"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/propagation/return"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("CantMakeImmutableInSubclass.kt") @@ -1770,7 +1771,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter") public static class TypeParameter extends AbstractLazyResolveNamespaceComparingTest { public void testAllFilesPresentInTypeParameter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter"), "kt", true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("InheritMutability.kt") @@ -1842,7 +1843,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("LoadIterable.kt") @@ -1860,7 +1861,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ModalityOfFakeOverrides.kt") @@ -1873,7 +1874,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("NotNullField.kt") @@ -1896,7 +1897,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("VarargInt.kt") @@ -1929,7 +1930,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("ClassObject.kt") diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerated.java index 98f14dfe5b2..02e96207a1d 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerated.java @@ -21,6 +21,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import java.io.File; +import java.util.regex.Pattern; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; @@ -32,7 +33,7 @@ import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveTest; @TestMetadata("compiler/testData/resolve/imports") public class LazyResolveTestGenerated extends AbstractLazyResolveTest { public void testAllFilesPresentInImports() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/resolve/imports"), "resolve", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/resolve/imports"), Pattern.compile("^(.+)\\.resolve$"), false); } @TestMetadata("ImportConflictAllPackage.resolve") diff --git a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java b/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java index 9248cc0a2bc..7a88d21a9a8 100644 --- a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java @@ -21,6 +21,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import java.io.File; +import java.util.regex.Pattern; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; @@ -39,7 +40,7 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { } public void testAllFilesPresentInChecker() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/checker"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/checker"), Pattern.compile("^(.+)\\.kt$"), false); } @TestMetadata("AnonymousInitializers.kt") @@ -267,7 +268,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("AmbiguityOnLazyTypeComputation.kt") @@ -390,7 +391,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.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("TypeInferenceError.kt") @@ -403,7 +404,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.tests.GenerateTests", new File("idea/testData/checker/infos"), "kt", false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/checker/infos"), Pattern.compile("^(.+)\\.kt$"), false); } @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 8c46948fc8c..519d20e38a1 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/DeprecatedHighlightingTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/DeprecatedHighlightingTestGenerated.java @@ -21,6 +21,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import java.io.File; +import java.util.regex.Pattern; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; @@ -32,7 +33,7 @@ import org.jetbrains.jet.plugin.highlighter.AbstractDeprecatedHighlightingTest; @TestMetadata("idea/testData/highlighter/deprecated") public class DeprecatedHighlightingTestGenerated extends AbstractDeprecatedHighlightingTest { public void testAllFilesPresentInDeprecated() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.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"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("Class.kt")