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

Author: tolusha Date: 2011-10-26 08:55:09 -0400 (Wed, 26 Oct 2011) New Revision: 5099 Modified: jcr/trunk/exo.jcr.component.ext/pom.xml jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgentTest.java Log: EXOJCR-1585: fix test Modified: jcr/trunk/exo.jcr.component.ext/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/pom.xml 2011-10-26 12:53:22 UTC (rev 5098) +++ jcr/trunk/exo.jcr.component.ext/pom.xml 2011-10-26 12:55:09 UTC (rev 5099) @@ -196,7 +196,7 @@ <exclude>**/backup/BaseRDBMSBackupTest.java</exclude> <exclude>**/backup/TestBackupScheduler.java</exclude> <exclude>**/backup/TestBackupRestart.java</exclude> - <exclude>**/backup/load/TestLoadBackup.java*</exclude> + <exclude>**/backup/usecase/TestLoadBackup.java*</exclude> <exclude>**/replication/**</exclude> <exclude>**/repository/creation/cluster/**</exclude> </excludes> Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgentTest.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgentTest.java 2011-10-26 12:53:22 UTC (rev 5098) +++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgentTest.java 2011-10-26 12:55:09 UTC (rev 5099) @@ -251,10 +251,9 @@ ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody()); List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups()); - assertEquals(1, list.size()); + ShortInfo info = getBackupInfo(list); + assertNotNull(info); - ShortInfo info = list.get(0); - assertNotNull(info); assertEquals(BackupManager.FULL_AND_INCREMENTAL, info.getBackupType().intValue()); assertNotNull(info.getStartedTime()); @@ -282,11 +281,9 @@ ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody()); List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups()); - assertEquals(1, list.size()); - - ShortInfo info = list.get(0); - + ShortInfo info = getBackupInfo(list); assertNotNull(info); + assertEquals(BackupManager.FULL_AND_INCREMENTAL, info.getBackupType().intValue()); assertNotNull(info.getStartedTime()); assertNotNull(info.getFinishedTime()); @@ -314,11 +311,9 @@ ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody()); List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups()); - assertEquals(1, list.size()); - - ShortInfo info = list.get(0); - + ShortInfo info = getBackupInfo(list); assertNotNull(info); + assertEquals(BackupManager.FULL_AND_INCREMENTAL, info.getBackupType().intValue()); assertNotNull(info.getStartedTime()); assertNotNull(info.getFinishedTime()); @@ -345,11 +340,9 @@ ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody()); List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups()); - assertEquals(1, list.size()); - - ShortInfo info = list.get(0); - + ShortInfo info = getBackupInfo(list); assertNotNull(info); + assertEquals(BackupManager.FULL_AND_INCREMENTAL, info.getBackupType().intValue()); assertNotNull(info.getStartedTime()); assertNotNull(info.getFinishedTime()); @@ -375,11 +368,9 @@ ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody()); List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups()); - assertEquals(1, list.size()); - - ShortInfo info = list.get(0); - + ShortInfo info = getBackupInfo(list); assertNotNull(info); + assertEquals(BackupManager.FULL_AND_INCREMENTAL, info.getBackupType().intValue()); assertNotNull(info.getStartedTime()); assertNotNull(info.getFinishedTime()); @@ -406,11 +397,9 @@ ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody()); List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups()); - assertEquals(1, list.size()); - - ShortInfo info = list.get(0); - + ShortInfo info = getBackupInfo(list); assertNotNull(info); + assertEquals(BackupManager.FULL_AND_INCREMENTAL, info.getBackupType().intValue()); assertNotNull(info.getStartedTime()); assertNotNull(info.getFinishedTime()); @@ -441,10 +430,9 @@ ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody()); List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups()); - assertEquals(1, list.size()); + ShortInfo info = getBackupInfo(list); + assertNotNull(info); - ShortInfo info = list.get(0); - assertEquals(info.getRepositoryName(), "db6"); assertEquals(info.getWorkspaceName(), "ws2"); @@ -497,10 +485,9 @@ ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody()); List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups()); - assertEquals(1, list.size()); + ShortInfo info = getBackupInfo(list); + assertNotNull(info); - ShortInfo info = list.get(0); - assertEquals(info.getRepositoryName(), "db6"); id = info.getBackupId(); @@ -552,10 +539,9 @@ ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody()); List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups()); - assertEquals(1, list.size()); + ShortInfo info = getBackupInfo(list); + assertNotNull(info); - ShortInfo info = list.get(0); - assertEquals(info.getRepositoryName(), "db6"); assertEquals(info.getWorkspaceName(), "ws2"); @@ -595,10 +581,9 @@ ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody()); List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups()); - assertEquals(1, list.size()); + ShortInfo info = getBackupInfo(list); + assertNotNull(info); - ShortInfo info = list.get(0); - assertEquals(info.getRepositoryName(), "db6"); id = info.getBackupId(); @@ -634,11 +619,9 @@ ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody()); List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups()); - assertEquals(1, list.size()); - - ShortInfo info = list.get(0); - + ShortInfo info = getBackupInfo(list); assertNotNull(info); + assertEquals(BackupManager.FULL_AND_INCREMENTAL, info.getBackupType().intValue()); assertNotNull(info.getStartedTime()); assertNotNull(info.getFinishedTime()); @@ -665,11 +648,9 @@ ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody()); List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups()); - assertEquals(1, list.size()); - - ShortInfo info = list.get(0); - + ShortInfo info = getBackupInfo(list); assertNotNull(info); + assertEquals(BackupManager.FULL_AND_INCREMENTAL, info.getBackupType().intValue()); assertNotNull(info.getStartedTime()); assertNotNull(info.getFinishedTime()); @@ -990,10 +971,9 @@ ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody()); List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups()); - assertEquals(1, list.size()); + ShortInfo info = getBackupInfo(list); + assertNotNull(info); - ShortInfo info = list.get(0); - assertEquals(info.getRepositoryName(), "db6"); assertEquals(info.getWorkspaceName(), "ws2"); @@ -1874,10 +1854,9 @@ ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody()); List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups()); - assertEquals(1, list.size()); + ShortInfo info = getBackupInfo(list); + assertNotNull(info); - ShortInfo info = list.get(0); - assertEquals(info.getRepositoryName(), "db6"); id = info.getBackupId(); @@ -2043,10 +2022,9 @@ ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody()); List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups()); - assertEquals(1, list.size()); + ShortInfo info = getBackupInfo(list); + assertNotNull(info); - ShortInfo info = list.get(0); - assertEquals(info.getRepositoryName(), "db6"); id = info.getBackupId(); @@ -2179,10 +2157,9 @@ ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody()); List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups()); - assertEquals(1, list.size()); + ShortInfo info = getBackupInfo(list); + assertNotNull(info); - ShortInfo info = list.get(0); - assertEquals(info.getRepositoryName(), "db6"); id = info.getBackupId(); @@ -2316,10 +2293,9 @@ ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody()); List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups()); - assertEquals(1, list.size()); + ShortInfo info = getBackupInfo(list); + assertNotNull(info); - ShortInfo info = list.get(0); - assertEquals(info.getRepositoryName(), "db6"); id = info.getBackupId(); @@ -2408,10 +2384,9 @@ ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody()); List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups()); - assertEquals(1, list.size()); + ShortInfo info = getBackupInfo(list); + assertNotNull(info); - ShortInfo info = list.get(0); - assertEquals(info.getRepositoryName(), "db6"); id = info.getBackupId(); @@ -2501,10 +2476,9 @@ ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody()); List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups()); - assertEquals(1, list.size()); + ShortInfo info = getBackupInfo(list); + assertNotNull(info); - ShortInfo info = list.get(0); - assertEquals(info.getRepositoryName(), "db6"); id = info.getBackupId(); @@ -2648,10 +2622,9 @@ ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody()); List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups()); - assertEquals(1, list.size()); + ShortInfo info = getBackupInfo(list); + assertNotNull(info); - ShortInfo info = list.get(0); - assertEquals(info.getRepositoryName(), "db6"); id = info.getBackupId(); @@ -2795,10 +2768,9 @@ ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody()); List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups()); - assertEquals(1, list.size()); + ShortInfo info = getBackupInfo(list); + assertNotNull(info); - ShortInfo info = list.get(0); - assertEquals(info.getRepositoryName(), "db6"); id = info.getBackupId(); @@ -2896,10 +2868,9 @@ ShortInfoList infoList = (ShortInfoList) getObject(ShortInfoList.class, responseWriter.getBody()); List<ShortInfo> list = new ArrayList<ShortInfo>(infoList.getBackups()); - assertEquals(1, list.size()); + ShortInfo info = getBackupInfo(list); + assertNotNull(info); - ShortInfo info = list.get(0); - assertEquals(info.getRepositoryName(), "db6"); id = info.getBackupId(); @@ -3161,4 +3132,17 @@ } } } + + private ShortInfo getBackupInfo(List<ShortInfo> list) + { + for (ShortInfo info : list) + { + if (info.getRepositoryName().equals("db6")) + { + return info; + } + } + + return null; + } }