Author: brett
Date: Sat Dec 31 05:57:41 2011
New Revision: 1226043
URL: http://svn.apache.org/viewvc?rev=1226043&view=rev
Log:
[NPANDAY-332] Ability to run nunit tests with a different framework version than
the nunit-console
Modified:
incubator/npanday/branches/npanday-1.4.x/ (props changed)
incubator/npanday/branches/npanday-1.4.x/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java
Propchange: incubator/npanday/branches/npanday-1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 31 05:57:41 2011
@@ -1,4 +1,4 @@
/incubator/npanday/branches/NPANDAY-410:1210743-1210765
/incubator/npanday/branches/npanday-uac-removed:1002005-1024539
/incubator/npanday/branches/npanday-vs2010-support:1002029-1025477
-/incubator/npanday/trunk:1221087,1221092,1221101,1221116-1221117,1221159,1222098-1222180,1222459-1222547
+/incubator/npanday/trunk:1221087,1221092,1221101,1221116-1221117,1221159,1222098-1222180,1222459-1222547,1226035
Modified:
incubator/npanday/branches/npanday-1.4.x/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/branches/npanday-1.4.x/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java?rev=1226043&r1=1226042&r2=1226043&view=diff
==============================================================================
---
incubator/npanday/branches/npanday-1.4.x/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java
(original)
+++
incubator/npanday/branches/npanday-1.4.x/plugins/maven-test-plugin/src/main/java/npanday/plugin/test/TesterMojo.java
Sat Dec 31 05:57:41 2011
@@ -167,7 +167,8 @@ extends AbstractMojo
private String nunitCommand;
/**
- * The framework version to run the tests: 1.1, 2.0, 3.5, 4.0
+ * The framework version to run the tests: 1.1, 2.0, 3.5, 4.0. Note that
using this setting will require you to use
+ * NUnit >= 2.5.
*
* @parameter expression = "${executionFrameworkVersion}"
*/
@@ -258,12 +259,12 @@ extends AbstractMojo
}
// Not supported on NUnit < 2.5 - see NPANDAY-332
- // String frameworkVersion = vendorInfo.getFrameworkVersion();
- // getLog().debug( "NPANDAY-1100-012: Framework version:" +
frameworkVersion );
- // if (!"MONO".equals( vendorName ) && (frameworkVersion != null &&
frameworkVersion.length() > 0 )) {
- // commands.add( switchChar + "framework:" + "v"+frameworkVersion);
- // }
-
+ if ( executionFrameworkVersion != null &&
executionFrameworkVersion.length() > 0 )
+ {
+ getLog().debug( "NPANDAY-1100-012: Framework version:" +
executionFrameworkVersion );
+ commands.add( switchChar + "framework:" + "v" +
executionFrameworkVersion );
+ }
+
return commands;
}
