Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some tests 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1129226 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-05-30 15:46:55 +00:00
parent 235ceb3c04
commit 073aad6bf8
2 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
View File

@ -198,7 +198,7 @@ public class CleanupReleasedSnapshotsRepositoryPurge
} }
catch ( LayoutException e ) catch ( LayoutException e )
{ {
log.debug( "Not processing file that is not an artifact: " + e.getMessage() ); log.debug( "Not processing file that is not an artifact: {}", e.getMessage() );
} }
catch ( ContentNotFoundException e ) catch ( ContentNotFoundException e )
{ {

48
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
View File

@ -48,6 +48,7 @@ public class RepositoryPurgeConsumerTest
throws Exception throws Exception
{ {
assertNotConsumed( "org/apache/maven/plugins/maven-plugin-plugin/2.4.1/maven-metadata.xml" ); assertNotConsumed( "org/apache/maven/plugins/maven-plugin-plugin/2.4.1/maven-metadata.xml" );
cleanupFileTypes();
} }
@Test @Test
@ -55,6 +56,16 @@ public class RepositoryPurgeConsumerTest
throws Exception throws Exception
{ {
assertNotConsumed( "org/apache/maven/plugins/maven-plugin-plugin/2.4.1/maven-metadata-central.xml" ); assertNotConsumed( "org/apache/maven/plugins/maven-plugin-plugin/2.4.1/maven-metadata-central.xml" );
cleanupFileTypes();
}
private void cleanupFileTypes()
{
ArchivaConfiguration archivaConfiguration =
applicationContext.getBean( "archivaConfiguration#default", ArchivaConfiguration.class );
FileType fileType = archivaConfiguration.getConfiguration().getRepositoryScanning().getFileTypes().get( 0 );
fileType.removePattern( "**/*.xml" );
} }
private void assertNotConsumed( String path ) private void assertNotConsumed( String path )
@ -68,9 +79,11 @@ public class RepositoryPurgeConsumerTest
fileType.addPattern( "**/*.xml" ); fileType.addPattern( "**/*.xml" );
// trigger reload // trigger reload
FileTypes fileTypes = applicationContext.getBean( FileTypes.class ); //FileTypes fileTypes = applicationContext.getBean( FileTypes.class );
fileTypes.afterConfigurationChange( null, "repositoryScanning.fileTypes", null ); for ( FileTypes fileTypes : applicationContext.getBeansOfType( FileTypes.class ).values() )
{
fileTypes.afterConfigurationChange( null, "repositoryScanning.fileTypes", null );
}
KnownRepositoryContentConsumer repoPurgeConsumer = KnownRepositoryContentConsumer repoPurgeConsumer =
applicationContext.getBean( "knownRepositoryContentConsumer#repository-purge", applicationContext.getBean( "knownRepositoryContentConsumer#repository-purge",
KnownRepositoryContentConsumer.class ); KnownRepositoryContentConsumer.class );
@ -146,6 +159,8 @@ public class RepositoryPurgeConsumerTest
assertExists( versionRoot + "/jruby-rake-plugin-1.0RC1-20070506.090132-4.pom" ); assertExists( versionRoot + "/jruby-rake-plugin-1.0RC1-20070506.090132-4.pom" );
assertExists( versionRoot + "/jruby-rake-plugin-1.0RC1-20070506.090132-4.pom.md5" ); assertExists( versionRoot + "/jruby-rake-plugin-1.0RC1-20070506.090132-4.pom.md5" );
assertExists( versionRoot + "/jruby-rake-plugin-1.0RC1-20070506.090132-4.pom.sha1" ); assertExists( versionRoot + "/jruby-rake-plugin-1.0RC1-20070506.090132-4.pom.sha1" );
removeRepoFromConfiguration( "retention-count", repoConfiguration );
} }
private void addRepoToConfiguration( String configHint, ManagedRepositoryConfiguration repoConfiguration ) private void addRepoToConfiguration( String configHint, ManagedRepositoryConfiguration repoConfiguration )
@ -154,10 +169,29 @@ public class RepositoryPurgeConsumerTest
ArchivaConfiguration archivaConfiguration = ArchivaConfiguration archivaConfiguration =
applicationContext.getBean( "archivaConfiguration#" + configHint, ArchivaConfiguration.class ); applicationContext.getBean( "archivaConfiguration#" + configHint, ArchivaConfiguration.class );
Configuration configuration = archivaConfiguration.getConfiguration(); Configuration configuration = archivaConfiguration.getConfiguration();
configuration.removeManagedRepository( configuration.findManagedRepositoryById( repoConfiguration.getId() ) ); ManagedRepositoryConfiguration managedRepositoryConfiguration =
configuration.findManagedRepositoryById( repoConfiguration.getId() );
if ( managedRepositoryConfiguration != null )
{
configuration.removeManagedRepository( managedRepositoryConfiguration );
}
configuration.addManagedRepository( repoConfiguration ); configuration.addManagedRepository( repoConfiguration );
} }
private void removeRepoFromConfiguration( String configHint, ManagedRepositoryConfiguration repoConfiguration )
throws Exception
{
ArchivaConfiguration archivaConfiguration =
applicationContext.getBean( "archivaConfiguration#" + configHint, ArchivaConfiguration.class );
Configuration configuration = archivaConfiguration.getConfiguration();
ManagedRepositoryConfiguration managedRepositoryConfiguration =
configuration.findManagedRepositoryById( repoConfiguration.getId() );
if ( managedRepositoryConfiguration != null )
{
configuration.removeManagedRepository( managedRepositoryConfiguration );
}
}
@Test @Test
public void testConsumerByDaysOld() public void testConsumerByDaysOld()
throws Exception throws Exception
@ -207,6 +241,8 @@ public class RepositoryPurgeConsumerTest
assertDeleted( projectRoot + "/2.2-SNAPSHOT/maven-install-plugin-2.2-20061118.060401-2.pom" ); assertDeleted( projectRoot + "/2.2-SNAPSHOT/maven-install-plugin-2.2-20061118.060401-2.pom" );
assertDeleted( projectRoot + "/2.2-SNAPSHOT/maven-install-plugin-2.2-20061118.060401-2.pom.md5" ); assertDeleted( projectRoot + "/2.2-SNAPSHOT/maven-install-plugin-2.2-20061118.060401-2.pom.md5" );
assertDeleted( projectRoot + "/2.2-SNAPSHOT/maven-install-plugin-2.2-20061118.060401-2.pom.sha1" ); assertDeleted( projectRoot + "/2.2-SNAPSHOT/maven-install-plugin-2.2-20061118.060401-2.pom.sha1" );
removeRepoFromConfiguration( "days-old", repoConfiguration );
} }
/** /**
@ -255,6 +291,8 @@ public class RepositoryPurgeConsumerTest
XMLAssert.assertXpathsEqual( "//expected/versions/version", expectedVersions, XMLAssert.assertXpathsEqual( "//expected/versions/version", expectedVersions,
"//metadata/versioning/versions/version", metadataXml ); "//metadata/versioning/versions/version", metadataXml );
XMLAssert.assertXpathEvaluatesTo( "20070315032817", "//metadata/versioning/lastUpdated", metadataXml ); XMLAssert.assertXpathEvaluatesTo( "20070315032817", "//metadata/versioning/lastUpdated", metadataXml );
removeRepoFromConfiguration( "retention-count", repoConfiguration );
} }
@Test @Test
@ -299,6 +337,8 @@ public class RepositoryPurgeConsumerTest
XMLAssert.assertXpathsEqual( "//expected/versions/version", expectedVersions, XMLAssert.assertXpathsEqual( "//expected/versions/version", expectedVersions,
"//metadata/versioning/versions/version", metadataXml ); "//metadata/versioning/versions/version", metadataXml );
XMLAssert.assertXpathEvaluatesTo( "20070315032817", "//metadata/versioning/lastUpdated", metadataXml ); XMLAssert.assertXpathEvaluatesTo( "20070315032817", "//metadata/versioning/lastUpdated", metadataXml );
removeRepoFromConfiguration( "days-old", repoConfiguration );
} }
@Before @Before