diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/rules/SpringMethodRule.java b/spring-test/src/main/java/org/springframework/test/context/junit4/rules/SpringMethodRule.java index b22a03c62cf..0291c4d39d5 100644 --- a/spring-test/src/main/java/org/springframework/test/context/junit4/rules/SpringMethodRule.java +++ b/spring-test/src/main/java/org/springframework/test/context/junit4/rules/SpringMethodRule.java @@ -61,7 +61,7 @@ import org.springframework.util.ReflectionUtils; *
public class ExampleSpringIntegrationTest {
*
* @ClassRule
- * public static final SpringClassRule SPRING_CLASS_RULE = new SpringClassRule();
+ * public static final SpringClassRule springClassRule = new SpringClassRule();
*
* @Rule
* public final SpringMethodRule springMethodRule = new SpringMethodRule();
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/nested/SpringRuleConfigurer.java b/spring-test/src/test/java/org/springframework/test/context/junit4/nested/SpringRuleConfigurer.java
index 8f47e230ca2..da9e63f00b1 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/nested/SpringRuleConfigurer.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/nested/SpringRuleConfigurer.java
@@ -32,7 +32,7 @@ import org.springframework.test.context.junit4.rules.SpringMethodRule;
public abstract class SpringRuleConfigurer {
@ClassRule
- public static final SpringClassRule SPRING_CLASS_RULE = new SpringClassRule();
+ public static final SpringClassRule springClassRule = new SpringClassRule();
@Rule
public final SpringMethodRule springMethodRule = new SpringMethodRule();
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/BaseAppCtxRuleTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/BaseAppCtxRuleTests.java
index 54bf4f6e35e..70304469fe6 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/BaseAppCtxRuleTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/BaseAppCtxRuleTests.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.*;
public class BaseAppCtxRuleTests {
@ClassRule
- public static final SpringClassRule SPRING_CLASS_RULE = new SpringClassRule();
+ public static final SpringClassRule springClassRule = new SpringClassRule();
@Rule
public final SpringMethodRule springMethodRule = new SpringMethodRule();
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/BasicAnnotationConfigWacSpringRuleTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/BasicAnnotationConfigWacSpringRuleTests.java
index 2a2c0247ff9..0ddeaf2132e 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/BasicAnnotationConfigWacSpringRuleTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/BasicAnnotationConfigWacSpringRuleTests.java
@@ -37,7 +37,7 @@ public class BasicAnnotationConfigWacSpringRuleTests extends BasicAnnotationConf
// All tests are in superclass.
@ClassRule
- public static final SpringClassRule SPRING_CLASS_RULE = new SpringClassRule();
+ public static final SpringClassRule springClassRule = new SpringClassRule();
@Rule
public final SpringMethodRule springMethodRule = new SpringMethodRule();
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/BeforeAndAfterTransactionAnnotationSpringRuleTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/BeforeAndAfterTransactionAnnotationSpringRuleTests.java
index f5c9aced19b..595bfaa872d 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/BeforeAndAfterTransactionAnnotationSpringRuleTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/BeforeAndAfterTransactionAnnotationSpringRuleTests.java
@@ -35,7 +35,7 @@ import org.springframework.test.context.junit4.BeforeAndAfterTransactionAnnotati
public class BeforeAndAfterTransactionAnnotationSpringRuleTests extends BeforeAndAfterTransactionAnnotationTests {
@ClassRule
- public static final SpringClassRule SPRING_CLASS_RULE = new SpringClassRule();
+ public static final SpringClassRule springClassRule = new SpringClassRule();
@Rule
public final SpringMethodRule springMethodRule = new SpringMethodRule();
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/ClassLevelDisabledSpringRuleTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/ClassLevelDisabledSpringRuleTests.java
index d9f494228e9..d931364868d 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/ClassLevelDisabledSpringRuleTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/ClassLevelDisabledSpringRuleTests.java
@@ -35,7 +35,7 @@ import org.springframework.test.context.junit4.ClassLevelDisabledSpringRunnerTes
public class ClassLevelDisabledSpringRuleTests extends ClassLevelDisabledSpringRunnerTests {
@ClassRule
- public static final SpringClassRule SPRING_CLASS_RULE = new SpringClassRule();
+ public static final SpringClassRule springClassRule = new SpringClassRule();
@Rule
public final SpringMethodRule springMethodRule = new SpringMethodRule();
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/EnabledAndIgnoredSpringRuleTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/EnabledAndIgnoredSpringRuleTests.java
index 2916adc75a3..2717161856d 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/EnabledAndIgnoredSpringRuleTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/EnabledAndIgnoredSpringRuleTests.java
@@ -35,7 +35,7 @@ import org.springframework.test.context.junit4.EnabledAndIgnoredSpringRunnerTest
public class EnabledAndIgnoredSpringRuleTests extends EnabledAndIgnoredSpringRunnerTests {
@ClassRule
- public static final SpringClassRule SPRING_CLASS_RULE = new SpringClassRule();
+ public static final SpringClassRule springClassRule = new SpringClassRule();
@Rule
public final SpringMethodRule springMethodRule = new SpringMethodRule();
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/FailingBeforeAndAfterMethodsSpringRuleTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/FailingBeforeAndAfterMethodsSpringRuleTests.java
index d3838cb1acc..7f8242a60e6 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/FailingBeforeAndAfterMethodsSpringRuleTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/FailingBeforeAndAfterMethodsSpringRuleTests.java
@@ -72,7 +72,7 @@ public class FailingBeforeAndAfterMethodsSpringRuleTests extends FailingBeforeAn
public static abstract class BaseSpringRuleTestCase {
@ClassRule
- public static final SpringClassRule SPRING_CLASS_RULE = new SpringClassRule();
+ public static final SpringClassRule springClassRule = new SpringClassRule();
@Rule
public final SpringMethodRule springMethodRule = new SpringMethodRule();
@@ -115,7 +115,7 @@ public class FailingBeforeAndAfterMethodsSpringRuleTests extends FailingBeforeAn
public static class FailingBeforeTransactionSpringRuleTestCase {
@ClassRule
- public static final SpringClassRule SPRING_CLASS_RULE = new SpringClassRule();
+ public static final SpringClassRule springClassRule = new SpringClassRule();
@Rule
public final SpringMethodRule springMethodRule = new SpringMethodRule();
@@ -138,7 +138,7 @@ public class FailingBeforeAndAfterMethodsSpringRuleTests extends FailingBeforeAn
public static class FailingAfterTransactionSpringRuleTestCase {
@ClassRule
- public static final SpringClassRule SPRING_CLASS_RULE = new SpringClassRule();
+ public static final SpringClassRule springClassRule = new SpringClassRule();
@Rule
public final SpringMethodRule springMethodRule = new SpringMethodRule();
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/ParameterizedSpringRuleTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/ParameterizedSpringRuleTests.java
index bd33cd7cbdb..9566d079960 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/ParameterizedSpringRuleTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/ParameterizedSpringRuleTests.java
@@ -52,7 +52,7 @@ public class ParameterizedSpringRuleTests {
private static final AtomicInteger invocationCount = new AtomicInteger();
@ClassRule
- public static final SpringClassRule SPRING_CLASS_RULE = new SpringClassRule();
+ public static final SpringClassRule springClassRule = new SpringClassRule();
@Rule
public final SpringMethodRule springMethodRule = new SpringMethodRule();
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/ProgrammaticTxMgmtSpringRuleTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/ProgrammaticTxMgmtSpringRuleTests.java
index bdb6aa831dc..a01d53ca40d 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/ProgrammaticTxMgmtSpringRuleTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/ProgrammaticTxMgmtSpringRuleTests.java
@@ -44,7 +44,7 @@ import org.springframework.transaction.PlatformTransactionManager;
public class ProgrammaticTxMgmtSpringRuleTests extends ProgrammaticTxMgmtTests {
@ClassRule
- public static final SpringClassRule SPRING_CLASS_RULE = new SpringClassRule();
+ public static final SpringClassRule springClassRule = new SpringClassRule();
@Rule
public final SpringMethodRule springMethodRule = new SpringMethodRule();
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/RepeatedSpringRuleTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/RepeatedSpringRuleTests.java
index 59b6872faf4..d8d4d2b90f1 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/RepeatedSpringRuleTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/RepeatedSpringRuleTests.java
@@ -73,7 +73,7 @@ public class RepeatedSpringRuleTests extends RepeatedSpringRunnerTests {
public abstract static class AbstractRepeatedTestCase {
@ClassRule
- public static final SpringClassRule SPRING_CLASS_RULE = new SpringClassRule();
+ public static final SpringClassRule springClassRule = new SpringClassRule();
@Rule
public final SpringMethodRule springMethodRule = new SpringMethodRule();
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/TimedSpringRuleTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/TimedSpringRuleTests.java
index 5d28391364d..bbb4aefc09a 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/TimedSpringRuleTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/TimedSpringRuleTests.java
@@ -55,7 +55,7 @@ public class TimedSpringRuleTests extends TimedSpringRunnerTests {
public static final class TimedSpringRuleTestCase extends TimedSpringRunnerTestCase {
@ClassRule
- public static final SpringClassRule SPRING_CLASS_RULE = new SpringClassRule();
+ public static final SpringClassRule springClassRule = new SpringClassRule();
@Rule
public final SpringMethodRule springMethodRule = new SpringMethodRule();
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/TimedTransactionalSpringRuleTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/TimedTransactionalSpringRuleTests.java
index a1045dd9e0c..ff5f8854a63 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/TimedTransactionalSpringRuleTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/TimedTransactionalSpringRuleTests.java
@@ -42,7 +42,7 @@ import static org.springframework.test.transaction.TransactionTestUtils.*;
public class TimedTransactionalSpringRuleTests extends TimedTransactionalSpringRunnerTests {
@ClassRule
- public static final SpringClassRule SPRING_CLASS_RULE = new SpringClassRule();
+ public static final SpringClassRule springClassRule = new SpringClassRule();
@Rule
public final SpringMethodRule springMethodRule = new SpringMethodRule();
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/TransactionalSqlScriptsSpringRuleTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/TransactionalSqlScriptsSpringRuleTests.java
index d0c736a8878..75371b71893 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/rules/TransactionalSqlScriptsSpringRuleTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/rules/TransactionalSqlScriptsSpringRuleTests.java
@@ -46,7 +46,7 @@ import org.springframework.test.context.jdbc.TransactionalSqlScriptsTests;
public class TransactionalSqlScriptsSpringRuleTests extends TransactionalSqlScriptsTests {
@ClassRule
- public static final SpringClassRule SPRING_CLASS_RULE = new SpringClassRule();
+ public static final SpringClassRule springClassRule = new SpringClassRule();
@Rule
public final SpringMethodRule springMethodRule = new SpringMethodRule();
diff --git a/src/docs/asciidoc/testing.adoc b/src/docs/asciidoc/testing.adoc
index 760fabdbad9..c7ab225ce40 100644
--- a/src/docs/asciidoc/testing.adoc
+++ b/src/docs/asciidoc/testing.adoc
@@ -3627,7 +3627,7 @@ demonstrates the proper way to declare these rules in an integration test.
public class IntegrationTest {
@ClassRule
- public static final SpringClassRule SPRING_CLASS_RULE = new SpringClassRule();
+ public static final SpringClassRule springClassRule = new SpringClassRule();
@Rule
public final SpringMethodRule springMethodRule = new SpringMethodRule();