Merge pull request #313 from dsaff/categorized_parameters_fix

Fixes gh-291: Categories + Parameterized still does not work

src/main/java/org/junit/experimental/theories/internal/AllMembersSupplier.java

@@ -80,6 +80,7 @@ private void addMultiPointMethods(List<PotentialAssignment> list) {
 			}
 	}
 
+	@SuppressWarnings("deprecation")
 	private void addSinglePointMethods(ParameterSignature sig,
 			List<PotentialAssignment> list) {
 		for (FrameworkMethod dataPointMethod : fClass

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

@@ -5,7 +5,6 @@
 
 import org.junit.ClassRule;
 import org.junit.Rule;
-import org.junit.rules.MethodRule;
 import org.junit.rules.TestRule;
 import org.junit.runners.model.FrameworkField;
 import org.junit.runners.model.TestClass;
@@ -80,7 +79,8 @@ private boolean isTestRule(FrameworkField target) {
 
 	@SuppressWarnings("deprecation")
 	private boolean isMethodRule(FrameworkField target) {
-		return MethodRule.class.isAssignableFrom(target.getType());
+		return org.junit.rules.MethodRule.class.isAssignableFrom(target
+				.getType());
 	}
 
 	private void addError(List<Throwable> errors, FrameworkField field,

src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java

@@ -17,7 +17,6 @@
 import org.junit.internal.runners.statements.InvokeMethod;
 import org.junit.internal.runners.statements.RunAfters;
 import org.junit.internal.runners.statements.RunBefores;
-import org.junit.rules.MethodRule;
 import org.junit.rules.RunRules;
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;

src/main/java/org/junit/runners/Parameterized.java

@@ -1,5 +1,6 @@
 package org.junit.runners;
 
+import java.lang.annotation.Annotation;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -117,6 +118,11 @@ protected void validateConstructor(List<Throwable> errors) {
 		protected Statement classBlock(RunNotifier notifier) {
 			return childrenInvoker(notifier);
 		}
+
+		@Override
+		protected Annotation[] getRunnerAnnotations() {
+			return new Annotation[0];
+		}
 	}
 
 	private final ArrayList<Runner> runners= new ArrayList<Runner>();

src/main/java/org/junit/runners/ParentRunner.java

@@ -270,14 +270,22 @@ protected final void runLeaf(Statement statement, Description description,
 		}
 	}
 
+	/**
+	 * @return the annotations that should be attached to this runner's 
+	 * description.
+	 */
+	protected Annotation[] getRunnerAnnotations() {
+		return fTestClass.getAnnotations();
+	}
+
 	//
 	// Implementation of Runner
 	// 
 
 	@Override
 	public Description getDescription() {
 		Description description= Description.createSuiteDescription(getName(),
-				fTestClass.getAnnotations());
+				getRunnerAnnotations());
 		for (T child : getFilteredChildren())
 			description.addChild(describeChild(child));
 		return description;

src/test/java/junit/samples/SimpleTest.java

@@ -47,10 +47,12 @@ public void testAdd() {
 		// forced failure result == 5
 		assertTrue(result == 6);
 	}
+
+	public int unused;
 	public void testDivideByZero() {
 		int zero= 0;
 		int result= 8/zero;
-		result++; // avoid warning for not using result
+		unused= result; // avoid warning for not using result
 	}
 	public void testEquals() {
 		assertEquals(12, 12);

src/test/java/org/junit/samples/SimpleTest.java

@@ -22,11 +22,13 @@ public static junit.framework.Test suite() {
 		 return new JUnit4TestAdapter(SimpleTest.class);
 	}
 
+	public int unused;
 	@Test public void divideByZero() {
 		int zero= 0;
 		int result= 8/zero;
-		result++; // avoid warning for not using result
+		unused= result; // avoid warning for not using result
 	}
+
 	@Test public void testEquals() {
 		assertEquals(12, 12);
 		assertEquals(12L, 12L);

src/test/java/org/junit/tests/experimental/categories/CategoriesAndParameterizedTest.java

@@ -1,6 +1,9 @@
 package org.junit.tests.experimental.categories;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertThat;
+import static org.junit.experimental.results.PrintableResult.testResult;
+import static org.junit.experimental.results.ResultMatchers.hasFailureContaining;
+import static org.junit.experimental.results.ResultMatchers.isSuccessful;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -10,10 +13,6 @@
 import org.junit.experimental.categories.Categories;
 import org.junit.experimental.categories.Categories.IncludeCategory;
 import org.junit.experimental.categories.Category;
-import org.junit.experimental.results.PrintableResult;
-import org.junit.experimental.results.ResultMatchers;
-import org.junit.runner.JUnitCore;
-import org.junit.runner.Result;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
@@ -57,6 +56,23 @@ public void testSomething() {
 		}
 	}
 
+	@RunWith(Parameterized.class)
+	@Category(Token.class)
+	public static class ParameterizedTestWithClassCategory {
+		public ParameterizedTestWithClassCategory(String a) {
+		}
+
+		@Parameters
+		public static Collection<Object[]> getParameters() {
+			return Collections.singletonList(new Object[] { "a" });
+		}
+
+		@Test
+		public void testSomething() {
+			Assert.assertTrue(true);
+		}
+	}
+
 	@Category(Token.class)
 	public static class VanillaCategorizedJUnitTest {
 		@Test
@@ -67,7 +83,9 @@ public void testSomething() {
 
 	@RunWith(Categories.class)
 	@IncludeCategory(Token.class)
-	@SuiteClasses({ VanillaCategorizedJUnitTest.class, WellBehavedParameterizedTest.class })
+	@SuiteClasses({ VanillaCategorizedJUnitTest.class, 
+					WellBehavedParameterizedTest.class,
+					ParameterizedTestWithClassCategory.class })
 	public static class ParameterTokenSuiteWellFormed {
 	}
 
@@ -85,23 +103,21 @@ public static class ParameterTokenSuiteMalformedAndSwapped {
 
 	@Test
 	public void shouldSucceedWithAParameterizedClassSomewhere() {
-		Result result= new JUnitCore().run(ParameterTokenSuiteWellFormed.class);
-		assertTrue(result.wasSuccessful());
+		assertThat(testResult(ParameterTokenSuiteWellFormed.class),
+				isSuccessful());
 	}
 
 	@Test
 	public void shouldFailWithMethodLevelCategoryAnnotation() {
-		Assert.assertThat(
-				PrintableResult.testResult(ParameterTokenSuiteMalformed.class),
-				ResultMatchers
-						.hasFailureContaining("Category annotations on Parameterized classes are not supported on individual methods."));
+		assertThat(
+				testResult(ParameterTokenSuiteMalformed.class),
+				hasFailureContaining("Category annotations on Parameterized classes are not supported on individual methods."));
 	}
 
 	@Test
 	public void shouldFailWithMethodLevelCategoryAnnotationSwapped() {
-		Assert.assertThat(
-				PrintableResult.testResult(ParameterTokenSuiteMalformedAndSwapped.class),
-				ResultMatchers
-						.hasFailureContaining("Category annotations on Parameterized classes are not supported on individual methods."));
+		assertThat(
+				testResult(ParameterTokenSuiteMalformedAndSwapped.class),
+				hasFailureContaining("Category annotations on Parameterized classes are not supported on individual methods."));
 	}
 }

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

@@ -178,7 +178,7 @@ public void testNewFile() throws IOException {
 		}
 
 		@Test
-		public void testNewFolder() throws IOException {
+		public void testNewFolder() {
 			folder.newFolder(NEW_FOLDER_DUMMY);
 		}
 	}

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

@@ -10,6 +10,7 @@
 import org.junit.rules.TestWatchman;
 import org.junit.runners.model.FrameworkMethod;
 
+@SuppressWarnings("deprecation")
 public class TestWatchmanTest {
 	public static class ViolatedAssumptionTest {
 		@Rule

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

@@ -126,6 +126,8 @@ protected void verify() {
 	}
 
 	@Test public void verifierRunsAfterTest() {
+		sequence = "";
 		assertThat(testResult(UsesVerifier.class), isSuccessful());
+		assertEquals("test verify ", sequence);
 	}
 }