svn commit: r1385046 - in /maven/surefire/trunk: surefire-grouper/src/main/javacc/category-expression.jj surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java

[kr...@apache.org]

Author: krosenvold
Date: Sat Sep 15 12:05:22 2012
New Revision: 1385046

URL: http://svn.apache.org/viewvc?rev=1385046&view=rev
Log:
[SUREFIRE-831] Dash symbol in groups does not work

Fixed with IT

Modified:
    maven/surefire/trunk/surefire-grouper/src/main/javacc/category-expression.jj
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java

Modified: maven/surefire/trunk/surefire-grouper/src/main/javacc/category-expression.jj
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-grouper/src/main/javacc/category-expression.jj?rev=1385046&r1=1385045&r2=1385046&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-grouper/src/main/javacc/category-expression.jj (original)
+++ maven/surefire/trunk/surefire-grouper/src/main/javacc/category-expression.jj Sat Sep 15 12:05:22 2012
@@ -83,7 +83,7 @@ TOKEN:
 | <BANG:  "!">
 | <LPAREN: "(">
 | <RPAREN: ")">
-| <STRING: (["A"-"Z", "a"-"z", "0"-"9", "_", "$", "#", "."])+ >
+| <STRING: (["A"-"Z", "a"-"z", "-", "0"-"9", "_", "$", "#", "."])+ >
 | <CLS:    ".class">
 }
 

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java?rev=1385046&r1=1385045&r2=1385046&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java Sat Sep 15 12:05:22 2012
@@ -19,27 +19,37 @@ package org.apache.maven.surefire.its;
  * under the License.
  */
 
-import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
 import org.apache.maven.surefire.its.fixture.SurefireLauncher;
 
+import org.junit.Test;
+
 /**
  * Test that TestNG's @Test(threadPoolSize = n, invocationCount=n) causes tests to be run in parallel.
  *
  * @author <a href="mailto:spam.haikal@gmail.com">Haikal Saadh</a>
  */
 public class TestNgGroupsIT
-    extends SurefireIntegrationTestCase
+    extends SurefireJUnit4IntegrationTestCase
 {
-    public void testTestNgGroupThreadParallel()
+    @Test
+    public void testNgGroupThreadParallel()
     {
         unpack().setExcludedGroups( "notincluded" ).executeTest().verifyErrorFree( 1 );
     }
 
-    public void testGroups()
+    @Test
+    public void groups()
     {
         unpack().setGroups( "functional" ).executeTest().verifyErrorFree( 2 );
     }
 
+    @Test
+    public void groupsWithDash()
+    {
+        unpack().setGroups( "abc-def" ).executeTest().verifyErrorFree( 2 );
+    }
+
     public SurefireLauncher unpack()
     {
         return unpack( "/testng-groups" );