diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/Normal8CompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/Normal8CompletionTest.groovy
index 5d1a5594398a..85a07c74b31d 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/Normal8CompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/Normal8CompletionTest.groovy
@@ -258,7 +258,7 @@ class Test88 {
 
   void testNoCollectorsInComment() { doAntiTest() }
 
-  void testNoContinueInsideLambdaInLoop() { doAntiTest(); }
+  void testNoContinueInsideLambdaInLoop() { doAntiTest() }
 
   void testNoSemicolonAfterVoidMethodInLambda() {
     configureByTestName()
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionDfaTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionDfaTest.groovy
index 5e8ba8e934cb..5b94b2dcd043 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionDfaTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionDfaTest.groovy
@@ -26,20 +26,20 @@ class NormalCompletionDfaTest extends LightFixtureCompletionTestCase {
     return JavaTestUtil.getRelativeJavaTestDataPath() + "/codeInsight/completion/normal/"
   }
   
-  void testCastInstanceofedQualifier() { doTest(); }
-  void testCastInstanceofedQualifierInForeach() { doTest(); }
-  void testCastComplexInstanceofedQualifier() { doTest(); }
-  void _testCastIncompleteInstanceofedQualifier() { doTest(); }
+  void testCastInstanceofedQualifier() { doTest() }
+  void testCastInstanceofedQualifierInForeach() { doTest() }
+  void testCastComplexInstanceofedQualifier() { doTest() }
+  void _testCastIncompleteInstanceofedQualifier() { doTest() }
 
   void testCastTooComplexInstanceofedQualifier() { doAntiTest() }
   
-  void testDontCastInstanceofedQualifier() { doTest(); }
-  void testDontCastPartiallyInstanceofedQualifier() { doAntiTest(); }
-  void testQualifierCastingWithUnknownAssignments() { doTest(); }
-  void testQualifierCastingBeforeLt() { doTest(); }
-  void testCastQualifierForPrivateFieldReference() { doTest(); }
-  void testOrAssignmentDfa() { doTest(); }
-  void testFieldWithCastingCaret() { doTest(); }
+  void testDontCastInstanceofedQualifier() { doTest() }
+  void testDontCastPartiallyInstanceofedQualifier() { doAntiTest() }
+  void testQualifierCastingWithUnknownAssignments() { doTest() }
+  void testQualifierCastingBeforeLt() { doTest() }
+  void testCastQualifierForPrivateFieldReference() { doTest() }
+  void testOrAssignmentDfa() { doTest() }
+  void testFieldWithCastingCaret() { doTest() }
 
   void testCastTwice() {
     configureByTestName()
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
index 9b79665779e5..423fd084fde5 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
@@ -204,9 +204,9 @@ class NormalCompletionTest extends LightFixtureCompletionTestCase {
     assertTrue("Exception not found", Arrays.binarySearch(myItems, "xxx") > 0)
   }
 
-  void testClassLiteralInArrayAnnoInitializer() throws Throwable { doTest(); }
+  void testClassLiteralInArrayAnnoInitializer() throws Throwable { doTest() }
 
-  void testClassLiteralInArrayAnnoInitializer2() throws Throwable { doTest(); }
+  void testClassLiteralInArrayAnnoInitializer2() throws Throwable { doTest() }
 
   void testReferenceParameters() throws Exception {
     configureByFile("ReferenceParameters.java")
@@ -398,13 +398,13 @@ class NormalCompletionTest extends LightFixtureCompletionTestCase {
    checkResult()
   }
 
-  void testFieldType() { doTest(); }
+  void testFieldType() { doTest() }
 
   void testPackageInAnnoParam() throws Throwable {
     doTest()
   }
 
-  void testAnonymousTypeParameter() throws Throwable { doTest(); }
+  void testAnonymousTypeParameter() throws Throwable { doTest() }
 
   void testClassLiteralInAnnoParam() throws Throwable {
     doTest()
@@ -473,9 +473,9 @@ public class Outer {
     doTest('\n')
   }
 
-  void testLocalClassName() throws Throwable { doTest(); }
+  void testLocalClassName() throws Throwable { doTest() }
 
-  void testAssigningFieldForTheFirstTime() throws Throwable { doTest(); }
+  void testAssigningFieldForTheFirstTime() throws Throwable { doTest() }
 
   void testClassTypeParameters() throws Throwable {
     configure()
@@ -538,9 +538,9 @@ public class Outer {
     doTest()
   }
 
-  void testBreakInIfCondition() throws Throwable { doTest(); }
+  void testBreakInIfCondition() throws Throwable { doTest() }
 
-  void testAccessStaticViaInstance() throws Throwable { doTest(); }
+  void testAccessStaticViaInstance() throws Throwable { doTest() }
 
   void testIfConditionLt() {
     configure()
@@ -559,7 +559,7 @@ public class Outer {
     checkResult()
   }
 
-  void testContinueLabel() throws Throwable { doTest(); }
+  void testContinueLabel() throws Throwable { doTest() }
 
   void testAnonymousProcess() {
     myFixture.addClass 'package java.lang; public class Process {}'
@@ -584,7 +584,7 @@ public class ListUtils {
     assert !('null' in myFixture.lookupElementStrings)
   }
 
-  void testLastExpressionInFor() throws Throwable { doTest(); }
+  void testLastExpressionInFor() throws Throwable { doTest() }
 
   void testOnlyKeywordsInsideSwitch() throws Throwable {
     configureByFile(getTestName(false) + ".java")
@@ -621,7 +621,7 @@ public class ListUtils {
     checkResult()
   }
 
-  void testEnclosingThis() throws Throwable { doTest(); }
+  void testEnclosingThis() throws Throwable { doTest() }
 
   void testSeamlessConstant() throws Throwable {
     configureByFile(getTestName(false) + ".java")
@@ -629,7 +629,7 @@ public class ListUtils {
     checkResult()
   }
 
-  void testDefaultAnnoParam() throws Throwable { doTest(); }
+  void testDefaultAnnoParam() throws Throwable { doTest() }
 
   void testSpaceAfterLookupString() throws Throwable {
     configureByFile(getTestName(false) + ".java")
@@ -684,7 +684,7 @@ public class ListUtils {
     doTest()
   }
 
-  void testInnerEnumConstant() throws Throwable { doTest('\n'); }
+  void testInnerEnumConstant() throws Throwable { doTest('\n') }
 
   void testNoExpectedReturnTypeDuplication() {
     configure()
@@ -717,15 +717,15 @@ public class ListUtils {
     doTest()
   }
 
-  void testNothingAfterNumericLiteral() throws Throwable { doAntiTest(); }
+  void testNothingAfterNumericLiteral() throws Throwable { doAntiTest() }
 
-  void testNothingAfterTypeParameterQualifier() { doAntiTest(); }
+  void testNothingAfterTypeParameterQualifier() { doAntiTest() }
 
-  void testExcludeVariableBeingDeclared() { doAntiTest(); }
+  void testExcludeVariableBeingDeclared() { doAntiTest() }
 
-  void testExcludeVariableBeingDeclared2() { doAntiTest(); }
+  void testExcludeVariableBeingDeclared2() { doAntiTest() }
 
-  void testSpacesAroundEq() throws Throwable { doTest('='); }
+  void testSpacesAroundEq() throws Throwable { doTest('=') }
 
   void _testClassBeforeCast() throws Throwable { doTest '\n' }
 
@@ -755,7 +755,7 @@ public class ListUtils {
     checkResult()
   }
 
-  void testFieldNegation() throws Throwable { doTest('!'); }
+  void testFieldNegation() throws Throwable { doTest('!') }
 
   void testDefaultInSwitch() throws Throwable { doTest() }
 
@@ -797,11 +797,11 @@ public class ListUtils {
     doTest()
   }
 
-  void testSecondMethodParameter() throws Throwable { doTest(); }
+  void testSecondMethodParameter() throws Throwable { doTest() }
 
-  void testReturnInCase() throws Throwable { doTest(); }
+  void testReturnInCase() throws Throwable { doTest() }
 
-  void testUnboxedConstantsInCase() throws Throwable { doTest(); }
+  void testUnboxedConstantsInCase() throws Throwable { doTest() }
 
   void testAnnotationWithoutValueMethod() throws Throwable {
     configureByFile(getTestName(false) + ".java")
@@ -858,13 +858,13 @@ public class ListUtils {
     doTest()
   }
 
-  void testNoSemicolonAfterExistingParenthesesEspeciallyIfItsACast() throws Throwable { doTest(); }
+  void testNoSemicolonAfterExistingParenthesesEspeciallyIfItsACast() throws Throwable { doTest() }
 
-  void testReturningTypeVariable() throws Throwable { doTest(); }
+  void testReturningTypeVariable() throws Throwable { doTest() }
 
-  void testReturningTypeVariable2() throws Throwable { doTest(); }
+  void testReturningTypeVariable2() throws Throwable { doTest() }
 
-  void testReturningTypeVariable3() throws Throwable { doTest(); }
+  void testReturningTypeVariable3() throws Throwable { doTest() }
 
   void testImportInGenericType() throws Throwable {
     configure()
@@ -873,7 +873,7 @@ public class ListUtils {
     checkResult()
   }
 
-  void testCaseTailType() throws Throwable { doTest(); }
+  void testCaseTailType() throws Throwable { doTest() }
 
   def doPrimitiveTypeTest() {
     configure()
@@ -963,7 +963,7 @@ public class ListUtils {
     checkResult()
   }
 
-  void testSecondAnonymousClassParameter() { doTest(); }
+  void testSecondAnonymousClassParameter() { doTest() }
 
   void testSpaceAfterReturn() throws Throwable {
     configure()
@@ -980,7 +980,7 @@ public class ListUtils {
     assertStringItems "fooa", "foob"
   }
 
-  void testNoReturnInTernary() throws Throwable { doTest(); }
+  void testNoReturnInTernary() throws Throwable { doTest() }
 
   void testWildcardsInLookup() throws Exception {
     configure()
@@ -999,11 +999,11 @@ public class ListUtils {
 
   void testSmartEnterInsideArrayBrackets() { doTest(Lookup.COMPLETE_STATEMENT_SELECT_CHAR as String) }
 
-  void testTabReplacesMethodNameWithLocalVariableName() throws Throwable { doTest('\t'); }
+  void testTabReplacesMethodNameWithLocalVariableName() throws Throwable { doTest('\t') }
 
-  void testMethodParameterAnnotationClass() throws Throwable { doTest(); }
+  void testMethodParameterAnnotationClass() throws Throwable { doTest() }
 
-  void testInnerAnnotation() { doTest('\n'); }
+  void testInnerAnnotation() { doTest('\n') }
 
   void testPrimitiveCastOverwrite() throws Throwable { doTest() }
 
@@ -1016,11 +1016,11 @@ public class ListUtils {
     doTest ' '
   }
 
-  void testEnumConstantFromEnumMember() throws Throwable { doTest(); }
+  void testEnumConstantFromEnumMember() throws Throwable { doTest() }
 
-  void testPrimitiveMethodParameter() throws Throwable { doTest(); }
+  void testPrimitiveMethodParameter() throws Throwable { doTest() }
 
-  void testNewExpectedClassParens() throws Throwable { doTest('\n'); }
+  void testNewExpectedClassParens() throws Throwable { doTest('\n') }
 
   void testQualifyInnerMembers() throws Throwable { doTest('\n') }
 
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionDfaTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionDfaTest.groovy
index a68254f2e4c2..6e4bc2b3d4d6 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionDfaTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionDfaTest.groovy
@@ -53,26 +53,26 @@ class SmartTypeCompletionDfaTest extends LightFixtureCompletionTestCase {
     checkResultByTestName()
   }
 
-  void testSuggestCastedValueAfterCast() { doTest(); }
+  void testSuggestCastedValueAfterCast() { doTest() }
 
   void testSuggestInstanceofedValue() { doTest() }
 
   void testSuggestInstanceofedValueInTernary() { doTest() }
 
-  void testSuggestInstanceofedValueInComplexIf() { doTest(); }
+  void testSuggestInstanceofedValueInComplexIf() { doTest() }
 
-  void testSuggestInstanceofedValueInElseNegated() { doTest(); }
+  void testSuggestInstanceofedValueInElseNegated() { doTest() }
 
-  void testSuggestInstanceofedValueAfterReturn() { doTest(); }
+  void testSuggestInstanceofedValueAfterReturn() { doTest() }
 
-  void testNoInstanceofedValueWhenBasicSuits() { doTest(); }
+  void testNoInstanceofedValueWhenBasicSuits() { doTest() }
 
-  void testNoInstanceofedValueInElse() { doAntiTest(); }
+  void testNoInstanceofedValueInElse() { doAntiTest() }
 
-  void testNoInstanceofedValueInThenNegated() { doAntiTest(); }
+  void testNoInstanceofedValueInThenNegated() { doAntiTest() }
 
-  void testNoInstanceofedValueInElseWithComplexIf() { doAntiTest(); }
+  void testNoInstanceofedValueInElseWithComplexIf() { doAntiTest() }
 
-  void testInstanceofedInsideAnonymous() { doTest(); }
+  void testInstanceofedInsideAnonymous() { doTest() }
 
 }
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateMethodFromUsageTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateMethodFromUsageTest.groovy
index 16f7a11ab97e..b14bff76924d 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateMethodFromUsageTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateMethodFromUsageTest.groovy
@@ -29,7 +29,7 @@ import com.intellij.psi.util.PsiTreeUtil
  * @author ven
  */
 class CreateMethodFromUsageTest extends LightQuickFixTestCase {
-  void test() throws Exception { doAllTests(); }
+  void test() throws Exception { doAllTests() }
 
   void testTemplateAssertions() throws Exception {
     configureFromFileText "a.java", """
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/template/LiveTemplateTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/template/LiveTemplateTest.groovy
index 39a6009d79cd..cd11766ed703 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/template/LiveTemplateTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/template/LiveTemplateTest.groovy
@@ -1128,7 +1128,7 @@ class Foo {
     ((TemplateImpl)template).templateContext.setEnabled(contextType(JavaCodeContextType.class), true)
     CodeInsightTestUtil.addTemplate(template, testRootDisposable)
 
-    writeCommand { startTemplate(template); }
+    writeCommand { startTemplate(template) }
     myFixture.checkResult """\
 class Foo {
   {
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyDslExecutor.groovy b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyDslExecutor.groovy
index abddce3fedc1..0a218f9c0946 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyDslExecutor.groovy
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyDslExecutor.groovy
@@ -72,7 +72,7 @@ class GroovyDslExecutor {
     use(cats) { generator.with closure }
   }
 
-  String toString() { "${super.toString()}; file = $myFileName"; }
+  String toString() { "${super.toString()}; file = $myFileName" }
 
   static GroovyDslExecutor createAndRunExecutor(String text, String fileName) {
     def configuration = new CompilerConfiguration()
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyActionsTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyActionsTest.groovy
index 219abd1a1f7f..6f41ee80020d 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyActionsTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyActionsTest.groovy
@@ -84,7 +84,7 @@ asdf $b sfsasdf
 
   void testSWInGStringEnd() { doTestSelectWordUpTo 2 }
 
-  void testSWInParameterList() { doTestForSelectWord(3); }
+  void testSWInParameterList() { doTestForSelectWord(3) }
 
   void testSWInArgLabel1() { doTestForSelectWord(2) }
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GrCompletionWithLibraryTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GrCompletionWithLibraryTest.groovy
index e43b2b6b78a7..93411a9a05d8 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GrCompletionWithLibraryTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GrCompletionWithLibraryTest.groovy
@@ -59,27 +59,27 @@ class GrCompletionWithLibraryTest extends GroovyCompletionTestBase {
 
   void testCategoryForArray() { doCompletionTest(null, null, '\n', CompletionType.BASIC) }
 
-  void testArrayLikeAccessForList() throws Throwable { doBasicTest(); }
+  void testArrayLikeAccessForList() throws Throwable { doBasicTest() }
 
-  void testArrayLikeAccessForMap() throws Throwable { doBasicTest(); }
+  void testArrayLikeAccessForMap() throws Throwable { doBasicTest() }
 
-  void testEachMethodForList() throws Throwable { doBasicTest(); }
+  void testEachMethodForList() throws Throwable { doBasicTest() }
 
-  void testEachMethodForMapWithKeyValue() throws Throwable { doBasicTest(); }
+  void testEachMethodForMapWithKeyValue() throws Throwable { doBasicTest() }
 
-  void testEachMethodForMapWithEntry() throws Throwable { doBasicTest(); }
+  void testEachMethodForMapWithEntry() throws Throwable { doBasicTest() }
 
-  void testWithMethod() throws Throwable { doBasicTest(); }
+  void testWithMethod() throws Throwable { doBasicTest() }
 
-  void testInjectMethodForCollection() throws Throwable { doBasicTest(); }
+  void testInjectMethodForCollection() throws Throwable { doBasicTest() }
 
-  void testInjectMethodForArray() throws Throwable { doBasicTest(); }
+  void testInjectMethodForArray() throws Throwable { doBasicTest() }
 
-  void testInjectMethodForMap() throws Throwable { doBasicTest(); }
+  void testInjectMethodForMap() throws Throwable { doBasicTest() }
 
-  void testClosureDefaultParameterInEachMethod() throws Throwable { doBasicTest(); }
+  void testClosureDefaultParameterInEachMethod() throws Throwable { doBasicTest() }
 
-  void testEachMethodForRanges() throws Throwable { doBasicTest(); }
+  void testEachMethodForRanges() throws Throwable { doBasicTest() }
 
   void testEachMethodForEnumRanges() throws Throwable {
     myFixture.configureByFile(getTestName(false) + ".groovy")
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyClassNameCompletionTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyClassNameCompletionTest.groovy
index fdeabb198ff2..2ff8c14500bb 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyClassNameCompletionTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyClassNameCompletionTest.groovy
@@ -48,9 +48,9 @@ class GroovyClassNameCompletionTest extends LightCodeInsightFixtureTestCase {
     myFixture.addClass("package $packageName; public class $name {}")
   }
 
-  void testInFieldDeclaration() throws Exception { doTest(); }
+  void testInFieldDeclaration() throws Exception { doTest() }
 
-  void testInParameter() throws Exception { doTest(); }
+  void testInParameter() throws Exception { doTest() }
 
   void testInImport() throws Exception {
     addClassToProject("a", "FooBar")
@@ -70,11 +70,11 @@ class GroovyClassNameCompletionTest extends LightCodeInsightFixtureTestCase {
     myFixture.checkResultByFile(getTestName(false) + "_after.groovy")
   }
 
-  void testInComment() throws Exception { doTest(); }
+  void testInComment() throws Exception { doTest() }
 
-  void testInTypeElementPlace() throws Exception { doTest(); }
+  void testInTypeElementPlace() throws Exception { doTest() }
 
-  void testWhenImportExists() throws Exception { doTest(); }
+  void testWhenImportExists() throws Exception { doTest() }
 
   void testFinishByDot() throws Exception {
     addClassToProject("a", "FooBar")
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
index 3b557f845e66..af1e3eefa40c 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
@@ -213,9 +213,9 @@ class Foo<A, B> {
 
   void testWhileInstanceof() { doBasicTest() }
 
-  void testCompletionInParameterListInClosableBlock() { doBasicTest(); }
+  void testCompletionInParameterListInClosableBlock() { doBasicTest() }
 
-  void testCompletionInParameterListInClosableBlock3() { doBasicTest(); }
+  void testCompletionInParameterListInClosableBlock3() { doBasicTest() }
 
   void testCompletionInParameterListInClosableBlock2() {
     myFixture.testCompletionVariants(getTestName(false) + ".groovy", "aDouble")
@@ -262,9 +262,9 @@ class Foo<A, B> {
     assert presentation.typeText == 'Integer'
   }
 
-  void testIntCompletionInPlusMethod() { doBasicTest(); }
+  void testIntCompletionInPlusMethod() { doBasicTest() }
 
-  void testIntCompletionInGenericParameter() { doBasicTest(); }
+  void testIntCompletionInGenericParameter() { doBasicTest() }
 
   void testWhenSiblingIsStaticallyImported_Method() {
     myFixture.addFileToProject "foo/Foo.groovy", """package foo
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovySmartCompletionTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovySmartCompletionTest.groovy
index 22831012d383..0486f27d5adc 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovySmartCompletionTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovySmartCompletionTest.groovy
@@ -33,21 +33,21 @@ class GroovySmartCompletionTest extends GroovyCompletionTestBase {
     assertOrderedEquals(myFixture.lookupElementStrings, "Bar", "Foo")
   }
 
-  void testCaretAfterSmartCompletionAfterNewInDeclaration() throws Throwable { doSmartTest(); }
+  void testCaretAfterSmartCompletionAfterNewInDeclaration() throws Throwable { doSmartTest() }
 
-  void testSmartCompletionAfterNewInDeclarationWithArray() throws Throwable { doSmartTest(); }
+  void testSmartCompletionAfterNewInDeclarationWithArray() throws Throwable { doSmartTest() }
 
-  void testSmartCompletionAfterNewInDeclarationWithIntArray() throws Throwable { doSmartTest(); }
+  void testSmartCompletionAfterNewInDeclarationWithIntArray() throws Throwable { doSmartTest() }
 
-  void testShortenNamesInSmartCompletionAfterNewInDeclaration() throws Throwable { doSmartTest(); }
+  void testShortenNamesInSmartCompletionAfterNewInDeclaration() throws Throwable { doSmartTest() }
 
-  void testSmartAfterNewInCall() throws Throwable { doSmartTest(); }
+  void testSmartAfterNewInCall() throws Throwable { doSmartTest() }
 
   void testInnerClassInStaticMethodCompletion() throws Throwable {
     doVariantableTest(null, "", CompletionType.SMART, CompletionResult.notContain, 'Inner')
   }
 
-  void testSmartCompletionInAssignmentExpression() throws Throwable { doSmartTest(); }
+  void testSmartCompletionInAssignmentExpression() throws Throwable { doSmartTest() }
 
   void testSimpleMethodParameter() throws Throwable {
     doSmartCompletion("d1", "d2")
@@ -74,11 +74,11 @@ class GroovySmartCompletionTest extends GroovyCompletionTestBase {
     doSmartTest()
   }
 
-  void testSmartCastCompletion() { doSmartTest(); }
+  void testSmartCastCompletion() { doSmartTest() }
 
-  void testSmartCastCompletionWithoutRParenth() { doSmartTest(); }
+  void testSmartCastCompletionWithoutRParenth() { doSmartTest() }
 
-  void testSmartCastCompletionWithRParenth() { doSmartTest(); }
+  void testSmartCastCompletionWithRParenth() { doSmartTest() }
 
   void testDontCompletePrivateMembers() { doSmartCompletion "foo1", "foo2", "getFoo1", "getFoo2" }
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/CreateParameterForFieldTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/CreateParameterForFieldTest.groovy
index ebf7d7d49d9a..edfd1eeba73a 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/CreateParameterForFieldTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/CreateParameterForFieldTest.groovy
@@ -26,9 +26,9 @@ class CreateParameterForFieldTest extends GrIntentionTestCase {
     return TestUtils.getTestDataPath() + "intentions/createParameterForField/"
   }
 
-  void testFromConstructor() { doTest(); }
+  void testFromConstructor() { doTest() }
 
-  void testFromField() { doTest(); }
+  void testFromField() { doTest() }
 
   protected void doTest() {
     doTest("Add constructor parameter for field", true)
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyEditingTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyEditingTest.groovy
index 01097aad4059..9a198e069429 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyEditingTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyEditingTest.groovy
@@ -48,25 +48,25 @@ class GroovyEditingTest extends LightCodeInsightFixtureTestCase {
     }
   }
 
-  void testCodeBlockRightBrace() throws Throwable { doTest('{'); }
+  void testCodeBlockRightBrace() throws Throwable { doTest('{') }
 
-  void testInterpolationInsideStringRightBrace() throws Throwable { doTest('{'); }
+  void testInterpolationInsideStringRightBrace() throws Throwable { doTest('{') }
 
-  void testStructuralInterpolationInsideStringRightBrace() throws Throwable { doTest('{'); }
+  void testStructuralInterpolationInsideStringRightBrace() throws Throwable { doTest('{') }
 
-  void testEnterInMultilineString() throws Throwable { doTest('\n'); }
+  void testEnterInMultilineString() throws Throwable { doTest('\n') }
 
-  void testEnterInStringInRefExpr() throws Throwable { doTest('\n'); }
+  void testEnterInStringInRefExpr() throws Throwable { doTest('\n') }
 
-  void testEnterInGStringInRefExpr() throws Throwable { doTest('\n'); }
+  void testEnterInGStringInRefExpr() throws Throwable { doTest('\n') }
 
-  void testPairAngleBracketAfterClassName() throws Throwable { doTest('<'); }
+  void testPairAngleBracketAfterClassName() throws Throwable { doTest('<') }
 
-  void testPairAngleBracketAfterClassNameOvertype() throws Throwable { doTest('>'); }
+  void testPairAngleBracketAfterClassNameOvertype() throws Throwable { doTest('>') }
 
-  void testPairAngleBracketAfterClassNameBackspace() throws Throwable { doTest('\b'); }
+  void testPairAngleBracketAfterClassNameBackspace() throws Throwable { doTest('\b') }
 
-  void testNoPairLess() throws Throwable { doTest('<'); }
+  void testNoPairLess() throws Throwable { doTest('<') }
 
   void testTripleString() {
     doTest('', "'''", "'''<caret>'''")
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/MissingReturnTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/MissingReturnTest.groovy
index 1b9afd27f0e4..2f85b6c51658 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/MissingReturnTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/MissingReturnTest.groovy
@@ -30,41 +30,41 @@ class MissingReturnTest extends LightGroovyTestCase {
     return "${TestUtils.testDataPath}highlighting/missingReturn"
   }
 
-  void testMissingReturnWithLastLoop() throws Throwable { doTest(); }
+  void testMissingReturnWithLastLoop() throws Throwable { doTest() }
 
-  void testMissingReturnWithUnknownCall() throws Throwable { doTest(); }
+  void testMissingReturnWithUnknownCall() throws Throwable { doTest() }
 
-  void testMissingReturnWithIf() throws Throwable { doTest(); }
+  void testMissingReturnWithIf() throws Throwable { doTest() }
 
-  void testMissingReturnWithAssertion() throws Throwable { doTest(); }
+  void testMissingReturnWithAssertion() throws Throwable { doTest() }
 
-  void testMissingReturnThrowException() throws Throwable { doTest(); }
+  void testMissingReturnThrowException() throws Throwable { doTest() }
 
-  void testMissingReturnTryCatch() throws Throwable { doTest(); }
+  void testMissingReturnTryCatch() throws Throwable { doTest() }
 
-  void testMissingReturnLastNull() throws Throwable { doTest(); }
+  void testMissingReturnLastNull() throws Throwable { doTest() }
 
-  void testMissingReturnImplicitReturns() throws Throwable { doTest(); }
+  void testMissingReturnImplicitReturns() throws Throwable { doTest() }
 
-  void testMissingReturnOvertReturnType() throws Throwable { doTest(); }
+  void testMissingReturnOvertReturnType() throws Throwable { doTest() }
 
-  void testMissingReturnFromClosure() throws Throwable { doTest(); }
+  void testMissingReturnFromClosure() throws Throwable { doTest() }
 
-  void testReturnsWithoutValue() throws Throwable { doTest(); }
+  void testReturnsWithoutValue() throws Throwable { doTest() }
 
-  void testEndlessLoop() throws Throwable { doTest(); }
+  void testEndlessLoop() throws Throwable { doTest() }
 
-  void testEndlessLoop2() throws Throwable { doTest(); }
+  void testEndlessLoop2() throws Throwable { doTest() }
 
-  void testExceptionWithFinally() throws Throwable { doTest(); }
+  void testExceptionWithFinally() throws Throwable { doTest() }
 
-  void testOnlyAssert() throws Throwable { doTest(); }
+  void testOnlyAssert() throws Throwable { doTest() }
 
-  void testImplicitReturnNull() throws Throwable { doTest(); }
+  void testImplicitReturnNull() throws Throwable { doTest() }
 
-  void testMissingReturnInClosure() { doTest(); }
+  void testMissingReturnInClosure() { doTest() }
 
-  void testFinally() { doTest(); }
+  void testFinally() { doTest() }
 
   void testClosureWithExplicitExpectedType() { doTest() }
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/controlFlow/ControlFlowTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/controlFlow/ControlFlowTest.groovy
index 41e7ba259057..60d95884620c 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/controlFlow/ControlFlowTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/controlFlow/ControlFlowTest.groovy
@@ -32,35 +32,35 @@ import org.jetbrains.plugins.groovy.util.TestUtils
 class ControlFlowTest extends LightCodeInsightFixtureTestCase {
   final String basePath = TestUtils.testDataPath + "groovy/controlFlow/"
 
-  void testAssignment() { doTest(); }
+  void testAssignment() { doTest() }
 
-  void testClosure1() { doTest(); }
+  void testClosure1() { doTest() }
 
-  void testComplexAssign() { doTest(); }
+  void testComplexAssign() { doTest() }
 
-  void testFor1() { doTest(); }
+  void testFor1() { doTest() }
 
-  void testForeach1() { doTest(); }
+  void testForeach1() { doTest() }
 
-  void testGrvy1497() { doTest(); }
+  void testGrvy1497() { doTest() }
 
-  void testIf1() { doTest(); }
+  void testIf1() { doTest() }
 
-  void testMultipleAssignment() { doTest(); }
+  void testMultipleAssignment() { doTest() }
 
-  void testNested() { doTest(); }
+  void testNested() { doTest() }
 
-  void testReturn() { doTest(); }
+  void testReturn() { doTest() }
 
-  void testSwitch1() { doTest(); }
+  void testSwitch1() { doTest() }
 
-  void testSwitch2() { doTest(); }
+  void testSwitch2() { doTest() }
 
-  void testSwitch3() { doTest(); }
+  void testSwitch3() { doTest() }
 
-  void testSwitch4() { doTest(); }
+  void testSwitch4() { doTest() }
 
-  void testSwitch5() { doTest(); }
+  void testSwitch5() { doTest() }
 
   void testNestedSwitch1() { doTest() }
 
@@ -76,51 +76,51 @@ class ControlFlowTest extends LightCodeInsightFixtureTestCase {
 
   void testForWithinSwitchWithinFor() { doTest() }
 
-  void testThrow1() { doTest(); }
+  void testThrow1() { doTest() }
 
-  void testThrowInCatch() { doTest(); }
+  void testThrowInCatch() { doTest() }
 
-  void testTry1() { doTest(); }
+  void testTry1() { doTest() }
 
-  void testTry2() { doTest(); }
+  void testTry2() { doTest() }
 
-  void testTry3() { doTest(); }
+  void testTry3() { doTest() }
 
-  void testTry4() { doTest(); }
+  void testTry4() { doTest() }
 
-  void testTry5() { doTest(); }
+  void testTry5() { doTest() }
 
-  void testTry6() { doTest(); }
+  void testTry6() { doTest() }
 
-  void testTry7() { doTest(); }
+  void testTry7() { doTest() }
 
-  void testTry8() { doTest(); }
+  void testTry8() { doTest() }
 
-  void testTry9() { doTest(); }
+  void testTry9() { doTest() }
 
-  void testTry10() { doTest(); }
+  void testTry10() { doTest() }
 
-  void testWhile1() { doTest(); }
+  void testWhile1() { doTest() }
 
-  void testWhile2() { doTest(); }
+  void testWhile2() { doTest() }
 
-  void testWhileNonConstant() { doTest(); }
+  void testWhileNonConstant() { doTest() }
 
-  void testIfInstanceofElse() { doTest(); }
+  void testIfInstanceofElse() { doTest() }
 
-  void testReturnMapFromClosure() { doTest(); }
+  void testReturnMapFromClosure() { doTest() }
 
-  void testSwitchInTryWithThrows() { doTest(); }
+  void testSwitchInTryWithThrows() { doTest() }
 
-  void testClosure() { doTest(); }
+  void testClosure() { doTest() }
 
-  void testAnonymous() { doTest(); }
+  void testAnonymous() { doTest() }
 
-  void testSomeCatches() { doTest(); }
+  void testSomeCatches() { doTest() }
 
-  void testOrInReturn() { doTest(); }
+  void testOrInReturn() { doTest() }
 
-  void testVarInString() { doTest(); }
+  void testVarInString() { doTest() }
 
   void testMayBeStaticWithCondition() { doTest() }
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/EnterActionTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/EnterActionTest.groovy
index 1c840a127972..4106bdaa233b 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/EnterActionTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/EnterActionTest.groovy
@@ -37,105 +37,105 @@ class EnterActionTest extends GroovyFormatterTestCase {
     myFixture.type('\n' as char)
   }
 
-  void testClos1() throws Throwable { doTest(); }
+  void testClos1() throws Throwable { doTest() }
 
-  void testClos2() throws Throwable { doTest(); }
+  void testClos2() throws Throwable { doTest() }
 
-  void testComment1() throws Throwable { doTest(); }
+  void testComment1() throws Throwable { doTest() }
 
-  void testComment2() throws Throwable { doTest(); }
+  void testComment2() throws Throwable { doTest() }
 
-  void testComment3() throws Throwable { doTest(); }
+  void testComment3() throws Throwable { doTest() }
 
-  void testComment4() throws Throwable { doTest(); }
+  void testComment4() throws Throwable { doTest() }
 
-  void testDef() throws Throwable { doTest(); }
+  void testDef() throws Throwable { doTest() }
 
-  void testDef2() throws Throwable { doTest(); }
+  void testDef2() throws Throwable { doTest() }
 
-  void testGdoc1() throws Throwable { doTest(); }
+  void testGdoc1() throws Throwable { doTest() }
 
-  void testGdoc2() throws Throwable { doTest(); }
+  void testGdoc2() throws Throwable { doTest() }
 
-  void testGdoc3() throws Throwable { doTest(); }
+  void testGdoc3() throws Throwable { doTest() }
 
-  void testGdoc4() throws Throwable { doTest(); }
+  void testGdoc4() throws Throwable { doTest() }
 
-  void testGdoc5() throws Throwable { doTest(); }
+  void testGdoc5() throws Throwable { doTest() }
 
-  void testGdoc6() throws Throwable { doTest(); }
+  void testGdoc6() throws Throwable { doTest() }
 
-  void testGdoc7() throws Throwable { doTest(); }
+  void testGdoc7() throws Throwable { doTest() }
 
-  void testGdoc8() throws Throwable { doTest(); }
+  void testGdoc8() throws Throwable { doTest() }
 
-  void testGdoc9() throws Throwable { doTest(); }
+  void testGdoc9() throws Throwable { doTest() }
 
-  void testGdoc10() throws Throwable { doTest(); }
+  void testGdoc10() throws Throwable { doTest() }
 
-  void testGdoc11() throws Throwable { doTest(); }
+  void testGdoc11() throws Throwable { doTest() }
 
-  void testBuildGdocPrecededByGNewLine() throws Throwable { doTest(); }
+  void testBuildGdocPrecededByGNewLine() throws Throwable { doTest() }
 
-  void testGRVY_953() throws Throwable { doTest(); }
+  void testGRVY_953() throws Throwable { doTest() }
 
-  void testGstring1() throws Throwable { doTest(); }
+  void testGstring1() throws Throwable { doTest() }
 
-  void testGstring10() throws Throwable { doTest(); }
+  void testGstring10() throws Throwable { doTest() }
 
-  void testGstring11() throws Throwable { doTest(); }
+  void testGstring11() throws Throwable { doTest() }
 
-  void testGstring12() throws Throwable { doTest(); }
+  void testGstring12() throws Throwable { doTest() }
 
-  void testGstring13() throws Throwable { doTest(); }
+  void testGstring13() throws Throwable { doTest() }
 
-  void testGstring14() throws Throwable { doTest(); }
+  void testGstring14() throws Throwable { doTest() }
 
-  void testGstring15() throws Throwable { doTest(); }
+  void testGstring15() throws Throwable { doTest() }
 
-  void testGstring16() throws Throwable { doTest(); }
+  void testGstring16() throws Throwable { doTest() }
 
-  void testGstring2() throws Throwable { doTest(); }
+  void testGstring2() throws Throwable { doTest() }
 
-  void testGstring3() throws Throwable { doTest(); }
+  void testGstring3() throws Throwable { doTest() }
 
-  void testGstring4() throws Throwable { doTest(); }
+  void testGstring4() throws Throwable { doTest() }
 
-  void testGstring5() throws Throwable { doTest(); }
+  void testGstring5() throws Throwable { doTest() }
 
-  void testGstring6() throws Throwable { doTest(); }
+  void testGstring6() throws Throwable { doTest() }
 
-  void testGstring7() throws Throwable { doTest(); }
+  void testGstring7() throws Throwable { doTest() }
 
-  void testGstring8() throws Throwable { doTest(); }
+  void testGstring8() throws Throwable { doTest() }
 
-  void testGstring9() throws Throwable { doTest(); }
+  void testGstring9() throws Throwable { doTest() }
 
-  void testMultilineIndent() throws Throwable { doTest(); }
+  void testMultilineIndent() throws Throwable { doTest() }
 
-  void testMultilineIndent2() throws Throwable { doTest(); }
+  void testMultilineIndent2() throws Throwable { doTest() }
 
-  void testSpaces1() throws Throwable { doTest(); }
+  void testSpaces1() throws Throwable { doTest() }
 
-  void testString1() throws Throwable { doTest(); }
+  void testString1() throws Throwable { doTest() }
 
-  void testString2() throws Throwable { doTest(); }
+  void testString2() throws Throwable { doTest() }
 
-  void testString3() throws Throwable { doTest(); }
+  void testString3() throws Throwable { doTest() }
 
-  void testString4() throws Throwable { doTest(); }
+  void testString4() throws Throwable { doTest() }
 
-  void testString5() throws Throwable { doTest(); }
+  void testString5() throws Throwable { doTest() }
 
-  void testString6() throws Throwable { doTest(); }
+  void testString6() throws Throwable { doTest() }
 
-  void testString7() throws Throwable { doTest(); }
+  void testString7() throws Throwable { doTest() }
 
-  void testString8() throws Throwable { doTest(); }
+  void testString8() throws Throwable { doTest() }
 
-  void testString9() throws Throwable { doTest(); }
+  void testString9() throws Throwable { doTest() }
 
-  void testString10() throws Throwable { doTest(); }
+  void testString10() throws Throwable { doTest() }
 
   void testRegex1() { doTest() }
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/FormatterTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/FormatterTest.groovy
index bf6c12d83950..f545f5a1c0c8 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/FormatterTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/FormatterTest.groovy
@@ -18,10 +18,10 @@ package org.jetbrains.plugins.groovy.lang.formatter
 
 import com.intellij.openapi.util.text.StringUtil
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings
-import org.jetbrains.plugins.groovy.GroovyFileType
 import org.jetbrains.plugins.groovy.GroovyLanguage
 import org.jetbrains.plugins.groovy.codeStyle.GroovyCodeStyleSettings
 import org.jetbrains.plugins.groovy.util.TestUtils
+
 /**
  * Test suite for static formatting. Compares two files:
  * before and after formatting
@@ -32,17 +32,17 @@ class FormatterTest extends GroovyFormatterTestCase {
 
   final String basePath = TestUtils.testDataPath + "groovy/formatter/"
 
-  void testAddign1() throws Throwable { doTest(); }
+  void testAddign1() throws Throwable { doTest() }
 
-  void testArg1() throws Throwable { doTest(); }
+  void testArg1() throws Throwable { doTest() }
 
-  void testArg2() throws Throwable { doTest(); }
+  void testArg2() throws Throwable { doTest() }
 
-  void testBin1() throws Throwable { doTest(); }
+  void testBin1() throws Throwable { doTest() }
 
-  void testBin2() throws Throwable { doTest(); }
+  void testBin2() throws Throwable { doTest() }
 
-  void testBin3() throws Throwable { doTest(); }
+  void testBin3() throws Throwable { doTest() }
 
   void testBlockExpr1() throws Throwable {
     //groovySettings.KEEP_CONTROL_STATEMENT_IN_ONE_LINE = false
@@ -50,138 +50,138 @@ class FormatterTest extends GroovyFormatterTestCase {
     doTest()
   }
 
-  void testClass1() throws Throwable { doTest(); }
+  void testClass1() throws Throwable { doTest() }
 
-  void testClo1() throws Throwable { doTest(); }
+  void testClo1() throws Throwable { doTest() }
 
-  void testClo2() throws Throwable { doTest(); }
+  void testClo2() throws Throwable { doTest() }
 
-  void testClo3() throws Throwable { doTest(); }
+  void testClo3() throws Throwable { doTest() }
 
-  void testClo4() throws Throwable { doTest(); }
+  void testClo4() throws Throwable { doTest() }
 
-  void testColon1() throws Throwable { doTest(); }
+  void testColon1() throws Throwable { doTest() }
 
-  void testColon2() throws Throwable { doTest(); }
+  void testColon2() throws Throwable { doTest() }
 
-  void testCond1() throws Throwable { doTest(); }
+  void testCond1() throws Throwable { doTest() }
 
-  void testDoc1() throws Throwable { doTest(); }
+  void testDoc1() throws Throwable { doTest() }
 
-  void testDoc2() throws Throwable { doTest(); }
+  void testDoc2() throws Throwable { doTest() }
 
-  void testDoc3() throws Throwable { doTest(); }
+  void testDoc3() throws Throwable { doTest() }
 
-  void testDockter() throws Throwable { doTest(); }
+  void testDockter() throws Throwable { doTest() }
 
-  void testDot1() throws Throwable { doTest(); }
+  void testDot1() throws Throwable { doTest() }
 
-  void testDot2() throws Throwable { doTest(); }
+  void testDot2() throws Throwable { doTest() }
 
-  void testFor1() throws Throwable { doTest(); }
+  void testFor1() throws Throwable { doTest() }
 
-  void testFor2() throws Throwable { doTest(); }
+  void testFor2() throws Throwable { doTest() }
 
-  void testFor3() throws Throwable { doTest(); }
+  void testFor3() throws Throwable { doTest() }
 
-  void testFor4() throws Throwable { doTest(); }
+  void testFor4() throws Throwable { doTest() }
 
-  void testGbegin1() throws Throwable { doTest(); }
+  void testGbegin1() throws Throwable { doTest() }
 
-  void testGrvy1637() throws Throwable { doTest(); }
+  void testGrvy1637() throws Throwable { doTest() }
 
-  void testGString1() throws Throwable { doTest(); }
+  void testGString1() throws Throwable { doTest() }
 
-  void testMap6() throws Throwable { doTest(); }
+  void testMap6() throws Throwable { doTest() }
 
-  void testMeth1() throws Throwable { doTest(); }
+  void testMeth1() throws Throwable { doTest() }
 
-  void testMeth2() throws Throwable { doTest(); }
+  void testMeth2() throws Throwable { doTest() }
 
-  void testMeth3() throws Throwable { doTest(); }
+  void testMeth3() throws Throwable { doTest() }
 
-  void testMeth4() throws Throwable { doTest(); }
+  void testMeth4() throws Throwable { doTest() }
 
-  void testMeth5() throws Throwable { doTest(); }
+  void testMeth5() throws Throwable { doTest() }
 
-  void testMultistring1() throws Throwable { doTest(); }
+  void testMultistring1() throws Throwable { doTest() }
 
-  void testMultistring2() throws Throwable { doTest(); }
+  void testMultistring2() throws Throwable { doTest() }
 
-  void testNew1() throws Throwable { doTest(); }
+  void testNew1() throws Throwable { doTest() }
 
-  void testParam1() throws Throwable { doTest(); }
+  void testParam1() throws Throwable { doTest() }
 
-  void testParam2() throws Throwable { doTest(); }
+  void testParam2() throws Throwable { doTest() }
 
-  void testParen1() throws Throwable { doTest(); }
+  void testParen1() throws Throwable { doTest() }
 
-  void testPath1() throws Throwable { doTest(); }
+  void testPath1() throws Throwable { doTest() }
 
-  void testPointer1() throws Throwable { doTest(); }
+  void testPointer1() throws Throwable { doTest() }
 
-  void testRange1() throws Throwable { doTest(); }
+  void testRange1() throws Throwable { doTest() }
 
-  void testRegex1() throws Throwable { doTest(); }
+  void testRegex1() throws Throwable { doTest() }
 
   void testRegex2() { doTest() }
 
-  void testSh1() throws Throwable { doTest(); }
+  void testSh1() throws Throwable { doTest() }
 
-  void testSh2() throws Throwable { doTest(); }
+  void testSh2() throws Throwable { doTest() }
 
-  void testSqr1() throws Throwable { doTest(); }
+  void testSqr1() throws Throwable { doTest() }
 
-  void testSqr2() throws Throwable { doTest(); }
+  void testSqr2() throws Throwable { doTest() }
 
-  void testSqr3() throws Throwable { doTest(); }
+  void testSqr3() throws Throwable { doTest() }
 
-  void testString1() throws Throwable { doTest(); }
+  void testString1() throws Throwable { doTest() }
 
-  void testSuper1() throws Throwable { doTest(); }
+  void testSuper1() throws Throwable { doTest() }
 
-  void testSwitch1() throws Throwable { doTest(); }
+  void testSwitch1() throws Throwable { doTest() }
 
-  void testSwitch2() throws Throwable { doTest(); }
+  void testSwitch2() throws Throwable { doTest() }
 
-  void testSwitch3() throws Throwable { doTest(); }
+  void testSwitch3() throws Throwable { doTest() }
 
-  void testSwitch4() throws Throwable { doTest(); }
+  void testSwitch4() throws Throwable { doTest() }
 
-  void testSwitch5() throws Throwable { doTest(); }
+  void testSwitch5() throws Throwable { doTest() }
 
-  void testSwitch6() throws Throwable { doTest(); }
+  void testSwitch6() throws Throwable { doTest() }
 
-  void testSwitch7() throws Throwable { doTest(); }
+  void testSwitch7() throws Throwable { doTest() }
 
-  void testSwitch8() throws Throwable { doTest(); }
+  void testSwitch8() throws Throwable { doTest() }
 
-  void testType1() throws Throwable { doTest(); }
+  void testType1() throws Throwable { doTest() }
 
-  void testTypeparam1() throws Throwable { doTest(); }
+  void testTypeparam1() throws Throwable { doTest() }
 
-  void testUn1() throws Throwable { doTest(); }
+  void testUn1() throws Throwable { doTest() }
 
-  void testUn2() throws Throwable { doTest(); }
+  void testUn2() throws Throwable { doTest() }
 
-  void testUn3() throws Throwable { doTest(); }
+  void testUn3() throws Throwable { doTest() }
 
-  void testWhile1() throws Throwable { doTest(); }
+  void testWhile1() throws Throwable { doTest() }
 
-  void testWhile2() throws Throwable { doTest(); }
+  void testWhile2() throws Throwable { doTest() }
 
-  void testWhileCStyle() throws Throwable { doTest(); }
+  void testWhileCStyle() throws Throwable { doTest() }
 
-  void testFields() throws Throwable { doTest(); }
+  void testFields() throws Throwable { doTest() }
 
   void testClosureAfterLineComment() throws Throwable {
     groovySettings.KEEP_SIMPLE_BLOCKS_IN_ONE_LINE = false
     doTest()
   }
 
-  void testAnnotationOnSeparateLine() throws Throwable { doTest(); }
+  void testAnnotationOnSeparateLine() throws Throwable { doTest() }
 
-  void testAlignMultipleVariables() throws Throwable { doTest(); }
+  void testAlignMultipleVariables() throws Throwable { doTest() }
 
   void testSpockTableWithStringComment() throws Throwable { doTest() }
 
@@ -192,22 +192,22 @@ class FormatterTest extends GroovyFormatterTestCase {
     doTest()
   }
 
-  void testElseIfsSpecial() throws Throwable { doTest(); }
+  void testElseIfsSpecial() throws Throwable { doTest() }
 
-  void testVarargDeclaration() throws Throwable { doTest(); }
+  void testVarargDeclaration() throws Throwable { doTest() }
 
-  void testPreserveSpaceBeforeClosureParameters() throws Throwable { doTest(); }
+  void testPreserveSpaceBeforeClosureParameters() throws Throwable { doTest() }
 
-  void testPreserveGroovydoc() throws Throwable { doTest(); }
+  void testPreserveGroovydoc() throws Throwable { doTest() }
 
   void testCaseInSwitch() throws Throwable {
     groovySettings.INDENT_CASE_FROM_SWITCH = false
     doTest()
   }
 
-  void testCaseInSwitchIndented() throws Throwable { doTest(); }
+  void testCaseInSwitchIndented() throws Throwable { doTest() }
 
-  void testStuffAfterLineComments() throws Throwable { doTest(); }
+  void testStuffAfterLineComments() throws Throwable { doTest() }
 
   void testAnonymousInCall() throws Throwable {
     groovySettings.ALIGN_MULTILINE_PARAMETERS_IN_CALLS = true
@@ -230,7 +230,7 @@ class FormatterTest extends GroovyFormatterTestCase {
     doTest()
   }
 
-  void testAlignClosureBraceWithCall() throws Throwable { doTest(); }
+  void testAlignClosureBraceWithCall() throws Throwable { doTest() }
 
   void testFlyingGeese() throws Throwable {
     myTempSettings.getCustomSettings(GroovyCodeStyleSettings.class).USE_FLYING_GEESE_BRACES = true
@@ -243,25 +243,25 @@ class FormatterTest extends GroovyFormatterTestCase {
     doTest()
   }
 
-  void testChainCallWithClosures() throws Throwable { doTest(); }
+  void testChainCallWithClosures() throws Throwable { doTest() }
 
-  void testFormatDiamonds() throws Throwable { doTest(); }
+  void testFormatDiamonds() throws Throwable { doTest() }
 
-  void testFormatAnonymousDiamonds() throws Throwable { doTest(); }
+  void testFormatAnonymousDiamonds() throws Throwable { doTest() }
 
-  void testPreserveChainingLineBreaks() throws Throwable { doTest(); }
+  void testPreserveChainingLineBreaks() throws Throwable { doTest() }
 
-  void testMultilineEolComment() throws Throwable { doTest(); }
+  void testMultilineEolComment() throws Throwable { doTest() }
 
-  void testRedundantClosureSpace() throws Throwable { doTest(); }
+  void testRedundantClosureSpace() throws Throwable { doTest() }
 
-  void testIndentNamedArguments() throws Throwable { doTest(); }
+  void testIndentNamedArguments() throws Throwable { doTest() }
 
-  void testIndentAssigned() throws Throwable { doTest(); }
+  void testIndentAssigned() throws Throwable { doTest() }
 
-  void testCommentBeforeMultilineString() throws Throwable { doTest(); }
+  void testCommentBeforeMultilineString() throws Throwable { doTest() }
 
-  void testMethodSemicolons() throws Throwable { doTest(); }
+  void testMethodSemicolons() throws Throwable { doTest() }
 
   void testNoFlyingGeese() throws Throwable {
     myTempSettings.getCustomSettings(GroovyCodeStyleSettings.class).SPACE_IN_NAMED_ARGUMENT = false
@@ -308,23 +308,23 @@ class FormatterTest extends GroovyFormatterTestCase {
     doTest()
   }
 
-  void testGeese1() { doGeeseTest(); }
+  void testGeese1() { doGeeseTest() }
 
-  void testGeese2() { doGeeseTest(); }
+  void testGeese2() { doGeeseTest() }
 
-  void testGeese3() { doGeeseTest(); }
+  void testGeese3() { doGeeseTest() }
 
-  void testGeese4() { doGeeseTest(); }
+  void testGeese4() { doGeeseTest() }
 
-  void testGeese5() { doGeeseTest(); }
+  void testGeese5() { doGeeseTest() }
 
-  void testGeese6() { doGeeseTest(); }
+  void testGeese6() { doGeeseTest() }
 
-  void testGeese7() { doGeeseTest(); }
+  void testGeese7() { doGeeseTest() }
 
-  void testGeese8() { doGeeseTest(); }
+  void testGeese8() { doGeeseTest() }
 
-  void testMapInArgumentList() { doTest(); }
+  void testMapInArgumentList() { doTest() }
 
   void testMapInArgList2() {
     myTempSettings.getCustomSettings(GroovyCodeStyleSettings.class).ALIGN_NAMED_ARGS_IN_MAP = true
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/GroovyCodeStyleFormatterTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/GroovyCodeStyleFormatterTest.groovy
index 58fbc2452580..1fbb3ba1faf1 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/GroovyCodeStyleFormatterTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/GroovyCodeStyleFormatterTest.groovy
@@ -84,53 +84,53 @@ class GroovyCodeStyleFormatterTest extends GroovyFormatterTestCase {
     }
   }
 
-  void testClass_decl1() throws Throwable { doTest(); }
+  void testClass_decl1() throws Throwable { doTest() }
 
-  void testClass_decl2() throws Throwable { doTest(); }
+  void testClass_decl2() throws Throwable { doTest() }
 
-  void testClass_decl3() throws Throwable { doTest(); }
+  void testClass_decl3() throws Throwable { doTest() }
 
-  void testClass_decl4() throws Throwable { doTest(); }
+  void testClass_decl4() throws Throwable { doTest() }
 
-  void testComm_at_first_column1() throws Throwable { doTest(); }
+  void testComm_at_first_column1() throws Throwable { doTest() }
 
-  void testComm_at_first_column2() throws Throwable { doTest(); }
+  void testComm_at_first_column2() throws Throwable { doTest() }
 
-  void testFor1() throws Throwable { doTest(); }
+  void testFor1() throws Throwable { doTest() }
 
-  void testFor2() throws Throwable { doTest(); }
+  void testFor2() throws Throwable { doTest() }
 
-  void testGRVY_1134() throws Throwable { doTest(); }
+  void testGRVY_1134() throws Throwable { doTest() }
 
-  void testIf1() throws Throwable { doTest(); }
+  void testIf1() throws Throwable { doTest() }
 
-  void testMethod_call_par1() throws Throwable { doTest(); }
+  void testMethod_call_par1() throws Throwable { doTest() }
 
-  void testMethod_call_par2() throws Throwable { doTest(); }
+  void testMethod_call_par2() throws Throwable { doTest() }
 
-  void testMethod_decl1() throws Throwable { doTest(); }
+  void testMethod_decl1() throws Throwable { doTest() }
 
-  void testMethod_decl2() throws Throwable { doTest(); }
+  void testMethod_decl2() throws Throwable { doTest() }
 
-  void testMethod_decl_par1() throws Throwable { doTest(); }
+  void testMethod_decl_par1() throws Throwable { doTest() }
 
-  void testSwitch1() throws Throwable { doTest(); }
+  void testSwitch1() throws Throwable { doTest() }
 
-  void testSynch1() throws Throwable { doTest(); }
+  void testSynch1() throws Throwable { doTest() }
 
-  void testTry1() throws Throwable { doTest(); }
+  void testTry1() throws Throwable { doTest() }
 
-  void testTry2() throws Throwable { doTest(); }
+  void testTry2() throws Throwable { doTest() }
 
-  void testWhile1() throws Throwable { doTest(); }
+  void testWhile1() throws Throwable { doTest() }
 
-  void testWhile2() throws Throwable { doTest(); }
+  void testWhile2() throws Throwable { doTest() }
 
-  void testWithin_brackets1() throws Throwable { doTest(); }
+  void testWithin_brackets1() throws Throwable { doTest() }
 
-  void testSpace_in_named_arg_true() throws Throwable { doTest(); }
+  void testSpace_in_named_arg_true() throws Throwable { doTest() }
 
-  void testSpace_in_named_arg_false() throws Throwable { doTest(); }
+  void testSpace_in_named_arg_false() throws Throwable { doTest() }
 
-  void testAnonymousVsLBraceOnNewLine() { doTest(); }
+  void testAnonymousVsLBraceOnNewLine() { doTest() }
 }
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityTest.groovy
index 7d8646d94189..9129cc82e1f9 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrAssignabilityTest.groovy
@@ -28,7 +28,7 @@ import org.jetbrains.plugins.groovy.codeInspection.untypedUnresolvedAccess.GrUnr
 class GrAssignabilityTest extends GrHighlightingTestBase {
   InspectionProfileEntry[] getCustomInspections() { [new GroovyAssignabilityCheckInspection()] }
 
-  void testIncompatibleTypesAssignments() { doTest(); }
+  void testIncompatibleTypesAssignments() { doTest() }
 
   void testDefaultMapConstructorNamedArgs() {
     addBigDecimal()
@@ -52,23 +52,23 @@ class GrAssignabilityTest extends GrHighlightingTestBase {
     doTest(new GroovyConstructorNamedArgumentsInspection())
   }
 
-  void testEverythingAssignableToString() { doTest(); }
+  void testEverythingAssignableToString() { doTest() }
 
-  void testMethodCallWithDefaultParameters() { doTest(); }
+  void testMethodCallWithDefaultParameters() { doTest() }
 
-  void testClosureWithDefaultParameters() { doTest(); }
+  void testClosureWithDefaultParameters() { doTest() }
 
-  void testClosureCallMethodWithInapplicableArguments() { doTest(); }
+  void testClosureCallMethodWithInapplicableArguments() { doTest() }
 
-  void testCallIsNotApplicable() { doTest(); }
+  void testCallIsNotApplicable() { doTest() }
 
-  void testPathCallIsNotApplicable() { doTest(); }
+  void testPathCallIsNotApplicable() { doTest() }
 
-  void testByteArrayArgument() { doTest(); }
+  void testByteArrayArgument() { doTest() }
 
-  void testPutValueToEmptyMap() { doTest(); }
+  void testPutValueToEmptyMap() { doTest() }
 
-  void _testPutIncorrectValueToMap() { doTest(); } //incorrect test
+  void _testPutIncorrectValueToMap() { doTest() } //incorrect test
 
   void testTupleTypeAssignments() {
     addBigDecimal()
@@ -83,15 +83,15 @@ class GrAssignabilityTest extends GrHighlightingTestBase {
     doTest()
   }
 
-  void testCollectionAssignments() { doTest(); }
+  void testCollectionAssignments() { doTest() }
 
-  void testReturnAssignability() { doTest(); }
+  void testReturnAssignability() { doTest() }
 
-  void testMapNotAcceptedAsStringParameter() { doTest(); }
+  void testMapNotAcceptedAsStringParameter() { doTest() }
 
-  void testRawTypeInAssignment() { doTest(); }
+  void testRawTypeInAssignment() { doTest() }
 
-  void testMapParamWithNoArgs() { doTest(); }
+  void testMapParamWithNoArgs() { doTest() }
 
   void testInheritInterfaceInDelegate() {
     doTest()
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GroovyHighlightingTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GroovyHighlightingTest.groovy
index b3cc1ed2fffe..5a20963f9699 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GroovyHighlightingTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GroovyHighlightingTest.groovy
@@ -74,15 +74,15 @@ class GroovyHighlightingTest extends GrHighlightingTestBase {
     doRefTest()
   }
 
-  void testAnonymousClassConstructor() { doTest(); }
+  void testAnonymousClassConstructor() { doTest() }
 
-  void testAnonymousClassAbstractMethod() { doTest(); }
+  void testAnonymousClassAbstractMethod() { doTest() }
 
   //public void _testAnonymousClassStaticMethod() { doTest(); }
 
-  void testAnonymousClassShouldImplementMethods() { doTest(); }
+  void testAnonymousClassShouldImplementMethods() { doTest() }
 
-  void testAnonymousClassShouldImplementSubstitutedMethod() { doTest(); }
+  void testAnonymousClassShouldImplementSubstitutedMethod() { doTest() }
 
   void testUnresolvedLhsAssignment() { doRefTest() }
 
@@ -90,36 +90,36 @@ class GroovyHighlightingTest extends GrHighlightingTestBase {
 
   void testBooleanProperties() { doRefTest() }
 
-  void testDuplicateInnerClass() { doTest(); }
+  void testDuplicateInnerClass() { doTest() }
 
-  void testThisInStaticContext() { doTest(); }
+  void testThisInStaticContext() { doTest() }
 
-  void testLocalVariableInStaticContext() { doTest(); }
+  void testLocalVariableInStaticContext() { doTest() }
 
   void testModifiersInPackageAndImportStatements() {
     myFixture.copyFileToProject(getTestName(false) + ".groovy", "x/" + getTestName(false) + ".groovy")
     myFixture.testHighlighting(true, false, false, "x/" + getTestName(false) + ".groovy")
   }
 
-  void testBreakOutside() { doTest(); }
+  void testBreakOutside() { doTest() }
 
-  void testUndefinedLabel() { doTest(); }
+  void testUndefinedLabel() { doTest() }
 
   void testNestedMethods() {
     doTest()
   }
 
-  void testRawOverriddenMethod() { doTest(); }
+  void testRawOverriddenMethod() { doTest() }
 
   void testFQNJavaClassesUsages() {
     doTest()
   }
 
-  void testGstringAssignableToString() { doTest(); }
+  void testGstringAssignableToString() { doTest() }
 
-  void testGstringAssignableToStringInClosureParameter() { doTest(); }
+  void testGstringAssignableToStringInClosureParameter() { doTest() }
 
-  void testEachOverRange() { doTest(); }
+  void testEachOverRange() { doTest() }
 
   void testEllipsisParam() {
     myFixture.configureByText('a.groovy', '''\
@@ -131,58 +131,58 @@ class A {
     myFixture.checkHighlighting(true, false, false)
   }
 
-  void testStringAndGStringUpperBound() { doTest(); }
+  void testStringAndGStringUpperBound() { doTest() }
 
-  void testWithMethod() { doTest(); }
+  void testWithMethod() { doTest() }
 
-  void testArrayLikeAccess() { doTest(); }
+  void testArrayLikeAccess() { doTest() }
 
-  void testSetInitializing() { doTest(); }
+  void testSetInitializing() { doTest() }
 
-  void testEmptyTupleAssignability() { doTest(); }
+  void testEmptyTupleAssignability() { doTest() }
 
   void testGrDefFieldsArePrivateInJavaCode() {
     myFixture.configureByText("X.groovy", "public class X{def x=5}")
     myFixture.testHighlighting(true, false, false, getTestName(false) + ".java")
   }
 
-  void testSuperConstructorInvocation() { doTest(); }
+  void testSuperConstructorInvocation() { doTest() }
 
-  void testDuplicateMapKeys() { doTest(); }
+  void testDuplicateMapKeys() { doTest() }
 
-  void testIndexPropertyAccess() { doTest(); }
+  void testIndexPropertyAccess() { doTest() }
 
-  void testPropertyAndFieldDeclaration() { doTest(); }
+  void testPropertyAndFieldDeclaration() { doTest() }
 
-  void testGenericsMethodUsage() { doTest(); }
+  void testGenericsMethodUsage() { doTest() }
 
-  void testWildcardInExtendsList() { doTest(); }
+  void testWildcardInExtendsList() { doTest() }
 
-  void testOverrideAnnotation() { doTest(); }
+  void testOverrideAnnotation() { doTest() }
 
-  void testClosureCallWithTupleTypeArgument() { doTest(); }
+  void testClosureCallWithTupleTypeArgument() { doTest() }
 
-  void testMethodDuplicates() { doTest(); }
+  void testMethodDuplicates() { doTest() }
 
-  void testAmbiguousCodeBlock() { doTest(); }
+  void testAmbiguousCodeBlock() { doTest() }
 
-  void testAmbiguousCodeBlockInMethodCall() { doTest(); }
+  void testAmbiguousCodeBlockInMethodCall() { doTest() }
 
-  void testNotAmbiguousClosableBlock() { doTest(); }
+  void testNotAmbiguousClosableBlock() { doTest() }
 
-  void testDuplicateParameterInClosableBlock() { doTest(); }
+  void testDuplicateParameterInClosableBlock() { doTest() }
 
-  void testCyclicInheritance() { doTest(); }
+  void testCyclicInheritance() { doTest() }
 
-  void testNoDefaultConstructor() { doTest(); }
+  void testNoDefaultConstructor() { doTest() }
 
-  void testNumberDuplicatesInMaps() { doTest(); }
+  void testNumberDuplicatesInMaps() { doTest() }
 
-  void testBuiltInTypeInstantiation() { doTest(); }
+  void testBuiltInTypeInstantiation() { doTest() }
 
-  void testSOEInFieldDeclarations() { doTest(); }
+  void testSOEInFieldDeclarations() { doTest() }
 
-  void testWrongAnnotation() { doTest(); }
+  void testWrongAnnotation() { doTest() }
 
   void testAmbiguousMethods() {
     myFixture.copyFileToProject(getTestName(false) + ".java")
@@ -215,7 +215,7 @@ class A {
     myFixture.checkHighlighting(true, false, false)
   }
 
-  void testDuplicatedNamedArgs() { doTest(); }
+  void testDuplicatedNamedArgs() { doTest() }
 
   void testConstructorWithAllParametersOptional() {
     doTest()
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/CommentsParsingTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/CommentsParsingTest.groovy
index 907f623e37f0..ffc3c83465a1 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/CommentsParsingTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/CommentsParsingTest.groovy
@@ -24,16 +24,16 @@ class CommentsParsingTest extends GroovyParsingTestCase {
     super.basePath + "comments"
   }
 
-  void testBrown() throws Throwable { doTest(); }
+  void testBrown() throws Throwable { doTest() }
 
-  void testError1205() throws Throwable { doTest(); }
+  void testError1205() throws Throwable { doTest() }
 
-  void testMax() throws Throwable { doTest(); }
+  void testMax() throws Throwable { doTest() }
 
-  void testNls1() throws Throwable { doTest(); }
+  void testNls1() throws Throwable { doTest() }
 
-  void testNls2() throws Throwable { doTest(); }
+  void testNls2() throws Throwable { doTest() }
 
-  void testRocher3() throws Throwable { doTest(); }
+  void testRocher3() throws Throwable { doTest() }
   
 }
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/ExpressionsParsingTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/ExpressionsParsingTest.groovy
index c8b52521cb0d..f4919c511c3f 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/ExpressionsParsingTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/ExpressionsParsingTest.groovy
@@ -24,419 +24,419 @@ class ExpressionsParsingTest extends GroovyParsingTestCase {
     return super.basePath + "expressions"
   }
 
-  void testarguments$carg1() throws Throwable { doTest(); }
+  void testarguments$carg1() throws Throwable { doTest() }
 
-  void testarguments$carg2() throws Throwable { doTest(); }
+  void testarguments$carg2() throws Throwable { doTest() }
 
-  void testarguments$carg3() throws Throwable { doTest(); }
+  void testarguments$carg3() throws Throwable { doTest() }
 
-  void testarguments$cargs1() throws Throwable { doTest(); }
+  void testarguments$cargs1() throws Throwable { doTest() }
 
-  void testarguments$cargs2() throws Throwable { doTest(); }
+  void testarguments$cargs2() throws Throwable { doTest() }
 
-  void testarguments$cargs3() throws Throwable { doTest(); }
+  void testarguments$cargs3() throws Throwable { doTest() }
 
-  void testarithmetic$add1() throws Throwable { doTest(); }
+  void testarithmetic$add1() throws Throwable { doTest() }
 
-  void testarithmetic$add2() throws Throwable { doTest(); }
+  void testarithmetic$add2() throws Throwable { doTest() }
 
-  void testarithmetic$addbug1() throws Throwable { doTest(); }
+  void testarithmetic$addbug1() throws Throwable { doTest() }
 
-  void testarithmetic$arif1() throws Throwable { doTest(); }
+  void testarithmetic$arif1() throws Throwable { doTest() }
 
-  void testarithmetic$mul1() throws Throwable { doTest(); }
+  void testarithmetic$mul1() throws Throwable { doTest() }
 
-  void testarithmetic$mul2() throws Throwable { doTest(); }
+  void testarithmetic$mul2() throws Throwable { doTest() }
 
-  void testarithmetic$mul3() throws Throwable { doTest(); }
+  void testarithmetic$mul3() throws Throwable { doTest() }
 
-  void testarithmetic$post1() throws Throwable { doTest(); }
+  void testarithmetic$post1() throws Throwable { doTest() }
 
-  void testarithmetic$sh1() throws Throwable { doTest(); }
+  void testarithmetic$sh1() throws Throwable { doTest() }
 
-  void testarithmetic$shift5() throws Throwable { doTest(); }
+  void testarithmetic$shift5() throws Throwable { doTest() }
 
-  void testarithmetic$shift6() throws Throwable { doTest(); }
+  void testarithmetic$shift6() throws Throwable { doTest() }
 
-  void testarithmetic$un1() throws Throwable { doTest(); }
+  void testarithmetic$un1() throws Throwable { doTest() }
 
-  void testass1() throws Throwable { doTest(); }
+  void testass1() throws Throwable { doTest() }
 
-  void testass2() throws Throwable { doTest(); }
+  void testass2() throws Throwable { doTest() }
 
-  void testass3() throws Throwable { doTest(); }
+  void testass3() throws Throwable { doTest() }
 
-  void testclosures$appended() throws Throwable { doTest(); }
+  void testclosures$appended() throws Throwable { doTest() }
 
-  void testclosures$closparam1() throws Throwable { doTest(); }
+  void testclosures$closparam1() throws Throwable { doTest() }
 
-  void testclosures$closparam2() throws Throwable { doTest(); }
+  void testclosures$closparam2() throws Throwable { doTest() }
 
-  void testclosures$closparam3() throws Throwable { doTest(); }
+  void testclosures$closparam3() throws Throwable { doTest() }
 
-  void testclosures$closparam4() throws Throwable { doTest(); }
+  void testclosures$closparam4() throws Throwable { doTest() }
 
-  void testclosures$closparam5() throws Throwable { doTest(); }
+  void testclosures$closparam5() throws Throwable { doTest() }
 
-  void testclosures$closparam6() throws Throwable { doTest(); }
+  void testclosures$closparam6() throws Throwable { doTest() }
 
-  void testclosures$final_error() throws Throwable { doTest(); }
+  void testclosures$final_error() throws Throwable { doTest() }
 
-  void testclosures$param6() throws Throwable { doTest(); }
+  void testclosures$param6() throws Throwable { doTest() }
 
-  void testclosures$param7() throws Throwable { doTest(); }
+  void testclosures$param7() throws Throwable { doTest() }
 
-  void testconditional$con1() throws Throwable { doTest(); }
+  void testconditional$con1() throws Throwable { doTest() }
 
-  void testconditional$con2() throws Throwable { doTest(); }
+  void testconditional$con2() throws Throwable { doTest() }
 
-  void testconditional$elvis1() throws Throwable { doTest(); }
+  void testconditional$elvis1() throws Throwable { doTest() }
 
-  void testconditional$elvis2() throws Throwable { doTest(); }
+  void testconditional$elvis2() throws Throwable { doTest() }
 
-  void testerrors$err_final() throws Throwable { doTest(); }
+  void testerrors$err_final() throws Throwable { doTest() }
 
-  void testgstring$daniel_sun() throws Throwable { doTest(); }
+  void testgstring$daniel_sun() throws Throwable { doTest() }
 
-  void testgstring$gravy16532() throws Throwable { doTest("gstring/gravy-1653-2.test"); }
+  void testgstring$gravy16532() throws Throwable { doTest("gstring/gravy-1653-2.test") }
 
-  void testgstring$grvy1653() throws Throwable { doTest("gstring/grvy-1653.test"); }
+  void testgstring$grvy1653() throws Throwable { doTest("gstring/grvy-1653.test") }
 
-  void testgstring$gstr3() throws Throwable { doTest(); }
+  void testgstring$gstr3() throws Throwable { doTest() }
 
-  void testgstring$standTrooper() throws Throwable { doTest(); }
+  void testgstring$standTrooper() throws Throwable { doTest() }
 
-  void testgstring$str1() throws Throwable { doTest(); }
+  void testgstring$str1() throws Throwable { doTest() }
 
-  void testgstring$str2() throws Throwable { doTest(); }
+  void testgstring$str2() throws Throwable { doTest() }
 
-  void testgstring$str3() throws Throwable { doTest(); }
+  void testgstring$str3() throws Throwable { doTest() }
 
-  void testgstring$str4() throws Throwable { doTest(); }
+  void testgstring$str4() throws Throwable { doTest() }
 
-  void testgstring$str5() throws Throwable { doTest(); }
+  void testgstring$str5() throws Throwable { doTest() }
 
-  void testgstring$str6() throws Throwable { doTest(); }
+  void testgstring$str6() throws Throwable { doTest() }
 
-  void testgstring$str7() throws Throwable { doTest(); }
+  void testgstring$str7() throws Throwable { doTest() }
 
-  void testgstring$str8() throws Throwable { doTest(); }
+  void testgstring$str8() throws Throwable { doTest() }
 
-  void testgstring$str_error1() throws Throwable { doTest(); }
+  void testgstring$str_error1() throws Throwable { doTest() }
 
-  void testgstring$str_error2() throws Throwable { doTest(); }
+  void testgstring$str_error2() throws Throwable { doTest() }
 
-  void testgstring$str_error3() throws Throwable { doTest(); }
+  void testgstring$str_error3() throws Throwable { doTest() }
 
-  void testgstring$str_error4() throws Throwable { doTest(); }
+  void testgstring$str_error4() throws Throwable { doTest() }
 
-  void testgstring$str_error5() throws Throwable { doTest(); }
+  void testgstring$str_error5() throws Throwable { doTest() }
 
-  void testgstring$str_error6() throws Throwable { doTest(); }
+  void testgstring$str_error6() throws Throwable { doTest() }
 
-  void testgstring$str_error7() throws Throwable { doTest(); }
+  void testgstring$str_error7() throws Throwable { doTest() }
 
-  void testgstring$str_error8() throws Throwable { doTest(); }
+  void testgstring$str_error8() throws Throwable { doTest() }
 
-  void testgstring$triple$triple1() throws Throwable { doTest(); }
+  void testgstring$triple$triple1() throws Throwable { doTest() }
 
-  void testgstring$triple$triple2() throws Throwable { doTest(); }
+  void testgstring$triple$triple2() throws Throwable { doTest() }
 
-  void testgstring$triple$triple3() throws Throwable { doTest(); }
+  void testgstring$triple$triple3() throws Throwable { doTest() }
 
-  void testgstring$triple$quote_and_slash() throws Throwable { doTest(); }
+  void testgstring$triple$quote_and_slash() throws Throwable { doTest() }
 
-  void testgstring$ugly_lexer() throws Throwable { doTest(); }
+  void testgstring$ugly_lexer() throws Throwable { doTest() }
 
   void testgstring$this() { doTest() }
 
-  void testmapLiteral() throws Throwable { doTest(); }
+  void testmapLiteral() throws Throwable { doTest() }
 
-  void testnew$arr_decl() throws Throwable { doTest(); }
+  void testnew$arr_decl() throws Throwable { doTest() }
 
   void testnew$emptyTypeArgs() { doTest() }
 //  public void testnew$new1() throws Throwable { doTest(); }
-  void testanonymous$anonymous() throws Throwable { doTest(); }
+  void testanonymous$anonymous() throws Throwable { doTest() }
 
-  void testnumbers() throws Throwable { doTest(); }
+  void testnumbers() throws Throwable { doTest() }
 
-  void testparenthed$exprInParenth() throws Throwable { doTest(); }
+  void testparenthed$exprInParenth() throws Throwable { doTest() }
 
-  void testparenthed$paren1() throws Throwable { doTest(); }
+  void testparenthed$paren1() throws Throwable { doTest() }
 
-  void testparenthed$paren2() throws Throwable { doTest(); }
+  void testparenthed$paren2() throws Throwable { doTest() }
 
-  void testparenthed$paren3() throws Throwable { doTest(); }
+  void testparenthed$paren3() throws Throwable { doTest() }
 
-  void testparenthed$paren4() throws Throwable { doTest(); }
+  void testparenthed$paren4() throws Throwable { doTest() }
 
-  void testparenthed$paren5() throws Throwable { doTest(); }
+  void testparenthed$paren5() throws Throwable { doTest() }
 
-  void testparenthed$paren6() throws Throwable { doTest(); }
+  void testparenthed$paren6() throws Throwable { doTest() }
 
-  void testpath$method$ass4() throws Throwable { doTest(); }
+  void testpath$method$ass4() throws Throwable { doTest() }
 
-  void testpath$method$clazz1() throws Throwable { doTest(); }
+  void testpath$method$clazz1() throws Throwable { doTest() }
 
-  void testpath$method$clazz2() throws Throwable { doTest(); }
+  void testpath$method$clazz2() throws Throwable { doTest() }
 
-  void testpath$method$clos1() throws Throwable { doTest(); }
+  void testpath$method$clos1() throws Throwable { doTest() }
 
-  void testpath$method$clos2() throws Throwable { doTest(); }
+  void testpath$method$clos2() throws Throwable { doTest() }
 
-  void testpath$method$clos3() throws Throwable { doTest(); }
+  void testpath$method$clos3() throws Throwable { doTest() }
 
-  void testpath$method$clos4() throws Throwable { doTest(); }
+  void testpath$method$clos4() throws Throwable { doTest() }
 
-  void testpath$method$ind1() throws Throwable { doTest(); }
+  void testpath$method$ind1() throws Throwable { doTest() }
 
-  void testpath$method$ind2() throws Throwable { doTest(); }
+  void testpath$method$ind2() throws Throwable { doTest() }
 
-  void testpath$method$ind3() throws Throwable { doTest(); }
+  void testpath$method$ind3() throws Throwable { doTest() }
 
-  void testpath$method$method1() throws Throwable { doTest(); }
+  void testpath$method$method1() throws Throwable { doTest() }
 
-  void testpath$method$method10() throws Throwable { doTest(); }
+  void testpath$method$method10() throws Throwable { doTest() }
 
-  void testpath$method$method11() throws Throwable { doTest(); }
+  void testpath$method$method11() throws Throwable { doTest() }
 
-  void testpath$method$method12() throws Throwable { doTest(); }
+  void testpath$method$method12() throws Throwable { doTest() }
 
-  void testpath$method$method13() throws Throwable { doTest(); }
+  void testpath$method$method13() throws Throwable { doTest() }
 
-  void testpath$method$method2() throws Throwable { doTest(); }
+  void testpath$method$method2() throws Throwable { doTest() }
 
-  void testpath$method$method3() throws Throwable { doTest(); }
+  void testpath$method$method3() throws Throwable { doTest() }
 
-  void testpath$method$method4() throws Throwable { doTest(); }
+  void testpath$method$method4() throws Throwable { doTest() }
 
-  void testpath$method$method5() throws Throwable { doTest(); }
+  void testpath$method$method5() throws Throwable { doTest() }
 
-  void testpath$method$method6() throws Throwable { doTest(); }
+  void testpath$method$method6() throws Throwable { doTest() }
 
-  void testpath$method$method7() throws Throwable { doTest(); }
+  void testpath$method$method7() throws Throwable { doTest() }
 
-  void testpath$method$method8() throws Throwable { doTest(); }
+  void testpath$method$method8() throws Throwable { doTest() }
 
-  void testpath$method$method9() throws Throwable { doTest(); }
+  void testpath$method$method9() throws Throwable { doTest() }
 
-  void testpath$path1() throws Throwable { doTest(); }
+  void testpath$path1() throws Throwable { doTest() }
 
-  void testpath$path13() throws Throwable { doTest(); }
+  void testpath$path13() throws Throwable { doTest() }
 
-  void testpath$path14() throws Throwable { doTest(); }
+  void testpath$path14() throws Throwable { doTest() }
 
-  void testpath$path2() throws Throwable { doTest(); }
+  void testpath$path2() throws Throwable { doTest() }
 
-  void testpath$path3() throws Throwable { doTest(); }
+  void testpath$path3() throws Throwable { doTest() }
 
-  void testpath$path4() throws Throwable { doTest(); }
+  void testpath$path4() throws Throwable { doTest() }
 
-  void testpath$path5() throws Throwable { doTest(); }
+  void testpath$path5() throws Throwable { doTest() }
 
-  void testpath$path6() throws Throwable { doTest(); }
+  void testpath$path6() throws Throwable { doTest() }
 
-  void testpath$path7() throws Throwable { doTest(); }
+  void testpath$path7() throws Throwable { doTest() }
 
-  void testpath$path8() throws Throwable { doTest(); }
+  void testpath$path8() throws Throwable { doTest() }
 
-  void testpath$path9() throws Throwable { doTest(); }
+  void testpath$path9() throws Throwable { doTest() }
 
-  void testpath$path10() throws Throwable { doTest(); }
+  void testpath$path10() throws Throwable { doTest() }
 
   void testpath$regexp() { doTest() }
 
-  void testpath$typeVsExpr() { doTest(); }
+  void testpath$typeVsExpr() { doTest() }
 
-  void testreferences$ref1() throws Throwable { doTest(); }
+  void testreferences$ref1() throws Throwable { doTest() }
 
-  void testreferences$ref2() throws Throwable { doTest(); }
+  void testreferences$ref2() throws Throwable { doTest() }
 
-  void testreferences$ref3() throws Throwable { doTest(); }
+  void testreferences$ref3() throws Throwable { doTest() }
 
-  void testreferences$ref4() throws Throwable { doTest(); }
+  void testreferences$ref4() throws Throwable { doTest() }
 
-  void testreferences$ref5() throws Throwable { doTest(); }
+  void testreferences$ref5() throws Throwable { doTest() }
 
-  void testreferences$ref6() throws Throwable { doTest(); }
+  void testreferences$ref6() throws Throwable { doTest() }
 
-  void testreferences$ref7() throws Throwable { doTest(); }
+  void testreferences$ref7() throws Throwable { doTest() }
 
-  void testreferences$ref8() throws Throwable { doTest(); }
+  void testreferences$ref8() throws Throwable { doTest() }
 
-  void testreferences$ref9() throws Throwable { doTest(); }
+  void testreferences$ref9() throws Throwable { doTest() }
 
   void testreferences$emptyTypeArgs() { doTest() }
 
-  void testregex$chen() throws Throwable { doTest(); }
+  void testregex$chen() throws Throwable { doTest() }
 
-  void testregex$GRVY1509err() throws Throwable { doTest("regex/GRVY-1509err.test"); }
+  void testregex$GRVY1509err() throws Throwable { doTest("regex/GRVY-1509err.test") }
 
-  void testregex$GRVY1509norm() throws Throwable { doTest("regex/GRVY-1509norm.test"); }
+  void testregex$GRVY1509norm() throws Throwable { doTest("regex/GRVY-1509norm.test") }
 
-  void testregex$GRVY1509test() throws Throwable { doTest("regex/GRVY-1509test.test"); }
+  void testregex$GRVY1509test() throws Throwable { doTest("regex/GRVY-1509test.test") }
 
-  void testregex$regex1() throws Throwable { doTest(); }
+  void testregex$regex1() throws Throwable { doTest() }
 
-  void testregex$regex10() throws Throwable { doTest(); }
+  void testregex$regex10() throws Throwable { doTest() }
 
-  void testregex$regex11() throws Throwable { doTest(); }
+  void testregex$regex11() throws Throwable { doTest() }
 
-  void testregex$regex12() throws Throwable { doTest(); }
+  void testregex$regex12() throws Throwable { doTest() }
 
-  void testregex$regex13() throws Throwable { doTest(); }
+  void testregex$regex13() throws Throwable { doTest() }
 
-  void testregex$regex14() throws Throwable { doTest(); }
+  void testregex$regex14() throws Throwable { doTest() }
 
-  void testregex$regex15() throws Throwable { doTest(); }
+  void testregex$regex15() throws Throwable { doTest() }
 
-  void testregex$regex16() throws Throwable { doTest(); }
+  void testregex$regex16() throws Throwable { doTest() }
 
-  void testregex$regex17() throws Throwable { doTest(); }
+  void testregex$regex17() throws Throwable { doTest() }
 
-  void testregex$regex18() throws Throwable { doTest(); }
+  void testregex$regex18() throws Throwable { doTest() }
 
-  void testregex$regex19() throws Throwable { doTest(); }
+  void testregex$regex19() throws Throwable { doTest() }
 
-  void testregex$regex2() throws Throwable { doTest(); }
+  void testregex$regex2() throws Throwable { doTest() }
 
-  void testregex$regex20() throws Throwable { doTest(); }
+  void testregex$regex20() throws Throwable { doTest() }
 
-  void testregex$regex21() throws Throwable { doTest(); }
+  void testregex$regex21() throws Throwable { doTest() }
 
-  void testregex$regex22() throws Throwable { doTest(); }
+  void testregex$regex22() throws Throwable { doTest() }
 
-  void testregex$regex23() throws Throwable { doTest(); }
+  void testregex$regex23() throws Throwable { doTest() }
 
-  void testregex$regex24() throws Throwable { doTest(); }
+  void testregex$regex24() throws Throwable { doTest() }
 
-  void testregex$regex25() throws Throwable { doTest(); }
+  void testregex$regex25() throws Throwable { doTest() }
 
-  void testregex$regex3() throws Throwable { doTest(); }
+  void testregex$regex3() throws Throwable { doTest() }
 
-  void testregex$regex33() throws Throwable { doTest(); }
+  void testregex$regex33() throws Throwable { doTest() }
 
-  void testregex$regex4() throws Throwable { doTest(); }
+  void testregex$regex4() throws Throwable { doTest() }
 
-  void testregex$regex5() throws Throwable { doTest(); }
+  void testregex$regex5() throws Throwable { doTest() }
 
-  void testregex$regex6() throws Throwable { doTest(); }
+  void testregex$regex6() throws Throwable { doTest() }
 
-  void testregex$regex7() throws Throwable { doTest(); }
+  void testregex$regex7() throws Throwable { doTest() }
 
-  void testregex$regex8() throws Throwable { doTest(); }
+  void testregex$regex8() throws Throwable { doTest() }
 
-  void testregex$regex9() throws Throwable { doTest(); }
+  void testregex$regex9() throws Throwable { doTest() }
 
-  void testregex$regex_begin() throws Throwable { doTest(); }
+  void testregex$regex_begin() throws Throwable { doTest() }
 
-  void testregex$regex_begin2() throws Throwable { doTest(); }
+  void testregex$regex_begin2() throws Throwable { doTest() }
 
-  void testregex$multiLineSlashy() throws Throwable { doTest(); }
+  void testregex$multiLineSlashy() throws Throwable { doTest() }
 
-  void testregex$dollarSlashy() throws Throwable { doTest(); }
+  void testregex$dollarSlashy() throws Throwable { doTest() }
 
-  void testregex$dollarSlashy2() throws Throwable { doTest(); }
+  void testregex$dollarSlashy2() throws Throwable { doTest() }
 
-  void testregex$dollarSlashy3() throws Throwable { doTest(); }
+  void testregex$dollarSlashy3() throws Throwable { doTest() }
 
-  void testregex$dollarSlashy4() throws Throwable { doTest(); }
+  void testregex$dollarSlashy4() throws Throwable { doTest() }
 
-  void testregex$dollarSlashy5() throws Throwable { doTest(); }
+  void testregex$dollarSlashy5() throws Throwable { doTest() }
 
-  void testregex$dollarSlashy6() throws Throwable { doTest(); }
+  void testregex$dollarSlashy6() throws Throwable { doTest() }
 
-  void testregex$dollarSlashy7() throws Throwable { doTest(); }
+  void testregex$dollarSlashy7() throws Throwable { doTest() }
 
-  void testregex$dollarSlashy8() throws Throwable { doTest(); }
+  void testregex$dollarSlashy8() throws Throwable { doTest() }
 
-  void testregex$dollarSlashy9() throws Throwable { doTest(); }
+  void testregex$dollarSlashy9() throws Throwable { doTest() }
 
-  void testregex$dollarSlashyCode() throws Throwable { doTest(); }
+  void testregex$dollarSlashyCode() throws Throwable { doTest() }
 
-  void testregex$dollarSlashyCodeUnfinished() throws Throwable { doTest(); }
+  void testregex$dollarSlashyCodeUnfinished() throws Throwable { doTest() }
 
-  void testregex$dollarSlashyEof() throws Throwable { doTest(); }
+  void testregex$dollarSlashyEof() throws Throwable { doTest() }
 
-  void testregex$dollarSlashyRegex() throws Throwable { doTest(); }
+  void testregex$dollarSlashyRegex() throws Throwable { doTest() }
 
-  void testregex$dollarSlashyRegexFinishedTwice() throws Throwable { doTest(); }
+  void testregex$dollarSlashyRegexFinishedTwice() throws Throwable { doTest() }
 
-  void testregex$dollarSlashyRegexUnfinished() throws Throwable { doTest(); }
+  void testregex$dollarSlashyRegexUnfinished() throws Throwable { doTest() }
 
-  void testregex$dollarSlashyUnfinished() throws Throwable { doTest(); }
+  void testregex$dollarSlashyUnfinished() throws Throwable { doTest() }
 
-  void testregex$dollarSlashyWindowsPaths() throws Throwable { doTest(); }
+  void testregex$dollarSlashyWindowsPaths() throws Throwable { doTest() }
 
-  void testregex$dollarSlashyXml() throws Throwable { doTest(); }
+  void testregex$dollarSlashyXml() throws Throwable { doTest() }
 
-  void testregex$dollarSlashyDouble() throws Throwable { doTest(); }
+  void testregex$dollarSlashyDouble() throws Throwable { doTest() }
 
-  void testregex$dollarSlashyTriple() throws Throwable { doTest(); }
+  void testregex$dollarSlashyTriple() throws Throwable { doTest() }
 
   void testregex$dollarSlashyUltimate() { doTest() }
 
-  void testrelational$eq1() throws Throwable { doTest(); }
+  void testrelational$eq1() throws Throwable { doTest() }
 
-  void testrelational$inst0() throws Throwable { doTest(); }
+  void testrelational$inst0() throws Throwable { doTest() }
 
-  void testrelational$inst1() throws Throwable { doTest(); }
+  void testrelational$inst1() throws Throwable { doTest() }
 
-  void testrelational$inst2() throws Throwable { doTest(); }
+  void testrelational$inst2() throws Throwable { doTest() }
 
-  void testrelational$rel1() throws Throwable { doTest(); }
+  void testrelational$rel1() throws Throwable { doTest() }
 
-  void testspecial$grvy1173() throws Throwable { doTest(); }
+  void testspecial$grvy1173() throws Throwable { doTest() }
 
-  void testspecial$list1() throws Throwable { doTest(); }
+  void testspecial$list1() throws Throwable { doTest() }
 
-  void testspecial$list2() throws Throwable { doTest(); }
+  void testspecial$list2() throws Throwable { doTest() }
 
-  void testspecial$list3() throws Throwable { doTest(); }
+  void testspecial$list3() throws Throwable { doTest() }
 
-  void testspecial$map1() throws Throwable { doTest(); }
+  void testspecial$map1() throws Throwable { doTest() }
 
-  void testspecial$map2() throws Throwable { doTest(); }
+  void testspecial$map2() throws Throwable { doTest() }
 
-  void testspecial$map3() throws Throwable { doTest(); }
+  void testspecial$map3() throws Throwable { doTest() }
 
-  void testspecial$map4() throws Throwable { doTest(); }
+  void testspecial$map4() throws Throwable { doTest() }
 
-  void testspecial$map5() throws Throwable { doTest(); }
+  void testspecial$map5() throws Throwable { doTest() }
 
-  void testspecial$map6() throws Throwable { doTest(); }
+  void testspecial$map6() throws Throwable { doTest() }
 
-  void testspecial$map7() throws Throwable { doTest(); }
+  void testspecial$map7() throws Throwable { doTest() }
 
-  void testspecial$map8() throws Throwable { doTest(); }
+  void testspecial$map8() throws Throwable { doTest() }
 
-  void testspecial$paren13() throws Throwable { doTest(); }
+  void testspecial$paren13() throws Throwable { doTest() }
 
-  void testtypecast$castToObject() throws Throwable { doTest(); }
+  void testtypecast$castToObject() throws Throwable { doTest() }
 
-  void testtypecast$una1() throws Throwable { doTest(); }
+  void testtypecast$una1() throws Throwable { doTest() }
 
-  void testtypecast$una2() throws Throwable { doTest(); }
+  void testtypecast$una2() throws Throwable { doTest() }
 
-  void testtypecast$una3() throws Throwable { doTest(); }
+  void testtypecast$una3() throws Throwable { doTest() }
 
-  void testtypecast$una4() throws Throwable { doTest(); }
+  void testtypecast$una4() throws Throwable { doTest() }
 
-  void testtypecast$una5() throws Throwable { doTest(); }
+  void testtypecast$una5() throws Throwable { doTest() }
 
-  void testtypecast$una6() throws Throwable { doTest(); }
+  void testtypecast$una6() throws Throwable { doTest() }
 
-  void testtypecast$elvis() throws Throwable { doTest(); }
+  void testtypecast$elvis() throws Throwable { doTest() }
 
-  void testtypecast$conditional() throws Throwable { doTest(); }
+  void testtypecast$conditional() throws Throwable { doTest() }
 
-  void testAtHang() throws Throwable { doTest(); }
+  void testAtHang() throws Throwable { doTest() }
 
-  void testDollar() throws Throwable { doTest(); }
+  void testDollar() throws Throwable { doTest() }
 
-  void testNoArrowClosure() throws Throwable { doTest(); }
+  void testNoArrowClosure() throws Throwable { doTest() }
 
-  void testNoArrowClosure2() throws Throwable { doTest(); }
+  void testNoArrowClosure2() throws Throwable { doTest() }
 
   void testPropertyAccessError() throws Throwable {
     checkParsingByText "a[b{}}", """Groovy script
@@ -461,13 +461,13 @@ class ExpressionsParsingTest extends GroovyParsingTestCase {
     PsiElement(})('}')"""
   }
 
-  void testthis$qualifiedThis() throws Throwable { doTest(); }
+  void testthis$qualifiedThis() throws Throwable { doTest() }
 
-  void testsuper$qualifiedSuper() throws Throwable { doTest(); }
+  void testsuper$qualifiedSuper() throws Throwable { doTest() }
 
-  void testthis$this() throws Throwable { doTest(); }
+  void testthis$this() throws Throwable { doTest() }
 
-  void testsuper$super() throws Throwable { doTest(); }
+  void testsuper$super() throws Throwable { doTest() }
 
   void testTripleEqual() throws Exception {
     checkParsingByText "2===3", """Groovy script
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/GenericsParsingTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/GenericsParsingTest.groovy
index c1e95844c8b1..81381e33d033 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/GenericsParsingTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/GenericsParsingTest.groovy
@@ -21,30 +21,30 @@ package org.jetbrains.plugins.groovy.lang.parser
 class GenericsParsingTest extends GroovyParsingTestCase {
   final String basePath = super.basePath + "generics"
 
-  void testErr1() throws Throwable { doTest(); }
+  void testErr1() throws Throwable { doTest() }
 
-  void testErr2() throws Throwable { doTest(); }
+  void testErr2() throws Throwable { doTest() }
 
-  void testErr3() throws Throwable { doTest(); }
+  void testErr3() throws Throwable { doTest() }
 
   void testErr4() { doTest() }
 
-  void testGenmethod1() throws Throwable { doTest(); }
+  void testGenmethod1() throws Throwable { doTest() }
 
-  void testGenmethod2() throws Throwable { doTest(); }
+  void testGenmethod2() throws Throwable { doTest() }
 
-  void testGenmethod3() throws Throwable { doTest(); }
+  void testGenmethod3() throws Throwable { doTest() }
 
-  void testGenmethod4() throws Throwable { doTest(); }
+  void testGenmethod4() throws Throwable { doTest() }
 
   void testGenmethod5() { doTest() }
 
-  void testTypeargs1() throws Throwable { doTest(); }
+  void testTypeargs1() throws Throwable { doTest() }
 
-  void testTypeparam1() throws Throwable { doTest(); }
+  void testTypeparam1() throws Throwable { doTest() }
 
-  void testTypeparam2() throws Throwable { doTest(); }
+  void testTypeparam2() throws Throwable { doTest() }
 
-  void testTypeparam3() throws Throwable { doTest(); }
+  void testTypeparam3() throws Throwable { doTest() }
 
 }
\ No newline at end of file
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/GroovydocParsingTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/GroovydocParsingTest.groovy
index 221b87458385..0d15c66910a4 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/GroovydocParsingTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/GroovydocParsingTest.groovy
@@ -24,71 +24,71 @@ class GroovydocParsingTest extends GroovyParsingTestCase {
     return super.basePath + "groovydoc"
   }
 
-  void testInlined$inlined1() throws Throwable { doTest(); }
+  void testInlined$inlined1() throws Throwable { doTest() }
 
-  void testInlined$inlined10() throws Throwable { doTest(); }
+  void testInlined$inlined10() throws Throwable { doTest() }
 
-  void testInlined$inlined2() throws Throwable { doTest(); }
+  void testInlined$inlined2() throws Throwable { doTest() }
 
-  void testInlined$inlined3() throws Throwable { doTest(); }
+  void testInlined$inlined3() throws Throwable { doTest() }
 
-  void testInlined$inlined4() throws Throwable { doTest(); }
+  void testInlined$inlined4() throws Throwable { doTest() }
 
-  void testInlined$inlined5() throws Throwable { doTest(); }
+  void testInlined$inlined5() throws Throwable { doTest() }
 
-  void testInlined$inlined6() throws Throwable { doTest(); }
+  void testInlined$inlined6() throws Throwable { doTest() }
 
-  void testInlined$inlined7() throws Throwable { doTest(); }
+  void testInlined$inlined7() throws Throwable { doTest() }
 
-  void testInlined$inlined8() throws Throwable { doTest(); }
+  void testInlined$inlined8() throws Throwable { doTest() }
 
-  void testInlined$inlined9() throws Throwable { doTest(); }
+  void testInlined$inlined9() throws Throwable { doTest() }
 
-  void testParam$param1() throws Throwable { doTest(); }
+  void testParam$param1() throws Throwable { doTest() }
 
-  void testParam$param2() throws Throwable { doTest(); }
+  void testParam$param2() throws Throwable { doTest() }
 
-  void testParam$param3() throws Throwable { doTest(); }
+  void testParam$param3() throws Throwable { doTest() }
 
-  void testParam$param4() throws Throwable { doTest(); }
+  void testParam$param4() throws Throwable { doTest() }
 
-  void testParam$param5() throws Throwable { doTest(); }
+  void testParam$param5() throws Throwable { doTest() }
 
-  void testReferences$link1() throws Throwable { doTest(); }
+  void testReferences$link1() throws Throwable { doTest() }
 
-  void testReferences$link2() throws Throwable { doTest(); }
+  void testReferences$link2() throws Throwable { doTest() }
 
-  void testReferences$linkplain1() throws Throwable { doTest(); }
+  void testReferences$linkplain1() throws Throwable { doTest() }
 
-  void testReferences$see1() throws Throwable { doTest(); }
+  void testReferences$see1() throws Throwable { doTest() }
 
-  void testReferences$see2() throws Throwable { doTest(); }
+  void testReferences$see2() throws Throwable { doTest() }
 
-  void testReferences$see3() throws Throwable { doTest(); }
+  void testReferences$see3() throws Throwable { doTest() }
 
-  void testReferences$see4() throws Throwable { doTest(); }
+  void testReferences$see4() throws Throwable { doTest() }
 
-  void testReferences$see5() throws Throwable { doTest(); }
+  void testReferences$see5() throws Throwable { doTest() }
 
-  void testReferences$see6() throws Throwable { doTest(); }
+  void testReferences$see6() throws Throwable { doTest() }
 
-  void testReferences$throws1() throws Throwable { doTest(); }
+  void testReferences$throws1() throws Throwable { doTest() }
 
-  void testReferences$throws2() throws Throwable { doTest(); }
+  void testReferences$throws2() throws Throwable { doTest() }
 
-  void testReferences$val1() throws Throwable { doTest(); }
+  void testReferences$val1() throws Throwable { doTest() }
 
-  void testReferences$val2() throws Throwable { doTest(); }
+  void testReferences$val2() throws Throwable { doTest() }
 
-  void testSimple$doc1() throws Throwable { doTest(); }
+  void testSimple$doc1() throws Throwable { doTest() }
 
-  void testSimple$end1() throws Throwable { doTest(); }
+  void testSimple$end1() throws Throwable { doTest() }
 
-  void testSimple$endless1() throws Throwable { doTest(); }
+  void testSimple$endless1() throws Throwable { doTest() }
 
-  void testSimple$tag2() throws Throwable { doTest(); }
+  void testSimple$tag2() throws Throwable { doTest() }
 
-  void testValue$data1() throws Throwable { doTest(); }
+  void testValue$data1() throws Throwable { doTest() }
 
-  void testValue$val3() throws Throwable { doTest(); }
+  void testValue$val3() throws Throwable { doTest() }
 }
\ No newline at end of file
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/PackagingParsingTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/PackagingParsingTest.groovy
index 6481b17249f6..ffb7c559708f 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/PackagingParsingTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/PackagingParsingTest.groovy
@@ -24,20 +24,20 @@ class PackagingParsingTest extends GroovyParsingTestCase {
     return super.basePath + "packaging"
   }
 
-  void testPack1() throws Throwable { doTest(); }
+  void testPack1() throws Throwable { doTest() }
 
-  void testPack2() throws Throwable { doTest(); }
+  void testPack2() throws Throwable { doTest() }
 
-  void testPack3() throws Throwable { doTest(); }
+  void testPack3() throws Throwable { doTest() }
 
-  void testPack4() throws Throwable { doTest(); }
+  void testPack4() throws Throwable { doTest() }
 
-  void testPack5() throws Throwable { doTest(); }
+  void testPack5() throws Throwable { doTest() }
 
-  void testPack6() throws Throwable { doTest(); }
+  void testPack6() throws Throwable { doTest() }
 
-  void testPack7() throws Throwable { doTest(); }
+  void testPack7() throws Throwable { doTest() }
 
-  void testPack8() throws Throwable { doTest(); }
+  void testPack8() throws Throwable { doTest() }
 
 }
\ No newline at end of file
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/StatementsParsingTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/StatementsParsingTest.groovy
index 394e920894c0..18b378ad2bc9 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/StatementsParsingTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/StatementsParsingTest.groovy
@@ -21,409 +21,409 @@ package org.jetbrains.plugins.groovy.lang.parser
 class StatementsParsingTest extends GroovyParsingTestCase {
   final String basePath = super.basePath + "statements"
 
-  void testBlocks$clos1() throws Throwable { doTest(); }
+  void testBlocks$clos1() throws Throwable { doTest() }
 
-  void testBlocks$clos2() throws Throwable { doTest(); }
+  void testBlocks$clos2() throws Throwable { doTest() }
 
-  void testBlocks$clos3() throws Throwable { doTest(); }
+  void testBlocks$clos3() throws Throwable { doTest() }
 
-  void testBlocks$clos4() throws Throwable { doTest(); }
+  void testBlocks$clos4() throws Throwable { doTest() }
 
-  void testBlocks$clos5() throws Throwable { doTest(); }
+  void testBlocks$clos5() throws Throwable { doTest() }
 
-  void testBlocks$clos6() throws Throwable { doTest(); }
+  void testBlocks$clos6() throws Throwable { doTest() }
 
-  void testBlocks$form() throws Throwable { doTest(); }
+  void testBlocks$form() throws Throwable { doTest() }
 
-  void testBlocks$labeledClosure() throws Throwable { doTest(); }
+  void testBlocks$labeledClosure() throws Throwable { doTest() }
 
-  void testBranch$assert1() throws Throwable { doTest(); }
+  void testBranch$assert1() throws Throwable { doTest() }
 
-  void testBranch$assert2() throws Throwable { doTest(); }
+  void testBranch$assert2() throws Throwable { doTest() }
 
-  void testBranch$assert3() throws Throwable { doTest(); }
+  void testBranch$assert3() throws Throwable { doTest() }
 
-  void testBranch$assert4() throws Throwable { doTest(); }
+  void testBranch$assert4() throws Throwable { doTest() }
 
-  void testBranch$break1() throws Throwable { doTest(); }
+  void testBranch$break1() throws Throwable { doTest() }
 
-  void testBranch$break2() throws Throwable { doTest(); }
+  void testBranch$break2() throws Throwable { doTest() }
 
-  void testBranch$ret1() throws Throwable { doTest(); }
+  void testBranch$ret1() throws Throwable { doTest() }
 
-  void testBranch$ret2() throws Throwable { doTest(); }
+  void testBranch$ret2() throws Throwable { doTest() }
 
-  void testBranch$ret3() throws Throwable { doTest(); }
+  void testBranch$ret3() throws Throwable { doTest() }
 
-  void testBranch$thr1() throws Throwable { doTest(); }
+  void testBranch$thr1() throws Throwable { doTest() }
 
-  void testBranch$thr2() throws Throwable { doTest(); }
+  void testBranch$thr2() throws Throwable { doTest() }
 
-  void testClass_initializers$class_init1() throws Throwable { doTest(); }
+  void testClass_initializers$class_init1() throws Throwable { doTest() }
 
-  void testClass_initializers$stat_block() throws Throwable { doTest(); }
+  void testClass_initializers$stat_block() throws Throwable { doTest() }
 
-  void testDeclaration$decl1() throws Throwable { doTest(); }
+  void testDeclaration$decl1() throws Throwable { doTest() }
 
-  void testDeclaration$decl10() throws Throwable { doTest(); }
+  void testDeclaration$decl10() throws Throwable { doTest() }
 
-  void testDeclaration$decl11() throws Throwable { doTest(); }
+  void testDeclaration$decl11() throws Throwable { doTest() }
 
-  void testDeclaration$decl2() throws Throwable { doTest(); }
+  void testDeclaration$decl2() throws Throwable { doTest() }
 
-  void testDeclaration$decl3() throws Throwable { doTest(); }
+  void testDeclaration$decl3() throws Throwable { doTest() }
 
-  void testDeclaration$decl4() throws Throwable { doTest(); }
+  void testDeclaration$decl4() throws Throwable { doTest() }
 
-  void testDeclaration$decl5() throws Throwable { doTest(); }
+  void testDeclaration$decl5() throws Throwable { doTest() }
 
-  void testDeclaration$decl6() throws Throwable { doTest(); }
+  void testDeclaration$decl6() throws Throwable { doTest() }
 
-  void testDeclaration$decl7() throws Throwable { doTest(); }
+  void testDeclaration$decl7() throws Throwable { doTest() }
 
-  void testDeclaration$decl8() throws Throwable { doTest(); }
+  void testDeclaration$decl8() throws Throwable { doTest() }
 
-  void testDeclaration$decl9() throws Throwable { doTest(); }
+  void testDeclaration$decl9() throws Throwable { doTest() }
 
-  void testDeclaration$decl12() throws Throwable { doTest(); }
+  void testDeclaration$decl12() throws Throwable { doTest() }
 
-  void testDeclaration$decl13() throws Throwable { doTest(); }
+  void testDeclaration$decl13() throws Throwable { doTest() }
 
-  void testDeclaration$exprStatement() throws Throwable { doTest(); }
+  void testDeclaration$exprStatement() throws Throwable { doTest() }
 
-  void testDeclaration$conditional1() throws Throwable { doTest(); }
+  void testDeclaration$conditional1() throws Throwable { doTest() }
 
-  void testDeclaration$conditional2() throws Throwable { doTest(); }
+  void testDeclaration$conditional2() throws Throwable { doTest() }
 
-  void testDeclaration$conditional3() throws Throwable { doTest(); }
+  void testDeclaration$conditional3() throws Throwable { doTest() }
 
-  void testDeclaration$dollar() throws Throwable { doTest(); }
+  void testDeclaration$dollar() throws Throwable { doTest() }
 
-  void testDeclaration$groovyMain() throws Throwable { doTest(); }
+  void testDeclaration$groovyMain() throws Throwable { doTest() }
 
-  void testDeclaration$GRVY1451() throws Throwable { doTest("declaration/GRVY-1451.test"); }
+  void testDeclaration$GRVY1451() throws Throwable { doTest("declaration/GRVY-1451.test") }
 
-  void testDeclaration$methodCallAsMultiDecl() throws Throwable { doTest(); }
+  void testDeclaration$methodCallAsMultiDecl() throws Throwable { doTest() }
 
-  void testDeclaration$meth_err13() throws Throwable { doTest(); }
+  void testDeclaration$meth_err13() throws Throwable { doTest() }
 
-  void testDeclaration$meth_err14() throws Throwable { doTest(); }
+  void testDeclaration$meth_err14() throws Throwable { doTest() }
 
-  void testDeclaration$nl_trows() throws Throwable { doTest(); }
+  void testDeclaration$nl_trows() throws Throwable { doTest() }
 
-  void testFor$for1() throws Throwable { doTest(); }
+  void testFor$for1() throws Throwable { doTest() }
 
-  void testFor$for10() throws Throwable { doTest(); }
+  void testFor$for10() throws Throwable { doTest() }
 
-  void testFor$for11() throws Throwable { doTest(); }
+  void testFor$for11() throws Throwable { doTest() }
 
-  void testFor$for12() throws Throwable { doTest(); }
+  void testFor$for12() throws Throwable { doTest() }
 
-  void testFor$for13() throws Throwable { doTest(); }
+  void testFor$for13() throws Throwable { doTest() }
 
-  void testFor$for2() throws Throwable { doTest(); }
+  void testFor$for2() throws Throwable { doTest() }
 
-  void testFor$for3() throws Throwable { doTest(); }
+  void testFor$for3() throws Throwable { doTest() }
 
-  void testFor$for4() throws Throwable { doTest(); }
+  void testFor$for4() throws Throwable { doTest() }
 
-  void testFor$for5() throws Throwable { doTest(); }
+  void testFor$for5() throws Throwable { doTest() }
 
-  void testFor$for6() throws Throwable { doTest(); }
+  void testFor$for6() throws Throwable { doTest() }
 
-  void testFor$for7() throws Throwable { doTest(); }
+  void testFor$for7() throws Throwable { doTest() }
 
-  void testFor$for8() throws Throwable { doTest(); }
+  void testFor$for8() throws Throwable { doTest() }
 
-  void testFor$for9() throws Throwable { doTest(); }
+  void testFor$for9() throws Throwable { doTest() }
 
-  void testIfstmt$if1() throws Throwable { doTest(); }
+  void testIfstmt$if1() throws Throwable { doTest() }
 
-  void testIfstmt$if2() throws Throwable { doTest(); }
+  void testIfstmt$if2() throws Throwable { doTest() }
 
-  void testIfstmt$if3() throws Throwable { doTest(); }
+  void testIfstmt$if3() throws Throwable { doTest() }
 
-  void testIfstmt$if4() throws Throwable { doTest(); }
+  void testIfstmt$if4() throws Throwable { doTest() }
 
-  void testIfstmt$if5() throws Throwable { doTest(); }
+  void testIfstmt$if5() throws Throwable { doTest() }
 
-  void testIfstmt$if6() throws Throwable { doTest(); }
+  void testIfstmt$if6() throws Throwable { doTest() }
 
-  void testImports$imp0() throws Throwable { doTest(); }
+  void testImports$imp0() throws Throwable { doTest() }
 
-  void testImports$imp1() throws Throwable { doTest(); }
+  void testImports$imp1() throws Throwable { doTest() }
 
-  void testImports$imp2() throws Throwable { doTest(); }
+  void testImports$imp2() throws Throwable { doTest() }
 
-  void testImports$imp3() throws Throwable { doTest(); }
+  void testImports$imp3() throws Throwable { doTest() }
 
-  void testImports$imp4() throws Throwable { doTest(); }
+  void testImports$imp4() throws Throwable { doTest() }
 
-  void testImports$imp5() throws Throwable { doTest(); }
+  void testImports$imp5() throws Throwable { doTest() }
 
-  void testImports$imp6() throws Throwable { doTest(); }
+  void testImports$imp6() throws Throwable { doTest() }
 
-  void testImports$imp7() throws Throwable { doTest(); }
+  void testImports$imp7() throws Throwable { doTest() }
 
-  void testImports$imp8() throws Throwable { doTest(); }
+  void testImports$imp8() throws Throwable { doTest() }
 
-  void testKing_regex$king1() throws Throwable { doTest(); }
+  void testKing_regex$king1() throws Throwable { doTest() }
 
-  void testKing_regex$king2() throws Throwable { doTest(); }
+  void testKing_regex$king2() throws Throwable { doTest() }
 
-  void testKing_regex$king3() throws Throwable { doTest(); }
+  void testKing_regex$king3() throws Throwable { doTest() }
 
-  void testKing_regex$king4() throws Throwable { doTest(); }
+  void testKing_regex$king4() throws Throwable { doTest() }
 
-  void testLabeled$label1() throws Throwable { doTest(); }
+  void testLabeled$label1() throws Throwable { doTest() }
 
-  void testLabeled$label2() throws Throwable { doTest(); }
+  void testLabeled$label2() throws Throwable { doTest() }
 
-  void testLabeled$label3() throws Throwable { doTest(); }
+  void testLabeled$label3() throws Throwable { doTest() }
 
-  void testLoop$while1() throws Throwable { doTest(); }
+  void testLoop$while1() throws Throwable { doTest() }
 
-  void testLoop$while2() throws Throwable { doTest(); }
+  void testLoop$while2() throws Throwable { doTest() }
 
-  void testLoop$while3() throws Throwable { doTest(); }
+  void testLoop$while3() throws Throwable { doTest() }
 
-  void testLoop$while4() throws Throwable { doTest(); }
+  void testLoop$while4() throws Throwable { doTest() }
 
-  void testLoop$while6() throws Throwable { doTest(); }
+  void testLoop$while6() throws Throwable { doTest() }
 
-  void testMethods$method1() throws Throwable { doTest(); }
+  void testMethods$method1() throws Throwable { doTest() }
 
-  void testMethods$method2() throws Throwable { doTest(); }
+  void testMethods$method2() throws Throwable { doTest() }
 
-  void testMethods$method3() throws Throwable { doTest(); }
+  void testMethods$method3() throws Throwable { doTest() }
 
-  void testMethods$method4() throws Throwable { doTest(); }
+  void testMethods$method4() throws Throwable { doTest() }
 
-  void testMethods$method5() throws Throwable { doTest(); }
+  void testMethods$method5() throws Throwable { doTest() }
 
-  void testMethods$method6() throws Throwable { doTest(); }
+  void testMethods$method6() throws Throwable { doTest() }
 
-  void testMethods$vararg() throws Throwable { doTest(); }
+  void testMethods$vararg() throws Throwable { doTest() }
 
-  void testMultiple_assign$grvy2086() throws Throwable { doTest("multiple_assign/grvy-2086.test"); }
+  void testMultiple_assign$grvy2086() throws Throwable { doTest("multiple_assign/grvy-2086.test") }
 
-  void testMultiple_assign$mult_assign() throws Throwable { doTest(); }
+  void testMultiple_assign$mult_assign() throws Throwable { doTest() }
 
-  void testMultiple_assign$mult_def() throws Throwable { doTest(); }
+  void testMultiple_assign$mult_def() throws Throwable { doTest() }
 
-  void testMultiple_assign$without_assign() throws Throwable { doTest(); }
+  void testMultiple_assign$without_assign() throws Throwable { doTest() }
 
-  void testSwitch$laforge1() throws Throwable { doTest(); }
+  void testSwitch$laforge1() throws Throwable { doTest() }
 
-  void testSwitch$swit1() throws Throwable { doTest(); }
+  void testSwitch$swit1() throws Throwable { doTest() }
 
-  void testSwitch$swit2() throws Throwable { doTest(); }
+  void testSwitch$swit2() throws Throwable { doTest() }
 
-  void testSwitch$swit3() throws Throwable { doTest(); }
+  void testSwitch$swit3() throws Throwable { doTest() }
 
-  void testSwitch$swit4() throws Throwable { doTest(); }
+  void testSwitch$swit4() throws Throwable { doTest() }
 
-  void testSwitch$swit5() throws Throwable { doTest(); }
+  void testSwitch$swit5() throws Throwable { doTest() }
 
-  void testSwitch$swit6() throws Throwable { doTest(); }
+  void testSwitch$swit6() throws Throwable { doTest() }
 
-  void testSwitch$swit7() throws Throwable { doTest(); }
+  void testSwitch$swit7() throws Throwable { doTest() }
 
-  void testSwitch$swit8() throws Throwable { doTest(); }
+  void testSwitch$swit8() throws Throwable { doTest() }
 
-  void testSyn$syn1() throws Throwable { doTest(); }
+  void testSyn$syn1() throws Throwable { doTest() }
 
-  void testTop_methods$method1() throws Throwable { doTest(); }
+  void testTop_methods$method1() throws Throwable { doTest() }
 
-  void testTop_methods$method2() throws Throwable { doTest(); }
+  void testTop_methods$method2() throws Throwable { doTest() }
 
-  void testTop_methods$method3() throws Throwable { doTest(); }
+  void testTop_methods$method3() throws Throwable { doTest() }
 
-  void testTop_methods$method4() throws Throwable { doTest(); }
+  void testTop_methods$method4() throws Throwable { doTest() }
 
-  void testTry_catch$try1() throws Throwable { doTest(); }
+  void testTry_catch$try1() throws Throwable { doTest() }
 
-  void testTry_catch$try2() throws Throwable { doTest(); }
+  void testTry_catch$try2() throws Throwable { doTest() }
 
-  void testTry_catch$try3() throws Throwable { doTest(); }
+  void testTry_catch$try3() throws Throwable { doTest() }
 
-  void testTry_catch$try4() throws Throwable { doTest(); }
+  void testTry_catch$try4() throws Throwable { doTest() }
 
-  void testTry_catch$try5() throws Throwable { doTest(); }
+  void testTry_catch$try5() throws Throwable { doTest() }
 
-  void testTry_catch$try6() throws Throwable { doTest(); }
+  void testTry_catch$try6() throws Throwable { doTest() }
 
-  void testTry_catch$try7() throws Throwable { doTest(); }
+  void testTry_catch$try7() throws Throwable { doTest() }
 
-  void testTuples$doubleParens() throws Throwable { doTest(); }
+  void testTuples$doubleParens() throws Throwable { doTest() }
 
-  void testTuples$methCallNotTuple() throws Throwable { doTest(); }
+  void testTuples$methCallNotTuple() throws Throwable { doTest() }
 
-  void testTuples$nestedTupleUnsupp() throws Throwable { doTest(); }
+  void testTuples$nestedTupleUnsupp() throws Throwable { doTest() }
 
-  void testTuples$tupleInClass() throws Throwable { doTest(); }
+  void testTuples$tupleInClass() throws Throwable { doTest() }
 
-  void testTuples$tupleInScript() throws Throwable { doTest(); }
+  void testTuples$tupleInScript() throws Throwable { doTest() }
 
-  void testTuples$tupleNotInit() throws Throwable { doTest(); }
+  void testTuples$tupleNotInit() throws Throwable { doTest() }
 
-  void testTuples$tupleOneVarInLine() throws Throwable { doTest(); }
+  void testTuples$tupleOneVarInLine() throws Throwable { doTest() }
 
-  void testTuples$tupleTypeErr() throws Throwable { doTest(); }
+  void testTuples$tupleTypeErr() throws Throwable { doTest() }
 
-  void testTuples$tupleWithoutDef() throws Throwable { doTest(); }
+  void testTuples$tupleWithoutDef() throws Throwable { doTest() }
 
-  void testTypedef$classes$abstr() throws Throwable { doTest(); }
+  void testTypedef$classes$abstr() throws Throwable { doTest() }
 
-  void testTypedef$classes$class1() throws Throwable { doTest(); }
+  void testTypedef$classes$class1() throws Throwable { doTest() }
 
-  void testTypedef$classes$class10() throws Throwable { doTest(); }
+  void testTypedef$classes$class10() throws Throwable { doTest() }
 
-  void testTypedef$classes$class11() throws Throwable { doTest(); }
+  void testTypedef$classes$class11() throws Throwable { doTest() }
 
-  void testTypedef$classes$class2() throws Throwable { doTest(); }
+  void testTypedef$classes$class2() throws Throwable { doTest() }
 
-  void testTypedef$classes$class3() throws Throwable { doTest(); }
+  void testTypedef$classes$class3() throws Throwable { doTest() }
 
-  void testTypedef$classes$class4() throws Throwable { doTest(); }
+  void testTypedef$classes$class4() throws Throwable { doTest() }
 
-  void testTypedef$classes$class5() throws Throwable { doTest(); }
+  void testTypedef$classes$class5() throws Throwable { doTest() }
 
-  void testTypedef$classes$class6() throws Throwable { doTest(); }
+  void testTypedef$classes$class6() throws Throwable { doTest() }
 
-  void testTypedef$classes$class7() throws Throwable { doTest(); }
+  void testTypedef$classes$class7() throws Throwable { doTest() }
 
-  void testTypedef$classes$class8() throws Throwable { doTest(); }
+  void testTypedef$classes$class8() throws Throwable { doTest() }
 
-  void testTypedef$classes$class9() throws Throwable { doTest(); }
+  void testTypedef$classes$class9() throws Throwable { doTest() }
 
-  void testTypedef$classes$errors$classerr1() throws Throwable { doTest(); }
+  void testTypedef$classes$errors$classerr1() throws Throwable { doTest() }
 
-  void testTypedef$classes$errors$classerr2() throws Throwable { doTest(); }
+  void testTypedef$classes$errors$classerr2() throws Throwable { doTest() }
 
-  void testTypedef$classes$errors$classerr3() throws Throwable { doTest(); }
+  void testTypedef$classes$errors$classerr3() throws Throwable { doTest() }
 
-  void testTypedef$classes$errors$class_error() throws Throwable { doTest(); }
+  void testTypedef$classes$errors$class_error() throws Throwable { doTest() }
 
-  void testTypedef$constructors$construct12() throws Throwable { doTest(); }
+  void testTypedef$constructors$construct12() throws Throwable { doTest() }
 
-  void testTypedef$constructors$constructor1() throws Throwable { doTest(); }
+  void testTypedef$constructors$constructor1() throws Throwable { doTest() }
 
-  void testTypedef$constructors$constructor10() throws Throwable { doTest(); }
+  void testTypedef$constructors$constructor10() throws Throwable { doTest() }
 
-  void testTypedef$constructors$constructor11() throws Throwable { doTest(); }
+  void testTypedef$constructors$constructor11() throws Throwable { doTest() }
 
-  void testTypedef$constructors$constructor13() throws Throwable { doTest(); }
+  void testTypedef$constructors$constructor13() throws Throwable { doTest() }
 
-  void testTypedef$constructors$constructor14() throws Throwable { doTest(); }
+  void testTypedef$constructors$constructor14() throws Throwable { doTest() }
 
-  void testTypedef$constructors$constructor15() throws Throwable { doTest(); }
+  void testTypedef$constructors$constructor15() throws Throwable { doTest() }
 
-  void testTypedef$constructors$constructor2() throws Throwable { doTest(); }
+  void testTypedef$constructors$constructor2() throws Throwable { doTest() }
 
-  void testTypedef$constructors$constructor3() throws Throwable { doTest(); }
+  void testTypedef$constructors$constructor3() throws Throwable { doTest() }
 
-  void testTypedef$constructors$constructor4() throws Throwable { doTest(); }
+  void testTypedef$constructors$constructor4() throws Throwable { doTest() }
 
-  void testTypedef$constructors$constructor5() throws Throwable { doTest(); }
+  void testTypedef$constructors$constructor5() throws Throwable { doTest() }
 
-  void testTypedef$constructors$constructor6() throws Throwable { doTest(); }
+  void testTypedef$constructors$constructor6() throws Throwable { doTest() }
 
-  void testTypedef$constructors$constructor7() throws Throwable { doTest(); }
+  void testTypedef$constructors$constructor7() throws Throwable { doTest() }
 
-  void testTypedef$constructors$constructor8() throws Throwable { doTest(); }
+  void testTypedef$constructors$constructor8() throws Throwable { doTest() }
 
-  void testTypedef$constructors$constructor9() throws Throwable { doTest(); }
+  void testTypedef$constructors$constructor9() throws Throwable { doTest() }
 
-  void testTypedef$enums$enum1() throws Throwable { doTest(); }
+  void testTypedef$enums$enum1() throws Throwable { doTest() }
 
-  void testTypedef$enums$enum10() throws Throwable { doTest(); }
+  void testTypedef$enums$enum10() throws Throwable { doTest() }
 
-  void testTypedef$enums$enum11() throws Throwable { doTest(); }
+  void testTypedef$enums$enum11() throws Throwable { doTest() }
 
-  void testTypedef$enums$enum12() throws Throwable { doTest(); }
+  void testTypedef$enums$enum12() throws Throwable { doTest() }
 
-  void testTypedef$enums$enum13() throws Throwable { doTest(); }
+  void testTypedef$enums$enum13() throws Throwable { doTest() }
 
-  void testTypedef$enums$enum2() throws Throwable { doTest(); }
+  void testTypedef$enums$enum2() throws Throwable { doTest() }
 
-  void testTypedef$enums$enum3() throws Throwable { doTest(); }
+  void testTypedef$enums$enum3() throws Throwable { doTest() }
 
-  void testTypedef$enums$enum4() throws Throwable { doTest(); }
+  void testTypedef$enums$enum4() throws Throwable { doTest() }
 
-  void testTypedef$enums$enum5() throws Throwable { doTest(); }
+  void testTypedef$enums$enum5() throws Throwable { doTest() }
 
-  void testTypedef$enums$enum6() throws Throwable { doTest(); }
+  void testTypedef$enums$enum6() throws Throwable { doTest() }
 
-  void testTypedef$enums$enum7() throws Throwable { doTest(); }
+  void testTypedef$enums$enum7() throws Throwable { doTest() }
 
-  void testTypedef$enums$enum8() throws Throwable { doTest(); }
+  void testTypedef$enums$enum8() throws Throwable { doTest() }
 
-  void testTypedef$enums$enum9() throws Throwable { doTest(); }
+  void testTypedef$enums$enum9() throws Throwable { doTest() }
 
-  void testTypedef$interfaces$errors$interfaceerr1() throws Throwable { doTest(); }
+  void testTypedef$interfaces$errors$interfaceerr1() throws Throwable { doTest() }
 
-  void testTypedef$interfaces$errors$interfaceerr2() throws Throwable { doTest(); }
+  void testTypedef$interfaces$errors$interfaceerr2() throws Throwable { doTest() }
 
-  void testTypedef$interfaces$errors$interfaceerr3() throws Throwable { doTest(); }
+  void testTypedef$interfaces$errors$interfaceerr3() throws Throwable { doTest() }
 
-  void testTypedef$interfaces$interface1() throws Throwable { doTest(); }
+  void testTypedef$interfaces$interface1() throws Throwable { doTest() }
 
-  void testTypedef$interfaces$interface2() throws Throwable { doTest(); }
+  void testTypedef$interfaces$interface2() throws Throwable { doTest() }
 
-  void testTypedef$interfaces$interface3() throws Throwable { doTest(); }
+  void testTypedef$interfaces$interface3() throws Throwable { doTest() }
 
-  void testTypedef$interfaces$interface4() throws Throwable { doTest(); }
+  void testTypedef$interfaces$interface4() throws Throwable { doTest() }
 
-  void testTypedef$interfaces$interface5() throws Throwable { doTest(); }
+  void testTypedef$interfaces$interface5() throws Throwable { doTest() }
 
-  void testTypedef$interfaces$member3() throws Throwable { doTest(); }
+  void testTypedef$interfaces$member3() throws Throwable { doTest() }
 
-  void testTypedef$interfaces$members$member1() throws Throwable { doTest(); }
+  void testTypedef$interfaces$members$member1() throws Throwable { doTest() }
 
-  void testTypedef$interfaces$members$member2() throws Throwable { doTest(); }
+  void testTypedef$interfaces$members$member2() throws Throwable { doTest() }
 
-  void testTypedef$interfaces$members$member3() throws Throwable { doTest(); }
+  void testTypedef$interfaces$members$member3() throws Throwable { doTest() }
 
-  void testTypedef$interfaces$members$member4() throws Throwable { doTest(); }
+  void testTypedef$interfaces$members$member4() throws Throwable { doTest() }
 
-  void testTypedef$interfaces$members$member5() throws Throwable { doTest(); }
+  void testTypedef$interfaces$members$member5() throws Throwable { doTest() }
 
-  void testTypedef$interfaces$members$member6() throws Throwable { doTest(); }
+  void testTypedef$interfaces$members$member6() throws Throwable { doTest() }
 
-  void testTypedef$interfaces$members$memeber7() throws Throwable { doTest(); }
+  void testTypedef$interfaces$members$memeber7() throws Throwable { doTest() }
 
   void testTypedef$traits$trait1() { doTest() }
 
-  void testTypedef$methods$method2() throws Throwable { doTest(); }
+  void testTypedef$methods$method2() throws Throwable { doTest() }
 
-  void testTypedef$methods$method3() throws Throwable { doTest(); }
+  void testTypedef$methods$method3() throws Throwable { doTest() }
 
-  void testTypedef$methods$method4() throws Throwable { doTest(); }
+  void testTypedef$methods$method4() throws Throwable { doTest() }
 
-  void testUse$use1() throws Throwable { doTest(); }
+  void testUse$use1() throws Throwable { doTest() }
 
-  void testVardef$vardef1() throws Throwable { doTest(); }
+  void testVardef$vardef1() throws Throwable { doTest() }
 
-  void testVardef$vardef2() throws Throwable { doTest(); }
+  void testVardef$vardef2() throws Throwable { doTest() }
 
-  void testVardef$vardef3() throws Throwable { doTest(); }
+  void testVardef$vardef3() throws Throwable { doTest() }
 
-  void testVardef$vardef4() throws Throwable { doTest(); }
+  void testVardef$vardef4() throws Throwable { doTest() }
 
-  void testVardef$vardeferr() throws Throwable { doTest(); }
+  void testVardef$vardeferr() throws Throwable { doTest() }
 
-  void testVardef$vardeferrsingle4() throws Throwable { doTest(); }
+  void testVardef$vardeferrsingle4() throws Throwable { doTest() }
 
-  void testWith$with1() throws Throwable { doTest(); }
+  void testWith$with1() throws Throwable { doTest() }
 
-  void testWith$with2() throws Throwable { doTest(); }
+  void testWith$with2() throws Throwable { doTest() }
 
-  void testAfterAs() throws Throwable { doTest(); }
+  void testAfterAs() throws Throwable { doTest() }
 
-  void testUnnamedField() throws Throwable { doTest(); }
+  void testUnnamedField() throws Throwable { doTest() }
 
-  void testIfRecovery() throws Throwable { doTest(); }
+  void testIfRecovery() throws Throwable { doTest() }
 
-  void testSemicolonsOnDifferentLines() throws Throwable { doTest(); }
+  void testSemicolonsOnDifferentLines() throws Throwable { doTest() }
 }
\ No newline at end of file
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/TypesParsingTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/TypesParsingTest.groovy
index 08574bfbfac3..6688a01653ce 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/TypesParsingTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/parser/TypesParsingTest.groovy
@@ -24,55 +24,55 @@ class TypesParsingTest extends GroovyParsingTestCase {
     return super.basePath + "types"
   }
 
-  void testAnn_def1() throws Throwable { doTest(); }
+  void testAnn_def1() throws Throwable { doTest() }
 
-  void testAnn_def2() throws Throwable { doTest(); }
+  void testAnn_def2() throws Throwable { doTest() }
 
-  void testAnn_def3() throws Throwable { doTest(); }
+  void testAnn_def3() throws Throwable { doTest() }
 
-  void testDefault1() throws Throwable { doTest(); }
+  void testDefault1() throws Throwable { doTest() }
 
-  void testDefault2() throws Throwable { doTest(); }
+  void testDefault2() throws Throwable { doTest() }
 
-  void testType1() throws Throwable { doTest(); }
+  void testType1() throws Throwable { doTest() }
 
-  void testType10() throws Throwable { doTest(); }
+  void testType10() throws Throwable { doTest() }
 
-  void testType11() throws Throwable { doTest(); }
+  void testType11() throws Throwable { doTest() }
 
-  void testType12() throws Throwable { doTest(); }
+  void testType12() throws Throwable { doTest() }
 
-  void testType13() throws Throwable { doTest(); }
+  void testType13() throws Throwable { doTest() }
 
-  void testType14() throws Throwable { doTest(); }
+  void testType14() throws Throwable { doTest() }
 
-  void testType15() throws Throwable { doTest(); }
+  void testType15() throws Throwable { doTest() }
 
-  void testType2() throws Throwable { doTest(); }
+  void testType2() throws Throwable { doTest() }
 
-  void testType3() throws Throwable { doTest(); }
+  void testType3() throws Throwable { doTest() }
 
-  void testType4() throws Throwable { doTest(); }
+  void testType4() throws Throwable { doTest() }
 
-  void testType5() throws Throwable { doTest(); }
+  void testType5() throws Throwable { doTest() }
 
-  void testType6() throws Throwable { doTest(); }
+  void testType6() throws Throwable { doTest() }
 
-  void testType7() throws Throwable { doTest(); }
+  void testType7() throws Throwable { doTest() }
 
-  void testType8() throws Throwable { doTest(); }
+  void testType8() throws Throwable { doTest() }
 
-  void testType9() throws Throwable { doTest(); }
+  void testType9() throws Throwable { doTest() }
 
-  void testInnerEnum() throws Throwable { doTest(); }
+  void testInnerEnum() throws Throwable { doTest() }
 
-  void testNewlineBeforeClassBrace() throws Throwable { doTest(); }
+  void testNewlineBeforeClassBrace() throws Throwable { doTest() }
 
-  void testNewlineBeforeExtends() throws Throwable { doTest(); }
+  void testNewlineBeforeExtends() throws Throwable { doTest() }
 
-  void testStaticInitializer() throws Throwable { doTest(); }
+  void testStaticInitializer() throws Throwable { doTest() }
 
-  void testInterfaceWithGroovyDoc() throws Throwable { doTest(); }
+  void testInterfaceWithGroovyDoc() throws Throwable { doTest() }
 
   void testIncorrectParam1() { doTest() }
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveClassTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveClassTest.groovy
index 72fae1bdc8ce..6b03da2ee665 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveClassTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveClassTest.groovy
@@ -103,13 +103,13 @@ class ResolveClassTest extends GroovyResolveTestCase {
     assertNotNull(ref.resolve())
   }
 
-  void _testImportStaticFromJavaUtil() throws Throwable { doTest(); }
+  void _testImportStaticFromJavaUtil() throws Throwable { doTest() }
 
-  void testInnerEnum() throws Throwable { doTest(); }
+  void testInnerEnum() throws Throwable { doTest() }
 
-  void testInnerClass() throws Throwable { doTest(); }
+  void testInnerClass() throws Throwable { doTest() }
 
-  void testInnerClassInSubclass() throws Throwable { doTest(); }
+  void testInnerClassInSubclass() throws Throwable { doTest() }
 
   void testInnerClassUsageInsideOuterSubclass() throws Throwable { doTest() }
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/surroundWith/SurroundExpressionTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/surroundWith/SurroundExpressionTest.groovy
index 5bd15a689937..4b4cd113eac0 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/surroundWith/SurroundExpressionTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/surroundWith/SurroundExpressionTest.groovy
@@ -23,21 +23,21 @@ import org.jetbrains.plugins.groovy.util.TestUtils
  */
 class SurroundExpressionTest extends SurroundTestCase {
 
-  void testBrackets1() throws Exception { doTest(new ParenthesisExprSurrounder()); }
+  void testBrackets1() throws Exception { doTest(new ParenthesisExprSurrounder()) }
 
-  void testIf1() throws Exception { doTest(new IfExprSurrounder()); }
+  void testIf1() throws Exception { doTest(new IfExprSurrounder()) }
 
-  void testIf_else1() throws Exception { doTest(new IfElseExprSurrounder()); }
+  void testIf_else1() throws Exception { doTest(new IfElseExprSurrounder()) }
 
-  void testType_cast1() throws Exception { doTest(new TypeCastSurrounder()); }
+  void testType_cast1() throws Exception { doTest(new TypeCastSurrounder()) }
 
-  void testType_cast2() throws Exception { doTest(new TypeCastSurrounder()); }
+  void testType_cast2() throws Exception { doTest(new TypeCastSurrounder()) }
 
-  void testWhile1() throws Exception { doTest(new WhileExprSurrounder()); }
+  void testWhile1() throws Exception { doTest(new WhileExprSurrounder()) }
 
-  void testWith2() throws Exception { doTest(new WithExprSurrounder()); }
+  void testWith2() throws Exception { doTest(new WithExprSurrounder()) }
 
-  void testBinaryWithCast() throws Exception { doTest(new TypeCastSurrounder()); }
+  void testBinaryWithCast() throws Exception { doTest(new TypeCastSurrounder()) }
 
   void testCommandArgList() { doTest(new TypeCastSurrounder()) }
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/surroundWith/SurroundStatementsTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/surroundWith/SurroundStatementsTest.groovy
index 25d19e845008..abb86c7ef729 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/surroundWith/SurroundStatementsTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/surroundWith/SurroundStatementsTest.groovy
@@ -30,33 +30,33 @@ class SurroundStatementsTest extends SurroundTestCase {
     return TestUtils.getTestDataPath() + "groovy/surround/statements/"
   }
 
-  void testClosure1() throws Exception { doTest(new SurrounderByClosure()); }
+  void testClosure1() throws Exception { doTest(new SurrounderByClosure()) }
 
-  void testClosure2() throws Exception { doTest(new SurrounderByClosure()); }
+  void testClosure2() throws Exception { doTest(new SurrounderByClosure()) }
 
-  void testClosure3() throws Exception { doTest(new SurrounderByClosure()); }
+  void testClosure3() throws Exception { doTest(new SurrounderByClosure()) }
 
-  void testIf1() throws Exception { doTest(new IfSurrounder()); }
+  void testIf1() throws Exception { doTest(new IfSurrounder()) }
 
-  void testIf_else1() throws Exception { doTest(new IfElseSurrounder()); }
+  void testIf_else1() throws Exception { doTest(new IfElseSurrounder()) }
 
-  void testShouldFailWithType() throws Exception { doTest(new ShouldFailWithTypeStatementsSurrounder()); }
+  void testShouldFailWithType() throws Exception { doTest(new ShouldFailWithTypeStatementsSurrounder()) }
 
-  void testTry_catch1() throws Exception { doTest(new TryCatchSurrounder()); }
+  void testTry_catch1() throws Exception { doTest(new TryCatchSurrounder()) }
 
-  void testTry_catch_finally() throws Exception { doTest(new TryCatchFinallySurrounder()); }
+  void testTry_catch_finally() throws Exception { doTest(new TryCatchFinallySurrounder()) }
 
-  void testTry_finally1() throws Exception { doTest(new TryFinallySurrounder()); }
+  void testTry_finally1() throws Exception { doTest(new TryFinallySurrounder()) }
 
-  void testTry_finallyFormatting() throws Exception { doTest(new TryFinallySurrounder()); }
+  void testTry_finallyFormatting() throws Exception { doTest(new TryFinallySurrounder()) }
 
-  void testWhile1() throws Exception { doTest(new WhileSurrounder()); }
+  void testWhile1() throws Exception { doTest(new WhileSurrounder()) }
 
-  void testWith2() throws Exception { doTest(new WithStatementsSurrounder()); }
+  void testWith2() throws Exception { doTest(new WithStatementsSurrounder()) }
 
-  void testFor1() throws Exception { doTest(new ForSurrounder()); }
+  void testFor1() throws Exception { doTest(new ForSurrounder()) }
 
-  void testIfComments() throws Exception { doTest(new IfSurrounder()); }
+  void testIfComments() throws Exception { doTest(new IfSurrounder()) }
 
   void testBracesInIf() {
     doTest(new GrBracesSurrounder(), '''\
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/extract/method/ExtractMethodTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/extract/method/ExtractMethodTest.groovy
index a899f07db220..28f507eef35a 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/extract/method/ExtractMethodTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/extract/method/ExtractMethodTest.groovy
@@ -103,83 +103,83 @@ class ExtractMethodTest extends LightGroovyTestCase {
     }
   }
 
-  void testClos_em() throws Throwable { doTest(); }
+  void testClos_em() throws Throwable { doTest() }
 
-  void testEm1() throws Throwable { doTest(); }
+  void testEm1() throws Throwable { doTest() }
 
-  void testEnum1() throws Throwable { doTest(); }
+  void testEnum1() throws Throwable { doTest() }
 
-  void testErr1() throws Throwable { doTest(); }
+  void testErr1() throws Throwable { doTest() }
 
-  void testExpr1() throws Throwable { doTest(); }
+  void testExpr1() throws Throwable { doTest() }
 
-  void testExpr2() throws Throwable { doTest(); }
+  void testExpr2() throws Throwable { doTest() }
 
-  void testExpr3() throws Throwable { doTest(); }
+  void testExpr3() throws Throwable { doTest() }
 
-  void testInput1() throws Throwable { doTest(); }
+  void testInput1() throws Throwable { doTest() }
 
-  void testInput2() throws Throwable { doTest(); }
+  void testInput2() throws Throwable { doTest() }
 
-  void testInter1() throws Throwable { doTest(); }
+  void testInter1() throws Throwable { doTest() }
 
-  void testInter2() throws Throwable { doAntiTest("Refactoring is not supported when return statement interrupts the execution flow"); }
+  void testInter2() throws Throwable { doAntiTest("Refactoring is not supported when return statement interrupts the execution flow") }
 
-  void testInter3() throws Throwable { doAntiTest("Refactoring is not supported when return statement interrupts the execution flow"); }
+  void testInter3() throws Throwable { doAntiTest("Refactoring is not supported when return statement interrupts the execution flow") }
 
-  void testInter4() throws Throwable { doTest(); }
+  void testInter4() throws Throwable { doTest() }
 
-  void testMeth_em1() throws Throwable { doTest(); }
+  void testMeth_em1() throws Throwable { doTest() }
 
-  void testMeth_em2() throws Throwable { doTest(); }
+  void testMeth_em2() throws Throwable { doTest() }
 
-  void testMeth_em3() throws Throwable { doTest(); }
+  void testMeth_em3() throws Throwable { doTest() }
 
-  void testOutput1() throws Throwable { doTest(); }
+  void testOutput1() throws Throwable { doTest() }
 
-  void testResul1() throws Throwable { doTest(); }
+  void testResul1() throws Throwable { doTest() }
 
-  void testRet1() throws Throwable { doTest(); }
+  void testRet1() throws Throwable { doTest() }
 
-  void testRet2() throws Throwable { doTest(); }
+  void testRet2() throws Throwable { doTest() }
 
-  void testRet3() throws Throwable { doTest(); }
+  void testRet3() throws Throwable { doTest() }
 
-  void testRet4() throws Throwable { doAntiTest("Refactoring is not supported when return statement interrupts the execution flow"); }
+  void testRet4() throws Throwable { doAntiTest("Refactoring is not supported when return statement interrupts the execution flow") }
 
-  void testVen1() throws Throwable { doTest(); }
+  void testVen1() throws Throwable { doTest() }
 
-  void testVen2() throws Throwable { doTest(); }
+  void testVen2() throws Throwable { doTest() }
 
-  void testVen3() throws Throwable { doTest(); }
+  void testVen3() throws Throwable { doTest() }
 
-  void testForIn() throws Throwable { doTest(); }
+  void testForIn() throws Throwable { doTest() }
 
-  void testInCatch() { doTest(); }
+  void testInCatch() { doTest() }
 
-  void testClosureIt() throws Throwable { doTest(); }
+  void testClosureIt() throws Throwable { doTest() }
 
-  void testImplicitReturn() { doTest(); }
+  void testImplicitReturn() { doTest() }
 
-  void testMultiOutput1() { doTest(); }
+  void testMultiOutput1() { doTest() }
 
-  void testMultiOutput2() { doTest(); }
+  void testMultiOutput2() { doTest() }
 
-  void testMultiOutput3() { doTest(); }
+  void testMultiOutput3() { doTest() }
 
-  void testMultiOutput4() { doTest(); }
+  void testMultiOutput4() { doTest() }
 
-  void testMultiOutput5() { doTest(); }
+  void testMultiOutput5() { doTest() }
 
-  void testDontShortenRefsIncorrect() { doTest(); }
+  void testDontShortenRefsIncorrect() { doTest() }
 
-  void testLastBlockStatementInterruptsControlFlow() { doTest(); }
+  void testLastBlockStatementInterruptsControlFlow() { doTest() }
 
-  void testAOOBE() { doTest(); }
+  void testAOOBE() { doTest() }
 
-  void testWildCardReturnType() { doTest(); }
+  void testWildCardReturnType() { doTest() }
 
-  void testParamChangedInsideExtractedMethod() { doTest(); }
+  void testParamChangedInsideExtractedMethod() { doTest() }
 
   void testTerribleAppStatement() { doTest() }
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/inline/InlineMethodTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/inline/InlineMethodTest.groovy
index d397bd4705c2..cb9c746383fd 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/inline/InlineMethodTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/inline/InlineMethodTest.groovy
@@ -44,113 +44,113 @@ class InlineMethodTest extends LightCodeInsightFixtureTestCase {
 
   final String basePath = TestUtils.testDataPath + "groovy/refactoring/inlineMethod/"
 
-  void testAbstr1() throws Throwable { doTest(); }
+  void testAbstr1() throws Throwable { doTest() }
 
-  void testBlock1() throws Throwable { doTest(); }
+  void testBlock1() throws Throwable { doTest() }
 
-  void testBlock2() throws Throwable { doTest(); }
+  void testBlock2() throws Throwable { doTest() }
 
-  void testBlock3() throws Throwable { doTest(); }
+  void testBlock3() throws Throwable { doTest() }
 
-  void testBlock4() throws Throwable { doTest(); }
+  void testBlock4() throws Throwable { doTest() }
 
-  void testCase1() throws Throwable { doTest(); }
+  void testCase1() throws Throwable { doTest() }
 
-  void testCase2() throws Throwable { doTest(); }
+  void testCase2() throws Throwable { doTest() }
 
-  void testClos_arg1() throws Throwable { doTest(); }
+  void testClos_arg1() throws Throwable { doTest() }
 
-  void testClos_arg2() throws Throwable { doTest(); }
+  void testClos_arg2() throws Throwable { doTest() }
 
-  void testClos_arg3() throws Throwable { doTest(); }
+  void testClos_arg3() throws Throwable { doTest() }
 
-  void testCond() throws Throwable { doTest(); }
+  void testCond() throws Throwable { doTest() }
 
-  void _testExpr1() throws Throwable { doTest(); }
+  void _testExpr1() throws Throwable { doTest() }
 
-  void testExpr2() throws Throwable { doTest(); }
+  void testExpr2() throws Throwable { doTest() }
 
-  void testExpr3() throws Throwable { doTest(); }
+  void testExpr3() throws Throwable { doTest() }
 
-  void _testExpr4() throws Throwable { doTest(); }
+  void _testExpr4() throws Throwable { doTest() }
 
-  void testFact() throws Throwable { doTest(); }
+  void testFact() throws Throwable { doTest() }
 
-  void testFact2() throws Throwable { doTest(); }
+  void testFact2() throws Throwable { doTest() }
 
-  void testInit1() throws Throwable { doTest(); }
+  void testInit1() throws Throwable { doTest() }
 
-  void testMap_arg1() throws Throwable { doTest(); }
+  void testMap_arg1() throws Throwable { doTest() }
 
-  void testQual1() throws Throwable { doTest(); }
+  void testQual1() throws Throwable { doTest() }
 
-  void testQual2() throws Throwable { doTest(); }
+  void testQual2() throws Throwable { doTest() }
 
-  void testQual3() throws Throwable { doTest(); }
+  void testQual3() throws Throwable { doTest() }
 
-  void testQual4() throws Throwable { doTest(); }
+  void testQual4() throws Throwable { doTest() }
 
-  void testQual5() throws Throwable { doTest(); }
+  void testQual5() throws Throwable { doTest() }
 
-  void testRef1() throws Throwable { doTest(); }
+  void testRef1() throws Throwable { doTest() }
 
-  void testRename1() throws Throwable { doTest(); }
+  void testRename1() throws Throwable { doTest() }
 
-  void testRename2() throws Throwable { doTest(); }
+  void testRename2() throws Throwable { doTest() }
 
-  void testRet1() throws Throwable { doTest(); }
+  void testRet1() throws Throwable { doTest() }
 
-  void testRet2() throws Throwable { doTest(); }
+  void testRet2() throws Throwable { doTest() }
 
-  void testRet3() throws Throwable { doTest(); }
+  void testRet3() throws Throwable { doTest() }
 
-  void testRet4() throws Throwable { doTest(); }
+  void testRet4() throws Throwable { doTest() }
 
-  void testRet5() throws Throwable { doTest(); }
+  void testRet5() throws Throwable { doTest() }
 
-  void testTail1() throws Throwable { doTest(); }
+  void testTail1() throws Throwable { doTest() }
 
-  void testTail1_1() throws Throwable { doTest(); }
+  void testTail1_1() throws Throwable { doTest() }
 
-  void testTail2() throws Throwable { doTest(); }
+  void testTail2() throws Throwable { doTest() }
 
-  void testTail3() throws Throwable { doTest(); }
+  void testTail3() throws Throwable { doTest() }
 
-  void testTail4() throws Throwable { doTest(); }
+  void testTail4() throws Throwable { doTest() }
 
-  void testTail5() throws Throwable { doTest(); }
+  void testTail5() throws Throwable { doTest() }
 
-  void testTail6() throws Throwable { doTest(); }
+  void testTail6() throws Throwable { doTest() }
 
-  void testVen_tail() throws Throwable { doTest(); }
+  void testVen_tail() throws Throwable { doTest() }
 
-  void testVen_tail2() throws Throwable { doTest(); }
+  void testVen_tail2() throws Throwable { doTest() }
 
-  void testVoid() throws Throwable { doTest(); }
+  void testVoid() throws Throwable { doTest() }
 
-  void testExpressionInParameter() throws Throwable { doTest(); }
+  void testExpressionInParameter() throws Throwable { doTest() }
 
-  void testFinalParameter() throws Throwable { doTest(); }
+  void testFinalParameter() throws Throwable { doTest() }
 
-  void testParameterIsUsedAfterCall() throws Throwable { doTest(); }
+  void testParameterIsUsedAfterCall() throws Throwable { doTest() }
 
-  void testFieldAsParameter() throws Throwable { doTest(); }
+  void testFieldAsParameter() throws Throwable { doTest() }
 
-  void testWritableVariable() throws Throwable { doTest(); }
+  void testWritableVariable() throws Throwable { doTest() }
 
-  void testSingleExpression() { doTest(); }
+  void testSingleExpression() { doTest() }
 
-  void testNamedArg() { doTest(); }
+  void testNamedArg() { doTest() }
 
-  void _testInlineInGString() throws Throwable { doTest(); }
+  void _testInlineInGString() throws Throwable { doTest() }
 
-  void testDontRemoveReturnValueExpr() { doTest(); }
+  void testDontRemoveReturnValueExpr() { doTest() }
 
-  void testDontRemoveLastStatement() { doTest(); }
+  void testDontRemoveLastStatement() { doTest() }
 
-  void testSideEffectInitializer() { doTest(); }
+  void testSideEffectInitializer() { doTest() }
 
-  void testVarargs() { doTest(); }
+  void testVarargs() { doTest() }
 
   void testTypeParameterDeclaredInFile() { doTest() }
 
@@ -169,7 +169,7 @@ class InlineMethodTest extends LightCodeInsightFixtureTestCase {
     })
   }
 
-  void testInlineNamedArgs() { doTest(); }
+  void testInlineNamedArgs() { doTest() }
 
   void testInlineVarargs() { doTest() }
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/inline/InlineVariableTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/inline/InlineVariableTest.groovy
index 11d568dfa8a9..5cfa49b0a296 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/inline/InlineVariableTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/inline/InlineVariableTest.groovy
@@ -38,57 +38,57 @@ import org.jetbrains.plugins.groovy.util.TestUtils
 class InlineVariableTest extends LightCodeInsightFixtureTestCase {
   final String basePath = TestUtils.testDataPath + "groovy/refactoring/inlineLocal/"
 
-  void testGRVY_1232() { doTest(); }
+  void testGRVY_1232() { doTest() }
 
-  void testGRVY_1248() { doTest(); }
+  void testGRVY_1248() { doTest() }
 
-  void testVar1() { doTest(); }
+  void testVar1() { doTest() }
 
-  void testVar2() { doTest(); }
+  void testVar2() { doTest() }
 
-  void testVar3() { doTest(); }
+  void testVar3() { doTest() }
 
-  void testVar4() { doTest(); }
+  void testVar4() { doTest() }
 
-  void testVar5() { doTest(); }
+  void testVar5() { doTest() }
 
-  void testVar6() { doTest(); }
+  void testVar6() { doTest() }
 
-  void testVarInGString() { doTest(); }
+  void testVarInGString() { doTest() }
 
-  void testVarInGString2() { doTest(); }
+  void testVarInGString2() { doTest() }
 
-  void testVarInGString3() { doTest(); }
+  void testVarInGString3() { doTest() }
 
-  void testVarInGString4() { doTest(); }
+  void testVarInGString4() { doTest() }
 
-  void testField() { doFieldTest(); }
+  void testField() { doFieldTest() }
 
-  void testPartial1() { doTest(); }
+  void testPartial1() { doTest() }
 
-  void testPartial2() { doTest(); }
+  void testPartial2() { doTest() }
 
-  void testPartial3() { doTest(); }
+  void testPartial3() { doTest() }
 
-  void testPartial4() { doTest(); }
+  void testPartial4() { doTest() }
 
-  void testClosure1() { doTest(); }
+  void testClosure1() { doTest() }
 
-  void testClosure2() { doTest(); }
+  void testClosure2() { doTest() }
 
-  void testClosure3() { doTest(); }
+  void testClosure3() { doTest() }
 
-  void testAnonymousClass1() { doTest(); }
+  void testAnonymousClass1() { doTest() }
 
-  void testRegexInCommandArg1() { doTest(); }
+  void testRegexInCommandArg1() { doTest() }
 
-  void testRegexInCommandArg2() { doTest(); }
+  void testRegexInCommandArg2() { doTest() }
 
-  void testRegexInCommandArg3() { doTest(); }
+  void testRegexInCommandArg3() { doTest() }
 
-  void testRegexInCommandArg4() { doTest(); }
+  void testRegexInCommandArg4() { doTest() }
 
-  void testRegexInCommandArg5() { doTest(); }
+  void testRegexInCommandArg5() { doTest() }
 
   void testUndefinedVarInline() { doTest() }
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduceParameter/GrIntroduceParameterTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduceParameter/GrIntroduceParameterTest.groovy
index 789a54c09b74..02214bce9915 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduceParameter/GrIntroduceParameterTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduceParameter/GrIntroduceParameterTest.groovy
@@ -297,19 +297,19 @@ class GrIntroduceParameterTest extends LightGroovyTestCase {
     doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false)
   }
 
-  void testDelegate1() { doDelegateTest(); }
+  void testDelegate1() { doDelegateTest() }
 
-  void testDelegate2() { doDelegateTest(); }
+  void testDelegate2() { doDelegateTest() }
 
-  void testDelegaterInSuper() { doDelegateTest(); }
+  void testDelegaterInSuper() { doDelegateTest() }
 
-  void testClosureArg() { doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false); }
+  void testClosureArg() { doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false) }
 
-  void testClosureArgWithEmptyArgList() { doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, true, false); }
+  void testClosureArgWithEmptyArgList() { doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, true, false) }
 
-  void testScriptMethod() { doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, true, false); }
+  void testScriptMethod() { doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, true, false) }
 
-  void testAppStatement() { doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false); }
+  void testAppStatement() { doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false) }
 
   void testStringPart0() {
     doTest(IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, false, null, false, '''\
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 021d6598a4b6..7fd80561b208 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
@@ -99,7 +99,7 @@ class OptimizeImportsTest extends LightGroovyTestCase {
     doTest()
   }
 
-  void testPreserveImportAnnotations() { doTest(); }
+  void testPreserveImportAnnotations() { doTest() }
 
   void testUtilListMasked() {
     myFixture.addClass("package java.awt; public class List {}")
@@ -139,27 +139,27 @@ class OptimizeImportsTest extends LightGroovyTestCase {
     doTest()
   }
 
-  void testRemoveImplicitlyImported() { doTest(); }
+  void testRemoveImplicitlyImported() { doTest() }
 
-  void testRemoveImplicitlyDemandImported() { doTest(); }
+  void testRemoveImplicitlyDemandImported() { doTest() }
 
-  void testDontRemoveRedImports() { doTest(); }
+  void testDontRemoveRedImports() { doTest() }
 
-  void testDontRemoveRedImports2() { doTest(); }
+  void testDontRemoveRedImports2() { doTest() }
 
-  void testDontRemoveRedImports3() { doTest(); }
+  void testDontRemoveRedImports3() { doTest() }
 
-  void testDontRemoveRedImports4() { doTest(); }
+  void testDontRemoveRedImports4() { doTest() }
 
-  void testDontRemoveRedImports5() { doTest(); }
+  void testDontRemoveRedImports5() { doTest() }
 
-  void testDontRemoveRedImports6() { doTest(); }
+  void testDontRemoveRedImports6() { doTest() }
 
-  void testDontRemoveRedImports7() { doTest(); }
+  void testDontRemoveRedImports7() { doTest() }
 
-  void testDontRemoveRedImports8() { doTest(); }
+  void testDontRemoveRedImports8() { doTest() }
 
-  void testDontRemoveRedImports9() { doTest(); }
+  void testDontRemoveRedImports9() { doTest() }
 
   void testRemoveSamePackaged() {
     myFixture.addClass("package foo.bar; public class Aaaa {}")
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/rename/RenameTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/rename/RenameTest.groovy
index 48584ba13d45..d59039014072 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/rename/RenameTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/rename/RenameTest.groovy
@@ -42,15 +42,15 @@ class RenameTest extends LightGroovyTestCase {
     TestUtils.testDataPath + 'groovy/refactoring/rename/'
   }
 
-  void testClosureIt() throws Throwable { doTest(); }
+  void testClosureIt() throws Throwable { doTest() }
 
-  void testTo_getter() throws Throwable { doTest(); }
+  void testTo_getter() throws Throwable { doTest() }
 
-  void testTo_prop() throws Throwable { doTest(); }
+  void testTo_prop() throws Throwable { doTest() }
 
-  void testTo_setter() throws Throwable { doTest(); }
+  void testTo_setter() throws Throwable { doTest() }
 
-  void testScriptMethod() throws Throwable { doTest(); }
+  void testScriptMethod() throws Throwable { doTest() }
 
   void testParameterIsNotAUsageOfGroovyParameter() throws Exception {
     myFixture.configureByText(GroovyFileType.GROOVY_FILE_TYPE, """