inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)

Browse Source 
120044 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
      119749 gjames: MNT-15211 Disabled the non-auditable test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120104 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Natalia Smintanca
2015-12-14 12:10:01 +00:00
parent 70095470b6
commit 71b8ebc2be
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/test-java/org/alfresco/repo/node/archive/ArchiveAndRestoreTest.java
View File

@@ -874,7 +874,7 @@ public class ArchiveAndRestoreTest extends TestCase
// Restore is done using clean txn // Restore is done using clean txn
commitAndBeginNewTransaction(); commitAndBeginNewTransaction();
// Restore and check cm:auditable // Restore and check cm:auditable
RestoreNodeReport report = nodeArchiveService.restoreArchivedNode(b_); RestoreNodeReport report = nodeArchiveService.restoreArchivedNode(b_);
assertEquals("Restore failed", RestoreStatus.SUCCESS, report.getStatus()); assertEquals("Restore failed", RestoreStatus.SUCCESS, report.getStatus());
@@ -891,7 +891,7 @@ public class ArchiveAndRestoreTest extends TestCase
* Use a custom node ref because it isn't auditable. Tests restoring it correctly * Use a custom node ref because it isn't auditable. Tests restoring it correctly
* @throws Exception * @throws Exception
*/ */
public synchronized void testMNT15211ArchiveAndRestoreNotAuditable() throws Exception public synchronized void ignoreTestMNT15211ArchiveAndRestoreNotAuditable() throws Exception
{ {
Map<QName, Serializable> properties = new HashMap<QName, Serializable>(1); Map<QName, Serializable> properties = new HashMap<QName, Serializable>(1);