From 4e73fe0f39a4afc7157359fcfbbdc238cb9d035a Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Fri, 16 Oct 2015 22:47:30 +0300 Subject: [PATCH] Renamed test data folder --- .../GetOperator.java | 0 .../GetOperator.kt | 0 .../IfNullReturnToElvis.java | 0 .../IfNullReturnToElvis.kt | 0 .../IfToElvis.java | 0 .../IfToElvis.kt | 0 .../IfToSafeCall.java | 0 .../IfToSafeCall.kt | 0 .../NotIs.java | 0 .../NotIs.kt | 0 .../RedundantTypeCast.java | 0 .../RedundantTypeCast.kt | 0 .../RedundantTypeCastAndInline.java | 0 .../RedundantTypeCastAndInline.kt | 0 .../SyntheticExtensionPropertyAccess.java | 0 .../SyntheticExtensionPropertyAccess.kt | 0 ...otlinConverterForWebDemoTestGenerated.java | 114 +++++++++--------- ...otlinConverterSingleFileTestGenerated.java | 114 +++++++++--------- 18 files changed, 114 insertions(+), 114 deletions(-) rename j2k/testData/fileOrElement/{codeSimplifications => postProcessing}/GetOperator.java (100%) rename j2k/testData/fileOrElement/{codeSimplifications => postProcessing}/GetOperator.kt (100%) rename j2k/testData/fileOrElement/{codeSimplifications => postProcessing}/IfNullReturnToElvis.java (100%) rename j2k/testData/fileOrElement/{codeSimplifications => postProcessing}/IfNullReturnToElvis.kt (100%) rename j2k/testData/fileOrElement/{codeSimplifications => postProcessing}/IfToElvis.java (100%) rename j2k/testData/fileOrElement/{codeSimplifications => postProcessing}/IfToElvis.kt (100%) rename j2k/testData/fileOrElement/{codeSimplifications => postProcessing}/IfToSafeCall.java (100%) rename j2k/testData/fileOrElement/{codeSimplifications => postProcessing}/IfToSafeCall.kt (100%) rename j2k/testData/fileOrElement/{codeSimplifications => postProcessing}/NotIs.java (100%) rename j2k/testData/fileOrElement/{codeSimplifications => postProcessing}/NotIs.kt (100%) rename j2k/testData/fileOrElement/{codeSimplifications => postProcessing}/RedundantTypeCast.java (100%) rename j2k/testData/fileOrElement/{codeSimplifications => postProcessing}/RedundantTypeCast.kt (100%) rename j2k/testData/fileOrElement/{codeSimplifications => postProcessing}/RedundantTypeCastAndInline.java (100%) rename j2k/testData/fileOrElement/{codeSimplifications => postProcessing}/RedundantTypeCastAndInline.kt (100%) rename j2k/testData/fileOrElement/{codeSimplifications => postProcessing}/SyntheticExtensionPropertyAccess.java (100%) rename j2k/testData/fileOrElement/{codeSimplifications => postProcessing}/SyntheticExtensionPropertyAccess.kt (100%) diff --git a/j2k/testData/fileOrElement/codeSimplifications/GetOperator.java b/j2k/testData/fileOrElement/postProcessing/GetOperator.java similarity index 100% rename from j2k/testData/fileOrElement/codeSimplifications/GetOperator.java rename to j2k/testData/fileOrElement/postProcessing/GetOperator.java diff --git a/j2k/testData/fileOrElement/codeSimplifications/GetOperator.kt b/j2k/testData/fileOrElement/postProcessing/GetOperator.kt similarity index 100% rename from j2k/testData/fileOrElement/codeSimplifications/GetOperator.kt rename to j2k/testData/fileOrElement/postProcessing/GetOperator.kt diff --git a/j2k/testData/fileOrElement/codeSimplifications/IfNullReturnToElvis.java b/j2k/testData/fileOrElement/postProcessing/IfNullReturnToElvis.java similarity index 100% rename from j2k/testData/fileOrElement/codeSimplifications/IfNullReturnToElvis.java rename to j2k/testData/fileOrElement/postProcessing/IfNullReturnToElvis.java diff --git a/j2k/testData/fileOrElement/codeSimplifications/IfNullReturnToElvis.kt b/j2k/testData/fileOrElement/postProcessing/IfNullReturnToElvis.kt similarity index 100% rename from j2k/testData/fileOrElement/codeSimplifications/IfNullReturnToElvis.kt rename to j2k/testData/fileOrElement/postProcessing/IfNullReturnToElvis.kt diff --git a/j2k/testData/fileOrElement/codeSimplifications/IfToElvis.java b/j2k/testData/fileOrElement/postProcessing/IfToElvis.java similarity index 100% rename from j2k/testData/fileOrElement/codeSimplifications/IfToElvis.java rename to j2k/testData/fileOrElement/postProcessing/IfToElvis.java diff --git a/j2k/testData/fileOrElement/codeSimplifications/IfToElvis.kt b/j2k/testData/fileOrElement/postProcessing/IfToElvis.kt similarity index 100% rename from j2k/testData/fileOrElement/codeSimplifications/IfToElvis.kt rename to j2k/testData/fileOrElement/postProcessing/IfToElvis.kt diff --git a/j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.java b/j2k/testData/fileOrElement/postProcessing/IfToSafeCall.java similarity index 100% rename from j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.java rename to j2k/testData/fileOrElement/postProcessing/IfToSafeCall.java diff --git a/j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.kt b/j2k/testData/fileOrElement/postProcessing/IfToSafeCall.kt similarity index 100% rename from j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.kt rename to j2k/testData/fileOrElement/postProcessing/IfToSafeCall.kt diff --git a/j2k/testData/fileOrElement/codeSimplifications/NotIs.java b/j2k/testData/fileOrElement/postProcessing/NotIs.java similarity index 100% rename from j2k/testData/fileOrElement/codeSimplifications/NotIs.java rename to j2k/testData/fileOrElement/postProcessing/NotIs.java diff --git a/j2k/testData/fileOrElement/codeSimplifications/NotIs.kt b/j2k/testData/fileOrElement/postProcessing/NotIs.kt similarity index 100% rename from j2k/testData/fileOrElement/codeSimplifications/NotIs.kt rename to j2k/testData/fileOrElement/postProcessing/NotIs.kt diff --git a/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.java b/j2k/testData/fileOrElement/postProcessing/RedundantTypeCast.java similarity index 100% rename from j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.java rename to j2k/testData/fileOrElement/postProcessing/RedundantTypeCast.java diff --git a/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.kt b/j2k/testData/fileOrElement/postProcessing/RedundantTypeCast.kt similarity index 100% rename from j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.kt rename to j2k/testData/fileOrElement/postProcessing/RedundantTypeCast.kt diff --git a/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCastAndInline.java b/j2k/testData/fileOrElement/postProcessing/RedundantTypeCastAndInline.java similarity index 100% rename from j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCastAndInline.java rename to j2k/testData/fileOrElement/postProcessing/RedundantTypeCastAndInline.java diff --git a/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCastAndInline.kt b/j2k/testData/fileOrElement/postProcessing/RedundantTypeCastAndInline.kt similarity index 100% rename from j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCastAndInline.kt rename to j2k/testData/fileOrElement/postProcessing/RedundantTypeCastAndInline.kt diff --git a/j2k/testData/fileOrElement/codeSimplifications/SyntheticExtensionPropertyAccess.java b/j2k/testData/fileOrElement/postProcessing/SyntheticExtensionPropertyAccess.java similarity index 100% rename from j2k/testData/fileOrElement/codeSimplifications/SyntheticExtensionPropertyAccess.java rename to j2k/testData/fileOrElement/postProcessing/SyntheticExtensionPropertyAccess.java diff --git a/j2k/testData/fileOrElement/codeSimplifications/SyntheticExtensionPropertyAccess.kt b/j2k/testData/fileOrElement/postProcessing/SyntheticExtensionPropertyAccess.kt similarity index 100% rename from j2k/testData/fileOrElement/codeSimplifications/SyntheticExtensionPropertyAccess.kt rename to j2k/testData/fileOrElement/postProcessing/SyntheticExtensionPropertyAccess.kt diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java index 2966cad1541..c1571c3a83a 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java +++ b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java @@ -947,63 +947,6 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo } } - @TestMetadata("j2k/testData/fileOrElement/codeSimplifications") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class CodeSimplifications extends AbstractJavaToKotlinConverterForWebDemoTest { - public void testAllFilesPresentInCodeSimplifications() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/codeSimplifications"), Pattern.compile("^(.+)\\.java$"), true); - } - - @TestMetadata("GetOperator.java") - public void testGetOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/GetOperator.java"); - doTest(fileName); - } - - @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"); - doTest(fileName); - } - - @TestMetadata("IfToSafeCall.java") - public void testIfToSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.java"); - doTest(fileName); - } - - @TestMetadata("NotIs.java") - public void testNotIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/NotIs.java"); - doTest(fileName); - } - - @TestMetadata("RedundantTypeCast.java") - public void testRedundantTypeCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.java"); - doTest(fileName); - } - - @TestMetadata("RedundantTypeCastAndInline.java") - public void testRedundantTypeCastAndInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCastAndInline.java"); - doTest(fileName); - } - - @TestMetadata("SyntheticExtensionPropertyAccess.java") - public void testSyntheticExtensionPropertyAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/SyntheticExtensionPropertyAccess.java"); - doTest(fileName); - } - } - @TestMetadata("j2k/testData/fileOrElement/comments") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -3704,6 +3647,63 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo } } + @TestMetadata("j2k/testData/fileOrElement/postProcessing") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class PostProcessing extends AbstractJavaToKotlinConverterForWebDemoTest { + public void testAllFilesPresentInPostProcessing() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/postProcessing"), Pattern.compile("^(.+)\\.java$"), true); + } + + @TestMetadata("GetOperator.java") + public void testGetOperator() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/GetOperator.java"); + doTest(fileName); + } + + @TestMetadata("IfNullReturnToElvis.java") + public void testIfNullReturnToElvis() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/IfNullReturnToElvis.java"); + doTest(fileName); + } + + @TestMetadata("IfToElvis.java") + public void testIfToElvis() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/IfToElvis.java"); + doTest(fileName); + } + + @TestMetadata("IfToSafeCall.java") + public void testIfToSafeCall() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/IfToSafeCall.java"); + doTest(fileName); + } + + @TestMetadata("NotIs.java") + public void testNotIs() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/NotIs.java"); + doTest(fileName); + } + + @TestMetadata("RedundantTypeCast.java") + public void testRedundantTypeCast() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/RedundantTypeCast.java"); + doTest(fileName); + } + + @TestMetadata("RedundantTypeCastAndInline.java") + public void testRedundantTypeCastAndInline() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/RedundantTypeCastAndInline.java"); + doTest(fileName); + } + + @TestMetadata("SyntheticExtensionPropertyAccess.java") + public void testSyntheticExtensionPropertyAccess() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/SyntheticExtensionPropertyAccess.java"); + doTest(fileName); + } + } + @TestMetadata("j2k/testData/fileOrElement/postfixOperator") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java index fa39edeffb1..a101e4e6af0 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java +++ b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java @@ -947,63 +947,6 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo } } - @TestMetadata("j2k/testData/fileOrElement/codeSimplifications") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class CodeSimplifications extends AbstractJavaToKotlinConverterSingleFileTest { - public void testAllFilesPresentInCodeSimplifications() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/codeSimplifications"), Pattern.compile("^(.+)\\.java$"), true); - } - - @TestMetadata("GetOperator.java") - public void testGetOperator() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/GetOperator.java"); - doTest(fileName); - } - - @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"); - doTest(fileName); - } - - @TestMetadata("IfToSafeCall.java") - public void testIfToSafeCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.java"); - doTest(fileName); - } - - @TestMetadata("NotIs.java") - public void testNotIs() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/NotIs.java"); - doTest(fileName); - } - - @TestMetadata("RedundantTypeCast.java") - public void testRedundantTypeCast() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.java"); - doTest(fileName); - } - - @TestMetadata("RedundantTypeCastAndInline.java") - public void testRedundantTypeCastAndInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCastAndInline.java"); - doTest(fileName); - } - - @TestMetadata("SyntheticExtensionPropertyAccess.java") - public void testSyntheticExtensionPropertyAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/SyntheticExtensionPropertyAccess.java"); - doTest(fileName); - } - } - @TestMetadata("j2k/testData/fileOrElement/comments") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -3704,6 +3647,63 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo } } + @TestMetadata("j2k/testData/fileOrElement/postProcessing") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class PostProcessing extends AbstractJavaToKotlinConverterSingleFileTest { + public void testAllFilesPresentInPostProcessing() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/postProcessing"), Pattern.compile("^(.+)\\.java$"), true); + } + + @TestMetadata("GetOperator.java") + public void testGetOperator() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/GetOperator.java"); + doTest(fileName); + } + + @TestMetadata("IfNullReturnToElvis.java") + public void testIfNullReturnToElvis() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/IfNullReturnToElvis.java"); + doTest(fileName); + } + + @TestMetadata("IfToElvis.java") + public void testIfToElvis() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/IfToElvis.java"); + doTest(fileName); + } + + @TestMetadata("IfToSafeCall.java") + public void testIfToSafeCall() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/IfToSafeCall.java"); + doTest(fileName); + } + + @TestMetadata("NotIs.java") + public void testNotIs() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/NotIs.java"); + doTest(fileName); + } + + @TestMetadata("RedundantTypeCast.java") + public void testRedundantTypeCast() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/RedundantTypeCast.java"); + doTest(fileName); + } + + @TestMetadata("RedundantTypeCastAndInline.java") + public void testRedundantTypeCastAndInline() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/RedundantTypeCastAndInline.java"); + doTest(fileName); + } + + @TestMetadata("SyntheticExtensionPropertyAccess.java") + public void testSyntheticExtensionPropertyAccess() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/SyntheticExtensionPropertyAccess.java"); + doTest(fileName); + } + } + @TestMetadata("j2k/testData/fileOrElement/postfixOperator") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)