diff options
Diffstat (limited to 'container-search/src/test/java/com/yahoo/search/federation/FederationResultTest.java')
-rw-r--r-- | container-search/src/test/java/com/yahoo/search/federation/FederationResultTest.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/federation/FederationResultTest.java b/container-search/src/test/java/com/yahoo/search/federation/FederationResultTest.java index a17104f888d..71004f5a98a 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/FederationResultTest.java +++ b/container-search/src/test/java/com/yahoo/search/federation/FederationResultTest.java @@ -11,16 +11,14 @@ import com.yahoo.search.searchchain.Execution; import com.yahoo.search.searchchain.FutureResult; import com.yahoo.search.searchchain.model.federation.FederationOptions; import com.yahoo.test.ManualClock; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.time.Duration; import java.util.Optional; import java.util.Set; import java.util.concurrent.TimeUnit; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * @author bratseth @@ -34,7 +32,7 @@ public class FederationResultTest { private final ManualClock clock = new ManualClock(); @Test - public void testFederationResult() { + void testFederationResult() { assertTimeout(ImmutableSet.of(), 100, 200, 180); assertTimeout(ImmutableSet.of(), 480, 400, 400); assertTimeout(ImmutableSet.of("dsp1"), 260, 280, 220); @@ -56,9 +54,9 @@ public class FederationResultTest { for (FederationResult.TargetResult targetResult : federationResult.all()) { Result result = targetResult.getOrTimeoutError(); if (expectedTimeoutNames.contains(targetResult.target.getId().toString())) - assertTrue(targetResult.target.getId() + " timed out", timedOut(result)); + assertTrue(timedOut(result), targetResult.target.getId() + " timed out"); else - assertFalse(targetResult.target.getId() + " did not time out", timedOut(result)); + assertFalse(timedOut(result), targetResult.target.getId() + " did not time out"); } } |