From 72cbd120b426112647eb02785097105036151927 Mon Sep 17 00:00:00 2001 From: grofoli Date: Sun, 8 Dec 2019 14:21:14 +0100 Subject: [PATCH] Renamed trace to throwable in IgnoredException container * https://github.com/awaitility/awaitility/issues/92 --- .../java/org/awaitility/core/ConditionAwaiter.java | 2 +- .../awaitility/core/ConditionEvaluationHandler.java | 4 ++-- .../org/awaitility/core/ConditionEvaluationLogger.java | 2 +- .../java/org/awaitility/core/IgnoredException.java | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/awaitility/src/main/java/org/awaitility/core/ConditionAwaiter.java b/awaitility/src/main/java/org/awaitility/core/ConditionAwaiter.java index 75918338..1a7fad9b 100755 --- a/awaitility/src/main/java/org/awaitility/core/ConditionAwaiter.java +++ b/awaitility/src/main/java/org/awaitility/core/ConditionAwaiter.java @@ -103,7 +103,7 @@ public void await(final ConditionEvaluationHandler conditionEvaluationHan break; } if (lastResult.hasTrace()) { - conditionEvaluationHandler.handleTrace(lastResult.getTrace()); + conditionEvaluationHandler.handleIgnoredException(lastResult.getTrace()); } pollInterval = conditionSettings.getPollInterval().next(pollCount, pollInterval); diff --git a/awaitility/src/main/java/org/awaitility/core/ConditionEvaluationHandler.java b/awaitility/src/main/java/org/awaitility/core/ConditionEvaluationHandler.java index 5ba4b140..1c89d21a 100644 --- a/awaitility/src/main/java/org/awaitility/core/ConditionEvaluationHandler.java +++ b/awaitility/src/main/java/org/awaitility/core/ConditionEvaluationHandler.java @@ -105,12 +105,12 @@ public void handleTimeout(String message, boolean isConditionSatisfied) { } } - public void handleTrace(Throwable trace) { + public void handleIgnoredException(Throwable throwable) { ConditionEvaluationListener listener = settings.getConditionEvaluationListener(); if (listener != null) { long elapsedTimeInMS = watch.getElapsedTimeInMS(); long remainingTimeInMS = getRemainingTimeInMS(elapsedTimeInMS, settings.getMaxWaitTime()); - listener.exceptionIgnored(new IgnoredException(trace, elapsedTimeInMS, remainingTimeInMS, settings.getAlias())); + listener.exceptionIgnored(new IgnoredException(throwable, elapsedTimeInMS, remainingTimeInMS, settings.getAlias())); } } diff --git a/awaitility/src/main/java/org/awaitility/core/ConditionEvaluationLogger.java b/awaitility/src/main/java/org/awaitility/core/ConditionEvaluationLogger.java index 6da357aa..a0636a47 100644 --- a/awaitility/src/main/java/org/awaitility/core/ConditionEvaluationLogger.java +++ b/awaitility/src/main/java/org/awaitility/core/ConditionEvaluationLogger.java @@ -72,7 +72,7 @@ public void onTimeout(TimeoutEvent timeoutEvent) { @Override public void exceptionIgnored(IgnoredException ignoredException) { - System.out.printf("Exception %s has been ignored", ignoredException.getTrace().getMessage()); + System.out.printf("Exception %s has been ignored", ignoredException.getThrowable().getMessage()); } /** diff --git a/awaitility/src/main/java/org/awaitility/core/IgnoredException.java b/awaitility/src/main/java/org/awaitility/core/IgnoredException.java index 5195b702..606c3e60 100644 --- a/awaitility/src/main/java/org/awaitility/core/IgnoredException.java +++ b/awaitility/src/main/java/org/awaitility/core/IgnoredException.java @@ -1,20 +1,20 @@ package org.awaitility.core; public class IgnoredException { - private final Throwable trace; + private final Throwable throwable; private final long elapsedTimeInMS; private final long remainingTimeInMS; private final String alias; - public IgnoredException(Throwable trace, long elapsedTimeInMS, long remainingTimeInMS, String alias) { - this.trace = trace; + public IgnoredException(Throwable throwable, long elapsedTimeInMS, long remainingTimeInMS, String alias) { + this.throwable = throwable; this.elapsedTimeInMS = elapsedTimeInMS; this.remainingTimeInMS = remainingTimeInMS; this.alias = alias; } - public Throwable getTrace() { - return trace; + public Throwable getThrowable() { + return throwable; } public long getElapsedTimeInMS() {