[sinttest] Refactor MultiResulitSyncPoint TimeoutException message co…

…nstruction for readability
Flowdalic · Jun 27, 2024 · 9254f73 · 9254f73
1 parent 68fa904
commit 9254f73
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/...ration-test/src/main/java/org/igniterealtime/smack/inttest/util/MultiResultSyncPoint.java b/...ration-test/src/main/java/org/igniterealtime/smack/inttest/util/MultiResultSyncPoint.java
@@ -44,7 +44,15 @@ public synchronized List<R> waitForResults(long timeout, String timeoutMessage)
             wait(deadline - now);
             now = System.currentTimeMillis();
         }
-        if (now >= deadline) throw new TimeoutException((timeoutMessage != null ? timeoutMessage + " " : "") + "MultiResultSyncPoint timeout waiting " + timeout + " millis. Got " + results.size() + " results of " + expectedResultCount + " results");
+        if (now >= deadline) {
+            StringBuilder sb = new StringBuilder();
+            if (timeoutMessage != null) {
+                sb.append(timeoutMessage).append(". ");
+            }
+            sb.append("MultiResultSyncPoint timeout waiting " + timeout + " ms. Got " + results.size() + " results of " + expectedResultCount + " results");
+
+            throw new TimeoutException(sb.toString());
+        }
         if (exception != null) throw exception;
         return new ArrayList<>(results);
     }

diff --git a/...-test/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatOccupantIntegrationTest.java b/...-test/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatOccupantIntegrationTest.java
@@ -292,7 +292,7 @@ public void mucJoinPresenceBroadcastTest() throws Exception {
         try {
             mucAsSeenByThree.join(nicknameThree);
 
-            List<Presence> results = assertResult(syncPoint, "Expected all occupants of room '" + mucAddress + "' to be notified of '" + conThree.getUser() + "' using nickname '" + nicknameThree + "' joining the room (but one or more did not get notified).");
+            List<Presence> results = assertResult(syncPoint, "Expected all occupants of room '" + mucAddress + "' to be notified of '" + conThree.getUser() + "' using nickname '" + nicknameThree + "' joining the room (but one or more did not get notified)");
             assertTrue(results.stream().allMatch(
                             result -> JidCreate.fullFrom(mucAddress, nicknameThree).equals(result.getFrom())),
                 "Expected all occupants of room '" + mucAddress + "' to be notified of '" + conThree.getUser() + "' using nickname '" + nicknameThree + "' joining the room (but one or more got notified for a different user).");