From 522f7f7c2581c319b4fe68558dbe23f556e5c56e Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Fri, 5 Dec 2014 03:20:08 +0000 Subject: [PATCH] RM-1771: SOLR dependent integration tests failing * fix up query so it works correctly as a Alfresco FTS search git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@91841 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../job/DispositionLifecycleJobExecuter.java | 8 +++---- .../job/AutomaticDispositionTest.java | 23 ++++++++++--------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java index 390aaffc14..c611ffd807 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java @@ -114,8 +114,8 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute { StringBuilder sb = new StringBuilder(); - sb.append("+TYPE:\"rma:dispositionAction\" "); - sb.append("+(@rma\\:dispositionAction:("); + sb.append("TYPE:\"rma:dispositionAction\" AND"); + sb.append("(@rma\\:dispositionAction:("); boolean bFirst = true; for (String dispositionAction : dispositionActions) @@ -133,8 +133,8 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute } sb.append("))"); - sb.append("+ISNULL:\"rma:dispositionActionCompletedAt\" "); - sb.append("+( "); + sb.append(" AND ISNULL:\"rma:dispositionActionCompletedAt\" "); + sb.append(" AND ( "); sb.append("@rma\\:dispositionEventsEligible:true "); sb.append("OR @rma\\:dispositionAsOf:[MIN TO NOW] "); sb.append(") "); diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/job/AutomaticDispositionTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/job/AutomaticDispositionTest.java index 6c1955da51..d2491dcd28 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/job/AutomaticDispositionTest.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/job/AutomaticDispositionTest.java @@ -110,17 +110,18 @@ public class AutomaticDispositionTest extends BaseRMTestCase // record should now be cut off assertTrue(dispositionService.isDisposableItemCutoff(record)); - // TODO uncomment and ensure is working - - //RecordsManagementAuditQueryParameters params = new RecordsManagementAuditQueryParameters(); - //params.setEvent(CutOffAction.NAME); - //params.setMaxEntries(1); - //List entries = auditService.getAuditTrail(params); - //assertNotNull(entries); - //assertEquals(1, entries.size()); - - //RecordsManagementAuditEntry entry = entries.get(0); - //assertEquals(record, entry.getNodeRef()); + // TODO .. automatic dispoistion does not log entry in audit + // .. the following test checks for this, but is currently commented out + // .. because it doesn't work! +// RecordsManagementAuditQueryParameters params = new RecordsManagementAuditQueryParameters(); +// params.setEvent(CutOffAction.NAME); +// params.setMaxEntries(1); +// List entries = auditService.getAuditTrail(params); +// assertNotNull(entries); +// assertEquals(1, entries.size()); +// +// RecordsManagementAuditEntry entry = entries.get(0); +// assertEquals(record, entry.getNodeRef()); } }); }