From 7f5ae7e5ede44c655fdfc1b5efb9fabd0aab408a Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 21 Feb 2014 14:55:34 +0100
Subject: [PATCH] Cleanup (formatting)

---
 .../LightQuickFixParameterizedTestCase.java   |  6 +++--
 .../quickFix/LightQuickFixTestCase.java       | 22 ++++++++++---------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixParameterizedTestCase.java b/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixParameterizedTestCase.java
index 73e94a9669dc..e5b8772026d2 100644
--- a/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixParameterizedTestCase.java
+++ b/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixParameterizedTestCase.java
@@ -16,11 +16,12 @@
 package com.intellij.codeInsight.daemon.quickFix;
 
 import com.intellij.testFramework.FileBasedTestCaseHelperEx;
+import com.intellij.testFramework.Parameterized;
 import org.jetbrains.annotations.Nullable;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-@RunWith(com.intellij.testFramework.Parameterized.class)
+@RunWith(Parameterized.class)
 public abstract class LightQuickFixParameterizedTestCase extends LightQuickFixTestCase implements FileBasedTestCaseHelperEx {
   @Override
   public String getRelativeBasePath() {
@@ -34,11 +35,13 @@ public abstract class LightQuickFixParameterizedTestCase extends LightQuickFixTe
     return fileName.substring(BEFORE_PREFIX.length());
   }
 
+  @SuppressWarnings("deprecation")
   @Override
   protected void doAllTests() {
     super.doAllTests();
   }
 
+  @SuppressWarnings("JUnit4AnnotatedMethodInJUnit3TestCase")
   @Test
   public void runSingle() throws Throwable {
     final Throwable[] throwables = new Throwable[1];
@@ -60,6 +63,5 @@ public abstract class LightQuickFixParameterizedTestCase extends LightQuickFixTe
     if (throwables[0] != null) {
       throw throwables[0];
     }
-    
   }
 }
diff --git a/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java b/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java
index eafc24d7d15f..9bf434c3e0f5 100644
--- a/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java
+++ b/java/testFramework/src/com/intellij/codeInsight/daemon/quickFix/LightQuickFixTestCase.java
@@ -114,7 +114,9 @@ public abstract class LightQuickFixTestCase extends LightDaemonAnalyzerTestCase
   }
 
   @NotNull
-  public static Pair<String, Boolean> parseActionHint(@NotNull PsiFile file, @NotNull String contents, @NotNull @NonNls @RegExp String actionPattern) {
+  public static Pair<String, Boolean> parseActionHint(@NotNull PsiFile file,
+                                                      @NotNull String contents,
+                                                      @NotNull @NonNls @RegExp String actionPattern) {
     PsiFile hostFile = InjectedLanguageManager.getInstance(file.getProject()).getTopLevelFile(file);
 
     final Commenter commenter = LanguageCommenters.INSTANCE.forLanguage(hostFile.getLanguage());
@@ -198,6 +200,14 @@ public abstract class LightQuickFixTestCase extends LightDaemonAnalyzerTestCase
     return null;
   }
 
+  /**
+   * @deprecated use {@link com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase}
+   * to get separate tests for all data files in testData directory.
+   */
+  protected void doAllTests() {
+    doAllTests(createWrapper());
+  }
+
   public static void doAllTests(QuickFixTestCase testCase) {
     assertNotNull("getBasePath() should not return null!", testCase.getBasePath());
 
@@ -210,7 +220,7 @@ public abstract class LightQuickFixTestCase extends LightDaemonAnalyzerTestCase
       }
     });
 
-    if (files == null) {
+    if (files == null || files.length == 0) {
       fail("Test files not found in " + testDirPath);
     }
 
@@ -218,20 +228,12 @@ public abstract class LightQuickFixTestCase extends LightDaemonAnalyzerTestCase
       final String testName = file.getName().substring(BEFORE_PREFIX.length());
       doTestFor(testName, testCase);
     }
-    assertTrue("Test files not found in "+testDirPath,files.length != 0);
   }
 
   protected void doSingleTest(String fileSuffix) {
     doTestFor(fileSuffix, createWrapper());
   }
 
-  /**
-   * @deprecated use com.intellij.codeInsight.daemon.quickFix.LightQuickFixParameterizedTestCase to get separate tests for all data files in 
-   * testData directory
-   */
-  protected void doAllTests() {
-    doAllTests(createWrapper());
-  }
   protected void doSingleTest(String fileSuffix, String testDataPath) {
     doTestFor(fileSuffix, createWrapper(testDataPath));
   }