maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r732066 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/it0039/project/ resources/it0039/project/src/ resources/it0039/project2/ resources/it0039/project2/src/
Date Tue, 06 Jan 2009 19:18:08 GMT
Author: bentmann
Date: Tue Jan  6 11:18:08 2009
New Revision: 732066

URL: http://svn.apache.org/viewvc?rev=732066&view=rev
Log:
o Decoupled it0039 from production plugins

Removed:
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0039/project/src/
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0039/project2/src/
Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039Test.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0039/project/pom.xml
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0039/project/release-pom.xml
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0039/project2/pom.xml
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0039/project2/release-pom.xml

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039Test.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039Test.java?rev=732066&r1=732065&r2=732066&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039Test.java
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039Test.java
Tue Jan  6 11:18:08 2009
@@ -23,8 +23,6 @@
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-607">MNG-607</a>.
@@ -45,16 +43,20 @@
         throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0039" );
+
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        List cliOptions = new ArrayList();
-        cliOptions.add( "-r" );
-        verifier.setCliOptions( cliOptions );
-        verifier.executeGoal( "package" );
-        verifier.assertFilePresent( "project/target/maven-it-it0039-p1-1.0.jar" );
-        verifier.assertFilePresent( "project2/target/maven-it-it0039-p2-1.0.jar" );
+        verifier.setAutoclean( false );
+        verifier.deleteDirectory( "project/target" );
+        verifier.deleteDirectory( "project2/target" );
+        verifier.getCliOptions().add( "-r" );
+        verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
+        verifier.assertFilePresent( "project/target/passed.log" );
+        verifier.assertFileNotPresent( "project/target/failed.log" );
+        verifier.assertFilePresent( "project2/target/passed.log" );
+        verifier.assertFileNotPresent( "project2/target/failed.log" );
     }
-}
 
+}

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0039/project/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0039/project/pom.xml?rev=732066&r1=732065&r2=732066&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0039/project/pom.xml
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0039/project/pom.xml
Tue Jan  6 11:18:08 2009
@@ -1,16 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
 <project>
   <modelVersion>4.0.0</modelVersion>
+
   <groupId>org.apache.maven.its.it0039</groupId>
-  <artifactId>maven-it-it0039-p1</artifactId>
+  <artifactId>test1</artifactId>
+  <version>0.1</version>
   <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <type>jar</type>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+
+  <name>Maven Integration Test :: it0039</name> 
+  <description>
+    Test that reactor uses release-pom.xml if available.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-log-file</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <configuration>
+          <logFile>target/failed.log</logFile>
+          <string>This should not get executed, should have taken the other POM</string>
+        </configuration>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>log-string</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0039/project/release-pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0039/project/release-pom.xml?rev=732066&r1=732065&r2=732066&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0039/project/release-pom.xml
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0039/project/release-pom.xml
Tue Jan  6 11:18:08 2009
@@ -1,16 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
 <project>
   <modelVersion>4.0.0</modelVersion>
+
   <groupId>org.apache.maven.its.it0039</groupId>
-  <artifactId>maven-it-it0039-p1</artifactId>
+  <artifactId>test1</artifactId>
+  <version>0.2</version>
   <packaging>jar</packaging>
-  <version>1.0</version>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <type>jar</type>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+
+  <name>Maven Integration Test :: it0039</name> 
+  <description>
+    Test that reactor uses release-pom.xml if available.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-log-file</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <configuration>
+          <logFile>target/passed.log</logFile>
+          <string>PASSED</string>
+        </configuration>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>log-string</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0039/project2/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0039/project2/pom.xml?rev=732066&r1=732065&r2=732066&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0039/project2/pom.xml
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0039/project2/pom.xml
Tue Jan  6 11:18:08 2009
@@ -1,16 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
 <project>
   <modelVersion>4.0.0</modelVersion>
+
   <groupId>org.apache.maven.its.it0039</groupId>
-  <artifactId>maven-it-it0039-p2</artifactId>
+  <artifactId>test2</artifactId>
+  <version>0.1</version>
   <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <type>jar</type>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+
+  <name>Maven Integration Test :: it0039</name> 
+  <description>
+    Test that reactor uses release-pom.xml if available.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-log-file</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <configuration>
+          <logFile>target/failed.log</logFile>
+          <string>This should not get executed, should have taken the other POM</string>
+        </configuration>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>log-string</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0039/project2/release-pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0039/project2/release-pom.xml?rev=732066&r1=732065&r2=732066&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0039/project2/release-pom.xml
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0039/project2/release-pom.xml
Tue Jan  6 11:18:08 2009
@@ -1,16 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
 <project>
   <modelVersion>4.0.0</modelVersion>
+
   <groupId>org.apache.maven.its.it0039</groupId>
-  <artifactId>maven-it-it0039-p2</artifactId>
+  <artifactId>test2</artifactId>
+  <version>0.2</version>
   <packaging>jar</packaging>
-  <version>1.0</version>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <type>jar</type>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+
+  <name>Maven Integration Test :: it0039</name> 
+  <description>
+    Test that reactor uses release-pom.xml if available.
+  </description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-log-file</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <configuration>
+          <logFile>target/passed.log</logFile>
+          <string>PASSED</string>
+        </configuration>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>log-string</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>



Mime
View raw message