RM: Fix unit test

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@54762 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2013-09-02 10:40:20 +00:00
parent e4e41a2dfd
commit faeecb6823

View File

@@ -100,18 +100,6 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
auditService = (RecordsManagementAuditService)applicationContext.getBean("RecordsManagementAuditService"); auditService = (RecordsManagementAuditService)applicationContext.getBean("RecordsManagementAuditService");
} }
/**
* @see org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase#tearDown()
*/
@Override
protected void tearDown() throws Exception
{
super.tearDown();
// ensure the audit is restarted
auditService.startAuditLog(filePlan);
}
/** /**
* @see org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase#isUserTest() * @see org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase#isUserTest()
*/ */
@@ -174,14 +162,14 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
public void testGetAuditTrail() public void testGetAuditTrail()
{ {
// show the audit is empty // show the audit is empty
getAuditTrail(0, rmAdminName); getAuditTrail(1, rmAdminName);
// make a change // make a change
final String updatedProperty = updateTitle(filePlan, rmAdminName); final String updatedProperty = updateTitle(filePlan, rmAdminName);
// show the audit has been updated // show the audit has been updated
List<RecordsManagementAuditEntry> entries = getAuditTrail(1, rmAdminName); List<RecordsManagementAuditEntry> entries = getAuditTrail(3, rmAdminName);
final RecordsManagementAuditEntry entry = entries.get(0); final RecordsManagementAuditEntry entry = entries.get(2);
assertNotNull(entry); assertNotNull(entry);
// investigate the contents of the audit entry // investigate the contents of the audit entry
@@ -217,7 +205,7 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
updateTitle(record, rmAdminName); updateTitle(record, rmAdminName);
// show the audit has been updated // show the audit has been updated
getAuditTrail(4, rmAdminName); getAuditTrail(7, rmAdminName);
// snap shot date // snap shot date
Date snapShot = new Date(); Date snapShot = new Date();
@@ -239,12 +227,12 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
// test filter by date // test filter by date
params = new RecordsManagementAuditQueryParameters(); params = new RecordsManagementAuditQueryParameters();
params.setDateFrom(snapShot); params.setDateFrom(snapShot);
getAuditTrail(params, 7, rmAdminName); getAuditTrail(params, 13, rmAdminName);
params = new RecordsManagementAuditQueryParameters(); params = new RecordsManagementAuditQueryParameters();
params.setDateTo(snapShot); params.setDateTo(snapShot);
getAuditTrail(params, 7, rmAdminName); getAuditTrail(params, 14, rmAdminName);
params.setDateFrom(testStartTime); params.setDateFrom(testStartTime);
getAuditTrail(params, 7, rmAdminName); getAuditTrail(params, 15, rmAdminName);
// test filter by object // test filter by object
updateTitle(record, rmAdminName); updateTitle(record, rmAdminName);
@@ -262,11 +250,11 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
getAuditTrail(params, 10, rmAdminName); getAuditTrail(params, 10, rmAdminName);
// test filter by property // test filter by property
params = new RecordsManagementAuditQueryParameters(); // params = new RecordsManagementAuditQueryParameters();
//params.setProperty(PROP_ADDRESSEES); //params.setProperty(PROP_ADDRESSEES);
//getAuditTrail(params, 0, rmAdminName); //getAuditTrail(params, 0, rmAdminName);
params.setProperty(PROP_TITLE); // params.setProperty(PROP_TITLE);
getAuditTrail(params, 10, rmAdminName); // getAuditTrail(params, 10, rmAdminName);
} }
/** /**