From 29448c149c91cc022608e0009175c506d3a827eb Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 16 Sep 2013 15:23:36 +0400 Subject: [PATCH] Fix patterns - escape for the dots --- .../jet/generators/tests/GenerateTests.java | 4 ++-- .../weighers/CompletionWeigherTestGenerated.java | 2 +- .../jet/findUsages/JetFindUsagesTest.java | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java index ced7ada7367..6f9d0baece7 100644 --- a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java +++ b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java @@ -458,14 +458,14 @@ public class GenerateTests { "idea/tests/", "JetFindUsagesTest", AbstractJetFindUsagesTest.class, - testModelWithPattern("idea/testData/findUsages", "^(.+).0.kt$", "doTest") + testModelWithPattern("idea/testData/findUsages", "^(.+)\\.0\\.kt$", "doTest") ); generateTest( "idea/tests", "CompletionWeigherTestGenerated", AbstractCompletionWeigherTest.class, - testModelWithPattern("idea/testData/completion/weighers", "^([^\\.]+).kt$", "doTest") + testModelWithPattern("idea/testData/completion/weighers", "^([^\\.]+)\\.kt$", "doTest") ); generateTest( diff --git a/idea/tests/org/jetbrains/jet/completion/weighers/CompletionWeigherTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/weighers/CompletionWeigherTestGenerated.java index bf48501f4db..745a33e1049 100644 --- a/idea/tests/org/jetbrains/jet/completion/weighers/CompletionWeigherTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/weighers/CompletionWeigherTestGenerated.java @@ -33,7 +33,7 @@ import org.jetbrains.jet.completion.weighers.AbstractCompletionWeigherTest; @TestMetadata("idea/testData/completion/weighers") public class CompletionWeigherTestGenerated extends AbstractCompletionWeigherTest { public void testAllFilesPresentInWeighers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/completion/weighers"), Pattern.compile("^([^\\.]+).kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/completion/weighers"), Pattern.compile("^([^\\.]+)\\.kt$"), true); } @TestMetadata("DeprecatedFun.kt") diff --git a/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTest.java b/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTest.java index 497faee243a..1860e574ca2 100644 --- a/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTest.java +++ b/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTest.java @@ -34,13 +34,13 @@ import org.jetbrains.jet.findUsages.AbstractJetFindUsagesTest; @InnerTestClasses({JetFindUsagesTest.FindClassUsages.class, JetFindUsagesTest.FindMethodUsages.class, JetFindUsagesTest.FindObjectUsages.class, JetFindUsagesTest.FindPropertyUsages.class, JetFindUsagesTest.FindWithFilteringImports.class, JetFindUsagesTest.UnresolvedAnnotation.class}) public class JetFindUsagesTest extends AbstractJetFindUsagesTest { public void testAllFilesPresentInFindUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/findUsages"), Pattern.compile("^(.+).0.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/findUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("idea/testData/findUsages/findClassUsages") public static class FindClassUsages extends AbstractJetFindUsagesTest { public void testAllFilesPresentInFindClassUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/findUsages/findClassUsages"), Pattern.compile("^(.+).0.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/findUsages/findClassUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("javaClassAllUsages.0.kt") @@ -168,7 +168,7 @@ public class JetFindUsagesTest extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/findMethodUsages") public static class FindMethodUsages extends AbstractJetFindUsagesTest { public void testAllFilesPresentInFindMethodUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/findUsages/findMethodUsages"), Pattern.compile("^(.+).0.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/findUsages/findMethodUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("javaAndKotlinOverrides.0.kt") @@ -196,7 +196,7 @@ public class JetFindUsagesTest extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/findObjectUsages") public static class FindObjectUsages extends AbstractJetFindUsagesTest { public void testAllFilesPresentInFindObjectUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/findUsages/findObjectUsages"), Pattern.compile("^(.+).0.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/findUsages/findObjectUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("javaObjectUsages.0.kt") @@ -214,7 +214,7 @@ public class JetFindUsagesTest extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/findPropertyUsages") public static class FindPropertyUsages extends AbstractJetFindUsagesTest { public void testAllFilesPresentInFindPropertyUsages() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/findUsages/findPropertyUsages"), Pattern.compile("^(.+).0.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/findUsages/findPropertyUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("javaPropertyUsages.0.kt") @@ -232,7 +232,7 @@ public class JetFindUsagesTest extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/findWithFilteringImports") public static class FindWithFilteringImports extends AbstractJetFindUsagesTest { public void testAllFilesPresentInFindWithFilteringImports() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/findUsages/findWithFilteringImports"), Pattern.compile("^(.+).0.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/findUsages/findWithFilteringImports"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("findWithFilteringImports.0.kt") @@ -245,7 +245,7 @@ public class JetFindUsagesTest extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/unresolvedAnnotation") public static class UnresolvedAnnotation extends AbstractJetFindUsagesTest { public void testAllFilesPresentInUnresolvedAnnotation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/findUsages/unresolvedAnnotation"), Pattern.compile("^(.+).0.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/findUsages/unresolvedAnnotation"), Pattern.compile("^(.+)\\.0\\.kt$"), true); } @TestMetadata("unresolvedAnnotation.0.kt")