SPRNET-1509 upgrade to NUnit 2.6, use NuGet packages
This commit is contained in:
@@ -242,7 +242,8 @@ ${tool.dir} : dir for tools
|
||||
<property name="test.bin.dir" value="${current.bin.dir}" if="${not property::exists('test.bin.dir')}" />
|
||||
<echo message="Unit Testing ${project.name}, ${test.assemblyname} in ${test.bin.dir}" />
|
||||
|
||||
<exec program="${tool.dir}\nunit\net-2.0\nunit-console-x86.exe" workingdir="${test.bin.dir}" verbose="true">
|
||||
<!-- 2.6.2 and 2.6.3 seem to be broken at least w.r.t. remoting and security levels -->
|
||||
<exec program="${nunit.console.exe}" workingdir="${test.bin.dir}" verbose="true">
|
||||
<arg line="${test.assemblyfile}" />
|
||||
<arg value="/xml:${test.assemblyname}.dll-TestResults.xml" />
|
||||
<arg value="/framework:${nunit.framework.version}" />
|
||||
@@ -285,7 +286,7 @@ ${tool.dir} : dir for tools
|
||||
<arg value="//ea" />
|
||||
<arg value="CoverageExcludeAttribute" />
|
||||
<arg value="//q" />
|
||||
<arg path="${tool.dir}/nunit/net-2.0/nunit-console-x86.exe" />
|
||||
<arg path="${nunit.console.exe}" />
|
||||
<arg line="${test.assemblyfile}" />
|
||||
<arg value="/xml:${test.assemblyname}.dll-TestResults.xml" />
|
||||
<arg value="/nologo" />
|
||||
@@ -323,7 +324,7 @@ ${tool.dir} : dir for tools
|
||||
|
||||
<exec program="${tool.dir}/opencover/OpenCover.Console.exe" workingdir="${test.bin.dir}" verbose="true">
|
||||
<arg value="-register:user" />
|
||||
<arg value="-target:${tool.dir}/nunit/net-2.0/nunit-console-x86.exe" />
|
||||
<arg value="-target:${nunit.console.exe}" />
|
||||
<arg value="-targetargs:${test.assemblyfile} /xml:${test.assemblyname}.dll-TestResults.xml /noshadow /nologo /framework:${nunit.framework.version}" />
|
||||
<arg value="-filter:"+[Spring*]* -[*Test*]* -[*nunit*]*"" />
|
||||
<arg value="-output:${test.bin.dir}/${test.assemblyname}.dll-TestCoverage.xml" />
|
||||
@@ -337,6 +338,6 @@ ${tool.dir} : dir for tools
|
||||
|
||||
<readregistry property="net35.install.dir" key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.5\InstallPath" hive="LocalMachine" failonerror="true"/>
|
||||
<property name="msbuild.exe" value="${net35.install.dir}\msbuild.exe"/>
|
||||
|
||||
<property name="nunit.console.exe" value="${spring.basedir}/packages/NUnit.Runners.2.6.1/tools/nunit-console.exe" />
|
||||
|
||||
</project>
|
||||
|
||||
Reference in New Issue
Block a user