From 06b8458f319fd7fe20a2c63a6b606d59b4e61521 Mon Sep 17 00:00:00 2001
From: Gethin James <gethin.james@alfresco.com>
Date: Thu, 14 Jul 2016 14:00:14 +0200
Subject: [PATCH] SEARCH-67: Removed Thread.sleep and lowered the cron

---
 .../alfresco/solr/query/AlfrescoReRankQParserPluginTest.java    | 1 -
 .../src/test/java/org/alfresco/solr/query/AuthDataLoad.java     | 1 -
 .../test/java/org/alfresco/solr/query/cmis/LoadCMISData.java    | 1 -
 .../java/org/alfresco/solr/tracker/AlfrescoSolrTrackerTest.java | 1 -
 .../resources/test-files/collection1/conf/solrcore.properties   | 2 +-
 5 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/AlfrescoReRankQParserPluginTest.java b/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/AlfrescoReRankQParserPluginTest.java
index bead2ff9e..ac1cb2681 100644
--- a/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/AlfrescoReRankQParserPluginTest.java
+++ b/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/AlfrescoReRankQParserPluginTest.java
@@ -46,7 +46,6 @@ public class AlfrescoReRankQParserPluginTest extends AbstractAlfrescoSolrTests
     public static void beforeClass() throws Exception
     {
         initAlfrescoCore("solrconfig-rerank.xml", "schema-rerank.xml");
-        Thread.sleep(1000);
     }
     @Before
     public void setUp() throws Exception
diff --git a/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/AuthDataLoad.java b/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/AuthDataLoad.java
index ed5d73c07..54916f8d5 100644
--- a/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/AuthDataLoad.java
+++ b/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/AuthDataLoad.java
@@ -56,7 +56,6 @@ public class AuthDataLoad extends AbstractAlfrescoSolrTests
     {
         //Start test haness
         initAlfrescoCore("solrconfig-afts.xml", "schema-afts.xml");
-        Thread.sleep(1000);
         // Root
 
         NodeRef rootNodeRef = new NodeRef(new StoreRef("workspace", "SpacesStore"), createGUID());
diff --git a/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/cmis/LoadCMISData.java b/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/cmis/LoadCMISData.java
index 374b6a610..2f84f7198 100644
--- a/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/cmis/LoadCMISData.java
+++ b/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/cmis/LoadCMISData.java
@@ -196,7 +196,6 @@ public class LoadCMISData extends AbstractAlfrescoSolrTests
     public static void loadCMISTestSet() throws Exception 
     {
         initAlfrescoCore("solrconfig-afts.xml", "schema-afts.xml");
-        Thread.sleep(1000);
         SolrCore core = h.getCore();
         AlfrescoSolrDataModel dataModel = AlfrescoSolrDataModel.getInstance();
         dataModel.setCMDefaultUri();
diff --git a/search-services/alfresco-solr/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerTest.java b/search-services/alfresco-solr/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerTest.java
index ccfb42855..9c31cc935 100644
--- a/search-services/alfresco-solr/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerTest.java
+++ b/search-services/alfresco-solr/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerTest.java
@@ -69,7 +69,6 @@ public class AlfrescoSolrTrackerTest extends AbstractAlfrescoSolrTests
     public static void beforeClass() throws Exception 
     {
         initAlfrescoCore("solrconfig-afts.xml", "schema-afts.xml");
-        Thread.sleep(1000);
     }
 
     @Before
diff --git a/search-services/alfresco-solr/src/test/resources/test-files/collection1/conf/solrcore.properties b/search-services/alfresco-solr/src/test/resources/test-files/collection1/conf/solrcore.properties
index 8f646a6d7..8be27b00b 100644
--- a/search-services/alfresco-solr/src/test/resources/test-files/collection1/conf/solrcore.properties
+++ b/search-services/alfresco-solr/src/test/resources/test-files/collection1/conf/solrcore.properties
@@ -24,7 +24,7 @@ alfresco.host=localhost
 alfresco.port=8080
 alfresco.port.ssl=8443
 alfresco.baseUrl=/alfresco
-alfresco.cron=0/5 * * * * ? *
+alfresco.cron=0/2 * * * * ? *
 
 #alfresco.index.transformContent=false
 #alfresco.ignore.datatype.1=d:content