svn commit: r637240 [2/7] - in /maven/surefire/trunk: maven-surefire-plugin/src/site/apt/examples/ maven-surefire-report-plugin/src/test/resources/test-reports/ surefire-api/src/site/apt/ surefire-api/src/test/java/org/apache/maven/surefire/report/ sur...

[be...@apache.org]

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTest.java?rev=637240&r1=637239&r2=637240&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTest.java Fri Mar 14 13:10:25 2008
@@ -1,118 +1,118 @@
-package org.apache.maven.surefire.its;
-
-
-import junit.framework.TestCase;
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.reporting.MavenReportException;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Test forkMode
- * 
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * 
- */
-public class ForkModeTest
-    extends TestCase
-{
-    public void testForkModeAlways () throws Exception
-    {
-        String[] pids = doTest("always");
-        
-        assertDifferentPids( pids );
-    }
-    
-    public void testForkModePerTest() throws Exception
-    {
-        String[] pids = doTest( "pertest" );
-
-        assertDifferentPids( pids );
-    }
-    
-    public void testForkModeNever() throws Exception 
-    {
-        String[] pids = doTest( "never" );
-
-        assertSamePids( pids );
-    }
-    
-    public void testForkModeNone() throws Exception 
-    {
-        String[] pids = doTest( "none" );
-
-        assertSamePids( pids );
-    }
-    
-    public void testForkModeOnce() throws Exception 
-    {
-        String[] pids = doTest( "once" );
-        // DGF It would be nice to assert that "once" was different
-        // from "never" ... but there's no way to check the PID of
-        // Maven itself.  No matter, "once" is tested by setting
-        // argLine, which can't be done except by forking.
-        assertSamePids( pids );
-    }
-
-    private void assertSamePids ( String[] pids ) {
-        assertEquals ("pid 1 didn't match pid 2", pids[0], pids[1]);
-        assertEquals ("pid 1 didn't match pid 3", pids[0], pids[2]);
-    }
-    
-    private void assertDifferentPids( String[] pids )
-    {
-        if (pids[0].equals( pids[1] )) {
-            fail ("pid 1 matched pid 2: " + pids[0]);
-        }
-        
-        if (pids[0].equals( pids[2] )) {
-            fail ("pid 1 matched pid 3: " + pids[0]);
-        }
-        
-        if (pids[1].equals( pids[2] )) {
-            fail ("pid 2 matched pid 3: " + pids[0]);
-        }
-    }
-
-    private String[] doTest(String forkMode)
-        throws IOException, VerificationException, MavenReportException
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/fork-mode" );
-
-        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        List goals = new ArrayList();
-        goals.add( "test" );
-        goals.add( "-DforkMode=" + forkMode );
-        verifier.executeGoals( goals );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-        
-        HelperAssertions.assertTestSuiteResults( 3, 0, 0, 0, testDir );
-        
-        File targetDir = new File(testDir, "target" );
-        String[] pids = new String[3];
-        for (int i = 1; i <= pids.length; i++) {
-            File pidFile = new File(targetDir, "test" + i + "-pid");
-            String pid = slurpFile( pidFile );
-            pids[i-1] = pid;
-        }
-        return pids;
-    }
-    
-    private String slurpFile(File textFile) throws IOException {
-        StringBuffer sb = new StringBuffer();
-        BufferedReader reader = new BufferedReader(new FileReader(textFile));
-        for (String line = reader.readLine(); line != null; line = reader.readLine()) {
-            sb.append( line );
-        }
-        reader.close();
-        return sb.toString();
-    }
-}
+package org.apache.maven.surefire.its;
+
+
+import junit.framework.TestCase;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.reporting.MavenReportException;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Test forkMode
+ * 
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * 
+ */
+public class ForkModeTest
+    extends TestCase
+{
+    public void testForkModeAlways () throws Exception
+    {
+        String[] pids = doTest("always");
+        
+        assertDifferentPids( pids );
+    }
+    
+    public void testForkModePerTest() throws Exception
+    {
+        String[] pids = doTest( "pertest" );
+
+        assertDifferentPids( pids );
+    }
+    
+    public void testForkModeNever() throws Exception 
+    {
+        String[] pids = doTest( "never" );
+
+        assertSamePids( pids );
+    }
+    
+    public void testForkModeNone() throws Exception 
+    {
+        String[] pids = doTest( "none" );
+
+        assertSamePids( pids );
+    }
+    
+    public void testForkModeOnce() throws Exception 
+    {
+        String[] pids = doTest( "once" );
+        // DGF It would be nice to assert that "once" was different
+        // from "never" ... but there's no way to check the PID of
+        // Maven itself.  No matter, "once" is tested by setting
+        // argLine, which can't be done except by forking.
+        assertSamePids( pids );
+    }
+
+    private void assertSamePids ( String[] pids ) {
+        assertEquals ("pid 1 didn't match pid 2", pids[0], pids[1]);
+        assertEquals ("pid 1 didn't match pid 3", pids[0], pids[2]);
+    }
+    
+    private void assertDifferentPids( String[] pids )
+    {
+        if (pids[0].equals( pids[1] )) {
+            fail ("pid 1 matched pid 2: " + pids[0]);
+        }
+        
+        if (pids[0].equals( pids[2] )) {
+            fail ("pid 1 matched pid 3: " + pids[0]);
+        }
+        
+        if (pids[1].equals( pids[2] )) {
+            fail ("pid 2 matched pid 3: " + pids[0]);
+        }
+    }
+
+    private String[] doTest(String forkMode)
+        throws IOException, VerificationException, MavenReportException
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/fork-mode" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        List goals = new ArrayList();
+        goals.add( "test" );
+        goals.add( "-DforkMode=" + forkMode );
+        verifier.executeGoals( goals );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+        
+        HelperAssertions.assertTestSuiteResults( 3, 0, 0, 0, testDir );
+        
+        File targetDir = new File(testDir, "target" );
+        String[] pids = new String[3];
+        for (int i = 1; i <= pids.length; i++) {
+            File pidFile = new File(targetDir, "test" + i + "-pid");
+            String pid = slurpFile( pidFile );
+            pids[i-1] = pid;
+        }
+        return pids;
+    }
+    
+    private String slurpFile(File textFile) throws IOException {
+        StringBuffer sb = new StringBuffer();
+        BufferedReader reader = new BufferedReader(new FileReader(textFile));
+        for (String line = reader.readLine(); line != null; line = reader.readLine()) {
+            sb.append( line );
+        }
+        reader.close();
+        return sb.toString();
+    }
+}

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

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/HelperAssertions.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/HelperAssertions.java?rev=637240&r1=637239&r2=637240&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/HelperAssertions.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/HelperAssertions.java Fri Mar 14 13:10:25 2008
@@ -1,85 +1,85 @@
-package org.apache.maven.surefire.its;
-
-import junit.framework.Assert;
-import org.apache.maven.plugins.surefire.report.ReportTestSuite;
-import org.apache.maven.plugins.surefire.report.SurefireReportParser;
-import org.apache.maven.reporting.MavenReportException;
-
-import java.io.File;
-import java.util.List;
-
-public class HelperAssertions
-{
-    /** assert that the reports in the specified testDir have the right summary statistics */
-    public static void assertTestSuiteResults( int total, int errors, int failures, int skipped,
-                                               File testDir ) throws MavenReportException {
-        ITSuiteResults suite = parseTestResults( new File[] { testDir } );
-        assertTestSuiteResults( total, errors, failures, skipped, suite );
-    }
-    
-    protected static void assertTestSuiteResults( int total, int errors, int failures, int skipped,
-                                               ITSuiteResults actualSuite )
-    {
-        Assert.assertEquals( "wrong number of tests", total, actualSuite.getTotal() );
-        Assert.assertEquals( "wrong number of errors", errors, actualSuite.getErrors() );
-        Assert.assertEquals( "wrong number of failures", failures, actualSuite.getFailures() );
-        Assert.assertEquals( "wrong number of skipped", skipped, actualSuite.getSkipped() );
-    }
-
-    protected static ITSuiteResults parseTestResults( File testDir )
-        throws MavenReportException
-    {
-        return parseTestResults( new File[] { testDir } );
-    }
-
-    protected static ITSuiteResults parseTestResults( File[] testDirs )
-        throws MavenReportException
-    {
-        List reports = extractReports( testDirs );
-        ITSuiteResults results = parseReportList( reports );
-        return results;
-    }
-
-    /** Converts a list of ReportTestSuites into an ITSuiteResults object, suitable for summary assertions */
-    protected static ITSuiteResults parseReportList( List reports )
-    {
-        Assert.assertTrue( "No reports!", reports.size() > 0 );
-        int total = 0, errors = 0, failures = 0, skipped = 0;
-        for (int i = 0; i < reports.size(); i++) {
-            ReportTestSuite suite = (ReportTestSuite) reports.get( i );
-            total += suite.getNumberOfTests();
-            errors += suite.getNumberOfErrors();
-            failures += suite.getNumberOfFailures();
-            skipped += suite.getNumberOfSkipped();
-        }
-        ITSuiteResults results = new ITSuiteResults(total, errors, failures, skipped);
-        return results;
-    }
-
-    protected static List extractReports( File testDir )
-    {
-        return extractReports( new File[] { testDir } );
-    }
-    
-    /** Extracts a list of ReportTestSuites from the specified testDirs */
-    protected static List extractReports( File[] testDirs )
-    {
-        SurefireReportParser parser = new SurefireReportParser();
-        File[] reportsDirs = new File[testDirs.length];
-        for ( int i = 0; i < testDirs.length; i++ )
-        {
-            File testDir = testDirs[i];
-            File reportsDir = new File( testDir, "target/surefire-reports" );
-            Assert.assertTrue( "Reports directory is missing: " + reportsDir.getAbsolutePath(), reportsDir.exists() );
-            reportsDirs[i] = reportsDir;
-        }
-        parser.setReportsDirectories( reportsDirs );
-        List reports;
-        try {
-            reports = parser.parseXMLReportFiles();
-        } catch (Exception e) {
-            throw new RuntimeException("Couldn't parse XML reports", e);
-        }
-        return reports;
-    }
-}
+package org.apache.maven.surefire.its;
+
+import junit.framework.Assert;
+import org.apache.maven.plugins.surefire.report.ReportTestSuite;
+import org.apache.maven.plugins.surefire.report.SurefireReportParser;
+import org.apache.maven.reporting.MavenReportException;
+
+import java.io.File;
+import java.util.List;
+
+public class HelperAssertions
+{
+    /** assert that the reports in the specified testDir have the right summary statistics */
+    public static void assertTestSuiteResults( int total, int errors, int failures, int skipped,
+                                               File testDir ) throws MavenReportException {
+        ITSuiteResults suite = parseTestResults( new File[] { testDir } );
+        assertTestSuiteResults( total, errors, failures, skipped, suite );
+    }
+    
+    protected static void assertTestSuiteResults( int total, int errors, int failures, int skipped,
+                                               ITSuiteResults actualSuite )
+    {
+        Assert.assertEquals( "wrong number of tests", total, actualSuite.getTotal() );
+        Assert.assertEquals( "wrong number of errors", errors, actualSuite.getErrors() );
+        Assert.assertEquals( "wrong number of failures", failures, actualSuite.getFailures() );
+        Assert.assertEquals( "wrong number of skipped", skipped, actualSuite.getSkipped() );
+    }
+
+    protected static ITSuiteResults parseTestResults( File testDir )
+        throws MavenReportException
+    {
+        return parseTestResults( new File[] { testDir } );
+    }
+
+    protected static ITSuiteResults parseTestResults( File[] testDirs )
+        throws MavenReportException
+    {
+        List reports = extractReports( testDirs );
+        ITSuiteResults results = parseReportList( reports );
+        return results;
+    }
+
+    /** Converts a list of ReportTestSuites into an ITSuiteResults object, suitable for summary assertions */
+    protected static ITSuiteResults parseReportList( List reports )
+    {
+        Assert.assertTrue( "No reports!", reports.size() > 0 );
+        int total = 0, errors = 0, failures = 0, skipped = 0;
+        for (int i = 0; i < reports.size(); i++) {
+            ReportTestSuite suite = (ReportTestSuite) reports.get( i );
+            total += suite.getNumberOfTests();
+            errors += suite.getNumberOfErrors();
+            failures += suite.getNumberOfFailures();
+            skipped += suite.getNumberOfSkipped();
+        }
+        ITSuiteResults results = new ITSuiteResults(total, errors, failures, skipped);
+        return results;
+    }
+
+    protected static List extractReports( File testDir )
+    {
+        return extractReports( new File[] { testDir } );
+    }
+    
+    /** Extracts a list of ReportTestSuites from the specified testDirs */
+    protected static List extractReports( File[] testDirs )
+    {
+        SurefireReportParser parser = new SurefireReportParser();
+        File[] reportsDirs = new File[testDirs.length];
+        for ( int i = 0; i < testDirs.length; i++ )
+        {
+            File testDir = testDirs[i];
+            File reportsDir = new File( testDir, "target/surefire-reports" );
+            Assert.assertTrue( "Reports directory is missing: " + reportsDir.getAbsolutePath(), reportsDir.exists() );
+            reportsDirs[i] = reportsDir;
+        }
+        parser.setReportsDirectories( reportsDirs );
+        List reports;
+        try {
+            reports = parser.parseXMLReportFiles();
+        } catch (Exception e) {
+            throw new RuntimeException("Couldn't parse XML reports", e);
+        }
+        return reports;
+    }
+}

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

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ITSuiteResults.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ITSuiteResults.java?rev=637240&r1=637239&r2=637240&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ITSuiteResults.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ITSuiteResults.java Fri Mar 14 13:10:25 2008
@@ -1,55 +1,55 @@
-package org.apache.maven.surefire.its;
-
-public class ITSuiteResults
-{
-    private int total, errors, failures, skipped;
-
-    public ITSuiteResults( int total, int errors, int failures, int skipped )
-    {
-        this.total = total;
-        this.errors = errors;
-        this.failures = failures;
-        this.skipped = skipped;
-    }
-
-    public int getTotal()
-    {
-        return total;
-    }
-
-    public void setTotal( int total )
-    {
-        this.total = total;
-    }
-
-    public int getErrors()
-    {
-        return errors;
-    }
-
-    public void setErrors( int errors )
-    {
-        this.errors = errors;
-    }
-
-    public int getFailures()
-    {
-        return failures;
-    }
-
-    public void setFailures( int failures )
-    {
-        this.failures = failures;
-    }
-
-    public int getSkipped()
-    {
-        return skipped;
-    }
-
-    public void setSkipped( int skipped )
-    {
-        this.skipped = skipped;
-    }
-    
-}
+package org.apache.maven.surefire.its;
+
+public class ITSuiteResults
+{
+    private int total, errors, failures, skipped;
+
+    public ITSuiteResults( int total, int errors, int failures, int skipped )
+    {
+        this.total = total;
+        this.errors = errors;
+        this.failures = failures;
+        this.skipped = skipped;
+    }
+
+    public int getTotal()
+    {
+        return total;
+    }
+
+    public void setTotal( int total )
+    {
+        this.total = total;
+    }
+
+    public int getErrors()
+    {
+        return errors;
+    }
+
+    public void setErrors( int errors )
+    {
+        this.errors = errors;
+    }
+
+    public int getFailures()
+    {
+        return failures;
+    }
+
+    public void setFailures( int failures )
+    {
+        this.failures = failures;
+    }
+
+    public int getSkipped()
+    {
+        return skipped;
+    }
+
+    public void setSkipped( int skipped )
+    {
+        this.skipped = skipped;
+    }
+    
+}

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

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44Dep.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44Dep.java?rev=637240&r1=637239&r2=637240&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44Dep.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44Dep.java Fri Mar 14 13:10:25 2008
@@ -1,31 +1,31 @@
-package org.apache.maven.surefire.its;
-
-
-import junit.framework.TestCase;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-
-/**
- * Test project using JUnit4.4 -dep.  junit-dep includes only junit.* classes, and depends explicitly on hamcrest-core
- * 
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * 
- */
-public class JUnit44Dep
-    extends TestCase
-{
-    public void testJUnit44Dep ()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/junit44-dep" );
-
-        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        verifier.executeGoal( "test" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-        
-        HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );
-    }
-}
+package org.apache.maven.surefire.its;
+
+
+import junit.framework.TestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+
+/**
+ * Test project using JUnit4.4 -dep.  junit-dep includes only junit.* classes, and depends explicitly on hamcrest-core
+ * 
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * 
+ */
+public class JUnit44Dep
+    extends TestCase
+{
+    public void testJUnit44Dep ()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/junit44-dep" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.executeGoal( "test" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+        
+        HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );
+    }
+}

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

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsTest.java?rev=637240&r1=637239&r2=637240&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsTest.java Fri Mar 14 13:10:25 2008
@@ -1,70 +1,70 @@
-package org.apache.maven.surefire.its;
-
-
-import junit.framework.TestCase;
-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;
-
-/**
- * Basic suite test using all known versions of JUnit 4.x
- * 
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * 
- */
-public class Junit4VersionsTest
-    extends TestCase
-{
-    
-    public void test40 () throws Exception
-    {
-        runJUnitTest( "4.0" );
-    }
-    
-    public void test41 () throws Exception
-    {
-        runJUnitTest( "4.1" );
-    }
-    
-    public void test42 () throws Exception
-    {
-        runJUnitTest( "4.2" );
-    }
-    
-    public void test43 () throws Exception
-    {
-        runJUnitTest( "4.3" );
-    }
-    
-    public void test431 () throws Exception
-    {
-        runJUnitTest( "4.3.1" );
-    }
-    
-    public void test44 () throws Exception
-    {
-        runJUnitTest( "4.4" );
-    }
-    
-    public void runJUnitTest (String version)
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/junit4" );
-
-        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        List arguments = new ArrayList();
-        arguments.add( "test" );
-        // DGF we have to pass in the version as a command line argument
-        // and NOT as a system property; otherwise our setting will be ignored
-        arguments.add( "-DjunitVersion=" + version );
-        verifier.executeGoals( arguments );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-        
-        ITSuiteResults suite = HelperAssertions.parseTestResults( new File[] { testDir } );
-        HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, suite );
-    }
-}
+package org.apache.maven.surefire.its;
+
+
+import junit.framework.TestCase;
+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;
+
+/**
+ * Basic suite test using all known versions of JUnit 4.x
+ * 
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * 
+ */
+public class Junit4VersionsTest
+    extends TestCase
+{
+    
+    public void test40 () throws Exception
+    {
+        runJUnitTest( "4.0" );
+    }
+    
+    public void test41 () throws Exception
+    {
+        runJUnitTest( "4.1" );
+    }
+    
+    public void test42 () throws Exception
+    {
+        runJUnitTest( "4.2" );
+    }
+    
+    public void test43 () throws Exception
+    {
+        runJUnitTest( "4.3" );
+    }
+    
+    public void test431 () throws Exception
+    {
+        runJUnitTest( "4.3.1" );
+    }
+    
+    public void test44 () throws Exception
+    {
+        runJUnitTest( "4.4" );
+    }
+    
+    public void runJUnitTest (String version)
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/junit4" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        List arguments = new ArrayList();
+        arguments.add( "test" );
+        // DGF we have to pass in the version as a command line argument
+        // and NOT as a system property; otherwise our setting will be ignored
+        arguments.add( "-DjunitVersion=" + version );
+        verifier.executeGoals( arguments );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+        
+        ITSuiteResults suite = HelperAssertions.parseTestResults( new File[] { testDir } );
+        HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, suite );
+    }
+}

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

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictTest.java?rev=637240&r1=637239&r2=637240&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictTest.java Fri Mar 14 13:10:25 2008
@@ -1,48 +1,48 @@
-package org.apache.maven.surefire.its;
-
-
-import junit.framework.TestCase;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-import java.util.ArrayList;
-
-/**
- * Test library using a conflicting version of plexus-utils
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- *
- */
-public class PlexusConflictTest
-    extends TestCase
-{
-    public void testPlexusConflict ()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/plexus-conflict" );
-
-        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        verifier.executeGoal( "test" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );
-    }
-
-    public void testPlexusConflictIsolatedClassLoader ()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/plexus-conflict" );
-
-        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        ArrayList goals = new ArrayList();
-        goals.add( "test" );
-        goals.add( "-Dsurefire.useSystemClassLoader=false" );
-        verifier.executeGoals( goals );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );
-    }
+package org.apache.maven.surefire.its;
+
+
+import junit.framework.TestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+import java.util.ArrayList;
+
+/**
+ * Test library using a conflicting version of plexus-utils
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ *
+ */
+public class PlexusConflictTest
+    extends TestCase
+{
+    public void testPlexusConflict ()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/plexus-conflict" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.executeGoal( "test" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+
+        HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );
+    }
+
+    public void testPlexusConflictIsolatedClassLoader ()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/plexus-conflict" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        ArrayList goals = new ArrayList();
+        goals.add( "test" );
+        goals.add( "-Dsurefire.useSystemClassLoader=false" );
+        verifier.executeGoals( goals );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+
+        HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );
+    }
 }

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

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorTest.java?rev=637240&r1=637239&r2=637240&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorTest.java Fri Mar 14 13:10:25 2008
@@ -1,35 +1,35 @@
-package org.apache.maven.surefire.its;
-
-
-import junit.framework.TestCase;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-
-/**
- * Test aggregator as a sibling to child modules; invokes modules as "../child"
- * 
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * 
- */
-public class SiblingAggregatorTest
-    extends TestCase
-{
-    public void testSiblingAggregator ()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/sibling-aggregator" );
-
-        File aggregatorDir = new File( testDir, "aggregator" );
-        
-        Verifier verifier = new Verifier( aggregatorDir.getAbsolutePath() );
-        verifier.executeGoal( "test" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-        
-        File child2Dir = new File( testDir, "child2" );
-        
-        HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, child2Dir );        
-    }
-}
+package org.apache.maven.surefire.its;
+
+
+import junit.framework.TestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+
+/**
+ * Test aggregator as a sibling to child modules; invokes modules as "../child"
+ * 
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * 
+ */
+public class SiblingAggregatorTest
+    extends TestCase
+{
+    public void testSiblingAggregator ()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/sibling-aggregator" );
+
+        File aggregatorDir = new File( testDir, "aggregator" );
+        
+        Verifier verifier = new Verifier( aggregatorDir.getAbsolutePath() );
+        verifier.executeGoal( "test" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+        
+        File child2Dir = new File( testDir, "child2" );
+        
+        HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, child2Dir );        
+    }
+}

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

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire146ForkPerTestNoSetupTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire146ForkPerTestNoSetupTest.java?rev=637240&r1=637239&r2=637240&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire146ForkPerTestNoSetupTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire146ForkPerTestNoSetupTest.java Fri Mar 14 13:10:25 2008
@@ -1,32 +1,32 @@
-package org.apache.maven.surefire.its;
-
-
-import junit.framework.TestCase;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-
-/**
- * Test Surefire-146 (forkMode=pertest fails to call setUp)
- * 
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * 
- */
-public class Surefire146ForkPerTestNoSetupTest
-    extends TestCase
-{
-    public void testForkPerTestNoSetup ()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/surefire-146-forkPerTestNoSetup" );
-
-        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        verifier.executeGoal( "test" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-        
-        HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );
-        
-    }
-}
+package org.apache.maven.surefire.its;
+
+
+import junit.framework.TestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+
+/**
+ * Test Surefire-146 (forkMode=pertest fails to call setUp)
+ * 
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * 
+ */
+public class Surefire146ForkPerTestNoSetupTest
+    extends TestCase
+{
+    public void testForkPerTestNoSetup ()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/surefire-146-forkPerTestNoSetup" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.executeGoal( "test" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+        
+        HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );
+        
+    }
+}

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

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire162CharsetProviderTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire162CharsetProviderTest.java?rev=637240&r1=637239&r2=637240&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire162CharsetProviderTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire162CharsetProviderTest.java Fri Mar 14 13:10:25 2008
@@ -1,36 +1,36 @@
-package org.apache.maven.surefire.its;
-
-
-import junit.framework.TestCase;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.codehaus.plexus.util.FileUtils;
-
-import java.io.File;
-
-/**
- * Test charset provider (SUREFIRE-162)
- * 
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * 
- */
-public class Surefire162CharsetProviderTest
-    extends TestCase
-{
-    public void testCharsetProvider ()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/surefire-162-charsetProvider" );
-
-        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        File jarFile = new File( verifier.getArtifactPath( "jcharset", "jcharset", "1.2.1", "jar" ) );
-        jarFile.getParentFile().mkdirs();
-        FileUtils.copyFile( new File( testDir, "repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar" ), jarFile );
-        FileUtils.copyFile( new File( testDir, "repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom" ), new File( verifier.getArtifactPath( "jcharset", "jcharset", "1.2.1", "pom" ) ) );
-        verifier.executeGoal( "test" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-        
-        HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );        
-    }
-}
+package org.apache.maven.surefire.its;
+
+
+import junit.framework.TestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+import org.codehaus.plexus.util.FileUtils;
+
+import java.io.File;
+
+/**
+ * Test charset provider (SUREFIRE-162)
+ * 
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * 
+ */
+public class Surefire162CharsetProviderTest
+    extends TestCase
+{
+    public void testCharsetProvider ()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/surefire-162-charsetProvider" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        File jarFile = new File( verifier.getArtifactPath( "jcharset", "jcharset", "1.2.1", "jar" ) );
+        jarFile.getParentFile().mkdirs();
+        FileUtils.copyFile( new File( testDir, "repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.jar" ), jarFile );
+        FileUtils.copyFile( new File( testDir, "repo/jcharset/jcharset/1.2.1/jcharset-1.2.1.pom" ), new File( verifier.getArtifactPath( "jcharset", "jcharset", "1.2.1", "pom" ) ) );
+        verifier.executeGoal( "test" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+        
+        HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );        
+    }
+}

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

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresTest.java?rev=637240&r1=637239&r2=637240&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresTest.java Fri Mar 14 13:10:25 2008
@@ -1,53 +1,53 @@
-package org.apache.maven.surefire.its;
-
-
-import junit.framework.TestCase;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.plugins.surefire.report.ReportTestCase;
-import org.apache.maven.plugins.surefire.report.ReportTestSuite;
-
-import java.io.File;
-import java.util.List;
-
-/**
- * Test Surefire-224 (XML test reports are not well-formed when failure message contains quotes)
- * 
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * 
- */
-public class Surefire224WellFormedXmlFailuresTest
-    extends TestCase
-{
-    public void testWellFormedXmlFailures ()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/surefire-224-wellFormedXmlFailures" );
-
-        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        verifier.executeGoal( "test" );
-        // DGF Don't verify error free log; we expect failures
-        // verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-        
-        HelperAssertions.assertTestSuiteResults( 4, 0, 4, 0, testDir );
-        
-        ReportTestSuite suite = (ReportTestSuite) HelperAssertions.extractReports( (new File[] { testDir }) ).get( 0 );
-        List testCases = suite.getTestCases();
-        assertEquals( "Wrong number of test case objects", 4, testCases.size() );
-        ReportTestCase current, testQuote = null, testLower = null, testGreater = null, testU0000 = null;
-        for ( int i = 0; i < testCases.size(); i++ )
-        {
-            current = (ReportTestCase) testCases.get( i );
-            if ( "testQuote".equals( current.getName() ) ) testQuote = current;
-            else if ( "testLower".equals( current.getName() ) ) testLower = current;
-            else if ( "testGreater".equals( current.getName() ) ) testGreater = current;
-            else if ( "testU0000".equals( current.getName() ) ) testU0000 = current;
-        }
-        assertEquals("Wrong error message", "\"", testQuote.getFailure().get( "message" ) );
-        assertEquals("Wrong error message", "<", testLower.getFailure().get( "message" ) );
-        assertEquals("Wrong error message", ">", testGreater.getFailure().get( "message" ) );
-        // SUREFIRE-456 we have to doubly-escape non-visible control characters like \u0000
-        assertEquals("Wrong error message", "&#0;", testU0000.getFailure().get( "message" ) );
-    }
-}
+package org.apache.maven.surefire.its;
+
+
+import junit.framework.TestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.plugins.surefire.report.ReportTestCase;
+import org.apache.maven.plugins.surefire.report.ReportTestSuite;
+
+import java.io.File;
+import java.util.List;
+
+/**
+ * Test Surefire-224 (XML test reports are not well-formed when failure message contains quotes)
+ * 
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * 
+ */
+public class Surefire224WellFormedXmlFailuresTest
+    extends TestCase
+{
+    public void testWellFormedXmlFailures ()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/surefire-224-wellFormedXmlFailures" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.executeGoal( "test" );
+        // DGF Don't verify error free log; we expect failures
+        // verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+        
+        HelperAssertions.assertTestSuiteResults( 4, 0, 4, 0, testDir );
+        
+        ReportTestSuite suite = (ReportTestSuite) HelperAssertions.extractReports( (new File[] { testDir }) ).get( 0 );
+        List testCases = suite.getTestCases();
+        assertEquals( "Wrong number of test case objects", 4, testCases.size() );
+        ReportTestCase current, testQuote = null, testLower = null, testGreater = null, testU0000 = null;
+        for ( int i = 0; i < testCases.size(); i++ )
+        {
+            current = (ReportTestCase) testCases.get( i );
+            if ( "testQuote".equals( current.getName() ) ) testQuote = current;
+            else if ( "testLower".equals( current.getName() ) ) testLower = current;
+            else if ( "testGreater".equals( current.getName() ) ) testGreater = current;
+            else if ( "testU0000".equals( current.getName() ) ) testU0000 = current;
+        }
+        assertEquals("Wrong error message", "\"", testQuote.getFailure().get( "message" ) );
+        assertEquals("Wrong error message", "<", testLower.getFailure().get( "message" ) );
+        assertEquals("Wrong error message", ">", testGreater.getFailure().get( "message" ) );
+        // SUREFIRE-456 we have to doubly-escape non-visible control characters like \u0000
+        assertEquals("Wrong error message", "&#0;", testU0000.getFailure().get( "message" ) );
+    }
+}

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

Modified: 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/Surefire376TestNgAfterSuiteFailure.java?rev=637240&r1=637239&r2=637240&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/Surefire376TestNgAfterSuiteFailure.java Fri Mar 14 13:10:25 2008
@@ -1,33 +1,33 @@
-package org.apache.maven.surefire.its;
-
-
-import junit.framework.TestCase;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-
-/**
- * Test Surefire-376 (TestNG @AfterSuite failures are ignored)
- * 
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * 
- */
-public class Surefire376TestNgAfterSuiteFailure
-    extends TestCase
-{
-    public void testAfterSuiteFailure ()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/testng-afterSuiteFailure" );
-
-        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        verifier.executeGoal( "test" );
-        // DGF Don't verify error free log; we expect failures
-        // verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-        
-        HelperAssertions.assertTestSuiteResults( 2, 0, 1, 0, testDir );
-        
-    }
-}
+package org.apache.maven.surefire.its;
+
+
+import junit.framework.TestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+
+/**
+ * Test Surefire-376 (TestNG @AfterSuite failures are ignored)
+ * 
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * 
+ */
+public class Surefire376TestNgAfterSuiteFailure
+    extends TestCase
+{
+    public void testAfterSuiteFailure ()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/testng-afterSuiteFailure" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.executeGoal( "test" );
+        // DGF Don't verify error free log; we expect failures
+        // verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+        
+        HelperAssertions.assertTestSuiteResults( 2, 0, 1, 0, testDir );
+        
+    }
+}

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

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire377TestNgAndJUnitTogetherTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire377TestNgAndJUnitTogetherTest.java?rev=637240&r1=637239&r2=637240&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire377TestNgAndJUnitTogetherTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire377TestNgAndJUnitTogetherTest.java Fri Mar 14 13:10:25 2008
@@ -1,31 +1,31 @@
-package org.apache.maven.surefire.its;
-
-
-import junit.framework.TestCase;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-
-/**
- * SUREFIRE-377 (When JUnit and TestNG tests are in same project, only one set gets run).
- * 
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * 
- */
-public class Surefire377TestNgAndJUnitTogetherTest
-    extends TestCase
-{
-    public void testTestNgAndJUnitTogether ()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/testng-junit-together" );
-
-        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        verifier.executeGoal( "test" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-        
-        HelperAssertions.assertTestSuiteResults( 2, 0, 0, 0, testDir );
-    }
-}
+package org.apache.maven.surefire.its;
+
+
+import junit.framework.TestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+
+/**
+ * SUREFIRE-377 (When JUnit and TestNG tests are in same project, only one set gets run).
+ * 
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * 
+ */
+public class Surefire377TestNgAndJUnitTogetherTest
+    extends TestCase
+{
+    public void testTestNgAndJUnitTogether ()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/testng-junit-together" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.executeGoal( "test" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+        
+        HelperAssertions.assertTestSuiteResults( 2, 0, 0, 0, testDir );
+    }
+}

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

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire42NotExtendingTestCase.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire42NotExtendingTestCase.java?rev=637240&r1=637239&r2=637240&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire42NotExtendingTestCase.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire42NotExtendingTestCase.java Fri Mar 14 13:10:25 2008
@@ -1,31 +1,31 @@
-package org.apache.maven.surefire.its;
-
-
-import junit.framework.TestCase;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-
-/**
- * Test JUnit test that contains inner classes
- * 
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * 
- */
-public class Surefire42NotExtendingTestCase
-    extends TestCase
-{
-    public void testInnerClass ()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/junit-notExtendingTestCase" );
-
-        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        verifier.executeGoal( "test" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-        
-        HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );        
-    }
-}
+package org.apache.maven.surefire.its;
+
+
+import junit.framework.TestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+
+/**
+ * Test JUnit test that contains inner classes
+ * 
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * 
+ */
+public class Surefire42NotExtendingTestCase
+    extends TestCase
+{
+    public void testInnerClass ()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/junit-notExtendingTestCase" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.executeGoal( "test" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+        
+        HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );        
+    }
+}

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

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire44InnerClassTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire44InnerClassTest.java?rev=637240&r1=637239&r2=637240&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire44InnerClassTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire44InnerClassTest.java Fri Mar 14 13:10:25 2008
@@ -1,31 +1,31 @@
-package org.apache.maven.surefire.its;
-
-
-import junit.framework.TestCase;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-
-/**
- * Test JUnit test that contains inner classes
- * 
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * 
- */
-public class Surefire44InnerClassTest
-    extends TestCase
-{
-    public void testInnerClass ()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/junit-innerClass" );
-
-        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        verifier.executeGoal( "test" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-        
-        HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );        
-    }
-}
+package org.apache.maven.surefire.its;
+
+
+import junit.framework.TestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+
+/**
+ * Test JUnit test that contains inner classes
+ * 
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * 
+ */
+public class Surefire44InnerClassTest
+    extends TestCase
+{
+    public void testInnerClass ()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/junit-innerClass" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.executeGoal( "test" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+        
+        HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );        
+    }
+}

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

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTest.java?rev=637240&r1=637239&r2=637240&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTest.java Fri Mar 14 13:10:25 2008
@@ -1,54 +1,54 @@
-package org.apache.maven.surefire.its;
-
-
-import junit.framework.TestCase;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-import java.util.ArrayList;
-
-/**
- * Test system properties
- * 
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * 
- */
-public class SystemPropertiesTest
-    extends TestCase
-{
-    public void testSystemProperties ()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/system-properties" );
-
-        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        ArrayList goals = new ArrayList();
-        goals.add( "test" );
-        goals.add( "-DsetOnMavenCommandLine=baz" );
-        verifier.executeGoals( goals );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-        
-        HelperAssertions.assertTestSuiteResults( 3, 0, 0, 0, testDir );        
-    }
-    
-    public void testSystemPropertiesNoFork()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/system-properties" );
-
-        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        ArrayList goals = new ArrayList();
-        goals.add( "test" );
-        goals.add( "-DforkMode=never" );
-        goals.add( "-DsetOnMavenCommandLine=baz" );
-        // DGF fake the argLine, since we're not forking
-        goals.add( "-DsetOnArgLine=bar" );
-        verifier.executeGoals( goals );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        HelperAssertions.assertTestSuiteResults( 3, 0, 0, 0, testDir );
-    }
-}
+package org.apache.maven.surefire.its;
+
+
+import junit.framework.TestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+import java.util.ArrayList;
+
+/**
+ * Test system properties
+ * 
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * 
+ */
+public class SystemPropertiesTest
+    extends TestCase
+{
+    public void testSystemProperties ()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/system-properties" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        ArrayList goals = new ArrayList();
+        goals.add( "test" );
+        goals.add( "-DsetOnMavenCommandLine=baz" );
+        verifier.executeGoals( goals );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+        
+        HelperAssertions.assertTestSuiteResults( 3, 0, 0, 0, testDir );        
+    }
+    
+    public void testSystemPropertiesNoFork()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/system-properties" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        ArrayList goals = new ArrayList();
+        goals.add( "test" );
+        goals.add( "-DforkMode=never" );
+        goals.add( "-DsetOnMavenCommandLine=baz" );
+        // DGF fake the argLine, since we're not forking
+        goals.add( "-DsetOnArgLine=bar" );
+        verifier.executeGoals( goals );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+
+        HelperAssertions.assertTestSuiteResults( 3, 0, 0, 0, testDir );
+    }
+}

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

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTests.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTests.java?rev=637240&r1=637239&r2=637240&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTests.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTests.java Fri Mar 14 13:10:25 2008
@@ -1,64 +1,64 @@
-package org.apache.maven.surefire.its;
-
-
-import junit.framework.TestCase;
-import org.apache.maven.it.VerificationException;
-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 failIfNoTests
- * 
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * 
- */
-public class TestFailIfNoTests
-    extends TestCase
-{
-    public void testFailIfNoTests ()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/default-configuration-noTests" );
-
-        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        List goals = new ArrayList();
-        goals.add( "test" );
-        goals.add( "-DfailIfNoTests" );
-
-        try
-        {
-            verifier.executeGoals( goals );
-            verifier.resetStreams();
-            verifier.verifyErrorFreeLog();
-            fail( "Build didn't fail, but it should" );
-        }
-        catch ( VerificationException e )
-        {
-            // as expected
-        }
-        finally
-        {
-            verifier.resetStreams();
-        }
-                
-    }
-    
-    public void testDontFailIfNoTests()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/default-configuration-noTests" );
-
-        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        verifier.executeGoal( "test" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-
-        File reportsDir = new File( testDir, "target/surefire-reports" );
-        assertFalse ( "Unexpected reports directory", reportsDir.exists() );
-    }
-
-}
+package org.apache.maven.surefire.its;
+
+
+import junit.framework.TestCase;
+import org.apache.maven.it.VerificationException;
+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 failIfNoTests
+ * 
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * 
+ */
+public class TestFailIfNoTests
+    extends TestCase
+{
+    public void testFailIfNoTests ()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/default-configuration-noTests" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        List goals = new ArrayList();
+        goals.add( "test" );
+        goals.add( "-DfailIfNoTests" );
+
+        try
+        {
+            verifier.executeGoals( goals );
+            verifier.resetStreams();
+            verifier.verifyErrorFreeLog();
+            fail( "Build didn't fail, but it should" );
+        }
+        catch ( VerificationException e )
+        {
+            // as expected
+        }
+        finally
+        {
+            verifier.resetStreams();
+        }
+                
+    }
+    
+    public void testDontFailIfNoTests()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/default-configuration-noTests" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.executeGoal( "test" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+
+        File reportsDir = new File( testDir, "target/surefire-reports" );
+        assertFalse ( "Unexpected reports directory", reportsDir.exists() );
+    }
+
+}

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

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTestsForkMode.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTestsForkMode.java?rev=637240&r1=637239&r2=637240&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTestsForkMode.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestFailIfNoTestsForkMode.java Fri Mar 14 13:10:25 2008
@@ -1,85 +1,85 @@
-package org.apache.maven.surefire.its;
-
-
-import junit.framework.TestCase;
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.reporting.MavenReportException;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Test failIfNoTests with various forkModes.
- * 
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * 
- */
-public class TestFailIfNoTestsForkMode
-    extends TestCase
-{
-    public void testFailIfNoTestsForkModeAlways () throws Exception
-    {
-        doTest("always", true);
-    }
-    
-    public void testFailIfNoTestsForkModeNever() throws Exception 
-    {
-        doTest( "never", true );
-    }
-    
-    public void testFailIfNoTestsForkModeOnce() throws Exception 
-    {
-        doTest( "once", true );
-    }
-    
-    public void testDontFailIfNoTestsForkModeAlways () throws Exception
-    {
-        doTest("always", false);
-    }
-    
-    public void testDontFailIfNoTestsForkModeNever() throws Exception 
-    {
-        doTest( "never", false );
-    }
-    
-    public void testDontFailIfNoTestsForkModeOnce() throws Exception 
-    {
-        doTest( "once", false );
-    }
-    
-    private void doTest(String forkMode, boolean failIfNoTests)
-        throws IOException, VerificationException, MavenReportException
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/default-configuration-classWithNoTests" );
-
-        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        List goals = new ArrayList();
-        goals.add( "test" );
-        goals.add( "-DforkMode=" + forkMode );
-        goals.add( "-DfailIfNoTests=" + failIfNoTests );
-        if (failIfNoTests)
-        {
-            try 
-            {
-                verifier.executeGoals( goals );
-                verifier.resetStreams();
-                verifier.verifyErrorFreeLog();
-                fail( "Build did not fail, but it should have" );
-            } catch (VerificationException e )
-            {
-                // this is what we expected
-            }
-        }
-        else
-        {
-            verifier.executeGoals( goals );
-            verifier.resetStreams();
-            verifier.verifyErrorFreeLog();
-            HelperAssertions.assertTestSuiteResults( 0, 0, 0, 0, testDir );
-        }
-    }
-}
+package org.apache.maven.surefire.its;
+
+
+import junit.framework.TestCase;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.reporting.MavenReportException;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Test failIfNoTests with various forkModes.
+ * 
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * 
+ */
+public class TestFailIfNoTestsForkMode
+    extends TestCase
+{
+    public void testFailIfNoTestsForkModeAlways () throws Exception
+    {
+        doTest("always", true);
+    }
+    
+    public void testFailIfNoTestsForkModeNever() throws Exception 
+    {
+        doTest( "never", true );
+    }
+    
+    public void testFailIfNoTestsForkModeOnce() throws Exception 
+    {
+        doTest( "once", true );
+    }
+    
+    public void testDontFailIfNoTestsForkModeAlways () throws Exception
+    {
+        doTest("always", false);
+    }
+    
+    public void testDontFailIfNoTestsForkModeNever() throws Exception 
+    {
+        doTest( "never", false );
+    }
+    
+    public void testDontFailIfNoTestsForkModeOnce() throws Exception 
+    {
+        doTest( "once", false );
+    }
+    
+    private void doTest(String forkMode, boolean failIfNoTests)
+        throws IOException, VerificationException, MavenReportException
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/default-configuration-classWithNoTests" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        List goals = new ArrayList();
+        goals.add( "test" );
+        goals.add( "-DforkMode=" + forkMode );
+        goals.add( "-DfailIfNoTests=" + failIfNoTests );
+        if (failIfNoTests)
+        {
+            try 
+            {
+                verifier.executeGoals( goals );
+                verifier.resetStreams();
+                verifier.verifyErrorFreeLog();
+                fail( "Build did not fail, but it should have" );
+            } catch (VerificationException e )
+            {
+                // this is what we expected
+            }
+        }
+        else
+        {
+            verifier.executeGoals( goals );
+            verifier.resetStreams();
+            verifier.verifyErrorFreeLog();
+            HelperAssertions.assertTestSuiteResults( 0, 0, 0, 0, testDir );
+        }
+    }
+}

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

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44Hamcrest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44Hamcrest.java?rev=637240&r1=637239&r2=637240&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44Hamcrest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit44Hamcrest.java Fri Mar 14 13:10:25 2008
@@ -1,31 +1,31 @@
-package org.apache.maven.surefire.its;
-
-
-import junit.framework.TestCase;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-
-/**
- * Test project using JUnit4.4 (including Hamcrest extensions)
- * 
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * 
- */
-public class TestJUnit44Hamcrest
-    extends TestCase
-{
-    public void testJUnit44Hamcrest ()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/junit44-hamcrest" );
-
-        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        verifier.executeGoal( "test" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-        
-        HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );
-    }
-}
+package org.apache.maven.surefire.its;
+
+
+import junit.framework.TestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+
+/**
+ * Test project using JUnit4.4 (including Hamcrest extensions)
+ * 
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * 
+ */
+public class TestJUnit44Hamcrest
+    extends TestCase
+{
+    public void testJUnit44Hamcrest ()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/junit44-hamcrest" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.executeGoal( "test" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+        
+        HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );
+    }
+}

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

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJunit4Ignore.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJunit4Ignore.java?rev=637240&r1=637239&r2=637240&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJunit4Ignore.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJunit4Ignore.java Fri Mar 14 13:10:25 2008
@@ -1,31 +1,31 @@
-package org.apache.maven.surefire.its;
-
-
-import junit.framework.TestCase;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-
-/**
- * Test JUnit 4 tests marked with "Ignore" attribute 
- * 
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * 
- */
-public class TestJunit4Ignore
-    extends TestCase
-{
-    public void testJunit4Ignore ()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/junit44-ignore" );
-
-        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        verifier.executeGoal( "test" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-        
-        HelperAssertions.assertTestSuiteResults( 1, 0, 0, 1, testDir );        
-    }
-}
+package org.apache.maven.surefire.its;
+
+
+import junit.framework.TestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+
+/**
+ * Test JUnit 4 tests marked with "Ignore" attribute 
+ * 
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * 
+ */
+public class TestJunit4Ignore
+    extends TestCase
+{
+    public void testJunit4Ignore ()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/junit44-ignore" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.executeGoal( "test" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+        
+        HelperAssertions.assertTestSuiteResults( 1, 0, 0, 1, testDir );        
+    }
+}

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

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethod.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethod.java?rev=637240&r1=637239&r2=637240&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethod.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethod.java Fri Mar 14 13:10:25 2008
@@ -1,31 +1,31 @@
-package org.apache.maven.surefire.its;
-
-
-import junit.framework.TestCase;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-
-/**
- * Test @BeforeMethod annotation on TestNg suite
- * 
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * 
- */
-public class TestNgBeforeMethod
-    extends TestCase
-{
-    public void testTestNgBeforeMethod ()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/testng-beforeMethod" );
-
-        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        verifier.executeGoal( "test" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-        
-        HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );
-    }
-}
+package org.apache.maven.surefire.its;
+
+
+import junit.framework.TestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+
+/**
+ * Test @BeforeMethod annotation on TestNg suite
+ * 
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * 
+ */
+public class TestNgBeforeMethod
+    extends TestCase
+{
+    public void testTestNgBeforeMethod ()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/testng-beforeMethod" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.executeGoal( "test" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+        
+        HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );
+    }
+}

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

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java?rev=637240&r1=637239&r2=637240&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgBeforeMethodFailure.java Fri Mar 14 13:10:25 2008
@@ -1,44 +1,44 @@
-package org.apache.maven.surefire.its;
-
-
-import junit.framework.TestCase;
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-
-/**
- * Test failures in @BeforeMethod annotation on TestNg suite
- * 
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * 
- */
-public class TestNgBeforeMethodFailure
-    extends TestCase
-{
-    public void testTestNgBeforeMethodFailure ()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/testng-beforeMethodFailure" );
-
-        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        try
-        {
-            verifier.executeGoal( "test" );
-            verifier.resetStreams();
-            verifier.verifyErrorFreeLog();
-            fail( "Build didn't fail, but it should" );
-        }
-        catch ( VerificationException e )
-        {
-            // as expected
-        }
-        finally
-        {
-            verifier.resetStreams();
-        }
-        
-        HelperAssertions.assertTestSuiteResults( 2, 0, 1, 1, testDir );
-    }
-}
+package org.apache.maven.surefire.its;
+
+
+import junit.framework.TestCase;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+
+/**
+ * Test failures in @BeforeMethod annotation on TestNg suite
+ * 
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * 
+ */
+public class TestNgBeforeMethodFailure
+    extends TestCase
+{
+    public void testTestNgBeforeMethodFailure ()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/testng-beforeMethodFailure" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        try
+        {
+            verifier.executeGoal( "test" );
+            verifier.resetStreams();
+            verifier.verifyErrorFreeLog();
+            fail( "Build didn't fail, but it should" );
+        }
+        catch ( VerificationException e )
+        {
+            // as expected
+        }
+        finally
+        {
+            verifier.resetStreams();
+        }
+        
+        HelperAssertions.assertTestSuiteResults( 2, 0, 1, 1, testDir );
+    }
+}

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

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgExecuteErrorTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgExecuteErrorTest.java?rev=637240&r1=637239&r2=637240&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgExecuteErrorTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgExecuteErrorTest.java Fri Mar 14 13:10:25 2008
@@ -1,33 +1,33 @@
-package org.apache.maven.surefire.its;
-
-
-import junit.framework.TestCase;
-
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-
-/**
- * Test for checking that the output from a forked suite is properly captured even if the suite encounters a severe error.
- * 
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * 
- */
-public class TestNgExecuteErrorTest
-    extends TestCase
-{
-    public void testExecuteError()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/testng-execute-error" );
-
-        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        try {
-            verifier.executeGoal( "test" );
-        } catch (VerificationException e) {} // expected 
-        verifier.resetStreams();
-        assertTrue( new File( testDir, "target/surefire-reports/TestSuite-output.txt" ).length() > 0 );
-    }
-}
+package org.apache.maven.surefire.its;
+
+
+import junit.framework.TestCase;
+
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+
+/**
+ * Test for checking that the output from a forked suite is properly captured even if the suite encounters a severe error.
+ * 
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * 
+ */
+public class TestNgExecuteErrorTest
+    extends TestCase
+{
+    public void testExecuteError()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/testng-execute-error" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        try {
+            verifier.executeGoal( "test" );
+        } catch (VerificationException e) {} // expected 
+        verifier.resetStreams();
+        assertTrue( new File( testDir, "target/surefire-reports/TestSuite-output.txt" ).length() > 0 );
+    }
+}

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

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupThreadParallel.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupThreadParallel.java?rev=637240&r1=637239&r2=637240&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupThreadParallel.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupThreadParallel.java Fri Mar 14 13:10:25 2008
@@ -1,32 +1,32 @@
-package org.apache.maven.surefire.its;
-
-
-import junit.framework.TestCase;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-
-/**
- * Test TestNG groups, together with TestNG parallelism
- * 
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- * 
- */
-public class TestNgGroupThreadParallel
-    extends TestCase
-{
-    public void testTestNgGroupThreadParallel ()
-        throws Exception
-    {
-        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/testng-group-thread-parallel" );
-
-        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        verifier.executeGoal( "test" );
-        verifier.verifyErrorFreeLog();
-        verifier.resetStreams();
-        
-        HelperAssertions.assertTestSuiteResults( 3, 0, 0, 0, testDir );
-        
-    }
-}
+package org.apache.maven.surefire.its;
+
+
+import junit.framework.TestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+
+/**
+ * Test TestNG groups, together with TestNG parallelism
+ * 
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ * 
+ */
+public class TestNgGroupThreadParallel
+    extends TestCase
+{
+    public void testTestNgGroupThreadParallel ()
+        throws Exception
+    {
+        File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/testng-group-thread-parallel" );
+
+        Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.executeGoal( "test" );
+        verifier.verifyErrorFreeLog();
+        verifier.resetStreams();
+        
+        HelperAssertions.assertTestSuiteResults( 3, 0, 0, 0, testDir );
+        
+    }
+}