[MRM-462] re-order methods

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

diff --git a/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryActionTest.java b/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryActionTest.java
index a525edb6204a157f7a6f317b0bb6f839cf744dbb..58c7ced358ad3a15e8d290e3e974146874e2cfcd 100644 (file)
--- a/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryActionTest.java
+++ b/MRM-462/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/ConfigureRepositoryActionTest.java
@@ -75,6 +75,19 @@ public class ConfigureRepositoryActionTest
         location = getTestFile( "location" );
     }
 
+    public void testSecureActionBundle()
+        throws SecureActionException
+    {
+        archivaConfiguration.getConfiguration();
+        archivaConfigurationControl.setReturnValue( new Configuration() );
+        archivaConfigurationControl.replay();
+
+        action.prepare();
+        SecureActionBundle bundle = action.getSecureActionBundle();
+        assertTrue( bundle.requiresAuthentication() );
+        assertEquals( 1, bundle.getAuthorizationTuples().size() );
+    }
+
     public void testAddRepositoryInitialPage()
         throws Exception
     {
@@ -165,38 +178,6 @@ public class ConfigureRepositoryActionTest
         assertRepositoryEquals( repository, createRepository() );
     }
 
-    private void assertRepositoryEquals( ManagedRepositoryConfiguration expectedRepository,
-                                         ManagedRepositoryConfiguration actualRepository )
-    {
-        assertEquals( expectedRepository.getDaysOlder(), actualRepository.getDaysOlder() );
-        assertEquals( expectedRepository.getId(), actualRepository.getId() );
-        assertEquals( expectedRepository.getIndexDir(), actualRepository.getIndexDir() );
-        assertEquals( expectedRepository.getLayout(), actualRepository.getLayout() );
-        assertEquals( expectedRepository.getLocation(), actualRepository.getLocation() );
-        assertEquals( expectedRepository.getName(), actualRepository.getName() );
-        assertEquals( expectedRepository.getRefreshCronExpression(), actualRepository.getRefreshCronExpression() );
-        assertEquals( expectedRepository.getRetentionCount(), actualRepository.getRetentionCount() );
-        assertEquals( expectedRepository.isDeleteReleasedSnapshots(), actualRepository.isDeleteReleasedSnapshots() );
-        assertEquals( expectedRepository.isIndexed(), actualRepository.isIndexed() );
-        assertEquals( expectedRepository.isReleases(), actualRepository.isReleases() );
-        assertEquals( expectedRepository.isSnapshots(), actualRepository.isSnapshots() );
-    }
-
-    private Configuration createConfigurationForEditing( ManagedRepositoryConfiguration repositoryConfiguration )
-    {
-        Configuration configuration = new Configuration();
-        configuration.addManagedRepository( repositoryConfiguration );
-        return configuration;
-    }
-
-    private ManagedRepositoryConfiguration createRepository()
-    {
-        ManagedRepositoryConfiguration r = new ManagedRepositoryConfiguration();
-        r.setId( REPO_ID );
-        populateRepository( r );
-        return r;
-    }
-
     public void testEditRepository()
         throws Exception
     {
@@ -323,6 +304,38 @@ public class ConfigureRepositoryActionTest
         return configuration;
     }
 
+    private void assertRepositoryEquals( ManagedRepositoryConfiguration expectedRepository,
+                                         ManagedRepositoryConfiguration actualRepository )
+    {
+        assertEquals( expectedRepository.getDaysOlder(), actualRepository.getDaysOlder() );
+        assertEquals( expectedRepository.getId(), actualRepository.getId() );
+        assertEquals( expectedRepository.getIndexDir(), actualRepository.getIndexDir() );
+        assertEquals( expectedRepository.getLayout(), actualRepository.getLayout() );
+        assertEquals( expectedRepository.getLocation(), actualRepository.getLocation() );
+        assertEquals( expectedRepository.getName(), actualRepository.getName() );
+        assertEquals( expectedRepository.getRefreshCronExpression(), actualRepository.getRefreshCronExpression() );
+        assertEquals( expectedRepository.getRetentionCount(), actualRepository.getRetentionCount() );
+        assertEquals( expectedRepository.isDeleteReleasedSnapshots(), actualRepository.isDeleteReleasedSnapshots() );
+        assertEquals( expectedRepository.isIndexed(), actualRepository.isIndexed() );
+        assertEquals( expectedRepository.isReleases(), actualRepository.isReleases() );
+        assertEquals( expectedRepository.isSnapshots(), actualRepository.isSnapshots() );
+    }
+
+    private Configuration createConfigurationForEditing( ManagedRepositoryConfiguration repositoryConfiguration )
+    {
+        Configuration configuration = new Configuration();
+        configuration.addManagedRepository( repositoryConfiguration );
+        return configuration;
+    }
+
+    private ManagedRepositoryConfiguration createRepository()
+    {
+        ManagedRepositoryConfiguration r = new ManagedRepositoryConfiguration();
+        r.setId( REPO_ID );
+        populateRepository( r );
+        return r;
+    }
+
     private void populateRepository( ManagedRepositoryConfiguration repository )
     {
         repository.setId( REPO_ID );
@@ -339,17 +352,6 @@ public class ConfigureRepositoryActionTest
     }
 
     // TODO: test errors during add, other actions
-
-    public void testSecureActionBundle()
-        throws SecureActionException
-    {
-        archivaConfiguration.getConfiguration();
-        archivaConfigurationControl.setReturnValue( new Configuration() );
-        archivaConfigurationControl.replay();
-
-        action.prepare();
-        SecureActionBundle bundle = action.getSecureActionBundle();
-        assertTrue( bundle.requiresAuthentication() );
-        assertEquals( 1, bundle.getAuthorizationTuples().size() );
-    }
+    // TODO: what if there are proxy connectors attached to a deleted repository?
+    // TODO: what about removing proxied content if a proxy is removed?
 }