From 4e6e488e28a468cd740f3d28ae864320c931ee7d Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Mon, 7 Nov 2011 13:20:46 +0400
Subject: [PATCH] method_mult avoided

---
 test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java    | 5 +----
 testData/ast/arrayType/method/methodArrayArgs.kt             | 3 ++-
 testData/ast/function/method/classGenericParam.kt            | 3 ++-
 testData/ast/function/method/emptyVoidMethod.kt              | 3 ++-
 testData/ast/function/method/internal.kt                     | 3 ++-
 testData/ast/function/method/methodClassType.kt              | 3 ++-
 testData/ast/function/method/methodPrimitiveType.kt          | 3 ++-
 testData/ast/function/method/methodPrimitiveType2.kt         | 3 ++-
 testData/ast/function/method/methodWithReturnStatement.kt    | 4 +++-
 testData/ast/function/method/ownGenericParam.kt              | 3 ++-
 testData/ast/function/method/ownSeveralGenericParams.kt      | 3 ++-
 testData/ast/function/method/private.kt                      | 3 ++-
 testData/ast/function/method/protected.kt                    | 3 ++-
 testData/ast/function/method/public.kt                       | 3 ++-
 testData/ast/inProjectionType/method/methodParams.kt         | 3 ++-
 testData/ast/outProjectionType/method/methodParams.kt        | 3 ++-
 testData/ast/starProjectionType/method/methodParams.kt       | 3 ++-
 .../method/methodDoubleParametrizationWithTwoBounds.kt       | 3 ++-
 testData/ast/typeParameters/method/where.kt                  | 3 ++-
 testData/ast/varArg/method/ellipsisTypeSingleParams.kt       | 3 ++-
 20 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java b/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java
index 1741520cb27..ae47e98b7d6 100644
--- a/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java
+++ b/test/org/jetbrains/jet/j2k/JavaToKotlinConverterTest.java
@@ -43,11 +43,8 @@ public class JavaToKotlinConverterTest extends LightDaemonAnalyzerTestCase {
     else if (javaFile.getParent().endsWith("/statement")) actual = statementToSingleLineKotlin(javaCode);
     else if (javaFile.getParent().endsWith("/statement_mult")) actual = statementToKotlin(javaCode);
 
-    else if (javaFile.getParent().endsWith("/method")) actual = methodToSingleLineKotlin(javaCode);
-    else if (javaFile.getParent().endsWith("/method_mult")) actual = methodToKotlin(javaCode);
-
+    else if (javaFile.getParent().endsWith("/method")) actual = methodToKotlin(javaCode);
     else if (javaFile.getParent().endsWith("/class")) actual = classToKotlin(javaCode);
-
     else if (javaFile.getParent().endsWith("/file")) actual = fileToKotlin(javaCode);
 
     assert !actual.equals("");
diff --git a/testData/ast/arrayType/method/methodArrayArgs.kt b/testData/ast/arrayType/method/methodArrayArgs.kt
index 6bd0c42dd8b..b095e2dd099 100644
--- a/testData/ast/arrayType/method/methodArrayArgs.kt
+++ b/testData/ast/arrayType/method/methodArrayArgs.kt
@@ -1 +1,2 @@
-fun fromArrayToCollection(a : Array<Foo?>?) : Unit { }
\ No newline at end of file
+fun fromArrayToCollection(a : Array<Foo?>?) : Unit {
+}
\ No newline at end of file
diff --git a/testData/ast/function/method/classGenericParam.kt b/testData/ast/function/method/classGenericParam.kt
index 7f936986c02..b9ea1d49799 100644
--- a/testData/ast/function/method/classGenericParam.kt
+++ b/testData/ast/function/method/classGenericParam.kt
@@ -1 +1,2 @@
-fun getT() : T? { }
\ No newline at end of file
+fun getT() : T? {
+}
\ No newline at end of file
diff --git a/testData/ast/function/method/emptyVoidMethod.kt b/testData/ast/function/method/emptyVoidMethod.kt
index 93eff2fa681..ae299eb173a 100644
--- a/testData/ast/function/method/emptyVoidMethod.kt
+++ b/testData/ast/function/method/emptyVoidMethod.kt
@@ -1 +1,2 @@
-fun main() : Unit { }
\ No newline at end of file
+fun main() : Unit {
+}
\ No newline at end of file
diff --git a/testData/ast/function/method/internal.kt b/testData/ast/function/method/internal.kt
index 8155b96fa2f..5b3e9634f3f 100644
--- a/testData/ast/function/method/internal.kt
+++ b/testData/ast/function/method/internal.kt
@@ -1 +1,2 @@
-fun test() : Unit { }
\ No newline at end of file
+fun test() : Unit {
+}
\ No newline at end of file
diff --git a/testData/ast/function/method/methodClassType.kt b/testData/ast/function/method/methodClassType.kt
index a501cae6c7c..196c45b6bf8 100644
--- a/testData/ast/function/method/methodClassType.kt
+++ b/testData/ast/function/method/methodClassType.kt
@@ -1 +1,2 @@
-fun main() : String? { }
\ No newline at end of file
+fun main() : String? {
+}
\ No newline at end of file
diff --git a/testData/ast/function/method/methodPrimitiveType.kt b/testData/ast/function/method/methodPrimitiveType.kt
index ee968dfc778..c6ef43f8a14 100644
--- a/testData/ast/function/method/methodPrimitiveType.kt
+++ b/testData/ast/function/method/methodPrimitiveType.kt
@@ -1 +1,2 @@
-fun main() : Int { }
\ No newline at end of file
+fun main() : Int {
+}
\ No newline at end of file
diff --git a/testData/ast/function/method/methodPrimitiveType2.kt b/testData/ast/function/method/methodPrimitiveType2.kt
index 30327d5bfd0..c978e93e7aa 100644
--- a/testData/ast/function/method/methodPrimitiveType2.kt
+++ b/testData/ast/function/method/methodPrimitiveType2.kt
@@ -1 +1,2 @@
-fun main() : Boolean { }
\ No newline at end of file
+fun main() : Boolean {
+}
\ No newline at end of file
diff --git a/testData/ast/function/method/methodWithReturnStatement.kt b/testData/ast/function/method/methodWithReturnStatement.kt
index 641bd3e4f6e..acfbd1010d8 100644
--- a/testData/ast/function/method/methodWithReturnStatement.kt
+++ b/testData/ast/function/method/methodWithReturnStatement.kt
@@ -1 +1,3 @@
-fun isTrue() : Boolean { return true }
\ No newline at end of file
+fun isTrue() : Boolean {
+return true
+}
\ No newline at end of file
diff --git a/testData/ast/function/method/ownGenericParam.kt b/testData/ast/function/method/ownGenericParam.kt
index bcc017c4dcc..e5533fdcb5f 100644
--- a/testData/ast/function/method/ownGenericParam.kt
+++ b/testData/ast/function/method/ownGenericParam.kt
@@ -1 +1,2 @@
-fun putU<U>(u : U?) : Unit { }
\ No newline at end of file
+fun putU<U>(u : U?) : Unit {
+}
\ No newline at end of file
diff --git a/testData/ast/function/method/ownSeveralGenericParams.kt b/testData/ast/function/method/ownSeveralGenericParams.kt
index 6fd24774822..19fb6188681 100644
--- a/testData/ast/function/method/ownSeveralGenericParams.kt
+++ b/testData/ast/function/method/ownSeveralGenericParams.kt
@@ -1 +1,2 @@
-fun putUVW<U, V, W>(u : U?, v : V?, w : W?) : Unit { }
\ No newline at end of file
+fun putUVW<U, V, W>(u : U?, v : V?, w : W?) : Unit {
+}
\ No newline at end of file
diff --git a/testData/ast/function/method/private.kt b/testData/ast/function/method/private.kt
index f71b1d7c6c8..45e5e8bab00 100644
--- a/testData/ast/function/method/private.kt
+++ b/testData/ast/function/method/private.kt
@@ -1 +1,2 @@
-private fun test() : Unit { }
\ No newline at end of file
+private fun test() : Unit {
+}
\ No newline at end of file
diff --git a/testData/ast/function/method/protected.kt b/testData/ast/function/method/protected.kt
index e03000581bc..dbbc30b447b 100644
--- a/testData/ast/function/method/protected.kt
+++ b/testData/ast/function/method/protected.kt
@@ -1 +1,2 @@
-protected fun test() : Unit { }
\ No newline at end of file
+protected fun test() : Unit {
+}
\ No newline at end of file
diff --git a/testData/ast/function/method/public.kt b/testData/ast/function/method/public.kt
index 6e8c3855f6c..d835330ec86 100644
--- a/testData/ast/function/method/public.kt
+++ b/testData/ast/function/method/public.kt
@@ -1 +1,2 @@
-public fun test() : Unit { }
\ No newline at end of file
+public fun test() : Unit {
+}
\ No newline at end of file
diff --git a/testData/ast/inProjectionType/method/methodParams.kt b/testData/ast/inProjectionType/method/methodParams.kt
index 8073329f038..6888dcd5c36 100644
--- a/testData/ast/inProjectionType/method/methodParams.kt
+++ b/testData/ast/inProjectionType/method/methodParams.kt
@@ -1 +1,2 @@
-fun popAll(dst : Collection<in E?>?) : Unit { }
\ No newline at end of file
+fun popAll(dst : Collection<in E?>?) : Unit {
+}
\ No newline at end of file
diff --git a/testData/ast/outProjectionType/method/methodParams.kt b/testData/ast/outProjectionType/method/methodParams.kt
index 6117f1d6945..373c01e629f 100644
--- a/testData/ast/outProjectionType/method/methodParams.kt
+++ b/testData/ast/outProjectionType/method/methodParams.kt
@@ -1 +1,2 @@
-fun pushAll(src : Collection<out E?>?) : Unit { }
\ No newline at end of file
+fun pushAll(src : Collection<out E?>?) : Unit {
+}
\ No newline at end of file
diff --git a/testData/ast/starProjectionType/method/methodParams.kt b/testData/ast/starProjectionType/method/methodParams.kt
index 2f5330f87b6..01ea4c15302 100644
--- a/testData/ast/starProjectionType/method/methodParams.kt
+++ b/testData/ast/starProjectionType/method/methodParams.kt
@@ -1 +1,2 @@
-fun wtf(w : Collection<*>?) : Unit { }
\ No newline at end of file
+fun wtf(w : Collection<*>?) : Unit {
+}
\ No newline at end of file
diff --git a/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt b/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt
index 1e9e0b36ed5..21f892b7d8d 100644
--- a/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt
+++ b/testData/ast/typeParameters/method/methodDoubleParametrizationWithTwoBounds.kt
@@ -1 +1,2 @@
-fun max<T : Any?, K : Node?>(coll : Collection<out T?>?) : T? where T : Comparable<in T?>?, K : Collection<in K?>? { }
\ No newline at end of file
+fun max<T : Any?, K : Node?>(coll : Collection<out T?>?) : T? where T : Comparable<in T?>?, K : Collection<in K?>? {
+}
\ No newline at end of file
diff --git a/testData/ast/typeParameters/method/where.kt b/testData/ast/typeParameters/method/where.kt
index fed3c38569d..6a1ccaeeec6 100644
--- a/testData/ast/typeParameters/method/where.kt
+++ b/testData/ast/typeParameters/method/where.kt
@@ -1 +1,2 @@
-fun max<T : Any?>(coll : Collection<out T?>?) : T? where T : Comparable<in T?>? { }
\ No newline at end of file
+fun max<T : Any?>(coll : Collection<out T?>?) : T? where T : Comparable<in T?>? {
+}
\ No newline at end of file
diff --git a/testData/ast/varArg/method/ellipsisTypeSingleParams.kt b/testData/ast/varArg/method/ellipsisTypeSingleParams.kt
index 0456fca4c8f..5219629e1e3 100644
--- a/testData/ast/varArg/method/ellipsisTypeSingleParams.kt
+++ b/testData/ast/varArg/method/ellipsisTypeSingleParams.kt
@@ -1 +1,2 @@
-fun pushAll(vararg objs : Any?) : Unit { }
\ No newline at end of file
+fun pushAll(vararg objs : Any?) : Unit {
+}
\ No newline at end of file