J2K converter applies IfNullToElvisIntention automatically

2015-04-29 17:10:04 +03:00
parent 38f735dcac
commit 7d6145e105
6 changed files with 45 additions and 4 deletions
@@ -0,0 +1,9 @@
+import java.io.File;
+
+class C {
+    String foo(File file) {
+        File parent = file.getParentFile();
+        if (parent == null) return "";
+        return parent.getName();
+    }
+}
@@ -0,0 +1,8 @@
+import java.io.File
+
+class C {
+    fun foo(file: File): String {
+        val parent = file.getParentFile() ?: return ""
+        return parent.getName()
+    }
+}
@@ -937,6 +937,12 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo
            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/codeSimplifications"), Pattern.compile("^(.+)\\.java$"), true);
        }

+        @TestMetadata("IfNullReturnToElvis.java")
+        public void testIfNullReturnToElvis() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/IfNullReturnToElvis.java");
+            doTest(fileName);
+        }
+
        @TestMetadata("IfToElvis.java")
        public void testIfToElvis() throws Exception {
            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/IfToElvis.java");
@@ -937,6 +937,12 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo
            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/codeSimplifications"), Pattern.compile("^(.+)\\.java$"), true);
        }

+        @TestMetadata("IfNullReturnToElvis.java")
+        public void testIfNullReturnToElvis() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/IfNullReturnToElvis.java");
+            doTest(fileName);
+        }
+
        @TestMetadata("IfToElvis.java")
        public void testIfToElvis() throws Exception {
            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/IfToElvis.java");