From 1464d1f7ad0f031aeab1b37fb619e200ddf1c007 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 19 Dec 2013 17:30:18 +0400 Subject: [PATCH] Conversion on copy paste: Introduce tests for conversion on copy paste Don't insert additional end of line after each converted element (not needed since converter takes care of formatting) Add test for some of the trivial cases of conversion on copy paste --- .../jet/generators/tests/GenerateTests.kt | 5 ++ .../copy/JavaCopyPastePostProcessor.java | 6 +- .../conversion/Constructor.expected.kt | 3 + .../copyPaste/conversion/Constructor.java | 5 ++ .../copyPaste/conversion/Constructor.to.kt | 3 + .../copyPaste/conversion/Imports1.expected.kt | 6 ++ .../copyPaste/conversion/Imports1.java | 4 ++ .../copyPaste/conversion/Imports1.to.kt | 5 ++ .../copyPaste/conversion/Imports2.expected.kt | 5 ++ .../copyPaste/conversion/Imports2.java | 4 ++ .../copyPaste/conversion/Imports2.to.kt | 5 ++ .../conversion/SampleBlock.expected.kt | 13 ++++ .../copyPaste/conversion/SampleBlock.java | 14 ++++ .../copyPaste/conversion/SampleBlock.to.kt | 3 + .../SeveralMethodsSample.expected.kt | 39 +++++++++++ .../conversion/SeveralMethodsSample.java | 40 ++++++++++++ .../conversion/SeveralMethodsSample.to.kt | 5 ++ ...ctJavaToKotlinCopyPasteConversionTest.java | 52 +++++++++++++++ ...otlinCopyPasteConversionTestGenerated.java | 64 +++++++++++++++++++ 19 files changed, 277 insertions(+), 4 deletions(-) create mode 100644 idea/testData/copyPaste/conversion/Constructor.expected.kt create mode 100644 idea/testData/copyPaste/conversion/Constructor.java create mode 100644 idea/testData/copyPaste/conversion/Constructor.to.kt create mode 100644 idea/testData/copyPaste/conversion/Imports1.expected.kt create mode 100644 idea/testData/copyPaste/conversion/Imports1.java create mode 100644 idea/testData/copyPaste/conversion/Imports1.to.kt create mode 100644 idea/testData/copyPaste/conversion/Imports2.expected.kt create mode 100644 idea/testData/copyPaste/conversion/Imports2.java create mode 100644 idea/testData/copyPaste/conversion/Imports2.to.kt create mode 100644 idea/testData/copyPaste/conversion/SampleBlock.expected.kt create mode 100644 idea/testData/copyPaste/conversion/SampleBlock.java create mode 100644 idea/testData/copyPaste/conversion/SampleBlock.to.kt create mode 100644 idea/testData/copyPaste/conversion/SeveralMethodsSample.expected.kt create mode 100644 idea/testData/copyPaste/conversion/SeveralMethodsSample.java create mode 100644 idea/testData/copyPaste/conversion/SeveralMethodsSample.to.kt create mode 100644 idea/tests/org/jetbrains/jet/plugin/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.java create mode 100644 idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java diff --git a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt index 0009186c14b..5e895fe41e2 100644 --- a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt @@ -80,6 +80,7 @@ import org.jetbrains.jet.generators.tests.generator.SingleClassTestModel import org.jetbrains.jet.generators.tests.generator.TestClassModel import org.jetbrains.jet.j2k.test.AbstractJavaToKotlinConverterPluginTest import org.jetbrains.jet.j2k.test.AbstractJavaToKotlinConverterBasicTest +import org.jetbrains.jet.plugin.conversion.copy.AbstractJavaToKotlinCopyPasteConversionTest fun main(args: Array) { System.setProperty("java.awt.headless", "true") @@ -414,6 +415,10 @@ fun main(args: Array) { testClass(javaClass()) { model("dataFlowValueRendering") } + + testClass(javaClass()) { + model("copyPaste/conversion", extension = "java") + } } testGroup("j2k/tests/test", "j2k/tests/testData") { diff --git a/idea/src/org/jetbrains/jet/plugin/conversion/copy/JavaCopyPastePostProcessor.java b/idea/src/org/jetbrains/jet/plugin/conversion/copy/JavaCopyPastePostProcessor.java index 4bdb7609757..44912454511 100644 --- a/idea/src/org/jetbrains/jet/plugin/conversion/copy/JavaCopyPastePostProcessor.java +++ b/idea/src/org/jetbrains/jet/plugin/conversion/copy/JavaCopyPastePostProcessor.java @@ -115,12 +115,10 @@ public class JavaCopyPastePostProcessor implements CopyPastePostProcessor buffer = getSelectedElements(code.getFile(), code.getStartOffsets(), code.getEndOffsets()); Project project = file.getProject(); + Converter converter = new Converter(project, J2kPackage.getPluginSettings()); StringBuilder result = new StringBuilder(); for (PsiElement e : buffer) { - String converted = new Converter(project, J2kPackage.getPluginSettings()).elementToKotlin(e); - if (!converted.isEmpty()) { - result.append(converted).append(EOL); - } + result.append(converter.elementToKotlin(e)); } return StringUtil.convertLineSeparators(result.toString()); diff --git a/idea/testData/copyPaste/conversion/Constructor.expected.kt b/idea/testData/copyPaste/conversion/Constructor.expected.kt new file mode 100644 index 00000000000..6a788f7b5ed --- /dev/null +++ b/idea/testData/copyPaste/conversion/Constructor.expected.kt @@ -0,0 +1,3 @@ +fun main(args: Array) { + A() +} \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/Constructor.java b/idea/testData/copyPaste/conversion/Constructor.java new file mode 100644 index 00000000000..eb3be809e31 --- /dev/null +++ b/idea/testData/copyPaste/conversion/Constructor.java @@ -0,0 +1,5 @@ +class A { + public static void main(String[] args) { + new A(); + } +} \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/Constructor.to.kt b/idea/testData/copyPaste/conversion/Constructor.to.kt new file mode 100644 index 00000000000..0b0e220a256 --- /dev/null +++ b/idea/testData/copyPaste/conversion/Constructor.to.kt @@ -0,0 +1,3 @@ +fun main(args: Array) { + +} \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/Imports1.expected.kt b/idea/testData/copyPaste/conversion/Imports1.expected.kt new file mode 100644 index 00000000000..05e7af58fe9 --- /dev/null +++ b/idea/testData/copyPaste/conversion/Imports1.expected.kt @@ -0,0 +1,6 @@ +import a.b.c +import g.e.v + +fun main(args: Array) { + +} \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/Imports1.java b/idea/testData/copyPaste/conversion/Imports1.java new file mode 100644 index 00000000000..b9d2d907dba --- /dev/null +++ b/idea/testData/copyPaste/conversion/Imports1.java @@ -0,0 +1,4 @@ +import java.util.List; +import a.b.c; +import java.util.Set; +import g.e.v; \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/Imports1.to.kt b/idea/testData/copyPaste/conversion/Imports1.to.kt new file mode 100644 index 00000000000..d4cdba3449f --- /dev/null +++ b/idea/testData/copyPaste/conversion/Imports1.to.kt @@ -0,0 +1,5 @@ + + +fun main(args: Array) { + +} \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/Imports2.expected.kt b/idea/testData/copyPaste/conversion/Imports2.expected.kt new file mode 100644 index 00000000000..e62da09fc0d --- /dev/null +++ b/idea/testData/copyPaste/conversion/Imports2.expected.kt @@ -0,0 +1,5 @@ +import java.util.List + +fun main(args: Array) { + +} \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/Imports2.java b/idea/testData/copyPaste/conversion/Imports2.java new file mode 100644 index 00000000000..01904c6e7d6 --- /dev/null +++ b/idea/testData/copyPaste/conversion/Imports2.java @@ -0,0 +1,4 @@ +import java.util.List; +import a.b.c; +import java.util.Set; +import g.e.v; \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/Imports2.to.kt b/idea/testData/copyPaste/conversion/Imports2.to.kt new file mode 100644 index 00000000000..d4cdba3449f --- /dev/null +++ b/idea/testData/copyPaste/conversion/Imports2.to.kt @@ -0,0 +1,5 @@ + + +fun main(args: Array) { + +} \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/SampleBlock.expected.kt b/idea/testData/copyPaste/conversion/SampleBlock.expected.kt new file mode 100644 index 00000000000..033285675a7 --- /dev/null +++ b/idea/testData/copyPaste/conversion/SampleBlock.expected.kt @@ -0,0 +1,13 @@ +fun main(args: Array) { + val buffer = getSelectedElements(code.getFile(), code.getStartOffsets(), code.getEndOffsets()) + + val project = file.getProject() + val converter = Converter(project, J2kPackage.getPluginSettings()) + val result = StringBuilder() + for (e in buffer) + { + result.append(converter.elementToKotlin(e)) + } + + return StringUtil.convertLineSeparators(result.toString()) +} \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/SampleBlock.java b/idea/testData/copyPaste/conversion/SampleBlock.java new file mode 100644 index 00000000000..69382d59081 --- /dev/null +++ b/idea/testData/copyPaste/conversion/SampleBlock.java @@ -0,0 +1,14 @@ +class A { + private static String convertCopiedCodeToKotlin(CopiedCode code, PsiFile file) { + List buffer = getSelectedElements(code.getFile(), code.getStartOffsets(), code.getEndOffsets()); + + Project project = file.getProject(); + Converter converter = new Converter(project, J2kPackage.getPluginSettings()); + StringBuilder result = new StringBuilder(); + for (PsiElement e : buffer) { + result.append(converter.elementToKotlin(e)); + } + + return StringUtil.convertLineSeparators(result.toString()); + } +} \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/SampleBlock.to.kt b/idea/testData/copyPaste/conversion/SampleBlock.to.kt new file mode 100644 index 00000000000..0b0e220a256 --- /dev/null +++ b/idea/testData/copyPaste/conversion/SampleBlock.to.kt @@ -0,0 +1,3 @@ +fun main(args: Array) { + +} \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/SeveralMethodsSample.expected.kt b/idea/testData/copyPaste/conversion/SeveralMethodsSample.expected.kt new file mode 100644 index 00000000000..16c702bfaf3 --- /dev/null +++ b/idea/testData/copyPaste/conversion/SeveralMethodsSample.expected.kt @@ -0,0 +1,39 @@ +class A { + fun someOther() = false + + private fun formatElement(var element : PsiElement) : String { + element = JetPsiUtil.ascendIfPropertyAccessor(element) + if (element is JetNamedFunction || element is JetProperty) + { + val bindingContext = AnalyzerFacadeWithCache.analyzeFileWithCache((element.getContainingFile() as JetFile)).getBindingContext() + + val declarationDescriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element) + if (declarationDescriptor is CallableMemberDescriptor) + { + val containingDescriptor = declarationDescriptor.getContainingDeclaration() + if (containingDescriptor is ClassDescriptor) + { + return JetBundle.message("x.in.y", DescriptorRenderer.COMPACT.render(declarationDescriptor), DescriptorRenderer.SOURCE_CODE_SHORT_NAMES_IN_TYPES.render(containingDescriptor)) + } + } + } + + assert(element is PsiMethod) {"Method accepts only kotlin functions/properties and java methods, but '" + element.getText() + "' was found"} + return JetRefactoringUtil.formatPsiMethod((element as PsiMethod), true, false) + } + + protected fun getDimensionServiceKey() : String { + return "#org.jetbrains.jet.plugin.refactoring.safeDelete.KotlinOverridingDialog" + } + + public fun getSelected() : ArrayList { + val result = ArrayList() + for (i in 0..myChecked.length - 1) { + if (myChecked[i]) + { + result.add(myOverridingMethods.get(i)) + } + } + return result + } +} \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/SeveralMethodsSample.java b/idea/testData/copyPaste/conversion/SeveralMethodsSample.java new file mode 100644 index 00000000000..d9243a6edca --- /dev/null +++ b/idea/testData/copyPaste/conversion/SeveralMethodsSample.java @@ -0,0 +1,40 @@ +class A { + private static String formatElement(PsiElement element) { + element = JetPsiUtil.ascendIfPropertyAccessor(element); + if (element instanceof JetNamedFunction || element instanceof JetProperty) { + BindingContext bindingContext = + AnalyzerFacadeWithCache.analyzeFileWithCache((JetFile) element.getContainingFile()).getBindingContext(); + + DeclarationDescriptor declarationDescriptor = bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element); + if (declarationDescriptor instanceof CallableMemberDescriptor) { + DeclarationDescriptor containingDescriptor = declarationDescriptor.getContainingDeclaration(); + if (containingDescriptor instanceof ClassDescriptor) { + return JetBundle.message( + "x.in.y", + DescriptorRenderer.COMPACT.render(declarationDescriptor), + DescriptorRenderer.SOURCE_CODE_SHORT_NAMES_IN_TYPES.render(containingDescriptor) + ); + } + } + } + + assert element instanceof PsiMethod + : "Method accepts only kotlin functions/properties and java methods, but '" + element.getText() + "' was found"; + return JetRefactoringUtil.formatPsiMethod((PsiMethod) element, true, false); + } + + @Override + protected String getDimensionServiceKey() { + return "#org.jetbrains.jet.plugin.refactoring.safeDelete.KotlinOverridingDialog"; + } + + public ArrayList getSelected() { + ArrayList result = new ArrayList(); + for (int i = 0; i < myChecked.length; i++) { + if (myChecked[i]) { + result.add(myOverridingMethods.get(i)); + } + } + return result; + } +} \ No newline at end of file diff --git a/idea/testData/copyPaste/conversion/SeveralMethodsSample.to.kt b/idea/testData/copyPaste/conversion/SeveralMethodsSample.to.kt new file mode 100644 index 00000000000..b1340cb1cf9 --- /dev/null +++ b/idea/testData/copyPaste/conversion/SeveralMethodsSample.to.kt @@ -0,0 +1,5 @@ +class A { + fun someOther() = false + + +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/jet/plugin/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.java b/idea/tests/org/jetbrains/jet/plugin/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.java new file mode 100644 index 00000000000..5996ffba61a --- /dev/null +++ b/idea/tests/org/jetbrains/jet/plugin/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.java @@ -0,0 +1,52 @@ +/* + * Copyright 2010-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.plugin.conversion.copy; + +import com.intellij.openapi.actionSystem.IdeActions; +import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; +import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.jet.plugin.editor.JetEditorOptions; + +public abstract class AbstractJavaToKotlinCopyPasteConversionTest extends LightCodeInsightFixtureTestCase { + + private static final String BASE_PATH = PluginTestCaseBase.getTestDataPathBase() + "/copyPaste/conversion"; + private JetEditorOptions oldState = null; + + @Override + protected void setUp() throws Exception { + super.setUp(); + oldState = JetEditorOptions.getInstance().getState(); + JetEditorOptions.getInstance().setEnableJavaToKotlinConversion(true); + JetEditorOptions.getInstance().setDonTShowConversionDialog(true); + } + + @Override + public void tearDown() throws Exception { + JetEditorOptions.getInstance().loadState(oldState); + super.tearDown(); + } + + public void doTest(@SuppressWarnings("UnusedParameters") String path) throws Exception { + myFixture.setTestDataPath(BASE_PATH); + String testName = getTestName(false); + myFixture.configureByFile(testName + ".java"); + myFixture.performEditorAction(IdeActions.ACTION_COPY); + myFixture.configureByFile(testName + ".to.kt"); + myFixture.performEditorAction(IdeActions.ACTION_PASTE); + myFixture.checkResultByFile(testName + ".expected.kt"); + } +} diff --git a/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java new file mode 100644 index 00000000000..7bb8a06432d --- /dev/null +++ b/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java @@ -0,0 +1,64 @@ +/* + * Copyright 2010-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.plugin.conversion.copy; + +import junit.framework.Assert; +import junit.framework.Test; +import junit.framework.TestSuite; + +import java.io.File; +import java.util.regex.Pattern; +import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.test.InnerTestClasses; +import org.jetbrains.jet.test.TestMetadata; + +import org.jetbrains.jet.plugin.conversion.copy.AbstractJavaToKotlinCopyPasteConversionTest; + +/** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("idea/testData/copyPaste/conversion") +public class JavaToKotlinCopyPasteConversionTestGenerated extends AbstractJavaToKotlinCopyPasteConversionTest { + public void testAllFilesPresentInConversion() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/copyPaste/conversion"), Pattern.compile("^(.+)\\.java$"), true); + } + + @TestMetadata("Constructor.java") + public void testConstructor() throws Exception { + doTest("idea/testData/copyPaste/conversion/Constructor.java"); + } + + @TestMetadata("Imports1.java") + public void testImports1() throws Exception { + doTest("idea/testData/copyPaste/conversion/Imports1.java"); + } + + @TestMetadata("Imports2.java") + public void testImports2() throws Exception { + doTest("idea/testData/copyPaste/conversion/Imports2.java"); + } + + @TestMetadata("SampleBlock.java") + public void testSampleBlock() throws Exception { + doTest("idea/testData/copyPaste/conversion/SampleBlock.java"); + } + + @TestMetadata("SeveralMethodsSample.java") + public void testSeveralMethodsSample() throws Exception { + doTest("idea/testData/copyPaste/conversion/SeveralMethodsSample.java"); + } + +}