vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-10-18 20:25:59 +02:00
Code Issues Releases Wiki Activity

Merge pull request #589 from guusdk/sint_syncpoint_timeoutmessage

Browse source 
[sinttest] Carry over assertion message when sync point times out
This commit is contained in:
Florian Schmaus 2024-04-17 10:43:35 +00:00 committed by GitHub
commit 37f4f35675
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/AbstractSmackIntTest.java
View file

@ -101,7 +101,7 @@ public abstract class AbstractSmackIntTest {
public static <R> R assertResult(ResultSyncPoint<R, ?> syncPoint, long timeout, String message) throws InterruptedException, TimeoutException, AssertionFailedError { public static <R> R assertResult(ResultSyncPoint<R, ?> syncPoint, long timeout, String message) throws InterruptedException, TimeoutException, AssertionFailedError {
try { try {
return syncPoint.waitForResult(timeout); return syncPoint.waitForResult(timeout, message);
} catch (InterruptedException | TimeoutException e) { } catch (InterruptedException | TimeoutException e) {
throw e; throw e;
} catch (Exception e) { } catch (Exception e) {

6
smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/util/ResultSyncPoint.java
View file

@ -26,6 +26,10 @@ public class ResultSyncPoint<R, E extends Exception> {
private E exception; private E exception;
public R waitForResult(long timeout) throws E, InterruptedException, TimeoutException { public R waitForResult(long timeout) throws E, InterruptedException, TimeoutException {
return waitForResult(timeout, null);
}
public R waitForResult(long timeout, String timeoutMessage) throws E, InterruptedException, TimeoutException {
synchronized (this) { synchronized (this) {
if (result != null) { if (result != null) {
return result; return result;
@ -46,7 +50,7 @@ public class ResultSyncPoint<R, E extends Exception> {
if (exception != null) { if (exception != null) {
throw exception; throw exception;
} }
throw new TimeoutException("Timeout expired"); throw new TimeoutException(timeoutMessage == null ? "Timeout expired" : timeoutMessage);
} }