You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2007/10/22 14:37:26 UTC
svn commit: r587071 - in
/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test:
conf/ java/org/apache/maven/archiva/consumers/core/repository/
Author: brett
Date: Mon Oct 22 05:37:25 2007
New Revision: 587071
URL: http://svn.apache.org/viewvc?rev=587071&view=rev
Log:
[MRM-546] restore correct test data and fix configuration modifications
Modified:
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager-daysOld.xml
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager.xml
maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
Modified: maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager-daysOld.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager-daysOld.xml?rev=587071&r1=587070&r2=587071&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager-daysOld.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager-daysOld.xml Mon Oct 22 05:37:25 2007
@@ -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>
Modified: maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager.xml?rev=587071&r1=587070&r2=587071&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/conf/repository-manager.xml Mon Oct 22 05:37:25 2007
@@ -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>
Modified: maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java?rev=587071&r1=587070&r2=587071&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java Mon Oct 22 05:37:25 2007
@@ -21,6 +21,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
/**
* 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 @@
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 @@
// 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 @@
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 @@
ManagedRepositoryConfiguration repoConfiguration = getRepoConfiguration();
repoConfiguration.setDeleteReleasedSnapshots( true );
addRepoToConfiguration( "days-old", repoConfiguration );
-
+
repoPurgeConsumer.beginScan( repoConfiguration );
String repoRoot = prepareTestRepo();
@@ -214,17 +217,17 @@
// 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