diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-08-27 21:03:38 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-08-27 21:03:38 +0000 |
| commit | 6f6609413d7f8ea240dc4dfa38d9f1e365a3a3ae (patch) | |
| tree | 43acd3aceb12930928ed7c19279807a7a25c9e30 /archiva-modules | |
| parent | a257d19489eb4e9c14dc858e4c991f28ea68e066 (diff) | |
| download | archiva-6f6609413d7f8ea240dc4dfa38d9f1e365a3a3ae.tar.gz archiva-6f6609413d7f8ea240dc4dfa38d9f1e365a3a3ae.zip | |
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
Diffstat (limited to 'archiva-modules')
2 files changed, 8 insertions, 5 deletions
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 c24996100..f87ec34d3 100644 --- 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 c2c251191..5d9afa13d 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 @@ -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> |