replacing deprecated JUnit MethodRule with TestRule

tobyweston · Jan 21, 2014 · e6107cc · e6107cc
1 parent 221ca95
commit e6107cc
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 10 deletions.
diff --git a/src/main/java/com/google/code/tempusfugit/concurrency/ConcurrentRule.java b/src/main/java/com/google/code/tempusfugit/concurrency/ConcurrentRule.java
@@ -16,14 +16,23 @@
 
 package com.google.code.tempusfugit.concurrency;
 
-import org.junit.rules.MethodRule;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.Statement;
 
-public class ConcurrentRule implements MethodRule {
+import java.lang.reflect.Method;
 
-    public Statement apply(Statement base, final FrameworkMethod method, final Object target) {
-        return new RunConcurrently(method, base);
-    }
+import static com.google.code.tempusfugit.ExceptionWrapper.wrapAsRuntimeException;
+
+public class ConcurrentRule implements TestRule {
 
+    @Override
+    public Statement apply(Statement base, Description description) {
+        return wrapAsRuntimeException(() -> {
+            Class<?> test = description.getTestClass();
+            Method method = test.getMethod(description.getMethodName());
+            return new RunConcurrently(new FrameworkMethod(method), base);
+        });
+    }
 }
diff --git a/src/main/java/com/google/code/tempusfugit/concurrency/RepeatingRule.java b/src/main/java/com/google/code/tempusfugit/concurrency/RepeatingRule.java
@@ -16,14 +16,23 @@
 
 package com.google.code.tempusfugit.concurrency;
 
-import org.junit.rules.MethodRule;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.Statement;
 
-public class RepeatingRule implements MethodRule {
+import java.lang.reflect.Method;
 
-    public Statement apply(Statement base, final FrameworkMethod method, final Object target) {
-        return new RunRepeatedly(method, base);
-    }
+import static com.google.code.tempusfugit.ExceptionWrapper.wrapAsRuntimeException;
+
+public class RepeatingRule implements TestRule {
 
+    @Override
+    public Statement apply(Statement base, Description description) {
+        return wrapAsRuntimeException(() -> {
+            Class<?> test = description.getTestClass();
+            Method method = test.getMethod(description.getMethodName());
+            return new RunRepeatedly(new FrameworkMethod(method), base);
+        });
+    }
 }
diff --git a/src/test/java/com/google/code/tempusfugit/ExceptionWrapperTest.java b/src/test/java/com/google/code/tempusfugit/ExceptionWrapperTest.java
@@ -49,6 +49,10 @@ public class ExceptionWrapperTest {
     private final Mockery context = new JUnit4Mockery();
     private final Callable<String> callable = context.mock(Callable.class);
 
+    public void exampleLambdaSyntax() throws SomeOtherCheckedException {
+        wrapAnyException(() -> null, with(SomeOtherCheckedException.class));
+    }
+
     @Test
     public void shouldDelegateCallReflectiveException() throws Exception {
         callWill(returnValue("value"));