extracted helper methods for renaming tests

maciejmikosik · Aug 19, 2018 · 6bb8808 · 6bb8808
1 parent 5432add
commit 6bb8808
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 17 deletions.
diff --git a/main/java/org/quackery/help/Helpers.java b/main/java/org/quackery/help/Helpers.java
@@ -0,0 +1,27 @@
+package org.quackery.help;
+
+import static org.quackery.Suite.suite;
+
+import org.quackery.Case;
+import org.quackery.Suite;
+import org.quackery.Test;
+
+public class Helpers {
+  public static Test rename(String name, final Test test) {
+    return test instanceof Case
+        ? rename(name, (Case) test)
+        : rename(name, (Suite) test);
+  }
+
+  public static Case rename(String name, final Case test) {
+    return new Case(name) {
+      public void run() throws Throwable {
+        test.run();
+      }
+    };
+  }
+
+  public static Suite rename(String name, final Suite test) {
+    return suite(name).addAll(test.tests);
+  }
+}
diff --git a/main/java/org/quackery/junit/FixBugs.java b/main/java/org/quackery/junit/FixBugs.java
@@ -1,6 +1,6 @@
 package org.quackery.junit;
 
-import static org.quackery.Suite.suite;
+import static org.quackery.help.Helpers.rename;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,16 +27,11 @@ private static Test fixNewlineBug(Test test) {
     return new Visitor() {
       protected Test visit(Suite visiting) {
         Suite suite = (Suite) super.visit(visiting);
-        return suite(fixNewlineBug(suite.name))
-            .addAll(suite.tests);
+        return rename(fixNewlineBug(suite.name), suite);
       }
 
-      protected Test visit(final Case visiting) {
-        return new Case(fixNewlineBug(visiting.name)) {
-          public void run() throws Throwable {
-            visiting.run();
-          }
-        };
+      protected Test visit(Case visiting) {
+        return rename(fixNewlineBug(visiting.name), visiting);
       }
     }.visit(test);
   }
@@ -55,6 +50,7 @@ protected Test visit(Suite visiting) {
             ? successfulCase(suite.name)
             : suite;
       }
+
     }.visit(test);
   }
 
@@ -68,16 +64,11 @@ private static Test fixEmptyNameBug(Test test) {
     return new Visitor() {
       protected Test visit(Suite visiting) {
         Suite suite = (Suite) super.visit(visiting);
-        return suite(fixEmptyNameBug(suite.name))
-            .addAll(suite.tests);
+        return rename(fixEmptyNameBug(suite.name), suite);
       }
 
-      protected Test visit(final Case visiting) {
-        return new Case(fixEmptyNameBug(visiting.name)) {
-          public void run() throws Throwable {
-            visiting.run();
-          }
-        };
+      protected Test visit(Case visiting) {
+        return rename(fixEmptyNameBug(visiting.name), visiting);
       }
     }.visit(test);
   }