fix issues downloading merged index path (thanks to unit tests) and add an other with non default mergedindex path

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

1 files changed, 10 insertions, 3 deletions

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
index 68c82de07..10bbc7181 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
@@ -123,8 +123,15 @@ public class DownloadMergedIndexTest
 
         RepositoryGroupService repositoryGroupService = getRepositoryGroupService();
 
+        String repoGroupId = "test-group";
+
+        if ( repositoryGroupService.getRepositoryGroup( repoGroupId ) != null )
+        {
+            repositoryGroupService.deleteRepositoryGroup( repoGroupId );
+        }
+
         RepositoryGroup repositoryGroup = new RepositoryGroup();
-        repositoryGroup.setId( "test-group" );
+        repositoryGroup.setId( repoGroupId );
         repositoryGroup.setRepositories( Arrays.asList( id ) );
 
         repositoryGroupService.addRepositoryGroup( repositoryGroup );
@@ -134,7 +141,7 @@ public class DownloadMergedIndexTest
         managedRepository = new ManagedRepository();
         managedRepository.setId( id );
         managedRepository.setName( "name of " + id );
-        managedRepository.setLocation(System.getProperty( "basedir" ) + "/src/test/repositories/test-repo" );
+        managedRepository.setLocation( System.getProperty( "basedir" ) + "/src/test/repositories/test-repo" );
         managedRepository.setIndexDirectory( System.getProperty( "java.io.tmpdir" ) + "/tmpIndex/" + id );
 
         if ( managedRepositoriesService.getManagedRepository( id ) != null )
@@ -157,7 +164,7 @@ public class DownloadMergedIndexTest
 
         ProxyConnectorService proxyConnectorService = getProxyConnectorService();
         ProxyConnector proxyConnector = new ProxyConnector();
-        proxyConnector.setProxyId( "foo-bar" );
+        proxyConnector.setProxyId( "foo-bar1" );
         proxyConnector.setSourceRepoId( id );
         proxyConnector.setTargetRepoId( "all-merged" );
         proxyConnectorService.addProxyConnector( proxyConnector );