From f730a6fbf115250aa61db47493a6468327f2842d Mon Sep 17 00:00:00 2001
From: Benjamin Bentmann <bentmann@apache.org>
Date: Thu, 8 Apr 2010 21:28:03 +0000
Subject: [PATCH] [MNG-2994] Snapshot repositories are not checked when using
 ranges

o Enabled IT

git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@932126 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/maven/it/IntegrationTestSuite.java |  2 +-
 ...nITmng2994SnapshotRangeRepositoryTest.java | 10 ++--
 .../src/test/resources/mng-2994/pom.xml       | 59 +++++++++++++++++--
 .../1.0-SNAPSHOT/artifact-1.0-SNAPSHOT.jar    |  0
 .../1.0-SNAPSHOT/artifact-1.0-SNAPSHOT.pom    |  5 +-
 .../artifact/maven-metadata.xml               |  7 ++-
 6 files changed, 68 insertions(+), 15 deletions(-)
 rename its/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/{it0123 => mng2994}/artifact/1.0-SNAPSHOT/artifact-1.0-SNAPSHOT.jar (100%)
 rename its/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/{it0123 => mng2994}/artifact/1.0-SNAPSHOT/artifact-1.0-SNAPSHOT.pom (54%)
 rename its/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/{it0123 => mng2994}/artifact/maven-metadata.xml (65%)

diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
index f1aa920430..dd74b40215 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
@@ -73,7 +73,6 @@ public class IntegrationTestSuite
         // -------------------------------------------------------------------------------------------------------------
         // suite.addTestSuite( MavenITmng3890TransitiveDependencyScopeUpdateTest.class );
         // suite.addTestSuite( MavenITmng3038TransitiveDepManVersionTest.class );
-        // suite.addTestSuite( MavenITmng2994SnapshotRangeRepositoryTest.class );
         // suite.addTestSuite( MavenITmng2771PomExtensionComponentOverrideTest.class );
         // suite.addTestSuite( MavenITmng0612NewestConflictResolverTest.class );
 
@@ -387,6 +386,7 @@ public class IntegrationTestSuite
         suite.addTestSuite( MavenITmng3023ReactorDependencyResolutionTest.class );
         suite.addTestSuite( MavenITmng3012CoreClassImportTest.class );
         suite.addTestSuite( MavenITmng3004ReactorFailureBehaviorMultithreadedTest.class );
+        suite.addTestSuite( MavenITmng2994SnapshotRangeRepositoryTest.class );
         suite.addTestSuite( MavenITmng2972OverridePluginDependencyTest.class );
         suite.addTestSuite( MavenITmng2926PluginPrefixOrderTest.class );
         suite.addTestSuite( MavenITmng2921ActiveAttachedArtifactsTest.class );
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java
index 1abb05ab12..c2927953dd 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java
@@ -33,25 +33,27 @@ import java.io.File;
 public class MavenITmng2994SnapshotRangeRepositoryTest
     extends AbstractMavenIntegrationTestCase
 {
+
     public MavenITmng2994SnapshotRangeRepositoryTest()
     {
-        super( ALL_MAVEN_VERSIONS );
+        super( "[3.0-beta-1,)" );
     }
 
     /**
      * Test that snapshot repositories are checked for ranges with snapshot boundaries.
      */
-    public void testitMNG2994()
+    public void testit()
         throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2994" );
         Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-        verifier.deleteArtifacts( "org.apache.maven.its.it0123" );
+        verifier.deleteArtifacts( "org.apache.maven.its.mng2994" );
         verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
         verifier.getCliOptions().add( "--settings" );
         verifier.getCliOptions().add( "settings.xml" );
-        verifier.executeGoal( "compile" );
+        verifier.executeGoal( "validate" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
     }
+
 }
diff --git a/its/core-it-suite/src/test/resources/mng-2994/pom.xml b/its/core-it-suite/src/test/resources/mng-2994/pom.xml
index 8d6ecc17a5..29a1c3f329 100644
--- a/its/core-it-suite/src/test/resources/mng-2994/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2994/pom.xml
@@ -1,15 +1,64 @@
+<?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>
-  <name>Maven Integration Test :: it0123</name> 
-  <groupId>org.apache.maven.its.it0123</groupId>
-  <artifactId>maven-it-it0123</artifactId>
-  <description>Test that snapshot repositories are checked for ranges with snapshot boundaries.</description>
+
+  <groupId>org.apache.maven.its.mng2994</groupId>
+  <artifactId>test</artifactId>
   <version>1.0</version>
+
+  <name>Maven Integration Test :: MNG-2994</name> 
+  <description>
+    Test that snapshot repositories are checked for ranges with snapshot boundaries.
+  </description>
+
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.its.it0123</groupId>
+      <groupId>org.apache.maven.its.mng2994</groupId>
       <artifactId>artifact</artifactId>
       <version>[1.0-SNAPSHOT]</version>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.its.plugins</groupId>
+        <artifactId>maven-it-plugin-dependency-resolution</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <configuration>
+          <compileClassPath>target/classpath.txt</compileClassPath>
+          <significantPathLevels>1</significantPathLevels>
+        </configuration>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/its/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/it0123/artifact/1.0-SNAPSHOT/artifact-1.0-SNAPSHOT.jar b/its/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/mng2994/artifact/1.0-SNAPSHOT/artifact-1.0-SNAPSHOT.jar
similarity index 100%
rename from its/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/it0123/artifact/1.0-SNAPSHOT/artifact-1.0-SNAPSHOT.jar
rename to its/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/mng2994/artifact/1.0-SNAPSHOT/artifact-1.0-SNAPSHOT.jar
diff --git a/its/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/it0123/artifact/1.0-SNAPSHOT/artifact-1.0-SNAPSHOT.pom b/its/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/mng2994/artifact/1.0-SNAPSHOT/artifact-1.0-SNAPSHOT.pom
similarity index 54%
rename from its/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/it0123/artifact/1.0-SNAPSHOT/artifact-1.0-SNAPSHOT.pom
rename to its/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/mng2994/artifact/1.0-SNAPSHOT/artifact-1.0-SNAPSHOT.pom
index e20caea89c..b372cf1f5b 100644
--- a/its/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/it0123/artifact/1.0-SNAPSHOT/artifact-1.0-SNAPSHOT.pom
+++ b/its/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/mng2994/artifact/1.0-SNAPSHOT/artifact-1.0-SNAPSHOT.pom
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.its.it0123</groupId>
+  <groupId>org.apache.maven.its.mng2994</groupId>
   <artifactId>artifact</artifactId>
   <version>1.0-SNAPSHOT</version>
 </project>
diff --git a/its/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/it0123/artifact/maven-metadata.xml b/its/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/mng2994/artifact/maven-metadata.xml
similarity index 65%
rename from its/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/it0123/artifact/maven-metadata.xml
rename to its/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/mng2994/artifact/maven-metadata.xml
index 9d1c9d9df7..877def4096 100644
--- a/its/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/it0123/artifact/maven-metadata.xml
+++ b/its/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/mng2994/artifact/maven-metadata.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
-  <groupId>org.apache.maven.its.it0123</groupId>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.apache.maven.its.mng2994</groupId>
   <artifactId>artifact</artifactId>
   <version>1.0-SNAPSHOT</version>
   <versioning>
@@ -8,4 +9,4 @@
     </versions>
     <lastUpdated>20070515170129</lastUpdated>
   </versioning>
-</metadata>
\ No newline at end of file
+</metadata>