From: Olivier Lamy Date: Mon, 24 Oct 2011 19:35:43 +0000 (+0000) Subject: remove a FIXME as it's fixed and covered by a unit test too RepositoryGroupAdminTest... X-Git-Tag: archiva-1.4-M2~224 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=013ee7f312a0aa69077135a9ec85d0927b26ecd6;p=archiva.git remove a FIXME as it's fixed and covered by a unit test too RepositoryGroupAdminTest#addAndDeleteGroupWithRemowingManagedRepo git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1188327 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java index ea385ff47..15d2bc823 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java @@ -263,8 +263,6 @@ public class DefaultManagedRepositoryAdmin return repository; } - - // FIXME cleanup repositoryGroups when deleting a ManagedRepo public Boolean deleteManagedRepository( String repositoryId, AuditInformation auditInformation, boolean deleteContent ) throws RepositoryAdminException diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java index e4f60e4bf..4adab3b17 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/managed/ManagedRepositoryAdminTest.java @@ -35,6 +35,10 @@ public class ManagedRepositoryAdminTest { public static final String STAGE_REPO_ID_END = DefaultManagedRepositoryAdmin.STAGE_REPO_ID_END; + + String repoId = "test-new-one"; + String repoLocation = APPSERVER_BASE_PATH + File.separator + repoId; + @Test public void getAllManagedRepos() throws Exception @@ -69,10 +73,6 @@ public class ManagedRepositoryAdminTest { mockAuditListener.clearEvents(); - String repoId = "test-new-one"; - - String repoLocation = APPSERVER_BASE_PATH + File.separator + repoId; - File repoDir = clearRepoLocation( repoLocation ); List repos = managedRepositoryAdmin.getManagedRepositories(); @@ -116,9 +116,6 @@ public class ManagedRepositoryAdminTest public void updateDeleteManagedRepo() throws Exception { - String repoId = "test-new-one"; - - String repoLocation = APPSERVER_BASE_PATH + File.separator + "new-path"; File repoDir = clearRepoLocation( repoLocation ); @@ -177,9 +174,6 @@ public class ManagedRepositoryAdminTest throws Exception { - String repoId = "test-new-one"; - String repoLocation = APPSERVER_BASE_PATH + File.separator + repoId; - File repoDir = clearRepoLocation( repoLocation ); mockAuditListener.clearEvents(); @@ -234,9 +228,6 @@ public class ManagedRepositoryAdminTest public void updateDeleteManagedRepoWithStagedRepo() throws Exception { - String repoId = "test-new-one"; - - String repoLocation = APPSERVER_BASE_PATH + File.separator + "new-path"; String stageRepoLocation = APPSERVER_BASE_PATH + File.separator + repoId; @@ -312,6 +303,7 @@ public class ManagedRepositoryAdminTest } + //---------------------------------- // utility methods //----------------------------------