From 468d33012d65df0711eb88a343602b3fdbf7eada Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 19 Aug 2011 17:16:18 +0000 Subject: [PATCH] as now RepositoryArchivaTaskScheduler is started this mock configuration must not failed with NPE or UOE git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1159692 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva/configuration/TestConfiguration.java | 11 ++++++++--- .../maven/archiva/web/tags/DependencyTreeTest.java | 8 -------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java index ead620e8c..b618f7306 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java @@ -26,10 +26,15 @@ import org.apache.maven.archiva.configuration.IndeterminateConfigurationExceptio import org.codehaus.plexus.registry.RegistryException; import org.codehaus.plexus.registry.RegistryListener; +import java.util.ArrayList; +import java.util.List; + public class TestConfiguration implements ArchivaConfiguration { - private Configuration configuration; + private Configuration configuration = new Configuration(); + + private List configurationListeners = new ArrayList(); public Configuration getConfiguration() { @@ -49,12 +54,12 @@ public class TestConfiguration public void addListener( ConfigurationListener listener ) { - throw new UnsupportedOperationException(); + configurationListeners.add( listener ); } public void removeListener( ConfigurationListener listener ) { - throw new UnsupportedOperationException(); + configurationListeners.remove( listener ); } public void addChangeListener( RegistryListener listener ) diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java index 12e36218d..87fc5731f 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java @@ -100,17 +100,11 @@ public class DependencyTreeTest repoConfig.setLocation( "src/test/repositories/test" ); configuration.addManagedRepository( repoConfig ); - //ArchivaConfiguration archivaConfiguration = (ArchivaConfiguration) lookup( ArchivaConfiguration.class ); ArchivaConfiguration archivaConfiguration = applicationContext.getBean( ArchivaConfiguration.class ); archivaConfiguration.save( configuration ); - //tree = (DependencyTree) lookup( DependencyTree.class ); - - //artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.class ); - artifactFactory = plexusSisuBridge.lookup( ArtifactFactory.class ); - //TestMetadataResolver metadataResolver = (TestMetadataResolver) lookup( MetadataResolver.class ); TestMetadataResolver metadataResolver = applicationContext.getBean( TestMetadataResolver.class ); ProjectVersionMetadata metadata = new ProjectVersionMetadata(); metadata.setId( TEST_VERSION ); @@ -118,8 +112,6 @@ public class DependencyTreeTest RepositorySession repositorySession = mock( RepositorySession.class ); when( repositorySession.getResolver() ).thenReturn( metadataResolver ); - //TestRepositorySessionFactory repositorySessionFactory = (TestRepositorySessionFactory) lookup( - // RepositorySessionFactory.class ); TestRepositorySessionFactory repositorySessionFactory = applicationContext.getBean( TestRepositorySessionFactory.class ); repositorySessionFactory.setRepositorySession( repositorySession ); -- 2.39.5