diff --git a/j2k.iml b/j2k.iml index 06922e896d4..26774724cb1 100644 --- a/j2k.iml +++ b/j2k.iml @@ -8,6 +8,7 @@ + diff --git a/j2k.ipr b/j2k.ipr index c7e7afb9ac9..2a46e027d3d 100644 --- a/j2k.ipr +++ b/j2k.ipr @@ -167,5 +167,14 @@ + + + + + + + + + diff --git a/lib/commons-io-2.1.jar b/lib/commons-io-2.1.jar new file mode 100644 index 00000000000..b5c7d692fe5 Binary files /dev/null and b/lib/commons-io-2.1.jar differ diff --git a/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java b/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java index ad3a83f7589..e7a536f9dde 100644 --- a/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java +++ b/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java @@ -9,11 +9,10 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.jetbrains.annotations.NotNull; -import java.io.BufferedReader; import java.io.File; -import java.io.FileReader; import java.io.IOException; +import static org.apache.commons.io.FileUtils.readFileToString; import static org.jetbrains.jet.j2k.TestCaseBuilder.getTestDataPathBase; /** @@ -28,43 +27,29 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase { myName = name; } - private static String readFileAsString(String filePath) - throws java.io.IOException { - StringBuffer fileData = new StringBuffer(1000); - BufferedReader reader = new BufferedReader( - new FileReader(filePath)); - char[] buf = new char[1024]; - int numRead = 0; - while ((numRead = reader.read(buf)) != -1) { - String readData = String.valueOf(buf, 0, numRead); - fileData.append(readData); - buf = new char[1024]; - } - reader.close(); - return fileData.toString(); - } - @Override protected void runTest() throws Throwable { String javaPath = getTestDataPath() + File.separator + getTestFilePath(); String kotlinPath = javaPath.replace(".jav", ".kt"); - String expected = readFileAsString(kotlinPath); + final String expected = readFileToString(new File(kotlinPath)); + final File javaFile = new File(javaPath); + final String javaCode = readFileToString(javaFile); String actual = ""; - if (javaPath.contains("/expression_mult/")) actual = expressionToKotlin(readFileAsString(javaPath)); - else if (javaPath.contains("/expression/")) actual = expressionToKotlin(readFileAsString(javaPath)); - else if (javaPath.contains("/statement/")) actual = statementToSingleLineKotlin(readFileAsString(javaPath)); - else if (javaPath.contains("/statement_mult/")) actual = statementToKotlin(readFileAsString(javaPath)); + if (javaFile.getParent().endsWith("/expression")) actual = expressionToKotlin(javaCode); - else if (javaPath.contains("/method/")) actual = methodToSingleLineKotlin(readFileAsString(javaPath)); - else if (javaPath.contains("/method_mult/")) actual = methodToKotlin(readFileAsString(javaPath)); + else if (javaFile.getParent().endsWith("/statement")) actual = statementToSingleLineKotlin(javaCode); + else if (javaFile.getParent().endsWith("/statement_mult")) actual = statementToKotlin(javaCode); - else if (javaPath.contains("/class/")) actual = classToSingleLineKotlin(readFileAsString(javaPath)); - else if (javaPath.contains("/class_mult/")) actual = classToKotlin(readFileAsString(javaPath)); + else if (javaFile.getParent().endsWith("/method")) actual = methodToSingleLineKotlin(javaCode); + else if (javaFile.getParent().endsWith("/method_mult")) actual = methodToKotlin(javaCode); - else if (javaPath.contains("/file/")) actual = fileToSingleLineKotlin(readFileAsString(javaPath)); - else if (javaPath.contains("/file_mult/")) actual = fileToKotlin(readFileAsString(javaPath)); + else if (javaFile.getParent().endsWith("/class")) actual = classToSingleLineKotlin(javaCode); + else if (javaFile.getParent().endsWith("/class_mult")) actual = classToKotlin(javaCode); + + else if (javaFile.getParent().endsWith("/file")) actual = fileToSingleLineKotlin(javaCode); + else if (javaFile.getParent().endsWith("/file_mult")) actual = fileToKotlin(javaCode); assert !actual.equals(""); Assert.assertEquals(expected, actual); @@ -162,10 +147,6 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase { return prettify(result); } - protected String expressionToSingleLineKotlin(String code) throws Exception { - return toSingleLine(expressionToKotlin(code)); - } - @NotNull private static String prettify(String code) { if (code == null) diff --git a/testData/ast/assignmentExpression/expression_mult/and.jav b/testData/ast/assignmentExpression/expression/and.jav similarity index 100% rename from testData/ast/assignmentExpression/expression_mult/and.jav rename to testData/ast/assignmentExpression/expression/and.jav diff --git a/testData/ast/assignmentExpression/expression_mult/and.kt b/testData/ast/assignmentExpression/expression/and.kt similarity index 100% rename from testData/ast/assignmentExpression/expression_mult/and.kt rename to testData/ast/assignmentExpression/expression/and.kt diff --git a/testData/ast/assignmentExpression/expression_mult/assignment.jav b/testData/ast/assignmentExpression/expression/assignment.jav similarity index 100% rename from testData/ast/assignmentExpression/expression_mult/assignment.jav rename to testData/ast/assignmentExpression/expression/assignment.jav diff --git a/testData/ast/assignmentExpression/expression_mult/assignment.kt b/testData/ast/assignmentExpression/expression/assignment.kt similarity index 100% rename from testData/ast/assignmentExpression/expression_mult/assignment.kt rename to testData/ast/assignmentExpression/expression/assignment.kt diff --git a/testData/ast/assignmentExpression/expression_mult/divideAssign.jav b/testData/ast/assignmentExpression/expression/divideAssign.jav similarity index 100% rename from testData/ast/assignmentExpression/expression_mult/divideAssign.jav rename to testData/ast/assignmentExpression/expression/divideAssign.jav diff --git a/testData/ast/assignmentExpression/expression_mult/divideAssign.kt b/testData/ast/assignmentExpression/expression/divideAssign.kt similarity index 100% rename from testData/ast/assignmentExpression/expression_mult/divideAssign.kt rename to testData/ast/assignmentExpression/expression/divideAssign.kt diff --git a/testData/ast/assignmentExpression/expression_mult/minusAssign.jav b/testData/ast/assignmentExpression/expression/minusAssign.jav similarity index 100% rename from testData/ast/assignmentExpression/expression_mult/minusAssign.jav rename to testData/ast/assignmentExpression/expression/minusAssign.jav diff --git a/testData/ast/assignmentExpression/expression_mult/minusAssign.kt b/testData/ast/assignmentExpression/expression/minusAssign.kt similarity index 100% rename from testData/ast/assignmentExpression/expression_mult/minusAssign.kt rename to testData/ast/assignmentExpression/expression/minusAssign.kt diff --git a/testData/ast/assignmentExpression/expression_mult/multiplyAssign.jav b/testData/ast/assignmentExpression/expression/multiplyAssign.jav similarity index 100% rename from testData/ast/assignmentExpression/expression_mult/multiplyAssign.jav rename to testData/ast/assignmentExpression/expression/multiplyAssign.jav diff --git a/testData/ast/assignmentExpression/expression_mult/multiplyAssign.kt b/testData/ast/assignmentExpression/expression/multiplyAssign.kt similarity index 100% rename from testData/ast/assignmentExpression/expression_mult/multiplyAssign.kt rename to testData/ast/assignmentExpression/expression/multiplyAssign.kt diff --git a/testData/ast/assignmentExpression/expression_mult/or.jav b/testData/ast/assignmentExpression/expression/or.jav similarity index 100% rename from testData/ast/assignmentExpression/expression_mult/or.jav rename to testData/ast/assignmentExpression/expression/or.jav diff --git a/testData/ast/assignmentExpression/expression_mult/or.kt b/testData/ast/assignmentExpression/expression/or.kt similarity index 100% rename from testData/ast/assignmentExpression/expression_mult/or.kt rename to testData/ast/assignmentExpression/expression/or.kt diff --git a/testData/ast/assignmentExpression/expression_mult/plusAssign.jav b/testData/ast/assignmentExpression/expression/plusAssign.jav similarity index 100% rename from testData/ast/assignmentExpression/expression_mult/plusAssign.jav rename to testData/ast/assignmentExpression/expression/plusAssign.jav diff --git a/testData/ast/assignmentExpression/expression_mult/plusAssign.kt b/testData/ast/assignmentExpression/expression/plusAssign.kt similarity index 100% rename from testData/ast/assignmentExpression/expression_mult/plusAssign.kt rename to testData/ast/assignmentExpression/expression/plusAssign.kt diff --git a/testData/ast/assignmentExpression/expression_mult/reminder.jav b/testData/ast/assignmentExpression/expression/reminder.jav similarity index 100% rename from testData/ast/assignmentExpression/expression_mult/reminder.jav rename to testData/ast/assignmentExpression/expression/reminder.jav diff --git a/testData/ast/assignmentExpression/expression_mult/reminder.kt b/testData/ast/assignmentExpression/expression/reminder.kt similarity index 100% rename from testData/ast/assignmentExpression/expression_mult/reminder.kt rename to testData/ast/assignmentExpression/expression/reminder.kt diff --git a/testData/ast/assignmentExpression/expression_mult/shiftLeft.jav b/testData/ast/assignmentExpression/expression/shiftLeft.jav similarity index 100% rename from testData/ast/assignmentExpression/expression_mult/shiftLeft.jav rename to testData/ast/assignmentExpression/expression/shiftLeft.jav diff --git a/testData/ast/assignmentExpression/expression_mult/shiftLeft.kt b/testData/ast/assignmentExpression/expression/shiftLeft.kt similarity index 100% rename from testData/ast/assignmentExpression/expression_mult/shiftLeft.kt rename to testData/ast/assignmentExpression/expression/shiftLeft.kt diff --git a/testData/ast/assignmentExpression/expression_mult/shiftRight.jav b/testData/ast/assignmentExpression/expression/shiftRight.jav similarity index 100% rename from testData/ast/assignmentExpression/expression_mult/shiftRight.jav rename to testData/ast/assignmentExpression/expression/shiftRight.jav diff --git a/testData/ast/assignmentExpression/expression_mult/shiftRight.kt b/testData/ast/assignmentExpression/expression/shiftRight.kt similarity index 100% rename from testData/ast/assignmentExpression/expression_mult/shiftRight.kt rename to testData/ast/assignmentExpression/expression/shiftRight.kt diff --git a/testData/ast/assignmentExpression/expression_mult/unsignedRightShift.jav b/testData/ast/assignmentExpression/expression/unsignedRightShift.jav similarity index 100% rename from testData/ast/assignmentExpression/expression_mult/unsignedRightShift.jav rename to testData/ast/assignmentExpression/expression/unsignedRightShift.jav diff --git a/testData/ast/assignmentExpression/expression_mult/unsignedRightShift.kt b/testData/ast/assignmentExpression/expression/unsignedRightShift.kt similarity index 100% rename from testData/ast/assignmentExpression/expression_mult/unsignedRightShift.kt rename to testData/ast/assignmentExpression/expression/unsignedRightShift.kt diff --git a/testData/ast/assignmentExpression/expression_mult/xor.jav b/testData/ast/assignmentExpression/expression/xor.jav similarity index 100% rename from testData/ast/assignmentExpression/expression_mult/xor.jav rename to testData/ast/assignmentExpression/expression/xor.jav diff --git a/testData/ast/assignmentExpression/expression_mult/xor.kt b/testData/ast/assignmentExpression/expression/xor.kt similarity index 100% rename from testData/ast/assignmentExpression/expression_mult/xor.kt rename to testData/ast/assignmentExpression/expression/xor.kt diff --git a/testData/ast/binaryExpression/expression_mult/and.jav b/testData/ast/binaryExpression/expression/and.jav similarity index 100% rename from testData/ast/binaryExpression/expression_mult/and.jav rename to testData/ast/binaryExpression/expression/and.jav diff --git a/testData/ast/binaryExpression/expression_mult/and.kt b/testData/ast/binaryExpression/expression/and.kt similarity index 100% rename from testData/ast/binaryExpression/expression_mult/and.kt rename to testData/ast/binaryExpression/expression/and.kt diff --git a/testData/ast/binaryExpression/expression_mult/conditionalAnd.jav b/testData/ast/binaryExpression/expression/conditionalAnd.jav similarity index 100% rename from testData/ast/binaryExpression/expression_mult/conditionalAnd.jav rename to testData/ast/binaryExpression/expression/conditionalAnd.jav diff --git a/testData/ast/binaryExpression/expression_mult/conditionalAnd.kt b/testData/ast/binaryExpression/expression/conditionalAnd.kt similarity index 100% rename from testData/ast/binaryExpression/expression_mult/conditionalAnd.kt rename to testData/ast/binaryExpression/expression/conditionalAnd.kt diff --git a/testData/ast/binaryExpression/expression_mult/conditionalOr.jav b/testData/ast/binaryExpression/expression/conditionalOr.jav similarity index 100% rename from testData/ast/binaryExpression/expression_mult/conditionalOr.jav rename to testData/ast/binaryExpression/expression/conditionalOr.jav diff --git a/testData/ast/binaryExpression/expression_mult/conditionalOr.kt b/testData/ast/binaryExpression/expression/conditionalOr.kt similarity index 100% rename from testData/ast/binaryExpression/expression_mult/conditionalOr.kt rename to testData/ast/binaryExpression/expression/conditionalOr.kt diff --git a/testData/ast/binaryExpression/expression_mult/divide.jav b/testData/ast/binaryExpression/expression/divide.jav similarity index 100% rename from testData/ast/binaryExpression/expression_mult/divide.jav rename to testData/ast/binaryExpression/expression/divide.jav diff --git a/testData/ast/binaryExpression/expression_mult/divide.kt b/testData/ast/binaryExpression/expression/divide.kt similarity index 100% rename from testData/ast/binaryExpression/expression_mult/divide.kt rename to testData/ast/binaryExpression/expression/divide.kt diff --git a/testData/ast/binaryExpression/expression_mult/greaterThan.jav b/testData/ast/binaryExpression/expression/greaterThan.jav similarity index 100% rename from testData/ast/binaryExpression/expression_mult/greaterThan.jav rename to testData/ast/binaryExpression/expression/greaterThan.jav diff --git a/testData/ast/binaryExpression/expression_mult/greaterThan.kt b/testData/ast/binaryExpression/expression/greaterThan.kt similarity index 100% rename from testData/ast/binaryExpression/expression_mult/greaterThan.kt rename to testData/ast/binaryExpression/expression/greaterThan.kt diff --git a/testData/ast/binaryExpression/expression_mult/greaterThanEqual.jav b/testData/ast/binaryExpression/expression/greaterThanEqual.jav similarity index 100% rename from testData/ast/binaryExpression/expression_mult/greaterThanEqual.jav rename to testData/ast/binaryExpression/expression/greaterThanEqual.jav diff --git a/testData/ast/binaryExpression/expression_mult/greaterThanEqual.kt b/testData/ast/binaryExpression/expression/greaterThanEqual.kt similarity index 100% rename from testData/ast/binaryExpression/expression_mult/greaterThanEqual.kt rename to testData/ast/binaryExpression/expression/greaterThanEqual.kt diff --git a/testData/ast/binaryExpression/expression_mult/lessThan.jav b/testData/ast/binaryExpression/expression/lessThan.jav similarity index 100% rename from testData/ast/binaryExpression/expression_mult/lessThan.jav rename to testData/ast/binaryExpression/expression/lessThan.jav diff --git a/testData/ast/binaryExpression/expression_mult/lessThan.kt b/testData/ast/binaryExpression/expression/lessThan.kt similarity index 100% rename from testData/ast/binaryExpression/expression_mult/lessThan.kt rename to testData/ast/binaryExpression/expression/lessThan.kt diff --git a/testData/ast/binaryExpression/expression_mult/lessThanEqual.jav b/testData/ast/binaryExpression/expression/lessThanEqual.jav similarity index 100% rename from testData/ast/binaryExpression/expression_mult/lessThanEqual.jav rename to testData/ast/binaryExpression/expression/lessThanEqual.jav diff --git a/testData/ast/binaryExpression/expression_mult/lessThanEqual.kt b/testData/ast/binaryExpression/expression/lessThanEqual.kt similarity index 100% rename from testData/ast/binaryExpression/expression_mult/lessThanEqual.kt rename to testData/ast/binaryExpression/expression/lessThanEqual.kt diff --git a/testData/ast/binaryExpression/expression_mult/minus.jav b/testData/ast/binaryExpression/expression/minus.jav similarity index 100% rename from testData/ast/binaryExpression/expression_mult/minus.jav rename to testData/ast/binaryExpression/expression/minus.jav diff --git a/testData/ast/binaryExpression/expression_mult/minus.kt b/testData/ast/binaryExpression/expression/minus.kt similarity index 100% rename from testData/ast/binaryExpression/expression_mult/minus.kt rename to testData/ast/binaryExpression/expression/minus.kt diff --git a/testData/ast/binaryExpression/expression_mult/multiply.jav b/testData/ast/binaryExpression/expression/multiply.jav similarity index 100% rename from testData/ast/binaryExpression/expression_mult/multiply.jav rename to testData/ast/binaryExpression/expression/multiply.jav diff --git a/testData/ast/binaryExpression/expression_mult/multiply.kt b/testData/ast/binaryExpression/expression/multiply.kt similarity index 100% rename from testData/ast/binaryExpression/expression_mult/multiply.kt rename to testData/ast/binaryExpression/expression/multiply.kt diff --git a/testData/ast/binaryExpression/expression_mult/or.jav b/testData/ast/binaryExpression/expression/or.jav similarity index 100% rename from testData/ast/binaryExpression/expression_mult/or.jav rename to testData/ast/binaryExpression/expression/or.jav diff --git a/testData/ast/binaryExpression/expression_mult/or.kt b/testData/ast/binaryExpression/expression/or.kt similarity index 100% rename from testData/ast/binaryExpression/expression_mult/or.kt rename to testData/ast/binaryExpression/expression/or.kt diff --git a/testData/ast/binaryExpression/expression_mult/plus.jav b/testData/ast/binaryExpression/expression/plus.jav similarity index 100% rename from testData/ast/binaryExpression/expression_mult/plus.jav rename to testData/ast/binaryExpression/expression/plus.jav diff --git a/testData/ast/binaryExpression/expression_mult/plus.kt b/testData/ast/binaryExpression/expression/plus.kt similarity index 100% rename from testData/ast/binaryExpression/expression_mult/plus.kt rename to testData/ast/binaryExpression/expression/plus.kt diff --git a/testData/ast/binaryExpression/expression_mult/remainder.jav b/testData/ast/binaryExpression/expression/remainder.jav similarity index 100% rename from testData/ast/binaryExpression/expression_mult/remainder.jav rename to testData/ast/binaryExpression/expression/remainder.jav diff --git a/testData/ast/binaryExpression/expression_mult/remainder.kt b/testData/ast/binaryExpression/expression/remainder.kt similarity index 100% rename from testData/ast/binaryExpression/expression_mult/remainder.kt rename to testData/ast/binaryExpression/expression/remainder.kt diff --git a/testData/ast/binaryExpression/expression_mult/shiftLeft.jav b/testData/ast/binaryExpression/expression/shiftLeft.jav similarity index 100% rename from testData/ast/binaryExpression/expression_mult/shiftLeft.jav rename to testData/ast/binaryExpression/expression/shiftLeft.jav diff --git a/testData/ast/binaryExpression/expression_mult/shiftLeft.kt b/testData/ast/binaryExpression/expression/shiftLeft.kt similarity index 100% rename from testData/ast/binaryExpression/expression_mult/shiftLeft.kt rename to testData/ast/binaryExpression/expression/shiftLeft.kt diff --git a/testData/ast/binaryExpression/expression_mult/shiftRight.jav b/testData/ast/binaryExpression/expression/shiftRight.jav similarity index 100% rename from testData/ast/binaryExpression/expression_mult/shiftRight.jav rename to testData/ast/binaryExpression/expression/shiftRight.jav diff --git a/testData/ast/binaryExpression/expression_mult/shiftRight.kt b/testData/ast/binaryExpression/expression/shiftRight.kt similarity index 100% rename from testData/ast/binaryExpression/expression_mult/shiftRight.kt rename to testData/ast/binaryExpression/expression/shiftRight.kt diff --git a/testData/ast/binaryExpression/expression_mult/unsignedRightShift.jav b/testData/ast/binaryExpression/expression/unsignedRightShift.jav similarity index 100% rename from testData/ast/binaryExpression/expression_mult/unsignedRightShift.jav rename to testData/ast/binaryExpression/expression/unsignedRightShift.jav diff --git a/testData/ast/binaryExpression/expression_mult/unsignedRightShift.kt b/testData/ast/binaryExpression/expression/unsignedRightShift.kt similarity index 100% rename from testData/ast/binaryExpression/expression_mult/unsignedRightShift.kt rename to testData/ast/binaryExpression/expression/unsignedRightShift.kt diff --git a/testData/ast/binaryExpression/expression_mult/xor.jav b/testData/ast/binaryExpression/expression/xor.jav similarity index 100% rename from testData/ast/binaryExpression/expression_mult/xor.jav rename to testData/ast/binaryExpression/expression/xor.jav diff --git a/testData/ast/binaryExpression/expression_mult/xor.kt b/testData/ast/binaryExpression/expression/xor.kt similarity index 100% rename from testData/ast/binaryExpression/expression_mult/xor.kt rename to testData/ast/binaryExpression/expression/xor.kt diff --git a/testData/ast/class_/class/class.jav b/testData/ast/class/class/class.jav similarity index 100% rename from testData/ast/class_/class/class.jav rename to testData/ast/class/class/class.jav diff --git a/testData/ast/class_/class/class.kt b/testData/ast/class/class/class.kt similarity index 100% rename from testData/ast/class_/class/class.kt rename to testData/ast/class/class/class.kt diff --git a/testData/ast/class_/class/emptyClass.jav b/testData/ast/class/class/emptyClass.jav similarity index 100% rename from testData/ast/class_/class/emptyClass.jav rename to testData/ast/class/class/emptyClass.jav diff --git a/testData/ast/class_/class/emptyClass.kt b/testData/ast/class/class/emptyClass.kt similarity index 100% rename from testData/ast/class_/class/emptyClass.kt rename to testData/ast/class/class/emptyClass.kt diff --git a/testData/ast/class_/class/extendsOneClassAndImplementsOneInterface.jav b/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.jav similarity index 100% rename from testData/ast/class_/class/extendsOneClassAndImplementsOneInterface.jav rename to testData/ast/class/class/extendsOneClassAndImplementsOneInterface.jav diff --git a/testData/ast/class_/class/extendsOneClassAndImplementsOneInterface.kt b/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.kt similarity index 100% rename from testData/ast/class_/class/extendsOneClassAndImplementsOneInterface.kt rename to testData/ast/class/class/extendsOneClassAndImplementsOneInterface.kt diff --git a/testData/ast/class_/class/extendsOneClassAndImplementsSeveralInterfaces.jav b/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.jav similarity index 100% rename from testData/ast/class_/class/extendsOneClassAndImplementsSeveralInterfaces.jav rename to testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.jav diff --git a/testData/ast/class_/class/extendsOneClassAndImplementsSeveralInterfaces.kt b/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.kt similarity index 100% rename from testData/ast/class_/class/extendsOneClassAndImplementsSeveralInterfaces.kt rename to testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.kt diff --git a/testData/ast/class_/class/finalClass.jav b/testData/ast/class/class/finalClass.jav similarity index 100% rename from testData/ast/class_/class/finalClass.jav rename to testData/ast/class/class/finalClass.jav diff --git a/testData/ast/class_/class/finalClass.kt b/testData/ast/class/class/finalClass.kt similarity index 100% rename from testData/ast/class_/class/finalClass.kt rename to testData/ast/class/class/finalClass.kt diff --git a/testData/ast/class_/class/genericClass.jav b/testData/ast/class/class/genericClass.jav similarity index 100% rename from testData/ast/class_/class/genericClass.jav rename to testData/ast/class/class/genericClass.jav diff --git a/testData/ast/class_/class/genericClass.kt b/testData/ast/class/class/genericClass.kt similarity index 100% rename from testData/ast/class_/class/genericClass.kt rename to testData/ast/class/class/genericClass.kt diff --git a/testData/ast/class_/class/innerEmptyClass.jav b/testData/ast/class/class/innerEmptyClass.jav similarity index 100% rename from testData/ast/class_/class/innerEmptyClass.jav rename to testData/ast/class/class/innerEmptyClass.jav diff --git a/testData/ast/class_/class/innerEmptyClass.kt b/testData/ast/class/class/innerEmptyClass.kt similarity index 100% rename from testData/ast/class_/class/innerEmptyClass.kt rename to testData/ast/class/class/innerEmptyClass.kt diff --git a/testData/ast/class_/class/innerStaticClass.jav b/testData/ast/class/class/innerStaticClass.jav similarity index 100% rename from testData/ast/class_/class/innerStaticClass.jav rename to testData/ast/class/class/innerStaticClass.jav diff --git a/testData/ast/class_/class/innerStaticClass.kt b/testData/ast/class/class/innerStaticClass.kt similarity index 100% rename from testData/ast/class_/class/innerStaticClass.kt rename to testData/ast/class/class/innerStaticClass.kt diff --git a/testData/ast/class_/class/internalClass.jav b/testData/ast/class/class/internalClass.jav similarity index 100% rename from testData/ast/class_/class/internalClass.jav rename to testData/ast/class/class/internalClass.jav diff --git a/testData/ast/class_/class/internalClass.kt b/testData/ast/class/class/internalClass.kt similarity index 100% rename from testData/ast/class_/class/internalClass.kt rename to testData/ast/class/class/internalClass.kt diff --git a/testData/ast/class_/class/oneStaticFieldOneNonStatic.jav b/testData/ast/class/class/oneStaticFieldOneNonStatic.jav similarity index 100% rename from testData/ast/class_/class/oneStaticFieldOneNonStatic.jav rename to testData/ast/class/class/oneStaticFieldOneNonStatic.jav diff --git a/testData/ast/class_/class/oneStaticFieldOneNonStatic.kt b/testData/ast/class/class/oneStaticFieldOneNonStatic.kt similarity index 100% rename from testData/ast/class_/class/oneStaticFieldOneNonStatic.kt rename to testData/ast/class/class/oneStaticFieldOneNonStatic.kt diff --git a/testData/ast/class_/class/oneStaticMethod.jav b/testData/ast/class/class/oneStaticMethod.jav similarity index 100% rename from testData/ast/class_/class/oneStaticMethod.jav rename to testData/ast/class/class/oneStaticMethod.jav diff --git a/testData/ast/class_/class/oneStaticMethod.kt b/testData/ast/class/class/oneStaticMethod.kt similarity index 100% rename from testData/ast/class_/class/oneStaticMethod.kt rename to testData/ast/class/class/oneStaticMethod.kt diff --git a/testData/ast/class_/class/oneStaticMethodOneNonStatic.jav b/testData/ast/class/class/oneStaticMethodOneNonStatic.jav similarity index 100% rename from testData/ast/class_/class/oneStaticMethodOneNonStatic.jav rename to testData/ast/class/class/oneStaticMethodOneNonStatic.jav diff --git a/testData/ast/class_/class/oneStaticMethodOneNonStatic.kt b/testData/ast/class/class/oneStaticMethodOneNonStatic.kt similarity index 100% rename from testData/ast/class_/class/oneStaticMethodOneNonStatic.kt rename to testData/ast/class/class/oneStaticMethodOneNonStatic.kt diff --git a/testData/ast/class_/class/pivateClass.jav b/testData/ast/class/class/pivateClass.jav similarity index 100% rename from testData/ast/class_/class/pivateClass.jav rename to testData/ast/class/class/pivateClass.jav diff --git a/testData/ast/class_/class/pivateClass.kt b/testData/ast/class/class/pivateClass.kt similarity index 100% rename from testData/ast/class_/class/pivateClass.kt rename to testData/ast/class/class/pivateClass.kt diff --git a/testData/ast/class_/class/protectedClass.jav b/testData/ast/class/class/protectedClass.jav similarity index 100% rename from testData/ast/class_/class/protectedClass.jav rename to testData/ast/class/class/protectedClass.jav diff --git a/testData/ast/class_/class/protectedClass.kt b/testData/ast/class/class/protectedClass.kt similarity index 100% rename from testData/ast/class_/class/protectedClass.kt rename to testData/ast/class/class/protectedClass.kt diff --git a/testData/ast/class_/class/publicClass.jav b/testData/ast/class/class/publicClass.jav similarity index 100% rename from testData/ast/class_/class/publicClass.jav rename to testData/ast/class/class/publicClass.jav diff --git a/testData/ast/class_/class/publicClass.kt b/testData/ast/class/class/publicClass.kt similarity index 100% rename from testData/ast/class_/class/publicClass.kt rename to testData/ast/class/class/publicClass.kt diff --git a/testData/ast/class_/class/simpleInheritance.jav b/testData/ast/class/class/simpleInheritance.jav similarity index 100% rename from testData/ast/class_/class/simpleInheritance.jav rename to testData/ast/class/class/simpleInheritance.jav diff --git a/testData/ast/class_/class/simpleInheritance.kt b/testData/ast/class/class/simpleInheritance.kt similarity index 100% rename from testData/ast/class_/class/simpleInheritance.kt rename to testData/ast/class/class/simpleInheritance.kt diff --git a/testData/ast/class_/class/twoStaticMethod.jav b/testData/ast/class/class/twoStaticMethod.jav similarity index 100% rename from testData/ast/class_/class/twoStaticMethod.jav rename to testData/ast/class/class/twoStaticMethod.jav diff --git a/testData/ast/class_/class/twoStaticMethod.kt b/testData/ast/class/class/twoStaticMethod.kt similarity index 100% rename from testData/ast/class_/class/twoStaticMethod.kt rename to testData/ast/class/class/twoStaticMethod.kt diff --git a/testData/ast/class_/class_mult/classWithEmptyMethods.jav b/testData/ast/class/class_mult/classWithEmptyMethods.jav similarity index 100% rename from testData/ast/class_/class_mult/classWithEmptyMethods.jav rename to testData/ast/class/class_mult/classWithEmptyMethods.jav diff --git a/testData/ast/class_/class_mult/classWithEmptyMethods.kt b/testData/ast/class/class_mult/classWithEmptyMethods.kt similarity index 100% rename from testData/ast/class_/class_mult/classWithEmptyMethods.kt rename to testData/ast/class/class_mult/classWithEmptyMethods.kt diff --git a/testData/ast/class_/class_mult/classWithFields.jav b/testData/ast/class/class_mult/classWithFields.jav similarity index 100% rename from testData/ast/class_/class_mult/classWithFields.jav rename to testData/ast/class/class_mult/classWithFields.jav diff --git a/testData/ast/class_/class_mult/classWithFields.kt b/testData/ast/class/class_mult/classWithFields.kt similarity index 100% rename from testData/ast/class_/class_mult/classWithFields.kt rename to testData/ast/class/class_mult/classWithFields.kt diff --git a/testData/ast/class_/class_mult/classWithMultiplyFields.jav b/testData/ast/class/class_mult/classWithMultiplyFields.jav similarity index 100% rename from testData/ast/class_/class_mult/classWithMultiplyFields.jav rename to testData/ast/class/class_mult/classWithMultiplyFields.jav diff --git a/testData/ast/class_/class_mult/classWithMultiplyFields.kt b/testData/ast/class/class_mult/classWithMultiplyFields.kt similarity index 100% rename from testData/ast/class_/class_mult/classWithMultiplyFields.kt rename to testData/ast/class/class_mult/classWithMultiplyFields.kt diff --git a/testData/ast/conditionalExpression/expression_mult/simpleConditionalExpression.jav b/testData/ast/conditionalExpression/expression/simpleConditionalExpression.jav similarity index 100% rename from testData/ast/conditionalExpression/expression_mult/simpleConditionalExpression.jav rename to testData/ast/conditionalExpression/expression/simpleConditionalExpression.jav diff --git a/testData/ast/conditionalExpression/expression_mult/simpleConditionalExpression.kt b/testData/ast/conditionalExpression/expression/simpleConditionalExpression.kt similarity index 100% rename from testData/ast/conditionalExpression/expression_mult/simpleConditionalExpression.kt rename to testData/ast/conditionalExpression/expression/simpleConditionalExpression.kt diff --git a/testData/ast/file_/file/packageWithClass.jav b/testData/ast/file/file/packageWithClass.jav similarity index 100% rename from testData/ast/file_/file/packageWithClass.jav rename to testData/ast/file/file/packageWithClass.jav diff --git a/testData/ast/file_/file/packageWithClass.kt b/testData/ast/file/file/packageWithClass.kt similarity index 100% rename from testData/ast/file_/file/packageWithClass.kt rename to testData/ast/file/file/packageWithClass.kt diff --git a/testData/ast/file_/file/packageWithClasses.jav b/testData/ast/file/file/packageWithClasses.jav similarity index 100% rename from testData/ast/file_/file/packageWithClasses.jav rename to testData/ast/file/file/packageWithClasses.jav diff --git a/testData/ast/file_/file/packageWithClasses.kt b/testData/ast/file/file/packageWithClasses.kt similarity index 100% rename from testData/ast/file_/file/packageWithClasses.kt rename to testData/ast/file/file/packageWithClasses.kt diff --git a/testData/ast/file_/file/packageWithOpenClass.jav b/testData/ast/file/file/packageWithOpenClass.jav similarity index 100% rename from testData/ast/file_/file/packageWithOpenClass.jav rename to testData/ast/file/file/packageWithOpenClass.jav diff --git a/testData/ast/file_/file/packageWithOpenClass.kt b/testData/ast/file/file/packageWithOpenClass.kt similarity index 100% rename from testData/ast/file_/file/packageWithOpenClass.kt rename to testData/ast/file/file/packageWithOpenClass.kt diff --git a/testData/ast/file_/file_mult/packageWithImports.jav b/testData/ast/file/file_mult/packageWithImports.jav similarity index 100% rename from testData/ast/file_/file_mult/packageWithImports.jav rename to testData/ast/file/file_mult/packageWithImports.jav diff --git a/testData/ast/file_/file_mult/packageWithImports.kt b/testData/ast/file/file_mult/packageWithImports.kt similarity index 100% rename from testData/ast/file_/file_mult/packageWithImports.kt rename to testData/ast/file/file_mult/packageWithImports.kt diff --git a/testData/ast/file_/file_mult/packageWithMixedImports.jav b/testData/ast/file/file_mult/packageWithMixedImports.jav similarity index 100% rename from testData/ast/file_/file_mult/packageWithMixedImports.jav rename to testData/ast/file/file_mult/packageWithMixedImports.jav diff --git a/testData/ast/file_/file_mult/packageWithMixedImports.kt b/testData/ast/file/file_mult/packageWithMixedImports.kt similarity index 100% rename from testData/ast/file_/file_mult/packageWithMixedImports.kt rename to testData/ast/file/file_mult/packageWithMixedImports.kt diff --git a/testData/ast/file_/file_mult/packageWithStaticImports.jav b/testData/ast/file/file_mult/packageWithStaticImports.jav similarity index 100% rename from testData/ast/file_/file_mult/packageWithStaticImports.jav rename to testData/ast/file/file_mult/packageWithStaticImports.jav diff --git a/testData/ast/file_/file_mult/packageWithStaticImports.kt b/testData/ast/file/file_mult/packageWithStaticImports.kt similarity index 100% rename from testData/ast/file_/file_mult/packageWithStaticImports.kt rename to testData/ast/file/file_mult/packageWithStaticImports.kt diff --git a/testData/ast/isOperator/expression_mult/complicatedExpression.jav b/testData/ast/isOperator/expression/complicatedExpression.jav similarity index 100% rename from testData/ast/isOperator/expression_mult/complicatedExpression.jav rename to testData/ast/isOperator/expression/complicatedExpression.jav diff --git a/testData/ast/isOperator/expression_mult/complicatedExpression.kt b/testData/ast/isOperator/expression/complicatedExpression.kt similarity index 100% rename from testData/ast/isOperator/expression_mult/complicatedExpression.kt rename to testData/ast/isOperator/expression/complicatedExpression.kt diff --git a/testData/ast/isOperator/expression_mult/simpleReference.jav b/testData/ast/isOperator/expression/simpleReference.jav similarity index 100% rename from testData/ast/isOperator/expression_mult/simpleReference.jav rename to testData/ast/isOperator/expression/simpleReference.jav diff --git a/testData/ast/isOperator/expression_mult/simpleReference.kt b/testData/ast/isOperator/expression/simpleReference.kt similarity index 100% rename from testData/ast/isOperator/expression_mult/simpleReference.kt rename to testData/ast/isOperator/expression/simpleReference.kt diff --git a/testData/ast/polyadicExpression/expression_mult/divide.jav b/testData/ast/polyadicExpression/expression/divide.jav similarity index 100% rename from testData/ast/polyadicExpression/expression_mult/divide.jav rename to testData/ast/polyadicExpression/expression/divide.jav diff --git a/testData/ast/polyadicExpression/expression_mult/divide.kt b/testData/ast/polyadicExpression/expression/divide.kt similarity index 100% rename from testData/ast/polyadicExpression/expression_mult/divide.kt rename to testData/ast/polyadicExpression/expression/divide.kt diff --git a/testData/ast/polyadicExpression/expression_mult/minus.jav b/testData/ast/polyadicExpression/expression/minus.jav similarity index 100% rename from testData/ast/polyadicExpression/expression_mult/minus.jav rename to testData/ast/polyadicExpression/expression/minus.jav diff --git a/testData/ast/polyadicExpression/expression_mult/minus.kt b/testData/ast/polyadicExpression/expression/minus.kt similarity index 100% rename from testData/ast/polyadicExpression/expression_mult/minus.kt rename to testData/ast/polyadicExpression/expression/minus.kt diff --git a/testData/ast/polyadicExpression/expression_mult/multiply.jav b/testData/ast/polyadicExpression/expression/multiply.jav similarity index 100% rename from testData/ast/polyadicExpression/expression_mult/multiply.jav rename to testData/ast/polyadicExpression/expression/multiply.jav diff --git a/testData/ast/polyadicExpression/expression_mult/multiply.kt b/testData/ast/polyadicExpression/expression/multiply.kt similarity index 100% rename from testData/ast/polyadicExpression/expression_mult/multiply.kt rename to testData/ast/polyadicExpression/expression/multiply.kt diff --git a/testData/ast/polyadicExpression/expression_mult/plus.jav b/testData/ast/polyadicExpression/expression/plus.jav similarity index 100% rename from testData/ast/polyadicExpression/expression_mult/plus.jav rename to testData/ast/polyadicExpression/expression/plus.jav diff --git a/testData/ast/polyadicExpression/expression_mult/plus.kt b/testData/ast/polyadicExpression/expression/plus.kt similarity index 100% rename from testData/ast/polyadicExpression/expression_mult/plus.kt rename to testData/ast/polyadicExpression/expression/plus.kt diff --git a/testData/ast/polyadicExpression/expression_mult/remainder.jav b/testData/ast/polyadicExpression/expression/remainder.jav similarity index 100% rename from testData/ast/polyadicExpression/expression_mult/remainder.jav rename to testData/ast/polyadicExpression/expression/remainder.jav diff --git a/testData/ast/polyadicExpression/expression_mult/remainder.kt b/testData/ast/polyadicExpression/expression/remainder.kt similarity index 100% rename from testData/ast/polyadicExpression/expression_mult/remainder.kt rename to testData/ast/polyadicExpression/expression/remainder.kt diff --git a/testData/ast/typeCastExpression/expression_mult/extendsWildcardCast.jav b/testData/ast/typeCastExpression/expression/extendsWildcardCast.jav similarity index 100% rename from testData/ast/typeCastExpression/expression_mult/extendsWildcardCast.jav rename to testData/ast/typeCastExpression/expression/extendsWildcardCast.jav diff --git a/testData/ast/typeCastExpression/expression_mult/extendsWildcardCast.kt b/testData/ast/typeCastExpression/expression/extendsWildcardCast.kt similarity index 100% rename from testData/ast/typeCastExpression/expression_mult/extendsWildcardCast.kt rename to testData/ast/typeCastExpression/expression/extendsWildcardCast.kt diff --git a/testData/ast/typeCastExpression/expression_mult/fooCast.jav b/testData/ast/typeCastExpression/expression/fooCast.jav similarity index 100% rename from testData/ast/typeCastExpression/expression_mult/fooCast.jav rename to testData/ast/typeCastExpression/expression/fooCast.jav diff --git a/testData/ast/typeCastExpression/expression_mult/fooCast.kt b/testData/ast/typeCastExpression/expression/fooCast.kt similarity index 100% rename from testData/ast/typeCastExpression/expression_mult/fooCast.kt rename to testData/ast/typeCastExpression/expression/fooCast.kt diff --git a/testData/ast/typeCastExpression/expression_mult/intCast.jav b/testData/ast/typeCastExpression/expression/intCast.jav similarity index 100% rename from testData/ast/typeCastExpression/expression_mult/intCast.jav rename to testData/ast/typeCastExpression/expression/intCast.jav diff --git a/testData/ast/typeCastExpression/expression_mult/intCast.kt b/testData/ast/typeCastExpression/expression/intCast.kt similarity index 100% rename from testData/ast/typeCastExpression/expression_mult/intCast.kt rename to testData/ast/typeCastExpression/expression/intCast.kt diff --git a/testData/ast/typeCastExpression/expression_mult/primitiveType.jav b/testData/ast/typeCastExpression/expression/primitiveType.jav similarity index 100% rename from testData/ast/typeCastExpression/expression_mult/primitiveType.jav rename to testData/ast/typeCastExpression/expression/primitiveType.jav diff --git a/testData/ast/typeCastExpression/expression_mult/primitiveType.kt b/testData/ast/typeCastExpression/expression/primitiveType.kt similarity index 100% rename from testData/ast/typeCastExpression/expression_mult/primitiveType.kt rename to testData/ast/typeCastExpression/expression/primitiveType.kt diff --git a/testData/ast/typeCastExpression/expression_mult/simpleGenericCast.jav b/testData/ast/typeCastExpression/expression/simpleGenericCast.jav similarity index 100% rename from testData/ast/typeCastExpression/expression_mult/simpleGenericCast.jav rename to testData/ast/typeCastExpression/expression/simpleGenericCast.jav diff --git a/testData/ast/typeCastExpression/expression_mult/simpleGenericCast.kt b/testData/ast/typeCastExpression/expression/simpleGenericCast.kt similarity index 100% rename from testData/ast/typeCastExpression/expression_mult/simpleGenericCast.kt rename to testData/ast/typeCastExpression/expression/simpleGenericCast.kt diff --git a/testData/ast/typeCastExpression/expression_mult/stringCast.jav b/testData/ast/typeCastExpression/expression/stringCast.jav similarity index 100% rename from testData/ast/typeCastExpression/expression_mult/stringCast.jav rename to testData/ast/typeCastExpression/expression/stringCast.jav diff --git a/testData/ast/typeCastExpression/expression_mult/stringCast.kt b/testData/ast/typeCastExpression/expression/stringCast.kt similarity index 100% rename from testData/ast/typeCastExpression/expression_mult/stringCast.kt rename to testData/ast/typeCastExpression/expression/stringCast.kt diff --git a/testData/ast/typeCastExpression/expression_mult/superWildcardCast.jav b/testData/ast/typeCastExpression/expression/superWildcardCast.jav similarity index 100% rename from testData/ast/typeCastExpression/expression_mult/superWildcardCast.jav rename to testData/ast/typeCastExpression/expression/superWildcardCast.jav diff --git a/testData/ast/typeCastExpression/expression_mult/superWildcardCast.kt b/testData/ast/typeCastExpression/expression/superWildcardCast.kt similarity index 100% rename from testData/ast/typeCastExpression/expression_mult/superWildcardCast.kt rename to testData/ast/typeCastExpression/expression/superWildcardCast.kt diff --git a/testData/ast/typeCastExpression/expression_mult/wildcardCast.jav b/testData/ast/typeCastExpression/expression/wildcardCast.jav similarity index 100% rename from testData/ast/typeCastExpression/expression_mult/wildcardCast.jav rename to testData/ast/typeCastExpression/expression/wildcardCast.jav diff --git a/testData/ast/typeCastExpression/expression_mult/wildcardCast.kt b/testData/ast/typeCastExpression/expression/wildcardCast.kt similarity index 100% rename from testData/ast/typeCastExpression/expression_mult/wildcardCast.kt rename to testData/ast/typeCastExpression/expression/wildcardCast.kt