From a9e1de4f65af62f2a2b9d640ea14145d52b5f1a2 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 28 Mar 2013 14:01:23 -0400 Subject: [PATCH] Behave properly when using Surefire excludedGroups (i.e. @Category). To reproduce SUREFIRE-974 prior to this fix, pick an arbitrary group class to (not) exclude: mvn -f test/pom.xml -Dtest=CoreJellyTest -DexcludedGroups=hudson.ExtensionPoint test --- .../java/org/jvnet/hudson/test/junit/GroupedTest.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/src/main/java/org/jvnet/hudson/test/junit/GroupedTest.java b/test/src/main/java/org/jvnet/hudson/test/junit/GroupedTest.java index c01782385e..c2f98c736a 100644 --- a/test/src/main/java/org/jvnet/hudson/test/junit/GroupedTest.java +++ b/test/src/main/java/org/jvnet/hudson/test/junit/GroupedTest.java @@ -25,6 +25,9 @@ package org.jvnet.hudson.test.junit; import junit.framework.TestSuite; import junit.framework.TestResult; +import org.junit.runner.manipulation.Filter; +import org.junit.runner.manipulation.Filterable; +import org.junit.runner.manipulation.NoTestsRemainException; /** * {@link TestSuite} that requires some set up and tear down for executing nested tests. @@ -34,7 +37,7 @@ import junit.framework.TestResult; * * @author Kohsuke Kawaguchi */ -public class GroupedTest extends TestSuite { +public class GroupedTest extends TestSuite implements Filterable { @Override public int countTestCases() { return super.countTestCases()+1; @@ -68,4 +71,7 @@ public class GroupedTest extends TestSuite { } protected void tearDown() throws Exception { } + + public void filter(Filter filter) throws NoTestsRemainException {} // SUREFIRE-974 + }