From 2621df324344dcadc32a89f16d86acbaca81133c Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 11 Jul 2013 16:14:45 +0400 Subject: [PATCH] Auto generate reference tests --- .../jet/generators/tests/GenerateTests.java | 8 ++ .../{ => references}/CtrlClickResolve.kt | 0 .../resolve/{ => references}/ResolveClass.kt | 0 .../ResolvePackageInProperty.kt | 0 .../resolve/{ => references}/SamAdapter.kt | 0 .../{ => references}/SamConstructor.kt | 0 .../SamConstructorTypeArguments.kt | 0 .../{ => references}/SeveralOverrides.kt | 0 ...Test.java => AbstractResolveBaseTest.java} | 38 +--------- .../ReferenceResolveTestGenerated.java | 74 +++++++++++++++++++ 10 files changed, 86 insertions(+), 34 deletions(-) rename idea/testData/resolve/{ => references}/CtrlClickResolve.kt (100%) rename idea/testData/resolve/{ => references}/ResolveClass.kt (100%) rename idea/testData/resolve/{ => references}/ResolvePackageInProperty.kt (100%) rename idea/testData/resolve/{ => references}/SamAdapter.kt (100%) rename idea/testData/resolve/{ => references}/SamConstructor.kt (100%) rename idea/testData/resolve/{ => references}/SamConstructorTypeArguments.kt (100%) rename idea/testData/resolve/{ => references}/SeveralOverrides.kt (100%) rename idea/tests/org/jetbrains/jet/resolve/{ResolveBaseTest.java => AbstractResolveBaseTest.java} (82%) create mode 100644 idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java diff --git a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java index 025d5b167e4..fa3353c6228 100644 --- a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java +++ b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java @@ -49,6 +49,7 @@ import org.jetbrains.jet.plugin.quickfix.AbstractQuickFixMultiFileTest; import org.jetbrains.jet.plugin.quickfix.AbstractQuickFixTest; import org.jetbrains.jet.plugin.refactoring.inline.AbstractInlineTest; import org.jetbrains.jet.psi.AbstractJetPsiMatcherTest; +import org.jetbrains.jet.resolve.AbstractResolveBaseTest; import org.jetbrains.jet.resolve.AbstractResolveTest; import org.jetbrains.jet.safeDelete.AbstractJetSafeDeleteTest; import org.jetbrains.jet.test.generator.SimpleTestClassModel; @@ -416,6 +417,13 @@ public class GenerateTests { // TODO fix -- disabled because doesn't work in Idea 130.1335 // testModel("idea/testData/safeDelete/deleteJavaMethod", "doJavaMethodTest") ); + + generateTest( + "idea/tests/", + "ReferenceResolveTestGenerated", + AbstractResolveBaseTest.class, + testModel("idea/testData/resolve/references", "doTest") + ); } private static SimpleTestClassModel testModel(@NotNull String rootPath) { diff --git a/idea/testData/resolve/CtrlClickResolve.kt b/idea/testData/resolve/references/CtrlClickResolve.kt similarity index 100% rename from idea/testData/resolve/CtrlClickResolve.kt rename to idea/testData/resolve/references/CtrlClickResolve.kt diff --git a/idea/testData/resolve/ResolveClass.kt b/idea/testData/resolve/references/ResolveClass.kt similarity index 100% rename from idea/testData/resolve/ResolveClass.kt rename to idea/testData/resolve/references/ResolveClass.kt diff --git a/idea/testData/resolve/ResolvePackageInProperty.kt b/idea/testData/resolve/references/ResolvePackageInProperty.kt similarity index 100% rename from idea/testData/resolve/ResolvePackageInProperty.kt rename to idea/testData/resolve/references/ResolvePackageInProperty.kt diff --git a/idea/testData/resolve/SamAdapter.kt b/idea/testData/resolve/references/SamAdapter.kt similarity index 100% rename from idea/testData/resolve/SamAdapter.kt rename to idea/testData/resolve/references/SamAdapter.kt diff --git a/idea/testData/resolve/SamConstructor.kt b/idea/testData/resolve/references/SamConstructor.kt similarity index 100% rename from idea/testData/resolve/SamConstructor.kt rename to idea/testData/resolve/references/SamConstructor.kt diff --git a/idea/testData/resolve/SamConstructorTypeArguments.kt b/idea/testData/resolve/references/SamConstructorTypeArguments.kt similarity index 100% rename from idea/testData/resolve/SamConstructorTypeArguments.kt rename to idea/testData/resolve/references/SamConstructorTypeArguments.kt diff --git a/idea/testData/resolve/SeveralOverrides.kt b/idea/testData/resolve/references/SeveralOverrides.kt similarity index 100% rename from idea/testData/resolve/SeveralOverrides.kt rename to idea/testData/resolve/references/SeveralOverrides.kt diff --git a/idea/tests/org/jetbrains/jet/resolve/ResolveBaseTest.java b/idea/tests/org/jetbrains/jet/resolve/AbstractResolveBaseTest.java similarity index 82% rename from idea/tests/org/jetbrains/jet/resolve/ResolveBaseTest.java rename to idea/tests/org/jetbrains/jet/resolve/AbstractResolveBaseTest.java index 8741a026434..c46bc807788 100644 --- a/idea/tests/org/jetbrains/jet/resolve/ResolveBaseTest.java +++ b/idea/tests/org/jetbrains/jet/resolve/AbstractResolveBaseTest.java @@ -32,47 +32,17 @@ import org.jetbrains.jet.InTextDirectivesUtils; import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.jet.testing.ReferenceUtils; -import java.io.File; import java.util.List; -public class ResolveBaseTest extends LightCodeInsightTestCase { +public abstract class AbstractResolveBaseTest extends LightCodeInsightTestCase { @Override protected void setUp() throws Exception { super.setUp(); ((StartupManagerImpl) StartupManager.getInstance(getProject())).runPostStartupActivities(); } - public void testCtrlClickResolve() throws Exception { - doTest(); - } - - public void testResolveClass() throws Exception { - doTest(); - } - - public void testResolvePackageInProperty() throws Exception { - doTest(); - } - - public void testSamConstructor() throws Exception { - doTest(); - } - - public void testSamConstructorTypeArguments() throws Exception { - doTest(); - } - - public void testSamAdapter() throws Exception { - doTest(); - } - - public void testSeveralOverrides() throws Exception { - doTest(); - } - - protected void doTest() { - String testName = getTestName(false); - configureByFile(testName + ".kt"); + protected void doTest(String path) { + configureByFile(path); if (InTextDirectivesUtils.isDirectiveDefined(getFile().getText(), "MULTIRESOLVE")) { doMultiResolveTest(); @@ -139,6 +109,6 @@ public class ResolveBaseTest extends LightCodeInsightTestCase { @NotNull @Override protected String getTestDataPath() { - return new File(PluginTestCaseBase.getTestDataPathBase(), "/resolve/").getPath() + File.separator; + return "./"; } } diff --git a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java new file mode 100644 index 00000000000..3bc6fc3fc4a --- /dev/null +++ b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java @@ -0,0 +1,74 @@ +/* + * 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.resolve; + +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.resolve.AbstractResolveBaseTest; + +/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("idea/testData/resolve/references") +public class ReferenceResolveTestGenerated extends AbstractResolveBaseTest { + public void testAllFilesPresentInReferences() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/resolve/references"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("CtrlClickResolve.kt") + public void testCtrlClickResolve() throws Exception { + doTest("idea/testData/resolve/references/CtrlClickResolve.kt"); + } + + @TestMetadata("ResolveClass.kt") + public void testResolveClass() throws Exception { + doTest("idea/testData/resolve/references/ResolveClass.kt"); + } + + @TestMetadata("ResolvePackageInProperty.kt") + public void testResolvePackageInProperty() throws Exception { + doTest("idea/testData/resolve/references/ResolvePackageInProperty.kt"); + } + + @TestMetadata("SamAdapter.kt") + public void testSamAdapter() throws Exception { + doTest("idea/testData/resolve/references/SamAdapter.kt"); + } + + @TestMetadata("SamConstructor.kt") + public void testSamConstructor() throws Exception { + doTest("idea/testData/resolve/references/SamConstructor.kt"); + } + + @TestMetadata("SamConstructorTypeArguments.kt") + public void testSamConstructorTypeArguments() throws Exception { + doTest("idea/testData/resolve/references/SamConstructorTypeArguments.kt"); + } + + @TestMetadata("SeveralOverrides.kt") + public void testSeveralOverrides() throws Exception { + doTest("idea/testData/resolve/references/SeveralOverrides.kt"); + } + +}