From a2e453b759b34a72eeaa687d1f14a961607e1b79 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 9 Jan 2013 15:21:24 +0400 Subject: [PATCH] Refactor CompileKotlinAgainstKotlinTest CKAKTest is now abstract, the actual testcases are generated via GenerateTests into CompileKotlinAgainstKotlinTestGenerated. Also invokeMain() now invokes namespace.main instead of bbb.namespace.main. --- ...onstructorA.kt => DefaultConstructor.A.kt} | 2 + ...onstructorB.kt => DefaultConstructor.B.kt} | 4 +- .../{SimpleA.kt => Simple.A.kt} | 0 .../{SimpleB.kt => Simple.B.kt} | 3 - ...stractCompileKotlinAgainstKotlinTest.java} | 69 +++++-------------- ...mpileKotlinAgainstKotlinTestGenerated.java | 46 +++++++++++++ .../jet/generators/tests/GenerateTests.java | 8 +++ 7 files changed, 74 insertions(+), 58 deletions(-) rename compiler/testData/compileKotlinAgainstKotlin/{DefaultConstructorA.kt => DefaultConstructor.A.kt} (64%) rename compiler/testData/compileKotlinAgainstKotlin/{DefaultConstructorB.kt => DefaultConstructor.B.kt} (61%) rename compiler/testData/compileKotlinAgainstKotlin/{SimpleA.kt => Simple.A.kt} (100%) rename compiler/testData/compileKotlinAgainstKotlin/{SimpleB.kt => Simple.B.kt} (68%) rename compiler/tests/org/jetbrains/jet/jvm/compiler/{CompileKotlinAgainstKotlinTest.java => AbstractCompileKotlinAgainstKotlinTest.java} (59%) create mode 100644 compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java diff --git a/compiler/testData/compileKotlinAgainstKotlin/DefaultConstructorA.kt b/compiler/testData/compileKotlinAgainstKotlin/DefaultConstructor.A.kt similarity index 64% rename from compiler/testData/compileKotlinAgainstKotlin/DefaultConstructorA.kt rename to compiler/testData/compileKotlinAgainstKotlin/DefaultConstructor.A.kt index 979ee73c04d..728fde868a3 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/DefaultConstructorA.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/DefaultConstructor.A.kt @@ -1 +1,3 @@ +package aaa + class A(val a: Int = 1) diff --git a/compiler/testData/compileKotlinAgainstKotlin/DefaultConstructorB.kt b/compiler/testData/compileKotlinAgainstKotlin/DefaultConstructor.B.kt similarity index 61% rename from compiler/testData/compileKotlinAgainstKotlin/DefaultConstructorB.kt rename to compiler/testData/compileKotlinAgainstKotlin/DefaultConstructor.B.kt index 7c6e14a033d..cbd8358bec6 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/DefaultConstructorB.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/DefaultConstructor.B.kt @@ -1,5 +1,3 @@ -package bbb - fun main(args: Array) { - A() + aaa.A() } diff --git a/compiler/testData/compileKotlinAgainstKotlin/SimpleA.kt b/compiler/testData/compileKotlinAgainstKotlin/Simple.A.kt similarity index 100% rename from compiler/testData/compileKotlinAgainstKotlin/SimpleA.kt rename to compiler/testData/compileKotlinAgainstKotlin/Simple.A.kt diff --git a/compiler/testData/compileKotlinAgainstKotlin/SimpleB.kt b/compiler/testData/compileKotlinAgainstKotlin/Simple.B.kt similarity index 68% rename from compiler/testData/compileKotlinAgainstKotlin/SimpleB.kt rename to compiler/testData/compileKotlinAgainstKotlin/Simple.B.kt index 39710711150..a98c92eea2d 100644 --- a/compiler/testData/compileKotlinAgainstKotlin/SimpleB.kt +++ b/compiler/testData/compileKotlinAgainstKotlin/Simple.B.kt @@ -1,9 +1,6 @@ -package bbb - fun main(args: Array) { val h = aaa.hello() if (h != 17) { throw Exception() } - System.out?.println("It is 17!") } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java similarity index 59% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTest.java rename to compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java index ae02fda9557..3e7924f83cb 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java @@ -20,10 +20,11 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.ArrayUtil; -import junit.framework.Assert; -import junit.framework.Test; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.*; +import org.jetbrains.jet.CompileCompilerDependenciesTest; +import org.jetbrains.jet.ConfigurationKind; +import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.cli.jvm.compiler.CompileEnvironmentUtil; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.codegen.ClassFileFactory; @@ -33,31 +34,12 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.test.TestCaseWithTmpdir; import java.io.File; -import java.io.FilenameFilter; import java.io.IOException; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; -@SuppressWarnings({"JUnitTestCaseWithNonTrivialConstructors", "JUnitTestCaseWithNoTests"}) -public final class CompileKotlinAgainstKotlinTest extends TestCaseWithTmpdir { - - private final File ktAFile; - private final File ktBFile; - - public CompileKotlinAgainstKotlinTest(@NotNull File ktAFile) { - Assert.assertTrue(ktAFile.getName().endsWith("A.kt")); - this.ktAFile = ktAFile; - this.ktBFile = new File(ktAFile.getPath().replaceFirst("A\\.kt$", "B.kt")); - } - - @Override - public String getName() { - return ktAFile.getName(); - } - +public abstract class AbstractCompileKotlinAgainstKotlinTest extends TestCaseWithTmpdir { private File aDir; private File bDir; @@ -70,32 +52,31 @@ public final class CompileKotlinAgainstKotlinTest extends TestCaseWithTmpdir { JetTestUtils.mkdirs(bDir); } - @Override - protected void runTest() throws Throwable { - compileA(); - compileB(); + public void doTest(@NotNull String fileName) throws Exception { + compileA(new File(fileName)); + compileB(new File(fileName.replaceFirst("A\\.kt$", "B.kt"))); invokeMain(); } - private void invokeMain() - throws MalformedURLException, ClassNotFoundException, NoSuchMethodException, IllegalAccessException, InvocationTargetException { + private void invokeMain() throws Exception { URLClassLoader classLoader = new URLClassLoader( new URL[]{ aDir.toURI().toURL(), bDir.toURI().toURL() }, - CompileKotlinAgainstKotlinTest.class.getClassLoader() + AbstractCompileKotlinAgainstKotlinTest.class.getClassLoader() ); - Class clazz = classLoader.loadClass("bbb.namespace"); - Method main = clazz.getMethod("main", new Class[] { String[].class }); + Class clazz = classLoader.loadClass("namespace"); + Method main = clazz.getMethod("main", new Class[] {String[].class}); main.invoke(null, new Object[] {ArrayUtil.EMPTY_STRING_ARRAY}); } - private void compileA() throws IOException { - JetCoreEnvironment jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(getTestRootDisposable()); + private void compileA(@NotNull File ktAFile) throws IOException { + JetCoreEnvironment jetCoreEnvironment = JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(getTestRootDisposable(), + ConfigurationKind.JDK_ONLY); compileKotlin(ktAFile, aDir, jetCoreEnvironment, getTestRootDisposable()); } - private void compileB() throws IOException { + private void compileB(@NotNull File ktBFile) throws IOException { CompilerConfiguration configurationWithADirInClasspath = CompileCompilerDependenciesTest - .compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, JetTestUtils.getAnnotationsJar(), aDir); + .compilerConfigurationForTests(ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, JetTestUtils.getAnnotationsJar(), aDir); compileKotlin(ktBFile, bDir, new JetCoreEnvironment(getTestRootDisposable(), configurationWithADirInClasspath), getTestRootDisposable()); } @@ -115,20 +96,4 @@ public final class CompileKotlinAgainstKotlinTest extends TestCaseWithTmpdir { Disposer.dispose(disposable); } - - public static Test suite() { - class Filter implements FilenameFilter { - @Override - public boolean accept(File dir, String name) { - return name.endsWith("A.kt"); - } - } - return JetTestCaseBuilder.suiteForDirectory(JetTestCaseBuilder.getTestDataPathBase(), "/compileKotlinAgainstKotlin", true, new Filter(), new JetTestCaseBuilder.NamedTestFactory() { - @NotNull - @Override - public Test createTest(@NotNull String dataPath, @NotNull String name, @NotNull File file) { - return new CompileKotlinAgainstKotlinTest(file); - } - }); - } } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java new file mode 100644 index 00000000000..eb94267216e --- /dev/null +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java @@ -0,0 +1,46 @@ +/* + * Copyright 2010-2012 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.jvm.compiler; + +import junit.framework.Assert; +import junit.framework.Test; +import junit.framework.TestSuite; + +import java.io.File; +import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.test.InnerTestClasses; +import org.jetbrains.jet.test.TestMetadata; + +import org.jetbrains.jet.jvm.compiler.AbstractCompileKotlinAgainstKotlinTest; + +/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ +@TestMetadata("compiler/testData/compileKotlinAgainstKotlin") +public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotlinAgainstKotlinTest { + public void testAllFilesPresentInCompileKotlinAgainstKotlin() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/compileKotlinAgainstKotlin"), "A.kt", true); + } + + @TestMetadata("DefaultConstructor.A.kt") + public void testDefaultConstructor_A() throws Exception { + doTest("compiler/testData/compileKotlinAgainstKotlin/DefaultConstructor.A.kt"); + } + + @TestMetadata("Simple.A.kt") + public void testSimple_A() throws Exception { + doTest("compiler/testData/compileKotlinAgainstKotlin/Simple.A.kt"); + } + +} diff --git a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java index 25a06291324..4dfaad6e8f0 100644 --- a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java +++ b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java @@ -28,6 +28,7 @@ import org.jetbrains.jet.codegen.defaultConstructor.AbstractDefaultConstructorCo import org.jetbrains.jet.codegen.flags.AbstractWriteFlagsTest; import org.jetbrains.jet.codegen.generated.AbstractCodegenTest; import org.jetbrains.jet.jvm.compiler.AbstractCompileJavaAgainstKotlinTest; +import org.jetbrains.jet.jvm.compiler.AbstractCompileKotlinAgainstKotlinTest; import org.jetbrains.jet.jvm.compiler.AbstractLoadCompiledKotlinTest; import org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest; import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveDescriptorRendererTest; @@ -166,6 +167,13 @@ public class GenerateTests { testModel("compiler/testData/compileJavaAgainstKotlin", "doTest") ); + generateTest( + "compiler/tests/", + "CompileKotlinAgainstKotlinTestGenerated", + AbstractCompileKotlinAgainstKotlinTest.class, + testModel("compiler/testData/compileKotlinAgainstKotlin", true, "A.kt", "doTest") + ); + generateTest( "compiler/tests/", "LazyResolveDescriptorRendererTestGenerated",