diff --git a/generators/generators.iml b/generators/generators.iml
index 4787edce5ae..e6927ce16a5 100644
--- a/generators/generators.iml
+++ b/generators/generators.iml
@@ -22,6 +22,7 @@
+
diff --git a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
index 481ca9e3d6c..e8aa48bbadb 100644
--- a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
+++ b/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) {
System.setProperty("java.awt.headless", "true")
@@ -413,6 +415,16 @@ fun main(args: Array) {
model("dataFlowValueRendering")
}
}
+
+ testGroup("j2k/tests/test", "j2k/tests/testData") {
+ testClass(javaClass()) {
+ model("ast", extension = "jav")
+ }
+
+ testClass(javaClass()) {
+ model("ast", extension = "jav")
+ }
+ }
}
private class TestGroup(val testsRoot: String, val testDataRoot: String) {
diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/StandaloneJavaToKotlinConverterTest.kt b/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt
similarity index 57%
rename from j2k/tests/test/org/jetbrains/jet/j2k/test/StandaloneJavaToKotlinConverterTest.kt
rename to j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt
index c4bc9365086..7da823e2ffc 100644
--- a/j2k/tests/test/org/jetbrains/jet/j2k/test/StandaloneJavaToKotlinConverterTest.kt
+++ b/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt
@@ -21,27 +21,28 @@ import com.intellij.openapi.util.io.FileUtil
import junit.framework.Assert
import com.intellij.psi.PsiJavaFile
import com.intellij.psi.PsiFile
-import junit.framework.Test
-import junit.framework.TestSuite
-import java.io.FilenameFilter
-import java.io.FileFilter
-import java.util.Collections
import org.jetbrains.jet.j2k.Converter
import org.jetbrains.jet.j2k.JavaToKotlinTranslator
import org.jetbrains.jet.ConfigurationKind
import org.jetbrains.jet.JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations
import com.intellij.testFramework.UsefulTestCase
import org.jetbrains.jet.j2k.ConverterSettings
+import org.jetbrains.jet.j2k.PluginSettings
+import org.jetbrains.jet.j2k.TestSettings
+import java.util.regex.Pattern
-public abstract class StandaloneJavaToKotlinConverterTest(val dataPath: String,
- val name: String,
- val settings: ConverterSettings) : UsefulTestCase() {
+public abstract class AbstractJavaToKotlinConverterPluginTest() : AbstractJavaToKotlinConverterTest("ide.kt", PluginSettings)
+public abstract class AbstractJavaToKotlinConverterBasicTest() : AbstractJavaToKotlinConverterTest("kt", TestSettings)
- protected override fun runTest(): Unit {
+public abstract class AbstractJavaToKotlinConverterTest(val kotlinFileExtension: String,
+ val settings: ConverterSettings) : UsefulTestCase() {
+
+ val testHeaderPattern = Pattern.compile("//(expression|statement|method|class|file|comp)\n")
+
+ protected fun doTest(javaPath: String) {
val jetCoreEnvironment = createEnvironmentWithMockJdkAndIdeaAnnotations(getTestRootDisposable(), ConfigurationKind.JDK_ONLY)
val converter = Converter(jetCoreEnvironment.getProject(), settings)
- val javaPath = "j2k/tests/testData/" + getTestFilePath()
- val kotlinPath = javaPath.replace(".jav", ".kt")
+ val kotlinPath = javaPath.replace(".jav", ".$kotlinFileExtension")
val kotlinFile = File(kotlinPath)
if (!kotlinFile.exists()) {
FileUtil.writeToFile(kotlinFile, "")
@@ -49,18 +50,20 @@ public abstract class StandaloneJavaToKotlinConverterTest(val dataPath: String,
val expected = FileUtil.loadFile(kotlinFile, true)
val javaFile = File(javaPath)
- val javaCode = FileUtil.loadFile(javaFile, true)
- val parentFileName = javaFile.getParentFile()?.getName()
-
- val actual = when (parentFileName) {
+ val fileContents = FileUtil.loadFile(javaFile, true)
+ val matcher = testHeaderPattern.matcher(fileContents)
+ matcher.find()
+ val prefix = matcher.group().trim().substring(2)
+ val javaCode = matcher.replaceFirst("")
+ val actual = when (prefix) {
"expression" -> expressionToKotlin(converter, javaCode)
"statement" -> statementToKotlin(converter, javaCode)
"method" -> methodToKotlin(converter, javaCode)
"class" -> fileToKotlin(converter, javaCode)
"file" -> fileToKotlin(converter, javaCode)
"comp" -> fileToFileWithCompatibilityImport(javaCode)
- else -> throw IllegalStateException("Specify what is it: file, class, method, statement or expression:" +
- "$javaPath parent: $parentFileName")
+ else -> throw IllegalStateException("Specify what is it: file, class, method, statement or expression "+
+ "using the first line of test data file")
}
val tmp = File(kotlinPath + ".tmp")
@@ -75,10 +78,6 @@ public abstract class StandaloneJavaToKotlinConverterTest(val dataPath: String,
Assert.assertEquals(expected, actual)
}
- fun getTestFilePath(): String {
- return "$dataPath/$name.jav"
- }
-
private fun fileToKotlin(converter: Converter, text: String): String {
return generateKotlinCode(converter, JavaToKotlinTranslator.createFile(converter.project, text))
}
@@ -98,7 +97,7 @@ public abstract class StandaloneJavaToKotlinConverterTest(val dataPath: String,
private fun expressionToKotlin(converter: Converter, code: String?): String {
var result = statementToKotlin(converter, "final Object o =" + code + "}")
- result = result.replaceFirst("val o : Any\\? =", "").replaceFirst("val o : Any = ", "")
+ result = result.replaceFirst("val o : Any\\? =", "").replaceFirst("val o : Any = ", "").replaceFirst("val o = ", "")
return prettify(result)
}
@@ -122,65 +121,4 @@ public abstract class StandaloneJavaToKotlinConverterTest(val dataPath: String,
return code.trim().replaceAll("\r\n", "\n").replaceAll(" \n", "\n").replaceAll("\n ", "\n").replaceAll("\n+", "\n").replaceAll(" +", " ").trim()
}
-
-}
-private val emptyFilter = object : FilenameFilter {
- public override fun accept(dir: File, name: String): Boolean {
- return true
- }
-}
-
-public trait NamedTestFactory {
- fun createTest(dataPath: String, name: String): Test
-}
-
-public fun suiteForDirectory(baseDataDir: String?, dataPath: String, factory: NamedTestFactory): TestSuite {
- return suiteForDirectory(baseDataDir, dataPath, true, emptyFilter, factory)
-}
-
-public fun suiteForDirectory(baseDataDir: String?, dataPath: String, recursive: Boolean, filter: FilenameFilter, factory: NamedTestFactory): TestSuite {
- val suite = TestSuite(dataPath)
- val extensionJava = ".jav"
- val extensionFilter = object : FilenameFilter {
- public override fun accept(dir: File, name: String): Boolean {
- return name.endsWith(extensionJava)
- }
- }
-
- val resultFilter =
- if (filter != emptyFilter) {
- object : FilenameFilter {
- public override fun accept(dir: File, name: String): Boolean {
- return (extensionFilter.accept(dir, name)) && filter.accept(dir, name)
- }
- }
- }
- else {
- extensionFilter
- }
-
- val dir = File(baseDataDir + dataPath)
- val dirFilter = object : FileFilter {
- public override fun accept(pathname: File): Boolean {
- return pathname.isDirectory()
- }
- }
-
- if (recursive) {
- val files = dir.listFiles(dirFilter)
- val subdirs = files!!.toLinkedList()
- Collections.sort(subdirs)
- for (subdir in subdirs) {
- suite.addTest(suiteForDirectory(baseDataDir, dataPath + "/" + subdir.getName(), recursive, filter, factory))
- }
- }
-
- val files = (dir.listFiles(resultFilter))!!.toLinkedList()
- Collections.sort(files)
- for (file in files) {
- val testName = file.getName().substring(0, (file.getName().length()) - (extensionJava.length()))
- suite.addTest(factory.createTest(dataPath, testName))
- }
- return suite
-}
-
+}
\ No newline at end of file
diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/BasicConverterTestSuite.java b/j2k/tests/test/org/jetbrains/jet/j2k/test/BasicConverterTestSuite.java
deleted file mode 100644
index 79ef5bc4269..00000000000
--- a/j2k/tests/test/org/jetbrains/jet/j2k/test/BasicConverterTestSuite.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2010-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.j2k.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.jetbrains.jet.j2k.J2kPackage;
-
-import static org.jetbrains.jet.j2k.test.TestPackage.suiteForDirectory;
-
-public class BasicConverterTestSuite {
-
- private BasicConverterTestSuite() {
- }
-
- public static Test suite() {
- TestSuite suite = new TestSuite();
- suite.addTest(suiteForDirectory("j2k/tests/testData", "/ast", new NamedTestFactory() {
- @Override
- public Test createTest(String dataPath, String name) {
- //noinspection JUnitTestCaseWithNoTests
- return new StandaloneJavaToKotlinConverterTest(dataPath, name, J2kPackage.getTestSettings()) {
- @Override
- protected void runTest() {
- super.runTest();
- }
- };
- }
- }));
- return suite;
- }
-}
diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/ConverterTestSuiteForPlugin.java b/j2k/tests/test/org/jetbrains/jet/j2k/test/ConverterTestSuiteForPlugin.java
deleted file mode 100644
index 075ec826631..00000000000
--- a/j2k/tests/test/org/jetbrains/jet/j2k/test/ConverterTestSuiteForPlugin.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2010-2013 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.j2k.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.jetbrains.jet.j2k.J2kPackage;
-
-import static org.jetbrains.jet.j2k.test.TestPackage.suiteForDirectory;
-
-public class ConverterTestSuiteForPlugin {
- private ConverterTestSuiteForPlugin() {
- }
-
- public static Test suite() {
-
- TestSuite suite = new TestSuite();
- suite.addTest(suiteForDirectory("j2k/tests/testData", "/plugin", new NamedTestFactory() {
- @Override
- public Test createTest(String dataPath, String name) {
- //noinspection JUnitTestCaseWithNoTests
- return new StandaloneJavaToKotlinConverterTest(dataPath, name, J2kPackage.getPluginSettings()) {
- @Override
- protected void runTest() {
- super.runTest();
- }
- };
- }
- }));
- return suite;
- }
-}
diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterBasicTestGenerated.java b/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterBasicTestGenerated.java
new file mode 100644
index 00000000000..bb853df66d2
--- /dev/null
+++ b/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterBasicTestGenerated.java
@@ -0,0 +1,2327 @@
+/*
+ * Copyright 2010-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.j2k.test;
+
+import junit.framework.Assert;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import java.io.File;
+import java.util.regex.Pattern;
+import org.jetbrains.jet.JetTestUtils;
+import org.jetbrains.jet.test.InnerTestClasses;
+import org.jetbrains.jet.test.TestMetadata;
+
+import org.jetbrains.jet.j2k.test.AbstractJavaToKotlinConverterBasicTest;
+
+/** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
+@SuppressWarnings("all")
+@TestMetadata("j2k/tests/testData/ast")
+@InnerTestClasses({JavaToKotlinConverterBasicTestGenerated.Annotations.class, JavaToKotlinConverterBasicTestGenerated.AnonymousBlock.class, JavaToKotlinConverterBasicTestGenerated.ArrayAccessExpression.class, JavaToKotlinConverterBasicTestGenerated.ArrayInitializerExpression.class, JavaToKotlinConverterBasicTestGenerated.ArrayType.class, JavaToKotlinConverterBasicTestGenerated.AssertStatement.class, JavaToKotlinConverterBasicTestGenerated.AssignmentExpression.class, JavaToKotlinConverterBasicTestGenerated.BinaryExpression.class, JavaToKotlinConverterBasicTestGenerated.BoxedType.class, JavaToKotlinConverterBasicTestGenerated.BreakStatement.class, JavaToKotlinConverterBasicTestGenerated.CallChainExpression.class, JavaToKotlinConverterBasicTestGenerated.Class.class, JavaToKotlinConverterBasicTestGenerated.ClassExpression.class, JavaToKotlinConverterBasicTestGenerated.ConditionalExpression.class, JavaToKotlinConverterBasicTestGenerated.Constructors.class, JavaToKotlinConverterBasicTestGenerated.ContinueStatement.class, JavaToKotlinConverterBasicTestGenerated.DeclarationStatement.class, JavaToKotlinConverterBasicTestGenerated.DoWhileStatement.class, JavaToKotlinConverterBasicTestGenerated.Enum.class, JavaToKotlinConverterBasicTestGenerated.Field.class, JavaToKotlinConverterBasicTestGenerated.For.class, JavaToKotlinConverterBasicTestGenerated.ForeachStatement.class, JavaToKotlinConverterBasicTestGenerated.Function.class, JavaToKotlinConverterBasicTestGenerated.Identifier.class, JavaToKotlinConverterBasicTestGenerated.IfStatement.class, JavaToKotlinConverterBasicTestGenerated.ImportStatement.class, JavaToKotlinConverterBasicTestGenerated.InProjectionType.class, JavaToKotlinConverterBasicTestGenerated.Inheritance.class, JavaToKotlinConverterBasicTestGenerated.IsOperator.class, JavaToKotlinConverterBasicTestGenerated.Issues.class, JavaToKotlinConverterBasicTestGenerated.KotlinExclusion.class, JavaToKotlinConverterBasicTestGenerated.LabelStatement.class, JavaToKotlinConverterBasicTestGenerated.List.class, JavaToKotlinConverterBasicTestGenerated.LiteralExpression.class, JavaToKotlinConverterBasicTestGenerated.LocalVariable.class, JavaToKotlinConverterBasicTestGenerated.MethodCallExpression.class, JavaToKotlinConverterBasicTestGenerated.Misc.class, JavaToKotlinConverterBasicTestGenerated.NewClassExpression.class, JavaToKotlinConverterBasicTestGenerated.ObjectLiteral.class, JavaToKotlinConverterBasicTestGenerated.OutProjectionType.class, JavaToKotlinConverterBasicTestGenerated.PackageStatement.class, JavaToKotlinConverterBasicTestGenerated.ParenthesizedExpression.class, JavaToKotlinConverterBasicTestGenerated.PolyadicExpression.class, JavaToKotlinConverterBasicTestGenerated.PostfixOperator.class, JavaToKotlinConverterBasicTestGenerated.PrefixOperator.class, JavaToKotlinConverterBasicTestGenerated.RawGenerics.class, JavaToKotlinConverterBasicTestGenerated.ReturnStatement.class, JavaToKotlinConverterBasicTestGenerated.StarProjectionType.class, JavaToKotlinConverterBasicTestGenerated.SuperExpression.class, JavaToKotlinConverterBasicTestGenerated.Switch.class, JavaToKotlinConverterBasicTestGenerated.SynchronizedStatement.class, JavaToKotlinConverterBasicTestGenerated.ThisExpression.class, JavaToKotlinConverterBasicTestGenerated.ThrowStatement.class, JavaToKotlinConverterBasicTestGenerated.Trait.class, JavaToKotlinConverterBasicTestGenerated.TryStatement.class, JavaToKotlinConverterBasicTestGenerated.TypeCastExpression.class, JavaToKotlinConverterBasicTestGenerated.TypeParameters.class, JavaToKotlinConverterBasicTestGenerated.VarArg.class, JavaToKotlinConverterBasicTestGenerated.WhileStatement.class})
+public class JavaToKotlinConverterBasicTestGenerated extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInAst() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/annotations")
+ public static class Annotations extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInAnnotations() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/annotations"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("jetbrainsNotNull.jav")
+ public void testJetbrainsNotNull() throws Exception {
+ doTest("j2k/tests/testData/ast/annotations/jetbrainsNotNull.jav");
+ }
+
+ @TestMetadata("jetbrainsNotNullChainExpr.jav")
+ public void testJetbrainsNotNullChainExpr() throws Exception {
+ doTest("j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/anonymousBlock")
+ public static class AnonymousBlock extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInAnonymousBlock() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/anonymousBlock"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("oneAnonBlock.jav")
+ public void testOneAnonBlock() throws Exception {
+ doTest("j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.jav");
+ }
+
+ @TestMetadata("oneStaticAnonBlock.jav")
+ public void testOneStaticAnonBlock() throws Exception {
+ doTest("j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/arrayAccessExpression")
+ public static class ArrayAccessExpression extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInArrayAccessExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/arrayAccessExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("expressionIndex.jav")
+ public void testExpressionIndex() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayAccessExpression/expressionIndex.jav");
+ }
+
+ @TestMetadata("intIndex.jav")
+ public void testIntIndex() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayAccessExpression/intIndex.jav");
+ }
+
+ @TestMetadata("variableIndex.jav")
+ public void testVariableIndex() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayAccessExpression/variableIndex.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/arrayInitializerExpression")
+ public static class ArrayInitializerExpression extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInArrayInitializerExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/arrayInitializerExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("doubleArray.jav")
+ public void testDoubleArray() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.jav");
+ }
+
+ @TestMetadata("doubleArrayWithVariables.jav")
+ public void testDoubleArrayWithVariables() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.jav");
+ }
+
+ @TestMetadata("floatArray.jav")
+ public void testFloatArray() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayInitializerExpression/floatArray.jav");
+ }
+
+ @TestMetadata("intArrayWithLength.jav")
+ public void testIntArrayWithLength() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.jav");
+ }
+
+ @TestMetadata("javaLangDoubleArray.jav")
+ public void testJavaLangDoubleArray() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.jav");
+ }
+
+ @TestMetadata("javaLangFloatArray.jav")
+ public void testJavaLangFloatArray() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.jav");
+ }
+
+ @TestMetadata("newByte.jav")
+ public void testNewByte() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayInitializerExpression/newByte.jav");
+ }
+
+ @TestMetadata("newInt.jav")
+ public void testNewInt() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayInitializerExpression/newInt.jav");
+ }
+
+ @TestMetadata("objectArrayWithLength.jav")
+ public void testObjectArrayWithLength() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.jav");
+ }
+
+ @TestMetadata("oneDim.jav")
+ public void testOneDim() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayInitializerExpression/oneDim.jav");
+ }
+
+ @TestMetadata("oneDimWithVariables.jav")
+ public void testOneDimWithVariables() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.jav");
+ }
+
+ @TestMetadata("twoDim.jav")
+ public void testTwoDim() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayInitializerExpression/twoDim.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/arrayType")
+ public static class ArrayType extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInArrayType() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/arrayType"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("arrayInitializationStatement.jav")
+ public void testArrayInitializationStatement() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayType/arrayInitializationStatement.jav");
+ }
+
+ @TestMetadata("arrayInitializationStatementWithDimension.jav")
+ public void testArrayInitializationStatementWithDimension() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.jav");
+ }
+
+ @TestMetadata("arrayInitializationStatementWithDimension3d.jav")
+ public void testArrayInitializationStatementWithDimension3d() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.jav");
+ }
+
+ @TestMetadata("arrayInitializationStatementWithDimensionExplicit.jav")
+ public void testArrayInitializationStatementWithDimensionExplicit() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.jav");
+ }
+
+ @TestMetadata("d2StringEmptyArray.jav")
+ public void testD2StringEmptyArray() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayType/d2StringEmptyArray.jav");
+ }
+
+ @TestMetadata("d3StringEmptyArray.jav")
+ public void testD3StringEmptyArray() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayType/d3StringEmptyArray.jav");
+ }
+
+ @TestMetadata("longArray.jav")
+ public void testLongArray() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayType/longArray.jav");
+ }
+
+ @TestMetadata("methodArrayArgs.jav")
+ public void testMethodArrayArgs() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayType/methodArrayArgs.jav");
+ }
+
+ @TestMetadata("newIntArray.jav")
+ public void testNewIntArray() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayType/newIntArray.jav");
+ }
+
+ @TestMetadata("newStringArray.jav")
+ public void testNewStringArray() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayType/newStringArray.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/assertStatement")
+ public static class AssertStatement extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInAssertStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/assertStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("onlyCondition.jav")
+ public void testOnlyCondition() throws Exception {
+ doTest("j2k/tests/testData/ast/assertStatement/onlyCondition.jav");
+ }
+
+ @TestMetadata("onlyConditionWithBraces.jav")
+ public void testOnlyConditionWithBraces() throws Exception {
+ doTest("j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.jav");
+ }
+
+ @TestMetadata("withStringDetail.jav")
+ public void testWithStringDetail() throws Exception {
+ doTest("j2k/tests/testData/ast/assertStatement/withStringDetail.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/assignmentExpression")
+ public static class AssignmentExpression extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInAssignmentExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/assignmentExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("and.jav")
+ public void testAnd() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/and.jav");
+ }
+
+ @TestMetadata("assignment.jav")
+ public void testAssignment() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/assignment.jav");
+ }
+
+ @TestMetadata("divideAssign.jav")
+ public void testDivideAssign() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/divideAssign.jav");
+ }
+
+ @TestMetadata("minusAssign.jav")
+ public void testMinusAssign() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/minusAssign.jav");
+ }
+
+ @TestMetadata("multiplyAssign.jav")
+ public void testMultiplyAssign() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/multiplyAssign.jav");
+ }
+
+ @TestMetadata("nullability.jav")
+ public void testNullability() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/nullability.jav");
+ }
+
+ @TestMetadata("or.jav")
+ public void testOr() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/or.jav");
+ }
+
+ @TestMetadata("plusAssign.jav")
+ public void testPlusAssign() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/plusAssign.jav");
+ }
+
+ @TestMetadata("reminder.jav")
+ public void testReminder() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/reminder.jav");
+ }
+
+ @TestMetadata("shiftLeft.jav")
+ public void testShiftLeft() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/shiftLeft.jav");
+ }
+
+ @TestMetadata("shiftRight.jav")
+ public void testShiftRight() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/shiftRight.jav");
+ }
+
+ @TestMetadata("simpleAssignment.jav")
+ public void testSimpleAssignment() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/simpleAssignment.jav");
+ }
+
+ @TestMetadata("unsignedRightShift.jav")
+ public void testUnsignedRightShift() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/unsignedRightShift.jav");
+ }
+
+ @TestMetadata("xor.jav")
+ public void testXor() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/xor.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/binaryExpression")
+ public static class BinaryExpression extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInBinaryExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/binaryExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("and.jav")
+ public void testAnd() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/and.jav");
+ }
+
+ @TestMetadata("conditionalAnd.jav")
+ public void testConditionalAnd() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/conditionalAnd.jav");
+ }
+
+ @TestMetadata("conditionalOr.jav")
+ public void testConditionalOr() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/conditionalOr.jav");
+ }
+
+ @TestMetadata("divide.jav")
+ public void testDivide() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/divide.jav");
+ }
+
+ @TestMetadata("greaterThan.jav")
+ public void testGreaterThan() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/greaterThan.jav");
+ }
+
+ @TestMetadata("greaterThanEqual.jav")
+ public void testGreaterThanEqual() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/greaterThanEqual.jav");
+ }
+
+ @TestMetadata("lessThan.jav")
+ public void testLessThan() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/lessThan.jav");
+ }
+
+ @TestMetadata("lessThanEqual.jav")
+ public void testLessThanEqual() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/lessThanEqual.jav");
+ }
+
+ @TestMetadata("minus.jav")
+ public void testMinus() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/minus.jav");
+ }
+
+ @TestMetadata("multiply.jav")
+ public void testMultiply() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/multiply.jav");
+ }
+
+ @TestMetadata("or.jav")
+ public void testOr() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/or.jav");
+ }
+
+ @TestMetadata("plus.jav")
+ public void testPlus() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/plus.jav");
+ }
+
+ @TestMetadata("remainder.jav")
+ public void testRemainder() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/remainder.jav");
+ }
+
+ @TestMetadata("shiftLeft.jav")
+ public void testShiftLeft() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/shiftLeft.jav");
+ }
+
+ @TestMetadata("shiftRight.jav")
+ public void testShiftRight() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/shiftRight.jav");
+ }
+
+ @TestMetadata("unsignedRightShift.jav")
+ public void testUnsignedRightShift() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/unsignedRightShift.jav");
+ }
+
+ @TestMetadata("xor.jav")
+ public void testXor() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/xor.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/boxedType")
+ public static class BoxedType extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInBoxedType() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/boxedType"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("boolean.jav")
+ public void testBoolean() throws Exception {
+ doTest("j2k/tests/testData/ast/boxedType/boolean.jav");
+ }
+
+ @TestMetadata("Boxing.jav")
+ public void testBoxing() throws Exception {
+ doTest("j2k/tests/testData/ast/boxedType/Boxing.jav");
+ }
+
+ @TestMetadata("byte.jav")
+ public void testByte() throws Exception {
+ doTest("j2k/tests/testData/ast/boxedType/byte.jav");
+ }
+
+ @TestMetadata("character.jav")
+ public void testCharacter() throws Exception {
+ doTest("j2k/tests/testData/ast/boxedType/character.jav");
+ }
+
+ @TestMetadata("double.jav")
+ public void testDouble() throws Exception {
+ doTest("j2k/tests/testData/ast/boxedType/double.jav");
+ }
+
+ @TestMetadata("float.jav")
+ public void testFloat() throws Exception {
+ doTest("j2k/tests/testData/ast/boxedType/float.jav");
+ }
+
+ @TestMetadata("integer.jav")
+ public void testInteger() throws Exception {
+ doTest("j2k/tests/testData/ast/boxedType/integer.jav");
+ }
+
+ @TestMetadata("kt-671.jav")
+ public void testKt_671() throws Exception {
+ doTest("j2k/tests/testData/ast/boxedType/kt-671.jav");
+ }
+
+ @TestMetadata("long.jav")
+ public void testLong() throws Exception {
+ doTest("j2k/tests/testData/ast/boxedType/long.jav");
+ }
+
+ @TestMetadata("object.jav")
+ public void testObject() throws Exception {
+ doTest("j2k/tests/testData/ast/boxedType/object.jav");
+ }
+
+ @TestMetadata("short.jav")
+ public void testShort() throws Exception {
+ doTest("j2k/tests/testData/ast/boxedType/short.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/breakStatement")
+ public static class BreakStatement extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInBreakStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/breakStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("breakWithLabel.jav")
+ public void testBreakWithLabel() throws Exception {
+ doTest("j2k/tests/testData/ast/breakStatement/breakWithLabel.jav");
+ }
+
+ @TestMetadata("breakWithoutLabel.jav")
+ public void testBreakWithoutLabel() throws Exception {
+ doTest("j2k/tests/testData/ast/breakStatement/breakWithoutLabel.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/callChainExpression")
+ public static class CallChainExpression extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInCallChainExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/callChainExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("libraryFieldCall.jav")
+ public void testLibraryFieldCall() throws Exception {
+ doTest("j2k/tests/testData/ast/callChainExpression/libraryFieldCall.jav");
+ }
+
+ @TestMetadata("libraryMethodCall.jav")
+ public void testLibraryMethodCall() throws Exception {
+ doTest("j2k/tests/testData/ast/callChainExpression/libraryMethodCall.jav");
+ }
+
+ @TestMetadata("libraryMethodCallFromInstance.jav")
+ public void testLibraryMethodCallFromInstance() throws Exception {
+ doTest("j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.jav");
+ }
+
+ @TestMetadata("libraryStringFieldCall.jav")
+ public void testLibraryStringFieldCall() throws Exception {
+ doTest("j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.jav");
+ }
+
+ @TestMetadata("sout.jav")
+ public void testSout() throws Exception {
+ doTest("j2k/tests/testData/ast/callChainExpression/sout.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/class")
+ public static class Class extends AbstractJavaToKotlinConverterBasicTest {
+ @TestMetadata("abstractClass.jav")
+ public void testAbstractClass() throws Exception {
+ doTest("j2k/tests/testData/ast/class/abstractClass.jav");
+ }
+
+ @TestMetadata("abstractClassShape.jav")
+ public void testAbstractClassShape() throws Exception {
+ doTest("j2k/tests/testData/ast/class/abstractClassShape.jav");
+ }
+
+ public void testAllFilesPresentInClass() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/class"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("class.jav")
+ public void testClass() throws Exception {
+ doTest("j2k/tests/testData/ast/class/class.jav");
+ }
+
+ @TestMetadata("ClassShadowing.jav")
+ public void testClassShadowing() throws Exception {
+ doTest("j2k/tests/testData/ast/class/ClassShadowing.jav");
+ }
+
+ @TestMetadata("classWithEmptyMethods.jav")
+ public void testClassWithEmptyMethods() throws Exception {
+ doTest("j2k/tests/testData/ast/class/classWithEmptyMethods.jav");
+ }
+
+ @TestMetadata("classWithFields.jav")
+ public void testClassWithFields() throws Exception {
+ doTest("j2k/tests/testData/ast/class/classWithFields.jav");
+ }
+
+ @TestMetadata("classWithMultiplyFields.jav")
+ public void testClassWithMultiplyFields() throws Exception {
+ doTest("j2k/tests/testData/ast/class/classWithMultiplyFields.jav");
+ }
+
+ @TestMetadata("emptyClass.jav")
+ public void testEmptyClass() throws Exception {
+ doTest("j2k/tests/testData/ast/class/emptyClass.jav");
+ }
+
+ @TestMetadata("extendsOneClassAndImplementsOneInterface.jav")
+ public void testExtendsOneClassAndImplementsOneInterface() throws Exception {
+ doTest("j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.jav");
+ }
+
+ @TestMetadata("extendsOneClassAndImplementsSeveralInterfaces.jav")
+ public void testExtendsOneClassAndImplementsSeveralInterfaces() throws Exception {
+ doTest("j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.jav");
+ }
+
+ @TestMetadata("finalClass.jav")
+ public void testFinalClass() throws Exception {
+ doTest("j2k/tests/testData/ast/class/finalClass.jav");
+ }
+
+ @TestMetadata("genericClass.jav")
+ public void testGenericClass() throws Exception {
+ doTest("j2k/tests/testData/ast/class/genericClass.jav");
+ }
+
+ @TestMetadata("innerEmptyClass.jav")
+ public void testInnerEmptyClass() throws Exception {
+ doTest("j2k/tests/testData/ast/class/innerEmptyClass.jav");
+ }
+
+ @TestMetadata("innerStaticClass.jav")
+ public void testInnerStaticClass() throws Exception {
+ doTest("j2k/tests/testData/ast/class/innerStaticClass.jav");
+ }
+
+ @TestMetadata("internalClass.jav")
+ public void testInternalClass() throws Exception {
+ doTest("j2k/tests/testData/ast/class/internalClass.jav");
+ }
+
+ @TestMetadata("kt-639.jav")
+ public void testKt_639() throws Exception {
+ doTest("j2k/tests/testData/ast/class/kt-639.jav");
+ }
+
+ @TestMetadata("oneStaticFieldOneNonStatic.jav")
+ public void testOneStaticFieldOneNonStatic() throws Exception {
+ doTest("j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.jav");
+ }
+
+ @TestMetadata("oneStaticMethod.jav")
+ public void testOneStaticMethod() throws Exception {
+ doTest("j2k/tests/testData/ast/class/oneStaticMethod.jav");
+ }
+
+ @TestMetadata("oneStaticMethodOneNonStatic.jav")
+ public void testOneStaticMethodOneNonStatic() throws Exception {
+ doTest("j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.jav");
+ }
+
+ @TestMetadata("pivateClass.jav")
+ public void testPivateClass() throws Exception {
+ doTest("j2k/tests/testData/ast/class/pivateClass.jav");
+ }
+
+ @TestMetadata("privateInit.jav")
+ public void testPrivateInit() throws Exception {
+ doTest("j2k/tests/testData/ast/class/privateInit.jav");
+ }
+
+ @TestMetadata("protectedClass.jav")
+ public void testProtectedClass() throws Exception {
+ doTest("j2k/tests/testData/ast/class/protectedClass.jav");
+ }
+
+ @TestMetadata("publicClass.jav")
+ public void testPublicClass() throws Exception {
+ doTest("j2k/tests/testData/ast/class/publicClass.jav");
+ }
+
+ @TestMetadata("simpleInheritance.jav")
+ public void testSimpleInheritance() throws Exception {
+ doTest("j2k/tests/testData/ast/class/simpleInheritance.jav");
+ }
+
+ @TestMetadata("twoStaticMethod.jav")
+ public void testTwoStaticMethod() throws Exception {
+ doTest("j2k/tests/testData/ast/class/twoStaticMethod.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/classExpression")
+ public static class ClassExpression extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInClassExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/classExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("complexExample.jav")
+ public void testComplexExample() throws Exception {
+ doTest("j2k/tests/testData/ast/classExpression/complexExample.jav");
+ }
+
+ @TestMetadata("objectClass.jav")
+ public void testObjectClass() throws Exception {
+ doTest("j2k/tests/testData/ast/classExpression/objectClass.jav");
+ }
+
+ @TestMetadata("stringClass.jav")
+ public void testStringClass() throws Exception {
+ doTest("j2k/tests/testData/ast/classExpression/stringClass.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/conditionalExpression")
+ public static class ConditionalExpression extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInConditionalExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/conditionalExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("simpleConditionalExpression.jav")
+ public void testSimpleConditionalExpression() throws Exception {
+ doTest("j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/constructors")
+ public static class Constructors extends AbstractJavaToKotlinConverterBasicTest {
+ @TestMetadata("allCallsPrimary.jav")
+ public void testAllCallsPrimary() throws Exception {
+ doTest("j2k/tests/testData/ast/constructors/allCallsPrimary.jav");
+ }
+
+ @TestMetadata("allCallsPrimary2.jav")
+ public void testAllCallsPrimary2() throws Exception {
+ doTest("j2k/tests/testData/ast/constructors/allCallsPrimary2.jav");
+ }
+
+ public void testAllFilesPresentInConstructors() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/constructors"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("customerBuilder.jav")
+ public void testCustomerBuilder() throws Exception {
+ doTest("j2k/tests/testData/ast/constructors/customerBuilder.jav");
+ }
+
+ @TestMetadata("genericIdentifier.jav")
+ public void testGenericIdentifier() throws Exception {
+ doTest("j2k/tests/testData/ast/constructors/genericIdentifier.jav");
+ }
+
+ @TestMetadata("identifier.jav")
+ public void testIdentifier() throws Exception {
+ doTest("j2k/tests/testData/ast/constructors/identifier.jav");
+ }
+
+ @TestMetadata("withManyDefaultParams.jav")
+ public void testWithManyDefaultParams() throws Exception {
+ doTest("j2k/tests/testData/ast/constructors/withManyDefaultParams.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/continueStatement")
+ public static class ContinueStatement extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInContinueStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/continueStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("continueWithLabel.jav")
+ public void testContinueWithLabel() throws Exception {
+ doTest("j2k/tests/testData/ast/continueStatement/continueWithLabel.jav");
+ }
+
+ @TestMetadata("continueWithoutLabel.jav")
+ public void testContinueWithoutLabel() throws Exception {
+ doTest("j2k/tests/testData/ast/continueStatement/continueWithoutLabel.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/declarationStatement")
+ public static class DeclarationStatement extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInDeclarationStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/declarationStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("multiplyFinalIntDeclaration.jav")
+ public void testMultiplyFinalIntDeclaration() throws Exception {
+ doTest("j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.jav");
+ }
+
+ @TestMetadata("multiplyIntDeclaration.jav")
+ public void testMultiplyIntDeclaration() throws Exception {
+ doTest("j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.jav");
+ }
+
+ @TestMetadata("singleFinalIntDeclaration.jav")
+ public void testSingleFinalIntDeclaration() throws Exception {
+ doTest("j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.jav");
+ }
+
+ @TestMetadata("singleFinalStringDeclaration.jav")
+ public void testSingleFinalStringDeclaration() throws Exception {
+ doTest("j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.jav");
+ }
+
+ @TestMetadata("singleIntDeclaration.jav")
+ public void testSingleIntDeclaration() throws Exception {
+ doTest("j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.jav");
+ }
+
+ @TestMetadata("singleStringDeclaration.jav")
+ public void testSingleStringDeclaration() throws Exception {
+ doTest("j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/doWhileStatement")
+ public static class DoWhileStatement extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInDoWhileStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/doWhileStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("whileWithBlock.jav")
+ public void testWhileWithBlock() throws Exception {
+ doTest("j2k/tests/testData/ast/doWhileStatement/whileWithBlock.jav");
+ }
+
+ @TestMetadata("whileWithEmptyBlock.jav")
+ public void testWhileWithEmptyBlock() throws Exception {
+ doTest("j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.jav");
+ }
+
+ @TestMetadata("whileWithExpression.jav")
+ public void testWhileWithExpression() throws Exception {
+ doTest("j2k/tests/testData/ast/doWhileStatement/whileWithExpression.jav");
+ }
+
+ @TestMetadata("whileWithReturn.jav")
+ public void testWhileWithReturn() throws Exception {
+ doTest("j2k/tests/testData/ast/doWhileStatement/whileWithReturn.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/enum")
+ public static class Enum extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInEnum() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/enum"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("colorEnum.jav")
+ public void testColorEnum() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/colorEnum.jav");
+ }
+
+ @TestMetadata("emptyEnum.jav")
+ public void testEmptyEnum() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/emptyEnum.jav");
+ }
+
+ @TestMetadata("enumConstantIsNotNull.jav")
+ public void testEnumConstantIsNotNull() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/enumConstantIsNotNull.jav");
+ }
+
+ @TestMetadata("enumImplementsOneInterface.jav")
+ public void testEnumImplementsOneInterface() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/enumImplementsOneInterface.jav");
+ }
+
+ @TestMetadata("enumImplementsSeveralInterfaces.jav")
+ public void testEnumImplementsSeveralInterfaces() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.jav");
+ }
+
+ @TestMetadata("enumWithNameField.jav")
+ public void testEnumWithNameField() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/enumWithNameField.jav");
+ }
+
+ @TestMetadata("fieldsWithPrimaryPrivateConstructor.jav")
+ public void testFieldsWithPrimaryPrivateConstructor() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.jav");
+ }
+
+ @TestMetadata("internalEnum.jav")
+ public void testInternalEnum() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/internalEnum.jav");
+ }
+
+ @TestMetadata("overrideToString.jav")
+ public void testOverrideToString() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/overrideToString.jav");
+ }
+
+ @TestMetadata("primaryPrivateConstructor.jav")
+ public void testPrimaryPrivateConstructor() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/primaryPrivateConstructor.jav");
+ }
+
+ @TestMetadata("privateEnum.jav")
+ public void testPrivateEnum() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/privateEnum.jav");
+ }
+
+ @TestMetadata("protectedEnum.jav")
+ public void testProtectedEnum() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/protectedEnum.jav");
+ }
+
+ @TestMetadata("publicEnum.jav")
+ public void testPublicEnum() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/publicEnum.jav");
+ }
+
+ @TestMetadata("runnableImplementation.jav")
+ public void testRunnableImplementation() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/runnableImplementation.jav");
+ }
+
+ @TestMetadata("typeSafeEnum.jav")
+ public void testTypeSafeEnum() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/typeSafeEnum.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/field")
+ public static class Field extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInField() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/field"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("classChildExtendsBase.jav")
+ public void testClassChildExtendsBase() throws Exception {
+ doTest("j2k/tests/testData/ast/field/classChildExtendsBase.jav");
+ }
+
+ @TestMetadata("internalField.jav")
+ public void testInternalField() throws Exception {
+ doTest("j2k/tests/testData/ast/field/internalField.jav");
+ }
+
+ @TestMetadata("privateField.jav")
+ public void testPrivateField() throws Exception {
+ doTest("j2k/tests/testData/ast/field/privateField.jav");
+ }
+
+ @TestMetadata("protectedField.jav")
+ public void testProtectedField() throws Exception {
+ doTest("j2k/tests/testData/ast/field/protectedField.jav");
+ }
+
+ @TestMetadata("publicField.jav")
+ public void testPublicField() throws Exception {
+ doTest("j2k/tests/testData/ast/field/publicField.jav");
+ }
+
+ @TestMetadata("valWithInit.jav")
+ public void testValWithInit() throws Exception {
+ doTest("j2k/tests/testData/ast/field/valWithInit.jav");
+ }
+
+ @TestMetadata("varWithInit.jav")
+ public void testVarWithInit() throws Exception {
+ doTest("j2k/tests/testData/ast/field/varWithInit.jav");
+ }
+
+ @TestMetadata("varWithoutInit.jav")
+ public void testVarWithoutInit() throws Exception {
+ doTest("j2k/tests/testData/ast/field/varWithoutInit.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/for")
+ public static class For extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInFor() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/for"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("commonCaseForTest.jav")
+ public void testCommonCaseForTest() throws Exception {
+ doTest("j2k/tests/testData/ast/for/commonCaseForTest.jav");
+ }
+
+ @TestMetadata("forRangeWithLE.jav")
+ public void testForRangeWithLE() throws Exception {
+ doTest("j2k/tests/testData/ast/for/forRangeWithLE.jav");
+ }
+
+ @TestMetadata("forRangeWithLT.jav")
+ public void testForRangeWithLT() throws Exception {
+ doTest("j2k/tests/testData/ast/for/forRangeWithLT.jav");
+ }
+
+ @TestMetadata("forWithBlock.jav")
+ public void testForWithBlock() throws Exception {
+ doTest("j2k/tests/testData/ast/for/forWithBlock.jav");
+ }
+
+ @TestMetadata("forWithBlockAndDoubleUpdate.jav")
+ public void testForWithBlockAndDoubleUpdate() throws Exception {
+ doTest("j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.jav");
+ }
+
+ @TestMetadata("forWithEmptyBlock.jav")
+ public void testForWithEmptyBlock() throws Exception {
+ doTest("j2k/tests/testData/ast/for/forWithEmptyBlock.jav");
+ }
+
+ @TestMetadata("forWithExpression.jav")
+ public void testForWithExpression() throws Exception {
+ doTest("j2k/tests/testData/ast/for/forWithExpression.jav");
+ }
+
+ @TestMetadata("forWithNullCondition.jav")
+ public void testForWithNullCondition() throws Exception {
+ doTest("j2k/tests/testData/ast/for/forWithNullCondition.jav");
+ }
+
+ @TestMetadata("forWithNullInit.jav")
+ public void testForWithNullInit() throws Exception {
+ doTest("j2k/tests/testData/ast/for/forWithNullInit.jav");
+ }
+
+ @TestMetadata("forWithNullUpdate.jav")
+ public void testForWithNullUpdate() throws Exception {
+ doTest("j2k/tests/testData/ast/for/forWithNullUpdate.jav");
+ }
+
+ @TestMetadata("forWithReturn.jav")
+ public void testForWithReturn() throws Exception {
+ doTest("j2k/tests/testData/ast/for/forWithReturn.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/foreachStatement")
+ public static class ForeachStatement extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInForeachStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/foreachStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("enhancedForWithBlock.jav")
+ public void testEnhancedForWithBlock() throws Exception {
+ doTest("j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.jav");
+ }
+
+ @TestMetadata("enhancedForWithEmptyBlock.jav")
+ public void testEnhancedForWithEmptyBlock() throws Exception {
+ doTest("j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.jav");
+ }
+
+ @TestMetadata("enhancedForWithExpression.jav")
+ public void testEnhancedForWithExpression() throws Exception {
+ doTest("j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.jav");
+ }
+
+ @TestMetadata("enhancedForWithReturn.jav")
+ public void testEnhancedForWithReturn() throws Exception {
+ doTest("j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/function")
+ public static class Function extends AbstractJavaToKotlinConverterBasicTest {
+ @TestMetadata("abstractMethod.jav")
+ public void testAbstractMethod() throws Exception {
+ doTest("j2k/tests/testData/ast/function/abstractMethod.jav");
+ }
+
+ public void testAllFilesPresentInFunction() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/function"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("classGenericParam.jav")
+ public void testClassGenericParam() throws Exception {
+ doTest("j2k/tests/testData/ast/function/classGenericParam.jav");
+ }
+
+ @TestMetadata("emptyVoidMethod.jav")
+ public void testEmptyVoidMethod() throws Exception {
+ doTest("j2k/tests/testData/ast/function/emptyVoidMethod.jav");
+ }
+
+ @TestMetadata("extendsBaseWhichExtendsObject.jav")
+ public void testExtendsBaseWhichExtendsObject() throws Exception {
+ doTest("j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.jav");
+ }
+
+ @TestMetadata("final.jav")
+ public void testFinal() throws Exception {
+ doTest("j2k/tests/testData/ast/function/final.jav");
+ }
+
+ @TestMetadata("functionInFinalClass.jav")
+ public void testFunctionInFinalClass() throws Exception {
+ doTest("j2k/tests/testData/ast/function/functionInFinalClass.jav");
+ }
+
+ @TestMetadata("internal.jav")
+ public void testInternal() throws Exception {
+ doTest("j2k/tests/testData/ast/function/internal.jav");
+ }
+
+ @TestMetadata("main.jav")
+ public void testMain() throws Exception {
+ doTest("j2k/tests/testData/ast/function/main.jav");
+ }
+
+ @TestMetadata("methodClassType.jav")
+ public void testMethodClassType() throws Exception {
+ doTest("j2k/tests/testData/ast/function/methodClassType.jav");
+ }
+
+ @TestMetadata("methodPrimitiveType.jav")
+ public void testMethodPrimitiveType() throws Exception {
+ doTest("j2k/tests/testData/ast/function/methodPrimitiveType.jav");
+ }
+
+ @TestMetadata("methodPrimitiveType2.jav")
+ public void testMethodPrimitiveType2() throws Exception {
+ doTest("j2k/tests/testData/ast/function/methodPrimitiveType2.jav");
+ }
+
+ @TestMetadata("methodWithReturnStatement.jav")
+ public void testMethodWithReturnStatement() throws Exception {
+ doTest("j2k/tests/testData/ast/function/methodWithReturnStatement.jav");
+ }
+
+ @TestMetadata("open.jav")
+ public void testOpen() throws Exception {
+ doTest("j2k/tests/testData/ast/function/open.jav");
+ }
+
+ @TestMetadata("override.jav")
+ public void testOverride() throws Exception {
+ doTest("j2k/tests/testData/ast/function/override.jav");
+ }
+
+ @TestMetadata("overrideAndOpen.jav")
+ public void testOverrideAndOpen() throws Exception {
+ doTest("j2k/tests/testData/ast/function/overrideAndOpen.jav");
+ }
+
+ @TestMetadata("overrideObject.jav")
+ public void testOverrideObject() throws Exception {
+ doTest("j2k/tests/testData/ast/function/overrideObject.jav");
+ }
+
+ @TestMetadata("ownGenericParam.jav")
+ public void testOwnGenericParam() throws Exception {
+ doTest("j2k/tests/testData/ast/function/ownGenericParam.jav");
+ }
+
+ @TestMetadata("ownSeveralGenericParams.jav")
+ public void testOwnSeveralGenericParams() throws Exception {
+ doTest("j2k/tests/testData/ast/function/ownSeveralGenericParams.jav");
+ }
+
+ @TestMetadata("private.jav")
+ public void testPrivate() throws Exception {
+ doTest("j2k/tests/testData/ast/function/private.jav");
+ }
+
+ @TestMetadata("protected.jav")
+ public void testProtected() throws Exception {
+ doTest("j2k/tests/testData/ast/function/protected.jav");
+ }
+
+ @TestMetadata("public.jav")
+ public void testPublic() throws Exception {
+ doTest("j2k/tests/testData/ast/function/public.jav");
+ }
+
+ @TestMetadata("varVararg.jav")
+ public void testVarVararg() throws Exception {
+ doTest("j2k/tests/testData/ast/function/varVararg.jav");
+ }
+
+ @TestMetadata("writableParameter.jav")
+ public void testWritableParameter() throws Exception {
+ doTest("j2k/tests/testData/ast/function/writableParameter.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/identifier")
+ public static class Identifier extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInIdentifier() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/identifier"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("finalFieldReference.jav")
+ public void testFinalFieldReference() throws Exception {
+ doTest("j2k/tests/testData/ast/identifier/finalFieldReference.jav");
+ }
+
+ @TestMetadata("keywords.jav")
+ public void testKeywords() throws Exception {
+ doTest("j2k/tests/testData/ast/identifier/keywords.jav");
+ }
+
+ @TestMetadata("withDollar.jav")
+ public void testWithDollar() throws Exception {
+ doTest("j2k/tests/testData/ast/identifier/withDollar.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/ifStatement")
+ public static class IfStatement extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInIfStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/ifStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("ifStatementWithEmptyBlocks.jav")
+ public void testIfStatementWithEmptyBlocks() throws Exception {
+ doTest("j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.jav");
+ }
+
+ @TestMetadata("ifStatementWithMultilineBlocks.jav")
+ public void testIfStatementWithMultilineBlocks() throws Exception {
+ doTest("j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.jav");
+ }
+
+ @TestMetadata("ifStatementWithOneLineBlocks.jav")
+ public void testIfStatementWithOneLineBlocks() throws Exception {
+ doTest("j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.jav");
+ }
+
+ @TestMetadata("ifStatementWithoutElse.jav")
+ public void testIfStatementWithoutElse() throws Exception {
+ doTest("j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/importStatement")
+ public static class ImportStatement extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInImportStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/importStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("importWithKeywords.jav")
+ public void testImportWithKeywords() throws Exception {
+ doTest("j2k/tests/testData/ast/importStatement/importWithKeywords.jav");
+ }
+
+ @TestMetadata("importWithStar.jav")
+ public void testImportWithStar() throws Exception {
+ doTest("j2k/tests/testData/ast/importStatement/importWithStar.jav");
+ }
+
+ @TestMetadata("simpleImport.jav")
+ public void testSimpleImport() throws Exception {
+ doTest("j2k/tests/testData/ast/importStatement/simpleImport.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/inProjectionType")
+ public static class InProjectionType extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInInProjectionType() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/inProjectionType"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("methodParams.jav")
+ public void testMethodParams() throws Exception {
+ doTest("j2k/tests/testData/ast/inProjectionType/methodParams.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/inheritance")
+ public static class Inheritance extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInInheritance() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/inheritance"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("classOneExtendsBaseGeneric.jav")
+ public void testClassOneExtendsBaseGeneric() throws Exception {
+ doTest("j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.jav");
+ }
+
+ @TestMetadata("classOneExtendsBaseWithOneParam.jav")
+ public void testClassOneExtendsBaseWithOneParam() throws Exception {
+ doTest("j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.jav");
+ }
+
+ @TestMetadata("classOneExtendsBaseWithZeroParams.jav")
+ public void testClassOneExtendsBaseWithZeroParams() throws Exception {
+ doTest("j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.jav");
+ }
+
+ @TestMetadata("classOneExtendsBaseWithZeroParamsNonEmptyConstructor.jav")
+ public void testClassOneExtendsBaseWithZeroParamsNonEmptyConstructor() throws Exception {
+ doTest("j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/isOperator")
+ public static class IsOperator extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInIsOperator() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/isOperator"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("complicatedExpression.jav")
+ public void testComplicatedExpression() throws Exception {
+ doTest("j2k/tests/testData/ast/isOperator/complicatedExpression.jav");
+ }
+
+ @TestMetadata("simpleReference.jav")
+ public void testSimpleReference() throws Exception {
+ doTest("j2k/tests/testData/ast/isOperator/simpleReference.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/issues")
+ public static class Issues extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInIssues() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/issues"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("arrayLength.jav")
+ public void testArrayLength() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/arrayLength.jav");
+ }
+
+ @TestMetadata("comments.jav")
+ public void testComments() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/comments.jav");
+ }
+
+ @TestMetadata("kt-1016.jav")
+ public void testKt_1016() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-1016.jav");
+ }
+
+ @TestMetadata("kt-1048.jav")
+ public void testKt_1048() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-1048.jav");
+ }
+
+ @TestMetadata("kt-1074.jav")
+ public void testKt_1074() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-1074.jav");
+ }
+
+ @TestMetadata("kt-543.jav")
+ public void testKt_543() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-543.jav");
+ }
+
+ @TestMetadata("kt-543-boxed.jav")
+ public void testKt_543_boxed() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-543-boxed.jav");
+ }
+
+ @TestMetadata("kt-543-mixed.jav")
+ public void testKt_543_mixed() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-543-mixed.jav");
+ }
+
+ @TestMetadata("kt-638.jav")
+ public void testKt_638() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-638.jav");
+ }
+
+ @TestMetadata("kt-696.jav")
+ public void testKt_696() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-696.jav");
+ }
+
+ @TestMetadata("kt-792.jav")
+ public void testKt_792() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-792.jav");
+ }
+
+ @TestMetadata("kt-792-mixed.jav")
+ public void testKt_792_mixed() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-792-mixed.jav");
+ }
+
+ @TestMetadata("kt-794.jav")
+ public void testKt_794() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-794.jav");
+ }
+
+ @TestMetadata("kt-794-mixed.jav")
+ public void testKt_794_mixed() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-794-mixed.jav");
+ }
+
+ @TestMetadata("kt-809.jav")
+ public void testKt_809() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-809.jav");
+ }
+
+ @TestMetadata("kt-809-string.jav")
+ public void testKt_809_string() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-809-string.jav");
+ }
+
+ @TestMetadata("kt-820.jav")
+ public void testKt_820() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-820.jav");
+ }
+
+ @TestMetadata("kt-820-field.jav")
+ public void testKt_820_field() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-820-field.jav");
+ }
+
+ @TestMetadata("kt-820-string.jav")
+ public void testKt_820_string() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-820-string.jav");
+ }
+
+ @TestMetadata("kt-824.jav")
+ public void testKt_824() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-824.jav");
+ }
+
+ @TestMetadata("kt-824-isDir.jav")
+ public void testKt_824_isDir() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-824-isDir.jav");
+ }
+
+ @TestMetadata("kt-828.jav")
+ public void testKt_828() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-828.jav");
+ }
+
+ @TestMetadata("kt-836.jav")
+ public void testKt_836() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-836.jav");
+ }
+
+ @TestMetadata("kt-837.jav")
+ public void testKt_837() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-837.jav");
+ }
+
+ @TestMetadata("kt-852.jav")
+ public void testKt_852() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-852.jav");
+ }
+
+ @TestMetadata("kt-871.jav")
+ public void testKt_871() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-871.jav");
+ }
+
+ @TestMetadata("kt-879.jav")
+ public void testKt_879() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-879.jav");
+ }
+
+ @TestMetadata("kt-893.jav")
+ public void testKt_893() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-893.jav");
+ }
+
+ @TestMetadata("kt-963.jav")
+ public void testKt_963() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-963.jav");
+ }
+
+ @TestMetadata("qualifyStatic.jav")
+ public void testQualifyStatic() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/qualifyStatic.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/kotlinExclusion")
+ public static class KotlinExclusion extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInKotlinExclusion() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/kotlinExclusion"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("kt-656.jav")
+ public void testKt_656() throws Exception {
+ doTest("j2k/tests/testData/ast/kotlinExclusion/kt-656.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/labelStatement")
+ public static class LabelStatement extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInLabelStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/labelStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("complicatedExampleFromJavaTutorial.jav")
+ public void testComplicatedExampleFromJavaTutorial() throws Exception {
+ doTest("j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/list")
+ public static class List extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInList() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/list"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("ForEach.jav")
+ public void testForEach() throws Exception {
+ doTest("j2k/tests/testData/ast/list/ForEach.jav");
+ }
+
+ @TestMetadata("Lists.jav")
+ public void testLists() throws Exception {
+ doTest("j2k/tests/testData/ast/list/Lists.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/literalExpression")
+ public static class LiteralExpression extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInLiteralExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/literalExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("char.jav")
+ public void testChar() throws Exception {
+ doTest("j2k/tests/testData/ast/literalExpression/char.jav");
+ }
+
+ @TestMetadata("dollarInsideString.jav")
+ public void testDollarInsideString() throws Exception {
+ doTest("j2k/tests/testData/ast/literalExpression/dollarInsideString.jav");
+ }
+
+ @TestMetadata("endsWithDFL.jav")
+ public void testEndsWithDFL() throws Exception {
+ doTest("j2k/tests/testData/ast/literalExpression/endsWithDFL.jav");
+ }
+
+ @TestMetadata("hex.jav")
+ public void testHex() throws Exception {
+ doTest("j2k/tests/testData/ast/literalExpression/hex.jav");
+ }
+
+ @TestMetadata("octal.jav")
+ public void testOctal() throws Exception {
+ doTest("j2k/tests/testData/ast/literalExpression/octal.jav");
+ }
+
+ @TestMetadata("trueOrFalse.jav")
+ public void testTrueOrFalse() throws Exception {
+ doTest("j2k/tests/testData/ast/literalExpression/trueOrFalse.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/localVariable")
+ public static class LocalVariable extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInLocalVariable() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/localVariable"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("object.jav")
+ public void testObject() throws Exception {
+ doTest("j2k/tests/testData/ast/localVariable/object.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/methodCallExpression")
+ public static class MethodCallExpression extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInMethodCallExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/methodCallExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("callWithKeywords.jav")
+ public void testCallWithKeywords() throws Exception {
+ doTest("j2k/tests/testData/ast/methodCallExpression/callWithKeywords.jav");
+ }
+
+ @TestMetadata("emptyCall.jav")
+ public void testEmptyCall() throws Exception {
+ doTest("j2k/tests/testData/ast/methodCallExpression/emptyCall.jav");
+ }
+
+ @TestMetadata("genericMethod.jav")
+ public void testGenericMethod() throws Exception {
+ doTest("j2k/tests/testData/ast/methodCallExpression/genericMethod.jav");
+ }
+
+ @TestMetadata("simpleCall.jav")
+ public void testSimpleCall() throws Exception {
+ doTest("j2k/tests/testData/ast/methodCallExpression/simpleCall.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/misc")
+ @InnerTestClasses({})
+ public static class Misc extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInMisc() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/misc"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("intNullability.jav")
+ public void testIntNullability() throws Exception {
+ doTest("j2k/tests/testData/ast/misc/intNullability.jav");
+ }
+
+ @TestMetadata("packageWithClass.jav")
+ public void testPackageWithClass() throws Exception {
+ doTest("j2k/tests/testData/ast/misc/packageWithClass.jav");
+ }
+
+ @TestMetadata("packageWithClasses.jav")
+ public void testPackageWithClasses() throws Exception {
+ doTest("j2k/tests/testData/ast/misc/packageWithClasses.jav");
+ }
+
+ @TestMetadata("packageWithImports.jav")
+ public void testPackageWithImports() throws Exception {
+ doTest("j2k/tests/testData/ast/misc/packageWithImports.jav");
+ }
+
+ @TestMetadata("packageWithMixedImports.jav")
+ public void testPackageWithMixedImports() throws Exception {
+ doTest("j2k/tests/testData/ast/misc/packageWithMixedImports.jav");
+ }
+
+ @TestMetadata("packageWithOpenClass.jav")
+ public void testPackageWithOpenClass() throws Exception {
+ doTest("j2k/tests/testData/ast/misc/packageWithOpenClass.jav");
+ }
+
+ @TestMetadata("packageWithStaticImports.jav")
+ public void testPackageWithStaticImports() throws Exception {
+ doTest("j2k/tests/testData/ast/misc/packageWithStaticImports.jav");
+ }
+
+ public static Test innerSuite() {
+ TestSuite suite = new TestSuite("Misc");
+ suite.addTestSuite(Misc.class);
+ return suite;
+ }
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/newClassExpression")
+ public static class NewClassExpression extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInNewClassExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/newClassExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("classWithParam.jav")
+ public void testClassWithParam() throws Exception {
+ doTest("j2k/tests/testData/ast/newClassExpression/classWithParam.jav");
+ }
+
+ @TestMetadata("classWithParams.jav")
+ public void testClassWithParams() throws Exception {
+ doTest("j2k/tests/testData/ast/newClassExpression/classWithParams.jav");
+ }
+
+ @TestMetadata("classWithoutBody.jav")
+ public void testClassWithoutBody() throws Exception {
+ doTest("j2k/tests/testData/ast/newClassExpression/classWithoutBody.jav");
+ }
+
+ @TestMetadata("fullQualifiedName.jav")
+ public void testFullQualifiedName() throws Exception {
+ doTest("j2k/tests/testData/ast/newClassExpression/fullQualifiedName.jav");
+ }
+
+ @TestMetadata("fullQualifiedName2.jav")
+ public void testFullQualifiedName2() throws Exception {
+ doTest("j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.jav");
+ }
+
+ @TestMetadata("genericClassInvocation.jav")
+ public void testGenericClassInvocation() throws Exception {
+ doTest("j2k/tests/testData/ast/newClassExpression/genericClassInvocation.jav");
+ }
+
+ @TestMetadata("newClassByFullName.jav")
+ public void testNewClassByFullName() throws Exception {
+ doTest("j2k/tests/testData/ast/newClassExpression/newClassByFullName.jav");
+ }
+
+ @TestMetadata("newClassWithAnonymousScope.jav")
+ public void testNewClassWithAnonymousScope() throws Exception {
+ doTest("j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.jav");
+ }
+
+ @TestMetadata("newInnerClass.jav")
+ public void testNewInnerClass() throws Exception {
+ doTest("j2k/tests/testData/ast/newClassExpression/newInnerClass.jav");
+ }
+
+ @TestMetadata("newListAndNewMember.jav")
+ public void testNewListAndNewMember() throws Exception {
+ doTest("j2k/tests/testData/ast/newClassExpression/newListAndNewMember.jav");
+ }
+
+ @TestMetadata("newStaticInnerClass.jav")
+ public void testNewStaticInnerClass() throws Exception {
+ doTest("j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/objectLiteral")
+ public static class ObjectLiteral extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInObjectLiteral() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/objectLiteral"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("MyFrame.jav")
+ public void testMyFrame() throws Exception {
+ doTest("j2k/tests/testData/ast/objectLiteral/MyFrame.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/outProjectionType")
+ public static class OutProjectionType extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInOutProjectionType() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/outProjectionType"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("methodParams.jav")
+ public void testMethodParams() throws Exception {
+ doTest("j2k/tests/testData/ast/outProjectionType/methodParams.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/packageStatement")
+ public static class PackageStatement extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInPackageStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/packageStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("orgJetbrainsJetJ2kIn.jav")
+ public void testOrgJetbrainsJetJ2kIn() throws Exception {
+ doTest("j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/parenthesizedExpression")
+ public static class ParenthesizedExpression extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInParenthesizedExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/parenthesizedExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("parenthesized.jav")
+ public void testParenthesized() throws Exception {
+ doTest("j2k/tests/testData/ast/parenthesizedExpression/parenthesized.jav");
+ }
+
+ @TestMetadata("parenthesized2.jav")
+ public void testParenthesized2() throws Exception {
+ doTest("j2k/tests/testData/ast/parenthesizedExpression/parenthesized2.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/polyadicExpression")
+ public static class PolyadicExpression extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInPolyadicExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/polyadicExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("divide.jav")
+ public void testDivide() throws Exception {
+ doTest("j2k/tests/testData/ast/polyadicExpression/divide.jav");
+ }
+
+ @TestMetadata("minus.jav")
+ public void testMinus() throws Exception {
+ doTest("j2k/tests/testData/ast/polyadicExpression/minus.jav");
+ }
+
+ @TestMetadata("multiply.jav")
+ public void testMultiply() throws Exception {
+ doTest("j2k/tests/testData/ast/polyadicExpression/multiply.jav");
+ }
+
+ @TestMetadata("plus.jav")
+ public void testPlus() throws Exception {
+ doTest("j2k/tests/testData/ast/polyadicExpression/plus.jav");
+ }
+
+ @TestMetadata("remainder.jav")
+ public void testRemainder() throws Exception {
+ doTest("j2k/tests/testData/ast/polyadicExpression/remainder.jav");
+ }
+
+ @TestMetadata("unassignedShiftRight.jav")
+ public void testUnassignedShiftRight() throws Exception {
+ doTest("j2k/tests/testData/ast/polyadicExpression/unassignedShiftRight.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/postfixOperator")
+ public static class PostfixOperator extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInPostfixOperator() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/postfixOperator"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("decrement.jav")
+ public void testDecrement() throws Exception {
+ doTest("j2k/tests/testData/ast/postfixOperator/decrement.jav");
+ }
+
+ @TestMetadata("increment.jav")
+ public void testIncrement() throws Exception {
+ doTest("j2k/tests/testData/ast/postfixOperator/increment.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/prefixOperator")
+ public static class PrefixOperator extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInPrefixOperator() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/prefixOperator"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("decrement.jav")
+ public void testDecrement() throws Exception {
+ doTest("j2k/tests/testData/ast/prefixOperator/decrement.jav");
+ }
+
+ @TestMetadata("excl.jav")
+ public void testExcl() throws Exception {
+ doTest("j2k/tests/testData/ast/prefixOperator/excl.jav");
+ }
+
+ @TestMetadata("increment.jav")
+ public void testIncrement() throws Exception {
+ doTest("j2k/tests/testData/ast/prefixOperator/increment.jav");
+ }
+
+ @TestMetadata("kt-667.jav")
+ public void testKt_667() throws Exception {
+ doTest("j2k/tests/testData/ast/prefixOperator/kt-667.jav");
+ }
+
+ @TestMetadata("nullableIf.jav")
+ public void testNullableIf() throws Exception {
+ doTest("j2k/tests/testData/ast/prefixOperator/nullableIf.jav");
+ }
+
+ @TestMetadata("tilde.jav")
+ public void testTilde() throws Exception {
+ doTest("j2k/tests/testData/ast/prefixOperator/tilde.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/rawGenerics")
+ public static class RawGenerics extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInRawGenerics() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/rawGenerics"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("kt-540.jav")
+ public void testKt_540() throws Exception {
+ doTest("j2k/tests/testData/ast/rawGenerics/kt-540.jav");
+ }
+
+ @TestMetadata("kt-540-map.jav")
+ public void testKt_540_map() throws Exception {
+ doTest("j2k/tests/testData/ast/rawGenerics/kt-540-map.jav");
+ }
+
+ @TestMetadata("kt-540-rawGenericClass.jav")
+ public void testKt_540_rawGenericClass() throws Exception {
+ doTest("j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.jav");
+ }
+
+ @TestMetadata("rawGenericMethod.jav")
+ public void testRawGenericMethod() throws Exception {
+ doTest("j2k/tests/testData/ast/rawGenerics/rawGenericMethod.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/returnStatement")
+ public static class ReturnStatement extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInReturnStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/returnStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("returnChar.jav")
+ public void testReturnChar() throws Exception {
+ doTest("j2k/tests/testData/ast/returnStatement/returnChar.jav");
+ }
+
+ @TestMetadata("returnLiteral.jav")
+ public void testReturnLiteral() throws Exception {
+ doTest("j2k/tests/testData/ast/returnStatement/returnLiteral.jav");
+ }
+
+ @TestMetadata("returnNumber.jav")
+ public void testReturnNumber() throws Exception {
+ doTest("j2k/tests/testData/ast/returnStatement/returnNumber.jav");
+ }
+
+ @TestMetadata("returnString.jav")
+ public void testReturnString() throws Exception {
+ doTest("j2k/tests/testData/ast/returnStatement/returnString.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/starProjectionType")
+ public static class StarProjectionType extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInStarProjectionType() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/starProjectionType"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("methodParams.jav")
+ public void testMethodParams() throws Exception {
+ doTest("j2k/tests/testData/ast/starProjectionType/methodParams.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/superExpression")
+ public static class SuperExpression extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInSuperExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/superExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("classAdotSuperFoo.jav")
+ public void testClassAdotSuperFoo() throws Exception {
+ doTest("j2k/tests/testData/ast/superExpression/classAdotSuperFoo.jav");
+ }
+
+ @TestMetadata("classAextendsB.jav")
+ public void testClassAextendsB() throws Exception {
+ doTest("j2k/tests/testData/ast/superExpression/classAextendsB.jav");
+ }
+
+ @TestMetadata("superStatement.jav")
+ public void testSuperStatement() throws Exception {
+ doTest("j2k/tests/testData/ast/superExpression/superStatement.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/switch")
+ public static class Switch extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInSwitch() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/switch"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("comlicatedFallDown.jav")
+ public void testComlicatedFallDown() throws Exception {
+ doTest("j2k/tests/testData/ast/switch/comlicatedFallDown.jav");
+ }
+
+ @TestMetadata("emptySwitch.jav")
+ public void testEmptySwitch() throws Exception {
+ doTest("j2k/tests/testData/ast/switch/emptySwitch.jav");
+ }
+
+ @TestMetadata("fallDown.jav")
+ public void testFallDown() throws Exception {
+ doTest("j2k/tests/testData/ast/switch/fallDown.jav");
+ }
+
+ @TestMetadata("kt-539.jav")
+ public void testKt_539() throws Exception {
+ doTest("j2k/tests/testData/ast/switch/kt-539.jav");
+ }
+
+ @TestMetadata("nondefault.jav")
+ public void testNondefault() throws Exception {
+ doTest("j2k/tests/testData/ast/switch/nondefault.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/synchronizedStatement")
+ public static class SynchronizedStatement extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInSynchronizedStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/synchronizedStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("singleLineExample.jav")
+ public void testSingleLineExample() throws Exception {
+ doTest("j2k/tests/testData/ast/synchronizedStatement/singleLineExample.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/thisExpression")
+ public static class ThisExpression extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInThisExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/thisExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("classAdotThisFoo.jav")
+ public void testClassAdotThisFoo() throws Exception {
+ doTest("j2k/tests/testData/ast/thisExpression/classAdotThisFoo.jav");
+ }
+
+ @TestMetadata("thisStatement.jav")
+ public void testThisStatement() throws Exception {
+ doTest("j2k/tests/testData/ast/thisExpression/thisStatement.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/throwStatement")
+ public static class ThrowStatement extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInThrowStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/throwStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("simpleThrowStatement.jav")
+ public void testSimpleThrowStatement() throws Exception {
+ doTest("j2k/tests/testData/ast/throwStatement/simpleThrowStatement.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/trait")
+ public static class Trait extends AbstractJavaToKotlinConverterBasicTest {
+ @TestMetadata("abstactInterface.jav")
+ public void testAbstactInterface() throws Exception {
+ doTest("j2k/tests/testData/ast/trait/abstactInterface.jav");
+ }
+
+ public void testAllFilesPresentInTrait() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/trait"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("emptyInterface.jav")
+ public void testEmptyInterface() throws Exception {
+ doTest("j2k/tests/testData/ast/trait/emptyInterface.jav");
+ }
+
+ @TestMetadata("extendsOneClassAndImplementsSeveralInterfaces.jav")
+ public void testExtendsOneClassAndImplementsSeveralInterfaces() throws Exception {
+ doTest("j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.jav");
+ }
+
+ @TestMetadata("extendsOneInterface.jav")
+ public void testExtendsOneInterface() throws Exception {
+ doTest("j2k/tests/testData/ast/trait/extendsOneInterface.jav");
+ }
+
+ @TestMetadata("interfaceWithFields.jav")
+ public void testInterfaceWithFields() throws Exception {
+ doTest("j2k/tests/testData/ast/trait/interfaceWithFields.jav");
+ }
+
+ @TestMetadata("interfaceWithMethodDeclaration.jav")
+ public void testInterfaceWithMethodDeclaration() throws Exception {
+ doTest("j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.jav");
+ }
+
+ @TestMetadata("interfaceWithStaticFields.jav")
+ public void testInterfaceWithStaticFields() throws Exception {
+ doTest("j2k/tests/testData/ast/trait/interfaceWithStaticFields.jav");
+ }
+
+ @TestMetadata("internalInterface.jav")
+ public void testInternalInterface() throws Exception {
+ doTest("j2k/tests/testData/ast/trait/internalInterface.jav");
+ }
+
+ @TestMetadata("privateInterface.jav")
+ public void testPrivateInterface() throws Exception {
+ doTest("j2k/tests/testData/ast/trait/privateInterface.jav");
+ }
+
+ @TestMetadata("protectedInterface.jav")
+ public void testProtectedInterface() throws Exception {
+ doTest("j2k/tests/testData/ast/trait/protectedInterface.jav");
+ }
+
+ @TestMetadata("publicInterface.jav")
+ public void testPublicInterface() throws Exception {
+ doTest("j2k/tests/testData/ast/trait/publicInterface.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/tryStatement")
+ public static class TryStatement extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInTryStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/tryStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("commonCaseForTryStatement.jav")
+ public void testCommonCaseForTryStatement() throws Exception {
+ doTest("j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.jav");
+ }
+
+ @TestMetadata("emptyTryWithTwoCatchesWithEmptyFinally.jav")
+ public void testEmptyTryWithTwoCatchesWithEmptyFinally() throws Exception {
+ doTest("j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.jav");
+ }
+
+ @TestMetadata("emptyTryWithTwoCatchesWithFinally.jav")
+ public void testEmptyTryWithTwoCatchesWithFinally() throws Exception {
+ doTest("j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.jav");
+ }
+
+ @TestMetadata("emptyTryWithTwoCatchesWithoutFinally.jav")
+ public void testEmptyTryWithTwoCatchesWithoutFinally() throws Exception {
+ doTest("j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/typeCastExpression")
+ public static class TypeCastExpression extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInTypeCastExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/typeCastExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("extendsWildcardCast.jav")
+ public void testExtendsWildcardCast() throws Exception {
+ doTest("j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.jav");
+ }
+
+ @TestMetadata("fooCast.jav")
+ public void testFooCast() throws Exception {
+ doTest("j2k/tests/testData/ast/typeCastExpression/fooCast.jav");
+ }
+
+ @TestMetadata("intCast.jav")
+ public void testIntCast() throws Exception {
+ doTest("j2k/tests/testData/ast/typeCastExpression/intCast.jav");
+ }
+
+ @TestMetadata("primitiveType.jav")
+ public void testPrimitiveType() throws Exception {
+ doTest("j2k/tests/testData/ast/typeCastExpression/primitiveType.jav");
+ }
+
+ @TestMetadata("simpleGenericCast.jav")
+ public void testSimpleGenericCast() throws Exception {
+ doTest("j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.jav");
+ }
+
+ @TestMetadata("stringCast.jav")
+ public void testStringCast() throws Exception {
+ doTest("j2k/tests/testData/ast/typeCastExpression/stringCast.jav");
+ }
+
+ @TestMetadata("superWildcardCast.jav")
+ public void testSuperWildcardCast() throws Exception {
+ doTest("j2k/tests/testData/ast/typeCastExpression/superWildcardCast.jav");
+ }
+
+ @TestMetadata("wildcardCast.jav")
+ public void testWildcardCast() throws Exception {
+ doTest("j2k/tests/testData/ast/typeCastExpression/wildcardCast.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/typeParameters")
+ public static class TypeParameters extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInTypeParameters() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/typeParameters"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("classDoubleParametrizationWithTwoBoundsWithExtending.jav")
+ public void testClassDoubleParametrizationWithTwoBoundsWithExtending() throws Exception {
+ doTest("j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.jav");
+ }
+
+ @TestMetadata("classParametrizationWithTwoBounds.jav")
+ public void testClassParametrizationWithTwoBounds() throws Exception {
+ doTest("j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.jav");
+ }
+
+ @TestMetadata("classParametrizationWithTwoBoundsWithExtending.jav")
+ public void testClassParametrizationWithTwoBoundsWithExtending() throws Exception {
+ doTest("j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.jav");
+ }
+
+ @TestMetadata("complexExampleWithClassExtending.jav")
+ public void testComplexExampleWithClassExtending() throws Exception {
+ doTest("j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.jav");
+ }
+
+ @TestMetadata("complexExampleWithClassMultiplyExtending.jav")
+ public void testComplexExampleWithClassMultiplyExtending() throws Exception {
+ doTest("j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.jav");
+ }
+
+ @TestMetadata("genericClass.jav")
+ public void testGenericClass() throws Exception {
+ doTest("j2k/tests/testData/ast/typeParameters/genericClass.jav");
+ }
+
+ @TestMetadata("genericParam.jav")
+ public void testGenericParam() throws Exception {
+ doTest("j2k/tests/testData/ast/typeParameters/genericParam.jav");
+ }
+
+ @TestMetadata("manyGenericParams.jav")
+ public void testManyGenericParams() throws Exception {
+ doTest("j2k/tests/testData/ast/typeParameters/manyGenericParams.jav");
+ }
+
+ @TestMetadata("methodDoubleParametrizationWithTwoBounds.jav")
+ public void testMethodDoubleParametrizationWithTwoBounds() throws Exception {
+ doTest("j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.jav");
+ }
+
+ @TestMetadata("traitDoubleParametrizationWithTwoBoundsWithExtending.jav")
+ public void testTraitDoubleParametrizationWithTwoBoundsWithExtending() throws Exception {
+ doTest("j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.jav");
+ }
+
+ @TestMetadata("where.jav")
+ public void testWhere() throws Exception {
+ doTest("j2k/tests/testData/ast/typeParameters/where.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/varArg")
+ public static class VarArg extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInVarArg() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/varArg"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("ellipsisTypeSeveralParams.jav")
+ public void testEllipsisTypeSeveralParams() throws Exception {
+ doTest("j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.jav");
+ }
+
+ @TestMetadata("ellipsisTypeSingleParams.jav")
+ public void testEllipsisTypeSingleParams() throws Exception {
+ doTest("j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/whileStatement")
+ public static class WhileStatement extends AbstractJavaToKotlinConverterBasicTest {
+ public void testAllFilesPresentInWhileStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/whileStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("whileWithBlock.jav")
+ public void testWhileWithBlock() throws Exception {
+ doTest("j2k/tests/testData/ast/whileStatement/whileWithBlock.jav");
+ }
+
+ @TestMetadata("whileWithEmptyBlock.jav")
+ public void testWhileWithEmptyBlock() throws Exception {
+ doTest("j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.jav");
+ }
+
+ @TestMetadata("whileWithExpression.jav")
+ public void testWhileWithExpression() throws Exception {
+ doTest("j2k/tests/testData/ast/whileStatement/whileWithExpression.jav");
+ }
+
+ @TestMetadata("whileWithReturn.jav")
+ public void testWhileWithReturn() throws Exception {
+ doTest("j2k/tests/testData/ast/whileStatement/whileWithReturn.jav");
+ }
+
+ }
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("JavaToKotlinConverterBasicTestGenerated");
+ suite.addTestSuite(JavaToKotlinConverterBasicTestGenerated.class);
+ suite.addTestSuite(Annotations.class);
+ suite.addTestSuite(AnonymousBlock.class);
+ suite.addTestSuite(ArrayAccessExpression.class);
+ suite.addTestSuite(ArrayInitializerExpression.class);
+ suite.addTestSuite(ArrayType.class);
+ suite.addTestSuite(AssertStatement.class);
+ suite.addTestSuite(AssignmentExpression.class);
+ suite.addTestSuite(BinaryExpression.class);
+ suite.addTestSuite(BoxedType.class);
+ suite.addTestSuite(BreakStatement.class);
+ suite.addTestSuite(CallChainExpression.class);
+ suite.addTestSuite(Class.class);
+ suite.addTestSuite(ClassExpression.class);
+ suite.addTestSuite(ConditionalExpression.class);
+ suite.addTestSuite(Constructors.class);
+ suite.addTestSuite(ContinueStatement.class);
+ suite.addTestSuite(DeclarationStatement.class);
+ suite.addTestSuite(DoWhileStatement.class);
+ suite.addTestSuite(Enum.class);
+ suite.addTestSuite(Field.class);
+ suite.addTestSuite(For.class);
+ suite.addTestSuite(ForeachStatement.class);
+ suite.addTestSuite(Function.class);
+ suite.addTestSuite(Identifier.class);
+ suite.addTestSuite(IfStatement.class);
+ suite.addTestSuite(ImportStatement.class);
+ suite.addTestSuite(InProjectionType.class);
+ suite.addTestSuite(Inheritance.class);
+ suite.addTestSuite(IsOperator.class);
+ suite.addTestSuite(Issues.class);
+ suite.addTestSuite(KotlinExclusion.class);
+ suite.addTestSuite(LabelStatement.class);
+ suite.addTestSuite(List.class);
+ suite.addTestSuite(LiteralExpression.class);
+ suite.addTestSuite(LocalVariable.class);
+ suite.addTestSuite(MethodCallExpression.class);
+ suite.addTest(Misc.innerSuite());
+ suite.addTestSuite(NewClassExpression.class);
+ suite.addTestSuite(ObjectLiteral.class);
+ suite.addTestSuite(OutProjectionType.class);
+ suite.addTestSuite(PackageStatement.class);
+ suite.addTestSuite(ParenthesizedExpression.class);
+ suite.addTestSuite(PolyadicExpression.class);
+ suite.addTestSuite(PostfixOperator.class);
+ suite.addTestSuite(PrefixOperator.class);
+ suite.addTestSuite(RawGenerics.class);
+ suite.addTestSuite(ReturnStatement.class);
+ suite.addTestSuite(StarProjectionType.class);
+ suite.addTestSuite(SuperExpression.class);
+ suite.addTestSuite(Switch.class);
+ suite.addTestSuite(SynchronizedStatement.class);
+ suite.addTestSuite(ThisExpression.class);
+ suite.addTestSuite(ThrowStatement.class);
+ suite.addTestSuite(Trait.class);
+ suite.addTestSuite(TryStatement.class);
+ suite.addTestSuite(TypeCastExpression.class);
+ suite.addTestSuite(TypeParameters.class);
+ suite.addTestSuite(VarArg.class);
+ suite.addTestSuite(WhileStatement.class);
+ return suite;
+ }
+}
diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterPluginTestGenerated.java b/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterPluginTestGenerated.java
new file mode 100644
index 00000000000..745b81ce265
--- /dev/null
+++ b/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterPluginTestGenerated.java
@@ -0,0 +1,2327 @@
+/*
+ * Copyright 2010-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.j2k.test;
+
+import junit.framework.Assert;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import java.io.File;
+import java.util.regex.Pattern;
+import org.jetbrains.jet.JetTestUtils;
+import org.jetbrains.jet.test.InnerTestClasses;
+import org.jetbrains.jet.test.TestMetadata;
+
+import org.jetbrains.jet.j2k.test.AbstractJavaToKotlinConverterPluginTest;
+
+/** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
+@SuppressWarnings("all")
+@TestMetadata("j2k/tests/testData/ast")
+@InnerTestClasses({JavaToKotlinConverterPluginTestGenerated.Annotations.class, JavaToKotlinConverterPluginTestGenerated.AnonymousBlock.class, JavaToKotlinConverterPluginTestGenerated.ArrayAccessExpression.class, JavaToKotlinConverterPluginTestGenerated.ArrayInitializerExpression.class, JavaToKotlinConverterPluginTestGenerated.ArrayType.class, JavaToKotlinConverterPluginTestGenerated.AssertStatement.class, JavaToKotlinConverterPluginTestGenerated.AssignmentExpression.class, JavaToKotlinConverterPluginTestGenerated.BinaryExpression.class, JavaToKotlinConverterPluginTestGenerated.BoxedType.class, JavaToKotlinConverterPluginTestGenerated.BreakStatement.class, JavaToKotlinConverterPluginTestGenerated.CallChainExpression.class, JavaToKotlinConverterPluginTestGenerated.Class.class, JavaToKotlinConverterPluginTestGenerated.ClassExpression.class, JavaToKotlinConverterPluginTestGenerated.ConditionalExpression.class, JavaToKotlinConverterPluginTestGenerated.Constructors.class, JavaToKotlinConverterPluginTestGenerated.ContinueStatement.class, JavaToKotlinConverterPluginTestGenerated.DeclarationStatement.class, JavaToKotlinConverterPluginTestGenerated.DoWhileStatement.class, JavaToKotlinConverterPluginTestGenerated.Enum.class, JavaToKotlinConverterPluginTestGenerated.Field.class, JavaToKotlinConverterPluginTestGenerated.For.class, JavaToKotlinConverterPluginTestGenerated.ForeachStatement.class, JavaToKotlinConverterPluginTestGenerated.Function.class, JavaToKotlinConverterPluginTestGenerated.Identifier.class, JavaToKotlinConverterPluginTestGenerated.IfStatement.class, JavaToKotlinConverterPluginTestGenerated.ImportStatement.class, JavaToKotlinConverterPluginTestGenerated.InProjectionType.class, JavaToKotlinConverterPluginTestGenerated.Inheritance.class, JavaToKotlinConverterPluginTestGenerated.IsOperator.class, JavaToKotlinConverterPluginTestGenerated.Issues.class, JavaToKotlinConverterPluginTestGenerated.KotlinExclusion.class, JavaToKotlinConverterPluginTestGenerated.LabelStatement.class, JavaToKotlinConverterPluginTestGenerated.List.class, JavaToKotlinConverterPluginTestGenerated.LiteralExpression.class, JavaToKotlinConverterPluginTestGenerated.LocalVariable.class, JavaToKotlinConverterPluginTestGenerated.MethodCallExpression.class, JavaToKotlinConverterPluginTestGenerated.Misc.class, JavaToKotlinConverterPluginTestGenerated.NewClassExpression.class, JavaToKotlinConverterPluginTestGenerated.ObjectLiteral.class, JavaToKotlinConverterPluginTestGenerated.OutProjectionType.class, JavaToKotlinConverterPluginTestGenerated.PackageStatement.class, JavaToKotlinConverterPluginTestGenerated.ParenthesizedExpression.class, JavaToKotlinConverterPluginTestGenerated.PolyadicExpression.class, JavaToKotlinConverterPluginTestGenerated.PostfixOperator.class, JavaToKotlinConverterPluginTestGenerated.PrefixOperator.class, JavaToKotlinConverterPluginTestGenerated.RawGenerics.class, JavaToKotlinConverterPluginTestGenerated.ReturnStatement.class, JavaToKotlinConverterPluginTestGenerated.StarProjectionType.class, JavaToKotlinConverterPluginTestGenerated.SuperExpression.class, JavaToKotlinConverterPluginTestGenerated.Switch.class, JavaToKotlinConverterPluginTestGenerated.SynchronizedStatement.class, JavaToKotlinConverterPluginTestGenerated.ThisExpression.class, JavaToKotlinConverterPluginTestGenerated.ThrowStatement.class, JavaToKotlinConverterPluginTestGenerated.Trait.class, JavaToKotlinConverterPluginTestGenerated.TryStatement.class, JavaToKotlinConverterPluginTestGenerated.TypeCastExpression.class, JavaToKotlinConverterPluginTestGenerated.TypeParameters.class, JavaToKotlinConverterPluginTestGenerated.VarArg.class, JavaToKotlinConverterPluginTestGenerated.WhileStatement.class})
+public class JavaToKotlinConverterPluginTestGenerated extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInAst() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/annotations")
+ public static class Annotations extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInAnnotations() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/annotations"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("jetbrainsNotNull.jav")
+ public void testJetbrainsNotNull() throws Exception {
+ doTest("j2k/tests/testData/ast/annotations/jetbrainsNotNull.jav");
+ }
+
+ @TestMetadata("jetbrainsNotNullChainExpr.jav")
+ public void testJetbrainsNotNullChainExpr() throws Exception {
+ doTest("j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/anonymousBlock")
+ public static class AnonymousBlock extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInAnonymousBlock() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/anonymousBlock"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("oneAnonBlock.jav")
+ public void testOneAnonBlock() throws Exception {
+ doTest("j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.jav");
+ }
+
+ @TestMetadata("oneStaticAnonBlock.jav")
+ public void testOneStaticAnonBlock() throws Exception {
+ doTest("j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/arrayAccessExpression")
+ public static class ArrayAccessExpression extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInArrayAccessExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/arrayAccessExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("expressionIndex.jav")
+ public void testExpressionIndex() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayAccessExpression/expressionIndex.jav");
+ }
+
+ @TestMetadata("intIndex.jav")
+ public void testIntIndex() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayAccessExpression/intIndex.jav");
+ }
+
+ @TestMetadata("variableIndex.jav")
+ public void testVariableIndex() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayAccessExpression/variableIndex.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/arrayInitializerExpression")
+ public static class ArrayInitializerExpression extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInArrayInitializerExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/arrayInitializerExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("doubleArray.jav")
+ public void testDoubleArray() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.jav");
+ }
+
+ @TestMetadata("doubleArrayWithVariables.jav")
+ public void testDoubleArrayWithVariables() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.jav");
+ }
+
+ @TestMetadata("floatArray.jav")
+ public void testFloatArray() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayInitializerExpression/floatArray.jav");
+ }
+
+ @TestMetadata("intArrayWithLength.jav")
+ public void testIntArrayWithLength() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.jav");
+ }
+
+ @TestMetadata("javaLangDoubleArray.jav")
+ public void testJavaLangDoubleArray() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.jav");
+ }
+
+ @TestMetadata("javaLangFloatArray.jav")
+ public void testJavaLangFloatArray() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.jav");
+ }
+
+ @TestMetadata("newByte.jav")
+ public void testNewByte() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayInitializerExpression/newByte.jav");
+ }
+
+ @TestMetadata("newInt.jav")
+ public void testNewInt() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayInitializerExpression/newInt.jav");
+ }
+
+ @TestMetadata("objectArrayWithLength.jav")
+ public void testObjectArrayWithLength() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.jav");
+ }
+
+ @TestMetadata("oneDim.jav")
+ public void testOneDim() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayInitializerExpression/oneDim.jav");
+ }
+
+ @TestMetadata("oneDimWithVariables.jav")
+ public void testOneDimWithVariables() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.jav");
+ }
+
+ @TestMetadata("twoDim.jav")
+ public void testTwoDim() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayInitializerExpression/twoDim.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/arrayType")
+ public static class ArrayType extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInArrayType() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/arrayType"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("arrayInitializationStatement.jav")
+ public void testArrayInitializationStatement() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayType/arrayInitializationStatement.jav");
+ }
+
+ @TestMetadata("arrayInitializationStatementWithDimension.jav")
+ public void testArrayInitializationStatementWithDimension() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.jav");
+ }
+
+ @TestMetadata("arrayInitializationStatementWithDimension3d.jav")
+ public void testArrayInitializationStatementWithDimension3d() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.jav");
+ }
+
+ @TestMetadata("arrayInitializationStatementWithDimensionExplicit.jav")
+ public void testArrayInitializationStatementWithDimensionExplicit() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.jav");
+ }
+
+ @TestMetadata("d2StringEmptyArray.jav")
+ public void testD2StringEmptyArray() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayType/d2StringEmptyArray.jav");
+ }
+
+ @TestMetadata("d3StringEmptyArray.jav")
+ public void testD3StringEmptyArray() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayType/d3StringEmptyArray.jav");
+ }
+
+ @TestMetadata("longArray.jav")
+ public void testLongArray() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayType/longArray.jav");
+ }
+
+ @TestMetadata("methodArrayArgs.jav")
+ public void testMethodArrayArgs() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayType/methodArrayArgs.jav");
+ }
+
+ @TestMetadata("newIntArray.jav")
+ public void testNewIntArray() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayType/newIntArray.jav");
+ }
+
+ @TestMetadata("newStringArray.jav")
+ public void testNewStringArray() throws Exception {
+ doTest("j2k/tests/testData/ast/arrayType/newStringArray.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/assertStatement")
+ public static class AssertStatement extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInAssertStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/assertStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("onlyCondition.jav")
+ public void testOnlyCondition() throws Exception {
+ doTest("j2k/tests/testData/ast/assertStatement/onlyCondition.jav");
+ }
+
+ @TestMetadata("onlyConditionWithBraces.jav")
+ public void testOnlyConditionWithBraces() throws Exception {
+ doTest("j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.jav");
+ }
+
+ @TestMetadata("withStringDetail.jav")
+ public void testWithStringDetail() throws Exception {
+ doTest("j2k/tests/testData/ast/assertStatement/withStringDetail.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/assignmentExpression")
+ public static class AssignmentExpression extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInAssignmentExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/assignmentExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("and.jav")
+ public void testAnd() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/and.jav");
+ }
+
+ @TestMetadata("assignment.jav")
+ public void testAssignment() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/assignment.jav");
+ }
+
+ @TestMetadata("divideAssign.jav")
+ public void testDivideAssign() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/divideAssign.jav");
+ }
+
+ @TestMetadata("minusAssign.jav")
+ public void testMinusAssign() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/minusAssign.jav");
+ }
+
+ @TestMetadata("multiplyAssign.jav")
+ public void testMultiplyAssign() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/multiplyAssign.jav");
+ }
+
+ @TestMetadata("nullability.jav")
+ public void testNullability() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/nullability.jav");
+ }
+
+ @TestMetadata("or.jav")
+ public void testOr() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/or.jav");
+ }
+
+ @TestMetadata("plusAssign.jav")
+ public void testPlusAssign() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/plusAssign.jav");
+ }
+
+ @TestMetadata("reminder.jav")
+ public void testReminder() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/reminder.jav");
+ }
+
+ @TestMetadata("shiftLeft.jav")
+ public void testShiftLeft() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/shiftLeft.jav");
+ }
+
+ @TestMetadata("shiftRight.jav")
+ public void testShiftRight() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/shiftRight.jav");
+ }
+
+ @TestMetadata("simpleAssignment.jav")
+ public void testSimpleAssignment() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/simpleAssignment.jav");
+ }
+
+ @TestMetadata("unsignedRightShift.jav")
+ public void testUnsignedRightShift() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/unsignedRightShift.jav");
+ }
+
+ @TestMetadata("xor.jav")
+ public void testXor() throws Exception {
+ doTest("j2k/tests/testData/ast/assignmentExpression/xor.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/binaryExpression")
+ public static class BinaryExpression extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInBinaryExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/binaryExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("and.jav")
+ public void testAnd() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/and.jav");
+ }
+
+ @TestMetadata("conditionalAnd.jav")
+ public void testConditionalAnd() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/conditionalAnd.jav");
+ }
+
+ @TestMetadata("conditionalOr.jav")
+ public void testConditionalOr() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/conditionalOr.jav");
+ }
+
+ @TestMetadata("divide.jav")
+ public void testDivide() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/divide.jav");
+ }
+
+ @TestMetadata("greaterThan.jav")
+ public void testGreaterThan() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/greaterThan.jav");
+ }
+
+ @TestMetadata("greaterThanEqual.jav")
+ public void testGreaterThanEqual() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/greaterThanEqual.jav");
+ }
+
+ @TestMetadata("lessThan.jav")
+ public void testLessThan() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/lessThan.jav");
+ }
+
+ @TestMetadata("lessThanEqual.jav")
+ public void testLessThanEqual() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/lessThanEqual.jav");
+ }
+
+ @TestMetadata("minus.jav")
+ public void testMinus() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/minus.jav");
+ }
+
+ @TestMetadata("multiply.jav")
+ public void testMultiply() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/multiply.jav");
+ }
+
+ @TestMetadata("or.jav")
+ public void testOr() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/or.jav");
+ }
+
+ @TestMetadata("plus.jav")
+ public void testPlus() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/plus.jav");
+ }
+
+ @TestMetadata("remainder.jav")
+ public void testRemainder() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/remainder.jav");
+ }
+
+ @TestMetadata("shiftLeft.jav")
+ public void testShiftLeft() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/shiftLeft.jav");
+ }
+
+ @TestMetadata("shiftRight.jav")
+ public void testShiftRight() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/shiftRight.jav");
+ }
+
+ @TestMetadata("unsignedRightShift.jav")
+ public void testUnsignedRightShift() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/unsignedRightShift.jav");
+ }
+
+ @TestMetadata("xor.jav")
+ public void testXor() throws Exception {
+ doTest("j2k/tests/testData/ast/binaryExpression/xor.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/boxedType")
+ public static class BoxedType extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInBoxedType() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/boxedType"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("boolean.jav")
+ public void testBoolean() throws Exception {
+ doTest("j2k/tests/testData/ast/boxedType/boolean.jav");
+ }
+
+ @TestMetadata("Boxing.jav")
+ public void testBoxing() throws Exception {
+ doTest("j2k/tests/testData/ast/boxedType/Boxing.jav");
+ }
+
+ @TestMetadata("byte.jav")
+ public void testByte() throws Exception {
+ doTest("j2k/tests/testData/ast/boxedType/byte.jav");
+ }
+
+ @TestMetadata("character.jav")
+ public void testCharacter() throws Exception {
+ doTest("j2k/tests/testData/ast/boxedType/character.jav");
+ }
+
+ @TestMetadata("double.jav")
+ public void testDouble() throws Exception {
+ doTest("j2k/tests/testData/ast/boxedType/double.jav");
+ }
+
+ @TestMetadata("float.jav")
+ public void testFloat() throws Exception {
+ doTest("j2k/tests/testData/ast/boxedType/float.jav");
+ }
+
+ @TestMetadata("integer.jav")
+ public void testInteger() throws Exception {
+ doTest("j2k/tests/testData/ast/boxedType/integer.jav");
+ }
+
+ @TestMetadata("kt-671.jav")
+ public void testKt_671() throws Exception {
+ doTest("j2k/tests/testData/ast/boxedType/kt-671.jav");
+ }
+
+ @TestMetadata("long.jav")
+ public void testLong() throws Exception {
+ doTest("j2k/tests/testData/ast/boxedType/long.jav");
+ }
+
+ @TestMetadata("object.jav")
+ public void testObject() throws Exception {
+ doTest("j2k/tests/testData/ast/boxedType/object.jav");
+ }
+
+ @TestMetadata("short.jav")
+ public void testShort() throws Exception {
+ doTest("j2k/tests/testData/ast/boxedType/short.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/breakStatement")
+ public static class BreakStatement extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInBreakStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/breakStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("breakWithLabel.jav")
+ public void testBreakWithLabel() throws Exception {
+ doTest("j2k/tests/testData/ast/breakStatement/breakWithLabel.jav");
+ }
+
+ @TestMetadata("breakWithoutLabel.jav")
+ public void testBreakWithoutLabel() throws Exception {
+ doTest("j2k/tests/testData/ast/breakStatement/breakWithoutLabel.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/callChainExpression")
+ public static class CallChainExpression extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInCallChainExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/callChainExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("libraryFieldCall.jav")
+ public void testLibraryFieldCall() throws Exception {
+ doTest("j2k/tests/testData/ast/callChainExpression/libraryFieldCall.jav");
+ }
+
+ @TestMetadata("libraryMethodCall.jav")
+ public void testLibraryMethodCall() throws Exception {
+ doTest("j2k/tests/testData/ast/callChainExpression/libraryMethodCall.jav");
+ }
+
+ @TestMetadata("libraryMethodCallFromInstance.jav")
+ public void testLibraryMethodCallFromInstance() throws Exception {
+ doTest("j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.jav");
+ }
+
+ @TestMetadata("libraryStringFieldCall.jav")
+ public void testLibraryStringFieldCall() throws Exception {
+ doTest("j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.jav");
+ }
+
+ @TestMetadata("sout.jav")
+ public void testSout() throws Exception {
+ doTest("j2k/tests/testData/ast/callChainExpression/sout.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/class")
+ public static class Class extends AbstractJavaToKotlinConverterPluginTest {
+ @TestMetadata("abstractClass.jav")
+ public void testAbstractClass() throws Exception {
+ doTest("j2k/tests/testData/ast/class/abstractClass.jav");
+ }
+
+ @TestMetadata("abstractClassShape.jav")
+ public void testAbstractClassShape() throws Exception {
+ doTest("j2k/tests/testData/ast/class/abstractClassShape.jav");
+ }
+
+ public void testAllFilesPresentInClass() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/class"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("class.jav")
+ public void testClass() throws Exception {
+ doTest("j2k/tests/testData/ast/class/class.jav");
+ }
+
+ @TestMetadata("ClassShadowing.jav")
+ public void testClassShadowing() throws Exception {
+ doTest("j2k/tests/testData/ast/class/ClassShadowing.jav");
+ }
+
+ @TestMetadata("classWithEmptyMethods.jav")
+ public void testClassWithEmptyMethods() throws Exception {
+ doTest("j2k/tests/testData/ast/class/classWithEmptyMethods.jav");
+ }
+
+ @TestMetadata("classWithFields.jav")
+ public void testClassWithFields() throws Exception {
+ doTest("j2k/tests/testData/ast/class/classWithFields.jav");
+ }
+
+ @TestMetadata("classWithMultiplyFields.jav")
+ public void testClassWithMultiplyFields() throws Exception {
+ doTest("j2k/tests/testData/ast/class/classWithMultiplyFields.jav");
+ }
+
+ @TestMetadata("emptyClass.jav")
+ public void testEmptyClass() throws Exception {
+ doTest("j2k/tests/testData/ast/class/emptyClass.jav");
+ }
+
+ @TestMetadata("extendsOneClassAndImplementsOneInterface.jav")
+ public void testExtendsOneClassAndImplementsOneInterface() throws Exception {
+ doTest("j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.jav");
+ }
+
+ @TestMetadata("extendsOneClassAndImplementsSeveralInterfaces.jav")
+ public void testExtendsOneClassAndImplementsSeveralInterfaces() throws Exception {
+ doTest("j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.jav");
+ }
+
+ @TestMetadata("finalClass.jav")
+ public void testFinalClass() throws Exception {
+ doTest("j2k/tests/testData/ast/class/finalClass.jav");
+ }
+
+ @TestMetadata("genericClass.jav")
+ public void testGenericClass() throws Exception {
+ doTest("j2k/tests/testData/ast/class/genericClass.jav");
+ }
+
+ @TestMetadata("innerEmptyClass.jav")
+ public void testInnerEmptyClass() throws Exception {
+ doTest("j2k/tests/testData/ast/class/innerEmptyClass.jav");
+ }
+
+ @TestMetadata("innerStaticClass.jav")
+ public void testInnerStaticClass() throws Exception {
+ doTest("j2k/tests/testData/ast/class/innerStaticClass.jav");
+ }
+
+ @TestMetadata("internalClass.jav")
+ public void testInternalClass() throws Exception {
+ doTest("j2k/tests/testData/ast/class/internalClass.jav");
+ }
+
+ @TestMetadata("kt-639.jav")
+ public void testKt_639() throws Exception {
+ doTest("j2k/tests/testData/ast/class/kt-639.jav");
+ }
+
+ @TestMetadata("oneStaticFieldOneNonStatic.jav")
+ public void testOneStaticFieldOneNonStatic() throws Exception {
+ doTest("j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.jav");
+ }
+
+ @TestMetadata("oneStaticMethod.jav")
+ public void testOneStaticMethod() throws Exception {
+ doTest("j2k/tests/testData/ast/class/oneStaticMethod.jav");
+ }
+
+ @TestMetadata("oneStaticMethodOneNonStatic.jav")
+ public void testOneStaticMethodOneNonStatic() throws Exception {
+ doTest("j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.jav");
+ }
+
+ @TestMetadata("pivateClass.jav")
+ public void testPivateClass() throws Exception {
+ doTest("j2k/tests/testData/ast/class/pivateClass.jav");
+ }
+
+ @TestMetadata("privateInit.jav")
+ public void testPrivateInit() throws Exception {
+ doTest("j2k/tests/testData/ast/class/privateInit.jav");
+ }
+
+ @TestMetadata("protectedClass.jav")
+ public void testProtectedClass() throws Exception {
+ doTest("j2k/tests/testData/ast/class/protectedClass.jav");
+ }
+
+ @TestMetadata("publicClass.jav")
+ public void testPublicClass() throws Exception {
+ doTest("j2k/tests/testData/ast/class/publicClass.jav");
+ }
+
+ @TestMetadata("simpleInheritance.jav")
+ public void testSimpleInheritance() throws Exception {
+ doTest("j2k/tests/testData/ast/class/simpleInheritance.jav");
+ }
+
+ @TestMetadata("twoStaticMethod.jav")
+ public void testTwoStaticMethod() throws Exception {
+ doTest("j2k/tests/testData/ast/class/twoStaticMethod.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/classExpression")
+ public static class ClassExpression extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInClassExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/classExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("complexExample.jav")
+ public void testComplexExample() throws Exception {
+ doTest("j2k/tests/testData/ast/classExpression/complexExample.jav");
+ }
+
+ @TestMetadata("objectClass.jav")
+ public void testObjectClass() throws Exception {
+ doTest("j2k/tests/testData/ast/classExpression/objectClass.jav");
+ }
+
+ @TestMetadata("stringClass.jav")
+ public void testStringClass() throws Exception {
+ doTest("j2k/tests/testData/ast/classExpression/stringClass.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/conditionalExpression")
+ public static class ConditionalExpression extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInConditionalExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/conditionalExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("simpleConditionalExpression.jav")
+ public void testSimpleConditionalExpression() throws Exception {
+ doTest("j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/constructors")
+ public static class Constructors extends AbstractJavaToKotlinConverterPluginTest {
+ @TestMetadata("allCallsPrimary.jav")
+ public void testAllCallsPrimary() throws Exception {
+ doTest("j2k/tests/testData/ast/constructors/allCallsPrimary.jav");
+ }
+
+ @TestMetadata("allCallsPrimary2.jav")
+ public void testAllCallsPrimary2() throws Exception {
+ doTest("j2k/tests/testData/ast/constructors/allCallsPrimary2.jav");
+ }
+
+ public void testAllFilesPresentInConstructors() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/constructors"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("customerBuilder.jav")
+ public void testCustomerBuilder() throws Exception {
+ doTest("j2k/tests/testData/ast/constructors/customerBuilder.jav");
+ }
+
+ @TestMetadata("genericIdentifier.jav")
+ public void testGenericIdentifier() throws Exception {
+ doTest("j2k/tests/testData/ast/constructors/genericIdentifier.jav");
+ }
+
+ @TestMetadata("identifier.jav")
+ public void testIdentifier() throws Exception {
+ doTest("j2k/tests/testData/ast/constructors/identifier.jav");
+ }
+
+ @TestMetadata("withManyDefaultParams.jav")
+ public void testWithManyDefaultParams() throws Exception {
+ doTest("j2k/tests/testData/ast/constructors/withManyDefaultParams.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/continueStatement")
+ public static class ContinueStatement extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInContinueStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/continueStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("continueWithLabel.jav")
+ public void testContinueWithLabel() throws Exception {
+ doTest("j2k/tests/testData/ast/continueStatement/continueWithLabel.jav");
+ }
+
+ @TestMetadata("continueWithoutLabel.jav")
+ public void testContinueWithoutLabel() throws Exception {
+ doTest("j2k/tests/testData/ast/continueStatement/continueWithoutLabel.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/declarationStatement")
+ public static class DeclarationStatement extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInDeclarationStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/declarationStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("multiplyFinalIntDeclaration.jav")
+ public void testMultiplyFinalIntDeclaration() throws Exception {
+ doTest("j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.jav");
+ }
+
+ @TestMetadata("multiplyIntDeclaration.jav")
+ public void testMultiplyIntDeclaration() throws Exception {
+ doTest("j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.jav");
+ }
+
+ @TestMetadata("singleFinalIntDeclaration.jav")
+ public void testSingleFinalIntDeclaration() throws Exception {
+ doTest("j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.jav");
+ }
+
+ @TestMetadata("singleFinalStringDeclaration.jav")
+ public void testSingleFinalStringDeclaration() throws Exception {
+ doTest("j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.jav");
+ }
+
+ @TestMetadata("singleIntDeclaration.jav")
+ public void testSingleIntDeclaration() throws Exception {
+ doTest("j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.jav");
+ }
+
+ @TestMetadata("singleStringDeclaration.jav")
+ public void testSingleStringDeclaration() throws Exception {
+ doTest("j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/doWhileStatement")
+ public static class DoWhileStatement extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInDoWhileStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/doWhileStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("whileWithBlock.jav")
+ public void testWhileWithBlock() throws Exception {
+ doTest("j2k/tests/testData/ast/doWhileStatement/whileWithBlock.jav");
+ }
+
+ @TestMetadata("whileWithEmptyBlock.jav")
+ public void testWhileWithEmptyBlock() throws Exception {
+ doTest("j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.jav");
+ }
+
+ @TestMetadata("whileWithExpression.jav")
+ public void testWhileWithExpression() throws Exception {
+ doTest("j2k/tests/testData/ast/doWhileStatement/whileWithExpression.jav");
+ }
+
+ @TestMetadata("whileWithReturn.jav")
+ public void testWhileWithReturn() throws Exception {
+ doTest("j2k/tests/testData/ast/doWhileStatement/whileWithReturn.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/enum")
+ public static class Enum extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInEnum() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/enum"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("colorEnum.jav")
+ public void testColorEnum() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/colorEnum.jav");
+ }
+
+ @TestMetadata("emptyEnum.jav")
+ public void testEmptyEnum() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/emptyEnum.jav");
+ }
+
+ @TestMetadata("enumConstantIsNotNull.jav")
+ public void testEnumConstantIsNotNull() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/enumConstantIsNotNull.jav");
+ }
+
+ @TestMetadata("enumImplementsOneInterface.jav")
+ public void testEnumImplementsOneInterface() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/enumImplementsOneInterface.jav");
+ }
+
+ @TestMetadata("enumImplementsSeveralInterfaces.jav")
+ public void testEnumImplementsSeveralInterfaces() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.jav");
+ }
+
+ @TestMetadata("enumWithNameField.jav")
+ public void testEnumWithNameField() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/enumWithNameField.jav");
+ }
+
+ @TestMetadata("fieldsWithPrimaryPrivateConstructor.jav")
+ public void testFieldsWithPrimaryPrivateConstructor() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.jav");
+ }
+
+ @TestMetadata("internalEnum.jav")
+ public void testInternalEnum() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/internalEnum.jav");
+ }
+
+ @TestMetadata("overrideToString.jav")
+ public void testOverrideToString() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/overrideToString.jav");
+ }
+
+ @TestMetadata("primaryPrivateConstructor.jav")
+ public void testPrimaryPrivateConstructor() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/primaryPrivateConstructor.jav");
+ }
+
+ @TestMetadata("privateEnum.jav")
+ public void testPrivateEnum() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/privateEnum.jav");
+ }
+
+ @TestMetadata("protectedEnum.jav")
+ public void testProtectedEnum() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/protectedEnum.jav");
+ }
+
+ @TestMetadata("publicEnum.jav")
+ public void testPublicEnum() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/publicEnum.jav");
+ }
+
+ @TestMetadata("runnableImplementation.jav")
+ public void testRunnableImplementation() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/runnableImplementation.jav");
+ }
+
+ @TestMetadata("typeSafeEnum.jav")
+ public void testTypeSafeEnum() throws Exception {
+ doTest("j2k/tests/testData/ast/enum/typeSafeEnum.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/field")
+ public static class Field extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInField() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/field"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("classChildExtendsBase.jav")
+ public void testClassChildExtendsBase() throws Exception {
+ doTest("j2k/tests/testData/ast/field/classChildExtendsBase.jav");
+ }
+
+ @TestMetadata("internalField.jav")
+ public void testInternalField() throws Exception {
+ doTest("j2k/tests/testData/ast/field/internalField.jav");
+ }
+
+ @TestMetadata("privateField.jav")
+ public void testPrivateField() throws Exception {
+ doTest("j2k/tests/testData/ast/field/privateField.jav");
+ }
+
+ @TestMetadata("protectedField.jav")
+ public void testProtectedField() throws Exception {
+ doTest("j2k/tests/testData/ast/field/protectedField.jav");
+ }
+
+ @TestMetadata("publicField.jav")
+ public void testPublicField() throws Exception {
+ doTest("j2k/tests/testData/ast/field/publicField.jav");
+ }
+
+ @TestMetadata("valWithInit.jav")
+ public void testValWithInit() throws Exception {
+ doTest("j2k/tests/testData/ast/field/valWithInit.jav");
+ }
+
+ @TestMetadata("varWithInit.jav")
+ public void testVarWithInit() throws Exception {
+ doTest("j2k/tests/testData/ast/field/varWithInit.jav");
+ }
+
+ @TestMetadata("varWithoutInit.jav")
+ public void testVarWithoutInit() throws Exception {
+ doTest("j2k/tests/testData/ast/field/varWithoutInit.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/for")
+ public static class For extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInFor() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/for"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("commonCaseForTest.jav")
+ public void testCommonCaseForTest() throws Exception {
+ doTest("j2k/tests/testData/ast/for/commonCaseForTest.jav");
+ }
+
+ @TestMetadata("forRangeWithLE.jav")
+ public void testForRangeWithLE() throws Exception {
+ doTest("j2k/tests/testData/ast/for/forRangeWithLE.jav");
+ }
+
+ @TestMetadata("forRangeWithLT.jav")
+ public void testForRangeWithLT() throws Exception {
+ doTest("j2k/tests/testData/ast/for/forRangeWithLT.jav");
+ }
+
+ @TestMetadata("forWithBlock.jav")
+ public void testForWithBlock() throws Exception {
+ doTest("j2k/tests/testData/ast/for/forWithBlock.jav");
+ }
+
+ @TestMetadata("forWithBlockAndDoubleUpdate.jav")
+ public void testForWithBlockAndDoubleUpdate() throws Exception {
+ doTest("j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.jav");
+ }
+
+ @TestMetadata("forWithEmptyBlock.jav")
+ public void testForWithEmptyBlock() throws Exception {
+ doTest("j2k/tests/testData/ast/for/forWithEmptyBlock.jav");
+ }
+
+ @TestMetadata("forWithExpression.jav")
+ public void testForWithExpression() throws Exception {
+ doTest("j2k/tests/testData/ast/for/forWithExpression.jav");
+ }
+
+ @TestMetadata("forWithNullCondition.jav")
+ public void testForWithNullCondition() throws Exception {
+ doTest("j2k/tests/testData/ast/for/forWithNullCondition.jav");
+ }
+
+ @TestMetadata("forWithNullInit.jav")
+ public void testForWithNullInit() throws Exception {
+ doTest("j2k/tests/testData/ast/for/forWithNullInit.jav");
+ }
+
+ @TestMetadata("forWithNullUpdate.jav")
+ public void testForWithNullUpdate() throws Exception {
+ doTest("j2k/tests/testData/ast/for/forWithNullUpdate.jav");
+ }
+
+ @TestMetadata("forWithReturn.jav")
+ public void testForWithReturn() throws Exception {
+ doTest("j2k/tests/testData/ast/for/forWithReturn.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/foreachStatement")
+ public static class ForeachStatement extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInForeachStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/foreachStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("enhancedForWithBlock.jav")
+ public void testEnhancedForWithBlock() throws Exception {
+ doTest("j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.jav");
+ }
+
+ @TestMetadata("enhancedForWithEmptyBlock.jav")
+ public void testEnhancedForWithEmptyBlock() throws Exception {
+ doTest("j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.jav");
+ }
+
+ @TestMetadata("enhancedForWithExpression.jav")
+ public void testEnhancedForWithExpression() throws Exception {
+ doTest("j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.jav");
+ }
+
+ @TestMetadata("enhancedForWithReturn.jav")
+ public void testEnhancedForWithReturn() throws Exception {
+ doTest("j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/function")
+ public static class Function extends AbstractJavaToKotlinConverterPluginTest {
+ @TestMetadata("abstractMethod.jav")
+ public void testAbstractMethod() throws Exception {
+ doTest("j2k/tests/testData/ast/function/abstractMethod.jav");
+ }
+
+ public void testAllFilesPresentInFunction() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/function"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("classGenericParam.jav")
+ public void testClassGenericParam() throws Exception {
+ doTest("j2k/tests/testData/ast/function/classGenericParam.jav");
+ }
+
+ @TestMetadata("emptyVoidMethod.jav")
+ public void testEmptyVoidMethod() throws Exception {
+ doTest("j2k/tests/testData/ast/function/emptyVoidMethod.jav");
+ }
+
+ @TestMetadata("extendsBaseWhichExtendsObject.jav")
+ public void testExtendsBaseWhichExtendsObject() throws Exception {
+ doTest("j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.jav");
+ }
+
+ @TestMetadata("final.jav")
+ public void testFinal() throws Exception {
+ doTest("j2k/tests/testData/ast/function/final.jav");
+ }
+
+ @TestMetadata("functionInFinalClass.jav")
+ public void testFunctionInFinalClass() throws Exception {
+ doTest("j2k/tests/testData/ast/function/functionInFinalClass.jav");
+ }
+
+ @TestMetadata("internal.jav")
+ public void testInternal() throws Exception {
+ doTest("j2k/tests/testData/ast/function/internal.jav");
+ }
+
+ @TestMetadata("main.jav")
+ public void testMain() throws Exception {
+ doTest("j2k/tests/testData/ast/function/main.jav");
+ }
+
+ @TestMetadata("methodClassType.jav")
+ public void testMethodClassType() throws Exception {
+ doTest("j2k/tests/testData/ast/function/methodClassType.jav");
+ }
+
+ @TestMetadata("methodPrimitiveType.jav")
+ public void testMethodPrimitiveType() throws Exception {
+ doTest("j2k/tests/testData/ast/function/methodPrimitiveType.jav");
+ }
+
+ @TestMetadata("methodPrimitiveType2.jav")
+ public void testMethodPrimitiveType2() throws Exception {
+ doTest("j2k/tests/testData/ast/function/methodPrimitiveType2.jav");
+ }
+
+ @TestMetadata("methodWithReturnStatement.jav")
+ public void testMethodWithReturnStatement() throws Exception {
+ doTest("j2k/tests/testData/ast/function/methodWithReturnStatement.jav");
+ }
+
+ @TestMetadata("open.jav")
+ public void testOpen() throws Exception {
+ doTest("j2k/tests/testData/ast/function/open.jav");
+ }
+
+ @TestMetadata("override.jav")
+ public void testOverride() throws Exception {
+ doTest("j2k/tests/testData/ast/function/override.jav");
+ }
+
+ @TestMetadata("overrideAndOpen.jav")
+ public void testOverrideAndOpen() throws Exception {
+ doTest("j2k/tests/testData/ast/function/overrideAndOpen.jav");
+ }
+
+ @TestMetadata("overrideObject.jav")
+ public void testOverrideObject() throws Exception {
+ doTest("j2k/tests/testData/ast/function/overrideObject.jav");
+ }
+
+ @TestMetadata("ownGenericParam.jav")
+ public void testOwnGenericParam() throws Exception {
+ doTest("j2k/tests/testData/ast/function/ownGenericParam.jav");
+ }
+
+ @TestMetadata("ownSeveralGenericParams.jav")
+ public void testOwnSeveralGenericParams() throws Exception {
+ doTest("j2k/tests/testData/ast/function/ownSeveralGenericParams.jav");
+ }
+
+ @TestMetadata("private.jav")
+ public void testPrivate() throws Exception {
+ doTest("j2k/tests/testData/ast/function/private.jav");
+ }
+
+ @TestMetadata("protected.jav")
+ public void testProtected() throws Exception {
+ doTest("j2k/tests/testData/ast/function/protected.jav");
+ }
+
+ @TestMetadata("public.jav")
+ public void testPublic() throws Exception {
+ doTest("j2k/tests/testData/ast/function/public.jav");
+ }
+
+ @TestMetadata("varVararg.jav")
+ public void testVarVararg() throws Exception {
+ doTest("j2k/tests/testData/ast/function/varVararg.jav");
+ }
+
+ @TestMetadata("writableParameter.jav")
+ public void testWritableParameter() throws Exception {
+ doTest("j2k/tests/testData/ast/function/writableParameter.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/identifier")
+ public static class Identifier extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInIdentifier() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/identifier"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("finalFieldReference.jav")
+ public void testFinalFieldReference() throws Exception {
+ doTest("j2k/tests/testData/ast/identifier/finalFieldReference.jav");
+ }
+
+ @TestMetadata("keywords.jav")
+ public void testKeywords() throws Exception {
+ doTest("j2k/tests/testData/ast/identifier/keywords.jav");
+ }
+
+ @TestMetadata("withDollar.jav")
+ public void testWithDollar() throws Exception {
+ doTest("j2k/tests/testData/ast/identifier/withDollar.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/ifStatement")
+ public static class IfStatement extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInIfStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/ifStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("ifStatementWithEmptyBlocks.jav")
+ public void testIfStatementWithEmptyBlocks() throws Exception {
+ doTest("j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.jav");
+ }
+
+ @TestMetadata("ifStatementWithMultilineBlocks.jav")
+ public void testIfStatementWithMultilineBlocks() throws Exception {
+ doTest("j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.jav");
+ }
+
+ @TestMetadata("ifStatementWithOneLineBlocks.jav")
+ public void testIfStatementWithOneLineBlocks() throws Exception {
+ doTest("j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.jav");
+ }
+
+ @TestMetadata("ifStatementWithoutElse.jav")
+ public void testIfStatementWithoutElse() throws Exception {
+ doTest("j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/importStatement")
+ public static class ImportStatement extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInImportStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/importStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("importWithKeywords.jav")
+ public void testImportWithKeywords() throws Exception {
+ doTest("j2k/tests/testData/ast/importStatement/importWithKeywords.jav");
+ }
+
+ @TestMetadata("importWithStar.jav")
+ public void testImportWithStar() throws Exception {
+ doTest("j2k/tests/testData/ast/importStatement/importWithStar.jav");
+ }
+
+ @TestMetadata("simpleImport.jav")
+ public void testSimpleImport() throws Exception {
+ doTest("j2k/tests/testData/ast/importStatement/simpleImport.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/inProjectionType")
+ public static class InProjectionType extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInInProjectionType() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/inProjectionType"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("methodParams.jav")
+ public void testMethodParams() throws Exception {
+ doTest("j2k/tests/testData/ast/inProjectionType/methodParams.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/inheritance")
+ public static class Inheritance extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInInheritance() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/inheritance"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("classOneExtendsBaseGeneric.jav")
+ public void testClassOneExtendsBaseGeneric() throws Exception {
+ doTest("j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.jav");
+ }
+
+ @TestMetadata("classOneExtendsBaseWithOneParam.jav")
+ public void testClassOneExtendsBaseWithOneParam() throws Exception {
+ doTest("j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.jav");
+ }
+
+ @TestMetadata("classOneExtendsBaseWithZeroParams.jav")
+ public void testClassOneExtendsBaseWithZeroParams() throws Exception {
+ doTest("j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.jav");
+ }
+
+ @TestMetadata("classOneExtendsBaseWithZeroParamsNonEmptyConstructor.jav")
+ public void testClassOneExtendsBaseWithZeroParamsNonEmptyConstructor() throws Exception {
+ doTest("j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/isOperator")
+ public static class IsOperator extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInIsOperator() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/isOperator"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("complicatedExpression.jav")
+ public void testComplicatedExpression() throws Exception {
+ doTest("j2k/tests/testData/ast/isOperator/complicatedExpression.jav");
+ }
+
+ @TestMetadata("simpleReference.jav")
+ public void testSimpleReference() throws Exception {
+ doTest("j2k/tests/testData/ast/isOperator/simpleReference.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/issues")
+ public static class Issues extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInIssues() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/issues"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("arrayLength.jav")
+ public void testArrayLength() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/arrayLength.jav");
+ }
+
+ @TestMetadata("comments.jav")
+ public void testComments() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/comments.jav");
+ }
+
+ @TestMetadata("kt-1016.jav")
+ public void testKt_1016() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-1016.jav");
+ }
+
+ @TestMetadata("kt-1048.jav")
+ public void testKt_1048() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-1048.jav");
+ }
+
+ @TestMetadata("kt-1074.jav")
+ public void testKt_1074() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-1074.jav");
+ }
+
+ @TestMetadata("kt-543.jav")
+ public void testKt_543() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-543.jav");
+ }
+
+ @TestMetadata("kt-543-boxed.jav")
+ public void testKt_543_boxed() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-543-boxed.jav");
+ }
+
+ @TestMetadata("kt-543-mixed.jav")
+ public void testKt_543_mixed() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-543-mixed.jav");
+ }
+
+ @TestMetadata("kt-638.jav")
+ public void testKt_638() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-638.jav");
+ }
+
+ @TestMetadata("kt-696.jav")
+ public void testKt_696() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-696.jav");
+ }
+
+ @TestMetadata("kt-792.jav")
+ public void testKt_792() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-792.jav");
+ }
+
+ @TestMetadata("kt-792-mixed.jav")
+ public void testKt_792_mixed() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-792-mixed.jav");
+ }
+
+ @TestMetadata("kt-794.jav")
+ public void testKt_794() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-794.jav");
+ }
+
+ @TestMetadata("kt-794-mixed.jav")
+ public void testKt_794_mixed() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-794-mixed.jav");
+ }
+
+ @TestMetadata("kt-809.jav")
+ public void testKt_809() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-809.jav");
+ }
+
+ @TestMetadata("kt-809-string.jav")
+ public void testKt_809_string() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-809-string.jav");
+ }
+
+ @TestMetadata("kt-820.jav")
+ public void testKt_820() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-820.jav");
+ }
+
+ @TestMetadata("kt-820-field.jav")
+ public void testKt_820_field() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-820-field.jav");
+ }
+
+ @TestMetadata("kt-820-string.jav")
+ public void testKt_820_string() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-820-string.jav");
+ }
+
+ @TestMetadata("kt-824.jav")
+ public void testKt_824() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-824.jav");
+ }
+
+ @TestMetadata("kt-824-isDir.jav")
+ public void testKt_824_isDir() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-824-isDir.jav");
+ }
+
+ @TestMetadata("kt-828.jav")
+ public void testKt_828() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-828.jav");
+ }
+
+ @TestMetadata("kt-836.jav")
+ public void testKt_836() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-836.jav");
+ }
+
+ @TestMetadata("kt-837.jav")
+ public void testKt_837() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-837.jav");
+ }
+
+ @TestMetadata("kt-852.jav")
+ public void testKt_852() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-852.jav");
+ }
+
+ @TestMetadata("kt-871.jav")
+ public void testKt_871() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-871.jav");
+ }
+
+ @TestMetadata("kt-879.jav")
+ public void testKt_879() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-879.jav");
+ }
+
+ @TestMetadata("kt-893.jav")
+ public void testKt_893() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-893.jav");
+ }
+
+ @TestMetadata("kt-963.jav")
+ public void testKt_963() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/kt-963.jav");
+ }
+
+ @TestMetadata("qualifyStatic.jav")
+ public void testQualifyStatic() throws Exception {
+ doTest("j2k/tests/testData/ast/issues/qualifyStatic.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/kotlinExclusion")
+ public static class KotlinExclusion extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInKotlinExclusion() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/kotlinExclusion"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("kt-656.jav")
+ public void testKt_656() throws Exception {
+ doTest("j2k/tests/testData/ast/kotlinExclusion/kt-656.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/labelStatement")
+ public static class LabelStatement extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInLabelStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/labelStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("complicatedExampleFromJavaTutorial.jav")
+ public void testComplicatedExampleFromJavaTutorial() throws Exception {
+ doTest("j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/list")
+ public static class List extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInList() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/list"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("ForEach.jav")
+ public void testForEach() throws Exception {
+ doTest("j2k/tests/testData/ast/list/ForEach.jav");
+ }
+
+ @TestMetadata("Lists.jav")
+ public void testLists() throws Exception {
+ doTest("j2k/tests/testData/ast/list/Lists.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/literalExpression")
+ public static class LiteralExpression extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInLiteralExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/literalExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("char.jav")
+ public void testChar() throws Exception {
+ doTest("j2k/tests/testData/ast/literalExpression/char.jav");
+ }
+
+ @TestMetadata("dollarInsideString.jav")
+ public void testDollarInsideString() throws Exception {
+ doTest("j2k/tests/testData/ast/literalExpression/dollarInsideString.jav");
+ }
+
+ @TestMetadata("endsWithDFL.jav")
+ public void testEndsWithDFL() throws Exception {
+ doTest("j2k/tests/testData/ast/literalExpression/endsWithDFL.jav");
+ }
+
+ @TestMetadata("hex.jav")
+ public void testHex() throws Exception {
+ doTest("j2k/tests/testData/ast/literalExpression/hex.jav");
+ }
+
+ @TestMetadata("octal.jav")
+ public void testOctal() throws Exception {
+ doTest("j2k/tests/testData/ast/literalExpression/octal.jav");
+ }
+
+ @TestMetadata("trueOrFalse.jav")
+ public void testTrueOrFalse() throws Exception {
+ doTest("j2k/tests/testData/ast/literalExpression/trueOrFalse.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/localVariable")
+ public static class LocalVariable extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInLocalVariable() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/localVariable"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("object.jav")
+ public void testObject() throws Exception {
+ doTest("j2k/tests/testData/ast/localVariable/object.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/methodCallExpression")
+ public static class MethodCallExpression extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInMethodCallExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/methodCallExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("callWithKeywords.jav")
+ public void testCallWithKeywords() throws Exception {
+ doTest("j2k/tests/testData/ast/methodCallExpression/callWithKeywords.jav");
+ }
+
+ @TestMetadata("emptyCall.jav")
+ public void testEmptyCall() throws Exception {
+ doTest("j2k/tests/testData/ast/methodCallExpression/emptyCall.jav");
+ }
+
+ @TestMetadata("genericMethod.jav")
+ public void testGenericMethod() throws Exception {
+ doTest("j2k/tests/testData/ast/methodCallExpression/genericMethod.jav");
+ }
+
+ @TestMetadata("simpleCall.jav")
+ public void testSimpleCall() throws Exception {
+ doTest("j2k/tests/testData/ast/methodCallExpression/simpleCall.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/misc")
+ @InnerTestClasses({})
+ public static class Misc extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInMisc() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/misc"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("intNullability.jav")
+ public void testIntNullability() throws Exception {
+ doTest("j2k/tests/testData/ast/misc/intNullability.jav");
+ }
+
+ @TestMetadata("packageWithClass.jav")
+ public void testPackageWithClass() throws Exception {
+ doTest("j2k/tests/testData/ast/misc/packageWithClass.jav");
+ }
+
+ @TestMetadata("packageWithClasses.jav")
+ public void testPackageWithClasses() throws Exception {
+ doTest("j2k/tests/testData/ast/misc/packageWithClasses.jav");
+ }
+
+ @TestMetadata("packageWithImports.jav")
+ public void testPackageWithImports() throws Exception {
+ doTest("j2k/tests/testData/ast/misc/packageWithImports.jav");
+ }
+
+ @TestMetadata("packageWithMixedImports.jav")
+ public void testPackageWithMixedImports() throws Exception {
+ doTest("j2k/tests/testData/ast/misc/packageWithMixedImports.jav");
+ }
+
+ @TestMetadata("packageWithOpenClass.jav")
+ public void testPackageWithOpenClass() throws Exception {
+ doTest("j2k/tests/testData/ast/misc/packageWithOpenClass.jav");
+ }
+
+ @TestMetadata("packageWithStaticImports.jav")
+ public void testPackageWithStaticImports() throws Exception {
+ doTest("j2k/tests/testData/ast/misc/packageWithStaticImports.jav");
+ }
+
+ public static Test innerSuite() {
+ TestSuite suite = new TestSuite("Misc");
+ suite.addTestSuite(Misc.class);
+ return suite;
+ }
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/newClassExpression")
+ public static class NewClassExpression extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInNewClassExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/newClassExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("classWithParam.jav")
+ public void testClassWithParam() throws Exception {
+ doTest("j2k/tests/testData/ast/newClassExpression/classWithParam.jav");
+ }
+
+ @TestMetadata("classWithParams.jav")
+ public void testClassWithParams() throws Exception {
+ doTest("j2k/tests/testData/ast/newClassExpression/classWithParams.jav");
+ }
+
+ @TestMetadata("classWithoutBody.jav")
+ public void testClassWithoutBody() throws Exception {
+ doTest("j2k/tests/testData/ast/newClassExpression/classWithoutBody.jav");
+ }
+
+ @TestMetadata("fullQualifiedName.jav")
+ public void testFullQualifiedName() throws Exception {
+ doTest("j2k/tests/testData/ast/newClassExpression/fullQualifiedName.jav");
+ }
+
+ @TestMetadata("fullQualifiedName2.jav")
+ public void testFullQualifiedName2() throws Exception {
+ doTest("j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.jav");
+ }
+
+ @TestMetadata("genericClassInvocation.jav")
+ public void testGenericClassInvocation() throws Exception {
+ doTest("j2k/tests/testData/ast/newClassExpression/genericClassInvocation.jav");
+ }
+
+ @TestMetadata("newClassByFullName.jav")
+ public void testNewClassByFullName() throws Exception {
+ doTest("j2k/tests/testData/ast/newClassExpression/newClassByFullName.jav");
+ }
+
+ @TestMetadata("newClassWithAnonymousScope.jav")
+ public void testNewClassWithAnonymousScope() throws Exception {
+ doTest("j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.jav");
+ }
+
+ @TestMetadata("newInnerClass.jav")
+ public void testNewInnerClass() throws Exception {
+ doTest("j2k/tests/testData/ast/newClassExpression/newInnerClass.jav");
+ }
+
+ @TestMetadata("newListAndNewMember.jav")
+ public void testNewListAndNewMember() throws Exception {
+ doTest("j2k/tests/testData/ast/newClassExpression/newListAndNewMember.jav");
+ }
+
+ @TestMetadata("newStaticInnerClass.jav")
+ public void testNewStaticInnerClass() throws Exception {
+ doTest("j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/objectLiteral")
+ public static class ObjectLiteral extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInObjectLiteral() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/objectLiteral"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("MyFrame.jav")
+ public void testMyFrame() throws Exception {
+ doTest("j2k/tests/testData/ast/objectLiteral/MyFrame.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/outProjectionType")
+ public static class OutProjectionType extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInOutProjectionType() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/outProjectionType"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("methodParams.jav")
+ public void testMethodParams() throws Exception {
+ doTest("j2k/tests/testData/ast/outProjectionType/methodParams.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/packageStatement")
+ public static class PackageStatement extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInPackageStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/packageStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("orgJetbrainsJetJ2kIn.jav")
+ public void testOrgJetbrainsJetJ2kIn() throws Exception {
+ doTest("j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/parenthesizedExpression")
+ public static class ParenthesizedExpression extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInParenthesizedExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/parenthesizedExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("parenthesized.jav")
+ public void testParenthesized() throws Exception {
+ doTest("j2k/tests/testData/ast/parenthesizedExpression/parenthesized.jav");
+ }
+
+ @TestMetadata("parenthesized2.jav")
+ public void testParenthesized2() throws Exception {
+ doTest("j2k/tests/testData/ast/parenthesizedExpression/parenthesized2.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/polyadicExpression")
+ public static class PolyadicExpression extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInPolyadicExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/polyadicExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("divide.jav")
+ public void testDivide() throws Exception {
+ doTest("j2k/tests/testData/ast/polyadicExpression/divide.jav");
+ }
+
+ @TestMetadata("minus.jav")
+ public void testMinus() throws Exception {
+ doTest("j2k/tests/testData/ast/polyadicExpression/minus.jav");
+ }
+
+ @TestMetadata("multiply.jav")
+ public void testMultiply() throws Exception {
+ doTest("j2k/tests/testData/ast/polyadicExpression/multiply.jav");
+ }
+
+ @TestMetadata("plus.jav")
+ public void testPlus() throws Exception {
+ doTest("j2k/tests/testData/ast/polyadicExpression/plus.jav");
+ }
+
+ @TestMetadata("remainder.jav")
+ public void testRemainder() throws Exception {
+ doTest("j2k/tests/testData/ast/polyadicExpression/remainder.jav");
+ }
+
+ @TestMetadata("unassignedShiftRight.jav")
+ public void testUnassignedShiftRight() throws Exception {
+ doTest("j2k/tests/testData/ast/polyadicExpression/unassignedShiftRight.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/postfixOperator")
+ public static class PostfixOperator extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInPostfixOperator() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/postfixOperator"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("decrement.jav")
+ public void testDecrement() throws Exception {
+ doTest("j2k/tests/testData/ast/postfixOperator/decrement.jav");
+ }
+
+ @TestMetadata("increment.jav")
+ public void testIncrement() throws Exception {
+ doTest("j2k/tests/testData/ast/postfixOperator/increment.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/prefixOperator")
+ public static class PrefixOperator extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInPrefixOperator() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/prefixOperator"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("decrement.jav")
+ public void testDecrement() throws Exception {
+ doTest("j2k/tests/testData/ast/prefixOperator/decrement.jav");
+ }
+
+ @TestMetadata("excl.jav")
+ public void testExcl() throws Exception {
+ doTest("j2k/tests/testData/ast/prefixOperator/excl.jav");
+ }
+
+ @TestMetadata("increment.jav")
+ public void testIncrement() throws Exception {
+ doTest("j2k/tests/testData/ast/prefixOperator/increment.jav");
+ }
+
+ @TestMetadata("kt-667.jav")
+ public void testKt_667() throws Exception {
+ doTest("j2k/tests/testData/ast/prefixOperator/kt-667.jav");
+ }
+
+ @TestMetadata("nullableIf.jav")
+ public void testNullableIf() throws Exception {
+ doTest("j2k/tests/testData/ast/prefixOperator/nullableIf.jav");
+ }
+
+ @TestMetadata("tilde.jav")
+ public void testTilde() throws Exception {
+ doTest("j2k/tests/testData/ast/prefixOperator/tilde.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/rawGenerics")
+ public static class RawGenerics extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInRawGenerics() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/rawGenerics"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("kt-540.jav")
+ public void testKt_540() throws Exception {
+ doTest("j2k/tests/testData/ast/rawGenerics/kt-540.jav");
+ }
+
+ @TestMetadata("kt-540-map.jav")
+ public void testKt_540_map() throws Exception {
+ doTest("j2k/tests/testData/ast/rawGenerics/kt-540-map.jav");
+ }
+
+ @TestMetadata("kt-540-rawGenericClass.jav")
+ public void testKt_540_rawGenericClass() throws Exception {
+ doTest("j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.jav");
+ }
+
+ @TestMetadata("rawGenericMethod.jav")
+ public void testRawGenericMethod() throws Exception {
+ doTest("j2k/tests/testData/ast/rawGenerics/rawGenericMethod.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/returnStatement")
+ public static class ReturnStatement extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInReturnStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/returnStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("returnChar.jav")
+ public void testReturnChar() throws Exception {
+ doTest("j2k/tests/testData/ast/returnStatement/returnChar.jav");
+ }
+
+ @TestMetadata("returnLiteral.jav")
+ public void testReturnLiteral() throws Exception {
+ doTest("j2k/tests/testData/ast/returnStatement/returnLiteral.jav");
+ }
+
+ @TestMetadata("returnNumber.jav")
+ public void testReturnNumber() throws Exception {
+ doTest("j2k/tests/testData/ast/returnStatement/returnNumber.jav");
+ }
+
+ @TestMetadata("returnString.jav")
+ public void testReturnString() throws Exception {
+ doTest("j2k/tests/testData/ast/returnStatement/returnString.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/starProjectionType")
+ public static class StarProjectionType extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInStarProjectionType() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/starProjectionType"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("methodParams.jav")
+ public void testMethodParams() throws Exception {
+ doTest("j2k/tests/testData/ast/starProjectionType/methodParams.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/superExpression")
+ public static class SuperExpression extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInSuperExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/superExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("classAdotSuperFoo.jav")
+ public void testClassAdotSuperFoo() throws Exception {
+ doTest("j2k/tests/testData/ast/superExpression/classAdotSuperFoo.jav");
+ }
+
+ @TestMetadata("classAextendsB.jav")
+ public void testClassAextendsB() throws Exception {
+ doTest("j2k/tests/testData/ast/superExpression/classAextendsB.jav");
+ }
+
+ @TestMetadata("superStatement.jav")
+ public void testSuperStatement() throws Exception {
+ doTest("j2k/tests/testData/ast/superExpression/superStatement.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/switch")
+ public static class Switch extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInSwitch() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/switch"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("comlicatedFallDown.jav")
+ public void testComlicatedFallDown() throws Exception {
+ doTest("j2k/tests/testData/ast/switch/comlicatedFallDown.jav");
+ }
+
+ @TestMetadata("emptySwitch.jav")
+ public void testEmptySwitch() throws Exception {
+ doTest("j2k/tests/testData/ast/switch/emptySwitch.jav");
+ }
+
+ @TestMetadata("fallDown.jav")
+ public void testFallDown() throws Exception {
+ doTest("j2k/tests/testData/ast/switch/fallDown.jav");
+ }
+
+ @TestMetadata("kt-539.jav")
+ public void testKt_539() throws Exception {
+ doTest("j2k/tests/testData/ast/switch/kt-539.jav");
+ }
+
+ @TestMetadata("nondefault.jav")
+ public void testNondefault() throws Exception {
+ doTest("j2k/tests/testData/ast/switch/nondefault.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/synchronizedStatement")
+ public static class SynchronizedStatement extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInSynchronizedStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/synchronizedStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("singleLineExample.jav")
+ public void testSingleLineExample() throws Exception {
+ doTest("j2k/tests/testData/ast/synchronizedStatement/singleLineExample.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/thisExpression")
+ public static class ThisExpression extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInThisExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/thisExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("classAdotThisFoo.jav")
+ public void testClassAdotThisFoo() throws Exception {
+ doTest("j2k/tests/testData/ast/thisExpression/classAdotThisFoo.jav");
+ }
+
+ @TestMetadata("thisStatement.jav")
+ public void testThisStatement() throws Exception {
+ doTest("j2k/tests/testData/ast/thisExpression/thisStatement.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/throwStatement")
+ public static class ThrowStatement extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInThrowStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/throwStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("simpleThrowStatement.jav")
+ public void testSimpleThrowStatement() throws Exception {
+ doTest("j2k/tests/testData/ast/throwStatement/simpleThrowStatement.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/trait")
+ public static class Trait extends AbstractJavaToKotlinConverterPluginTest {
+ @TestMetadata("abstactInterface.jav")
+ public void testAbstactInterface() throws Exception {
+ doTest("j2k/tests/testData/ast/trait/abstactInterface.jav");
+ }
+
+ public void testAllFilesPresentInTrait() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/trait"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("emptyInterface.jav")
+ public void testEmptyInterface() throws Exception {
+ doTest("j2k/tests/testData/ast/trait/emptyInterface.jav");
+ }
+
+ @TestMetadata("extendsOneClassAndImplementsSeveralInterfaces.jav")
+ public void testExtendsOneClassAndImplementsSeveralInterfaces() throws Exception {
+ doTest("j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.jav");
+ }
+
+ @TestMetadata("extendsOneInterface.jav")
+ public void testExtendsOneInterface() throws Exception {
+ doTest("j2k/tests/testData/ast/trait/extendsOneInterface.jav");
+ }
+
+ @TestMetadata("interfaceWithFields.jav")
+ public void testInterfaceWithFields() throws Exception {
+ doTest("j2k/tests/testData/ast/trait/interfaceWithFields.jav");
+ }
+
+ @TestMetadata("interfaceWithMethodDeclaration.jav")
+ public void testInterfaceWithMethodDeclaration() throws Exception {
+ doTest("j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.jav");
+ }
+
+ @TestMetadata("interfaceWithStaticFields.jav")
+ public void testInterfaceWithStaticFields() throws Exception {
+ doTest("j2k/tests/testData/ast/trait/interfaceWithStaticFields.jav");
+ }
+
+ @TestMetadata("internalInterface.jav")
+ public void testInternalInterface() throws Exception {
+ doTest("j2k/tests/testData/ast/trait/internalInterface.jav");
+ }
+
+ @TestMetadata("privateInterface.jav")
+ public void testPrivateInterface() throws Exception {
+ doTest("j2k/tests/testData/ast/trait/privateInterface.jav");
+ }
+
+ @TestMetadata("protectedInterface.jav")
+ public void testProtectedInterface() throws Exception {
+ doTest("j2k/tests/testData/ast/trait/protectedInterface.jav");
+ }
+
+ @TestMetadata("publicInterface.jav")
+ public void testPublicInterface() throws Exception {
+ doTest("j2k/tests/testData/ast/trait/publicInterface.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/tryStatement")
+ public static class TryStatement extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInTryStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/tryStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("commonCaseForTryStatement.jav")
+ public void testCommonCaseForTryStatement() throws Exception {
+ doTest("j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.jav");
+ }
+
+ @TestMetadata("emptyTryWithTwoCatchesWithEmptyFinally.jav")
+ public void testEmptyTryWithTwoCatchesWithEmptyFinally() throws Exception {
+ doTest("j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.jav");
+ }
+
+ @TestMetadata("emptyTryWithTwoCatchesWithFinally.jav")
+ public void testEmptyTryWithTwoCatchesWithFinally() throws Exception {
+ doTest("j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.jav");
+ }
+
+ @TestMetadata("emptyTryWithTwoCatchesWithoutFinally.jav")
+ public void testEmptyTryWithTwoCatchesWithoutFinally() throws Exception {
+ doTest("j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/typeCastExpression")
+ public static class TypeCastExpression extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInTypeCastExpression() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/typeCastExpression"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("extendsWildcardCast.jav")
+ public void testExtendsWildcardCast() throws Exception {
+ doTest("j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.jav");
+ }
+
+ @TestMetadata("fooCast.jav")
+ public void testFooCast() throws Exception {
+ doTest("j2k/tests/testData/ast/typeCastExpression/fooCast.jav");
+ }
+
+ @TestMetadata("intCast.jav")
+ public void testIntCast() throws Exception {
+ doTest("j2k/tests/testData/ast/typeCastExpression/intCast.jav");
+ }
+
+ @TestMetadata("primitiveType.jav")
+ public void testPrimitiveType() throws Exception {
+ doTest("j2k/tests/testData/ast/typeCastExpression/primitiveType.jav");
+ }
+
+ @TestMetadata("simpleGenericCast.jav")
+ public void testSimpleGenericCast() throws Exception {
+ doTest("j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.jav");
+ }
+
+ @TestMetadata("stringCast.jav")
+ public void testStringCast() throws Exception {
+ doTest("j2k/tests/testData/ast/typeCastExpression/stringCast.jav");
+ }
+
+ @TestMetadata("superWildcardCast.jav")
+ public void testSuperWildcardCast() throws Exception {
+ doTest("j2k/tests/testData/ast/typeCastExpression/superWildcardCast.jav");
+ }
+
+ @TestMetadata("wildcardCast.jav")
+ public void testWildcardCast() throws Exception {
+ doTest("j2k/tests/testData/ast/typeCastExpression/wildcardCast.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/typeParameters")
+ public static class TypeParameters extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInTypeParameters() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/typeParameters"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("classDoubleParametrizationWithTwoBoundsWithExtending.jav")
+ public void testClassDoubleParametrizationWithTwoBoundsWithExtending() throws Exception {
+ doTest("j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.jav");
+ }
+
+ @TestMetadata("classParametrizationWithTwoBounds.jav")
+ public void testClassParametrizationWithTwoBounds() throws Exception {
+ doTest("j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.jav");
+ }
+
+ @TestMetadata("classParametrizationWithTwoBoundsWithExtending.jav")
+ public void testClassParametrizationWithTwoBoundsWithExtending() throws Exception {
+ doTest("j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.jav");
+ }
+
+ @TestMetadata("complexExampleWithClassExtending.jav")
+ public void testComplexExampleWithClassExtending() throws Exception {
+ doTest("j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.jav");
+ }
+
+ @TestMetadata("complexExampleWithClassMultiplyExtending.jav")
+ public void testComplexExampleWithClassMultiplyExtending() throws Exception {
+ doTest("j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.jav");
+ }
+
+ @TestMetadata("genericClass.jav")
+ public void testGenericClass() throws Exception {
+ doTest("j2k/tests/testData/ast/typeParameters/genericClass.jav");
+ }
+
+ @TestMetadata("genericParam.jav")
+ public void testGenericParam() throws Exception {
+ doTest("j2k/tests/testData/ast/typeParameters/genericParam.jav");
+ }
+
+ @TestMetadata("manyGenericParams.jav")
+ public void testManyGenericParams() throws Exception {
+ doTest("j2k/tests/testData/ast/typeParameters/manyGenericParams.jav");
+ }
+
+ @TestMetadata("methodDoubleParametrizationWithTwoBounds.jav")
+ public void testMethodDoubleParametrizationWithTwoBounds() throws Exception {
+ doTest("j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.jav");
+ }
+
+ @TestMetadata("traitDoubleParametrizationWithTwoBoundsWithExtending.jav")
+ public void testTraitDoubleParametrizationWithTwoBoundsWithExtending() throws Exception {
+ doTest("j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.jav");
+ }
+
+ @TestMetadata("where.jav")
+ public void testWhere() throws Exception {
+ doTest("j2k/tests/testData/ast/typeParameters/where.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/varArg")
+ public static class VarArg extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInVarArg() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/varArg"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("ellipsisTypeSeveralParams.jav")
+ public void testEllipsisTypeSeveralParams() throws Exception {
+ doTest("j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.jav");
+ }
+
+ @TestMetadata("ellipsisTypeSingleParams.jav")
+ public void testEllipsisTypeSingleParams() throws Exception {
+ doTest("j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.jav");
+ }
+
+ }
+
+ @TestMetadata("j2k/tests/testData/ast/whileStatement")
+ public static class WhileStatement extends AbstractJavaToKotlinConverterPluginTest {
+ public void testAllFilesPresentInWhileStatement() throws Exception {
+ JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/whileStatement"), Pattern.compile("^(.+)\\.jav$"), true);
+ }
+
+ @TestMetadata("whileWithBlock.jav")
+ public void testWhileWithBlock() throws Exception {
+ doTest("j2k/tests/testData/ast/whileStatement/whileWithBlock.jav");
+ }
+
+ @TestMetadata("whileWithEmptyBlock.jav")
+ public void testWhileWithEmptyBlock() throws Exception {
+ doTest("j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.jav");
+ }
+
+ @TestMetadata("whileWithExpression.jav")
+ public void testWhileWithExpression() throws Exception {
+ doTest("j2k/tests/testData/ast/whileStatement/whileWithExpression.jav");
+ }
+
+ @TestMetadata("whileWithReturn.jav")
+ public void testWhileWithReturn() throws Exception {
+ doTest("j2k/tests/testData/ast/whileStatement/whileWithReturn.jav");
+ }
+
+ }
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("JavaToKotlinConverterPluginTestGenerated");
+ suite.addTestSuite(JavaToKotlinConverterPluginTestGenerated.class);
+ suite.addTestSuite(Annotations.class);
+ suite.addTestSuite(AnonymousBlock.class);
+ suite.addTestSuite(ArrayAccessExpression.class);
+ suite.addTestSuite(ArrayInitializerExpression.class);
+ suite.addTestSuite(ArrayType.class);
+ suite.addTestSuite(AssertStatement.class);
+ suite.addTestSuite(AssignmentExpression.class);
+ suite.addTestSuite(BinaryExpression.class);
+ suite.addTestSuite(BoxedType.class);
+ suite.addTestSuite(BreakStatement.class);
+ suite.addTestSuite(CallChainExpression.class);
+ suite.addTestSuite(Class.class);
+ suite.addTestSuite(ClassExpression.class);
+ suite.addTestSuite(ConditionalExpression.class);
+ suite.addTestSuite(Constructors.class);
+ suite.addTestSuite(ContinueStatement.class);
+ suite.addTestSuite(DeclarationStatement.class);
+ suite.addTestSuite(DoWhileStatement.class);
+ suite.addTestSuite(Enum.class);
+ suite.addTestSuite(Field.class);
+ suite.addTestSuite(For.class);
+ suite.addTestSuite(ForeachStatement.class);
+ suite.addTestSuite(Function.class);
+ suite.addTestSuite(Identifier.class);
+ suite.addTestSuite(IfStatement.class);
+ suite.addTestSuite(ImportStatement.class);
+ suite.addTestSuite(InProjectionType.class);
+ suite.addTestSuite(Inheritance.class);
+ suite.addTestSuite(IsOperator.class);
+ suite.addTestSuite(Issues.class);
+ suite.addTestSuite(KotlinExclusion.class);
+ suite.addTestSuite(LabelStatement.class);
+ suite.addTestSuite(List.class);
+ suite.addTestSuite(LiteralExpression.class);
+ suite.addTestSuite(LocalVariable.class);
+ suite.addTestSuite(MethodCallExpression.class);
+ suite.addTest(Misc.innerSuite());
+ suite.addTestSuite(NewClassExpression.class);
+ suite.addTestSuite(ObjectLiteral.class);
+ suite.addTestSuite(OutProjectionType.class);
+ suite.addTestSuite(PackageStatement.class);
+ suite.addTestSuite(ParenthesizedExpression.class);
+ suite.addTestSuite(PolyadicExpression.class);
+ suite.addTestSuite(PostfixOperator.class);
+ suite.addTestSuite(PrefixOperator.class);
+ suite.addTestSuite(RawGenerics.class);
+ suite.addTestSuite(ReturnStatement.class);
+ suite.addTestSuite(StarProjectionType.class);
+ suite.addTestSuite(SuperExpression.class);
+ suite.addTestSuite(Switch.class);
+ suite.addTestSuite(SynchronizedStatement.class);
+ suite.addTestSuite(ThisExpression.class);
+ suite.addTestSuite(ThrowStatement.class);
+ suite.addTestSuite(Trait.class);
+ suite.addTestSuite(TryStatement.class);
+ suite.addTestSuite(TypeCastExpression.class);
+ suite.addTestSuite(TypeParameters.class);
+ suite.addTestSuite(VarArg.class);
+ suite.addTestSuite(WhileStatement.class);
+ return suite;
+ }
+}
diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.ide.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNull.ide.kt
new file mode 100644
index 00000000000..1222ec13ce0
--- /dev/null
+++ b/j2k/tests/testData/ast/annotations/jetbrainsNotNull.ide.kt
@@ -0,0 +1,20 @@
+package test
+public open class Test(str : String) {
+var myStr : String = "String2"
+public open fun sout(str : String) : Unit {
+System.out.println(str)
+}
+public open fun dummy(str : String) : String {
+return str
+}
+public open fun test() : Unit {
+sout("String")
+val test = "String2"
+sout(test)
+sout(dummy(test))
+Test(test)
+}
+{
+myStr = str
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/annotations/file/jetbrainsNotNull.jav b/j2k/tests/testData/ast/annotations/jetbrainsNotNull.jav
similarity index 98%
rename from j2k/tests/testData/ast/annotations/file/jetbrainsNotNull.jav
rename to j2k/tests/testData/ast/annotations/jetbrainsNotNull.jav
index 92c511d88a0..4de1a3c1e9e 100644
--- a/j2k/tests/testData/ast/annotations/file/jetbrainsNotNull.jav
+++ b/j2k/tests/testData/ast/annotations/jetbrainsNotNull.jav
@@ -1,3 +1,4 @@
+//file
package test;
import org.jetbrains.annotations.NotNull;
diff --git a/j2k/tests/testData/ast/annotations/file/jetbrainsNotNull.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNull.kt
similarity index 100%
rename from j2k/tests/testData/ast/annotations/file/jetbrainsNotNull.kt
rename to j2k/tests/testData/ast/annotations/jetbrainsNotNull.kt
diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt
new file mode 100644
index 00000000000..e219cdccfd7
--- /dev/null
+++ b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt
@@ -0,0 +1,17 @@
+package test
+open class Foo() {
+open fun execute() : Unit {
+}
+}
+open class Bar() {
+var fooNotNull : Foo = Foo()
+var fooNullable : Foo = null
+}
+open class Test() {
+public open fun test(barNotNull : Bar, barNullable : Bar) : Unit {
+barNotNull.fooNotNull.execute()
+barNotNull.fooNullable.execute()
+barNullable.fooNotNull.execute()
+barNullable.fooNullable.execute()
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/annotations/file/jetbrainsNotNullChainExpr.jav b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.jav
similarity index 98%
rename from j2k/tests/testData/ast/annotations/file/jetbrainsNotNullChainExpr.jav
rename to j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.jav
index c8d50704ff8..1f12378054a 100644
--- a/j2k/tests/testData/ast/annotations/file/jetbrainsNotNullChainExpr.jav
+++ b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.jav
@@ -1,3 +1,4 @@
+//file
package test;
import org.jetbrains.annotations.NotNull;
diff --git a/j2k/tests/testData/ast/annotations/file/jetbrainsNotNullChainExpr.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt
similarity index 100%
rename from j2k/tests/testData/ast/annotations/file/jetbrainsNotNullChainExpr.kt
rename to j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt
diff --git a/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.ide.kt b/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.ide.kt
new file mode 100644
index 00000000000..592aa1a8f4b
--- /dev/null
+++ b/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.ide.kt
@@ -0,0 +1,6 @@
+open class Test() {
+var str : String = 0
+{
+str = "Ola"
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/anonymousBlock/file/oneAnonBlock.jav b/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.jav
similarity index 88%
rename from j2k/tests/testData/ast/anonymousBlock/file/oneAnonBlock.jav
rename to j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.jav
index fba735a5ff0..292bbf96142 100644
--- a/j2k/tests/testData/ast/anonymousBlock/file/oneAnonBlock.jav
+++ b/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.jav
@@ -1,3 +1,4 @@
+//file
class Test {
String str;
{
diff --git a/j2k/tests/testData/ast/anonymousBlock/file/oneAnonBlock.kt b/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.kt
similarity index 100%
rename from j2k/tests/testData/ast/anonymousBlock/file/oneAnonBlock.kt
rename to j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.kt
diff --git a/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.ide.kt b/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.ide.kt
new file mode 100644
index 00000000000..59f41c38354
--- /dev/null
+++ b/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.ide.kt
@@ -0,0 +1,8 @@
+open class Test() {
+var str : String = 0
+class object {
+{
+str = "Ola"
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/anonymousBlock/file/oneStaticAnonBlock.jav b/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.jav
similarity index 89%
rename from j2k/tests/testData/ast/anonymousBlock/file/oneStaticAnonBlock.jav
rename to j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.jav
index c86774f1642..7ccb0496303 100644
--- a/j2k/tests/testData/ast/anonymousBlock/file/oneStaticAnonBlock.jav
+++ b/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.jav
@@ -1,3 +1,4 @@
+//file
class Test {
String str;
static {
diff --git a/j2k/tests/testData/ast/anonymousBlock/file/oneStaticAnonBlock.kt b/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.kt
similarity index 100%
rename from j2k/tests/testData/ast/anonymousBlock/file/oneStaticAnonBlock.kt
rename to j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.kt
diff --git a/j2k/tests/testData/ast/arrayAccessExpression/expression/expressionIndex.jav b/j2k/tests/testData/ast/arrayAccessExpression/expressionIndex.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayAccessExpression/expression/expressionIndex.jav
rename to j2k/tests/testData/ast/arrayAccessExpression/expressionIndex.ide.kt
diff --git a/j2k/tests/testData/ast/arrayAccessExpression/expressionIndex.jav b/j2k/tests/testData/ast/arrayAccessExpression/expressionIndex.jav
new file mode 100644
index 00000000000..cf3991697ee
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayAccessExpression/expressionIndex.jav
@@ -0,0 +1,2 @@
+//expression
+myArray[myLibrary.calculateIndex(100)]
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayAccessExpression/expression/expressionIndex.kt b/j2k/tests/testData/ast/arrayAccessExpression/expressionIndex.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayAccessExpression/expression/expressionIndex.kt
rename to j2k/tests/testData/ast/arrayAccessExpression/expressionIndex.kt
diff --git a/j2k/tests/testData/ast/arrayAccessExpression/expression/intIndex.jav b/j2k/tests/testData/ast/arrayAccessExpression/intIndex.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayAccessExpression/expression/intIndex.jav
rename to j2k/tests/testData/ast/arrayAccessExpression/intIndex.ide.kt
diff --git a/j2k/tests/testData/ast/arrayAccessExpression/intIndex.jav b/j2k/tests/testData/ast/arrayAccessExpression/intIndex.jav
new file mode 100644
index 00000000000..72214a44c26
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayAccessExpression/intIndex.jav
@@ -0,0 +1,2 @@
+//expression
+myArray[10]
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayAccessExpression/expression/intIndex.kt b/j2k/tests/testData/ast/arrayAccessExpression/intIndex.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayAccessExpression/expression/intIndex.kt
rename to j2k/tests/testData/ast/arrayAccessExpression/intIndex.kt
diff --git a/j2k/tests/testData/ast/arrayAccessExpression/expression/variableIndex.jav b/j2k/tests/testData/ast/arrayAccessExpression/variableIndex.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayAccessExpression/expression/variableIndex.jav
rename to j2k/tests/testData/ast/arrayAccessExpression/variableIndex.ide.kt
diff --git a/j2k/tests/testData/ast/arrayAccessExpression/variableIndex.jav b/j2k/tests/testData/ast/arrayAccessExpression/variableIndex.jav
new file mode 100644
index 00000000000..96068016d25
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayAccessExpression/variableIndex.jav
@@ -0,0 +1,2 @@
+//expression
+myArray[i]
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayAccessExpression/expression/variableIndex.kt b/j2k/tests/testData/ast/arrayAccessExpression/variableIndex.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayAccessExpression/expression/variableIndex.kt
rename to j2k/tests/testData/ast/arrayAccessExpression/variableIndex.kt
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.ide.kt b/j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.ide.kt
new file mode 100644
index 00000000000..521c3aa570a
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.ide.kt
@@ -0,0 +1 @@
+val a = doubleArray(1.0, 2.0, 3.0)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/statement/doubleArray.jav b/j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.jav
similarity index 75%
rename from j2k/tests/testData/ast/arrayInitializerExpression/statement/doubleArray.jav
rename to j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.jav
index 44f26cb4a79..ffa23e6d571 100644
--- a/j2k/tests/testData/ast/arrayInitializerExpression/statement/doubleArray.jav
+++ b/j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.jav
@@ -1 +1,2 @@
+//statement
double[] a = new double[]{1.0, 2, 3}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/statement/doubleArray.kt b/j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayInitializerExpression/statement/doubleArray.kt
rename to j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.kt
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.ide.kt b/j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.ide.kt
new file mode 100644
index 00000000000..5ecb77039a4
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.ide.kt
@@ -0,0 +1,4 @@
+val a = 0
+val b = 0
+val c = 0
+val ds = doubleArray((a).toDouble(), (b).toDouble(), (c).toDouble())
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/statement/doubleArrayWithVariables.jav b/j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.jav
similarity index 81%
rename from j2k/tests/testData/ast/arrayInitializerExpression/statement/doubleArrayWithVariables.jav
rename to j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.jav
index 58d0ca95d05..596b7aaa6c0 100644
--- a/j2k/tests/testData/ast/arrayInitializerExpression/statement/doubleArrayWithVariables.jav
+++ b/j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.jav
@@ -1,2 +1,3 @@
+//statement
double a = 0, b = 0, c = 0;
double ds[] = {a, b, c};
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/statement/doubleArrayWithVariables.kt b/j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayInitializerExpression/statement/doubleArrayWithVariables.kt
rename to j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.kt
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/floatArray.ide.kt b/j2k/tests/testData/ast/arrayInitializerExpression/floatArray.ide.kt
new file mode 100644
index 00000000000..75287a3f864
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayInitializerExpression/floatArray.ide.kt
@@ -0,0 +1 @@
+val a = floatArray(1.0, 2.0, 3.0)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/statement/floatArray.jav b/j2k/tests/testData/ast/arrayInitializerExpression/floatArray.jav
similarity index 73%
rename from j2k/tests/testData/ast/arrayInitializerExpression/statement/floatArray.jav
rename to j2k/tests/testData/ast/arrayInitializerExpression/floatArray.jav
index 36d2afa3425..35e98fcdfe9 100644
--- a/j2k/tests/testData/ast/arrayInitializerExpression/statement/floatArray.jav
+++ b/j2k/tests/testData/ast/arrayInitializerExpression/floatArray.jav
@@ -1 +1,2 @@
+//statement
float[] a = new float[]{1, 2, 3.0}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/statement/floatArray.kt b/j2k/tests/testData/ast/arrayInitializerExpression/floatArray.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayInitializerExpression/statement/floatArray.kt
rename to j2k/tests/testData/ast/arrayInitializerExpression/floatArray.kt
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.ide.kt b/j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.ide.kt
new file mode 100644
index 00000000000..50eeec88f46
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.ide.kt
@@ -0,0 +1 @@
+val a = IntArray(10)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/statement/intArrayWithLength.jav b/j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.jav
similarity index 63%
rename from j2k/tests/testData/ast/arrayInitializerExpression/statement/intArrayWithLength.jav
rename to j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.jav
index bf0219dc831..d69d62c1a3a 100644
--- a/j2k/tests/testData/ast/arrayInitializerExpression/statement/intArrayWithLength.jav
+++ b/j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.jav
@@ -1 +1,2 @@
+//statement
int[] a = new int[10]
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/statement/intArrayWithLength.kt b/j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayInitializerExpression/statement/intArrayWithLength.kt
rename to j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.kt
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.ide.kt b/j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.ide.kt
new file mode 100644
index 00000000000..e45850509f1
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.ide.kt
@@ -0,0 +1 @@
+val a = array(1.0, 2.0, 3.0)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/statement/javaLangDoubleArray.jav b/j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.jav
similarity index 82%
rename from j2k/tests/testData/ast/arrayInitializerExpression/statement/javaLangDoubleArray.jav
rename to j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.jav
index 3ebd4af38bd..0ccbe3bfd3f 100644
--- a/j2k/tests/testData/ast/arrayInitializerExpression/statement/javaLangDoubleArray.jav
+++ b/j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.jav
@@ -1 +1,2 @@
+//statement
java.lang.Double[] a = new java.lang.Double[]{1, 2, 3};
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/statement/javaLangDoubleArray.kt b/j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayInitializerExpression/statement/javaLangDoubleArray.kt
rename to j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.kt
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.ide.kt b/j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.ide.kt
new file mode 100644
index 00000000000..f7863159886
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.ide.kt
@@ -0,0 +1 @@
+val a = array(1.0, 2.0, 3.0)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/statement/javaLangFloatArray.jav b/j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.jav
similarity index 81%
rename from j2k/tests/testData/ast/arrayInitializerExpression/statement/javaLangFloatArray.jav
rename to j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.jav
index b53b4dc9aec..0b8f745ec47 100644
--- a/j2k/tests/testData/ast/arrayInitializerExpression/statement/javaLangFloatArray.jav
+++ b/j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.jav
@@ -1 +1,2 @@
+//statement
java.lang.Float[] a = new java.lang.Float[]{1, 2, 3};
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/statement/javaLangFloatArray.kt b/j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayInitializerExpression/statement/javaLangFloatArray.kt
rename to j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.kt
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/newByte.ide.kt b/j2k/tests/testData/ast/arrayInitializerExpression/newByte.ide.kt
new file mode 100644
index 00000000000..592a2c123db
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayInitializerExpression/newByte.ide.kt
@@ -0,0 +1 @@
+val a = byteArray(1, 2, 3)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/statement/newByte.jav b/j2k/tests/testData/ast/arrayInitializerExpression/newByte.jav
similarity index 72%
rename from j2k/tests/testData/ast/arrayInitializerExpression/statement/newByte.jav
rename to j2k/tests/testData/ast/arrayInitializerExpression/newByte.jav
index 5a6e85cdfe1..f70a27c9fe5 100644
--- a/j2k/tests/testData/ast/arrayInitializerExpression/statement/newByte.jav
+++ b/j2k/tests/testData/ast/arrayInitializerExpression/newByte.jav
@@ -1 +1,2 @@
+//statement
byte[] a = new byte[] {1, 2, 3};
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/statement/newByte.kt b/j2k/tests/testData/ast/arrayInitializerExpression/newByte.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayInitializerExpression/statement/newByte.kt
rename to j2k/tests/testData/ast/arrayInitializerExpression/newByte.kt
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/expression/newInt.kt b/j2k/tests/testData/ast/arrayInitializerExpression/newInt.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayInitializerExpression/expression/newInt.kt
rename to j2k/tests/testData/ast/arrayInitializerExpression/newInt.ide.kt
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/expression/newInt.jav b/j2k/tests/testData/ast/arrayInitializerExpression/newInt.jav
similarity index 60%
rename from j2k/tests/testData/ast/arrayInitializerExpression/expression/newInt.jav
rename to j2k/tests/testData/ast/arrayInitializerExpression/newInt.jav
index 0d3fb727286..7583934dfaa 100644
--- a/j2k/tests/testData/ast/arrayInitializerExpression/expression/newInt.jav
+++ b/j2k/tests/testData/ast/arrayInitializerExpression/newInt.jav
@@ -1 +1,2 @@
+//expression
new int[] {1, 2, 3};
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/newInt.kt b/j2k/tests/testData/ast/arrayInitializerExpression/newInt.kt
new file mode 100644
index 00000000000..6cfae9942ea
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayInitializerExpression/newInt.kt
@@ -0,0 +1 @@
+intArray(1, 2, 3)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.ide.kt b/j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.ide.kt
new file mode 100644
index 00000000000..91ced175767
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.ide.kt
@@ -0,0 +1 @@
+val a = arrayOfNulls(10)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/statement/objectArrayWithLength.jav b/j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.jav
similarity index 69%
rename from j2k/tests/testData/ast/arrayInitializerExpression/statement/objectArrayWithLength.jav
rename to j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.jav
index 04dedc06ddc..f9f750c283f 100644
--- a/j2k/tests/testData/ast/arrayInitializerExpression/statement/objectArrayWithLength.jav
+++ b/j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.jav
@@ -1 +1,2 @@
+//statement
Object[] a = new Object[10]
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/statement/objectArrayWithLength.kt b/j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayInitializerExpression/statement/objectArrayWithLength.kt
rename to j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.kt
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/oneDim.ide.kt b/j2k/tests/testData/ast/arrayInitializerExpression/oneDim.ide.kt
new file mode 100644
index 00000000000..a9df4a3017b
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayInitializerExpression/oneDim.ide.kt
@@ -0,0 +1 @@
+val a = intArray(1, 2, 3)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/statement/oneDim.jav b/j2k/tests/testData/ast/arrayInitializerExpression/oneDim.jav
similarity index 62%
rename from j2k/tests/testData/ast/arrayInitializerExpression/statement/oneDim.jav
rename to j2k/tests/testData/ast/arrayInitializerExpression/oneDim.jav
index 9e498af66a6..a03e5f935f9 100644
--- a/j2k/tests/testData/ast/arrayInitializerExpression/statement/oneDim.jav
+++ b/j2k/tests/testData/ast/arrayInitializerExpression/oneDim.jav
@@ -1 +1,2 @@
+//statement
int[] a = {1, 2, 3};
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/statement/oneDim.kt b/j2k/tests/testData/ast/arrayInitializerExpression/oneDim.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayInitializerExpression/statement/oneDim.kt
rename to j2k/tests/testData/ast/arrayInitializerExpression/oneDim.kt
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.ide.kt b/j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.ide.kt
new file mode 100644
index 00000000000..1b0234abcac
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.ide.kt
@@ -0,0 +1,4 @@
+val a = 0
+val b = 0
+val c = 0
+val `is` = intArray(a, b, c)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/statement/oneDimWithVariables.jav b/j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.jav
similarity index 79%
rename from j2k/tests/testData/ast/arrayInitializerExpression/statement/oneDimWithVariables.jav
rename to j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.jav
index 185a7d5aaf8..6cd3aad2b29 100644
--- a/j2k/tests/testData/ast/arrayInitializerExpression/statement/oneDimWithVariables.jav
+++ b/j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.jav
@@ -1,2 +1,3 @@
+//statement
int a = 0, b = 0, c = 0;
int is[] = {a, b, c};
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/statement/oneDimWithVariables.kt b/j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayInitializerExpression/statement/oneDimWithVariables.kt
rename to j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.kt
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/twoDim.ide.kt b/j2k/tests/testData/ast/arrayInitializerExpression/twoDim.ide.kt
new file mode 100644
index 00000000000..13f4c0fc540
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayInitializerExpression/twoDim.ide.kt
@@ -0,0 +1 @@
+val a = array(intArray(1, 2, 3), intArray(4, 5, 6), intArray(7, 8, 9))
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/statement/twoDim.jav b/j2k/tests/testData/ast/arrayInitializerExpression/twoDim.jav
similarity index 80%
rename from j2k/tests/testData/ast/arrayInitializerExpression/statement/twoDim.jav
rename to j2k/tests/testData/ast/arrayInitializerExpression/twoDim.jav
index f895393aad5..ee637a0d368 100644
--- a/j2k/tests/testData/ast/arrayInitializerExpression/statement/twoDim.jav
+++ b/j2k/tests/testData/ast/arrayInitializerExpression/twoDim.jav
@@ -1 +1,2 @@
+//statement
int[][] a = { {1, 2, 3}, {4, 5, 6}, {7, 8, 9} };
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/statement/twoDim.kt b/j2k/tests/testData/ast/arrayInitializerExpression/twoDim.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayInitializerExpression/statement/twoDim.kt
rename to j2k/tests/testData/ast/arrayInitializerExpression/twoDim.kt
diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatement.ide.kt b/j2k/tests/testData/ast/arrayType/arrayInitializationStatement.ide.kt
new file mode 100644
index 00000000000..68ce4c06c72
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayType/arrayInitializationStatement.ide.kt
@@ -0,0 +1 @@
+val d2 = array()
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatement.jav b/j2k/tests/testData/ast/arrayType/arrayInitializationStatement.jav
similarity index 70%
rename from j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatement.jav
rename to j2k/tests/testData/ast/arrayType/arrayInitializationStatement.jav
index 781bcb6a731..fc8512f2705 100644
--- a/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatement.jav
+++ b/j2k/tests/testData/ast/arrayType/arrayInitializationStatement.jav
@@ -1 +1,2 @@
+//statement
int [][] d2 = new int[][]{};
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatement.kt b/j2k/tests/testData/ast/arrayType/arrayInitializationStatement.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatement.kt
rename to j2k/tests/testData/ast/arrayType/arrayInitializationStatement.kt
diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.ide.kt b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.ide.kt
new file mode 100644
index 00000000000..1462d0c46d1
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.ide.kt
@@ -0,0 +1 @@
+val d2 = arrayOfNulls(5)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.jav b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.jav
similarity index 69%
rename from j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.jav
rename to j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.jav
index 01c957d5dfe..a1c2aeda352 100644
--- a/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.jav
+++ b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.jav
@@ -1 +1,2 @@
+//statement
int [][] d2 = new int[5][];
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.kt b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension.kt
rename to j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.kt
diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.ide.kt b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.ide.kt
new file mode 100644
index 00000000000..0752ec85a4c
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.ide.kt
@@ -0,0 +1 @@
+val d3 = Array>(5, {arrayOfNulls(5)})
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.jav b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.jav
similarity index 72%
rename from j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.jav
rename to j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.jav
index abe20f1ec57..dd323feef89 100644
--- a/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.jav
+++ b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.jav
@@ -1 +1,2 @@
+//statement
int [][][] d3 = new int[5][5][];
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.kt b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimension3d.kt
rename to j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.kt
diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.ide.kt b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.ide.kt
new file mode 100644
index 00000000000..27afd6103c3
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.ide.kt
@@ -0,0 +1 @@
+val d2 = Array(5, {IntArray(5)})
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimensionExplicit.jav b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.jav
similarity index 70%
rename from j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimensionExplicit.jav
rename to j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.jav
index fe4a268f124..ebdc7270f87 100644
--- a/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimensionExplicit.jav
+++ b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.jav
@@ -1 +1,2 @@
+//statement
int [][] d2 = new int[5][5];
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimensionExplicit.kt b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayType/statement/arrayInitializationStatementWithDimensionExplicit.kt
rename to j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.kt
diff --git a/j2k/tests/testData/ast/arrayType/d2StringEmptyArray.ide.kt b/j2k/tests/testData/ast/arrayType/d2StringEmptyArray.ide.kt
new file mode 100644
index 00000000000..4dab6bcb6f4
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayType/d2StringEmptyArray.ide.kt
@@ -0,0 +1 @@
+val ss = Array>(5, {arrayOfNulls(5)})
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayType/statement/d2StringEmptyArray.jav b/j2k/tests/testData/ast/arrayType/d2StringEmptyArray.jav
similarity index 73%
rename from j2k/tests/testData/ast/arrayType/statement/d2StringEmptyArray.jav
rename to j2k/tests/testData/ast/arrayType/d2StringEmptyArray.jav
index d49028c3fe0..a4618b0d654 100644
--- a/j2k/tests/testData/ast/arrayType/statement/d2StringEmptyArray.jav
+++ b/j2k/tests/testData/ast/arrayType/d2StringEmptyArray.jav
@@ -1 +1,2 @@
+//statement
String [][] ss = new String[5][5];
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayType/statement/d2StringEmptyArray.kt b/j2k/tests/testData/ast/arrayType/d2StringEmptyArray.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayType/statement/d2StringEmptyArray.kt
rename to j2k/tests/testData/ast/arrayType/d2StringEmptyArray.kt
diff --git a/j2k/tests/testData/ast/arrayType/d3StringEmptyArray.ide.kt b/j2k/tests/testData/ast/arrayType/d3StringEmptyArray.ide.kt
new file mode 100644
index 00000000000..dd399725576
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayType/d3StringEmptyArray.ide.kt
@@ -0,0 +1 @@
+val sss = Array>>(5, {Array>(5, {arrayOfNulls(5)})})
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayType/statement/d3StringEmptyArray.jav b/j2k/tests/testData/ast/arrayType/d3StringEmptyArray.jav
similarity index 76%
rename from j2k/tests/testData/ast/arrayType/statement/d3StringEmptyArray.jav
rename to j2k/tests/testData/ast/arrayType/d3StringEmptyArray.jav
index 498743daff6..ec7ace6a62b 100644
--- a/j2k/tests/testData/ast/arrayType/statement/d3StringEmptyArray.jav
+++ b/j2k/tests/testData/ast/arrayType/d3StringEmptyArray.jav
@@ -1 +1,2 @@
+//statement
String [][][] sss = new String[5][5][5];
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayType/statement/d3StringEmptyArray.kt b/j2k/tests/testData/ast/arrayType/d3StringEmptyArray.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayType/statement/d3StringEmptyArray.kt
rename to j2k/tests/testData/ast/arrayType/d3StringEmptyArray.kt
diff --git a/j2k/tests/testData/ast/arrayType/longArray.ide.kt b/j2k/tests/testData/ast/arrayType/longArray.ide.kt
new file mode 100644
index 00000000000..6d27fcb3715
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayType/longArray.ide.kt
@@ -0,0 +1 @@
+val a = longArray(1, 2, 3)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayType/statement/longArray.jav b/j2k/tests/testData/ast/arrayType/longArray.jav
similarity index 71%
rename from j2k/tests/testData/ast/arrayType/statement/longArray.jav
rename to j2k/tests/testData/ast/arrayType/longArray.jav
index 8ba3eb35a5c..16b6b534e7a 100644
--- a/j2k/tests/testData/ast/arrayType/statement/longArray.jav
+++ b/j2k/tests/testData/ast/arrayType/longArray.jav
@@ -1 +1,2 @@
+//statement
long[] a = new long[]{1, 2, 3}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayType/statement/longArray.kt b/j2k/tests/testData/ast/arrayType/longArray.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayType/statement/longArray.kt
rename to j2k/tests/testData/ast/arrayType/longArray.kt
diff --git a/j2k/tests/testData/ast/arrayType/methodArrayArgs.ide.kt b/j2k/tests/testData/ast/arrayType/methodArrayArgs.ide.kt
new file mode 100644
index 00000000000..b111f9219a9
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayType/methodArrayArgs.ide.kt
@@ -0,0 +1,2 @@
+fun fromArrayToCollection(a : Array) : Unit {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayType/method/methodArrayArgs.jav b/j2k/tests/testData/ast/arrayType/methodArrayArgs.jav
similarity index 80%
rename from j2k/tests/testData/ast/arrayType/method/methodArrayArgs.jav
rename to j2k/tests/testData/ast/arrayType/methodArrayArgs.jav
index c5c5768faf4..3c8d6114cb7 100644
--- a/j2k/tests/testData/ast/arrayType/method/methodArrayArgs.jav
+++ b/j2k/tests/testData/ast/arrayType/methodArrayArgs.jav
@@ -1 +1,2 @@
+//method
void fromArrayToCollection(Foo[] a) {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayType/method/methodArrayArgs.kt b/j2k/tests/testData/ast/arrayType/methodArrayArgs.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayType/method/methodArrayArgs.kt
rename to j2k/tests/testData/ast/arrayType/methodArrayArgs.kt
diff --git a/j2k/tests/testData/ast/arrayType/newIntArray.ide.kt b/j2k/tests/testData/ast/arrayType/newIntArray.ide.kt
new file mode 100644
index 00000000000..a9df4a3017b
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayType/newIntArray.ide.kt
@@ -0,0 +1 @@
+val a = intArray(1, 2, 3)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayType/statement/newIntArray.jav b/j2k/tests/testData/ast/arrayType/newIntArray.jav
similarity index 70%
rename from j2k/tests/testData/ast/arrayType/statement/newIntArray.jav
rename to j2k/tests/testData/ast/arrayType/newIntArray.jav
index 8c66b71c91f..4bdc1ad8874 100644
--- a/j2k/tests/testData/ast/arrayType/statement/newIntArray.jav
+++ b/j2k/tests/testData/ast/arrayType/newIntArray.jav
@@ -1 +1,2 @@
+//statement
int[] a = new int[]{1, 2, 3}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayType/statement/newIntArray.kt b/j2k/tests/testData/ast/arrayType/newIntArray.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayType/statement/newIntArray.kt
rename to j2k/tests/testData/ast/arrayType/newIntArray.kt
diff --git a/j2k/tests/testData/ast/arrayType/newStringArray.ide.kt b/j2k/tests/testData/ast/arrayType/newStringArray.ide.kt
new file mode 100644
index 00000000000..c1803c10649
--- /dev/null
+++ b/j2k/tests/testData/ast/arrayType/newStringArray.ide.kt
@@ -0,0 +1 @@
+val a = array("abc")
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayType/statement/newStringArray.jav b/j2k/tests/testData/ast/arrayType/newStringArray.jav
similarity index 72%
rename from j2k/tests/testData/ast/arrayType/statement/newStringArray.jav
rename to j2k/tests/testData/ast/arrayType/newStringArray.jav
index 371c13bfa2d..0cfcb6b46d8 100644
--- a/j2k/tests/testData/ast/arrayType/statement/newStringArray.jav
+++ b/j2k/tests/testData/ast/arrayType/newStringArray.jav
@@ -1 +1,2 @@
+//statement
String[] a = new String[]{"abc"}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/arrayType/statement/newStringArray.kt b/j2k/tests/testData/ast/arrayType/newStringArray.kt
similarity index 100%
rename from j2k/tests/testData/ast/arrayType/statement/newStringArray.kt
rename to j2k/tests/testData/ast/arrayType/newStringArray.kt
diff --git a/j2k/tests/testData/ast/assertStatement/statement/onlyCondition.kt b/j2k/tests/testData/ast/assertStatement/onlyCondition.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/assertStatement/statement/onlyCondition.kt
rename to j2k/tests/testData/ast/assertStatement/onlyCondition.ide.kt
diff --git a/j2k/tests/testData/ast/assertStatement/statement/onlyCondition.jav b/j2k/tests/testData/ast/assertStatement/onlyCondition.jav
similarity index 62%
rename from j2k/tests/testData/ast/assertStatement/statement/onlyCondition.jav
rename to j2k/tests/testData/ast/assertStatement/onlyCondition.jav
index 7ac44744fe6..42de6d47ea2 100644
--- a/j2k/tests/testData/ast/assertStatement/statement/onlyCondition.jav
+++ b/j2k/tests/testData/ast/assertStatement/onlyCondition.jav
@@ -1 +1,2 @@
+//statement
assert boolMethod();
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assertStatement/onlyCondition.kt b/j2k/tests/testData/ast/assertStatement/onlyCondition.kt
new file mode 100644
index 00000000000..e148b562e0c
--- /dev/null
+++ b/j2k/tests/testData/ast/assertStatement/onlyCondition.kt
@@ -0,0 +1 @@
+assert {boolMethod()}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assertStatement/statement/onlyConditionWithBraces.kt b/j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/assertStatement/statement/onlyConditionWithBraces.kt
rename to j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.ide.kt
diff --git a/j2k/tests/testData/ast/assertStatement/statement/onlyConditionWithBraces.jav b/j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.jav
similarity index 63%
rename from j2k/tests/testData/ast/assertStatement/statement/onlyConditionWithBraces.jav
rename to j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.jav
index b1c738d82a9..fd63d572db6 100644
--- a/j2k/tests/testData/ast/assertStatement/statement/onlyConditionWithBraces.jav
+++ b/j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.jav
@@ -1 +1,2 @@
+//statement
assert(boolMethod());
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.kt b/j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.kt
new file mode 100644
index 00000000000..dda5f1e1170
--- /dev/null
+++ b/j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.kt
@@ -0,0 +1 @@
+assert {(boolMethod())}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assertStatement/statement/withStringDetail.kt b/j2k/tests/testData/ast/assertStatement/withStringDetail.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/assertStatement/statement/withStringDetail.kt
rename to j2k/tests/testData/ast/assertStatement/withStringDetail.ide.kt
diff --git a/j2k/tests/testData/ast/assertStatement/statement/withStringDetail.jav b/j2k/tests/testData/ast/assertStatement/withStringDetail.jav
similarity index 72%
rename from j2k/tests/testData/ast/assertStatement/statement/withStringDetail.jav
rename to j2k/tests/testData/ast/assertStatement/withStringDetail.jav
index aad7600e036..332dec0c307 100644
--- a/j2k/tests/testData/ast/assertStatement/statement/withStringDetail.jav
+++ b/j2k/tests/testData/ast/assertStatement/withStringDetail.jav
@@ -1 +1,2 @@
+//statement
assert true : "string details";
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assertStatement/withStringDetail.kt b/j2k/tests/testData/ast/assertStatement/withStringDetail.kt
new file mode 100644
index 00000000000..9fa45aa19e7
--- /dev/null
+++ b/j2k/tests/testData/ast/assertStatement/withStringDetail.kt
@@ -0,0 +1 @@
+assert("string details") {true}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/expression/and.kt b/j2k/tests/testData/ast/assignmentExpression/and.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/assignmentExpression/expression/and.kt
rename to j2k/tests/testData/ast/assignmentExpression/and.ide.kt
diff --git a/j2k/tests/testData/ast/assignmentExpression/and.jav b/j2k/tests/testData/ast/assignmentExpression/and.jav
new file mode 100644
index 00000000000..a7ddbe20ebb
--- /dev/null
+++ b/j2k/tests/testData/ast/assignmentExpression/and.jav
@@ -0,0 +1,2 @@
+//expression
+x &= 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/and.kt b/j2k/tests/testData/ast/assignmentExpression/and.kt
new file mode 100644
index 00000000000..dc3b47760da
--- /dev/null
+++ b/j2k/tests/testData/ast/assignmentExpression/and.kt
@@ -0,0 +1 @@
+x = x and 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/expression/assignment.jav b/j2k/tests/testData/ast/assignmentExpression/assignment.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/assignmentExpression/expression/assignment.jav
rename to j2k/tests/testData/ast/assignmentExpression/assignment.ide.kt
diff --git a/j2k/tests/testData/ast/assignmentExpression/assignment.jav b/j2k/tests/testData/ast/assignmentExpression/assignment.jav
new file mode 100644
index 00000000000..28407cb5d7a
--- /dev/null
+++ b/j2k/tests/testData/ast/assignmentExpression/assignment.jav
@@ -0,0 +1,2 @@
+//expression
+x = 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/expression/assignment.kt b/j2k/tests/testData/ast/assignmentExpression/assignment.kt
similarity index 100%
rename from j2k/tests/testData/ast/assignmentExpression/expression/assignment.kt
rename to j2k/tests/testData/ast/assignmentExpression/assignment.kt
diff --git a/j2k/tests/testData/ast/assignmentExpression/expression/divideAssign.jav b/j2k/tests/testData/ast/assignmentExpression/divideAssign.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/assignmentExpression/expression/divideAssign.jav
rename to j2k/tests/testData/ast/assignmentExpression/divideAssign.ide.kt
diff --git a/j2k/tests/testData/ast/assignmentExpression/divideAssign.jav b/j2k/tests/testData/ast/assignmentExpression/divideAssign.jav
new file mode 100644
index 00000000000..c9d7d70673e
--- /dev/null
+++ b/j2k/tests/testData/ast/assignmentExpression/divideAssign.jav
@@ -0,0 +1,2 @@
+//expression
+x /= 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/expression/divideAssign.kt b/j2k/tests/testData/ast/assignmentExpression/divideAssign.kt
similarity index 100%
rename from j2k/tests/testData/ast/assignmentExpression/expression/divideAssign.kt
rename to j2k/tests/testData/ast/assignmentExpression/divideAssign.kt
diff --git a/j2k/tests/testData/ast/assignmentExpression/expression/and.jav b/j2k/tests/testData/ast/assignmentExpression/expression/and.jav
deleted file mode 100644
index d345703fc8e..00000000000
--- a/j2k/tests/testData/ast/assignmentExpression/expression/and.jav
+++ /dev/null
@@ -1 +0,0 @@
-x &= 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/expression/or.jav b/j2k/tests/testData/ast/assignmentExpression/expression/or.jav
deleted file mode 100644
index 07b425b9cc5..00000000000
--- a/j2k/tests/testData/ast/assignmentExpression/expression/or.jav
+++ /dev/null
@@ -1 +0,0 @@
-x |= 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/expression/shiftLeft.jav b/j2k/tests/testData/ast/assignmentExpression/expression/shiftLeft.jav
deleted file mode 100644
index 1b5eb34ba7e..00000000000
--- a/j2k/tests/testData/ast/assignmentExpression/expression/shiftLeft.jav
+++ /dev/null
@@ -1 +0,0 @@
-x <<= 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/expression/shiftRight.jav b/j2k/tests/testData/ast/assignmentExpression/expression/shiftRight.jav
deleted file mode 100644
index ac7c546b4cb..00000000000
--- a/j2k/tests/testData/ast/assignmentExpression/expression/shiftRight.jav
+++ /dev/null
@@ -1 +0,0 @@
-x >>= 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/expression/unsignedRightShift.jav b/j2k/tests/testData/ast/assignmentExpression/expression/unsignedRightShift.jav
deleted file mode 100644
index 80750c37495..00000000000
--- a/j2k/tests/testData/ast/assignmentExpression/expression/unsignedRightShift.jav
+++ /dev/null
@@ -1 +0,0 @@
-x >>>= 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/expression/xor.jav b/j2k/tests/testData/ast/assignmentExpression/expression/xor.jav
deleted file mode 100644
index 2f6e418eb5d..00000000000
--- a/j2k/tests/testData/ast/assignmentExpression/expression/xor.jav
+++ /dev/null
@@ -1 +0,0 @@
-x ^= 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/expression/minusAssign.jav b/j2k/tests/testData/ast/assignmentExpression/minusAssign.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/assignmentExpression/expression/minusAssign.jav
rename to j2k/tests/testData/ast/assignmentExpression/minusAssign.ide.kt
diff --git a/j2k/tests/testData/ast/assignmentExpression/minusAssign.jav b/j2k/tests/testData/ast/assignmentExpression/minusAssign.jav
new file mode 100644
index 00000000000..0e82db5caca
--- /dev/null
+++ b/j2k/tests/testData/ast/assignmentExpression/minusAssign.jav
@@ -0,0 +1,2 @@
+//expression
+x -= 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/expression/minusAssign.kt b/j2k/tests/testData/ast/assignmentExpression/minusAssign.kt
similarity index 100%
rename from j2k/tests/testData/ast/assignmentExpression/expression/minusAssign.kt
rename to j2k/tests/testData/ast/assignmentExpression/minusAssign.kt
diff --git a/j2k/tests/testData/ast/assignmentExpression/expression/multiplyAssign.jav b/j2k/tests/testData/ast/assignmentExpression/multiplyAssign.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/assignmentExpression/expression/multiplyAssign.jav
rename to j2k/tests/testData/ast/assignmentExpression/multiplyAssign.ide.kt
diff --git a/j2k/tests/testData/ast/assignmentExpression/multiplyAssign.jav b/j2k/tests/testData/ast/assignmentExpression/multiplyAssign.jav
new file mode 100644
index 00000000000..4cf5ebe6838
--- /dev/null
+++ b/j2k/tests/testData/ast/assignmentExpression/multiplyAssign.jav
@@ -0,0 +1,2 @@
+//expression
+x *= 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/expression/multiplyAssign.kt b/j2k/tests/testData/ast/assignmentExpression/multiplyAssign.kt
similarity index 100%
rename from j2k/tests/testData/ast/assignmentExpression/expression/multiplyAssign.kt
rename to j2k/tests/testData/ast/assignmentExpression/multiplyAssign.kt
diff --git a/j2k/tests/testData/ast/assignmentExpression/nullability.ide.kt b/j2k/tests/testData/ast/assignmentExpression/nullability.ide.kt
new file mode 100644
index 00000000000..b3308b2ebad
--- /dev/null
+++ b/j2k/tests/testData/ast/assignmentExpression/nullability.ide.kt
@@ -0,0 +1,8 @@
+import java.util.BitSet
+open class Foo() {
+open fun foo(o : BitSet) : Unit {
+val o2 = o
+val foo = 0
+foo = o2.size()
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/file/nullability.jav b/j2k/tests/testData/ast/assignmentExpression/nullability.jav
similarity index 94%
rename from j2k/tests/testData/ast/assignmentExpression/file/nullability.jav
rename to j2k/tests/testData/ast/assignmentExpression/nullability.jav
index dc7800cc26e..3de96bd8228 100644
--- a/j2k/tests/testData/ast/assignmentExpression/file/nullability.jav
+++ b/j2k/tests/testData/ast/assignmentExpression/nullability.jav
@@ -1,3 +1,4 @@
+//file
import java.util.BitSet;
class Foo {
diff --git a/j2k/tests/testData/ast/assignmentExpression/file/nullability.kt b/j2k/tests/testData/ast/assignmentExpression/nullability.kt
similarity index 100%
rename from j2k/tests/testData/ast/assignmentExpression/file/nullability.kt
rename to j2k/tests/testData/ast/assignmentExpression/nullability.kt
diff --git a/j2k/tests/testData/ast/assignmentExpression/expression/or.kt b/j2k/tests/testData/ast/assignmentExpression/or.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/assignmentExpression/expression/or.kt
rename to j2k/tests/testData/ast/assignmentExpression/or.ide.kt
diff --git a/j2k/tests/testData/ast/assignmentExpression/or.jav b/j2k/tests/testData/ast/assignmentExpression/or.jav
new file mode 100644
index 00000000000..ba6b41fe667
--- /dev/null
+++ b/j2k/tests/testData/ast/assignmentExpression/or.jav
@@ -0,0 +1,2 @@
+//expression
+x |= 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/or.kt b/j2k/tests/testData/ast/assignmentExpression/or.kt
new file mode 100644
index 00000000000..776a84a8989
--- /dev/null
+++ b/j2k/tests/testData/ast/assignmentExpression/or.kt
@@ -0,0 +1 @@
+x = x or 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/expression/plusAssign.jav b/j2k/tests/testData/ast/assignmentExpression/plusAssign.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/assignmentExpression/expression/plusAssign.jav
rename to j2k/tests/testData/ast/assignmentExpression/plusAssign.ide.kt
diff --git a/j2k/tests/testData/ast/assignmentExpression/plusAssign.jav b/j2k/tests/testData/ast/assignmentExpression/plusAssign.jav
new file mode 100644
index 00000000000..b7ba717778c
--- /dev/null
+++ b/j2k/tests/testData/ast/assignmentExpression/plusAssign.jav
@@ -0,0 +1,2 @@
+//expression
+x += 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/expression/plusAssign.kt b/j2k/tests/testData/ast/assignmentExpression/plusAssign.kt
similarity index 100%
rename from j2k/tests/testData/ast/assignmentExpression/expression/plusAssign.kt
rename to j2k/tests/testData/ast/assignmentExpression/plusAssign.kt
diff --git a/j2k/tests/testData/ast/assignmentExpression/expression/reminder.jav b/j2k/tests/testData/ast/assignmentExpression/reminder.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/assignmentExpression/expression/reminder.jav
rename to j2k/tests/testData/ast/assignmentExpression/reminder.ide.kt
diff --git a/j2k/tests/testData/ast/assignmentExpression/reminder.jav b/j2k/tests/testData/ast/assignmentExpression/reminder.jav
new file mode 100644
index 00000000000..6a10a37e2de
--- /dev/null
+++ b/j2k/tests/testData/ast/assignmentExpression/reminder.jav
@@ -0,0 +1,2 @@
+//expression
+x %= 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/expression/reminder.kt b/j2k/tests/testData/ast/assignmentExpression/reminder.kt
similarity index 100%
rename from j2k/tests/testData/ast/assignmentExpression/expression/reminder.kt
rename to j2k/tests/testData/ast/assignmentExpression/reminder.kt
diff --git a/j2k/tests/testData/ast/assignmentExpression/expression/shiftLeft.kt b/j2k/tests/testData/ast/assignmentExpression/shiftLeft.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/assignmentExpression/expression/shiftLeft.kt
rename to j2k/tests/testData/ast/assignmentExpression/shiftLeft.ide.kt
diff --git a/j2k/tests/testData/ast/assignmentExpression/shiftLeft.jav b/j2k/tests/testData/ast/assignmentExpression/shiftLeft.jav
new file mode 100644
index 00000000000..bcfd8a6e6ff
--- /dev/null
+++ b/j2k/tests/testData/ast/assignmentExpression/shiftLeft.jav
@@ -0,0 +1,2 @@
+//expression
+x <<= 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/shiftLeft.kt b/j2k/tests/testData/ast/assignmentExpression/shiftLeft.kt
new file mode 100644
index 00000000000..bc26f965e4d
--- /dev/null
+++ b/j2k/tests/testData/ast/assignmentExpression/shiftLeft.kt
@@ -0,0 +1 @@
+x = x shl 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/expression/shiftRight.kt b/j2k/tests/testData/ast/assignmentExpression/shiftRight.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/assignmentExpression/expression/shiftRight.kt
rename to j2k/tests/testData/ast/assignmentExpression/shiftRight.ide.kt
diff --git a/j2k/tests/testData/ast/assignmentExpression/shiftRight.jav b/j2k/tests/testData/ast/assignmentExpression/shiftRight.jav
new file mode 100644
index 00000000000..782317cce05
--- /dev/null
+++ b/j2k/tests/testData/ast/assignmentExpression/shiftRight.jav
@@ -0,0 +1,2 @@
+//expression
+x >>= 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/shiftRight.kt b/j2k/tests/testData/ast/assignmentExpression/shiftRight.kt
new file mode 100644
index 00000000000..a731104d2f6
--- /dev/null
+++ b/j2k/tests/testData/ast/assignmentExpression/shiftRight.kt
@@ -0,0 +1 @@
+x = x shr 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/statement/simpleAssignment.kt b/j2k/tests/testData/ast/assignmentExpression/simpleAssignment.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/assignmentExpression/statement/simpleAssignment.kt
rename to j2k/tests/testData/ast/assignmentExpression/simpleAssignment.ide.kt
diff --git a/j2k/tests/testData/ast/assignmentExpression/simpleAssignment.jav b/j2k/tests/testData/ast/assignmentExpression/simpleAssignment.jav
new file mode 100644
index 00000000000..032623a46da
--- /dev/null
+++ b/j2k/tests/testData/ast/assignmentExpression/simpleAssignment.jav
@@ -0,0 +1,2 @@
+//statement
+i = 1;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/simpleAssignment.kt b/j2k/tests/testData/ast/assignmentExpression/simpleAssignment.kt
new file mode 100644
index 00000000000..88de072edc6
--- /dev/null
+++ b/j2k/tests/testData/ast/assignmentExpression/simpleAssignment.kt
@@ -0,0 +1 @@
+i = 1
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/statement/simpleAssignment.jav b/j2k/tests/testData/ast/assignmentExpression/statement/simpleAssignment.jav
deleted file mode 100644
index 5cb450aa538..00000000000
--- a/j2k/tests/testData/ast/assignmentExpression/statement/simpleAssignment.jav
+++ /dev/null
@@ -1 +0,0 @@
-i = 1;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/expression/unsignedRightShift.kt b/j2k/tests/testData/ast/assignmentExpression/unsignedRightShift.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/assignmentExpression/expression/unsignedRightShift.kt
rename to j2k/tests/testData/ast/assignmentExpression/unsignedRightShift.ide.kt
diff --git a/j2k/tests/testData/ast/assignmentExpression/unsignedRightShift.jav b/j2k/tests/testData/ast/assignmentExpression/unsignedRightShift.jav
new file mode 100644
index 00000000000..192a8b06bdf
--- /dev/null
+++ b/j2k/tests/testData/ast/assignmentExpression/unsignedRightShift.jav
@@ -0,0 +1,2 @@
+//expression
+x >>>= 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/unsignedRightShift.kt b/j2k/tests/testData/ast/assignmentExpression/unsignedRightShift.kt
new file mode 100644
index 00000000000..2450029bd56
--- /dev/null
+++ b/j2k/tests/testData/ast/assignmentExpression/unsignedRightShift.kt
@@ -0,0 +1 @@
+x = x ushr 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/expression/xor.kt b/j2k/tests/testData/ast/assignmentExpression/xor.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/assignmentExpression/expression/xor.kt
rename to j2k/tests/testData/ast/assignmentExpression/xor.ide.kt
diff --git a/j2k/tests/testData/ast/assignmentExpression/xor.jav b/j2k/tests/testData/ast/assignmentExpression/xor.jav
new file mode 100644
index 00000000000..ec210cb9f6f
--- /dev/null
+++ b/j2k/tests/testData/ast/assignmentExpression/xor.jav
@@ -0,0 +1,2 @@
+//expression
+x ^= 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/assignmentExpression/xor.kt b/j2k/tests/testData/ast/assignmentExpression/xor.kt
new file mode 100644
index 00000000000..381ed467f3d
--- /dev/null
+++ b/j2k/tests/testData/ast/assignmentExpression/xor.kt
@@ -0,0 +1 @@
+x = x xor 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/and.kt b/j2k/tests/testData/ast/binaryExpression/and.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/and.kt
rename to j2k/tests/testData/ast/binaryExpression/and.ide.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/and.jav b/j2k/tests/testData/ast/binaryExpression/and.jav
new file mode 100644
index 00000000000..c98318c73c9
--- /dev/null
+++ b/j2k/tests/testData/ast/binaryExpression/and.jav
@@ -0,0 +1,2 @@
+//expression
+x & 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/and.kt b/j2k/tests/testData/ast/binaryExpression/and.kt
new file mode 100644
index 00000000000..cbf463b36ea
--- /dev/null
+++ b/j2k/tests/testData/ast/binaryExpression/and.kt
@@ -0,0 +1 @@
+x and 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/conditionalAnd.jav b/j2k/tests/testData/ast/binaryExpression/conditionalAnd.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/conditionalAnd.jav
rename to j2k/tests/testData/ast/binaryExpression/conditionalAnd.ide.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/conditionalAnd.jav b/j2k/tests/testData/ast/binaryExpression/conditionalAnd.jav
new file mode 100644
index 00000000000..38d0b649653
--- /dev/null
+++ b/j2k/tests/testData/ast/binaryExpression/conditionalAnd.jav
@@ -0,0 +1,2 @@
+//expression
+true && false
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/conditionalAnd.kt b/j2k/tests/testData/ast/binaryExpression/conditionalAnd.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/conditionalAnd.kt
rename to j2k/tests/testData/ast/binaryExpression/conditionalAnd.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/conditionalOr.jav b/j2k/tests/testData/ast/binaryExpression/conditionalOr.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/conditionalOr.jav
rename to j2k/tests/testData/ast/binaryExpression/conditionalOr.ide.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/conditionalOr.jav b/j2k/tests/testData/ast/binaryExpression/conditionalOr.jav
new file mode 100644
index 00000000000..eacdafe8b93
--- /dev/null
+++ b/j2k/tests/testData/ast/binaryExpression/conditionalOr.jav
@@ -0,0 +1,2 @@
+//expression
+true || false
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/conditionalOr.kt b/j2k/tests/testData/ast/binaryExpression/conditionalOr.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/conditionalOr.kt
rename to j2k/tests/testData/ast/binaryExpression/conditionalOr.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/divide.jav b/j2k/tests/testData/ast/binaryExpression/divide.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/divide.jav
rename to j2k/tests/testData/ast/binaryExpression/divide.ide.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/divide.jav b/j2k/tests/testData/ast/binaryExpression/divide.jav
new file mode 100644
index 00000000000..544b48abf87
--- /dev/null
+++ b/j2k/tests/testData/ast/binaryExpression/divide.jav
@@ -0,0 +1,2 @@
+//expression
+1 / 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/divide.kt b/j2k/tests/testData/ast/binaryExpression/divide.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/divide.kt
rename to j2k/tests/testData/ast/binaryExpression/divide.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/and.jav b/j2k/tests/testData/ast/binaryExpression/expression/and.jav
deleted file mode 100644
index 8c519f1a5d3..00000000000
--- a/j2k/tests/testData/ast/binaryExpression/expression/and.jav
+++ /dev/null
@@ -1 +0,0 @@
-x & 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/or.jav b/j2k/tests/testData/ast/binaryExpression/expression/or.jav
deleted file mode 100644
index 27e32efa3d5..00000000000
--- a/j2k/tests/testData/ast/binaryExpression/expression/or.jav
+++ /dev/null
@@ -1 +0,0 @@
-x | 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/shiftLeft.jav b/j2k/tests/testData/ast/binaryExpression/expression/shiftLeft.jav
deleted file mode 100644
index 0fc7ee16109..00000000000
--- a/j2k/tests/testData/ast/binaryExpression/expression/shiftLeft.jav
+++ /dev/null
@@ -1 +0,0 @@
-x << 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/shiftRight.jav b/j2k/tests/testData/ast/binaryExpression/expression/shiftRight.jav
deleted file mode 100644
index 452d459f0be..00000000000
--- a/j2k/tests/testData/ast/binaryExpression/expression/shiftRight.jav
+++ /dev/null
@@ -1 +0,0 @@
-x >> 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/unsignedRightShift.jav b/j2k/tests/testData/ast/binaryExpression/expression/unsignedRightShift.jav
deleted file mode 100644
index 43c9914d750..00000000000
--- a/j2k/tests/testData/ast/binaryExpression/expression/unsignedRightShift.jav
+++ /dev/null
@@ -1 +0,0 @@
-x >>> 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/xor.jav b/j2k/tests/testData/ast/binaryExpression/expression/xor.jav
deleted file mode 100644
index 09b544bdf1e..00000000000
--- a/j2k/tests/testData/ast/binaryExpression/expression/xor.jav
+++ /dev/null
@@ -1 +0,0 @@
-x ^ 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/greaterThan.jav b/j2k/tests/testData/ast/binaryExpression/greaterThan.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/greaterThan.jav
rename to j2k/tests/testData/ast/binaryExpression/greaterThan.ide.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/greaterThan.jav b/j2k/tests/testData/ast/binaryExpression/greaterThan.jav
new file mode 100644
index 00000000000..60bf4462cc3
--- /dev/null
+++ b/j2k/tests/testData/ast/binaryExpression/greaterThan.jav
@@ -0,0 +1,2 @@
+//expression
+1 > 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/greaterThan.kt b/j2k/tests/testData/ast/binaryExpression/greaterThan.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/greaterThan.kt
rename to j2k/tests/testData/ast/binaryExpression/greaterThan.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/greaterThanEqual.jav b/j2k/tests/testData/ast/binaryExpression/greaterThanEqual.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/greaterThanEqual.jav
rename to j2k/tests/testData/ast/binaryExpression/greaterThanEqual.ide.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/greaterThanEqual.jav b/j2k/tests/testData/ast/binaryExpression/greaterThanEqual.jav
new file mode 100644
index 00000000000..bb97f70302a
--- /dev/null
+++ b/j2k/tests/testData/ast/binaryExpression/greaterThanEqual.jav
@@ -0,0 +1,2 @@
+//expression
+1 >= 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/greaterThanEqual.kt b/j2k/tests/testData/ast/binaryExpression/greaterThanEqual.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/greaterThanEqual.kt
rename to j2k/tests/testData/ast/binaryExpression/greaterThanEqual.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/lessThan.jav b/j2k/tests/testData/ast/binaryExpression/lessThan.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/lessThan.jav
rename to j2k/tests/testData/ast/binaryExpression/lessThan.ide.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/lessThan.jav b/j2k/tests/testData/ast/binaryExpression/lessThan.jav
new file mode 100644
index 00000000000..efba058f7c6
--- /dev/null
+++ b/j2k/tests/testData/ast/binaryExpression/lessThan.jav
@@ -0,0 +1,2 @@
+//expression
+1 < 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/lessThan.kt b/j2k/tests/testData/ast/binaryExpression/lessThan.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/lessThan.kt
rename to j2k/tests/testData/ast/binaryExpression/lessThan.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/lessThanEqual.jav b/j2k/tests/testData/ast/binaryExpression/lessThanEqual.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/lessThanEqual.jav
rename to j2k/tests/testData/ast/binaryExpression/lessThanEqual.ide.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/lessThanEqual.jav b/j2k/tests/testData/ast/binaryExpression/lessThanEqual.jav
new file mode 100644
index 00000000000..4c67181ef62
--- /dev/null
+++ b/j2k/tests/testData/ast/binaryExpression/lessThanEqual.jav
@@ -0,0 +1,2 @@
+//expression
+1 <= 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/lessThanEqual.kt b/j2k/tests/testData/ast/binaryExpression/lessThanEqual.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/lessThanEqual.kt
rename to j2k/tests/testData/ast/binaryExpression/lessThanEqual.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/minus.jav b/j2k/tests/testData/ast/binaryExpression/minus.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/minus.jav
rename to j2k/tests/testData/ast/binaryExpression/minus.ide.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/minus.jav b/j2k/tests/testData/ast/binaryExpression/minus.jav
new file mode 100644
index 00000000000..1d805af40a3
--- /dev/null
+++ b/j2k/tests/testData/ast/binaryExpression/minus.jav
@@ -0,0 +1,2 @@
+//expression
+1 - 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/minus.kt b/j2k/tests/testData/ast/binaryExpression/minus.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/minus.kt
rename to j2k/tests/testData/ast/binaryExpression/minus.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/multiply.jav b/j2k/tests/testData/ast/binaryExpression/multiply.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/multiply.jav
rename to j2k/tests/testData/ast/binaryExpression/multiply.ide.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/multiply.jav b/j2k/tests/testData/ast/binaryExpression/multiply.jav
new file mode 100644
index 00000000000..42e21f31964
--- /dev/null
+++ b/j2k/tests/testData/ast/binaryExpression/multiply.jav
@@ -0,0 +1,2 @@
+//expression
+1 * 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/multiply.kt b/j2k/tests/testData/ast/binaryExpression/multiply.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/multiply.kt
rename to j2k/tests/testData/ast/binaryExpression/multiply.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/or.kt b/j2k/tests/testData/ast/binaryExpression/or.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/or.kt
rename to j2k/tests/testData/ast/binaryExpression/or.ide.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/or.jav b/j2k/tests/testData/ast/binaryExpression/or.jav
new file mode 100644
index 00000000000..0159b923787
--- /dev/null
+++ b/j2k/tests/testData/ast/binaryExpression/or.jav
@@ -0,0 +1,2 @@
+//expression
+x | 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/or.kt b/j2k/tests/testData/ast/binaryExpression/or.kt
new file mode 100644
index 00000000000..ccad705935d
--- /dev/null
+++ b/j2k/tests/testData/ast/binaryExpression/or.kt
@@ -0,0 +1 @@
+x or 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/plus.jav b/j2k/tests/testData/ast/binaryExpression/plus.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/plus.jav
rename to j2k/tests/testData/ast/binaryExpression/plus.ide.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/plus.jav b/j2k/tests/testData/ast/binaryExpression/plus.jav
new file mode 100644
index 00000000000..2bc8ad83360
--- /dev/null
+++ b/j2k/tests/testData/ast/binaryExpression/plus.jav
@@ -0,0 +1,2 @@
+//expression
+1 + 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/plus.kt b/j2k/tests/testData/ast/binaryExpression/plus.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/plus.kt
rename to j2k/tests/testData/ast/binaryExpression/plus.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/remainder.jav b/j2k/tests/testData/ast/binaryExpression/remainder.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/remainder.jav
rename to j2k/tests/testData/ast/binaryExpression/remainder.ide.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/remainder.jav b/j2k/tests/testData/ast/binaryExpression/remainder.jav
new file mode 100644
index 00000000000..5edce937eaf
--- /dev/null
+++ b/j2k/tests/testData/ast/binaryExpression/remainder.jav
@@ -0,0 +1,2 @@
+//expression
+1 % 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/remainder.kt b/j2k/tests/testData/ast/binaryExpression/remainder.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/remainder.kt
rename to j2k/tests/testData/ast/binaryExpression/remainder.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/shiftLeft.kt b/j2k/tests/testData/ast/binaryExpression/shiftLeft.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/shiftLeft.kt
rename to j2k/tests/testData/ast/binaryExpression/shiftLeft.ide.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/shiftLeft.jav b/j2k/tests/testData/ast/binaryExpression/shiftLeft.jav
new file mode 100644
index 00000000000..38e4593e86c
--- /dev/null
+++ b/j2k/tests/testData/ast/binaryExpression/shiftLeft.jav
@@ -0,0 +1,2 @@
+//expression
+x << 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/shiftLeft.kt b/j2k/tests/testData/ast/binaryExpression/shiftLeft.kt
new file mode 100644
index 00000000000..face9a53255
--- /dev/null
+++ b/j2k/tests/testData/ast/binaryExpression/shiftLeft.kt
@@ -0,0 +1 @@
+x shl 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/shiftRight.kt b/j2k/tests/testData/ast/binaryExpression/shiftRight.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/shiftRight.kt
rename to j2k/tests/testData/ast/binaryExpression/shiftRight.ide.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/shiftRight.jav b/j2k/tests/testData/ast/binaryExpression/shiftRight.jav
new file mode 100644
index 00000000000..b5aa8e4ea34
--- /dev/null
+++ b/j2k/tests/testData/ast/binaryExpression/shiftRight.jav
@@ -0,0 +1,2 @@
+//expression
+x >> 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/shiftRight.kt b/j2k/tests/testData/ast/binaryExpression/shiftRight.kt
new file mode 100644
index 00000000000..771795abe88
--- /dev/null
+++ b/j2k/tests/testData/ast/binaryExpression/shiftRight.kt
@@ -0,0 +1 @@
+x shr 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/unsignedRightShift.kt b/j2k/tests/testData/ast/binaryExpression/unsignedRightShift.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/unsignedRightShift.kt
rename to j2k/tests/testData/ast/binaryExpression/unsignedRightShift.ide.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/unsignedRightShift.jav b/j2k/tests/testData/ast/binaryExpression/unsignedRightShift.jav
new file mode 100644
index 00000000000..93650d0559d
--- /dev/null
+++ b/j2k/tests/testData/ast/binaryExpression/unsignedRightShift.jav
@@ -0,0 +1,2 @@
+//expression
+x >>> 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/unsignedRightShift.kt b/j2k/tests/testData/ast/binaryExpression/unsignedRightShift.kt
new file mode 100644
index 00000000000..8b8c1f89e58
--- /dev/null
+++ b/j2k/tests/testData/ast/binaryExpression/unsignedRightShift.kt
@@ -0,0 +1 @@
+x.ushr(2)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/expression/xor.kt b/j2k/tests/testData/ast/binaryExpression/xor.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/binaryExpression/expression/xor.kt
rename to j2k/tests/testData/ast/binaryExpression/xor.ide.kt
diff --git a/j2k/tests/testData/ast/binaryExpression/xor.jav b/j2k/tests/testData/ast/binaryExpression/xor.jav
new file mode 100644
index 00000000000..a4d007cd388
--- /dev/null
+++ b/j2k/tests/testData/ast/binaryExpression/xor.jav
@@ -0,0 +1,2 @@
+//expression
+x ^ 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/binaryExpression/xor.kt b/j2k/tests/testData/ast/binaryExpression/xor.kt
new file mode 100644
index 00000000000..b8ad1650a31
--- /dev/null
+++ b/j2k/tests/testData/ast/binaryExpression/xor.kt
@@ -0,0 +1 @@
+x xor 2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/boxedType/Boxing.ide.kt b/j2k/tests/testData/ast/boxedType/Boxing.ide.kt
new file mode 100644
index 00000000000..ea407cbe835
--- /dev/null
+++ b/j2k/tests/testData/ast/boxedType/Boxing.ide.kt
@@ -0,0 +1,12 @@
+import java.util.ArrayList
+open class Boxing() {
+open fun test() : Unit {
+val i = 0
+val n = 0.0.toFloat()
+i = 1
+val j = i!!
+val k = i!! + 2
+i = null
+j = i!!
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/boxedType/file/Boxing.jav b/j2k/tests/testData/ast/boxedType/Boxing.jav
similarity index 97%
rename from j2k/tests/testData/ast/boxedType/file/Boxing.jav
rename to j2k/tests/testData/ast/boxedType/Boxing.jav
index 57648c23044..66bdbd72fe6 100644
--- a/j2k/tests/testData/ast/boxedType/file/Boxing.jav
+++ b/j2k/tests/testData/ast/boxedType/Boxing.jav
@@ -1,3 +1,4 @@
+//file
import java.util.ArrayList;
import java.util.List;
diff --git a/j2k/tests/testData/ast/boxedType/file/Boxing.kt b/j2k/tests/testData/ast/boxedType/Boxing.kt
similarity index 100%
rename from j2k/tests/testData/ast/boxedType/file/Boxing.kt
rename to j2k/tests/testData/ast/boxedType/Boxing.kt
diff --git a/j2k/tests/testData/ast/boxedType/boolean.ide.kt b/j2k/tests/testData/ast/boxedType/boolean.ide.kt
new file mode 100644
index 00000000000..428839e7260
--- /dev/null
+++ b/j2k/tests/testData/ast/boxedType/boolean.ide.kt
@@ -0,0 +1 @@
+val i = 10
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/boxedType/statement/boolean.jav b/j2k/tests/testData/ast/boxedType/boolean.jav
similarity index 55%
rename from j2k/tests/testData/ast/boxedType/statement/boolean.jav
rename to j2k/tests/testData/ast/boxedType/boolean.jav
index ccd666e6ee8..5ed417e2121 100644
--- a/j2k/tests/testData/ast/boxedType/statement/boolean.jav
+++ b/j2k/tests/testData/ast/boxedType/boolean.jav
@@ -1 +1,2 @@
+//statement
Boolean i = 10;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/boxedType/statement/boolean.kt b/j2k/tests/testData/ast/boxedType/boolean.kt
similarity index 100%
rename from j2k/tests/testData/ast/boxedType/statement/boolean.kt
rename to j2k/tests/testData/ast/boxedType/boolean.kt
diff --git a/j2k/tests/testData/ast/boxedType/byte.ide.kt b/j2k/tests/testData/ast/boxedType/byte.ide.kt
new file mode 100644
index 00000000000..428839e7260
--- /dev/null
+++ b/j2k/tests/testData/ast/boxedType/byte.ide.kt
@@ -0,0 +1 @@
+val i = 10
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/boxedType/statement/byte.jav b/j2k/tests/testData/ast/boxedType/byte.jav
similarity index 50%
rename from j2k/tests/testData/ast/boxedType/statement/byte.jav
rename to j2k/tests/testData/ast/boxedType/byte.jav
index 14a750b548b..5d37efa0bdd 100644
--- a/j2k/tests/testData/ast/boxedType/statement/byte.jav
+++ b/j2k/tests/testData/ast/boxedType/byte.jav
@@ -1 +1,2 @@
+//statement
Byte i = 10;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/boxedType/statement/byte.kt b/j2k/tests/testData/ast/boxedType/byte.kt
similarity index 100%
rename from j2k/tests/testData/ast/boxedType/statement/byte.kt
rename to j2k/tests/testData/ast/boxedType/byte.kt
diff --git a/j2k/tests/testData/ast/boxedType/character.ide.kt b/j2k/tests/testData/ast/boxedType/character.ide.kt
new file mode 100644
index 00000000000..428839e7260
--- /dev/null
+++ b/j2k/tests/testData/ast/boxedType/character.ide.kt
@@ -0,0 +1 @@
+val i = 10
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/boxedType/statement/character.jav b/j2k/tests/testData/ast/boxedType/character.jav
similarity index 58%
rename from j2k/tests/testData/ast/boxedType/statement/character.jav
rename to j2k/tests/testData/ast/boxedType/character.jav
index 611a419cc54..709196e4099 100644
--- a/j2k/tests/testData/ast/boxedType/statement/character.jav
+++ b/j2k/tests/testData/ast/boxedType/character.jav
@@ -1 +1,2 @@
+//statement
Character i = 10;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/boxedType/statement/character.kt b/j2k/tests/testData/ast/boxedType/character.kt
similarity index 100%
rename from j2k/tests/testData/ast/boxedType/statement/character.kt
rename to j2k/tests/testData/ast/boxedType/character.kt
diff --git a/j2k/tests/testData/ast/boxedType/double.ide.kt b/j2k/tests/testData/ast/boxedType/double.ide.kt
new file mode 100644
index 00000000000..428839e7260
--- /dev/null
+++ b/j2k/tests/testData/ast/boxedType/double.ide.kt
@@ -0,0 +1 @@
+val i = 10
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/boxedType/statement/double.jav b/j2k/tests/testData/ast/boxedType/double.jav
similarity index 53%
rename from j2k/tests/testData/ast/boxedType/statement/double.jav
rename to j2k/tests/testData/ast/boxedType/double.jav
index 691af6d77f6..a51a40f5bc4 100644
--- a/j2k/tests/testData/ast/boxedType/statement/double.jav
+++ b/j2k/tests/testData/ast/boxedType/double.jav
@@ -1 +1,2 @@
+//statement
Double i = 10;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/boxedType/statement/double.kt b/j2k/tests/testData/ast/boxedType/double.kt
similarity index 100%
rename from j2k/tests/testData/ast/boxedType/statement/double.kt
rename to j2k/tests/testData/ast/boxedType/double.kt
diff --git a/j2k/tests/testData/ast/boxedType/float.ide.kt b/j2k/tests/testData/ast/boxedType/float.ide.kt
new file mode 100644
index 00000000000..428839e7260
--- /dev/null
+++ b/j2k/tests/testData/ast/boxedType/float.ide.kt
@@ -0,0 +1 @@
+val i = 10
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/boxedType/statement/float.jav b/j2k/tests/testData/ast/boxedType/float.jav
similarity index 52%
rename from j2k/tests/testData/ast/boxedType/statement/float.jav
rename to j2k/tests/testData/ast/boxedType/float.jav
index c283bbbe5fa..112afe5d665 100644
--- a/j2k/tests/testData/ast/boxedType/statement/float.jav
+++ b/j2k/tests/testData/ast/boxedType/float.jav
@@ -1 +1,2 @@
+//statement
Float i = 10;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/boxedType/statement/float.kt b/j2k/tests/testData/ast/boxedType/float.kt
similarity index 100%
rename from j2k/tests/testData/ast/boxedType/statement/float.kt
rename to j2k/tests/testData/ast/boxedType/float.kt
diff --git a/j2k/tests/testData/ast/boxedType/integer.ide.kt b/j2k/tests/testData/ast/boxedType/integer.ide.kt
new file mode 100644
index 00000000000..428839e7260
--- /dev/null
+++ b/j2k/tests/testData/ast/boxedType/integer.ide.kt
@@ -0,0 +1 @@
+val i = 10
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/boxedType/statement/integer.jav b/j2k/tests/testData/ast/boxedType/integer.jav
similarity index 55%
rename from j2k/tests/testData/ast/boxedType/statement/integer.jav
rename to j2k/tests/testData/ast/boxedType/integer.jav
index ce81c24fe40..a9671746ede 100644
--- a/j2k/tests/testData/ast/boxedType/statement/integer.jav
+++ b/j2k/tests/testData/ast/boxedType/integer.jav
@@ -1 +1,2 @@
+//statement
Integer i = 10;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/boxedType/statement/integer.kt b/j2k/tests/testData/ast/boxedType/integer.kt
similarity index 100%
rename from j2k/tests/testData/ast/boxedType/statement/integer.kt
rename to j2k/tests/testData/ast/boxedType/integer.kt
diff --git a/j2k/tests/testData/ast/boxedType/kt-671.ide.kt b/j2k/tests/testData/ast/boxedType/kt-671.ide.kt
new file mode 100644
index 00000000000..35dabbcaebf
--- /dev/null
+++ b/j2k/tests/testData/ast/boxedType/kt-671.ide.kt
@@ -0,0 +1,8 @@
+package demo
+open class Test() {
+open fun test() : Unit {
+val i = Integer.valueOf(100)
+val s = 3
+val ss = java.lang.Short.valueOf(s)
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/boxedType/file/kt-671.jav b/j2k/tests/testData/ast/boxedType/kt-671.jav
similarity index 95%
rename from j2k/tests/testData/ast/boxedType/file/kt-671.jav
rename to j2k/tests/testData/ast/boxedType/kt-671.jav
index c0ba6a8bc30..9cd9a275a31 100644
--- a/j2k/tests/testData/ast/boxedType/file/kt-671.jav
+++ b/j2k/tests/testData/ast/boxedType/kt-671.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class Test {
diff --git a/j2k/tests/testData/ast/boxedType/file/kt-671.kt b/j2k/tests/testData/ast/boxedType/kt-671.kt
similarity index 100%
rename from j2k/tests/testData/ast/boxedType/file/kt-671.kt
rename to j2k/tests/testData/ast/boxedType/kt-671.kt
diff --git a/j2k/tests/testData/ast/boxedType/long.ide.kt b/j2k/tests/testData/ast/boxedType/long.ide.kt
new file mode 100644
index 00000000000..428839e7260
--- /dev/null
+++ b/j2k/tests/testData/ast/boxedType/long.ide.kt
@@ -0,0 +1 @@
+val i = 10
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/boxedType/statement/long.jav b/j2k/tests/testData/ast/boxedType/long.jav
similarity index 50%
rename from j2k/tests/testData/ast/boxedType/statement/long.jav
rename to j2k/tests/testData/ast/boxedType/long.jav
index 9ca58295d8a..9d1a5e4f4a6 100644
--- a/j2k/tests/testData/ast/boxedType/statement/long.jav
+++ b/j2k/tests/testData/ast/boxedType/long.jav
@@ -1 +1,2 @@
+//statement
Long i = 10;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/boxedType/statement/long.kt b/j2k/tests/testData/ast/boxedType/long.kt
similarity index 100%
rename from j2k/tests/testData/ast/boxedType/statement/long.kt
rename to j2k/tests/testData/ast/boxedType/long.kt
diff --git a/j2k/tests/testData/ast/boxedType/object.ide.kt b/j2k/tests/testData/ast/boxedType/object.ide.kt
new file mode 100644
index 00000000000..428839e7260
--- /dev/null
+++ b/j2k/tests/testData/ast/boxedType/object.ide.kt
@@ -0,0 +1 @@
+val i = 10
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/boxedType/statement/object.jav b/j2k/tests/testData/ast/boxedType/object.jav
similarity index 53%
rename from j2k/tests/testData/ast/boxedType/statement/object.jav
rename to j2k/tests/testData/ast/boxedType/object.jav
index ca135870cd6..a6e1301e127 100644
--- a/j2k/tests/testData/ast/boxedType/statement/object.jav
+++ b/j2k/tests/testData/ast/boxedType/object.jav
@@ -1 +1,2 @@
+//statement
Object i = 10;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/boxedType/statement/object.kt b/j2k/tests/testData/ast/boxedType/object.kt
similarity index 100%
rename from j2k/tests/testData/ast/boxedType/statement/object.kt
rename to j2k/tests/testData/ast/boxedType/object.kt
diff --git a/j2k/tests/testData/ast/boxedType/short.ide.kt b/j2k/tests/testData/ast/boxedType/short.ide.kt
new file mode 100644
index 00000000000..428839e7260
--- /dev/null
+++ b/j2k/tests/testData/ast/boxedType/short.ide.kt
@@ -0,0 +1 @@
+val i = 10
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/boxedType/statement/short.jav b/j2k/tests/testData/ast/boxedType/short.jav
similarity index 52%
rename from j2k/tests/testData/ast/boxedType/statement/short.jav
rename to j2k/tests/testData/ast/boxedType/short.jav
index 1364e5c8dbb..dfe0f2e2928 100644
--- a/j2k/tests/testData/ast/boxedType/statement/short.jav
+++ b/j2k/tests/testData/ast/boxedType/short.jav
@@ -1 +1,2 @@
+//statement
Short i = 10;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/boxedType/statement/short.kt b/j2k/tests/testData/ast/boxedType/short.kt
similarity index 100%
rename from j2k/tests/testData/ast/boxedType/statement/short.kt
rename to j2k/tests/testData/ast/boxedType/short.kt
diff --git a/j2k/tests/testData/ast/breakStatement/statement/breakWithLabel.kt b/j2k/tests/testData/ast/breakStatement/breakWithLabel.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/breakStatement/statement/breakWithLabel.kt
rename to j2k/tests/testData/ast/breakStatement/breakWithLabel.ide.kt
diff --git a/j2k/tests/testData/ast/breakStatement/statement/breakWithLabel.jav b/j2k/tests/testData/ast/breakStatement/breakWithLabel.jav
similarity index 50%
rename from j2k/tests/testData/ast/breakStatement/statement/breakWithLabel.jav
rename to j2k/tests/testData/ast/breakStatement/breakWithLabel.jav
index b2375dc68b4..01d492bed67 100644
--- a/j2k/tests/testData/ast/breakStatement/statement/breakWithLabel.jav
+++ b/j2k/tests/testData/ast/breakStatement/breakWithLabel.jav
@@ -1 +1,2 @@
+//statement
break label;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/breakStatement/breakWithLabel.kt b/j2k/tests/testData/ast/breakStatement/breakWithLabel.kt
new file mode 100644
index 00000000000..02d8620a138
--- /dev/null
+++ b/j2k/tests/testData/ast/breakStatement/breakWithLabel.kt
@@ -0,0 +1 @@
+break@label
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/breakStatement/statement/breakWithoutLabel.kt b/j2k/tests/testData/ast/breakStatement/breakWithoutLabel.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/breakStatement/statement/breakWithoutLabel.kt
rename to j2k/tests/testData/ast/breakStatement/breakWithoutLabel.ide.kt
diff --git a/j2k/tests/testData/ast/breakStatement/breakWithoutLabel.jav b/j2k/tests/testData/ast/breakStatement/breakWithoutLabel.jav
new file mode 100644
index 00000000000..087f581655a
--- /dev/null
+++ b/j2k/tests/testData/ast/breakStatement/breakWithoutLabel.jav
@@ -0,0 +1,2 @@
+//statement
+break;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/breakStatement/breakWithoutLabel.kt b/j2k/tests/testData/ast/breakStatement/breakWithoutLabel.kt
new file mode 100644
index 00000000000..5da70343a46
--- /dev/null
+++ b/j2k/tests/testData/ast/breakStatement/breakWithoutLabel.kt
@@ -0,0 +1 @@
+break
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/breakStatement/statement/breakWithoutLabel.jav b/j2k/tests/testData/ast/breakStatement/statement/breakWithoutLabel.jav
deleted file mode 100644
index 8cb76cf02d7..00000000000
--- a/j2k/tests/testData/ast/breakStatement/statement/breakWithoutLabel.jav
+++ /dev/null
@@ -1 +0,0 @@
-break;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.ide.kt
new file mode 100644
index 00000000000..ea0692f134d
--- /dev/null
+++ b/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.ide.kt
@@ -0,0 +1,10 @@
+open class Library() {
+class object {
+val ourOut : java.io.PrintStream = 0
+}
+}
+open class User() {
+open fun main() : Unit {
+Library.ourOut.print()
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/callChainExpression/file/libraryFieldCall.jav b/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.jav
similarity index 94%
rename from j2k/tests/testData/ast/callChainExpression/file/libraryFieldCall.jav
rename to j2k/tests/testData/ast/callChainExpression/libraryFieldCall.jav
index 2278e35a1bc..6e9cd081638 100644
--- a/j2k/tests/testData/ast/callChainExpression/file/libraryFieldCall.jav
+++ b/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.jav
@@ -1,3 +1,4 @@
+//file
class Library {
final static java.io.PrintStream ourOut;
}
diff --git a/j2k/tests/testData/ast/callChainExpression/file/libraryFieldCall.kt b/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt
similarity index 100%
rename from j2k/tests/testData/ast/callChainExpression/file/libraryFieldCall.kt
rename to j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt
diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt
new file mode 100644
index 00000000000..59eb308bf6e
--- /dev/null
+++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt
@@ -0,0 +1,15 @@
+open class Library() {
+class object {
+open fun call() : Unit {
+}
+open fun getString() : String {
+return ""
+}
+}
+}
+open class User() {
+open fun main() : Unit {
+Library.call()
+Library.getString().isEmpty()
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/callChainExpression/file/libraryMethodCall.jav b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.jav
similarity index 96%
rename from j2k/tests/testData/ast/callChainExpression/file/libraryMethodCall.jav
rename to j2k/tests/testData/ast/callChainExpression/libraryMethodCall.jav
index 265696edc72..1b77d13c7d4 100644
--- a/j2k/tests/testData/ast/callChainExpression/file/libraryMethodCall.jav
+++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.jav
@@ -1,3 +1,4 @@
+//file
class Library {
static void call() {}
diff --git a/j2k/tests/testData/ast/callChainExpression/file/libraryMethodCall.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt
similarity index 100%
rename from j2k/tests/testData/ast/callChainExpression/file/libraryMethodCall.kt
rename to j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt
diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt
new file mode 100644
index 00000000000..2704eb95a00
--- /dev/null
+++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt
@@ -0,0 +1,16 @@
+open class Library() {
+open fun call() : Unit {
+}
+open fun getString() : String {
+return ""
+}
+}
+open class User() {
+open fun main() : Unit {
+val lib = Library()
+lib.call()
+lib.getString().isEmpty()
+Library().call()
+Library().getString().isEmpty()
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/callChainExpression/file/libraryMethodCallFromInstance.jav b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.jav
similarity index 97%
rename from j2k/tests/testData/ast/callChainExpression/file/libraryMethodCallFromInstance.jav
rename to j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.jav
index 3a22446070d..d874e24e06a 100644
--- a/j2k/tests/testData/ast/callChainExpression/file/libraryMethodCallFromInstance.jav
+++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.jav
@@ -1,3 +1,4 @@
+//file
class Library {
void call() {}
diff --git a/j2k/tests/testData/ast/callChainExpression/file/libraryMethodCallFromInstance.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt
similarity index 100%
rename from j2k/tests/testData/ast/callChainExpression/file/libraryMethodCallFromInstance.kt
rename to j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt
diff --git a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.ide.kt
new file mode 100644
index 00000000000..fe3c12aee65
--- /dev/null
+++ b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.ide.kt
@@ -0,0 +1,8 @@
+open class Library() {
+public val myString : String = 0
+}
+open class User() {
+open fun main() : Unit {
+Library.myString.isEmpty()
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/callChainExpression/file/libraryStringFieldCall.jav b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.jav
similarity index 94%
rename from j2k/tests/testData/ast/callChainExpression/file/libraryStringFieldCall.jav
rename to j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.jav
index 67d826da1d9..bd434be3156 100644
--- a/j2k/tests/testData/ast/callChainExpression/file/libraryStringFieldCall.jav
+++ b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.jav
@@ -1,3 +1,4 @@
+//file
class Library {
final public String myString;
}
diff --git a/j2k/tests/testData/ast/callChainExpression/file/libraryStringFieldCall.kt b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt
similarity index 100%
rename from j2k/tests/testData/ast/callChainExpression/file/libraryStringFieldCall.kt
rename to j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt
diff --git a/j2k/tests/testData/ast/callChainExpression/sout.ide.kt b/j2k/tests/testData/ast/callChainExpression/sout.ide.kt
new file mode 100644
index 00000000000..0dfec573287
--- /dev/null
+++ b/j2k/tests/testData/ast/callChainExpression/sout.ide.kt
@@ -0,0 +1 @@
+System.out.println("Hello, world")
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/callChainExpression/statement/sout.jav b/j2k/tests/testData/ast/callChainExpression/sout.jav
similarity index 74%
rename from j2k/tests/testData/ast/callChainExpression/statement/sout.jav
rename to j2k/tests/testData/ast/callChainExpression/sout.jav
index a16cbe89562..551cf4099f6 100644
--- a/j2k/tests/testData/ast/callChainExpression/statement/sout.jav
+++ b/j2k/tests/testData/ast/callChainExpression/sout.jav
@@ -1 +1,2 @@
+//statement
System.out.println("Hello, world");
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/callChainExpression/statement/sout.kt b/j2k/tests/testData/ast/callChainExpression/sout.kt
similarity index 100%
rename from j2k/tests/testData/ast/callChainExpression/statement/sout.kt
rename to j2k/tests/testData/ast/callChainExpression/sout.kt
diff --git a/j2k/tests/testData/ast/class/ClassShadowing.ide.kt b/j2k/tests/testData/ast/class/ClassShadowing.ide.kt
new file mode 100644
index 00000000000..cf46ffc1809
--- /dev/null
+++ b/j2k/tests/testData/ast/class/ClassShadowing.ide.kt
@@ -0,0 +1,17 @@
+package test
+public open class Short() {
+class object {
+public open fun valueOf(value : String) : Short {
+return Short()
+}
+}
+}
+open class Test() {
+class object {
+public open fun test() : Unit {
+test.Short.valueOf("1")
+test.Short.valueOf("1")
+java.lang.Short.valueOf("1")
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/file/ClassShadowing.jav b/j2k/tests/testData/ast/class/ClassShadowing.jav
similarity index 97%
rename from j2k/tests/testData/ast/class/file/ClassShadowing.jav
rename to j2k/tests/testData/ast/class/ClassShadowing.jav
index 9cd425af6ea..667534f4722 100644
--- a/j2k/tests/testData/ast/class/file/ClassShadowing.jav
+++ b/j2k/tests/testData/ast/class/ClassShadowing.jav
@@ -1,3 +1,4 @@
+//file
package test;
public class Short {
diff --git a/j2k/tests/testData/ast/class/file/ClassShadowing.kt b/j2k/tests/testData/ast/class/ClassShadowing.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/file/ClassShadowing.kt
rename to j2k/tests/testData/ast/class/ClassShadowing.kt
diff --git a/j2k/tests/testData/ast/class/class/abstractClass.kt b/j2k/tests/testData/ast/class/abstractClass.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/class/abstractClass.kt
rename to j2k/tests/testData/ast/class/abstractClass.ide.kt
diff --git a/j2k/tests/testData/ast/class/class/abstractClass.jav b/j2k/tests/testData/ast/class/abstractClass.jav
similarity index 93%
rename from j2k/tests/testData/ast/class/class/abstractClass.jav
rename to j2k/tests/testData/ast/class/abstractClass.jav
index 0ff487db135..aeca5891800 100644
--- a/j2k/tests/testData/ast/class/class/abstractClass.jav
+++ b/j2k/tests/testData/ast/class/abstractClass.jav
@@ -1,3 +1,4 @@
+//class
abstract class A {
abstract void callme();
diff --git a/j2k/tests/testData/ast/class/abstractClass.kt b/j2k/tests/testData/ast/class/abstractClass.kt
new file mode 100644
index 00000000000..e7fb293e5af
--- /dev/null
+++ b/j2k/tests/testData/ast/class/abstractClass.kt
@@ -0,0 +1,6 @@
+abstract class A() {
+abstract fun callme() : Unit
+open fun callmetoo() : Unit {
+print("This is a concrete method.")
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/abstractClassShape.ide.kt b/j2k/tests/testData/ast/class/abstractClassShape.ide.kt
new file mode 100644
index 00000000000..33a191ed8d8
--- /dev/null
+++ b/j2k/tests/testData/ast/class/abstractClassShape.ide.kt
@@ -0,0 +1,10 @@
+abstract class Shape() {
+public var color : String = 0
+public open fun setColor(c : String) : Unit {
+color = c
+}
+public open fun getColor() : String {
+return color
+}
+public abstract fun area() : Double
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/class/abstractClassShape.jav b/j2k/tests/testData/ast/class/abstractClassShape.jav
similarity index 96%
rename from j2k/tests/testData/ast/class/class/abstractClassShape.jav
rename to j2k/tests/testData/ast/class/abstractClassShape.jav
index a6b01569bbb..5e31b50b4e8 100644
--- a/j2k/tests/testData/ast/class/class/abstractClassShape.jav
+++ b/j2k/tests/testData/ast/class/abstractClassShape.jav
@@ -1,3 +1,4 @@
+//class
abstract class Shape {
public String color;
public Shape() {
diff --git a/j2k/tests/testData/ast/class/class/abstractClassShape.kt b/j2k/tests/testData/ast/class/abstractClassShape.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/class/abstractClassShape.kt
rename to j2k/tests/testData/ast/class/abstractClassShape.kt
diff --git a/j2k/tests/testData/ast/class/class/class.kt b/j2k/tests/testData/ast/class/class.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/class/class.kt
rename to j2k/tests/testData/ast/class/class.ide.kt
diff --git a/j2k/tests/testData/ast/class/class/class.jav b/j2k/tests/testData/ast/class/class.jav
similarity index 61%
rename from j2k/tests/testData/ast/class/class/class.jav
rename to j2k/tests/testData/ast/class/class.jav
index 183c3f5b3be..6efabff9cf5 100644
--- a/j2k/tests/testData/ast/class/class/class.jav
+++ b/j2k/tests/testData/ast/class/class.jav
@@ -1 +1,2 @@
+//class
class Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/class/internalClass.kt b/j2k/tests/testData/ast/class/class.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/class/internalClass.kt
rename to j2k/tests/testData/ast/class/class.kt
diff --git a/j2k/tests/testData/ast/class/classWithEmptyMethods.ide.kt b/j2k/tests/testData/ast/class/classWithEmptyMethods.ide.kt
new file mode 100644
index 00000000000..362017eef2c
--- /dev/null
+++ b/j2k/tests/testData/ast/class/classWithEmptyMethods.ide.kt
@@ -0,0 +1,8 @@
+class T() {
+fun main() : Unit {
+}
+fun i() : Int {
+}
+fun s() : String {
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/class/classWithEmptyMethods.jav b/j2k/tests/testData/ast/class/classWithEmptyMethods.jav
similarity index 86%
rename from j2k/tests/testData/ast/class/class/classWithEmptyMethods.jav
rename to j2k/tests/testData/ast/class/classWithEmptyMethods.jav
index 49ec763ae8f..a683e9f6b38 100644
--- a/j2k/tests/testData/ast/class/class/classWithEmptyMethods.jav
+++ b/j2k/tests/testData/ast/class/classWithEmptyMethods.jav
@@ -1 +1,2 @@
+//class
final class T {void main() {}int i() {}String s() {}}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/class/classWithEmptyMethods.kt b/j2k/tests/testData/ast/class/classWithEmptyMethods.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/class/classWithEmptyMethods.kt
rename to j2k/tests/testData/ast/class/classWithEmptyMethods.kt
diff --git a/j2k/tests/testData/ast/class/classWithFields.ide.kt b/j2k/tests/testData/ast/class/classWithFields.ide.kt
new file mode 100644
index 00000000000..2ba81d6077f
--- /dev/null
+++ b/j2k/tests/testData/ast/class/classWithFields.ide.kt
@@ -0,0 +1,4 @@
+class T() {
+var a : String = "abc"
+var b : Int = 10
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/class/classWithFields.jav b/j2k/tests/testData/ast/class/classWithFields.jav
similarity index 84%
rename from j2k/tests/testData/ast/class/class/classWithFields.jav
rename to j2k/tests/testData/ast/class/classWithFields.jav
index c7059937021..8613fc9b10d 100644
--- a/j2k/tests/testData/ast/class/class/classWithFields.jav
+++ b/j2k/tests/testData/ast/class/classWithFields.jav
@@ -1 +1,2 @@
+//class
final class T {String a = "abc";int b = 10;}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/class/classWithFields.kt b/j2k/tests/testData/ast/class/classWithFields.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/class/classWithFields.kt
rename to j2k/tests/testData/ast/class/classWithFields.kt
diff --git a/j2k/tests/testData/ast/class/classWithMultiplyFields.ide.kt b/j2k/tests/testData/ast/class/classWithMultiplyFields.ide.kt
new file mode 100644
index 00000000000..8aa8aa3526e
--- /dev/null
+++ b/j2k/tests/testData/ast/class/classWithMultiplyFields.ide.kt
@@ -0,0 +1,5 @@
+class T() {
+var a : String = 0
+var b : String = 0
+var c : String = "abc"
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/class/classWithMultiplyFields.jav b/j2k/tests/testData/ast/class/classWithMultiplyFields.jav
similarity index 82%
rename from j2k/tests/testData/ast/class/class/classWithMultiplyFields.jav
rename to j2k/tests/testData/ast/class/classWithMultiplyFields.jav
index 6fd5e1a9865..7e246115f46 100644
--- a/j2k/tests/testData/ast/class/class/classWithMultiplyFields.jav
+++ b/j2k/tests/testData/ast/class/classWithMultiplyFields.jav
@@ -1 +1,2 @@
+//class
final class T {String a, b, c = "abc";}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/class/classWithMultiplyFields.kt b/j2k/tests/testData/ast/class/classWithMultiplyFields.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/class/classWithMultiplyFields.kt
rename to j2k/tests/testData/ast/class/classWithMultiplyFields.kt
diff --git a/j2k/tests/testData/ast/class/class/emptyClass.kt b/j2k/tests/testData/ast/class/emptyClass.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/class/emptyClass.kt
rename to j2k/tests/testData/ast/class/emptyClass.ide.kt
diff --git a/j2k/tests/testData/ast/class/class/emptyClass.jav b/j2k/tests/testData/ast/class/emptyClass.jav
similarity index 66%
rename from j2k/tests/testData/ast/class/class/emptyClass.jav
rename to j2k/tests/testData/ast/class/emptyClass.jav
index 151119ab6a7..b93de2b2c46 100644
--- a/j2k/tests/testData/ast/class/class/emptyClass.jav
+++ b/j2k/tests/testData/ast/class/emptyClass.jav
@@ -1 +1,2 @@
+//class
final class A {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/emptyClass.kt b/j2k/tests/testData/ast/class/emptyClass.kt
new file mode 100644
index 00000000000..161cb193d08
--- /dev/null
+++ b/j2k/tests/testData/ast/class/emptyClass.kt
@@ -0,0 +1,2 @@
+class A() {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.kt b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.kt
rename to j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.ide.kt
diff --git a/j2k/tests/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.jav b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.jav
similarity index 84%
rename from j2k/tests/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.jav
rename to j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.jav
index b306e379a44..94d075a5b1a 100644
--- a/j2k/tests/testData/ast/class/class/extendsOneClassAndImplementsOneInterface.jav
+++ b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.jav
@@ -1 +1,2 @@
+//class
final class A extends Base implements I {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.kt b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.kt
new file mode 100644
index 00000000000..7206c054962
--- /dev/null
+++ b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.kt
@@ -0,0 +1,2 @@
+class A() : Base(), I {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.kt b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.kt
rename to j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.ide.kt
diff --git a/j2k/tests/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.jav b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.jav
similarity index 86%
rename from j2k/tests/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.jav
rename to j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.jav
index dd454cafdb7..e51899fd468 100644
--- a/j2k/tests/testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.jav
+++ b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.jav
@@ -1 +1,2 @@
+//class
final class A extends Base implements I0, I1, I2 {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.kt b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.kt
new file mode 100644
index 00000000000..7812e054bda
--- /dev/null
+++ b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.kt
@@ -0,0 +1,2 @@
+class A() : Base(), I0, I1, I2 {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/class/finalClass.kt b/j2k/tests/testData/ast/class/finalClass.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/class/finalClass.kt
rename to j2k/tests/testData/ast/class/finalClass.ide.kt
diff --git a/j2k/tests/testData/ast/class/class/finalClass.jav b/j2k/tests/testData/ast/class/finalClass.jav
similarity index 70%
rename from j2k/tests/testData/ast/class/class/finalClass.jav
rename to j2k/tests/testData/ast/class/finalClass.jav
index 5071bba9931..d374f552643 100644
--- a/j2k/tests/testData/ast/class/class/finalClass.jav
+++ b/j2k/tests/testData/ast/class/finalClass.jav
@@ -1 +1,2 @@
+//class
final class Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/finalClass.kt b/j2k/tests/testData/ast/class/finalClass.kt
new file mode 100644
index 00000000000..98c16b37053
--- /dev/null
+++ b/j2k/tests/testData/ast/class/finalClass.kt
@@ -0,0 +1,2 @@
+class Test() {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/class/genericClass.kt b/j2k/tests/testData/ast/class/genericClass.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/class/genericClass.kt
rename to j2k/tests/testData/ast/class/genericClass.ide.kt
diff --git a/j2k/tests/testData/ast/class/class/genericClass.jav b/j2k/tests/testData/ast/class/genericClass.jav
similarity index 76%
rename from j2k/tests/testData/ast/class/class/genericClass.jav
rename to j2k/tests/testData/ast/class/genericClass.jav
index b18123be7cb..44a991acb0c 100644
--- a/j2k/tests/testData/ast/class/class/genericClass.jav
+++ b/j2k/tests/testData/ast/class/genericClass.jav
@@ -1 +1,2 @@
+//class
final class Entry {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/genericClass.kt b/j2k/tests/testData/ast/class/genericClass.kt
new file mode 100644
index 00000000000..f3565e5ec30
--- /dev/null
+++ b/j2k/tests/testData/ast/class/genericClass.kt
@@ -0,0 +1,2 @@
+class Entry() {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/class/innerEmptyClass.kt b/j2k/tests/testData/ast/class/innerEmptyClass.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/class/innerEmptyClass.kt
rename to j2k/tests/testData/ast/class/innerEmptyClass.ide.kt
diff --git a/j2k/tests/testData/ast/class/class/innerEmptyClass.jav b/j2k/tests/testData/ast/class/innerEmptyClass.jav
similarity index 83%
rename from j2k/tests/testData/ast/class/class/innerEmptyClass.jav
rename to j2k/tests/testData/ast/class/innerEmptyClass.jav
index 3053641622a..40260c381f7 100644
--- a/j2k/tests/testData/ast/class/class/innerEmptyClass.jav
+++ b/j2k/tests/testData/ast/class/innerEmptyClass.jav
@@ -1 +1,2 @@
+//class
final class A { inner final class B {} }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/innerEmptyClass.kt b/j2k/tests/testData/ast/class/innerEmptyClass.kt
new file mode 100644
index 00000000000..983e65e757e
--- /dev/null
+++ b/j2k/tests/testData/ast/class/innerEmptyClass.kt
@@ -0,0 +1,4 @@
+class A() {
+class B() {
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/class/innerStaticClass.kt b/j2k/tests/testData/ast/class/innerStaticClass.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/class/innerStaticClass.kt
rename to j2k/tests/testData/ast/class/innerStaticClass.ide.kt
diff --git a/j2k/tests/testData/ast/class/class/innerStaticClass.jav b/j2k/tests/testData/ast/class/innerStaticClass.jav
similarity index 82%
rename from j2k/tests/testData/ast/class/class/innerStaticClass.jav
rename to j2k/tests/testData/ast/class/innerStaticClass.jav
index d0885630764..b11106f661e 100644
--- a/j2k/tests/testData/ast/class/class/innerStaticClass.jav
+++ b/j2k/tests/testData/ast/class/innerStaticClass.jav
@@ -1 +1,2 @@
+//class
final class S { static class Inner {} }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/innerStaticClass.kt b/j2k/tests/testData/ast/class/innerStaticClass.kt
new file mode 100644
index 00000000000..dc0ae41dff2
--- /dev/null
+++ b/j2k/tests/testData/ast/class/innerStaticClass.kt
@@ -0,0 +1,6 @@
+class S() {
+class object {
+open class Inner() {
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/internalClass.ide.kt b/j2k/tests/testData/ast/class/internalClass.ide.kt
new file mode 100644
index 00000000000..bc29d4b27a1
--- /dev/null
+++ b/j2k/tests/testData/ast/class/internalClass.ide.kt
@@ -0,0 +1,2 @@
+open class Test() {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/class/internalClass.jav b/j2k/tests/testData/ast/class/internalClass.jav
similarity index 61%
rename from j2k/tests/testData/ast/class/class/internalClass.jav
rename to j2k/tests/testData/ast/class/internalClass.jav
index 183c3f5b3be..6efabff9cf5 100644
--- a/j2k/tests/testData/ast/class/class/internalClass.jav
+++ b/j2k/tests/testData/ast/class/internalClass.jav
@@ -1 +1,2 @@
+//class
class Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/internalClass.kt b/j2k/tests/testData/ast/class/internalClass.kt
new file mode 100644
index 00000000000..bc29d4b27a1
--- /dev/null
+++ b/j2k/tests/testData/ast/class/internalClass.kt
@@ -0,0 +1,2 @@
+open class Test() {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/kt-639.ide.kt b/j2k/tests/testData/ast/class/kt-639.ide.kt
new file mode 100644
index 00000000000..cb89edb78ab
--- /dev/null
+++ b/j2k/tests/testData/ast/class/kt-639.ide.kt
@@ -0,0 +1,22 @@
+package demo
+import java.util.HashMap
+open class Test() {
+class object {
+open fun init() : Test {
+val __ = Test()
+return __
+}
+open fun init(s : String) : Test {
+val __ = Test()
+return __
+}
+}
+}
+open class User() {
+open fun main() : Unit {
+val m = HashMap(1)
+val m2 = HashMap(10)
+val t1 = Test.init()
+val t2 = Test.init("")
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/file/kt-639.jav b/j2k/tests/testData/ast/class/kt-639.jav
similarity index 97%
rename from j2k/tests/testData/ast/class/file/kt-639.jav
rename to j2k/tests/testData/ast/class/kt-639.jav
index 102ae0c907b..ff0db9e2496 100644
--- a/j2k/tests/testData/ast/class/file/kt-639.jav
+++ b/j2k/tests/testData/ast/class/kt-639.jav
@@ -1,3 +1,4 @@
+//file
package demo;
import java.util.HashMap;
diff --git a/j2k/tests/testData/ast/class/file/kt-639.kt b/j2k/tests/testData/ast/class/kt-639.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/file/kt-639.kt
rename to j2k/tests/testData/ast/class/kt-639.kt
diff --git a/j2k/tests/testData/ast/class/class/oneStaticFieldOneNonStatic.kt b/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/class/oneStaticFieldOneNonStatic.kt
rename to j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.ide.kt
diff --git a/j2k/tests/testData/ast/class/class/oneStaticFieldOneNonStatic.jav b/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.jav
similarity index 89%
rename from j2k/tests/testData/ast/class/class/oneStaticFieldOneNonStatic.jav
rename to j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.jav
index 0e0b14688a4..dad23b91318 100644
--- a/j2k/tests/testData/ast/class/class/oneStaticFieldOneNonStatic.jav
+++ b/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.jav
@@ -1 +1,2 @@
+//class
final class S { boolean sB() { return true; } static int myI = 10; }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.kt b/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.kt
new file mode 100644
index 00000000000..7be6598f76a
--- /dev/null
+++ b/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.kt
@@ -0,0 +1,8 @@
+class S() {
+fun sB() : Boolean {
+return true
+}
+class object {
+var myI : Int = 10
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/class/oneStaticMethod.kt b/j2k/tests/testData/ast/class/oneStaticMethod.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/class/oneStaticMethod.kt
rename to j2k/tests/testData/ast/class/oneStaticMethod.ide.kt
diff --git a/j2k/tests/testData/ast/class/class/oneStaticMethod.jav b/j2k/tests/testData/ast/class/oneStaticMethod.jav
similarity index 88%
rename from j2k/tests/testData/ast/class/class/oneStaticMethod.jav
rename to j2k/tests/testData/ast/class/oneStaticMethod.jav
index 98884d114b7..a23e0cf0a61 100644
--- a/j2k/tests/testData/ast/class/class/oneStaticMethod.jav
+++ b/j2k/tests/testData/ast/class/oneStaticMethod.jav
@@ -1 +1,2 @@
+//class
final class S { static boolean staticF() { return true; } }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/oneStaticMethod.kt b/j2k/tests/testData/ast/class/oneStaticMethod.kt
new file mode 100644
index 00000000000..beb564521e3
--- /dev/null
+++ b/j2k/tests/testData/ast/class/oneStaticMethod.kt
@@ -0,0 +1,7 @@
+class S() {
+class object {
+fun staticF() : Boolean {
+return true
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/class/oneStaticMethodOneNonStatic.kt b/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/class/oneStaticMethodOneNonStatic.kt
rename to j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.ide.kt
diff --git a/j2k/tests/testData/ast/class/class/oneStaticMethodOneNonStatic.jav b/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.jav
similarity index 90%
rename from j2k/tests/testData/ast/class/class/oneStaticMethodOneNonStatic.jav
rename to j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.jav
index 4c6915861c5..e9f3e081e54 100644
--- a/j2k/tests/testData/ast/class/class/oneStaticMethodOneNonStatic.jav
+++ b/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.jav
@@ -1 +1,2 @@
+//class
final class S { boolean sB() { return true; } static int sI() { return 1; } }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.kt b/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.kt
new file mode 100644
index 00000000000..cb96091ed53
--- /dev/null
+++ b/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.kt
@@ -0,0 +1,10 @@
+class S() {
+fun sB() : Boolean {
+return true
+}
+class object {
+fun sI() : Int {
+return 1
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/class/pivateClass.kt b/j2k/tests/testData/ast/class/pivateClass.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/class/pivateClass.kt
rename to j2k/tests/testData/ast/class/pivateClass.ide.kt
diff --git a/j2k/tests/testData/ast/class/class/pivateClass.jav b/j2k/tests/testData/ast/class/pivateClass.jav
similarity index 72%
rename from j2k/tests/testData/ast/class/class/pivateClass.jav
rename to j2k/tests/testData/ast/class/pivateClass.jav
index 91cc7a0e937..8626c96eeb5 100644
--- a/j2k/tests/testData/ast/class/class/pivateClass.jav
+++ b/j2k/tests/testData/ast/class/pivateClass.jav
@@ -1 +1,2 @@
+//class
private class Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/pivateClass.kt b/j2k/tests/testData/ast/class/pivateClass.kt
new file mode 100644
index 00000000000..96001c69f28
--- /dev/null
+++ b/j2k/tests/testData/ast/class/pivateClass.kt
@@ -0,0 +1,2 @@
+private open class Test() {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/file/privateInit.kt b/j2k/tests/testData/ast/class/privateInit.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/file/privateInit.kt
rename to j2k/tests/testData/ast/class/privateInit.ide.kt
diff --git a/j2k/tests/testData/ast/class/file/privateInit.jav b/j2k/tests/testData/ast/class/privateInit.jav
similarity index 91%
rename from j2k/tests/testData/ast/class/file/privateInit.jav
rename to j2k/tests/testData/ast/class/privateInit.jav
index 5a65a0cc32b..c89945a7756 100644
--- a/j2k/tests/testData/ast/class/file/privateInit.jav
+++ b/j2k/tests/testData/ast/class/privateInit.jav
@@ -1,3 +1,4 @@
+//file
public class MyClass {
private void init(int arg1, int arg2, int arg3) {
}
diff --git a/j2k/tests/testData/ast/class/privateInit.kt b/j2k/tests/testData/ast/class/privateInit.kt
new file mode 100644
index 00000000000..4f86265d153
--- /dev/null
+++ b/j2k/tests/testData/ast/class/privateInit.kt
@@ -0,0 +1,4 @@
+public open class MyClass() {
+private fun init(arg1 : Int, arg2 : Int, arg3 : Int) : Unit {
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/class/protectedClass.kt b/j2k/tests/testData/ast/class/protectedClass.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/class/protectedClass.kt
rename to j2k/tests/testData/ast/class/protectedClass.ide.kt
diff --git a/j2k/tests/testData/ast/class/class/protectedClass.jav b/j2k/tests/testData/ast/class/protectedClass.jav
similarity index 74%
rename from j2k/tests/testData/ast/class/class/protectedClass.jav
rename to j2k/tests/testData/ast/class/protectedClass.jav
index d27e53f5081..ba73b0f9a93 100644
--- a/j2k/tests/testData/ast/class/class/protectedClass.jav
+++ b/j2k/tests/testData/ast/class/protectedClass.jav
@@ -1 +1,2 @@
+//class
protected class Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/protectedClass.kt b/j2k/tests/testData/ast/class/protectedClass.kt
new file mode 100644
index 00000000000..e82caa26cd0
--- /dev/null
+++ b/j2k/tests/testData/ast/class/protectedClass.kt
@@ -0,0 +1,2 @@
+protected open class Test() {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/class/publicClass.kt b/j2k/tests/testData/ast/class/publicClass.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/class/publicClass.kt
rename to j2k/tests/testData/ast/class/publicClass.ide.kt
diff --git a/j2k/tests/testData/ast/class/class/publicClass.jav b/j2k/tests/testData/ast/class/publicClass.jav
similarity index 71%
rename from j2k/tests/testData/ast/class/class/publicClass.jav
rename to j2k/tests/testData/ast/class/publicClass.jav
index 099aac22fd3..108aa7b8cf4 100644
--- a/j2k/tests/testData/ast/class/class/publicClass.jav
+++ b/j2k/tests/testData/ast/class/publicClass.jav
@@ -1 +1,2 @@
+//class
public class Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/publicClass.kt b/j2k/tests/testData/ast/class/publicClass.kt
new file mode 100644
index 00000000000..98e32f1aca0
--- /dev/null
+++ b/j2k/tests/testData/ast/class/publicClass.kt
@@ -0,0 +1,2 @@
+public open class Test() {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/class/simpleInheritance.kt b/j2k/tests/testData/ast/class/simpleInheritance.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/class/simpleInheritance.kt
rename to j2k/tests/testData/ast/class/simpleInheritance.ide.kt
diff --git a/j2k/tests/testData/ast/class/class/simpleInheritance.jav b/j2k/tests/testData/ast/class/simpleInheritance.jav
similarity index 78%
rename from j2k/tests/testData/ast/class/class/simpleInheritance.jav
rename to j2k/tests/testData/ast/class/simpleInheritance.jav
index 01916ab4d7b..7eca37f745f 100644
--- a/j2k/tests/testData/ast/class/class/simpleInheritance.jav
+++ b/j2k/tests/testData/ast/class/simpleInheritance.jav
@@ -1 +1,2 @@
+//class
final class A extends Base {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/simpleInheritance.kt b/j2k/tests/testData/ast/class/simpleInheritance.kt
new file mode 100644
index 00000000000..7bf6ef80f75
--- /dev/null
+++ b/j2k/tests/testData/ast/class/simpleInheritance.kt
@@ -0,0 +1,2 @@
+class A() : Base() {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/class/twoStaticMethod.kt b/j2k/tests/testData/ast/class/twoStaticMethod.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/class/class/twoStaticMethod.kt
rename to j2k/tests/testData/ast/class/twoStaticMethod.ide.kt
diff --git a/j2k/tests/testData/ast/class/class/twoStaticMethod.jav b/j2k/tests/testData/ast/class/twoStaticMethod.jav
similarity index 91%
rename from j2k/tests/testData/ast/class/class/twoStaticMethod.jav
rename to j2k/tests/testData/ast/class/twoStaticMethod.jav
index b69b1398e17..3087adf7ef7 100644
--- a/j2k/tests/testData/ast/class/class/twoStaticMethod.jav
+++ b/j2k/tests/testData/ast/class/twoStaticMethod.jav
@@ -1 +1,2 @@
+//class
final class S { static boolean sB() { return true; } static int sI() { return 1; } }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/twoStaticMethod.kt b/j2k/tests/testData/ast/class/twoStaticMethod.kt
new file mode 100644
index 00000000000..87bd397e519
--- /dev/null
+++ b/j2k/tests/testData/ast/class/twoStaticMethod.kt
@@ -0,0 +1,10 @@
+class S() {
+class object {
+fun sB() : Boolean {
+return true
+}
+fun sI() : Int {
+return 1
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/classExpression/complexExample.ide.kt b/j2k/tests/testData/ast/classExpression/complexExample.ide.kt
new file mode 100644
index 00000000000..61365f4d601
--- /dev/null
+++ b/j2k/tests/testData/ast/classExpression/complexExample.ide.kt
@@ -0,0 +1 @@
+val constrArgTypes = array>(javaClass>(), javaClass())
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/classExpression/statement/complexExample.jav b/j2k/tests/testData/ast/classExpression/complexExample.jav
similarity index 85%
rename from j2k/tests/testData/ast/classExpression/statement/complexExample.jav
rename to j2k/tests/testData/ast/classExpression/complexExample.jav
index a74d8698493..f0a8047102f 100644
--- a/j2k/tests/testData/ast/classExpression/statement/complexExample.jav
+++ b/j2k/tests/testData/ast/classExpression/complexExample.jav
@@ -1 +1,2 @@
+//statement
Class[] constrArgTypes = new Class[]{String[].class, String.class};
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/classExpression/statement/complexExample.kt b/j2k/tests/testData/ast/classExpression/complexExample.kt
similarity index 100%
rename from j2k/tests/testData/ast/classExpression/statement/complexExample.kt
rename to j2k/tests/testData/ast/classExpression/complexExample.kt
diff --git a/j2k/tests/testData/ast/classExpression/expression/objectClass.jav b/j2k/tests/testData/ast/classExpression/expression/objectClass.jav
deleted file mode 100644
index b5c1a920fca..00000000000
--- a/j2k/tests/testData/ast/classExpression/expression/objectClass.jav
+++ /dev/null
@@ -1 +0,0 @@
-Object.class
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/classExpression/expression/stringClass.jav b/j2k/tests/testData/ast/classExpression/expression/stringClass.jav
deleted file mode 100644
index 025387a83e8..00000000000
--- a/j2k/tests/testData/ast/classExpression/expression/stringClass.jav
+++ /dev/null
@@ -1 +0,0 @@
-String.class
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/classExpression/expression/objectClass.kt b/j2k/tests/testData/ast/classExpression/objectClass.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/classExpression/expression/objectClass.kt
rename to j2k/tests/testData/ast/classExpression/objectClass.ide.kt
diff --git a/j2k/tests/testData/ast/classExpression/objectClass.jav b/j2k/tests/testData/ast/classExpression/objectClass.jav
new file mode 100644
index 00000000000..75cdc4fa995
--- /dev/null
+++ b/j2k/tests/testData/ast/classExpression/objectClass.jav
@@ -0,0 +1,2 @@
+//expression
+Object.class
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/classExpression/objectClass.kt b/j2k/tests/testData/ast/classExpression/objectClass.kt
new file mode 100644
index 00000000000..a23b22175d5
--- /dev/null
+++ b/j2k/tests/testData/ast/classExpression/objectClass.kt
@@ -0,0 +1 @@
+javaClass()
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/classExpression/expression/stringClass.kt b/j2k/tests/testData/ast/classExpression/stringClass.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/classExpression/expression/stringClass.kt
rename to j2k/tests/testData/ast/classExpression/stringClass.ide.kt
diff --git a/j2k/tests/testData/ast/classExpression/stringClass.jav b/j2k/tests/testData/ast/classExpression/stringClass.jav
new file mode 100644
index 00000000000..b886d414bb8
--- /dev/null
+++ b/j2k/tests/testData/ast/classExpression/stringClass.jav
@@ -0,0 +1,2 @@
+//expression
+String.class
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/classExpression/stringClass.kt b/j2k/tests/testData/ast/classExpression/stringClass.kt
new file mode 100644
index 00000000000..49f7ad88685
--- /dev/null
+++ b/j2k/tests/testData/ast/classExpression/stringClass.kt
@@ -0,0 +1 @@
+javaClass()
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/conditionalExpression/expression/simpleConditionalExpression.kt b/j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/conditionalExpression/expression/simpleConditionalExpression.kt
rename to j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.ide.kt
diff --git a/j2k/tests/testData/ast/conditionalExpression/expression/simpleConditionalExpression.jav b/j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.jav
similarity index 59%
rename from j2k/tests/testData/ast/conditionalExpression/expression/simpleConditionalExpression.jav
rename to j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.jav
index 3e742448544..9d691b3ca13 100644
--- a/j2k/tests/testData/ast/conditionalExpression/expression/simpleConditionalExpression.jav
+++ b/j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.jav
@@ -1 +1,2 @@
+//expression
a.isEmpty() ? 0 : 1
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.kt b/j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.kt
new file mode 100644
index 00000000000..85131998260
--- /dev/null
+++ b/j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.kt
@@ -0,0 +1,4 @@
+(if (a.isEmpty())
+0
+else
+1)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt
new file mode 100644
index 00000000000..3e84ffc7127
--- /dev/null
+++ b/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt
@@ -0,0 +1,21 @@
+open class C(arg1 : Int, arg2 : Int, arg3 : Int) {
+class object {
+open fun init(arg1 : Int, arg2 : Int) : C {
+val __ = C(arg1, arg2, 0)
+return __
+}
+open fun init(arg1 : Int) : C {
+val __ = C(arg1, 0, 0)
+return __
+}
+}
+}
+public open class User() {
+class object {
+public open fun main() : Unit {
+val c1 = C(100, 100, 100)
+val c2 = C.init(100, 100)
+val c3 = C.init(100)
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/constructors/file/allCallsPrimary.jav b/j2k/tests/testData/ast/constructors/allCallsPrimary.jav
similarity index 97%
rename from j2k/tests/testData/ast/constructors/file/allCallsPrimary.jav
rename to j2k/tests/testData/ast/constructors/allCallsPrimary.jav
index 997b50c969c..91b45345b1d 100644
--- a/j2k/tests/testData/ast/constructors/file/allCallsPrimary.jav
+++ b/j2k/tests/testData/ast/constructors/allCallsPrimary.jav
@@ -1,3 +1,4 @@
+//file
class C {
C(int arg1, int arg2, int arg3) {
}
diff --git a/j2k/tests/testData/ast/constructors/file/allCallsPrimary.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary.kt
similarity index 100%
rename from j2k/tests/testData/ast/constructors/file/allCallsPrimary.kt
rename to j2k/tests/testData/ast/constructors/allCallsPrimary.kt
diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt
new file mode 100644
index 00000000000..746405d4c12
--- /dev/null
+++ b/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt
@@ -0,0 +1,33 @@
+open class C(arg1 : Int) {
+val myArg1 : Int
+var myArg2 : Int = 0
+var myArg3 : Int = 0
+{
+myArg1 = arg1
+myArg2 = 0
+myArg3 = 0
+}
+class object {
+open fun init(arg1 : Int, arg2 : Int, arg3 : Int) : C {
+val __ = C(arg1)
+__.myArg2 = arg2
+__.myArg3 = arg3
+return __
+}
+open fun init(arg1 : Int, arg2 : Int) : C {
+val __ = C(arg1)
+__.myArg2 = arg2
+__.myArg3 = 0
+return __
+}
+}
+}
+public open class User() {
+class object {
+public open fun main() : Unit {
+val c1 = C.init(100, 100, 100)
+val c2 = C.init(100, 100)
+val c3 = C(100)
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/constructors/file/allCallsPrimary2.jav b/j2k/tests/testData/ast/constructors/allCallsPrimary2.jav
similarity index 98%
rename from j2k/tests/testData/ast/constructors/file/allCallsPrimary2.jav
rename to j2k/tests/testData/ast/constructors/allCallsPrimary2.jav
index 45b045051bc..5dd89c1b11b 100644
--- a/j2k/tests/testData/ast/constructors/file/allCallsPrimary2.jav
+++ b/j2k/tests/testData/ast/constructors/allCallsPrimary2.jav
@@ -1,3 +1,4 @@
+//file
class C {
final int myArg1;
int myArg2;
diff --git a/j2k/tests/testData/ast/constructors/file/allCallsPrimary2.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary2.kt
similarity index 100%
rename from j2k/tests/testData/ast/constructors/file/allCallsPrimary2.kt
rename to j2k/tests/testData/ast/constructors/allCallsPrimary2.kt
diff --git a/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt b/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt
new file mode 100644
index 00000000000..74491704f13
--- /dev/null
+++ b/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt
@@ -0,0 +1,45 @@
+package org.test.customer
+open class Customer(first : String, last : String) {
+public val _firstName : String
+public val _lastName : String
+public open fun getFirstName() : String {
+return _firstName
+}
+public open fun getLastName() : String {
+return _lastName
+}
+private fun doSmthBefore() : Unit {
+}
+private fun doSmthAfter() : Unit {
+}
+{
+doSmthBefore()
+_firstName = first
+_lastName = last
+doSmthAfter()
+}
+}
+open class CustomerBuilder() {
+public var _firstName : String = "Homer"
+public var _lastName : String = "Simpson"
+public open fun WithFirstName(firstName : String) : CustomerBuilder {
+_firstName = firstName
+return this
+}
+public open fun WithLastName(lastName : String) : CustomerBuilder {
+_lastName = lastName
+return this
+}
+public open fun Build() : Customer {
+return Customer(_firstName, _lastName)
+}
+}
+public open class User() {
+class object {
+public open fun main() : Unit {
+val customer = CustomerBuilder().WithFirstName("Homer").WithLastName("Simpson").Build()
+System.out.println(customer.getFirstName())
+System.out.println(customer.getLastName())
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/constructors/file/customerBuilder.jav b/j2k/tests/testData/ast/constructors/customerBuilder.jav
similarity index 99%
rename from j2k/tests/testData/ast/constructors/file/customerBuilder.jav
rename to j2k/tests/testData/ast/constructors/customerBuilder.jav
index 4f99ad3c63d..7fe1320a3ca 100644
--- a/j2k/tests/testData/ast/constructors/file/customerBuilder.jav
+++ b/j2k/tests/testData/ast/constructors/customerBuilder.jav
@@ -1,3 +1,4 @@
+//file
package org.test.customer
class Customer {
diff --git a/j2k/tests/testData/ast/constructors/file/customerBuilder.kt b/j2k/tests/testData/ast/constructors/customerBuilder.kt
similarity index 100%
rename from j2k/tests/testData/ast/constructors/file/customerBuilder.kt
rename to j2k/tests/testData/ast/constructors/customerBuilder.kt
diff --git a/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt b/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt
new file mode 100644
index 00000000000..6bfc7dbf009
--- /dev/null
+++ b/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt
@@ -0,0 +1,37 @@
+public open class Identifier(_myName : T, _myHasDollar : Boolean) {
+private val myName : T
+private var myHasDollar : Boolean = false
+private var myNullable : Boolean = true
+public open fun getName() : T {
+return myName
+}
+{
+myName = _myName
+myHasDollar = _myHasDollar
+}
+class object {
+public open fun init(name : T) : Identifier {
+val __ = Identifier(name, false)
+return __
+}
+public open fun init(name : T, isNullable : Boolean) : Identifier {
+val __ = Identifier(name, false)
+__.myNullable = isNullable
+return __
+}
+public open fun init(name : T, hasDollar : Boolean, isNullable : Boolean) : Identifier {
+val __ = Identifier(name, hasDollar)
+__.myNullable = isNullable
+return __
+}
+}
+}
+public open class User() {
+class object {
+public open fun main() : Unit {
+val i1 = Identifier.init("name", false, true)
+val i2 = Identifier.init("name", false)
+val i3 = Identifier.init("name")
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/constructors/file/genericIdentifier.jav b/j2k/tests/testData/ast/constructors/genericIdentifier.jav
similarity index 99%
rename from j2k/tests/testData/ast/constructors/file/genericIdentifier.jav
rename to j2k/tests/testData/ast/constructors/genericIdentifier.jav
index c77f997a1c6..35d5006aa48 100644
--- a/j2k/tests/testData/ast/constructors/file/genericIdentifier.jav
+++ b/j2k/tests/testData/ast/constructors/genericIdentifier.jav
@@ -1,3 +1,4 @@
+//file
public class Identifier {
private final T myName;
private boolean myHasDollar;
diff --git a/j2k/tests/testData/ast/constructors/file/genericIdentifier.kt b/j2k/tests/testData/ast/constructors/genericIdentifier.kt
similarity index 100%
rename from j2k/tests/testData/ast/constructors/file/genericIdentifier.kt
rename to j2k/tests/testData/ast/constructors/genericIdentifier.kt
diff --git a/j2k/tests/testData/ast/constructors/identifier.ide.kt b/j2k/tests/testData/ast/constructors/identifier.ide.kt
new file mode 100644
index 00000000000..b5e85883a2a
--- /dev/null
+++ b/j2k/tests/testData/ast/constructors/identifier.ide.kt
@@ -0,0 +1,37 @@
+public open class Identifier(_myName : String, _myHasDollar : Boolean) {
+private val myName : String
+private var myHasDollar : Boolean = false
+private var myNullable : Boolean = true
+public open fun getName() : String {
+return myName
+}
+{
+myName = _myName
+myHasDollar = _myHasDollar
+}
+class object {
+public open fun init(name : String) : Identifier {
+val __ = Identifier(name, false)
+return __
+}
+public open fun init(name : String, isNullable : Boolean) : Identifier {
+val __ = Identifier(name, false)
+__.myNullable = isNullable
+return __
+}
+public open fun init(name : String, hasDollar : Boolean, isNullable : Boolean) : Identifier {
+val __ = Identifier(name, hasDollar)
+__.myNullable = isNullable
+return __
+}
+}
+}
+public open class User() {
+class object {
+public open fun main() : Unit {
+val i1 = Identifier.init("name", false, true)
+val i2 = Identifier.init("name", false)
+val i3 = Identifier.init("name")
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/constructors/file/identifier.jav b/j2k/tests/testData/ast/constructors/identifier.jav
similarity index 99%
rename from j2k/tests/testData/ast/constructors/file/identifier.jav
rename to j2k/tests/testData/ast/constructors/identifier.jav
index 929628643c8..8170fd48d42 100644
--- a/j2k/tests/testData/ast/constructors/file/identifier.jav
+++ b/j2k/tests/testData/ast/constructors/identifier.jav
@@ -1,3 +1,4 @@
+//file
public class Identifier {
private final String myName;
private boolean myHasDollar;
diff --git a/j2k/tests/testData/ast/constructors/file/identifier.kt b/j2k/tests/testData/ast/constructors/identifier.kt
similarity index 100%
rename from j2k/tests/testData/ast/constructors/file/identifier.kt
rename to j2k/tests/testData/ast/constructors/identifier.kt
diff --git a/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt b/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt
new file mode 100644
index 00000000000..b2d68ed3e5f
--- /dev/null
+++ b/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt
@@ -0,0 +1,40 @@
+public open class Test(_myName : String, _a : Boolean, _b : Double, _c : Float, _d : Long, _e : Int, _f : Short, _g : Char) {
+private val myName : String
+private var a : Boolean = false
+private var b : Double = 0.toDouble()
+private var c : Float = 0.toFloat()
+private var d : Long = 0
+private var e : Int = 0
+private var f : Short = 0
+private var g : Char = ' '
+{
+myName = _myName
+a = _a
+b = _b
+c = _c
+d = _d
+e = _e
+f = _f
+g = _g
+}
+class object {
+public open fun init() : Test {
+val __ = Test(0, false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ')
+return __
+}
+public open fun init(name : String) : Test {
+val __ = Test(foo(name), false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ')
+return __
+}
+open fun foo(n : String) : String {
+return ""
+}
+}
+}
+public open class User() {
+class object {
+public open fun main() : Unit {
+val t = Test.init("name")
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/constructors/file/withManyDefaultParams.jav b/j2k/tests/testData/ast/constructors/withManyDefaultParams.jav
similarity index 98%
rename from j2k/tests/testData/ast/constructors/file/withManyDefaultParams.jav
rename to j2k/tests/testData/ast/constructors/withManyDefaultParams.jav
index c8d04543b0b..2940814308f 100644
--- a/j2k/tests/testData/ast/constructors/file/withManyDefaultParams.jav
+++ b/j2k/tests/testData/ast/constructors/withManyDefaultParams.jav
@@ -1,3 +1,4 @@
+//file
public class Test {
private final String myName;
private boolean a;
diff --git a/j2k/tests/testData/ast/constructors/file/withManyDefaultParams.kt b/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt
similarity index 100%
rename from j2k/tests/testData/ast/constructors/file/withManyDefaultParams.kt
rename to j2k/tests/testData/ast/constructors/withManyDefaultParams.kt
diff --git a/j2k/tests/testData/ast/continueStatement/statement/continueWithLabel.kt b/j2k/tests/testData/ast/continueStatement/continueWithLabel.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/continueStatement/statement/continueWithLabel.kt
rename to j2k/tests/testData/ast/continueStatement/continueWithLabel.ide.kt
diff --git a/j2k/tests/testData/ast/continueStatement/statement/continueWithLabel.jav b/j2k/tests/testData/ast/continueStatement/continueWithLabel.jav
similarity index 55%
rename from j2k/tests/testData/ast/continueStatement/statement/continueWithLabel.jav
rename to j2k/tests/testData/ast/continueStatement/continueWithLabel.jav
index aa7bbb7cd89..70c8182702e 100644
--- a/j2k/tests/testData/ast/continueStatement/statement/continueWithLabel.jav
+++ b/j2k/tests/testData/ast/continueStatement/continueWithLabel.jav
@@ -1 +1,2 @@
+//statement
continue label;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/continueStatement/continueWithLabel.kt b/j2k/tests/testData/ast/continueStatement/continueWithLabel.kt
new file mode 100644
index 00000000000..9dc6020680e
--- /dev/null
+++ b/j2k/tests/testData/ast/continueStatement/continueWithLabel.kt
@@ -0,0 +1 @@
+continue@label
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/continueStatement/statement/continueWithoutLabel.kt b/j2k/tests/testData/ast/continueStatement/continueWithoutLabel.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/continueStatement/statement/continueWithoutLabel.kt
rename to j2k/tests/testData/ast/continueStatement/continueWithoutLabel.ide.kt
diff --git a/j2k/tests/testData/ast/continueStatement/continueWithoutLabel.jav b/j2k/tests/testData/ast/continueStatement/continueWithoutLabel.jav
new file mode 100644
index 00000000000..a3e5db997fd
--- /dev/null
+++ b/j2k/tests/testData/ast/continueStatement/continueWithoutLabel.jav
@@ -0,0 +1,2 @@
+//statement
+continue;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/continueStatement/continueWithoutLabel.kt b/j2k/tests/testData/ast/continueStatement/continueWithoutLabel.kt
new file mode 100644
index 00000000000..b2960313c53
--- /dev/null
+++ b/j2k/tests/testData/ast/continueStatement/continueWithoutLabel.kt
@@ -0,0 +1 @@
+continue
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/continueStatement/statement/continueWithoutLabel.jav b/j2k/tests/testData/ast/continueStatement/statement/continueWithoutLabel.jav
deleted file mode 100644
index 45127c0ad12..00000000000
--- a/j2k/tests/testData/ast/continueStatement/statement/continueWithoutLabel.jav
+++ /dev/null
@@ -1 +0,0 @@
-continue;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/declarationStatement/statement/multiplyFinalIntDeclaration.kt b/j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/declarationStatement/statement/multiplyFinalIntDeclaration.kt
rename to j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.ide.kt
diff --git a/j2k/tests/testData/ast/declarationStatement/statement/multiplyFinalIntDeclaration.jav b/j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.jav
similarity index 60%
rename from j2k/tests/testData/ast/declarationStatement/statement/multiplyFinalIntDeclaration.jav
rename to j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.jav
index 42d4cea5522..ee5ee8de3a5 100644
--- a/j2k/tests/testData/ast/declarationStatement/statement/multiplyFinalIntDeclaration.jav
+++ b/j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.jav
@@ -1 +1,2 @@
+//statement
final int k, l, m;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.kt b/j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.kt
new file mode 100644
index 00000000000..08a84179833
--- /dev/null
+++ b/j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.kt
@@ -0,0 +1,3 @@
+val k : Int
+val l : Int
+val m : Int
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.ide.kt b/j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.ide.kt
new file mode 100644
index 00000000000..08a84179833
--- /dev/null
+++ b/j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.ide.kt
@@ -0,0 +1,3 @@
+val k : Int
+val l : Int
+val m : Int
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/declarationStatement/statement/multiplyIntDeclaration.jav b/j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.jav
similarity index 50%
rename from j2k/tests/testData/ast/declarationStatement/statement/multiplyIntDeclaration.jav
rename to j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.jav
index 219f057f8f0..af30eb950d4 100644
--- a/j2k/tests/testData/ast/declarationStatement/statement/multiplyIntDeclaration.jav
+++ b/j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.jav
@@ -1 +1,2 @@
+//statement
int k, l, m;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/declarationStatement/statement/multiplyIntDeclaration.kt b/j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.kt
similarity index 100%
rename from j2k/tests/testData/ast/declarationStatement/statement/multiplyIntDeclaration.kt
rename to j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.kt
diff --git a/j2k/tests/testData/ast/declarationStatement/statement/singleFinalIntDeclaration.kt b/j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/declarationStatement/statement/singleFinalIntDeclaration.kt
rename to j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.ide.kt
diff --git a/j2k/tests/testData/ast/declarationStatement/statement/singleFinalIntDeclaration.jav b/j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.jav
similarity index 50%
rename from j2k/tests/testData/ast/declarationStatement/statement/singleFinalIntDeclaration.jav
rename to j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.jav
index 79db42cfc1c..18a0b736d56 100644
--- a/j2k/tests/testData/ast/declarationStatement/statement/singleFinalIntDeclaration.jav
+++ b/j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.jav
@@ -1 +1,2 @@
+//statement
final int s;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.kt b/j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.kt
new file mode 100644
index 00000000000..0ff0482bb0f
--- /dev/null
+++ b/j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.kt
@@ -0,0 +1 @@
+val s : Int
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.ide.kt b/j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.ide.kt
new file mode 100644
index 00000000000..3f658920fee
--- /dev/null
+++ b/j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.ide.kt
@@ -0,0 +1 @@
+val s : String
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/declarationStatement/statement/singleFinalStringDeclaration.jav b/j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.jav
similarity index 55%
rename from j2k/tests/testData/ast/declarationStatement/statement/singleFinalStringDeclaration.jav
rename to j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.jav
index 0d5e93f00ff..1522db10132 100644
--- a/j2k/tests/testData/ast/declarationStatement/statement/singleFinalStringDeclaration.jav
+++ b/j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.jav
@@ -1 +1,2 @@
+//statement
final String s;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/declarationStatement/statement/singleFinalStringDeclaration.kt b/j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.kt
similarity index 100%
rename from j2k/tests/testData/ast/declarationStatement/statement/singleFinalStringDeclaration.kt
rename to j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.kt
diff --git a/j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.ide.kt b/j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.ide.kt
new file mode 100644
index 00000000000..0ff0482bb0f
--- /dev/null
+++ b/j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.ide.kt
@@ -0,0 +1 @@
+val s : Int
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.jav b/j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.jav
new file mode 100644
index 00000000000..bac4142d374
--- /dev/null
+++ b/j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.jav
@@ -0,0 +1,2 @@
+//statement
+int s;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/declarationStatement/statement/singleIntDeclaration.kt b/j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.kt
similarity index 100%
rename from j2k/tests/testData/ast/declarationStatement/statement/singleIntDeclaration.kt
rename to j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.kt
diff --git a/j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.ide.kt b/j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.ide.kt
new file mode 100644
index 00000000000..3f658920fee
--- /dev/null
+++ b/j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.ide.kt
@@ -0,0 +1 @@
+val s : String
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.jav b/j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.jav
new file mode 100644
index 00000000000..e085d066969
--- /dev/null
+++ b/j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.jav
@@ -0,0 +1,2 @@
+//statement
+String s;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/declarationStatement/statement/singleStringDeclaration.kt b/j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.kt
similarity index 100%
rename from j2k/tests/testData/ast/declarationStatement/statement/singleStringDeclaration.kt
rename to j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.kt
diff --git a/j2k/tests/testData/ast/declarationStatement/statement/singleIntDeclaration.jav b/j2k/tests/testData/ast/declarationStatement/statement/singleIntDeclaration.jav
deleted file mode 100644
index ee7cd0becae..00000000000
--- a/j2k/tests/testData/ast/declarationStatement/statement/singleIntDeclaration.jav
+++ /dev/null
@@ -1 +0,0 @@
-int s;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/declarationStatement/statement/singleStringDeclaration.jav b/j2k/tests/testData/ast/declarationStatement/statement/singleStringDeclaration.jav
deleted file mode 100644
index 8f1adbb52a5..00000000000
--- a/j2k/tests/testData/ast/declarationStatement/statement/singleStringDeclaration.jav
+++ /dev/null
@@ -1 +0,0 @@
-String s;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.ide.kt b/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.ide.kt
new file mode 100644
index 00000000000..1de090155c7
--- /dev/null
+++ b/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.ide.kt
@@ -0,0 +1,6 @@
+do
+{
+val i = 1
+i = i + 1
+}
+while (a > b)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/doWhileStatement/statement/whileWithBlock.jav b/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.jav
similarity index 76%
rename from j2k/tests/testData/ast/doWhileStatement/statement/whileWithBlock.jav
rename to j2k/tests/testData/ast/doWhileStatement/whileWithBlock.jav
index 48a9639a646..237fadf87e5 100644
--- a/j2k/tests/testData/ast/doWhileStatement/statement/whileWithBlock.jav
+++ b/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.jav
@@ -1 +1,2 @@
+//statement
do {int i = 1; i = i + 1;} while (a > b)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/doWhileStatement/statement/whileWithBlock.kt b/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.kt
similarity index 100%
rename from j2k/tests/testData/ast/doWhileStatement/statement/whileWithBlock.kt
rename to j2k/tests/testData/ast/doWhileStatement/whileWithBlock.kt
diff --git a/j2k/tests/testData/ast/doWhileStatement/statement/whileWithEmptyBlock.kt b/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/doWhileStatement/statement/whileWithEmptyBlock.kt
rename to j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.ide.kt
diff --git a/j2k/tests/testData/ast/doWhileStatement/statement/whileWithEmptyBlock.jav b/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.jav
similarity index 60%
rename from j2k/tests/testData/ast/doWhileStatement/statement/whileWithEmptyBlock.jav
rename to j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.jav
index b57bb051009..c436e428d09 100644
--- a/j2k/tests/testData/ast/doWhileStatement/statement/whileWithEmptyBlock.jav
+++ b/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.jav
@@ -1 +1,2 @@
+//statement
do {} while (true)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.kt b/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.kt
new file mode 100644
index 00000000000..7018b864e5e
--- /dev/null
+++ b/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.kt
@@ -0,0 +1,4 @@
+do
+{
+}
+while (true)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/doWhileStatement/statement/whileWithExpression.kt b/j2k/tests/testData/ast/doWhileStatement/whileWithExpression.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/doWhileStatement/statement/whileWithExpression.kt
rename to j2k/tests/testData/ast/doWhileStatement/whileWithExpression.ide.kt
diff --git a/j2k/tests/testData/ast/doWhileStatement/statement/whileWithExpression.jav b/j2k/tests/testData/ast/doWhileStatement/whileWithExpression.jav
similarity index 68%
rename from j2k/tests/testData/ast/doWhileStatement/statement/whileWithExpression.jav
rename to j2k/tests/testData/ast/doWhileStatement/whileWithExpression.jav
index e724468b028..0df144f868e 100644
--- a/j2k/tests/testData/ast/doWhileStatement/statement/whileWithExpression.jav
+++ b/j2k/tests/testData/ast/doWhileStatement/whileWithExpression.jav
@@ -1 +1,2 @@
+//statement
do i = i + 1; while (true)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithExpression.kt b/j2k/tests/testData/ast/doWhileStatement/whileWithExpression.kt
new file mode 100644
index 00000000000..a20c7c5d83d
--- /dev/null
+++ b/j2k/tests/testData/ast/doWhileStatement/whileWithExpression.kt
@@ -0,0 +1,3 @@
+do
+i = i + 1
+while (true)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/doWhileStatement/statement/whileWithReturn.kt b/j2k/tests/testData/ast/doWhileStatement/whileWithReturn.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/doWhileStatement/statement/whileWithReturn.kt
rename to j2k/tests/testData/ast/doWhileStatement/whileWithReturn.ide.kt
diff --git a/j2k/tests/testData/ast/doWhileStatement/statement/whileWithReturn.jav b/j2k/tests/testData/ast/doWhileStatement/whileWithReturn.jav
similarity index 67%
rename from j2k/tests/testData/ast/doWhileStatement/statement/whileWithReturn.jav
rename to j2k/tests/testData/ast/doWhileStatement/whileWithReturn.jav
index 6ca0c6cd1b2..926ba4a30a7 100644
--- a/j2k/tests/testData/ast/doWhileStatement/statement/whileWithReturn.jav
+++ b/j2k/tests/testData/ast/doWhileStatement/whileWithReturn.jav
@@ -1 +1,2 @@
+//statement
do return 1; while (true)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithReturn.kt b/j2k/tests/testData/ast/doWhileStatement/whileWithReturn.kt
new file mode 100644
index 00000000000..21de9dff87a
--- /dev/null
+++ b/j2k/tests/testData/ast/doWhileStatement/whileWithReturn.kt
@@ -0,0 +1,3 @@
+do
+return 1
+while (true)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/colorEnum.kt b/j2k/tests/testData/ast/enum/colorEnum.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/enum/class/colorEnum.kt
rename to j2k/tests/testData/ast/enum/colorEnum.ide.kt
diff --git a/j2k/tests/testData/ast/enum/class/colorEnum.jav b/j2k/tests/testData/ast/enum/colorEnum.jav
similarity index 95%
rename from j2k/tests/testData/ast/enum/class/colorEnum.jav
rename to j2k/tests/testData/ast/enum/colorEnum.jav
index d59c8198ccd..ff1b00096c0 100644
--- a/j2k/tests/testData/ast/enum/class/colorEnum.jav
+++ b/j2k/tests/testData/ast/enum/colorEnum.jav
@@ -1,3 +1,4 @@
+//class
package demo;
enum MyEnum {
diff --git a/j2k/tests/testData/ast/enum/colorEnum.kt b/j2k/tests/testData/ast/enum/colorEnum.kt
new file mode 100644
index 00000000000..39fb85952d6
--- /dev/null
+++ b/j2k/tests/testData/ast/enum/colorEnum.kt
@@ -0,0 +1,12 @@
+package demo
+enum class MyEnum(_color : Int) {
+RED : MyEnum(10)
+BLUE : MyEnum(20)
+private val color : Int
+public fun getColor() : Int {
+return color
+}
+{
+color = _color
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/emptyEnum.kt b/j2k/tests/testData/ast/enum/emptyEnum.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/enum/class/emptyEnum.kt
rename to j2k/tests/testData/ast/enum/emptyEnum.ide.kt
diff --git a/j2k/tests/testData/ast/enum/class/emptyEnum.jav b/j2k/tests/testData/ast/enum/emptyEnum.jav
similarity index 52%
rename from j2k/tests/testData/ast/enum/class/emptyEnum.jav
rename to j2k/tests/testData/ast/enum/emptyEnum.jav
index 6374d13e5e5..584f167b950 100644
--- a/j2k/tests/testData/ast/enum/class/emptyEnum.jav
+++ b/j2k/tests/testData/ast/enum/emptyEnum.jav
@@ -1 +1,2 @@
+//class
enum A {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/emptyEnum.kt b/j2k/tests/testData/ast/enum/emptyEnum.kt
new file mode 100644
index 00000000000..c8338128138
--- /dev/null
+++ b/j2k/tests/testData/ast/enum/emptyEnum.kt
@@ -0,0 +1,2 @@
+enum class A {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/enumConstantIsNotNull.kt b/j2k/tests/testData/ast/enum/enumConstantIsNotNull.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/enum/class/enumConstantIsNotNull.kt
rename to j2k/tests/testData/ast/enum/enumConstantIsNotNull.ide.kt
diff --git a/j2k/tests/testData/ast/enum/class/enumConstantIsNotNull.jav b/j2k/tests/testData/ast/enum/enumConstantIsNotNull.jav
similarity index 87%
rename from j2k/tests/testData/ast/enum/class/enumConstantIsNotNull.jav
rename to j2k/tests/testData/ast/enum/enumConstantIsNotNull.jav
index b6dbf7edc50..37600c98b74 100644
--- a/j2k/tests/testData/ast/enum/class/enumConstantIsNotNull.jav
+++ b/j2k/tests/testData/ast/enum/enumConstantIsNotNull.jav
@@ -1,3 +1,4 @@
+//class
enum E {
FOO;
diff --git a/j2k/tests/testData/ast/enum/enumConstantIsNotNull.kt b/j2k/tests/testData/ast/enum/enumConstantIsNotNull.kt
new file mode 100644
index 00000000000..62a8e2019a2
--- /dev/null
+++ b/j2k/tests/testData/ast/enum/enumConstantIsNotNull.kt
@@ -0,0 +1,6 @@
+enum class E {
+FOO
+fun foo() : Unit {
+FOO.toString()
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/enumImplementsOneInterface.kt b/j2k/tests/testData/ast/enum/enumImplementsOneInterface.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/enum/class/enumImplementsOneInterface.kt
rename to j2k/tests/testData/ast/enum/enumImplementsOneInterface.ide.kt
diff --git a/j2k/tests/testData/ast/enum/class/enumImplementsOneInterface.jav b/j2k/tests/testData/ast/enum/enumImplementsOneInterface.jav
similarity index 73%
rename from j2k/tests/testData/ast/enum/class/enumImplementsOneInterface.jav
rename to j2k/tests/testData/ast/enum/enumImplementsOneInterface.jav
index c2e20825bfe..4566a73f3ca 100644
--- a/j2k/tests/testData/ast/enum/class/enumImplementsOneInterface.jav
+++ b/j2k/tests/testData/ast/enum/enumImplementsOneInterface.jav
@@ -1 +1,2 @@
+//class
enum A implements I {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/enumImplementsOneInterface.kt b/j2k/tests/testData/ast/enum/enumImplementsOneInterface.kt
new file mode 100644
index 00000000000..9cd0e207155
--- /dev/null
+++ b/j2k/tests/testData/ast/enum/enumImplementsOneInterface.kt
@@ -0,0 +1,2 @@
+enum class A : I {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/enumImplementsSeveralInterfaces.kt b/j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/enum/class/enumImplementsSeveralInterfaces.kt
rename to j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.ide.kt
diff --git a/j2k/tests/testData/ast/enum/class/enumImplementsSeveralInterfaces.jav b/j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.jav
similarity index 79%
rename from j2k/tests/testData/ast/enum/class/enumImplementsSeveralInterfaces.jav
rename to j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.jav
index 0334953a275..482d116a49f 100644
--- a/j2k/tests/testData/ast/enum/class/enumImplementsSeveralInterfaces.jav
+++ b/j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.jav
@@ -1 +1,2 @@
+//class
enum A implements I0, I1, I2 {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.kt b/j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.kt
new file mode 100644
index 00000000000..9cf25118b35
--- /dev/null
+++ b/j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.kt
@@ -0,0 +1,2 @@
+enum class A : I0, I1, I2 {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/enumWithNameField.ide.kt b/j2k/tests/testData/ast/enum/enumWithNameField.ide.kt
new file mode 100644
index 00000000000..e182e4d2eca
--- /dev/null
+++ b/j2k/tests/testData/ast/enum/enumWithNameField.ide.kt
@@ -0,0 +1,4 @@
+enum class E {
+I
+private var name : String = 0
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/enumWithNameField.jav b/j2k/tests/testData/ast/enum/enumWithNameField.jav
similarity index 80%
rename from j2k/tests/testData/ast/enum/class/enumWithNameField.jav
rename to j2k/tests/testData/ast/enum/enumWithNameField.jav
index 30f259ecb0f..51320d9c3bd 100644
--- a/j2k/tests/testData/ast/enum/class/enumWithNameField.jav
+++ b/j2k/tests/testData/ast/enum/enumWithNameField.jav
@@ -1 +1,2 @@
+//class
enum E { I; private String name; }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/enumWithNameField.kt b/j2k/tests/testData/ast/enum/enumWithNameField.kt
similarity index 100%
rename from j2k/tests/testData/ast/enum/class/enumWithNameField.kt
rename to j2k/tests/testData/ast/enum/enumWithNameField.kt
diff --git a/j2k/tests/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.kt b/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.kt
rename to j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.ide.kt
diff --git a/j2k/tests/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.jav b/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.jav
similarity index 95%
rename from j2k/tests/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.jav
rename to j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.jav
index 210e6919883..c2f2c98bcb4 100644
--- a/j2k/tests/testData/ast/enum/class/fieldsWithPrimaryPrivateConstructor.jav
+++ b/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.jav
@@ -1,3 +1,4 @@
+//class
enum Color {
WHITE(21), BLACK(22), RED(23), YELLOW(24), BLUE(25);
diff --git a/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.kt b/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.kt
new file mode 100644
index 00000000000..6fdb4ebc7cc
--- /dev/null
+++ b/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.kt
@@ -0,0 +1,14 @@
+enum class Color(c : Int) {
+WHITE : Color(21)
+BLACK : Color(22)
+RED : Color(23)
+YELLOW : Color(24)
+BLUE : Color(25)
+private var code : Int = 0
+public fun getCode() : Int {
+return code
+}
+{
+code = c
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/internalEnum.kt b/j2k/tests/testData/ast/enum/internalEnum.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/enum/class/internalEnum.kt
rename to j2k/tests/testData/ast/enum/internalEnum.ide.kt
diff --git a/j2k/tests/testData/ast/enum/class/internalEnum.jav b/j2k/tests/testData/ast/enum/internalEnum.jav
similarity index 60%
rename from j2k/tests/testData/ast/enum/class/internalEnum.jav
rename to j2k/tests/testData/ast/enum/internalEnum.jav
index 5ac159fa355..df413fc06fb 100644
--- a/j2k/tests/testData/ast/enum/class/internalEnum.jav
+++ b/j2k/tests/testData/ast/enum/internalEnum.jav
@@ -1 +1,2 @@
+//class
enum Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/internalEnum.kt b/j2k/tests/testData/ast/enum/internalEnum.kt
new file mode 100644
index 00000000000..79279032cc3
--- /dev/null
+++ b/j2k/tests/testData/ast/enum/internalEnum.kt
@@ -0,0 +1,2 @@
+enum class Test {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/overrideToString.ide.kt b/j2k/tests/testData/ast/enum/overrideToString.ide.kt
new file mode 100644
index 00000000000..24848d6a572
--- /dev/null
+++ b/j2k/tests/testData/ast/enum/overrideToString.ide.kt
@@ -0,0 +1,10 @@
+enum class Color {
+WHITE
+BLACK
+RED
+YELLOW
+BLUE
+override fun toString() : String {
+return "COLOR"
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/overrideToString.jav b/j2k/tests/testData/ast/enum/overrideToString.jav
similarity index 92%
rename from j2k/tests/testData/ast/enum/class/overrideToString.jav
rename to j2k/tests/testData/ast/enum/overrideToString.jav
index e2aae14da6c..d52d245387f 100644
--- a/j2k/tests/testData/ast/enum/class/overrideToString.jav
+++ b/j2k/tests/testData/ast/enum/overrideToString.jav
@@ -1 +1,2 @@
+//class
enum Color { WHITE, BLACK, RED, YELLOW, BLUE;@Override String toString() { return "COLOR";}}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/overrideToString.kt b/j2k/tests/testData/ast/enum/overrideToString.kt
similarity index 100%
rename from j2k/tests/testData/ast/enum/class/overrideToString.kt
rename to j2k/tests/testData/ast/enum/overrideToString.kt
diff --git a/j2k/tests/testData/ast/enum/class/primaryPrivateConstructor.kt b/j2k/tests/testData/ast/enum/primaryPrivateConstructor.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/enum/class/primaryPrivateConstructor.kt
rename to j2k/tests/testData/ast/enum/primaryPrivateConstructor.ide.kt
diff --git a/j2k/tests/testData/ast/enum/class/primaryPrivateConstructor.jav b/j2k/tests/testData/ast/enum/primaryPrivateConstructor.jav
similarity index 94%
rename from j2k/tests/testData/ast/enum/class/primaryPrivateConstructor.jav
rename to j2k/tests/testData/ast/enum/primaryPrivateConstructor.jav
index 7dad6bb265e..c9d3583c317 100644
--- a/j2k/tests/testData/ast/enum/class/primaryPrivateConstructor.jav
+++ b/j2k/tests/testData/ast/enum/primaryPrivateConstructor.jav
@@ -1,3 +1,4 @@
+//class
package demo;
enum Color {
diff --git a/j2k/tests/testData/ast/enum/primaryPrivateConstructor.kt b/j2k/tests/testData/ast/enum/primaryPrivateConstructor.kt
new file mode 100644
index 00000000000..b860f61eeed
--- /dev/null
+++ b/j2k/tests/testData/ast/enum/primaryPrivateConstructor.kt
@@ -0,0 +1,10 @@
+package demo
+enum class Color(c : Int) {
+private var code : Int = 0
+public fun getCode() : Int {
+return code
+}
+{
+code = c
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/privateEnum.kt b/j2k/tests/testData/ast/enum/privateEnum.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/enum/class/privateEnum.kt
rename to j2k/tests/testData/ast/enum/privateEnum.ide.kt
diff --git a/j2k/tests/testData/ast/enum/class/privateEnum.jav b/j2k/tests/testData/ast/enum/privateEnum.jav
similarity index 71%
rename from j2k/tests/testData/ast/enum/class/privateEnum.jav
rename to j2k/tests/testData/ast/enum/privateEnum.jav
index 963b14059d8..36e98f9a9a1 100644
--- a/j2k/tests/testData/ast/enum/class/privateEnum.jav
+++ b/j2k/tests/testData/ast/enum/privateEnum.jav
@@ -1 +1,2 @@
+//class
private enum Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/privateEnum.kt b/j2k/tests/testData/ast/enum/privateEnum.kt
new file mode 100644
index 00000000000..a3a71c70855
--- /dev/null
+++ b/j2k/tests/testData/ast/enum/privateEnum.kt
@@ -0,0 +1,2 @@
+private enum class Test {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/protectedEnum.kt b/j2k/tests/testData/ast/enum/protectedEnum.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/enum/class/protectedEnum.kt
rename to j2k/tests/testData/ast/enum/protectedEnum.ide.kt
diff --git a/j2k/tests/testData/ast/enum/class/protectedEnum.jav b/j2k/tests/testData/ast/enum/protectedEnum.jav
similarity index 73%
rename from j2k/tests/testData/ast/enum/class/protectedEnum.jav
rename to j2k/tests/testData/ast/enum/protectedEnum.jav
index 1361563477c..838da5ff572 100644
--- a/j2k/tests/testData/ast/enum/class/protectedEnum.jav
+++ b/j2k/tests/testData/ast/enum/protectedEnum.jav
@@ -1 +1,2 @@
+//class
protected enum Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/protectedEnum.kt b/j2k/tests/testData/ast/enum/protectedEnum.kt
new file mode 100644
index 00000000000..586bab108fd
--- /dev/null
+++ b/j2k/tests/testData/ast/enum/protectedEnum.kt
@@ -0,0 +1,2 @@
+protected enum class Test {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/publicEnum.kt b/j2k/tests/testData/ast/enum/publicEnum.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/enum/class/publicEnum.kt
rename to j2k/tests/testData/ast/enum/publicEnum.ide.kt
diff --git a/j2k/tests/testData/ast/enum/class/publicEnum.jav b/j2k/tests/testData/ast/enum/publicEnum.jav
similarity index 70%
rename from j2k/tests/testData/ast/enum/class/publicEnum.jav
rename to j2k/tests/testData/ast/enum/publicEnum.jav
index 23365fc3853..684a2e18b7c 100644
--- a/j2k/tests/testData/ast/enum/class/publicEnum.jav
+++ b/j2k/tests/testData/ast/enum/publicEnum.jav
@@ -1 +1,2 @@
+//class
public enum Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/publicEnum.kt b/j2k/tests/testData/ast/enum/publicEnum.kt
new file mode 100644
index 00000000000..4ef7f4c4c6b
--- /dev/null
+++ b/j2k/tests/testData/ast/enum/publicEnum.kt
@@ -0,0 +1,2 @@
+public enum class Test {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/runnableImplementation.ide.kt b/j2k/tests/testData/ast/enum/runnableImplementation.ide.kt
new file mode 100644
index 00000000000..c1f1bee9e30
--- /dev/null
+++ b/j2k/tests/testData/ast/enum/runnableImplementation.ide.kt
@@ -0,0 +1,10 @@
+enum class Color : Runnable {
+WHITE
+BLACK
+RED
+YELLOW
+BLUE
+public override fun run() : Unit {
+System.out.println("name()=" + name() + ", toString()=" + toString())
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/class/runnableImplementation.jav b/j2k/tests/testData/ast/enum/runnableImplementation.jav
similarity index 95%
rename from j2k/tests/testData/ast/enum/class/runnableImplementation.jav
rename to j2k/tests/testData/ast/enum/runnableImplementation.jav
index 5db856671ca..cdd6d4d9067 100644
--- a/j2k/tests/testData/ast/enum/class/runnableImplementation.jav
+++ b/j2k/tests/testData/ast/enum/runnableImplementation.jav
@@ -1,3 +1,4 @@
+//class
enum Color implements Runnable {
WHITE, BLACK, RED, YELLOW, BLUE;
diff --git a/j2k/tests/testData/ast/enum/class/runnableImplementation.kt b/j2k/tests/testData/ast/enum/runnableImplementation.kt
similarity index 100%
rename from j2k/tests/testData/ast/enum/class/runnableImplementation.kt
rename to j2k/tests/testData/ast/enum/runnableImplementation.kt
diff --git a/j2k/tests/testData/ast/enum/class/typeSafeEnum.kt b/j2k/tests/testData/ast/enum/typeSafeEnum.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/enum/class/typeSafeEnum.kt
rename to j2k/tests/testData/ast/enum/typeSafeEnum.ide.kt
diff --git a/j2k/tests/testData/ast/enum/class/typeSafeEnum.jav b/j2k/tests/testData/ast/enum/typeSafeEnum.jav
similarity index 84%
rename from j2k/tests/testData/ast/enum/class/typeSafeEnum.jav
rename to j2k/tests/testData/ast/enum/typeSafeEnum.jav
index 1ecc70526e4..40c1b236bd4 100644
--- a/j2k/tests/testData/ast/enum/class/typeSafeEnum.jav
+++ b/j2k/tests/testData/ast/enum/typeSafeEnum.jav
@@ -1 +1,2 @@
+//class
enum Coin { PENNY, NICKEL, DIME, QUARTER; }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/typeSafeEnum.kt b/j2k/tests/testData/ast/enum/typeSafeEnum.kt
new file mode 100644
index 00000000000..7d80ec0ac2f
--- /dev/null
+++ b/j2k/tests/testData/ast/enum/typeSafeEnum.kt
@@ -0,0 +1,6 @@
+enum class Coin {
+PENNY
+NICKEL
+DIME
+QUARTER
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/field/classChildExtendsBase.ide.kt b/j2k/tests/testData/ast/field/classChildExtendsBase.ide.kt
new file mode 100644
index 00000000000..12b68798cd5
--- /dev/null
+++ b/j2k/tests/testData/ast/field/classChildExtendsBase.ide.kt
@@ -0,0 +1,6 @@
+open class Base() {
+private var myFirst : String = 0
+}
+open class Child() : Base() {
+private var mySecond : String = 0
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/field/file/classChildExtendsBase.jav b/j2k/tests/testData/ast/field/classChildExtendsBase.jav
similarity index 93%
rename from j2k/tests/testData/ast/field/file/classChildExtendsBase.jav
rename to j2k/tests/testData/ast/field/classChildExtendsBase.jav
index 94d40fbfea4..a41cdc7caf5 100644
--- a/j2k/tests/testData/ast/field/file/classChildExtendsBase.jav
+++ b/j2k/tests/testData/ast/field/classChildExtendsBase.jav
@@ -1,3 +1,4 @@
+//file
class Base {
private String myFirst;
}
diff --git a/j2k/tests/testData/ast/field/file/classChildExtendsBase.kt b/j2k/tests/testData/ast/field/classChildExtendsBase.kt
similarity index 100%
rename from j2k/tests/testData/ast/field/file/classChildExtendsBase.kt
rename to j2k/tests/testData/ast/field/classChildExtendsBase.kt
diff --git a/j2k/tests/testData/ast/field/internalField.ide.kt b/j2k/tests/testData/ast/field/internalField.ide.kt
new file mode 100644
index 00000000000..352557fd844
--- /dev/null
+++ b/j2k/tests/testData/ast/field/internalField.ide.kt
@@ -0,0 +1,3 @@
+open class C() {
+var f : Foo = 0
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/field/file/internalField.jav b/j2k/tests/testData/ast/field/internalField.jav
similarity index 72%
rename from j2k/tests/testData/ast/field/file/internalField.jav
rename to j2k/tests/testData/ast/field/internalField.jav
index 3c3f6a6f633..3ab3bbf9c70 100644
--- a/j2k/tests/testData/ast/field/file/internalField.jav
+++ b/j2k/tests/testData/ast/field/internalField.jav
@@ -1,3 +1,4 @@
+//file
class C {
Foo f;
}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/field/file/internalField.kt b/j2k/tests/testData/ast/field/internalField.kt
similarity index 100%
rename from j2k/tests/testData/ast/field/file/internalField.kt
rename to j2k/tests/testData/ast/field/internalField.kt
diff --git a/j2k/tests/testData/ast/field/privateField.ide.kt b/j2k/tests/testData/ast/field/privateField.ide.kt
new file mode 100644
index 00000000000..e8e87a73c35
--- /dev/null
+++ b/j2k/tests/testData/ast/field/privateField.ide.kt
@@ -0,0 +1,3 @@
+open class C() {
+private var f : Foo = 0
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/field/file/privateField.jav b/j2k/tests/testData/ast/field/privateField.jav
similarity index 79%
rename from j2k/tests/testData/ast/field/file/privateField.jav
rename to j2k/tests/testData/ast/field/privateField.jav
index 958031a23b4..3004fe6d82a 100644
--- a/j2k/tests/testData/ast/field/file/privateField.jav
+++ b/j2k/tests/testData/ast/field/privateField.jav
@@ -1,3 +1,4 @@
+//file
class C {
private Foo f;
}
diff --git a/j2k/tests/testData/ast/field/file/privateField.kt b/j2k/tests/testData/ast/field/privateField.kt
similarity index 100%
rename from j2k/tests/testData/ast/field/file/privateField.kt
rename to j2k/tests/testData/ast/field/privateField.kt
diff --git a/j2k/tests/testData/ast/field/protectedField.ide.kt b/j2k/tests/testData/ast/field/protectedField.ide.kt
new file mode 100644
index 00000000000..0b36c5eb07f
--- /dev/null
+++ b/j2k/tests/testData/ast/field/protectedField.ide.kt
@@ -0,0 +1,3 @@
+open class C() {
+protected var f : Foo = 0
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/field/file/protectedField.jav b/j2k/tests/testData/ast/field/protectedField.jav
similarity index 80%
rename from j2k/tests/testData/ast/field/file/protectedField.jav
rename to j2k/tests/testData/ast/field/protectedField.jav
index 100199e107f..3acad7c3c6e 100644
--- a/j2k/tests/testData/ast/field/file/protectedField.jav
+++ b/j2k/tests/testData/ast/field/protectedField.jav
@@ -1,3 +1,4 @@
+//file
class C {
protected Foo f;
}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/field/file/protectedField.kt b/j2k/tests/testData/ast/field/protectedField.kt
similarity index 100%
rename from j2k/tests/testData/ast/field/file/protectedField.kt
rename to j2k/tests/testData/ast/field/protectedField.kt
diff --git a/j2k/tests/testData/ast/field/publicField.ide.kt b/j2k/tests/testData/ast/field/publicField.ide.kt
new file mode 100644
index 00000000000..54420112d7f
--- /dev/null
+++ b/j2k/tests/testData/ast/field/publicField.ide.kt
@@ -0,0 +1,3 @@
+open class C() {
+public var f : Foo = 0
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/field/file/publicField.jav b/j2k/tests/testData/ast/field/publicField.jav
similarity index 78%
rename from j2k/tests/testData/ast/field/file/publicField.jav
rename to j2k/tests/testData/ast/field/publicField.jav
index 1944ff6914a..51fb27cb5bc 100644
--- a/j2k/tests/testData/ast/field/file/publicField.jav
+++ b/j2k/tests/testData/ast/field/publicField.jav
@@ -1,3 +1,4 @@
+//file
class C {
public Foo f;
}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/field/file/publicField.kt b/j2k/tests/testData/ast/field/publicField.kt
similarity index 100%
rename from j2k/tests/testData/ast/field/file/publicField.kt
rename to j2k/tests/testData/ast/field/publicField.kt
diff --git a/j2k/tests/testData/ast/field/file/valWithInit.kt b/j2k/tests/testData/ast/field/valWithInit.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/field/file/valWithInit.kt
rename to j2k/tests/testData/ast/field/valWithInit.ide.kt
diff --git a/j2k/tests/testData/ast/field/file/valWithInit.jav b/j2k/tests/testData/ast/field/valWithInit.jav
similarity index 85%
rename from j2k/tests/testData/ast/field/file/valWithInit.jav
rename to j2k/tests/testData/ast/field/valWithInit.jav
index 4e007d357ce..794312d2f65 100644
--- a/j2k/tests/testData/ast/field/file/valWithInit.jav
+++ b/j2k/tests/testData/ast/field/valWithInit.jav
@@ -1,3 +1,4 @@
+//file
class C {
final Foo f = new Foo(1, 2);
}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/field/valWithInit.kt b/j2k/tests/testData/ast/field/valWithInit.kt
new file mode 100644
index 00000000000..b311ebb6784
--- /dev/null
+++ b/j2k/tests/testData/ast/field/valWithInit.kt
@@ -0,0 +1,3 @@
+open class C() {
+val f : Foo = Foo(1, 2)
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/field/varWithInit.ide.kt b/j2k/tests/testData/ast/field/varWithInit.ide.kt
new file mode 100644
index 00000000000..aaf4d5003e3
--- /dev/null
+++ b/j2k/tests/testData/ast/field/varWithInit.ide.kt
@@ -0,0 +1,3 @@
+open class C() {
+var f : Foo = Foo(1, 2)
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/field/file/varWithInit.jav b/j2k/tests/testData/ast/field/varWithInit.jav
similarity index 82%
rename from j2k/tests/testData/ast/field/file/varWithInit.jav
rename to j2k/tests/testData/ast/field/varWithInit.jav
index 07f05b3bc3f..633e9d94f9a 100644
--- a/j2k/tests/testData/ast/field/file/varWithInit.jav
+++ b/j2k/tests/testData/ast/field/varWithInit.jav
@@ -1,3 +1,4 @@
+//file
class C {
Foo f = new Foo(1, 2);
}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/field/file/varWithInit.kt b/j2k/tests/testData/ast/field/varWithInit.kt
similarity index 100%
rename from j2k/tests/testData/ast/field/file/varWithInit.kt
rename to j2k/tests/testData/ast/field/varWithInit.kt
diff --git a/j2k/tests/testData/ast/field/varWithoutInit.ide.kt b/j2k/tests/testData/ast/field/varWithoutInit.ide.kt
new file mode 100644
index 00000000000..352557fd844
--- /dev/null
+++ b/j2k/tests/testData/ast/field/varWithoutInit.ide.kt
@@ -0,0 +1,3 @@
+open class C() {
+var f : Foo = 0
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/field/file/varWithoutInit.jav b/j2k/tests/testData/ast/field/varWithoutInit.jav
similarity index 72%
rename from j2k/tests/testData/ast/field/file/varWithoutInit.jav
rename to j2k/tests/testData/ast/field/varWithoutInit.jav
index 3c3f6a6f633..3ab3bbf9c70 100644
--- a/j2k/tests/testData/ast/field/file/varWithoutInit.jav
+++ b/j2k/tests/testData/ast/field/varWithoutInit.jav
@@ -1,3 +1,4 @@
+//file
class C {
Foo f;
}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/field/file/varWithoutInit.kt b/j2k/tests/testData/ast/field/varWithoutInit.kt
similarity index 100%
rename from j2k/tests/testData/ast/field/file/varWithoutInit.kt
rename to j2k/tests/testData/ast/field/varWithoutInit.kt
diff --git a/j2k/tests/testData/ast/for/statement/commonCaseForTest.kt b/j2k/tests/testData/ast/for/commonCaseForTest.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/for/statement/commonCaseForTest.kt
rename to j2k/tests/testData/ast/for/commonCaseForTest.ide.kt
diff --git a/j2k/tests/testData/ast/for/statement/commonCaseForTest.jav b/j2k/tests/testData/ast/for/commonCaseForTest.jav
similarity index 78%
rename from j2k/tests/testData/ast/for/statement/commonCaseForTest.jav
rename to j2k/tests/testData/ast/for/commonCaseForTest.jav
index 0ea98e4b45f..ddf33974b80 100644
--- a/j2k/tests/testData/ast/for/statement/commonCaseForTest.jav
+++ b/j2k/tests/testData/ast/for/commonCaseForTest.jav
@@ -1 +1,2 @@
+//statement
for (init(); condition(); update()) body();
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/for/commonCaseForTest.kt b/j2k/tests/testData/ast/for/commonCaseForTest.kt
new file mode 100644
index 00000000000..0fab59caf33
--- /dev/null
+++ b/j2k/tests/testData/ast/for/commonCaseForTest.kt
@@ -0,0 +1,10 @@
+{
+init()
+while (condition())
+{
+body()
+{
+update()
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/for/forRangeWithLE.ide.kt b/j2k/tests/testData/ast/for/forRangeWithLE.ide.kt
new file mode 100644
index 00000000000..caf76ef83ff
--- /dev/null
+++ b/j2k/tests/testData/ast/for/forRangeWithLE.ide.kt
@@ -0,0 +1,4 @@
+val array = IntArray(10)
+for (i in 0..10) {
+array[i] = i
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/for/statement/forRangeWithLE.jav b/j2k/tests/testData/ast/for/forRangeWithLE.jav
similarity index 85%
rename from j2k/tests/testData/ast/for/statement/forRangeWithLE.jav
rename to j2k/tests/testData/ast/for/forRangeWithLE.jav
index a0069d48943..29b803f7f98 100644
--- a/j2k/tests/testData/ast/for/statement/forRangeWithLE.jav
+++ b/j2k/tests/testData/ast/for/forRangeWithLE.jav
@@ -1,2 +1,3 @@
+//statement
int[] array = new int[10];
for (int i = 0; i <= 10; i++) {array[i] = i;}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/for/statement/forRangeWithLE.kt b/j2k/tests/testData/ast/for/forRangeWithLE.kt
similarity index 100%
rename from j2k/tests/testData/ast/for/statement/forRangeWithLE.kt
rename to j2k/tests/testData/ast/for/forRangeWithLE.kt
diff --git a/j2k/tests/testData/ast/for/forRangeWithLT.ide.kt b/j2k/tests/testData/ast/for/forRangeWithLT.ide.kt
new file mode 100644
index 00000000000..a749417fdb2
--- /dev/null
+++ b/j2k/tests/testData/ast/for/forRangeWithLT.ide.kt
@@ -0,0 +1,4 @@
+val array = IntArray(10)
+for (i in 0..10 - 1) {
+array[i] = i
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/for/statement/forRangeWithLT.jav b/j2k/tests/testData/ast/for/forRangeWithLT.jav
similarity index 85%
rename from j2k/tests/testData/ast/for/statement/forRangeWithLT.jav
rename to j2k/tests/testData/ast/for/forRangeWithLT.jav
index 19b24cf03fb..255ff0538ac 100644
--- a/j2k/tests/testData/ast/for/statement/forRangeWithLT.jav
+++ b/j2k/tests/testData/ast/for/forRangeWithLT.jav
@@ -1,2 +1,3 @@
+//statement
int[] array = new int[10];
for (int i = 0; i < 10; i++) {array[i] = i;}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/for/statement/forRangeWithLT.kt b/j2k/tests/testData/ast/for/forRangeWithLT.kt
similarity index 100%
rename from j2k/tests/testData/ast/for/statement/forRangeWithLT.kt
rename to j2k/tests/testData/ast/for/forRangeWithLT.kt
diff --git a/j2k/tests/testData/ast/for/forWithBlock.ide.kt b/j2k/tests/testData/ast/for/forWithBlock.ide.kt
new file mode 100644
index 00000000000..a749417fdb2
--- /dev/null
+++ b/j2k/tests/testData/ast/for/forWithBlock.ide.kt
@@ -0,0 +1,4 @@
+val array = IntArray(10)
+for (i in 0..10 - 1) {
+array[i] = i
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/for/statement/forWithBlock.jav b/j2k/tests/testData/ast/for/forWithBlock.jav
similarity index 85%
rename from j2k/tests/testData/ast/for/statement/forWithBlock.jav
rename to j2k/tests/testData/ast/for/forWithBlock.jav
index 19b24cf03fb..255ff0538ac 100644
--- a/j2k/tests/testData/ast/for/statement/forWithBlock.jav
+++ b/j2k/tests/testData/ast/for/forWithBlock.jav
@@ -1,2 +1,3 @@
+//statement
int[] array = new int[10];
for (int i = 0; i < 10; i++) {array[i] = i;}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/for/statement/forWithBlock.kt b/j2k/tests/testData/ast/for/forWithBlock.kt
similarity index 100%
rename from j2k/tests/testData/ast/for/statement/forWithBlock.kt
rename to j2k/tests/testData/ast/for/forWithBlock.kt
diff --git a/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.ide.kt b/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.ide.kt
new file mode 100644
index 00000000000..dd87b91e89e
--- /dev/null
+++ b/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.ide.kt
@@ -0,0 +1,14 @@
+{
+val i = 0
+while (i < 0)
+{
+{
+val i = 1
+i++
+}
+{
+j++
+i++
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/for/statement/forWithBlockAndDoubleUpdate.jav b/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.jav
similarity index 80%
rename from j2k/tests/testData/ast/for/statement/forWithBlockAndDoubleUpdate.jav
rename to j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.jav
index 6c7c9e0e210..d3c8723b6b8 100644
--- a/j2k/tests/testData/ast/for/statement/forWithBlockAndDoubleUpdate.jav
+++ b/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.jav
@@ -1 +1,2 @@
+//statement
for (int i = 0; i < 0; j++, i++) {int i = 1; i++;}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/for/statement/forWithBlockAndDoubleUpdate.kt b/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.kt
similarity index 100%
rename from j2k/tests/testData/ast/for/statement/forWithBlockAndDoubleUpdate.kt
rename to j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.kt
diff --git a/j2k/tests/testData/ast/for/forWithEmptyBlock.ide.kt b/j2k/tests/testData/ast/for/forWithEmptyBlock.ide.kt
new file mode 100644
index 00000000000..293b4688434
--- /dev/null
+++ b/j2k/tests/testData/ast/for/forWithEmptyBlock.ide.kt
@@ -0,0 +1,12 @@
+{
+val i = 0
+while (i < 0)
+{
+{
+}
+{
+j++
+i++
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/for/statement/forWithEmptyBlock.jav b/j2k/tests/testData/ast/for/forWithEmptyBlock.jav
similarity index 74%
rename from j2k/tests/testData/ast/for/statement/forWithEmptyBlock.jav
rename to j2k/tests/testData/ast/for/forWithEmptyBlock.jav
index 35fa13bac7b..a513244a148 100644
--- a/j2k/tests/testData/ast/for/statement/forWithEmptyBlock.jav
+++ b/j2k/tests/testData/ast/for/forWithEmptyBlock.jav
@@ -1 +1,2 @@
+//statement
for (int i = 0; i < 0; j++, i++) {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/for/statement/forWithEmptyBlock.kt b/j2k/tests/testData/ast/for/forWithEmptyBlock.kt
similarity index 100%
rename from j2k/tests/testData/ast/for/statement/forWithEmptyBlock.kt
rename to j2k/tests/testData/ast/for/forWithEmptyBlock.kt
diff --git a/j2k/tests/testData/ast/for/statement/forWithExpression.kt b/j2k/tests/testData/ast/for/forWithExpression.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/for/statement/forWithExpression.kt
rename to j2k/tests/testData/ast/for/forWithExpression.ide.kt
diff --git a/j2k/tests/testData/ast/for/statement/forWithExpression.jav b/j2k/tests/testData/ast/for/forWithExpression.jav
similarity index 72%
rename from j2k/tests/testData/ast/for/statement/forWithExpression.jav
rename to j2k/tests/testData/ast/for/forWithExpression.jav
index fc006f06703..e1e7f946fb9 100644
--- a/j2k/tests/testData/ast/for/statement/forWithExpression.jav
+++ b/j2k/tests/testData/ast/for/forWithExpression.jav
@@ -1 +1,2 @@
+//statement
for (int i = 0; i < 0; i++) t++;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/for/forWithExpression.kt b/j2k/tests/testData/ast/for/forWithExpression.kt
new file mode 100644
index 00000000000..be1826e8d8a
--- /dev/null
+++ b/j2k/tests/testData/ast/for/forWithExpression.kt
@@ -0,0 +1 @@
+for (i in 0..0 - 1) t++
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/for/statement/forWithNullCondition.kt b/j2k/tests/testData/ast/for/forWithNullCondition.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/for/statement/forWithNullCondition.kt
rename to j2k/tests/testData/ast/for/forWithNullCondition.ide.kt
diff --git a/j2k/tests/testData/ast/for/statement/forWithNullCondition.jav b/j2k/tests/testData/ast/for/forWithNullCondition.jav
similarity index 72%
rename from j2k/tests/testData/ast/for/statement/forWithNullCondition.jav
rename to j2k/tests/testData/ast/for/forWithNullCondition.jav
index 87d923167b5..a1010b054d9 100644
--- a/j2k/tests/testData/ast/for/statement/forWithNullCondition.jav
+++ b/j2k/tests/testData/ast/for/forWithNullCondition.jav
@@ -1 +1,2 @@
+//statement
for (init(); ; update()) body();
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/for/forWithNullCondition.kt b/j2k/tests/testData/ast/for/forWithNullCondition.kt
new file mode 100644
index 00000000000..cf2473e1d9a
--- /dev/null
+++ b/j2k/tests/testData/ast/for/forWithNullCondition.kt
@@ -0,0 +1,10 @@
+{
+init()
+while (true)
+{
+body()
+{
+update()
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/for/statement/forWithNullInit.kt b/j2k/tests/testData/ast/for/forWithNullInit.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/for/statement/forWithNullInit.kt
rename to j2k/tests/testData/ast/for/forWithNullInit.ide.kt
diff --git a/j2k/tests/testData/ast/for/forWithNullInit.jav b/j2k/tests/testData/ast/for/forWithNullInit.jav
new file mode 100644
index 00000000000..fac293aaafa
--- /dev/null
+++ b/j2k/tests/testData/ast/for/forWithNullInit.jav
@@ -0,0 +1,2 @@
+//statement
+for (; condition() ; update()) body();
diff --git a/j2k/tests/testData/ast/for/forWithNullInit.kt b/j2k/tests/testData/ast/for/forWithNullInit.kt
new file mode 100644
index 00000000000..f0216b02c94
--- /dev/null
+++ b/j2k/tests/testData/ast/for/forWithNullInit.kt
@@ -0,0 +1,9 @@
+{
+while (condition())
+{
+body()
+{
+update()
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/for/statement/forWithNullUpdate.kt b/j2k/tests/testData/ast/for/forWithNullUpdate.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/for/statement/forWithNullUpdate.kt
rename to j2k/tests/testData/ast/for/forWithNullUpdate.ide.kt
diff --git a/j2k/tests/testData/ast/for/forWithNullUpdate.jav b/j2k/tests/testData/ast/for/forWithNullUpdate.jav
new file mode 100644
index 00000000000..a642370ff72
--- /dev/null
+++ b/j2k/tests/testData/ast/for/forWithNullUpdate.jav
@@ -0,0 +1,2 @@
+//statement
+for (init(); condition(); ) body();
diff --git a/j2k/tests/testData/ast/for/forWithNullUpdate.kt b/j2k/tests/testData/ast/for/forWithNullUpdate.kt
new file mode 100644
index 00000000000..b683704827b
--- /dev/null
+++ b/j2k/tests/testData/ast/for/forWithNullUpdate.kt
@@ -0,0 +1,7 @@
+{
+init()
+while (condition())
+{
+body()
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/for/forWithReturn.ide.kt b/j2k/tests/testData/ast/for/forWithReturn.ide.kt
new file mode 100644
index 00000000000..7a25971d6f7
--- /dev/null
+++ b/j2k/tests/testData/ast/for/forWithReturn.ide.kt
@@ -0,0 +1,11 @@
+{
+val i = 0
+while (i < 0)
+{
+return i
+{
+j++
+i++
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/for/statement/forWithReturn.jav b/j2k/tests/testData/ast/for/forWithReturn.jav
similarity index 77%
rename from j2k/tests/testData/ast/for/statement/forWithReturn.jav
rename to j2k/tests/testData/ast/for/forWithReturn.jav
index 9a439dfe876..907fb8c607a 100644
--- a/j2k/tests/testData/ast/for/statement/forWithReturn.jav
+++ b/j2k/tests/testData/ast/for/forWithReturn.jav
@@ -1 +1,2 @@
+//statement
for (int i = 0; i < 0; j++, i++) return i;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/for/statement/forWithReturn.kt b/j2k/tests/testData/ast/for/forWithReturn.kt
similarity index 100%
rename from j2k/tests/testData/ast/for/statement/forWithReturn.kt
rename to j2k/tests/testData/ast/for/forWithReturn.kt
diff --git a/j2k/tests/testData/ast/for/statement/forWithNullInit.jav b/j2k/tests/testData/ast/for/statement/forWithNullInit.jav
deleted file mode 100644
index 424f82d59ac..00000000000
--- a/j2k/tests/testData/ast/for/statement/forWithNullInit.jav
+++ /dev/null
@@ -1 +0,0 @@
-for (; condition() ; update()) body();
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/for/statement/forWithNullUpdate.jav b/j2k/tests/testData/ast/for/statement/forWithNullUpdate.jav
deleted file mode 100644
index 3a7372eaf0d..00000000000
--- a/j2k/tests/testData/ast/for/statement/forWithNullUpdate.jav
+++ /dev/null
@@ -1 +0,0 @@
-for (init(); condition(); ) body();
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.ide.kt b/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.ide.kt
new file mode 100644
index 00000000000..8b03dd6d4ce
--- /dev/null
+++ b/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.ide.kt
@@ -0,0 +1,5 @@
+for (n in list)
+{
+val i = 1
+i++
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithBlock.jav b/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.jav
similarity index 75%
rename from j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithBlock.jav
rename to j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.jav
index 8657e2d8f9c..6f2a0e6986b 100644
--- a/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithBlock.jav
+++ b/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.jav
@@ -1 +1,2 @@
+//statement
for (Node n : list) {int i = 1; i++;}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithBlock.kt b/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.kt
similarity index 100%
rename from j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithBlock.kt
rename to j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.kt
diff --git a/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.kt b/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.kt
rename to j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.ide.kt
diff --git a/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.jav b/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.jav
similarity index 64%
rename from j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.jav
rename to j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.jav
index 225aecfb59c..c6352ce5c2c 100644
--- a/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.jav
+++ b/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.jav
@@ -1 +1,2 @@
+//statement
for (Node n : list) {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.kt b/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.kt
new file mode 100644
index 00000000000..7fa0c32db4d
--- /dev/null
+++ b/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.kt
@@ -0,0 +1,3 @@
+for (n in list)
+{
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithExpression.kt b/j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithExpression.kt
rename to j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.ide.kt
diff --git a/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithExpression.jav b/j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.jav
similarity index 66%
rename from j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithExpression.jav
rename to j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.jav
index 22e30e2879e..1291697d824 100644
--- a/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithExpression.jav
+++ b/j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.jav
@@ -1 +1,2 @@
+//statement
for (Node n : list) i++;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.kt b/j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.kt
new file mode 100644
index 00000000000..999fe998205
--- /dev/null
+++ b/j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.kt
@@ -0,0 +1,2 @@
+for (n in list)
+i++
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithReturn.kt b/j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithReturn.kt
rename to j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.ide.kt
diff --git a/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithReturn.jav b/j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.jav
similarity index 70%
rename from j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithReturn.jav
rename to j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.jav
index 59409790376..fe92486e41c 100644
--- a/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithReturn.jav
+++ b/j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.jav
@@ -1 +1,2 @@
+//statement
for (Node n : list) return n;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.kt b/j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.kt
new file mode 100644
index 00000000000..1e2f43f9a1f
--- /dev/null
+++ b/j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.kt
@@ -0,0 +1,2 @@
+for (n in list)
+return n
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/method/abstractMethod.kt b/j2k/tests/testData/ast/function/abstractMethod.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/function/method/abstractMethod.kt
rename to j2k/tests/testData/ast/function/abstractMethod.ide.kt
diff --git a/j2k/tests/testData/ast/function/method/abstractMethod.jav b/j2k/tests/testData/ast/function/abstractMethod.jav
similarity index 75%
rename from j2k/tests/testData/ast/function/method/abstractMethod.jav
rename to j2k/tests/testData/ast/function/abstractMethod.jav
index 03a2e8270c8..0dee9ddff42 100644
--- a/j2k/tests/testData/ast/function/method/abstractMethod.jav
+++ b/j2k/tests/testData/ast/function/abstractMethod.jav
@@ -1 +1,2 @@
+//method
abstract int getNoofGears();
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/abstractMethod.kt b/j2k/tests/testData/ast/function/abstractMethod.kt
new file mode 100644
index 00000000000..8163dfad9bb
--- /dev/null
+++ b/j2k/tests/testData/ast/function/abstractMethod.kt
@@ -0,0 +1 @@
+abstract fun getNoofGears() : Int
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/classGenericParam.ide.kt b/j2k/tests/testData/ast/function/classGenericParam.ide.kt
new file mode 100644
index 00000000000..6a054f02f70
--- /dev/null
+++ b/j2k/tests/testData/ast/function/classGenericParam.ide.kt
@@ -0,0 +1,2 @@
+fun getT() : T {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/method/classGenericParam.jav b/j2k/tests/testData/ast/function/classGenericParam.jav
similarity index 55%
rename from j2k/tests/testData/ast/function/method/classGenericParam.jav
rename to j2k/tests/testData/ast/function/classGenericParam.jav
index ec2f1534b58..c9012ce2cad 100644
--- a/j2k/tests/testData/ast/function/method/classGenericParam.jav
+++ b/j2k/tests/testData/ast/function/classGenericParam.jav
@@ -1 +1,2 @@
+//method
T getT() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/method/classGenericParam.kt b/j2k/tests/testData/ast/function/classGenericParam.kt
similarity index 100%
rename from j2k/tests/testData/ast/function/method/classGenericParam.kt
rename to j2k/tests/testData/ast/function/classGenericParam.kt
diff --git a/j2k/tests/testData/ast/function/method/emptyVoidMethod.kt b/j2k/tests/testData/ast/function/emptyVoidMethod.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/function/method/emptyVoidMethod.kt
rename to j2k/tests/testData/ast/function/emptyVoidMethod.ide.kt
diff --git a/j2k/tests/testData/ast/function/method/emptyVoidMethod.jav b/j2k/tests/testData/ast/function/emptyVoidMethod.jav
similarity index 60%
rename from j2k/tests/testData/ast/function/method/emptyVoidMethod.jav
rename to j2k/tests/testData/ast/function/emptyVoidMethod.jav
index 05a37e98348..50999bf549c 100644
--- a/j2k/tests/testData/ast/function/method/emptyVoidMethod.jav
+++ b/j2k/tests/testData/ast/function/emptyVoidMethod.jav
@@ -1 +1,2 @@
+//method
void main() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/emptyVoidMethod.kt b/j2k/tests/testData/ast/function/emptyVoidMethod.kt
new file mode 100644
index 00000000000..ae299eb173a
--- /dev/null
+++ b/j2k/tests/testData/ast/function/emptyVoidMethod.kt
@@ -0,0 +1,2 @@
+fun main() : Unit {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt
new file mode 100644
index 00000000000..9f25dd62141
--- /dev/null
+++ b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt
@@ -0,0 +1,35 @@
+package test
+open class Test() : Base() {
+public override fun hashCode() : Int {
+return super.hashCode()
+}
+public override fun equals(o : Any) : Boolean {
+return super.equals(o)
+}
+protected override fun clone() : Any {
+return super.clone()
+}
+public override fun toString() : String {
+return super.toString()
+}
+protected override fun finalize() : Unit {
+super.finalize()
+}
+}
+open class Base() {
+public open fun hashCode() : Int {
+return System.identityHashCode(this)
+}
+public open fun equals(o : Any) : Boolean {
+return this.identityEquals(o)
+}
+protected open fun clone() : Any {
+return super.clone()
+}
+public open fun toString() : String {
+return getJavaClass.getName() + '@' + Integer.toHexString(hashCode())
+}
+protected open fun finalize() : Unit {
+super.finalize()
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/file/extendsBaseWhichExtendsObject.jav b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.jav
similarity index 99%
rename from j2k/tests/testData/ast/function/file/extendsBaseWhichExtendsObject.jav
rename to j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.jav
index b72fd76ec71..29d24ef8067 100644
--- a/j2k/tests/testData/ast/function/file/extendsBaseWhichExtendsObject.jav
+++ b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.jav
@@ -1,3 +1,4 @@
+//file
package test;
class Test extends Base {
diff --git a/j2k/tests/testData/ast/function/file/extendsBaseWhichExtendsObject.kt b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt
similarity index 100%
rename from j2k/tests/testData/ast/function/file/extendsBaseWhichExtendsObject.kt
rename to j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt
diff --git a/j2k/tests/testData/ast/function/final.ide.kt b/j2k/tests/testData/ast/function/final.ide.kt
new file mode 100644
index 00000000000..51517e6cfc6
--- /dev/null
+++ b/j2k/tests/testData/ast/function/final.ide.kt
@@ -0,0 +1,3 @@
+fun getString() : String {
+return ""
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/method/final.jav b/j2k/tests/testData/ast/function/final.jav
similarity index 81%
rename from j2k/tests/testData/ast/function/method/final.jav
rename to j2k/tests/testData/ast/function/final.jav
index 8a49597af12..3b035e91736 100644
--- a/j2k/tests/testData/ast/function/method/final.jav
+++ b/j2k/tests/testData/ast/function/final.jav
@@ -1 +1,2 @@
+//method
final String getString() { return ""; }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/method/final.kt b/j2k/tests/testData/ast/function/final.kt
similarity index 100%
rename from j2k/tests/testData/ast/function/method/final.kt
rename to j2k/tests/testData/ast/function/final.kt
diff --git a/j2k/tests/testData/ast/function/file/functionInFinalClass.kt b/j2k/tests/testData/ast/function/functionInFinalClass.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/function/file/functionInFinalClass.kt
rename to j2k/tests/testData/ast/function/functionInFinalClass.ide.kt
diff --git a/j2k/tests/testData/ast/function/file/functionInFinalClass.jav b/j2k/tests/testData/ast/function/functionInFinalClass.jav
similarity index 88%
rename from j2k/tests/testData/ast/function/file/functionInFinalClass.jav
rename to j2k/tests/testData/ast/function/functionInFinalClass.jav
index e8417401a9a..360b8d5c0cf 100644
--- a/j2k/tests/testData/ast/function/file/functionInFinalClass.jav
+++ b/j2k/tests/testData/ast/function/functionInFinalClass.jav
@@ -1,3 +1,4 @@
+//file
package demo;
final class Final {
diff --git a/j2k/tests/testData/ast/function/functionInFinalClass.kt b/j2k/tests/testData/ast/function/functionInFinalClass.kt
new file mode 100644
index 00000000000..def36e1f8de
--- /dev/null
+++ b/j2k/tests/testData/ast/function/functionInFinalClass.kt
@@ -0,0 +1,5 @@
+package demo
+class Final() {
+fun test() : Unit {
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/method/internal.kt b/j2k/tests/testData/ast/function/internal.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/function/method/internal.kt
rename to j2k/tests/testData/ast/function/internal.ide.kt
diff --git a/j2k/tests/testData/ast/function/method/internal.jav b/j2k/tests/testData/ast/function/internal.jav
similarity index 60%
rename from j2k/tests/testData/ast/function/method/internal.jav
rename to j2k/tests/testData/ast/function/internal.jav
index 48b8cb32a8b..1dd7e81dc42 100644
--- a/j2k/tests/testData/ast/function/method/internal.jav
+++ b/j2k/tests/testData/ast/function/internal.jav
@@ -1 +1,2 @@
+//method
void test() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/internal.kt b/j2k/tests/testData/ast/function/internal.kt
new file mode 100644
index 00000000000..5b3e9634f3f
--- /dev/null
+++ b/j2k/tests/testData/ast/function/internal.kt
@@ -0,0 +1,2 @@
+fun test() : Unit {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/main.ide.kt b/j2k/tests/testData/ast/function/main.ide.kt
new file mode 100644
index 00000000000..5301c489a62
--- /dev/null
+++ b/j2k/tests/testData/ast/function/main.ide.kt
@@ -0,0 +1,4 @@
+class object {
+public fun main(args : Array) : Unit {
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/method/main.jav b/j2k/tests/testData/ast/function/main.jav
similarity index 82%
rename from j2k/tests/testData/ast/function/method/main.jav
rename to j2k/tests/testData/ast/function/main.jav
index a03c0afe12f..9340ae12095 100644
--- a/j2k/tests/testData/ast/function/method/main.jav
+++ b/j2k/tests/testData/ast/function/main.jav
@@ -1 +1,2 @@
+//method
public static void main(String[] args) {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/method/main.kt b/j2k/tests/testData/ast/function/main.kt
similarity index 100%
rename from j2k/tests/testData/ast/function/method/main.kt
rename to j2k/tests/testData/ast/function/main.kt
diff --git a/j2k/tests/testData/ast/function/methodClassType.ide.kt b/j2k/tests/testData/ast/function/methodClassType.ide.kt
new file mode 100644
index 00000000000..63f4630144a
--- /dev/null
+++ b/j2k/tests/testData/ast/function/methodClassType.ide.kt
@@ -0,0 +1,2 @@
+fun main() : String {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/method/methodClassType.jav b/j2k/tests/testData/ast/function/methodClassType.jav
similarity index 64%
rename from j2k/tests/testData/ast/function/method/methodClassType.jav
rename to j2k/tests/testData/ast/function/methodClassType.jav
index ad93979b6fc..dd49bf626b6 100644
--- a/j2k/tests/testData/ast/function/method/methodClassType.jav
+++ b/j2k/tests/testData/ast/function/methodClassType.jav
@@ -1 +1,2 @@
+//method
String main() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/method/methodClassType.kt b/j2k/tests/testData/ast/function/methodClassType.kt
similarity index 100%
rename from j2k/tests/testData/ast/function/method/methodClassType.kt
rename to j2k/tests/testData/ast/function/methodClassType.kt
diff --git a/j2k/tests/testData/ast/function/method/methodPrimitiveType.kt b/j2k/tests/testData/ast/function/methodPrimitiveType.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/function/method/methodPrimitiveType.kt
rename to j2k/tests/testData/ast/function/methodPrimitiveType.ide.kt
diff --git a/j2k/tests/testData/ast/function/method/methodPrimitiveType.jav b/j2k/tests/testData/ast/function/methodPrimitiveType.jav
similarity index 59%
rename from j2k/tests/testData/ast/function/method/methodPrimitiveType.jav
rename to j2k/tests/testData/ast/function/methodPrimitiveType.jav
index c272dabaeb6..57c96f9a0ea 100644
--- a/j2k/tests/testData/ast/function/method/methodPrimitiveType.jav
+++ b/j2k/tests/testData/ast/function/methodPrimitiveType.jav
@@ -1 +1,2 @@
+//method
int main() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/methodPrimitiveType.kt b/j2k/tests/testData/ast/function/methodPrimitiveType.kt
new file mode 100644
index 00000000000..c6ef43f8a14
--- /dev/null
+++ b/j2k/tests/testData/ast/function/methodPrimitiveType.kt
@@ -0,0 +1,2 @@
+fun main() : Int {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/method/methodPrimitiveType2.kt b/j2k/tests/testData/ast/function/methodPrimitiveType2.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/function/method/methodPrimitiveType2.kt
rename to j2k/tests/testData/ast/function/methodPrimitiveType2.ide.kt
diff --git a/j2k/tests/testData/ast/function/method/methodPrimitiveType2.jav b/j2k/tests/testData/ast/function/methodPrimitiveType2.jav
similarity index 65%
rename from j2k/tests/testData/ast/function/method/methodPrimitiveType2.jav
rename to j2k/tests/testData/ast/function/methodPrimitiveType2.jav
index 0539f74aaef..16d7399d058 100644
--- a/j2k/tests/testData/ast/function/method/methodPrimitiveType2.jav
+++ b/j2k/tests/testData/ast/function/methodPrimitiveType2.jav
@@ -1 +1,2 @@
+//method
boolean main() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/methodPrimitiveType2.kt b/j2k/tests/testData/ast/function/methodPrimitiveType2.kt
new file mode 100644
index 00000000000..c978e93e7aa
--- /dev/null
+++ b/j2k/tests/testData/ast/function/methodPrimitiveType2.kt
@@ -0,0 +1,2 @@
+fun main() : Boolean {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/method/methodWithReturnStatement.kt b/j2k/tests/testData/ast/function/methodWithReturnStatement.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/function/method/methodWithReturnStatement.kt
rename to j2k/tests/testData/ast/function/methodWithReturnStatement.ide.kt
diff --git a/j2k/tests/testData/ast/function/method/methodWithReturnStatement.jav b/j2k/tests/testData/ast/function/methodWithReturnStatement.jav
similarity index 78%
rename from j2k/tests/testData/ast/function/method/methodWithReturnStatement.jav
rename to j2k/tests/testData/ast/function/methodWithReturnStatement.jav
index 1b02cbaa290..ea1cacd48e5 100644
--- a/j2k/tests/testData/ast/function/method/methodWithReturnStatement.jav
+++ b/j2k/tests/testData/ast/function/methodWithReturnStatement.jav
@@ -1 +1,2 @@
+//method
boolean isTrue() { return true; }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/methodWithReturnStatement.kt b/j2k/tests/testData/ast/function/methodWithReturnStatement.kt
new file mode 100644
index 00000000000..acfbd1010d8
--- /dev/null
+++ b/j2k/tests/testData/ast/function/methodWithReturnStatement.kt
@@ -0,0 +1,3 @@
+fun isTrue() : Boolean {
+return true
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/open.ide.kt b/j2k/tests/testData/ast/function/open.ide.kt
new file mode 100644
index 00000000000..51517e6cfc6
--- /dev/null
+++ b/j2k/tests/testData/ast/function/open.ide.kt
@@ -0,0 +1,3 @@
+fun getString() : String {
+return ""
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/method/open.jav b/j2k/tests/testData/ast/function/open.jav
similarity index 78%
rename from j2k/tests/testData/ast/function/method/open.jav
rename to j2k/tests/testData/ast/function/open.jav
index 6db748fef42..e285b3091f5 100644
--- a/j2k/tests/testData/ast/function/method/open.jav
+++ b/j2k/tests/testData/ast/function/open.jav
@@ -1 +1,2 @@
+//method
String getString() { return ""; }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/method/open.kt b/j2k/tests/testData/ast/function/open.kt
similarity index 100%
rename from j2k/tests/testData/ast/function/method/open.kt
rename to j2k/tests/testData/ast/function/open.kt
diff --git a/j2k/tests/testData/ast/function/file/override.kt b/j2k/tests/testData/ast/function/override.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/function/file/override.kt
rename to j2k/tests/testData/ast/function/override.ide.kt
diff --git a/j2k/tests/testData/ast/function/file/override.jav b/j2k/tests/testData/ast/function/override.jav
similarity index 89%
rename from j2k/tests/testData/ast/function/file/override.jav
rename to j2k/tests/testData/ast/function/override.jav
index 63a319a053c..bcae054e7ff 100644
--- a/j2k/tests/testData/ast/function/file/override.jav
+++ b/j2k/tests/testData/ast/function/override.jav
@@ -1 +1,2 @@
+//file
class A {void a() {}} final class B extends A {void a() {}}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/override.kt b/j2k/tests/testData/ast/function/override.kt
new file mode 100644
index 00000000000..d895be5bb27
--- /dev/null
+++ b/j2k/tests/testData/ast/function/override.kt
@@ -0,0 +1,8 @@
+open class A() {
+open fun a() : Unit {
+}
+}
+class B() : A() {
+override fun a() : Unit {
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/file/overrideAndOpen.kt b/j2k/tests/testData/ast/function/overrideAndOpen.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/function/file/overrideAndOpen.kt
rename to j2k/tests/testData/ast/function/overrideAndOpen.ide.kt
diff --git a/j2k/tests/testData/ast/function/file/overrideAndOpen.jav b/j2k/tests/testData/ast/function/overrideAndOpen.jav
similarity index 93%
rename from j2k/tests/testData/ast/function/file/overrideAndOpen.jav
rename to j2k/tests/testData/ast/function/overrideAndOpen.jav
index bda1a410cff..a3b2f5a7ca8 100644
--- a/j2k/tests/testData/ast/function/file/overrideAndOpen.jav
+++ b/j2k/tests/testData/ast/function/overrideAndOpen.jav
@@ -1,3 +1,4 @@
+//file
class A {
void foo() {}
}
diff --git a/j2k/tests/testData/ast/function/overrideAndOpen.kt b/j2k/tests/testData/ast/function/overrideAndOpen.kt
new file mode 100644
index 00000000000..678a37a4a70
--- /dev/null
+++ b/j2k/tests/testData/ast/function/overrideAndOpen.kt
@@ -0,0 +1,12 @@
+open class A() {
+open fun foo() : Unit {
+}
+}
+open class B() : A() {
+override fun foo() : Unit {
+}
+}
+open class C() : B() {
+override fun foo() : Unit {
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/overrideObject.ide.kt b/j2k/tests/testData/ast/function/overrideObject.ide.kt
new file mode 100644
index 00000000000..bd26c7ce938
--- /dev/null
+++ b/j2k/tests/testData/ast/function/overrideObject.ide.kt
@@ -0,0 +1,18 @@
+package test
+open class Test() {
+public open fun hashCode() : Int {
+return System.identityHashCode(this)
+}
+public open fun equals(o : Any) : Boolean {
+return this.identityEquals(o)
+}
+protected open fun clone() : Any {
+return super.clone()
+}
+public open fun toString() : String {
+return getJavaClass.getName() + '@' + Integer.toHexString(hashCode())
+}
+protected open fun finalize() : Unit {
+super.finalize()
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/file/overrideObject.jav b/j2k/tests/testData/ast/function/overrideObject.jav
similarity index 98%
rename from j2k/tests/testData/ast/function/file/overrideObject.jav
rename to j2k/tests/testData/ast/function/overrideObject.jav
index 0538508c9b8..f3e75c843ee 100644
--- a/j2k/tests/testData/ast/function/file/overrideObject.jav
+++ b/j2k/tests/testData/ast/function/overrideObject.jav
@@ -1,3 +1,4 @@
+//file
package test;
class Test {
diff --git a/j2k/tests/testData/ast/function/file/overrideObject.kt b/j2k/tests/testData/ast/function/overrideObject.kt
similarity index 100%
rename from j2k/tests/testData/ast/function/file/overrideObject.kt
rename to j2k/tests/testData/ast/function/overrideObject.kt
diff --git a/j2k/tests/testData/ast/function/ownGenericParam.ide.kt b/j2k/tests/testData/ast/function/ownGenericParam.ide.kt
new file mode 100644
index 00000000000..ac57365e9fd
--- /dev/null
+++ b/j2k/tests/testData/ast/function/ownGenericParam.ide.kt
@@ -0,0 +1,2 @@
+fun putU(u : U) : Unit {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/method/ownGenericParam.jav b/j2k/tests/testData/ast/function/ownGenericParam.jav
similarity index 70%
rename from j2k/tests/testData/ast/function/method/ownGenericParam.jav
rename to j2k/tests/testData/ast/function/ownGenericParam.jav
index 3b651cfda09..d3d4f121a1b 100644
--- a/j2k/tests/testData/ast/function/method/ownGenericParam.jav
+++ b/j2k/tests/testData/ast/function/ownGenericParam.jav
@@ -1 +1,2 @@
+//method
void putU(U u) {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/method/ownGenericParam.kt b/j2k/tests/testData/ast/function/ownGenericParam.kt
similarity index 100%
rename from j2k/tests/testData/ast/function/method/ownGenericParam.kt
rename to j2k/tests/testData/ast/function/ownGenericParam.kt
diff --git a/j2k/tests/testData/ast/function/ownSeveralGenericParams.ide.kt b/j2k/tests/testData/ast/function/ownSeveralGenericParams.ide.kt
new file mode 100644
index 00000000000..eb9fce3065f
--- /dev/null
+++ b/j2k/tests/testData/ast/function/ownSeveralGenericParams.ide.kt
@@ -0,0 +1,2 @@
+fun putUVW(u : U, v : V, w : W) : Unit {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/method/ownSeveralGenericParams.jav b/j2k/tests/testData/ast/function/ownSeveralGenericParams.jav
similarity index 81%
rename from j2k/tests/testData/ast/function/method/ownSeveralGenericParams.jav
rename to j2k/tests/testData/ast/function/ownSeveralGenericParams.jav
index 3af41393000..a16f4b188d6 100644
--- a/j2k/tests/testData/ast/function/method/ownSeveralGenericParams.jav
+++ b/j2k/tests/testData/ast/function/ownSeveralGenericParams.jav
@@ -1 +1,2 @@
+//method
void putUVW(U u, V v, W w) {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/method/ownSeveralGenericParams.kt b/j2k/tests/testData/ast/function/ownSeveralGenericParams.kt
similarity index 100%
rename from j2k/tests/testData/ast/function/method/ownSeveralGenericParams.kt
rename to j2k/tests/testData/ast/function/ownSeveralGenericParams.kt
diff --git a/j2k/tests/testData/ast/function/method/private.kt b/j2k/tests/testData/ast/function/private.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/function/method/private.kt
rename to j2k/tests/testData/ast/function/private.ide.kt
diff --git a/j2k/tests/testData/ast/function/method/private.jav b/j2k/tests/testData/ast/function/private.jav
similarity index 70%
rename from j2k/tests/testData/ast/function/method/private.jav
rename to j2k/tests/testData/ast/function/private.jav
index 823fbd1e89e..145b7257db7 100644
--- a/j2k/tests/testData/ast/function/method/private.jav
+++ b/j2k/tests/testData/ast/function/private.jav
@@ -1 +1,2 @@
+//method
private void test() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/private.kt b/j2k/tests/testData/ast/function/private.kt
new file mode 100644
index 00000000000..45e5e8bab00
--- /dev/null
+++ b/j2k/tests/testData/ast/function/private.kt
@@ -0,0 +1,2 @@
+private fun test() : Unit {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/method/protected.kt b/j2k/tests/testData/ast/function/protected.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/function/method/protected.kt
rename to j2k/tests/testData/ast/function/protected.ide.kt
diff --git a/j2k/tests/testData/ast/function/method/protected.jav b/j2k/tests/testData/ast/function/protected.jav
similarity index 72%
rename from j2k/tests/testData/ast/function/method/protected.jav
rename to j2k/tests/testData/ast/function/protected.jav
index ab7575a6ed6..85be095041b 100644
--- a/j2k/tests/testData/ast/function/method/protected.jav
+++ b/j2k/tests/testData/ast/function/protected.jav
@@ -1 +1,2 @@
+//method
protected void test() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/protected.kt b/j2k/tests/testData/ast/function/protected.kt
new file mode 100644
index 00000000000..dbbc30b447b
--- /dev/null
+++ b/j2k/tests/testData/ast/function/protected.kt
@@ -0,0 +1,2 @@
+protected fun test() : Unit {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/method/public.kt b/j2k/tests/testData/ast/function/public.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/function/method/public.kt
rename to j2k/tests/testData/ast/function/public.ide.kt
diff --git a/j2k/tests/testData/ast/function/method/public.jav b/j2k/tests/testData/ast/function/public.jav
similarity index 70%
rename from j2k/tests/testData/ast/function/method/public.jav
rename to j2k/tests/testData/ast/function/public.jav
index db620e22298..087a1dacddb 100644
--- a/j2k/tests/testData/ast/function/method/public.jav
+++ b/j2k/tests/testData/ast/function/public.jav
@@ -1 +1,2 @@
+//method
public void test() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/public.kt b/j2k/tests/testData/ast/function/public.kt
new file mode 100644
index 00000000000..d835330ec86
--- /dev/null
+++ b/j2k/tests/testData/ast/function/public.kt
@@ -0,0 +1,2 @@
+public fun test() : Unit {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/varVararg.ide.kt b/j2k/tests/testData/ast/function/varVararg.ide.kt
new file mode 100644
index 00000000000..cb04b7d2f96
--- /dev/null
+++ b/j2k/tests/testData/ast/function/varVararg.ide.kt
@@ -0,0 +1,6 @@
+package demo
+open class Test() {
+open fun test(vararg var args : Any) : Unit {
+args = array(1, 2, 3)
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/file/varVararg.jav b/j2k/tests/testData/ast/function/varVararg.jav
similarity index 93%
rename from j2k/tests/testData/ast/function/file/varVararg.jav
rename to j2k/tests/testData/ast/function/varVararg.jav
index bba8ce2db90..ac4996f2db8 100644
--- a/j2k/tests/testData/ast/function/file/varVararg.jav
+++ b/j2k/tests/testData/ast/function/varVararg.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class Test {
diff --git a/j2k/tests/testData/ast/function/file/varVararg.kt b/j2k/tests/testData/ast/function/varVararg.kt
similarity index 100%
rename from j2k/tests/testData/ast/function/file/varVararg.kt
rename to j2k/tests/testData/ast/function/varVararg.kt
diff --git a/j2k/tests/testData/ast/function/file/writableParameter.kt b/j2k/tests/testData/ast/function/writableParameter.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/function/file/writableParameter.kt
rename to j2k/tests/testData/ast/function/writableParameter.ide.kt
diff --git a/j2k/tests/testData/ast/function/file/writableParameter.jav b/j2k/tests/testData/ast/function/writableParameter.jav
similarity index 92%
rename from j2k/tests/testData/ast/function/file/writableParameter.jav
rename to j2k/tests/testData/ast/function/writableParameter.jav
index c2ed3cf10d4..3b7736c9212 100644
--- a/j2k/tests/testData/ast/function/file/writableParameter.jav
+++ b/j2k/tests/testData/ast/function/writableParameter.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class Test {
diff --git a/j2k/tests/testData/ast/function/writableParameter.kt b/j2k/tests/testData/ast/function/writableParameter.kt
new file mode 100644
index 00000000000..b098e657066
--- /dev/null
+++ b/j2k/tests/testData/ast/function/writableParameter.kt
@@ -0,0 +1,7 @@
+package demo
+open class Test() {
+open fun test(var i : Int) : Int {
+i = 10
+return i + 20
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/identifier/expression/withDollar.jav b/j2k/tests/testData/ast/identifier/expression/withDollar.jav
deleted file mode 100644
index 49ceb94e5b8..00000000000
--- a/j2k/tests/testData/ast/identifier/expression/withDollar.jav
+++ /dev/null
@@ -1 +0,0 @@
-$$$$$
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt b/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt
new file mode 100644
index 00000000000..eaa77087c55
--- /dev/null
+++ b/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt
@@ -0,0 +1,13 @@
+open class `$$$$$`() {
+}
+open class `$`() {
+}
+open class `$$`(`$$$$` : `$$$$$`) : `$`() {
+val `$$$` : `$$$$$`
+public open fun `$$$$$$`() : `$$$$$` {
+return `$$$`
+}
+{
+`$$$` = `$$$$`
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/identifier/file/finalFieldReference.jav b/j2k/tests/testData/ast/identifier/finalFieldReference.jav
similarity index 95%
rename from j2k/tests/testData/ast/identifier/file/finalFieldReference.jav
rename to j2k/tests/testData/ast/identifier/finalFieldReference.jav
index f5d31f19d64..bca4c97d5b0 100644
--- a/j2k/tests/testData/ast/identifier/file/finalFieldReference.jav
+++ b/j2k/tests/testData/ast/identifier/finalFieldReference.jav
@@ -1,3 +1,4 @@
+//file
class $$$$$ {}
class $ {}
diff --git a/j2k/tests/testData/ast/identifier/file/finalFieldReference.kt b/j2k/tests/testData/ast/identifier/finalFieldReference.kt
similarity index 100%
rename from j2k/tests/testData/ast/identifier/file/finalFieldReference.kt
rename to j2k/tests/testData/ast/identifier/finalFieldReference.kt
diff --git a/j2k/tests/testData/ast/identifier/keywords.ide.kt b/j2k/tests/testData/ast/identifier/keywords.ide.kt
new file mode 100644
index 00000000000..9dbe1a315e7
--- /dev/null
+++ b/j2k/tests/testData/ast/identifier/keywords.ide.kt
@@ -0,0 +1,11 @@
+val `as` : Int
+val `type` : Int
+val `val` : Int
+val `var` : Int
+val `fun` : Int
+val `is` : Int
+val `in` : Int
+val `object` : Int
+val `when` : Int
+val `trait` : Int
+val `This` : Int
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/identifier/statement/keywords.jav b/j2k/tests/testData/ast/identifier/keywords.jav
similarity index 84%
rename from j2k/tests/testData/ast/identifier/statement/keywords.jav
rename to j2k/tests/testData/ast/identifier/keywords.jav
index 02a6d77d21a..98414215cb4 100644
--- a/j2k/tests/testData/ast/identifier/statement/keywords.jav
+++ b/j2k/tests/testData/ast/identifier/keywords.jav
@@ -1 +1,2 @@
+//statement
int as, type, val, var, fun, is, in, object, when, trait, This;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/identifier/statement/keywords.kt b/j2k/tests/testData/ast/identifier/keywords.kt
similarity index 100%
rename from j2k/tests/testData/ast/identifier/statement/keywords.kt
rename to j2k/tests/testData/ast/identifier/keywords.kt
diff --git a/j2k/tests/testData/ast/identifier/expression/withDollar.kt b/j2k/tests/testData/ast/identifier/withDollar.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/identifier/expression/withDollar.kt
rename to j2k/tests/testData/ast/identifier/withDollar.ide.kt
diff --git a/j2k/tests/testData/ast/identifier/withDollar.jav b/j2k/tests/testData/ast/identifier/withDollar.jav
new file mode 100644
index 00000000000..b9b48285c9e
--- /dev/null
+++ b/j2k/tests/testData/ast/identifier/withDollar.jav
@@ -0,0 +1,2 @@
+//expression
+$$$$$
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/identifier/withDollar.kt b/j2k/tests/testData/ast/identifier/withDollar.kt
new file mode 100644
index 00000000000..47ac2104db8
--- /dev/null
+++ b/j2k/tests/testData/ast/identifier/withDollar.kt
@@ -0,0 +1 @@
+`$$$$$`
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.kt
rename to j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.ide.kt
diff --git a/j2k/tests/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.jav b/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.jav
similarity index 63%
rename from j2k/tests/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.jav
rename to j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.jav
index 3690c79ad62..b0789de87df 100644
--- a/j2k/tests/testData/ast/ifStatement/statement/ifStatementWithEmptyBlocks.jav
+++ b/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.jav
@@ -1 +1,2 @@
+//statement
if (1 > 0) {} else {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.kt
new file mode 100644
index 00000000000..4587b89bf1e
--- /dev/null
+++ b/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.kt
@@ -0,0 +1,6 @@
+if (1 > 0)
+{
+}
+else
+{
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.ide.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.ide.kt
new file mode 100644
index 00000000000..19c68833ab2
--- /dev/null
+++ b/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.ide.kt
@@ -0,0 +1,9 @@
+if (1 > 0)
+{
+val n = 1
+return n
+}
+else
+{
+return 0
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.jav b/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.jav
similarity index 80%
rename from j2k/tests/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.jav
rename to j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.jav
index 5546ee07bcf..566724fceaa 100644
--- a/j2k/tests/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.jav
+++ b/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.jav
@@ -1 +1,2 @@
+//statement
if (1 > 0) {int n = 1; return n;} else {return 0;}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.kt
similarity index 100%
rename from j2k/tests/testData/ast/ifStatement/statement/ifStatementWithMultilineBlocks.kt
rename to j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.kt
diff --git a/j2k/tests/testData/ast/ifStatement/statement/ifStatementWithOneLineBlocks.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/ifStatement/statement/ifStatementWithOneLineBlocks.kt
rename to j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.ide.kt
diff --git a/j2k/tests/testData/ast/ifStatement/statement/ifStatementWithOneLineBlocks.jav b/j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.jav
similarity index 73%
rename from j2k/tests/testData/ast/ifStatement/statement/ifStatementWithOneLineBlocks.jav
rename to j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.jav
index c772469d2d2..ab907ed943c 100644
--- a/j2k/tests/testData/ast/ifStatement/statement/ifStatementWithOneLineBlocks.jav
+++ b/j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.jav
@@ -1 +1,2 @@
+//statement
if (true) return 1; else return 0;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.kt
new file mode 100644
index 00000000000..923c0d36318
--- /dev/null
+++ b/j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.kt
@@ -0,0 +1,4 @@
+if (true)
+return 1
+else
+return 0
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.ide.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.ide.kt
new file mode 100644
index 00000000000..96a26560347
--- /dev/null
+++ b/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.ide.kt
@@ -0,0 +1,5 @@
+if (1 > 0)
+{
+val n = 1
+return n
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/ifStatement/statement/ifStatementWithoutElse.jav b/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.jav
similarity index 73%
rename from j2k/tests/testData/ast/ifStatement/statement/ifStatementWithoutElse.jav
rename to j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.jav
index d4814fbe107..4debfeaf426 100644
--- a/j2k/tests/testData/ast/ifStatement/statement/ifStatementWithoutElse.jav
+++ b/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.jav
@@ -1 +1,2 @@
+//statement
if (1 > 0) {int n = 1; return n;}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/ifStatement/statement/ifStatementWithoutElse.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.kt
similarity index 100%
rename from j2k/tests/testData/ast/ifStatement/statement/ifStatementWithoutElse.kt
rename to j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.kt
diff --git a/j2k/tests/testData/ast/importStatement/file/importWithKeywords.kt b/j2k/tests/testData/ast/importStatement/importWithKeywords.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/importStatement/file/importWithKeywords.kt
rename to j2k/tests/testData/ast/importStatement/importWithKeywords.ide.kt
diff --git a/j2k/tests/testData/ast/importStatement/file/importWithKeywords.jav b/j2k/tests/testData/ast/importStatement/importWithKeywords.jav
similarity index 92%
rename from j2k/tests/testData/ast/importStatement/file/importWithKeywords.jav
rename to j2k/tests/testData/ast/importStatement/importWithKeywords.jav
index 5b4e73fec5a..e65da94d928 100644
--- a/j2k/tests/testData/ast/importStatement/file/importWithKeywords.jav
+++ b/j2k/tests/testData/ast/importStatement/importWithKeywords.jav
@@ -1,3 +1,4 @@
+//file
package test;
import as.type.val.var.fun.is.in.object.when.trait.This;
diff --git a/j2k/tests/testData/ast/importStatement/importWithKeywords.kt b/j2k/tests/testData/ast/importStatement/importWithKeywords.kt
new file mode 100644
index 00000000000..63b5935201f
--- /dev/null
+++ b/j2k/tests/testData/ast/importStatement/importWithKeywords.kt
@@ -0,0 +1,4 @@
+package test
+import `as`.`type`.`val`.`var`.`fun`.`is`.`in`.`object`.`when`.`trait`.`This`
+open class Test() {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/importStatement/file/importWithStar.kt b/j2k/tests/testData/ast/importStatement/importWithStar.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/importStatement/file/importWithStar.kt
rename to j2k/tests/testData/ast/importStatement/importWithStar.ide.kt
diff --git a/j2k/tests/testData/ast/importStatement/file/importWithStar.jav b/j2k/tests/testData/ast/importStatement/importWithStar.jav
similarity index 93%
rename from j2k/tests/testData/ast/importStatement/file/importWithStar.jav
rename to j2k/tests/testData/ast/importStatement/importWithStar.jav
index abbec8d10d3..41455c1be6c 100644
--- a/j2k/tests/testData/ast/importStatement/file/importWithStar.jav
+++ b/j2k/tests/testData/ast/importStatement/importWithStar.jav
@@ -1,3 +1,4 @@
+//file
package org.jetbrains.jet.j2k;
import org.jetbrains.annotations.*;
diff --git a/j2k/tests/testData/ast/importStatement/importWithStar.kt b/j2k/tests/testData/ast/importStatement/importWithStar.kt
new file mode 100644
index 00000000000..c390c539acc
--- /dev/null
+++ b/j2k/tests/testData/ast/importStatement/importWithStar.kt
@@ -0,0 +1,4 @@
+package org.jetbrains.jet.j2k
+import org.jetbrains.annotations.*
+public open class Converter() {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/importStatement/file/simpleImport.kt b/j2k/tests/testData/ast/importStatement/simpleImport.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/importStatement/file/simpleImport.kt
rename to j2k/tests/testData/ast/importStatement/simpleImport.ide.kt
diff --git a/j2k/tests/testData/ast/importStatement/file/simpleImport.jav b/j2k/tests/testData/ast/importStatement/simpleImport.jav
similarity index 93%
rename from j2k/tests/testData/ast/importStatement/file/simpleImport.jav
rename to j2k/tests/testData/ast/importStatement/simpleImport.jav
index a2daf0cd933..5cd35650f21 100644
--- a/j2k/tests/testData/ast/importStatement/file/simpleImport.jav
+++ b/j2k/tests/testData/ast/importStatement/simpleImport.jav
@@ -1,3 +1,4 @@
+//file
package org.jetbrains.jet.j2k;
import org.jetbrains.annotations.NotNull;
diff --git a/j2k/tests/testData/ast/importStatement/simpleImport.kt b/j2k/tests/testData/ast/importStatement/simpleImport.kt
new file mode 100644
index 00000000000..c35720004e5
--- /dev/null
+++ b/j2k/tests/testData/ast/importStatement/simpleImport.kt
@@ -0,0 +1,3 @@
+package org.jetbrains.jet.j2k
+public open class Converter() {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/inProjectionType/methodParams.ide.kt b/j2k/tests/testData/ast/inProjectionType/methodParams.ide.kt
new file mode 100644
index 00000000000..c5f37c03f4c
--- /dev/null
+++ b/j2k/tests/testData/ast/inProjectionType/methodParams.ide.kt
@@ -0,0 +1,2 @@
+fun popAll(dst : Collection) : Unit {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/inProjectionType/method/methodParams.jav b/j2k/tests/testData/ast/inProjectionType/methodParams.jav
similarity index 82%
rename from j2k/tests/testData/ast/inProjectionType/method/methodParams.jav
rename to j2k/tests/testData/ast/inProjectionType/methodParams.jav
index 63b9ff6d6b7..4178ba48e8d 100644
--- a/j2k/tests/testData/ast/inProjectionType/method/methodParams.jav
+++ b/j2k/tests/testData/ast/inProjectionType/methodParams.jav
@@ -1 +1,2 @@
+//method
void popAll(Collection dst) {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/inProjectionType/method/methodParams.kt b/j2k/tests/testData/ast/inProjectionType/methodParams.kt
similarity index 100%
rename from j2k/tests/testData/ast/inProjectionType/method/methodParams.kt
rename to j2k/tests/testData/ast/inProjectionType/methodParams.kt
diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt
new file mode 100644
index 00000000000..1808e38ae78
--- /dev/null
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt
@@ -0,0 +1,8 @@
+open class Base(name : T) {
+}
+open class One(name : T, second : K) : Base(name) {
+private var mySecond : K = 0
+{
+mySecond = second
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseGeneric.jav b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.jav
similarity index 95%
rename from j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseGeneric.jav
rename to j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.jav
index 0abe463c9ae..fb9d147dc8a 100644
--- a/j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseGeneric.jav
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.jav
@@ -1,3 +1,4 @@
+//file
class Base {
Base(T name) { }
}
diff --git a/j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseGeneric.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt
similarity index 100%
rename from j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseGeneric.kt
rename to j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt
diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt
new file mode 100644
index 00000000000..c219bb292a7
--- /dev/null
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt
@@ -0,0 +1,4 @@
+open class Base(name : String) {
+}
+open class One(name : String, second : String) : Base(name) {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithOneParam.jav b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.jav
similarity index 94%
rename from j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithOneParam.jav
rename to j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.jav
index 9e7190d29fa..25ac22a46eb 100644
--- a/j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithOneParam.jav
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.jav
@@ -1,3 +1,4 @@
+//file
class Base {
Base(String name) {}
}
diff --git a/j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithOneParam.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.kt
similarity index 100%
rename from j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithOneParam.kt
rename to j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.kt
diff --git a/j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParams.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParams.kt
rename to j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.ide.kt
diff --git a/j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParams.jav b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.jav
similarity index 85%
rename from j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParams.jav
rename to j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.jav
index 2a89c5bd6e0..ea454d8d12a 100644
--- a/j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParams.jav
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.jav
@@ -1,3 +1,4 @@
+//file
class Base {}
class One extends Base {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.kt
new file mode 100644
index 00000000000..94f907016db
--- /dev/null
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.kt
@@ -0,0 +1,4 @@
+open class Base() {
+}
+open class One() : Base() {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt
new file mode 100644
index 00000000000..2a152e2f826
--- /dev/null
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt
@@ -0,0 +1,8 @@
+open class Base(name : String) {
+}
+open class One(name : String, second : String) : Base(name) {
+private var mySecond : String = 0
+{
+mySecond = second
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.jav b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.jav
similarity index 96%
rename from j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.jav
rename to j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.jav
index 94f530c95a1..5f662cfc21e 100644
--- a/j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.jav
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.jav
@@ -1,3 +1,4 @@
+//file
class Base {
Base(String name) {
}
diff --git a/j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt
similarity index 100%
rename from j2k/tests/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt
rename to j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt
diff --git a/j2k/tests/testData/ast/isOperator/expression/complicatedExpression.kt b/j2k/tests/testData/ast/isOperator/complicatedExpression.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/isOperator/expression/complicatedExpression.kt
rename to j2k/tests/testData/ast/isOperator/complicatedExpression.ide.kt
diff --git a/j2k/tests/testData/ast/isOperator/expression/complicatedExpression.jav b/j2k/tests/testData/ast/isOperator/complicatedExpression.jav
similarity index 75%
rename from j2k/tests/testData/ast/isOperator/expression/complicatedExpression.jav
rename to j2k/tests/testData/ast/isOperator/complicatedExpression.jav
index 8840a8af77b..c998dd81b65 100644
--- a/j2k/tests/testData/ast/isOperator/expression/complicatedExpression.jav
+++ b/j2k/tests/testData/ast/isOperator/complicatedExpression.jav
@@ -1 +1,2 @@
+//expression
c.getType().getName() instanceof String
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/isOperator/complicatedExpression.kt b/j2k/tests/testData/ast/isOperator/complicatedExpression.kt
new file mode 100644
index 00000000000..1cf2e9ebc79
--- /dev/null
+++ b/j2k/tests/testData/ast/isOperator/complicatedExpression.kt
@@ -0,0 +1 @@
+c.getType().getName() is String
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/isOperator/expression/simpleReference.kt b/j2k/tests/testData/ast/isOperator/simpleReference.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/isOperator/expression/simpleReference.kt
rename to j2k/tests/testData/ast/isOperator/simpleReference.ide.kt
diff --git a/j2k/tests/testData/ast/isOperator/expression/simpleReference.jav b/j2k/tests/testData/ast/isOperator/simpleReference.jav
similarity index 59%
rename from j2k/tests/testData/ast/isOperator/expression/simpleReference.jav
rename to j2k/tests/testData/ast/isOperator/simpleReference.jav
index 2cd30e5adf2..c010435ac4a 100644
--- a/j2k/tests/testData/ast/isOperator/expression/simpleReference.jav
+++ b/j2k/tests/testData/ast/isOperator/simpleReference.jav
@@ -1 +1,2 @@
+//expression
a instanceof String
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/isOperator/simpleReference.kt b/j2k/tests/testData/ast/isOperator/simpleReference.kt
new file mode 100644
index 00000000000..7ccaa0c9744
--- /dev/null
+++ b/j2k/tests/testData/ast/isOperator/simpleReference.kt
@@ -0,0 +1 @@
+a is String
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/arrayLength.ide.kt b/j2k/tests/testData/ast/issues/arrayLength.ide.kt
new file mode 100644
index 00000000000..cbe0fe83b77
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/arrayLength.ide.kt
@@ -0,0 +1,7 @@
+open class Test() {
+class object {
+public open fun foo(args : Array) : Int {
+return args.size
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/arrayLength.jav b/j2k/tests/testData/ast/issues/arrayLength.jav
similarity index 92%
rename from j2k/tests/testData/ast/issues/file/arrayLength.jav
rename to j2k/tests/testData/ast/issues/arrayLength.jav
index 418cf61f079..a08f83805fe 100644
--- a/j2k/tests/testData/ast/issues/file/arrayLength.jav
+++ b/j2k/tests/testData/ast/issues/arrayLength.jav
@@ -1,3 +1,4 @@
+//file
class Test {
public static int foo(String[] args) {
return args.length;
diff --git a/j2k/tests/testData/ast/issues/file/arrayLength.kt b/j2k/tests/testData/ast/issues/arrayLength.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/arrayLength.kt
rename to j2k/tests/testData/ast/issues/arrayLength.kt
diff --git a/j2k/tests/testData/ast/issues/file/comments.kt b/j2k/tests/testData/ast/issues/comments.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/comments.kt
rename to j2k/tests/testData/ast/issues/comments.ide.kt
diff --git a/j2k/tests/testData/ast/issues/file/comments.jav b/j2k/tests/testData/ast/issues/comments.jav
similarity index 97%
rename from j2k/tests/testData/ast/issues/file/comments.jav
rename to j2k/tests/testData/ast/issues/comments.jav
index 1220e5f6776..61547baf89e 100644
--- a/j2k/tests/testData/ast/issues/file/comments.jav
+++ b/j2k/tests/testData/ast/issues/comments.jav
@@ -1,3 +1,4 @@
+//file
// This is an end-of-line comment
/*
diff --git a/j2k/tests/testData/ast/issues/comments.kt b/j2k/tests/testData/ast/issues/comments.kt
new file mode 100644
index 00000000000..e98e6e431d5
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/comments.kt
@@ -0,0 +1,17 @@
+// This is an end-of-line comment
+/*
+This is a block comment
+*/
+open class C() {
+// This is a class comment
+/**
+ * This is a field doc comment.
+ */
+private var i : Int = 0
+/**
+ * This is a function doc comment.
+ */
+public open fun foo() : Unit {
+/* This is a function comment */
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-1016.kt b/j2k/tests/testData/ast/issues/kt-1016.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-1016.kt
rename to j2k/tests/testData/ast/issues/kt-1016.ide.kt
diff --git a/j2k/tests/testData/ast/issues/file/kt-1016.jav b/j2k/tests/testData/ast/issues/kt-1016.jav
similarity index 92%
rename from j2k/tests/testData/ast/issues/file/kt-1016.jav
rename to j2k/tests/testData/ast/issues/kt-1016.jav
index 2e7b3a85644..4fba7116cbf 100644
--- a/j2k/tests/testData/ast/issues/file/kt-1016.jav
+++ b/j2k/tests/testData/ast/issues/kt-1016.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class C {
diff --git a/j2k/tests/testData/ast/issues/kt-1016.kt b/j2k/tests/testData/ast/issues/kt-1016.kt
new file mode 100644
index 00000000000..801abcf6e5a
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-1016.kt
@@ -0,0 +1,7 @@
+package demo
+open class C(i : Int) {
+private val i : Int
+{
+this.i = i
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/kt-1048.ide.kt b/j2k/tests/testData/ast/issues/kt-1048.ide.kt
new file mode 100644
index 00000000000..f54664254b7
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-1048.ide.kt
@@ -0,0 +1,14 @@
+import java.util.HashMap
+open class G(t : T) {
+}
+public open class Java() {
+open fun test() : Unit {
+val m = HashMap()
+m.put(1, 1)
+}
+open fun test2() : Unit {
+val m = HashMap()
+val g = G("")
+val g2 = G("")
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-1048.jav b/j2k/tests/testData/ast/issues/kt-1048.jav
similarity index 97%
rename from j2k/tests/testData/ast/issues/file/kt-1048.jav
rename to j2k/tests/testData/ast/issues/kt-1048.jav
index 0b198292616..2dfbfb69b7c 100644
--- a/j2k/tests/testData/ast/issues/file/kt-1048.jav
+++ b/j2k/tests/testData/ast/issues/kt-1048.jav
@@ -1,3 +1,4 @@
+//file
import java.util.HashMap;
class G {
diff --git a/j2k/tests/testData/ast/issues/file/kt-1048.kt b/j2k/tests/testData/ast/issues/kt-1048.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-1048.kt
rename to j2k/tests/testData/ast/issues/kt-1048.kt
diff --git a/j2k/tests/testData/ast/issues/file/kt-1074.kt b/j2k/tests/testData/ast/issues/kt-1074.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-1074.kt
rename to j2k/tests/testData/ast/issues/kt-1074.ide.kt
diff --git a/j2k/tests/testData/ast/issues/file/kt-1074.jav b/j2k/tests/testData/ast/issues/kt-1074.jav
similarity index 98%
rename from j2k/tests/testData/ast/issues/file/kt-1074.jav
rename to j2k/tests/testData/ast/issues/kt-1074.jav
index 4579da0addc..e9b01318ba7 100644
--- a/j2k/tests/testData/ast/issues/file/kt-1074.jav
+++ b/j2k/tests/testData/ast/issues/kt-1074.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class Test {
diff --git a/j2k/tests/testData/ast/issues/kt-1074.kt b/j2k/tests/testData/ast/issues/kt-1074.kt
new file mode 100644
index 00000000000..652697c03b5
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-1074.kt
@@ -0,0 +1,13 @@
+package demo
+open class Test() {
+class object {
+open fun subListRangeCheck(fromIndex : Int, toIndex : Int, size : Int) : Unit {
+if (fromIndex < 0)
+throw IndexOutOfBoundsException("fromIndex = " + fromIndex)
+if (toIndex > size)
+throw IndexOutOfBoundsException("toIndex = " + toIndex)
+if (fromIndex > toIndex)
+throw IllegalArgumentException("fromIndex(" + fromIndex + ") > toIndex(" + toIndex + ")")
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/kt-543-boxed.ide.kt b/j2k/tests/testData/ast/issues/kt-543-boxed.ide.kt
new file mode 100644
index 00000000000..de2f22324ed
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-543-boxed.ide.kt
@@ -0,0 +1,11 @@
+package demo
+open class Test() {
+open fun putInt(i : Int) : Unit {
+}
+open fun test() : Unit {
+val b = 10
+putInt(b.toInt())
+val b2 = 10
+putInt(b2.toInt())
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-543-boxed.jav b/j2k/tests/testData/ast/issues/kt-543-boxed.jav
similarity index 95%
rename from j2k/tests/testData/ast/issues/file/kt-543-boxed.jav
rename to j2k/tests/testData/ast/issues/kt-543-boxed.jav
index e1f28f04faa..d97e9ddc4b8 100644
--- a/j2k/tests/testData/ast/issues/file/kt-543-boxed.jav
+++ b/j2k/tests/testData/ast/issues/kt-543-boxed.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class Test {
diff --git a/j2k/tests/testData/ast/issues/file/kt-543-boxed.kt b/j2k/tests/testData/ast/issues/kt-543-boxed.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-543-boxed.kt
rename to j2k/tests/testData/ast/issues/kt-543-boxed.kt
diff --git a/j2k/tests/testData/ast/issues/kt-543-mixed.ide.kt b/j2k/tests/testData/ast/issues/kt-543-mixed.ide.kt
new file mode 100644
index 00000000000..d42440ca277
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-543-mixed.ide.kt
@@ -0,0 +1,9 @@
+package demo
+open class Test() {
+open fun putInt(i : Int) : Unit {
+}
+open fun test() : Unit {
+val i = 10
+putInt(i)
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-543-mixed.jav b/j2k/tests/testData/ast/issues/kt-543-mixed.jav
similarity index 93%
rename from j2k/tests/testData/ast/issues/file/kt-543-mixed.jav
rename to j2k/tests/testData/ast/issues/kt-543-mixed.jav
index 1193a5403bb..41282d98ab3 100644
--- a/j2k/tests/testData/ast/issues/file/kt-543-mixed.jav
+++ b/j2k/tests/testData/ast/issues/kt-543-mixed.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class Test {
diff --git a/j2k/tests/testData/ast/issues/file/kt-543-mixed.kt b/j2k/tests/testData/ast/issues/kt-543-mixed.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-543-mixed.kt
rename to j2k/tests/testData/ast/issues/kt-543-mixed.kt
diff --git a/j2k/tests/testData/ast/issues/kt-543.ide.kt b/j2k/tests/testData/ast/issues/kt-543.ide.kt
new file mode 100644
index 00000000000..b78e0c86415
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-543.ide.kt
@@ -0,0 +1,9 @@
+package demo
+open class Test() {
+open fun putInt(i : Int) : Unit {
+}
+open fun test() : Unit {
+val b = 10
+putInt(b.toInt())
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-543.jav b/j2k/tests/testData/ast/issues/kt-543.jav
similarity index 93%
rename from j2k/tests/testData/ast/issues/file/kt-543.jav
rename to j2k/tests/testData/ast/issues/kt-543.jav
index c5e0e602076..ef01474693f 100644
--- a/j2k/tests/testData/ast/issues/file/kt-543.jav
+++ b/j2k/tests/testData/ast/issues/kt-543.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class Test {
diff --git a/j2k/tests/testData/ast/issues/file/kt-543.kt b/j2k/tests/testData/ast/issues/kt-543.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-543.kt
rename to j2k/tests/testData/ast/issues/kt-543.kt
diff --git a/j2k/tests/testData/ast/issues/kt-638.ide.kt b/j2k/tests/testData/ast/issues/kt-638.ide.kt
new file mode 100644
index 00000000000..8ba587838e2
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-638.ide.kt
@@ -0,0 +1,38 @@
+public open class Identifier(_myName : T, _myHasDollar : Boolean) {
+private val myName : T
+private var myHasDollar : Boolean = false
+private var myNullable : Boolean = true
+public open fun getName() : T {
+return myName
+}
+{
+myName = _myName
+myHasDollar = _myHasDollar
+}
+class object {
+public open fun init(name : T) : Identifier {
+val __ = Identifier(name, false)
+return __
+}
+public open fun init(name : T, isNullable : Boolean) : Identifier {
+val __ = Identifier(name, false)
+__.myNullable = isNullable
+return __
+}
+public open fun init(name : T, hasDollar : Boolean, isNullable : Boolean) : Identifier {
+val __ = Identifier(name, hasDollar)
+__.myNullable = isNullable
+return __
+}
+}
+}
+public open class User() {
+class object {
+public open fun main(args : Array) : Unit {
+val i1 = Identifier.init("name", false, true)
+val i2 = Identifier.init("name", false)
+val i3 = Identifier.init("name")
+}
+}
+}
+fun main(args : Array) = User.main(args as Array?)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-638.jav b/j2k/tests/testData/ast/issues/kt-638.jav
similarity index 99%
rename from j2k/tests/testData/ast/issues/file/kt-638.jav
rename to j2k/tests/testData/ast/issues/kt-638.jav
index 8a5b22477da..0a86c6b72b4 100644
--- a/j2k/tests/testData/ast/issues/file/kt-638.jav
+++ b/j2k/tests/testData/ast/issues/kt-638.jav
@@ -1,3 +1,4 @@
+//file
public class Identifier {
private final T myName;
private boolean myHasDollar;
diff --git a/j2k/tests/testData/ast/issues/file/kt-638.kt b/j2k/tests/testData/ast/issues/kt-638.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-638.kt
rename to j2k/tests/testData/ast/issues/kt-638.kt
diff --git a/j2k/tests/testData/ast/issues/kt-696.ide.kt b/j2k/tests/testData/ast/issues/kt-696.ide.kt
new file mode 100644
index 00000000000..746e2628d75
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-696.ide.kt
@@ -0,0 +1,23 @@
+package test
+open class Base() {
+public open fun hashCode() : Int {
+return System.identityHashCode(this)
+}
+public open fun equals(o : Any) : Boolean {
+return this.identityEquals(o)
+}
+public open fun toString() : String {
+return getJavaClass.getName() + '@' + Integer.toHexString(hashCode())
+}
+}
+open class Child() : Base() {
+public override fun hashCode() : Int {
+return super.hashCode()
+}
+public override fun equals(o : Any) : Boolean {
+return super.equals(o)
+}
+public override fun toString() : String {
+return super.toString()
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-696.jav b/j2k/tests/testData/ast/issues/kt-696.jav
similarity index 98%
rename from j2k/tests/testData/ast/issues/file/kt-696.jav
rename to j2k/tests/testData/ast/issues/kt-696.jav
index 2a03b39aa53..bf9610f0a7f 100644
--- a/j2k/tests/testData/ast/issues/file/kt-696.jav
+++ b/j2k/tests/testData/ast/issues/kt-696.jav
@@ -1,3 +1,4 @@
+//file
package test;
class Base {
diff --git a/j2k/tests/testData/ast/issues/file/kt-696.kt b/j2k/tests/testData/ast/issues/kt-696.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-696.kt
rename to j2k/tests/testData/ast/issues/kt-696.kt
diff --git a/j2k/tests/testData/ast/issues/kt-792-mixed.ide.kt b/j2k/tests/testData/ast/issues/kt-792-mixed.ide.kt
new file mode 100644
index 00000000000..1ef3d38bf15
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-792-mixed.ide.kt
@@ -0,0 +1,7 @@
+package demo
+open class Test(i : Int) {
+open fun test() : Unit {
+val i = 10
+Test(i)
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-792-mixed.jav b/j2k/tests/testData/ast/issues/kt-792-mixed.jav
similarity index 93%
rename from j2k/tests/testData/ast/issues/file/kt-792-mixed.jav
rename to j2k/tests/testData/ast/issues/kt-792-mixed.jav
index 95fdbca8c1c..0a12c2f896b 100644
--- a/j2k/tests/testData/ast/issues/file/kt-792-mixed.jav
+++ b/j2k/tests/testData/ast/issues/kt-792-mixed.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class Test {
diff --git a/j2k/tests/testData/ast/issues/file/kt-792-mixed.kt b/j2k/tests/testData/ast/issues/kt-792-mixed.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-792-mixed.kt
rename to j2k/tests/testData/ast/issues/kt-792-mixed.kt
diff --git a/j2k/tests/testData/ast/issues/kt-792.ide.kt b/j2k/tests/testData/ast/issues/kt-792.ide.kt
new file mode 100644
index 00000000000..a90021b8ab5
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-792.ide.kt
@@ -0,0 +1,7 @@
+package demo
+open class Test(i : Int) {
+open fun test() : Unit {
+val b = 10
+Test(b.toInt())
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-792.jav b/j2k/tests/testData/ast/issues/kt-792.jav
similarity index 93%
rename from j2k/tests/testData/ast/issues/file/kt-792.jav
rename to j2k/tests/testData/ast/issues/kt-792.jav
index 9c1d1cf00d9..b49aa3c5aad 100644
--- a/j2k/tests/testData/ast/issues/file/kt-792.jav
+++ b/j2k/tests/testData/ast/issues/kt-792.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class Test {
diff --git a/j2k/tests/testData/ast/issues/file/kt-792.kt b/j2k/tests/testData/ast/issues/kt-792.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-792.kt
rename to j2k/tests/testData/ast/issues/kt-792.kt
diff --git a/j2k/tests/testData/ast/issues/kt-794-mixed.ide.kt b/j2k/tests/testData/ast/issues/kt-794-mixed.ide.kt
new file mode 100644
index 00000000000..9eb2852ea37
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-794-mixed.ide.kt
@@ -0,0 +1,9 @@
+package demo
+open class Test() {
+open fun getInteger(i : Int) : Int {
+return i
+}
+open fun test() : Unit {
+val i = getInteger(10)!!
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-794-mixed.jav b/j2k/tests/testData/ast/issues/kt-794-mixed.jav
similarity index 94%
rename from j2k/tests/testData/ast/issues/file/kt-794-mixed.jav
rename to j2k/tests/testData/ast/issues/kt-794-mixed.jav
index d64b41aa5a8..1e9c506b397 100644
--- a/j2k/tests/testData/ast/issues/file/kt-794-mixed.jav
+++ b/j2k/tests/testData/ast/issues/kt-794-mixed.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class Test {
diff --git a/j2k/tests/testData/ast/issues/file/kt-794-mixed.kt b/j2k/tests/testData/ast/issues/kt-794-mixed.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-794-mixed.kt
rename to j2k/tests/testData/ast/issues/kt-794-mixed.kt
diff --git a/j2k/tests/testData/ast/issues/kt-794.ide.kt b/j2k/tests/testData/ast/issues/kt-794.ide.kt
new file mode 100644
index 00000000000..621f7c77988
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-794.ide.kt
@@ -0,0 +1,6 @@
+open class Test() {
+open fun getInt() : Int {
+val b = 10
+return b.toInt()
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-794.jav b/j2k/tests/testData/ast/issues/kt-794.jav
similarity index 90%
rename from j2k/tests/testData/ast/issues/file/kt-794.jav
rename to j2k/tests/testData/ast/issues/kt-794.jav
index 5458bce32ca..2449369ac43 100644
--- a/j2k/tests/testData/ast/issues/file/kt-794.jav
+++ b/j2k/tests/testData/ast/issues/kt-794.jav
@@ -1,3 +1,4 @@
+//file
class Test {
int getInt() {
byte b = 10;
diff --git a/j2k/tests/testData/ast/issues/file/kt-794.kt b/j2k/tests/testData/ast/issues/kt-794.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-794.kt
rename to j2k/tests/testData/ast/issues/kt-794.kt
diff --git a/j2k/tests/testData/ast/issues/kt-809-string.ide.kt b/j2k/tests/testData/ast/issues/kt-809-string.ide.kt
new file mode 100644
index 00000000000..1e774047243
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-809-string.ide.kt
@@ -0,0 +1,19 @@
+package demo
+open class Container() {
+var myString : String = "1"
+}
+open class One() {
+class object {
+var myContainer : Container = Container()
+}
+}
+open class StringContainer(s : String) {
+}
+open class Test() {
+open fun putString(s : String) : Unit {
+}
+open fun test() : Unit {
+putString(One.myContainer.myString)
+StringContainer(One.myContainer.myString)
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-809-string.jav b/j2k/tests/testData/ast/issues/kt-809-string.jav
similarity index 97%
rename from j2k/tests/testData/ast/issues/file/kt-809-string.jav
rename to j2k/tests/testData/ast/issues/kt-809-string.jav
index 5e60a8c8552..9b30eda142a 100644
--- a/j2k/tests/testData/ast/issues/file/kt-809-string.jav
+++ b/j2k/tests/testData/ast/issues/kt-809-string.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class Container {
diff --git a/j2k/tests/testData/ast/issues/file/kt-809-string.kt b/j2k/tests/testData/ast/issues/kt-809-string.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-809-string.kt
rename to j2k/tests/testData/ast/issues/kt-809-string.kt
diff --git a/j2k/tests/testData/ast/issues/kt-809.ide.kt b/j2k/tests/testData/ast/issues/kt-809.ide.kt
new file mode 100644
index 00000000000..39edc95786d
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-809.ide.kt
@@ -0,0 +1,19 @@
+package demo
+open class Container() {
+var myInt : Int = 1
+}
+open class One() {
+class object {
+var myContainer : Container = Container()
+}
+}
+open class IntContainer(i : Int) {
+}
+open class Test() {
+open fun putInt(i : Int) : Unit {
+}
+open fun test() : Unit {
+putInt(One.myContainer.myInt)
+IntContainer(One.myContainer.myInt)
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-809.jav b/j2k/tests/testData/ast/issues/kt-809.jav
similarity index 97%
rename from j2k/tests/testData/ast/issues/file/kt-809.jav
rename to j2k/tests/testData/ast/issues/kt-809.jav
index b2cc8015ee9..875042db04f 100644
--- a/j2k/tests/testData/ast/issues/file/kt-809.jav
+++ b/j2k/tests/testData/ast/issues/kt-809.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class Container {
diff --git a/j2k/tests/testData/ast/issues/file/kt-809.kt b/j2k/tests/testData/ast/issues/kt-809.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-809.kt
rename to j2k/tests/testData/ast/issues/kt-809.kt
diff --git a/j2k/tests/testData/ast/issues/kt-820-field.ide.kt b/j2k/tests/testData/ast/issues/kt-820-field.ide.kt
new file mode 100644
index 00000000000..51515fb72a7
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-820-field.ide.kt
@@ -0,0 +1,12 @@
+package demo
+open class Container() {
+var myInt : Int = 1
+}
+open class One() {
+class object {
+var myContainer : Container = Container()
+}
+}
+open class Test() {
+var b : Byte = One.myContainer.myInt.toByte()
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-820-field.jav b/j2k/tests/testData/ast/issues/kt-820-field.jav
similarity index 95%
rename from j2k/tests/testData/ast/issues/file/kt-820-field.jav
rename to j2k/tests/testData/ast/issues/kt-820-field.jav
index ca2c1588ef7..4c66f60dfb9 100644
--- a/j2k/tests/testData/ast/issues/file/kt-820-field.jav
+++ b/j2k/tests/testData/ast/issues/kt-820-field.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class Container {
diff --git a/j2k/tests/testData/ast/issues/file/kt-820-field.kt b/j2k/tests/testData/ast/issues/kt-820-field.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-820-field.kt
rename to j2k/tests/testData/ast/issues/kt-820-field.kt
diff --git a/j2k/tests/testData/ast/issues/kt-820-string.ide.kt b/j2k/tests/testData/ast/issues/kt-820-string.ide.kt
new file mode 100644
index 00000000000..c46310e511d
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-820-string.ide.kt
@@ -0,0 +1,8 @@
+open class Test() {
+class object {
+public open fun toFileSystemSafeName(name : String) : String {
+val size = name.length()
+return name
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-820-string.jav b/j2k/tests/testData/ast/issues/kt-820-string.jav
similarity index 95%
rename from j2k/tests/testData/ast/issues/file/kt-820-string.jav
rename to j2k/tests/testData/ast/issues/kt-820-string.jav
index 9bc81004c38..63d30d88bf3 100644
--- a/j2k/tests/testData/ast/issues/file/kt-820-string.jav
+++ b/j2k/tests/testData/ast/issues/kt-820-string.jav
@@ -1,3 +1,4 @@
+//file
class Test {
public static String toFileSystemSafeName(String name) {
int size = name.length();
diff --git a/j2k/tests/testData/ast/issues/file/kt-820-string.kt b/j2k/tests/testData/ast/issues/kt-820-string.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-820-string.kt
rename to j2k/tests/testData/ast/issues/kt-820-string.kt
diff --git a/j2k/tests/testData/ast/issues/kt-820.ide.kt b/j2k/tests/testData/ast/issues/kt-820.ide.kt
new file mode 100644
index 00000000000..88a596837fb
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-820.ide.kt
@@ -0,0 +1,14 @@
+package demo
+open class Container() {
+var myInt : Int = 1
+}
+open class One() {
+class object {
+var myContainer : Container = Container()
+}
+}
+open class Test() {
+open fun test() : Unit {
+val b = One.myContainer.myInt.toByte()
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-820.jav b/j2k/tests/testData/ast/issues/kt-820.jav
similarity index 96%
rename from j2k/tests/testData/ast/issues/file/kt-820.jav
rename to j2k/tests/testData/ast/issues/kt-820.jav
index 20ac0acdb97..a5d47bb1d49 100644
--- a/j2k/tests/testData/ast/issues/file/kt-820.jav
+++ b/j2k/tests/testData/ast/issues/kt-820.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class Container {
diff --git a/j2k/tests/testData/ast/issues/file/kt-820.kt b/j2k/tests/testData/ast/issues/kt-820.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-820.kt
rename to j2k/tests/testData/ast/issues/kt-820.kt
diff --git a/j2k/tests/testData/ast/issues/kt-824-isDir.ide.kt b/j2k/tests/testData/ast/issues/kt-824-isDir.ide.kt
new file mode 100644
index 00000000000..a3b96c5b4aa
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-824-isDir.ide.kt
@@ -0,0 +1,22 @@
+package test
+import java.io.File
+/**
+* User: ignatov
+*/
+public open class Test() {
+class object {
+public open fun isDir(parent : File) : Boolean {
+if (parent == null || !parent.exists())
+{
+return false
+}
+val result = true
+if (parent.isDirectory())
+{
+return true
+}
+else
+return false
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-824-isDir.jav b/j2k/tests/testData/ast/issues/kt-824-isDir.jav
similarity index 98%
rename from j2k/tests/testData/ast/issues/file/kt-824-isDir.jav
rename to j2k/tests/testData/ast/issues/kt-824-isDir.jav
index 3429c9be45f..1526492d962 100644
--- a/j2k/tests/testData/ast/issues/file/kt-824-isDir.jav
+++ b/j2k/tests/testData/ast/issues/kt-824-isDir.jav
@@ -1,3 +1,4 @@
+//file
package test;
import java.io.File;
diff --git a/j2k/tests/testData/ast/issues/file/kt-824-isDir.kt b/j2k/tests/testData/ast/issues/kt-824-isDir.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-824-isDir.kt
rename to j2k/tests/testData/ast/issues/kt-824-isDir.kt
diff --git a/j2k/tests/testData/ast/issues/kt-824.ide.kt b/j2k/tests/testData/ast/issues/kt-824.ide.kt
new file mode 100644
index 00000000000..30577dd0df4
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-824.ide.kt
@@ -0,0 +1,26 @@
+package demo
+open class Container() {
+var myBoolean : Boolean = true
+}
+open class One() {
+class object {
+var myContainer : Container = Container()
+}
+}
+open class Test() {
+open fun test() : Unit {
+if (One.myContainer.myBoolean)
+System.out.println("Ok")
+val s = (if (One.myContainer.myBoolean)
+"YES"
+else
+"NO")
+while (One.myContainer.myBoolean)
+System.out.println("Ok")
+do
+{
+System.out.println("Ok")
+}
+while (One.myContainer.myBoolean)
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-824.jav b/j2k/tests/testData/ast/issues/kt-824.jav
similarity index 98%
rename from j2k/tests/testData/ast/issues/file/kt-824.jav
rename to j2k/tests/testData/ast/issues/kt-824.jav
index 4e0a95754fd..987ebd0b6c9 100644
--- a/j2k/tests/testData/ast/issues/file/kt-824.jav
+++ b/j2k/tests/testData/ast/issues/kt-824.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class Container {
diff --git a/j2k/tests/testData/ast/issues/file/kt-824.kt b/j2k/tests/testData/ast/issues/kt-824.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-824.kt
rename to j2k/tests/testData/ast/issues/kt-824.kt
diff --git a/j2k/tests/testData/ast/issues/kt-828.ide.kt b/j2k/tests/testData/ast/issues/kt-828.ide.kt
new file mode 100644
index 00000000000..21a2b6bb51d
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-828.ide.kt
@@ -0,0 +1,14 @@
+open class Test() {
+open fun test() : Unit {
+val res = true
+res = res and false
+res = res or false
+res = res xor false
+System.out.println(true and false)
+System.out.println(true or false)
+System.out.println(true xor false)
+System.out.println(!true)
+System.out.println(true && false)
+System.out.println(true || false)
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-828.jav b/j2k/tests/testData/ast/issues/kt-828.jav
similarity index 97%
rename from j2k/tests/testData/ast/issues/file/kt-828.jav
rename to j2k/tests/testData/ast/issues/kt-828.jav
index 682975f22e0..37ea22f175a 100644
--- a/j2k/tests/testData/ast/issues/file/kt-828.jav
+++ b/j2k/tests/testData/ast/issues/kt-828.jav
@@ -1,3 +1,4 @@
+//file
class Test {
void test() {
boolean res = true;
diff --git a/j2k/tests/testData/ast/issues/file/kt-828.kt b/j2k/tests/testData/ast/issues/kt-828.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-828.kt
rename to j2k/tests/testData/ast/issues/kt-828.kt
diff --git a/j2k/tests/testData/ast/issues/kt-836.ide.kt b/j2k/tests/testData/ast/issues/kt-836.ide.kt
new file mode 100644
index 00000000000..26276c4091b
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-836.ide.kt
@@ -0,0 +1,25 @@
+package com.voltvoodoo.saplo4j.model
+import java.io.Serializable
+public open class Language(code : String) : Serializable {
+protected var code : String = 0
+public override fun toString() : String {
+return this.code
+}
+{
+this.code = code
+}
+}
+open class Base() {
+open fun test() : Unit {
+}
+open fun toString() : String {
+return "BASE"
+}
+}
+open class Child() : Base() {
+override fun test() : Unit {
+}
+override fun toString() : String {
+return "Child"
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-836.jav b/j2k/tests/testData/ast/issues/kt-836.jav
similarity index 98%
rename from j2k/tests/testData/ast/issues/file/kt-836.jav
rename to j2k/tests/testData/ast/issues/kt-836.jav
index 99d0b460e3a..042c8f90472 100644
--- a/j2k/tests/testData/ast/issues/file/kt-836.jav
+++ b/j2k/tests/testData/ast/issues/kt-836.jav
@@ -1,3 +1,4 @@
+//file
package com.voltvoodoo.saplo4j.model;
import java.io.Serializable;
diff --git a/j2k/tests/testData/ast/issues/file/kt-836.kt b/j2k/tests/testData/ast/issues/kt-836.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-836.kt
rename to j2k/tests/testData/ast/issues/kt-836.kt
diff --git a/j2k/tests/testData/ast/issues/kt-837.ide.kt b/j2k/tests/testData/ast/issues/kt-837.ide.kt
new file mode 100644
index 00000000000..f049c0eb7e6
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-837.ide.kt
@@ -0,0 +1,16 @@
+package com.voltvoodoo.saplo4j.model
+import java.io.Serializable
+public open class Language(code : String) : Serializable {
+protected var code : String = 0
+public open fun equals(other : Language) : Boolean {
+return other.toString().equals(this.toString())
+}
+{
+this.code = code
+}
+class object {
+public var ENGLISH : Language = Language("en")
+public var SWEDISH : Language = Language("sv")
+private val serialVersionUID : Long = -2442762969929206780
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-837.jav b/j2k/tests/testData/ast/issues/kt-837.jav
similarity index 98%
rename from j2k/tests/testData/ast/issues/file/kt-837.jav
rename to j2k/tests/testData/ast/issues/kt-837.jav
index c1f41afeccf..95571bf130a 100644
--- a/j2k/tests/testData/ast/issues/file/kt-837.jav
+++ b/j2k/tests/testData/ast/issues/kt-837.jav
@@ -1,3 +1,4 @@
+//file
package com.voltvoodoo.saplo4j.model;
import java.io.Serializable;
diff --git a/j2k/tests/testData/ast/issues/file/kt-837.kt b/j2k/tests/testData/ast/issues/kt-837.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-837.kt
rename to j2k/tests/testData/ast/issues/kt-837.kt
diff --git a/j2k/tests/testData/ast/issues/kt-852.ide.kt b/j2k/tests/testData/ast/issues/kt-852.ide.kt
new file mode 100644
index 00000000000..7d296cbff20
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-852.ide.kt
@@ -0,0 +1,13 @@
+package demo
+open class Test() {
+open fun test() : String {
+val s1 = ""
+val s2 = ""
+val s3 = ""
+if (s1.isEmpty() && s2.isEmpty())
+return "OK"
+if (s1.isEmpty() && s2.isEmpty() && s3.isEmpty())
+return "OOOK"
+return ""
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-852.jav b/j2k/tests/testData/ast/issues/kt-852.jav
similarity index 97%
rename from j2k/tests/testData/ast/issues/file/kt-852.jav
rename to j2k/tests/testData/ast/issues/kt-852.jav
index b9abf40fe36..6a7dc278e58 100644
--- a/j2k/tests/testData/ast/issues/file/kt-852.jav
+++ b/j2k/tests/testData/ast/issues/kt-852.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class Test {
diff --git a/j2k/tests/testData/ast/issues/file/kt-852.kt b/j2k/tests/testData/ast/issues/kt-852.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-852.kt
rename to j2k/tests/testData/ast/issues/kt-852.kt
diff --git a/j2k/tests/testData/ast/issues/kt-871.ide.kt b/j2k/tests/testData/ast/issues/kt-871.ide.kt
new file mode 100644
index 00000000000..e11d5c91c76
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-871.ide.kt
@@ -0,0 +1,9 @@
+package demo
+open class Program() {
+class object {
+public open fun main(args : Array) : Unit {
+System.out.println("Halo!")
+}
+}
+}
+fun main(args : Array) = Program.main(args as Array?)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-871.jav b/j2k/tests/testData/ast/issues/kt-871.jav
similarity index 94%
rename from j2k/tests/testData/ast/issues/file/kt-871.jav
rename to j2k/tests/testData/ast/issues/kt-871.jav
index b49b8041fc5..ea108048b2c 100644
--- a/j2k/tests/testData/ast/issues/file/kt-871.jav
+++ b/j2k/tests/testData/ast/issues/kt-871.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class Program {
diff --git a/j2k/tests/testData/ast/issues/file/kt-871.kt b/j2k/tests/testData/ast/issues/kt-871.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-871.kt
rename to j2k/tests/testData/ast/issues/kt-871.kt
diff --git a/j2k/tests/testData/ast/issues/file/kt-879.kt b/j2k/tests/testData/ast/issues/kt-879.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-879.kt
rename to j2k/tests/testData/ast/issues/kt-879.ide.kt
diff --git a/j2k/tests/testData/ast/issues/file/kt-879.jav b/j2k/tests/testData/ast/issues/kt-879.jav
similarity index 97%
rename from j2k/tests/testData/ast/issues/file/kt-879.jav
rename to j2k/tests/testData/ast/issues/kt-879.jav
index bd55559a3d8..c9cbe1b3604 100644
--- a/j2k/tests/testData/ast/issues/file/kt-879.jav
+++ b/j2k/tests/testData/ast/issues/kt-879.jav
@@ -1,3 +1,4 @@
+//file
class Test {
public static int getInt(int i) {
switch (i) {
diff --git a/j2k/tests/testData/ast/issues/kt-879.kt b/j2k/tests/testData/ast/issues/kt-879.kt
new file mode 100644
index 00000000000..b52d1403a85
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-879.kt
@@ -0,0 +1,23 @@
+open class Test() {
+class object {
+public open fun getInt(i : Int) : Int {
+when (i) {
+0 -> {
+return 0
+}
+1 -> {
+return 1
+}
+2 -> {
+return 2
+}
+3 -> {
+return 3
+}
+else -> {
+return -1
+}
+}
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/kt-893.ide.kt b/j2k/tests/testData/ast/issues/kt-893.ide.kt
new file mode 100644
index 00000000000..1caab4290f3
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-893.ide.kt
@@ -0,0 +1,8 @@
+package demo
+open class Test() {
+open fun test() : Unit {
+for (i in 0..10 - 1) {
+System.out.println(i)
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/kt-893.jav b/j2k/tests/testData/ast/issues/kt-893.jav
similarity index 94%
rename from j2k/tests/testData/ast/issues/file/kt-893.jav
rename to j2k/tests/testData/ast/issues/kt-893.jav
index 8637f952b7e..8a75da1c3ff 100644
--- a/j2k/tests/testData/ast/issues/file/kt-893.jav
+++ b/j2k/tests/testData/ast/issues/kt-893.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class Test {
diff --git a/j2k/tests/testData/ast/issues/file/kt-893.kt b/j2k/tests/testData/ast/issues/kt-893.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-893.kt
rename to j2k/tests/testData/ast/issues/kt-893.kt
diff --git a/j2k/tests/testData/ast/issues/file/kt-963.kt b/j2k/tests/testData/ast/issues/kt-963.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/kt-963.kt
rename to j2k/tests/testData/ast/issues/kt-963.ide.kt
diff --git a/j2k/tests/testData/ast/issues/file/kt-963.jav b/j2k/tests/testData/ast/issues/kt-963.jav
similarity index 92%
rename from j2k/tests/testData/ast/issues/file/kt-963.jav
rename to j2k/tests/testData/ast/issues/kt-963.jav
index 9e2cbb3e114..5c50c3be6da 100644
--- a/j2k/tests/testData/ast/issues/file/kt-963.jav
+++ b/j2k/tests/testData/ast/issues/kt-963.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class C {
diff --git a/j2k/tests/testData/ast/issues/kt-963.kt b/j2k/tests/testData/ast/issues/kt-963.kt
new file mode 100644
index 00000000000..2e024295a77
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/kt-963.kt
@@ -0,0 +1,7 @@
+package demo
+open class C(a : Int) {
+var abc : Int = 0
+{
+abc = a * 2
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/qualifyStatic.ide.kt b/j2k/tests/testData/ast/issues/qualifyStatic.ide.kt
new file mode 100644
index 00000000000..7cfa3eea3f5
--- /dev/null
+++ b/j2k/tests/testData/ast/issues/qualifyStatic.ide.kt
@@ -0,0 +1,6 @@
+import java.util.Calendar
+abstract class MyCalendar() : Calendar() {
+public open fun foo() : Unit {
+val i = Calendar.ALL_STYLES
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/file/qualifyStatic.jav b/j2k/tests/testData/ast/issues/qualifyStatic.jav
similarity index 94%
rename from j2k/tests/testData/ast/issues/file/qualifyStatic.jav
rename to j2k/tests/testData/ast/issues/qualifyStatic.jav
index 35b26e68374..8382a7665f9 100644
--- a/j2k/tests/testData/ast/issues/file/qualifyStatic.jav
+++ b/j2k/tests/testData/ast/issues/qualifyStatic.jav
@@ -1,3 +1,4 @@
+//file
import java.util.Calendar
abstract class MyCalendar extends Calendar {
diff --git a/j2k/tests/testData/ast/issues/file/qualifyStatic.kt b/j2k/tests/testData/ast/issues/qualifyStatic.kt
similarity index 100%
rename from j2k/tests/testData/ast/issues/file/qualifyStatic.kt
rename to j2k/tests/testData/ast/issues/qualifyStatic.kt
diff --git a/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt b/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt
new file mode 100644
index 00000000000..5d03d470b2a
--- /dev/null
+++ b/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt
@@ -0,0 +1,19 @@
+package demo
+open class Test() : java.lang.Iterable {
+public override fun iterator() : java.util.Iterator {
+return null
+}
+public open fun push(i : java.util.Iterator) : java.util.Iterator {
+val j = i
+return j
+}
+}
+open class FullTest() : java.lang.Iterable {
+public override fun iterator() : java.util.Iterator {
+return null
+}
+public open fun push(i : java.util.Iterator) : java.util.Iterator {
+val j = i
+return j
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/kotlinExclusion/file/kt-656.jav b/j2k/tests/testData/ast/kotlinExclusion/kt-656.jav
similarity index 98%
rename from j2k/tests/testData/ast/kotlinExclusion/file/kt-656.jav
rename to j2k/tests/testData/ast/kotlinExclusion/kt-656.jav
index 1c05dc9b7be..1a3b16843bd 100644
--- a/j2k/tests/testData/ast/kotlinExclusion/file/kt-656.jav
+++ b/j2k/tests/testData/ast/kotlinExclusion/kt-656.jav
@@ -1,3 +1,4 @@
+//file
package demo;
import java.util.Iterator;
diff --git a/j2k/tests/testData/ast/kotlinExclusion/file/kt-656.kt b/j2k/tests/testData/ast/kotlinExclusion/kt-656.kt
similarity index 100%
rename from j2k/tests/testData/ast/kotlinExclusion/file/kt-656.kt
rename to j2k/tests/testData/ast/kotlinExclusion/kt-656.kt
diff --git a/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.ide.kt b/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.ide.kt
new file mode 100644
index 00000000000..5730840e161
--- /dev/null
+++ b/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.ide.kt
@@ -0,0 +1,18 @@
+@test for (i in 0..max) {
+val n = substring.length()
+val j = i
+val k = 0
+while (n-- != 0)
+{
+if (searchMe.charAt(j++) != substring.charAt(k++))
+{
+continue@test
+}
+}
+foundIt = true
+break@test
+}
+System.out.println((if (foundIt)
+"Found it"
+else
+"Didn't find it"))
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.jav b/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.jav
similarity index 97%
rename from j2k/tests/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.jav
rename to j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.jav
index 5c8ac99dd07..0aa2b3dd098 100644
--- a/j2k/tests/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.jav
+++ b/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.jav
@@ -1 +1,2 @@
+//statement
test: for (int i = 0; i <= max; i++) { int n = substring.length(); int j = i; int k = 0; while (n-- != 0) { if (searchMe.charAt(j++) != substring.charAt(k++)) { continue test; } } foundIt = true; break test; } System.out.println(foundIt ? "Found it" : "Didn't find it"); }}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.kt b/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.kt
similarity index 100%
rename from j2k/tests/testData/ast/labelStatement/statement/complicatedExampleFromJavaTutorial.kt
rename to j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.kt
diff --git a/j2k/tests/testData/ast/list/ForEach.ide.kt b/j2k/tests/testData/ast/list/ForEach.ide.kt
new file mode 100644
index 00000000000..0fd8d8309ef
--- /dev/null
+++ b/j2k/tests/testData/ast/list/ForEach.ide.kt
@@ -0,0 +1,15 @@
+import java.util.*
+public open class ForEach() {
+public open fun test() : Unit {
+val xs = ArrayList()
+val ys = LinkedList()
+for (x in xs)
+{
+ys.add(x)
+}
+for (y in ys)
+{
+xs.add(y)
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/list/file/ForEach.jav b/j2k/tests/testData/ast/list/ForEach.jav
similarity index 97%
rename from j2k/tests/testData/ast/list/file/ForEach.jav
rename to j2k/tests/testData/ast/list/ForEach.jav
index fb9eed76e95..7daecf251e2 100644
--- a/j2k/tests/testData/ast/list/file/ForEach.jav
+++ b/j2k/tests/testData/ast/list/ForEach.jav
@@ -1,3 +1,4 @@
+//file
import java.util.*;
public class ForEach {
diff --git a/j2k/tests/testData/ast/list/file/ForEach.kt b/j2k/tests/testData/ast/list/ForEach.kt
similarity index 100%
rename from j2k/tests/testData/ast/list/file/ForEach.kt
rename to j2k/tests/testData/ast/list/ForEach.kt
diff --git a/j2k/tests/testData/ast/list/Lists.ide.kt b/j2k/tests/testData/ast/list/Lists.ide.kt
new file mode 100644
index 00000000000..0304160b8cc
--- /dev/null
+++ b/j2k/tests/testData/ast/list/Lists.ide.kt
@@ -0,0 +1,13 @@
+import java.util.*
+public open class Lists() {
+public open fun test() : Unit {
+val xs = ArrayList()
+val ys = LinkedList()
+val zs = ArrayList()
+xs.add(null)
+ys.add(null)
+xs.clear()
+ys.clear()
+zs.add(null)
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/list/file/Lists.jav b/j2k/tests/testData/ast/list/Lists.jav
similarity index 97%
rename from j2k/tests/testData/ast/list/file/Lists.jav
rename to j2k/tests/testData/ast/list/Lists.jav
index 2f4b336f360..80d34ce9b83 100644
--- a/j2k/tests/testData/ast/list/file/Lists.jav
+++ b/j2k/tests/testData/ast/list/Lists.jav
@@ -1,3 +1,4 @@
+//file
import java.util.*;
public class Lists {
diff --git a/j2k/tests/testData/ast/list/file/Lists.kt b/j2k/tests/testData/ast/list/Lists.kt
similarity index 100%
rename from j2k/tests/testData/ast/list/file/Lists.kt
rename to j2k/tests/testData/ast/list/Lists.kt
diff --git a/j2k/tests/testData/ast/literalExpression/char.ide.kt b/j2k/tests/testData/ast/literalExpression/char.ide.kt
new file mode 100644
index 00000000000..84487813201
--- /dev/null
+++ b/j2k/tests/testData/ast/literalExpression/char.ide.kt
@@ -0,0 +1,6 @@
+open class Test() {
+open fun test() : Unit {
+val c1 = 'c'
+val c2 = 'C'
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/literalExpression/file/char.jav b/j2k/tests/testData/ast/literalExpression/char.jav
similarity index 91%
rename from j2k/tests/testData/ast/literalExpression/file/char.jav
rename to j2k/tests/testData/ast/literalExpression/char.jav
index 653706393b2..942d36cbe30 100644
--- a/j2k/tests/testData/ast/literalExpression/file/char.jav
+++ b/j2k/tests/testData/ast/literalExpression/char.jav
@@ -1,3 +1,4 @@
+//file
class Test {
void test() {
char c1 = 'c';
diff --git a/j2k/tests/testData/ast/literalExpression/file/char.kt b/j2k/tests/testData/ast/literalExpression/char.kt
similarity index 100%
rename from j2k/tests/testData/ast/literalExpression/file/char.kt
rename to j2k/tests/testData/ast/literalExpression/char.kt
diff --git a/j2k/tests/testData/ast/literalExpression/dollarInsideString.ide.kt b/j2k/tests/testData/ast/literalExpression/dollarInsideString.ide.kt
new file mode 100644
index 00000000000..cb502e8677b
--- /dev/null
+++ b/j2k/tests/testData/ast/literalExpression/dollarInsideString.ide.kt
@@ -0,0 +1,11 @@
+package demo
+open class Test() {
+open fun test() : Unit {
+val name = "$$$$"
+name = name.replaceAll("\\$[0-9]+", "\\$")
+val c = '$'
+System.out.println(c)
+val C = '$'
+System.out.println(C)
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/literalExpression/file/dollarInsideString.jav b/j2k/tests/testData/ast/literalExpression/dollarInsideString.jav
similarity index 96%
rename from j2k/tests/testData/ast/literalExpression/file/dollarInsideString.jav
rename to j2k/tests/testData/ast/literalExpression/dollarInsideString.jav
index 51039d40d25..4db952cf11f 100644
--- a/j2k/tests/testData/ast/literalExpression/file/dollarInsideString.jav
+++ b/j2k/tests/testData/ast/literalExpression/dollarInsideString.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class Test {
diff --git a/j2k/tests/testData/ast/literalExpression/file/dollarInsideString.kt b/j2k/tests/testData/ast/literalExpression/dollarInsideString.kt
similarity index 100%
rename from j2k/tests/testData/ast/literalExpression/file/dollarInsideString.kt
rename to j2k/tests/testData/ast/literalExpression/dollarInsideString.kt
diff --git a/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt b/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt
new file mode 100644
index 00000000000..05b0e3f7fdf
--- /dev/null
+++ b/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt
@@ -0,0 +1,18 @@
+open class Test() {
+open fun test() : Unit {
+val l1 = 10
+val d1 = 10.0
+val f1 = 10.0.toFloat()
+val l2 = 10
+val d2 = 10.0
+val f2 = 10.0.toFloat()
+}
+open fun testBoxed() : Unit {
+val l1 = 10
+val d1 = 10.0
+val f1 = 10.0.toFloat()
+val l2 = 10
+val d2 = 10.0
+val f2 = 10.0.toFloat()
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/literalExpression/file/endsWithDFL.jav b/j2k/tests/testData/ast/literalExpression/endsWithDFL.jav
similarity index 97%
rename from j2k/tests/testData/ast/literalExpression/file/endsWithDFL.jav
rename to j2k/tests/testData/ast/literalExpression/endsWithDFL.jav
index 4b4450d3303..1856154241a 100644
--- a/j2k/tests/testData/ast/literalExpression/file/endsWithDFL.jav
+++ b/j2k/tests/testData/ast/literalExpression/endsWithDFL.jav
@@ -1,3 +1,4 @@
+//file
class Test {
void test() {
long l1 = 10L;
diff --git a/j2k/tests/testData/ast/literalExpression/file/endsWithDFL.kt b/j2k/tests/testData/ast/literalExpression/endsWithDFL.kt
similarity index 100%
rename from j2k/tests/testData/ast/literalExpression/file/endsWithDFL.kt
rename to j2k/tests/testData/ast/literalExpression/endsWithDFL.kt
diff --git a/j2k/tests/testData/ast/literalExpression/hex.ide.kt b/j2k/tests/testData/ast/literalExpression/hex.ide.kt
new file mode 100644
index 00000000000..b32ce811965
--- /dev/null
+++ b/j2k/tests/testData/ast/literalExpression/hex.ide.kt
@@ -0,0 +1,6 @@
+open class Test() {
+open fun test() : Unit {
+val i1 = 33
+val i2 = 51
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/literalExpression/file/hex.jav b/j2k/tests/testData/ast/literalExpression/hex.jav
similarity index 91%
rename from j2k/tests/testData/ast/literalExpression/file/hex.jav
rename to j2k/tests/testData/ast/literalExpression/hex.jav
index 285af379ea2..fa015fd0331 100644
--- a/j2k/tests/testData/ast/literalExpression/file/hex.jav
+++ b/j2k/tests/testData/ast/literalExpression/hex.jav
@@ -1,3 +1,4 @@
+//file
class Test {
void test() {
int i1 = 0x21;
diff --git a/j2k/tests/testData/ast/literalExpression/file/hex.kt b/j2k/tests/testData/ast/literalExpression/hex.kt
similarity index 100%
rename from j2k/tests/testData/ast/literalExpression/file/hex.kt
rename to j2k/tests/testData/ast/literalExpression/hex.kt
diff --git a/j2k/tests/testData/ast/literalExpression/octal.ide.kt b/j2k/tests/testData/ast/literalExpression/octal.ide.kt
new file mode 100644
index 00000000000..e1e3c2d775b
--- /dev/null
+++ b/j2k/tests/testData/ast/literalExpression/octal.ide.kt
@@ -0,0 +1,6 @@
+open class Test() {
+open fun test() : Unit {
+val i1 = 37
+val i2 = 26
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/literalExpression/file/octal.jav b/j2k/tests/testData/ast/literalExpression/octal.jav
similarity index 90%
rename from j2k/tests/testData/ast/literalExpression/file/octal.jav
rename to j2k/tests/testData/ast/literalExpression/octal.jav
index 900549670fb..eb4a10815e3 100644
--- a/j2k/tests/testData/ast/literalExpression/file/octal.jav
+++ b/j2k/tests/testData/ast/literalExpression/octal.jav
@@ -1,3 +1,4 @@
+//file
class Test {
void test() {
int i1 = 045;
diff --git a/j2k/tests/testData/ast/literalExpression/file/octal.kt b/j2k/tests/testData/ast/literalExpression/octal.kt
similarity index 100%
rename from j2k/tests/testData/ast/literalExpression/file/octal.kt
rename to j2k/tests/testData/ast/literalExpression/octal.kt
diff --git a/j2k/tests/testData/ast/literalExpression/trueOrFalse.ide.kt b/j2k/tests/testData/ast/literalExpression/trueOrFalse.ide.kt
new file mode 100644
index 00000000000..bc951e95c4f
--- /dev/null
+++ b/j2k/tests/testData/ast/literalExpression/trueOrFalse.ide.kt
@@ -0,0 +1,8 @@
+open class Test() {
+open fun test() : Unit {
+val t1 = true
+val t2 = true
+val f1 = false
+val f2 = false
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/literalExpression/file/trueOrFalse.jav b/j2k/tests/testData/ast/literalExpression/trueOrFalse.jav
similarity index 94%
rename from j2k/tests/testData/ast/literalExpression/file/trueOrFalse.jav
rename to j2k/tests/testData/ast/literalExpression/trueOrFalse.jav
index 2b6495e3427..ed9eb978a3a 100644
--- a/j2k/tests/testData/ast/literalExpression/file/trueOrFalse.jav
+++ b/j2k/tests/testData/ast/literalExpression/trueOrFalse.jav
@@ -1,3 +1,4 @@
+//file
class Test {
void test() {
boolean t1 = true;
diff --git a/j2k/tests/testData/ast/literalExpression/file/trueOrFalse.kt b/j2k/tests/testData/ast/literalExpression/trueOrFalse.kt
similarity index 100%
rename from j2k/tests/testData/ast/literalExpression/file/trueOrFalse.kt
rename to j2k/tests/testData/ast/literalExpression/trueOrFalse.kt
diff --git a/j2k/tests/testData/ast/localVariable/object.ide.kt b/j2k/tests/testData/ast/localVariable/object.ide.kt
new file mode 100644
index 00000000000..d6bf0084f01
--- /dev/null
+++ b/j2k/tests/testData/ast/localVariable/object.ide.kt
@@ -0,0 +1 @@
+val i : Int
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/localVariable/object.jav b/j2k/tests/testData/ast/localVariable/object.jav
new file mode 100644
index 00000000000..75fefb76910
--- /dev/null
+++ b/j2k/tests/testData/ast/localVariable/object.jav
@@ -0,0 +1,2 @@
+//statement
+int i;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/localVariable/statement/object.kt b/j2k/tests/testData/ast/localVariable/object.kt
similarity index 100%
rename from j2k/tests/testData/ast/localVariable/statement/object.kt
rename to j2k/tests/testData/ast/localVariable/object.kt
diff --git a/j2k/tests/testData/ast/localVariable/statement/object.jav b/j2k/tests/testData/ast/localVariable/statement/object.jav
deleted file mode 100644
index c9cd10a31fd..00000000000
--- a/j2k/tests/testData/ast/localVariable/statement/object.jav
+++ /dev/null
@@ -1 +0,0 @@
-int i;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/methodCallExpression/statement/callWithKeywords.kt b/j2k/tests/testData/ast/methodCallExpression/callWithKeywords.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/methodCallExpression/statement/callWithKeywords.kt
rename to j2k/tests/testData/ast/methodCallExpression/callWithKeywords.ide.kt
diff --git a/j2k/tests/testData/ast/methodCallExpression/statement/callWithKeywords.jav b/j2k/tests/testData/ast/methodCallExpression/callWithKeywords.jav
similarity index 60%
rename from j2k/tests/testData/ast/methodCallExpression/statement/callWithKeywords.jav
rename to j2k/tests/testData/ast/methodCallExpression/callWithKeywords.jav
index db350dda8fc..4ac9ae7db93 100644
--- a/j2k/tests/testData/ast/methodCallExpression/statement/callWithKeywords.jav
+++ b/j2k/tests/testData/ast/methodCallExpression/callWithKeywords.jav
@@ -1 +1,2 @@
+//statement
when(open, trait);
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/methodCallExpression/callWithKeywords.kt b/j2k/tests/testData/ast/methodCallExpression/callWithKeywords.kt
new file mode 100644
index 00000000000..489e2d97b10
--- /dev/null
+++ b/j2k/tests/testData/ast/methodCallExpression/callWithKeywords.kt
@@ -0,0 +1 @@
+`when`(open, `trait`)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/methodCallExpression/statement/emptyCall.kt b/j2k/tests/testData/ast/methodCallExpression/emptyCall.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/methodCallExpression/statement/emptyCall.kt
rename to j2k/tests/testData/ast/methodCallExpression/emptyCall.ide.kt
diff --git a/j2k/tests/testData/ast/methodCallExpression/statement/emptyCall.jav b/j2k/tests/testData/ast/methodCallExpression/emptyCall.jav
similarity index 52%
rename from j2k/tests/testData/ast/methodCallExpression/statement/emptyCall.jav
rename to j2k/tests/testData/ast/methodCallExpression/emptyCall.jav
index 9c6af147cda..8f83e05fe3c 100644
--- a/j2k/tests/testData/ast/methodCallExpression/statement/emptyCall.jav
+++ b/j2k/tests/testData/ast/methodCallExpression/emptyCall.jav
@@ -1 +1,2 @@
+//statement
methodCall();
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/methodCallExpression/emptyCall.kt b/j2k/tests/testData/ast/methodCallExpression/emptyCall.kt
new file mode 100644
index 00000000000..60d495be000
--- /dev/null
+++ b/j2k/tests/testData/ast/methodCallExpression/emptyCall.kt
@@ -0,0 +1 @@
+methodCall()
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt b/j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt
new file mode 100644
index 00000000000..ec1665774ce
--- /dev/null
+++ b/j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt
@@ -0,0 +1,11 @@
+package demo
+open class Map() {
+open fun put(k : K, v : V) : Unit {
+}
+}
+open class U() {
+open fun test() : Unit {
+val m = Map()
+m.put("10", 10)
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/methodCallExpression/file/genericMethod.jav b/j2k/tests/testData/ast/methodCallExpression/genericMethod.jav
similarity index 95%
rename from j2k/tests/testData/ast/methodCallExpression/file/genericMethod.jav
rename to j2k/tests/testData/ast/methodCallExpression/genericMethod.jav
index 952645f5f09..8f02a08c22f 100644
--- a/j2k/tests/testData/ast/methodCallExpression/file/genericMethod.jav
+++ b/j2k/tests/testData/ast/methodCallExpression/genericMethod.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class Map {
diff --git a/j2k/tests/testData/ast/methodCallExpression/file/genericMethod.kt b/j2k/tests/testData/ast/methodCallExpression/genericMethod.kt
similarity index 100%
rename from j2k/tests/testData/ast/methodCallExpression/file/genericMethod.kt
rename to j2k/tests/testData/ast/methodCallExpression/genericMethod.kt
diff --git a/j2k/tests/testData/ast/methodCallExpression/statement/simpleCall.kt b/j2k/tests/testData/ast/methodCallExpression/simpleCall.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/methodCallExpression/statement/simpleCall.kt
rename to j2k/tests/testData/ast/methodCallExpression/simpleCall.ide.kt
diff --git a/j2k/tests/testData/ast/methodCallExpression/statement/simpleCall.jav b/j2k/tests/testData/ast/methodCallExpression/simpleCall.jav
similarity index 65%
rename from j2k/tests/testData/ast/methodCallExpression/statement/simpleCall.jav
rename to j2k/tests/testData/ast/methodCallExpression/simpleCall.jav
index 0e52b457e69..1459d392b00 100644
--- a/j2k/tests/testData/ast/methodCallExpression/statement/simpleCall.jav
+++ b/j2k/tests/testData/ast/methodCallExpression/simpleCall.jav
@@ -1 +1,2 @@
+//statement
method(param1, param2);
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/methodCallExpression/simpleCall.kt b/j2k/tests/testData/ast/methodCallExpression/simpleCall.kt
new file mode 100644
index 00000000000..43ea8339772
--- /dev/null
+++ b/j2k/tests/testData/ast/methodCallExpression/simpleCall.kt
@@ -0,0 +1 @@
+method(param1, param2)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/file/comp/intNullability.kt b/j2k/tests/testData/ast/misc/intNullability.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/file/comp/intNullability.kt
rename to j2k/tests/testData/ast/misc/intNullability.ide.kt
diff --git a/j2k/tests/testData/ast/file/comp/intNullability.jav b/j2k/tests/testData/ast/misc/intNullability.jav
similarity index 94%
rename from j2k/tests/testData/ast/file/comp/intNullability.jav
rename to j2k/tests/testData/ast/misc/intNullability.jav
index 328d9cb6ee2..25507ca3fe2 100644
--- a/j2k/tests/testData/ast/file/comp/intNullability.jav
+++ b/j2k/tests/testData/ast/misc/intNullability.jav
@@ -1,3 +1,4 @@
+//comp
package demo;
class Test {
diff --git a/j2k/tests/testData/ast/misc/intNullability.kt b/j2k/tests/testData/ast/misc/intNullability.kt
new file mode 100644
index 00000000000..e3e6c4ca889
--- /dev/null
+++ b/j2k/tests/testData/ast/misc/intNullability.kt
@@ -0,0 +1,9 @@
+package demo
+import kotlin.compatibility.*
+open class Test() {
+open fun test() : Unit {
+var i : Int? = 10
+var j : Int? = 10
+System.out?.println(i!! + j!!)
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/file/file/packageWithClass.kt b/j2k/tests/testData/ast/misc/packageWithClass.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/file/file/packageWithClass.kt
rename to j2k/tests/testData/ast/misc/packageWithClass.ide.kt
diff --git a/j2k/tests/testData/ast/file/file/packageWithClass.jav b/j2k/tests/testData/ast/misc/packageWithClass.jav
similarity index 81%
rename from j2k/tests/testData/ast/file/file/packageWithClass.jav
rename to j2k/tests/testData/ast/misc/packageWithClass.jav
index 3524ce7525c..7003d871c43 100644
--- a/j2k/tests/testData/ast/file/file/packageWithClass.jav
+++ b/j2k/tests/testData/ast/misc/packageWithClass.jav
@@ -1 +1,2 @@
+//file
package test; final class C {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/misc/packageWithClass.kt b/j2k/tests/testData/ast/misc/packageWithClass.kt
new file mode 100644
index 00000000000..3f205654c0b
--- /dev/null
+++ b/j2k/tests/testData/ast/misc/packageWithClass.kt
@@ -0,0 +1,3 @@
+package test
+class C() {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/file/file/packageWithClasses.kt b/j2k/tests/testData/ast/misc/packageWithClasses.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/file/file/packageWithClasses.kt
rename to j2k/tests/testData/ast/misc/packageWithClasses.ide.kt
diff --git a/j2k/tests/testData/ast/file/file/packageWithClasses.jav b/j2k/tests/testData/ast/misc/packageWithClasses.jav
similarity index 82%
rename from j2k/tests/testData/ast/file/file/packageWithClasses.jav
rename to j2k/tests/testData/ast/misc/packageWithClasses.jav
index d0964b8ccb5..fbc2bf4dbd3 100644
--- a/j2k/tests/testData/ast/file/file/packageWithClasses.jav
+++ b/j2k/tests/testData/ast/misc/packageWithClasses.jav
@@ -1 +1,2 @@
+//file
final class A {} final class B {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/misc/packageWithClasses.kt b/j2k/tests/testData/ast/misc/packageWithClasses.kt
new file mode 100644
index 00000000000..4ed94efde09
--- /dev/null
+++ b/j2k/tests/testData/ast/misc/packageWithClasses.kt
@@ -0,0 +1,4 @@
+class A() {
+}
+class B() {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/file/file/packageWithImports.kt b/j2k/tests/testData/ast/misc/packageWithImports.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/file/file/packageWithImports.kt
rename to j2k/tests/testData/ast/misc/packageWithImports.ide.kt
diff --git a/j2k/tests/testData/ast/file/file/packageWithImports.jav b/j2k/tests/testData/ast/misc/packageWithImports.jav
similarity index 83%
rename from j2k/tests/testData/ast/file/file/packageWithImports.jav
rename to j2k/tests/testData/ast/misc/packageWithImports.jav
index 94a969cfe93..5601e0127d5 100644
--- a/j2k/tests/testData/ast/file/file/packageWithImports.jav
+++ b/j2k/tests/testData/ast/misc/packageWithImports.jav
@@ -1 +1,2 @@
+//file
package test;import ast;import ast2;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/file/file/packageWithMixedImports.kt b/j2k/tests/testData/ast/misc/packageWithImports.kt
similarity index 100%
rename from j2k/tests/testData/ast/file/file/packageWithMixedImports.kt
rename to j2k/tests/testData/ast/misc/packageWithImports.kt
diff --git a/j2k/tests/testData/ast/file/file/packageWithStaticImports.kt b/j2k/tests/testData/ast/misc/packageWithMixedImports.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/file/file/packageWithStaticImports.kt
rename to j2k/tests/testData/ast/misc/packageWithMixedImports.ide.kt
diff --git a/j2k/tests/testData/ast/file/file/packageWithMixedImports.jav b/j2k/tests/testData/ast/misc/packageWithMixedImports.jav
similarity index 86%
rename from j2k/tests/testData/ast/file/file/packageWithMixedImports.jav
rename to j2k/tests/testData/ast/misc/packageWithMixedImports.jav
index 6296e224258..909eaa4eb11 100644
--- a/j2k/tests/testData/ast/file/file/packageWithMixedImports.jav
+++ b/j2k/tests/testData/ast/misc/packageWithMixedImports.jav
@@ -1 +1,2 @@
+//file
package test;import static ast;import ast2;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/misc/packageWithMixedImports.kt b/j2k/tests/testData/ast/misc/packageWithMixedImports.kt
new file mode 100644
index 00000000000..d646d02ccc0
--- /dev/null
+++ b/j2k/tests/testData/ast/misc/packageWithMixedImports.kt
@@ -0,0 +1,3 @@
+package test
+import ast
+import ast2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/file/file/packageWithOpenClass.kt b/j2k/tests/testData/ast/misc/packageWithOpenClass.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/file/file/packageWithOpenClass.kt
rename to j2k/tests/testData/ast/misc/packageWithOpenClass.ide.kt
diff --git a/j2k/tests/testData/ast/file/file/packageWithOpenClass.jav b/j2k/tests/testData/ast/misc/packageWithOpenClass.jav
similarity index 77%
rename from j2k/tests/testData/ast/file/file/packageWithOpenClass.jav
rename to j2k/tests/testData/ast/misc/packageWithOpenClass.jav
index 821bbec2b3d..fb1263cab0c 100644
--- a/j2k/tests/testData/ast/file/file/packageWithOpenClass.jav
+++ b/j2k/tests/testData/ast/misc/packageWithOpenClass.jav
@@ -1 +1,2 @@
+//file
package test; class C {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/misc/packageWithOpenClass.kt b/j2k/tests/testData/ast/misc/packageWithOpenClass.kt
new file mode 100644
index 00000000000..d4336ffcc51
--- /dev/null
+++ b/j2k/tests/testData/ast/misc/packageWithOpenClass.kt
@@ -0,0 +1,3 @@
+package test
+open class C() {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/misc/packageWithStaticImports.ide.kt b/j2k/tests/testData/ast/misc/packageWithStaticImports.ide.kt
new file mode 100644
index 00000000000..d646d02ccc0
--- /dev/null
+++ b/j2k/tests/testData/ast/misc/packageWithStaticImports.ide.kt
@@ -0,0 +1,3 @@
+package test
+import ast
+import ast2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/file/file/packageWithStaticImports.jav b/j2k/tests/testData/ast/misc/packageWithStaticImports.jav
similarity index 87%
rename from j2k/tests/testData/ast/file/file/packageWithStaticImports.jav
rename to j2k/tests/testData/ast/misc/packageWithStaticImports.jav
index 0d1bea3ba5a..31928c55c5a 100644
--- a/j2k/tests/testData/ast/file/file/packageWithStaticImports.jav
+++ b/j2k/tests/testData/ast/misc/packageWithStaticImports.jav
@@ -1 +1,2 @@
+//file
package test;import static ast;import static ast2;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/misc/packageWithStaticImports.kt b/j2k/tests/testData/ast/misc/packageWithStaticImports.kt
new file mode 100644
index 00000000000..d646d02ccc0
--- /dev/null
+++ b/j2k/tests/testData/ast/misc/packageWithStaticImports.kt
@@ -0,0 +1,3 @@
+package test
+import ast
+import ast2
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/newClassExpression/expression/classWithParam.kt b/j2k/tests/testData/ast/newClassExpression/classWithParam.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/newClassExpression/expression/classWithParam.kt
rename to j2k/tests/testData/ast/newClassExpression/classWithParam.ide.kt
diff --git a/j2k/tests/testData/ast/newClassExpression/expression/classWithParam.jav b/j2k/tests/testData/ast/newClassExpression/classWithParam.jav
similarity index 53%
rename from j2k/tests/testData/ast/newClassExpression/expression/classWithParam.jav
rename to j2k/tests/testData/ast/newClassExpression/classWithParam.jav
index 44849d3495c..159a4b16ae1 100644
--- a/j2k/tests/testData/ast/newClassExpression/expression/classWithParam.jav
+++ b/j2k/tests/testData/ast/newClassExpression/classWithParam.jav
@@ -1 +1,2 @@
+//expression
new Foo(param);
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/newClassExpression/classWithParam.kt b/j2k/tests/testData/ast/newClassExpression/classWithParam.kt
new file mode 100644
index 00000000000..9d29e159e31
--- /dev/null
+++ b/j2k/tests/testData/ast/newClassExpression/classWithParam.kt
@@ -0,0 +1 @@
+Foo(param)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/newClassExpression/expression/classWithParams.kt b/j2k/tests/testData/ast/newClassExpression/classWithParams.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/newClassExpression/expression/classWithParams.kt
rename to j2k/tests/testData/ast/newClassExpression/classWithParams.ide.kt
diff --git a/j2k/tests/testData/ast/newClassExpression/expression/classWithParams.jav b/j2k/tests/testData/ast/newClassExpression/classWithParams.jav
similarity index 64%
rename from j2k/tests/testData/ast/newClassExpression/expression/classWithParams.jav
rename to j2k/tests/testData/ast/newClassExpression/classWithParams.jav
index 2461539a170..1baf6a18f37 100644
--- a/j2k/tests/testData/ast/newClassExpression/expression/classWithParams.jav
+++ b/j2k/tests/testData/ast/newClassExpression/classWithParams.jav
@@ -1 +1,2 @@
+//expression
new Foo(param1, param2);
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/newClassExpression/classWithParams.kt b/j2k/tests/testData/ast/newClassExpression/classWithParams.kt
new file mode 100644
index 00000000000..e10fb436db2
--- /dev/null
+++ b/j2k/tests/testData/ast/newClassExpression/classWithParams.kt
@@ -0,0 +1 @@
+Foo(param1, param2)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/newClassExpression/expression/classWithoutBody.kt b/j2k/tests/testData/ast/newClassExpression/classWithoutBody.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/newClassExpression/expression/classWithoutBody.kt
rename to j2k/tests/testData/ast/newClassExpression/classWithoutBody.ide.kt
diff --git a/j2k/tests/testData/ast/newClassExpression/classWithoutBody.jav b/j2k/tests/testData/ast/newClassExpression/classWithoutBody.jav
new file mode 100644
index 00000000000..220875444e3
--- /dev/null
+++ b/j2k/tests/testData/ast/newClassExpression/classWithoutBody.jav
@@ -0,0 +1,2 @@
+//expression
+new Foo();
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/newClassExpression/classWithoutBody.kt b/j2k/tests/testData/ast/newClassExpression/classWithoutBody.kt
new file mode 100644
index 00000000000..17f280dc444
--- /dev/null
+++ b/j2k/tests/testData/ast/newClassExpression/classWithoutBody.kt
@@ -0,0 +1 @@
+Foo()
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/newClassExpression/expression/classWithoutBody.jav b/j2k/tests/testData/ast/newClassExpression/expression/classWithoutBody.jav
deleted file mode 100644
index acad3c2ee3f..00000000000
--- a/j2k/tests/testData/ast/newClassExpression/expression/classWithoutBody.jav
+++ /dev/null
@@ -1 +0,0 @@
-new Foo();
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.ide.kt b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.ide.kt
new file mode 100644
index 00000000000..f540dfcdce3
--- /dev/null
+++ b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.ide.kt
@@ -0,0 +1,6 @@
+package test
+open class User() {
+open fun main() : Unit {
+val list = java.util.LinkedList()
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName.jav b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.jav
similarity index 94%
rename from j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName.jav
rename to j2k/tests/testData/ast/newClassExpression/fullQualifiedName.jav
index de1ff2bd28c..025166bde9f 100644
--- a/j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName.jav
+++ b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.jav
@@ -1,3 +1,4 @@
+//file
package test;
import java.util.List;
diff --git a/j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName.kt b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.kt
similarity index 100%
rename from j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName.kt
rename to j2k/tests/testData/ast/newClassExpression/fullQualifiedName.kt
diff --git a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.ide.kt b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.ide.kt
new file mode 100644
index 00000000000..f540dfcdce3
--- /dev/null
+++ b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.ide.kt
@@ -0,0 +1,6 @@
+package test
+open class User() {
+open fun main() : Unit {
+val list = java.util.LinkedList()
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName2.jav b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.jav
similarity index 93%
rename from j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName2.jav
rename to j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.jav
index e8ef97b8b9e..9df0a2cf3d2 100644
--- a/j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName2.jav
+++ b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.jav
@@ -1,3 +1,4 @@
+//file
package test;
class User {
diff --git a/j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName2.kt b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.kt
similarity index 100%
rename from j2k/tests/testData/ast/newClassExpression/file/fullQualifiedName2.kt
rename to j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.kt
diff --git a/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.ide.kt b/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.ide.kt
new file mode 100644
index 00000000000..90255d5650d
--- /dev/null
+++ b/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.ide.kt
@@ -0,0 +1,6 @@
+import java.util.LinkedList
+open class User() {
+open fun main() : Unit {
+val list = LinkedList()
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/newClassExpression/file/genericClassInvocation.jav b/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.jav
similarity index 95%
rename from j2k/tests/testData/ast/newClassExpression/file/genericClassInvocation.jav
rename to j2k/tests/testData/ast/newClassExpression/genericClassInvocation.jav
index a74e92a8bc5..ae9b5e6a858 100644
--- a/j2k/tests/testData/ast/newClassExpression/file/genericClassInvocation.jav
+++ b/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.jav
@@ -1,3 +1,4 @@
+//file
import java.util.List;
import java.util.LinkedList;
diff --git a/j2k/tests/testData/ast/newClassExpression/file/genericClassInvocation.kt b/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.kt
similarity index 100%
rename from j2k/tests/testData/ast/newClassExpression/file/genericClassInvocation.kt
rename to j2k/tests/testData/ast/newClassExpression/genericClassInvocation.kt
diff --git a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt
new file mode 100644
index 00000000000..2818ebccad3
--- /dev/null
+++ b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt
@@ -0,0 +1,8 @@
+package org.test
+open class Library() {
+}
+open class User() {
+open fun main() : Unit {
+val lib = Library()
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/newClassExpression/file/newClassByFullName.jav b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.jav
similarity index 93%
rename from j2k/tests/testData/ast/newClassExpression/file/newClassByFullName.jav
rename to j2k/tests/testData/ast/newClassExpression/newClassByFullName.jav
index 486db1bec93..8d9b2bc0b5c 100644
--- a/j2k/tests/testData/ast/newClassExpression/file/newClassByFullName.jav
+++ b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.jav
@@ -1,3 +1,4 @@
+//file
package org.test
class Library {}
diff --git a/j2k/tests/testData/ast/newClassExpression/file/newClassByFullName.kt b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt
similarity index 100%
rename from j2k/tests/testData/ast/newClassExpression/file/newClassByFullName.kt
rename to j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt
diff --git a/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.ide.kt b/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.ide.kt
new file mode 100644
index 00000000000..01bbbbe3281
--- /dev/null
+++ b/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.ide.kt
@@ -0,0 +1,5 @@
+object : Runnable() {
+public override fun run() : Unit {
+System.out.println("Run")
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.jav b/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.jav
similarity index 87%
rename from j2k/tests/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.jav
rename to j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.jav
index fd947e43a0c..5019f553636 100644
--- a/j2k/tests/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.jav
+++ b/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.jav
@@ -1,3 +1,4 @@
+//expression
new Runnable() {
@Override
public void run() {
diff --git a/j2k/tests/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.kt b/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.kt
similarity index 100%
rename from j2k/tests/testData/ast/newClassExpression/expression/newClassWithAnonymousScope.kt
rename to j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.kt
diff --git a/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt b/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt
new file mode 100644
index 00000000000..77b610445c7
--- /dev/null
+++ b/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt
@@ -0,0 +1,11 @@
+package org.test
+open class OuterClass() {
+open class InnerClass() {
+}
+}
+open class User() {
+open fun main() : Unit {
+val outerObject = OuterClass()
+val innerObject = outerObject.InnerClass()
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/newClassExpression/file/newInnerClass.jav b/j2k/tests/testData/ast/newClassExpression/newInnerClass.jav
similarity index 96%
rename from j2k/tests/testData/ast/newClassExpression/file/newInnerClass.jav
rename to j2k/tests/testData/ast/newClassExpression/newInnerClass.jav
index 1f4cdf9f589..0243fb807cc 100644
--- a/j2k/tests/testData/ast/newClassExpression/file/newInnerClass.jav
+++ b/j2k/tests/testData/ast/newClassExpression/newInnerClass.jav
@@ -1,3 +1,4 @@
+//file
package org.test;
class OuterClass {
diff --git a/j2k/tests/testData/ast/newClassExpression/file/newInnerClass.kt b/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt
similarity index 100%
rename from j2k/tests/testData/ast/newClassExpression/file/newInnerClass.kt
rename to j2k/tests/testData/ast/newClassExpression/newInnerClass.kt
diff --git a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt
new file mode 100644
index 00000000000..ebfa0bb5af2
--- /dev/null
+++ b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt
@@ -0,0 +1,10 @@
+package org.test
+import java.util.LinkedList
+open class Member() {
+}
+open class User() {
+open fun main() : Unit {
+val members = LinkedList()
+members.add(Member())
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/newClassExpression/file/newListAndNewMember.jav b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.jav
similarity index 96%
rename from j2k/tests/testData/ast/newClassExpression/file/newListAndNewMember.jav
rename to j2k/tests/testData/ast/newClassExpression/newListAndNewMember.jav
index 8ed2bad7297..d7f76542484 100644
--- a/j2k/tests/testData/ast/newClassExpression/file/newListAndNewMember.jav
+++ b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.jav
@@ -1,3 +1,4 @@
+//file
package org.test;
import java.util.List;
diff --git a/j2k/tests/testData/ast/newClassExpression/file/newListAndNewMember.kt b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt
similarity index 100%
rename from j2k/tests/testData/ast/newClassExpression/file/newListAndNewMember.kt
rename to j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt
diff --git a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt
new file mode 100644
index 00000000000..1bc3562e941
--- /dev/null
+++ b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt
@@ -0,0 +1,12 @@
+package demo
+open class Foo() {
+class object {
+open class Bar() {
+}
+}
+}
+open class User() {
+open fun main() : Unit {
+val boo = Foo.Bar()
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/newClassExpression/file/newStaticInnerClass.jav b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.jav
similarity index 94%
rename from j2k/tests/testData/ast/newClassExpression/file/newStaticInnerClass.jav
rename to j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.jav
index 0465c7498aa..461789214c1 100644
--- a/j2k/tests/testData/ast/newClassExpression/file/newStaticInnerClass.jav
+++ b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class Foo {
diff --git a/j2k/tests/testData/ast/newClassExpression/file/newStaticInnerClass.kt b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt
similarity index 100%
rename from j2k/tests/testData/ast/newClassExpression/file/newStaticInnerClass.kt
rename to j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt
diff --git a/j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt b/j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt
new file mode 100644
index 00000000000..7ae2d9972b2
--- /dev/null
+++ b/j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt
@@ -0,0 +1,18 @@
+package demo
+open class WindowAdapter() {
+public open fun windowClosing() : Unit {
+}
+}
+public class Client() : Frame() {
+{
+val a = object : WindowAdapter() {
+public override fun windowClosing() : Unit {
+}
+}
+addWindowListener(a)
+addWindowListener(object : WindowAdapter() {
+public override fun windowClosing() : Unit {
+}
+})
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/objectLiteral/file/MyFrame.jav b/j2k/tests/testData/ast/objectLiteral/MyFrame.jav
similarity index 98%
rename from j2k/tests/testData/ast/objectLiteral/file/MyFrame.jav
rename to j2k/tests/testData/ast/objectLiteral/MyFrame.jav
index 28e0dbef4de..45cf8f31b54 100644
--- a/j2k/tests/testData/ast/objectLiteral/file/MyFrame.jav
+++ b/j2k/tests/testData/ast/objectLiteral/MyFrame.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class WindowAdapter {
diff --git a/j2k/tests/testData/ast/objectLiteral/file/MyFrame.kt b/j2k/tests/testData/ast/objectLiteral/MyFrame.kt
similarity index 100%
rename from j2k/tests/testData/ast/objectLiteral/file/MyFrame.kt
rename to j2k/tests/testData/ast/objectLiteral/MyFrame.kt
diff --git a/j2k/tests/testData/ast/outProjectionType/methodParams.ide.kt b/j2k/tests/testData/ast/outProjectionType/methodParams.ide.kt
new file mode 100644
index 00000000000..7523758fd46
--- /dev/null
+++ b/j2k/tests/testData/ast/outProjectionType/methodParams.ide.kt
@@ -0,0 +1,2 @@
+fun pushAll(src : Collection) : Unit {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/outProjectionType/method/methodParams.jav b/j2k/tests/testData/ast/outProjectionType/methodParams.jav
similarity index 83%
rename from j2k/tests/testData/ast/outProjectionType/method/methodParams.jav
rename to j2k/tests/testData/ast/outProjectionType/methodParams.jav
index ac87941ea87..995462452f6 100644
--- a/j2k/tests/testData/ast/outProjectionType/method/methodParams.jav
+++ b/j2k/tests/testData/ast/outProjectionType/methodParams.jav
@@ -1 +1,2 @@
+//method
void pushAll(Collection src) {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/outProjectionType/method/methodParams.kt b/j2k/tests/testData/ast/outProjectionType/methodParams.kt
similarity index 100%
rename from j2k/tests/testData/ast/outProjectionType/method/methodParams.kt
rename to j2k/tests/testData/ast/outProjectionType/methodParams.kt
diff --git a/j2k/tests/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.kt b/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.kt
rename to j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.ide.kt
diff --git a/j2k/tests/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.jav b/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.jav
similarity index 95%
rename from j2k/tests/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.jav
rename to j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.jav
index 7b8f669aba1..679b96e6327 100644
--- a/j2k/tests/testData/ast/packageStatement/file/orgJetbrainsJetJ2kIn.jav
+++ b/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.jav
@@ -1,3 +1,4 @@
+//file
package org.jetbrains.jet.j2k.in;
import org.jetbrains.annotations.NotNull;
diff --git a/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.kt b/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.kt
new file mode 100644
index 00000000000..a673d540277
--- /dev/null
+++ b/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.kt
@@ -0,0 +1,4 @@
+package org.jetbrains.jet.j2k.`in`
+import org.jetbrains.annotations.Nullable
+public open class Converter() {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/parenthesizedExpression/expression/parenthesized.jav b/j2k/tests/testData/ast/parenthesizedExpression/parenthesized.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/parenthesizedExpression/expression/parenthesized.jav
rename to j2k/tests/testData/ast/parenthesizedExpression/parenthesized.ide.kt
diff --git a/j2k/tests/testData/ast/parenthesizedExpression/parenthesized.jav b/j2k/tests/testData/ast/parenthesizedExpression/parenthesized.jav
new file mode 100644
index 00000000000..d678a57c711
--- /dev/null
+++ b/j2k/tests/testData/ast/parenthesizedExpression/parenthesized.jav
@@ -0,0 +1,2 @@
+//expression
+(1 + 2)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/parenthesizedExpression/expression/parenthesized.kt b/j2k/tests/testData/ast/parenthesizedExpression/parenthesized.kt
similarity index 100%
rename from j2k/tests/testData/ast/parenthesizedExpression/expression/parenthesized.kt
rename to j2k/tests/testData/ast/parenthesizedExpression/parenthesized.kt
diff --git a/j2k/tests/testData/ast/parenthesizedExpression/expression/parenthesized2.jav b/j2k/tests/testData/ast/parenthesizedExpression/parenthesized2.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/parenthesizedExpression/expression/parenthesized2.jav
rename to j2k/tests/testData/ast/parenthesizedExpression/parenthesized2.ide.kt
diff --git a/j2k/tests/testData/ast/parenthesizedExpression/parenthesized2.jav b/j2k/tests/testData/ast/parenthesizedExpression/parenthesized2.jav
new file mode 100644
index 00000000000..b6ac6039930
--- /dev/null
+++ b/j2k/tests/testData/ast/parenthesizedExpression/parenthesized2.jav
@@ -0,0 +1,2 @@
+//expression
+(str.toString() + "abc")
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/parenthesizedExpression/expression/parenthesized2.kt b/j2k/tests/testData/ast/parenthesizedExpression/parenthesized2.kt
similarity index 100%
rename from j2k/tests/testData/ast/parenthesizedExpression/expression/parenthesized2.kt
rename to j2k/tests/testData/ast/parenthesizedExpression/parenthesized2.kt
diff --git a/j2k/tests/testData/ast/polyadicExpression/expression/divide.jav b/j2k/tests/testData/ast/polyadicExpression/divide.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/polyadicExpression/expression/divide.jav
rename to j2k/tests/testData/ast/polyadicExpression/divide.ide.kt
diff --git a/j2k/tests/testData/ast/polyadicExpression/divide.jav b/j2k/tests/testData/ast/polyadicExpression/divide.jav
new file mode 100644
index 00000000000..470c539bd78
--- /dev/null
+++ b/j2k/tests/testData/ast/polyadicExpression/divide.jav
@@ -0,0 +1,2 @@
+//expression
+1 / 2 / 3
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/polyadicExpression/expression/divide.kt b/j2k/tests/testData/ast/polyadicExpression/divide.kt
similarity index 100%
rename from j2k/tests/testData/ast/polyadicExpression/expression/divide.kt
rename to j2k/tests/testData/ast/polyadicExpression/divide.kt
diff --git a/j2k/tests/testData/ast/polyadicExpression/expression/minus.jav b/j2k/tests/testData/ast/polyadicExpression/minus.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/polyadicExpression/expression/minus.jav
rename to j2k/tests/testData/ast/polyadicExpression/minus.ide.kt
diff --git a/j2k/tests/testData/ast/polyadicExpression/minus.jav b/j2k/tests/testData/ast/polyadicExpression/minus.jav
new file mode 100644
index 00000000000..6eb7795b537
--- /dev/null
+++ b/j2k/tests/testData/ast/polyadicExpression/minus.jav
@@ -0,0 +1,2 @@
+//expression
+1 - 2 - 3
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/polyadicExpression/expression/minus.kt b/j2k/tests/testData/ast/polyadicExpression/minus.kt
similarity index 100%
rename from j2k/tests/testData/ast/polyadicExpression/expression/minus.kt
rename to j2k/tests/testData/ast/polyadicExpression/minus.kt
diff --git a/j2k/tests/testData/ast/polyadicExpression/expression/multiply.jav b/j2k/tests/testData/ast/polyadicExpression/multiply.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/polyadicExpression/expression/multiply.jav
rename to j2k/tests/testData/ast/polyadicExpression/multiply.ide.kt
diff --git a/j2k/tests/testData/ast/polyadicExpression/multiply.jav b/j2k/tests/testData/ast/polyadicExpression/multiply.jav
new file mode 100644
index 00000000000..575116fe93a
--- /dev/null
+++ b/j2k/tests/testData/ast/polyadicExpression/multiply.jav
@@ -0,0 +1,2 @@
+//expression
+1 * 2 * 3
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/polyadicExpression/expression/multiply.kt b/j2k/tests/testData/ast/polyadicExpression/multiply.kt
similarity index 100%
rename from j2k/tests/testData/ast/polyadicExpression/expression/multiply.kt
rename to j2k/tests/testData/ast/polyadicExpression/multiply.kt
diff --git a/j2k/tests/testData/ast/polyadicExpression/expression/plus.jav b/j2k/tests/testData/ast/polyadicExpression/plus.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/polyadicExpression/expression/plus.jav
rename to j2k/tests/testData/ast/polyadicExpression/plus.ide.kt
diff --git a/j2k/tests/testData/ast/polyadicExpression/plus.jav b/j2k/tests/testData/ast/polyadicExpression/plus.jav
new file mode 100644
index 00000000000..96d806d8877
--- /dev/null
+++ b/j2k/tests/testData/ast/polyadicExpression/plus.jav
@@ -0,0 +1,2 @@
+//expression
+1 + 2 + 3
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/polyadicExpression/expression/plus.kt b/j2k/tests/testData/ast/polyadicExpression/plus.kt
similarity index 100%
rename from j2k/tests/testData/ast/polyadicExpression/expression/plus.kt
rename to j2k/tests/testData/ast/polyadicExpression/plus.kt
diff --git a/j2k/tests/testData/ast/polyadicExpression/expression/remainder.jav b/j2k/tests/testData/ast/polyadicExpression/remainder.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/polyadicExpression/expression/remainder.jav
rename to j2k/tests/testData/ast/polyadicExpression/remainder.ide.kt
diff --git a/j2k/tests/testData/ast/polyadicExpression/remainder.jav b/j2k/tests/testData/ast/polyadicExpression/remainder.jav
new file mode 100644
index 00000000000..6612271163f
--- /dev/null
+++ b/j2k/tests/testData/ast/polyadicExpression/remainder.jav
@@ -0,0 +1,2 @@
+//expression
+1 % 2 % 3
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/polyadicExpression/expression/remainder.kt b/j2k/tests/testData/ast/polyadicExpression/remainder.kt
similarity index 100%
rename from j2k/tests/testData/ast/polyadicExpression/expression/remainder.kt
rename to j2k/tests/testData/ast/polyadicExpression/remainder.kt
diff --git a/j2k/tests/testData/ast/polyadicExpression/expression/unassignedShiftRight.kt b/j2k/tests/testData/ast/polyadicExpression/unassignedShiftRight.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/polyadicExpression/expression/unassignedShiftRight.kt
rename to j2k/tests/testData/ast/polyadicExpression/unassignedShiftRight.ide.kt
diff --git a/j2k/tests/testData/ast/polyadicExpression/expression/unassignedShiftRight.jav b/j2k/tests/testData/ast/polyadicExpression/unassignedShiftRight.jav
similarity index 50%
rename from j2k/tests/testData/ast/polyadicExpression/expression/unassignedShiftRight.jav
rename to j2k/tests/testData/ast/polyadicExpression/unassignedShiftRight.jav
index c9745ec8062..c4121de0f66 100644
--- a/j2k/tests/testData/ast/polyadicExpression/expression/unassignedShiftRight.jav
+++ b/j2k/tests/testData/ast/polyadicExpression/unassignedShiftRight.jav
@@ -1 +1,2 @@
+//expression
1 >>> 2 >>> 3
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/polyadicExpression/unassignedShiftRight.kt b/j2k/tests/testData/ast/polyadicExpression/unassignedShiftRight.kt
new file mode 100644
index 00000000000..83d192a6a77
--- /dev/null
+++ b/j2k/tests/testData/ast/polyadicExpression/unassignedShiftRight.kt
@@ -0,0 +1 @@
+1 ushr 2 ushr 3
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/postfixOperator/statement/decrement.kt b/j2k/tests/testData/ast/postfixOperator/decrement.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/postfixOperator/statement/decrement.kt
rename to j2k/tests/testData/ast/postfixOperator/decrement.ide.kt
diff --git a/j2k/tests/testData/ast/postfixOperator/decrement.jav b/j2k/tests/testData/ast/postfixOperator/decrement.jav
new file mode 100644
index 00000000000..d249a6d7961
--- /dev/null
+++ b/j2k/tests/testData/ast/postfixOperator/decrement.jav
@@ -0,0 +1,2 @@
+//statement
+i--;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/postfixOperator/decrement.kt b/j2k/tests/testData/ast/postfixOperator/decrement.kt
new file mode 100644
index 00000000000..b45bc7f1686
--- /dev/null
+++ b/j2k/tests/testData/ast/postfixOperator/decrement.kt
@@ -0,0 +1 @@
+i--
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/postfixOperator/statement/increment.kt b/j2k/tests/testData/ast/postfixOperator/increment.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/postfixOperator/statement/increment.kt
rename to j2k/tests/testData/ast/postfixOperator/increment.ide.kt
diff --git a/j2k/tests/testData/ast/postfixOperator/increment.jav b/j2k/tests/testData/ast/postfixOperator/increment.jav
new file mode 100644
index 00000000000..1310c60ea0a
--- /dev/null
+++ b/j2k/tests/testData/ast/postfixOperator/increment.jav
@@ -0,0 +1,2 @@
+//statement
+i++;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/postfixOperator/increment.kt b/j2k/tests/testData/ast/postfixOperator/increment.kt
new file mode 100644
index 00000000000..f47eebed94d
--- /dev/null
+++ b/j2k/tests/testData/ast/postfixOperator/increment.kt
@@ -0,0 +1 @@
+i++
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/postfixOperator/statement/decrement.jav b/j2k/tests/testData/ast/postfixOperator/statement/decrement.jav
deleted file mode 100644
index 47b6f21c63d..00000000000
--- a/j2k/tests/testData/ast/postfixOperator/statement/decrement.jav
+++ /dev/null
@@ -1 +0,0 @@
-i--;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/postfixOperator/statement/increment.jav b/j2k/tests/testData/ast/postfixOperator/statement/increment.jav
deleted file mode 100644
index 689efdaa358..00000000000
--- a/j2k/tests/testData/ast/postfixOperator/statement/increment.jav
+++ /dev/null
@@ -1 +0,0 @@
-i++;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/prefixOperator/statement/decrement.kt b/j2k/tests/testData/ast/prefixOperator/decrement.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/prefixOperator/statement/decrement.kt
rename to j2k/tests/testData/ast/prefixOperator/decrement.ide.kt
diff --git a/j2k/tests/testData/ast/prefixOperator/decrement.jav b/j2k/tests/testData/ast/prefixOperator/decrement.jav
new file mode 100644
index 00000000000..e159b662001
--- /dev/null
+++ b/j2k/tests/testData/ast/prefixOperator/decrement.jav
@@ -0,0 +1,2 @@
+//statement
+--i;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/prefixOperator/decrement.kt b/j2k/tests/testData/ast/prefixOperator/decrement.kt
new file mode 100644
index 00000000000..33b7049c8ba
--- /dev/null
+++ b/j2k/tests/testData/ast/prefixOperator/decrement.kt
@@ -0,0 +1 @@
+--i
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/prefixOperator/excl.ide.kt b/j2k/tests/testData/ast/prefixOperator/excl.ide.kt
new file mode 100644
index 00000000000..15f6f9d5a87
--- /dev/null
+++ b/j2k/tests/testData/ast/prefixOperator/excl.ide.kt
@@ -0,0 +1,2 @@
+val i = true
+val j = !i
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/prefixOperator/statement/excl.jav b/j2k/tests/testData/ast/prefixOperator/excl.jav
similarity index 73%
rename from j2k/tests/testData/ast/prefixOperator/statement/excl.jav
rename to j2k/tests/testData/ast/prefixOperator/excl.jav
index 93e541d4332..68adcf95699 100644
--- a/j2k/tests/testData/ast/prefixOperator/statement/excl.jav
+++ b/j2k/tests/testData/ast/prefixOperator/excl.jav
@@ -1,2 +1,3 @@
+//statement
boolean i = true;
boolean j = !i;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/prefixOperator/statement/excl.kt b/j2k/tests/testData/ast/prefixOperator/excl.kt
similarity index 100%
rename from j2k/tests/testData/ast/prefixOperator/statement/excl.kt
rename to j2k/tests/testData/ast/prefixOperator/excl.kt
diff --git a/j2k/tests/testData/ast/prefixOperator/statement/increment.kt b/j2k/tests/testData/ast/prefixOperator/increment.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/prefixOperator/statement/increment.kt
rename to j2k/tests/testData/ast/prefixOperator/increment.ide.kt
diff --git a/j2k/tests/testData/ast/prefixOperator/increment.jav b/j2k/tests/testData/ast/prefixOperator/increment.jav
new file mode 100644
index 00000000000..b63a2f00e31
--- /dev/null
+++ b/j2k/tests/testData/ast/prefixOperator/increment.jav
@@ -0,0 +1,2 @@
+//statement
+++i;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/prefixOperator/increment.kt b/j2k/tests/testData/ast/prefixOperator/increment.kt
new file mode 100644
index 00000000000..de36816d982
--- /dev/null
+++ b/j2k/tests/testData/ast/prefixOperator/increment.kt
@@ -0,0 +1 @@
+++i
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/prefixOperator/kt-667.ide.kt b/j2k/tests/testData/ast/prefixOperator/kt-667.ide.kt
new file mode 100644
index 00000000000..a709cf29015
--- /dev/null
+++ b/j2k/tests/testData/ast/prefixOperator/kt-667.ide.kt
@@ -0,0 +1,2 @@
+val i = (10).inv()
+val j = ((i * 100)).inv()
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/prefixOperator/statement/kt-667.jav b/j2k/tests/testData/ast/prefixOperator/kt-667.jav
similarity index 72%
rename from j2k/tests/testData/ast/prefixOperator/statement/kt-667.jav
rename to j2k/tests/testData/ast/prefixOperator/kt-667.jav
index eb1dc5658a7..6aef8f29af9 100644
--- a/j2k/tests/testData/ast/prefixOperator/statement/kt-667.jav
+++ b/j2k/tests/testData/ast/prefixOperator/kt-667.jav
@@ -1,2 +1,3 @@
+//statement
int i = ~10;
int j = ~(i * 100);
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/prefixOperator/statement/kt-667.kt b/j2k/tests/testData/ast/prefixOperator/kt-667.kt
similarity index 100%
rename from j2k/tests/testData/ast/prefixOperator/statement/kt-667.kt
rename to j2k/tests/testData/ast/prefixOperator/kt-667.kt
diff --git a/j2k/tests/testData/ast/prefixOperator/nullableIf.ide.kt b/j2k/tests/testData/ast/prefixOperator/nullableIf.ide.kt
new file mode 100644
index 00000000000..911034707aa
--- /dev/null
+++ b/j2k/tests/testData/ast/prefixOperator/nullableIf.ide.kt
@@ -0,0 +1,4 @@
+val s = null
+if (!s.isEmpty())
+{
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/prefixOperator/statement/nullableIf.jav b/j2k/tests/testData/ast/prefixOperator/nullableIf.jav
similarity index 76%
rename from j2k/tests/testData/ast/prefixOperator/statement/nullableIf.jav
rename to j2k/tests/testData/ast/prefixOperator/nullableIf.jav
index 521960489a3..0c08100df67 100644
--- a/j2k/tests/testData/ast/prefixOperator/statement/nullableIf.jav
+++ b/j2k/tests/testData/ast/prefixOperator/nullableIf.jav
@@ -1,2 +1,3 @@
+//statement
String s = null;
if (!s.isEmpty()) { }
diff --git a/j2k/tests/testData/ast/prefixOperator/statement/nullableIf.kt b/j2k/tests/testData/ast/prefixOperator/nullableIf.kt
similarity index 100%
rename from j2k/tests/testData/ast/prefixOperator/statement/nullableIf.kt
rename to j2k/tests/testData/ast/prefixOperator/nullableIf.kt
diff --git a/j2k/tests/testData/ast/prefixOperator/statement/decrement.jav b/j2k/tests/testData/ast/prefixOperator/statement/decrement.jav
deleted file mode 100644
index 10724ba55da..00000000000
--- a/j2k/tests/testData/ast/prefixOperator/statement/decrement.jav
+++ /dev/null
@@ -1 +0,0 @@
---i;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/prefixOperator/statement/increment.jav b/j2k/tests/testData/ast/prefixOperator/statement/increment.jav
deleted file mode 100644
index 97ad097f1e2..00000000000
--- a/j2k/tests/testData/ast/prefixOperator/statement/increment.jav
+++ /dev/null
@@ -1 +0,0 @@
-++i;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/prefixOperator/tilde.ide.kt b/j2k/tests/testData/ast/prefixOperator/tilde.ide.kt
new file mode 100644
index 00000000000..b98a77a029e
--- /dev/null
+++ b/j2k/tests/testData/ast/prefixOperator/tilde.ide.kt
@@ -0,0 +1,2 @@
+val i = 10
+val j = (10).inv()
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/prefixOperator/statement/tilde.jav b/j2k/tests/testData/ast/prefixOperator/tilde.jav
similarity index 66%
rename from j2k/tests/testData/ast/prefixOperator/statement/tilde.jav
rename to j2k/tests/testData/ast/prefixOperator/tilde.jav
index 354a6ddb01b..3f4c02e99d2 100644
--- a/j2k/tests/testData/ast/prefixOperator/statement/tilde.jav
+++ b/j2k/tests/testData/ast/prefixOperator/tilde.jav
@@ -1,2 +1,3 @@
+//statement
int i = 10;
int j = ~10;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/prefixOperator/statement/tilde.kt b/j2k/tests/testData/ast/prefixOperator/tilde.kt
similarity index 100%
rename from j2k/tests/testData/ast/prefixOperator/statement/tilde.kt
rename to j2k/tests/testData/ast/prefixOperator/tilde.kt
diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540-map.ide.kt b/j2k/tests/testData/ast/rawGenerics/kt-540-map.ide.kt
new file mode 100644
index 00000000000..fbc36b7a377
--- /dev/null
+++ b/j2k/tests/testData/ast/rawGenerics/kt-540-map.ide.kt
@@ -0,0 +1,9 @@
+package demo
+import java.util.HashMap
+open class Test() {
+open fun main() : Unit {
+val commonMap = HashMap()
+val rawMap = HashMap()
+val superRawMap = HashMap()
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/rawGenerics/file/kt-540-map.jav b/j2k/tests/testData/ast/rawGenerics/kt-540-map.jav
similarity index 97%
rename from j2k/tests/testData/ast/rawGenerics/file/kt-540-map.jav
rename to j2k/tests/testData/ast/rawGenerics/kt-540-map.jav
index 539c842981f..f00b8ec6fcd 100644
--- a/j2k/tests/testData/ast/rawGenerics/file/kt-540-map.jav
+++ b/j2k/tests/testData/ast/rawGenerics/kt-540-map.jav
@@ -1,3 +1,4 @@
+//file
package demo;
import java.util.HashMap;
diff --git a/j2k/tests/testData/ast/rawGenerics/file/kt-540-map.kt b/j2k/tests/testData/ast/rawGenerics/kt-540-map.kt
similarity index 100%
rename from j2k/tests/testData/ast/rawGenerics/file/kt-540-map.kt
rename to j2k/tests/testData/ast/rawGenerics/kt-540-map.kt
diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.ide.kt b/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.ide.kt
new file mode 100644
index 00000000000..a96fc96ecbd
--- /dev/null
+++ b/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.ide.kt
@@ -0,0 +1,13 @@
+package demo
+open class Collection(e : E) {
+{
+System.out.println(e)
+}
+}
+open class Test() {
+open fun main() : Unit {
+val raw1 = Collection(1)
+val raw2 = Collection(1)
+val raw3 = Collection("1")
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.jav b/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.jav
similarity index 97%
rename from j2k/tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.jav
rename to j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.jav
index 28e9ae350cc..798cfe61450 100644
--- a/j2k/tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.jav
+++ b/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class Collection {
diff --git a/j2k/tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt b/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt
similarity index 100%
rename from j2k/tests/testData/ast/rawGenerics/file/kt-540-rawGenericClass.kt
rename to j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt
diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540.ide.kt b/j2k/tests/testData/ast/rawGenerics/kt-540.ide.kt
new file mode 100644
index 00000000000..51c31b4015a
--- /dev/null
+++ b/j2k/tests/testData/ast/rawGenerics/kt-540.ide.kt
@@ -0,0 +1,9 @@
+package demo
+import java.util.LinkedList
+open class Test() {
+open fun main() : Unit {
+val common = LinkedList()
+val raw = LinkedList()
+val superRaw = LinkedList()
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/rawGenerics/file/kt-540.jav b/j2k/tests/testData/ast/rawGenerics/kt-540.jav
similarity index 97%
rename from j2k/tests/testData/ast/rawGenerics/file/kt-540.jav
rename to j2k/tests/testData/ast/rawGenerics/kt-540.jav
index 6327874eab3..3776bb92e58 100644
--- a/j2k/tests/testData/ast/rawGenerics/file/kt-540.jav
+++ b/j2k/tests/testData/ast/rawGenerics/kt-540.jav
@@ -1,3 +1,4 @@
+//file
package demo;
import java.util.List;
diff --git a/j2k/tests/testData/ast/rawGenerics/file/kt-540.kt b/j2k/tests/testData/ast/rawGenerics/kt-540.kt
similarity index 100%
rename from j2k/tests/testData/ast/rawGenerics/file/kt-540.kt
rename to j2k/tests/testData/ast/rawGenerics/kt-540.kt
diff --git a/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt
new file mode 100644
index 00000000000..ce632182ab3
--- /dev/null
+++ b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt
@@ -0,0 +1,13 @@
+package demo
+open class TestT() {
+open fun getT() : Unit {
+}
+}
+open class U() {
+open fun main() : Unit {
+val t = TestT()
+t.getT()
+t.getT()
+t.getT()
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/rawGenerics/file/rawGenericMethod.jav b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.jav
similarity index 96%
rename from j2k/tests/testData/ast/rawGenerics/file/rawGenericMethod.jav
rename to j2k/tests/testData/ast/rawGenerics/rawGenericMethod.jav
index 1303b4a305a..3cc03f9780f 100644
--- a/j2k/tests/testData/ast/rawGenerics/file/rawGenericMethod.jav
+++ b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.jav
@@ -1,3 +1,4 @@
+//file
package demo;
class TestT {
diff --git a/j2k/tests/testData/ast/rawGenerics/file/rawGenericMethod.kt b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt
similarity index 100%
rename from j2k/tests/testData/ast/rawGenerics/file/rawGenericMethod.kt
rename to j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt
diff --git a/j2k/tests/testData/ast/returnStatement/statement/returnChar.kt b/j2k/tests/testData/ast/returnStatement/returnChar.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/returnStatement/statement/returnChar.kt
rename to j2k/tests/testData/ast/returnStatement/returnChar.ide.kt
diff --git a/j2k/tests/testData/ast/returnStatement/returnChar.jav b/j2k/tests/testData/ast/returnStatement/returnChar.jav
new file mode 100644
index 00000000000..32b1efee872
--- /dev/null
+++ b/j2k/tests/testData/ast/returnStatement/returnChar.jav
@@ -0,0 +1,2 @@
+//statement
+return 'c';
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/returnStatement/returnChar.kt b/j2k/tests/testData/ast/returnStatement/returnChar.kt
new file mode 100644
index 00000000000..b6284fba897
--- /dev/null
+++ b/j2k/tests/testData/ast/returnStatement/returnChar.kt
@@ -0,0 +1 @@
+return 'c'
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/returnStatement/statement/returnLiteral.kt b/j2k/tests/testData/ast/returnStatement/returnLiteral.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/returnStatement/statement/returnLiteral.kt
rename to j2k/tests/testData/ast/returnStatement/returnLiteral.ide.kt
diff --git a/j2k/tests/testData/ast/returnStatement/statement/returnLiteral.jav b/j2k/tests/testData/ast/returnStatement/returnLiteral.jav
similarity index 50%
rename from j2k/tests/testData/ast/returnStatement/statement/returnLiteral.jav
rename to j2k/tests/testData/ast/returnStatement/returnLiteral.jav
index 5acac407ebf..318493d710b 100644
--- a/j2k/tests/testData/ast/returnStatement/statement/returnLiteral.jav
+++ b/j2k/tests/testData/ast/returnStatement/returnLiteral.jav
@@ -1 +1,2 @@
+//statement
return true;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/returnStatement/returnLiteral.kt b/j2k/tests/testData/ast/returnStatement/returnLiteral.kt
new file mode 100644
index 00000000000..2a925639120
--- /dev/null
+++ b/j2k/tests/testData/ast/returnStatement/returnLiteral.kt
@@ -0,0 +1 @@
+return true
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/returnStatement/statement/returnNumber.kt b/j2k/tests/testData/ast/returnStatement/returnNumber.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/returnStatement/statement/returnNumber.kt
rename to j2k/tests/testData/ast/returnStatement/returnNumber.ide.kt
diff --git a/j2k/tests/testData/ast/returnStatement/returnNumber.jav b/j2k/tests/testData/ast/returnStatement/returnNumber.jav
new file mode 100644
index 00000000000..69d0c6713d8
--- /dev/null
+++ b/j2k/tests/testData/ast/returnStatement/returnNumber.jav
@@ -0,0 +1,2 @@
+//statement
+return 1;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/returnStatement/returnNumber.kt b/j2k/tests/testData/ast/returnStatement/returnNumber.kt
new file mode 100644
index 00000000000..5efef616fdb
--- /dev/null
+++ b/j2k/tests/testData/ast/returnStatement/returnNumber.kt
@@ -0,0 +1 @@
+return 1
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/returnStatement/statement/returnString.kt b/j2k/tests/testData/ast/returnStatement/returnString.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/returnStatement/statement/returnString.kt
rename to j2k/tests/testData/ast/returnStatement/returnString.ide.kt
diff --git a/j2k/tests/testData/ast/returnStatement/statement/returnString.jav b/j2k/tests/testData/ast/returnStatement/returnString.jav
similarity index 52%
rename from j2k/tests/testData/ast/returnStatement/statement/returnString.jav
rename to j2k/tests/testData/ast/returnStatement/returnString.jav
index b98a6ce7734..6e3e67807d2 100644
--- a/j2k/tests/testData/ast/returnStatement/statement/returnString.jav
+++ b/j2k/tests/testData/ast/returnStatement/returnString.jav
@@ -1 +1,2 @@
+//statement
return "str";
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/returnStatement/returnString.kt b/j2k/tests/testData/ast/returnStatement/returnString.kt
new file mode 100644
index 00000000000..f831e0baf83
--- /dev/null
+++ b/j2k/tests/testData/ast/returnStatement/returnString.kt
@@ -0,0 +1 @@
+return "str"
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/returnStatement/statement/returnChar.jav b/j2k/tests/testData/ast/returnStatement/statement/returnChar.jav
deleted file mode 100644
index d693916818c..00000000000
--- a/j2k/tests/testData/ast/returnStatement/statement/returnChar.jav
+++ /dev/null
@@ -1 +0,0 @@
-return 'c';
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/returnStatement/statement/returnNumber.jav b/j2k/tests/testData/ast/returnStatement/statement/returnNumber.jav
deleted file mode 100644
index eb224e0951e..00000000000
--- a/j2k/tests/testData/ast/returnStatement/statement/returnNumber.jav
+++ /dev/null
@@ -1 +0,0 @@
-return 1;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/starProjectionType/methodParams.ide.kt b/j2k/tests/testData/ast/starProjectionType/methodParams.ide.kt
new file mode 100644
index 00000000000..4d9524c085b
--- /dev/null
+++ b/j2k/tests/testData/ast/starProjectionType/methodParams.ide.kt
@@ -0,0 +1,2 @@
+fun wtf(w : Collection<*>) : Unit {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/starProjectionType/method/methodParams.jav b/j2k/tests/testData/ast/starProjectionType/methodParams.jav
similarity index 75%
rename from j2k/tests/testData/ast/starProjectionType/method/methodParams.jav
rename to j2k/tests/testData/ast/starProjectionType/methodParams.jav
index 18d4217e0d9..661b0518c7f 100644
--- a/j2k/tests/testData/ast/starProjectionType/method/methodParams.jav
+++ b/j2k/tests/testData/ast/starProjectionType/methodParams.jav
@@ -1 +1,2 @@
+//method
void wtf(Collection w) {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/starProjectionType/method/methodParams.kt b/j2k/tests/testData/ast/starProjectionType/methodParams.kt
similarity index 100%
rename from j2k/tests/testData/ast/starProjectionType/method/methodParams.kt
rename to j2k/tests/testData/ast/starProjectionType/methodParams.kt
diff --git a/j2k/tests/testData/ast/superExpression/file/classAdotSuperFoo.kt b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/superExpression/file/classAdotSuperFoo.kt
rename to j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt
diff --git a/j2k/tests/testData/ast/superExpression/file/classAdotSuperFoo.jav b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.jav
similarity index 94%
rename from j2k/tests/testData/ast/superExpression/file/classAdotSuperFoo.jav
rename to j2k/tests/testData/ast/superExpression/classAdotSuperFoo.jav
index f53906b2c67..2f5f53113af 100644
--- a/j2k/tests/testData/ast/superExpression/file/classAdotSuperFoo.jav
+++ b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.jav
@@ -1,3 +1,4 @@
+//file
class Base {
void foo();
}
diff --git a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt
new file mode 100644
index 00000000000..a6495ce0571
--- /dev/null
+++ b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt
@@ -0,0 +1,10 @@
+open class Base() {
+open fun foo() : Unit
+}
+open class A() : Base() {
+open class C() {
+open fun test() : Unit {
+super@A.foo()
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/superExpression/class/classAextendsB.kt b/j2k/tests/testData/ast/superExpression/classAextendsB.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/superExpression/class/classAextendsB.kt
rename to j2k/tests/testData/ast/superExpression/classAextendsB.ide.kt
diff --git a/j2k/tests/testData/ast/superExpression/class/classAextendsB.jav b/j2k/tests/testData/ast/superExpression/classAextendsB.jav
similarity index 94%
rename from j2k/tests/testData/ast/superExpression/class/classAextendsB.jav
rename to j2k/tests/testData/ast/superExpression/classAextendsB.jav
index 6f07978fe79..6e818b7ac12 100644
--- a/j2k/tests/testData/ast/superExpression/class/classAextendsB.jav
+++ b/j2k/tests/testData/ast/superExpression/classAextendsB.jav
@@ -1,3 +1,4 @@
+//class
class B {
B(int i) {}
int call() {return 1;}
diff --git a/j2k/tests/testData/ast/superExpression/classAextendsB.kt b/j2k/tests/testData/ast/superExpression/classAextendsB.kt
new file mode 100644
index 00000000000..b9c5e29b288
--- /dev/null
+++ b/j2k/tests/testData/ast/superExpression/classAextendsB.kt
@@ -0,0 +1,10 @@
+open class B(i : Int) {
+open fun call() : Int {
+return 1
+}
+}
+open class A() : B(10) {
+override fun call() : Int {
+return super.call()
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/superExpression/statement/superStatement.kt b/j2k/tests/testData/ast/superExpression/superStatement.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/superExpression/statement/superStatement.kt
rename to j2k/tests/testData/ast/superExpression/superStatement.ide.kt
diff --git a/j2k/tests/testData/ast/superExpression/statement/superStatement.jav b/j2k/tests/testData/ast/superExpression/superStatement.jav
similarity index 52%
rename from j2k/tests/testData/ast/superExpression/statement/superStatement.jav
rename to j2k/tests/testData/ast/superExpression/superStatement.jav
index 4b2f79a6823..5bb0ec33134 100644
--- a/j2k/tests/testData/ast/superExpression/statement/superStatement.jav
+++ b/j2k/tests/testData/ast/superExpression/superStatement.jav
@@ -1 +1,2 @@
+//statement
super.call();
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/thisExpression/statement/thisStatement.kt b/j2k/tests/testData/ast/superExpression/superStatement.kt
similarity index 100%
rename from j2k/tests/testData/ast/thisExpression/statement/thisStatement.kt
rename to j2k/tests/testData/ast/superExpression/superStatement.kt
diff --git a/j2k/tests/testData/ast/switch/comlicatedFallDown.ide.kt b/j2k/tests/testData/ast/switch/comlicatedFallDown.ide.kt
new file mode 100644
index 00000000000..687bf185ee4
--- /dev/null
+++ b/j2k/tests/testData/ast/switch/comlicatedFallDown.ide.kt
@@ -0,0 +1,88 @@
+package demo
+public open class SwitchDemo() {
+class object {
+public open fun print(o : Any) : Unit {
+System.out.println(o)
+}
+public open fun test(i : Int) : Unit {
+val monthString = ""
+when (i) {
+1 -> {
+print(1)
+print(2)
+print(3)
+print(4)
+print(5)
+}
+2 -> {
+print(2)
+print(3)
+print(4)
+print(5)
+}
+3 -> {
+print(3)
+print(4)
+print(5)
+}
+4 -> {
+print(4)
+print(5)
+}
+5 -> {
+print(5)
+}
+6 -> {
+print(6)
+print(7)
+print(8)
+print(9)
+print(10)
+print(11)
+monthString = "December"
+}
+7 -> {
+print(7)
+print(8)
+print(9)
+print(10)
+print(11)
+monthString = "December"
+}
+8 -> {
+print(8)
+print(9)
+print(10)
+print(11)
+monthString = "December"
+}
+9 -> {
+print(9)
+print(10)
+print(11)
+monthString = "December"
+}
+10 -> {
+print(10)
+print(11)
+monthString = "December"
+}
+11 -> {
+print(11)
+monthString = "December"
+}
+12 -> {
+monthString = "December"
+}
+else -> {
+monthString = "Invalid month"
+}
+}
+System.out.println(monthString)
+}
+public open fun main(args : Array) : Unit {
+for (i in 1..12) test(i)
+}
+}
+}
+fun main(args : Array) = SwitchDemo.main(args as Array?)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/switch/file/comlicatedFallDown.jav b/j2k/tests/testData/ast/switch/comlicatedFallDown.jav
similarity index 99%
rename from j2k/tests/testData/ast/switch/file/comlicatedFallDown.jav
rename to j2k/tests/testData/ast/switch/comlicatedFallDown.jav
index 7bede23f75c..319c15a53f3 100644
--- a/j2k/tests/testData/ast/switch/file/comlicatedFallDown.jav
+++ b/j2k/tests/testData/ast/switch/comlicatedFallDown.jav
@@ -1,3 +1,4 @@
+//file
package demo;
public class SwitchDemo {
diff --git a/j2k/tests/testData/ast/switch/file/comlicatedFallDown.kt b/j2k/tests/testData/ast/switch/comlicatedFallDown.kt
similarity index 100%
rename from j2k/tests/testData/ast/switch/file/comlicatedFallDown.kt
rename to j2k/tests/testData/ast/switch/comlicatedFallDown.kt
diff --git a/j2k/tests/testData/ast/switch/emptySwitch.ide.kt b/j2k/tests/testData/ast/switch/emptySwitch.ide.kt
new file mode 100644
index 00000000000..1786c1b157a
--- /dev/null
+++ b/j2k/tests/testData/ast/switch/emptySwitch.ide.kt
@@ -0,0 +1,14 @@
+public open class NonDefault() {
+class object {
+public open fun main(args : Array) : Unit {
+val value = 3
+val valueString = ""
+when (value) {
+else -> {
+}
+}
+System.out.println(valueString)
+}
+}
+}
+fun main(args : Array) = NonDefault.main(args as Array?)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/switch/file/emptySwitch.jav b/j2k/tests/testData/ast/switch/emptySwitch.jav
similarity index 96%
rename from j2k/tests/testData/ast/switch/file/emptySwitch.jav
rename to j2k/tests/testData/ast/switch/emptySwitch.jav
index 3e97ccdc5ca..1fa57f569fa 100644
--- a/j2k/tests/testData/ast/switch/file/emptySwitch.jav
+++ b/j2k/tests/testData/ast/switch/emptySwitch.jav
@@ -1,3 +1,4 @@
+//file
public class NonDefault {
public static void main(String[] args) {
diff --git a/j2k/tests/testData/ast/switch/file/emptySwitch.kt b/j2k/tests/testData/ast/switch/emptySwitch.kt
similarity index 100%
rename from j2k/tests/testData/ast/switch/file/emptySwitch.kt
rename to j2k/tests/testData/ast/switch/emptySwitch.kt
diff --git a/j2k/tests/testData/ast/switch/fallDown.ide.kt b/j2k/tests/testData/ast/switch/fallDown.ide.kt
new file mode 100644
index 00000000000..f4b14b211a4
--- /dev/null
+++ b/j2k/tests/testData/ast/switch/fallDown.ide.kt
@@ -0,0 +1,19 @@
+package switch_demo
+public open class SwitchDemo() {
+class object {
+public open fun main(args : Array) : Unit {
+val month = 8
+val monthString : String
+when (month) {
+1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 -> {
+monthString = "December"
+}
+else -> {
+monthString = "Invalid month"
+}
+}
+System.out.println(monthString)
+}
+}
+}
+fun main(args : Array) = SwitchDemo.main(args as Array?)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/switch/file/fallDown.jav b/j2k/tests/testData/ast/switch/fallDown.jav
similarity index 98%
rename from j2k/tests/testData/ast/switch/file/fallDown.jav
rename to j2k/tests/testData/ast/switch/fallDown.jav
index a6e4c557a72..fc912e2e93b 100644
--- a/j2k/tests/testData/ast/switch/file/fallDown.jav
+++ b/j2k/tests/testData/ast/switch/fallDown.jav
@@ -1,3 +1,4 @@
+//file
package switch_demo;
public class SwitchDemo {
diff --git a/j2k/tests/testData/ast/switch/file/fallDown.kt b/j2k/tests/testData/ast/switch/fallDown.kt
similarity index 100%
rename from j2k/tests/testData/ast/switch/file/fallDown.kt
rename to j2k/tests/testData/ast/switch/fallDown.kt
diff --git a/j2k/tests/testData/ast/switch/kt-539.ide.kt b/j2k/tests/testData/ast/switch/kt-539.ide.kt
new file mode 100644
index 00000000000..6ee522f5499
--- /dev/null
+++ b/j2k/tests/testData/ast/switch/kt-539.ide.kt
@@ -0,0 +1,52 @@
+package switch_demo
+public open class SwitchDemo() {
+class object {
+public open fun main(args : Array) : Unit {
+val month = 8
+val monthString : String
+when (month) {
+1 -> {
+monthString = "January"
+}
+2 -> {
+monthString = "February"
+}
+3 -> {
+monthString = "March"
+}
+4 -> {
+monthString = "April"
+}
+5 -> {
+monthString = "May"
+}
+6 -> {
+monthString = "June"
+}
+7 -> {
+monthString = "July"
+}
+8 -> {
+monthString = "August"
+}
+9 -> {
+monthString = "September"
+}
+10 -> {
+monthString = "October"
+}
+11 -> {
+monthString = "November"
+}
+12 -> {
+monthString = "December"
+}
+else -> {
+monthString = "Invalid month"
+}
+}
+System.out.println(monthString)
+}
+}
+}
+fun main(args : Array) = SwitchDemo.main(args as Array?)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/switch/file/kt-539.jav b/j2k/tests/testData/ast/switch/kt-539.jav
similarity index 99%
rename from j2k/tests/testData/ast/switch/file/kt-539.jav
rename to j2k/tests/testData/ast/switch/kt-539.jav
index 890eaa836e2..52ca7e7ef4a 100644
--- a/j2k/tests/testData/ast/switch/file/kt-539.jav
+++ b/j2k/tests/testData/ast/switch/kt-539.jav
@@ -1,3 +1,4 @@
+//file
package switch_demo;
public class SwitchDemo {
diff --git a/j2k/tests/testData/ast/switch/file/kt-539.kt b/j2k/tests/testData/ast/switch/kt-539.kt
similarity index 100%
rename from j2k/tests/testData/ast/switch/file/kt-539.kt
rename to j2k/tests/testData/ast/switch/kt-539.kt
diff --git a/j2k/tests/testData/ast/switch/nondefault.ide.kt b/j2k/tests/testData/ast/switch/nondefault.ide.kt
new file mode 100644
index 00000000000..57debde90c0
--- /dev/null
+++ b/j2k/tests/testData/ast/switch/nondefault.ide.kt
@@ -0,0 +1,23 @@
+public open class NonDefault() {
+class object {
+public open fun main(args : Array) : Unit {
+val value = 3
+val valueString = ""
+when (value) {
+1 -> {
+valueString = "ONE"
+}
+2 -> {
+valueString = "TWO"
+}
+3 -> {
+valueString = "THREE"
+}
+else -> {
+}
+}
+System.out.println(valueString)
+}
+}
+}
+fun main(args : Array) = NonDefault.main(args as Array?)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/switch/file/nondefault.jav b/j2k/tests/testData/ast/switch/nondefault.jav
similarity index 98%
rename from j2k/tests/testData/ast/switch/file/nondefault.jav
rename to j2k/tests/testData/ast/switch/nondefault.jav
index 7734371f59e..e24a661f6cf 100644
--- a/j2k/tests/testData/ast/switch/file/nondefault.jav
+++ b/j2k/tests/testData/ast/switch/nondefault.jav
@@ -1,3 +1,4 @@
+//file
public class NonDefault {
public static void main(String[] args) {
diff --git a/j2k/tests/testData/ast/switch/file/nondefault.kt b/j2k/tests/testData/ast/switch/nondefault.kt
similarity index 100%
rename from j2k/tests/testData/ast/switch/file/nondefault.kt
rename to j2k/tests/testData/ast/switch/nondefault.kt
diff --git a/j2k/tests/testData/ast/synchronizedStatement/statement/singleLineExample.kt b/j2k/tests/testData/ast/synchronizedStatement/singleLineExample.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/synchronizedStatement/statement/singleLineExample.kt
rename to j2k/tests/testData/ast/synchronizedStatement/singleLineExample.ide.kt
diff --git a/j2k/tests/testData/ast/synchronizedStatement/statement/singleLineExample.jav b/j2k/tests/testData/ast/synchronizedStatement/singleLineExample.jav
similarity index 75%
rename from j2k/tests/testData/ast/synchronizedStatement/statement/singleLineExample.jav
rename to j2k/tests/testData/ast/synchronizedStatement/singleLineExample.jav
index 4c4b01beee5..75b593f97b6 100644
--- a/j2k/tests/testData/ast/synchronizedStatement/statement/singleLineExample.jav
+++ b/j2k/tests/testData/ast/synchronizedStatement/singleLineExample.jav
@@ -1 +1,2 @@
+//statement
synchronized (s) { doSomething(s); }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/synchronizedStatement/singleLineExample.kt b/j2k/tests/testData/ast/synchronizedStatement/singleLineExample.kt
new file mode 100644
index 00000000000..6665fbbba33
--- /dev/null
+++ b/j2k/tests/testData/ast/synchronizedStatement/singleLineExample.kt
@@ -0,0 +1,3 @@
+synchronized (s) {
+doSomething(s)
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/thisExpression/file/classAdotThisFoo.kt b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/thisExpression/file/classAdotThisFoo.kt
rename to j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt
diff --git a/j2k/tests/testData/ast/thisExpression/file/classAdotThisFoo.jav b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.jav
similarity index 94%
rename from j2k/tests/testData/ast/thisExpression/file/classAdotThisFoo.jav
rename to j2k/tests/testData/ast/thisExpression/classAdotThisFoo.jav
index 6449695eb81..0d2259d6e9b 100644
--- a/j2k/tests/testData/ast/thisExpression/file/classAdotThisFoo.jav
+++ b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.jav
@@ -1,3 +1,4 @@
+//file
class Base {
void foo() {}
}
diff --git a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt
new file mode 100644
index 00000000000..615b3b5dc0a
--- /dev/null
+++ b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt
@@ -0,0 +1,11 @@
+open class Base() {
+open fun foo() : Unit {
+}
+}
+open class A() : Base() {
+open class C() {
+open fun test() : Unit {
+this@A.foo()
+}
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/thisExpression/thisStatement.ide.kt b/j2k/tests/testData/ast/thisExpression/thisStatement.ide.kt
new file mode 100644
index 00000000000..a0ea37bcc63
--- /dev/null
+++ b/j2k/tests/testData/ast/thisExpression/thisStatement.ide.kt
@@ -0,0 +1 @@
+super.call()
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/thisExpression/statement/thisStatement.jav b/j2k/tests/testData/ast/thisExpression/thisStatement.jav
similarity index 52%
rename from j2k/tests/testData/ast/thisExpression/statement/thisStatement.jav
rename to j2k/tests/testData/ast/thisExpression/thisStatement.jav
index 4b2f79a6823..5bb0ec33134 100644
--- a/j2k/tests/testData/ast/thisExpression/statement/thisStatement.jav
+++ b/j2k/tests/testData/ast/thisExpression/thisStatement.jav
@@ -1 +1,2 @@
+//statement
super.call();
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/thisExpression/thisStatement.kt b/j2k/tests/testData/ast/thisExpression/thisStatement.kt
new file mode 100644
index 00000000000..a0ea37bcc63
--- /dev/null
+++ b/j2k/tests/testData/ast/thisExpression/thisStatement.kt
@@ -0,0 +1 @@
+super.call()
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/throwStatement/statement/simpleThrowStatement.kt b/j2k/tests/testData/ast/throwStatement/simpleThrowStatement.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/throwStatement/statement/simpleThrowStatement.kt
rename to j2k/tests/testData/ast/throwStatement/simpleThrowStatement.ide.kt
diff --git a/j2k/tests/testData/ast/throwStatement/statement/simpleThrowStatement.jav b/j2k/tests/testData/ast/throwStatement/simpleThrowStatement.jav
similarity index 57%
rename from j2k/tests/testData/ast/throwStatement/statement/simpleThrowStatement.jav
rename to j2k/tests/testData/ast/throwStatement/simpleThrowStatement.jav
index 2d879427e7c..f886ec32cef 100644
--- a/j2k/tests/testData/ast/throwStatement/statement/simpleThrowStatement.jav
+++ b/j2k/tests/testData/ast/throwStatement/simpleThrowStatement.jav
@@ -1 +1,2 @@
+//statement
throw exception;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/throwStatement/simpleThrowStatement.kt b/j2k/tests/testData/ast/throwStatement/simpleThrowStatement.kt
new file mode 100644
index 00000000000..0894cfeda14
--- /dev/null
+++ b/j2k/tests/testData/ast/throwStatement/simpleThrowStatement.kt
@@ -0,0 +1 @@
+throw exception
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/class/abstactInterface.kt b/j2k/tests/testData/ast/trait/abstactInterface.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/trait/class/abstactInterface.kt
rename to j2k/tests/testData/ast/trait/abstactInterface.ide.kt
diff --git a/j2k/tests/testData/ast/trait/class/abstactInterface.jav b/j2k/tests/testData/ast/trait/abstactInterface.jav
similarity index 74%
rename from j2k/tests/testData/ast/trait/class/abstactInterface.jav
rename to j2k/tests/testData/ast/trait/abstactInterface.jav
index 17b89868943..53337871d07 100644
--- a/j2k/tests/testData/ast/trait/class/abstactInterface.jav
+++ b/j2k/tests/testData/ast/trait/abstactInterface.jav
@@ -1 +1,2 @@
+//class
abstract interface I {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/abstactInterface.kt b/j2k/tests/testData/ast/trait/abstactInterface.kt
new file mode 100644
index 00000000000..97c0b5c0bed
--- /dev/null
+++ b/j2k/tests/testData/ast/trait/abstactInterface.kt
@@ -0,0 +1,2 @@
+abstract trait I {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/class/emptyInterface.kt b/j2k/tests/testData/ast/trait/emptyInterface.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/trait/class/emptyInterface.kt
rename to j2k/tests/testData/ast/trait/emptyInterface.ide.kt
diff --git a/j2k/tests/testData/ast/trait/class/emptyInterface.jav b/j2k/tests/testData/ast/trait/emptyInterface.jav
similarity index 63%
rename from j2k/tests/testData/ast/trait/class/emptyInterface.jav
rename to j2k/tests/testData/ast/trait/emptyInterface.jav
index 0bdb5912e9b..9a74240790d 100644
--- a/j2k/tests/testData/ast/trait/class/emptyInterface.jav
+++ b/j2k/tests/testData/ast/trait/emptyInterface.jav
@@ -1 +1,2 @@
+//class
interface A {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/emptyInterface.kt b/j2k/tests/testData/ast/trait/emptyInterface.kt
new file mode 100644
index 00000000000..670cabdb241
--- /dev/null
+++ b/j2k/tests/testData/ast/trait/emptyInterface.kt
@@ -0,0 +1,2 @@
+trait A {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.kt b/j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.kt
rename to j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.ide.kt
diff --git a/j2k/tests/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.jav b/j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.jav
similarity index 80%
rename from j2k/tests/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.jav
rename to j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.jav
index f0434f0b324..0dbd6f57c0d 100644
--- a/j2k/tests/testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.jav
+++ b/j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.jav
@@ -1 +1,2 @@
+//class
interface A extends I0, I1, I2 {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.kt b/j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.kt
new file mode 100644
index 00000000000..3bbc299803d
--- /dev/null
+++ b/j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.kt
@@ -0,0 +1,2 @@
+trait A : I0, I1, I2 {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/class/extendsOneInterface.kt b/j2k/tests/testData/ast/trait/extendsOneInterface.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/trait/class/extendsOneInterface.kt
rename to j2k/tests/testData/ast/trait/extendsOneInterface.ide.kt
diff --git a/j2k/tests/testData/ast/trait/class/extendsOneInterface.jav b/j2k/tests/testData/ast/trait/extendsOneInterface.jav
similarity index 75%
rename from j2k/tests/testData/ast/trait/class/extendsOneInterface.jav
rename to j2k/tests/testData/ast/trait/extendsOneInterface.jav
index fdd7b33cb4b..75fd76bf208 100644
--- a/j2k/tests/testData/ast/trait/class/extendsOneInterface.jav
+++ b/j2k/tests/testData/ast/trait/extendsOneInterface.jav
@@ -1 +1,2 @@
+//class
interface A extends I {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/extendsOneInterface.kt b/j2k/tests/testData/ast/trait/extendsOneInterface.kt
new file mode 100644
index 00000000000..a5d59a56576
--- /dev/null
+++ b/j2k/tests/testData/ast/trait/extendsOneInterface.kt
@@ -0,0 +1,2 @@
+trait A : I {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/interfaceWithFields.ide.kt b/j2k/tests/testData/ast/trait/interfaceWithFields.ide.kt
new file mode 100644
index 00000000000..cfd0705e789
--- /dev/null
+++ b/j2k/tests/testData/ast/trait/interfaceWithFields.ide.kt
@@ -0,0 +1,7 @@
+trait INode {
+class object {
+val IN : String = "in"
+val AT : String = "@"
+val COMMA_WITH_SPACE : String = COMMA + SPACE
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/class/interfaceWithFields.jav b/j2k/tests/testData/ast/trait/interfaceWithFields.jav
similarity index 91%
rename from j2k/tests/testData/ast/trait/class/interfaceWithFields.jav
rename to j2k/tests/testData/ast/trait/interfaceWithFields.jav
index 5fdf82bfa6c..c3fb73f0fdb 100644
--- a/j2k/tests/testData/ast/trait/class/interfaceWithFields.jav
+++ b/j2k/tests/testData/ast/trait/interfaceWithFields.jav
@@ -1 +1,2 @@
+//class
interface INode {String IN = "in";String AT = "@";String COMMA_WITH_SPACE = COMMA + SPACE;}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/class/interfaceWithFields.kt b/j2k/tests/testData/ast/trait/interfaceWithFields.kt
similarity index 100%
rename from j2k/tests/testData/ast/trait/class/interfaceWithFields.kt
rename to j2k/tests/testData/ast/trait/interfaceWithFields.kt
diff --git a/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.ide.kt b/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.ide.kt
new file mode 100644
index 00000000000..0a901456e3d
--- /dev/null
+++ b/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.ide.kt
@@ -0,0 +1,4 @@
+trait INode {
+open fun getTag() : Tag
+open fun toKotlin() : String
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/class/interfaceWithMethodDeclaration.jav b/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.jav
similarity index 85%
rename from j2k/tests/testData/ast/trait/class/interfaceWithMethodDeclaration.jav
rename to j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.jav
index 4023476a76e..6751759c3fb 100644
--- a/j2k/tests/testData/ast/trait/class/interfaceWithMethodDeclaration.jav
+++ b/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.jav
@@ -1 +1,2 @@
+//class
interface INode {Tag getTag();String toKotlin();}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/class/interfaceWithMethodDeclaration.kt b/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.kt
similarity index 100%
rename from j2k/tests/testData/ast/trait/class/interfaceWithMethodDeclaration.kt
rename to j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.kt
diff --git a/j2k/tests/testData/ast/trait/interfaceWithStaticFields.ide.kt b/j2k/tests/testData/ast/trait/interfaceWithStaticFields.ide.kt
new file mode 100644
index 00000000000..d6527b5f2be
--- /dev/null
+++ b/j2k/tests/testData/ast/trait/interfaceWithStaticFields.ide.kt
@@ -0,0 +1,7 @@
+public trait INode {
+class object {
+public val IN : String = "in"
+public val AT : String = "@"
+public val COMMA_WITH_SPACE : String = COMMA + SPACE
+}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/class/interfaceWithStaticFields.jav b/j2k/tests/testData/ast/trait/interfaceWithStaticFields.jav
similarity index 95%
rename from j2k/tests/testData/ast/trait/class/interfaceWithStaticFields.jav
rename to j2k/tests/testData/ast/trait/interfaceWithStaticFields.jav
index 831ea008a23..ad8d5172998 100644
--- a/j2k/tests/testData/ast/trait/class/interfaceWithStaticFields.jav
+++ b/j2k/tests/testData/ast/trait/interfaceWithStaticFields.jav
@@ -1 +1,2 @@
+//class
public interface INode { public static final String IN = "in"; public static final String AT = "@"; public static final String COMMA_WITH_SPACE = COMMA + SPACE;}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/class/interfaceWithStaticFields.kt b/j2k/tests/testData/ast/trait/interfaceWithStaticFields.kt
similarity index 100%
rename from j2k/tests/testData/ast/trait/class/interfaceWithStaticFields.kt
rename to j2k/tests/testData/ast/trait/interfaceWithStaticFields.kt
diff --git a/j2k/tests/testData/ast/trait/class/internalInterface.kt b/j2k/tests/testData/ast/trait/internalInterface.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/trait/class/internalInterface.kt
rename to j2k/tests/testData/ast/trait/internalInterface.ide.kt
diff --git a/j2k/tests/testData/ast/trait/class/internalInterface.jav b/j2k/tests/testData/ast/trait/internalInterface.jav
similarity index 68%
rename from j2k/tests/testData/ast/trait/class/internalInterface.jav
rename to j2k/tests/testData/ast/trait/internalInterface.jav
index 6afccc2f169..475a1f50cad 100644
--- a/j2k/tests/testData/ast/trait/class/internalInterface.jav
+++ b/j2k/tests/testData/ast/trait/internalInterface.jav
@@ -1 +1,2 @@
+//class
interface Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/internalInterface.kt b/j2k/tests/testData/ast/trait/internalInterface.kt
new file mode 100644
index 00000000000..802809a5724
--- /dev/null
+++ b/j2k/tests/testData/ast/trait/internalInterface.kt
@@ -0,0 +1,2 @@
+trait Test {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/class/privateInterface.kt b/j2k/tests/testData/ast/trait/privateInterface.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/trait/class/privateInterface.kt
rename to j2k/tests/testData/ast/trait/privateInterface.ide.kt
diff --git a/j2k/tests/testData/ast/trait/class/privateInterface.jav b/j2k/tests/testData/ast/trait/privateInterface.jav
similarity index 75%
rename from j2k/tests/testData/ast/trait/class/privateInterface.jav
rename to j2k/tests/testData/ast/trait/privateInterface.jav
index cf33d97c99c..4da638e3aa2 100644
--- a/j2k/tests/testData/ast/trait/class/privateInterface.jav
+++ b/j2k/tests/testData/ast/trait/privateInterface.jav
@@ -1 +1,2 @@
+//class
private interface Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/privateInterface.kt b/j2k/tests/testData/ast/trait/privateInterface.kt
new file mode 100644
index 00000000000..72942402d0b
--- /dev/null
+++ b/j2k/tests/testData/ast/trait/privateInterface.kt
@@ -0,0 +1,2 @@
+private trait Test {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/class/protectedInterface.kt b/j2k/tests/testData/ast/trait/protectedInterface.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/trait/class/protectedInterface.kt
rename to j2k/tests/testData/ast/trait/protectedInterface.ide.kt
diff --git a/j2k/tests/testData/ast/trait/class/protectedInterface.jav b/j2k/tests/testData/ast/trait/protectedInterface.jav
similarity index 77%
rename from j2k/tests/testData/ast/trait/class/protectedInterface.jav
rename to j2k/tests/testData/ast/trait/protectedInterface.jav
index e91d5694021..f6d52096fc3 100644
--- a/j2k/tests/testData/ast/trait/class/protectedInterface.jav
+++ b/j2k/tests/testData/ast/trait/protectedInterface.jav
@@ -1 +1,2 @@
+//class
protected interface Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/protectedInterface.kt b/j2k/tests/testData/ast/trait/protectedInterface.kt
new file mode 100644
index 00000000000..359d3b99929
--- /dev/null
+++ b/j2k/tests/testData/ast/trait/protectedInterface.kt
@@ -0,0 +1,2 @@
+protected trait Test {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/class/publicInterface.kt b/j2k/tests/testData/ast/trait/publicInterface.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/trait/class/publicInterface.kt
rename to j2k/tests/testData/ast/trait/publicInterface.ide.kt
diff --git a/j2k/tests/testData/ast/trait/class/publicInterface.jav b/j2k/tests/testData/ast/trait/publicInterface.jav
similarity index 75%
rename from j2k/tests/testData/ast/trait/class/publicInterface.jav
rename to j2k/tests/testData/ast/trait/publicInterface.jav
index 19c4ff3a675..3973e285389 100644
--- a/j2k/tests/testData/ast/trait/class/publicInterface.jav
+++ b/j2k/tests/testData/ast/trait/publicInterface.jav
@@ -1 +1,2 @@
+//class
public interface Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/publicInterface.kt b/j2k/tests/testData/ast/trait/publicInterface.kt
new file mode 100644
index 00000000000..14565fbd6b3
--- /dev/null
+++ b/j2k/tests/testData/ast/trait/publicInterface.kt
@@ -0,0 +1,2 @@
+public trait Test {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.kt b/j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.kt
rename to j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.ide.kt
diff --git a/j2k/tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.jav b/j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.jav
similarity index 91%
rename from j2k/tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.jav
rename to j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.jav
index ba4d634d21b..36f0a4df556 100644
--- a/j2k/tests/testData/ast/tryStatement/statement/commonCaseForTryStatement.jav
+++ b/j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.jav
@@ -1 +1,2 @@
+//statement
try { callMethod(params);} catch (Exception e) { println(1);} catch (IOException e) { println(0);} finally { println(3);}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.kt b/j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.kt
new file mode 100644
index 00000000000..ce5da7da296
--- /dev/null
+++ b/j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.kt
@@ -0,0 +1,14 @@
+try
+{
+callMethod(params)
+}
+catch (e : Exception) {
+println(1)
+}
+catch (e : IOException) {
+println(0)
+}
+finally
+{
+println(3)
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.kt b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.kt
rename to j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.ide.kt
diff --git a/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.jav b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.jav
similarity index 88%
rename from j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.jav
rename to j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.jav
index f334b56c36a..5c4e7340dfa 100644
--- a/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithEmptyFinally.jav
+++ b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.jav
@@ -1 +1,2 @@
+//statement
try {} catch (Exception e) { println(1);} catch (IOException e) { println(0);} finally {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.kt b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.kt
new file mode 100644
index 00000000000..40e83f0667f
--- /dev/null
+++ b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.kt
@@ -0,0 +1,12 @@
+try
+{
+}
+catch (e : Exception) {
+println(1)
+}
+catch (e : IOException) {
+println(0)
+}
+finally
+{
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.kt b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.kt
rename to j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.ide.kt
diff --git a/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.jav b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.jav
similarity index 90%
rename from j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.jav
rename to j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.jav
index 9658c4120c2..4f24cd027f7 100644
--- a/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithFinally.jav
+++ b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.jav
@@ -1 +1,2 @@
+//statement
try {} catch (Exception e) { println(1);} catch (IOException e) { println(0);} finally { println(3);}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.kt b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.kt
new file mode 100644
index 00000000000..92e60f280d4
--- /dev/null
+++ b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.kt
@@ -0,0 +1,13 @@
+try
+{
+}
+catch (e : Exception) {
+println(1)
+}
+catch (e : IOException) {
+println(0)
+}
+finally
+{
+println(3)
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.kt b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.kt
rename to j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.ide.kt
diff --git a/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.jav b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.jav
similarity index 87%
rename from j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.jav
rename to j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.jav
index 5e85a85b378..208278d9073 100644
--- a/j2k/tests/testData/ast/tryStatement/statement/emptyTryWithTwoCatchesWithoutFinally.jav
+++ b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.jav
@@ -1 +1,2 @@
+//statement
try {} catch (Exception e) { println(1);} catch (IOException e) { println(0);}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.kt b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.kt
new file mode 100644
index 00000000000..2f5deb07c0b
--- /dev/null
+++ b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.kt
@@ -0,0 +1,9 @@
+try
+{
+}
+catch (e : Exception) {
+println(1)
+}
+catch (e : IOException) {
+println(0)
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeCastExpression/expression/fooCast.jav b/j2k/tests/testData/ast/typeCastExpression/expression/fooCast.jav
deleted file mode 100644
index 8edd243486a..00000000000
--- a/j2k/tests/testData/ast/typeCastExpression/expression/fooCast.jav
+++ /dev/null
@@ -1 +0,0 @@
-(Foo)t
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeCastExpression/expression/intCast.jav b/j2k/tests/testData/ast/typeCastExpression/expression/intCast.jav
deleted file mode 100644
index c000fb4d468..00000000000
--- a/j2k/tests/testData/ast/typeCastExpression/expression/intCast.jav
+++ /dev/null
@@ -1 +0,0 @@
-(int)t
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeCastExpression/expression/primitiveType.jav b/j2k/tests/testData/ast/typeCastExpression/expression/primitiveType.jav
deleted file mode 100644
index a9cc54cd6b8..00000000000
--- a/j2k/tests/testData/ast/typeCastExpression/expression/primitiveType.jav
+++ /dev/null
@@ -1 +0,0 @@
-(int)100.00;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeCastExpression/expression/stringCast.jav b/j2k/tests/testData/ast/typeCastExpression/expression/stringCast.jav
deleted file mode 100644
index b4cf91cf340..00000000000
--- a/j2k/tests/testData/ast/typeCastExpression/expression/stringCast.jav
+++ /dev/null
@@ -1 +0,0 @@
-(String)t
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.ide.kt b/j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.ide.kt
new file mode 100644
index 00000000000..41e0ce28f7d
--- /dev/null
+++ b/j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.ide.kt
@@ -0,0 +1 @@
+(list as List)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeCastExpression/expression/extendsWildcardCast.jav b/j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.jav
similarity index 68%
rename from j2k/tests/testData/ast/typeCastExpression/expression/extendsWildcardCast.jav
rename to j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.jav
index c19f94da6e8..4cca76e1578 100644
--- a/j2k/tests/testData/ast/typeCastExpression/expression/extendsWildcardCast.jav
+++ b/j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.jav
@@ -1 +1,2 @@
+//expression
(List)list
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeCastExpression/expression/extendsWildcardCast.kt b/j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.kt
similarity index 100%
rename from j2k/tests/testData/ast/typeCastExpression/expression/extendsWildcardCast.kt
rename to j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.kt
diff --git a/j2k/tests/testData/ast/typeCastExpression/fooCast.ide.kt b/j2k/tests/testData/ast/typeCastExpression/fooCast.ide.kt
new file mode 100644
index 00000000000..ae853a5e094
--- /dev/null
+++ b/j2k/tests/testData/ast/typeCastExpression/fooCast.ide.kt
@@ -0,0 +1 @@
+(t as Foo)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeCastExpression/fooCast.jav b/j2k/tests/testData/ast/typeCastExpression/fooCast.jav
new file mode 100644
index 00000000000..76ecaa1646f
--- /dev/null
+++ b/j2k/tests/testData/ast/typeCastExpression/fooCast.jav
@@ -0,0 +1,2 @@
+//expression
+(Foo)t
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeCastExpression/expression/fooCast.kt b/j2k/tests/testData/ast/typeCastExpression/fooCast.kt
similarity index 100%
rename from j2k/tests/testData/ast/typeCastExpression/expression/fooCast.kt
rename to j2k/tests/testData/ast/typeCastExpression/fooCast.kt
diff --git a/j2k/tests/testData/ast/typeCastExpression/expression/intCast.kt b/j2k/tests/testData/ast/typeCastExpression/intCast.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/typeCastExpression/expression/intCast.kt
rename to j2k/tests/testData/ast/typeCastExpression/intCast.ide.kt
diff --git a/j2k/tests/testData/ast/typeCastExpression/intCast.jav b/j2k/tests/testData/ast/typeCastExpression/intCast.jav
new file mode 100644
index 00000000000..f183b8b46cd
--- /dev/null
+++ b/j2k/tests/testData/ast/typeCastExpression/intCast.jav
@@ -0,0 +1,2 @@
+//expression
+(int)t
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeCastExpression/intCast.kt b/j2k/tests/testData/ast/typeCastExpression/intCast.kt
new file mode 100644
index 00000000000..28dc4fc3816
--- /dev/null
+++ b/j2k/tests/testData/ast/typeCastExpression/intCast.kt
@@ -0,0 +1 @@
+(t as Int)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeCastExpression/expression/primitiveType.kt b/j2k/tests/testData/ast/typeCastExpression/primitiveType.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/typeCastExpression/expression/primitiveType.kt
rename to j2k/tests/testData/ast/typeCastExpression/primitiveType.ide.kt
diff --git a/j2k/tests/testData/ast/typeCastExpression/primitiveType.jav b/j2k/tests/testData/ast/typeCastExpression/primitiveType.jav
new file mode 100644
index 00000000000..0808b87a3ca
--- /dev/null
+++ b/j2k/tests/testData/ast/typeCastExpression/primitiveType.jav
@@ -0,0 +1,2 @@
+//expression
+(int)100.00;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeCastExpression/primitiveType.kt b/j2k/tests/testData/ast/typeCastExpression/primitiveType.kt
new file mode 100644
index 00000000000..e312f02e742
--- /dev/null
+++ b/j2k/tests/testData/ast/typeCastExpression/primitiveType.kt
@@ -0,0 +1 @@
+100.00.toInt()
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.ide.kt b/j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.ide.kt
new file mode 100644
index 00000000000..c5c0169c4c1
--- /dev/null
+++ b/j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.ide.kt
@@ -0,0 +1 @@
+(list as List)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeCastExpression/expression/simpleGenericCast.jav b/j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.jav
similarity index 62%
rename from j2k/tests/testData/ast/typeCastExpression/expression/simpleGenericCast.jav
rename to j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.jav
index cdfdd30aea4..23e4a463671 100644
--- a/j2k/tests/testData/ast/typeCastExpression/expression/simpleGenericCast.jav
+++ b/j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.jav
@@ -1 +1,2 @@
+//expression
(List)list
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeCastExpression/expression/simpleGenericCast.kt b/j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.kt
similarity index 100%
rename from j2k/tests/testData/ast/typeCastExpression/expression/simpleGenericCast.kt
rename to j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.kt
diff --git a/j2k/tests/testData/ast/typeCastExpression/stringCast.ide.kt b/j2k/tests/testData/ast/typeCastExpression/stringCast.ide.kt
new file mode 100644
index 00000000000..88d53877299
--- /dev/null
+++ b/j2k/tests/testData/ast/typeCastExpression/stringCast.ide.kt
@@ -0,0 +1 @@
+(t as String)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeCastExpression/stringCast.jav b/j2k/tests/testData/ast/typeCastExpression/stringCast.jav
new file mode 100644
index 00000000000..21f52cfff1c
--- /dev/null
+++ b/j2k/tests/testData/ast/typeCastExpression/stringCast.jav
@@ -0,0 +1,2 @@
+//expression
+(String)t
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeCastExpression/expression/stringCast.kt b/j2k/tests/testData/ast/typeCastExpression/stringCast.kt
similarity index 100%
rename from j2k/tests/testData/ast/typeCastExpression/expression/stringCast.kt
rename to j2k/tests/testData/ast/typeCastExpression/stringCast.kt
diff --git a/j2k/tests/testData/ast/typeCastExpression/superWildcardCast.ide.kt b/j2k/tests/testData/ast/typeCastExpression/superWildcardCast.ide.kt
new file mode 100644
index 00000000000..c440782dd48
--- /dev/null
+++ b/j2k/tests/testData/ast/typeCastExpression/superWildcardCast.ide.kt
@@ -0,0 +1 @@
+(list as List)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeCastExpression/expression/superWildcardCast.jav b/j2k/tests/testData/ast/typeCastExpression/superWildcardCast.jav
similarity index 66%
rename from j2k/tests/testData/ast/typeCastExpression/expression/superWildcardCast.jav
rename to j2k/tests/testData/ast/typeCastExpression/superWildcardCast.jav
index c197fc42e15..d54fc9f799c 100644
--- a/j2k/tests/testData/ast/typeCastExpression/expression/superWildcardCast.jav
+++ b/j2k/tests/testData/ast/typeCastExpression/superWildcardCast.jav
@@ -1 +1,2 @@
+//expression
(List)list
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeCastExpression/expression/superWildcardCast.kt b/j2k/tests/testData/ast/typeCastExpression/superWildcardCast.kt
similarity index 100%
rename from j2k/tests/testData/ast/typeCastExpression/expression/superWildcardCast.kt
rename to j2k/tests/testData/ast/typeCastExpression/superWildcardCast.kt
diff --git a/j2k/tests/testData/ast/typeCastExpression/wildcardCast.ide.kt b/j2k/tests/testData/ast/typeCastExpression/wildcardCast.ide.kt
new file mode 100644
index 00000000000..13fd5a7456a
--- /dev/null
+++ b/j2k/tests/testData/ast/typeCastExpression/wildcardCast.ide.kt
@@ -0,0 +1 @@
+(list as List<*>)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeCastExpression/expression/wildcardCast.jav b/j2k/tests/testData/ast/typeCastExpression/wildcardCast.jav
similarity index 50%
rename from j2k/tests/testData/ast/typeCastExpression/expression/wildcardCast.jav
rename to j2k/tests/testData/ast/typeCastExpression/wildcardCast.jav
index 38bd7a07f97..014bf2430cb 100644
--- a/j2k/tests/testData/ast/typeCastExpression/expression/wildcardCast.jav
+++ b/j2k/tests/testData/ast/typeCastExpression/wildcardCast.jav
@@ -1 +1,2 @@
+//expression
(List)list
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeCastExpression/expression/wildcardCast.kt b/j2k/tests/testData/ast/typeCastExpression/wildcardCast.kt
similarity index 100%
rename from j2k/tests/testData/ast/typeCastExpression/expression/wildcardCast.kt
rename to j2k/tests/testData/ast/typeCastExpression/wildcardCast.kt
diff --git a/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.ide.kt b/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.ide.kt
new file mode 100644
index 00000000000..80eb93690f7
--- /dev/null
+++ b/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.ide.kt
@@ -0,0 +1,2 @@
+class CC() : A() where T : Comparable, K : Collection {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.jav b/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.jav
similarity index 93%
rename from j2k/tests/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.jav
rename to j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.jav
index c576f7f0633..1896ee7b7f4 100644
--- a/j2k/tests/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.jav
+++ b/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.jav
@@ -1 +1,2 @@
+//class
final class CC , K extends Node & Collection> extends A {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.kt b/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt
similarity index 100%
rename from j2k/tests/testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.kt
rename to j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt
diff --git a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.ide.kt b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.ide.kt
new file mode 100644
index 00000000000..0417ab3d582
--- /dev/null
+++ b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.ide.kt
@@ -0,0 +1,2 @@
+class C() where T : Comparable {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.jav b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.jav
similarity index 87%
rename from j2k/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.jav
rename to j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.jav
index 9794cb4338c..24b206eb9b7 100644
--- a/j2k/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.jav
+++ b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.jav
@@ -1 +1,2 @@
+//class
final class C> {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.kt b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.kt
similarity index 100%
rename from j2k/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBounds.kt
rename to j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.kt
diff --git a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.ide.kt b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.ide.kt
new file mode 100644
index 00000000000..59bc7d58339
--- /dev/null
+++ b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.ide.kt
@@ -0,0 +1,2 @@
+class C() : A() where T : Comparable {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.jav b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.jav
similarity index 89%
rename from j2k/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.jav
rename to j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.jav
index aaea17bff62..4215ba527e8 100644
--- a/j2k/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.jav
+++ b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.jav
@@ -1 +1,2 @@
+//class
final class C> extends A {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.kt b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt
similarity index 100%
rename from j2k/tests/testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.kt
rename to j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt
diff --git a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.ide.kt b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.ide.kt
new file mode 100644
index 00000000000..c1b49e64cfa
--- /dev/null
+++ b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.ide.kt
@@ -0,0 +1,2 @@
+trait CommandHandler {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/class/complexExampleWithClassExtending.jav b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.jav
similarity index 85%
rename from j2k/tests/testData/ast/typeParameters/class/complexExampleWithClassExtending.jav
rename to j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.jav
index d23995b68a2..1936ac38a00 100644
--- a/j2k/tests/testData/ast/typeParameters/class/complexExampleWithClassExtending.jav
+++ b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.jav
@@ -1 +1,2 @@
+//class
interface CommandHandler {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/class/complexExampleWithClassExtending.kt b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.kt
similarity index 100%
rename from j2k/tests/testData/ast/typeParameters/class/complexExampleWithClassExtending.kt
rename to j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.kt
diff --git a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.ide.kt b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.ide.kt
new file mode 100644
index 00000000000..dfb1ccaa1cf
--- /dev/null
+++ b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.ide.kt
@@ -0,0 +1,2 @@
+trait CommandHandler {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.jav b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.jav
similarity index 86%
rename from j2k/tests/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.jav
rename to j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.jav
index 8d1c87481ff..2b80ced7b30 100644
--- a/j2k/tests/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.jav
+++ b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.jav
@@ -1 +1,2 @@
+//class
interface CommandHandler {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.kt b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.kt
similarity index 100%
rename from j2k/tests/testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.kt
rename to j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.kt
diff --git a/j2k/tests/testData/ast/typeParameters/class/genericClass.kt b/j2k/tests/testData/ast/typeParameters/genericClass.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/typeParameters/class/genericClass.kt
rename to j2k/tests/testData/ast/typeParameters/genericClass.ide.kt
diff --git a/j2k/tests/testData/ast/typeParameters/class/genericClass.jav b/j2k/tests/testData/ast/typeParameters/genericClass.jav
similarity index 77%
rename from j2k/tests/testData/ast/typeParameters/class/genericClass.jav
rename to j2k/tests/testData/ast/typeParameters/genericClass.jav
index 10066e3b55d..251689718ad 100644
--- a/j2k/tests/testData/ast/typeParameters/class/genericClass.jav
+++ b/j2k/tests/testData/ast/typeParameters/genericClass.jav
@@ -1 +1,2 @@
+//class
final class Comparable {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/genericClass.kt b/j2k/tests/testData/ast/typeParameters/genericClass.kt
new file mode 100644
index 00000000000..dd8d1147200
--- /dev/null
+++ b/j2k/tests/testData/ast/typeParameters/genericClass.kt
@@ -0,0 +1,2 @@
+class Comparable() {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/genericParam.ide.kt b/j2k/tests/testData/ast/typeParameters/genericParam.ide.kt
new file mode 100644
index 00000000000..7906dcc847d
--- /dev/null
+++ b/j2k/tests/testData/ast/typeParameters/genericParam.ide.kt
@@ -0,0 +1 @@
+val l : List
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/genericParam.jav b/j2k/tests/testData/ast/typeParameters/genericParam.jav
new file mode 100644
index 00000000000..c35bd1ea9a2
--- /dev/null
+++ b/j2k/tests/testData/ast/typeParameters/genericParam.jav
@@ -0,0 +1,2 @@
+//statement
+List l;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/statement/genericParam.kt b/j2k/tests/testData/ast/typeParameters/genericParam.kt
similarity index 100%
rename from j2k/tests/testData/ast/typeParameters/statement/genericParam.kt
rename to j2k/tests/testData/ast/typeParameters/genericParam.kt
diff --git a/j2k/tests/testData/ast/typeParameters/manyGenericParams.ide.kt b/j2k/tests/testData/ast/typeParameters/manyGenericParams.ide.kt
new file mode 100644
index 00000000000..27182aa85e3
--- /dev/null
+++ b/j2k/tests/testData/ast/typeParameters/manyGenericParams.ide.kt
@@ -0,0 +1 @@
+val l : List
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/statement/manyGenericParams.jav b/j2k/tests/testData/ast/typeParameters/manyGenericParams.jav
similarity index 57%
rename from j2k/tests/testData/ast/typeParameters/statement/manyGenericParams.jav
rename to j2k/tests/testData/ast/typeParameters/manyGenericParams.jav
index 65eb2f4ca9d..f6ac149f1ac 100644
--- a/j2k/tests/testData/ast/typeParameters/statement/manyGenericParams.jav
+++ b/j2k/tests/testData/ast/typeParameters/manyGenericParams.jav
@@ -1 +1,2 @@
+//statement
List l;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/statement/manyGenericParams.kt b/j2k/tests/testData/ast/typeParameters/manyGenericParams.kt
similarity index 100%
rename from j2k/tests/testData/ast/typeParameters/statement/manyGenericParams.kt
rename to j2k/tests/testData/ast/typeParameters/manyGenericParams.kt
diff --git a/j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.ide.kt b/j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.ide.kt
new file mode 100644
index 00000000000..a0857b763ea
--- /dev/null
+++ b/j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.ide.kt
@@ -0,0 +1,2 @@
+fun max(coll : Collection) : T where T : Comparable, K : Collection {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.jav b/j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.jav
similarity index 93%
rename from j2k/tests/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.jav
rename to j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.jav
index 40ab13a5851..f56c82bdeb7 100644
--- a/j2k/tests/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.jav
+++ b/j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.jav
@@ -1 +1,2 @@
+//method
, K extends Node & Collection> T max(Collection coll) {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt b/j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.kt
similarity index 100%
rename from j2k/tests/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt
rename to j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.kt
diff --git a/j2k/tests/testData/ast/typeParameters/statement/genericParam.jav b/j2k/tests/testData/ast/typeParameters/statement/genericParam.jav
deleted file mode 100644
index 89c94caafda..00000000000
--- a/j2k/tests/testData/ast/typeParameters/statement/genericParam.jav
+++ /dev/null
@@ -1 +0,0 @@
-List l;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.ide.kt b/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.ide.kt
new file mode 100644
index 00000000000..6b62010cb69
--- /dev/null
+++ b/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.ide.kt
@@ -0,0 +1,2 @@
+trait I : II where T : Comparable, K : Collection {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.jav b/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.jav
similarity index 93%
rename from j2k/tests/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.jav
rename to j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.jav
index 533a138632d..fe100723927 100644
--- a/j2k/tests/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.jav
+++ b/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.jav
@@ -1 +1,2 @@
+//class
interface I , K extends Node & Collection> extends II {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.kt b/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt
similarity index 100%
rename from j2k/tests/testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.kt
rename to j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt
diff --git a/j2k/tests/testData/ast/typeParameters/where.ide.kt b/j2k/tests/testData/ast/typeParameters/where.ide.kt
new file mode 100644
index 00000000000..9ee4f2b1eed
--- /dev/null
+++ b/j2k/tests/testData/ast/typeParameters/where.ide.kt
@@ -0,0 +1,2 @@
+fun max(coll : Collection) : T where T : Comparable {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/method/where.jav b/j2k/tests/testData/ast/typeParameters/where.jav
similarity index 90%
rename from j2k/tests/testData/ast/typeParameters/method/where.jav
rename to j2k/tests/testData/ast/typeParameters/where.jav
index 20bb1bf62fd..75e0c1f6ed1 100644
--- a/j2k/tests/testData/ast/typeParameters/method/where.jav
+++ b/j2k/tests/testData/ast/typeParameters/where.jav
@@ -1 +1,2 @@
+//method
> T max(Collection coll) {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/method/where.kt b/j2k/tests/testData/ast/typeParameters/where.kt
similarity index 100%
rename from j2k/tests/testData/ast/typeParameters/method/where.kt
rename to j2k/tests/testData/ast/typeParameters/where.kt
diff --git a/j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.ide.kt b/j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.ide.kt
new file mode 100644
index 00000000000..fc817eef037
--- /dev/null
+++ b/j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.ide.kt
@@ -0,0 +1 @@
+fun format(pattern : String, vararg arguments : Any) : String
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/varArg/method/ellipsisTypeSeveralParams.jav b/j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.jav
similarity index 85%
rename from j2k/tests/testData/ast/varArg/method/ellipsisTypeSeveralParams.jav
rename to j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.jav
index 46bdd2765ee..07c6ebc03b4 100644
--- a/j2k/tests/testData/ast/varArg/method/ellipsisTypeSeveralParams.jav
+++ b/j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.jav
@@ -1 +1,2 @@
+//method
String format(String pattern, Object... arguments);
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/varArg/method/ellipsisTypeSeveralParams.kt b/j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.kt
similarity index 100%
rename from j2k/tests/testData/ast/varArg/method/ellipsisTypeSeveralParams.kt
rename to j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.kt
diff --git a/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.ide.kt b/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.ide.kt
new file mode 100644
index 00000000000..715241ae78d
--- /dev/null
+++ b/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.ide.kt
@@ -0,0 +1,2 @@
+fun pushAll(vararg objs : Any) : Unit {
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/varArg/method/ellipsisTypeSingleParams.jav b/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.jav
similarity index 77%
rename from j2k/tests/testData/ast/varArg/method/ellipsisTypeSingleParams.jav
rename to j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.jav
index 2c1f529675e..8a46bf3edf2 100644
--- a/j2k/tests/testData/ast/varArg/method/ellipsisTypeSingleParams.jav
+++ b/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.jav
@@ -1 +1,2 @@
+//method
void pushAll(Object... objs) {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/varArg/method/ellipsisTypeSingleParams.kt b/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.kt
similarity index 100%
rename from j2k/tests/testData/ast/varArg/method/ellipsisTypeSingleParams.kt
rename to j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.kt
diff --git a/j2k/tests/testData/ast/whileStatement/whileWithBlock.ide.kt b/j2k/tests/testData/ast/whileStatement/whileWithBlock.ide.kt
new file mode 100644
index 00000000000..e2211cc3a81
--- /dev/null
+++ b/j2k/tests/testData/ast/whileStatement/whileWithBlock.ide.kt
@@ -0,0 +1,5 @@
+while (a > b)
+{
+val i = 1
+i = i + 1
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/whileStatement/statement/whileWithBlock.jav b/j2k/tests/testData/ast/whileStatement/whileWithBlock.jav
similarity index 75%
rename from j2k/tests/testData/ast/whileStatement/statement/whileWithBlock.jav
rename to j2k/tests/testData/ast/whileStatement/whileWithBlock.jav
index 729a9e5f6f7..2bdb159e3e8 100644
--- a/j2k/tests/testData/ast/whileStatement/statement/whileWithBlock.jav
+++ b/j2k/tests/testData/ast/whileStatement/whileWithBlock.jav
@@ -1 +1,2 @@
+//statement
while (a > b) {int i = 1; i = i + 1;}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/whileStatement/statement/whileWithBlock.kt b/j2k/tests/testData/ast/whileStatement/whileWithBlock.kt
similarity index 100%
rename from j2k/tests/testData/ast/whileStatement/statement/whileWithBlock.kt
rename to j2k/tests/testData/ast/whileStatement/whileWithBlock.kt
diff --git a/j2k/tests/testData/ast/whileStatement/statement/whileWithEmptyBlock.kt b/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/whileStatement/statement/whileWithEmptyBlock.kt
rename to j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.ide.kt
diff --git a/j2k/tests/testData/ast/whileStatement/statement/whileWithEmptyBlock.jav b/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.jav
similarity index 55%
rename from j2k/tests/testData/ast/whileStatement/statement/whileWithEmptyBlock.jav
rename to j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.jav
index 5055fb08ee2..a0bb7c97efc 100644
--- a/j2k/tests/testData/ast/whileStatement/statement/whileWithEmptyBlock.jav
+++ b/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.jav
@@ -1 +1,2 @@
+//statement
while (true) {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.kt b/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.kt
new file mode 100644
index 00000000000..7c69899ce77
--- /dev/null
+++ b/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.kt
@@ -0,0 +1,3 @@
+while (true)
+{
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/whileStatement/statement/whileWithExpression.kt b/j2k/tests/testData/ast/whileStatement/whileWithExpression.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/whileStatement/statement/whileWithExpression.kt
rename to j2k/tests/testData/ast/whileStatement/whileWithExpression.ide.kt
diff --git a/j2k/tests/testData/ast/whileStatement/statement/whileWithExpression.jav b/j2k/tests/testData/ast/whileStatement/whileWithExpression.jav
similarity index 65%
rename from j2k/tests/testData/ast/whileStatement/statement/whileWithExpression.jav
rename to j2k/tests/testData/ast/whileStatement/whileWithExpression.jav
index b0e6f1b9b32..3052dac6d16 100644
--- a/j2k/tests/testData/ast/whileStatement/statement/whileWithExpression.jav
+++ b/j2k/tests/testData/ast/whileStatement/whileWithExpression.jav
@@ -1 +1,2 @@
+//statement
while (true) i = i + 1;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/whileStatement/whileWithExpression.kt b/j2k/tests/testData/ast/whileStatement/whileWithExpression.kt
new file mode 100644
index 00000000000..fd2a7536a52
--- /dev/null
+++ b/j2k/tests/testData/ast/whileStatement/whileWithExpression.kt
@@ -0,0 +1,2 @@
+while (true)
+i = i + 1
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/whileStatement/statement/whileWithReturn.kt b/j2k/tests/testData/ast/whileStatement/whileWithReturn.ide.kt
similarity index 100%
rename from j2k/tests/testData/ast/whileStatement/statement/whileWithReturn.kt
rename to j2k/tests/testData/ast/whileStatement/whileWithReturn.ide.kt
diff --git a/j2k/tests/testData/ast/whileStatement/statement/whileWithReturn.jav b/j2k/tests/testData/ast/whileStatement/whileWithReturn.jav
similarity index 64%
rename from j2k/tests/testData/ast/whileStatement/statement/whileWithReturn.jav
rename to j2k/tests/testData/ast/whileStatement/whileWithReturn.jav
index 2174fc827bd..b1e0092a701 100644
--- a/j2k/tests/testData/ast/whileStatement/statement/whileWithReturn.jav
+++ b/j2k/tests/testData/ast/whileStatement/whileWithReturn.jav
@@ -1 +1,2 @@
+//statement
while (true) return 1;
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/whileStatement/whileWithReturn.kt b/j2k/tests/testData/ast/whileStatement/whileWithReturn.kt
new file mode 100644
index 00000000000..ec1e88ceed8
--- /dev/null
+++ b/j2k/tests/testData/ast/whileStatement/whileWithReturn.kt
@@ -0,0 +1,2 @@
+while (true)
+return 1
\ No newline at end of file
diff --git a/j2k/tests/testData/plugin/file/example.jav b/j2k/tests/testData/plugin/file/example.jav
deleted file mode 100644
index 284baf66c67..00000000000
--- a/j2k/tests/testData/plugin/file/example.jav
+++ /dev/null
@@ -1,10 +0,0 @@
-class Example {
- void main(Integer param1, int param2) {
- Library.getString().isEmpty();
- Integer i = 10;
- for (Integer a : Arrays.asList(1, 2, 3)) {
-
- }
- }
-}
-
diff --git a/j2k/tests/testData/plugin/file/example.kt b/j2k/tests/testData/plugin/file/example.kt
deleted file mode 100644
index 8714bb87465..00000000000
--- a/j2k/tests/testData/plugin/file/example.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-open class Example() {
-open fun main(param1 : Int, param2 : Int) : Unit {
-Library.getString().isEmpty()
-val i = 10
-for (a in Arrays.asList(1, 2, 3))
-{
-}
-}
-}
\ No newline at end of file