Converter tests:

Use generated tests approach in converter tests

Introduce two seperate generated test cases of each of configurations, all tests are generated in both test cases
Test data for plugin configuration has extension "ide.kt", for basic configuration "*.kt"
Test data file is used to determine type of the test (file/class/expression/...) instead of directory, all test data is moved accordingly
Add abstract base classes for generated tests
Rename test folder "file" to "misc" (for the lack of imagination)

generators/generators.iml

@@ -22,6 +22,7 @@
     <orderEntry type="module" module-name="jps-plugin" scope="TEST" />
     <orderEntry type="module" module-name="util" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="kotlin-runtime" level="project" />
+    <orderEntry type="module" module-name="j2k-tests" scope="TEST" />
   </component>
 </module>
 

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

@@ -78,6 +78,8 @@ import org.jetbrains.jet.resolve.calls.AbstractResolvedCallsTest
 import org.jetbrains.jet.plugin.refactoring.rename.AbstractRenameTest
 import org.jetbrains.jet.generators.tests.generator.SingleClassTestModel
 import org.jetbrains.jet.generators.tests.generator.TestClassModel
+import org.jetbrains.jet.j2k.test.AbstractJavaToKotlinConverterPluginTest
+import org.jetbrains.jet.j2k.test.AbstractJavaToKotlinConverterBasicTest
 
 fun main(args: Array<String>) {
     System.setProperty("java.awt.headless", "true")
@@ -413,6 +415,16 @@ fun main(args: Array<String>) {
             model("dataFlowValueRendering")
         }
     }
+
+    testGroup("j2k/tests/test", "j2k/tests/testData") {
+        testClass(javaClass<AbstractJavaToKotlinConverterPluginTest>()) {
+            model("ast", extension = "jav")
+        }
+
+        testClass(javaClass<AbstractJavaToKotlinConverterBasicTest>()) {
+            model("ast", extension = "jav")
+        }
+    }
 }
 
 private class TestGroup(val testsRoot: String, val testDataRoot: String) {