diff options
Diffstat (limited to 'container-search/src/test/java/com/yahoo/vespa/streamingvisitors')
7 files changed, 71 insertions, 77 deletions
diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/ListMergerTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/ListMergerTestCase.java index 5523fe3c893..97dc2674256 100644 --- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/ListMergerTestCase.java +++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/ListMergerTestCase.java @@ -1,12 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.streamingvisitors; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.LinkedList; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Ulf Carlin @@ -31,9 +31,9 @@ public class ListMergerTestCase { } @Test - public void testMergeLists() { + void testMergeLists() { int entryCount = 6; - int padding = (int)Math.log10(entryCount) + 1; + int padding = (int) Math.log10(entryCount) + 1; List<String> list1 = new LinkedList<>(); List<String> list2 = new LinkedList<>(); @@ -42,17 +42,17 @@ public class ListMergerTestCase { List<String> newList = ListMerger.mergeIntoArrayList(list1, list2); verifyList(newList, entryCount, padding); - newList = ListMerger.mergeIntoArrayList(list1, list2, entryCount/2); - verifyList(newList, entryCount/2, padding); + newList = ListMerger.mergeIntoArrayList(list1, list2, entryCount / 2); + verifyList(newList, entryCount / 2, padding); - ListMerger.mergeLinkedLists(list1, list2, entryCount/2); - verifyList(list1, entryCount/2, padding); + ListMerger.mergeLinkedLists(list1, list2, entryCount / 2); + verifyList(list1, entryCount / 2, padding); } @Test - public void testMergeListsReversed() { + void testMergeListsReversed() { int entryCount = 6; - int padding = (int)Math.log10(entryCount) + 1; + int padding = (int) Math.log10(entryCount) + 1; List<String> list1 = new LinkedList<>(); List<String> list2 = new LinkedList<>(); @@ -61,11 +61,11 @@ public class ListMergerTestCase { List<String> newList = ListMerger.mergeIntoArrayList(list1, list2); verifyList(newList, entryCount, padding); - newList = ListMerger.mergeIntoArrayList(list1, list2, entryCount/2); - verifyList(newList, entryCount/2, padding); + newList = ListMerger.mergeIntoArrayList(list1, list2, entryCount / 2); + verifyList(newList, entryCount / 2, padding); - ListMerger.mergeLinkedLists(list1, list2, entryCount/2); - verifyList(list1, entryCount/2, padding); + ListMerger.mergeLinkedLists(list1, list2, entryCount / 2); + verifyList(list1, entryCount / 2, padding); } } diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java index c407945ee15..8e2380f72c2 100644 --- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/MetricsSearcherTestCase.java @@ -9,11 +9,9 @@ import com.yahoo.search.result.ErrorMessage; import com.yahoo.search.result.Hit; import com.yahoo.search.searchchain.Execution; import com.yahoo.vdslib.VisitorStatistics; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * @author Ulf Carlin @@ -36,12 +34,12 @@ public class MetricsSearcherTestCase { assertEquals("news:0", result.hits().get(0).getId().toString()); } else { 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() + "'"); } if (metricParam == null) { @@ -77,21 +75,21 @@ public class MetricsSearcherTestCase { } @Test - public void testBasics() { + void testBasics() { // Start counting at -1 since count is reset upon the first query by MetricsSearcher.search expStatsLt1.count--; - String[] loadTypes = { LOADTYPE1, LOADTYPE2}; + String[] loadTypes = {LOADTYPE1, LOADTYPE2}; for (String loadType : loadTypes) { - verifySearch("streaming.loadtype="+loadType, null, null); - verifySearch("metricsearcher.id="+loadType, null, null); + verifySearch("streaming.loadtype=" + loadType, null, null); + verifySearch("metricsearcher.id=" + loadType, null, null); verifySearch(null, null, null); - verifySearch("streaming.loadtype="+loadType, "Backend communication error", "Detailed error message"); + verifySearch("streaming.loadtype=" + loadType, "Backend communication error", "Detailed error message"); } } @Test - public void searcherDoesNotTryToDereferenceNullQueryContext() { + void searcherDoesNotTryToDereferenceNullQueryContext() { backend.setImplicitlyCreateContext(false); // This will crash with an NPE if the searcher does not cope with null // query contexts. 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")); diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java index 19fa8c50424..0e3ecf1c8cc 100644 --- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java +++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java @@ -19,13 +19,13 @@ import com.yahoo.text.Utf8String; import com.yahoo.vdslib.DocumentSummary; import com.yahoo.vdslib.SearchResult; import com.yahoo.vespa.objects.BufferSerializer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @author <a href="mailto:ulf@yahoo-inc.com">Ulf Carlin</a> @@ -280,13 +280,13 @@ public class VdsVisitorTestCase { } @Test - public void testGetQueryFlags() { + void testGetQueryFlags() { assertEquals(0x00028000, VdsVisitor.getQueryFlags(new Query("/?query=test"))); assertEquals(0x00028080, VdsVisitor.getQueryFlags(new Query("/?query=test&hitcountestimate=true"))); assertEquals(0x00068000, VdsVisitor.getQueryFlags(new Query("/?query=test&rankfeatures=true"))); assertEquals(0x00068080, VdsVisitor.getQueryFlags(new Query("/?query=test&hitcountestimate=true&rankfeatures=true"))); - Query query= new Query("/?query=test"); + Query query = new Query("/?query=test"); assertEquals(0x00028000, VdsVisitor.getQueryFlags(query)); query.setNoCache(true); assertEquals(0x00038000, VdsVisitor.getQueryFlags(query)); @@ -295,7 +295,7 @@ public class VdsVisitorTestCase { } @Test - public void testBasics() throws Exception { + void testBasics() throws Exception { Route route = Route.parse("storageClusterRouteSpec"); String searchCluster = "searchClusterConfigId"; MockVisitorSessionFactory factory = new MockVisitorSessionFactory(); @@ -318,7 +318,7 @@ public class VdsVisitorTestCase { } @Test - public void testFailures() throws Exception { + void testFailures() throws Exception { Route route = Route.parse("storageClusterRouteSpec"); String searchCluster = "searchClusterConfigId"; MockVisitorSessionFactory factory = new MockVisitorSessionFactory(); @@ -346,11 +346,11 @@ public class VdsVisitorTestCase { VdsVisitor visitor = new VdsVisitor(buildQuery(qa), searchCluster, route, "mytype", factory, 0); try { visitor.doSearch(); - assertTrue("Visitor did not fail", false); + assertTrue(false, "Visitor did not fail"); } catch (TimeoutException te) { - assertTrue("Got TimeoutException unexpectedly", factory.timeoutQuery); + assertTrue(factory.timeoutQuery, "Got TimeoutException unexpectedly"); } catch (IllegalArgumentException iae) { - assertTrue("Got IllegalArgumentException unexpectedly", factory.failQuery); + assertTrue(factory.failQuery, "Got IllegalArgumentException unexpectedly"); } } @@ -363,7 +363,7 @@ public class VdsVisitorTestCase { visitor.onMessage(createDSM("id:ns:type::2"), ackToken); try { visitor.onMessage(createM(), ackToken); - assertTrue("Unsupported message did not cause exception", false); + assertTrue(false, "Unsupported message did not cause exception"); } catch (UnsupportedOperationException uoe) { assertTrue(uoe.getMessage().contains("VdsVisitor can only accept query result, search result, and documentsummary messages")); } @@ -389,10 +389,10 @@ public class VdsVisitorTestCase { assertEquals("id:ns:type::0", hit.getDocId()); assertEquals(0.3, hit.getRank(), 0.01); } else { - assertTrue("Got too many hits", false); + assertTrue(false, "Got too many hits"); } DocumentSummary.Summary summary = visitor.getSummaryMap().get(hit.getDocId()); - assertNotNull("Did not find summary for " + hit.getDocId(), summary); + assertNotNull(summary, "Did not find summary for " + hit.getDocId()); } } diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/tracing/MaxSamplesPerPeriodTest.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/tracing/MaxSamplesPerPeriodTest.java index cd951e83699..349bedafcce 100644 --- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/tracing/MaxSamplesPerPeriodTest.java +++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/tracing/MaxSamplesPerPeriodTest.java @@ -1,22 +1,22 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.streamingvisitors.tracing; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class MaxSamplesPerPeriodTest { @Test - public void first_sample_in_period_returns_true() { + void first_sample_in_period_returns_true() { var clock = MockUtils.mockedClockReturning(1000L); var sampler = new MaxSamplesPerPeriod(clock, 1000L, 1L); assertTrue(sampler.shouldSample()); } @Test - public void samples_exceeding_period_count_return_false() { + void samples_exceeding_period_count_return_false() { var clock = MockUtils.mockedClockReturning(1000L, 1100L, 1200L); var sampler = new MaxSamplesPerPeriod(clock, 1000L, 2L); assertTrue(sampler.shouldSample()); @@ -25,7 +25,7 @@ public class MaxSamplesPerPeriodTest { } @Test - public void sample_in_new_period_returns_true() { + void sample_in_new_period_returns_true() { var clock = MockUtils.mockedClockReturning(1000L, 1900L, 2000L, 2900L); var sampler = new MaxSamplesPerPeriod(clock, 1000L, 1L); assertTrue(sampler.shouldSample()); diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/tracing/ProbabilisticSampleRateTest.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/tracing/ProbabilisticSampleRateTest.java index 1ce05df5f26..f5576d5d512 100644 --- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/tracing/ProbabilisticSampleRateTest.java +++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/tracing/ProbabilisticSampleRateTest.java @@ -1,12 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.streamingvisitors.tracing; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.TimeUnit; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ProbabilisticSampleRateTest { @@ -15,7 +15,7 @@ public class ProbabilisticSampleRateTest { } @Test - public void samples_are_rate_limited_per_second() { + void samples_are_rate_limited_per_second() { var clock = MockUtils.mockedClockReturning(ms2ns(10_000), ms2ns(10_500), ms2ns(10_500), ms2ns(10_501)); var rng = MockUtils.mockedRandomReturning(0.1, 0.51, 0.49, 0.01); var sampler = new ProbabilisticSampleRate(clock, () -> rng, 1.0); @@ -30,7 +30,7 @@ public class ProbabilisticSampleRateTest { } @Test - public void zero_desired_sample_rate_returns_false() { + void zero_desired_sample_rate_returns_false() { var clock = MockUtils.mockedClockReturning(ms2ns(10_000)); var rng = MockUtils.mockedRandomReturning(0.99999999); // [0, 1) var sampler = new ProbabilisticSampleRate(clock, () -> rng, 0.0); diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/tracing/SamplingTraceExporterTest.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/tracing/SamplingTraceExporterTest.java index 36b6ed35213..f143efbf786 100644 --- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/tracing/SamplingTraceExporterTest.java +++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/tracing/SamplingTraceExporterTest.java @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.streamingvisitors.tracing; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; @@ -12,7 +12,7 @@ import static org.mockito.Mockito.when; public class SamplingTraceExporterTest { @Test - public void sampling_decision_is_deferred_to_provided_sampler() { + void sampling_decision_is_deferred_to_provided_sampler() { var exporter = mock(TraceExporter.class); var sampler = mock(SamplingStrategy.class); when(sampler.shouldSample()).thenReturn(true, false); |