diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/ExpectedResultVerificationErrorHandler.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/ExpectedResultVerificationErrorHandler.java index 19368d639..c2ca0cde9 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/ExpectedResultVerificationErrorHandler.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/ExpectedResultVerificationErrorHandler.java @@ -40,7 +40,7 @@ public class ExpectedResultVerificationErrorHandler implements ErrorHandler, Err public ErrorDetail handleError(String name, Throwable t, long cycle, long durationInNanos, ErrorDetail detail) { if (t instanceof ExpectedResultVerificationError erve) { if (erve.getTriesLeft() == 0) { - logger.warn("Cycle: {} Verification of result {} did not pass following expression: {}", cycle, erve.getResultAsString(), erve.getExpectedResultExpression()); + logger.warn("Cycle: {} Verification of result did not pass following expression: {}", cycle, erve.getExpectedResultExpression()); exceptionExpectedResultVerificationMetrics.countVerificationErrors(); } else { logger.info("Cycle: {} Verification of result did not pass. {} retries left.", cycle, erve.getTriesLeft()); diff --git a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/actions/StandardAction.java b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/actions/StandardAction.java index e204ac247..b0ab2aa8d 100644 --- a/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/actions/StandardAction.java +++ b/engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/actions/StandardAction.java @@ -111,7 +111,7 @@ public class StandardAction, R extends Op> impl if (shouldVerifyExpectedResultFor(op, expectedResultExpression)) { var verified = MVEL.executeExpression(expectedResultExpression, result, boolean.class); if (!verified) { - throw new ExpectedResultVerificationError(maxTries - tries, expectedResultExpression, result); + throw new ExpectedResultVerificationError(maxTries - tries, expectedResultExpression); } } } catch (Exception e) { diff --git a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandlerTest.java b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandlerTest.java index 6c9b7295f..7534f9966 100644 --- a/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandlerTest.java +++ b/engine-api/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandlerTest.java @@ -205,13 +205,13 @@ class NBErrorHandlerTest { appender.cleanup(logger); } + @SuppressWarnings("unused") private static Stream testExpectedResultVerificationErrorHandler() { Logger logger = (Logger) LogManager.getLogger("VERIFY"); - var obj = new Object(); return Stream.of( Arguments.of( "retries left", - new ExpectedResultVerificationError(5, "expected", obj), + new ExpectedResultVerificationError(5, "expected"), "Cycle: 1 Verification of result did not pass. 5 retries left.", 1, 0, @@ -219,13 +219,13 @@ class NBErrorHandlerTest { ), Arguments.of( "no retries left", - new ExpectedResultVerificationError(0, "expected", obj), - String.format("Cycle: 1 Verification of result %s did not pass following expression: %s", obj.toString(), "expected"), + new ExpectedResultVerificationError(0, "expected"), + "Cycle: 1 Verification of result did not pass following expression: expected", 0, 1, logger ) - ); + ); } } diff --git a/nb-api/src/main/java/io/nosqlbench/api/errors/ExpectedResultVerificationError.java b/nb-api/src/main/java/io/nosqlbench/api/errors/ExpectedResultVerificationError.java index 88df81890..44d70c594 100644 --- a/nb-api/src/main/java/io/nosqlbench/api/errors/ExpectedResultVerificationError.java +++ b/nb-api/src/main/java/io/nosqlbench/api/errors/ExpectedResultVerificationError.java @@ -21,12 +21,10 @@ import java.io.Serializable; public class ExpectedResultVerificationError extends RuntimeException { private final int triesLeft; private final Serializable expectedResultExpression; - private final Object result; - public ExpectedResultVerificationError(int triesLeft, Serializable expectedResultExpression, Object result) { + public ExpectedResultVerificationError(int triesLeft, Serializable expectedResultExpression) { this.triesLeft = triesLeft; this.expectedResultExpression = expectedResultExpression; - this.result = result; } public int getTriesLeft() { @@ -37,7 +35,4 @@ public class ExpectedResultVerificationError extends RuntimeException { return expectedResultExpression; } - public String getResultAsString() { - return result.toString(); // TODO JK how to traverse the first x characters of the result? parse to json? via reflection? - } }