[sling-org-apache-sling-resourceresolver] branch master updated: SLING-12019 - Avoid duplicate ResourceResolverFactory registrations

[jsedding]

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

jsedding pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git


The following commit(s) were added to refs/heads/master by this push:
     new 7bf85fe  SLING-12019 - Avoid duplicate ResourceResolverFactory 
registrations
7bf85fe is described below

commit 7bf85fe4da055be25e763efb28257a5487a7757c
Author: Julian Sedding <jsedd...@apache.org>
AuthorDate: Tue Oct 17 14:22:17 2023 +0200

    SLING-12019 - Avoid duplicate ResourceResolverFactory registrations
    
    - allow more time time for events to arrive
    - provide better feedback that failure may be due to timing
---
 .../sling/resourceresolver/util/events/RecordingListener.java    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git 
a/src/test/java/org/apache/sling/resourceresolver/util/events/RecordingListener.java
 
b/src/test/java/org/apache/sling/resourceresolver/util/events/RecordingListener.java
index dbeb60f..3d0c677 100644
--- 
a/src/test/java/org/apache/sling/resourceresolver/util/events/RecordingListener.java
+++ 
b/src/test/java/org/apache/sling/resourceresolver/util/events/RecordingListener.java
@@ -80,8 +80,12 @@ public class RecordingListener extends 
AbstractAwaitingListener {
     }
 
     public void assertRecorded(Matcher<? super Collection<? extends 
ServiceEventDTO>> serviceEventDTOMatcher) throws InterruptedException {
+        assertRecordedWithin(5, serviceEventDTOMatcher);
+    }
+
+    public void assertRecordedWithin(int maxWaitSec, Matcher<? super 
Collection<? extends ServiceEventDTO>> serviceEventDTOMatcher) throws 
InterruptedException {
         if (signalRegistration != null) {
-            final long deadline = System.nanoTime() + 
TimeUnit.SECONDS.toNanos(1);
+            final long deadline = System.nanoTime() + 
TimeUnit.SECONDS.toNanos(maxWaitSec);
             while (!serviceEventDTOMatcher.matches(serviceEvents) && 
System.nanoTime() < deadline) {
                 // give other threads a chance
                 Thread.yield();
@@ -94,6 +98,7 @@ public class RecordingListener extends 
AbstractAwaitingListener {
             stopListening();
         }
 
-        assertThat("Expected ServiceEvents", serviceEvents, 
serviceEventDTOMatcher);
+        assertThat("Expected ServiceEvents were not recorded within " + 
maxWaitSec + " seconds. Make sure to " +
+                        "re-try with a longer wait time.", serviceEvents, 
serviceEventDTOMatcher);
     }
 }