From 5a3e23ead6720577af7d9662830ade45edda56cd Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Sat, 21 May 2011 07:49:25 +0000
Subject: [PATCH] [MRM-1473] removing plexus-spring use fix unit tests in
 archiva-configuration

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1125645 13f79535-47bb-0310-9956-ffa450edef68
---
 .../DefaultArchivaConfiguration.java          |  9 ++++
 .../ArchivaConfigurationTest.java             | 10 +++--
 .../src/test/resources/spring-context.xml     | 42 ++++++++++++++++++-
 3 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
index b2234217c..bdc82ebdd 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
@@ -540,8 +540,12 @@ public class DefaultArchivaConfiguration
         // UPDATE: Upgrading to commons-configuration 1.4 breaks half the unit tests. 2007-10-11 (joakime)
 
         String contents = "<configuration />";
+
+        String fileLocation = userConfigFilename;
+
         if ( !writeFile( "user configuration", userConfigFilename, contents ) )
         {
+            fileLocation = altConfigFilename;
             if ( !writeFile( "alternative configuration", altConfigFilename, contents ) )
             {
                 throw new RegistryException(
@@ -551,6 +555,11 @@ public class DefaultArchivaConfiguration
             }
         }
 
+        // olamy hackish I know :-)
+        contents = "<configuration><xml fileName=\"" + fileLocation +"\" config-forceCreate=\"true\" config-name=\"org.apache.maven.archiva.user\"/>"
+                    + "</configuration>";
+
+
         ( (CommonsConfigurationRegistry) registry ).setProperties( contents );
 
         ( (CommonsConfigurationRegistry) registry ).initialize();
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
index 63811fd3d..a167c973d 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/ArchivaConfigurationTest.java
@@ -351,7 +351,7 @@ public class ArchivaConfigurationTest
         assertFalse( userFile.exists() );
 
         ArchivaConfiguration archivaConfiguration =
-            (ArchivaConfiguration) lookup( ArchivaConfiguration.class, "test-save-user" );
+            (ArchivaConfiguration) lookup( ArchivaConfiguration.class, "test-save-user-defaults" );
 
         archivaConfiguration.reload();
 
@@ -366,8 +366,8 @@ public class ArchivaConfigurationTest
         archivaConfiguration.addListener( listener );
 
         listener.configurationEvent( new ConfigurationEvent( ConfigurationEvent.SAVED ) );
-        // once from default creation, and again from manual call to save
-        control.setVoidCallable( 2 );
+
+        control.setVoidCallable( 1 );
 
         control.replay();
 
@@ -414,7 +414,7 @@ public class ArchivaConfigurationTest
         FileUtils.writeStringToFile( baseFile, "<configuration/>", null );
 
         ArchivaConfiguration archivaConfiguration =
-            (ArchivaConfiguration) lookup( ArchivaConfiguration.class, "test-save-user" );
+            (ArchivaConfiguration) lookup( ArchivaConfiguration.class, "test-save-user-fallback" );
 
         archivaConfiguration.reload();
 
@@ -796,6 +796,8 @@ public class ArchivaConfigurationTest
         ArchivaConfiguration archivaConfiguration =
             (ArchivaConfiguration) lookup( ArchivaConfiguration.class, "test-remove-central" );
 
+        archivaConfiguration.reload();
+
         Configuration configuration = archivaConfiguration.getConfiguration();
 
         RepositoryGroupConfiguration repositoryGroup =
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 697cde1a6..9022581ca 100755
--- 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
@@ -128,6 +128,44 @@
     </property>
   </bean>
 
+  <bean name="archivaConfiguration#test-save-user-defaults"  class="org.apache.maven.archiva.configuration.DefaultArchivaConfiguration">
+    <property name="registry" ref="registry#test-save-user-defaults"/>
+  </bean>
+
+  <bean name="registry#test-save-user-defaults" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+    <property name="properties">
+      <value>
+        <![CDATA[
+      <configuration>
+          <xml fileName="${basedir}/target/test/test-file-user.xml" config-optional="true" config-forceCreate="true"
+               config-name="org.apache.maven.archiva.user" config-at="org.apache.maven.archiva"/>
+          <xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="false"
+               config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
+      </configuration>
+        ]]>
+      </value>
+    </property>
+  </bean>
+
+  <bean name="archivaConfiguration#test-save-user-fallback"  class="org.apache.maven.archiva.configuration.DefaultArchivaConfiguration">
+    <property name="registry" ref="registry#test-save-user-fallback"/>
+  </bean>
+
+  <bean name="registry#test-save-user-fallback" class="org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry">
+    <property name="properties">
+      <value>
+        <![CDATA[
+      <configuration>
+          <xml fileName="${basedir}/target/test/test-file-user.xml" config-optional="true" config-forceCreate="false"
+               config-name="org.apache.maven.archiva.user" config-at="org.apache.maven.archiva"/>
+          <xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="true"
+               config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
+      </configuration>
+        ]]>
+      </value>
+    </property>
+  </bean>
+
   <bean name="archivaConfiguration#test-save-user"  class="org.apache.maven.archiva.configuration.DefaultArchivaConfiguration">
     <property name="registry" ref="registry#test-save-user"/>
   </bean>
@@ -137,9 +175,9 @@
       <value>
         <![CDATA[
       <configuration>
-          <xml fileName="${basedir}/target/test/test-file-user.xml" config-optional="true" config-forceCreate="false"
+          <xml fileName="${basedir}/target/test/test-file-user.xml" config-optional="true" config-forceCreate="true"
                config-name="org.apache.maven.archiva.user" config-at="org.apache.maven.archiva"/>
-          <xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="true"
+          <xml fileName="${basedir}/target/test/test-file.xml" config-optional="true" config-forceCreate="false"
                config-name="org.apache.maven.archiva.base" config-at="org.apache.maven.archiva"/>
       </configuration>
         ]]>
-- 
2.39.5