Author: brett
Date: Mon Sep 22 20:25:49 2008
New Revision: 698074
URL:
http://svn.apache.org/viewvc?rev=698074&view=revLog:
[NMAVEN-186] update stray ITs
Added:
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-0020-ShareTestSource/pom.xml
Modified:
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/notes.txt
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0020-ShareTestSource/A/pom.xml
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0020-ShareTestSource/B/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=698074&r1=698073&r2=698074&view=diff==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/notes.txt (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/notes.txt Mon Sep 22 20:25:49 2008
@@ -1,11 +1,11 @@
Planned changes:
-- Currently, the tests run best without the toolchain, but with CSC in the path. Review tests to work best in this scenario.
- Port 0.14 ITs that are not present
- Ensure test suite runs for 0.14 by translating POMs according to the formula below
- Make it possible to run ITs on different versions of NMaven by substituting plugin version, like Maven ITs
- 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)
- Rename tests to have valid issue numbers of test descriptions rather than MNG-0000
+- Move tests to a separate trunk, independent of version
Fixes:
@@ -22,7 +22,7 @@
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
@@ -32,3 +32,5 @@
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/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java?rev=698074&r1=698073&r2=698074&view=diff==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java Mon Sep 22 20:25:49 2008
@@ -45,19 +45,19 @@
}
TestSuite suite = new TestSuite();
-
- //suite.addTestSuite( MavenITmng0006NUnitTestExecution.class );
- //suite.addTestSuite( MavenITmng0009CSharpCompileWithProvidedGacDependency.class );
- //suite.addTestSuite( MavenITmng0020 );
// NMAVEN-8
//suite.addTestSuite( MavenITmng0007CSharpCompileTestLibrary.class );
//suite.addTestSuite( MavenITmng0019BuildFailureOnNUnitFailure.class );
+ //suite.addTestSuite( MavenITmng0020ShareTestSource.class );
// Fails occasionally with:
// error CS1548: Cryptographic failure while signing assembly ... The process cannot access the file because it is being used by another process. '
// suite.addTestSuite( MavenITmng0017CSharpStrongNamedAssembly.class );
+ // Neeed to be able to locate the GAC root, perhaps using the toolchain
+ // suite.addTestSuite( MavenITmng0009CSharpCompileWithProvidedGacDependency.class );
+
// Currently requiring library in $M2_HOME/lib when extension should be enough
// suite.addTestSuite( MavenITDotNetToolchain.class );
@@ -67,7 +67,6 @@
suite.addTestSuite( MavenITmng0003CSharpCompileWinexe.class );
suite.addTestSuite( MavenITmng0004CSharpCompileWithDependency.class );
suite.addTestSuite( MavenITmng0005CSharpCompileWithTransitiveDependency.class );
-
suite.addTestSuite( MavenITmng0008CSharpCompileWithProvidedDependency.class );
suite.addTestSuite( MavenITmng0010DeployLibrary.class );
suite.addTestSuite( MavenITmng0011DeployExe.class );
Added: 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=698074&view=auto==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0020ShareTestSource.java (added)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITmng0020ShareTestSource.java Mon Sep 22 20:25:49 2008
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+package org.apache.maven.dotnet.integrationtests;
+
+import java.io.File;
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+public class MavenITmng0020ShareTestSource
+ extends AbstractNMavenIntegrationTestCase
+{
+ public void testit0020()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0020-ShareTestSource" );
+ Verifier verifier = getVerifier( testDir );
+ verifier.executeGoal( "install" );
+// TODO: check results
+ verifier.verifyErrorFreeLog();
+
+ verifier.resetStreams();
+ }
+}
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0020-ShareTestSource/A/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0020-ShareTestSource/A/pom.xml?rev=698074&r1=698073&r2=698074&view=diff==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0020-ShareTestSource/A/pom.xml (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0020-ShareTestSource/A/pom.xml Mon Sep 22 20:25:49 2008
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>NMaven.Its</groupId>
- <artifactId>NMaven.It.parent</artifactId>
+ <artifactId>NMaven.It.It0020</artifactId>
<version>1.0.0</version>
</parent>
<groupId>NMaven.Its</groupId>
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0020-ShareTestSource/B/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0020-ShareTestSource/B/pom.xml?rev=698074&r1=698073&r2=698074&view=diff==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0020-ShareTestSource/B/pom.xml (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0020-ShareTestSource/B/pom.xml Mon Sep 22 20:25:49 2008
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>NMaven.Its</groupId>
- <artifactId>NMaven.It.parent</artifactId>
+ <artifactId>NMaven.It.It0020</artifactId>
<version>1.0.0</version>
</parent>
<groupId>NMaven.Its</groupId>
@@ -55,22 +55,11 @@
</build>
<dependencies>
<dependency>
- <groupId>org.apache.maven.dotnet</groupId>
+ <groupId>NUnit</groupId>
<artifactId>NUnit.Framework</artifactId>
- <version>2.4.8.0</version>
+ <version>2.2.8.0</version>
<type>dotnet:library</type>
<scope>test</scope>
</dependency>
</dependencies>
-
- <repositories>
- <repository>
- <id>m2-snapshot</id>
- <name>Maven2 Snapshot Repository</name>
- <url>
http://people.apache.org/repo/m2-snapshot-repository/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
</project>
Added: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0020-ShareTestSource/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0020-ShareTestSource/pom.xml?rev=698074&view=auto==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0020-ShareTestSource/pom.xml (added)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0020-ShareTestSource/pom.xml Mon Sep 22 20:25:49 2008
@@ -0,0 +1,33 @@
+<?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>NMaven.Its</groupId>
+ <artifactId>NMaven.It.It0020</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0.0</version>
+ <name>NMaven.It.It0020</name>
+ <modules>
+ <module>A</module>
+ <module>B</module>
+ </modules>
+</project>
