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

[do-not-reply at jboss.org]

Author: areshetnyak
Date: 2010-12-21 09:23:17 -0500 (Tue, 21 Dec 2010)
New Revision: 3698

Modified:
   jcr/trunk/exo.jcr.component.ext/pom.xml
   jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupUseCasesTest.java
   jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestRDBMSBackupManager.java
Log:
JCR-1502 : .The use cases in AbstractBackupUseCasesTest was fixed.

Modified: jcr/trunk/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ext/pom.xml	2010-12-21 12:46:08 UTC (rev 3697)
+++ jcr/trunk/exo.jcr.component.ext/pom.xml	2010-12-21 14:23:17 UTC (rev 3698)
@@ -185,12 +185,10 @@
               <include>**/replication/*.java</include>
               <include>**/replication/external/*.java</include>
               <include>**/replication/async/**/*.java</include>
-              <include>**/backup/TestBackupManager.java</include>
               <include>**/backup/*.java</include>
               <include>**/backup/server/*.java</include>
             </includes>
             <excludes>
-              <exclude>**/backup/TestRdbmsWorkspaceInitializer.java</exclude>
               <exclude>**/BaseStandaloneTest.java</exclude>
               <exclude>**/backup/AbstractBackupTestCase.java</exclude>
               <exclude>**/backup/BaseRDBMSBackupTest.java</exclude>

Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupUseCasesTest.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupUseCasesTest.java	2010-12-21 12:46:08 UTC (rev 3697)
+++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupUseCasesTest.java	2010-12-21 14:23:17 UTC (rev 3698)
@@ -2343,7 +2343,7 @@
          fail("There are no backup files in " + backDir.getAbsolutePath());
    }
 
-   /*public void testWorkspaceRestoreWithNullConfig() throws Exception
+   public void testWorkspaceRestoreWithNullConfig() throws Exception
    {
       // backup
       File backDir = new File("target/backup/" + getUUIndex());
@@ -2375,8 +2375,7 @@
          fail("Can't get fullBackup chain");
 
       //TODO
-      super.tearDown();
-      removeWorkspaceFully(repositoryNameToBackup, workspaceNameToBackup);
+      removeWorkspaceFullySingleDB(repositoryNameToBackup, workspaceNameToBackup);
 
       File backLog = new File(bch.getLogFilePath());
       if (backLog.exists())
@@ -2402,7 +2401,7 @@
          SessionImpl back1 = null;
          try
          {
-            back1 = (SessionImpl) getReposityToBackup().login(credentials, "ws1");
+            back1 = (SessionImpl) getReposityToBackup().login(credentials, workspaceNameToBackup);
             Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
             assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
                      .getProperty("exo:data").getString());
@@ -2420,7 +2419,7 @@
       }
       else
          fail("There are no backup files in " + backDir.getAbsolutePath());
-   }*/
+   }
 
    public void testExistedWorkspaceRestoreWithConfigBackupSetDir() throws Exception
    {
@@ -2560,7 +2559,7 @@
          fail("There are no backup files in " + backDir.getAbsolutePath());
    }
 
-   /*public void testWorkspaceRestoreWithConfigBackupSetDir() throws Exception
+   public void testWorkspaceRestoreWithConfigBackupSetDir() throws Exception
    {
       // backup
       File backDir = new File((File.createTempFile("12123", "123")).getParent() + File.separator + getUUIndex());
@@ -2592,8 +2591,7 @@
          fail("Can't get fullBackup chain");
 
       //TODO
-      super.tearDown();
-      removeWorkspaceFully(repositoryNameToBackup, workspaceNameToBackup);
+      removeWorkspaceFullySingleDB(repositoryNameToBackup, workspaceNameToBackup);
 
       File backLog = new File(bch.getLogFilePath());
       if (backLog.exists())
@@ -2627,7 +2625,7 @@
       }
       else
          fail("There are no backup files in " + backDir.getAbsolutePath());
-   }*/
+   }
 
    public void testRepositoryRestoreWithConfigBackupSetDir() throws Exception
    {

Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestRDBMSBackupManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestRDBMSBackupManager.java	2010-12-21 12:46:08 UTC (rev 3697)
+++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestRDBMSBackupManager.java	2010-12-21 14:23:17 UTC (rev 3698)
@@ -54,7 +54,7 @@
       return backupManagerImpl;
    }
 
-   @Override
+   //   @Override
    public void testExistedWorkspaceRestoreMultiDB() throws Exception
    {
       String repositoryNameToBackup = "db8";