From a81ed335d0ea1af2dcaccfe7e8c050e1b67135f1 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Tue, 21 Jul 2015 11:37:19 +0300 Subject: [PATCH] Renamed test data folders --- .../.intention | 0 .../inapplicableExistingIndices.kt | 0 .../inapplicableOverridenFunction.kt | 0 .../inapplicableSyntaxError.kt | 0 .../inapplicableUnorderedCollection.kt | 0 .../intArray.kt | 0 .../intArray.kt.after | 0 .../iterable.kt | 0 .../iterable.kt.after | 0 .../listWithType.kt | 0 .../listWithType.kt.after | 0 .../objectArray.kt | 0 .../objectArray.kt.after | 0 .../simpleIntList.kt | 0 .../simpleIntList.kt.after | 0 .../stream.kt | 0 .../stream.kt.after | 0 .../string.kt | 0 .../string.kt.after | 0 .../.intention | 0 .../inapplicableForLoop.kt | 0 .../inapplicableIndexUse.kt | 0 .../inapplicableOverridenFunction.kt | 0 .../loopWithType.kt | 0 .../loopWithType.kt.after | 0 .../simpleLoopWithIndices.kt | 0 .../simpleLoopWithIndices.kt.after | 0 .../intentions/IntentionTestGenerated.java | 48 +++++++++---------- 28 files changed, 24 insertions(+), 24 deletions(-) rename idea/testData/intentions/{addForLoopIndicesIntention => addForLoopIndices}/.intention (100%) rename idea/testData/intentions/{addForLoopIndicesIntention => addForLoopIndices}/inapplicableExistingIndices.kt (100%) rename idea/testData/intentions/{addForLoopIndicesIntention => addForLoopIndices}/inapplicableOverridenFunction.kt (100%) rename idea/testData/intentions/{addForLoopIndicesIntention => addForLoopIndices}/inapplicableSyntaxError.kt (100%) rename idea/testData/intentions/{addForLoopIndicesIntention => addForLoopIndices}/inapplicableUnorderedCollection.kt (100%) rename idea/testData/intentions/{addForLoopIndicesIntention => addForLoopIndices}/intArray.kt (100%) rename idea/testData/intentions/{addForLoopIndicesIntention => addForLoopIndices}/intArray.kt.after (100%) rename idea/testData/intentions/{addForLoopIndicesIntention => addForLoopIndices}/iterable.kt (100%) rename idea/testData/intentions/{addForLoopIndicesIntention => addForLoopIndices}/iterable.kt.after (100%) rename idea/testData/intentions/{addForLoopIndicesIntention => addForLoopIndices}/listWithType.kt (100%) rename idea/testData/intentions/{addForLoopIndicesIntention => addForLoopIndices}/listWithType.kt.after (100%) rename idea/testData/intentions/{addForLoopIndicesIntention => addForLoopIndices}/objectArray.kt (100%) rename idea/testData/intentions/{addForLoopIndicesIntention => addForLoopIndices}/objectArray.kt.after (100%) rename idea/testData/intentions/{addForLoopIndicesIntention => addForLoopIndices}/simpleIntList.kt (100%) rename idea/testData/intentions/{addForLoopIndicesIntention => addForLoopIndices}/simpleIntList.kt.after (100%) rename idea/testData/intentions/{addForLoopIndicesIntention => addForLoopIndices}/stream.kt (100%) rename idea/testData/intentions/{addForLoopIndicesIntention => addForLoopIndices}/stream.kt.after (100%) rename idea/testData/intentions/{addForLoopIndicesIntention => addForLoopIndices}/string.kt (100%) rename idea/testData/intentions/{addForLoopIndicesIntention => addForLoopIndices}/string.kt.after (100%) rename idea/testData/intentions/{removeForLoopIndicesIntention => removeForLoopIndices}/.intention (100%) rename idea/testData/intentions/{removeForLoopIndicesIntention => removeForLoopIndices}/inapplicableForLoop.kt (100%) rename idea/testData/intentions/{removeForLoopIndicesIntention => removeForLoopIndices}/inapplicableIndexUse.kt (100%) rename idea/testData/intentions/{removeForLoopIndicesIntention => removeForLoopIndices}/inapplicableOverridenFunction.kt (100%) rename idea/testData/intentions/{removeForLoopIndicesIntention => removeForLoopIndices}/loopWithType.kt (100%) rename idea/testData/intentions/{removeForLoopIndicesIntention => removeForLoopIndices}/loopWithType.kt.after (100%) rename idea/testData/intentions/{removeForLoopIndicesIntention => removeForLoopIndices}/simpleLoopWithIndices.kt (100%) rename idea/testData/intentions/{removeForLoopIndicesIntention => removeForLoopIndices}/simpleLoopWithIndices.kt.after (100%) diff --git a/idea/testData/intentions/addForLoopIndicesIntention/.intention b/idea/testData/intentions/addForLoopIndices/.intention similarity index 100% rename from idea/testData/intentions/addForLoopIndicesIntention/.intention rename to idea/testData/intentions/addForLoopIndices/.intention diff --git a/idea/testData/intentions/addForLoopIndicesIntention/inapplicableExistingIndices.kt b/idea/testData/intentions/addForLoopIndices/inapplicableExistingIndices.kt similarity index 100% rename from idea/testData/intentions/addForLoopIndicesIntention/inapplicableExistingIndices.kt rename to idea/testData/intentions/addForLoopIndices/inapplicableExistingIndices.kt diff --git a/idea/testData/intentions/addForLoopIndicesIntention/inapplicableOverridenFunction.kt b/idea/testData/intentions/addForLoopIndices/inapplicableOverridenFunction.kt similarity index 100% rename from idea/testData/intentions/addForLoopIndicesIntention/inapplicableOverridenFunction.kt rename to idea/testData/intentions/addForLoopIndices/inapplicableOverridenFunction.kt diff --git a/idea/testData/intentions/addForLoopIndicesIntention/inapplicableSyntaxError.kt b/idea/testData/intentions/addForLoopIndices/inapplicableSyntaxError.kt similarity index 100% rename from idea/testData/intentions/addForLoopIndicesIntention/inapplicableSyntaxError.kt rename to idea/testData/intentions/addForLoopIndices/inapplicableSyntaxError.kt diff --git a/idea/testData/intentions/addForLoopIndicesIntention/inapplicableUnorderedCollection.kt b/idea/testData/intentions/addForLoopIndices/inapplicableUnorderedCollection.kt similarity index 100% rename from idea/testData/intentions/addForLoopIndicesIntention/inapplicableUnorderedCollection.kt rename to idea/testData/intentions/addForLoopIndices/inapplicableUnorderedCollection.kt diff --git a/idea/testData/intentions/addForLoopIndicesIntention/intArray.kt b/idea/testData/intentions/addForLoopIndices/intArray.kt similarity index 100% rename from idea/testData/intentions/addForLoopIndicesIntention/intArray.kt rename to idea/testData/intentions/addForLoopIndices/intArray.kt diff --git a/idea/testData/intentions/addForLoopIndicesIntention/intArray.kt.after b/idea/testData/intentions/addForLoopIndices/intArray.kt.after similarity index 100% rename from idea/testData/intentions/addForLoopIndicesIntention/intArray.kt.after rename to idea/testData/intentions/addForLoopIndices/intArray.kt.after diff --git a/idea/testData/intentions/addForLoopIndicesIntention/iterable.kt b/idea/testData/intentions/addForLoopIndices/iterable.kt similarity index 100% rename from idea/testData/intentions/addForLoopIndicesIntention/iterable.kt rename to idea/testData/intentions/addForLoopIndices/iterable.kt diff --git a/idea/testData/intentions/addForLoopIndicesIntention/iterable.kt.after b/idea/testData/intentions/addForLoopIndices/iterable.kt.after similarity index 100% rename from idea/testData/intentions/addForLoopIndicesIntention/iterable.kt.after rename to idea/testData/intentions/addForLoopIndices/iterable.kt.after diff --git a/idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt b/idea/testData/intentions/addForLoopIndices/listWithType.kt similarity index 100% rename from idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt rename to idea/testData/intentions/addForLoopIndices/listWithType.kt diff --git a/idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt.after b/idea/testData/intentions/addForLoopIndices/listWithType.kt.after similarity index 100% rename from idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt.after rename to idea/testData/intentions/addForLoopIndices/listWithType.kt.after diff --git a/idea/testData/intentions/addForLoopIndicesIntention/objectArray.kt b/idea/testData/intentions/addForLoopIndices/objectArray.kt similarity index 100% rename from idea/testData/intentions/addForLoopIndicesIntention/objectArray.kt rename to idea/testData/intentions/addForLoopIndices/objectArray.kt diff --git a/idea/testData/intentions/addForLoopIndicesIntention/objectArray.kt.after b/idea/testData/intentions/addForLoopIndices/objectArray.kt.after similarity index 100% rename from idea/testData/intentions/addForLoopIndicesIntention/objectArray.kt.after rename to idea/testData/intentions/addForLoopIndices/objectArray.kt.after diff --git a/idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt b/idea/testData/intentions/addForLoopIndices/simpleIntList.kt similarity index 100% rename from idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt rename to idea/testData/intentions/addForLoopIndices/simpleIntList.kt diff --git a/idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt.after b/idea/testData/intentions/addForLoopIndices/simpleIntList.kt.after similarity index 100% rename from idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt.after rename to idea/testData/intentions/addForLoopIndices/simpleIntList.kt.after diff --git a/idea/testData/intentions/addForLoopIndicesIntention/stream.kt b/idea/testData/intentions/addForLoopIndices/stream.kt similarity index 100% rename from idea/testData/intentions/addForLoopIndicesIntention/stream.kt rename to idea/testData/intentions/addForLoopIndices/stream.kt diff --git a/idea/testData/intentions/addForLoopIndicesIntention/stream.kt.after b/idea/testData/intentions/addForLoopIndices/stream.kt.after similarity index 100% rename from idea/testData/intentions/addForLoopIndicesIntention/stream.kt.after rename to idea/testData/intentions/addForLoopIndices/stream.kt.after diff --git a/idea/testData/intentions/addForLoopIndicesIntention/string.kt b/idea/testData/intentions/addForLoopIndices/string.kt similarity index 100% rename from idea/testData/intentions/addForLoopIndicesIntention/string.kt rename to idea/testData/intentions/addForLoopIndices/string.kt diff --git a/idea/testData/intentions/addForLoopIndicesIntention/string.kt.after b/idea/testData/intentions/addForLoopIndices/string.kt.after similarity index 100% rename from idea/testData/intentions/addForLoopIndicesIntention/string.kt.after rename to idea/testData/intentions/addForLoopIndices/string.kt.after diff --git a/idea/testData/intentions/removeForLoopIndicesIntention/.intention b/idea/testData/intentions/removeForLoopIndices/.intention similarity index 100% rename from idea/testData/intentions/removeForLoopIndicesIntention/.intention rename to idea/testData/intentions/removeForLoopIndices/.intention diff --git a/idea/testData/intentions/removeForLoopIndicesIntention/inapplicableForLoop.kt b/idea/testData/intentions/removeForLoopIndices/inapplicableForLoop.kt similarity index 100% rename from idea/testData/intentions/removeForLoopIndicesIntention/inapplicableForLoop.kt rename to idea/testData/intentions/removeForLoopIndices/inapplicableForLoop.kt diff --git a/idea/testData/intentions/removeForLoopIndicesIntention/inapplicableIndexUse.kt b/idea/testData/intentions/removeForLoopIndices/inapplicableIndexUse.kt similarity index 100% rename from idea/testData/intentions/removeForLoopIndicesIntention/inapplicableIndexUse.kt rename to idea/testData/intentions/removeForLoopIndices/inapplicableIndexUse.kt diff --git a/idea/testData/intentions/removeForLoopIndicesIntention/inapplicableOverridenFunction.kt b/idea/testData/intentions/removeForLoopIndices/inapplicableOverridenFunction.kt similarity index 100% rename from idea/testData/intentions/removeForLoopIndicesIntention/inapplicableOverridenFunction.kt rename to idea/testData/intentions/removeForLoopIndices/inapplicableOverridenFunction.kt diff --git a/idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt b/idea/testData/intentions/removeForLoopIndices/loopWithType.kt similarity index 100% rename from idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt rename to idea/testData/intentions/removeForLoopIndices/loopWithType.kt diff --git a/idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt.after b/idea/testData/intentions/removeForLoopIndices/loopWithType.kt.after similarity index 100% rename from idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt.after rename to idea/testData/intentions/removeForLoopIndices/loopWithType.kt.after diff --git a/idea/testData/intentions/removeForLoopIndicesIntention/simpleLoopWithIndices.kt b/idea/testData/intentions/removeForLoopIndices/simpleLoopWithIndices.kt similarity index 100% rename from idea/testData/intentions/removeForLoopIndicesIntention/simpleLoopWithIndices.kt rename to idea/testData/intentions/removeForLoopIndices/simpleLoopWithIndices.kt diff --git a/idea/testData/intentions/removeForLoopIndicesIntention/simpleLoopWithIndices.kt.after b/idea/testData/intentions/removeForLoopIndices/simpleLoopWithIndices.kt.after similarity index 100% rename from idea/testData/intentions/removeForLoopIndicesIntention/simpleLoopWithIndices.kt.after rename to idea/testData/intentions/removeForLoopIndices/simpleLoopWithIndices.kt.after diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java index 393dfac7e67..dbb199e7046 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java @@ -92,77 +92,77 @@ public class IntentionTestGenerated extends AbstractIntentionTest { } } - @TestMetadata("idea/testData/intentions/addForLoopIndicesIntention") + @TestMetadata("idea/testData/intentions/addForLoopIndices") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class AddForLoopIndicesIntention extends AbstractIntentionTest { - public void testAllFilesPresentInAddForLoopIndicesIntention() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/addForLoopIndicesIntention"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + public static class AddForLoopIndices extends AbstractIntentionTest { + public void testAllFilesPresentInAddForLoopIndices() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/addForLoopIndices"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("inapplicableExistingIndices.kt") public void testInapplicableExistingIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndicesIntention/inapplicableExistingIndices.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/inapplicableExistingIndices.kt"); doTest(fileName); } @TestMetadata("inapplicableOverridenFunction.kt") public void testInapplicableOverridenFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndicesIntention/inapplicableOverridenFunction.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/inapplicableOverridenFunction.kt"); doTest(fileName); } @TestMetadata("inapplicableSyntaxError.kt") public void testInapplicableSyntaxError() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndicesIntention/inapplicableSyntaxError.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/inapplicableSyntaxError.kt"); doTest(fileName); } @TestMetadata("inapplicableUnorderedCollection.kt") public void testInapplicableUnorderedCollection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndicesIntention/inapplicableUnorderedCollection.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/inapplicableUnorderedCollection.kt"); doTest(fileName); } @TestMetadata("intArray.kt") public void testIntArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndicesIntention/intArray.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/intArray.kt"); doTest(fileName); } @TestMetadata("iterable.kt") public void testIterable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndicesIntention/iterable.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/iterable.kt"); doTest(fileName); } @TestMetadata("listWithType.kt") public void testListWithType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndicesIntention/listWithType.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/listWithType.kt"); doTest(fileName); } @TestMetadata("objectArray.kt") public void testObjectArray() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndicesIntention/objectArray.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/objectArray.kt"); doTest(fileName); } @TestMetadata("simpleIntList.kt") public void testSimpleIntList() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndicesIntention/simpleIntList.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/simpleIntList.kt"); doTest(fileName); } @TestMetadata("stream.kt") public void testStream() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndicesIntention/stream.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/stream.kt"); doTest(fileName); } @TestMetadata("string.kt") public void testString() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndicesIntention/string.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/string.kt"); doTest(fileName); } } @@ -6164,41 +6164,41 @@ public class IntentionTestGenerated extends AbstractIntentionTest { } - @TestMetadata("idea/testData/intentions/removeForLoopIndicesIntention") + @TestMetadata("idea/testData/intentions/removeForLoopIndices") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) - public static class RemoveForLoopIndicesIntention extends AbstractIntentionTest { - public void testAllFilesPresentInRemoveForLoopIndicesIntention() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeForLoopIndicesIntention"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); + public static class RemoveForLoopIndices extends AbstractIntentionTest { + public void testAllFilesPresentInRemoveForLoopIndices() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeForLoopIndices"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } @TestMetadata("inapplicableForLoop.kt") public void testInapplicableForLoop() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndicesIntention/inapplicableForLoop.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndices/inapplicableForLoop.kt"); doTest(fileName); } @TestMetadata("inapplicableIndexUse.kt") public void testInapplicableIndexUse() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndicesIntention/inapplicableIndexUse.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndices/inapplicableIndexUse.kt"); doTest(fileName); } @TestMetadata("inapplicableOverridenFunction.kt") public void testInapplicableOverridenFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndicesIntention/inapplicableOverridenFunction.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndices/inapplicableOverridenFunction.kt"); doTest(fileName); } @TestMetadata("loopWithType.kt") public void testLoopWithType() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndicesIntention/loopWithType.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndices/loopWithType.kt"); doTest(fileName); } @TestMetadata("simpleLoopWithIndices.kt") public void testSimpleLoopWithIndices() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndicesIntention/simpleLoopWithIndices.kt"); + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeForLoopIndices/simpleLoopWithIndices.kt"); doTest(fileName); } }