inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2025-09-10 14:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve tests stability by giving Solr time to process changes after applying custom data models

Browse Source
This commit is contained in:
Piotr Żurek
2025-03-02 20:34:50 +01:00
parent 0d3ea0a012
commit fb24eba0d8
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
e2e-test/src/test/java/org/alfresco/test/search/functional/AbstractE2EFunctionalTest.java
View File

@@ -299,6 +299,8 @@ public abstract class AbstractE2EFunctionalTest extends AbstractTestNGSpringCont
SearchRequest searchRequest = createQuery(userQuery); SearchRequest searchRequest = createQuery(userQuery);
final int ignoreRuntimeExceptionThreshold = SEARCH_MAX_ATTEMPTS / 10 + 1;
// Repeat search until the query results are as expected or Search Retry count is hit // Repeat search until the query results are as expected or Search Retry count is hit
for (int searchCount = 0; searchCount < SEARCH_MAX_ATTEMPTS; searchCount++) for (int searchCount = 0; searchCount < SEARCH_MAX_ATTEMPTS; searchCount++)
{ {
@@ -308,13 +310,26 @@ public abstract class AbstractE2EFunctionalTest extends AbstractTestNGSpringCont
{ {
return true; return true;
} }
// Wait for the solr indexing (eventual consistency).
Utility.waitToLoopTime(properties.getSolrWaitTimeInSeconds(), "Wait For Indexing. Retry Attempt: " + (searchCount + 1));
} }
catch (EmptyJsonResponseException ignore) catch (EmptyJsonResponseException ignore)
{ {
} }
catch (RuntimeException runtimeException)
{
if (searchCount > ignoreRuntimeExceptionThreshold)
{
throw runtimeException;
}
else
{
LOGGER.warn("Ignoring initial Search API failure.", runtimeException);
}
}
finally
{
// Wait for the solr indexing (eventual consistency).
Utility.waitToLoopTime(properties.getSolrWaitTimeInSeconds(), "Wait For Indexing. Retry Attempt: " + (searchCount + 1));
}
} }
return false; return false;
@@ -323,7 +338,6 @@ public abstract class AbstractE2EFunctionalTest extends AbstractTestNGSpringCont
private boolean isContentFoundWithRequest(SearchRequest searchRequest, String contentName) private boolean isContentFoundWithRequest(SearchRequest searchRequest, String contentName)
{ {
SearchResponse response = query(searchRequest); SearchResponse response = query(searchRequest);
final String responseBody = restClient.onResponse().getResponse().body().prettyPrint();
if (restClient.getStatusCode().matches(String.valueOf(HttpStatus.OK.value()))) if (restClient.getStatusCode().matches(String.valueOf(HttpStatus.OK.value())))
{ {
@@ -331,6 +345,7 @@ public abstract class AbstractE2EFunctionalTest extends AbstractTestNGSpringCont
} }
else else
{ {
final String responseBody = restClient.onResponse().getResponse().body().prettyPrint();
throw new RuntimeException("API returned status code:" + restClient.getStatusCode() + " Expected: " + HttpStatus.OK.value() + "; Response body: " + responseBody); throw new RuntimeException("API returned status code:" + restClient.getStatusCode() + " Expected: " + HttpStatus.OK.value() + "; Response body: " + responseBody);
} }
} }