azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using null instead empty string for directory.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-12-19 20:59:53 +04:00
parent 1d21ebf882
commit 4f36031874
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/codegen/TopLevelMembersInvocationTestGenerated.java
+1 -1
View File
@@ -33,7 +33,7 @@ import org.jetbrains.jet.codegen.AbstractTopLevelMembersInvocationTest;
@TestMetadata("compiler/testData/codegen/topLevelMemberInvocation") @TestMetadata("compiler/testData/codegen/topLevelMemberInvocation")
public class TopLevelMembersInvocationTestGenerated extends AbstractTopLevelMembersInvocationTest { public class TopLevelMembersInvocationTestGenerated extends AbstractTopLevelMembersInvocationTest {
public void testAllFilesPresentInTopLevelMemberInvocation() throws Exception { 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") @TestMetadata("extensionFunction")
compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java
+1 -1
View File
@@ -33,7 +33,7 @@ import org.jetbrains.jet.codegen.generated.AbstractBlackBoxCodegenTest;
@TestMetadata("compiler/testData/codegen/boxMultiFile") @TestMetadata("compiler/testData/codegen/boxMultiFile")
public class BlackBoxMultiFileCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public class BlackBoxMultiFileCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
public void testAllFilesPresentInBoxMultiFile() throws Exception { 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") @TestMetadata("internalVisibility")
generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
+9 -9
View File
@@ -109,7 +109,7 @@ fun main(args: Array<String>) {
} }
testClass(javaClass<AbstractBlackBoxCodegenTest>(), "BlackBoxMultiFileCodegenTestGenerated") { testClass(javaClass<AbstractBlackBoxCodegenTest>(), "BlackBoxMultiFileCodegenTestGenerated") {
model("codegen/boxMultiFile", extension = "", recursive = false, testMethod = "doTestMultiFile") model("codegen/boxMultiFile", extension = null, recursive = false, testMethod = "doTestMultiFile")
} }
testClass(javaClass<AbstractBlackBoxCodegenTest>(), "BlackBoxWithJavaCodegenTestGenerated") { testClass(javaClass<AbstractBlackBoxCodegenTest>(), "BlackBoxWithJavaCodegenTestGenerated") {
@@ -125,7 +125,7 @@ fun main(args: Array<String>) {
} }
testClass(javaClass<AbstractTopLevelMembersInvocationTest>()) { testClass(javaClass<AbstractTopLevelMembersInvocationTest>()) {
model("codegen/topLevelMemberInvocation", extension = "", recursive = false) model("codegen/topLevelMemberInvocation", extension = null, recursive = false)
} }
testClass(javaClass<AbstractCheckLocalVariablesTableTest>()) { testClass(javaClass<AbstractCheckLocalVariablesTableTest>()) {
@@ -320,11 +320,11 @@ fun main(args: Array<String>) {
} }
testClass(javaClass<AbstractHierarchyTest>()) { testClass(javaClass<AbstractHierarchyTest>()) {
model("hierarchy/class/type", extension = "", recursive = false, testMethod = "doTypeClassHierarchyTest") model("hierarchy/class/type", extension = null, recursive = false, testMethod = "doTypeClassHierarchyTest")
model("hierarchy/class/super", extension = "", recursive = false, testMethod = "doSuperClassHierarchyTest") model("hierarchy/class/super", extension = null, recursive = false, testMethod = "doSuperClassHierarchyTest")
model("hierarchy/class/sub", extension = "", recursive = false, testMethod = "doSubClassHierarchyTest") model("hierarchy/class/sub", extension = null, recursive = false, testMethod = "doSubClassHierarchyTest")
model("hierarchy/calls/callers", extension = "", recursive = false, testMethod = "doCallerHierarchyTest") model("hierarchy/calls/callers", extension = null, recursive = false, testMethod = "doCallerHierarchyTest")
model("hierarchy/calls/callees", extension = "", recursive = false, testMethod = "doCalleeHierarchyTest") model("hierarchy/calls/callees", extension = null, recursive = false, testMethod = "doCalleeHierarchyTest")
} }
testClass(javaClass<AbstractCodeMoverTest>()) { testClass(javaClass<AbstractCodeMoverTest>()) {
@@ -441,8 +441,8 @@ private class TestGroup(val testsRoot: String, val testDataRoot: String) {
fun model( fun model(
relativeRootPath: String, relativeRootPath: String,
recursive: Boolean = true, recursive: Boolean = true,
extension: String = "kt", // empty string means dir extension: String? = "kt", // null string means dir (name without dot)
pattern: String = "^(.+)" + (if (extension == "") "" else "\\.$extension") + "\$", pattern: String = if (extension == null) """^([^\.]+)$""" else "^(.+)\\.$extension\$",
testMethod: String = "doTest", testMethod: String = "doTest",
singleClass: Boolean = false singleClass: Boolean = false
) { ) {
idea/tests/org/jetbrains/jet/checkers/JetJsCheckerTestGenerated.java
+1 -1
View File
@@ -33,7 +33,7 @@ import org.jetbrains.jet.checkers.AbstractJetJsCheckerTest;
@TestMetadata("idea/testData/checker/js") @TestMetadata("idea/testData/checker/js")
public class JetJsCheckerTestGenerated extends AbstractJetJsCheckerTest { public class JetJsCheckerTestGenerated extends AbstractJetJsCheckerTest {
public void testAllFilesPresentInJs() throws Exception { 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") @TestMetadata("basic.kt")
idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java
+1 -1
View File
@@ -176,7 +176,7 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu
@TestMetadata("idea/testData/configuration/maven") @TestMetadata("idea/testData/configuration/maven")
public static class Maven extends AbstractConfigureProjectByChangingFileTest { public static class Maven extends AbstractConfigureProjectByChangingFileTest {
public void testAllFilesPresentInMaven() throws Exception { 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") @TestMetadata("libraryMissed")
idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java
+5 -5
View File
@@ -35,7 +35,7 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest {
@TestMetadata("idea/testData/hierarchy/class/type") @TestMetadata("idea/testData/hierarchy/class/type")
public static class Type extends AbstractHierarchyTest { public static class Type extends AbstractHierarchyTest {
public void testAllFilesPresentInType() throws Exception { 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") @TestMetadata("CaretAtAnnotation")
@@ -163,7 +163,7 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest {
@TestMetadata("idea/testData/hierarchy/class/super") @TestMetadata("idea/testData/hierarchy/class/super")
public static class Super extends AbstractHierarchyTest { public static class Super extends AbstractHierarchyTest {
public void testAllFilesPresentInSuper() throws Exception { 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") @TestMetadata("JetList")
@@ -181,7 +181,7 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest {
@TestMetadata("idea/testData/hierarchy/class/sub") @TestMetadata("idea/testData/hierarchy/class/sub")
public static class Sub extends AbstractHierarchyTest { public static class Sub extends AbstractHierarchyTest {
public void testAllFilesPresentInSub() throws Exception { 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") @TestMetadata("ClassFromClass")
@@ -204,7 +204,7 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest {
@TestMetadata("idea/testData/hierarchy/calls/callers") @TestMetadata("idea/testData/hierarchy/calls/callers")
public static class Callers extends AbstractHierarchyTest { public static class Callers extends AbstractHierarchyTest {
public void testAllFilesPresentInCallers() throws Exception { 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") @TestMetadata("javaConstructor")
@@ -267,7 +267,7 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest {
@TestMetadata("idea/testData/hierarchy/calls/callees") @TestMetadata("idea/testData/hierarchy/calls/callees")
public static class Callees extends AbstractHierarchyTest { public static class Callees extends AbstractHierarchyTest {
public void testAllFilesPresentInCallees() throws Exception { 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") @TestMetadata("javaConstructor")