diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/LightGroovyTestCase.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/LightGroovyTestCase.groovy index 2a5f12742fb8..169aaa9307c3 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/LightGroovyTestCase.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/LightGroovyTestCase.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. @@ -34,6 +34,16 @@ public abstract class LightGroovyTestCase extends LightCodeInsightFixtureTestCas myFixture } + @Override + void setUp() throws Exception { + super.setUp() + } + + @Override + void tearDown() throws Exception { + super.tearDown() + } + @Override @NotNull protected LightProjectDescriptor getProjectDescriptor() { 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 1c743837a030..59bf8f88c706 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 @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 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. @@ -33,7 +33,7 @@ public abstract class GroovyResolveTestCase extends LightGroovyTestCase { @NonNls protected static final String MARKER = ""; @Override - protected void setUp() { + void setUp() { super.setUp(); if (new File("$myFixture.testDataPath/${getTestName(true)}").exists()) { myFixture.copyDirectoryToProject(getTestName(true), ""); diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInferenceTestBase.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInferenceTestBase.groovy index 885b95539a7b..130f49d5a1b7 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInferenceTestBase.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInferenceTestBase.groovy @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 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. @@ -30,7 +30,7 @@ abstract class TypeInferenceTestBase extends GroovyResolveTestCase { final String basePath = TestUtils.testDataPath + "resolve/inference/" @Override - protected void setUp() { + void setUp() { super.setUp() myFixture.addClass("package java.math; public class BigDecimal extends Number implements Comparable {}"); diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/optimizeImports/OptimizeImportsTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/optimizeImports/OptimizeImportsTest.groovy index 45819bfdb88a..d98029d91737 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/optimizeImports/OptimizeImportsTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/optimizeImports/OptimizeImportsTest.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. @@ -35,14 +35,14 @@ public class OptimizeImportsTest extends LightGroovyTestCase { final String basePath = "${TestUtils.testDataPath}optimizeImports/" @Override - protected void setUp() { + void setUp() { super.setUp() CodeInsightSettings.instance.OPTIMIZE_IMPORTS_ON_THE_FLY = true ((CodeInsightTestFixtureImpl)myFixture).canChangeDocumentDuringHighlighting(true) } @Override - protected void tearDown() { + void tearDown() { CodeInsightSettings.instance.OPTIMIZE_IMPORTS_ON_THE_FLY = false super.tearDown() }