Remove expected error logging from the test console

cpettitt-linkedin · cpettitt-linkedin · commit fe4e79b08a11 · 2014-03-28T12:57:21.000-07:00
diff --git a/test/com/linkedin/parseq/TestEngine.java b/test/com/linkedin/parseq/TestEngine.java
@@ -31,6 +31,7 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+import static com.linkedin.parseq.TestUtil.withDisabledLogging;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertFalse;
 import static org.testng.AssertJUnit.assertTrue;
@@ -190,8 +191,22 @@ public void testFailPlanExecution() throws InterruptedException
       // during submit to the underlying executor. We expect that it will be
       // cancelled.
       final Task<?> task = neverEndingBlockingTask();
-      engine.run(task);
-      assertTrue(task.await(5, TimeUnit.SECONDS));
+      withDisabledLogging(new Runnable()
+      {
+        @Override
+        public void run()
+        {
+          engine.run(task);
+          try
+          {
+            assertTrue(task.await(5, TimeUnit.SECONDS));
+          }
+          catch (InterruptedException e)
+          {
+            // Ignore.
+          }
+        }
+      });
       assertTrue(task.isFailed());
       assertTrue("Expected underlying exception to be instance of RejectedExecutionException, but was: " + task.getError().getCause(),
                  task.getError().getCause() instanceof RejectedExecutionException);
diff --git a/test/com/linkedin/parseq/TestUtil.java b/test/com/linkedin/parseq/TestUtil.java
@@ -18,6 +18,9 @@
 
 import com.linkedin.parseq.promise.Promise;
 import com.linkedin.parseq.promise.Promises;
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.spi.LoggerRepository;
 
 import static com.linkedin.parseq.Tasks.action;
 import static org.testng.AssertJUnit.assertTrue;
@@ -79,6 +82,22 @@ public static <T> Task<T> value(final String name, final T value)
     return new ValueTask<T>(name, value);
   }
 
+  public static void withDisabledLogging(final Runnable r)
+  {
+    // Note: this assumes we're using Log4J and needs to be fixed up if this changes.
+    final LoggerRepository loggerRepo = LogManager.getLoggerRepository();
+    final Level oldLevel = loggerRepo.getThreshold();
+    loggerRepo.setThreshold(Level.OFF);
+    try
+    {
+      r.run();
+    }
+    finally
+    {
+      loggerRepo.setThreshold(oldLevel);
+    }
+  }
+
   private static class ValueTask<T> extends BaseTask<T>
   {
     private final T _value;
diff --git a/test/com/linkedin/parseq/promise/TestSettablePromise.java b/test/com/linkedin/parseq/promise/TestSettablePromise.java
@@ -26,6 +26,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
+import static com.linkedin.parseq.TestUtil.withDisabledLogging;
 import static org.testng.AssertJUnit.*;
 
 /**
@@ -339,7 +340,14 @@ public void onResolved(Promise<String> promise)
       }
     });
 
-    promise.done("Done!");
+    withDisabledLogging(new Runnable() {
+      @Override
+      public void run()
+      {
+        promise.done("Done!");
+      }
+    });
+
     assertTrue(promise.await(5, TimeUnit.SECONDS));
     assertEquals("Done!", promise.get());
   }
@@ -359,7 +367,14 @@ public void onResolved(Promise<String> promise)
       }
     });
 
-    promise.done("Done!");
+    withDisabledLogging(new Runnable() {
+      @Override
+      public void run()
+      {
+        promise.done("Done!");
+      }
+    });
+
     assertTrue(promise.await(5, TimeUnit.SECONDS));
     assertEquals("Done!", promise.get());
   }
@@ -373,13 +388,20 @@ public void testListenerThrowsErrorAfterPromiseDone() throws InterruptedExceptio
     promise.done("Done!");
     assertTrue(promise.await(5, TimeUnit.SECONDS));
 
-    // This should not throw
-    promise.addListener(new PromiseListener<String>()
+    withDisabledLogging(new Runnable()
     {
       @Override
-      public void onResolved(Promise<String> promise)
+      public void run()
       {
-        throw new Error();
+        // This should not throw
+        promise.addListener(new PromiseListener<String>()
+        {
+          @Override
+          public void onResolved(Promise<String> promise)
+          {
+            throw new Error();
+          }
+        });
       }
     });
   }
