Author: bdaw
Date: 2008-01-23 17:22:16 -0500 (Wed, 23 Jan 2008)
New Revision: 9590
Modified:
modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/JBossUnitTask.java
modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/UnitMojo.java
modules/test/trunk/unit/src/main/java/org/jboss/unit/tooling/filter/ExcludeTestFilter.java
modules/test/trunk/unit/src/main/java/org/jboss/unit/tooling/filter/IncludeTestFilter.java
Log:
- minor typo
- wrong filter behaviour for generic jboss unit tests
Modified:
modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/JBossUnitTask.java
===================================================================
---
modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/JBossUnitTask.java 2008-01-23
21:58:05 UTC (rev 9589)
+++
modules/test/trunk/tooling/ant/src/main/java/org/jboss/unit/tooling/ant/JBossUnitTask.java 2008-01-23
22:22:16 UTC (rev 9590)
@@ -41,7 +41,7 @@
*/
public class JBossUnitTask extends Task
{
- public static final String MAVEN_SKIP_TEST = "maven.skip.test";
+ public static final String MAVEN_SKIP_TEST = "maven.test.skip";
List<TestsType> testsTypes = new LinkedList();
Modified:
modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/UnitMojo.java
===================================================================
---
modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/UnitMojo.java 2008-01-23
21:58:05 UTC (rev 9589)
+++
modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/UnitMojo.java 2008-01-23
22:22:16 UTC (rev 9590)
@@ -36,7 +36,7 @@
public class UnitMojo extends AbstractMojo
{
- public static final String MAVEN_SKIP_TEST = "maven.skip.test";
+ public static final String MAVEN_SKIP_TEST = "maven.test.skip";
/**
* @parameter
Modified:
modules/test/trunk/unit/src/main/java/org/jboss/unit/tooling/filter/ExcludeTestFilter.java
===================================================================
---
modules/test/trunk/unit/src/main/java/org/jboss/unit/tooling/filter/ExcludeTestFilter.java 2008-01-23
21:58:05 UTC (rev 9589)
+++
modules/test/trunk/unit/src/main/java/org/jboss/unit/tooling/filter/ExcludeTestFilter.java 2008-01-23
22:22:16 UTC (rev 9590)
@@ -24,6 +24,7 @@
import org.jboss.unit.TestId;
import org.jboss.unit.info.TestInfo;
+import org.jboss.unit.info.TestSuiteInfo;
import java.util.Set;
@@ -48,6 +49,19 @@
{
// First check names
+ if (testInfo instanceof TestSuiteInfo)
+ {
+ TestSuiteInfo testSuiteInfo = (TestSuiteInfo)testInfo;
+
+ for (String name : testSuiteInfo.getNames())
+ {
+ if (checkName(name))
+ {
+ return false;
+ }
+ }
+ }
+
if (checkName(testInfo.getName()))
{
return false;
Modified:
modules/test/trunk/unit/src/main/java/org/jboss/unit/tooling/filter/IncludeTestFilter.java
===================================================================
---
modules/test/trunk/unit/src/main/java/org/jboss/unit/tooling/filter/IncludeTestFilter.java 2008-01-23
21:58:05 UTC (rev 9589)
+++
modules/test/trunk/unit/src/main/java/org/jboss/unit/tooling/filter/IncludeTestFilter.java 2008-01-23
22:22:16 UTC (rev 9590)
@@ -24,6 +24,7 @@
import org.jboss.unit.TestId;
import org.jboss.unit.info.TestInfo;
+import org.jboss.unit.info.TestSuiteInfo;
import java.util.Set;
@@ -49,6 +50,20 @@
// First check names
+ if (testInfo instanceof TestSuiteInfo)
+ {
+ TestSuiteInfo testSuiteInfo = (TestSuiteInfo)testInfo;
+
+ for (String name : testSuiteInfo.getNames())
+ {
+ if (checkName(name))
+ {
+ return true;
+ }
+ }
+
+ }
+
if (checkName(testInfo.getName()))
{
return true;