From e3cbc52f0c7db9b4ab19785f7afa62722b4b80a5 Mon Sep 17 00:00:00 2001
From: Benjamin Bentmann <bentmann@apache.org>
Date: Mon, 29 Dec 2008 17:43:03 +0000
Subject: [PATCH] o Decoupled it0007 from production stuff

git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@729957 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/maven/it/MavenIT0007Test.java  | 18 +++----
 ...mng1021EqualAttachmentBuildNumberTest.java |  1 +
 .../src/test/resources/it0007/pom.xml         | 48 ++++++++++++-------
 .../its/it0007/parent/2.0/parent-2.0.pom      | 40 ++++++++++++++++
 .../its/it0007/parent/maven-metadata.xml      | 12 +++++
 .../src/test/resources/it0007/settings.xml    | 43 +++++++++++++++++
 .../java/org/apache/maven/it0007/Person.java  | 16 -------
 .../src/main/resources/it0007.properties      |  1 -
 .../org/apache/maven/it0007/PersonTest.java   | 16 -------
 9 files changed, 137 insertions(+), 58 deletions(-)
 create mode 100644 its/core-it-suite/src/test/resources/it0007/repo/org/apache/maven/its/it0007/parent/2.0/parent-2.0.pom
 create mode 100644 its/core-it-suite/src/test/resources/it0007/repo/org/apache/maven/its/it0007/parent/maven-metadata.xml
 create mode 100644 its/core-it-suite/src/test/resources/it0007/settings.xml
 delete mode 100644 its/core-it-suite/src/test/resources/it0007/src/main/java/org/apache/maven/it0007/Person.java
 delete mode 100644 its/core-it-suite/src/test/resources/it0007/src/main/resources/it0007.properties
 delete mode 100644 its/core-it-suite/src/test/resources/it0007/src/test/java/org/apache/maven/it0007/PersonTest.java

diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0007Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0007Test.java
index 13e483178e..e8edb9ae33 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0007Test.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0007Test.java
@@ -36,17 +36,17 @@ public class MavenIT0007Test
         throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0007" );
+
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        verifier.deleteArtifact( "org.apache.maven.plugins", "maven-plugin-parent", "2.0", "pom" );
-        verifier.executeGoal( "package" );
-        verifier.assertFilePresent( "target/classes/org/apache/maven/it0007/Person.class" );
-        verifier.assertFilePresent( "target/test-classes/org/apache/maven/it0007/PersonTest.class" );
-        verifier.assertFilePresent( "target/maven-it-it0007-1.0.jar" );
-        verifier.assertFilePresent( "target/maven-it-it0007-1.0.jar!/it0007.properties" );
-        verifier.assertArtifactPresent( "org.apache.maven.plugins", "maven-plugin-parent", "2.0", "pom" );
+        verifier.setAutoclean( false );
+        verifier.filterFile( "settings.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
+        verifier.deleteArtifacts( "org.apache.maven.its.it0007" );
+        verifier.getCliOptions().add( "-s" );
+        verifier.getCliOptions().add( new File( testDir, "settings.xml" ).getAbsolutePath() );
+        verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
-
+        verifier.assertArtifactPresent( "org.apache.maven.its.it0007", "parent", "2.0", "pom" );
     }
-}
 
+}
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
index b10bbbcfad..bb3e4feada 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
@@ -43,6 +43,7 @@ public class MavenITmng1021EqualAttachmentBuildNumberTest
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-1021" );
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+        verifier.setAutoclean( false );
         verifier.deleteDirectory( "repo" );
         verifier.deleteArtifacts( "org.apache.maven.its.mng1021" );
         verifier.executeGoal( "initialize" );
diff --git a/its/core-it-suite/src/test/resources/it0007/pom.xml b/its/core-it-suite/src/test/resources/it0007/pom.xml
index 4a26c9d3f8..283c05b792 100644
--- a/its/core-it-suite/src/test/resources/it0007/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0007/pom.xml
@@ -1,22 +1,38 @@
+<?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>
+
   <parent>
-    <artifactId>maven-plugin-parent</artifactId>
-    <groupId>org.apache.maven.plugins</groupId>
+    <groupId>org.apache.maven.its.it0007</groupId>
+    <artifactId>parent</artifactId>
     <version>2.0</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-it-it0007</artifactId>
-  <description>We specify a parent in the POM and make sure that it is downloaded as
-        part of the process.        </description>
-  <packaging>jar</packaging>
+
+  <artifactId>test</artifactId>
   <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 :: it0007</name> 
+  <description>
+    Verify that a parent POM is successfully downloaded.
+  </description>
 </project>
diff --git a/its/core-it-suite/src/test/resources/it0007/repo/org/apache/maven/its/it0007/parent/2.0/parent-2.0.pom b/its/core-it-suite/src/test/resources/it0007/repo/org/apache/maven/its/it0007/parent/2.0/parent-2.0.pom
new file mode 100644
index 0000000000..e8d1d1158c
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/it0007/repo/org/apache/maven/its/it0007/parent/2.0/parent-2.0.pom
@@ -0,0 +1,40 @@
+<?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.it0007</groupId>
+  <artifactId>parent</artifactId>
+  <version>2.0</version>
+  <packaging>pom</packaging>
+
+  <distributionManagement>
+    <repository>
+      <id>maven-core-it</id>
+      <url>file:///${basedir}/repo</url>
+    </repository>
+  </distributionManagement>
+
+  <properties>
+    <updateReleaseInfo>true</updateReleaseInfo>
+  </properties>
+</project>
diff --git a/its/core-it-suite/src/test/resources/it0007/repo/org/apache/maven/its/it0007/parent/maven-metadata.xml b/its/core-it-suite/src/test/resources/it0007/repo/org/apache/maven/its/it0007/parent/maven-metadata.xml
new file mode 100644
index 0000000000..610bc2d750
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/it0007/repo/org/apache/maven/its/it0007/parent/maven-metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+  <groupId>org.apache.maven.its.it0007</groupId>
+  <artifactId>parent</artifactId>
+  <version>2.0</version>
+  <versioning>
+    <release>2.0</release>
+    <versions>
+      <version>2.0</version>
+    </versions>
+    <lastUpdated>20081229165708</lastUpdated>
+  </versioning>
+</metadata>
\ No newline at end of file
diff --git a/its/core-it-suite/src/test/resources/it0007/settings.xml b/its/core-it-suite/src/test/resources/it0007/settings.xml
new file mode 100644
index 0000000000..84f73bcadc
--- /dev/null
+++ b/its/core-it-suite/src/test/resources/it0007/settings.xml
@@ -0,0 +1,43 @@
+<?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.
+-->
+
+<settings>
+  <profiles>
+    <profile>
+      <id>maven-core-it-repo</id>
+      <repositories>
+        <repository>
+          <id>maven-core-it</id>
+          <url>@baseurl@/repo</url>
+          <releases>
+            <checksumPolicy>ignore</checksumPolicy>
+          </releases>
+          <snapshots>
+            <checksumPolicy>ignore</checksumPolicy>
+          </snapshots>
+        </repository>
+      </repositories>
+    </profile>
+  </profiles>
+  <activeProfiles>
+    <activeProfile>maven-core-it-repo</activeProfile>
+  </activeProfiles>
+</settings>
diff --git a/its/core-it-suite/src/test/resources/it0007/src/main/java/org/apache/maven/it0007/Person.java b/its/core-it-suite/src/test/resources/it0007/src/main/java/org/apache/maven/it0007/Person.java
deleted file mode 100644
index fd86c7e709..0000000000
--- a/its/core-it-suite/src/test/resources/it0007/src/main/java/org/apache/maven/it0007/Person.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.apache.maven.it0007;
-
-public class Person
-{
-    private String name;
-    
-    public void setName( String name )
-    {
-        this.name = name;
-    }
-    
-    public String getName()
-    {
-        return name;
-    }
-}
diff --git a/its/core-it-suite/src/test/resources/it0007/src/main/resources/it0007.properties b/its/core-it-suite/src/test/resources/it0007/src/main/resources/it0007.properties
deleted file mode 100644
index f54f8ab106..0000000000
--- a/its/core-it-suite/src/test/resources/it0007/src/main/resources/it0007.properties
+++ /dev/null
@@ -1 +0,0 @@
-name = jason
diff --git a/its/core-it-suite/src/test/resources/it0007/src/test/java/org/apache/maven/it0007/PersonTest.java b/its/core-it-suite/src/test/resources/it0007/src/test/java/org/apache/maven/it0007/PersonTest.java
deleted file mode 100644
index 228f5f0e96..0000000000
--- a/its/core-it-suite/src/test/resources/it0007/src/test/java/org/apache/maven/it0007/PersonTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.apache.maven.it0007;
-
-import junit.framework.TestCase;
-
-public class PersonTest
-    extends TestCase
-{
-    public void testPerson()
-    {
-        Person person = new Person();
-        
-        person.setName( "foo" );
-        
-        assertEquals( "foo", person.getName() );
-    }
-}