class_mult avoided

test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java

@@ -46,8 +46,7 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase {
     else if (javaFile.getParent().endsWith("/method")) actual = methodToSingleLineKotlin(javaCode);
     else if (javaFile.getParent().endsWith("/method_mult")) actual = methodToKotlin(javaCode);
 
-    else if (javaFile.getParent().endsWith("/class")) actual = classToSingleLineKotlin(javaCode);
-    else if (javaFile.getParent().endsWith("/class_mult")) actual = classToKotlin(javaCode);
+    else if (javaFile.getParent().endsWith("/class")) actual = classToKotlin(javaCode);
 
     else if (javaFile.getParent().endsWith("/file")) actual = fileToKotlin(javaCode);
 
@@ -112,11 +111,15 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase {
     return prettify(result);
   }
 
-  @NotNull
-  protected String classToSingleLineKotlin(String text) throws IOException {
-    return toSingleLine(classToKotlin(text));
+  protected String methodToSingleLineKotlin(String text) throws IOException {
+    return toSingleLine(methodToKotlin(text));
   }
 
+  protected String statementToSingleLineKotlin(String code) throws Exception {
+    return toSingleLine(statementToKotlin(code));
+  }
+
+  @NotNull
   protected String methodToKotlin(String text) throws IOException {
     String result = classToKotlin("final class C {" + text + "}")
       .replaceAll("class C \\{", "");
@@ -124,10 +127,7 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase {
     return prettify(result);
   }
 
-  protected String methodToSingleLineKotlin(String text) throws IOException {
-    return toSingleLine(methodToKotlin(text));
-  }
-
+  @NotNull
   protected String statementToKotlin(String text) throws Exception {
     String result = methodToKotlin("void main() {" + text + "}");
     int pos = result.lastIndexOf("}");
@@ -135,10 +135,7 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase {
     return prettify(result);
   }
 
-  protected String statementToSingleLineKotlin(String code) throws Exception {
-    return toSingleLine(statementToKotlin(code));
-  }
-
+  @NotNull
   protected String expressionToKotlin(String code) throws Exception {
     String result = statementToKotlin("Object o =" + code + "}");
     result = result.replaceFirst("var o : Any\\? =", "");

testData/ast/class/class/class.kt

@@ -1 +1,2 @@
-open class Test { }
+open class Test {
+}

testData/ast/class/class/emptyClass.kt

@@ -1 +1,2 @@
-class A { }
+class A {
+}

testData/ast/class/class/extendsOneClassAndImplementsOneInterface.kt

@@ -1 +1,2 @@
-class A : Base, I { }
+class A : Base, I {
+}

testData/ast/class/class/extendsOneClassAndImplementsSeveralInterfaces.kt

@@ -1 +1,2 @@
-class A : Base, I0, I1, I2 { }
+class A : Base, I0, I1, I2 {
+}

testData/ast/class/class/finalClass.kt

@@ -1 +1,2 @@
-class Test { }
+class Test {
+}

testData/ast/class/class/genericClass.kt

@@ -1 +1,2 @@
-class Entry<K, V> { }
+class Entry<K, V> {
+}

testData/ast/class/class/innerEmptyClass.kt

@@ -1 +1,4 @@
-class A { class B { } }
+class A {
+class B {
+}
+}

testData/ast/class/class/innerStaticClass.kt

@@ -1 +1,6 @@
-class S { class object { open class Inner { } } }
+class S {
+class object {
+open class Inner {
+}
+}
+}

testData/ast/class/class/internalClass.kt

@@ -1 +1,2 @@
-open class Test { }
+open class Test {
+}

testData/ast/class/class/oneStaticFieldOneNonStatic.kt

@@ -1 +1,8 @@
-class S { class object { var myI : Int = 10 } fun sB() : Boolean { return true } }
+class S {
+class object {
+var myI : Int = 10
+}
+fun sB() : Boolean {
+return true
+}
+}

testData/ast/class/class/oneStaticMethod.kt

@@ -1 +1,7 @@
-class S { class object { fun staticF() : Boolean { return true } } }
+class S {
+class object {
+fun staticF() : Boolean {
+return true
+}
+}
+}

testData/ast/class/class/oneStaticMethodOneNonStatic.kt

@@ -1 +1,10 @@
-class S { class object { fun sI() : Int { return 1 } } fun sB() : Boolean { return true } }
+class S {
+class object {
+fun sI() : Int {
+return 1
+}
+}
+fun sB() : Boolean {
+return true
+}
+}

testData/ast/class/class/pivateClass.kt

@@ -1 +1,2 @@
-private open class Test { }
+private open class Test {
+}

testData/ast/class/class/protectedClass.kt

@@ -1 +1,2 @@
-protected open class Test { }
+protected open class Test {
+}

testData/ast/class/class/publicClass.kt

@@ -1 +1,2 @@
-public open class Test { }
+public open class Test {
+}

testData/ast/class/class/simpleInheritance.kt

@@ -1 +1,2 @@
-class A : Base { }
+class A : Base {
+}

testData/ast/class/class/twoStaticMethod.kt

@@ -1 +1,10 @@
-class S { class object { fun sB() : Boolean { return true } fun sI() : Int { return 1 } } }
+class S {
+class object {
+fun sB() : Boolean {
+return true
+}
+fun sI() : Int {
+return 1
+}
+}
+}

testData/ast/enum/class/emptyEnum.kt

@@ -1 +1,2 @@
-enum A { }
+enum A {
+}

testData/ast/enum/class/enumImplementsOneInterface.kt

@@ -1 +1,2 @@
-enum A : I { }
+enum A : I {
+}

testData/ast/enum/class/enumImplementsSeveralInterfaces.kt

@@ -1 +1,2 @@
-enum A : I0, I1, I2 { }
+enum A : I0, I1, I2 {
+}

testData/ast/enum/class/internalEnum.kt

@@ -1 +1,2 @@
-enum Test { }
+enum Test {
+}

testData/ast/enum/class/privateEnum.kt

@@ -1 +1,2 @@
-private enum Test { }
+private enum Test {
+}

testData/ast/enum/class/protectedEnum.kt

@@ -1 +1,2 @@
-protected enum Test { }
+protected enum Test {
+}

testData/ast/enum/class/publicEnum.kt

@@ -1 +1,2 @@
-public enum Test { }
+public enum Test {
+}

testData/ast/trait/class/emptyInterface.kt

@@ -1 +1,2 @@
-trait A { }
+trait A {
+}

testData/ast/trait/class/extendsOneClassAndImplementsSeveralInterfaces.kt

@@ -1 +1,2 @@
-trait A : I0, I1, I2 { }
+trait A : I0, I1, I2 {
+}

testData/ast/trait/class/extendsOneInterface.kt

@@ -1 +1,2 @@
-trait A : I { }
+trait A : I {
+}

testData/ast/trait/class/internalInterface.kt

@@ -1 +1,2 @@
-trait Test { }
+trait Test {
+}

testData/ast/trait/class/privateInterface.kt

@@ -1 +1,2 @@
-private trait Test { }
+private trait Test {
+}

testData/ast/trait/class/protectedInterface.kt

@@ -1 +1,2 @@
-protected trait Test { }
+protected trait Test {
+}

testData/ast/trait/class/publicInterface.kt

@@ -1 +1,2 @@
-public trait Test { }
+public trait Test {
+}

testData/ast/typeParameters/class/classDoubleParametrizationWithTwoBoundsWithExtending.kt

@@ -1 +1,2 @@
-class CC<T : INode?, K : Node?> : A where T : Comparable<in T?>?, K : Collection<in K?>? { }
+class CC<T : INode?, K : Node?> : A where T : Comparable<in T?>?, K : Collection<in K?>? {
+}

testData/ast/typeParameters/class/classParametrizationWithTwoBounds.kt

@@ -1 +1,2 @@
-class C<T : INode?> where T : Comparable<in T?>? { }
+class C<T : INode?> where T : Comparable<in T?>? {
+}

testData/ast/typeParameters/class/classParametrizationWithTwoBoundsWithExtending.kt

@@ -1 +1,2 @@
-class C<T : INode?> : A where T : Comparable<in T?>? { }
+class C<T : INode?> : A where T : Comparable<in T?>? {
+}

testData/ast/typeParameters/class/complexExampleWithClassExtending.kt

@@ -1 +1,2 @@
-trait CommandHandler<T : Command?> { }
+trait CommandHandler<T : Command?> {
+}

testData/ast/typeParameters/class/complexExampleWithClassMultiplyExtending.kt

@@ -1 +1,2 @@
-trait CommandHandler<T : INode?, String> { }
+trait CommandHandler<T : INode?, String> {
+}

testData/ast/typeParameters/class/genericClass.kt

@@ -1 +1,2 @@
-class Comparable<T> { }
+class Comparable<T> {
+}

testData/ast/typeParameters/class/traitDoubleParametrizationWithTwoBoundsWithExtending.kt

@@ -1 +1,2 @@
-trait I<T : INode?, K : Node?> : II where T : Comparable<in T?>?, K : Collection<in K?>? { }
+trait I<T : INode?, K : Node?> : II where T : Comparable<in T?>?, K : Collection<in K?>? {
+}