diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java b/org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java index a5078e5b4de..1584fa064a8 100644 --- a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java +++ b/org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java @@ -45,6 +45,7 @@ import org.springframework.test.context.junit4.statements.RunBeforeTestClassCall import org.springframework.test.context.junit4.statements.RunBeforeTestMethodCallbacks; import org.springframework.test.context.junit4.statements.SpringFailOnTimeout; import org.springframework.test.context.junit4.statements.SpringRepeat; +import org.springframework.util.ReflectionUtils; /** *
@@ -307,6 +308,7 @@ public class SpringJUnit4ClassRunner extends BlockJUnit4ClassRunner {
Statement statement = methodInvoker(frameworkMethod, testInstance);
statement = possiblyExpectingExceptions(frameworkMethod, testInstance, statement);
+ statement = withRulesReflectively(frameworkMethod, testInstance, statement);
statement = withBefores(frameworkMethod, testInstance, statement);
statement = withAfters(frameworkMethod, testInstance, statement);
statement = withPotentialRepeat(frameworkMethod, testInstance, statement);
@@ -315,6 +317,24 @@ public class SpringJUnit4ClassRunner extends BlockJUnit4ClassRunner {
return statement;
}
+ /**
+ * Invokes JUnit 4.7's private withRules() method using
+ * reflection. This is necessary for backwards compatibility with the JUnit
+ * 4.5 and 4.6 implementations of {@link BlockJUnit4ClassRunner}.
+ */
+ private Statement withRulesReflectively(FrameworkMethod frameworkMethod, Object testInstance, Statement statement) {
+ Method withRulesMethod = ReflectionUtils.findMethod(getClass(), "withRules", FrameworkMethod.class,
+ Object.class, Statement.class);
+ if (withRulesMethod != null) {
+ // Original JUnit 4.7 code:
+ // statement = withRules(frameworkMethod, testInstance, statement);
+ ReflectionUtils.makeAccessible(withRulesMethod);
+ statement = (Statement) ReflectionUtils.invokeMethod(withRulesMethod, this, frameworkMethod, testInstance,
+ statement);
+ }
+ return statement;
+ }
+
/**
* Returns true if {@link Ignore @Ignore} is present for
* the supplied {@link FrameworkMethod test method} or if the test method is
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit47ClassRunnerRuleTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit47ClassRunnerRuleTests.java
new file mode 100644
index 00000000000..215e410469d
--- /dev/null
+++ b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit47ClassRunnerRuleTests.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.test.context.junit4;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.TestExecutionListeners;
+
+/**
+ * Verifies support for JUnit 4.7 {@link Rule Rules} in conjunction with the
+ * {@link SpringJUnit4ClassRunner}. The body of this test class is taken from
+ * the JUnit 4.7 release notes.
+ *
+ * @author JUnit 4.7 Team
+ * @author Sam Brannen
+ * @since 3.0
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@TestExecutionListeners( {})
+public class SpringJUnit47ClassRunnerRuleTests {
+
+ @Rule
+ public TestName name = new TestName();
+
+
+ @Test
+ public void testA() {
+ assertEquals("testA", name.getMethodName());
+ }
+
+ @Test
+ public void testB() {
+ assertEquals("testB", name.getMethodName());
+ }
+}
diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java
index 794da5d7122..d2d8d1e00eb 100644
--- a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java
+++ b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java
@@ -45,9 +45,9 @@ import org.springframework.test.context.junit4.orm.HibernateSessionFlushingTests
@RunWith(Suite.class)
// Note: the following 'multi-line' layout is for enhanced code readability.
@SuiteClasses( {//
-//
- StandardJUnit4FeaturesTests.class,//
+StandardJUnit4FeaturesTests.class,//
StandardJUnit4FeaturesSpringRunnerTests.class,//
+ SpringJUnit47ClassRunnerRuleTests.class,//
ExpectedExceptionSpringRunnerTests.class,//
TimedSpringRunnerTests.class,//
RepeatedSpringRunnerTests.class,//