Merge pull request #65 from sschaef/add-junit-rule

Add junit rule

Author: kiritsuku

org.scala-refactoring.library/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Scala Refactoring
 Bundle-SymbolicName: org.scala-refactoring.library
 Bundle-Version: 0.6.3.qualifier
-Require-Bundle: org.junit;bundle-version="4.7.0",
+Require-Bundle: org.junit;bundle-version="4.11.0",
  org.scala-lang.scala-library
 Export-Package: scala.tools.refactoring,scala.tools.refactoring.analys
  is,scala.tools.refactoring.common,scala.tools.refactoring.implementat

org.scala-refactoring.library/src/test/java/scala/tools/refactoring/tests/util/ExceptionWrapper.java

@@ -0,0 +1,30 @@
+package scala.tools.refactoring.tests.util;
+
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+import scala.tools.nsc.util.FailedInterrupt;
+
+/**
+ * In case an assertion error is caught and wrapped by another error type (as it
+ * is the case for exceptions that are thrown on the compiler thread), we need
+ * to manually unwrap them later, in order to let JUnit "see" them.
+ */
+public final class ExceptionWrapper implements TestRule {
+
+  @Override
+  public Statement apply(final Statement base, final Description description) {
+    return new Statement() {
+      @Override
+      public void evaluate() throws Throwable {
+        try {
+          base.evaluate();
+        } catch (FailedInterrupt e) {
+          // a FailedInterrupt is thrown when an exception occurs on the compiler thread
+          throw e.getCause();
+        }
+      }
+    };
+  }
+}

org.scala-refactoring.library/src/test/java/scala/tools/refactoring/tests/util/ScalaVersionTestRule.java

@@ -1,13 +1,13 @@
 package scala.tools.refactoring.tests.util;
 
-import org.junit.Rule;
+import org.junit.Assume;
 import org.junit.rules.MethodRule;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.Statement;
+
 import scala.util.Properties;
-import org.junit.Assume;
 
-abstract public class ScalaVersionTestRule {
+public class ScalaVersionTestRule implements MethodRule {
 
   final class EmptyStatement extends Statement {
     @Override
@@ -16,23 +16,19 @@ public void evaluate() throws Throwable {
     }
   }
 
-  @Rule
-  public MethodRule rule = new MethodRule() {
-
-    public Statement apply(Statement stmt, FrameworkMethod meth, Object arg2) {
-      ScalaVersion onlyOn = meth.getAnnotation(ScalaVersion.class);
+  public Statement apply(Statement stmt, FrameworkMethod meth, Object arg2) {
+    ScalaVersion onlyOn = meth.getAnnotation(ScalaVersion.class);
 
-      if (onlyOn != null) {
-        if (!onlyOn.doesNotMatch().isEmpty() && Properties.versionString().contains(onlyOn.doesNotMatch())) {
-          return new EmptyStatement();
-        } else if (Properties.versionString().contains(onlyOn.matches())) {
-          return stmt;
-        } else{
-          return new EmptyStatement();
-        }
-      } else {
+    if (onlyOn != null) {
+      if (!onlyOn.doesNotMatch().isEmpty() && Properties.versionString().contains(onlyOn.doesNotMatch())) {
+        return new EmptyStatement();
+      } else if (Properties.versionString().contains(onlyOn.matches())) {
         return stmt;
+      } else {
+        return new EmptyStatement();
       }
+    } else {
+      return stmt;
     }
-  };
+  }
 }

org.scala-refactoring.library/src/test/java/scala/tools/refactoring/tests/util/TestRules.java

@@ -0,0 +1,14 @@
+package scala.tools.refactoring.tests.util;
+
+import org.junit.Rule;
+
+public abstract class TestRules {
+
+  // all rules need to be public fields
+
+  @Rule
+  public final ScalaVersionTestRule rule1 = new ScalaVersionTestRule();
+
+  @Rule
+  public final ExceptionWrapper rule2 = new ExceptionWrapper();
+}

org.scala-refactoring.library/src/test/scala/scala/tools/refactoring/tests/sourcegen/ReusingPrinterTest.scala

@@ -24,10 +24,11 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
   }
 
   final implicit class ImplicitTreeHelper(original: Tree) {
+    /** Needs to be executed on the PC thread. */
     def printsTo(expectedOutput: String): Unit = {
       val sourceFile = new BatchSourceFile("noname", expectedOutput)
       val expected = stripWhitespacePreservers(expectedOutput).trim()
-      val actual = ask { () => generate(original, sourceFile = Some(sourceFile)).asText.trim() }
+      val actual = generate(original, sourceFile = Some(sourceFile)).asText.trim()
       if (actual != expected)
         throw new ComparisonFailure("", expected, actual)
     }
@@ -36,15 +37,15 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
     def becomes(expectedOutput: String) = input -> expectedOutput
   }
   final implicit class OrToDieAfter(input: (String, String)) {
-    def after(trans: Transformation[Tree, Tree]): Unit = {
-      val t = ask { () => trans(treeFrom(input._1)) }
+    def after(trans: Transformation[Tree, Tree]): Unit = ask { () =>
+      val t = trans(treeFrom(input._1))
       require(t.isDefined, "transformation was not successful")
       t foreach (_.printsTo(input._2))
     }
   }
 
   @Test
-  def add_return_type_to_def() = global.ask { () => """
+  def add_return_type_to_def() = """
     package add_return_type_to_def
     object X {
       def value = new java.io.File("")
@@ -57,10 +58,9 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
         val newTpt = tpt setOriginal mkReturn(List(tpt.tpe.typeSymbol))
         d.copy(tpt = newTpt) replaces d
     }}}
-  }
 
   @Test
-  def add_return_type_to_val() = global.ask { () => """
+  def add_return_type_to_val() = """
     package add_return_type_to_val
     object X {
       val value = new java.io.File("")
@@ -74,10 +74,9 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
         val newTpt = tpt setOriginal mkReturn(List(tpt.tpe.typeSymbol))
         d.copy(tpt = newTpt) replaces d
     }}}
-  }
 
   @Test
-  def add_return_type_to_var() = global.ask { () => """
+  def add_return_type_to_var() = """
     package add_return_type_to_var
     object X {
       var variable = new java.io.File("")
@@ -91,10 +90,9 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
         val newTpt = tpt setOriginal mkReturn(List(tpt.tpe.typeSymbol))
         d.copy(tpt = newTpt) replaces d
     }}}
-  }
 
   @Test
-  def add_override_flag() = global.ask { () => """
+  def add_override_flag() = """
     package add_override_flag
     trait T {
       def meth: Int
@@ -120,10 +118,9 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
           d.copy(mods = d.mods.withFlag(Flag.OVERRIDE)) replaces d
       }
     }}
-  }
 
   @Test
-  def add_override_final_flags_to_lazy_val() = global.ask { () => """
+  def add_override_final_flags_to_lazy_val() = """
     package add_override_final_flags_to_lazy_val
     trait T {
       def meth: Int
@@ -149,10 +146,9 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
           d.copy(mods = d.mods.withFlag(Flag.OVERRIDE).withFlag(Flag.FINAL).withFlag(Flag.LAZY).withFlag(Tokens.VAL)) replaces d
       }
     }}
-  }
 
   @Test
-  def add_override_protected_abstract_flag() = global.ask { () => """
+  def add_override_protected_abstract_flag() = """
     package add_override_protected_abstract_flag
     trait T {
       protected def meth: Int = 0
@@ -178,10 +174,9 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
           d.copy(mods = d.mods.withFlag(Flag.ABSTRACT).withFlag(Flag.OVERRIDE).withFlag(Flag.PROTECTED)) replaces d
       }
     }}
-  }
 
   @Test
-  def add_final_case_flag() = global.ask { () => """
+  def add_final_case_flag() = """
     package add_final_case_flag
     class C(i: Int)
     """ becomes """
@@ -193,10 +188,9 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
           d.copy(mods = d.mods.withFlag(Flag.FINAL).withFlag(Flag.CASE).withFlag(Flag.PRIVATE)) replaces d
       }
     }}
-  }
 
   @Test
-  def add_modifier_to_def_without_return_type() = global.ask { () => """
+  def add_modifier_to_def_without_return_type() = """
     package add_modifier_to_def_without_return_type
     trait T {
       def meth: Int
@@ -222,10 +216,9 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
           d.copy(mods = d.mods.withFlag(Flag.OVERRIDE)) replaces d
       }
     }}
-  }
 
   @Test
-  def add_modifier_to_val_without_return_type() = global.ask { () => """
+  def add_modifier_to_val_without_return_type() = """
     package add_modifier_to_val_without_return_type
     trait T {
       def meth: Int
@@ -252,5 +245,4 @@ class ReusingPrinterTest extends TestHelper with SilentTracing {
           d.copy(mods = d.mods.withFlag(Flag.OVERRIDE)) replaces d
       }
     }}
-  }
 }

org.scala-refactoring.library/src/test/scala/scala/tools/refactoring/tests/util/TestHelper.scala

@@ -20,7 +20,7 @@ import scala.tools.refactoring.common.Selections
 
 import language.{ postfixOps, implicitConversions }
 
-trait TestHelper extends ScalaVersionTestRule with Refactoring with CompilerProvider with common.InteractiveScalaCompiler {
+trait TestHelper extends TestRules with Refactoring with CompilerProvider with common.InteractiveScalaCompiler {
 
   @Before
   def cleanup() = resetPresentationCompiler()

pom.xml

@@ -51,7 +51,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.7</version>
+      <version>4.11</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -219,7 +219,7 @@
     <repository>
       <id>helios</id>
       <layout>p2</layout>
-      <url>http://download.eclipse.org/releases/indigo</url>
+      <url>http://download.eclipse.org/releases/kepler</url>
     </repository>
     <repository>
       <id>codehaus-snapshots</id>