@@ -2,3 +2,4 @@ MaxCore.ser bin junit4.* target +MaxCore.max .gitignore @@ -24,14 +24,13 @@ public class ErrorCollector extends Verifier { errors.add(error); } - // TODO (Jun 15, 2009 10:00:10 PM): is this same as assertThat? - public <T> void checkThat(T value, Matcher<T> matcher) { - // TODO (Jun 15, 2009 10:01:28 PM): checkReturns - try { - assertThat(value, matcher); - } catch (AssertionError e) { - addError(e); - } + public <T> void checkThat(final T value, final Matcher<T> matcher) { + checkSucceeds(new Callable<Object>() { + public Object call() throws Exception { + assertThat(value, matcher); + return value; + } + }); } public Object checkSucceeds(Callable<Object> callable) { src/main/java/org/junit/experimental/interceptor/ErrorCollector.java @@ -8,10 +8,6 @@ public class ExternalResource implements StatementInterceptor { return new Statement() { @Override public void evaluate() throws Throwable { - // TODO (Jun 3, 2009 11:49:23 PM): should we replicate - // @Before/@After semantics? - // 1. after() run even if before() fails. - // 2. exception in after() _adds_ to failure in base. before(); try { base.evaluate(); src/main/java/org/junit/experimental/interceptor/ExternalResource.java @@ -22,14 +22,10 @@ public class TestWatchman implements StatementInterceptor { } }; } - - // TODO (May 25, 2009 9:44:36 PM): Fix max and Theories public void succeeded(FrameworkMethod method) { } - // TODO (Apr 28, 2009 10:50:47 PM): is this right? Is - // FrameworkMethod too powerful? public void failed(Throwable e, FrameworkMethod method) { } src/main/java/org/junit/experimental/interceptor/TestWatchman.java @@ -1,8 +1,6 @@ package org.junit.experimental.max; import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -42,19 +40,7 @@ public class MaxCore { public Result run(Request request, JUnitCore core) { core.addListener(fHistory.listener()); - try { - return core.run(sortRequest(request).getRunner()); - } finally { - try { - fHistory.save(); - } catch (FileNotFoundException e) { - // TODO - e.printStackTrace(); - } catch (IOException e) { - // TODO - e.printStackTrace(); - } - } + return core.run(sortRequest(request).getRunner()); } // TODO (Feb 23, 2009 10:14:05 PM): publicized for squeeze src/main/java/org/junit/experimental/max/MaxCore.java @@ -13,6 +13,7 @@ import java.util.HashMap; import java.util.Map; import org.junit.runner.Description; +import org.junit.runner.Result; import org.junit.runner.notification.Failure; import org.junit.runner.notification.RunListener; @@ -129,6 +130,11 @@ public class MaxHistory implements Serializable { public void testFailure(Failure failure) throws Exception { putTestFailureTimestamp(failure.getDescription(), overallStart); } + + @Override + public void testRunFinished(Result result) throws Exception { + save(); + } } private class TestComparator implements Comparator<Description> { src/main/java/org/junit/experimental/max/MaxHistory.java 50b77b1f3108aa77af0906162d552e513936c322 David Saff saff@redredrobot.local http://github.com/KentBeck/junit/commit/e9e9b31a483fc562af4ebf5c59e7c89a8ef83459 e9e9b31a483fc562af4ebf5c59e7c89a8ef83459 2009-06-15T22:18:42-07:00 2009-06-15T22:18:42-07:00 Clean up TODO's, including unnecessary exception catch in max c55548e2120c0de1a7ce169ab49491dd958c9b71 David Saff saff@redredrobot.local