@@ -50,4 +50,7 @@ Toby Byron: Suggested updating linking in javadoc (2090230) Raphael Parree: Improved docs on Parameterized (2186792) Robin de Silva Jayasinghe: Fixed Javadoc code sample for AfterClass (2126279) + +2009 May 04 + James Abbley: Submitted a patch that fixed the 2-second limit on Parallel execution. \ No newline at end of file acknowledgements.txt @@ -46,4 +46,5 @@ ### Bug fixes ### - Fixed: BaseTestRunner.getTest() requires class to extend TestCase (1812200) -- Fixed: Suite does not allow for inheritance in annotations (2783118) \ No newline at end of file +- Fixed: Suite does not allow for inheritance in annotations (2783118) +- Fixed: ParallelComputer skipped tests that took longer than 2 seconds \ No newline at end of file doc/ReleaseNotes4.7.txt @@ -3,11 +3,9 @@ package org.junit.experimental; import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; -import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; import org.junit.runner.Computer; import org.junit.runner.Runner; @@ -31,13 +29,13 @@ public class ParallelComputer extends Computer { return new ParallelComputer(true, false); } -//TODO(parallel) extract commonality from ParallelSuite and ParallelRunner + // TODO(parallel) extract commonality from ParallelSuite and ParallelRunner public static class ParallelSuite extends Suite { public ParallelSuite(RunnerBuilder builder, Class<?>[] classes) throws InitializationError { super(builder, classes); } - private final ParallelCollator collator = new ParallelCollator(); + private final ParallelCollator fCollator = new ParallelCollator(); @Override protected void runChild(final Runner runner, final RunNotifier notifier) { @@ -47,7 +45,7 @@ public class ParallelComputer extends Computer { return null; } }; - collator.process(callable); + fCollator.process(callable); } protected void superRunChild(Runner runner, RunNotifier notifier) { @@ -57,7 +55,7 @@ public class ParallelComputer extends Computer { @Override public void run(RunNotifier notifier) { super.run(notifier); - for (Future<Object> each : collator.results) + for (Future<Object> each : fCollator.results) try { each.get(); } catch (Exception e) { @@ -71,7 +69,7 @@ public class ParallelComputer extends Computer { super(klass); } - private final ParallelCollator collator = new ParallelCollator(); + private final ParallelCollator fCollator = new ParallelCollator(); @Override protected void runChild(final FrameworkMethod method, final RunNotifier notifier) { @@ -81,7 +79,7 @@ public class ParallelComputer extends Computer { return null; } }; - collator.process(callable); + fCollator.process(callable); } protected void superRunChild(FrameworkMethod method, RunNotifier notifier) { @@ -91,9 +89,9 @@ public class ParallelComputer extends Computer { @Override public void run(RunNotifier notifier) { super.run(notifier); - for (Future<Object> each : collator.results) + for (Future<Object> each : fCollator.results) try { - each.get(); // TODO(parallel) what should this really be? + each.get(); } catch (Exception e) { e.printStackTrace(); } @@ -120,9 +118,7 @@ public class ParallelComputer extends Computer { } private static class ParallelCollator { - - final List<Future<Object>> results = new ArrayList<Future<Object>>(); - + private final List<Future<Object>> results = new ArrayList<Future<Object>>(); private final ExecutorService service = Executors.newCachedThreadPool(); public void process(Callable<Object> callable) { src/main/java/org/junit/experimental/ParallelComputer.java 015c02e04d940a4bffc6a8e687751c4610db19b8 David Saff saff@dhcp-172-31-197-71.cam.corp.google.com http://github.com/KentBeck/junit/commit/8b507d7908603bf6e36ea9e60921b76eb5923d0f 8b507d7908603bf6e36ea9e60921b76eb5923d0f 2009-05-04T10:52:47-07:00 2009-05-04T10:52:47-07:00 Incorporated James Abbley's patch for ParallelComputer 7fc1e7985c116cf44ac42e670f35229b8f38b747 David Saff saff@dhcp-172-31-197-71.cam.corp.google.com