diff options
Diffstat (limited to 'container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java')
-rw-r--r-- | container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java index 3cf2a38982a..0ecf1db01e5 100644 --- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java @@ -23,7 +23,7 @@ import com.yahoo.vespa.streamingvisitors.tracing.MockUtils; import com.yahoo.vespa.streamingvisitors.tracing.MonotonicNanoClock; import com.yahoo.vespa.streamingvisitors.tracing.SamplingStrategy; import com.yahoo.vespa.streamingvisitors.tracing.TraceExporter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashMap; @@ -31,11 +31,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -185,12 +181,12 @@ public class VdsStreamingSearcherTestCase { for (Query query : generateTestQueries(queryString)) { Result result = executeQuery(searcher, query); assertNotNull(result.hits().getError()); - assertTrue("Expected '" + message + "' to be contained in '" - + result.hits().getErrorHit().errors().iterator().next().getMessage() + "'", - result.hits().getErrorHit().errors().iterator().next().getMessage().contains(message)); - assertTrue("Expected '" + detailedMessage + "' to be contained in '" - + result.hits().getErrorHit().errors().iterator().next().getDetailedMessage() + "'", - result.hits().getErrorHit().errors().iterator().next().getDetailedMessage().contains(detailedMessage)); + assertTrue(result.hits().getErrorHit().errors().iterator().next().getMessage().contains(message), + "Expected '" + message + "' to be contained in '" + + result.hits().getErrorHit().errors().iterator().next().getMessage() + "'"); + assertTrue(result.hits().getErrorHit().errors().iterator().next().getDetailedMessage().contains(detailedMessage), + "Expected '" + detailedMessage + "' to be contained in '" + + result.hits().getErrorHit().errors().iterator().next().getDetailedMessage() + "'"); } } @@ -217,17 +213,17 @@ public class VdsStreamingSearcherTestCase { } @Test - public void testBasics() { + void testBasics() { MockVisitorFactory factory = new MockVisitorFactory(); VdsStreamingSearcher searcher = new VdsStreamingSearcher(factory); var schema = new Schema.Builder("test"); schema.add(new com.yahoo.search.schema.DocumentSummary.Builder("default").build()); searcher.init("container.0", - new SummaryParameters("default"), - new ClusterParams("clusterName"), - new DocumentdbInfoConfig.Builder().documentdb(new DocumentdbInfoConfig.Documentdb.Builder().name("test")).build(), - new SchemaInfo(List.of(schema.build()), Map.of())); + new SummaryParameters("default"), + new ClusterParams("clusterName"), + new DocumentdbInfoConfig.Builder().documentdb(new DocumentdbInfoConfig.Documentdb.Builder().name("test")).build(), + new SchemaInfo(List.of(schema.build()), Map.of())); // Magic query values are used to trigger specific behaviors from mock visitor. checkError(searcher, "/?query=noselection", @@ -256,7 +252,7 @@ public class VdsStreamingSearcherTestCase { } @Test - public void testVerifyDocId() { + void testVerifyDocId() { Query generalQuery = new Query("/?streaming.selection=true&query=test"); Query user1Query = new Query("/?streaming.userid=1&query=test"); Query group1Query = new Query("/?streaming.groupname=group1&query=test"); @@ -321,7 +317,7 @@ public class VdsStreamingSearcherTestCase { } @Test - public void trace_level_set_if_sampling_strategy_returns_true() { + void trace_level_set_if_sampling_strategy_returns_true() { var f = TraceFixture.withSampledTrace(true); executeQuery(f.searcher, new Query("/?streaming.userid=1&query=timeoutexception")); @@ -330,7 +326,7 @@ public class VdsStreamingSearcherTestCase { } @Test - public void trace_level_not_set_if_sampling_strategy_returns_false() { + void trace_level_not_set_if_sampling_strategy_returns_false() { var f = TraceFixture.withSampledTrace(false); executeQuery(f.searcher, new Query("/?streaming.userid=1&query=timeoutexception")); @@ -339,7 +335,7 @@ public class VdsStreamingSearcherTestCase { } @Test - public void trace_is_exported_if_timed_out_beyond_threshold() { + void trace_is_exported_if_timed_out_beyond_threshold() { // Default mock timeout threshold is 2x timeout var f = TraceFixture.withTracingAndClockSampledAt(1000, 3001); executeQuery(f.searcher, new Query("/?streaming.userid=1&query=timeoutexception&timeout=1.0")); @@ -348,7 +344,7 @@ public class VdsStreamingSearcherTestCase { } @Test - public void trace_is_not_exported_if_timed_out_less_than_threshold() { + void trace_is_not_exported_if_timed_out_less_than_threshold() { // Default mock timeout threshold is 2x timeout var f = TraceFixture.withTracingAndClockSampledAt(1000, 2999); executeQuery(f.searcher, new Query("/?streaming.userid=1&query=timeoutexception&timeout=1.0")); |