RM-1771 (SOLR dependent integration tests failing)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@91835 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

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

@@ -84,7 +84,7 @@ public class ScheduledDispositionJob implements Job
     	String query = "+ASPECT:\"rma:record\" +ASPECT:\"rma:dispositionSchedule\" +@rma\\:dispositionAsOf:" + dateRange;
 
     	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();
     	results.close();

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

@@ -386,7 +386,7 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode
                 }
 
                 // 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\"");
                 try
                 {
@@ -412,7 +412,7 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode
                 // 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
                 {
                     logger.info("Bootstraping " + rs.length() + " record folders ...");

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

@@ -157,7 +157,7 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
             if (dispositionActions != null && !dispositionActions.isEmpty())
             {
                 // 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();
                 results.close();
 

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

@@ -91,7 +91,7 @@ public class NotifyOfRecordsDueForReviewJobExecuter extends RecordsManagementJob
                 queryBuffer.append(") ");
                 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();
                 results.close();
 

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

@@ -276,7 +276,7 @@ public class BootstrapTestDataGet extends DeclarativeWebScript
                 }
 
                 // 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
                 {
                     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
-                rs = searchService.query(SPACES_STORE, SearchService.LANGUAGE_LUCENE, "TYPE:\"rma:recordFolder\"");
+                rs = searchService.query(SPACES_STORE, SearchService.LANGUAGE_FTS_ALFRESCO, "TYPE:\"rma:recordFolder\"");
                 try
                 {
                     logger.info("Bootstraping " + rs.length() + " record folders ...");

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

@@ -47,7 +47,7 @@ import org.mockito.Mock;
 
 /**
  * Disposition lifecycle job execution unit test.
- * 
+ *
  * @author Roy Wetherall
  * @since 2.2
  */
@@ -57,16 +57,16 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
     private static final String CUTOFF = "cutoff";
     private static final String RETAIN = "retain";
     private static final String DESTROY = "destroy";
-    
+
     /** test query snipit */
     private static final String QUERY = "\"" + CUTOFF + "\" OR \"" + RETAIN + "\"";
-    
+
     /** mocked result set */
     @Mock ResultSet mockedResultSet;
-    
+
     /** disposition lifecycle job executer */
     @InjectMocks DispositionLifecycleJobExecuter executer;
-    
+
     /**
      * @see org.alfresco.module.org_alfresco_module_rm.test.util.BaseUnitTest#before()
      */
@@ -75,25 +75,25 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
     public void before() throws Exception
     {
         super.before();
-        
+
         // setup data
         List<String> dispositionActions = buildList(CUTOFF, RETAIN);
         executer.setDispositionActions(dispositionActions);
-        
+
         // 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());
     }
-    
+
     /**
      * Helper method to verify that the query has been executed and closed
      */
     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)).close();        
+        verify(mockedResultSet, times(1)).close();
     }
-    
+
     /**
      * When the are no results in query.
      */
@@ -102,19 +102,19 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
     {
         // given
         doReturn(Collections.EMPTY_LIST).when(mockedResultSet).getNodeRefs();
-        
+
         // when
         executer.executeImpl();
-        
+
         // then
-        
+
         // ensure the query is executed and closed
         verifyQuery();
-        
+
         // ensure nothing else happens becuase we have no results
         verifyZeroInteractions(mockedNodeService, mockedRecordFolderService, mockedRetryingTransactionHelper);
     }
-    
+
     /**
      * When the disposition actions do not match those that can be processed automatically.
      */
@@ -126,34 +126,34 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
         NodeRef node1 = generateNodeRef();
         NodeRef node2 = generateNodeRef();
         List<NodeRef> nodeRefs = buildList(node1, node2);
-        
+
         // given
         doReturn(nodeRefs).when(mockedResultSet).getNodeRefs();
         doReturn(DESTROY).when(mockedNodeService).getProperty(node1, RecordsManagementModel.PROP_DISPOSITION_ACTION);
         doReturn(DESTROY).when(mockedNodeService).getProperty(node2, RecordsManagementModel.PROP_DISPOSITION_ACTION);
-                
+
         // when
         executer.executeImpl();
-        
+
         // then
-        
+
         // ensure the query is executed and closed
         verifyQuery();
-        
+
         // ensure work is executed in transaction for each node processed
         verify(mockedNodeService, times(2)).exists(any(NodeRef.class));
         verify(mockedRetryingTransactionHelper, times(2)).doInTransaction(any(RetryingTransactionCallback.class));
-        
+
         // ensure each node is process correctly
         verify(mockedNodeService, times(1)).getProperty(node1, RecordsManagementModel.PROP_DISPOSITION_ACTION);
         verify(mockedNodeService, times(1)).getProperty(node2, RecordsManagementModel.PROP_DISPOSITION_ACTION);
-        
+
         // ensure no more interactions
         verifyNoMoreInteractions(mockedNodeService);
         verifyZeroInteractions(mockedRecordsManagementActionService);
-        
+
     }
-    
+
     /**
      * When a node does not exist
      */
@@ -163,26 +163,26 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
         // test data
         NodeRef node1 = generateNodeRef(null, false);
         List<NodeRef> nodeRefs = buildList(node1);
-        
+
         // given
         doReturn(nodeRefs).when(mockedResultSet).getNodeRefs();
-                
+
         // when
         executer.executeImpl();
-        
+
         // then
-        
+
         // ensure the query is executed and closed
         verifyQuery();
-        
+
         // ensure the node exist check is made for the node
         verify(mockedNodeService, times(1)).exists(any(NodeRef.class));
-        
+
         // ensure no more interactions
         verifyNoMoreInteractions(mockedNodeService);
-        verifyZeroInteractions(mockedRecordsManagementActionService, mockedRetryingTransactionHelper); 
+        verifyZeroInteractions(mockedRecordsManagementActionService, mockedRetryingTransactionHelper);
     }
-    
+
     /**
      * When there are disposition actions eligible for processing
      */
@@ -195,26 +195,26 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
         NodeRef node2 = generateNodeRef();
         List<NodeRef> nodeRefs = buildList(node1, node2);
         NodeRef parent = generateNodeRef();
-        ChildAssociationRef parentAssoc = new ChildAssociationRef(ASSOC_NEXT_DISPOSITION_ACTION, parent, generateQName(), generateNodeRef()); 
+        ChildAssociationRef parentAssoc = new ChildAssociationRef(ASSOC_NEXT_DISPOSITION_ACTION, parent, generateQName(), generateNodeRef());
-        
+
         // given
         doReturn(nodeRefs).when(mockedResultSet).getNodeRefs();
         doReturn(CUTOFF).when(mockedNodeService).getProperty(node1, RecordsManagementModel.PROP_DISPOSITION_ACTION);
         doReturn(RETAIN).when(mockedNodeService).getProperty(node2, RecordsManagementModel.PROP_DISPOSITION_ACTION);
         doReturn(parentAssoc).when(mockedNodeService).getPrimaryParent(any(NodeRef.class));
-                
+
         // when
         executer.executeImpl();
-        
+
         // then
-        
+
         // ensure the query is executed and closed
         verifyQuery();
-        
+
         // ensure work is executed in transaction for each node processed
         verify(mockedNodeService, times(2)).exists(any(NodeRef.class));
         verify(mockedRetryingTransactionHelper, times(2)).doInTransaction(any(RetryingTransactionCallback.class));
-        
+
         // ensure each node is process correctly
         // node1
         verify(mockedNodeService, times(1)).getProperty(node1, RecordsManagementModel.PROP_DISPOSITION_ACTION);
@@ -224,7 +224,7 @@ public class DispositionLifecycleJobExecuterUnitTest extends BaseUnitTest
         verify(mockedNodeService, times(1)).getProperty(node2, RecordsManagementModel.PROP_DISPOSITION_ACTION);
         verify(mockedNodeService, times(1)).getPrimaryParent(node2);
         verify(mockedRecordsManagementActionService, times(1)).executeRecordsManagementAction(eq(parent), eq(RETAIN), anyMap());
-        
+
         // ensure no more interactions
         verifyNoMoreInteractions(mockedNodeService, mockedRecordsManagementActionService);
     }