fix unit test.

avoid using same registry singleton which is modified by one test.

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

diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationMRM789Test.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationMRM789Test.java
index c2499610057801fe9d074fed69b2b2faa1b31004..f87ec34d37d001c1af79a78bc086afd38aec1cfc 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationMRM789Test.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationMRM789Test.java
@@ -68,10 +68,10 @@ public class ArchivaConfigurationMRM789Test
     public void testGetConfigurationFromDefaultsWithDefaultRepoLocationAlreadyExisting()
         throws Exception
     {
-        File repo = new File( FileUtil.getBasedir(), "/target/test-classes/existing_snapshots" );
+        File repo = new File( FileUtil.getBasedir(), "target/test-classes/existing_snapshots" );
         repo.mkdirs();
 
-        repo = new File( FileUtil.getBasedir(), "/target/test-classes/existing_internal" );
+        repo = new File( FileUtil.getBasedir(), "target/test-classes/existing_internal" );
         repo.mkdirs();
 
         String existingTestDefaultArchivaConfigFile = FileUtils.readFileToString(
@@ -88,7 +88,7 @@ public class ArchivaConfigurationMRM789Test
         ArchivaConfiguration archivaConfiguration =
             lookup( ArchivaConfiguration.class, "test-defaults-default-repo-location-exists" );
         Configuration configuration = archivaConfiguration.getConfiguration();
-        assertConfiguration( configuration, 2, 1, 1 );
+        assertConfiguration( configuration, 2, 2, 2 );
 
         ManagedRepositoryConfiguration repository = configuration.getManagedRepositories().get( 0 );
         assertTrue( "check managed repositories", repository.getLocation().endsWith( "data/repositories/internal" ) );

diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
index c2c2511915d1de31b948ca448a0ef503b3732a09..5d9afa13d7cf85d8e0426f3397e9c58649def03e 100755 (executable)
--- a/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
@@ -32,16 +32,19 @@
   <bean name="archivaConfiguration#test-defaults-default-repo-location-exists" class="org.apache.archiva.configuration.DefaultArchivaConfiguration">
     <property name="registry" ref="registry#empty"/>
   </bean>
+  <bean name="registry#empty" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"/>
 
   <bean name="archivaConfiguration#test-defaults" class="org.apache.archiva.configuration.DefaultArchivaConfiguration">
-    <property name="registry" ref="registry#empty"/>
+    <property name="registry" ref="registry#emptydef"/>
   </bean>
-  <bean name="registry#empty" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"/>
+  <bean name="registry#emptydef" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"/>
 
   <bean name="archivaConfiguration#test-upgrade-09"  class="org.apache.archiva.configuration.DefaultArchivaConfiguration">
     <property name="registry" ref="registry#test-upgrade-09"/>
   </bean>
 
+
+
   <bean name="registry#test-upgrade-09" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry">
     <property name="properties">
       <value>