Merge pull request junit-team#343 from marcphilipp/no-static-rules

Fixes junit-teamgh-339: @rule fields/methods must not be static

Author: dsaff

src/main/java/org/junit/internal/runners/rules/RuleFieldValidator.java

@@ -43,13 +43,13 @@ public enum RuleFieldValidator {
 
 	private final Class<? extends Annotation> fAnnotation;
 
-	private final boolean fOnlyStaticMembers;
+	private final boolean fStaticMembers;
 	private final boolean fMethods;
 
 	private RuleFieldValidator(Class<? extends Annotation> annotation,
-			boolean methods, boolean fOnlyStaticMembers) {
+			boolean methods, boolean fStaticMembers) {
 		this.fAnnotation= annotation;
-		this.fOnlyStaticMembers= fOnlyStaticMembers;
+		this.fStaticMembers= fStaticMembers;
 		this.fMethods= methods;
 	}
 
@@ -68,15 +68,17 @@ public void validate(TestClass target, List<Throwable> errors) {
 	}
 
 	private void validateMember(FrameworkMember<?> member, List<Throwable> errors) {
-		optionallyValidateStatic(member, errors);
+		validateStatic(member, errors);
 		validatePublic(member, errors);
 		validateTestRuleOrMethodRule(member, errors);
 	}
 
-	private void optionallyValidateStatic(FrameworkMember<?> member,
+	private void validateStatic(FrameworkMember<?> member,
 			List<Throwable> errors) {
-		if (fOnlyStaticMembers && !member.isStatic())
+		if (fStaticMembers && !member.isStatic())
 			addError(errors, member, "must be static.");
+		if (!fStaticMembers && member.isStatic())
+			addError(errors, member, "must not be static.");
 	}
 
 	private void validatePublic(FrameworkMember<?> member, List<Throwable> errors) {

src/test/java/org/junit/tests/experimental/rules/RuleFieldValidatorTest.java

@@ -59,6 +59,18 @@ public static class TestWithNonStaticTestRule {
 		public TestRule temporaryFolder = new TemporaryFolder();
 	}
 
+	@Test
+	public void rejectStaticTestRule() {
+		TestClass target= new TestClass(TestWithStaticTestRule.class);
+		RULE_VALIDATOR.validate(target, errors);
+		assertOneErrorWithMessage("The @Rule 'temporaryFolder' must not be static.");
+	}
+
+	public static class TestWithStaticTestRule {
+		@Rule
+		public static TestRule temporaryFolder = new TemporaryFolder();
+	}
+
 	@Test
 	public void acceptMethodRule() throws Exception {
 		TestClass target= new TestClass(TestWithMethodRule.class);
@@ -125,6 +137,18 @@ public static class TestMethodWithNonStaticTestRule {
 		public TestRule getTemporaryFolder() { return new TemporaryFolder(); }
 	}
 
+	@Test
+	public void rejectMethodStaticTestRule() {
+		TestClass target= new TestClass(TestMethodWithStaticTestRule.class);
+		RULE_METHOD_VALIDATOR.validate(target, errors);
+		assertOneErrorWithMessage("The @Rule 'getTemporaryFolder' must not be static.");
+	}
+
+	public static class TestMethodWithStaticTestRule {
+		@Rule
+		public static TestRule getTemporaryFolder() { return new TemporaryFolder(); }
+	}
+
 	@Test
 	public void methodAcceptMethodRuleMethod() throws Exception {
 		TestClass target= new TestClass(MethodTestWithMethodRule.class);