added unit tests for repository archive

scm-test/src/main/java/sonia/scm/repository/RepositoryManagerTestBase.java

@@ -37,6 +37,7 @@ package sonia.scm.repository;
 
 import org.junit.Test;
 
+import sonia.scm.Manager;
 import sonia.scm.ManagerTestBase;
 
 import static org.junit.Assert.*;
@@ -55,6 +56,17 @@ public abstract class RepositoryManagerTestBase
   extends ManagerTestBase<Repository, RepositoryException>
 {
 
+  /**
+   * Method description
+   *
+   *
+   * @param archiveEnabled
+   *
+   * @return
+   */
+  protected abstract RepositoryManager createRepositoryManager(
+    boolean archiveEnabled);
+
   /**
    * Method description
    *
@@ -96,11 +108,20 @@ public abstract class RepositoryManagerTestBase
   @Test
   public void testDelete() throws RepositoryException, IOException
   {
-    Repository heartOfGold = createTestRepository();
+    delete(manager, createTestRepository());
-    String id = heartOfGold.getId();
+  }
 
-    manager.delete(heartOfGold);
+  /**
-    assertNull(manager.get(id));
+   * Method description
+   *
+   *
+   * @throws IOException
+   * @throws RepositoryException
+   */
+  @Test(expected = RepositoryIsNotArchivedException.class)
+  public void testDeleteNonArchived() throws RepositoryException, IOException
+  {
+    delete(createRepositoryManager(true), createTestRepository());
   }
 
   /**
@@ -116,6 +137,23 @@ public abstract class RepositoryManagerTestBase
     manager.delete(createRepositoryWithId());
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @throws IOException
+   * @throws RepositoryException
+   */
+  @Test
+  public void testDeleteWithEnabledArchive()
+    throws RepositoryException, IOException
+  {
+    Repository repository = createTestRepository();
+
+    repository.setArchived(true);
+    delete(createRepositoryManager(true), repository);
+  }
+
   /**
    *  Method description
    *
@@ -336,4 +374,24 @@ public abstract class RepositoryManagerTestBase
   {
     return createRepository(RepositoryTestData.createHeartOfGold());
   }
+
+  /**
+   * Method description
+   *
+   *
+   * @param manager
+   * @param repository
+   *
+   * @throws IOException
+   * @throws RepositoryException
+   */
+  private void delete(Manager<Repository, RepositoryException> manager,
+    Repository repository)
+    throws RepositoryException, IOException
+  {
+    String id = repository.getId();
+
+    manager.delete(repository);
+    assertNull(manager.get(id));
+  }
 }

scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java

@@ -120,6 +120,21 @@ public class DefaultRepositoryManagerTest extends RepositoryManagerTestBase
    */
   @Override
   protected DefaultRepositoryManager createManager()
+  {
+    return createRepositoryManager(false);
+  }
+
+  /**
+   * Method description
+   *
+   *
+   * @param archiveEnabled
+   *
+   * @return
+   */
+  @Override
+  protected DefaultRepositoryManager createRepositoryManager(
+    boolean archiveEnabled)
   {
     Set<RepositoryHandler> handlerSet = new HashSet<RepositoryHandler>();
     StoreFactory factory = new JAXBStoreFactory();
@@ -155,6 +170,8 @@ public class DefaultRepositoryManagerTest extends RepositoryManagerTestBase
 
     ScmConfiguration configuration = new ScmConfiguration();
 
+    configuration.setEnableRepositoryArchive(archiveEnabled);
+
     return new DefaultRepositoryManager(configuration, contextProvider,
       new DefaultKeyGenerator(), repositoryDAO, handlerSet, listenerProvider,
       hookProvider, createEmptyPreProcessorUtil());