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/22 15:29:37 UTC
svn commit: r697869 [1/2] - in /incubator/nmaven/branches/NMAVEN-186:
components/maven-dotnet-core-it-runner/
components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/
core-integration-tests/ core-integration-tests/src/test/java...
Author: brett
Date: Mon Sep 22 08:29:36 2008
New Revision: 697869
URL: http://svn.apache.org/viewvc?rev=697869&view=rev
Log:
[NMAVEN-186] partially apply patch and make other modifications to prepare for unifying 0.14 and 0.16 test suites
See notes.txt for list of planned changes
Added:
incubator/nmaven/branches/NMAVEN-186/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/IntegrationTestSuite.java (contents, props changed)
- copied, changed from r697654, incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/MonoSuite.java
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/AbstractNMavenIntegrationTestCase.java
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/java/org/apache/maven/dotnet/integrationtests/MavenITDotNetToolchain.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITDotNetToolchain/ (props changed)
- copied from r697654, incubator/nmaven/trunk/core-integration-tests/src/test/resources/MavenITmng-0000-CSharpCompileLibrary/
Removed:
incubator/nmaven/branches/NMAVEN-186/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/MicrosoftSuite.java
incubator/nmaven/branches/NMAVEN-186/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/MonoSuite.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MicrosoftIntegrationTestSuite.java
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MonoIntegrationTestSuite.java
Modified:
incubator/nmaven/branches/NMAVEN-186/components/maven-dotnet-core-it-runner/pom.xml
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/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/resources/MavenITDotNetToolchain/pom.xml
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0000-CSharpCompileLibrary/pom.xml
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0001-CSharpCompileExe/pom.xml
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0002-CSharpCompileModule/pom.xml
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0003-CSharpCompileWinexe/pom.xml
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0004-CSharpCompileWithDependency/pom.xml
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0005-CSharpCompileWithTransitiveDependency/pom.xml
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/pom.xml
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0008-CSharpCompileWithProvidedDependency/pom.xml
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0009-CSharpCompileWithProvidedGacDependency/pom.xml
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0010-DeployLibrary/pom.xml
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0011-DeployExe/pom.xml
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0012-DeployModule/pom.xml
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0013-DeployWinexe/pom.xml
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0014-ResolveLibraryDependency/pom.xml
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0015-DeployLibraryAsSnapshot/pom.xml
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0016-CSharpAssemblyInfoGeneration/pom.xml
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0017-CSharpStrongNamedAssembly/pom.xml
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0018-CSharpSynchronizeTargetWithSource/pom.xml
incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0019-BuildFailureOnNUnitFailure/pom.xml
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/components/maven-dotnet-core-it-runner/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/components/maven-dotnet-core-it-runner/pom.xml?rev=697869&r1=697868&r2=697869&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/components/maven-dotnet-core-it-runner/pom.xml (original)
+++ incubator/nmaven/branches/NMAVEN-186/components/maven-dotnet-core-it-runner/pom.xml Mon Sep 22 08:29:36 2008
@@ -51,31 +51,15 @@
</dependencies>
<profiles>
<profile>
- <id>microsoft-its</id>
+ <id>run-its</id>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4.3</version>
<configuration>
<includes>
- <include>**/MicrosoftSuite.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>mono-its</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <includes>
- <include>**/MonoSuite.java</include>
+ <include>**/IntegrationTestSuite.*</include>
</includes>
</configuration>
</plugin>
Copied: incubator/nmaven/branches/NMAVEN-186/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/IntegrationTestSuite.java (from r697654, incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/MonoSuite.java)
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/IntegrationTestSuite.java?p2=incubator/nmaven/branches/NMAVEN-186/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/IntegrationTestSuite.java&p1=incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/MonoSuite.java&r1=697654&r2=697869&rev=697869&view=diff
==============================================================================
--- incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/MonoSuite.java (original)
+++ incubator/nmaven/branches/NMAVEN-186/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/IntegrationTestSuite.java Mon Sep 22 08:29:36 2008
@@ -1,3 +1,5 @@
+package org.apache.maven.dotnet.its;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,19 +18,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.dotnet.its;
-import org.apache.maven.dotnet.integrationtests.MonoIntegrationTestSuite;
import org.apache.maven.it.VerificationException;
import junit.framework.TestCase;
import junit.framework.Test;
-public class MonoSuite
+public class IntegrationTestSuite
extends TestCase
{
public static Test suite()
throws VerificationException
{
- return MonoIntegrationTestSuite.suite();
+ return org.apache.maven.dotnet.integrationtests.IntegrationTestSuite.suite();
}
-}
\ No newline at end of file
+}
Propchange: incubator/nmaven/branches/NMAVEN-186/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/IntegrationTestSuite.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/nmaven/branches/NMAVEN-186/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/IntegrationTestSuite.java
------------------------------------------------------------------------------
svn:mergeinfo =
Added: 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=697869&view=auto
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/notes.txt (added)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/notes.txt Mon Sep 22 08:29:36 2008
@@ -0,0 +1,34 @@
+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
+
+Fixes:
+
+- review toolchain support (NMAVEN-147)
+- review NUnit issues / missing dependency (NMAVEN-8)
+
+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
+
+
+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
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=697869&r1=697868&r2=697869&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/pom.xml (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/pom.xml Mon Sep 22 08:29:36 2008
@@ -18,8 +18,9 @@
specific language governing permissions and limitations
under the License.
-->
-<project 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">
+<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">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
<version>0.16-incubating-SNAPSHOT</version>
Added: 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=697869&view=auto
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/AbstractNMavenIntegrationTestCase.java (added)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/AbstractNMavenIntegrationTestCase.java Mon Sep 22 08:29:36 2008
@@ -0,0 +1,125 @@
+/*
+ * 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.dotnet.BuildDirectories;
+import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+
+public class AbstractNMavenIntegrationTestCase
+ extends AbstractMavenIntegrationTestCase
+{
+
+ // TODO: comparing to (,0.15) is better
+ public static final String VERSION_0_14 = "0.14";
+
+ private static final String NMAVEN_VERSION_SYSTEM_PROPERTY = "nmaven.version";
+
+ protected Verifier getVerifier( File testDirectory )
+ throws VerificationException
+ {
+ Verifier verifier = new Verifier( testDirectory.getAbsolutePath() );
+ // List cliOptions = new ArrayList( 2 );
+ // cliOptions.add( "-Dnmaven.vendor=" + System.getProperty( "nmaven.vendor" ) );
+ // cliOptions.add("-Dnmaven.version=" + getVersion());
+ // verifier.setCliOptions( cliOptions );
+ return verifier;
+ }
+
+ protected String getCommentsFile()
+ {
+ return "target/comments.xml";
+ }
+
+ protected String getBuildSourcesMain( String fileName )
+ {
+ if ( VERSION_0_14.equals( getNMavenVersion() ) )
+ {
+ return "target/build-sources/" + fileName;
+ }
+ else
+ {
+ return getBuildFile( BuildDirectories.BUILD_SOURCES_MAIN, fileName );
+ }
+ }
+
+ protected String getBuildSourcesGenerated( String fileName )
+ {
+ if ( VERSION_0_14.equals( getNMavenVersion() ) )
+ {
+ return getBuildSourcesMain( fileName );
+ }
+ else
+ {
+ return getBuildFile( BuildDirectories.BUILD_SOURCES_GENERATED, fileName );
+ }
+ }
+
+ protected String getBuildSourcesTest( String fileName )
+ {
+ if ( VERSION_0_14.equals( getNMavenVersion() ) )
+ {
+ return "target/build-test-sources/" + fileName;
+ }
+ else
+ {
+ return getBuildFile( BuildDirectories.TEST_BUILD_SOURCES_MAIN, fileName );
+ }
+ }
+
+ private String getBuildFile( BuildDirectories buildDirectory, String fileName )
+ {
+ return "target/" + buildDirectory.getBuildDirectoryName() + "/" + fileName;
+ }
+
+ protected String getAssemblyFile( String assemblyName, String version, String type )
+ {
+ return getAssemblyFile( assemblyName, version, type, null );
+ }
+
+ protected String getAssemblyFile( String assemblyName, String version, String type, String classifier )
+ {
+ StringBuilder sb = new StringBuilder();
+ sb.append( "target/" );
+ sb.append( assemblyName );
+ /* TODO: current version still uses version in target
+ if ( VERSION_0_14.equals( getNMavenVersion() ) )*/
+ {
+ sb.append( "-" );
+ sb.append( version );
+ if ( classifier != null )
+ {
+ sb.append( "-" );
+ sb.append( classifier );
+ }
+ }
+ sb.append( "." );
+ sb.append( type );
+ return sb.toString();
+ }
+
+ protected String getNMavenVersion()
+ {
+ return System.getProperty( NMAVEN_VERSION_SYSTEM_PROPERTY );
+ }
+}
Added: 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=697869&view=auto
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java (added)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java Mon Sep 22 08:29:36 2008
@@ -0,0 +1,87 @@
+/*
+ * 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 junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+
+public class IntegrationTestSuite
+ extends AbstractMavenIntegrationTestCase
+{
+ public static Test suite()
+ throws VerificationException
+ {
+ Verifier verifier = null;
+ try
+ {
+ verifier = new Verifier( "" );
+ }
+ finally
+ {
+ if ( verifier != null )
+ {
+ verifier.resetStreams();
+ }
+ }
+
+ 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 );
+
+ // 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 );
+
+ // Currently requiring library in $M2_HOME/lib when extension should be enough
+ // suite.addTestSuite( MavenITDotNetToolchain.class );
+
+ suite.addTestSuite( MavenITmng0000CSharpCompileLibrary.class );
+ suite.addTestSuite( MavenITmng0001CSharpCompileExe.class );
+ suite.addTestSuite( MavenITmng0002CSharpCompileModule.class );
+ suite.addTestSuite( MavenITmng0003CSharpCompileWinexe.class );
+ suite.addTestSuite( MavenITmng0004CSharpCompileWithDependency.class );
+ suite.addTestSuite( MavenITmng0005CSharpCompileWithTransitiveDependency.class );
+
+ suite.addTestSuite( MavenITmng0008CSharpCompileWithProvidedDependency.class );
+ suite.addTestSuite( MavenITmng0010DeployLibrary.class );
+ suite.addTestSuite( MavenITmng0011DeployExe.class );
+ suite.addTestSuite( MavenITmng0012DeployModule.class );
+ suite.addTestSuite( MavenITmng0013DeployWinexe.class );
+ suite.addTestSuite( MavenITmng0014ResolveLibraryDependency.class );
+ suite.addTestSuite( MavenITmng0015DeployLibraryAsSnapshot.class );
+ suite.addTestSuite( MavenITmng0016CSharpAssemblyInfoGeneration.class );
+ suite.addTestSuite( MavenITmng0018CSharpSynchronizeTargetWithSource.class );
+ return suite;
+ }
+
+ protected static String getVendor()
+ {
+ return null;
+ }
+}
Added: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITDotNetToolchain.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITDotNetToolchain.java?rev=697869&view=auto
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITDotNetToolchain.java (added)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MavenITDotNetToolchain.java Mon Sep 22 08:29:36 2008
@@ -0,0 +1,44 @@
+/*
+ * 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;
+
+/**
+ * @todo this shouldn't be necessary but it reduces the complexity of every test needing to include
+ * the toolchain plugin. We need to simplify so that you can run across vendors and using the default
+ * toolchain with minimal configuration.
+ */
+public class MavenITDotNetToolchain
+ extends AbstractNMavenIntegrationTestCase
+{
+ public void testInstallParent()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/MavenITDotNetToolchain" );
+ Verifier verifier = getVerifier( testDir );
+ verifier.executeGoal( "install" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+ }
+}
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=697869&r1=697868&r2=697869&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 Mon Sep 22 08:29:36 2008
@@ -19,25 +19,23 @@
package org.apache.maven.dotnet.integrationtests;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
+import java.io.File;
+
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.dotnet.BuildDirectories;
-
-import java.io.File;
public class MavenITmng0000CSharpCompileLibrary
- extends AbstractMavenIntegrationTestCase
+ extends AbstractNMavenIntegrationTestCase
{
public void testit0000()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0000-CSharpCompileLibrary" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" + BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0000.cs" );
- verifier.assertFilePresent( "target/comments.xml" );
- verifier.assertFilePresent( "target/NMaven.It.It0000-1.0.0.dll" );
+ verifier.assertFilePresent( getBuildSourcesMain( "It0000.cs" ) );
+ verifier.assertFilePresent( getCommentsFile() );
+ verifier.assertFilePresent( getAssemblyFile( "NMaven.It.It0000", "1.0.0", "dll" ) );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
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=697869&r1=697868&r2=697869&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 Mon Sep 22 08:29:36 2008
@@ -19,25 +19,23 @@
package org.apache.maven.dotnet.integrationtests;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.dotnet.BuildDirectories;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
-
import java.io.File;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
public class MavenITmng0001CSharpCompileExe
- extends AbstractMavenIntegrationTestCase
+ extends AbstractNMavenIntegrationTestCase
{
- public void testit0001()
+ public void testit0001()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0001-CSharpCompileExe" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" + BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0001.cs" );
- verifier.assertFilePresent( "target/comments.xml" );
- verifier.assertFilePresent( "target/NMaven.It.It0001-1.0.0.exe" );
+ verifier.assertFilePresent( getBuildSourcesMain( "It0001.cs" ) );
+ verifier.assertFilePresent( getCommentsFile() );
+ verifier.assertFilePresent( getAssemblyFile( "NMaven.It.It0001","1.0.0","exe") );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
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=697869&r1=697868&r2=697869&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 Mon Sep 22 08:29:36 2008
@@ -19,25 +19,23 @@
package org.apache.maven.dotnet.integrationtests;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.dotnet.BuildDirectories;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
-
import java.io.File;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
public class MavenITmng0002CSharpCompileModule
- extends AbstractMavenIntegrationTestCase
+ extends AbstractNMavenIntegrationTestCase
{
public void testit0002()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0002-CSharpCompileModule" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" + BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0002.cs" );
- verifier.assertFilePresent( "target/comments.xml" );
- verifier.assertFilePresent( "target/NMaven.It.It0002-1.0.0.netmodule" );
+ verifier.assertFilePresent( getBuildSourcesMain( "It0002.cs" ) );
+ verifier.assertFilePresent( getCommentsFile() );
+ verifier.assertFilePresent( getAssemblyFile( "NMaven.It.It0002", "1.0.0", "netmodule" ) );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
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=697869&r1=697868&r2=697869&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 Mon Sep 22 08:29:36 2008
@@ -19,25 +19,23 @@
package org.apache.maven.dotnet.integrationtests;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.dotnet.BuildDirectories;
-
import java.io.File;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
public class MavenITmng0003CSharpCompileWinexe
- extends AbstractMavenIntegrationTestCase
+ extends AbstractNMavenIntegrationTestCase
{
public void testit0003()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0003-CSharpCompileWinexe" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" + BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0003.cs" );
- verifier.assertFilePresent( "target/comments.xml" );
- verifier.assertFilePresent( "target/NMaven.It.It0003-1.0.0.exe" );
+ verifier.assertFilePresent( getBuildSourcesMain( "It0003.cs" ) );
+ verifier.assertFilePresent( getCommentsFile() );
+ verifier.assertFilePresent( getAssemblyFile("NMaven.It.It0003","1.0.0","exe" ));
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
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=697869&r1=697868&r2=697869&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 Mon Sep 22 08:29:36 2008
@@ -19,26 +19,24 @@
package org.apache.maven.dotnet.integrationtests;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.dotnet.BuildDirectories;
-
import java.io.File;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
public class MavenITmng0004CSharpCompileWithDependency
- extends AbstractMavenIntegrationTestCase
+ extends AbstractNMavenIntegrationTestCase
{
public void testit0004()
throws Exception
{
File testDir =
ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0004-CSharpCompileWithDependency" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" + BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0004.cs" );
- verifier.assertFilePresent( "target/comments.xml" );
- verifier.assertFilePresent( "target/NMaven.It.It0004-1.0.0.dll" );
+ verifier.assertFilePresent( getBuildSourcesMain( "It0004.cs" ));
+ verifier.assertFilePresent( getCommentsFile() );
+ verifier.assertFilePresent( getAssemblyFile("NMaven.It.It0004","1.0.0","dll" ));
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
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=697869&r1=697868&r2=697869&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 Mon Sep 22 08:29:36 2008
@@ -19,25 +19,23 @@
package org.apache.maven.dotnet.integrationtests;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.dotnet.BuildDirectories;
-
import java.io.File;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
public class MavenITmng0005CSharpCompileWithTransitiveDependency
- extends AbstractMavenIntegrationTestCase
+ extends AbstractNMavenIntegrationTestCase
{
public void testit0005()
throws Exception
{
File testDir =
ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0005-CSharpCompileWithTransitiveDependency" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" + BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0005.cs" );
- verifier.assertFilePresent( "target/NMaven.It.It0005-1.0.0.dll" );
+ verifier.assertFilePresent( getBuildSourcesMain( "It0005.cs" ));
+ verifier.assertFilePresent( getAssemblyFile("NMaven.It.It0005","1.0.0","dll" ));
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
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=697869&r1=697868&r2=697869&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 Mon Sep 22 08:29:36 2008
@@ -19,25 +19,24 @@
package org.apache.maven.dotnet.integrationtests;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
+import java.io.File;
+
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.dotnet.BuildDirectories;
-
-import java.io.File;
public class MavenITmng0007CSharpCompileTestLibrary
- extends AbstractMavenIntegrationTestCase
+ extends AbstractNMavenIntegrationTestCase
{
public void testit0007()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0007-CSharpCompileTestLibrary" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir =
+ ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0007-CSharpCompileTestLibrary" );
+ Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" + BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/App.cs" );
- verifier.assertFilePresent( "target/" + BuildDirectories.TEST_BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0007.cs" );
- verifier.assertFilePresent( "target/NMaven.It.It0007-1.0.0-test.dll" );
+ verifier.assertFilePresent( getBuildSourcesMain( "App.cs" ) );
+ verifier.assertFilePresent( getBuildSourcesTest( "It0007.cs" ) );
+ verifier.assertFilePresent( getAssemblyFile( "NMaven.It.It0007", "1.0.0", "dll", "test" ) );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
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=697869&r1=697868&r2=697869&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 Mon Sep 22 08:29:36 2008
@@ -19,25 +19,23 @@
package org.apache.maven.dotnet.integrationtests;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.dotnet.BuildDirectories;
-
import java.io.File;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
public class MavenITmng0008CSharpCompileWithProvidedDependency
- extends AbstractMavenIntegrationTestCase
+ extends AbstractNMavenIntegrationTestCase
{
public void testit0008()
throws Exception
{
File testDir =
ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0008-CSharpCompileWithProvidedDependency" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" + BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0008.cs" );
- verifier.assertFilePresent( "target/NMaven.It.It0008-1.0.0.dll" );
+ verifier.assertFilePresent( getBuildSourcesMain("It0008.cs" ));
+ verifier.assertFilePresent( getAssemblyFile("NMaven.It.It0008","1.0.0","dll" ));
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
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=697869&r1=697868&r2=697869&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 Mon Sep 22 08:29:36 2008
@@ -19,25 +19,23 @@
package org.apache.maven.dotnet.integrationtests;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.dotnet.BuildDirectories;
-
import java.io.File;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
public class MavenITmng0009CSharpCompileWithProvidedGacDependency
- extends AbstractMavenIntegrationTestCase
+ extends AbstractNMavenIntegrationTestCase
{
public void testit0009()
throws Exception
{
File testDir =
ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0009-CSharpCompileWithProvidedGacDependency" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" + BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0009.cs" );
- verifier.assertFilePresent( "target/NMaven.It.It0009-1.0.0.dll" );
+ verifier.assertFilePresent( getBuildSourcesMain( "It0009.cs" ));
+ verifier.assertFilePresent( getAssemblyFile("NMaven.It.It0009","1.0.0","dll" ));
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
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=697869&r1=697868&r2=697869&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 Mon Sep 22 08:29:36 2008
@@ -19,24 +19,22 @@
package org.apache.maven.dotnet.integrationtests;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.dotnet.BuildDirectories;
-
import java.io.File;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
public class MavenITmng0010DeployLibrary
- extends AbstractMavenIntegrationTestCase
+ extends AbstractNMavenIntegrationTestCase
{
public void testit0010()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0010-DeployLibrary" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "deploy" );
- verifier.assertFilePresent( "target/" + BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0010.cs" );
- verifier.assertFilePresent( "target/NMaven.It.It0010-1.0.0.dll" );
+ verifier.assertFilePresent( getBuildSourcesMain("It0010.cs" ));
+ verifier.assertFilePresent( getAssemblyFile("NMaven.It.It0010","1.0.0","dll" ));
verifier.assertFilePresent( "target/test-repo/NMaven/Its/NMaven.It.It0010/1.0.0/NMaven.It.It0010-1.0.0.dll" );
verifier.assertFilePresent( "target/test-repo/NMaven/Its/NMaven.It.It0010/1.0.0/NMaven.It.It0010-1.0.0.pom" );
verifier.assertFilePresent( "target/test-repo/NMaven/Its/NMaven.It.It0010/maven-metadata.xml" );
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=697869&r1=697868&r2=697869&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 Mon Sep 22 08:29:36 2008
@@ -19,29 +19,28 @@
package org.apache.maven.dotnet.integrationtests;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.dotnet.BuildDirectories;
-
import java.io.File;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
public class MavenITmng0011DeployExe
- extends AbstractMavenIntegrationTestCase
+ extends AbstractNMavenIntegrationTestCase
{
public void testit0011()
throws Exception
{
String artifactId = "NMaven.It.It0011";
- String artifactName = artifactId + "-1.0.0";
+ String version = "1.0.0";
+ String artifactName = artifactId + "-" + version;
String metadataDir = "target/test-repo/NMaven/Its/" + artifactId + "/";
String artifactDir = metadataDir + "1.0.0/";
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0011-DeployExe" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "deploy" );
- verifier.assertFilePresent( "target/" + BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0011.cs" );
- verifier.assertFilePresent( "target/" + artifactName + ".exe" );
+ verifier.assertFilePresent( getBuildSourcesMain("It0011.cs" ));
+ verifier.assertFilePresent( getAssemblyFile( artifactId , version,"exe" ));
verifier.assertFilePresent( artifactDir + artifactName + ".exe" );
verifier.assertFilePresent( artifactDir + artifactName + ".pom" );
verifier.assertFilePresent( metadataDir + "maven-metadata.xml" );
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=697869&r1=697868&r2=697869&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 Mon Sep 22 08:29:36 2008
@@ -19,29 +19,28 @@
package org.apache.maven.dotnet.integrationtests;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.dotnet.BuildDirectories;
-
import java.io.File;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
public class MavenITmng0012DeployModule
- extends AbstractMavenIntegrationTestCase
+ extends AbstractNMavenIntegrationTestCase
{
public void testit0012()
throws Exception
{
String artifactId = "NMaven.It.It0012";
- String artifactName = artifactId + "-1.0.0";
+ String version = "1.0.0";
+ String artifactName = artifactId + "-" + version;
String metadataDir = "target/test-repo/NMaven/Its/" + artifactId + "/";
String artifactDir = metadataDir + "1.0.0/";
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0012-DeployModule" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "deploy" );
- verifier.assertFilePresent( "target/" + BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0012.cs" );
- verifier.assertFilePresent( "target/" + artifactName + ".netmodule" );
+ verifier.assertFilePresent( getBuildSourcesMain("It0012.cs" ));
+ verifier.assertFilePresent( getAssemblyFile( artifactId , version,"netmodule" ));
verifier.assertFilePresent( artifactDir + artifactName + ".netmodule" );
verifier.assertFilePresent( artifactDir + artifactName + ".pom" );
verifier.assertFilePresent( metadataDir + "maven-metadata.xml" );
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=697869&r1=697868&r2=697869&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 Mon Sep 22 08:29:36 2008
@@ -19,29 +19,28 @@
package org.apache.maven.dotnet.integrationtests;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.dotnet.BuildDirectories;
-
import java.io.File;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
public class MavenITmng0013DeployWinexe
- extends AbstractMavenIntegrationTestCase
+ extends AbstractNMavenIntegrationTestCase
{
public void testit0013()
throws Exception
{
String artifactId = "NMaven.It.It0013";
- String artifactName = artifactId + "-1.0.0";
+ String version = "1.0.0";
+ String artifactName = artifactId + "-" + version;
String metadataDir = "target/test-repo/NMaven/Its/" + artifactId + "/";
String artifactDir = metadataDir + "1.0.0/";
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0013-DeployWinexe" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "deploy" );
- verifier.assertFilePresent( "target/" + BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0013.cs" );
- verifier.assertFilePresent( "target/" + artifactName + ".exe" );
+ verifier.assertFilePresent( getBuildSourcesMain( "It0013.cs" ));
+ verifier.assertFilePresent( getAssemblyFile( artifactId , version,"exe" ));
verifier.assertFilePresent( artifactDir + artifactName + ".exe" );
verifier.assertFilePresent( artifactDir + artifactName + ".pom" );
verifier.assertFilePresent( metadataDir + "maven-metadata.xml" );
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=697869&r1=697868&r2=697869&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 Mon Sep 22 08:29:36 2008
@@ -19,27 +19,25 @@
package org.apache.maven.dotnet.integrationtests;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.dotnet.BuildDirectories;
-
import java.io.File;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
public class MavenITmng0014ResolveLibraryDependency
- extends AbstractMavenIntegrationTestCase
+ extends AbstractNMavenIntegrationTestCase
{
public void testit0014()
throws Exception
{
File testDir =
ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0014-ResolveLibraryDependency" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = getVerifier( testDir );
verifier.deleteArtifact( "NMaven.Its", "NMaven.It.It0010", "1.0.0", "dll" );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" + BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0014.cs" );
- verifier.assertFilePresent( "target/NMaven.It.It0014-1.0.0.dll" );
+ verifier.assertFilePresent( getBuildSourcesMain( "It0014.cs" ));
+ verifier.assertFilePresent( getAssemblyFile("NMaven.It.It0014","1.0.0","dll" ));
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
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=697869&r1=697868&r2=697869&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 Mon Sep 22 08:29:36 2008
@@ -18,31 +18,29 @@
*/
package org.apache.maven.dotnet.integrationtests;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.dotnet.BuildDirectories;
-
import java.io.File;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
public class MavenITmng0015DeployLibraryAsSnapshot
- extends AbstractMavenIntegrationTestCase
+ extends AbstractNMavenIntegrationTestCase
{
public void testit0015()
throws Exception
{
String artifactId = "NMaven.It.It0015";
- String artifactName = artifactId + "-1.0.0-SNAPSHOT";
+ String version = "1.0.0-SNAPSHOT";
String metadataDir = "target/test-repo/NMaven/Its/" + artifactId + "/";
String artifactDir = metadataDir + "1.0.0-SNAPSHOT/";
File testDir =
ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0015-DeployLibraryAsSnapshot" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "deploy" );
- verifier.assertFilePresent( "target/" + BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0015.cs" );
- verifier.assertFilePresent( "target/" + artifactName + ".dll" );
+ verifier.assertFilePresent( getBuildSourcesMain( "It0015.cs" ) );
+ verifier.assertFilePresent( getAssemblyFile( artifactId, version, "dll" ) );
verifier.assertFilePresent( artifactDir );
verifier.assertFilePresent( metadataDir + "maven-metadata.xml" );
verifier.resetStreams();
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=697869&r1=697868&r2=697869&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 Mon Sep 22 08:29:36 2008
@@ -18,31 +18,38 @@
*/
package org.apache.maven.dotnet.integrationtests;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.dotnet.BuildDirectories;
-
import java.io.File;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
public class MavenITmng0016CSharpAssemblyInfoGeneration
- extends AbstractMavenIntegrationTestCase
+ extends AbstractNMavenIntegrationTestCase
{
public void testit0016()
throws Exception
{
File testDir =
ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0016-CSharpAssemblyInfoGeneration" );
- String assemblyInfoFileName =
- "target/" + BuildDirectories.BUILD_SOURCES_GENERATED.getBuildDirectoryName() + "/META-INF/AssemblyInfo.cs";
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+
+ String assemblyInfoFileName;
+ if ( VERSION_0_14.equals( getNMavenVersion() ) )
+ {
+ assemblyInfoFileName = "META-INF/NMaven/Its/AssemblyInfo.cs";
+ }
+ else
+ {
+ assemblyInfoFileName = "META-INF/AssemblyInfo.cs";
+ }
+
+ Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" + BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0016.cs" );
- verifier.assertFilePresent( assemblyInfoFileName );
- verifier.assertFilePresent( "target/NMaven.It.It0016-1.0.0.dll" );
+ verifier.assertFilePresent( getBuildSourcesMain( "It0016.cs" ) );
+ verifier.assertFilePresent( getBuildSourcesGenerated( assemblyInfoFileName ) );
+ verifier.assertFilePresent( getAssemblyFile( "NMaven.It.It0016", "1.0.0", "dll" ) );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
- //requires some manual verification of looking at AssemblyInfo.cs to confirm that the pom preoprties have
- //been properly set
+ // requires some manual verification of looking at AssemblyInfo.cs to confirm that the pom preoprties have
+ // been properly set
}
}
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=697869&r1=697868&r2=697869&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 Mon Sep 22 08:29:36 2008
@@ -18,25 +18,23 @@
*/
package org.apache.maven.dotnet.integrationtests;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.dotnet.BuildDirectories;
-
import java.io.File;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
public class MavenITmng0017CSharpStrongNamedAssembly
- extends AbstractMavenIntegrationTestCase
+ extends AbstractNMavenIntegrationTestCase
{
public void testit0017()
throws Exception
{
File testDir =
ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0017-CSharpStrongNamedAssembly" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "install" );
- verifier.assertFilePresent( "target/" + BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0017.cs" );
- verifier.assertFilePresent( "target/NMaven.It.It0017-1.0.0.dll" );
+ verifier.assertFilePresent( getBuildSourcesMain("It0017.cs" ));
+ verifier.assertFilePresent( getAssemblyFile("NMaven.It.It0017","1.0.0","dll" ));
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
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=697869&r1=697868&r2=697869&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 Mon Sep 22 08:29:36 2008
@@ -18,17 +18,16 @@
*/
package org.apache.maven.dotnet.integrationtests;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.dotnet.BuildDirectories;
-
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
+import org.apache.maven.dotnet.BuildDirectories;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
public class MavenITmng0018CSharpSynchronizeTargetWithSource
- extends AbstractMavenIntegrationTestCase
+ extends AbstractNMavenIntegrationTestCase
{
private static final String CS_GEN_FILENAME = "It0018Gen.cs";
@@ -54,16 +53,12 @@
fileWriter.write( CS_GEN_SOURCE );
fileWriter.close();
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "install" );
- verifier.assertFilePresent(
- "target/" + BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0018.cs" );
- verifier.assertFilePresent(
- "target/" + BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0018Gen.cs" );
- verifier.assertFilePresent(
- "target/" + BuildDirectories.TEST_BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0018.cs" );
- verifier.assertFilePresent(
- "target/" + BuildDirectories.TEST_BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0018Gen.cs" );
+ verifier.assertFilePresent( getBuildSourcesMain( "It0018.cs" ) );
+ verifier.assertFilePresent( getBuildSourcesMain( "It0018Gen.cs" ) );
+ verifier.assertFilePresent( getBuildSourcesTest( "It0018.cs" ) );
+ verifier.assertFilePresent( getBuildSourcesTest( "It0018Gen.cs" ) );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
@@ -74,8 +69,7 @@
verifier.executeGoal( "install" );
// Verify that the deleted file is purged from the staging compilation directory
- verifier.assertFileNotPresent(
- "target/" + BuildDirectories.BUILD_SOURCES_MAIN.getBuildDirectoryName() + "/It0018Gen.cs" );
+ verifier.assertFileNotPresent( getBuildSourcesMain( "It0018Gen.cs" ) );
verifier.assertFileNotPresent(
"target/" + BuildDirectories.TEST_BUILD_SOURCES_GENERATED.getBuildDirectoryName() + "/It0018Gen.cs" );
verifier.verifyErrorFreeLog();
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=697869&r1=697868&r2=697869&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 Mon Sep 22 08:29:36 2008
@@ -20,23 +20,31 @@
import java.io.File;
-import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
+import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
public class MavenITmng0019BuildFailureOnNUnitFailure
- extends AbstractMavenIntegrationTestCase
+ extends AbstractNMavenIntegrationTestCase
{
public void testit0019()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0019-BuildFailureOnNUnitFailure" );
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+ File testDir =
+ ResourceExtractor.simpleExtractResources( getClass(), "/MavenITmng-0019-BuildFailureOnNUnitFailure" );
+ Verifier verifier = getVerifier( testDir );
verifier.executeGoal( "test" );
-
-
- // TODO: Need to verify that the build failed!
-
+
+ try
+ {
+ verifier.verifyErrorFreeLog();
+ fail( "Log has no errors, expected test failure" );
+ }
+ catch ( VerificationException e )
+ {
+ // expected
+ }
+
verifier.resetStreams();
}
}
Propchange: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITDotNetToolchain/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITDotNetToolchain/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITDotNetToolchain/pom.xml?rev=697869&r1=697654&r2=697869&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITDotNetToolchain/pom.xml (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITDotNetToolchain/pom.xml Mon Sep 22 08:29:36 2008
@@ -17,13 +17,15 @@
specific language governing permissions and limitations
under the License.
-->
-<project>
+<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.It0000</artifactId>
+ <artifactId>NMaven.It.DotNetToolchain</artifactId>
<packaging>dotnet:library</packaging>
<version>1.0.0</version>
- <name>NMaven.It.It0000</name>
+ <name>NMaven.It.DotNetToolchain</name>
<build>
<sourceDirectory>.</sourceDirectory>
<extensions>
@@ -53,6 +55,7 @@
<configuration>
<toolchains>
<dotnet>
+ <!-- TODO: ability to test others -->
<vendor>MICROSOFT</vendor>
</dotnet>
</toolchains>
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0000-CSharpCompileLibrary/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0000-CSharpCompileLibrary/pom.xml?rev=697869&r1=697868&r2=697869&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0000-CSharpCompileLibrary/pom.xml (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0000-CSharpCompileLibrary/pom.xml Mon Sep 22 08:29:36 2008
@@ -17,7 +17,9 @@
specific language governing permissions and limitations
under the License.
-->
-<project>
+<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.It0000</artifactId>
@@ -26,39 +28,12 @@
<name>NMaven.It.It0000</name>
<build>
<sourceDirectory>.</sourceDirectory>
- <extensions>
- <extension>
- <groupId>org.apache.maven.dotnet</groupId>
- <artifactId>maven-dotnet-toolchain</artifactId>
- <version>0.16-incubating-SNAPSHOT</version>
- </extension>
- </extensions>
<plugins>
<plugin>
<groupId>org.apache.maven.dotnet.plugins</groupId>
<artifactId>maven-dotnet-compiler-plugin</artifactId>
<extensions>true</extensions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-toolchains-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>toolchain</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <toolchains>
- <dotnet>
- <vendor>MICROSOFT</vendor>
- </dotnet>
- </toolchains>
- </configuration>
- <extensions>true</extensions>
- </plugin>
</plugins>
</build>
</project>
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0001-CSharpCompileExe/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0001-CSharpCompileExe/pom.xml?rev=697869&r1=697868&r2=697869&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0001-CSharpCompileExe/pom.xml (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0001-CSharpCompileExe/pom.xml Mon Sep 22 08:29:36 2008
@@ -17,7 +17,9 @@
specific language governing permissions and limitations
under the License.
-->
-<project>
+<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.It0001</artifactId>
@@ -31,7 +33,7 @@
<groupId>org.apache.maven.dotnet.plugins</groupId>
<artifactId>maven-dotnet-compiler-plugin</artifactId>
<extensions>true</extensions>
- </plugin>
+ </plugin>
</plugins>
</build>
</project>
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0002-CSharpCompileModule/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0002-CSharpCompileModule/pom.xml?rev=697869&r1=697868&r2=697869&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0002-CSharpCompileModule/pom.xml (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0002-CSharpCompileModule/pom.xml Mon Sep 22 08:29:36 2008
@@ -17,7 +17,9 @@
specific language governing permissions and limitations
under the License.
-->
-<project>
+<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.It0002</artifactId>
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0003-CSharpCompileWinexe/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0003-CSharpCompileWinexe/pom.xml?rev=697869&r1=697868&r2=697869&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0003-CSharpCompileWinexe/pom.xml (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0003-CSharpCompileWinexe/pom.xml Mon Sep 22 08:29:36 2008
@@ -17,7 +17,9 @@
specific language governing permissions and limitations
under the License.
-->
-<project>
+<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.It0003</artifactId>
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0004-CSharpCompileWithDependency/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0004-CSharpCompileWithDependency/pom.xml?rev=697869&r1=697868&r2=697869&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0004-CSharpCompileWithDependency/pom.xml (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0004-CSharpCompileWithDependency/pom.xml Mon Sep 22 08:29:36 2008
@@ -17,7 +17,9 @@
specific language governing permissions and limitations
under the License.
-->
-<project>
+<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.It0004</artifactId>
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0005-CSharpCompileWithTransitiveDependency/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0005-CSharpCompileWithTransitiveDependency/pom.xml?rev=697869&r1=697868&r2=697869&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0005-CSharpCompileWithTransitiveDependency/pom.xml (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0005-CSharpCompileWithTransitiveDependency/pom.xml Mon Sep 22 08:29:36 2008
@@ -17,7 +17,9 @@
specific language governing permissions and limitations
under the License.
-->
-<project>
+<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.It0005</artifactId>
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/pom.xml?rev=697869&r1=697868&r2=697869&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/pom.xml (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0007-CSharpCompileTestLibrary/pom.xml Mon Sep 22 08:29:36 2008
@@ -17,7 +17,9 @@
specific language governing permissions and limitations
under the License.
-->
-<project>
+<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.It0007</artifactId>
@@ -48,9 +50,9 @@
</build>
<dependencies>
<dependency>
- <groupId>org.apache.maven.dotnet</groupId>
+ <groupId>NUnit</groupId>
<artifactId>NUnit.Framework</artifactId>
- <version>2.4.6-incubating-SNAPSHOT</version>
+ <version>2.2.8.0</version>
<type>dotnet:library</type>
<scope>test</scope>
</dependency>
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0008-CSharpCompileWithProvidedDependency/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0008-CSharpCompileWithProvidedDependency/pom.xml?rev=697869&r1=697868&r2=697869&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0008-CSharpCompileWithProvidedDependency/pom.xml (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0008-CSharpCompileWithProvidedDependency/pom.xml Mon Sep 22 08:29:36 2008
@@ -17,7 +17,9 @@
specific language governing permissions and limitations
under the License.
-->
-<project>
+<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.It0008</artifactId>
Modified: incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0009-CSharpCompileWithProvidedGacDependency/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0009-CSharpCompileWithProvidedGacDependency/pom.xml?rev=697869&r1=697868&r2=697869&view=diff
==============================================================================
--- incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0009-CSharpCompileWithProvidedGacDependency/pom.xml (original)
+++ incubator/nmaven/branches/NMAVEN-186/core-integration-tests/src/test/resources/MavenITmng-0009-CSharpCompileWithProvidedGacDependency/pom.xml Mon Sep 22 08:29:36 2008
@@ -17,7 +17,9 @@
specific language governing permissions and limitations
under the License.
-->
-<project>
+<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.It0009</artifactId>