AuditCaseRemoteOperationIT was flakey because it checked for three WireMock requests without waiting for all three to have been delivered

Author: Alex McAusland

src/test/java/uk/gov/hmcts/ccd/domain/service/lau/AuditCaseRemoteOperationIT.java

@@ -159,7 +159,7 @@ public void shouldMakeAuditRequestWhenPerformingCaseSearch() throws JsonProcessi
                 .build();
 
         auditService.audit(auditContext);
-        waitForPossibleAuditResponse(SEARCH_AUDIT_ENDPOINT);
+        waitForPossibleAuditResponse(SEARCH_AUDIT_ENDPOINT, 1);
 
         Mockito.verify(auditCaseRemoteOperation).postCaseSearch(captor.capture(), ArgumentMatchers.any());
         assertThat(captor.getValue().getOperationType(), is(equalTo(AuditOperationType.SEARCH_CASE.getLabel())));
@@ -200,7 +200,7 @@ public void shouldMakeAuditRequestWhenPerformingCaseAction() throws JsonProcessi
         ArgumentCaptor<AuditEntry> captor = ArgumentCaptor.forClass(AuditEntry.class);
 
         auditService.audit(auditContext);
-        waitForPossibleAuditResponse(ACTION_AUDIT_ENDPOINT);
+        waitForPossibleAuditResponse(ACTION_AUDIT_ENDPOINT, 1);
 
         Mockito.verify(auditCaseRemoteOperation).postCaseAction(captor.capture(), ArgumentMatchers.any());
         assertThat(captor.getValue().getOperationType(), is(equalTo(AuditOperationType.CASE_ACCESSED.getLabel())));
@@ -238,7 +238,7 @@ public void shouldNotThrowExceptionInAuditServiceIfLauIsDownAndRetry()
             .willReturn(aResponse().withStatus(AUDIT_UNAUTHORISED_HTTP_STATUS)));
 
         auditService.audit(auditContext);
-        waitForPossibleAuditResponse(ACTION_AUDIT_ENDPOINT);
+        waitForPossibleAuditResponse(ACTION_AUDIT_ENDPOINT, 3);
 
         verifyWireMock(3, postRequestedFor(urlEqualTo(ACTION_AUDIT_ENDPOINT))
             .withRequestBody(equalToJson(EXPECTED_CASE_ACTION_LOG_JSON)));
@@ -269,28 +269,30 @@ public void shouldNotThrowExceptionInAuditServiceIfLauSearchIsDownAndRetry()
             .build();
 
         auditService.audit(auditContext);
-        waitForPossibleAuditResponse(SEARCH_AUDIT_ENDPOINT);
+        waitForPossibleAuditResponse(SEARCH_AUDIT_ENDPOINT, 3);
 
         verifyWireMock(3, postRequestedFor(urlEqualTo(SEARCH_AUDIT_ENDPOINT))
             .withRequestBody(equalToJson(EXPECTED_CASE_SEARCH_LOG_JSON)));
     }
 
     private void waitForPossibleAuditResponse(String pathPrefix) throws InterruptedException {
-        List<ServeEvent> allServeEvents;
-        boolean found = false;
-        long finishTime = ZonedDateTime.now().toInstant().toEpochMilli() + ASYNC_DELAY_TIMEOUT_MILLISECONDS;
-
-        while (ZonedDateTime.now().toInstant().toEpochMilli() < finishTime && !found) {
-            allServeEvents = getAllServeEvents();
-            for (ServeEvent serveEvent : allServeEvents) {
-                if (serveEvent.getRequest().getUrl().startsWith(pathPrefix)) {
-                    found = true;
-                }
-            }
-            if (!found) {
-                TimeUnit.MILLISECONDS.sleep(ASYNC_DELAY_INTERVAL_MILLISECONDS);
-            }
+        waitForPossibleAuditResponse(pathPrefix, 1);
+    }
+
+    private void waitForPossibleAuditResponse(String pathPrefix, int expectedCount) throws InterruptedException {
+        long finishTime = System.currentTimeMillis() + ASYNC_DELAY_TIMEOUT_MILLISECONDS;
+        long currentCount = countServeEvents(pathPrefix);
+
+        while (System.currentTimeMillis() < finishTime && currentCount < expectedCount) {
+            TimeUnit.MILLISECONDS.sleep(ASYNC_DELAY_INTERVAL_MILLISECONDS);
+            currentCount = countServeEvents(pathPrefix);
         }
     }
 
+    private long countServeEvents(String pathPrefix) {
+        return getAllServeEvents().stream()
+            .filter(serveEvent -> serveEvent.getRequest().getUrl().startsWith(pathPrefix))
+            .count();
+    }
+
 }