Search-961 Amendments as per the review comments

This commit is contained in:
Meenal Bhave
2018-07-17 18:01:50 +01:00
parent 08faf902ea
commit a0a05d4e43
2 changed files with 5 additions and 4 deletions
@@ -104,6 +104,7 @@ public abstract class AbstractSearchServiceE2E extends AbstractTestNGSpringConte
Boolean found = false;
Boolean resultAsExpected = false;
String expectedStatusCode = HttpStatus.OK.toString();
Integer retryCount = 3;
SearchRequest query = new SearchRequest();
RestRequestQueryModel queryReq = new RestRequestQueryModel();
@@ -114,7 +115,7 @@ public abstract class AbstractSearchServiceE2E extends AbstractTestNGSpringConte
SearchResponse response = restClient.authenticateUser(dataUser.getAdminUser()).withSearchAPI().search(query);
// Repeat search until the query results are as expected or Search Retry count is hit
for (int searchCount = 1; searchCount <= 3; searchCount++)
for (int searchCount = 1; searchCount <= retryCount; searchCount++)
{
if (searchCount > 1)
{
@@ -111,11 +111,11 @@ public class SetupTest extends AbstractSearchServiceE2E
cmisApi.authenticateUser(testUser).usingSite(testSite).usingResource(testFolder).createFile(customFile, properties, VersioningState.MAJOR).assertThat()
.existsInRepo();
Assert.assertTrue("New content could not be found", waitForIndexing(customFile.getName(), true));
Assert.assertTrue("New content could not be found", waitForIndexing("cm:name:" + customFile.getName(), true));
}
// Test sql API can be used
@Test(priority = 3)
@Test(priority = 4)
public void testSQLAPICanBeUsed() throws Exception
{
// Select distinct site: json format
@@ -130,7 +130,7 @@ public class SetupTest extends AbstractSearchServiceE2E
}
// Test sql can be executed via jdbc
@Test(priority = 4)
@Test(priority = 5)
public void testSQLViaJDBC() throws Exception
{
SiteModel publicSite = new SiteModel(RandomData.getRandomName("SiteSearch"));