j2k: flatten test cases and testData directory structure

Move j2k/test/tests -> j2k/tests, j2k/test/testData -> j2k/testData

.idea/runConfigurations/J2K_Tests.xml

@@ -23,8 +23,14 @@
     </option>
     <envs />
     <patterns />
+    <RunnerSettings RunnerId="Debug">
+      <option name="DEBUG_PORT" value="" />
+      <option name="TRANSPORT" value="0" />
+      <option name="LOCAL" value="true" />
+    </RunnerSettings>
     <RunnerSettings RunnerId="Profile " />
     <RunnerSettings RunnerId="Run" />
+    <ConfigurationWrapper RunnerId="Debug" />
     <ConfigurationWrapper RunnerId="Run" />
     <method />
   </configuration>

generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt

@@ -675,17 +675,17 @@ fun main(args: Array<String>) {
         }
     }
 
-    testGroup("j2k/tests/test", "j2k/tests/testData") {
+    testGroup("j2k/tests", "j2k/testData") {
         testClass(javaClass<AbstractJavaToKotlinConverterSingleFileTest>()) {
             model("fileOrElement", extension = "java")
         }
     }
-    testGroup("j2k/tests/test", "j2k/tests/testData") {
+    testGroup("j2k/tests", "j2k/testData") {
         testClass(javaClass<AbstractJavaToKotlinConverterMultiFileTest>()) {
             model("multiFile", extension = null)
         }
     }
-    testGroup("j2k/tests/test", "j2k/tests/testData") {
+    testGroup("j2k/tests", "j2k/testData") {
         testClass(javaClass<AbstractJavaToKotlinConverterForWebDemoTest>()) {
             model("fileOrElement", extension = "java")
         }

j2k/j2k.iml

@@ -4,7 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/tests/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -16,5 +16,4 @@
     <orderEntry type="module" module-name="idea" scope="TEST" />
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
   </component>
-</module>
-
+</module>