Merge pull request #12 from Nordstrom/pr/fix-ignore-npe

Fix NullPointerException failures for ignored test methods

Author: sbabcoc

src/main/java/com/nordstrom/automation/junit/RetryHandler.java

@@ -35,7 +35,7 @@ private RetryHandler() {
     /**
      * Run the specified method, retrying on failure.
      * 
-     * @param runner underlying test runner
+     * @param runner JUnit test runner
      * @param method test method to be run
      * @param notifier run notifier through which events are published
      * @param maxRetry maximum number of retry attempts
@@ -54,19 +54,19 @@ static void runChildWithRetry(Object runner, final FrameworkMethod method, RunNo
                 statement.evaluate();
                 doRetry = false;
             } catch (AssumptionViolatedException thrown) {
-                doRetry = doRetry(runner, method, thrown, count);
+                doRetry = doRetry(method, thrown, count);
                 if (doRetry) {
                     description = RetriedTest.proxyFor(description, thrown);
-                    RunReflectiveCall.fireTestIgnored(method);
+                    RunReflectiveCall.fireTestIgnored(runner, method);
                     eachNotifier.fireTestIgnored();
                 } else {
                     eachNotifier.addFailedAssumption(thrown);
                 }
             } catch (Throwable thrown) {
-                doRetry = doRetry(runner, method, thrown, count);
+                doRetry = doRetry(method, thrown, count);
                 if (doRetry) {
                     description = RetriedTest.proxyFor(description, thrown);
-                    RunReflectiveCall.fireTestIgnored(method);
+                    RunReflectiveCall.fireTestIgnored(runner, method);
                     eachNotifier.fireTestIgnored();
                 } else {
                     eachNotifier.addFailure(thrown);
@@ -85,7 +85,7 @@ static void runChildWithRetry(Object runner, final FrameworkMethod method, RunNo
      * @param retryCounter retry counter (remaining attempts)
      * @return {@code true} if failed test should be retried; otherwise {@code false}
      */
-    static boolean doRetry(Object runner, FrameworkMethod method, Throwable thrown, AtomicInteger retryCounter) {
+    static boolean doRetry(FrameworkMethod method, Throwable thrown, AtomicInteger retryCounter) {
         boolean doRetry = false;
         if ((retryCounter.decrementAndGet() > -1) && isRetriable(method, thrown)) {
             LOGGER.warn("### RETRY ### {}", method);
@@ -100,6 +100,7 @@ static boolean doRetry(Object runner, FrameworkMethod method, Throwable thrown,
      * <b>NOTE</b>: If the specified method or the class that declares it are marked with the {@code @NoRetry}
      * annotation, this method returns zero (0).
      * 
+     * @param runner JUnit test runner
      * @param method test method for which retry is being considered
      * @return maximum retry attempts that will be made if the specified method fails
      */

src/main/java/com/nordstrom/automation/junit/RunChild.java

@@ -32,7 +32,7 @@ public static void intercept(@This final Object runner, @SuperCall final Callabl
         boolean isIgnored = (null != method.getAnnotation(Ignore.class));
 
         if (isIgnored) {
-            RunReflectiveCall.fireTestIgnored(method);
+            RunReflectiveCall.fireTestIgnored(runner, method);
         }
 
         if (count == 0) {

src/main/java/com/nordstrom/automation/junit/RunReflectiveCall.java

@@ -1,6 +1,7 @@
 package com.nordstrom.automation.junit;
 
 import static com.nordstrom.automation.junit.LifecycleHooks.getFieldValue;
+import static com.nordstrom.automation.junit.LifecycleHooks.getTestClassOf;
 
 import java.util.Map;
 import java.util.Objects;
@@ -149,11 +150,11 @@ private static void notifyIfTestFailed(RunWatcher watcher, AtomicTest atomicTest
     /**
      * Invoke to tell listeners that an atomic test was ignored.
      * 
-     * @param runnable {@link Runnable} object that wraps the atomic test
+     * @param runner JUnit test runner
+     * @param method {@link FrameworkMethod} object
      */
-    static void fireTestIgnored(FrameworkMethod method) {
-        Object target = getTargetFor(method);
-        TestClass testClass = LifecycleHooks.getTestClassFor(target);
+    static void fireTestIgnored(Object runner, FrameworkMethod method) {
+        TestClass testClass = getTestClassOf(runner);
         for (RunWatcher watcher : runWatcherLoader) {
             watcher.testIgnored(method, testClass);
         }
@@ -203,8 +204,8 @@ static AtomicTest createAtomicTest(TestClass testClass, Runnable runnable) {
         AtomicTest atomicTest = null;
 
         try {
-            runner = LifecycleHooks.getFieldValue(runnable, "this$0");
-            child = LifecycleHooks.getFieldValue(runnable, "val$each");
+            runner = getFieldValue(runnable, "this$0");
+            child = getFieldValue(runnable, "val$each");
         } catch (IllegalAccessException | NoSuchFieldException | SecurityException e) {
             // nothing to do here
         }

src/test/java/com/nordstrom/automation/junit/AutomaticRetryIgnore.java

@@ -0,0 +1,17 @@
+package com.nordstrom.automation.junit;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class AutomaticRetryIgnore {
+    
+    @Test
+    @Ignore
+    public void testIgnore() {
+        System.out.println("testIgnore");
+        assertTrue(true);
+    }
+    
+}

src/test/java/com/nordstrom/automation/junit/AutomaticRetryTest.java

@@ -79,6 +79,21 @@ public void testNoRetry() {
         assertEquals(rla.getRetriedTests().size(), 0, "Incorrect retried test count");
     }
 
+    @Test
+    public void testIgnore() {
+        RunListenerAdapter rla = new RunListenerAdapter();
+        
+        JUnitCore runner = new JUnitCore();
+        runner.addListener(rla);
+        Result result = runner.run(AutomaticRetryIgnore.class);
+        assertTrue(result.wasSuccessful());
+        
+        assertEquals(rla.getPassedTests().size(), 0, "Incorrect passed test count");
+        assertEquals(rla.getFailedTests().size(), 0, "Incorrect failed test count");
+        assertEquals(rla.getIgnoredTests().size(), 1, "Incorrect ignored test count");
+        assertEquals(rla.getRetriedTests().size(), 0, "Incorrect retried test count");
+    }
+    
     @AfterClass
     public static void afterClass() {
         System.clearProperty(JUnitSettings.MAX_RETRY.key());