maven-surefire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krosenv...@apache.org
Subject svn commit: r1060976 - in /maven/surefire/trunk: maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ surefire-integration-tests/src/test/resources/...
Date Wed, 19 Jan 2011 20:38:20 GMT
Author: krosenvold
Date: Wed Jan 19 20:38:18 2011
New Revision: 1060976

URL: http://svn.apache.org/viewvc?rev=1060976&view=rev
Log:
[SUREFIRE-570] Empty reports with multiple report directories

Patch by Thomas Sauzedde. Applied with heavy modifications, including adding IT.

Added:
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire570MultipleReportDirectoriesIT.java
      - copied, changed from r1060396, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire500PuzzlingErrorIT.java
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/pom.xml   (with props)
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/main/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/main/java/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/main/java/org/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/main/java/org/apache/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/main/java/org/apache/maven/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/main/java/org/apache/maven/surefire570/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/main/java/org/apache/maven/surefire570/MyModule1Class.java   (with props)
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/java/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/java/org/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/java/org/apache/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/java/org/apache/maven/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/java/org/apache/maven/surefire570/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/java/org/apache/maven/surefire570/MyModule1ClassTest.java   (with props)
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml   (with props)
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt   (with props)
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/pom.xml   (with props)
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/main/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/main/java/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/main/java/org/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/main/java/org/apache/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/main/java/org/apache/maven/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/main/java/org/apache/maven/surefire570/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/main/java/org/apache/maven/surefire570/module2/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/main/java/org/apache/maven/surefire570/module2/MyModule2Class.java   (with props)
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/java/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/java/org/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/java/org/apache/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/java/org/apache/maven/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/java/org/apache/maven/surefire570/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/java/org/apache/maven/surefire570/module2/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/java/org/apache/maven/surefire570/module2/MyModule2ClassTest.java   (with props)
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml   (with props)
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt   (with props)
    maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml   (with props)
Modified:
    maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
    maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
    maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/HelperAssertions.java
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire500PuzzlingErrorIT.java
    maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java

Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java?rev=1060976&r1=1060975&r2=1060976&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java Wed Jan 19 20:38:18 2011
@@ -22,7 +22,6 @@ package org.apache.maven.plugins.surefir
 import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.reporting.MavenReportException;
 
-import java.io.File;
 import java.text.NumberFormat;
 import java.util.Iterator;
 import java.util.List;
@@ -45,7 +44,7 @@ public class SurefireReportGenerator
 
     private String xrefLocation;
 
-    public SurefireReportGenerator( File[] reportsDirectories, Locale locale, boolean showSuccess, String xrefLocation )
+    public SurefireReportGenerator( List reportsDirectories, Locale locale, boolean showSuccess, String xrefLocation )
     {
         report = new SurefireReportParser( reportsDirectories, locale );
 

Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java?rev=1060976&r1=1060975&r2=1060976&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java Wed Jan 19 20:38:18 2011
@@ -21,6 +21,8 @@ package org.apache.maven.plugins.surefir
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
@@ -86,8 +88,8 @@ public class SurefireReportMojo
     /**
      * (Deprecated, use reportsDirectories) This directory contains the XML Report files that will be parsed and rendered to HTML format.
      *
-     * @deprecated
      * @parameter
+     * @deprecated
      */
     private File reportsDirectory;
 
@@ -129,57 +131,97 @@ public class SurefireReportMojo
      */
     private boolean aggregate;
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public void executeReport( Locale locale )
         throws MavenReportException
     {
+        final List reportsDirectoryList = new ArrayList();
+
         if ( reportsDirectory != null )
         {
-            if ( reportsDirectories == null )
+            if ( reportsDirectories != null )
             {
-                reportsDirectories = new File[] { reportsDirectory };
-            }
-            else
-            {
-                File[] oldReports = reportsDirectories;
-                reportsDirectories = new File[oldReports.length+1];
-                System.arraycopy( oldReports, 0, reportsDirectories, 0, oldReports.length );
-                reportsDirectories[oldReports.length] = reportsDirectory;
+                reportsDirectoryList.addAll( Arrays.asList( reportsDirectories ) );
             }
+            reportsDirectoryList.add( reportsDirectory );
         }
         if ( aggregate )
         {
-            if ( !project.isExecutionRoot() ) return;
+            if ( !project.isExecutionRoot() )
+            {
+                return;
+            }
             if ( reportsDirectories == null )
             {
-                ArrayList reportsDirectoryList = new ArrayList();
-                // TODO guess the real location
-                for (Iterator i = reactorProjects.iterator(); i.hasNext();)
+                for ( Iterator i = getProjectsWithoutRoot().iterator(); i.hasNext(); )
+                {
+                    reportsDirectoryList.add( getSurefireReportsDirectory( (MavenProject) i.next() ) );
+                }
+            }
+            else
+            {
+                // Multiple report directories are configured.
+                // Let's see if those directories exist in each sub-module to fix SUREFIRE-570
+                String parentBaseDir = getProject().getBasedir().getAbsolutePath();
+                for ( Iterator i = getProjectsWithoutRoot().iterator(); i.hasNext(); )
                 {
                     MavenProject subProject = (MavenProject) i.next();
-                    if ( project.equals( subProject ) ) continue;
-                    String buildDir = subProject.getBuild().getDirectory();
-                    File reportsDirectory = new File( buildDir + "/surefire-reports" );
-                    reportsDirectoryList.add( reportsDirectory );
+                    String moduleBaseDir = subProject.getBasedir().getAbsolutePath();
+                    for ( int d = 0; d < reportsDirectories.length; d++ )
+                    {
+                        String reportDir = reportsDirectories[d].getPath();
+                        if ( reportDir.startsWith( parentBaseDir ) )
+                        {
+                            reportDir = reportDir.substring( parentBaseDir.length() );
+                        }
+                        File reportsDirectory = new File( moduleBaseDir, reportDir );
+                        if ( reportsDirectory.exists() && reportsDirectory.isDirectory() )
+                        {
+                            getLog().debug( "Adding report dir : " + moduleBaseDir + reportDir );
+                            reportsDirectoryList.add( reportsDirectory );
+                        }
+                    }
                 }
-                reportsDirectories = (File[]) reportsDirectoryList.toArray( new File[0] );
             }
         }
         else
         {
-            if ( reportsDirectories == null )
+            if ( reportsDirectoryList.size() == 0 )
             {
-                reportsDirectories = new File[] { new File( project.getBuild().getDirectory() + "/surefire-reports" ) };
+
+                reportsDirectoryList.add( getSurefireReportsDirectory( project ) );
             }
         }
 
-
         SurefireReportGenerator report =
-            new SurefireReportGenerator( reportsDirectories, locale, showSuccess, determineXrefLocation() );
+            new SurefireReportGenerator( reportsDirectoryList, locale, showSuccess, determineXrefLocation() );
 
         report.doGenerateReport( getBundle( locale ), getSink() );
     }
 
+    private File getSurefireReportsDirectory( MavenProject subProject )
+    {
+        String buildDir = subProject.getBuild().getDirectory();
+        return new File( buildDir + "/surefire-reports" );
+    }
+
+    private List getProjectsWithoutRoot()
+    {
+        List result = new ArrayList();
+        for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
+        {
+            MavenProject subProject = (MavenProject) i.next();
+            if ( !project.equals( subProject ) )
+            {
+                result.add( subProject );
+            }
+        }
+        return result;
+
+    }
+
     private String determineXrefLocation()
     {
         String location = null;
@@ -220,37 +262,49 @@ public class SurefireReportMojo
         return location;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public String getName( Locale locale )
     {
         return getBundle( locale ).getString( "report.surefire.name" );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public String getDescription( Locale locale )
     {
         return getBundle( locale ).getString( "report.surefire.description" );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     protected Renderer getSiteRenderer()
     {
         return siteRenderer;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     protected MavenProject getProject()
     {
         return project;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public String getOutputName()
     {
         return outputName;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     protected String getOutputDirectory()
     {
         return outputDirectory.getAbsolutePath();

Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java?rev=1060976&r1=1060975&r2=1060976&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java Wed Jan 19 20:38:18 2011
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.ListIterator;
@@ -44,7 +45,7 @@ public class SurefireReportParser
 {
     private NumberFormat numberFormat = NumberFormat.getInstance();
 
-    private File[] reportsDirectories;
+    private List reportsDirectories;
 
     private List testSuites = new ArrayList();
 
@@ -54,9 +55,9 @@ public class SurefireReportParser
     {
     }
 
-    public SurefireReportParser( File[] reportsDirectories, Locale locale )
+    public SurefireReportParser( List reportsDirectoriesFiles , Locale locale )
     {
-        this.reportsDirectories = reportsDirectories;
+        this.reportsDirectories = reportsDirectoriesFiles;
 
         setLocale( locale );
     }
@@ -65,9 +66,9 @@ public class SurefireReportParser
         throws MavenReportException
     {
         List xmlReportFileList = new ArrayList();
-        for ( int i = 0; i < reportsDirectories.length; i++ )
+        for ( int i = 0; i < reportsDirectories.size(); i++ )
         {
-            File reportsDirectory = reportsDirectories[i];
+            File reportsDirectory = (File) reportsDirectories.get(i);
             if ( !reportsDirectory.exists() )
             {
                 continue;
@@ -177,17 +178,7 @@ public class SurefireReportParser
 
     public void setReportsDirectory( File reportsDirectory )
     {
-        this.reportsDirectories = new File[] { reportsDirectory };
-    }
-
-    public void setReportsDirectories( File[] reportsDirectories )
-    {
-        this.reportsDirectories = reportsDirectories;
-    }
-
-    public File[] getReportsDirectories()
-    {
-        return this.reportsDirectories;
+        this.reportsDirectories = Collections.singletonList( reportsDirectory );
     }
 
     public final void setLocale( Locale locale )

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=1060976&r1=1060975&r2=1060976&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 Wed Jan 19 20:38:18 2011
@@ -18,13 +18,16 @@ package org.apache.maven.surefire.its;
  * under the License.
  */
 
-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.ArrayList;
 import java.util.List;
+import java.util.Locale;
+
+import junit.framework.Assert;
 
 public class HelperAssertions
 {
@@ -90,16 +93,15 @@ public class HelperAssertions
      */
     protected static List extractReports( File[] testDirs )
     {
-        SurefireReportParser parser = new SurefireReportParser();
-        File[] reportsDirs = new File[testDirs.length];
+        List reportsDirs = new ArrayList();
         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;
+            reportsDirs.add( reportsDir);
         }
-        parser.setReportsDirectories( reportsDirs );
+        SurefireReportParser parser = new SurefireReportParser(reportsDirs, Locale.getDefault());
         List reports;
         try
         {

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire500PuzzlingErrorIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire500PuzzlingErrorIT.java?rev=1060976&r1=1060975&r2=1060976&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire500PuzzlingErrorIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire500PuzzlingErrorIT.java Wed Jan 19 20:38:18 2011
@@ -23,6 +23,7 @@ import java.io.File;
 import java.util.List;
 
 import junit.framework.Assert;
+import org.apache.maven.it.VerificationException;
 
 /**
  * SUREFIRE-500 Asserts correct error handling for the "odd" surefire-500 (and 625) issues.
@@ -42,17 +43,9 @@ public class Surefire500PuzzlingErrorIT
     {
         failNever();
         executeTest();
-        final File surefireReportsFile = getSurefireReportsFile( "surefire500.ExplodingTest.txt" );
 
-        final List<String> list = getVerifier().loadFile( surefireReportsFile, false );
-        for ( String line : list )
-        {
-
-            if ( line.contains( "java.lang.NoClassDefFoundError: whoops!" ) )
-            {
-                return;
-            }
-        }
-        Assert.fail( "Did not find expected message in log" );
+        File surefireReportsFile = getSurefireReportsFile( "surefire500.ExplodingTest.txt" );
+        assertContainsText( surefireReportsFile, "java.lang.NoClassDefFoundError: whoops!" );
     }
+
 }
\ No newline at end of file

Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire570MultipleReportDirectoriesIT.java (from r1060396, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire500PuzzlingErrorIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire570MultipleReportDirectoriesIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire570MultipleReportDirectoriesIT.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire500PuzzlingErrorIT.java&r1=1060396&r2=1060976&rev=1060976&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire500PuzzlingErrorIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire570MultipleReportDirectoriesIT.java Wed Jan 19 20:38:18 2011
@@ -20,39 +20,35 @@ package org.apache.maven.surefire.its;
 
 
 import java.io.File;
-import java.util.List;
-
-import junit.framework.Assert;
 
 /**
- * SUREFIRE-500 Asserts correct error handling for the "odd" surefire-500 (and 625) issues.
+ * Test Surefire-570 Multiple report directories
  *
  * @author Kristian Rosenvold
  */
-public class Surefire500PuzzlingErrorIT
+public class Surefire570MultipleReportDirectoriesIT
     extends SurefireVerifierTestClass
 {
-    public Surefire500PuzzlingErrorIT()
+
+    public Surefire570MultipleReportDirectoriesIT()
     {
-        super( "/surefire-500-puzzling-error" );
+        super( "/surefire-570-multipleReportDirectories" );
     }
 
-    public void testBuildFailingWhenErrors()
+    public void testForkPerTestNoSetup()
         throws Exception
     {
+
         failNever();
-        executeTest();
-        final File surefireReportsFile = getSurefireReportsFile( "surefire500.ExplodingTest.txt" );
+        executeTest(); // Hmm. This shouldn't be necessary but is another bug
+
+        reset();
 
-        final List<String> list = getVerifier().loadFile( surefireReportsFile, false );
-        for ( String line : list )
-        {
-
-            if ( line.contains( "java.lang.NoClassDefFoundError: whoops!" ) )
-            {
-                return;
-            }
-        }
-        Assert.fail( "Did not find expected message in log" );
+        addGoal( "-Daggregate=true" );
+        execute( "surefire-report:report" );
+        File siteFile = getSiteFile( "surefire-report.html" );
+        assertContainsText( siteFile, "MyModule1ClassTest" );
+        assertContainsText( siteFile, "MyModule2ClassTest" );
+        assertContainsText( siteFile, "MyDummyClassTest" );
     }
-}
\ No newline at end of file
+}

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=1060976&r1=1060975&r2=1060976&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 Wed Jan 19 20:38:18 2011
@@ -19,6 +19,7 @@ package org.apache.maven.surefire.its;
  * under the License.
  */
 
+import junit.framework.Assert;
 import junit.framework.TestCase;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
@@ -40,9 +41,7 @@ import java.util.List;
  *
  * @author Kristian Rosenvold
  */
-public abstract class SurefireVerifierTestClass
-    extends TestCase
-{
+public abstract class SurefireVerifierTestClass extends TestCase {
     private final File testDir;
 
     private final List<String> cliOptions = new ArrayList<String>();
@@ -51,77 +50,64 @@ public abstract class SurefireVerifierTe
 
     private final Verifier verifier;
 
-    private final String testNgVersion = System.getProperty( "testng.version" );
+    private final String testNgVersion = System.getProperty("testng.version");
 
-    private final String surefireVersion = System.getProperty( "surefire.version" );
+    private final String surefireVersion = System.getProperty("surefire.version");
 
 
-
-    protected SurefireVerifierTestClass( String testProject )
-    {
-        try
-        {
-            testDir = ResourceExtractor.simpleExtractResources( getClass(), testProject );
+    protected SurefireVerifierTestClass(String testProject) {
+        try {
+            testDir = ResourceExtractor.simpleExtractResources(getClass(), testProject);
             this.goals = getInitialGoals();
-            this.verifier = new Verifier( testDir.getAbsolutePath() );
-        }
-        catch ( VerificationException e )
-        {
-            throw new RuntimeException( e );
-        }
-        catch ( IOException e )
-        {
-            throw new RuntimeException( e );
+            this.verifier = new Verifier(testDir.getAbsolutePath());
+        } catch (VerificationException e) {
+            throw new RuntimeException(e);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
         }
     }
 
 
-    private List<String> getInitialGoals()
-    {
+    protected void reset(){
+        goals.clear();
+        goals.addAll(  getInitialGoals() );
+        cliOptions.clear();
+    }
+
+    private List<String> getInitialGoals() {
         List<String> goals1 = new ArrayList<String>();
-        goals1.add( "-Dsurefire.version=" + surefireVersion );
+        goals1.add("-Dsurefire.version=" + surefireVersion);
 
-        if ( testNgVersion != null )
-        {
-            goals1.add( "-DtestNgVersion=" + testNgVersion );
-
-            ArtifactVersion v = new DefaultArtifactVersion( testNgVersion );
-            try
-            {
-                if ( VersionRange.createFromVersionSpec( "(,5.12.1)" ).containsVersion( v ) )
-                {
-                    goals1.add( "-DtestNgClassifier=jdk15" );
+        if (testNgVersion != null) {
+            goals1.add("-DtestNgVersion=" + testNgVersion);
+
+            ArtifactVersion v = new DefaultArtifactVersion(testNgVersion);
+            try {
+                if (VersionRange.createFromVersionSpec("(,5.12.1)").containsVersion(v)) {
+                    goals1.add("-DtestNgClassifier=jdk15");
                 }
-            }
-            catch ( InvalidVersionSpecificationException e )
-            {
-                throw new RuntimeException( e.getMessage(), e );
+            } catch (InvalidVersionSpecificationException e) {
+                throw new RuntimeException(e.getMessage(), e);
             }
         }
 
         return goals1;
     }
 
-    protected List<String> getInitialGoals( String testNgVersion )
-    {
+    protected List<String> getInitialGoals(String testNgVersion) {
         List<String> goals = new ArrayList<String>();
-        goals.add( "-Dsurefire.version=" + surefireVersion );
+        goals.add("-Dsurefire.version=" + surefireVersion);
+
+        if (testNgVersion != null) {
+            goals.add("-DtestNgVersion=" + testNgVersion);
 
-        if ( testNgVersion != null )
-        {
-            goals.add( "-DtestNgVersion=" + testNgVersion );
-
-            ArtifactVersion v = new DefaultArtifactVersion( testNgVersion );
-            try
-            {
-                if ( VersionRange.createFromVersionSpec( "(,5.12.1)" ).containsVersion( v ) )
-                {
-                    goals.add( "-DtestNgClassifier=jdk15" );
+            ArtifactVersion v = new DefaultArtifactVersion(testNgVersion);
+            try {
+                if (VersionRange.createFromVersionSpec("(,5.12.1)").containsVersion(v)) {
+                    goals.add("-DtestNgClassifier=jdk15");
                 }
-            }
-            catch ( InvalidVersionSpecificationException e )
-            {
-                throw new RuntimeException( e.getMessage(), e );
+            } catch (InvalidVersionSpecificationException e) {
+                throw new RuntimeException(e.getMessage(), e);
             }
         }
 
@@ -134,135 +120,163 @@ public abstract class SurefireVerifierTe
      * @param path The subdirectory under basedir
      * @return A file
      */
-    protected File getSubFile( String path )
-    {
-        return new File( testDir, path );
+    protected File getSubFile(String path) {
+        return new File(testDir, path);
     }
 
-    protected void assertPresent( File file )
-    {
-        verifier.assertFilePresent( file.getAbsolutePath() );
+    protected void assertPresent(File file) {
+        verifier.assertFilePresent(file.getAbsolutePath());
     }
 
-    protected void assertNotPresent( File file )
-    {
-        verifier.assertFileNotPresent( file.getAbsolutePath() );
+    protected void assertNotPresent(File file) {
+        verifier.assertFileNotPresent(file.getAbsolutePath());
     }
 
-    protected void showErrorStackTraces()
-    {
-        cliOptions.add( "-e" );
+    protected void showErrorStackTraces() {
+        cliOptions.add("-e");
     }
 
-    protected void debugLogging()
-    {
-        cliOptions.add( "-X" );
+    protected void debugLogging() {
+        cliOptions.add("-X");
     }
 
 
-    protected void failNever()
-    {
-        cliOptions.add( "-fn" );
+    protected void failNever() {
+        cliOptions.add("-fn");
     }
 
-    protected SurefireVerifierTestClass addGoal( String goal )
-    {
-        goals.add( goal );
+    protected SurefireVerifierTestClass addGoal(String goal) {
+        goals.add(goal);
         return this;
     }
 
-    protected Verifier executeTest()
-        throws VerificationException
-    {
-        return execute( "test" );
+    protected Verifier executeTest() throws VerificationException {
+        return execute("test");
     }
 
-    protected Verifier execute( String goal )
-        throws VerificationException
-    {
-        addGoal( goal );
-        verifier.setCliOptions( cliOptions );
-        try
-        {
-            verifier.executeGoals( goals );
+    protected Verifier execute(String goal) throws VerificationException {
+        addGoal(goal);
+        verifier.setCliOptions(cliOptions);
+        try {
+            verifier.executeGoals(goals);
             return verifier;
-        }
-        finally
-        {
+        } finally {
             verifier.resetStreams();
         }
     }
 
-    protected File getSurefireReportsFile( String fileName )
-    {
-        File targetDir = getSubFile( "target/surefire-reports" );
-        return new File( targetDir, fileName );
+    protected File getSurefireReportsFile(String fileName) {
+        File targetDir = getSubFile("target/surefire-reports");
+        return new File(targetDir, fileName);
     }
 
-    protected void printSummary( boolean printsummary )
-    {
-        addGoal( "-DprintSummary=" + printsummary );
+    protected File getSiteFile(String fileName) {
+        File targetDir = getSubFile("target/site");
+        return new File(targetDir, fileName);
     }
 
-    protected void redirectToFile( boolean redirect )
-    {
-        addGoal( "-Dredirect.to.file=" + redirect );
+    protected void printSummary(boolean printsummary) {
+        addGoal("-DprintSummary=" + printsummary);
     }
 
-    protected void forkOnce()
-    {
-        forkMode( "once" );
+    protected void redirectToFile(boolean redirect) {
+        addGoal("-Dredirect.to.file=" + redirect);
     }
 
-    protected void forkNever()
-    {
-        forkMode( "never" );
+    protected void forkOnce() {
+        forkMode("once");
     }
 
-    protected void forkAlways()
-    {
-        forkMode( "always" );
+    protected void forkNever() {
+        forkMode("never");
     }
 
-    protected void forkMode( String forkMode )
-    {
-        addGoal( "-DforkMode=" + forkMode );
+    protected void forkAlways() {
+        forkMode("always");
     }
 
-    protected void activateProfile( String profile )
-    {
+    protected void forkMode(String forkMode) {
+        addGoal("-DforkMode=" + forkMode);
+    }
+
+    protected void activateProfile(String profile) {
         addGoal("-P" + profile);
     }
 
 
-    public void assertTestSuiteResults( int total, int errors, int failures, int skipped )
-        throws MavenReportException
-    {
-        HelperAssertions.assertTestSuiteResults( total, errors, failures, skipped, testDir );
+    public void assertTestSuiteResults(int total, int errors, int failures, int skipped) throws MavenReportException {
+        HelperAssertions.assertTestSuiteResults(total, errors, failures, skipped, testDir);
     }
 
-    public void verifyTextInLog( String text )
-        throws VerificationException
+    public void verifyTextInLog(String text) throws VerificationException
 
     {
-        verifier.verifyTextInLog( text );
+        verifier.verifyTextInLog(text);
     }
 
-    protected void verifyErrorFreeLog()
-        throws VerificationException
-    {
+    protected void verifyErrorFreeLog() throws VerificationException {
         verifier.verifyErrorFreeLog();
     }
 
-    protected Verifier getVerifier()
-    {
+    protected Verifier getVerifier() {
         return verifier;
     }
 
-    public File getTestDir()
-    {
+    public File getTestDir() {
         return testDir;
     }
+
+    protected boolean assertContainsText(File file, String text) throws VerificationException {
+        final List<String> list = getVerifier().loadFile(file, false);
+        for (String line : list) {
+
+            if (line.contains(text)) {
+                return true;
+            }
+        }
+        Assert.fail("Did not find expected message in log");
+        return false; // doh
+    }
+
+    protected boolean isMaven3X(){
+        return matchesVersionRange("[3.0,)");
+    }
+
+
+    private DefaultArtifactVersion getMavenVersion() {
+        try {
+            String v = verifier.getMavenVersion();
+            // NOTE: If the version looks like "${...}" it has been configured from an undefined expression
+            if (v != null && v.length() > 0 && !v.startsWith("${")) {
+                return new DefaultArtifactVersion(v);
+            }
+        } catch (VerificationException e) {
+            throw new RuntimeException(e);
+        }
+
+        return null;
+    }
+
+    /**
+     * This allows fine-grained control over execution of individual test methods
+     * by allowing tests to adjust to the current maven version, or else simply avoid
+     * executing altogether if the wrong version is present.
+     */
+    private boolean matchesVersionRange(String versionRangeStr) {
+        VersionRange versionRange;
+        try {
+            versionRange = VersionRange.createFromVersionSpec(versionRangeStr);
+        } catch (InvalidVersionSpecificationException e) {
+            throw (RuntimeException) new IllegalArgumentException("Invalid version range: " + versionRangeStr).initCause(e);
+        }
+
+        ArtifactVersion version = getMavenVersion();
+        if (version != null) {
+            return versionRange.containsVersion(version);
+        } else {
+            throw new IllegalStateException("Cannot determine maven version");
+        }
+    }
 }
 
 

Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/pom.xml?rev=1060976&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/pom.xml (added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/pom.xml Wed Jan 19 20:38:18 2011
@@ -0,0 +1,23 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+	<groupId>org.apache.maven.surefire-report</groupId>
+	<artifactId>surefire-570-multipleReportDirectories</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	
+	<groupId>org.apache.maven.surefire-report.module1</groupId>
+	<artifactId>module1</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.2</version>
+			<type>jar</type>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file

Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/main/java/org/apache/maven/surefire570/MyModule1Class.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/main/java/org/apache/maven/surefire570/MyModule1Class.java?rev=1060976&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/main/java/org/apache/maven/surefire570/MyModule1Class.java (added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/main/java/org/apache/maven/surefire570/MyModule1Class.java Wed Jan 19 20:38:18 2011
@@ -0,0 +1,6 @@
+package org.apache.maven.surefire570;
+public class MyModule1Class {
+  public int getFoo() {
+    return 42;
+  }
+}

Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/main/java/org/apache/maven/surefire570/MyModule1Class.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/java/org/apache/maven/surefire570/MyModule1ClassTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/java/org/apache/maven/surefire570/MyModule1ClassTest.java?rev=1060976&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/java/org/apache/maven/surefire570/MyModule1ClassTest.java (added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/java/org/apache/maven/surefire570/MyModule1ClassTest.java Wed Jan 19 20:38:18 2011
@@ -0,0 +1,18 @@
+package org.apache.maven.surefire570;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+import org.apache.maven.surefire570.MyModule1Class;
+
+public class MyModule1ClassTest extends TestCase {
+
+  public void testGetFooKO() {
+    MyModule1Class mc = new MyModule1Class();
+    Assert.assertEquals(18, mc.getFoo());
+  }
+
+  public void testGetFooOK() {
+    MyModule1Class mc = new MyModule1Class();
+    Assert.assertEquals(42, mc.getFoo());
+  }
+}

Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/java/org/apache/maven/surefire570/MyModule1ClassTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml?rev=1060976&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml (added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml Wed Jan 19 20:38:18 2011
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite failures="1" time="0.04" errors="0" skipped="0" tests="2" name="org.apache.maven.surefireReport.surefireReportTest.MyClassTest">
+  <properties>
+    <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
+    <property name="sun.boot.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/i386"/>
+    <property name="java.vm.version" value="14.0-b16"/>
+    <property name="java.vm.vendor" value="Sun Microsystems Inc."/>
+    <property name="java.vendor.url" value="http://java.sun.com/"/>
+    <property name="path.separator" value=":"/>
+    <property name="java.vm.name" value="Java HotSpot(TM) Server VM"/>
+    <property name="file.encoding.pkg" value="sun.io"/>
+    <property name="user.country" value="FR"/>
+    <property name="sun.java.launcher" value="SUN_STANDARD"/>
+    <property name="sun.os.patch.level" value="unknown"/>
+    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+    <property name="user.dir" value="/home/tsauzedde/Work/eclipse-workspace/surefire-report-test"/>
+    <property name="java.runtime.version" value="1.6.0_14-b08"/>
+    <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
+    <property name="basedir" value="/home/tsauzedde/Work/eclipse-workspace/surefire-report-test"/>
+    <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/endorsed"/>
+    <property name="os.arch" value="i386"/>
+    <property name="surefire.real.class.path" value="/tmp/surefirebooter5998945456175966466.jar"/>
+    <property name="java.io.tmpdir" value="/tmp"/>
+    <property name="line.separator" value="
+"/>
+    <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
+    <property name="os.name" value="Linux"/>
+    <property name="sun.jnu.encoding" value="UTF-8"/>
+    <property name="java.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/i386/server:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/i386:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/../lib/i386:/usr/java/packages/lib/i386:/lib:/usr/lib"/>
+    <property name="surefire.test.class.path" value="/home/tsauzedde/Work/eclipse-workspace/surefire-report-test/target/test-classes:/home/tsauzedde/Work/eclipse-workspace/surefire-report-test/target/classes:/home/tsauzedde/.m2/repository/junit/junit/3.8.2/junit-3.8.2.jar:"/>
+    <property name="java.specification.name" value="Java Platform API Specification"/>
+    <property name="java.class.version" value="50.0"/>
+    <property name="sun.management.compiler" value="HotSpot Tiered Compilers"/>
+    <property name="os.version" value="2.6.28-15-generic"/>
+    <property name="user.home" value="/home/tsauzedde"/>
+    <property name="user.timezone" value=""/>
+    <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
+    <property name="file.encoding" value="UTF-8"/>
+    <property name="java.specification.version" value="1.6"/>
+    <property name="user.name" value="tsauzedde"/>
+    <property name="java.class.path" value="/home/tsauzedde/Work/eclipse-workspace/surefire-report-test/target/test-classes:/home/tsauzedde/Work/eclipse-workspace/surefire-report-test/target/classes:/home/tsauzedde/.m2/repository/junit/junit/3.8.2/junit-3.8.2.jar:"/>
+    <property name="java.vm.specification.version" value="1.0"/>
+    <property name="sun.arch.data.model" value="32"/>
+    <property name="java.home" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre"/>
+    <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
+    <property name="user.language" value="fr"/>
+    <property name="java.vm.info" value="mixed mode"/>
+    <property name="java.version" value="1.6.0_14"/>
+    <property name="java.ext.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/ext:/usr/java/packages/lib/ext"/>
+    <property name="sun.boot.class.path" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/resources.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/rt.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/jsse.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/jce.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/charsets.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/classes"/>
+    <property name="java.vendor" value="Sun Microsystems Inc."/>
+    <property name="localRepository" value="/home/tsauzedde/.m2/repository"/>
+    <property name="file.separator" value="/"/>
+    <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/>
+    <property name="sun.cpu.endian" value="little"/>
+    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
+    <property name="sun.desktop" value="gnome"/>
+    <property name="sun.cpu.isalist" value=""/>
+  </properties>
+  <testcase time="0.005" classname="org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest" name="testGetFooKO">
+    <failure message="expected:&lt;18&gt; but was:&lt;42&gt;" type="junit.framework.AssertionFailedError">junit.framework.AssertionFailedError: expected:&lt;18&gt; but was:&lt;42&gt;
+	at junit.framework.Assert.fail(Assert.java:47)
+	at junit.framework.Assert.failNotEquals(Assert.java:280)
+	at junit.framework.Assert.assertEquals(Assert.java:64)
+	at junit.framework.Assert.assertEquals(Assert.java:198)
+	at junit.framework.Assert.assertEquals(Assert.java:204)
+	at org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest.testGetFooKO(MyClassTest.java:10)
+</failure>
+  </testcase>
+  <testcase time="0" classname="org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest" name="testGetFooOK"/>
+</testsuite>
\ No newline at end of file

Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt?rev=1060976&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt (added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt Wed Jan 19 20:38:18 2011
@@ -0,0 +1,13 @@
+-------------------------------------------------------------------------------
+Test set: org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest
+-------------------------------------------------------------------------------
+Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.049 sec <<< FAILURE!
+testGetFooKO(org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest)  Time elapsed: 0.01 sec  <<< FAILURE!
+junit.framework.AssertionFailedError: expected:<18> but was:<42>
+	at junit.framework.Assert.fail(Assert.java:47)
+	at junit.framework.Assert.failNotEquals(Assert.java:280)
+	at junit.framework.Assert.assertEquals(Assert.java:64)
+	at junit.framework.Assert.assertEquals(Assert.java:198)
+	at junit.framework.Assert.assertEquals(Assert.java:204)
+	at org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest.testGetFooKO(MyClassTest.java:10)
+

Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module1/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/pom.xml?rev=1060976&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/pom.xml (added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/pom.xml Wed Jan 19 20:38:18 2011
@@ -0,0 +1,23 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	
+	<parent>
+	<groupId>org.apache.maven.surefire-report</groupId>
+	<artifactId>surefire-570-multipleReportDirectories</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	</parent>
+	
+	<groupId>org.apache.maven.surefire-report.module2</groupId>
+	<artifactId>module2</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.2</version>
+			<type>jar</type>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file

Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/main/java/org/apache/maven/surefire570/module2/MyModule2Class.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/main/java/org/apache/maven/surefire570/module2/MyModule2Class.java?rev=1060976&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/main/java/org/apache/maven/surefire570/module2/MyModule2Class.java (added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/main/java/org/apache/maven/surefire570/module2/MyModule2Class.java Wed Jan 19 20:38:18 2011
@@ -0,0 +1,6 @@
+package org.apache.maven.surefire570.module2;
+public class MyModule2Class {
+  public int getFoo() {
+    return 42;
+  }
+}

Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/main/java/org/apache/maven/surefire570/module2/MyModule2Class.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/java/org/apache/maven/surefire570/module2/MyModule2ClassTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/java/org/apache/maven/surefire570/module2/MyModule2ClassTest.java?rev=1060976&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/java/org/apache/maven/surefire570/module2/MyModule2ClassTest.java (added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/java/org/apache/maven/surefire570/module2/MyModule2ClassTest.java Wed Jan 19 20:38:18 2011
@@ -0,0 +1,18 @@
+package org.apache.maven.surefire570.module2;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+import org.apache.maven.surefire570.module2.MyModule2Class;
+
+public class MyModule2ClassTest extends TestCase {
+
+  public void testGetFooKO() {
+    MyModule2Class mc = new MyModule2Class();
+    Assert.assertEquals(18, mc.getFoo());
+  }
+
+  public void testGetFooOK() {
+    MyModule2Class mc = new MyModule2Class();
+    Assert.assertEquals(42, mc.getFoo());
+  }
+}

Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/java/org/apache/maven/surefire570/module2/MyModule2ClassTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml?rev=1060976&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml (added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml Wed Jan 19 20:38:18 2011
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite failures="1" time="0.04" errors="0" skipped="0" tests="2" name="org.apache.maven.surefireReport.surefireReportTest.MyClassTest">
+  <properties>
+    <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
+    <property name="sun.boot.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/i386"/>
+    <property name="java.vm.version" value="14.0-b16"/>
+    <property name="java.vm.vendor" value="Sun Microsystems Inc."/>
+    <property name="java.vendor.url" value="http://java.sun.com/"/>
+    <property name="path.separator" value=":"/>
+    <property name="java.vm.name" value="Java HotSpot(TM) Server VM"/>
+    <property name="file.encoding.pkg" value="sun.io"/>
+    <property name="user.country" value="FR"/>
+    <property name="sun.java.launcher" value="SUN_STANDARD"/>
+    <property name="sun.os.patch.level" value="unknown"/>
+    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
+    <property name="user.dir" value="/home/tsauzedde/Work/eclipse-workspace/surefire-report-test"/>
+    <property name="java.runtime.version" value="1.6.0_14-b08"/>
+    <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
+    <property name="basedir" value="/home/tsauzedde/Work/eclipse-workspace/surefire-report-test"/>
+    <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/endorsed"/>
+    <property name="os.arch" value="i386"/>
+    <property name="surefire.real.class.path" value="/tmp/surefirebooter5998945456175966466.jar"/>
+    <property name="java.io.tmpdir" value="/tmp"/>
+    <property name="line.separator" value="
+"/>
+    <property name="java.vm.specification.vendor" value="Sun Microsystems Inc."/>
+    <property name="os.name" value="Linux"/>
+    <property name="sun.jnu.encoding" value="UTF-8"/>
+    <property name="java.library.path" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/i386/server:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/i386:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/../lib/i386:/usr/java/packages/lib/i386:/lib:/usr/lib"/>
+    <property name="surefire.test.class.path" value="/home/tsauzedde/Work/eclipse-workspace/surefire-report-test/target/test-classes:/home/tsauzedde/Work/eclipse-workspace/surefire-report-test/target/classes:/home/tsauzedde/.m2/repository/junit/junit/3.8.2/junit-3.8.2.jar:"/>
+    <property name="java.specification.name" value="Java Platform API Specification"/>
+    <property name="java.class.version" value="50.0"/>
+    <property name="sun.management.compiler" value="HotSpot Tiered Compilers"/>
+    <property name="os.version" value="2.6.28-15-generic"/>
+    <property name="user.home" value="/home/tsauzedde"/>
+    <property name="user.timezone" value=""/>
+    <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
+    <property name="file.encoding" value="UTF-8"/>
+    <property name="java.specification.version" value="1.6"/>
+    <property name="user.name" value="tsauzedde"/>
+    <property name="java.class.path" value="/home/tsauzedde/Work/eclipse-workspace/surefire-report-test/target/test-classes:/home/tsauzedde/Work/eclipse-workspace/surefire-report-test/target/classes:/home/tsauzedde/.m2/repository/junit/junit/3.8.2/junit-3.8.2.jar:"/>
+    <property name="java.vm.specification.version" value="1.0"/>
+    <property name="sun.arch.data.model" value="32"/>
+    <property name="java.home" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre"/>
+    <property name="java.specification.vendor" value="Sun Microsystems Inc."/>
+    <property name="user.language" value="fr"/>
+    <property name="java.vm.info" value="mixed mode"/>
+    <property name="java.version" value="1.6.0_14"/>
+    <property name="java.ext.dirs" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/ext:/usr/java/packages/lib/ext"/>
+    <property name="sun.boot.class.path" value="/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/resources.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/rt.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/jsse.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/jce.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/lib/charsets.jar:/usr/lib/jvm/java-6-sun-1.6.0.14/jre/classes"/>
+    <property name="java.vendor" value="Sun Microsystems Inc."/>
+    <property name="localRepository" value="/home/tsauzedde/.m2/repository"/>
+    <property name="file.separator" value="/"/>
+    <property name="java.vendor.url.bug" value="http://java.sun.com/cgi-bin/bugreport.cgi"/>
+    <property name="sun.cpu.endian" value="little"/>
+    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
+    <property name="sun.desktop" value="gnome"/>
+    <property name="sun.cpu.isalist" value=""/>
+  </properties>
+  <testcase time="0.005" classname="org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest" name="testGetFooKO">
+    <failure message="expected:&lt;18&gt; but was:&lt;42&gt;" type="junit.framework.AssertionFailedError">junit.framework.AssertionFailedError: expected:&lt;18&gt; but was:&lt;42&gt;
+	at junit.framework.Assert.fail(Assert.java:47)
+	at junit.framework.Assert.failNotEquals(Assert.java:280)
+	at junit.framework.Assert.assertEquals(Assert.java:64)
+	at junit.framework.Assert.assertEquals(<Assert class="ja"></Assert>va:198)
+	at junit.framework.Assert.assertEquals(Assert.java:204)
+	at org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest.testGetFooKO(MyClassTest.java:10)
+</failure>
+  </testcase>
+  <testcase time="0" classname="org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest" name="testGetFooOK"/>
+</testsuite>
\ No newline at end of file

Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/TEST-org.apache.maven.surefireReport.surefireReportTest.MyClassTest.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt?rev=1060976&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt (added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt Wed Jan 19 20:38:18 2011
@@ -0,0 +1,13 @@
+-------------------------------------------------------------------------------
+Test set: org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest
+-------------------------------------------------------------------------------
+Tests run: 2, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.049 sec <<< FAILURE!
+testGetFooKO(org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest)  Time elapsed: 0.01 sec  <<< FAILURE!
+junit.framework.AssertionFailedError: expected:<18> but was:<42>
+	at junit.framework.Assert.fail(Assert.java:47)
+	at junit.framework.Assert.failNotEquals(Assert.java:280)
+	at junit.framework.Assert.assertEquals(Assert.java:64)
+	at junit.framework.Assert.assertEquals(Assert.java:198)
+	at junit.framework.Assert.assertEquals(Assert.java:204)
+	at org.apache.maven.surefireReport.surefireReportTest.module1.MyDummyClassTest.testGetFooKO(MyClassTest.java:10)
+

Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/module2/src/test/resources/surefire-reports/org.apache.maven.surefireReport.surefireReportTest.MyClassTest.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml?rev=1060976&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml (added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml Wed Jan 19 20:38:18 2011
@@ -0,0 +1,112 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.surefire-report</groupId>
+  <artifactId>surefire-570-multipleReportDirectories</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${surefire.version}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+
+  <profiles>
+    <profile>
+      <id>maven-3</id>
+      <activation>
+        <file>
+          <!--  This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
+          <exists>${basedir}</exists>
+        </file>
+      </activation>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-surefire-report-plugin</artifactId>
+              <version>${surefire.version}</version>
+              <inherited>true</inherited>
+              <configuration>
+                <reportsDirectories>
+                  <reportsDirectory>${basedir}/target/surefire-reports</reportsDirectory>
+                  <reportsDirectory>${basedir}/src/test/resources/surefire-reports</reportsDirectory>
+                </reportsDirectories>
+              </configuration>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-surefire-plugin</artifactId>
+              <version>${surefire.version}</version>
+            </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-site-plugin</artifactId>
+              <version>3.0-beta-3</version>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+        <plugins>
+          <plugin>
+            <artifactId>maven-site-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-descriptor</id>
+                <goals>
+                  <goal>attach-descriptor</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-report-plugin</artifactId>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-site-plugin</artifactId>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-report-plugin</artifactId>
+        <version>${surefire.version}</version>
+        <inherited>true</inherited>
+        <configuration>
+          <reportsDirectories>
+            <reportsDirectory>${basedir}/target/surefire-reports</reportsDirectory>
+            <reportsDirectory>${basedir}/src/test/resources/surefire-reports</reportsDirectory>
+          </reportsDirectories>
+        </configuration>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>report-only</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <modules>
+    <module>module1</module>
+    <module>module2</module>
+  </modules>
+</project>

Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-570-multipleReportDirectories/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message