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 br...@apache.org on 2008/09/24 08:10:10 UTC
svn commit: r698456 - in
/incubator/nmaven/branches/NMAVEN-186/core-integration-tests: ./
src/test/java/org/apache/maven/dotnet/integrationtests/
src/test/resources/MavenITmng-0018-CSharpSynchronizeTargetWithSource/
Author: brett
Date: Wed Sep 24 01:10:09 2008
New Revision: 698456
URL: http://svn.apache.org/viewvc?rev=698456&view=rev
Log:
[NMAVEN-186] ability to run the tests for 0.14 as well
Modified:
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/notes.txt
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/pom.xml
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/AbstractNMavenIntegrationTestCase.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0000CSharpCompileLibrary.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0001CSharpCompileExe.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0002CSharpCompileModule.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0003CSharpCompileWinexe.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0004CSharpCompileWithDependency.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0005CSharpCompileWithTransitiveDependency.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0008CSharpCompileWithProvidedDependency.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0009CSharpCompileWithProvidedGacDependency.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0010DeployLibrary.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0011DeployExe.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0012DeployModule.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0013DeployWinexe.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0014ResolveLibraryDependency.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0015DeployLibraryAsSnapshot.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0016CSharpAssemblyInfoGeneration.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0017CSharpStrongNamedAssembly.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0018CSharpSynchronizeTargetWithSource.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0019BuildFailureOnNUnitFailure.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0020ShareTestSource.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0018-CSharpSynchronizeTargetWithSource/pom.xml
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/notes.txt
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/notes.txt?rev=698456&r1=698455&r2=698456&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/notes.txt (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/notes.txt Wed Sep 24 01:10:09 2008
@@ -1,6 +1,5 @@
Planned changes:
-- Ensure test suite runs for 0.14 by translating POMs according to the formula below
- review toolchain support (NMAVEN-147)
- Make it possible to run the entire test suite with a given toolchain (previous tests only did so for IT0000 and it wasn't configurable)
@@ -15,25 +14,3 @@
- Port 0.14 ITs if relevant: 18 (1.1), 19 (Compact)
- Add ITs: .NET 3.0
-Translating 0.16 to 0.14 and vice-versa
-
-To 0.14
-for i in $(find . -type f -iname *.xml); do sed 's/maven-dotnet-compiler-plugin/maven-compile-plugin/g' $i > $i-tmp;mv $i-tmp $i; done
-for i in $(find . -type f -iname *.xml); do sed 's/maven-dotnet-test-plugin/maven-test-plugin/g' $i > $i-tmp;mv $i-tmp $i; done
-for i in $(find . -type f -iname *.xml); do sed 's/dotnet:library/library/g' $i > $i-tmp;mv $i-tmp $i; done
-for i in $(find . -type f -iname *.xml); do sed 's/dotnet:exe/exe/g' $i > $i-tmp;mv $i-tmp $i; done
-for i in $(find . -type f -iname *.xml); do sed 's/dotnet:module/module/g' $i > $i-tmp;mv $i-tmp $i; done
-for i in $(find . -type f -iname *.xml); do sed 's/dotnet:winexe/exe/g' $i > $i-tmp;mv $i-tmp $i; done
-sed 's/<value>0.16<\/value>/<value>0.14<\/value>/g' pom.xml > pom.xml-tmp;mv pom.xml-tmp pom.xml
-- optionally add toolchains plugin and extension
-
-To 0.16
-for i in $(find . -type f -iname *.xml); do sed 's/maven-compile-plugin/maven-dotnet-compiler-plugin/g' $i > $i-tmp;mv $i-tmp $i; done
-for i in $(find . -type f -iname *.xml); do sed 's/maven-test-plugin/maven-dotnet-test-plugin/g' $i > $i-tmp;mv $i-tmp $i; done
-for i in $(find . -type f -iname *.xml); do sed 's/packaging>library/packaging>dotnet:library/g' $i > $i-tmp;mv $i-tmp $i; done
-for i in $(find . -type f -iname *.xml | grep -v Winexe); do sed 's/packaging>exe/packaging>dotnet:exe/g' $i > $i-tmp;mv $i-tmp $i; done
-for i in $(find . -type f -iname *.xml); do sed 's/packaging>module/packaging>dotnet:module/g' $i > $i-tmp;mv $i-tmp $i; done
-for i in $(find . -type f -iname *.xml | grep Winexe); do sed 's/packaging>exe/packaging>dotnet:winexe/g' $i > $i-tmp;mv $i-tmp $i; done
-sed 's/<value>0.14<\/value>/<value>0.16<\/value>/g' pom.xml > pom.xml-tmp;mv pom.xml-tmp pom.xml
-- remove toolchains plugin
-- remove toolchains extension
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/pom.xml?rev=698456&r1=698455&r2=698456&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/pom.xml (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/pom.xml Wed Sep 24 01:10:09 2008
@@ -70,6 +70,11 @@
<artifactId>maven-artifact</artifactId>
<version>2.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>2.0</version>
+ </dependency>
</dependencies>
<properties>
<nmaven.version>${project.version}</nmaven.version>
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/AbstractNMavenIntegrationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/AbstractNMavenIntegrationTestCase.java?rev=698456&r1=698455&r2=698456&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/AbstractNMavenIntegrationTestCase.java (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/AbstractNMavenIntegrationTestCase.java Wed Sep 24 01:10:09 2008
@@ -20,6 +20,10 @@
package org.apache.maven.dotnet.integrationtests;
import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.List;
@@ -31,6 +35,14 @@
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.IOUtil;
+import org.apache.maven.it.util.ResourceExtractor;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
public class AbstractNMavenIntegrationTestCase
extends TestCase
@@ -221,10 +233,7 @@
StringBuilder sb = new StringBuilder();
sb.append( "target/" );
sb.append( assemblyName );
- /*
- * TODO: current version still uses version in target
- */
- // if ( NMAVEN_0_14.containsVersion( version ) )
+ if ( !NMAVEN_0_14.containsVersion( this.version ) )
{
sb.append( "-" );
sb.append( version );
@@ -238,4 +247,129 @@
sb.append( type );
return sb.toString();
}
+
+ protected File extractAndTranslateResources( String path )
+ throws IOException
+ {
+ File resources = ResourceExtractor.simpleExtractResources( getClass(), path );
+
+ if ( NMAVEN_0_14.containsVersion( version ) )
+ {
+ translatePom( resources );
+ }
+
+ return resources;
+ }
+
+ @SuppressWarnings( "unchecked" )
+ private void translatePom( File directory )
+ throws IOException, FileNotFoundException
+ {
+ File pom = new File( directory, "pom.xml" );
+
+ FileReader fileReader = new FileReader( pom );
+ Model model;
+ try
+ {
+ MavenXpp3Reader reader = new MavenXpp3Reader();
+ model = reader.read( fileReader );
+ }
+ catch ( XmlPullParserException e )
+ {
+ throw new IOException( e.getMessage(), e );
+ }
+ finally
+ {
+ IOUtil.close( fileReader );
+ }
+
+ processModel( model );
+
+ FileWriter fileWriter = new FileWriter( pom );
+ try
+ {
+ MavenXpp3Writer writer = new MavenXpp3Writer();
+ writer.write( fileWriter, model );
+ }
+ finally
+ {
+ IOUtil.close( fileWriter );
+ }
+
+ if ( model.getModules() != null )
+ {
+ for ( String module : (List<String>) model.getModules() )
+ {
+ translatePom( new File( pom.getParentFile(), module ) );
+ }
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private void processModel( Model model )
+ {
+ model.setPackaging( processType( model.getPackaging() ) );
+
+ if ( model.getBuild() != null )
+ {
+ processPlugins( model.getBuild().getPlugins() );
+ if ( model.getBuild().getPluginManagement() != null )
+ {
+ processPlugins( model.getBuild().getPluginManagement().getPlugins() );
+ }
+ }
+ processDependencies( model.getDependencies() );
+ if ( model.getDependencyManagement() != null )
+ {
+ processDependencies( model.getDependencyManagement().getDependencies() );
+ }
+ }
+
+ private void processPlugins( List<Plugin> plugins )
+ {
+ for ( Plugin p : plugins )
+ {
+ if ( "org.apache.maven.dotnet.plugins".equals( p.getGroupId() ) )
+ {
+ if ( "maven-dotnet-compiler-plugin".equals( p.getArtifactId() ) )
+ {
+ p.setArtifactId( "maven-compile-plugin" );
+ }
+ else if ( "maven-dotnet-test-plugin".equals( p.getArtifactId() ) )
+ {
+ p.setArtifactId( "maven-test-plugin" );
+ }
+ }
+ }
+ }
+
+ private void processDependencies( List<Dependency> dependencies )
+ {
+ for ( Dependency d : dependencies )
+ {
+ d.setType( processType( d.getType() ) );
+ }
+ }
+
+ private String processType( String type )
+ {
+ if ( "dotnet:library".equals( type ) )
+ {
+ return "library";
+ }
+ else if ( "dotnet:exe".equals( type ) )
+ {
+ return "exe";
+ }
+ else if ( "dotnet:winexe".equals( type ) )
+ {
+ return "exe";
+ }
+ else if ( "dotnet:module".equals( type ) )
+ {
+ return "module";
+ }
+ return type;
+ }
}
+
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0000CSharpCompileLibrary.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0000CSharpCompileLibrary.java?rev=698456&r1=698455&r2=698456&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0000CSharpCompileLibrary.java (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0000CSharpCompileLibrary.java Wed Sep 24 01:10:09 2008
@@ -22,7 +22,6 @@
import java.io.File;
import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
public class MavenITmng0000CSharpCompileLibrary
extends AbstractNMavenIntegrationTestCase
@@ -30,7 +29,7 @@
public void testit0000()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0000-CSharpCompileLibrary" );
+ File testDir = extractAndTranslateResources( "/MavenITmng-0000-CSharpCompileLibrary" );
Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "install" );
verifier.assertFilePresent( getBuildSourcesMain( "It0000.cs" ) );
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0001CSharpCompileExe.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0001CSharpCompileExe.java?rev=698456&r1=698455&r2=698456&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0001CSharpCompileExe.java (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0001CSharpCompileExe.java Wed Sep 24 01:10:09 2008
@@ -22,7 +22,6 @@
import java.io.File;
import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
public class MavenITmng0001CSharpCompileExe
extends AbstractNMavenIntegrationTestCase
@@ -30,7 +29,7 @@
public void testit0001()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0001-CSharpCompileExe" );
+ File testDir = extractAndTranslateResources( "/MavenITmng-0001-CSharpCompileExe" );
Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "install" );
verifier.assertFilePresent( getBuildSourcesMain( "It0001.cs" ) );
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0002CSharpCompileModule.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0002CSharpCompileModule.java?rev=698456&r1=698455&r2=698456&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0002CSharpCompileModule.java (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0002CSharpCompileModule.java Wed Sep 24 01:10:09 2008
@@ -22,7 +22,6 @@
import java.io.File;
import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
public class MavenITmng0002CSharpCompileModule
extends AbstractNMavenIntegrationTestCase
@@ -30,7 +29,7 @@
public void testit0002()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0002-CSharpCompileModule" );
+ File testDir = extractAndTranslateResources( "/MavenITmng-0002-CSharpCompileModule" );
Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "install" );
verifier.assertFilePresent( getBuildSourcesMain( "It0002.cs" ) );
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0003CSharpCompileWinexe.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0003CSharpCompileWinexe.java?rev=698456&r1=698455&r2=698456&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0003CSharpCompileWinexe.java (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0003CSharpCompileWinexe.java Wed Sep 24 01:10:09 2008
@@ -22,7 +22,6 @@
import java.io.File;
import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
public class MavenITmng0003CSharpCompileWinexe
extends AbstractNMavenIntegrationTestCase
@@ -30,7 +29,7 @@
public void testit0003()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0003-CSharpCompileWinexe" );
+ File testDir = extractAndTranslateResources( "/MavenITmng-0003-CSharpCompileWinexe" );
Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "install" );
verifier.assertFilePresent( getBuildSourcesMain( "It0003.cs" ) );
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0004CSharpCompileWithDependency.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0004CSharpCompileWithDependency.java?rev=698456&r1=698455&r2=698456&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0004CSharpCompileWithDependency.java (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0004CSharpCompileWithDependency.java Wed Sep 24 01:10:09 2008
@@ -22,7 +22,6 @@
import java.io.File;
import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
public class MavenITmng0004CSharpCompileWithDependency
extends AbstractNMavenIntegrationTestCase
@@ -30,8 +29,7 @@
public void testit0004()
throws Exception
{
- File testDir =
- ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0004-CSharpCompileWithDependency" );
+ File testDir = extractAndTranslateResources( "/MavenITmng-0004-CSharpCompileWithDependency" );
Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "install" );
verifier.assertFilePresent( getBuildSourcesMain( "It0004.cs" ));
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0005CSharpCompileWithTransitiveDependency.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0005CSharpCompileWithTransitiveDependency.java?rev=698456&r1=698455&r2=698456&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0005CSharpCompileWithTransitiveDependency.java (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0005CSharpCompileWithTransitiveDependency.java Wed Sep 24 01:10:09 2008
@@ -22,7 +22,6 @@
import java.io.File;
import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
public class MavenITmng0005CSharpCompileWithTransitiveDependency
extends AbstractNMavenIntegrationTestCase
@@ -30,8 +29,7 @@
public void testit0005()
throws Exception
{
- File testDir =
- ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0005-CSharpCompileWithTransitiveDependency" );
+ File testDir = extractAndTranslateResources( "/MavenITmng-0005-CSharpCompileWithTransitiveDependency" );
Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "install" );
verifier.assertFilePresent( getBuildSourcesMain( "It0005.cs" ));
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java?rev=698456&r1=698455&r2=698456&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0007CSharpCompileTestLibrary.java Wed Sep 24 01:10:09 2008
@@ -22,7 +22,6 @@
import java.io.File;
import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
public class MavenITmng0007CSharpCompileTestLibrary
extends AbstractNMavenIntegrationTestCase
@@ -31,7 +30,7 @@
throws Exception
{
File testDir =
- ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0007-CSharpCompileTestLibrary" );
+ extractAndTranslateResources( "/MavenITmng-0007-CSharpCompileTestLibrary" );
Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "install" );
verifier.assertFilePresent( getBuildSourcesMain( "App.cs" ) );
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0008CSharpCompileWithProvidedDependency.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0008CSharpCompileWithProvidedDependency.java?rev=698456&r1=698455&r2=698456&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0008CSharpCompileWithProvidedDependency.java (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0008CSharpCompileWithProvidedDependency.java Wed Sep 24 01:10:09 2008
@@ -22,7 +22,6 @@
import java.io.File;
import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
public class MavenITmng0008CSharpCompileWithProvidedDependency
extends AbstractNMavenIntegrationTestCase
@@ -31,7 +30,7 @@
throws Exception
{
File testDir =
- ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0008-CSharpCompileWithProvidedDependency" );
+ extractAndTranslateResources( "/MavenITmng-0008-CSharpCompileWithProvidedDependency" );
Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "install" );
verifier.assertFilePresent( getBuildSourcesMain("It0008.cs" ));
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0009CSharpCompileWithProvidedGacDependency.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0009CSharpCompileWithProvidedGacDependency.java?rev=698456&r1=698455&r2=698456&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0009CSharpCompileWithProvidedGacDependency.java (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0009CSharpCompileWithProvidedGacDependency.java Wed Sep 24 01:10:09 2008
@@ -22,7 +22,6 @@
import java.io.File;
import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
public class MavenITmng0009CSharpCompileWithProvidedGacDependency
extends AbstractNMavenIntegrationTestCase
@@ -31,7 +30,7 @@
throws Exception
{
File testDir =
- ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0009-CSharpCompileWithProvidedGacDependency" );
+ extractAndTranslateResources( "/MavenITmng-0009-CSharpCompileWithProvidedGacDependency" );
Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "install" );
verifier.assertFilePresent( getBuildSourcesMain( "It0009.cs" ));
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0010DeployLibrary.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0010DeployLibrary.java?rev=698456&r1=698455&r2=698456&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0010DeployLibrary.java (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0010DeployLibrary.java Wed Sep 24 01:10:09 2008
@@ -22,7 +22,6 @@
import java.io.File;
import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
public class MavenITmng0010DeployLibrary
extends AbstractNMavenIntegrationTestCase
@@ -30,7 +29,7 @@
public void testit0010()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0010-DeployLibrary" );
+ File testDir = extractAndTranslateResources( "/MavenITmng-0010-DeployLibrary" );
Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "deploy" );
verifier.assertFilePresent( getBuildSourcesMain("It0010.cs" ));
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0011DeployExe.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0011DeployExe.java?rev=698456&r1=698455&r2=698456&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0011DeployExe.java (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0011DeployExe.java Wed Sep 24 01:10:09 2008
@@ -22,7 +22,6 @@
import java.io.File;
import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
public class MavenITmng0011DeployExe
extends AbstractNMavenIntegrationTestCase
@@ -36,7 +35,7 @@
String metadataDir = "target/test-repo/NMaven/Its/" + artifactId + "/";
String artifactDir = metadataDir + "1.0.0/";
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0011-DeployExe" );
+ File testDir = extractAndTranslateResources( "/MavenITmng-0011-DeployExe" );
Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "deploy" );
verifier.assertFilePresent( getBuildSourcesMain("It0011.cs" ));
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0012DeployModule.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0012DeployModule.java?rev=698456&r1=698455&r2=698456&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0012DeployModule.java (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0012DeployModule.java Wed Sep 24 01:10:09 2008
@@ -22,7 +22,6 @@
import java.io.File;
import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
public class MavenITmng0012DeployModule
extends AbstractNMavenIntegrationTestCase
@@ -36,7 +35,7 @@
String metadataDir = "target/test-repo/NMaven/Its/" + artifactId + "/";
String artifactDir = metadataDir + "1.0.0/";
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0012-DeployModule" );
+ File testDir = extractAndTranslateResources( "/MavenITmng-0012-DeployModule" );
Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "deploy" );
verifier.assertFilePresent( getBuildSourcesMain("It0012.cs" ));
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0013DeployWinexe.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0013DeployWinexe.java?rev=698456&r1=698455&r2=698456&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0013DeployWinexe.java (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0013DeployWinexe.java Wed Sep 24 01:10:09 2008
@@ -22,7 +22,6 @@
import java.io.File;
import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
public class MavenITmng0013DeployWinexe
extends AbstractNMavenIntegrationTestCase
@@ -36,7 +35,7 @@
String metadataDir = "target/test-repo/NMaven/Its/" + artifactId + "/";
String artifactDir = metadataDir + "1.0.0/";
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0013-DeployWinexe" );
+ File testDir = extractAndTranslateResources( "/MavenITmng-0013-DeployWinexe" );
Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "deploy" );
verifier.assertFilePresent( getBuildSourcesMain( "It0013.cs" ));
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0014ResolveLibraryDependency.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0014ResolveLibraryDependency.java?rev=698456&r1=698455&r2=698456&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0014ResolveLibraryDependency.java (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0014ResolveLibraryDependency.java Wed Sep 24 01:10:09 2008
@@ -22,7 +22,6 @@
import java.io.File;
import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
public class MavenITmng0014ResolveLibraryDependency
extends AbstractNMavenIntegrationTestCase
@@ -31,7 +30,7 @@
throws Exception
{
File testDir =
- ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0014-ResolveLibraryDependency" );
+ extractAndTranslateResources( "/MavenITmng-0014-ResolveLibraryDependency" );
Verifier verifier = getVerifier( testDir );
verifier.deleteArtifact( "NMaven.Its", "NMaven.It.It0010", "1.0.0", "dll" );
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0015DeployLibraryAsSnapshot.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0015DeployLibraryAsSnapshot.java?rev=698456&r1=698455&r2=698456&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0015DeployLibraryAsSnapshot.java (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0015DeployLibraryAsSnapshot.java Wed Sep 24 01:10:09 2008
@@ -21,7 +21,6 @@
import java.io.File;
import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
public class MavenITmng0015DeployLibraryAsSnapshot
extends AbstractNMavenIntegrationTestCase
@@ -35,7 +34,7 @@
String artifactDir = metadataDir + "1.0.0-SNAPSHOT/";
File testDir =
- ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0015-DeployLibraryAsSnapshot" );
+ extractAndTranslateResources( "/MavenITmng-0015-DeployLibraryAsSnapshot" );
Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "deploy" );
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0016CSharpAssemblyInfoGeneration.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0016CSharpAssemblyInfoGeneration.java?rev=698456&r1=698455&r2=698456&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0016CSharpAssemblyInfoGeneration.java (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0016CSharpAssemblyInfoGeneration.java Wed Sep 24 01:10:09 2008
@@ -21,7 +21,6 @@
import java.io.File;
import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
public class MavenITmng0016CSharpAssemblyInfoGeneration
extends AbstractNMavenIntegrationTestCase
@@ -29,8 +28,7 @@
public void testit0016()
throws Exception
{
- File testDir =
- ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0016-CSharpAssemblyInfoGeneration" );
+ File testDir = extractAndTranslateResources( "/MavenITmng-0016-CSharpAssemblyInfoGeneration" );
String assemblyInfoFileName;
if ( matchesVersionRange( "(,0.14]" ) )
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0017CSharpStrongNamedAssembly.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0017CSharpStrongNamedAssembly.java?rev=698456&r1=698455&r2=698456&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0017CSharpStrongNamedAssembly.java (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0017CSharpStrongNamedAssembly.java Wed Sep 24 01:10:09 2008
@@ -21,7 +21,6 @@
import java.io.File;
import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
public class MavenITmng0017CSharpStrongNamedAssembly
extends AbstractNMavenIntegrationTestCase
@@ -30,7 +29,7 @@
throws Exception
{
File testDir =
- ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0017-CSharpStrongNamedAssembly" );
+ extractAndTranslateResources( "/MavenITmng-0017-CSharpStrongNamedAssembly" );
Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "install" );
verifier.assertFilePresent( getBuildSourcesMain("It0017.cs" ));
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0018CSharpSynchronizeTargetWithSource.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0018CSharpSynchronizeTargetWithSource.java?rev=698456&r1=698455&r2=698456&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0018CSharpSynchronizeTargetWithSource.java (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0018CSharpSynchronizeTargetWithSource.java Wed Sep 24 01:10:09 2008
@@ -23,7 +23,6 @@
import java.io.FileWriter;
import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
public class MavenITmng0018CSharpSynchronizeTargetWithSource
extends AbstractNMavenIntegrationTestCase
@@ -37,8 +36,7 @@
public void testit0018()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
- "/MavenITmng-0018-CSharpSynchronizeTargetWithSource" );
+ File testDir = extractAndTranslateResources( "/MavenITmng-0018-CSharpSynchronizeTargetWithSource" );
// Generate a new CS source file
File generatedCSSourceFile = new File( testDir, "src/" + CS_GEN_FILENAME );
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0019BuildFailureOnNUnitFailure.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0019BuildFailureOnNUnitFailure.java?rev=698456&r1=698455&r2=698456&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0019BuildFailureOnNUnitFailure.java (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0019BuildFailureOnNUnitFailure.java Wed Sep 24 01:10:09 2008
@@ -22,7 +22,6 @@
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
public class MavenITmng0019BuildFailureOnNUnitFailure
extends AbstractNMavenIntegrationTestCase
@@ -30,8 +29,7 @@
public void testit0019()
throws Exception
{
- File testDir =
- ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0019-BuildFailureOnNUnitFailure" );
+ File testDir = extractAndTranslateResources( "/MavenITmng-0019-BuildFailureOnNUnitFailure" );
Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "test" );
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0020ShareTestSource.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0020ShareTestSource.java?rev=698456&r1=698455&r2=698456&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0020ShareTestSource.java (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0020ShareTestSource.java Wed Sep 24 01:10:09 2008
@@ -21,7 +21,6 @@
import java.io.File;
import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
public class MavenITmng0020ShareTestSource
extends AbstractNMavenIntegrationTestCase
@@ -29,7 +28,7 @@
public void testit0020()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0020-ShareTestSource" );
+ File testDir = extractAndTranslateResources( "/MavenITmng-0020-ShareTestSource" );
Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "install" );
// TODO: check results
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0018-CSharpSynchronizeTargetWithSource/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0018-CSharpSynchronizeTargetWithSource/pom.xml?rev=698456&r1=698455&r2=698456&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0018-CSharpSynchronizeTargetWithSource/pom.xml (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0018-CSharpSynchronizeTargetWithSource/pom.xml Wed Sep 24 01:10:09 2008
@@ -43,4 +43,13 @@
</plugin>
</plugins>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>NUnit</groupId>
+ <artifactId>NUnit.Framework</artifactId>
+ <version>2.2.8.0</version>
+ <type>dotnet:library</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>