From 228efef0da1a7f00cd63d2c81a032d19f68fdf4b Mon Sep 17 00:00:00 2001
From: Meenal Bhave <meenal.bhave@alfresco.com>
Date: Thu, 9 Aug 2018 15:54:40 +0100
Subject: [PATCH] Revert "Search-999 Simplified repeat search"

This reverts commit 100dc80a9601b90f2098b73c2c6ac0da77ecce5f.
---
 .../rest/search/AbstractSearchTest.java       | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java b/e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java
index 4fb099fe4..c8463c0ac 100644
--- a/e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java
+++ b/e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java
@@ -166,17 +166,23 @@ public class AbstractSearchTest extends RestTest
      * @return true (indexing is finished) if search returns appropriate results
      * @throws Exception
      */
-    public boolean waitForIndexing(String userQuery, boolean expectedInResults) throws Exception
+    public boolean waitForIndexing(String userQuery, Boolean expectedInResults) throws Exception
     {
-        boolean found = false;
-        boolean resultAsExpected = false;
+        Boolean found = false;
+        Boolean resultAsExpected = false;
         String expectedStatusCode = HttpStatus.OK.toString();
 
+        SearchRequest searchRequest = createQuery(userQuery);
+        SearchResponse response = query(searchRequest);
+
         // Repeat search until the query results are as expected or Search Retry count is hit
         for (int searchCount = 1; searchCount <= 3; searchCount++)
         {
-            SearchRequest searchRequest = createQuery(userQuery);
-            SearchResponse response = query(searchRequest);
+            if (searchCount > 1)
+            {
+                // Wait for the solr indexing.
+                Utility.waitToLoopTime(properties.getSolrWaitTimeInSeconds(), "Wait For Indexing");
+            }
 
             if (restClient.getStatusCode().matches(expectedStatusCode))
             {
@@ -190,17 +196,11 @@ public class AbstractSearchTest extends RestTest
                 }
 
                 // Loop again if result is not as expected: To cater for solr lag: eventual consistency
-                resultAsExpected = (expectedInResults == found);
-
+                resultAsExpected = (expectedInResults.equals(found));
                 if (resultAsExpected)
                 {
                     break;
                 }
-                else
-                {
-                    // Wait for the solr indexing.
-                    Utility.waitToLoopTime(properties.getSolrWaitTimeInSeconds(), "Wait For Indexing");
-                }
             }
             else
             {