From 9254f735c79a047626c6579cd9b5ede82be202d2 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 27 Jun 2024 16:49:23 +0200 Subject: [PATCH] [sinttest] Refactor MultiResulitSyncPoint TimeoutException message construction for readability --- .../smack/inttest/util/MultiResultSyncPoint.java | 10 +++++++++- .../muc/MultiUserChatOccupantIntegrationTest.java | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/util/MultiResultSyncPoint.java b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/util/MultiResultSyncPoint.java index da220ff69..aaf0bd4f1 100644 --- a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/util/MultiResultSyncPoint.java +++ b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/util/MultiResultSyncPoint.java @@ -44,7 +44,15 @@ public class MultiResultSyncPoint { 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/smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatOccupantIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatOccupantIntegrationTest.java index 33ed0a816..35721e0b3 100644 --- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatOccupantIntegrationTest.java +++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatOccupantIntegrationTest.java @@ -292,7 +292,7 @@ public class MultiUserChatOccupantIntegrationTest extends AbstractMultiUserChatI try { mucAsSeenByThree.join(nicknameThree); - List 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 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).");