diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-11-01 16:36:49 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-11-01 16:36:49 +0100 |
commit | fb125b363ba81e8db3542debc1ad11f0cee529ac (patch) | |
tree | a54b81527fd76683471dd93a4865478cf28b5994 | |
parent | af9531701d4abf11c657afaec0c769c11a296a58 (diff) |
Update mock based tests.
2 files changed, 14 insertions, 4 deletions
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/SimpleLoggerResultCallback.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/SimpleLoggerResultCallback.java index 74871e09380..eba7fbef483 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/SimpleLoggerResultCallback.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/SimpleLoggerResultCallback.java @@ -97,7 +97,10 @@ public class SimpleLoggerResultCallback implements FeedClient.ResultCallback { printProgress(); } resultCounter++; - if ( !documentResult.isSuccessOrConditionNotMet() ) { + boolean success = ignoreConditionNotMet + ? documentResult.isSuccessOrConditionNotMet() + : documentResult.isSuccess(); + if ( ! success ) { failureCounter++; println("Failure: " + documentResult + (documentResult.getDetails().isEmpty() ? "" : ":")); for (Result.Detail detail : documentResult.getDetails()) diff --git a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/SimpleLoggerResultCallbackTest.java b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/SimpleLoggerResultCallbackTest.java index 667248b7551..5f4a0fdec9a 100644 --- a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/SimpleLoggerResultCallbackTest.java +++ b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/SimpleLoggerResultCallbackTest.java @@ -54,11 +54,10 @@ public class SimpleLoggerResultCallbackTest { assertEquals(rate, 15., 0.1 /* delta */); } - @Test - public void testPrintout() { + private void verifyPrintout(boolean ignoreConditionNotMet) { ArrayList<String> outputList = new ArrayList<>(); - SimpleLoggerResultCallback logger = new SimpleLoggerResultCallback(new AtomicInteger(30), 0, false) { + SimpleLoggerResultCallback logger = new SimpleLoggerResultCallback(new AtomicInteger(30), 0, ignoreConditionNotMet) { @Override protected void println(String output) { outputList.add(output); @@ -71,9 +70,11 @@ public class SimpleLoggerResultCallbackTest { // 2 success, 1 failure Result result = mock(Result.class); when(result.isSuccess()).thenReturn(true); + when(result.isSuccessOrConditionNotMet()).thenReturn(true); logger.onCompletion("1", result); logger.onCompletion("1", result); when(result.isSuccess()).thenReturn(false); + when(result.isSuccessOrConditionNotMet()).thenReturn(false); when(result.toString()).thenReturn("fooError"); logger.onCompletion("1", result); logger.printProgress(); @@ -82,4 +83,10 @@ public class SimpleLoggerResultCallbackTest { assertThat(outputList.toString(), containsString("Failure: fooError")); } + @Test + public void testPrintout() { + verifyPrintout(false); + verifyPrintout(true); + } + } |