svn commit: r1159692 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache: archiva/configuration/TestConfiguration.java maven/archiva/web/tags/DependencyTreeTest.java

[olamy]

Author: olamy
Date: Fri Aug 19 17:16:18 2011
New Revision: 1159692

URL: http://svn.apache.org/viewvc?rev=1159692&view=rev
Log:
as now RepositoryArchivaTaskScheduler is started this mock configuration must 
not failed with NPE or UOE

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java?rev=1159692&r1=1159691&r2=1159692&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/configuration/TestConfiguration.java
 Fri Aug 19 17:16:18 2011
@@ -26,10 +26,15 @@ import org.apache.maven.archiva.configur
 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<ConfigurationListener> configurationListeners = new 
ArrayList<ConfigurationListener>();
 
     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 )

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java?rev=1159692&r1=1159691&r2=1159692&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/tags/DependencyTreeTest.java
 Fri Aug 19 17:16:18 2011
@@ -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 );