maven-surefire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krosenv...@apache.org
Subject svn commit: r1053083 - /maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/
Date Mon, 27 Dec 2010 15:11:46 GMT
Author: krosenvold
Date: Mon Dec 27 15:11:45 2010
New Revision: 1053083

URL: http://svn.apache.org/viewvc?rev=1053083&view=rev
Log:
o Improved IT, let's hope it builds on grid

Modified:
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java?rev=1053083&r1=1053082&r2=1053083&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIntegrationTestClass.java
Mon Dec 27 15:11:45 2010
@@ -43,14 +43,14 @@ public abstract class AbstractSurefireIn
 
     private String testNgVersion = System.getProperty( "testng.version" );
 
-    protected ArrayList getInitialGoals()
+    protected List<String> getInitialGoals()
     {
         return getInitialGoals( testNgVersion );
     }
 
-    protected ArrayList getInitialGoals( String testNgVersion )
+    protected List<String> getInitialGoals( String testNgVersion )
     {
-        ArrayList goals = new ArrayList();
+        List<String> goals = new ArrayList<String>();
         goals.add( "-Dsurefire.version=" + surefireVersion );
 
         if ( testNgVersion != null )
@@ -77,11 +77,12 @@ public abstract class AbstractSurefireIn
     protected void executeGoal( Verifier verifier, String goal )
         throws VerificationException
     {
-        List goals = getInitialGoals();
+        List<String> goals = getInitialGoals();
         goals.add( goal );
         executeGoals( verifier, goals );
     }
 
+    @SuppressWarnings( { "unchecked" } )
     protected void executeGoals( Verifier verifier, List goals )
         throws VerificationException
     {

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java?rev=1053083&r1=1053082&r2=1053083&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
Mon Dec 27 15:11:45 2010
@@ -42,7 +42,7 @@ public class ForkConsoleOutputIT
         printSummary( true );
 
         execute( "test" );
-//        assertPresent( getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" ) );
+        assertPresent( getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" ) );
     }
 
     public void testPrintSummaryTrueWithoutRedirect()
@@ -52,7 +52,7 @@ public class ForkConsoleOutputIT
         printSummary( true );
 
         execute( "test" );
-//        assertNotPresent( getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt"
) );
+        assertNotPresent( getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" )
);
     }
 
     public void testPrintSummaryFalseWithRedirect()
@@ -62,7 +62,7 @@ public class ForkConsoleOutputIT
         printSummary( false );
 
         execute( "test" );
-//        assertPresent( getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" ) );
+        assertPresent( getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" ) );
     }
 
     public void testPrintSummaryFalseWithoutRedirect()
@@ -72,7 +72,7 @@ public class ForkConsoleOutputIT
         printSummary( false );
 
         execute( "test" );
-//        assertNotPresent( getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt"
) );
+        assertNotPresent( getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" )
);
     }
 
 }

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java?rev=1053083&r1=1053082&r2=1053083&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
Mon Dec 27 15:11:45 2010
@@ -23,7 +23,7 @@ import org.apache.maven.it.Verifier;
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
-import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Test library using a conflicting version of plexus-utils
@@ -52,7 +52,7 @@ public class PlexusConflictIT
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/plexus-conflict"
);
 
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        ArrayList goals = this.getInitialGoals();
+        List<String> goals = this.getInitialGoals();
         goals.add( "test" );
         goals.add( "-Dsurefire.useSystemClassLoader=false" );
         executeGoals( verifier, goals );

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java?rev=1053083&r1=1053082&r2=1053083&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
Mon Dec 27 15:11:45 2010
@@ -37,13 +37,11 @@ import java.util.List;
 public abstract class SurefireVerifierTestClass
     extends AbstractSurefireIntegrationTestClass
 {
-    private final String testProject;
-
     private final File testDir;
 
-    private final List cliOptions = new ArrayList();
+    private final List<String> cliOptions = new ArrayList<String>();
 
-    private final List goals;
+    private final List<String> goals;
 
     private final Verifier verifier;
 
@@ -52,8 +50,7 @@ public abstract class SurefireVerifierTe
     {
         try
         {
-            this.testProject = testProject;
-            testDir = ResourceExtractor.simpleExtractResources( getClass(), "/fork-consoleOutput"
);
+            testDir = ResourceExtractor.simpleExtractResources( getClass(), testProject );
             this.goals = getInitialGoals();
             this.verifier = new Verifier( testDir.getAbsolutePath() );
         }

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java?rev=1053083&r1=1053082&r2=1053083&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java
Mon Dec 27 15:11:45 2010
@@ -23,6 +23,7 @@ import org.apache.maven.it.util.Resource
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Test system properties
@@ -38,7 +39,7 @@ public class SystemPropertiesTestIT
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/system-properties"
);
 
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        ArrayList goals = getInitialGoals();
+        List<String> goals = getInitialGoals();
         goals.add( "test" );
         goals.add( "-DsetOnMavenCommandLine=baz" );
         goals.add( "-DsetOnArgLineWorkAround=baz" );
@@ -55,7 +56,7 @@ public class SystemPropertiesTestIT
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/system-properties"
);
 
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        ArrayList goals = getInitialGoals();
+        List<String> goals = getInitialGoals();
         goals.add( "test" );
         goals.add( "-DforkMode=never" );
         goals.add( "-DsetOnArgLineWorkAround=baz" );

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java?rev=1053083&r1=1053082&r2=1053083&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
Mon Dec 27 15:11:45 2010
@@ -24,7 +24,7 @@ import org.apache.maven.it.util.Resource
 
 import java.io.File;
 import java.io.IOException;
-import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Test a directory with an umlaut
@@ -51,7 +51,7 @@ public class UmlautDirIT
         throws Exception
     {
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        ArrayList goals = this.getInitialGoals();
+        List<String> goals = this.getInitialGoals();
         goals.add( "test" );
         goals.add( "-DuseSystemClassLoader=false" );
         executeGoals( verifier, goals );

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java?rev=1053083&r1=1053082&r2=1053083&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
Mon Dec 27 15:11:45 2010
@@ -25,6 +25,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Properties;
 
 /**
@@ -84,7 +85,7 @@ public class WorkingDirectoryIT
         throws Exception
     {
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        ArrayList goals = this.getInitialGoals();
+        List<String> goals = this.getInitialGoals();
         goals.add( "test" );
         goals.add( "-DforkMode=never" );
         executeGoals( verifier, goals );
@@ -112,7 +113,7 @@ public class WorkingDirectoryIT
     {
 
         Verifier verifier = new Verifier( childTestDir.getAbsolutePath() );
-        ArrayList goals = this.getInitialGoals();
+        List<String> goals = this.getInitialGoals();
         goals.add( "test" );
         goals.add( "-DforkMode=never" );
         executeGoals( verifier, goals );



Mime
View raw message