From 7ce3c57896ab91fc48f30665ab3c80b874685dd3 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Thu, 12 Oct 2017 02:34:37 +0300 Subject: [PATCH] New J2K: Add some primitive tests for new converter --- .../newFileOrElement/first/First.java | 5 ++ j2k/testData/newFileOrElement/first/First.kt | 0 ...wJavaToKotlinConverterNewSingleFileTest.kt | 27 ++++++++++ ...inConverterNewSingleFileTestGenerated.java | 53 +++++++++++++++++++ 4 files changed, 85 insertions(+) create mode 100644 j2k/testData/newFileOrElement/first/First.java create mode 100644 j2k/testData/newFileOrElement/first/First.kt create mode 100644 j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterNewSingleFileTest.kt create mode 100644 j2k/tests/org/jetbrains/kotlin/j2k/NewJavaToKotlinConverterNewSingleFileTestGenerated.java diff --git a/j2k/testData/newFileOrElement/first/First.java b/j2k/testData/newFileOrElement/first/First.java new file mode 100644 index 00000000000..d5dc18626ce --- /dev/null +++ b/j2k/testData/newFileOrElement/first/First.java @@ -0,0 +1,5 @@ +package p; + +public class Some { + public String aaaa = ""; +} \ No newline at end of file diff --git a/j2k/testData/newFileOrElement/first/First.kt b/j2k/testData/newFileOrElement/first/First.kt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterNewSingleFileTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterNewSingleFileTest.kt new file mode 100644 index 00000000000..36573205dcc --- /dev/null +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractNewJavaToKotlinConverterNewSingleFileTest.kt @@ -0,0 +1,27 @@ +/* + * Copyright 2010-2017 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.kotlin.j2k + +import com.intellij.openapi.project.Project + +abstract class AbstractNewJavaToKotlinConverterNewSingleFileTest : AbstractJavaToKotlinConverterSingleFileTest() { + + override fun fileToKotlin(text: String, settings: ConverterSettings, project: Project): String { + val file = createJavaFile(text) + return NewJavaToKotlinConverter(project, settings).filesToKotlin(listOf(file)) + } +} \ No newline at end of file diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/NewJavaToKotlinConverterNewSingleFileTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/NewJavaToKotlinConverterNewSingleFileTestGenerated.java new file mode 100644 index 00000000000..c28ce22d7aa --- /dev/null +++ b/j2k/tests/org/jetbrains/kotlin/j2k/NewJavaToKotlinConverterNewSingleFileTestGenerated.java @@ -0,0 +1,53 @@ +/* + * Copyright 2010-2017 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.kotlin.j2k; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.TargetBackend; +import org.jetbrains.kotlin.test.TestMetadata; +import org.junit.runner.RunWith; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("j2k/testData/newFileOrElement") +@TestDataPath("$PROJECT_ROOT") +@RunWith(JUnit3RunnerWithInners.class) +public class NewJavaToKotlinConverterNewSingleFileTestGenerated extends AbstractNewJavaToKotlinConverterNewSingleFileTest { + public void testAllFilesPresentInNewFileOrElement() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/newFileOrElement"), Pattern.compile("^(.+)\\.java$"), TargetBackend.ANY, true); + } + + @TestMetadata("j2k/testData/newFileOrElement/first") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class First extends AbstractNewJavaToKotlinConverterNewSingleFileTest { + public void testAllFilesPresentInFirst() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/newFileOrElement/first"), Pattern.compile("^(.+)\\.java$"), TargetBackend.ANY, true); + } + + @TestMetadata("First.java") + public void testFirst() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/newFileOrElement/first/First.java"); + doTest(fileName); + } + } +}