StatementInterceptor takes Object target

marcphilipp · Jul 7, 2009 · 8e313a1 · 8e313a1
1 parent 4b54936
commit 8e313a1
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 17 deletions.
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Wed Jul 01 13:15:17 EDT 2009
+#Mon Jul 06 21:57:53 EDT 2009
 eclipse.preferences.version=1
 org.eclipse.jdt.core.codeComplete.argumentPrefixes=
 org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -46,7 +46,7 @@ org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
 org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
 org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=no_tag

diff --git a/src/main/java/org/junit/experimental/interceptor/ExpectedException.java b/src/main/java/org/junit/experimental/interceptor/ExpectedException.java
@@ -44,7 +44,7 @@
 public class ExpectedException implements StatementInterceptor {
 	private Matcher<?> fMatcher= null;
 
-	public Statement intercept(Statement base, FrameworkMethod method) {
+	public Statement intercept(Statement base, FrameworkMethod method, Object target) {
 		return new ExpectedExceptionStatement(base);
 	}
 

diff --git a/src/main/java/org/junit/experimental/interceptor/ExternalResource.java b/src/main/java/org/junit/experimental/interceptor/ExternalResource.java
@@ -34,7 +34,7 @@
  */
 public abstract class ExternalResource implements StatementInterceptor {
 	public final Statement intercept(final Statement base,
-			FrameworkMethod method) {
+			FrameworkMethod method, Object target) {
 		return new Statement() {
 			@Override
 			public void evaluate() throws Throwable {

diff --git a/src/main/java/org/junit/experimental/interceptor/StatementInterceptor.java b/src/main/java/org/junit/experimental/interceptor/StatementInterceptor.java
@@ -6,5 +6,5 @@
 public interface StatementInterceptor {
 	// TODO (Jul 1, 2009 1:43:11 PM): add documentation to
 	// BlockJUnit4ClassRunner
-	Statement intercept(Statement base, FrameworkMethod method);
+	Statement intercept(Statement base, FrameworkMethod method, Object target);
 }
diff --git a/src/main/java/org/junit/experimental/interceptor/TestWatchman.java b/src/main/java/org/junit/experimental/interceptor/TestWatchman.java
@@ -5,7 +5,7 @@
 
 public class TestWatchman implements StatementInterceptor {
 	public Statement intercept(final Statement base,
-			final FrameworkMethod method) {
+			final FrameworkMethod method, Object target) {
 		return new Statement() {
 			@Override
 			public void evaluate() throws Throwable {

diff --git a/src/main/java/org/junit/experimental/interceptor/Timeout.java b/src/main/java/org/junit/experimental/interceptor/Timeout.java
@@ -14,7 +14,7 @@ public Timeout(int millis) {
 		fMillis= millis;
 	}
 
-	public Statement intercept(Statement base, FrameworkMethod method) {
+	public Statement intercept(Statement base, FrameworkMethod method, Object target) {
 		return new FailOnTimeout(base, fMillis);
 	}
 }
diff --git a/src/main/java/org/junit/experimental/interceptor/Verifier.java b/src/main/java/org/junit/experimental/interceptor/Verifier.java
@@ -4,7 +4,7 @@
 import org.junit.runners.model.Statement;
 
 public class Verifier implements StatementInterceptor {
-	public Statement intercept(final Statement base, FrameworkMethod method) {
+	public Statement intercept(final Statement base, FrameworkMethod method, Object target) {
 		return new Statement() {
 			@Override
 			public void evaluate() throws Throwable {

diff --git a/src/main/java/org/junit/experimental/max/MaxHistory.java b/src/main/java/org/junit/experimental/max/MaxHistory.java
@@ -64,16 +64,15 @@ private static MaxHistory readHistory(File storedResults)
 
 	private final Map<String, Long> fFailureTimestamps= new HashMap<String, Long>();
 
-	// TODO (Jul 1, 2009 3:39:45 PM): rename. This ain't a folder.
-	private final File fFolder;
+	private final File fHistoryStore;
 
 	private MaxHistory(File storedResults) {
-		fFolder= storedResults;
+		fHistoryStore= storedResults;
 	}
 
 	private void save() throws IOException {
 		ObjectOutputStream stream= new ObjectOutputStream(new FileOutputStream(
-				fFolder));
+				fHistoryStore));
 		stream.writeObject(this);
 		stream.close();
 	}

diff --git a/src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java b/src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java
@@ -330,11 +330,11 @@ protected Statement withAfters(FrameworkMethod method, Object target,
 			new RunAfters(statement, afters, target);
 	}
 
-	private Statement withInterceptors(FrameworkMethod method, Object test,
+	private Statement withInterceptors(FrameworkMethod method, Object target,
 			Statement statement) {
 		Statement result= statement;
-		for (StatementInterceptor each : interceptors(test))
-			result= each.intercept(result, method);
+		for (StatementInterceptor each : interceptors(target))
+			result= each.intercept(result, method, target);
 		return result;
 	}
 

diff --git a/src/test/java/org/junit/tests/experimental/interceptor/InterceptorTest.java b/src/test/java/org/junit/tests/experimental/interceptor/InterceptorTest.java
@@ -27,7 +27,7 @@ public static class ExampleTest {
 		@Interceptor
 		public StatementInterceptor example= new StatementInterceptor() {
 			public Statement intercept(final Statement base,
-					FrameworkMethod method) {
+					FrameworkMethod method, Object target) {
 				return new Statement() {
 					@Override
 					public void evaluate() throws Throwable {
@@ -56,7 +56,7 @@ public void interceptorIsIntroducedAndEvaluated() {
 	public static class MultipleInterceptorTest {
 		private static class Incrementor implements StatementInterceptor {
 			public Statement intercept(final Statement base,
-					FrameworkMethod method) {
+					FrameworkMethod method, Object target) {
 				return new Statement() {
 					@Override
 					public void evaluate() throws Throwable {