azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

J2K: generating of elvis operators instead of if's

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-03-25 20:35:34 +03:00
parent 0932cb4606
commit 2d4055e921
6 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/testData/fileOrElement/codeSimplifications/IfToElvis.java
+5
View File
@@ -0,0 +1,5 @@
class C {
String foo(String s) {
return s != null ? s : "";
}
}
j2k/testData/fileOrElement/codeSimplifications/IfToElvis.kt
+5
View File
@@ -0,0 +1,5 @@
class C {
fun foo(s: String?): String {
return s ?: ""
}
}
j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java
+6
View File
@@ -982,6 +982,12 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/codeSimplifications"), Pattern.compile("^(.+)\\.java$"), true);
}
@TestMetadata("IfToElvis.java")
public void testIfToElvis() throws Exception {
String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/IfToElvis.java");
doTest(fileName);
}
@TestMetadata("IfToSafeCall.java")
public void testIfToSafeCall() throws Exception {
String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.java");
j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java
+6
View File
@@ -982,6 +982,12 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/codeSimplifications"), Pattern.compile("^(.+)\\.java$"), true);
}
@TestMetadata("IfToElvis.java")
public void testIfToElvis() throws Exception {
String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/IfToElvis.java");
doTest(fileName);
}
@TestMetadata("IfToSafeCall.java")
public void testIfToSafeCall() throws Exception {
String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.java");