[camel] branch main updated: CAMEL-17948: Wait for completion on reset (#7430)

[nf...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nfilotto pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 92e6b430b0f CAMEL-17948: Wait for completion on reset (#7430)
92e6b430b0f is described below

commit 92e6b430b0fa5aac8d128bd61066208777d07191
Author: Nicolas Filotto <es...@users.noreply.github.com>
AuthorDate: Wed Apr 13 11:48:49 2022 +0200

    CAMEL-17948: Wait for completion on reset (#7430)
    
    ## Motivation
    
    The first fix had impact on several test cases, so we had to find a better fix.
    
    ## Modifications
    
    * Restore the previous code that makes the thread waits only when the received counter was not at the expected value
    * Make the thread wait completion only on `reset` to have a limited impact especially on tests that are not with the scope `PER_CLASS`
---
 .../apache/camel/component/mock/MockEndpoint.java  | 31 +++++++++++++++++-----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
index 2e33b9bda26..0e7cccbf4ff 100644
--- a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
+++ b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
@@ -311,6 +311,7 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
     }
 
     public void reset() {
+        safeLatchReset();
         expectedCount = -1;
         counter.set(0);
         defaultProcessor = null;
@@ -318,7 +319,6 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
         receivedExchanges = new CopyOnWriteArrayList<>();
         failures = new CopyOnWriteArrayList<>();
         tests = new CopyOnWriteArrayList<>();
-        latch = null;
         failFastAssertionError = null;
         sleepForEmptyTest = 0;
         resultWaitTime = 0;
@@ -441,13 +441,15 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
                 Thread.sleep(timeoutForEmptyEndpoints);
             }
             assertEquals("Received message count", expectedCount, getReceivedCounter());
-        } else if (expectedCount > 0 || expectedMinimumCount > 0) {
-            // Always wait whatever the value of the received counter to ensure that all expected messages are
-            // fully processed (until the latch countDown)
-            waitForCompleteLatch();
-            if (expectedCount > 0 && failFastAssertionError == null) {
+        } else if (expectedCount > 0) {
+            if (expectedCount != getReceivedCounter()) {
+                waitForCompleteLatch();
+            }
+            if (failFastAssertionError == null) {
                 assertEquals("Received message count", expectedCount, getReceivedCounter());
             }
+        } else if (expectedMinimumCount > 0 && getReceivedCounter() < expectedMinimumCount) {
+            waitForCompleteLatch();
         }
 
         if (failFastAssertionError != null) {
@@ -1749,6 +1751,23 @@ public class MockEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
         }
     }
 
+    /**
+     * Reset the latch to {@code null} if it was not {@code null} but before, wait until the latch is released to ensure
+     * that all expected messages are fully processed (until the latch countDown) to prevent conflicts with subsequent
+     * tests.
+     */
+    private void safeLatchReset() {
+        if (latch == null) {
+            return;
+        }
+        try {
+            waitForCompleteLatch(resultWaitTime);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
+        this.latch = null;
+    }
+
     protected void waitForCompleteLatch() throws InterruptedException {
         if (latch == null) {
             fail("Should have a latch!");