From f3e7ec81dca87cc6a9a152fa176b4ab65c5f260f Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 11 Apr 2013 15:51:13 +0400 Subject: [PATCH] Do extensions test with fixtures --- .../jet/generators/tests/GenerateTests.java | 2 + .../completion/ExtensionsCompletionTest.java | 66 ------------------- .../completion/JetBasicJSCompletionTest.java | 56 +++++++++++++++- .../JetBasicJavaCompletionTest.java | 56 +++++++++++++++- 4 files changed, 112 insertions(+), 68 deletions(-) delete mode 100644 idea/tests/org/jetbrains/jet/completion/ExtensionsCompletionTest.java diff --git a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java index c151f588f64..863b01725ed 100644 --- a/generators/org/jetbrains/jet/generators/tests/GenerateTests.java +++ b/generators/org/jetbrains/jet/generators/tests/GenerateTests.java @@ -231,6 +231,7 @@ public class GenerateTests { "JetBasicJSCompletionTest", AbstractJetJSCompletionTest.class, testModel("idea/testData/completion/basic", false, "doTest"), + testModel("idea/testData/completion/basic/extensions", false, "doTest"), testModel("idea/testData/completion/basic/js", false, "doTest") ); @@ -239,6 +240,7 @@ public class GenerateTests { "JetBasicJavaCompletionTest", AbstractJavaCompletionTest.class, testModel("idea/testData/completion/basic", false, "doTest"), + testModel("idea/testData/completion/basic/extensions", false, "doTest"), testModel("idea/testData/completion/basic/java", false, "doTest") ); diff --git a/idea/tests/org/jetbrains/jet/completion/ExtensionsCompletionTest.java b/idea/tests/org/jetbrains/jet/completion/ExtensionsCompletionTest.java deleted file mode 100644 index 65a7b8bab38..00000000000 --- a/idea/tests/org/jetbrains/jet/completion/ExtensionsCompletionTest.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * 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.completion; - -import org.jetbrains.jet.plugin.PluginTestCaseBase; - -import java.io.File; - -public class ExtensionsCompletionTest extends JetCompletionTestBase { - - public void testExtensionInExtendedClass() { - doTest(); - } - - public void testExtensionInExtendedClassThis() { - doTest(); - } - - public void testExtensionInExtension() { - doTest(); - } - - public void testExtensionInExtensionThis() { - doTest(); - } - - public void testInvalidTypeParameters() { - doTest(); - } - - public void testIrrelevantExtension() { - doTest(); - } - - public void testJavaTypeExtension() { - doTest(); - } - - public void testKotlinGenericTypeExtension() { - doTest(); - } - - public void testKotlinTypeExtension() { - doTest(); - } - - @Override - protected String getTestDataPath() { - return new File(PluginTestCaseBase.getTestDataPathBase(), "/completion/basic/extensions").getPath() + - File.separator; - } -} diff --git a/idea/tests/org/jetbrains/jet/completion/JetBasicJSCompletionTest.java b/idea/tests/org/jetbrains/jet/completion/JetBasicJSCompletionTest.java index 274df98b2ed..7ee55b0cd98 100644 --- a/idea/tests/org/jetbrains/jet/completion/JetBasicJSCompletionTest.java +++ b/idea/tests/org/jetbrains/jet/completion/JetBasicJSCompletionTest.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.completion.AbstractJetJSCompletionTest; /** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({JetBasicJSCompletionTest.Basic.class, JetBasicJSCompletionTest.Js.class}) +@InnerTestClasses({JetBasicJSCompletionTest.Basic.class, JetBasicJSCompletionTest.Extensions.class, JetBasicJSCompletionTest.Js.class}) public class JetBasicJSCompletionTest extends AbstractJetJSCompletionTest { @TestMetadata("idea/testData/completion/basic") public static class Basic extends AbstractJetJSCompletionTest { @@ -350,6 +350,59 @@ public class JetBasicJSCompletionTest extends AbstractJetJSCompletionTest { } + @TestMetadata("idea/testData/completion/basic/extensions") + public static class Extensions extends AbstractJetJSCompletionTest { + public void testAllFilesPresentInExtensions() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/completion/basic/extensions"), Pattern.compile("^(.+)\\.kt$"), false); + } + + @TestMetadata("ExtensionInExtendedClass.kt") + public void testExtensionInExtendedClass() throws Exception { + doTest("idea/testData/completion/basic/extensions/ExtensionInExtendedClass.kt"); + } + + @TestMetadata("ExtensionInExtendedClassThis.kt") + public void testExtensionInExtendedClassThis() throws Exception { + doTest("idea/testData/completion/basic/extensions/ExtensionInExtendedClassThis.kt"); + } + + @TestMetadata("ExtensionInExtension.kt") + public void testExtensionInExtension() throws Exception { + doTest("idea/testData/completion/basic/extensions/ExtensionInExtension.kt"); + } + + @TestMetadata("ExtensionInExtensionThis.kt") + public void testExtensionInExtensionThis() throws Exception { + doTest("idea/testData/completion/basic/extensions/ExtensionInExtensionThis.kt"); + } + + @TestMetadata("InvalidTypeParameters.kt") + public void testInvalidTypeParameters() throws Exception { + doTest("idea/testData/completion/basic/extensions/InvalidTypeParameters.kt"); + } + + @TestMetadata("IrrelevantExtension.kt") + public void testIrrelevantExtension() throws Exception { + doTest("idea/testData/completion/basic/extensions/IrrelevantExtension.kt"); + } + + @TestMetadata("JavaTypeExtension.kt") + public void testJavaTypeExtension() throws Exception { + doTest("idea/testData/completion/basic/extensions/JavaTypeExtension.kt"); + } + + @TestMetadata("KotlinGenericTypeExtension.kt") + public void testKotlinGenericTypeExtension() throws Exception { + doTest("idea/testData/completion/basic/extensions/KotlinGenericTypeExtension.kt"); + } + + @TestMetadata("KotlinTypeExtension.kt") + public void testKotlinTypeExtension() throws Exception { + doTest("idea/testData/completion/basic/extensions/KotlinTypeExtension.kt"); + } + + } + @TestMetadata("idea/testData/completion/basic/js") public static class Js extends AbstractJetJSCompletionTest { public void testAllFilesPresentInJs() throws Exception { @@ -371,6 +424,7 @@ public class JetBasicJSCompletionTest extends AbstractJetJSCompletionTest { public static Test suite() { TestSuite suite = new TestSuite("JetBasicJSCompletionTest"); suite.addTestSuite(Basic.class); + suite.addTestSuite(Extensions.class); suite.addTestSuite(Js.class); return suite; } diff --git a/idea/tests/org/jetbrains/jet/completion/JetBasicJavaCompletionTest.java b/idea/tests/org/jetbrains/jet/completion/JetBasicJavaCompletionTest.java index 9e2235e2505..6260e6a2033 100644 --- a/idea/tests/org/jetbrains/jet/completion/JetBasicJavaCompletionTest.java +++ b/idea/tests/org/jetbrains/jet/completion/JetBasicJavaCompletionTest.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.completion.AbstractJavaCompletionTest; /** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({JetBasicJavaCompletionTest.Basic.class, JetBasicJavaCompletionTest.Java.class}) +@InnerTestClasses({JetBasicJavaCompletionTest.Basic.class, JetBasicJavaCompletionTest.Extensions.class, JetBasicJavaCompletionTest.Java.class}) public class JetBasicJavaCompletionTest extends AbstractJavaCompletionTest { @TestMetadata("idea/testData/completion/basic") public static class Basic extends AbstractJavaCompletionTest { @@ -350,6 +350,59 @@ public class JetBasicJavaCompletionTest extends AbstractJavaCompletionTest { } + @TestMetadata("idea/testData/completion/basic/extensions") + public static class Extensions extends AbstractJavaCompletionTest { + public void testAllFilesPresentInExtensions() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("idea/testData/completion/basic/extensions"), Pattern.compile("^(.+)\\.kt$"), false); + } + + @TestMetadata("ExtensionInExtendedClass.kt") + public void testExtensionInExtendedClass() throws Exception { + doTest("idea/testData/completion/basic/extensions/ExtensionInExtendedClass.kt"); + } + + @TestMetadata("ExtensionInExtendedClassThis.kt") + public void testExtensionInExtendedClassThis() throws Exception { + doTest("idea/testData/completion/basic/extensions/ExtensionInExtendedClassThis.kt"); + } + + @TestMetadata("ExtensionInExtension.kt") + public void testExtensionInExtension() throws Exception { + doTest("idea/testData/completion/basic/extensions/ExtensionInExtension.kt"); + } + + @TestMetadata("ExtensionInExtensionThis.kt") + public void testExtensionInExtensionThis() throws Exception { + doTest("idea/testData/completion/basic/extensions/ExtensionInExtensionThis.kt"); + } + + @TestMetadata("InvalidTypeParameters.kt") + public void testInvalidTypeParameters() throws Exception { + doTest("idea/testData/completion/basic/extensions/InvalidTypeParameters.kt"); + } + + @TestMetadata("IrrelevantExtension.kt") + public void testIrrelevantExtension() throws Exception { + doTest("idea/testData/completion/basic/extensions/IrrelevantExtension.kt"); + } + + @TestMetadata("JavaTypeExtension.kt") + public void testJavaTypeExtension() throws Exception { + doTest("idea/testData/completion/basic/extensions/JavaTypeExtension.kt"); + } + + @TestMetadata("KotlinGenericTypeExtension.kt") + public void testKotlinGenericTypeExtension() throws Exception { + doTest("idea/testData/completion/basic/extensions/KotlinGenericTypeExtension.kt"); + } + + @TestMetadata("KotlinTypeExtension.kt") + public void testKotlinTypeExtension() throws Exception { + doTest("idea/testData/completion/basic/extensions/KotlinTypeExtension.kt"); + } + + } + @TestMetadata("idea/testData/completion/basic/java") public static class Java extends AbstractJavaCompletionTest { public void testAllFilesPresentInJava() throws Exception { @@ -396,6 +449,7 @@ public class JetBasicJavaCompletionTest extends AbstractJavaCompletionTest { public static Test suite() { TestSuite suite = new TestSuite("JetBasicJavaCompletionTest"); suite.addTestSuite(Basic.class); + suite.addTestSuite(Extensions.class); suite.addTestSuite(Java.class); return suite; }