diff options
Diffstat (limited to 'container-search/src/test/java/com/yahoo/search/searchers')
8 files changed, 90 insertions, 96 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/searchers/ValidateFuzzySearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/ValidateFuzzySearcherTestCase.java index 577963ef2b3..1cf8159e19e 100644 --- a/container-search/src/test/java/com/yahoo/search/searchers/ValidateFuzzySearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/ValidateFuzzySearcherTestCase.java @@ -14,13 +14,14 @@ import com.yahoo.search.searchchain.Execution; import com.yahoo.search.yql.YqlParser; import com.yahoo.vespa.config.search.AttributesConfig; import com.yahoo.vespa.config.search.AttributesConfig.Attribute; -import org.junit.Test; +import org.junit.jupiter.api.Test; + import java.util.ArrayList; import java.util.List; import java.util.Set; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; /** * @author alexeyche @@ -64,10 +65,10 @@ public class ValidateFuzzySearcherTestCase { @Test - public void testQueriesToAllAttributes() { + void testQueriesToAllAttributes() { final Set<String> validAttributes = Set.of("string_single", "string_array", "string_weightedset"); - for (String attribute: attributes) { + for (String attribute : attributes) { String q = makeQuery(attribute, "fuzzy"); Result r = doSearch(searcher, q); if (validAttributes.contains(attribute)) { @@ -79,28 +80,28 @@ public class ValidateFuzzySearcherTestCase { } @Test - public void testInvalidEmptyStringQuery() { + void testInvalidEmptyStringQuery() { String q = makeQuery("string_single", ""); Result r = doSearch(searcher, q); assertErrMsg("FUZZY(,2,0) string_single: fuzzy query must be non-empty", r); } @Test - public void testInvalidQueryWrongMaxEditDistance() { + void testInvalidQueryWrongMaxEditDistance() { String q = makeQuery("string_single", "fuzzy", -1, 0); Result r = doSearch(searcher, q); assertErrMsg("FUZZY(fuzzy,-1,0) string_single:fuzzy has invalid maxEditDistance -1: Must be >= 0", r); } @Test - public void testInvalidQueryWrongPrefixLength() { + void testInvalidQueryWrongPrefixLength() { String q = makeQuery("string_single", "fuzzy", 2, -1); Result r = doSearch(searcher, q); assertErrMsg("FUZZY(fuzzy,2,-1) string_single:fuzzy has invalid prefixLength -1: Must be >= 0", r); } @Test - public void testInvalidQueryWrongAttributeName() { + void testInvalidQueryWrongAttributeName() { String q = makeQuery("wrong_name", "fuzzy"); Result r = doSearch(searcher, q); assertErrMsg("FUZZY(fuzzy,2,0) wrong_name:fuzzy field is not a string attribute", r); diff --git a/container-search/src/test/java/com/yahoo/search/searchers/ValidateNearestNeighborTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/ValidateNearestNeighborTestCase.java index c2f4ee31aa8..b8be0b3dd43 100644 --- a/container-search/src/test/java/com/yahoo/search/searchers/ValidateNearestNeighborTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/ValidateNearestNeighborTestCase.java @@ -16,10 +16,10 @@ import com.yahoo.search.yql.YqlParser; import com.yahoo.tensor.Tensor; import com.yahoo.tensor.TensorType; import com.yahoo.vespa.config.search.AttributesConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; /** * @author arnej @@ -103,7 +103,7 @@ public class ValidateNearestNeighborTestCase { } @Test - public void testValidQueryDoubleVectors() { + void testValidQueryDoubleVectors() { String q = makeQuery("dvector", "qvector"); Tensor t = makeTensor(tt_dense_dvector_3); Result r = doSearch(searcher, q, t); @@ -111,7 +111,7 @@ public class ValidateNearestNeighborTestCase { } @Test - public void testValidQueryFloatVectors() { + void testValidQueryFloatVectors() { String q = makeQuery("fvector", "qvector"); Tensor t = makeTensor(tt_dense_fvector_3); Result r = doSearch(searcher, q, t); @@ -119,7 +119,7 @@ public class ValidateNearestNeighborTestCase { } @Test - public void testValidQueryDoubleVectorAgainstFloatVector() { + void testValidQueryDoubleVectorAgainstFloatVector() { String q = makeQuery("dvector", "qvector"); Tensor t = makeTensor(tt_dense_fvector_3); Result r = doSearch(searcher, q, t); @@ -127,7 +127,7 @@ public class ValidateNearestNeighborTestCase { } @Test - public void testValidQueryFloatVectorAgainstDoubleVector() { + void testValidQueryFloatVectorAgainstDoubleVector() { String q = makeQuery("fvector", "qvector"); Tensor t = makeTensor(tt_dense_dvector_3); Result r = doSearch(searcher, q, t); @@ -152,7 +152,7 @@ public class ValidateNearestNeighborTestCase { } @Test - public void testMissingTargetNumHits() { + void testMissingTargetNumHits() { String q = "select * from sources * where nearestNeighbor(dvector,qvector)"; Tensor t = makeTensor(tt_dense_dvector_3); Result r = doSearch(searcher, q, t); @@ -160,7 +160,7 @@ public class ValidateNearestNeighborTestCase { } @Test - public void testMissingQueryTensor() { + void testMissingQueryTensor() { String q = makeQuery("dvector", "foo"); Tensor t = makeTensor(tt_dense_dvector_3); Result r = doSearch(searcher, q, t); @@ -168,7 +168,7 @@ public class ValidateNearestNeighborTestCase { } @Test - public void testWrongTensorType() { + void testWrongTensorType() { String q = makeQuery("dvector", "qvector"); Tensor t = makeTensor(tt_dense_dvector_2, 2); Result r = doSearch(searcher, q, t); @@ -176,7 +176,7 @@ public class ValidateNearestNeighborTestCase { } @Test - public void testNotAttribute() { + void testNotAttribute() { String q = makeQuery("foo", "qvector"); Tensor t = makeTensor(tt_dense_dvector_3); Result r = doSearch(searcher, q, t); @@ -184,7 +184,7 @@ public class ValidateNearestNeighborTestCase { } @Test - public void testWrongAttributeType() { + void testWrongAttributeType() { String q = makeQuery("simple", "qvector"); Tensor t = makeTensor(tt_dense_dvector_3); Result r = doSearch(searcher, q, t); @@ -192,7 +192,7 @@ public class ValidateNearestNeighborTestCase { } @Test - public void testSeveralAttributesWithSameName() { + void testSeveralAttributesWithSameName() { String q = makeQuery("threetypes", "qvector"); Tensor t1 = makeTensor(tt_dense_fvector_3); Result r1 = doSearch(searcher, q, t1); @@ -206,7 +206,7 @@ public class ValidateNearestNeighborTestCase { } @Test - public void testSparseTensor() { + void testSparseTensor() { String q = makeQuery("sparse", "qvector"); Tensor t = makeTensor(tt_sparse_vector_x); Result r = doSearch(searcher, q, t); @@ -214,7 +214,7 @@ public class ValidateNearestNeighborTestCase { } @Test - public void testMatrix() { + void testMatrix() { String q = makeQuery("matrix", "qvector"); Tensor t = makeMatrix(tt_dense_matrix_xy); Result r = doSearch(searcher, q, t); diff --git a/container-search/src/test/java/com/yahoo/search/searchers/test/CacheControlSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/test/CacheControlSearcherTestCase.java index b0fd77897fc..dc99185f4b8 100644 --- a/container-search/src/test/java/com/yahoo/search/searchers/test/CacheControlSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/test/CacheControlSearcherTestCase.java @@ -8,15 +8,12 @@ import com.yahoo.search.Searcher; import com.yahoo.search.result.Hit; import com.yahoo.search.searchchain.Execution; import com.yahoo.search.searchers.CacheControlSearcher; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; import static com.yahoo.search.searchers.CacheControlSearcher.CACHE_CONTROL_HEADER; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.*; /** * Unit test cases for CacheControlSearcher. @@ -54,17 +51,17 @@ public class CacheControlSearcherTestCase { * @param cacheheaders - The "Cache-Control" headers from the response ListMap */ private void assertCacheHeaders(String[] values, List<String> cacheheaders) { - assertNotNull("No headers to test for (was null)", values); - assertTrue("No headers to test for (no elements in array)", values.length > 0); - assertNotNull("No cache headers set in response", cacheheaders); + assertNotNull(values, "No headers to test for (was null)"); + assertTrue(values.length > 0, "No headers to test for (no elements in array)"); + assertNotNull(cacheheaders, "No cache headers set in response"); assertEquals(values.length, cacheheaders.size()); for (String header : values) { - assertTrue("Cache header does not contain header '" + header + "'", cacheheaders.contains(header)); + assertTrue(cacheheaders.contains(header), "Cache header does not contain header '" + header + "'"); } } @Test - public void testNoHeader() { + void testNoHeader() { Chain<Searcher> chain = getSearchChain(); Query query = new Query("?query=foo&custid=foo"); Result result = new Execution(chain, Execution.Context.createContextStub()).search(query); @@ -72,7 +69,7 @@ public class CacheControlSearcherTestCase { } @Test - public void testInvalidAgeParams() { + void testInvalidAgeParams() { Chain<Searcher> chain = getSearchChain(); try { @@ -97,7 +94,7 @@ public class CacheControlSearcherTestCase { } @Test - public void testMaxAge() { + void testMaxAge() { Chain<Searcher> chain = getSearchChain(); Query query = new Query("?query=foo&custid=foo&cachecontrol.maxage=120"); @@ -106,7 +103,7 @@ public class CacheControlSearcherTestCase { } @Test - public void testNoCache() { + void testNoCache() { Chain<Searcher> chain = getSearchChain(); Query query = new Query("?query=foo&custid=foo&cachecontrol.maxage=120&noCache"); @@ -119,7 +116,7 @@ public class CacheControlSearcherTestCase { } @Test - public void testStateWhileRevalidate() { + void testStateWhileRevalidate() { Chain<Searcher> chain = getSearchChain(); Query query = new Query("?query=foo&custid=foo&cachecontrol.staleage=3600"); @@ -128,7 +125,7 @@ public class CacheControlSearcherTestCase { } @Test - public void testStaleAndMaxAge() { + void testStaleAndMaxAge() { Chain<Searcher> chain = getSearchChain(); Query query = new Query("?query=foo&custid=foo&cachecontrol.maxage=60&cachecontrol.staleage=3600"); diff --git a/container-search/src/test/java/com/yahoo/search/searchers/test/ConnectionControlSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/test/ConnectionControlSearcherTestCase.java index 48dc0975efe..5323149ae1d 100644 --- a/container-search/src/test/java/com/yahoo/search/searchers/test/ConnectionControlSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/test/ConnectionControlSearcherTestCase.java @@ -1,8 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchers.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -12,8 +12,7 @@ import java.net.SocketAddress; import java.net.URI; import java.net.URISyntaxException; -import org.junit.Test; - +import org.junit.jupiter.api.Test; import com.yahoo.component.chain.Chain; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.jdisc.Container; @@ -35,7 +34,7 @@ import com.yahoo.search.searchers.ConnectionControlSearcher; public class ConnectionControlSearcherTestCase { @Test - public final void test() throws URISyntaxException { + final void test() throws URISyntaxException { URI uri = new URI("http://finance.yahoo.com/?connectioncontrol.maxlifetime=1"); long connectedAtMillis = 0L; long nowMillis = 2L * 1000L; @@ -44,7 +43,7 @@ public class ConnectionControlSearcherTestCase { } @Test - public final void testForcedClose() throws URISyntaxException { + final void testForcedClose() throws URISyntaxException { URI uri = new URI("http://finance.yahoo.com/?connectioncontrol.maxlifetime=0"); long connectedAtMillis = 0L; long nowMillis = 0L; @@ -53,7 +52,7 @@ public class ConnectionControlSearcherTestCase { } @Test - public final void testNormalCloseWithoutJdisc() { + final void testNormalCloseWithoutJdisc() { long nowMillis = 2L; Query query = new Query("/?connectioncontrol.maxlifetime=1"); Execution e = new Execution(new Chain<Searcher>(ConnectionControlSearcher.createTestInstance(() -> nowMillis)), @@ -63,7 +62,7 @@ public class ConnectionControlSearcherTestCase { } @Test - public final void testNoMaxLifetime() throws URISyntaxException { + final void testNoMaxLifetime() throws URISyntaxException { URI uri = new URI("http://finance.yahoo.com/"); long connectedAtMillis = 0L; long nowMillis = 0L; @@ -72,7 +71,7 @@ public class ConnectionControlSearcherTestCase { } @Test - public final void testYoungEnoughConnection() throws URISyntaxException { + final void testYoungEnoughConnection() throws URISyntaxException { URI uri = new URI("http://finance.yahoo.com/?connectioncontrol.maxlifetime=1"); long connectedAtMillis = 0L; long nowMillis = 500L; diff --git a/container-search/src/test/java/com/yahoo/search/searchers/test/InputCheckingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/test/InputCheckingSearcherTestCase.java index 91784c82800..2cd65f65209 100644 --- a/container-search/src/test/java/com/yahoo/search/searchers/test/InputCheckingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/test/InputCheckingSearcherTestCase.java @@ -1,16 +1,15 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchers.test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import com.yahoo.component.chain.Chain; import com.yahoo.metrics.simple.MetricReceiver; import com.yahoo.prelude.IndexFacts; @@ -30,44 +29,44 @@ public class InputCheckingSearcherTestCase { Execution execution; - @Before + @BeforeEach public void setUp() { execution = new Execution(new Chain<Searcher>(new InputCheckingSearcher(MetricReceiver.nullImplementation)), Execution.Context.createContextStub()); } - @After + @AfterEach public void tearDown() { execution = null; } @Test - public void testCommonCase() { + void testCommonCase() { Result r = execution.search(new Query("/search/?query=three+blind+mice")); assertNull(r.hits().getErrorHit()); } @Test - public void candidateButAsciiOnly() { + void candidateButAsciiOnly() { Result r = execution.search(new Query("/search/?query=a+a+a+a+a+a")); assertNull(r.hits().getErrorHit()); } @Test - public void candidateButValid() throws UnsupportedEncodingException { + void candidateButValid() throws UnsupportedEncodingException { Result r = execution.search(new Query("/search/?query=" + URLEncoder.encode("å å å å å å", "UTF-8"))); assertNull(r.hits().getErrorHit()); } @Test - public void candidateButValidAndOutsideFirst256() throws UnsupportedEncodingException { + void candidateButValidAndOutsideFirst256() throws UnsupportedEncodingException { Result r = execution.search(new Query("/search/?query=" + URLEncoder.encode("œ œ œ œ œ œ", "UTF-8"))); assertNull(r.hits().getErrorHit()); } @Test - public void testDoubleEncoded() throws UnsupportedEncodingException { + void testDoubleEncoded() throws UnsupportedEncodingException { String rawQuery = "å å å å å å"; byte[] encodedOnce = Utf8.toBytes(rawQuery); char[] secondEncodingBuffer = new char[encodedOnce.length]; @@ -80,37 +79,37 @@ public class InputCheckingSearcherTestCase { } @Test - public void testRepeatedConsecutiveTermsInPhrase() { + void testRepeatedConsecutiveTermsInPhrase() { Result r = execution.search(new Query("/search/?query=%22a.b.0.0.0.0.0.c%22")); assertNull(r.hits().getErrorHit()); r = execution.search(new Query("/search/?query=%22a.b.0.0.0.0.0.0.c%22")); assertNotNull(r.hits().getErrorHit()); assertEquals("More than 5 occurrences of term '0' in a row detected in phrase : \"a b 0 0 0 0 0 0 c\"", - r.hits().getErrorHit().errorIterator().next().getDetailedMessage()); + r.hits().getErrorHit().errorIterator().next().getDetailedMessage()); r = execution.search(new Query("/search/?query=a.b.0.0.0.1.0.0.0.c")); assertNull(r.hits().getErrorHit()); } @Test - public void testThatMaxRepeatedConsecutiveTermsInPhraseIs5() { + void testThatMaxRepeatedConsecutiveTermsInPhraseIs5() { Result r = execution.search(new Query("/search/?query=%22a.b.0.0.0.0.0.c%22")); assertNull(r.hits().getErrorHit()); r = execution.search(new Query("/search/?query=%22a.b.0.0.0.0.0.0.c%22")); assertNotNull(r.hits().getErrorHit()); assertEquals("More than 5 occurrences of term '0' in a row detected in phrase : \"a b 0 0 0 0 0 0 c\"", - r.hits().getErrorHit().errorIterator().next().getDetailedMessage()); + r.hits().getErrorHit().errorIterator().next().getDetailedMessage()); r = execution.search(new Query("/search/?query=%22a.b.0.0.0.1.0.0.0.c%22")); assertNull(r.hits().getErrorHit()); } @Test - public void testThatMaxRepeatedTermsInPhraseIs10() { + void testThatMaxRepeatedTermsInPhraseIs10() { Result r = execution.search(new Query("/search/?query=%220.a.1.a.2.a.3.a.4.a.5.a.6.a.7.a.9.a%22")); assertNull(r.hits().getErrorHit()); r = execution.search(new Query("/search/?query=%220.a.1.a.2.a.3.a.4.a.5.a.6.a.7.a.8.a.9.a.10.a%22")); assertNotNull(r.hits().getErrorHit()); assertEquals("Phrase contains more than 10 occurrences of term 'a' in phrase : \"0 a 1 a 2 a 3 a 4 a 5 a 6 a 7 a 8 a 9 a 10 a\"", - r.hits().getErrorHit().errorIterator().next().getDetailedMessage()); + r.hits().getErrorHit().errorIterator().next().getDetailedMessage()); } } diff --git a/container-search/src/test/java/com/yahoo/search/searchers/test/QueryValidatorTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/test/QueryValidatorTestCase.java index d5fb1c0cfe3..64fb4354003 100644 --- a/container-search/src/test/java/com/yahoo/search/searchers/test/QueryValidatorTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/test/QueryValidatorTestCase.java @@ -7,10 +7,10 @@ import com.yahoo.prelude.SearchDefinition; import com.yahoo.search.Query; import com.yahoo.search.searchchain.Execution; import com.yahoo.search.searchers.QueryValidator; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; /** * @author bratseth @@ -18,7 +18,7 @@ import static org.junit.Assert.fail; public class QueryValidatorTestCase { @Test - public void testValidation() { + void testValidation() { SearchDefinition sd = new SearchDefinition("test"); sd.addCommand("mytensor1", "type tensor(x[100]"); sd.addCommand("mytensor2", "type tensor<float>(x[100]"); diff --git a/container-search/src/test/java/com/yahoo/search/searchers/test/RateLimitingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/test/RateLimitingSearcherTestCase.java index 4ee57112960..102f9bda5dc 100755 --- a/container-search/src/test/java/com/yahoo/search/searchers/test/RateLimitingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/test/RateLimitingSearcherTestCase.java @@ -14,15 +14,13 @@ import com.yahoo.search.config.RateLimitingConfig; import com.yahoo.search.searchchain.Execution; import com.yahoo.search.searchers.RateLimitingSearcher; import com.yahoo.yolean.chain.After; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.yahoo.test.ManualClock; import java.time.Duration; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.*; /** * Unit tests for RateLimitingSearcher @@ -32,7 +30,7 @@ import static org.junit.Assert.assertFalse; public class RateLimitingSearcherTestCase { @Test - public void testRateLimiting() { + void testRateLimiting() { RateLimitingConfig.Builder rateLimitingConfig = new RateLimitingConfig.Builder(); rateLimitingConfig.maxAvailableCapacity(4); rateLimitingConfig.capacityIncrement(2); @@ -46,36 +44,36 @@ public class RateLimitingSearcherTestCase { MetricReceiver.MockReceiver metric = new MetricReceiver.MockReceiver(); Chain<Searcher> chain = new Chain<>("test", new RateLimitingSearcher(new RateLimitingConfig(rateLimitingConfig), - new ClusterInfoConfig(clusterInfoConfig), - metric, clock), - new CostSettingSearcher()); - assertEquals("'rate' request are available initially", 2, tryRequests(chain, "id1")); - assertTrue("However, don't reject if we dryRun", executeWasAllowed(chain, "id1", true)); + new ClusterInfoConfig(clusterInfoConfig), + metric, clock), + new CostSettingSearcher()); + assertEquals(2, tryRequests(chain, "id1"), "'rate' request are available initially"); + assertTrue(executeWasAllowed(chain, "id1", true), "However, don't reject if we dryRun"); clock.advance(Duration.ofMillis(1500)); // causes 2 new requests to become available - assertEquals("'rate' new requests became available", 2, tryRequests(chain, "id1")); + assertEquals(2, tryRequests(chain, "id1"), "'rate' new requests became available"); - assertEquals("Another id", 2, tryRequests(chain, "id2")); + assertEquals(2, tryRequests(chain, "id2"), "Another id"); clock.advance(Duration.ofMillis(1000000)); - assertEquals("'maxAvailableCapacity' request became available", 4, tryRequests(chain, "id2")); + assertEquals(4, tryRequests(chain, "id2"), "'maxAvailableCapacity' request became available"); - assertFalse("If quota is set to 0, all requests are rejected, even initially", executeWasAllowed(chain, "id3", 0)); + assertFalse(executeWasAllowed(chain, "id3", 0), "If quota is set to 0, all requests are rejected, even initially"); clock.advance(Duration.ofMillis(1000000)); - assertTrue("A single query which costs more than capacity is allowed as cost is calculated after allowing it", - executeWasAllowed(chain, "id1", 8, 8, false)); - assertFalse("capacity is -4: disallowing", executeWasAllowed(chain, "id1")); + assertTrue(executeWasAllowed(chain, "id1", 8, 8, false), + "A single query which costs more than capacity is allowed as cost is calculated after allowing it"); + assertFalse(executeWasAllowed(chain, "id1"), "capacity is -4: disallowing"); clock.advance(Duration.ofMillis(1000)); - assertFalse("capacity is -2: disallowing", executeWasAllowed(chain, "id1")); + assertFalse(executeWasAllowed(chain, "id1"), "capacity is -2: disallowing"); clock.advance(Duration.ofMillis(1000)); - assertFalse("capacity is 0: disallowing", executeWasAllowed(chain, "id1")); + assertFalse(executeWasAllowed(chain, "id1"), "capacity is 0: disallowing"); clock.advance(Duration.ofMillis(1000)); assertTrue(executeWasAllowed(chain, "id1")); // check metrics - Map<Point,UntypedMetric> map = metric.getSnapshot().getMapForMetric("requestsOverQuota"); - assertEquals(requestsToTry-2 + 1 + requestsToTry-2 + 3, map.get(metric.point("id", "id1")).getCount()); - assertEquals(requestsToTry-2 + requestsToTry-4, map.get(metric.point("id", "id2")).getCount()); + Map<Point, UntypedMetric> map = metric.getSnapshot().getMapForMetric("requestsOverQuota"); + assertEquals(requestsToTry - 2 + 1 + requestsToTry - 2 + 3, map.get(metric.point("id", "id1")).getCount()); + assertEquals(requestsToTry - 2 + requestsToTry - 4, map.get(metric.point("id", "id2")).getCount()); } private int requestsToTry = 50; diff --git a/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java index 1b3689a94b0..a040575c4b4 100644 --- a/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java @@ -9,12 +9,12 @@ import com.yahoo.search.searchers.ValidateMatchPhaseSearcher; import com.yahoo.search.Query; import com.yahoo.search.Result; import com.yahoo.vespa.config.search.AttributesConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author baldersheim @@ -61,7 +61,7 @@ public class ValidateMatchPhaseSearcherTestCase { } @Test - public void testMatchPhaseAttribute() { + void testMatchPhaseAttribute() { assertEquals("", search("")); assertEquals("", match("ok")); assertEquals(getErrorMatch("not_numeric"), match("not_numeric")); @@ -71,7 +71,7 @@ public class ValidateMatchPhaseSearcherTestCase { } @Test - public void testDiversityAttribute() { + void testDiversityAttribute() { assertEquals("", search("")); assertEquals("", diversify("ok")); assertEquals("", diversify("not_numeric")); |