inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

RM-1771: SOLR dependent integration tests failing

Browse Source 
* 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
This commit is contained in:
Roy Wetherall
2014-12-05 03:20:08 +00:00
parent 64bbcf4bdc
commit 522f7f7c25
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java
View File

@@ -114,8 +114,8 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("+TYPE:\"rma:dispositionAction\" "); sb.append("TYPE:\"rma:dispositionAction\" AND");
sb.append("+(@rma\\:dispositionAction:("); sb.append("(@rma\\:dispositionAction:(");
boolean bFirst = true; boolean bFirst = true;
for (String dispositionAction : dispositionActions) for (String dispositionAction : dispositionActions)
@@ -133,8 +133,8 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
} }
sb.append("))"); sb.append("))");
sb.append("+ISNULL:\"rma:dispositionActionCompletedAt\" "); sb.append(" AND ISNULL:\"rma:dispositionActionCompletedAt\" ");
sb.append("+( "); sb.append(" AND ( ");
sb.append("@rma\\:dispositionEventsEligible:true "); sb.append("@rma\\:dispositionEventsEligible:true ");
sb.append("OR @rma\\:dispositionAsOf:[MIN TO NOW] "); sb.append("OR @rma\\:dispositionAsOf:[MIN TO NOW] ");
sb.append(") "); sb.append(") ");

23
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/job/AutomaticDispositionTest.java
View File

@@ -110,17 +110,18 @@ public class AutomaticDispositionTest extends BaseRMTestCase
// record should now be cut off // record should now be cut off
assertTrue(dispositionService.isDisposableItemCutoff(record)); assertTrue(dispositionService.isDisposableItemCutoff(record));
// TODO uncomment and ensure is working // TODO .. automatic dispoistion does not log entry in audit
// .. the following test checks for this, but is currently commented out
//RecordsManagementAuditQueryParameters params = new RecordsManagementAuditQueryParameters(); // .. because it doesn't work!
//params.setEvent(CutOffAction.NAME); // RecordsManagementAuditQueryParameters params = new RecordsManagementAuditQueryParameters();
//params.setMaxEntries(1); // params.setEvent(CutOffAction.NAME);
//List<RecordsManagementAuditEntry> entries = auditService.getAuditTrail(params); // params.setMaxEntries(1);
//assertNotNull(entries); // List<RecordsManagementAuditEntry> entries = auditService.getAuditTrail(params);
//assertEquals(1, entries.size()); // assertNotNull(entries);
// assertEquals(1, entries.size());
//RecordsManagementAuditEntry entry = entries.get(0); //
//assertEquals(record, entry.getNodeRef()); // RecordsManagementAuditEntry entry = entries.get(0);
// assertEquals(record, entry.getNodeRef());
} }
}); });
} }