From b4e71bb0b63f61847b613ea155960975dc0a2373 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sat, 3 Jan 2015 04:22:01 +0300 Subject: [PATCH] Minor, rename package in some j2k tests --- .../fileOrElement/importStatement/importWithStar.java | 2 +- .../fileOrElement/importStatement/importWithStar.kt | 4 ++-- .../fileOrElement/importStatement/simpleImport.java | 4 ++-- j2k/testData/fileOrElement/importStatement/simpleImport.kt | 4 ++-- ...{orgJetbrainsJetJ2kIn.java => keywordInPackageName.java} | 4 ++-- .../fileOrElement/packageStatement/keywordInPackageName.kt | 3 +++ .../fileOrElement/packageStatement/orgJetbrainsJetJ2kIn.kt | 3 --- .../j2k/JavaToKotlinConverterForWebDemoTestGenerated.java | 6 +++--- .../j2k/JavaToKotlinConverterSingleFileTestGenerated.java | 6 +++--- 9 files changed, 18 insertions(+), 18 deletions(-) rename j2k/testData/fileOrElement/packageStatement/{orgJetbrainsJetJ2kIn.java => keywordInPackageName.java} (61%) create mode 100644 j2k/testData/fileOrElement/packageStatement/keywordInPackageName.kt delete mode 100644 j2k/testData/fileOrElement/packageStatement/orgJetbrainsJetJ2kIn.kt diff --git a/j2k/testData/fileOrElement/importStatement/importWithStar.java b/j2k/testData/fileOrElement/importStatement/importWithStar.java index 41455c1be6c..0540a560ea2 100644 --- a/j2k/testData/fileOrElement/importStatement/importWithStar.java +++ b/j2k/testData/fileOrElement/importStatement/importWithStar.java @@ -1,5 +1,5 @@ //file -package org.jetbrains.jet.j2k; +package test.j2k; import org.jetbrains.annotations.*; diff --git a/j2k/testData/fileOrElement/importStatement/importWithStar.kt b/j2k/testData/fileOrElement/importStatement/importWithStar.kt index 86ac68c0e36..fc3e21ec12d 100644 --- a/j2k/testData/fileOrElement/importStatement/importWithStar.kt +++ b/j2k/testData/fileOrElement/importStatement/importWithStar.kt @@ -1,5 +1,5 @@ -package org.jetbrains.jet.j2k +package test.j2k import org.jetbrains.annotations.* -public class Converter \ No newline at end of file +public class Converter diff --git a/j2k/testData/fileOrElement/importStatement/simpleImport.java b/j2k/testData/fileOrElement/importStatement/simpleImport.java index 5cd35650f21..67e4b3b5ef6 100644 --- a/j2k/testData/fileOrElement/importStatement/simpleImport.java +++ b/j2k/testData/fileOrElement/importStatement/simpleImport.java @@ -1,6 +1,6 @@ //file -package org.jetbrains.jet.j2k; +package test.j2k; import org.jetbrains.annotations.NotNull; -public class Converter {} \ No newline at end of file +public class Converter {} diff --git a/j2k/testData/fileOrElement/importStatement/simpleImport.kt b/j2k/testData/fileOrElement/importStatement/simpleImport.kt index 31d5b6d7e72..6b3c5f27850 100644 --- a/j2k/testData/fileOrElement/importStatement/simpleImport.kt +++ b/j2k/testData/fileOrElement/importStatement/simpleImport.kt @@ -1,3 +1,3 @@ -package org.jetbrains.jet.j2k +package test.j2k -public class Converter \ No newline at end of file +public class Converter diff --git a/j2k/testData/fileOrElement/packageStatement/orgJetbrainsJetJ2kIn.java b/j2k/testData/fileOrElement/packageStatement/keywordInPackageName.java similarity index 61% rename from j2k/testData/fileOrElement/packageStatement/orgJetbrainsJetJ2kIn.java rename to j2k/testData/fileOrElement/packageStatement/keywordInPackageName.java index 679b96e6327..253878f98a0 100644 --- a/j2k/testData/fileOrElement/packageStatement/orgJetbrainsJetJ2kIn.java +++ b/j2k/testData/fileOrElement/packageStatement/keywordInPackageName.java @@ -1,7 +1,7 @@ //file -package org.jetbrains.jet.j2k.in; +package test.j2k.in; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public class Converter {} \ No newline at end of file +public class Converter {} diff --git a/j2k/testData/fileOrElement/packageStatement/keywordInPackageName.kt b/j2k/testData/fileOrElement/packageStatement/keywordInPackageName.kt new file mode 100644 index 00000000000..a205d648201 --- /dev/null +++ b/j2k/testData/fileOrElement/packageStatement/keywordInPackageName.kt @@ -0,0 +1,3 @@ +package test.j2k.`in` + +public class Converter diff --git a/j2k/testData/fileOrElement/packageStatement/orgJetbrainsJetJ2kIn.kt b/j2k/testData/fileOrElement/packageStatement/orgJetbrainsJetJ2kIn.kt deleted file mode 100644 index a789c877b1d..00000000000 --- a/j2k/testData/fileOrElement/packageStatement/orgJetbrainsJetJ2kIn.kt +++ /dev/null @@ -1,3 +0,0 @@ -package org.jetbrains.jet.j2k.`in` - -public class Converter \ No newline at end of file diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java index 534e68abc72..5454cdba9f3 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java +++ b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java @@ -3144,9 +3144,9 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/packageStatement"), Pattern.compile("^(.+)\\.java$"), true); } - @TestMetadata("orgJetbrainsJetJ2kIn.java") - public void testOrgJetbrainsJetJ2kIn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/packageStatement/orgJetbrainsJetJ2kIn.java"); + @TestMetadata("keywordInPackageName.java") + public void testKeywordInPackageName() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/packageStatement/keywordInPackageName.java"); doTest(fileName); } } diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java index 335056263c4..dd0ab94456a 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java +++ b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java @@ -3144,9 +3144,9 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/packageStatement"), Pattern.compile("^(.+)\\.java$"), true); } - @TestMetadata("orgJetbrainsJetJ2kIn.java") - public void testOrgJetbrainsJetJ2kIn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/packageStatement/orgJetbrainsJetJ2kIn.java"); + @TestMetadata("keywordInPackageName.java") + public void testKeywordInPackageName() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/packageStatement/keywordInPackageName.java"); doTest(fileName); } }