[exo-jcr-commits] exo-jcr SVN: r4600 - in jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/creation: cluster and 1 other directory.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2011-07-05 09:52:30 -0400 (Tue, 05 Jul 2011)
New Revision: 4600

Modified:
   jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/creation/TestRepositoryCreationService.java
   jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/creation/cluster/TestRepositoryCreationServiceInClusterNode1.java
Log:
EXOJCR-1396: tests updated

Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/creation/TestRepositoryCreationService.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/creation/TestRepositoryCreationService.java	2011-07-05 13:49:29 UTC (rev 4599)
+++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/creation/TestRepositoryCreationService.java	2011-07-05 13:52:30 UTC (rev 4600)
@@ -97,6 +97,17 @@
       assertNotNull(repoService.getConfig().getRepositoryConfiguration(tenantName));
 
       // remove repository
+      try
+      {
+         creatorService.removeRepository(tenantName, false);
+         fail("Exception should be thrown");
+      }
+      catch (RepositoryCreationException e)
+      {
+         // repository in use
+      }
+
+      // remove repository
       creatorService.removeRepository(tenantName, true);
 
       try
@@ -163,6 +174,17 @@
       RepositoryService repoService = (RepositoryService)this.container.getComponentInstance(RepositoryService.class);
       assertNotNull(repoService.getConfig().getRepositoryConfiguration(tenantName));
 
+      // remove repository
+      try
+      {
+         creatorService.removeRepository(tenantName, false);
+         fail("Exception should be thrown");
+      }
+      catch (RepositoryCreationException e)
+      {
+         // repository in use
+      }
+
       // remove repository 
       creatorService.removeRepository(tenantName, true);
 
@@ -240,6 +262,17 @@
       assertNotNull(repoService.getConfig().getRepositoryConfiguration(tenantName));
 
       // remove repository
+      try
+      {
+         creatorService.removeRepository(tenantName, false);
+         fail("Exception should be thrown");
+      }
+      catch (RepositoryCreationException e)
+      {
+         // repository in use
+      }
+
+      // remove repository
       creatorService.removeRepository(tenantName, true);
 
       try

Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/creation/cluster/TestRepositoryCreationServiceInClusterNode1.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/creation/cluster/TestRepositoryCreationServiceInClusterNode1.java	2011-07-05 13:49:29 UTC (rev 4599)
+++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/creation/cluster/TestRepositoryCreationServiceInClusterNode1.java	2011-07-05 13:52:30 UTC (rev 4600)
@@ -26,6 +26,7 @@
 import org.exoplatform.services.jcr.ext.backup.RepositoryBackupChain;
 import org.exoplatform.services.jcr.ext.backup.RepositoryBackupConfig;
 import org.exoplatform.services.jcr.ext.repository.creation.DBCreationProperties;
+import org.exoplatform.services.jcr.ext.repository.creation.RepositoryCreationException;
 import org.exoplatform.services.jcr.ext.repository.creation.RepositoryCreationService;
 
 import java.io.File;
@@ -111,6 +112,17 @@
       Thread.sleep(60000);
       
       // remove repository
+      try
+      {
+         creatorService.removeRepository(tenantName, false);
+         fail("Exception should be thrown");
+      }
+      catch (RepositoryCreationException e)
+      {
+         // repository in use
+      }
+
+      // remove repository
       creatorService.removeRepository(tenantName, true);
 
       try