From 4f36031874524d304dea6c2dfd3c2510f91d0540 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 19 Dec 2013 20:59:53 +0400 Subject: [PATCH] Using null instead empty string for directory. --- ...TopLevelMembersInvocationTestGenerated.java | 2 +- .../BlackBoxMultiFileCodegenTestGenerated.java | 2 +- .../jet/generators/tests/GenerateTests.kt | 18 +++++++++--------- .../checkers/JetJsCheckerTestGenerated.java | 2 +- ...gureProjectByChangingFileTestGenerated.java | 2 +- .../hierarchy/HierarchyTestGenerated.java | 10 +++++----- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/codegen/TopLevelMembersInvocationTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/TopLevelMembersInvocationTestGenerated.java index 2936337cad3..de65e02ea86 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/TopLevelMembersInvocationTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/TopLevelMembersInvocationTestGenerated.java @@ -33,7 +33,7 @@ import org.jetbrains.jet.codegen.AbstractTopLevelMembersInvocationTest; @TestMetadata("compiler/testData/codegen/topLevelMemberInvocation") public class TopLevelMembersInvocationTestGenerated extends AbstractTopLevelMembersInvocationTest { public void testAllFilesPresentInTopLevelMemberInvocation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/topLevelMemberInvocation"), Pattern.compile("^(.+)$"), false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/topLevelMemberInvocation"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("extensionFunction") diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java index 0f08463fa92..9881a063139 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java @@ -33,7 +33,7 @@ import org.jetbrains.jet.codegen.generated.AbstractBlackBoxCodegenTest; @TestMetadata("compiler/testData/codegen/boxMultiFile") public class BlackBoxMultiFileCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBoxMultiFile() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxMultiFile"), Pattern.compile("^(.+)$"), false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxMultiFile"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("internalVisibility") diff --git a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt index f5638d86f65..1e949eb7d07 100644 --- a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt @@ -109,7 +109,7 @@ fun main(args: Array) { } testClass(javaClass(), "BlackBoxMultiFileCodegenTestGenerated") { - model("codegen/boxMultiFile", extension = "", recursive = false, testMethod = "doTestMultiFile") + model("codegen/boxMultiFile", extension = null, recursive = false, testMethod = "doTestMultiFile") } testClass(javaClass(), "BlackBoxWithJavaCodegenTestGenerated") { @@ -125,7 +125,7 @@ fun main(args: Array) { } testClass(javaClass()) { - model("codegen/topLevelMemberInvocation", extension = "", recursive = false) + model("codegen/topLevelMemberInvocation", extension = null, recursive = false) } testClass(javaClass()) { @@ -320,11 +320,11 @@ fun main(args: Array) { } testClass(javaClass()) { - model("hierarchy/class/type", extension = "", recursive = false, testMethod = "doTypeClassHierarchyTest") - model("hierarchy/class/super", extension = "", recursive = false, testMethod = "doSuperClassHierarchyTest") - model("hierarchy/class/sub", extension = "", recursive = false, testMethod = "doSubClassHierarchyTest") - model("hierarchy/calls/callers", extension = "", recursive = false, testMethod = "doCallerHierarchyTest") - model("hierarchy/calls/callees", extension = "", recursive = false, testMethod = "doCalleeHierarchyTest") + model("hierarchy/class/type", extension = null, recursive = false, testMethod = "doTypeClassHierarchyTest") + model("hierarchy/class/super", extension = null, recursive = false, testMethod = "doSuperClassHierarchyTest") + model("hierarchy/class/sub", extension = null, recursive = false, testMethod = "doSubClassHierarchyTest") + model("hierarchy/calls/callers", extension = null, recursive = false, testMethod = "doCallerHierarchyTest") + model("hierarchy/calls/callees", extension = null, recursive = false, testMethod = "doCalleeHierarchyTest") } testClass(javaClass()) { @@ -441,8 +441,8 @@ private class TestGroup(val testsRoot: String, val testDataRoot: String) { fun model( relativeRootPath: String, recursive: Boolean = true, - extension: String = "kt", // empty string means dir - pattern: String = "^(.+)" + (if (extension == "") "" else "\\.$extension") + "\$", + extension: String? = "kt", // null string means dir (name without dot) + pattern: String = if (extension == null) """^([^\.]+)$""" else "^(.+)\\.$extension\$", testMethod: String = "doTest", singleClass: Boolean = false ) { diff --git a/idea/tests/org/jetbrains/jet/checkers/JetJsCheckerTestGenerated.java b/idea/tests/org/jetbrains/jet/checkers/JetJsCheckerTestGenerated.java index 1d2e4e4a332..e75b237c2c0 100644 --- a/idea/tests/org/jetbrains/jet/checkers/JetJsCheckerTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/checkers/JetJsCheckerTestGenerated.java @@ -33,7 +33,7 @@ import org.jetbrains.jet.checkers.AbstractJetJsCheckerTest; @TestMetadata("idea/testData/checker/js") public class JetJsCheckerTestGenerated extends AbstractJetJsCheckerTest { public void testAllFilesPresentInJs() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/checker/js"), Pattern.compile("^(.+)\\.kt$"), false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/checker/js"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("basic.kt") diff --git a/idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java index c67d6bd542e..37d173792e0 100644 --- a/idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java @@ -176,7 +176,7 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu @TestMetadata("idea/testData/configuration/maven") public static class Maven extends AbstractConfigureProjectByChangingFileTest { public void testAllFilesPresentInMaven() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/configuration/maven"), Pattern.compile("^(.+)$"), false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/configuration/maven"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("libraryMissed") diff --git a/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java index 3a19845d8e7..a8e6e0d3417 100644 --- a/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java @@ -35,7 +35,7 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest { @TestMetadata("idea/testData/hierarchy/class/type") public static class Type extends AbstractHierarchyTest { public void testAllFilesPresentInType() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/hierarchy/class/type"), Pattern.compile("^(.+)$"), false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/hierarchy/class/type"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("CaretAtAnnotation") @@ -163,7 +163,7 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest { @TestMetadata("idea/testData/hierarchy/class/super") public static class Super extends AbstractHierarchyTest { public void testAllFilesPresentInSuper() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/hierarchy/class/super"), Pattern.compile("^(.+)$"), false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/hierarchy/class/super"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("JetList") @@ -181,7 +181,7 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest { @TestMetadata("idea/testData/hierarchy/class/sub") public static class Sub extends AbstractHierarchyTest { public void testAllFilesPresentInSub() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/hierarchy/class/sub"), Pattern.compile("^(.+)$"), false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/hierarchy/class/sub"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("ClassFromClass") @@ -204,7 +204,7 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest { @TestMetadata("idea/testData/hierarchy/calls/callers") public static class Callers extends AbstractHierarchyTest { public void testAllFilesPresentInCallers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/hierarchy/calls/callers"), Pattern.compile("^(.+)$"), false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/hierarchy/calls/callers"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("javaConstructor") @@ -267,7 +267,7 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest { @TestMetadata("idea/testData/hierarchy/calls/callees") public static class Callees extends AbstractHierarchyTest { public void testAllFilesPresentInCallees() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/hierarchy/calls/callees"), Pattern.compile("^(.+)$"), false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/hierarchy/calls/callees"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("javaConstructor")