diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/GrCompletionTestWithLibrary.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GrCompletionTestWithLibrary.groovy similarity index 98% rename from plugins/groovy/test/org/jetbrains/plugins/groovy/GrCompletionTestWithLibrary.groovy rename to plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GrCompletionTestWithLibrary.groovy index 5bffbbdfa5c9..2861f580f90a 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/GrCompletionTestWithLibrary.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GrCompletionTestWithLibrary.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.plugins.groovy +package org.jetbrains.plugins.groovy.completion import com.intellij.openapi.module.Module import com.intellij.openapi.roots.ContentEntry diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyClassNameCompletionTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyClassNameCompletionTest.groovy similarity index 99% rename from plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyClassNameCompletionTest.groovy rename to plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyClassNameCompletionTest.groovy index 61b793d624f3..465de15b289b 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyClassNameCompletionTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyClassNameCompletionTest.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.plugins.groovy; +package org.jetbrains.plugins.groovy.completion; import com.intellij.codeInsight.CodeInsightSettings diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyCompletionTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy similarity index 77% rename from plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyCompletionTest.groovy rename to plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy index 7867af903ed6..17c6fb4f0ce9 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyCompletionTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy @@ -14,15 +14,16 @@ * limitations under the License. */ -package org.jetbrains.plugins.groovy; +package org.jetbrains.plugins.groovy.completion; -import com.intellij.codeInsight.completion.CompletionType import com.intellij.codeInsight.lookup.LookupElement import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiFile import org.jetbrains.plugins.groovy.util.TestUtils +import org.jetbrains.plugins.groovy.GroovyFileType + /** * @author Maxim.Medvedev */ @@ -38,38 +39,6 @@ public class GroovyCompletionTest extends GroovyCompletionTestBase { myFixture.checkResultByFile(getTestName(false) + "_after.groovy"); } - public void testSmartCompletionAfterNewInDeclaration() throws Throwable { - myFixture.configureByFile(getTestName(false) + ".groovy"); - myFixture.complete(CompletionType.SMART); - assertOrderedEquals(myFixture.getLookupElementStrings(), "Bar", "Foo"); - } - - public void testSmartCompletionAfterNewInDeclarationWithInterface() throws Throwable { - doSmartTest(); - } - - public void testCaretAfterSmartCompletionAfterNewInDeclaration() throws Throwable { - doSmartTest(); - } - - public void testSmartCompletionAfterNewInDeclarationWithAbstractClass() throws Throwable { - doSmartTest(); - } - - public void testSmartCompletionAfterNewInDeclarationWithArray() throws Throwable { - doSmartTest(); - } - - public void testSmartCompletionAfterNewInDeclarationWithIntArray() throws Throwable { - doSmartTest(); - } - - public void testShortenNamesInSmartCompletionAfterNewInDeclaration() throws Throwable { - doSmartTest(); - } - - public void testSmartAfterNewInCall() throws Throwable { doSmartTest(); } - public void testNamedParametersForApplication() throws Throwable { doVariantableTest("abx", "aby"); } @@ -151,11 +120,6 @@ public class GroovyCompletionTest extends GroovyCompletionTestBase { myFixture.testCompletionVariants(getTestName(false) + ".groovy", "Inner1", "Inner2"); } - public void testInnerClassInStaticMethodCompletion() throws Throwable { - doSmartTest(); - } - - public void testQualifiedThisCompletion() throws Throwable { myFixture.testCompletionVariants(getTestName(false) + ".groovy", "foo1", "foo2"); } @@ -208,42 +172,9 @@ public class GroovyCompletionTest extends GroovyCompletionTestBase { myFixture.testCompletionVariants(getTestName(false) + ".groovy", "geteMail", "getePost"); } - public void testSmartCompletionInAssignmentExpression() throws Throwable { - doSmartTest(); - } - - public void testSimpleMethodParameter() throws Throwable { - doSmartCompletion("d1", "d2"); - } - - public void testReturnStatement() throws Exception { - doSmartCompletion("b", "b1", "b2", "foo"); - } - - public void testIncSmartCompletion() throws Exception { - doSmartCompletion("a", "b"); - } - - public void testInheritConstructorsAnnotation() throws Throwable { - myFixture.addFileToProject("groovy/transform/InheritConstructors.java", "package groovy.transform;\n" + - "\n" + - "import java.lang.annotation.ElementType;\n" + - "import java.lang.annotation.Retention;\n" + - "import java.lang.annotation.RetentionPolicy;\n" + - "import java.lang.annotation.Target;@Retention(RetentionPolicy.SOURCE)\n" + - "@Target({ElementType.TYPE})\n" + - "public @interface InheritConstructors {\n" + - "}"); - doSmartTest(); - } - public void testIntCompletionInPlusMethod() {doBasicTest();} public void testIntCompletionInGenericParameter() {doBasicTest();} - public void testSmartCastCompletion() {doSmartTest();} - public void testSmartCastCompletionWithoutRParenth() {doSmartTest();} - public void testSmartCastCompletionWithRParenth() {doSmartTest();} - public void testWhenSiblingIsStaticallyImported_Method() throws Exception { myFixture.addFileToProject "foo/Foo.groovy", """package foo class Foo { diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyCompletionTestBase.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTestBase.java similarity index 97% rename from plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyCompletionTestBase.java rename to plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTestBase.java index 4474a21ddce0..37fedaaa0fc3 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyCompletionTestBase.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTestBase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.plugins.groovy; +package org.jetbrains.plugins.groovy.completion; import com.intellij.codeInsight.completion.CompletionType; import com.intellij.testFramework.UsefulTestCase; diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovySmartCompletionTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovySmartCompletionTest.groovy new file mode 100644 index 000000000000..f77d806e465f --- /dev/null +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovySmartCompletionTest.groovy @@ -0,0 +1,90 @@ +/* + * Copyright 2000-2010 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.plugins.groovy.completion; + + +import com.intellij.codeInsight.completion.CompletionType +import com.intellij.psi.PsiDocumentManager +import com.intellij.psi.PsiFile +import org.jetbrains.plugins.groovy.util.TestUtils + +/** + * @author peter + */ +public class GroovySmartCompletionTest extends GroovyCompletionTestBase { + @Override + protected String getBasePath() { + return TestUtils.getTestDataPath() + "groovy/completion/smart"; + } + + public void testSmartCompletionAfterNewInDeclaration() throws Throwable { + myFixture.configureByFile(getTestName(false) + ".groovy"); + myFixture.complete(CompletionType.SMART); + assertOrderedEquals(myFixture.getLookupElementStrings(), "Bar", "Foo"); + } + + public void testSmartCompletionAfterNewInDeclarationWithInterface() throws Throwable { doSmartTest(); } + + public void testCaretAfterSmartCompletionAfterNewInDeclaration() throws Throwable { doSmartTest(); } + + public void testSmartCompletionAfterNewInDeclarationWithAbstractClass() throws Throwable { doSmartTest(); } + + public void testSmartCompletionAfterNewInDeclarationWithArray() throws Throwable { doSmartTest(); } + + public void testSmartCompletionAfterNewInDeclarationWithIntArray() throws Throwable { doSmartTest(); } + + public void testShortenNamesInSmartCompletionAfterNewInDeclaration() throws Throwable { doSmartTest(); } + + public void testSmartAfterNewInCall() throws Throwable { doSmartTest(); } + + public void testInnerClassInStaticMethodCompletion() throws Throwable { doSmartTest(); } + + public void testSmartCompletionInAssignmentExpression() throws Throwable { doSmartTest(); } + + public void testSimpleMethodParameter() throws Throwable { + doSmartCompletion("d1", "d2"); + } + + public void testReturnStatement() throws Exception { + doSmartCompletion("b", "b1", "b2", "foo"); + } + + public void testIncSmartCompletion() throws Exception { + doSmartCompletion("a", "b"); + } + + public void testInheritConstructorsAnnotation() throws Throwable { + myFixture.addFileToProject("groovy/transform/InheritConstructors.java", "package groovy.transform;\n" + + "\n" + + "import java.lang.annotation.ElementType;\n" + + "import java.lang.annotation.Retention;\n" + + "import java.lang.annotation.RetentionPolicy;\n" + + "import java.lang.annotation.Target;@Retention(RetentionPolicy.SOURCE)\n" + + "@Target({ElementType.TYPE})\n" + + "public @interface InheritConstructors {\n" + + "}"); + doSmartTest(); + } + + public void testSmartCastCompletion() {doSmartTest();} + public void testSmartCastCompletionWithoutRParenth() {doSmartTest();} + public void testSmartCastCompletionWithRParenth() {doSmartTest();} + + def getFileText(PsiFile file) { + return PsiDocumentManager.getInstance(project).getDocument(file).text + } +} \ No newline at end of file diff --git a/plugins/groovy/testdata/groovy/completion/InnerClassInStaticMethodCompletion.groovy b/plugins/groovy/testdata/groovy/completion/InnerClassInStaticMethodCompletion.groovy deleted file mode 100644 index 02566494e0fd..000000000000 --- a/plugins/groovy/testdata/groovy/completion/InnerClassInStaticMethodCompletion.groovy +++ /dev/null @@ -1,10 +0,0 @@ -class A{ - class Inner { - - } - - static def foo() { - Inner i=new - } - -} \ No newline at end of file diff --git a/plugins/groovy/testdata/groovy/completion/CaretAfterSmartCompletionAfterNewInDeclaration.groovy b/plugins/groovy/testdata/groovy/completion/smart/CaretAfterSmartCompletionAfterNewInDeclaration.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/CaretAfterSmartCompletionAfterNewInDeclaration.groovy rename to plugins/groovy/testdata/groovy/completion/smart/CaretAfterSmartCompletionAfterNewInDeclaration.groovy diff --git a/plugins/groovy/testdata/groovy/completion/CaretAfterSmartCompletionAfterNewInDeclaration_after.groovy b/plugins/groovy/testdata/groovy/completion/smart/CaretAfterSmartCompletionAfterNewInDeclaration_after.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/CaretAfterSmartCompletionAfterNewInDeclaration_after.groovy rename to plugins/groovy/testdata/groovy/completion/smart/CaretAfterSmartCompletionAfterNewInDeclaration_after.groovy diff --git a/plugins/groovy/testdata/groovy/completion/IncSmartCompletion.groovy b/plugins/groovy/testdata/groovy/completion/smart/IncSmartCompletion.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/IncSmartCompletion.groovy rename to plugins/groovy/testdata/groovy/completion/smart/IncSmartCompletion.groovy diff --git a/plugins/groovy/testdata/groovy/completion/InheritConstructorsAnnotation.groovy b/plugins/groovy/testdata/groovy/completion/smart/InheritConstructorsAnnotation.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/InheritConstructorsAnnotation.groovy rename to plugins/groovy/testdata/groovy/completion/smart/InheritConstructorsAnnotation.groovy diff --git a/plugins/groovy/testdata/groovy/completion/InheritConstructorsAnnotation_after.groovy b/plugins/groovy/testdata/groovy/completion/smart/InheritConstructorsAnnotation_after.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/InheritConstructorsAnnotation_after.groovy rename to plugins/groovy/testdata/groovy/completion/smart/InheritConstructorsAnnotation_after.groovy diff --git a/plugins/groovy/testdata/groovy/completion/InnerClassInStaticMethodCompletion_after.groovy b/plugins/groovy/testdata/groovy/completion/smart/InnerClassInStaticMethodCompletion_after.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/InnerClassInStaticMethodCompletion_after.groovy rename to plugins/groovy/testdata/groovy/completion/smart/InnerClassInStaticMethodCompletion_after.groovy diff --git a/plugins/groovy/testdata/groovy/completion/ReturnStatement.groovy b/plugins/groovy/testdata/groovy/completion/smart/ReturnStatement.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/ReturnStatement.groovy rename to plugins/groovy/testdata/groovy/completion/smart/ReturnStatement.groovy diff --git a/plugins/groovy/testdata/groovy/completion/ShortenNamesInSmartCompletionAfterNewInDeclaration.groovy b/plugins/groovy/testdata/groovy/completion/smart/ShortenNamesInSmartCompletionAfterNewInDeclaration.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/ShortenNamesInSmartCompletionAfterNewInDeclaration.groovy rename to plugins/groovy/testdata/groovy/completion/smart/ShortenNamesInSmartCompletionAfterNewInDeclaration.groovy diff --git a/plugins/groovy/testdata/groovy/completion/ShortenNamesInSmartCompletionAfterNewInDeclaration_after.groovy b/plugins/groovy/testdata/groovy/completion/smart/ShortenNamesInSmartCompletionAfterNewInDeclaration_after.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/ShortenNamesInSmartCompletionAfterNewInDeclaration_after.groovy rename to plugins/groovy/testdata/groovy/completion/smart/ShortenNamesInSmartCompletionAfterNewInDeclaration_after.groovy diff --git a/plugins/groovy/testdata/groovy/completion/SimpleMethodParameter.groovy b/plugins/groovy/testdata/groovy/completion/smart/SimpleMethodParameter.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/SimpleMethodParameter.groovy rename to plugins/groovy/testdata/groovy/completion/smart/SimpleMethodParameter.groovy diff --git a/plugins/groovy/testdata/groovy/completion/SmartAfterNewInCall.groovy b/plugins/groovy/testdata/groovy/completion/smart/SmartAfterNewInCall.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/SmartAfterNewInCall.groovy rename to plugins/groovy/testdata/groovy/completion/smart/SmartAfterNewInCall.groovy diff --git a/plugins/groovy/testdata/groovy/completion/SmartAfterNewInCall_after.groovy b/plugins/groovy/testdata/groovy/completion/smart/SmartAfterNewInCall_after.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/SmartAfterNewInCall_after.groovy rename to plugins/groovy/testdata/groovy/completion/smart/SmartAfterNewInCall_after.groovy diff --git a/plugins/groovy/testdata/groovy/completion/SmartCastCompletion.groovy b/plugins/groovy/testdata/groovy/completion/smart/SmartCastCompletion.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/SmartCastCompletion.groovy rename to plugins/groovy/testdata/groovy/completion/smart/SmartCastCompletion.groovy diff --git a/plugins/groovy/testdata/groovy/completion/SmartCastCompletionWithRParenth.groovy b/plugins/groovy/testdata/groovy/completion/smart/SmartCastCompletionWithRParenth.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/SmartCastCompletionWithRParenth.groovy rename to plugins/groovy/testdata/groovy/completion/smart/SmartCastCompletionWithRParenth.groovy diff --git a/plugins/groovy/testdata/groovy/completion/SmartCastCompletionWithRParenth_after.groovy b/plugins/groovy/testdata/groovy/completion/smart/SmartCastCompletionWithRParenth_after.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/SmartCastCompletionWithRParenth_after.groovy rename to plugins/groovy/testdata/groovy/completion/smart/SmartCastCompletionWithRParenth_after.groovy diff --git a/plugins/groovy/testdata/groovy/completion/SmartCastCompletionWithoutRParenth.groovy b/plugins/groovy/testdata/groovy/completion/smart/SmartCastCompletionWithoutRParenth.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/SmartCastCompletionWithoutRParenth.groovy rename to plugins/groovy/testdata/groovy/completion/smart/SmartCastCompletionWithoutRParenth.groovy diff --git a/plugins/groovy/testdata/groovy/completion/SmartCastCompletionWithoutRParenth_after.groovy b/plugins/groovy/testdata/groovy/completion/smart/SmartCastCompletionWithoutRParenth_after.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/SmartCastCompletionWithoutRParenth_after.groovy rename to plugins/groovy/testdata/groovy/completion/smart/SmartCastCompletionWithoutRParenth_after.groovy diff --git a/plugins/groovy/testdata/groovy/completion/SmartCastCompletion_after.groovy b/plugins/groovy/testdata/groovy/completion/smart/SmartCastCompletion_after.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/SmartCastCompletion_after.groovy rename to plugins/groovy/testdata/groovy/completion/smart/SmartCastCompletion_after.groovy diff --git a/plugins/groovy/testdata/groovy/completion/SmartCompletionAfterNewInDeclaration.groovy b/plugins/groovy/testdata/groovy/completion/smart/SmartCompletionAfterNewInDeclaration.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/SmartCompletionAfterNewInDeclaration.groovy rename to plugins/groovy/testdata/groovy/completion/smart/SmartCompletionAfterNewInDeclaration.groovy diff --git a/plugins/groovy/testdata/groovy/completion/SmartCompletionAfterNewInDeclarationWithAbstractClass.groovy b/plugins/groovy/testdata/groovy/completion/smart/SmartCompletionAfterNewInDeclarationWithAbstractClass.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/SmartCompletionAfterNewInDeclarationWithAbstractClass.groovy rename to plugins/groovy/testdata/groovy/completion/smart/SmartCompletionAfterNewInDeclarationWithAbstractClass.groovy diff --git a/plugins/groovy/testdata/groovy/completion/SmartCompletionAfterNewInDeclarationWithAbstractClass_after.groovy b/plugins/groovy/testdata/groovy/completion/smart/SmartCompletionAfterNewInDeclarationWithAbstractClass_after.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/SmartCompletionAfterNewInDeclarationWithAbstractClass_after.groovy rename to plugins/groovy/testdata/groovy/completion/smart/SmartCompletionAfterNewInDeclarationWithAbstractClass_after.groovy diff --git a/plugins/groovy/testdata/groovy/completion/SmartCompletionAfterNewInDeclarationWithArray.groovy b/plugins/groovy/testdata/groovy/completion/smart/SmartCompletionAfterNewInDeclarationWithArray.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/SmartCompletionAfterNewInDeclarationWithArray.groovy rename to plugins/groovy/testdata/groovy/completion/smart/SmartCompletionAfterNewInDeclarationWithArray.groovy diff --git a/plugins/groovy/testdata/groovy/completion/SmartCompletionAfterNewInDeclarationWithArray_after.groovy b/plugins/groovy/testdata/groovy/completion/smart/SmartCompletionAfterNewInDeclarationWithArray_after.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/SmartCompletionAfterNewInDeclarationWithArray_after.groovy rename to plugins/groovy/testdata/groovy/completion/smart/SmartCompletionAfterNewInDeclarationWithArray_after.groovy diff --git a/plugins/groovy/testdata/groovy/completion/SmartCompletionAfterNewInDeclarationWithIntArray.groovy b/plugins/groovy/testdata/groovy/completion/smart/SmartCompletionAfterNewInDeclarationWithIntArray.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/SmartCompletionAfterNewInDeclarationWithIntArray.groovy rename to plugins/groovy/testdata/groovy/completion/smart/SmartCompletionAfterNewInDeclarationWithIntArray.groovy diff --git a/plugins/groovy/testdata/groovy/completion/SmartCompletionAfterNewInDeclarationWithIntArray_after.groovy b/plugins/groovy/testdata/groovy/completion/smart/SmartCompletionAfterNewInDeclarationWithIntArray_after.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/SmartCompletionAfterNewInDeclarationWithIntArray_after.groovy rename to plugins/groovy/testdata/groovy/completion/smart/SmartCompletionAfterNewInDeclarationWithIntArray_after.groovy diff --git a/plugins/groovy/testdata/groovy/completion/SmartCompletionAfterNewInDeclarationWithInterface.groovy b/plugins/groovy/testdata/groovy/completion/smart/SmartCompletionAfterNewInDeclarationWithInterface.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/SmartCompletionAfterNewInDeclarationWithInterface.groovy rename to plugins/groovy/testdata/groovy/completion/smart/SmartCompletionAfterNewInDeclarationWithInterface.groovy diff --git a/plugins/groovy/testdata/groovy/completion/SmartCompletionAfterNewInDeclarationWithInterface_after.groovy b/plugins/groovy/testdata/groovy/completion/smart/SmartCompletionAfterNewInDeclarationWithInterface_after.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/SmartCompletionAfterNewInDeclarationWithInterface_after.groovy rename to plugins/groovy/testdata/groovy/completion/smart/SmartCompletionAfterNewInDeclarationWithInterface_after.groovy diff --git a/plugins/groovy/testdata/groovy/completion/SmartCompletionInAssignmentExpression.groovy b/plugins/groovy/testdata/groovy/completion/smart/SmartCompletionInAssignmentExpression.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/SmartCompletionInAssignmentExpression.groovy rename to plugins/groovy/testdata/groovy/completion/smart/SmartCompletionInAssignmentExpression.groovy diff --git a/plugins/groovy/testdata/groovy/completion/SmartCompletionInAssignmentExpression_after.groovy b/plugins/groovy/testdata/groovy/completion/smart/SmartCompletionInAssignmentExpression_after.groovy similarity index 100% rename from plugins/groovy/testdata/groovy/completion/SmartCompletionInAssignmentExpression_after.groovy rename to plugins/groovy/testdata/groovy/completion/smart/SmartCompletionInAssignmentExpression_after.groovy