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 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@91835 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2014-12-04 22:22:04 +00:00
parent 9c679b9b54
commit 3200e48c3a
6 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/ScheduledDispositionJob.java
View File

@@ -84,7 +84,7 @@ public class ScheduledDispositionJob implements Job
String query = "+ASPECT:\"rma:record\" +ASPECT:\"rma:dispositionSchedule\" +@rma\\:dispositionAsOf:" + dateRange; String query = "+ASPECT:\"rma:record\" +ASPECT:\"rma:dispositionSchedule\" +@rma\\:dispositionAsOf:" + dateRange;
SearchService search = (SearchService)context.getJobDetail().getJobDataMap().get("searchService"); SearchService search = (SearchService)context.getJobDetail().getJobDataMap().get("searchService");
ResultSet results = search.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, SearchService.LANGUAGE_LUCENE, query); ResultSet results = search.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, SearchService.LANGUAGE_FTS_ALFRESCO, query);
List<NodeRef> resultNodes = results.getNodeRefs(); List<NodeRef> resultNodes = results.getNodeRefs();
results.close(); results.close();

4
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetServiceImpl.java
View File

@@ -386,7 +386,7 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode
} }
// Make sure all the containers do not inherit permissions // Make sure all the containers do not inherit permissions
ResultSet rs = searchService.query(SPACES_STORE, SearchService.LANGUAGE_LUCENE, ResultSet rs = searchService.query(SPACES_STORE, SearchService.LANGUAGE_FTS_ALFRESCO,
"TYPE:\"rma:recordsManagementContainer\""); "TYPE:\"rma:recordsManagementContainer\"");
try try
{ {
@@ -412,7 +412,7 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode
// fix up the test dataset to fire initial events for // fix up the test dataset to fire initial events for
// disposition // disposition
// schedules // schedules
rs = searchService.query(SPACES_STORE, SearchService.LANGUAGE_LUCENE, "TYPE:\"rma:recordFolder\""); rs = searchService.query(SPACES_STORE, SearchService.LANGUAGE_FTS_ALFRESCO, "TYPE:\"rma:recordFolder\"");
try try
{ {
logger.info("Bootstraping " + rs.length() + " record folders ..."); logger.info("Bootstraping " + rs.length() + " record folders ...");

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

@@ -157,7 +157,7 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
if (dispositionActions != null && !dispositionActions.isEmpty()) if (dispositionActions != null && !dispositionActions.isEmpty())
{ {
// execute search // execute search
ResultSet results = searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, SearchService.LANGUAGE_LUCENE, getQuery()); ResultSet results = searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, SearchService.LANGUAGE_FTS_ALFRESCO, getQuery());
List<NodeRef> resultNodes = results.getNodeRefs(); List<NodeRef> resultNodes = results.getNodeRefs();
results.close(); results.close();

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/job/NotifyOfRecordsDueForReviewJobExecuter.java
View File

@@ -91,7 +91,7 @@ public class NotifyOfRecordsDueForReviewJobExecuter extends RecordsManagementJob
queryBuffer.append(") "); queryBuffer.append(") ");
String query = queryBuffer.toString(); String query = queryBuffer.toString();
ResultSet results = searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, SearchService.LANGUAGE_LUCENE, query); ResultSet results = searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, SearchService.LANGUAGE_FTS_ALFRESCO, query);
final List<NodeRef> resultNodes = results.getNodeRefs(); final List<NodeRef> resultNodes = results.getNodeRefs();
results.close(); results.close();

4
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BootstrapTestDataGet.java
View File

@@ -276,7 +276,7 @@ public class BootstrapTestDataGet extends DeclarativeWebScript
} }
// Make sure all the containers do not inherit permissions // Make sure all the containers do not inherit permissions
ResultSet rs = searchService.query(SPACES_STORE, SearchService.LANGUAGE_LUCENE, "TYPE:\"rma:recordsManagementContainer\""); ResultSet rs = searchService.query(SPACES_STORE, SearchService.LANGUAGE_FTS_ALFRESCO, "TYPE:\"rma:recordsManagementContainer\"");
try try
{ {
logger.info("Bootstraping " + rs.length() + " record containers ..."); logger.info("Bootstraping " + rs.length() + " record containers ...");
@@ -299,7 +299,7 @@ public class BootstrapTestDataGet extends DeclarativeWebScript
} }
// fix up the test dataset to fire initial events for disposition schedules // fix up the test dataset to fire initial events for disposition schedules
rs = searchService.query(SPACES_STORE, SearchService.LANGUAGE_LUCENE, "TYPE:\"rma:recordFolder\""); rs = searchService.query(SPACES_STORE, SearchService.LANGUAGE_FTS_ALFRESCO, "TYPE:\"rma:recordFolder\"");
try try
{ {
logger.info("Bootstraping " + rs.length() + " record folders ..."); logger.info("Bootstraping " + rs.length() + " record folders ...");

4
rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuterUnitTest.java
View File

@@ -81,7 +81,7 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
executer.setDispositionActions(dispositionActions); executer.setDispositionActions(dispositionActions);
// setup interactions // setup interactions
doReturn(mockedResultSet).when(mockedSearchService).query(eq(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE), eq(SearchService.LANGUAGE_LUCENE), anyString()); doReturn(mockedResultSet).when(mockedSearchService).query(eq(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE), eq(SearchService.LANGUAGE_FTS_ALFRESCO), anyString());
} }
/** /**
@@ -89,7 +89,7 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
*/ */
private void verifyQuery() private void verifyQuery()
{ {
verify(mockedSearchService, times(1)).query(eq(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE), eq(SearchService.LANGUAGE_LUCENE), contains(QUERY)); verify(mockedSearchService, times(1)).query(eq(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE), eq(SearchService.LANGUAGE_FTS_ALFRESCO), contains(QUERY));
verify(mockedResultSet, times(1)).getNodeRefs(); verify(mockedResultSet, times(1)).getNodeRefs();
verify(mockedResultSet, times(1)).close(); verify(mockedResultSet, times(1)).close();
} }