You are viewing a plain text version of this content. The canonical link for it is here.
Posted to nmaven-commits@incubator.apache.org by ew...@apache.org on 2008/01/01 23:29:34 UTC
svn commit: r607945 - in /incubator/nmaven/trunk/plugins:
dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/
maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/
Author: eworley
Date: Tue Jan 1 15:29:32 2008
New Revision: 607945
URL: http://svn.apache.org/viewvc?rev=607945&view=rev
Log:
* Added support for maven.test.skip property
* Added support for dotnet-test-plugin configuration from the pom, see IT0007 for an example
Modified:
incubator/nmaven/trunk/plugins/dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java
incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestSourceProcessorMojo.java
Modified: incubator/nmaven/trunk/plugins/dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java?rev=607945&r1=607944&r2=607945&view=diff
==============================================================================
--- incubator/nmaven/trunk/plugins/dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java (original)
+++ incubator/nmaven/trunk/plugins/dotnet-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/nunit/DotnetTestMojo.java Tue Jan 1 15:29:32 2008
@@ -19,6 +19,8 @@
package org.apache.maven.dotnet.plugin.nunit;
import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
@@ -53,10 +55,23 @@
* @required
*/
private MavenProject project;
+
+ /**
+ * The arguments to pass to nunit
+ * @parameter
+ */
+ private List<String> arguments;
public void execute()
throws MojoExecutionException, MojoFailureException
{
+ String skipTest = System.getProperty( "maven.test.skip" );
+ if ( "TRUE".equalsIgnoreCase( skipTest ) )
+ {
+ getLog().info( "Skipping Test Execution" );
+ return;
+ }
+
// The directory where the test artifact exists
String outputDirectory = project.getBuild().getDirectory();
@@ -103,11 +118,14 @@
}
private String[] getNUnitArguments() {
- return new String[] {
- getTestAssemblyName(),
- "/labels",
- "/nologo"
- };
+ List<String> nunitArgs = new ArrayList<String>();
+
+ nunitArgs.add( getTestAssemblyName() );
+ if (arguments != null) {
+ nunitArgs.addAll( arguments );
+ }
+
+ return nunitArgs.toArray( new String[0] );
}
private static class NUnitStreamConsumer
Modified: incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java?rev=607945&r1=607944&r2=607945&view=diff
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java (original)
+++ incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestCompilerMojo.java Tue Jan 1 15:29:32 2008
@@ -121,6 +121,14 @@
public void execute()
throws MojoExecutionException, MojoFailureException
{
+
+ String skipTest = System.getProperty( "maven.test.skip" );
+ if ( "TRUE".equalsIgnoreCase( skipTest ) )
+ {
+ getLog().info( "Skipping Test compilation" );
+ return;
+ }
+
File sourceDir =
new File( project.getBuild().getDirectory(),
BuildDirectories.TEST_SOURCES.getBuildDirectoryName() );
Modified: incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestSourceProcessorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestSourceProcessorMojo.java?rev=607945&r1=607944&r2=607945&view=diff
==============================================================================
--- incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestSourceProcessorMojo.java (original)
+++ incubator/nmaven/trunk/plugins/maven-compiler-plugin/src/main/java/org/apache/maven/dotnet/plugin/compiler/TestSourceProcessorMojo.java Tue Jan 1 15:29:32 2008
@@ -73,6 +73,13 @@
public void execute()
throws MojoExecutionException
{
+ String skipTest = System.getProperty( "maven.test.skip" );
+ if ( "TRUE".equalsIgnoreCase( skipTest ) )
+ {
+ getLog().info( "Skipping Test source processing " );
+ return;
+ }
+
File testSourceDirectory = new File( project.getBuild().getTestSourceDirectory() );
File outputDirectory =
new File( project.getBuild().getDirectory(), BuildDirectories.TEST_SOURCES.getBuildDirectoryName() );