J2K: minor fix

j2k/src/org/jetbrains/jet/j2k/visitors/SpecialMethod.kt

@@ -69,12 +69,12 @@ enum class SpecialMethod(val qualifiedClassName: String?, val methodName: String
 
     COLLECTIONS_SINGLETON_LIST: SpecialMethod("java.util.Collections", "singletonList", 1) {
         override fun convertCall(qualifier: PsiExpression?, arguments: Array<PsiExpression>, typeArgumentsConverted: List<Type>, converter: Converter)
-                = MethodCallExpression.build(null, "listOf", listOf(converter.convertExpression(arguments.single())), listOf(), false)
+                = MethodCallExpression.build(null, "listOf", listOf(converter.convertExpression(arguments.single())), typeArgumentsConverted, false)
     }
 
     COLLECTIONS_SINGLETON: SpecialMethod("java.util.Collections", "singleton", 1) {
         override fun convertCall(qualifier: PsiExpression?, arguments: Array<PsiExpression>, typeArgumentsConverted: List<Type>, converter: Converter)
-                = MethodCallExpression.build(null, "setOf", listOf(converter.convertExpression(arguments.single())), listOf(), false)
+                = MethodCallExpression.build(null, "setOf", listOf(converter.convertExpression(arguments.single())), typeArgumentsConverted, false)
     }
 
     open fun matches(method: PsiMethod): Boolean {

j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterTestGenerated.java

@@ -17,13 +17,10 @@
 package org.jetbrains.jet.j2k.test;
 
 import com.intellij.testFramework.TestDataPath;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.junit.runner.RunWith;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.test.InnerTestClasses;
 import org.jetbrains.jet.test.TestMetadata;
-import org.jetbrains.jet.JUnit3RunnerWithInners;
+import org.junit.runner.RunWith;
 
 import java.io.File;
 import java.util.regex.Pattern;
@@ -2585,6 +2582,12 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
             doTest(fileName);
         }
         
+        @TestMetadata("collectionsMethods2.java")
+        public void testCollectionsMethods2() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/collectionsMethods2.java");
+            doTest(fileName);
+        }
+        
         @TestMetadata("emptyCall.java")
         public void testEmptyCall() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/emptyCall.java");

j2k/tests/testData/ast/methodCallExpression/collectionsMethods.java

@@ -1,4 +1,3 @@
-//file
 import java.util.*;
 
 class A {

j2k/tests/testData/ast/methodCallExpression/collectionsMethods2.java

@@ -0,0 +1,8 @@
+import java.util.*;
+
+class A {
+    void foo() {
+        List<String> list = Collections.singletonList(null);
+        Set<String> set = Collections.singleton(null);
+    }
+}

j2k/tests/testData/ast/methodCallExpression/collectionsMethods2.kt

@@ -0,0 +1,8 @@
+import java.util.*
+
+class A {
+    fun foo() {
+        val list = listOf<String>(null)
+        val set = setOf<String>(null)
+    }
+}