[MRM-546] restore correct test data and fix configuration modifications

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@587071 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager-daysOld.xml b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager-daysOld.xml
index 6fed7140dde14c4456273f03ed88b0e8ae34cc63..0be0264a02ad3bae0a828fdb6fba7a0a25256f75 100644 (file)
--- a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager-daysOld.xml
+++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager-daysOld.xml
@@ -20,47 +20,58 @@
 
 <configuration>
   <version>1</version>
-  <managedRepositories>
-    <managedRepository>
+  <repositories>
+    <repository>
       <id>internal</id>
       <name>Archiva Managed Internal Repository</name>
-      <location>${appserver.base}/repositories/internal</location>
+      <url>file://${appserver.base}/repositories/internal</url>
       <layout>default</layout>
       <releases>true</releases>
       <snapshots>false</snapshots>
       <indexed>true</indexed>
       <refreshCronExpression>0 0 * * ?</refreshCronExpression>
-    </managedRepository>
-    <managedRepository>
+    </repository>
+    <repository>
       <id>snapshots</id>
       <name>Archiva Managed Snapshot Repository</name>
-      <location>${appserver.base}/repositories/snapshots</location>
+      <url>file://${appserver.base}/repositories/snapshots</url>
       <layout>default</layout>
       <releases>false</releases>
       <snapshots>true</snapshots>
       <indexed>true</indexed>
       <refreshCronExpression>0 0,30 * * ?</refreshCronExpression>
-    </managedRepository>
-  </managedRepositories>
-  
-  <remoteRepositories>
-    <remoteRepository>
+    </repository>
+    <repository>
       <id>central</id>
       <name>Central Repository</name>
       <url>http://repo1.maven.org/maven2</url>
       <layout>default</layout>
       <releases>true</releases>
       <snapshots>false</snapshots>
-    </remoteRepository>
-    <remoteRepository>
+      <indexed>false</indexed>
+    </repository>
+    <repository>
       <id>maven2-repository.dev.java.net</id>
       <name>Java.net Repository for Maven 2</name>
       <url>https://maven2-repository.dev.java.net/nonav/repository</url>
       <layout>default</layout>
       <releases>true</releases>
       <snapshots>false</snapshots>
-    </remoteRepository>
-  </remoteRepositories>
+      <indexed>false</indexed>
+    </repository>
+    <repository>
+      <id>test-repo</id>
+      <name>Test Repository</name>
+      <url>file://${appserver.base}/test-repo</url>
+      <layout>default</layout>
+      <releases>true</releases>
+      <snapshots>true</snapshots>
+      <indexed>true</indexed>
+      <refreshCronExpression>0 0 * * ?</refreshCronExpression>
+      <daysOlder>100</daysOlder>
+      <deleteReleasedSnapshots>true</deleteReleasedSnapshots>
+    </repository>
+  </repositories>
 
   <proxyConnectors>
     <proxyConnector>

diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager.xml b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager.xml
index 6fed7140dde14c4456273f03ed88b0e8ae34cc63..72b8d9df7e07074b46773dcb6374bb15b3df347a 100644 (file)
--- a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager.xml
+++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager.xml
@@ -20,47 +20,58 @@
 
 <configuration>
   <version>1</version>
-  <managedRepositories>
-    <managedRepository>
+  <repositories>
+    <repository>
       <id>internal</id>
       <name>Archiva Managed Internal Repository</name>
-      <location>${appserver.base}/repositories/internal</location>
+      <url>file://${appserver.base}/repositories/internal</url>
       <layout>default</layout>
       <releases>true</releases>
       <snapshots>false</snapshots>
       <indexed>true</indexed>
       <refreshCronExpression>0 0 * * ?</refreshCronExpression>
-    </managedRepository>
-    <managedRepository>
+    </repository>
+    <repository>
       <id>snapshots</id>
       <name>Archiva Managed Snapshot Repository</name>
-      <location>${appserver.base}/repositories/snapshots</location>
+      <url>file://${appserver.base}/repositories/snapshots</url>
       <layout>default</layout>
       <releases>false</releases>
       <snapshots>true</snapshots>
       <indexed>true</indexed>
       <refreshCronExpression>0 0,30 * * ?</refreshCronExpression>
-    </managedRepository>
-  </managedRepositories>
-  
-  <remoteRepositories>
-    <remoteRepository>
+    </repository>
+    <repository>
       <id>central</id>
       <name>Central Repository</name>
       <url>http://repo1.maven.org/maven2</url>
       <layout>default</layout>
       <releases>true</releases>
       <snapshots>false</snapshots>
-    </remoteRepository>
-    <remoteRepository>
+      <indexed>false</indexed>
+    </repository>
+    <repository>
       <id>maven2-repository.dev.java.net</id>
       <name>Java.net Repository for Maven 2</name>
       <url>https://maven2-repository.dev.java.net/nonav/repository</url>
       <layout>default</layout>
       <releases>true</releases>
       <snapshots>false</snapshots>
-    </remoteRepository>
-  </remoteRepositories>
+      <indexed>false</indexed>
+    </repository>
+    <repository>
+      <id>test-repo</id>
+      <name>Test Repository</name>
+      <url>file://${appserver.base}/test-repo</url>
+      <layout>default</layout>
+      <releases>true</releases>
+      <snapshots>true</snapshots>
+      <indexed>true</indexed>
+      <refreshCronExpression>0 0 * * ?</refreshCronExpression>
+      <daysOlder>0</daysOlder>
+      <retentionCount>2</retentionCount>
+    </repository>
+  </repositories>
 
   <proxyConnectors>
     <proxyConnector>

diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
index b7ec31922ca8e1b510320b1bde90ca880af820ee..f89cce1790cd09d45977275090ea1377905d0f86 100644 (file)
--- a/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
+++ b/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
@@ -21,6 +21,7 @@ package org.apache.maven.archiva.consumers.core.repository;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
+import org.apache.maven.archiva.configuration.Configuration;
 import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
 import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
 import org.apache.maven.archiva.database.ArchivaDatabaseException;
@@ -58,15 +59,15 @@ public class RepositoryPurgeConsumerTest
         repoConfiguration.setDaysOlder( 0 ); // force days older off to allow retention count purge to execute.
         repoConfiguration.setRetentionCount( TEST_RETENTION_COUNT );
         addRepoToConfiguration( "retention-count", repoConfiguration );
-        
+
         repoPurgeConsumer.beginScan( repoConfiguration );
 
         String repoRoot = prepareTestRepo();
 
         repoPurgeConsumer.processFile( PATH_TO_BY_RETENTION_COUNT_ARTIFACT );
-        
+
         String versionRoot = repoRoot + "/org/jruby/plugins/jruby-rake-plugin/1.0RC1-SNAPSHOT";
-        
+
         // assert if removed from repo
         assertDeleted( versionRoot + "/jruby-rake-plugin-1.0RC1-20070504.153317-1.jar" );
         assertDeleted( versionRoot + "/jruby-rake-plugin-1.0RC1-20070504.153317-1.jar.md5" );
@@ -101,9 +102,11 @@ public class RepositoryPurgeConsumerTest
     private void addRepoToConfiguration( String configHint, ManagedRepositoryConfiguration repoConfiguration )
         throws Exception
     {
-        ArchivaConfiguration archivaConfiguration = (ArchivaConfiguration) lookup( ArchivaConfiguration.class,
-                                                                                   configHint );
-        archivaConfiguration.getConfiguration().addManagedRepository( repoConfiguration );
+        ArchivaConfiguration archivaConfiguration =
+            (ArchivaConfiguration) lookup( ArchivaConfiguration.class, configHint );
+        Configuration configuration = archivaConfiguration.getConfiguration();
+        configuration.removeManagedRepository( configuration.findManagedRepositoryById( repoConfiguration.getId() ) );
+        configuration.addManagedRepository( repoConfiguration );
     }
 
     public void testConsumerByDaysOld()
@@ -115,7 +118,7 @@ public class RepositoryPurgeConsumerTest
             KnownRepositoryContentConsumer.class, "repo-purge-consumer-by-days-old" );
 
         ManagedRepositoryConfiguration repoConfiguration = getRepoConfiguration();
-        repoConfiguration.setDaysOlder( TEST_DAYS_OLDER ); 
+        repoConfiguration.setDaysOlder( TEST_DAYS_OLDER );
         addRepoToConfiguration( "days-old", repoConfiguration );
 
         repoPurgeConsumer.beginScan( repoConfiguration );
@@ -127,7 +130,7 @@ public class RepositoryPurgeConsumerTest
 
         repoPurgeConsumer.processFile( PATH_TO_BY_DAYS_OLD_ARTIFACT );
 
-        assertDeleted( projectRoot + "/2.2-SNAPSHOT/maven-install-plugin-2.2-SNAPSHOT.jar"  );
+        assertDeleted( projectRoot + "/2.2-SNAPSHOT/maven-install-plugin-2.2-SNAPSHOT.jar" );
         assertDeleted( projectRoot + "/2.2-SNAPSHOT/maven-install-plugin-2.2-SNAPSHOT.jar.md5" );
         assertDeleted( projectRoot + "/2.2-SNAPSHOT/maven-install-plugin-2.2-SNAPSHOT.jar.sha1" );
         assertDeleted( projectRoot + "/2.2-SNAPSHOT/maven-install-plugin-2.2-SNAPSHOT.pom" );
@@ -137,8 +140,8 @@ public class RepositoryPurgeConsumerTest
 
     /**
      * Test the snapshot clean consumer on a repository set to NOT clean/delete snapshots
-     * based on released versions. 
-     * 
+     * based on released versions.
+     *
      * @throws Exception
      */
     public void testReleasedSnapshotsWereNotCleaned()
@@ -152,7 +155,7 @@ public class RepositoryPurgeConsumerTest
         ManagedRepositoryConfiguration repoConfiguration = getRepoConfiguration();
         repoConfiguration.setDeleteReleasedSnapshots( false ); // Set to NOT delete released snapshots.
         addRepoToConfiguration( "retention-count", repoConfiguration );
-        
+
         repoPurgeConsumer.beginScan( repoConfiguration );
 
         String repoRoot = prepareTestRepo();
@@ -161,7 +164,7 @@ public class RepositoryPurgeConsumerTest
 
         // check if the snapshot wasn't removed
         String projectRoot = repoRoot + "/org/apache/maven/plugins/maven-plugin-plugin";
-                       
+
         assertExists( projectRoot + "/2.3-SNAPSHOT" );
         assertExists( projectRoot + "/2.3-SNAPSHOT/maven-plugin-plugin-2.3-SNAPSHOT.jar" );
         assertExists( projectRoot + "/2.3-SNAPSHOT/maven-plugin-plugin-2.3-SNAPSHOT.jar.md5" );
@@ -174,13 +177,13 @@ public class RepositoryPurgeConsumerTest
         File artifactMetadataFile = new File( projectRoot + "/maven-metadata.xml" );
 
         String metadataXml = FileUtils.readFileToString( artifactMetadataFile, null );
-        
+
         String expectedVersions = "<expected><versions><version>2.3-SNAPSHOT</version></versions></expected>";
-        
+
         XMLAssert.assertXpathEvaluatesTo( "2.3-SNAPSHOT", "//metadata/versioning/latest", metadataXml );
         XMLAssert.assertXpathsEqual( "//expected/versions/version", expectedVersions,
                                      "//metadata/versioning/versions/version", metadataXml );
-        XMLAssert.assertXpathEvaluatesTo( "20070315032817", "//metadata/versioning/lastUpdated", metadataXml );        
+        XMLAssert.assertXpathEvaluatesTo( "20070315032817", "//metadata/versioning/lastUpdated", metadataXml );
     }
 
     public void testReleasedSnapshotsWereCleaned()
@@ -194,7 +197,7 @@ public class RepositoryPurgeConsumerTest
         ManagedRepositoryConfiguration repoConfiguration = getRepoConfiguration();
         repoConfiguration.setDeleteReleasedSnapshots( true );
         addRepoToConfiguration( "days-old", repoConfiguration );
-        
+
         repoPurgeConsumer.beginScan( repoConfiguration );
 
         String repoRoot = prepareTestRepo();
@@ -214,17 +217,17 @@ public class RepositoryPurgeConsumerTest
 
         // check if metadata file was updated
         File artifactMetadataFile = new File( projectRoot + "/maven-metadata.xml" );
-        
+
         String metadataXml = FileUtils.readFileToString( artifactMetadataFile, null );
-        
-        String expectedVersions = "<expected><versions><version>2.2</version>"
-            + "<version>2.3</version></versions></expected>";
-        
+
+        String expectedVersions =
+            "<expected><versions><version>2.2</version>" + "<version>2.3</version></versions></expected>";
+
         XMLAssert.assertXpathEvaluatesTo( "2.3", "//metadata/versioning/latest", metadataXml );
         XMLAssert.assertXpathsEqual( "//expected/versions/version", expectedVersions,
                                      "//metadata/versioning/versions/version", metadataXml );
-        XMLAssert.assertXpathEvaluatesTo( "20070315032817", "//metadata/versioning/lastUpdated", metadataXml );        
-   }
+        XMLAssert.assertXpathEvaluatesTo( "20070315032817", "//metadata/versioning/lastUpdated", metadataXml );
+    }
 
     public void populateDbForRetentionCountTest()
         throws ArchivaDatabaseException