Rename SPRING_CLASS_RULE fields to springClassRule

sbrannen · sbrannen · commit dcdb0b416f88 · 2017-09-06T17:38:22.000+02:00
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
@@ -61,7 +61,7 @@
  * <pre><code> public class ExampleSpringIntegrationTest {
  *
  *    &#064;ClassRule
- *    public static final SpringClassRule SPRING_CLASS_RULE = new SpringClassRule();
+ *    public static final SpringClassRule springClassRule = new SpringClassRule();
  *
  *    &#064;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
@@ -32,7 +32,7 @@
 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
@@ -44,7 +44,7 @@
 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
@@ -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
@@ -35,7 +35,7 @@
 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
@@ -35,7 +35,7 @@
 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
@@ -35,7 +35,7 @@
 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
@@ -72,7 +72,7 @@ protected Class<? extends Runner> getRunnerClass() {
 	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 static class AlwaysFailingAfterTestMethodSpringRuleTestCase extends BaseS
 	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 void beforeTransaction() {
 	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
@@ -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
@@ -44,7 +44,7 @@
 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
@@ -73,7 +73,7 @@ protected Class<? extends Runner> getRunnerClass() {
 	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
@@ -55,7 +55,7 @@ protected Class<? extends Runner> getRunnerClass() {
 	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
@@ -42,7 +42,7 @@
 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
@@ -46,7 +46,7 @@
 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
@@ -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();

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@`
`61`	`61`	`* <pre><code> public class ExampleSpringIntegrationTest {`
`62`	`62`	`*`
`63`	`63`	`* @ClassRule`
`64`		`- * public static final SpringClassRule SPRING_CLASS_RULE = new SpringClassRule();`
	`64`	`+ * public static final SpringClassRule springClassRule = new SpringClassRule();`
`65`	`65`	`*`
`66`	`66`	`* @Rule`
`67`	`67`	`* public final SpringMethodRule springMethodRule = new SpringMethodRule();`