svn commit: r1210559 - /maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/

[krosenvold]

Author: krosenvold
Date: Mon Dec  5 18:27:32 2011
New Revision: 1210559

URL: http://svn.apache.org/viewvc?rev=1210559&view=rev
Log:
o Enabled a few more IT's that weren't running

Added:
    
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailureIT.java
   (contents, props changed)
      - copied, changed from r1210545, 
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailure.java
    
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java
   (contents, props changed)
      - copied, changed from r1210545, 
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotations.java
Removed:
    
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailure.java
    
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotations.java

Copied: 
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailureIT.java
 (from r1210545, 
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailure.java)
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailureIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailureIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailure.java&r1=1210545&r2=1210559&rev=1210559&view=diff
==============================================================================
--- 
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailure.java
 (original)
+++ 
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailureIT.java
 Mon Dec  5 18:27:32 2011
@@ -19,16 +19,18 @@ package org.apache.maven.surefire.its;
  */
 
 
+import org.apache.maven.it.VerificationException;
+
 /**
  * Test Surefire-376 (TestNG @AfterSuite failures are ignored)
  *
  * @author <a href="mailto:dfabul...@apache.org";>Dan Fabulich</a>
  */
-public class Surefire376TestNgAfterSuiteFailure
+public class Surefire376TestNgAfterSuiteFailureIT
     extends SurefireVerifierTestClass
 {
 
-    public Surefire376TestNgAfterSuiteFailure()
+    public Surefire376TestNgAfterSuiteFailureIT()
     {
         super( "/testng-afterSuiteFailure" );
     }
@@ -36,7 +38,14 @@ public class Surefire376TestNgAfterSuite
     public void testAfterSuiteFailure()
         throws Exception
     {
-        executeTest();
-        assertTestSuiteResults( 2, 0, 1, 0 );
+        try
+        {
+            executeTest();
+            fail( "Should fail" );
+        }
+        catch ( VerificationException e )
+        {
+            assertTestSuiteResults( 2, 0, 1, 0 );
+        }
     }
 }

Propchange: 
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire376TestNgAfterSuiteFailureIT.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: 
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java
 (from r1210545, 
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotations.java)
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotations.java&r1=1210545&r2=1210559&rev=1210559&view=diff
==============================================================================
--- 
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotations.java
 (original)
+++ 
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java
 Mon Dec  5 18:27:32 2011
@@ -25,10 +25,10 @@ package org.apache.maven.surefire.its;
  * @author <a href="mailto:spam.hai...@gmail.com";>Haikal Saadh</a>
  * 
  */
-public class TestNgParallelWithAnnotations
+public class TestNgParallelWithAnnotationsIT
    extends SurefireVerifierTestClass
 {
-    public TestNgParallelWithAnnotations()
+    public TestNgParallelWithAnnotationsIT()
     {
         super( "/testng-parallel-with-annotations" );
     }

Propchange: 
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java
------------------------------------------------------------------------------
    svn:eol-style = native