From 848623fe8f61002849b992b87209a050ef76dda6 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Wed, 1 Oct 2014 22:33:00 +0400
Subject: [PATCH] Changed format of test data for word selection test - each
 test's data in own directory

---
 .../{Statements.kt => Statements/0.kt}        |  0
 .../{Statements.1.kt => Statements/1.kt}      |  0
 .../{Statements.10.kt => Statements/10.kt}    |  0
 .../{Statements.11.kt => Statements/11.kt}    |  0
 .../{Statements.2.kt => Statements/2.kt}      |  0
 .../{Statements.3.kt => Statements/3.kt}      |  0
 .../{Statements.4.kt => Statements/4.kt}      |  0
 .../{Statements.5.kt => Statements/5.kt}      |  0
 .../{Statements.6.kt => Statements/6.kt}      |  0
 .../{Statements.7.kt => Statements/7.kt}      |  0
 .../{Statements.8.kt => Statements/8.kt}      |  0
 .../{Statements.9.kt => Statements/9.kt}      |  0
 .../{TypeArguments.kt => TypeArguments/0.kt}  |  0
 .../1.kt}                                     |  0
 .../0.kt}                                     |  0
 .../1.kt}                                     |  0
 .../0.kt}                                     |  0
 .../1.kt}                                     |  0
 .../0.kt}                                     |  0
 .../1.kt}                                     |  0
 .../{WhenEntries.kt => WhenEntries/0.kt}      |  0
 .../{WhenEntries.1.kt => WhenEntries/1.kt}    |  0
 .../{WhenEntries.2.kt => WhenEntries/2.kt}    |  0
 .../{WhenEntries.3.kt => WhenEntries/3.kt}    |  0
 .../{WhenEntries.4.kt => WhenEntries/4.kt}    |  0
 .../{WhenEntries.5.kt => WhenEntries/5.kt}    |  0
 .../{WhenEntries.6.kt => WhenEntries/6.kt}    |  0
 .../jet/plugin/WordSelectionTest.java         | 27 ++++++++++---------
 28 files changed, 15 insertions(+), 12 deletions(-)
 rename idea/testData/wordSelection/{Statements.kt => Statements/0.kt} (100%)
 rename idea/testData/wordSelection/{Statements.1.kt => Statements/1.kt} (100%)
 rename idea/testData/wordSelection/{Statements.10.kt => Statements/10.kt} (100%)
 rename idea/testData/wordSelection/{Statements.11.kt => Statements/11.kt} (100%)
 rename idea/testData/wordSelection/{Statements.2.kt => Statements/2.kt} (100%)
 rename idea/testData/wordSelection/{Statements.3.kt => Statements/3.kt} (100%)
 rename idea/testData/wordSelection/{Statements.4.kt => Statements/4.kt} (100%)
 rename idea/testData/wordSelection/{Statements.5.kt => Statements/5.kt} (100%)
 rename idea/testData/wordSelection/{Statements.6.kt => Statements/6.kt} (100%)
 rename idea/testData/wordSelection/{Statements.7.kt => Statements/7.kt} (100%)
 rename idea/testData/wordSelection/{Statements.8.kt => Statements/8.kt} (100%)
 rename idea/testData/wordSelection/{Statements.9.kt => Statements/9.kt} (100%)
 rename idea/testData/wordSelection/{TypeArguments.kt => TypeArguments/0.kt} (100%)
 rename idea/testData/wordSelection/{TypeArguments.1.kt => TypeArguments/1.kt} (100%)
 rename idea/testData/wordSelection/{TypeParameters.kt => TypeParameters/0.kt} (100%)
 rename idea/testData/wordSelection/{TypeParameters.1.kt => TypeParameters/1.kt} (100%)
 rename idea/testData/wordSelection/{ValueArguments.kt => ValueArguments/0.kt} (100%)
 rename idea/testData/wordSelection/{ValueArguments.1.kt => ValueArguments/1.kt} (100%)
 rename idea/testData/wordSelection/{ValueParameters.kt => ValueParameters/0.kt} (100%)
 rename idea/testData/wordSelection/{ValueParameters.1.kt => ValueParameters/1.kt} (100%)
 rename idea/testData/wordSelection/{WhenEntries.kt => WhenEntries/0.kt} (100%)
 rename idea/testData/wordSelection/{WhenEntries.1.kt => WhenEntries/1.kt} (100%)
 rename idea/testData/wordSelection/{WhenEntries.2.kt => WhenEntries/2.kt} (100%)
 rename idea/testData/wordSelection/{WhenEntries.3.kt => WhenEntries/3.kt} (100%)
 rename idea/testData/wordSelection/{WhenEntries.4.kt => WhenEntries/4.kt} (100%)
 rename idea/testData/wordSelection/{WhenEntries.5.kt => WhenEntries/5.kt} (100%)
 rename idea/testData/wordSelection/{WhenEntries.6.kt => WhenEntries/6.kt} (100%)

diff --git a/idea/testData/wordSelection/Statements.kt b/idea/testData/wordSelection/Statements/0.kt
similarity index 100%
rename from idea/testData/wordSelection/Statements.kt
rename to idea/testData/wordSelection/Statements/0.kt
diff --git a/idea/testData/wordSelection/Statements.1.kt b/idea/testData/wordSelection/Statements/1.kt
similarity index 100%
rename from idea/testData/wordSelection/Statements.1.kt
rename to idea/testData/wordSelection/Statements/1.kt
diff --git a/idea/testData/wordSelection/Statements.10.kt b/idea/testData/wordSelection/Statements/10.kt
similarity index 100%
rename from idea/testData/wordSelection/Statements.10.kt
rename to idea/testData/wordSelection/Statements/10.kt
diff --git a/idea/testData/wordSelection/Statements.11.kt b/idea/testData/wordSelection/Statements/11.kt
similarity index 100%
rename from idea/testData/wordSelection/Statements.11.kt
rename to idea/testData/wordSelection/Statements/11.kt
diff --git a/idea/testData/wordSelection/Statements.2.kt b/idea/testData/wordSelection/Statements/2.kt
similarity index 100%
rename from idea/testData/wordSelection/Statements.2.kt
rename to idea/testData/wordSelection/Statements/2.kt
diff --git a/idea/testData/wordSelection/Statements.3.kt b/idea/testData/wordSelection/Statements/3.kt
similarity index 100%
rename from idea/testData/wordSelection/Statements.3.kt
rename to idea/testData/wordSelection/Statements/3.kt
diff --git a/idea/testData/wordSelection/Statements.4.kt b/idea/testData/wordSelection/Statements/4.kt
similarity index 100%
rename from idea/testData/wordSelection/Statements.4.kt
rename to idea/testData/wordSelection/Statements/4.kt
diff --git a/idea/testData/wordSelection/Statements.5.kt b/idea/testData/wordSelection/Statements/5.kt
similarity index 100%
rename from idea/testData/wordSelection/Statements.5.kt
rename to idea/testData/wordSelection/Statements/5.kt
diff --git a/idea/testData/wordSelection/Statements.6.kt b/idea/testData/wordSelection/Statements/6.kt
similarity index 100%
rename from idea/testData/wordSelection/Statements.6.kt
rename to idea/testData/wordSelection/Statements/6.kt
diff --git a/idea/testData/wordSelection/Statements.7.kt b/idea/testData/wordSelection/Statements/7.kt
similarity index 100%
rename from idea/testData/wordSelection/Statements.7.kt
rename to idea/testData/wordSelection/Statements/7.kt
diff --git a/idea/testData/wordSelection/Statements.8.kt b/idea/testData/wordSelection/Statements/8.kt
similarity index 100%
rename from idea/testData/wordSelection/Statements.8.kt
rename to idea/testData/wordSelection/Statements/8.kt
diff --git a/idea/testData/wordSelection/Statements.9.kt b/idea/testData/wordSelection/Statements/9.kt
similarity index 100%
rename from idea/testData/wordSelection/Statements.9.kt
rename to idea/testData/wordSelection/Statements/9.kt
diff --git a/idea/testData/wordSelection/TypeArguments.kt b/idea/testData/wordSelection/TypeArguments/0.kt
similarity index 100%
rename from idea/testData/wordSelection/TypeArguments.kt
rename to idea/testData/wordSelection/TypeArguments/0.kt
diff --git a/idea/testData/wordSelection/TypeArguments.1.kt b/idea/testData/wordSelection/TypeArguments/1.kt
similarity index 100%
rename from idea/testData/wordSelection/TypeArguments.1.kt
rename to idea/testData/wordSelection/TypeArguments/1.kt
diff --git a/idea/testData/wordSelection/TypeParameters.kt b/idea/testData/wordSelection/TypeParameters/0.kt
similarity index 100%
rename from idea/testData/wordSelection/TypeParameters.kt
rename to idea/testData/wordSelection/TypeParameters/0.kt
diff --git a/idea/testData/wordSelection/TypeParameters.1.kt b/idea/testData/wordSelection/TypeParameters/1.kt
similarity index 100%
rename from idea/testData/wordSelection/TypeParameters.1.kt
rename to idea/testData/wordSelection/TypeParameters/1.kt
diff --git a/idea/testData/wordSelection/ValueArguments.kt b/idea/testData/wordSelection/ValueArguments/0.kt
similarity index 100%
rename from idea/testData/wordSelection/ValueArguments.kt
rename to idea/testData/wordSelection/ValueArguments/0.kt
diff --git a/idea/testData/wordSelection/ValueArguments.1.kt b/idea/testData/wordSelection/ValueArguments/1.kt
similarity index 100%
rename from idea/testData/wordSelection/ValueArguments.1.kt
rename to idea/testData/wordSelection/ValueArguments/1.kt
diff --git a/idea/testData/wordSelection/ValueParameters.kt b/idea/testData/wordSelection/ValueParameters/0.kt
similarity index 100%
rename from idea/testData/wordSelection/ValueParameters.kt
rename to idea/testData/wordSelection/ValueParameters/0.kt
diff --git a/idea/testData/wordSelection/ValueParameters.1.kt b/idea/testData/wordSelection/ValueParameters/1.kt
similarity index 100%
rename from idea/testData/wordSelection/ValueParameters.1.kt
rename to idea/testData/wordSelection/ValueParameters/1.kt
diff --git a/idea/testData/wordSelection/WhenEntries.kt b/idea/testData/wordSelection/WhenEntries/0.kt
similarity index 100%
rename from idea/testData/wordSelection/WhenEntries.kt
rename to idea/testData/wordSelection/WhenEntries/0.kt
diff --git a/idea/testData/wordSelection/WhenEntries.1.kt b/idea/testData/wordSelection/WhenEntries/1.kt
similarity index 100%
rename from idea/testData/wordSelection/WhenEntries.1.kt
rename to idea/testData/wordSelection/WhenEntries/1.kt
diff --git a/idea/testData/wordSelection/WhenEntries.2.kt b/idea/testData/wordSelection/WhenEntries/2.kt
similarity index 100%
rename from idea/testData/wordSelection/WhenEntries.2.kt
rename to idea/testData/wordSelection/WhenEntries/2.kt
diff --git a/idea/testData/wordSelection/WhenEntries.3.kt b/idea/testData/wordSelection/WhenEntries/3.kt
similarity index 100%
rename from idea/testData/wordSelection/WhenEntries.3.kt
rename to idea/testData/wordSelection/WhenEntries/3.kt
diff --git a/idea/testData/wordSelection/WhenEntries.4.kt b/idea/testData/wordSelection/WhenEntries/4.kt
similarity index 100%
rename from idea/testData/wordSelection/WhenEntries.4.kt
rename to idea/testData/wordSelection/WhenEntries/4.kt
diff --git a/idea/testData/wordSelection/WhenEntries.5.kt b/idea/testData/wordSelection/WhenEntries/5.kt
similarity index 100%
rename from idea/testData/wordSelection/WhenEntries.5.kt
rename to idea/testData/wordSelection/WhenEntries/5.kt
diff --git a/idea/testData/wordSelection/WhenEntries.6.kt b/idea/testData/wordSelection/WhenEntries/6.kt
similarity index 100%
rename from idea/testData/wordSelection/WhenEntries.6.kt
rename to idea/testData/wordSelection/WhenEntries/6.kt
diff --git a/idea/tests/org/jetbrains/jet/plugin/WordSelectionTest.java b/idea/tests/org/jetbrains/jet/plugin/WordSelectionTest.java
index b478f0ffe51..3e64811e018 100644
--- a/idea/tests/org/jetbrains/jet/plugin/WordSelectionTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/WordSelectionTest.java
@@ -24,37 +24,40 @@ import java.io.File;
 
 public class WordSelectionTest extends JetLightCodeInsightFixtureTestCase {
     public void testStatements() {
-        doTest(11);
+        doTest();
     }
 
     public void testWhenEntries() {
-        doTest(6);
+        doTest();
     }
 
     public void testTypeArguments() {
-        doTest(1);
+        doTest();
     }
 
     public void testValueArguments() {
-        doTest(1);
+        doTest();
     }
 
     public void testTypeParameters() {
-        doTest(1);
+        doTest();
     }
 
     public void testValueParameters() {
-        doTest(1);
+        doTest();
     }
 
-    private void doTest(int howMany) {
-        String testName = getTestName(false);
-        String[] afterFiles = new String[howMany];
-        for (int i = 1; i <= howMany; i++) {
-            afterFiles[i - 1] = String.format("%s.%d.kt", testName, i);
+    private void doTest() {
+        String dirName = getTestName(false);
+
+        File dir = new File(myFixture.getTestDataPath() + dirName);
+        int filesCount = dir.listFiles().length;
+        String[] afterFiles = new String[filesCount - 1];
+        for (int i = 1; i < filesCount; i++) {
+            afterFiles[i - 1] = dirName + File.separator + i + ".kt";
         }
 
-        CodeInsightTestUtil.doWordSelectionTest(myFixture, testName + ".kt", afterFiles);
+        CodeInsightTestUtil.doWordSelectionTest(myFixture, dirName + File.separator + "0.kt", afterFiles);
     }
 
     @NotNull