From da9bca97f457aec92b36ac5804f2666d88f03cb1 Mon Sep 17 00:00:00 2001 From: Daniil Ovchinnikov Date: Wed, 8 Jun 2016 22:45:14 +0300 Subject: [PATCH] [groovy] tests: implement getBasePath() --- .../plugins/groovy/LightGroovyTestCase.groovy | 2 +- .../jetbrains/plugins/groovy/SetupRule.groovy | 1 - .../groovy/builder/JsonBuilderTest.groovy | 1 - .../builder/StreamingJsonBuilderTest.groovy | 2 +- .../builder/XmlMarkupBuilderTest.groovy | 2 -- .../GrDependencyVisitorTest.groovy | 6 +----- .../MiscBuilderTransformationTest.groovy | 2 -- .../plugins/groovy/dsl/DsldTest.groovy | 19 +++++++++++++++---- .../inspections/GrChangeToOperatorTest.groovy | 1 - .../GrMethodMayBeStaticTest.groovy | 1 - .../GroovyFallthroughInspectionTest.groovy | 16 +++++++++++++++- .../lang/LiteralConstructorUsagesTest.groovy | 6 +----- .../groovy/lang/actions/JoinLineTest.groovy | 3 +-- .../GrAnnotationCollectorTest.groovy | 3 +-- .../GrReturnPointHighlightingTest.groovy | 3 +-- .../GrAliasedImportInheritorsTest.groovy | 2 -- .../GroovyOverrideImplementTest.groovy | 5 ----- .../lang/psi/GrStubAstSwitchTest.groovy | 4 ---- .../resolve/DelegatesToSupportTest.groovy | 1 - .../lang/resolve/GrDocResolveTest.groovy | 3 +-- .../lang/resolve/GroovyResolveTestCase.groovy | 2 -- .../resolve/GroovyTraitCoercionTest.groovy | 1 - .../ResolveAnnotationAttributeTest.groovy | 6 +----- .../lang/resolve/ResolveMethod23Test.groovy | 1 - .../resolve/ResolveWithDelegatesToTest.groovy | 2 -- 25 files changed, 39 insertions(+), 56 deletions(-) diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/LightGroovyTestCase.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/LightGroovyTestCase.groovy index 169aaa9307c3..112cd9330d1d 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/LightGroovyTestCase.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/LightGroovyTestCase.groovy @@ -58,7 +58,7 @@ public abstract class LightGroovyTestCase extends LightCodeInsightFixtureTestCas */ @Override @NonNls - protected abstract String getBasePath(); + protected String getBasePath() { null } protected void addGroovyTransformField() { diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/SetupRule.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/SetupRule.groovy index bed76348d2f3..15ec7c73f199 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/SetupRule.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/SetupRule.groovy @@ -26,7 +26,6 @@ import org.junit.runners.model.Statement class SetupRule implements TestRule { final LightGroovyTestCase testCase = new LightGroovyTestCase() { - String basePath = "" LightProjectDescriptor projectDescriptor = GroovyLightProjectDescriptor.GROOVY_LATEST_REAL_JDK } diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/builder/JsonBuilderTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/builder/JsonBuilderTest.groovy index e075d91d145b..2b2a9e0a5f61 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/builder/JsonBuilderTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/builder/JsonBuilderTest.groovy @@ -32,7 +32,6 @@ import static org.jetbrains.plugins.groovy.GroovyLightProjectDescriptor.GROOVY_L @CompileStatic class JsonBuilderTest extends LightGroovyTestCase { - final String basePath = null final LightProjectDescriptor projectDescriptor = GROOVY_LATEST void 'test highlighting'() { diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/builder/StreamingJsonBuilderTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/builder/StreamingJsonBuilderTest.groovy index ac3be20b8ac6..c7dfea525611 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/builder/StreamingJsonBuilderTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/builder/StreamingJsonBuilderTest.groovy @@ -31,7 +31,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMe @CompileStatic class StreamingJsonBuilderTest extends LightGroovyTestCase { - final String basePath = null + final LightProjectDescriptor projectDescriptor = GroovyLightProjectDescriptor.GROOVY_LATEST void 'test highlighting'() { diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/builder/XmlMarkupBuilderTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/builder/XmlMarkupBuilderTest.groovy index 0ce0d6e7cbc4..e44147d3bb05 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/builder/XmlMarkupBuilderTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/builder/XmlMarkupBuilderTest.groovy @@ -27,8 +27,6 @@ import org.jetbrains.plugins.groovy.lang.psi.impl.synthetic.GrLightMethodBuilder */ class XmlMarkupBuilderTest extends LightGroovyTestCase { - final String basePath = "" - public void testHighlighting() { myFixture.enableInspections(GroovyAssignabilityCheckInspection, GrUnresolvedAccessInspection) myFixture.configureByText "A.groovy", """\ diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/codeInspection/dependencies/GrDependencyVisitorTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/codeInspection/dependencies/GrDependencyVisitorTest.groovy index a83499a1cf17..6800038314ec 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/codeInspection/dependencies/GrDependencyVisitorTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/codeInspection/dependencies/GrDependencyVisitorTest.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2016 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. @@ -22,10 +22,6 @@ import org.jetbrains.plugins.groovy.LightGroovyTestCase @CompileStatic class GrDependencyVisitorTest extends LightGroovyTestCase { - @Override - protected String getBasePath() { - return "" - } void test() { def file = myFixture.addFileToProject("C.groovy", "import groovy.util.ConfigObject\nclass C { }") diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/builder/MiscBuilderTransformationTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/builder/MiscBuilderTransformationTest.groovy index cc287441b6b3..222977be4979 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/builder/MiscBuilderTransformationTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/builder/MiscBuilderTransformationTest.groovy @@ -26,8 +26,6 @@ import org.jetbrains.plugins.groovy.lang.resolve.ast.builder.BuilderAnnotationCo @CompileStatic class MiscBuilderTransformationTest extends LightGroovyTestCase { - final String basePath = null - final LightProjectDescriptor projectDescriptor = GroovyLightProjectDescriptor.GROOVY_LATEST void 'test resolve inner class from java'() { diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/dsl/DsldTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/dsl/DsldTest.groovy index a7e9fbc4410c..af7a111e41df 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/dsl/DsldTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/dsl/DsldTest.groovy @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2016 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.dsl import com.intellij.psi.util.PsiTreeUtil @@ -9,10 +24,6 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrNewExp * @author peter */ class DsldTest extends LightGroovyTestCase { - @Override - protected String getBasePath() { - return '' - } public void testUnknownPointcut() { checkHighlighting "contribute(asdfsadf()) { property name:'foo', type:'String' }", diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/inspections/GrChangeToOperatorTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/inspections/GrChangeToOperatorTest.groovy index 9fdc9a1ecda9..a43d064df88f 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/inspections/GrChangeToOperatorTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/inspections/GrChangeToOperatorTest.groovy @@ -28,7 +28,6 @@ import static org.jetbrains.plugins.groovy.util.TestUtils.CARET_MARKER public class GrChangeToOperatorTest extends LightGroovyTestCase { - final String basePath = null final LightProjectDescriptor projectDescriptor = GroovyLightProjectDescriptor.GROOVY_LATEST def inspection = new ChangeToOperatorInspection() diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/inspections/GrMethodMayBeStaticTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/inspections/GrMethodMayBeStaticTest.groovy index 938ba34cb2e8..395d8c1ed67c 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/inspections/GrMethodMayBeStaticTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/inspections/GrMethodMayBeStaticTest.groovy @@ -27,7 +27,6 @@ import org.jetbrains.plugins.groovy.codeInspection.declaration.GrMethodMayBeStat @CompileStatic public class GrMethodMayBeStaticTest extends LightGroovyTestCase { - final String basePath = null final LightProjectDescriptor projectDescriptor = GroovyLightProjectDescriptor.GROOVY_LATEST final GrMethodMayBeStaticInspection inspection = new GrMethodMayBeStaticInspection() diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/inspections/GroovyFallthroughInspectionTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/inspections/GroovyFallthroughInspectionTest.groovy index 91ccc9668104..d3594ccc6b02 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/inspections/GroovyFallthroughInspectionTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/inspections/GroovyFallthroughInspectionTest.groovy @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2016 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.inspections import org.jetbrains.plugins.groovy.LightGroovyTestCase @@ -7,7 +22,6 @@ import org.jetbrains.plugins.groovy.codeInspection.control.GroovyFallthroughInsp * @author Bas Leijdekkers */ class GroovyFallthroughInspectionTest extends LightGroovyTestCase { - final String basePath = null private void doTest(final String text) { myFixture.configureByText('_.groovy', text) diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/LiteralConstructorUsagesTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/LiteralConstructorUsagesTest.groovy index 6386f060d195..a5788510cbb8 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/LiteralConstructorUsagesTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/LiteralConstructorUsagesTest.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2016 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. @@ -23,10 +23,6 @@ import org.jetbrains.plugins.groovy.LightGroovyTestCase * @author peter */ class LiteralConstructorUsagesTest extends LightGroovyTestCase { - @Override - protected String getBasePath() { - null - } public void testList_AsCast() throws Exception { def foo = myFixture.addClass("""class Foo { diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/actions/JoinLineTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/actions/JoinLineTest.groovy index 934dca39742d..164f1713f7e4 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/actions/JoinLineTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/actions/JoinLineTest.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2016 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. @@ -23,7 +23,6 @@ import org.jetbrains.plugins.groovy.GroovyFileType * @author Max Medvedev */ class JoinLineTest extends GroovyEditorActionTestBase { - final String basePath = null void testVariable() { doTest('''\ diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/aliasAnnotations/GrAnnotationCollectorTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/aliasAnnotations/GrAnnotationCollectorTest.groovy index 90cf16f9f3a3..f6b8ae02f63e 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/aliasAnnotations/GrAnnotationCollectorTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/aliasAnnotations/GrAnnotationCollectorTest.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2016 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. @@ -27,7 +27,6 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefini * @author Max Medvedev */ class GrAnnotationCollectorTest extends LightGroovyTestCase { - final String basePath = null void testAnnotatedAlias() { doTest('''\ diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrReturnPointHighlightingTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrReturnPointHighlightingTest.groovy index d46066e268cc..4d5a81772fef 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrReturnPointHighlightingTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrReturnPointHighlightingTest.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2016 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. @@ -25,7 +25,6 @@ import org.jetbrains.plugins.groovy.LightGroovyTestCase * @author Max Medvedev */ class GrReturnPointHighlightingTest extends LightGroovyTestCase { - final String basePath = null void testReturnPoint1() { doTest('''\ diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/GrAliasedImportInheritorsTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/GrAliasedImportInheritorsTest.groovy index 9896fe1cc1f3..736f293b1f66 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/GrAliasedImportInheritorsTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/GrAliasedImportInheritorsTest.groovy @@ -24,8 +24,6 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefini @CompileStatic class GrAliasedImportInheritorsTest extends LightGroovyTestCase { - final String basePath = null - void 'test aliased import'() { def iface = myFixture.addClass ''' package pckg; diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/GroovyOverrideImplementTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/GroovyOverrideImplementTest.groovy index 21aea5ba36ed..f9eaca179095 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/GroovyOverrideImplementTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/GroovyOverrideImplementTest.groovy @@ -259,9 +259,4 @@ class A implements T { PsiMethod findMethod(String className, String methodName) { return JavaPsiFacade.getInstance(project).findClass(className, GlobalSearchScope.allScope(project)).findMethodsByName(methodName, false)[0] } - - @Override - protected String getBasePath() { - return null - } } diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/psi/GrStubAstSwitchTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/psi/GrStubAstSwitchTest.groovy index e20e9c812ee1..10a16cc3ff4d 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/psi/GrStubAstSwitchTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/psi/GrStubAstSwitchTest.groovy @@ -32,10 +32,6 @@ import org.jetbrains.plugins.groovy.lang.psi.stubs.index.GrAnonymousClassIndex */ @CompileStatic class GrStubAstSwitchTest extends LightGroovyTestCase { - @Override - protected String getBasePath() { - null - } void testDontLoadContentWhenProcessingImports() { GroovyFileImpl file = (GroovyFileImpl)myFixture.addFileToProject("A.groovy", """ diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/DelegatesToSupportTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/DelegatesToSupportTest.groovy index 28437ba863ba..2b165ca8e2cd 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/DelegatesToSupportTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/DelegatesToSupportTest.groovy @@ -25,7 +25,6 @@ import org.jetbrains.plugins.groovy.codeInspection.untypedUnresolvedAccess.GrUnr @CompileStatic class DelegatesToSupportTest extends LightGroovyTestCase { - final String basePath = null final LightProjectDescriptor projectDescriptor = GroovyLightProjectDescriptor.GROOVY_LATEST @Override diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/GrDocResolveTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/GrDocResolveTest.groovy index 55e21d0cc621..ec67e5d35127 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/GrDocResolveTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/GrDocResolveTest.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2016 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. @@ -19,7 +19,6 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrField import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod; public class GrDocResolveTest extends GroovyResolveTestCase { - final String basePath = null void 'test resolve to property from within class'() { resolveByText('''\ diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/GroovyResolveTestCase.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/GroovyResolveTestCase.groovy index 82af65fef7ba..55033283f0d7 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/GroovyResolveTestCase.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/GroovyResolveTestCase.groovy @@ -33,8 +33,6 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrRefere public abstract class GroovyResolveTestCase extends LightGroovyTestCase { @NonNls protected static final String MARKER = ""; - protected String getBasePath() { null } - @Override void setUp() { super.setUp(); diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/GroovyTraitCoercionTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/GroovyTraitCoercionTest.groovy index d43b1264851f..0212dd1d921a 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/GroovyTraitCoercionTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/GroovyTraitCoercionTest.groovy @@ -26,7 +26,6 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMe class GroovyTraitCoercionTest extends GroovyResolveTestCase { - String basePath = null LightProjectDescriptor projectDescriptor = GroovyLightProjectDescriptor.GROOVY_LATEST @Override diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveAnnotationAttributeTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveAnnotationAttributeTest.groovy index 8e5047d9d4d4..cc3d51dacb1f 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveAnnotationAttributeTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveAnnotationAttributeTest.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2016 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. @@ -24,10 +24,6 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMe * @author Max Medvedev */ class ResolveAnnotationAttributeTest extends GroovyResolveTestCase { - @Override - protected String getBasePath() { - return null - } void testSimpleAttribute() { final ref = this.configureByText(''' diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveMethod23Test.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveMethod23Test.groovy index 9b33699d9749..ffb605c95fb1 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveMethod23Test.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveMethod23Test.groovy @@ -21,7 +21,6 @@ import org.jetbrains.plugins.groovy.GroovyLightProjectDescriptor class ResolveMethod23Test extends GroovyResolveTestCase { - final String basePath = null final LightProjectDescriptor projectDescriptor = GroovyLightProjectDescriptor.GROOVY_2_3 void 'test resolve upper bound type method'() { diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveWithDelegatesToTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveWithDelegatesToTest.groovy index 877c32512d87..4c6018cf3ccf 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveWithDelegatesToTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveWithDelegatesToTest.groovy @@ -23,8 +23,6 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrRefere * @author Max Medvedev */ class ResolveWithDelegatesToTest extends LightGroovyTestCase { - @Override - protected String getBasePath() { null } @Override public void setUp() throws Exception {