Author: jdcasey
Date: Mon Aug 31 20:48:58 2009
New Revision: 809740
URL: http://svn.apache.org/viewvc?rev=809740&view=rev
Log:
[SUREFIRE-571] Put off instantiation of the Runner instance for a JUnit4TestSet instance until
that test set is executed, to prevent static initialization of classes not currently being
executed.
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit4ForkAlwaysStaticInitPollution.java
(with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml
(with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/App2Test.java
(with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/AppTest.java
(with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/org/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/org/apache/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/org/apache/maven/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/org/apache/maven/surefire/
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java
Added: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit4ForkAlwaysStaticInitPollution.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit4ForkAlwaysStaticInitPollution.java?rev=809740&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit4ForkAlwaysStaticInitPollution.java
(added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestJUnit4ForkAlwaysStaticInitPollution.java
Mon Aug 31 20:48:58 2009
@@ -0,0 +1,30 @@
+package org.apache.maven.surefire.its;
+
+
+import java.io.File;
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * Test JUnit 4 tests marked with "Ignore" attribute
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ *
+ */
+public class TestJUnit4ForkAlwaysStaticInitPollution
+ extends AbstractSurefireIT
+{
+ public void testJunit4Ignore ()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/junit4-forkAlways-staticInit"
);
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ this.executeGoal( verifier, "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/TestJUnit4ForkAlwaysStaticInitPollution.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml?rev=809740&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml
(added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml
Mon Aug 31 20:48:58 2009
@@ -0,0 +1,41 @@
+<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.test</groupId>
+ <artifactId>junit4-forkAlways-staticInit</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <name>JUnit4 ForkAlways StaticInit Pollution</name>
+ <description>
+ Test that static initializers on classes other than the one being executed in the current
test-set will not be run, and cannot pollute the environment.
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>always</forkMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/App2Test.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/App2Test.java?rev=809740&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/App2Test.java
(added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/App2Test.java
Mon Aug 31 20:48:58 2009
@@ -0,0 +1,31 @@
+package junit4;
+
+import java.util.Properties;
+
+import junit.framework.TestCase;
+
+/**
+ * Unit test for simple App.
+ */
+public class App2Test
+ extends TestCase
+{
+
+ static
+ {
+ System.out.println( "Loading " + App2Test.class.getName() );
+
+ Properties p = System.getProperties();
+ p.setProperty( "Foo", "Bar2" );
+ System.setProperties( p );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ System.out.println( "Expecting: Bar2\nGot: " + System.getProperty( "Foo" ) );
+ assertEquals( "Expecting: Bar2\nGot: " + System.getProperty( "Foo" ), "Bar2", System.getProperty(
"Foo" ) );
+ }
+}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/App2Test.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/AppTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/AppTest.java?rev=809740&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/AppTest.java
(added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/AppTest.java
Mon Aug 31 20:48:58 2009
@@ -0,0 +1,31 @@
+package junit4;
+
+import java.util.Properties;
+
+import junit.framework.TestCase;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+
+ static
+ {
+ System.out.println( "Loading " + AppTest.class.getName() );
+
+ Properties p = System.getProperties();
+ p.setProperty( "Foo", "Bar" );
+ System.setProperties( p );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ System.out.println( "Expecting: Bar\nGot: " + System.getProperty( "Foo" ) );
+ assertEquals( "Expecting: Bar\nGot: " + System.getProperty( "Foo" ), "Bar", System.getProperty(
"Foo" ) );
+ }
+}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-forkAlways-staticInit/src/test/java/junit4/AppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java?rev=809740&r1=809739&r2=809740&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java
(original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java
Mon Aug 31 20:48:58 2009
@@ -30,9 +30,6 @@
public class JUnit4TestSet
extends AbstractTestSet
{
- // Member Variables
- private Runner junitTestRunner;
-
/**
* Constructor.
*
@@ -41,8 +38,6 @@
protected JUnit4TestSet( Class testClass )
{
super( testClass );
-
- junitTestRunner = Request.aClass( testClass ).getRunner();
}
/**
@@ -53,6 +48,8 @@
public void execute( ReporterManager reportManager, ClassLoader loader )
throws TestSetFailedException
{
+ Runner junitTestRunner = Request.aClass( getTestClass() ).getRunner();
+
RunNotifier fNotifier = new RunNotifier();
RunListener listener = new JUnit4TestSetReporter( this, reportManager );
fNotifier.addListener( listener );
Author: bentmann
Date: Mon Aug 31 10:16:04 2009
New Revision: 809528
URL: http://svn.apache.org/viewvc?rev=809528&view=rev
Log:
o Fixed tests to use proper Maven version
Modified:
maven/surefire/trunk/surefire-integration-tests/pom.xml
Modified: maven/surefire/trunk/surefire-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/pom.xml?rev=809528&r1=809527&r2=809528&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/pom.xml (original)
+++ maven/surefire/trunk/surefire-integration-tests/pom.xml Mon Aug 31 10:16:04 2009
@@ -73,6 +73,10 @@
<name>surefire.version</name>
<value>${project.version}</value>
</property>
+ <property>
+ <name>maven.home</name>
+ <value>${maven.home}</value>
+ </property>
</systemProperties>
</configuration>
Author: bentmann
Date: Sun Aug 30 10:56:07 2009
New Revision: 809308
URL: http://svn.apache.org/viewvc?rev=809308&view=rev
Log:
o Stabilized build
Modified:
maven/surefire/trunk/maven-surefire-plugin/pom.xml
Modified: maven/surefire/trunk/maven-surefire-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/pom.xml?rev=809308&r1=809307&r2=809308&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-plugin/pom.xml Sun Aug 30 10:56:07 2009
@@ -155,6 +155,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
+ <version>2.5</version>
</plugin>
</plugins>
</reporting>
Author: bentmann
Date: Sun Aug 30 10:55:40 2009
New Revision: 809307
URL: http://svn.apache.org/viewvc?rev=809307&view=rev
Log:
o Inherited from maven-parent:13
Modified:
maven/surefire/trunk/pom.xml
Modified: maven/surefire/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/pom.xml?rev=809307&r1=809306&r2=809307&view=diff
==============================================================================
--- maven/surefire/trunk/pom.xml (original)
+++ maven/surefire/trunk/pom.xml Sun Aug 30 10:55:40 2009
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.apache.maven</groupId>
- <version>11</version>
+ <version>13</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
Author: bentmann
Date: Sat Aug 22 11:55:53 2009
New Revision: 806843
URL: http://svn.apache.org/viewvc?rev=806843&view=rev
Log:
o Added workaround for MSHARED-120 as suggested by Vincent's patch for the issue
Modified:
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
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=806843&r1=806842&r2=806843&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
Sat Aug 22 11:55:53 2009
@@ -20,19 +20,29 @@
*/
import java.io.File;
+import java.io.IOException;
+import java.io.Writer;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
+import org.apache.maven.doxia.site.decoration.DecorationModel;
import org.apache.maven.doxia.siterenderer.Renderer;
+import org.apache.maven.doxia.siterenderer.RendererException;
+import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
+import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
+import org.apache.maven.reporting.sink.SinkFactory;
+import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.PathTool;
import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.WriterFactory;
/**
@@ -129,6 +139,63 @@
*/
private boolean aggregate;
+ // TODO: Remove this override once MSHARED-120 is released
+ public void execute()
+ throws MojoExecutionException
+ {
+ Locale locale = Locale.getDefault();
+
+ SiteRendererSink sink;
+ try
+ {
+ sink = SinkFactory.createSink( new File( getOutputDirectory() ), getOutputName()
+ ".html" );
+
+ try
+ {
+ generate( sink, locale );
+ }
+ finally
+ {
+ sink.close();
+ }
+ }
+ catch ( MavenReportException e )
+ {
+ throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH
)
+ + " report generation.", e );
+ }
+
+ File outputHtml = new File( getOutputDirectory(), getOutputName() + ".html" );
+ outputHtml.getParentFile().mkdirs();
+
+ Writer writer = null;
+ try
+ {
+ SiteRenderingContext context = new SiteRenderingContext();
+ context.setDecoration( new DecorationModel() );
+ context.setTemplateName( "org/apache/maven/doxia/siterenderer/resources/default-site.vm"
);
+ context.setLocale( locale );
+
+ writer = WriterFactory.newXmlWriter( outputHtml );
+
+ getSiteRenderer().generateDocument( writer, sink, context );
+ }
+ catch ( RendererException e )
+ {
+ throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH
)
+ + " report generation.", e );
+ }
+ catch ( IOException e )
+ {
+ throw new MojoExecutionException( "An error has occurred in " + getName( Locale.ENGLISH
)
+ + " report generation.", e );
+ }
+ finally
+ {
+ IOUtil.close( writer );
+ }
+ }
+
/** {@inheritDoc} */
public void executeReport( Locale locale )
throws MavenReportException
Author: pgier
Date: Thu Aug 20 19:16:15 2009
New Revision: 806311
URL: http://svn.apache.org/viewvc?rev=806311&view=rev
Log:
[SUREFIRE-502] Fixing classpath ordering for configured classes/test-classes directories are
used. Removing a couple of unnecessary @required tags.
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Modified: maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java?rev=806311&r1=806310&r2=806311&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
(original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Thu Aug 20 19:16:15 2009
@@ -116,23 +116,22 @@
* System.getProperty("basedir").
*
* @parameter expression="${basedir}"
- * @required
*/
private File basedir;
/**
* The directory containing generated test classes of the project being tested.
+ * This will be included at the beginning the test classpath.
*
- * @parameter expression="${project.build.testOutputDirectory}"
- * @required
+ * @parameter default-value="${project.build.testOutputDirectory}"
*/
private File testClassesDirectory;
/**
* The directory containing generated classes of the project being tested.
+ * This will be included after the test classes in the test classpath.
*
- * @parameter expression="${project.build.outputDirectory}"
- * @required
+ * @parameter default-value="${project.build.outputDirectory}"
*/
private File classesDirectory;
@@ -837,21 +836,40 @@
//
// ----------------------------------------------------------------------
- getLog().debug( "Test Classpath :" );
-
// Check if we need to add configured classes/test classes directories here.
// If they are configured, we should remove the default to avoid conflicts.
- if ( !project.getBuild().getOutputDirectory().equals( classesDirectory.getAbsolutePath()
) )
+ File projectClassesDirectory = new File ( project.getBuild().getOutputDirectory()
);
+ if ( ! projectClassesDirectory.equals( classesDirectory ) )
{
- classpathElements.remove( project.getBuild().getOutputDirectory() );
- classpathElements.add( classesDirectory.getAbsolutePath() );
+ int indexToReplace = classpathElements.indexOf( project.getBuild().getOutputDirectory()
);
+ if ( indexToReplace != -1 )
+ {
+ classpathElements.remove( indexToReplace );
+ classpathElements.add( indexToReplace, classesDirectory.getAbsolutePath()
);
+ }
+ else
+ {
+ classpathElements.add( 1, classesDirectory.getAbsolutePath() );
+ }
}
- if ( !project.getBuild().getTestOutputDirectory().equals( testClassesDirectory.getAbsolutePath()
) )
+
+ File projectTestClassesDirectory = new File( project.getBuild().getTestOutputDirectory()
);
+ if ( !projectTestClassesDirectory.equals( testClassesDirectory ) )
{
- classpathElements.remove( project.getBuild().getTestOutputDirectory() );
- classpathElements.add( testClassesDirectory.getAbsolutePath() );
+ int indexToReplace = classpathElements.indexOf( project.getBuild().getTestOutputDirectory()
);
+ if ( indexToReplace != -1 )
+ {
+ classpathElements.remove( indexToReplace );
+ classpathElements.add( indexToReplace, testClassesDirectory.getAbsolutePath()
);
+ }
+ else
+ {
+ classpathElements.add( 0, testClassesDirectory.getAbsolutePath() );
+ }
}
+ getLog().debug( "Test Classpath :" );
+
for ( Iterator i = classpathElements.iterator(); i.hasNext(); )
{
String classpathElement = (String) i.next();
@@ -977,6 +995,11 @@
return surefireBooter;
}
+
+ /*private void replaceListItem( List list, Object item1, Object item2 )
+ {
+ list.r
+ }*/
private void showMap( Map map, String setting )
{
Author: pgier
Date: Thu Aug 20 16:39:55 2009
New Revision: 806246
URL: http://svn.apache.org/viewvc?rev=806246&view=rev
Log:
[SUREFIRE-529] Debugging example should use forkMode=never instead of forkMode=none
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/debugging.apt
Modified: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/debugging.apt
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/debugging.apt?rev=806246&r1=806245&r2=806246&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/debugging.apt (original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/debugging.apt Thu Aug
20 16:39:55 2009
@@ -35,14 +35,14 @@
You can force Maven not to fork tests by configuring the <<<forkMode>>>
configuration parameter.
+---+
-mvn -DforkMode=none test
+mvn -DforkMode=never test
+---+
Then all you need to do is debug Maven itself. Since Maven 2.0.8, Maven has shipped with
a "mvnDebug" shell script that you can
use to launch Maven with convenient debugging options:
+---+
-mvnDebug -DforkMode=none test
+mvnDebug -DforkMode=never test
+---+
Then you can attach Eclipse to Maven itself, which may be easier/more convenient than debugging
the forked executable.
\ No newline at end of file
Author: pgier
Date: Thu Aug 20 15:46:27 2009
New Revision: 806224
URL: http://svn.apache.org/viewvc?rev=806224&view=rev
Log:
Minor site documentation improvements.
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt.vm
Modified: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt.vm
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt.vm?rev=806224&r1=806223&r2=806224&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt.vm
(original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt.vm
Thu Aug 20 15:46:27 2009
@@ -13,6 +13,9 @@
organization.
But, if you must, you can use the <<<additionalClasspathElements>>> element
to add custom resources/jars to your classpath.
+ This will be treated as an absolute file system path, so you may want use ${basedir} or
another property combined with a relative path.
+ Note that additional classpath elements are added to the end of the classpath, so you cannot
use these to
+ override project dependencies or resources.
+---+
<project>
Author: vsiveton
Date: Sun Aug 16 11:56:03 2009
New Revision: 804676
URL: http://svn.apache.org/viewvc?rev=804676&view=rev
Log:
o fixed test cases
Modified:
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.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=804676&r1=804675&r2=804676&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
Sun Aug 16 11:56:03 2009
@@ -380,7 +380,7 @@
List testCases = suite.getTestCases();
- if ( testCases != null )
+ if ( testCases != null && !testCases.isEmpty() )
{
ListIterator caseIterator = testCases.listIterator();
@@ -639,21 +639,21 @@
{
if ( !testSuites.isEmpty() )
{
- sink.section2();
+ sink.paragraph();
- sink.rawText( "[" );
+ sink.text( "[" );
sinkLink( sink, bundle.getString( "report.surefire.label.summary" ), "#Summary"
);
- sink.rawText( "]" );
+ sink.text( "]" );
- sink.rawText( " [" );
+ sink.text( " [" );
sinkLink( sink, bundle.getString( "report.surefire.label.packagelist" ), "#Package_List"
);
- sink.rawText( "]" );
+ sink.text( "]" );
- sink.rawText( " [" );
+ sink.text( " [" );
sinkLink( sink, bundle.getString( "report.surefire.label.testcases" ), "#Test_Cases"
);
- sink.rawText( "]" );
+ sink.text( "]" );
- sink.section2_();
+ sink.paragraph_();
}
}
Author: vsiveton
Date: Thu Aug 13 14:00:16 2009
New Revision: 803888
URL: http://svn.apache.org/viewvc?rev=803888&view=rev
Log:
SUREFIRE-567: Review the Doxia Sink calls
o fixed sink calls
Modified:
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.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=803888&r1=803887&r2=803888&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
Thu Aug 13 14:00:16 2009
@@ -114,8 +114,6 @@
constructFailureDetails( sink, bundle, failureList );
}
- sinkLineBreak( sink );
-
sink.body_();
sink.flush();
@@ -129,13 +127,11 @@
sink.section1();
sink.sectionTitle1();
-
- sinkAnchor( sink, "Summary" );
-
sink.text( bundle.getString( "report.surefire.label.summary" ) );
-
sink.sectionTitle1_();
+ sinkAnchor( sink, "Summary" );
+
constructHotLinks( sink, bundle );
sinkLineBreak( sink );
@@ -178,7 +174,9 @@
sink.lineBreak();
+ sink.paragraph();
sink.rawText( bundle.getString( "report.surefire.text.note1" ) );
+ sink.paragraph_();
sinkLineBreak( sink );
@@ -191,13 +189,11 @@
sink.section1();
sink.sectionTitle1();
-
- sinkAnchor( sink, "Package_List" );
-
sink.text( bundle.getString( "report.surefire.label.packagelist" ) );
-
sink.sectionTitle1_();
+ sinkAnchor( sink, "Package_List" );
+
constructHotLinks( sink, bundle );
sinkLineBreak( sink );
@@ -255,7 +251,9 @@
sink.lineBreak();
+ sink.paragraph();
sink.rawText( bundle.getString( "report.surefire.text.note2" ) );
+ sink.paragraph_();
packIter = suitePackages.keySet().iterator();
@@ -269,13 +267,11 @@
sink.section2();
sink.sectionTitle2();
-
- sinkAnchor( sink, packageName );
-
sink.text( packageName );
-
sink.sectionTitle2_();
+ sinkAnchor( sink, packageName );
+
sink.table();
sink.tableRow();
@@ -369,13 +365,11 @@
sink.section1();
sink.sectionTitle1();
-
- sinkAnchor( sink, "Test_Cases" );
-
sink.text( bundle.getString( "report.surefire.label.testcases" ) );
-
sink.sectionTitle1_();
+ sinkAnchor( sink, "Test_Cases" );
+
constructHotLinks( sink, bundle );
ListIterator suiteIterator = testSuites.listIterator();
@@ -392,13 +386,11 @@
sink.section2();
sink.sectionTitle2();
-
- sinkAnchor( sink, suite.getPackageName() + suite.getName() );
-
sink.text( suite.getName() );
-
sink.sectionTitle2_();
+ sinkAnchor( sink, suite.getPackageName() + suite.getName() );
+
sink.table();
while ( caseIterator.hasNext() )
@@ -517,13 +509,11 @@
{
sink.section1();
sink.sectionTitle1();
-
- sinkAnchor( sink, "Failure_Details" );
-
sink.text( bundle.getString( "report.surefire.label.failuredetails" ) );
-
sink.sectionTitle1_();
+ sinkAnchor( sink, "Failure_Details" );
+
constructHotLinks( sink, bundle );
sinkLineBreak( sink );
Author: vsiveton
Date: Thu Aug 13 13:58:22 2009
New Revision: 803887
URL: http://svn.apache.org/viewvc?rev=803887&view=rev
Log:
o minor improvement
Modified:
maven/surefire/trunk/maven-surefire-report-plugin/pom.xml
Modified: maven/surefire/trunk/maven-surefire-report-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/pom.xml?rev=803887&r1=803886&r2=803887&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/pom.xml Thu Aug 13 13:58:22 2009
@@ -28,8 +28,8 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>maven-surefire-report-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven Surefire Report Plugin</name>
Author: vsiveton
Date: Thu Aug 13 13:43:01 2009
New Revision: 803879
URL: http://svn.apache.org/viewvc?rev=803879&view=rev
Log:
o javadoc
Modified:
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestCase.java
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java
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/SurefireReportOnlyMojo.java
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportParser.java
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestCaseTest.java
maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestSuiteTest.java
maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java
maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportParserTest.java
maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub.java
maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub2.java
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestCase.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestCase.java?rev=803879&r1=803878&r2=803879&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestCase.java
(original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestCase.java
Thu Aug 13 13:43:01 2009
@@ -22,6 +22,9 @@
import java.util.HashMap;
import java.util.Map;
+/**
+ * @version $Id$
+ */
public class ReportTestCase
{
private String fullClassName;
@@ -97,7 +100,8 @@
failure.put( "message", message );
failure.put( "type", type );
}
-
+
+ /** {@inheritDoc} */
public String toString()
{
return fullName;
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java?rev=803879&r1=803878&r2=803879&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java
(original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/ReportTestSuite.java
Thu Aug 13 13:43:01 2009
@@ -22,6 +22,9 @@
import java.util.ArrayList;
import java.util.List;
+/**
+ * @version $Id$
+ */
public class ReportTestSuite
{
private List testCases = new ArrayList();
@@ -41,7 +44,7 @@
private String packageName;
private float timeElapsed;
-
+
public List getTestCases()
{
return this.testCases;
@@ -108,9 +111,9 @@
{
this.fullClassName = fullClassName;
int lastDotPosition = fullClassName.lastIndexOf( "." );
-
+
name = fullClassName.substring( lastDotPosition + 1, fullClassName.length() );
-
+
if ( lastDotPosition < 0 )
{
/* no package name */
@@ -146,7 +149,8 @@
{
this.testCases = testCases;
}
-
+
+ /** {@inheritDoc} */
public String toString()
{
return fullClassName + " ["+getNumberOfTests()+"/"+getNumberOfFailures()+"/"+getNumberOfErrors()+"/"+getNumberOfSkipped()+"]";
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=803879&r1=803878&r2=803879&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
Thu Aug 13 13:43:01 2009
@@ -32,6 +32,9 @@
import java.util.ResourceBundle;
import java.util.StringTokenizer;
+/**
+ * @version $Id$
+ */
public class SurefireReportGenerator
{
private SurefireReportParser report;
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=803879&r1=803878&r2=803879&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
Thu Aug 13 13:43:01 2009
@@ -129,6 +129,7 @@
*/
private boolean aggregate;
+ /** {@inheritDoc} */
public void executeReport( Locale locale )
throws MavenReportException
{
@@ -219,31 +220,37 @@
return location;
}
+ /** {@inheritDoc} */
public String getName( Locale locale )
{
return getBundle( locale ).getString( "report.surefire.name" );
}
+ /** {@inheritDoc} */
public String getDescription( Locale locale )
{
return getBundle( locale ).getString( "report.surefire.description" );
}
+ /** {@inheritDoc} */
protected Renderer getSiteRenderer()
{
return siteRenderer;
}
+ /** {@inheritDoc} */
protected MavenProject getProject()
{
return project;
}
+ /** {@inheritDoc} */
public String getOutputName()
{
return outputName;
}
+ /** {@inheritDoc} */
protected String getOutputDirectory()
{
return outputDirectory.getAbsolutePath();
@@ -253,5 +260,4 @@
{
return ResourceBundle.getBundle( "surefire-report", locale, this.getClass().getClassLoader()
);
}
-
}
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportOnlyMojo.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportOnlyMojo.java?rev=803879&r1=803878&r2=803879&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportOnlyMojo.java
(original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportOnlyMojo.java
Thu Aug 13 13:43:01 2009
@@ -26,6 +26,7 @@
* <a href="http://jira.codehaus.org/browse/MSUREFIREREP-6">http://jira.codehaus.org/browse/MSUREFIREREP-6</a>
*
* @author <a href="mailto:baerrach@gmail.com">Barrie Treloar</a>
+ * @version $Id$
* @goal report-only
* @execute phase="validate" lifecycle="surefire"
* @since 2.3
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=803879&r1=803878&r2=803879&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
Thu Aug 13 13:43:01 2009
@@ -37,6 +37,9 @@
import org.codehaus.plexus.util.StringUtils;
import org.xml.sax.SAXException;
+/**
+ * @version $Id$
+ */
public class SurefireReportParser
{
private NumberFormat numberFormat = NumberFormat.getInstance();
@@ -173,7 +176,7 @@
{
this.reportsDirectories = new File[] { reportsDirectory };
}
-
+
public void setReportsDirectories( File[] reportsDirectories )
{
this.reportsDirectories = reportsDirectories;
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java?rev=803879&r1=803878&r2=803879&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
(original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/TestSuiteXmlParser.java
Thu Aug 13 13:43:01 2009
@@ -38,6 +38,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
+/**
+ * @version $Id$
+ */
public class TestSuiteXmlParser
extends DefaultHandler
{
@@ -59,22 +62,23 @@
SAXParserFactory factory = SAXParserFactory.newInstance();
SAXParser saxParser = factory.newSAXParser();
-
+
classesToSuites = new HashMap();
saxParser.parse( new File( xmlPath ), this );
-
+
if ( currentSuite != defaultSuite )
{ // omit the defaultSuite if it's empty and there are alternatives
- if ( defaultSuite.getNumberOfTests() == 0 )
+ if ( defaultSuite.getNumberOfTests() == 0 )
{
classesToSuites.remove( defaultSuite.getFullClassName() );
}
}
-
+
return classesToSuites.values();
}
+ /** {@inheritDoc} */
public void startElement( String uri, String localName, String qName, Attributes attributes
)
throws SAXException
{
@@ -116,11 +120,11 @@
currentElement = new StringBuffer();
testCase = new ReportTestCase();
-
+
testCase.setName( attributes.getValue( "name" ) );
-
+
String fullClassName = attributes.getValue( "classname" );
-
+
// if the testcase declares its own classname, it may need to belong to its
own suite
if ( fullClassName != null )
{
@@ -132,7 +136,7 @@
classesToSuites.put( fullClassName, currentSuite );
}
}
-
+
testCase.setFullClassName( currentSuite.getFullClassName() );
testCase.setClassName( currentSuite.getName() );
testCase.setFullName( currentSuite.getFullClassName() + "." + testCase.getName()
);
@@ -174,7 +178,7 @@
}
}
-
+ /** {@inheritDoc} */
public void endElement( String uri, String localName, String qName )
throws SAXException
{
@@ -208,6 +212,7 @@
// TODO extract real skipped reasons
}
+ /** {@inheritDoc} */
public void characters( char[] ch, int start, int length )
throws SAXException
{
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestCaseTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestCaseTest.java?rev=803879&r1=803878&r2=803879&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestCaseTest.java
(original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestCaseTest.java
Thu Aug 13 13:43:01 2009
@@ -23,12 +23,14 @@
/**
* @author Jontri
+ * @version $Id$
*/
public class ReportTestCaseTest
extends TestCase
{
private ReportTestCase tCase;
+ /** {@inheritDoc} */
protected void setUp()
throws Exception
{
@@ -37,6 +39,15 @@
tCase = new ReportTestCase();
}
+ /** {@inheritDoc} */
+ protected void tearDown()
+ throws Exception
+ {
+ super.tearDown();
+
+ tCase = null;
+ }
+
public void testSetName()
{
tCase.setName( "Test Case Name" );
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestSuiteTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestSuiteTest.java?rev=803879&r1=803878&r2=803879&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestSuiteTest.java
(original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/ReportTestSuiteTest.java
Thu Aug 13 13:43:01 2009
@@ -24,11 +24,15 @@
import java.util.ArrayList;
import java.util.List;
+/**
+ * @version $Id$
+ */
public class ReportTestSuiteTest
extends TestCase
{
private ReportTestSuite tSuite;
+ /** {@inheritDoc} */
protected void setUp()
throws Exception
{
@@ -37,6 +41,15 @@
tSuite = new ReportTestSuite();
}
+ /** {@inheritDoc} */
+ protected void tearDown()
+ throws Exception
+ {
+ super.tearDown();
+
+ tSuite = null;
+ }
+
public void testSetTestCases()
{
ReportTestCase tCase = new ReportTestCase();
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java?rev=803879&r1=803878&r2=803879&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java
(original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java
Thu Aug 13 13:43:01 2009
@@ -38,6 +38,7 @@
/**
* @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
+ * @version $Id$
*/
public class SurefireReportMojoTest
extends AbstractMojoTestCase
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportParserTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportParserTest.java?rev=803879&r1=803878&r2=803879&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportParserTest.java
(original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportParserTest.java
Thu Aug 13 13:43:01 2009
@@ -33,11 +33,15 @@
import java.util.Locale;
import java.util.Map;
+/**
+ * @version $Id$
+ */
public class SurefireReportParserTest
extends TestCase
{
private SurefireReportParser report;
+ /** {@inheritDoc} */
protected void setUp()
throws Exception
{
@@ -48,6 +52,15 @@
report.setLocale( Locale.ENGLISH );
}
+ /** {@inheritDoc} */
+ protected void tearDown()
+ throws Exception
+ {
+ super.tearDown();
+
+ report = null;
+ }
+
public void testParseXMLReportFiles()
throws MavenReportException, UnsupportedEncodingException
{
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub.java?rev=803879&r1=803878&r2=803879&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub.java
(original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub.java
Thu Aug 13 13:43:01 2009
@@ -28,10 +28,12 @@
/**
* @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
+ * @version $Id$
*/
public class SurefireRepMavenProjectStub
extends MavenProjectStub
{
+ /** {@inheritDoc} */
public List getReportPlugins()
{
Reporting reporting = new Reporting();
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub2.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub2.java?rev=803879&r1=803878&r2=803879&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub2.java
(original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub2.java
Thu Aug 13 13:43:01 2009
@@ -26,10 +26,12 @@
/**
* @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
+ * @version $Id$
*/
public class SurefireRepMavenProjectStub2
extends MavenProjectStub
{
+ /** {@inheritDoc} */
public List getReportPlugins()
{
return new ArrayList();
Author: vsiveton
Date: Thu Aug 13 13:35:52 2009
New Revision: 803877
URL: http://svn.apache.org/viewvc?rev=803877&view=rev
Log:
SUREFIRE-565: Bump to Doxia 1.0
o fixed
Modified:
maven/surefire/trunk/maven-surefire-report-plugin/pom.xml
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/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java
Modified: maven/surefire/trunk/maven-surefire-report-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/pom.xml?rev=803877&r1=803876&r2=803877&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/pom.xml Thu Aug 13 13:35:52 2009
@@ -54,12 +54,28 @@
</distributionManagement>
<properties>
- <mavenVersion>2.0</mavenVersion>
+ <mavenVersion>2.0.6</mavenVersion>
+ <doxiaVersion>1.0</doxiaVersion>
</properties>
<dependencies>
<!-- maven -->
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
<version>${mavenVersion}</version>
@@ -67,7 +83,35 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>${mavenVersion}</version>
+ <version>2.0.4.2</version>
+ </dependency>
+
+ <!-- doxia -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-sink-api</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-decoration-model</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-site-renderer</artifactId>
+ <version>${doxiaVersion}</version>
+ </dependency>
+
+ <!-- plexus -->
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
</dependency>
<!-- test -->
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=803877&r1=803876&r2=803877&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
Thu Aug 13 13:35:52 2009
@@ -19,8 +19,8 @@
* under the License.
*/
+import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.reporting.MavenReportException;
-import org.codehaus.doxia.sink.Sink;
import java.io.File;
import java.text.NumberFormat;
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=803877&r1=803876&r2=803877&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
Thu Aug 13 13:35:52 2009
@@ -26,11 +26,11 @@
import java.util.Locale;
import java.util.ResourceBundle;
+import org.apache.maven.doxia.siterenderer.Renderer;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
-import org.codehaus.doxia.site.renderer.SiteRenderer;
import org.codehaus.plexus.util.PathTool;
import org.codehaus.plexus.util.StringUtils;
@@ -58,7 +58,7 @@
*
* @component
*/
- private SiteRenderer siteRenderer;
+ private Renderer siteRenderer;
/**
* Maven Project
@@ -91,7 +91,7 @@
*/
private File reportsDirectory;
-
+
/**
* The projects in the reactor for aggregation report.
*
@@ -99,7 +99,7 @@
* @readonly
*/
private List reactorProjects;
-
+
/**
* The filename to use for the report.
*
@@ -121,7 +121,7 @@
* @parameter expression="${linkXRef}" default-value="true"
*/
private boolean linkXRef;
-
+
/**
* Whether to build an aggregated report at the root, or build individual reports.
*
@@ -151,7 +151,7 @@
if ( !project.isExecutionRoot() ) return;
if ( reportsDirectories == null )
{
- ArrayList reportsDirectoryList = new ArrayList();
+ ArrayList reportsDirectoryList = new ArrayList();
// TODO guess the real location
for (Iterator i = reactorProjects.iterator(); i.hasNext();)
{
@@ -171,8 +171,8 @@
reportsDirectories = new File[] { new File( project.getBuild().getDirectory()
+ "/surefire-reports" ) };
}
}
-
-
+
+
SurefireReportGenerator report =
new SurefireReportGenerator( reportsDirectories, locale, showSuccess, determineXrefLocation()
);
@@ -229,7 +229,7 @@
return getBundle( locale ).getString( "report.surefire.description" );
}
- protected SiteRenderer getSiteRenderer()
+ protected Renderer getSiteRenderer()
{
return siteRenderer;
}
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java?rev=803877&r1=803876&r2=803877&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java
(original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java
Thu Aug 13 13:35:52 2009
@@ -19,13 +19,22 @@
* under the License.
*/
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.codehaus.plexus.util.FileUtils;
-
import java.io.File;
+import java.io.IOException;
import java.io.UnsupportedEncodingException;
+import java.io.Writer;
import java.net.URL;
import java.net.URLDecoder;
+import java.util.Locale;
+
+import org.apache.maven.doxia.site.decoration.DecorationModel;
+import org.apache.maven.doxia.siterenderer.RendererException;
+import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
+import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
+import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.WriterFactory;
/**
* @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
@@ -63,7 +72,6 @@
reportsDir.getAbsolutePath() );
assertEquals( "surefire-report", outputName );
-
assertEquals(
new File( getBasedir() + "/target/site/unit/basic-surefire-report-test/xref-test"
).getAbsolutePath(),
xrefLocation.getAbsolutePath() );
@@ -74,6 +82,8 @@
File report = new File( getBasedir(), "target/site/unit/basic-surefire-report-test/surefire-report.html"
);
+ renderer( mojo, report );
+
assertTrue( report.exists() );
String htmlContent = FileUtils.fileRead( report );
@@ -108,6 +118,8 @@
File report =
new File( getBasedir(), "target/site/unit/basic-surefire-report-success-false/surefire-report.html"
);
+ renderer( mojo, report );
+
assertTrue( report.exists() );
String htmlContent = FileUtils.fileRead( report );
@@ -135,13 +147,15 @@
File report =
new File( getBasedir(), "target/site/unit/basic-surefire-report-success-false/surefire-report.html"
);
+ renderer( mojo, report );
+
assertTrue( report.exists() );
String htmlContent = FileUtils.fileRead( report );
int idx = htmlContent.indexOf( "./xref-test/com/shape/CircleTest.html#44" );
- assertTrue( idx >= 0 );
+ assertTrue( idx == -1 );
}
public void testBasicSurefireReportIfReportingIsNull()
@@ -158,6 +172,8 @@
File report =
new File( getBasedir(), "target/site/unit/basic-surefire-report-reporting-null/surefire-report.html"
);
+ renderer( mojo, report );
+
assertTrue( report.exists() );
String htmlContent = FileUtils.fileRead( report );
@@ -166,4 +182,35 @@
assertTrue( idx < 0 );
}
+
+ /**
+ * Renderer the sink from the report mojo.
+ *
+ * @param mojo not null
+ * @param outputHtml not null
+ * @throws RendererException if any
+ * @throws IOException if any
+ */
+ private void renderer( SurefireReportMojo mojo, File outputHtml )
+ throws RendererException, IOException
+ {
+ Writer writer = null;
+ SiteRenderingContext context = new SiteRenderingContext();
+ context.setDecoration( new DecorationModel() );
+ context.setTemplateName( "org/apache/maven/doxia/siterenderer/resources/default-site.vm"
);
+ context.setLocale( Locale.ENGLISH );
+
+ try
+ {
+ outputHtml.getParentFile().mkdirs();
+ writer = WriterFactory.newXmlWriter( outputHtml );
+
+ mojo.getSiteRenderer().generateDocument( writer, (SiteRendererSink) mojo.getSink(),
+ context );
+ }
+ finally
+ {
+ IOUtil.close( writer );
+ }
+ }
}
Author: vsiveton
Date: Thu Aug 13 13:07:05 2009
New Revision: 803872
URL: http://svn.apache.org/viewvc?rev=803872&view=rev
Log:
o order tags according our conventions
o using latest maven-plugin-testing-harness
Modified:
maven/surefire/trunk/maven-surefire-report-plugin/pom.xml
Modified: maven/surefire/trunk/maven-surefire-report-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/pom.xml?rev=803872&r1=803871&r2=803872&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/pom.xml Thu Aug 13 13:07:05 2009
@@ -34,10 +34,6 @@
<name>Maven Surefire Report Plugin</name>
- <prerequisites>
- <maven>2.0.3</maven>
- </prerequisites>
-
<developers>
<developer>
<id>jruiz</id>
@@ -46,6 +42,10 @@
</developer>
</developers>
+ <prerequisites>
+ <maven>2.0.3</maven>
+ </prerequisites>
+
<distributionManagement>
<site>
<id>apache.website</id>
@@ -53,28 +53,36 @@
</site>
</distributionManagement>
+ <properties>
+ <mavenVersion>2.0</mavenVersion>
+ </properties>
+
<dependencies>
+ <!-- maven -->
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>2.0</version>
+ <version>${mavenVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>2.0</version>
+ <version>${mavenVersion}</version>
</dependency>
+
+ <!-- test -->
<dependency>
- <groupId>org.apache.maven.shared</groupId>
+ <groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
+ <version>1.2</version>
<scope>test</scope>
- <version>1.0-beta-1</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<stagingSiteURL>scp://people.apache.org/www/maven.apache.org/plugins/${project.artifactId}-${project.version}</stagingSiteURL>
@@ -83,6 +91,16 @@
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
<profiles>
<!-- Force JDK 1.4 for this one, plugins can never be built on 1.3 -->
<profile>
@@ -134,13 +152,4 @@
</build>
</profile>
</profiles>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
</project>
Author: bentmann
Date: Sat Aug 8 14:56:38 2009
New Revision: 802386
URL: http://svn.apache.org/viewvc?rev=802386&view=rev
Log:
o Stabilized ITs
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/pom.xml
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportTest.java?rev=802386&r1=802385&r2=802386&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportTest.java
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportTest.java
Sat Aug 8 14:56:38 2009
@@ -23,7 +23,6 @@
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
List goals = this.getInitialGoals();
- goals.add( "jxr:test-jxr" );
goals.add( "surefire-report:report" );
verifier.executeGoals( goals );
//DGF even though the build will succeed, the log will contain errors (from the failure)
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml?rev=802386&r1=802385&r2=802386&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/aggregate-report/pom.xml
Sat Aug 8 14:56:38 2009
@@ -48,13 +48,8 @@
<reporting>
<plugins>
<plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>${surefire.version}</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/pom.xml?rev=802386&r1=802385&r2=802386&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/pom.xml
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-162-charsetProvider/pom.xml
Sat Aug 8 14:56:38 2009
@@ -1,41 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.surefire.its</groupId>
- <artifactId>surefire-162-charsetProvider</artifactId>
- <name>Test alternate CharsetProvider</name>
- <version>1.0-SNAPSHOT</version>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <forkMode>once</forkMode>
- <useSystemClassLoader>true</useSystemClassLoader>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jcharset</groupId>
- <artifactId>jcharset</artifactId>
- <version>1.2.1</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.surefire.its</groupId>
+ <artifactId>surefire-162-charsetProvider</artifactId>
+ <name>Test alternate CharsetProvider</name>
+ <version>1.0-SNAPSHOT</version>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <forkMode>once</forkMode>
+ <useSystemClassLoader>true</useSystemClassLoader>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jcharset</groupId>
+ <artifactId>jcharset</artifactId>
+ <version>1.2.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</project>
Author: vsiveton
Date: Sat Aug 8 13:41:57 2009
New Revision: 802375
URL: http://svn.apache.org/viewvc?rev=802375&view=rev
Log:
o fixed ambiguous links
o added Doxia xsd
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/index.apt
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/usage.apt
maven/surefire/trunk/maven-surefire-plugin/src/site/fml/faq.fml
maven/surefire/trunk/maven-surefire-plugin/src/site/site.xml
Modified: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/index.apt?rev=802375&r1=802374&r2=802375&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/apt/index.apt (original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/apt/index.apt Sat Aug 8 13:41:57
2009
@@ -6,6 +6,26 @@
July 2006
------
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
Maven Surefire Plugin
The Surefire Plugin is used during the <<<test>>> phase of the build
@@ -27,48 +47,48 @@
The Surefire Plugin has only 1 goal:
- * {{{test-mojo.html}surefire:test}} runs the unit tests of an application.
+ * {{{./test-mojo.html}surefire:test}} runs the unit tests of an application.
[]
* Usage
- General instructions on how to use the Surefire Plugin can be found on the {{{usage.html}usage
page}}. Some more
+ General instructions on how to use the Surefire Plugin can be found on the {{{./usage.html}usage
page}}. Some more
specific use cases are described in the examples given below. Last but not least, users
occasionally contribute
additional examples, tips or errata to the
{{{http://docs.codehaus.org/display/MAVENUSER/Surefire+Plugin}plugin's wiki page}}.
- In case you still have questions regarding the plugin's usage, please have a look at the
{{{faq.html}FAQ}} and feel
- free to contact the {{{mail-lists.html}user mailing list}}. The posts to the mailing list
are archived and could
+ In case you still have questions regarding the plugin's usage, please have a look at the
{{{./faq.html}FAQ}} and feel
+ free to contact the {{{./mail-lists.html}user mailing list}}. The posts to the mailing
list are archived and could
already contain the answer to your question as part of an older thread. Hence, it is also
worth browsing/searching
- the {{{mail-lists.html}mail archive}}.
+ the {{{./mail-lists.html}mail archive}}.
If you feel like the plugin is missing a feature or has a defect, you can fill a feature
request or bug report in our
- {{{issue-tracking.html}issue tracker}}. When creating a new issue, please provide a comprehensive
description of your
+ {{{./issue-tracking.html}issue tracker}}. When creating a new issue, please provide a comprehensive
description of your
concern. Especially for fixing bugs it is crucial that the developers can reproduce your
problem. For this reason,
entire debug logs, POMs or most preferably little demo projects attached to the issue are
very much appreciated.
Of course, patches are welcome, too. Contributors can check out the project from our
- {{{source-repository.html}source repository}} and will find supplementary information in
the
+ {{{./source-repository.html}source repository}} and will find supplementary information
in the
{{{http://maven.apache.org/guides/development/guide-helping.html}guide to helping with
Maven}}.
* Examples
The following examples show how to use the Surefire Plugin in more advanced use-cases:
- * {{{examples/testng.html}Using TestNG}}
+ * {{{./examples/testng.html}Using TestNG}}
+
+ * {{{./examples/skipping-test.html}Skipping Tests}}
+
+ * {{{./examples/inclusion-exclusion.html}Inclusions and Exclusions of Tests}}
- * {{{examples/skipping-test.html}Skipping Tests}}
+ * {{{./examples/single-test.html}Running a Single Test}}
- * {{{examples/inclusion-exclusion.html}Inclusions and Exclusions of Tests}}
+ * {{{./examples/class-loading.html}Class Loading Issues}}
- * {{{examples/single-test.html}Running a Single Test}}
+ * {{{./examples/debugging.html}Debugging Tests}}
- * {{{examples/class-loading.html}Class Loading Issues}}
+ * {{{./examples/system-properties.html}Using System Properties}}
- * {{{examples/debugging.html}Debugging Tests}}
+ * {{{./examples/additional-classpath.html}Additional Classpath Elements}}
- * {{{examples/system-properties.html}Using System Properties}}
-
- * {{{examples/additional-classpath.html}Additional Classpath Elements}}
-
[]
Modified: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/usage.apt?rev=802375&r1=802374&r2=802375&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/apt/usage.apt (original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/apt/usage.apt Sat Aug 8 13:41:57
2009
@@ -7,6 +7,26 @@
July 2006
------
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
Usage
The Surefire Plugin can be invoked by calling the <<<test>>> phase of
the
@@ -47,5 +67,4 @@
tests (including if you are using TestNG to execute your JUnit tests, which
occurs by default if both are present in Surefire).
- See {{{examples/testng.html} Using TestNG}} for more information.
-
+ See {{{./examples/testng.html} Using TestNG}} for more information.
Modified: maven/surefire/trunk/maven-surefire-plugin/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/fml/faq.fml?rev=802375&r1=802374&r2=802375&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/fml/faq.fml (original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/fml/faq.fml Sat Aug 8 13:41:57 2009
@@ -19,7 +19,11 @@
under the License.
-->
-<faqs id="FAQ" title="Frequently Asked Questions">
+
+<faqs xmlns="http://maven.apache.org/FML/1.0.1"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/FML/1.0.1 http://maven.apache.org/xsd/fml-1.0.1.xsd"
+ id="FAQ" title="Frequently Asked Questions">
<part id="General">
<faq id="reuse-test-code">
<question>How can I reuse my test code in other modules?</question>
Modified: maven/surefire/trunk/maven-surefire-plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/site.xml?rev=802375&r1=802374&r2=802375&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/site.xml (original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/site.xml Sat Aug 8 13:41:57 2009
@@ -17,9 +17,12 @@
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
- -->
+-->
-<project>
+<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd"
+ name="Maven Surefire plugin">
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
Author: bentmann
Date: Sat Aug 8 12:11:39 2009
New Revision: 802348
URL: http://svn.apache.org/viewvc?rev=802348&view=rev
Log:
o Enabled filtering of plugin version
Added:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt.vm
- copied, changed from r793387, maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt.vm
- copied, changed from r793387, maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt.vm
- copied, changed from r793386, maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/skipping-test.apt.vm
- copied, changed from r793386, maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/skipping-test.apt
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/system-properties.apt.vm
- copied, changed from r793386, maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/system-properties.apt
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm
- copied, changed from r793387, maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt
maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/changing-report-name.apt.vm
- copied, changed from r793386, maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/changing-report-name.apt
maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/cross-referencing.apt.vm
- copied, changed from r793386, maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/cross-referencing.apt
maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/report-custom-location.apt.vm
- copied, changed from r793386, maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/report-custom-location.apt
maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/show-failures.apt.vm
- copied, changed from r793386, maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/show-failures.apt
maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/usage.apt.vm
- copied, changed from r793386, maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/usage.apt
Removed:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/skipping-test.apt
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/system-properties.apt
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt
maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/changing-report-name.apt
maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/cross-referencing.apt
maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/report-custom-location.apt
maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/show-failures.apt
maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/usage.apt
Copied: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt.vm
(from r793387, maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt.vm?p2=maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt.vm&p1=maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt&r1=793387&r2=802348&rev=802348&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt
(original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt.vm
Sat Aug 8 12:11:39 2009
@@ -22,11 +22,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>${project.version}</version>
<configuration>
<additionalClasspathElements>
- <additionalClasspathElement>path/to/additional/resources</additionalClasspathElement>
- <additionalClasspathElement>path/to/additional/jar</additionalClasspathElement>
+ <additionalClasspathElement>path/to/additional/resources</additionalClasspathElement>
+ <additionalClasspathElement>path/to/additional/jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
Copied: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt.vm
(from r793387, maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt.vm?p2=maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt.vm&p1=maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt&r1=793387&r2=802348&rev=802348&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt (original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt.vm
Sat Aug 8 12:11:39 2009
@@ -124,7 +124,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>${project.version}</version>
<configuration>
<useSystemClassLoader>false</useSystemClassLoader>
</configuration>
Copied: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt.vm
(from r793386, maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt.vm?p2=maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt.vm&p1=maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt&r1=793386&r2=802348&rev=802348&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt
(original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/inclusion-exclusion.apt.vm
Sat Aug 8 12:11:39 2009
@@ -35,7 +35,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.2</version>
+ <version>${project.version}</version>
<configuration>
<includes>
<include>Sample.java</include>
@@ -63,7 +63,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.2</version>
+ <version>${project.version}</version>
<configuration>
<excludes>
<exclude>**/TestCircle.java</exclude>
Copied: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/skipping-test.apt.vm
(from r793386, maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/skipping-test.apt)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/skipping-test.apt.vm?p2=maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/skipping-test.apt.vm&p1=maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/skipping-test.apt&r1=793386&r2=802348&rev=802348&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/skipping-test.apt (original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/skipping-test.apt.vm
Sat Aug 8 12:11:39 2009
@@ -21,7 +21,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.2</version>
+ <version>${project.version}</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
Copied: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/system-properties.apt.vm
(from r793386, maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/system-properties.apt)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/system-properties.apt.vm?p2=maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/system-properties.apt.vm&p1=maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/system-properties.apt&r1=793386&r2=802348&rev=802348&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/system-properties.apt
(original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/system-properties.apt.vm
Sat Aug 8 12:11:39 2009
@@ -24,11 +24,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.2</version>
+ <version>${project.version}</version>
<configuration>
<systemPropertyVariables>
<propertyName>propertyValue</propertyName>
- <buildDirectory>${project.build.directory}</buildDirectory>
+ <buildDirectory>\${project.build.directory}</buildDirectory>
[...]
</systemPropertyVariables>
</configuration>
@@ -50,7 +50,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.2</version>
+ <version>${project.version}</version>
<configuration>
<systemProperties>
<property>
@@ -80,12 +80,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.2</version>
+ <version>${project.version}</version>
<configuration>
<systemProperties>
<property>
<name>buildDir</name>
- <value>${project.build.outputDirectory}</value>
+ <value>\${project.build.outputDirectory}</value>
</property>
</systemProperties>
</configuration>
Copied: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm (from
r793387, maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm?p2=maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm&p1=maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt&r1=793387&r2=802348&rev=802348&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt (original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt.vm Sat Aug
8 12:11:39 2009
@@ -43,7 +43,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.2</version>
+ <version>${project.version}</version>
<configuration>
<suiteXmlFiles>
<suiteXmlFile>testng.xml</suiteXmlFile>
@@ -65,7 +65,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.2</version>
+ <version>${project.version}</version>
<configuration>
<systemProperties>
<property>
@@ -90,7 +90,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.2</version>
+ <version>${project.version}</version>
<configuration>
<groups>functest,perftest</groups>
</configuration>
@@ -111,7 +111,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.2</version>
+ <version>${project.version}</version>
<configuration>
<parallel>methods</parallel>
<threadCount>10</threadCount>
@@ -135,7 +135,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>${project.version}</version>
<configuration>
<properties>
<property>
Copied: maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/changing-report-name.apt.vm
(from r793386, maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/changing-report-name.apt)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/changing-report-name.apt.vm?p2=maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/changing-report-name.apt.vm&p1=maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/changing-report-name.apt&r1=793386&r2=802348&rev=802348&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/changing-report-name.apt
(original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/changing-report-name.apt.vm
Sat Aug 8 12:11:39 2009
@@ -37,9 +37,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.2</version>
+ <version>${project.version}</version>
<configuration>
- <outputName>newname</outputName>
+ <outputName>newname</outputName>
</configuration>
</plugin>
</plugins>
Copied: maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/cross-referencing.apt.vm
(from r793386, maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/cross-referencing.apt)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/cross-referencing.apt.vm?p2=maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/cross-referencing.apt.vm&p1=maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/cross-referencing.apt&r1=793386&r2=802348&rev=802348&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/cross-referencing.apt
(original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/cross-referencing.apt.vm
Sat Aug 8 12:11:39 2009
@@ -42,9 +42,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.2</version>
+ <version>${project.version}</version>
<configuration>
- <!-- place your configuration here -->
+ <!-- place your configuration here -->
</configuration>
</plugin>
<plugin>
Copied: maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/report-custom-location.apt.vm
(from r793386, maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/report-custom-location.apt)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/report-custom-location.apt.vm?p2=maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/report-custom-location.apt.vm&p1=maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/report-custom-location.apt&r1=793386&r2=802348&rev=802348&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/report-custom-location.apt
(original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/report-custom-location.apt.vm
Sat Aug 8 12:11:39 2009
@@ -39,17 +39,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.2</version>
+ <version>${project.version}</version>
<configuration>
- <outputDirectory>${basedir}/target/newsite</outputDirectory>
+ <outputDirectory>${basedir}/target/newsite</outputDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
+ <version>2.0.1</version>
<configuration>
- <outputDirectory>${basedir}/target/newsite</outputDirectory>
+ <outputDirectory>${basedir}/target/newsite</outputDirectory>
</configuration>
</plugin>
</plugins>
Copied: maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/show-failures.apt.vm
(from r793386, maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/show-failures.apt)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/show-failures.apt.vm?p2=maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/show-failures.apt.vm&p1=maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/show-failures.apt&r1=793386&r2=802348&rev=802348&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/show-failures.apt
(original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/examples/show-failures.apt.vm
Sat Aug 8 12:11:39 2009
@@ -37,9 +37,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.2</version>
+ <version>${project.version}</version>
<configuration>
- <showSuccess>false</showSuccess>
+ <showSuccess>false</showSuccess>
</configuration>
</plugin>
</plugins>
Copied: maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/usage.apt.vm (from
r793386, maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/usage.apt)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/usage.apt.vm?p2=maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/usage.apt.vm&p1=maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/usage.apt&r1=793386&r2=802348&rev=802348&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/usage.apt (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/usage.apt.vm Sat Aug 8
12:11:39 2009
@@ -38,7 +38,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.2</version>
+ <version>${project.version}</version>
</plugin>
</plugins>
</reporting>
Author: bentmann
Date: Sun Jul 12 18:14:22 2009
New Revision: 793387
URL: http://svn.apache.org/viewvc?rev=793387&view=rev
Log:
o Added plugin version to POM snippets in documentation
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt
Modified: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt?rev=793387&r1=793386&r2=793387&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt
(original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt
Sun Jul 12 18:14:22 2009
@@ -22,10 +22,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
<configuration>
<additionalClasspathElements>
- <additionalClasspathElement>path/to/additional/resources</additionalClasspathElement>
- <additionalClasspathElement>path/to/additional/jar</additionalClasspathElement>
+ <additionalClasspathElement>path/to/additional/resources</additionalClasspathElement>
+ <additionalClasspathElement>path/to/additional/jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
@@ -33,4 +34,4 @@
</build>
[...]
</project>
-+---+
\ No newline at end of file
++---+
Modified: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt?rev=793387&r1=793386&r2=793387&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt (original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/class-loading.apt Sun
Jul 12 18:14:22 2009
@@ -124,6 +124,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
<configuration>
<useSystemClassLoader>false</useSystemClassLoader>
</configuration>
@@ -144,4 +145,4 @@
* If you're using the defaults, useSystemClassLoader=true and useManifestOnlyJar=false.
In that case, look at the generated manifest-only surefire booter jar. Open it up (it's
just a zip) and read its manifest.
- * Run mvn with -Dmaven.surefire.debug, and attach to the running process with a debugger.
\ No newline at end of file
+ * Run mvn with -Dmaven.surefire.debug, and attach to the running process with a debugger.
Modified: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt?rev=793387&r1=793386&r2=793387&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt (original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/testng.apt Sun Jul 12
18:14:22 2009
@@ -135,6 +135,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
<configuration>
<properties>
<property>
Author: bentmann
Date: Sun Jul 12 18:11:15 2009
New Revision: 793386
URL: http://svn.apache.org/viewvc?rev=793386&view=rev
Log:
o Set svn:eol-style=native
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt
(contents, props changed)
maven/surefire/trunk/maven-surefire-report-plugin/src/test/resources/test-reports/TEST-AntUnit.xml
(contents, props changed)
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIT.java
(contents, props changed)
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlSingleTest.java
(contents, props changed)
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestPlainOldJavaClasspath.java
(contents, props changed)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml
(contents, props changed)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java
(contents, props changed)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/pom.xml (contents,
props changed)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/src/main/webapp/WEB-INF/web.xml
(props changed)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/src/test/java/WebAppTest.java
(contents, props changed)
Modified: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt?rev=793386&r1=793385&r2=793386&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt
(original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt
Sun Jul 12 18:11:15 2009
@@ -1,36 +1,36 @@
- ------
- Additional Classpath
- ------
- Pascal Lambert
- ------
- March 2008
- ------
-
-Additional Classpath Elements
-
- If you need to put more stuff in your classpath when Surefire executes (e.g some funky
resources or a container special jar),
- we normally recommend you add it to your classpath as a dependency. Consider deploying
shared jars to a private remote repository for your
- organization.
-
- But, if you must, you can use the <<<additionalClasspathElements>>> element
to add custom resources/jars to your classpath.
-
-+---+
-<project>
- [...]
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <additionalClasspathElements>
- <additionalClasspathElement>path/to/additional/resources</additionalClasspathElement>
- <additionalClasspathElement>path/to/additional/jar</additionalClasspathElement>
- </additionalClasspathElements>
- </configuration>
- </plugin>
- </plugins>
- </build>
- [...]
-</project>
+ ------
+ Additional Classpath
+ ------
+ Pascal Lambert
+ ------
+ March 2008
+ ------
+
+Additional Classpath Elements
+
+ If you need to put more stuff in your classpath when Surefire executes (e.g some funky
resources or a container special jar),
+ we normally recommend you add it to your classpath as a dependency. Consider deploying
shared jars to a private remote repository for your
+ organization.
+
+ But, if you must, you can use the <<<additionalClasspathElements>>> element
to add custom resources/jars to your classpath.
+
++---+
+<project>
+ [...]
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <additionalClasspathElements>
+ <additionalClasspathElement>path/to/additional/resources</additionalClasspathElement>
+ <additionalClasspathElement>path/to/additional/jar</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ [...]
+</project>
+---+
\ No newline at end of file
Propchange: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/examples/additional-classpath.apt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/test/resources/test-reports/TEST-AntUnit.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/test/resources/test-reports/TEST-AntUnit.xml?rev=793386&r1=793385&r2=793386&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/test/resources/test-reports/TEST-AntUnit.xml
(original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/test/resources/test-reports/TEST-AntUnit.xml
Sun Jul 12 18:11:15 2009
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testsuite buildFile="/home/pjanes/devel/maven/client/tools/tests/changebase.xml" hostname="merope"
name="tests.changebase_xml" timestamp="2008-04-23T13:25:46">
- <testcase name="testNegativeValue">
- <time>0.378</time>
- </testcase>
- <tests>1</tests>
- <failures>0</failures>
- <errors>0</errors>
- <time>0.378</time>
-</testsuite>
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite buildFile="/home/pjanes/devel/maven/client/tools/tests/changebase.xml" hostname="merope"
name="tests.changebase_xml" timestamp="2008-04-23T13:25:46">
+ <testcase name="testNegativeValue">
+ <time>0.378</time>
+ </testcase>
+ <tests>1</tests>
+ <failures>0</failures>
+ <errors>0</errors>
+ <time>0.378</time>
+</testsuite>
Propchange: maven/surefire/trunk/maven-surefire-report-plugin/src/test/resources/test-reports/TEST-AntUnit.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIT.java?rev=793386&r1=793385&r2=793386&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIT.java
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIT.java
Sun Jul 12 18:11:15 2009
@@ -1,37 +1,37 @@
-package org.apache.maven.surefire.its;
-
-import java.util.ArrayList;
-
-import junit.framework.TestCase;
-
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
-
-
-/**
- * Base class of all integration test cases. Mainly used to pickup surefire version
- * from system property
- * @author Dan T. Tran
- *
- */
-public abstract class AbstractSurefireIT
- extends TestCase
-{
- private String surefireVersion = System.getProperty( "surefire.version" );
-
- protected ArrayList getInitialGoals()
- {
- ArrayList goals = new ArrayList();
- goals.add( "-Dsurefire.version=" + surefireVersion );
- return goals;
- }
-
- protected void executeGoal( Verifier verifier, String goal )
- throws VerificationException
- {
- ArrayList goals = this.getInitialGoals();
- goals.add( goal );
- verifier.executeGoals( goals );
- }
-
-}
+package org.apache.maven.surefire.its;
+
+import java.util.ArrayList;
+
+import junit.framework.TestCase;
+
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+
+
+/**
+ * Base class of all integration test cases. Mainly used to pickup surefire version
+ * from system property
+ * @author Dan T. Tran
+ *
+ */
+public abstract class AbstractSurefireIT
+ extends TestCase
+{
+ private String surefireVersion = System.getProperty( "surefire.version" );
+
+ protected ArrayList getInitialGoals()
+ {
+ ArrayList goals = new ArrayList();
+ goals.add( "-Dsurefire.version=" + surefireVersion );
+ return goals;
+ }
+
+ protected void executeGoal( Verifier verifier, String goal )
+ throws VerificationException
+ {
+ ArrayList goals = this.getInitialGoals();
+ goals.add( goal );
+ verifier.executeGoals( goals );
+ }
+
+}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AbstractSurefireIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlSingleTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlSingleTest.java?rev=793386&r1=793385&r2=793386&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlSingleTest.java
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlSingleTest.java
Sun Jul 12 18:11:15 2009
@@ -1,37 +1,37 @@
-package org.apache.maven.surefire.its;
-
-
-import java.io.File;
-import java.util.List;
-
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-/**
- * Use -Dtest to run a single TestNG test, overriding the suite XML parameter.
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- *
- */
-public class TestNgSuiteXmlSingleTest
- extends AbstractSurefireIT
-{
- public void testTestNGSuite()
- throws Exception
- {
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/testng-twoTestCaseSuite"
);
-
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- List goals = this.getInitialGoals();
- goals.add( "test" );
- goals.add( "-Dtest=TestNGTestTwo" );
- verifier.executeGoals( goals );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
-
- List reports = HelperAssertions.extractReports( ( new File[] { testDir } ) );
- ITSuiteResults results = HelperAssertions.parseReportList( reports );
- HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, results );
- }
-
-}
+package org.apache.maven.surefire.its;
+
+
+import java.io.File;
+import java.util.List;
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * Use -Dtest to run a single TestNG test, overriding the suite XML parameter.
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ *
+ */
+public class TestNgSuiteXmlSingleTest
+ extends AbstractSurefireIT
+{
+ public void testTestNGSuite()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/testng-twoTestCaseSuite"
);
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ List goals = this.getInitialGoals();
+ goals.add( "test" );
+ goals.add( "-Dtest=TestNGTestTwo" );
+ verifier.executeGoals( goals );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ List reports = HelperAssertions.extractReports( ( new File[] { testDir } ) );
+ ITSuiteResults results = HelperAssertions.parseReportList( reports );
+ HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, results );
+ }
+
+}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgSuiteXmlSingleTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestPlainOldJavaClasspath.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestPlainOldJavaClasspath.java?rev=793386&r1=793385&r2=793386&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestPlainOldJavaClasspath.java
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestPlainOldJavaClasspath.java
Sun Jul 12 18:11:15 2009
@@ -1,30 +1,30 @@
-package org.apache.maven.surefire.its;
-
-
-import java.io.File;
-
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-/**
- * Test useManifestOnlyJar option
- *
- * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
- *
- */
-public class TestPlainOldJavaClasspath
- extends AbstractSurefireIT
-{
- public void testPlainOldJavaClasspath ()
- throws Exception
- {
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/plain-old-java-classpath"
);
-
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- this.executeGoal( verifier, "test" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
-
- HelperAssertions.assertTestSuiteResults( 1, 0, 0, 0, testDir );
- }
-}
+package org.apache.maven.surefire.its;
+
+
+import java.io.File;
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * Test useManifestOnlyJar option
+ *
+ * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
+ *
+ */
+public class TestPlainOldJavaClasspath
+ extends AbstractSurefireIT
+{
+ public void testPlainOldJavaClasspath ()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/plain-old-java-classpath"
);
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ this.executeGoal( verifier, "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/TestPlainOldJavaClasspath.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml?rev=793386&r1=793385&r2=793386&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml
Sun Jul 12 18:11:15 2009
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-<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.plugins.surefire</groupId>
- <artifactId>plain-old-java-classpath</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Test for useManifestOnlyJar=false</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <useManifestOnlyJar>false</useManifestOnlyJar>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<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.plugins.surefire</groupId>
+ <artifactId>plain-old-java-classpath</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for useManifestOnlyJar=false</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <useManifestOnlyJar>false</useManifestOnlyJar>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java?rev=793386&r1=793385&r2=793386&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java
Sun Jul 12 18:11:15 2009
@@ -1,69 +1,69 @@
-package plainOldJavaClasspath;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class BasicTest
- extends TestCase
-{
-
- private boolean setUpCalled = false;
-
- private static boolean tearDownCalled = false;
-
- public BasicTest( String name, String extraName )
- {
- super( name );
- }
-
- public static Test suite()
- {
- System.out.println("suite");
- TestSuite suite = new TestSuite();
- Test test = new BasicTest( "testSetUp", "dummy" );
- suite.addTest( test );
- TestSetup setup = new TestSetup( suite )
- {
-
- protected void setUp()
- {
- //oneTimeSetUp();
- }
-
- protected void tearDown()
- {
- oneTimeTearDown();
- }
-
- };
-
- return setup;
- }
-
- protected void setUp()
- {
- setUpCalled = true;
- tearDownCalled = false;
- System.out.println( "Called setUp" );
- }
-
- protected void tearDown()
- {
- setUpCalled = false;
- tearDownCalled = true;
- System.out.println( "Called tearDown" );
- }
-
- public void testSetUp()
- {
- assertTrue( "setUp was not called", setUpCalled );
- }
-
- public static void oneTimeTearDown()
- {
- assertTrue( "tearDown was not called", tearDownCalled );
- }
-
-}
+package plainOldJavaClasspath;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class BasicTest
+ extends TestCase
+{
+
+ private boolean setUpCalled = false;
+
+ private static boolean tearDownCalled = false;
+
+ public BasicTest( String name, String extraName )
+ {
+ super( name );
+ }
+
+ public static Test suite()
+ {
+ System.out.println("suite");
+ TestSuite suite = new TestSuite();
+ Test test = new BasicTest( "testSetUp", "dummy" );
+ suite.addTest( test );
+ TestSetup setup = new TestSetup( suite )
+ {
+
+ protected void setUp()
+ {
+ //oneTimeSetUp();
+ }
+
+ protected void tearDown()
+ {
+ oneTimeTearDown();
+ }
+
+ };
+
+ return setup;
+ }
+
+ protected void setUp()
+ {
+ setUpCalled = true;
+ tearDownCalled = false;
+ System.out.println( "Called setUp" );
+ }
+
+ protected void tearDown()
+ {
+ setUpCalled = false;
+ tearDownCalled = true;
+ System.out.println( "Called tearDown" );
+ }
+
+ public void testSetUp()
+ {
+ assertTrue( "setUp was not called", setUpCalled );
+ }
+
+ public static void oneTimeTearDown()
+ {
+ assertTrue( "tearDown was not called", tearDownCalled );
+ }
+
+}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/pom.xml?rev=793386&r1=793385&r2=793386&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/pom.xml (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/pom.xml Sun
Jul 12 18:11:15 2009
@@ -10,12 +10,12 @@
<finalName>webapp</finalName>
<plugins>
<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-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ </plugin>
+
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.0</version>
@@ -84,8 +84,8 @@
<artifactId>commons-el</artifactId>
<version>1.0</version>
</dependency>
- </dependencies>
-
+ </dependencies>
+
<profiles>
<profile>
<id>default-tools.jar</id>
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/src/test/java/WebAppTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/src/test/java/WebAppTest.java?rev=793386&r1=793385&r2=793386&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/src/test/java/WebAppTest.java
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/src/test/java/WebAppTest.java
Sun Jul 12 18:11:15 2009
@@ -1,37 +1,37 @@
-import java.io.InputStream;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.mortbay.jetty.Server;
-
-
-public class WebAppTest extends TestCase {
- private Server server = null;
-
- public void setUp() throws Exception {
- System.setProperty("org.mortbay.xml.XmlParser.NotValidating", "true");
-
- server = new Server();
- String testPort = ":18080";
- server.addListener(testPort);
- server.addWebApplication("127.0.0.1", "/webapp", "target/webapp");
-
- server.start();
- }
-
- public void testBlah() throws Exception {
- URL url = new URL("http://127.0.0.1:18080/webapp/index.jsp");
- InputStream stream = url.openStream();
- StringBuffer sb = new StringBuffer();
- for (int i = stream.read(); i != -1; i = stream.read()) {
- sb.append((char)i);
- }
- String value = sb.toString();
- assertTrue(value, value.contains("Hello"));
- }
-
- public void tearDown() throws Exception {
- if (server != null) server.stop();
- }
-}
+import java.io.InputStream;
+import java.net.URL;
+
+import junit.framework.TestCase;
+
+import org.mortbay.jetty.Server;
+
+
+public class WebAppTest extends TestCase {
+ private Server server = null;
+
+ public void setUp() throws Exception {
+ System.setProperty("org.mortbay.xml.XmlParser.NotValidating", "true");
+
+ server = new Server();
+ String testPort = ":18080";
+ server.addListener(testPort);
+ server.addWebApplication("127.0.0.1", "/webapp", "target/webapp");
+
+ server.start();
+ }
+
+ public void testBlah() throws Exception {
+ URL url = new URL("http://127.0.0.1:18080/webapp/index.jsp");
+ InputStream stream = url.openStream();
+ StringBuffer sb = new StringBuffer();
+ for (int i = stream.read(); i != -1; i = stream.read()) {
+ sb.append((char)i);
+ }
+ String value = sb.toString();
+ assertTrue(value, value.contains("Hello"));
+ }
+
+ public void tearDown() throws Exception {
+ if (server != null) server.stop();
+ }
+}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/webapp/src/test/java/WebAppTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Author: bentmann
Date: Sun Jun 28 18:17:52 2009
New Revision: 789135
URL: http://svn.apache.org/viewvc?rev=789135&view=rev
Log:
o Decoupled test from assumption that default values apply (for instance during CI, surefire.useFile
is commonly set to false)
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-execute-error/pom.xml
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-execute-error/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-execute-error/pom.xml?rev=789135&r1=789134&r2=789135&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-execute-error/pom.xml
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-execute-error/pom.xml
Sun Jun 28 18:17:52 2009
@@ -42,6 +42,7 @@
<version>${surefire.version}</version>
<configuration>
<forkMode>once</forkMode>
+ <useFile>true</useFile>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
</plugin>
Author: bentmann
Date: Sun Jun 28 18:05:54 2009
New Revision: 789132
URL: http://svn.apache.org/viewvc?rev=789132&view=rev
Log:
o Decoupled test from details of the Maven core (the interaction between interpolation and
plugin configuration is not Surefire's concern, the core IT for MNG-3530 covers this)
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml?rev=789132&r1=789131&r2=789132&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml
Sun Jun 28 18:05:54 2009
@@ -66,7 +66,6 @@
<buildDirectory>${project.build.directory}</buildDirectory>
<reservedPort1>${reservedPort1}</reservedPort1>
<reservedPort2>${reservedPort2}</reservedPort2>
- <reservedPort3>${reservedPort3}</reservedPort3>
<nullProperty></nullProperty>
<blankProperty> </blankProperty>
<!-- this is a work around for SUREFIRE-121 -->
@@ -89,7 +88,6 @@
</dependencies>
<properties>
- <reservedPort3>1</reservedPort3>
<setOnArgLineWorkAround>fool</setOnArgLineWorkAround>
</properties>
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java?rev=789132&r1=789131&r2=789132&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
Sun Jun 28 18:05:54 2009
@@ -33,24 +33,18 @@
public void testSystemPropertyGenerateByOtherPlugin()
throws Exception
{
- int reservedPort1 = Integer.parseInt( System.getProperty( "reservedPort1" ) );
- int reservedPort2 = Integer.parseInt( System.getProperty( "reservedPort2" ) );
- int reservedPort3 = Integer.parseInt( System.getProperty( "reservedPort3" ) );
+ int reservedPort1 = Integer.parseInt( System.getProperty( "reservedPort1" ) );
+ int reservedPort2 = Integer.parseInt( System.getProperty( "reservedPort2" ) );
System.out.println( "reservedPort1: " + reservedPort1 );
System.out.println( "reservedPort2: " + reservedPort2 );
- System.out.println( "reservedPort3: " + reservedPort3 );
assertTrue( reservedPort1 != reservedPort2 );
-
- //plugin cannot overwrite the default value set in the pom, this is maven bug but
fixed at 2.1-M1
- assertEquals( 1, reservedPort3 );
-
}
public void testEmptySystemProperties()
{
- assertNull( "Null property is not null", System.getProperty( "nullProperty" ) );
- assertNull( "Blank property is not null", System.getProperty( "blankProperty" )
);
+ assertNull( "Null property is not null", System.getProperty( "nullProperty" ) );
+ assertNull( "Blank property is not null", System.getProperty( "blankProperty" ) );
}
/**
Author: olamy
Date: Mon Jun 15 21:22:16 2009
New Revision: 784986
URL: http://svn.apache.org/viewvc?rev=784986&view=rev
Log:
[SUREFIRE-551] On Linux (Ubuntu) it fails to escape all special characters when forking commands.
upgrade to p-u 1.5.9
Modified:
maven/surefire/trunk/pom.xml
Modified: maven/surefire/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/pom.xml?rev=784986&r1=784985&r2=784986&view=diff
==============================================================================
--- maven/surefire/trunk/pom.xml (original)
+++ maven/surefire/trunk/pom.xml Mon Jun 15 21:22:16 2009
@@ -120,7 +120,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.5.1</version>
+ <version>1.5.9</version>
</dependency>
</dependencies>
</dependencyManagement>
Author: olamy
Date: Sun Apr 5 06:56:13 2009
New Revision: 762048
URL: http://svn.apache.org/viewvc?rev=762048&view=rev
Log:
ignore eclipse file
Modified:
maven/surefire/trunk/ (props changed)
Propchange: maven/surefire/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Apr 5 06:56:13 2009
@@ -5,3 +5,4 @@
.classpath
.project
.metadata
+.settings
Author: jvanzyl
Date: Tue Mar 31 04:50:09 2009
New Revision: 760322
URL: http://svn.apache.org/viewvc?rev=760322&view=rev
Log:
o use injection for the toolchain manager
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Modified: maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java?rev=760322&r1=760321&r2=760322&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
(original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Tue Mar 31 04:50:09 2009
@@ -58,21 +58,9 @@
import org.apache.maven.surefire.report.FileReporter;
import org.apache.maven.surefire.report.ForkingConsoleReporter;
import org.apache.maven.surefire.report.XMLReporter;
-import org.codehaus.plexus.util.StringUtils;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import org.apache.maven.execution.MavenSession;
import org.apache.maven.toolchain.Toolchain;
import org.apache.maven.toolchain.ToolchainManager;
-import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.codehaus.plexus.util.StringUtils;
/**
* Run tests using Surefire.
@@ -484,6 +472,8 @@
*/
private ArtifactMetadataSource metadataSource;
+
+
private static final String BRIEF_REPORT_FORMAT = "brief";
private static final String PLAIN_REPORT_FORMAT = "plain";
@@ -553,6 +543,10 @@
*/
private String objectFactory;
+ /** @component */
+ private ToolchainManager toolchainManager;
+
+
public void execute()
throws MojoExecutionException, MojoFailureException
{
@@ -1181,19 +1175,12 @@
private Toolchain getToolchain()
{
Toolchain tc = null;
- try
+
+ if ( toolchainManager != null )
{
- if (session != null) //session is null in tests..
- {
- ToolchainManager toolchainManager = (ToolchainManager) session.getContainer().lookup(ToolchainManager.ROLE);
- if (toolchainManager != null)
- {
- tc = toolchainManager.getToolchainFromBuildContext("jdk", session);
- }
- }
- } catch (ComponentLookupException componentLookupException) {
- //just ignore, could happen in pre-2.0.9 builds..
+ tc = toolchainManager.getToolchainFromBuildContext( "jdk", session );
}
+
return tc;
}
}
Author: ogusakov
Date: Thu Mar 12 20:30:29 2009
New Revision: 753001
URL: http://svn.apache.org/viewvc?rev=753001&view=rev
Log:
[SUREFIRE-541] - applied Velo's patch
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
Modified: maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java?rev=753001&r1=753000&r2=753001&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
(original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Thu Mar 12 20:30:29 2009
@@ -19,6 +19,16 @@
* under the License.
*/
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
@@ -32,6 +42,7 @@
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -79,27 +90,27 @@
/**
* Set this to 'true' to skip running tests, but still compile them. Its use is NOT RECOMMENDED,
but quite
* convenient on occasion.
- *
+ *
* @parameter expression="${skipTests}"
* @since 2.4
*/
private boolean skipTests;
-
+
/**
* DEPRECATED This old parameter is just like skipTests, but bound to the old property
maven.test.skip.exec.
* Use -DskipTests instead; it's shorter.
- *
+ *
* @deprecated
* @parameter expression="${maven.test.skip.exec}"
* @since 2.3
*/
private boolean skipExec;
-
+
/**
* Set this to 'true' to bypass unit tests entirely. Its use is NOT RECOMMENDED, especially
if you
* enable it using the "maven.test.skip" property, because maven.test.skip disables both
running the
* tests and compiling the tests. Consider using the skipTests parameter instead.
- *
+ *
* @parameter expression="${maven.test.skip}"
*/
private boolean skip;
@@ -107,7 +118,7 @@
/**
* Set this to true to ignore a failure during testing. Its use is NOT RECOMMENDED, but
quite convenient on
* occasion.
- *
+ *
* @parameter expression="${maven.test.failure.ignore}"
*/
private boolean testFailureIgnore;
@@ -115,7 +126,7 @@
/**
* The base directory of the project being tested. This can be obtained in your unit
test by
* System.getProperty("basedir").
- *
+ *
* @parameter expression="${basedir}"
* @required
*/
@@ -123,7 +134,7 @@
/**
* The directory containing generated test classes of the project being tested.
- *
+ *
* @parameter expression="${project.build.testOutputDirectory}"
* @required
*/
@@ -148,7 +159,7 @@
/**
* The classpath elements of the project being tested.
- *
+ *
* @parameter expression="${project.testClasspathElements}"
* @required
* @readonly
@@ -157,22 +168,22 @@
/**
* Additional elements to be appended to the classpath.
- *
+ *
* @parameter
* @since 2.4
*/
private List additionalClasspathElements;
-
+
/**
* Base directory where all reports are written to.
- *
+ *
* @parameter expression="${project.build.directory}/surefire-reports"
*/
private File reportsDirectory;
/**
* The test source directory containing test class sources.
- *
+ *
* @parameter expression="${project.build.testSourceDirectory}"
* @required
* @since 2.2
@@ -181,11 +192,11 @@
/**
* Specify this parameter to run individual tests by file name, overriding the <code>includes/excludes</code>
- * parameters. Each pattern you specify here will be used to create an
+ * parameters. Each pattern you specify here will be used to create an
* include pattern formatted like <code>**/${test}.java</code>, so
you can just type "-Dtest=MyTest"
* to run a single test called "foo/MyTest.java". This parameter will override the TestNG
suiteXmlFiles
* parameter.
- *
+ *
* @parameter expression="${test}"
*/
private String test;
@@ -195,7 +206,7 @@
* specified and when the <code>test</code> parameter is not specified, the
default includes will be
* <code>**/Test*.java **/*Test.java **/*TestCase.java</code>.
This parameter is ignored if
* TestNG suiteXmlFiles are specified.
- *
+ *
* @parameter
*/
private List includes;
@@ -205,7 +216,7 @@
* specified and when the <code>test</code> parameter is not specified, the
default excludes will be
* <code>**/*$*</code> (which excludes all inner classes). This
parameter is ignored if
* TestNG suiteXmlFiles are specified.
- *
+ *
* @parameter
*/
private List excludes;
@@ -213,7 +224,7 @@
/**
* ArtifactRepository of the localRepository. To obtain the directory of localRepository
in unit tests use
* System.setProperty( "localRepository").
- *
+ *
* @parameter expression="${localRepository}"
* @required
* @readonly
@@ -228,13 +239,13 @@
private Properties systemProperties;
/**
- * List of System properties to pass to the JUnit tests.
- *
+ * List of System properties to pass to the JUnit tests.
+ *
* @parameter
* @since 2.5
*/
private Map systemPropertyVariables;
-
+
/**
* List of properties for configuring all TestNG related configurations. This is the
new
* preferred method of configuring TestNG.
@@ -246,7 +257,7 @@
/**
* Map of of plugin artifacts.
- *
+ *
* @parameter expression="${plugin.artifactMap}"
* @required
* @readonly
@@ -255,7 +266,7 @@
/**
* Map of of project artifacts.
- *
+ *
* @parameter expression="${project.artifactMap}"
* @required
* @readonly
@@ -264,21 +275,21 @@
/**
* Option to print summary of test suites or just print the test cases that has errors.
- *
+ *
* @parameter expression="${surefire.printSummary}" default-value="true"
*/
private boolean printSummary;
/**
* Selects the formatting for the test report to be generated. Can be set as brief or
plain.
- *
+ *
* @parameter expression="${surefire.reportFormat}" default-value="brief"
*/
private String reportFormat;
/**
* Option to generate a file test report or just output the test report to the console.
- *
+ *
* @parameter expression="${surefire.useFile}" default-value="true"
*/
private boolean useFile;
@@ -286,7 +297,7 @@
/**
* When forking, set this to true to redirect the unit test standard output to a file
(found in
* reportsDirectory/testName-output.txt).
- *
+ *
* @parameter expression="${maven.test.redirectTestOutputToFile}" default-value="false"
* @since 2.3
*/
@@ -294,16 +305,16 @@
/**
* Set this to "true" to cause a failure if there are no tests to run. Defaults to false.
- *
+ *
* @parameter expression="${failIfNoTests}"
* @since 2.4
*/
private Boolean failIfNoTests;
-
+
/**
* Option to specify the forking mode. Can be "never", "once" or "always". "none" and
"pertest" are also accepted
* for backwards compatibility.
- *
+ *
* @parameter expression="${forkMode}" default-value="once"
* @since 2.1
*/
@@ -312,7 +323,7 @@
/**
* Option to specify the jvm (or path to the java executable) to use with the forking
options. For the default, the
* jvm will be the same as the one used to run Maven.
- *
+ *
* @parameter expression="${jvm}"
* @since 2.1
*/
@@ -320,35 +331,35 @@
/**
* Arbitrary JVM options to set on the command line.
- *
+ *
* @parameter expression="${argLine}"
* @since 2.1
*/
private String argLine;
/**
- * Attach a debugger to the forked JVM. If set to "true", the process will suspend and
+ * Attach a debugger to the forked JVM. If set to "true", the process will suspend and
* wait for a debugger to attach on port 5005. If set to some other string, that
* string will be appended to the argLine, allowing you to configure arbitrary
* debuggability options (without overwriting the other options specified in the argLine).
- *
+ *
* @parameter expression="${maven.surefire.debug}"
* @since 2.4
*/
private String debugForkedProcess;
-
+
/**
* Kill the forked test process after a certain number of seconds. If set to 0,
* wait forever for the process, never timing out.
- *
+ *
* @parameter expression="${surefire.timeout}"
* @since 2.4
*/
private int forkedProcessTimeoutInSeconds;
-
+
/**
* Additional environments to set on the command line.
- *
+ *
* @parameter
* @since 2.1.3
*/
@@ -356,7 +367,7 @@
/**
* Command line working directory.
- *
+ *
* @parameter expression="${basedir}"
* @since 2.1.3
*/
@@ -366,7 +377,7 @@
* When false it makes tests run using the standard classloader delegation instead of
the default Maven isolated
* classloader. Only used when forking (forkMode is not "none").<br/> Setting it
to false helps with some problems
* caused by conflicts between xml parsers in the classpath and the Java 5 provider parser.
- *
+ *
* @parameter expression="${childDelegation}" default-value="false"
* @since 2.1
*/
@@ -375,7 +386,7 @@
/**
* (TestNG only) Groups for this test. Only classes/methods/etc decorated with one of
the groups specified here will be included
* in test run, if specified. This parameter is overridden if suiteXmlFiles are specified.
- *
+ *
* @parameter expression="${groups}"
* @since 2.2
*/
@@ -384,7 +395,7 @@
/**
* (TestNG only) Excluded groups. Any methods/classes/etc with one of the groups specified
in this list will specifically not be
* run. This parameter is overridden if suiteXmlFiles are specified.
- *
+ *
* @parameter expression="${excludedGroups}"
* @since 2.2
*/
@@ -394,32 +405,32 @@
* (TestNG only) List of TestNG suite xml file locations, seperated by commas. Note that
suiteXmlFiles is incompatible
* with several other parameters on this plugin, like includes/excludes. This parameter
is ignored if
* the "test" parameter is specified (allowing you to run a single test instead of an
entire suite).
- *
+ *
* @parameter
* @since 2.2
*/
private File[] suiteXmlFiles;
-
+
/**
* Allows you to specify the name of the JUnit artifact. If not set, <code>junit:junit</code>
will be used.
- *
+ *
* @parameter expression="${junitArtifactName}" default-value="junit:junit"
* @since 2.3.1
*/
private String junitArtifactName;
-
+
/**
* Allows you to specify the name of the TestNG artifact. If not set, <code>org.testng:testng</code>
will be used.
- *
+ *
* @parameter expression="${testNGArtifactName}" default-value="org.testng:testng"
* @since 2.3.1
*/
private String testNGArtifactName;
-
+
/**
* (TestNG only) The attribute thread-count allows you to specify how many threads should
be allocated for this execution. Only
* makes sense to use in conjunction with parallel.
- *
+ *
* @parameter expression="${threadCount}"
* @since 2.2
*/
@@ -429,7 +440,7 @@
* (TestNG only) When you use the parallel attribute, TestNG will try to run all your
test methods in separate threads, except for
* methods that depend on each other, which will be run in the same thread in order to
respect their order of
* execution.
- *
+ *
* @parameter expression="${parallel}"
* @todo test how this works with forking, and console/file output parallelism
* @since 2.2
@@ -438,7 +449,7 @@
/**
* Whether to trim the stack trace in the reports to just the lines within the test,
or show the full trace.
- *
+ *
* @parameter expression="${trimStackTrace}" default-value="true"
* @since 2.2
*/
@@ -446,21 +457,21 @@
/**
* Resolves the artifacts needed.
- *
+ *
* @component
*/
private ArtifactResolver artifactResolver;
/**
* Creates the artifact
- *
+ *
* @component
*/
private ArtifactFactory artifactFactory;
/**
* The plugin remote repositories declared in the pom.
- *
+ *
* @parameter expression="${project.pluginArtifactRepositories}"
* @since 2.2
*/
@@ -468,7 +479,7 @@
/**
* For retrieval of artifact's metadata.
- *
+ *
* @component
*/
private ArtifactMetadataSource metadataSource;
@@ -486,7 +497,7 @@
/**
* Flag to disable the generation of report files in xml format.
- *
+ *
* @parameter expression="${disableXmlReport}" default-value="false"
* @since 2.2
*/
@@ -496,21 +507,21 @@
* Option to pass dependencies to the system's classloader instead of using an isolated
class loader when forking.
* Prevents problems with JDKs which implement the service provider lookup mechanism
by using the system's
* classloader. Default value is "true".
- *
+ *
* @parameter expression="${surefire.useSystemClassLoader}"
* @since 2.3
*/
private Boolean useSystemClassLoader;
-
+
/**
* By default, Surefire forks your tests using a manifest-only jar; set this parameter
* to "false" to force it to launch your tests with a plain old Java classpath.
* (See http://maven.apache.org/plugins/maven-surefire-plugin/examples/class-loading.html
* for a more detailed explanation of manifest-only jars and their benefits.)
- *
+ *
* Default value is "true". Beware, setting this to "false" may cause your tests to
* fail on Windows if your classpath is too long.
- *
+ *
* @parameter expression="${surefire.useManifestOnlyJar}" default-value="true"
* @since 2.4.3
*/
@@ -519,14 +530,14 @@
/**
* By default, Surefire enables JVM assertions for the execution of your test cases.
To disable the assertions, set
* this flag to <code>false</code>.
- *
+ *
* @parameter expression="${enableAssertions}" default-value="true"
* @since 2.3.1
*/
private boolean enableAssertions;
-
+
/**
- * The current build session instance.
+ * The current build session instance.
*
* @parameter expression="${session}"
* @required
@@ -534,6 +545,14 @@
*/
private MavenSession session;
+ /**
+ * (TestNG only) Define the factory class used to create all test instances
+ *
+ * @parameter expression="${objectFactory}"
+ * @since 2.5
+ */
+ private String objectFactory;
+
public void execute()
throws MojoExecutionException, MojoFailureException
{
@@ -564,9 +583,9 @@
}
if ( result == 0 ) return;
-
+
String msg;
-
+
if ( result == SurefireBooter.NO_TESTS_EXIT_CODE )
{
if ( ( failIfNoTests == null ) || !failIfNoTests.booleanValue() ) return;
@@ -577,7 +596,7 @@
msg = "There are test failures.\n\nPlease refer to " + reportsDirectory +
" for the individual test results.";
}
-
+
if ( testFailureIgnore )
{
getLog().error( msg );
@@ -644,6 +663,10 @@
{
properties.setProperty( "threadcount", new Integer( this.threadCount ).toString()
);
}
+ if ( this.objectFactory != null )
+ {
+ properties.setProperty( "objectfactory", this.objectFactory );
+ }
}
private SurefireBooter constructSurefireBooter()
@@ -729,7 +752,7 @@
{
throw new MojoExecutionException( "suiteXmlFiles is configured, but there
is no TestNG dependency" );
}
-
+
// TODO: properties should be passed in here too
surefireBooter.addTestSuite( "org.apache.maven.surefire.testng.TestNGXmlTestSuite",
new Object[]{
suiteXmlFiles, testSourceDirectory.getAbsolutePath(), testNgArtifact.getVersion(),
testNgArtifact.getClassifier(), properties, reportsDirectory} );
@@ -843,36 +866,36 @@
surefireBooter.addClassPathUrl( classpathElement );
}
-
+
Toolchain tc = getToolchain();
-
- if (tc != null)
+
+ if (tc != null)
{
getLog().info("Toolchain in surefire-plugin: " + tc);
- if (ForkConfiguration.FORK_NEVER.equals( forkMode ) )
+ if (ForkConfiguration.FORK_NEVER.equals( forkMode ) )
{
forkMode = ForkConfiguration.FORK_ONCE;
}
- if ( jvm != null )
+ if ( jvm != null )
{
getLog().warn("Toolchains are ignored, 'executable' parameter is set to "
+ jvm);
} else {
jvm = tc.findTool("java"); //NOI18N
}
}
-
+
if ( additionalClasspathElements != null )
{
for ( Iterator i = additionalClasspathElements.iterator(); i.hasNext(); )
{
String classpathElement = (String) i.next();
-
+
getLog().debug( " " + classpathElement );
-
+
surefireBooter.addClassPathUrl( classpathElement );
}
}
-
+
// ----------------------------------------------------------------------
// Forking
// ----------------------------------------------------------------------
@@ -895,12 +918,12 @@
fork.setUseManifestOnlyJar( useManifestOnlyJar );
fork.setSystemProperties( internalSystemProperties );
-
+
if ( "true".equals( debugForkedProcess ) )
{
debugForkedProcess = "-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005";
}
-
+
fork.setDebugLine( debugForkedProcess );
if ( jvm == null || "".equals( jvm ) )
@@ -943,7 +966,7 @@
}
surefireBooter.setFailIfNoTests( failIfNoTests == null ? false : failIfNoTests.booleanValue()
);
-
+
surefireBooter.setForkedProcessTimeoutInSeconds( forkedProcessTimeoutInSeconds );
surefireBooter.setRedirectTestOutputToFile( redirectTestOutputToFile );
@@ -1033,7 +1056,7 @@
internalSystemProperties.setProperty( key, value );
}
}
-
+
if ( this.systemPropertyVariables != null )
{
for ( Iterator i = systemPropertyVariables.keySet().iterator(); i.hasNext();
)
@@ -1049,12 +1072,12 @@
}
originalSystemProperties = (Properties) System.getProperties().clone();
-
+
// We used to take all of our system properties and dump them in with the
// user specified properties for SUREFIRE-121, causing SUREFIRE-491.
// Not gonna do THAT any more... but I'm leaving this code here in case
// we need it later when we try to fix SUREFIRE-121 again.
-
+
// Get the properties from the MavenSession instance to make embedded use work correctly
Properties userSpecifiedProperties = (Properties) session.getExecutionProperties().clone();
userSpecifiedProperties.putAll( internalSystemProperties );
@@ -1087,7 +1110,7 @@
* <p>
* The Reporter that will be added will be based on the value of the parameter useFile,
reportFormat, and
* printSummary.
- *
+ *
* @param surefireBooter The surefire booter that will run tests.
* @param forking
*/
@@ -1152,18 +1175,18 @@
{
this.skipTests = skipExec;
}
-
+
//TODO remove the part with ToolchainManager lookup once we depend on
//2.0.9 (have it as prerequisite). Define as regular component field then.
- private Toolchain getToolchain()
+ private Toolchain getToolchain()
{
Toolchain tc = null;
- try
+ try
{
if (session != null) //session is null in tests..
{
ToolchainManager toolchainManager = (ToolchainManager) session.getContainer().lookup(ToolchainManager.ROLE);
- if (toolchainManager != null)
+ if (toolchainManager != null)
{
tc = toolchainManager.getToolchainFromBuildContext("jdk", session);
}
Modified: maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java?rev=753001&r1=753000&r2=753001&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
(original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
Thu Mar 12 20:30:29 2009
@@ -19,10 +19,6 @@
* under the License.
*/
-import org.apache.maven.surefire.testset.TestSetFailedException;
-import org.apache.maven.surefire.util.NestedRuntimeException;
-import org.testng.TestNG;
-
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap;
@@ -30,6 +26,10 @@
import java.util.List;
import java.util.Map;
+import org.apache.maven.surefire.testset.TestSetFailedException;
+import org.apache.maven.surefire.util.NestedRuntimeException;
+import org.testng.TestNG;
+
public abstract class AbstractDirectConfigurator
implements Configurator
{
@@ -82,24 +82,32 @@
if (listenerClasses == null || "".equals(listenerClasses.trim())) {
return new ArrayList();
}
-
+
List classes = new ArrayList();
String[] classNames = listenerClasses.split(" *, *");
- for(int i = 0; i < classNames.length; i++)
+ for(int i = 0; i < classNames.length; i++)
{
- try
- {
- classes.add(Class.forName(classNames[i]));
- }
- catch(Exception ex)
- {
- throw new TestSetFailedException("Cannot find listener class " + classNames[i],
ex);
- }
+ String className = classNames[i];
+ Class clazz = loadClass( className );
+ classes.add( clazz );
}
-
+
return classes;
}
-
+
+ public static Class loadClass(String className )
+ throws TestSetFailedException
+ {
+ try
+ {
+ return Class.forName( className );
+ }
+ catch(Exception ex)
+ {
+ throw new TestSetFailedException("Cannot find listener class " + className, ex);
+ }
+ }
+
public static final class Setter
{
private final String setterName;
Modified: maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java?rev=753001&r1=753000&r2=753001&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
(original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
Thu Mar 12 20:30:29 2009
@@ -25,6 +25,8 @@
import java.util.Iterator;
import java.util.Map;
+import org.apache.maven.surefire.testng.conf.AbstractDirectConfigurator;
+import org.apache.maven.surefire.testng.conf.Configurator;
import org.apache.maven.surefire.testset.TestSetFailedException;
import org.testng.TestNG;
@@ -37,11 +39,11 @@
* <code>TestNGCommandLineArgs.SKIP_FAILED_INVOCATION_COUNT_OPT</code> which
is a <code>Boolean</code>,
* <code>TestNGCommandLineArgs.OBJECT_FACTORY_COMMAND_OPT</code> which is a <code>Class</code>,
* <code>TestNGCommandLineArgs.REPORTERS_LIST</code> which is a <code>List>ReporterConfig<</code>.
- *
+ *
* <p/>
* Test classes and/or suite files are not passed along as options parameters, but
* configured separately.
- *
+ *
* @author <a href='mailto:the[dot]mindstorm[at]gmail[dot]com'>Alex Popescu</a>
*/
public class TestNGMapConfigurator
@@ -59,12 +61,16 @@
{
val = AbstractDirectConfigurator.loadListenerClasses((String) val);
}
+ if ( "objectfactory".equals( key ) )
+ {
+ val = AbstractDirectConfigurator.loadClass((String) val);
+ }
if ( "reporter".equals( key ) )
{
// TODO support multiple reporters?
val = convertReporterConfig( val );
key = "reporterslist";
-
+
}
if ( "junit".equals( key ) )
{
@@ -78,18 +84,18 @@
val = convert( val, String.class );
}
// TODO objectfactory... not even documented, does it work?
- if ( key.startsWith("-") )
+ if ( key.startsWith("-") )
{
convertedOptions.put( key, val );
}
- else
+ else
{
convertedOptions.put( "-" + key, val );
}
}
testng.configure( convertedOptions );
-
+
}
// ReporterConfig only became available in later versions of TestNG
Author: bentmann
Date: Sat Feb 21 09:18:31 2009
New Revision: 746457
URL: http://svn.apache.org/viewvc?rev=746457&view=rev
Log:
o Inherited from maven-parent:11
Modified:
maven/surefire/trunk/pom.xml
Modified: maven/surefire/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/pom.xml?rev=746457&r1=746456&r2=746457&view=diff
==============================================================================
--- maven/surefire/trunk/pom.xml (original)
+++ maven/surefire/trunk/pom.xml Sat Feb 21 09:18:31 2009
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.apache.maven</groupId>
- <version>11-SNAPSHOT</version>
+ <version>11</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
Author: brianf
Date: Sat Feb 14 02:04:34 2009
New Revision: 744362
URL: http://svn.apache.org/viewvc?rev=744362&view=rev
Log:
new parent
Modified:
maven/surefire/trunk/pom.xml
Modified: maven/surefire/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/pom.xml?rev=744362&r1=744361&r2=744362&view=diff
==============================================================================
--- maven/surefire/trunk/pom.xml (original)
+++ maven/surefire/trunk/pom.xml Sat Feb 14 02:04:34 2009
@@ -23,7 +23,7 @@
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.apache.maven</groupId>
- <version>10</version>
+ <version>11-SNAPSHOT</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
Author: vsiveton
Date: Fri Jan 16 05:51:51 2009
New Revision: 735006
URL: http://svn.apache.org/viewvc?rev=735006&view=rev
Log:
o bump to maven-stylus-skin:1.1
Modified:
maven/surefire/trunk/src/site/site.xml
Modified: maven/surefire/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/src/site/site.xml?rev=735006&r1=735005&r2=735006&view=diff
==============================================================================
--- maven/surefire/trunk/src/site/site.xml (original)
+++ maven/surefire/trunk/src/site/site.xml Fri Jan 16 05:51:51 2009
@@ -24,7 +24,7 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-stylus-skin</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1</version>
</skin>
<body>
<menu ref="modules"/>
Author: dantran
Date: Thu Jan 8 20:19:49 2009
New Revision: 732922
URL: http://svn.apache.org/viewvc?rev=732922&view=rev
Log:
Add test to show the workaround for SUREFIRE-121
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
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=732922&r1=732921&r2=732922&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
Thu Jan 8 20:19:49 2009
@@ -26,11 +26,13 @@
goals.add( "test" );
// SUREFIRE-121... someday we should re-enable this
// goals.add( "-DsetOnMavenCommandLine=baz" );
+
+ goals.add( "-DsetOnArgLineWorkAround=baz" );
verifier.executeGoals( goals );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- HelperAssertions.assertTestSuiteResults( 5, 0, 0, 0, testDir );
+ HelperAssertions.assertTestSuiteResults( 6, 0, 0, 0, testDir );
}
public void testSystemPropertiesNoFork()
@@ -42,6 +44,7 @@
ArrayList goals = getInitialGoals();
goals.add( "test" );
goals.add( "-DforkMode=never" );
+ goals.add( "-DsetOnArgLineWorkAround=baz" );
// SUREFIRE-121... someday we should re-enable this
// goals.add( "-DsetOnMavenCommandLine=baz" );
// DGF fake the argLine, since we're not forking
@@ -50,6 +53,6 @@
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- HelperAssertions.assertTestSuiteResults( 5, 0, 0, 0, testDir );
+ HelperAssertions.assertTestSuiteResults( 6, 0, 0, 0, testDir );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml?rev=732922&r1=732921&r2=732922&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml
Thu Jan 8 20:19:49 2009
@@ -69,6 +69,8 @@
<reservedPort3>${reservedPort3}</reservedPort3>
<nullProperty></nullProperty>
<blankProperty> </blankProperty>
+ <!-- this is a work around for SUREFIRE-121 -->
+ <setOnArgLineWorkAround>${setOnArgLineWorkAround}</setOnArgLineWorkAround>
</systemPropertyVariables>
<argLine>-DsetOnArgLine=bar</argLine>
</configuration>
@@ -88,6 +90,7 @@
<properties>
<reservedPort3>1</reservedPort3>
+ <setOnArgLineWorkAround>fool</setOnArgLineWorkAround>
</properties>
</project>
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java?rev=732922&r1=732921&r2=732922&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
Thu Jan 8 20:19:49 2009
@@ -52,6 +52,14 @@
assertNull( "Null property is not null", System.getProperty( "nullProperty" ) );
assertNull( "Blank property is not null", System.getProperty( "blankProperty" )
);
}
+
+ /**
+ * work around for SUREFIRE-121
+ */
+ public void testSetOnArgLineWorkAround()
+ {
+ assertEquals("property setOnArgLineWorkAround not set", "baz", System.getProperty(
"setOnArgLineWorkAround" ) );
+ }
// SUREFIRE-121; someday we should re-enable this
// public void testSetOnMavenCommandLine()
Author: bentmann
Date: Sun Jan 4 04:36:43 2009
New Revision: 731244
URL: http://svn.apache.org/viewvc?rev=731244&view=rev
Log:
o Avoided deprecated syntax @parameter expression="${component...}"
Modified:
maven/surefire/trunk/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
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=731244&r1=731243&r2=731244&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
Sun Jan 4 04:36:43 2009
@@ -56,8 +56,7 @@
/**
* Doxia Site Renderer
*
- * @parameter expression="${component.org.codehaus.doxia.site.renderer.SiteRenderer}"
- * @required @readonly
+ * @component
*/
private SiteRenderer siteRenderer;
Author: dantran
Date: Sun Jan 4 03:11:33 2009
New Revision: 731220
URL: http://svn.apache.org/viewvc?rev=731220&view=rev
Log:
SUREFIRE-511: allow null systemPropertyVariable's value, otherwise user cannot migrate deprecated
systemProperties. Forgot one check-in from the last commit
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Modified: maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java?rev=731220&r1=731219&r2=731220&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
(original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Sun Jan 4 03:11:33 2009
@@ -1040,13 +1040,12 @@
{
String key = (String) i.next();
String value = (String) systemPropertyVariables.get( key );
- if ( value == null )
+ //java Properties does not accept null value
+ if ( value != null )
{
- this.getLog().error( key + "'s value cannot be null." );
+ internalSystemProperties.setProperty( key, value );
}
- internalSystemProperties.setProperty( key, value );
}
-
}
originalSystemProperties = (Properties) System.getProperties().clone();
Author: dantran
Date: Sun Jan 4 00:42:42 2009
New Revision: 731207
URL: http://svn.apache.org/viewvc?rev=731207&view=rev
Log:
SUREFIRE-511: allow null systemPropertyVariable's value, otherwise user cannot migrate deprecated
systemProperties
Modified:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml
maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
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=731207&r1=731206&r2=731207&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
Sun Jan 4 00:42:42 2009
@@ -30,7 +30,7 @@
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- HelperAssertions.assertTestSuiteResults( 4, 0, 0, 0, testDir );
+ HelperAssertions.assertTestSuiteResults( 5, 0, 0, 0, testDir );
}
public void testSystemPropertiesNoFork()
@@ -50,6 +50,6 @@
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- HelperAssertions.assertTestSuiteResults( 4, 0, 0, 0, testDir );
+ HelperAssertions.assertTestSuiteResults( 5, 0, 0, 0, testDir );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml?rev=731207&r1=731206&r2=731207&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/pom.xml
Sun Jan 4 00:42:42 2009
@@ -67,6 +67,8 @@
<reservedPort1>${reservedPort1}</reservedPort1>
<reservedPort2>${reservedPort2}</reservedPort2>
<reservedPort3>${reservedPort3}</reservedPort3>
+ <nullProperty></nullProperty>
+ <blankProperty> </blankProperty>
</systemPropertyVariables>
<argLine>-DsetOnArgLine=bar</argLine>
</configuration>
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java?rev=731207&r1=731206&r2=731207&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
(original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/system-properties/src/test/java/systemProperties/BasicTest.java
Sun Jan 4 00:42:42 2009
@@ -42,11 +42,16 @@
assertTrue( reservedPort1 != reservedPort2 );
- //plugin cannot overwrite the default value set in the pom, this is maven bug
+ //plugin cannot overwrite the default value set in the pom, this is maven bug but
fixed at 2.1-M1
assertEquals( 1, reservedPort3 );
}
+ public void testEmptySystemProperties()
+ {
+ assertNull( "Null property is not null", System.getProperty( "nullProperty" ) );
+ assertNull( "Blank property is not null", System.getProperty( "blankProperty" )
);
+ }
// SUREFIRE-121; someday we should re-enable this
// public void testSetOnMavenCommandLine()
Author: vsiveton
Date: Tue Dec 23 06:45:48 2008
New Revision: 728976
URL: http://svn.apache.org/viewvc?rev=728976&view=rev
Log:
o removed unused project. The official documentation is in /src/site
Removed:
maven/surefire/trunk/surefire-site/
Author: vsiveton
Date: Tue Dec 23 06:43:32 2008
New Revision: 728973
URL: http://svn.apache.org/viewvc?rev=728973&view=rev
Log:
o using maven-stylus-skin snap due to r728944
Modified:
maven/surefire/trunk/src/site/site.xml
Modified: maven/surefire/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/src/site/site.xml?rev=728973&r1=728972&r2=728973&view=diff
==============================================================================
--- maven/surefire/trunk/src/site/site.xml (original)
+++ maven/surefire/trunk/src/site/site.xml Tue Dec 23 06:43:32 2008
@@ -20,42 +20,13 @@
-->
<project name="Surefire">
- <!-- TODO: banners, skin, publish date, version should be inherited from Maven itself
-->
- <bannerLeft>
- <name>${project.name}</name>
- <src>http://maven.apache.org/images/apache-maven-project-2.png</src>
- <href>http://maven.apache.org/surefire</href>
- </bannerLeft>
- <bannerRight>
- <src>http://maven.apache.org/images/maven-logo-2.gif</src>
- </bannerRight>
+ <!-- TODO remove when using Maven Parent 11+ -->
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-stylus-skin</artifactId>
+ <version>1.1-SNAPSHOT</version>
</skin>
- <publishDate format="dd MMM yyyy" position="left"/>
- <version position="left"/>
<body>
- <!-- TODO: Link, head, reports should be inherited -->
- <!-- TODO: use breadcrumbs more structure, links for links, and inherit subprojects
as a menu or not at all -->
- <links>
- <item name="Apache" href="http://www.apache.org/"/>
- <item name="Maven 1.x" href="http://maven.apache.org/maven-1.x"/>
- <item name="Maven 2.x" href="http://maven.apache.org/"/>
- <item name="Maven 2.x Plugins" href="http://maven.apache.org/plugins/"/>
- <item name="SCM" href="http://maven.apache.org/scm"/>
- <item name="Wagon" href="http://maven.apache.org/wagon"/>
- <item name="JXR" href="http://maven.apache.org/jxr"/>
- <item name="Doxia" href="http://maven.apache.org/doxia"/>
- </links>
- <head>
- <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
- </script>
- <script type="text/javascript">
- _uacct = "UA-140879-1";
- urchinTracker();
- </script>
- </head>
<menu ref="modules"/>
<menu ref="reports" inherit="bottom"/>
</body>
Author: vsiveton
Date: Tue Dec 23 06:38:08 2008
New Revision: 728972
URL: http://svn.apache.org/viewvc?rev=728972&view=rev
Log:
o removed inherited plugins
Modified:
maven/surefire/trunk/pom.xml
Modified: maven/surefire/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/pom.xml?rev=728972&r1=728971&r2=728972&view=diff
==============================================================================
--- maven/surefire/trunk/pom.xml (original)
+++ maven/surefire/trunk/pom.xml Tue Dec 23 06:38:08 2008
@@ -142,20 +142,12 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
- </plugin>
- <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.3</source>
<target>1.3</target>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
- </plugin>
</plugins>
<pluginManagement>
<plugins>
Author: vsiveton
Date: Tue Dec 23 06:36:23 2008
New Revision: 728970
URL: http://svn.apache.org/viewvc?rev=728970&view=rev
Log:
o using relativePath for the parent
Modified:
maven/surefire/trunk/maven-surefire-plugin/pom.xml
maven/surefire/trunk/maven-surefire-report-plugin/pom.xml
maven/surefire/trunk/surefire-api/pom.xml
maven/surefire/trunk/surefire-booter/pom.xml
maven/surefire/trunk/surefire-integration-tests/pom.xml
maven/surefire/trunk/surefire-providers/pom.xml
maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml
maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml
maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml
Modified: maven/surefire/trunk/maven-surefire-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/pom.xml?rev=728970&r1=728969&r2=728970&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-plugin/pom.xml Tue Dec 23 06:36:23 2008
@@ -22,9 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire</artifactId>
<version>2.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>maven-surefire-plugin</artifactId>
Modified: maven/surefire/trunk/maven-surefire-report-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/pom.xml?rev=728970&r1=728969&r2=728970&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/pom.xml Tue Dec 23 06:36:23 2008
@@ -22,9 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire</artifactId>
<version>2.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>maven-surefire-report-plugin</artifactId>
Modified: maven/surefire/trunk/surefire-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/pom.xml?rev=728970&r1=728969&r2=728970&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/pom.xml (original)
+++ maven/surefire/trunk/surefire-api/pom.xml Tue Dec 23 06:36:23 2008
@@ -21,9 +21,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire</artifactId>
<version>2.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>surefire-api</artifactId>
Modified: maven/surefire/trunk/surefire-booter/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/pom.xml?rev=728970&r1=728969&r2=728970&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/pom.xml (original)
+++ maven/surefire/trunk/surefire-booter/pom.xml Tue Dec 23 06:36:23 2008
@@ -21,9 +21,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire</artifactId>
<version>2.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>surefire-booter</artifactId>
Modified: maven/surefire/trunk/surefire-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/pom.xml?rev=728970&r1=728969&r2=728970&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/pom.xml (original)
+++ maven/surefire/trunk/surefire-integration-tests/pom.xml Tue Dec 23 06:36:23 2008
@@ -22,9 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire</artifactId>
<version>2.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.maven.surefire</groupId>
Modified: maven/surefire/trunk/surefire-providers/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/pom.xml?rev=728970&r1=728969&r2=728970&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/pom.xml Tue Dec 23 06:36:23 2008
@@ -22,9 +22,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire</artifactId>
<version>2.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>surefire-providers</artifactId>
Modified: maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml?rev=728970&r1=728969&r2=728970&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml Tue Dec 23 06:36:23 2008
@@ -24,6 +24,7 @@
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-providers</artifactId>
<version>2.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>surefire-junit</artifactId>
Modified: maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml?rev=728970&r1=728969&r2=728970&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml Tue Dec 23 06:36:23 2008
@@ -24,6 +24,7 @@
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-providers</artifactId>
<version>2.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>surefire-junit4</artifactId>
Modified: maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml?rev=728970&r1=728969&r2=728970&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml Tue Dec 23 06:36:23 2008
@@ -24,6 +24,7 @@
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-providers</artifactId>
<version>2.5-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>surefire-testng</artifactId>
Author: vsiveton
Date: Tue Dec 23 06:34:23 2008
New Revision: 728968
URL: http://svn.apache.org/viewvc?rev=728968&view=rev
Log:
o ordering pom
Modified:
maven/surefire/trunk/maven-surefire-plugin/pom.xml
maven/surefire/trunk/maven-surefire-report-plugin/pom.xml
maven/surefire/trunk/pom.xml
maven/surefire/trunk/surefire-api/pom.xml
maven/surefire/trunk/surefire-booter/pom.xml
maven/surefire/trunk/surefire-integration-tests/pom.xml
maven/surefire/trunk/surefire-providers/pom.xml
maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml
maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml
maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml
Modified: maven/surefire/trunk/maven-surefire-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/pom.xml?rev=728968&r1=728967&r2=728968&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-plugin/pom.xml Tue Dec 23 06:34:23 2008
@@ -19,19 +19,24 @@
-->
<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>
<artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
<version>2.5-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>maven-surefire-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<packaging>maven-plugin</packaging>
+
<name>Maven Surefire Plugin</name>
+
<prerequisites>
<maven>2.0.6</maven>
</prerequisites>
+
<mailingLists>
<!-- duplication from maven-plugins pom - temporary until they inherit properly -->
<mailingList>
@@ -82,12 +87,21 @@
<archive>http://mail-archives.apache.org/mod_mbox/maven-notifications/</archive>
</mailingList>
</mailingLists>
+
<contributors>
<contributor>
<name>Joakim Erdfelt</name>
<email>joakim@erdfelt.com</email>
</contributor>
</contributors>
+
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>scp://people.apache.org/www/maven.apache.org/plugins/maven-surefire-plugin</url>
+ </site>
+ </distributionManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -122,7 +136,7 @@
<artifactId>maven-toolchain</artifactId>
<version>1.0</version>
</dependency>
-</dependencies>
+ </dependencies>
<build>
<plugins>
@@ -135,6 +149,15 @@
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+
<profiles>
<!-- Force JDK 1.4 for this one, plugins can never be built on 1.3 -->
<profile>
@@ -178,18 +201,4 @@
</build>
</profile>
</profiles>
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <url>scp://people.apache.org/www/maven.apache.org/plugins/maven-surefire-plugin</url>
- </site>
- </distributionManagement>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
</project>
Modified: maven/surefire/trunk/maven-surefire-report-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/pom.xml?rev=728968&r1=728967&r2=728968&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/pom.xml (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/pom.xml Tue Dec 23 06:34:23 2008
@@ -19,19 +19,24 @@
-->
<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>
<artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
<version>2.5-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>maven-surefire-report-plugin</artifactId>
<groupId>org.apache.maven.plugins</groupId>
<packaging>maven-plugin</packaging>
+
<name>Maven Surefire Report Plugin</name>
+
<prerequisites>
<maven>2.0.3</maven>
</prerequisites>
+
<developers>
<developer>
<id>jruiz</id>
@@ -39,6 +44,14 @@
<email>jruiz@exist.com</email>
</developer>
</developers>
+
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <url>scp://people.apache.org/www/maven.apache.org/plugins/maven-surefire-report-plugin</url>
+ </site>
+ </distributionManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
@@ -120,12 +133,7 @@
</build>
</profile>
</profiles>
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <url>scp://people.apache.org/www/maven.apache.org/plugins/maven-surefire-report-plugin</url>
- </site>
- </distributionManagement>
+
<reporting>
<plugins>
<plugin>
Modified: maven/surefire/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/pom.xml?rev=728968&r1=728967&r2=728968&view=diff
==============================================================================
--- maven/surefire/trunk/pom.xml (original)
+++ maven/surefire/trunk/pom.xml Tue Dec 23 06:34:23 2008
@@ -19,24 +19,24 @@
<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>
<artifactId>maven-parent</artifactId>
<groupId>org.apache.maven</groupId>
<version>10</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
+
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire</artifactId>
+ <version>2.5-SNAPSHOT</version>
<packaging>pom</packaging>
+
<name>SureFire</name>
- <version>2.5-SNAPSHOT</version>
<description>Surefire is a test framework project.</description>
<url>http://maven.apache.org/surefire</url>
- <issueManagement>
- <system>jira</system>
- <url>http://jira.codehaus.org/browse/SUREFIRE</url>
- </issueManagement>
<inceptionYear>2004</inceptionYear>
+
<mailingLists>
<mailingList>
<name>Surefire User List</name>
@@ -71,6 +71,7 @@
</otherArchives>
</mailingList>
</mailingLists>
+
<contributors>
<contributor>
<name>Jesse Kuhnert</name>
@@ -84,11 +85,26 @@
</roles>
</contributor>
</contributors>
+
+ <modules>
+ <module>surefire-api</module>
+ <module>surefire-booter</module>
+ <module>surefire-providers</module>
+ <module>maven-surefire-plugin</module>
+ <module>maven-surefire-report-plugin</module>
+ <module>surefire-integration-tests</module>
+ </modules>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/surefire/trunk/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/surefire/trunk/</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/maven/surefire/trunk</url>
</scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.codehaus.org/browse/SUREFIRE</url>
+ </issueManagement>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -122,6 +138,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -155,14 +172,6 @@
</plugins>
</pluginManagement>
</build>
- <modules>
- <module>surefire-api</module>
- <module>surefire-booter</module>
- <module>surefire-providers</module>
- <module>maven-surefire-plugin</module>
- <module>maven-surefire-report-plugin</module>
- <module>surefire-integration-tests</module>
- </modules>
<profiles>
<!-- use preinstalled JDK 1.3 to build and test -->
Modified: maven/surefire/trunk/surefire-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/pom.xml?rev=728968&r1=728967&r2=728968&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/pom.xml (original)
+++ maven/surefire/trunk/surefire-api/pom.xml Tue Dec 23 06:34:23 2008
@@ -18,14 +18,29 @@
-->
<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>
<artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
<version>2.5-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>surefire-api</artifactId>
<name>SureFire API</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.1</version>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -61,15 +76,4 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.1</version>
- </dependency>
- </dependencies>
</project>
Modified: maven/surefire/trunk/surefire-booter/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/pom.xml?rev=728968&r1=728967&r2=728968&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/pom.xml (original)
+++ maven/surefire/trunk/surefire-booter/pom.xml Tue Dec 23 06:34:23 2008
@@ -18,14 +18,28 @@
~ under the License.
-->
<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>
<artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
<version>2.5-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>surefire-booter</artifactId>
<name>SureFire Booter</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -56,14 +70,4 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
- </dependencies>
</project>
\ No newline at end of file
Modified: maven/surefire/trunk/surefire-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/pom.xml?rev=728968&r1=728967&r2=728968&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/pom.xml (original)
+++ maven/surefire/trunk/surefire-integration-tests/pom.xml Tue Dec 23 06:34:23 2008
@@ -19,15 +19,39 @@
-->
<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>
<artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
<version>2.5-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-integration-tests</artifactId>
+
<name>Maven Surefire Integration Tests</name>
+
+ <dependencies>
+ <!-- DGF Depend on the SurefireReportParser -->
+ <dependency>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-verifier</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -54,23 +78,4 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <!-- DGF Depend on the SurefireReportParser -->
- <dependency>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <groupId>org.apache.maven.plugins</groupId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-verifier</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
</project>
Modified: maven/surefire/trunk/surefire-providers/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/pom.xml?rev=728968&r1=728967&r2=728968&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/pom.xml Tue Dec 23 06:34:23 2008
@@ -19,20 +19,25 @@
-->
<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>
<artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
<version>2.5-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>surefire-providers</artifactId>
<packaging>pom</packaging>
+
<name>SureFire Providers</name>
+
<modules>
<module>surefire-junit</module>
<module>surefire-junit4</module>
<module>surefire-testng</module>
</modules>
+
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
Modified: maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml?rev=728968&r1=728967&r2=728968&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml Tue Dec 23 06:34:23 2008
@@ -19,13 +19,17 @@
<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</groupId>
<artifactId>surefire-providers</artifactId>
<version>2.5-SNAPSHOT</version>
</parent>
+
<artifactId>surefire-junit</artifactId>
+
<name>SureFire JUnit Runner</name>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml?rev=728968&r1=728967&r2=728968&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml Tue Dec 23 06:34:23 2008
@@ -19,13 +19,17 @@
<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</groupId>
<artifactId>surefire-providers</artifactId>
<version>2.5-SNAPSHOT</version>
</parent>
+
<artifactId>surefire-junit4</artifactId>
+
<name>SureFire JUnit4 Runner</name>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -33,6 +37,7 @@
<version>4.0</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
Modified: maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml?rev=728968&r1=728967&r2=728968&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml Tue Dec 23 06:34:23 2008
@@ -19,13 +19,17 @@
<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</groupId>
<artifactId>surefire-providers</artifactId>
<version>2.5-SNAPSHOT</version>
</parent>
+
<artifactId>surefire-testng</artifactId>
+
<name>SureFire TestNG Runner</name>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -38,6 +42,27 @@
<version>3.8.1</version>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <fork>false</fork>
+ <compilerVersion>1.4</compilerVersion>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- DGF There are no tests in this project currently, and this
+ resolves SUREFIRE-414 -->
+ <skipExec>true</skipExec>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<!-- TODO: do we include both? Or just 1.5? No need for profile -->
<profiles>
<profile>
@@ -69,23 +94,4 @@
</dependencies>
</profile>
</profiles>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <fork>false</fork>
- <compilerVersion>1.4</compilerVersion>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- DGF There are no tests in this project currently, and this
- resolves SUREFIRE-414 -->
- <skipExec>true</skipExec>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Author: vsiveton
Date: Tue Dec 23 06:25:38 2008
New Revision: 728966
URL: http://svn.apache.org/viewvc?rev=728966&view=rev
Log:
o using latest parent
Modified:
maven/surefire/trunk/pom.xml
Modified: maven/surefire/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/pom.xml?rev=728966&r1=728965&r2=728966&view=diff
==============================================================================
--- maven/surefire/trunk/pom.xml (original)
+++ maven/surefire/trunk/pom.xml Tue Dec 23 06:25:38 2008
@@ -22,7 +22,7 @@
<parent>
<artifactId>maven-parent</artifactId>
<groupId>org.apache.maven</groupId>
- <version>7</version>
+ <version>10</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
<groupId>org.apache.maven.surefire</groupId>
Author: bentmann
Date: Tue Sep 23 07:24:54 2008
New Revision: 698189
URL: http://svn.apache.org/viewvc?rev=698189&view=rev
Log:
o Migrated core IT 0050 over to its corresponding plugin project
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesTest.java
(with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/pom.xml
(with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/src/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/src/test/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/DefaultTest.java
(with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/DontRunTest.java
(with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/NotIncludedByDefault.java
(with props)
Added: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesTest.java?rev=698189&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesTest.java
(added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesTest.java
Tue Sep 23 07:24:54 2008
@@ -0,0 +1,55 @@
+package org.apache.maven.surefire.its;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * Test include/exclude patterns.
+ *
+ * @author Benjamin Bentmann
+ * @version $Id$
+ */
+public class IncludesExcludesTest
+ extends AbstractSurefireIT
+{
+
+ /**
+ * Test surefire inclusions/exclusions
+ */
+ public void testIncludesExcludes()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/includes-excludes"
);
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ executeGoal( verifier, "test" );
+ verifier.assertFilePresent( "target/testTouchFile.txt" );
+ verifier.assertFilePresent( "target/defaultTestTouchFile.txt" );
+ 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/IncludesExcludesTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/pom.xml?rev=698189&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/pom.xml
(added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/pom.xml
Tue Sep 23 07:24:54 2008
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>maven-it-it0050</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <name>Maven Integration Test :: it0050</name>
+ <description>Test surefire inclusion/exclusions</description>
+
+ <dependencies>
+ <dependency>
+ <artifactId>junit</artifactId>
+ <groupId>junit</groupId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <excludes>
+ <exclude>DontRunTest.*</exclude>
+ </excludes>
+ <includes>
+ <include>NotIncludedByDefault.java</include>
+ <include>*Test.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/DefaultTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/DefaultTest.java?rev=698189&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/DefaultTest.java
(added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/DefaultTest.java
Tue Sep 23 07:24:54 2008
@@ -0,0 +1,13 @@
+import java.io.FileOutputStream;
+
+public class DefaultTest
+{
+ public void testRun()
+ throws Exception
+ {
+ FileOutputStream fout = new FileOutputStream("target/defaultTestTouchFile.txt");
+ fout.write('!');
+ fout.flush();
+ fout.close();
+ }
+}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/DefaultTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/DefaultTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/DontRunTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/DontRunTest.java?rev=698189&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/DontRunTest.java
(added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/DontRunTest.java
Tue Sep 23 07:24:54 2008
@@ -0,0 +1,9 @@
+import junit.framework.TestCase;
+
+public class DontRunTest extends TestCase
+{
+ public void testRun()
+ {
+ assertEquals(true, false);
+ }
+}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/DontRunTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/DontRunTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/NotIncludedByDefault.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/NotIncludedByDefault.java?rev=698189&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/NotIncludedByDefault.java
(added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/NotIncludedByDefault.java
Tue Sep 23 07:24:54 2008
@@ -0,0 +1,13 @@
+import java.io.FileOutputStream;
+
+public class NotIncludedByDefault
+{
+ public void testRun()
+ throws Exception
+ {
+ FileOutputStream fout = new FileOutputStream("target/testTouchFile.txt");
+ fout.write('!');
+ fout.flush();
+ fout.close();
+ }
+}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/NotIncludedByDefault.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/includes-excludes/src/test/java/NotIncludedByDefault.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Author: bentmann
Date: Fri Aug 29 03:40:14 2008
New Revision: 690173
URL: http://svn.apache.org/viewvc?rev=690173&view=rev
Log:
o Updated index page of plugin site
Modified:
maven/surefire/trunk/maven-surefire-plugin/src/site/apt/index.apt
maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/index.apt
Modified: maven/surefire/trunk/maven-surefire-plugin/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-plugin/src/site/apt/index.apt?rev=690173&r1=690172&r2=690173&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-plugin/src/site/apt/index.apt (original)
+++ maven/surefire/trunk/maven-surefire-plugin/src/site/apt/index.apt Fri Aug 29 03:40:14
2008
@@ -34,12 +34,14 @@
* Usage
General instructions on how to use the Surefire Plugin can be found on the {{{usage.html}usage
page}}. Some more
- specific use cases are described in the examples given below.
+ specific use cases are described in the examples given below. Last but not least, users
occasionally contribute
+ additional examples, tips or errata to the
+ {{{http://docs.codehaus.org/display/MAVENUSER/Surefire+Plugin}plugin's wiki page}}.
In case you still have questions regarding the plugin's usage, please have a look at the
{{{faq.html}FAQ}} and feel
free to contact the {{{mail-lists.html}user mailing list}}. The posts to the mailing list
are archived and could
already contain the answer to your question as part of an older thread. Hence, it is also
worth browsing/searching
- the mail archive.
+ the {{{mail-lists.html}mail archive}}.
If you feel like the plugin is missing a feature or has a defect, you can fill a feature
request or bug report in our
{{{issue-tracking.html}issue tracker}}. When creating a new issue, please provide a comprehensive
description of your
Modified: maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/index.apt?rev=690173&r1=690172&r2=690173&view=diff
==============================================================================
--- maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/index.apt (original)
+++ maven/surefire/trunk/maven-surefire-report-plugin/src/site/apt/index.apt Fri Aug 29 03:40:14
2008
@@ -45,12 +45,14 @@
* Usage
General instructions on how to use the Surefire Report Plugin can be found on the {{{usage.html}usage
page}}. Some more
- specific use cases are described in the examples given below.
+ specific use cases are described in the examples given below. Last but not least, users
occasionally contribute
+ additional examples, tips or errata to the
+ {{{http://docs.codehaus.org/display/MAVENUSER/Surefire+Report+Plugin}plugin's wiki page}}.
In case you still have questions regarding the plugin's usage, please have a look at the
{{{faq.html}FAQ}} and feel
free to contact the {{{mail-lists.html}user mailing list}}. The posts to the mailing list
are archived and could
already contain the answer to your question as part of an older thread. Hence, it is also
worth browsing/searching
- the mail archive.
+ the {{{mail-lists.html}mail archive}}.
If you feel like the plugin is missing a feature or has a defect, you can fill a feature
request or bug report in our
{{{issue-tracking.html}issue tracker}}. When creating a new issue, please provide a comprehensive
description of your