From 0c9401c953fbe520f1f80bd060ff2ffbe5f5823b Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Tue, 21 Jul 2015 13:10:33 +0300 Subject: [PATCH] Renamed and correct test data --- .../{listWithType.kt => explicitParamType.kt} | 0 ...pe.kt.after => explicitParamType.kt.after} | 0 .../inapplicableExistingIndices.kt | 2 +- ...eredCollection.kt => inapplicableOnMap.kt} | 0 .../inapplicableSyntaxError.kt | 7 ----- .../inapplicableUnresolved.kt | 7 +++++ .../intentions/addForLoopIndices/intArray.kt | 2 +- .../addForLoopIndices/intArray.kt.after | 2 +- .../intentions/addForLoopIndices/iterable.kt | 2 +- .../addForLoopIndices/iterable.kt.after | 2 +- .../addForLoopIndices/objectArray.kt | 2 +- .../addForLoopIndices/objectArray.kt.after | 2 +- .../intentions/addForLoopIndices/string.kt | 2 +- .../addForLoopIndices/string.kt.after | 2 +- .../inapplicableForLoop.kt | 2 +- .../inapplicableIndexUse.kt | 2 +- .../removeForLoopIndices/loopWithType.kt | 2 +- .../loopWithType.kt.after | 2 +- .../simpleLoopWithIndices.kt | 2 +- .../simpleLoopWithIndices.kt.after | 2 +- .../intentions/IntentionTestGenerated.java | 30 +++++++++---------- 21 files changed, 37 insertions(+), 37 deletions(-) rename idea/testData/intentions/addForLoopIndices/{listWithType.kt => explicitParamType.kt} (100%) rename idea/testData/intentions/addForLoopIndices/{listWithType.kt.after => explicitParamType.kt.after} (100%) rename idea/testData/intentions/addForLoopIndices/{inapplicableUnorderedCollection.kt => inapplicableOnMap.kt} (100%) delete mode 100644 idea/testData/intentions/addForLoopIndices/inapplicableSyntaxError.kt create mode 100644 idea/testData/intentions/addForLoopIndices/inapplicableUnresolved.kt diff --git a/idea/testData/intentions/addForLoopIndices/listWithType.kt b/idea/testData/intentions/addForLoopIndices/explicitParamType.kt similarity index 100% rename from idea/testData/intentions/addForLoopIndices/listWithType.kt rename to idea/testData/intentions/addForLoopIndices/explicitParamType.kt diff --git a/idea/testData/intentions/addForLoopIndices/listWithType.kt.after b/idea/testData/intentions/addForLoopIndices/explicitParamType.kt.after similarity index 100% rename from idea/testData/intentions/addForLoopIndices/listWithType.kt.after rename to idea/testData/intentions/addForLoopIndices/explicitParamType.kt.after diff --git a/idea/testData/intentions/addForLoopIndices/inapplicableExistingIndices.kt b/idea/testData/intentions/addForLoopIndices/inapplicableExistingIndices.kt index 08b3a0ec6c9..b67c1a2c735 100644 --- a/idea/testData/intentions/addForLoopIndices/inapplicableExistingIndices.kt +++ b/idea/testData/intentions/addForLoopIndices/inapplicableExistingIndices.kt @@ -1,4 +1,4 @@ -//IS_APPLICABLE: FALSE +// IS_APPLICABLE: false // WITH_RUNTIME fun b(c: List) { for ((indexVariable, d) in c.withIndex()) { diff --git a/idea/testData/intentions/addForLoopIndices/inapplicableUnorderedCollection.kt b/idea/testData/intentions/addForLoopIndices/inapplicableOnMap.kt similarity index 100% rename from idea/testData/intentions/addForLoopIndices/inapplicableUnorderedCollection.kt rename to idea/testData/intentions/addForLoopIndices/inapplicableOnMap.kt diff --git a/idea/testData/intentions/addForLoopIndices/inapplicableSyntaxError.kt b/idea/testData/intentions/addForLoopIndices/inapplicableSyntaxError.kt deleted file mode 100644 index 130fb1e80ba..00000000000 --- a/idea/testData/intentions/addForLoopIndices/inapplicableSyntaxError.kt +++ /dev/null @@ -1,7 +0,0 @@ -//IS_APPLICABLE: FALSE -//ERROR: Unresolved reference: b -fun foo() { - for (a in b) { - - } -} \ No newline at end of file diff --git a/idea/testData/intentions/addForLoopIndices/inapplicableUnresolved.kt b/idea/testData/intentions/addForLoopIndices/inapplicableUnresolved.kt new file mode 100644 index 00000000000..c397c9898eb --- /dev/null +++ b/idea/testData/intentions/addForLoopIndices/inapplicableUnresolved.kt @@ -0,0 +1,7 @@ +// IS_APPLICABLE: false +// ERROR: Unresolved reference: b +fun foo() { + for (a in b) { + + } +} \ No newline at end of file diff --git a/idea/testData/intentions/addForLoopIndices/intArray.kt b/idea/testData/intentions/addForLoopIndices/intArray.kt index 40ab0ca1785..358656430d6 100644 --- a/idea/testData/intentions/addForLoopIndices/intArray.kt +++ b/idea/testData/intentions/addForLoopIndices/intArray.kt @@ -1,4 +1,4 @@ -//WITH_RUNTIME +// WITH_RUNTIME fun foo(bar: IntArray) { for (a in bar) { diff --git a/idea/testData/intentions/addForLoopIndices/intArray.kt.after b/idea/testData/intentions/addForLoopIndices/intArray.kt.after index b4ab124628b..c4b6f424b0e 100644 --- a/idea/testData/intentions/addForLoopIndices/intArray.kt.after +++ b/idea/testData/intentions/addForLoopIndices/intArray.kt.after @@ -1,4 +1,4 @@ -//WITH_RUNTIME +// WITH_RUNTIME fun foo(bar: IntArray) { for ((index, a) in bar.withIndex()) { diff --git a/idea/testData/intentions/addForLoopIndices/iterable.kt b/idea/testData/intentions/addForLoopIndices/iterable.kt index aca19b4b400..414782c9a9a 100644 --- a/idea/testData/intentions/addForLoopIndices/iterable.kt +++ b/idea/testData/intentions/addForLoopIndices/iterable.kt @@ -1,4 +1,4 @@ -//WITH_RUNTIME +// WITH_RUNTIME fun foo(bar: Iterable) { for (a in bar) { diff --git a/idea/testData/intentions/addForLoopIndices/iterable.kt.after b/idea/testData/intentions/addForLoopIndices/iterable.kt.after index 902f7c2661f..673b64d48de 100644 --- a/idea/testData/intentions/addForLoopIndices/iterable.kt.after +++ b/idea/testData/intentions/addForLoopIndices/iterable.kt.after @@ -1,4 +1,4 @@ -//WITH_RUNTIME +// WITH_RUNTIME fun foo(bar: Iterable) { for ((index, a) in bar.withIndex()) { diff --git a/idea/testData/intentions/addForLoopIndices/objectArray.kt b/idea/testData/intentions/addForLoopIndices/objectArray.kt index 32c665ac8a3..a907c08aba7 100644 --- a/idea/testData/intentions/addForLoopIndices/objectArray.kt +++ b/idea/testData/intentions/addForLoopIndices/objectArray.kt @@ -1,4 +1,4 @@ -//WITH_RUNTIME +// WITH_RUNTIME fun foo(bar: Array) { for (a in bar) { diff --git a/idea/testData/intentions/addForLoopIndices/objectArray.kt.after b/idea/testData/intentions/addForLoopIndices/objectArray.kt.after index 3a439a7c204..0f51422ec66 100644 --- a/idea/testData/intentions/addForLoopIndices/objectArray.kt.after +++ b/idea/testData/intentions/addForLoopIndices/objectArray.kt.after @@ -1,4 +1,4 @@ -//WITH_RUNTIME +// WITH_RUNTIME fun foo(bar: Array) { for ((index, a) in bar.withIndex()) { diff --git a/idea/testData/intentions/addForLoopIndices/string.kt b/idea/testData/intentions/addForLoopIndices/string.kt index d838de6f97e..f2da1ff5806 100644 --- a/idea/testData/intentions/addForLoopIndices/string.kt +++ b/idea/testData/intentions/addForLoopIndices/string.kt @@ -1,4 +1,4 @@ -//WITH_RUNTIME +// WITH_RUNTIME fun foo(bar: String) { for (a in bar) { diff --git a/idea/testData/intentions/addForLoopIndices/string.kt.after b/idea/testData/intentions/addForLoopIndices/string.kt.after index 7d5610a30fd..4eaba4e1f2d 100644 --- a/idea/testData/intentions/addForLoopIndices/string.kt.after +++ b/idea/testData/intentions/addForLoopIndices/string.kt.after @@ -1,4 +1,4 @@ -//WITH_RUNTIME +// WITH_RUNTIME fun foo(bar: String) { for ((index, a) in bar.withIndex()) { diff --git a/idea/testData/intentions/removeForLoopIndices/inapplicableForLoop.kt b/idea/testData/intentions/removeForLoopIndices/inapplicableForLoop.kt index 6a70ccdd704..1d06d512929 100644 --- a/idea/testData/intentions/removeForLoopIndices/inapplicableForLoop.kt +++ b/idea/testData/intentions/removeForLoopIndices/inapplicableForLoop.kt @@ -1,4 +1,4 @@ -//IS_APPLICABLE: FALSE +// IS_APPLICABLE: false fun foo(bar: List) { for (a in bar) { diff --git a/idea/testData/intentions/removeForLoopIndices/inapplicableIndexUse.kt b/idea/testData/intentions/removeForLoopIndices/inapplicableIndexUse.kt index 6d6948cb0c6..8832d6b4661 100644 --- a/idea/testData/intentions/removeForLoopIndices/inapplicableIndexUse.kt +++ b/idea/testData/intentions/removeForLoopIndices/inapplicableIndexUse.kt @@ -1,5 +1,5 @@ // IS_APPLICABLE: FALSE -//WITH_RUNTIME +// WITH_RUNTIME fun foo(b: List) : Int { for ((i, c) in b.withIndex()) { diff --git a/idea/testData/intentions/removeForLoopIndices/loopWithType.kt b/idea/testData/intentions/removeForLoopIndices/loopWithType.kt index 9ad127ad0b0..22bccaea436 100644 --- a/idea/testData/intentions/removeForLoopIndices/loopWithType.kt +++ b/idea/testData/intentions/removeForLoopIndices/loopWithType.kt @@ -1,4 +1,4 @@ -//WITH_RUNTIME +// WITH_RUNTIME fun foo(bar: List) { for ((i : Int, b: Int) in bar.withIndex()) { diff --git a/idea/testData/intentions/removeForLoopIndices/loopWithType.kt.after b/idea/testData/intentions/removeForLoopIndices/loopWithType.kt.after index 59f246f69bd..918d3ab32f8 100644 --- a/idea/testData/intentions/removeForLoopIndices/loopWithType.kt.after +++ b/idea/testData/intentions/removeForLoopIndices/loopWithType.kt.after @@ -1,4 +1,4 @@ -//WITH_RUNTIME +// WITH_RUNTIME fun foo(bar: List) { for (b: Int in bar) { diff --git a/idea/testData/intentions/removeForLoopIndices/simpleLoopWithIndices.kt b/idea/testData/intentions/removeForLoopIndices/simpleLoopWithIndices.kt index 187c87358a6..067a31938eb 100644 --- a/idea/testData/intentions/removeForLoopIndices/simpleLoopWithIndices.kt +++ b/idea/testData/intentions/removeForLoopIndices/simpleLoopWithIndices.kt @@ -1,4 +1,4 @@ -//WITH_RUNTIME +// WITH_RUNTIME fun foo(bar: List) { for ((i,a) in bar.withIndex()) { diff --git a/idea/testData/intentions/removeForLoopIndices/simpleLoopWithIndices.kt.after b/idea/testData/intentions/removeForLoopIndices/simpleLoopWithIndices.kt.after index 1a04724adc8..8b1907b3c3d 100644 --- a/idea/testData/intentions/removeForLoopIndices/simpleLoopWithIndices.kt.after +++ b/idea/testData/intentions/removeForLoopIndices/simpleLoopWithIndices.kt.after @@ -1,4 +1,4 @@ -//WITH_RUNTIME +// WITH_RUNTIME fun foo(bar: List) { for (a in bar) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java index 9da117906a6..fb676ac4ec2 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java @@ -100,27 +100,33 @@ public class IntentionTestGenerated extends AbstractIntentionTest { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/addForLoopIndices"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } + @TestMetadata("explicitParamType.kt") + public void testExplicitParamType() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/explicitParamType.kt"); + doTest(fileName); + } + @TestMetadata("inapplicableExistingIndices.kt") public void testInapplicableExistingIndices() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/inapplicableExistingIndices.kt"); doTest(fileName); } + @TestMetadata("inapplicableOnMap.kt") + public void testInapplicableOnMap() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/inapplicableOnMap.kt"); + doTest(fileName); + } + @TestMetadata("inapplicableOverridenFunction.kt") public void testInapplicableOverridenFunction() throws Exception { 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/addForLoopIndices/inapplicableSyntaxError.kt"); - doTest(fileName); - } - - @TestMetadata("inapplicableUnorderedCollection.kt") - public void testInapplicableUnorderedCollection() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/inapplicableUnorderedCollection.kt"); + @TestMetadata("inapplicableUnresolved.kt") + public void testInapplicableUnresolved() throws Exception { + String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addForLoopIndices/inapplicableUnresolved.kt"); doTest(fileName); } @@ -136,12 +142,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { doTest(fileName); } - @TestMetadata("listWithType.kt") - public void testListWithType() throws Exception { - 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/addForLoopIndices/objectArray.kt");