Author: sisbell
Date: Thu Mar 13 10:40:42 2008
New Revision: 636810
URL: http://svn.apache.org/viewvc?rev=636810&view=rev
Log:
Separating the test suites between Microsoft and Mono. Going to need this as we
develop platform specific plugins.
Added:
incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/MicrosoftSuite.java
incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/MonoSuite.java
(contents, props changed)
- copied, changed from r633575,
incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/Suite.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MicrosoftIntegrationTestSuite.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MonoIntegrationTestSuite.java
(contents, props changed)
- copied, changed from r633575,
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java
Removed:
incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/Suite.java
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java
Modified:
incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/pom.xml
Modified: incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/pom.xml?rev=636810&r1=636809&r2=636810&view=diff
==============================================================================
--- incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/pom.xml
(original)
+++ incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/pom.xml Thu
Mar 13 10:40:42 2008
@@ -29,19 +29,7 @@
<groupId>org.apache.maven.dotnet</groupId>
<artifactId>maven-dotnet-core-it-runner</artifactId>
<name>Apache NMaven: maven-dotnet-core-it-runner</name>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <includes>
- <include>**/Suite.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
<dependencies>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -76,6 +64,40 @@
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>microsoft-its</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.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>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
<repositories>
<repository>
<id>apache.snapshots</id>
Added:
incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/MicrosoftSuite.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/MicrosoftSuite.java?rev=636810&view=auto
==============================================================================
---
incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/MicrosoftSuite.java
(added)
+++
incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/MicrosoftSuite.java
Thu Mar 13 10:40:42 2008
@@ -0,0 +1,35 @@
+/*
+ * 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.its;
+
+import junit.framework.TestCase;
+import junit.framework.Test;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.dotnet.integrationtests.MicrosoftIntegrationTestSuite;
+
+public class MicrosoftSuite
+ extends TestCase
+{
+ public static Test suite()
+ throws VerificationException
+ {
+ return MicrosoftIntegrationTestSuite.suite();
+ }
+}
+
Copied:
incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/MonoSuite.java
(from r633575,
incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/Suite.java)
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/MonoSuite.java?p2=incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/MonoSuite.java&p1=incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/Suite.java&r1=633575&r2=636810&rev=636810&view=diff
==============================================================================
---
incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/Suite.java
(original)
+++
incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/MonoSuite.java
Thu Mar 13 10:40:42 2008
@@ -18,17 +18,17 @@
*/
package org.apache.maven.dotnet.its;
-import org.apache.maven.dotnet.integrationtests.IntegrationTestSuite;
+import org.apache.maven.dotnet.integrationtests.MonoIntegrationTestSuite;
import org.apache.maven.it.VerificationException;
import junit.framework.TestCase;
import junit.framework.Test;
-public class Suite
+public class MonoSuite
extends TestCase
{
public static Test suite()
throws VerificationException
{
- return IntegrationTestSuite.suite();
+ return MonoIntegrationTestSuite.suite();
}
}
Propchange:
incubator/nmaven/trunk/components/maven-dotnet-core-it-runner/src/test/java/org/apache/maven/dotnet/its/MonoSuite.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MicrosoftIntegrationTestSuite.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MicrosoftIntegrationTestSuite.java?rev=636810&view=auto
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MicrosoftIntegrationTestSuite.java
(added)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MicrosoftIntegrationTestSuite.java
Thu Mar 13 10:40:42 2008
@@ -0,0 +1,71 @@
+/*
+ * 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 org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class MicrosoftIntegrationTestSuite
+ 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( MavenITmng0000CSharpCompileLibrary.class );
+ suite.addTestSuite( MavenITmng0001CSharpCompileExe.class );
+ suite.addTestSuite( MavenITmng0002CSharpCompileModule.class );
+ suite.addTestSuite( MavenITmng0003CSharpCompileWinexe.class );
+ suite.addTestSuite( MavenITmng0004CSharpCompileWithDependency.class );
+ suite.addTestSuite(
MavenITmng0005CSharpCompileWithTransitiveDependency.class );
+
+ //suite.addTestSuite( MavenITmng0006NUnitTestExecution.class );
+ suite.addTestSuite( MavenITmng0007CSharpCompileTestLibrary.class );
+ suite.addTestSuite(
MavenITmng0008CSharpCompileWithProvidedDependency.class );
+ //suite.addTestSuite(
MavenITmng0009CSharpCompileWithProvidedGacDependency.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( MavenITmng0017CSharpStrongNamedAssembly.class );
+ suite.addTestSuite(
MavenITmng0018CSharpSynchronizeTargetWithSource.class );
+ suite.addTestSuite( MavenITmng0019BuildFailureOnNUnitFailure.class );
+ return suite;
+ }
+}
Copied:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MonoIntegrationTestSuite.java
(from r633575,
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java)
URL:
http://svn.apache.org/viewvc/incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MonoIntegrationTestSuite.java?p2=incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MonoIntegrationTestSuite.java&p1=incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java&r1=633575&r2=636810&rev=636810&view=diff
==============================================================================
---
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/IntegrationTestSuite.java
(original)
+++
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MonoIntegrationTestSuite.java
Thu Mar 13 10:40:42 2008
@@ -25,7 +25,7 @@
import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
-public class IntegrationTestSuite
+public class MonoIntegrationTestSuite
extends AbstractMavenIntegrationTestCase
{
public static Test suite()
Propchange:
incubator/nmaven/trunk/core-integration-tests/src/test/java/org/apache/maven/dotnet/integrationtests/MonoIntegrationTestSuite.java
------------------------------------------------------------------------------
svn:eol-style = native
