diff options
Diffstat (limited to 'container-search/src/test/java/com/yahoo/search/result')
8 files changed, 125 insertions, 134 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/result/DefaultErrorHitTestCase.java b/container-search/src/test/java/com/yahoo/search/result/DefaultErrorHitTestCase.java index 5c9af0c756e..42095e263dd 100644 --- a/container-search/src/test/java/com/yahoo/search/result/DefaultErrorHitTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/result/DefaultErrorHitTestCase.java @@ -1,13 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.result; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.util.Iterator; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Steinar Knutsen @@ -17,13 +16,13 @@ public class DefaultErrorHitTestCase { private static final String SOURCE = "nalle"; DefaultErrorHit de; - @Before + @BeforeEach public void setUp() throws Exception { de = new DefaultErrorHit(SOURCE, ErrorMessage.createUnspecifiedError("DefaultErrorHitTestCase")); } @Test - public void testSetSourceTakeTwo() { + void testSetSourceTakeTwo() { assertEquals(SOURCE, de.getSource()); de.setSource(null); assertNull(de.getSource()); @@ -36,19 +35,19 @@ public class DefaultErrorHitTestCase { } @Test - public void testToString() { + void testToString() { assertEquals("Error: Source 'nalle': 5: Unspecified error: DefaultErrorHitTestCase", de.toString()); } @Test - public void testSetMainError() { + void testSetMainError() { ErrorMessage e = ErrorMessage.createBackendCommunicationError("abc"); assertNull(e.getSource()); de.addError(e); assertEquals(SOURCE, e.getSource()); boolean caught = false; try { - new DefaultErrorHit(SOURCE, (ErrorMessage)null); + new DefaultErrorHit(SOURCE, (ErrorMessage) null); } catch (NullPointerException ex) { caught = true; } @@ -64,7 +63,7 @@ public class DefaultErrorHitTestCase { } @Test - public void testAddError() { + void testAddError() { ErrorMessage e = ErrorMessage.createBackendCommunicationError("ljkhlkjh"); assertNull(e.getSource()); de.addError(e); @@ -79,7 +78,7 @@ public class DefaultErrorHitTestCase { } @Test - public void testAddErrors() { + void testAddErrors() { DefaultErrorHit other = new DefaultErrorHit("abc", ErrorMessage.createBadRequest("sdasd")); de.addErrors(other); int i = 0; @@ -98,7 +97,7 @@ public class DefaultErrorHitTestCase { } @Test - public void testHasOnlyErrorCode() { + void testHasOnlyErrorCode() { assertTrue(de.hasOnlyErrorCode(com.yahoo.container.protect.Error.UNSPECIFIED.code)); assertFalse(de.hasOnlyErrorCode(com.yahoo.container.protect.Error.BACKEND_COMMUNICATION_ERROR.code)); diff --git a/container-search/src/test/java/com/yahoo/search/result/FeatureDataTestCase.java b/container-search/src/test/java/com/yahoo/search/result/FeatureDataTestCase.java index f7b9817437f..5d423eceb98 100644 --- a/container-search/src/test/java/com/yahoo/search/result/FeatureDataTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/result/FeatureDataTestCase.java @@ -6,12 +6,12 @@ import com.yahoo.slime.Cursor; import com.yahoo.slime.Slime; import com.yahoo.tensor.Tensor; import com.yahoo.tensor.serialization.TypedBinaryFormat; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.stream.Collectors; -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 bratseth @@ -21,7 +21,7 @@ public class FeatureDataTestCase { private static final double delta = 0.00000001; @Test - public void testFeatureData() { + void testFeatureData() { Cursor features = new Slime().setObject(); features.setDouble("scalar1", 1.5); features.setDouble("scalar2", 2.5); @@ -32,11 +32,11 @@ public class FeatureDataTestCase { FeatureData featureData = new FeatureData(new SlimeAdapter(features)); assertEquals("scalar1,scalar2,tensor1,tensor2", - featureData.featureNames().stream().sorted().collect(Collectors.joining(","))); + featureData.featureNames().stream().sorted().collect(Collectors.joining(","))); assertNull(featureData.getDouble("nosuch1")); assertEquals(1.5, featureData.getDouble("scalar1"), delta); assertEquals(2.5, featureData.getDouble("scalar2"), delta); - assertEquals("Cached lookup", 2.5, featureData.getDouble("scalar2"), delta); + assertEquals(2.5, featureData.getDouble("scalar2"), delta, "Cached lookup"); assertNull(featureData.getDouble("nosuch2")); assertNull(featureData.getDouble("nosuch2")); @@ -45,17 +45,17 @@ public class FeatureDataTestCase { assertEquals(Tensor.from(2.5), featureData.getTensor("scalar2")); assertEquals(tensor1, featureData.getTensor("tensor1")); assertEquals(tensor2, featureData.getTensor("tensor2")); - assertEquals("Cached lookup", tensor2, featureData.getTensor("tensor2")); + assertEquals(tensor2, featureData.getTensor("tensor2"), "Cached lookup"); assertNull(featureData.getTensor("nosuch2")); assertNull(featureData.getTensor("nosuch2")); String expectedJson = "{" + - "\"scalar1\":1.5," + - "\"scalar2\":2.5," + - "\"tensor1\":{\"type\":\"tensor(x[3])\",\"cells\":[{\"address\":{\"x\":\"0\"},\"value\":1.5},{\"address\":{\"x\":\"1\"},\"value\":2.0},{\"address\":{\"x\":\"2\"},\"value\":2.5}]}," + - "\"tensor2\":{\"type\":\"tensor()\",\"cells\":[{\"address\":{},\"value\":0.5}]}" + - "}"; + "\"scalar1\":1.5," + + "\"scalar2\":2.5," + + "\"tensor1\":{\"type\":\"tensor(x[3])\",\"cells\":[{\"address\":{\"x\":\"0\"},\"value\":1.5},{\"address\":{\"x\":\"1\"},\"value\":2.0},{\"address\":{\"x\":\"2\"},\"value\":2.5}]}," + + "\"tensor2\":{\"type\":\"tensor()\",\"cells\":[{\"address\":{},\"value\":0.5}]}" + + "}"; assertEquals(expectedJson, featureData.toJson()); } diff --git a/container-search/src/test/java/com/yahoo/search/result/NanNumberTestCase.java b/container-search/src/test/java/com/yahoo/search/result/NanNumberTestCase.java index c6e5c87efb2..0790b6754fe 100644 --- a/container-search/src/test/java/com/yahoo/search/result/NanNumberTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/result/NanNumberTestCase.java @@ -1,9 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.result; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Integrity test for representation of undefined numeric field values. @@ -14,27 +15,27 @@ public class NanNumberTestCase { @Test - public final void testIntValue() { + final void testIntValue() { assertEquals(0, NanNumber.NaN.intValue()); } @Test - public final void testLongValue() { + final void testLongValue() { assertEquals(0L, NanNumber.NaN.longValue()); } @Test - public final void testFloatValue() { + final void testFloatValue() { assertTrue(Float.isNaN(NanNumber.NaN.floatValue())); } @Test - public final void testDoubleValue() { + final void testDoubleValue() { assertTrue(Double.isNaN(NanNumber.NaN.doubleValue())); } @Test - public final void testToString() { + final void testToString() { assertEquals("", NanNumber.NaN.toString()); } diff --git a/container-search/src/test/java/com/yahoo/search/result/PositionsDataTestCase.java b/container-search/src/test/java/com/yahoo/search/result/PositionsDataTestCase.java index 96039beafa5..a112cb41a64 100644 --- a/container-search/src/test/java/com/yahoo/search/result/PositionsDataTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/result/PositionsDataTestCase.java @@ -3,9 +3,9 @@ package com.yahoo.search.result; import com.yahoo.data.access.simple.Value; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Arne Juul @@ -13,7 +13,7 @@ import org.junit.Test; public class PositionsDataTestCase { @Test - public void testRenderingOfSinglePosition() { + void testRenderingOfSinglePosition() { Value.ObjectValue pos = createPosition(-122057174, 37374821, "N37.374821;W122.057174"); PositionsData pd = new PositionsData(pos.inspect()); @@ -23,7 +23,7 @@ public class PositionsDataTestCase { } @Test - public void testRenderingOfMultiplePositions() { + void testRenderingOfMultiplePositions() { Value.ArrayValue arr = new Value.ArrayValue(); arr.add(createPosition(-122057174, 37374821, "N37.374821;W122.057174")); arr.add(createPosition(3, -7, "S0.000007;E0.000003")); @@ -31,9 +31,9 @@ public class PositionsDataTestCase { PositionsData pd = new PositionsData(arr.inspect()); assertXml("<position x=\"-122057174\" y=\"37374821\" latlong=\"N37.374821;W122.057174\" />" + - "<position x=\"3\" y=\"-7\" latlong=\"S0.000007;E0.000003\" />", pd); + "<position x=\"3\" y=\"-7\" latlong=\"S0.000007;E0.000003\" />", pd); assertJson("[{\"x\":-122057174,\"y\":37374821,\"latlong\":\"N37.374821;W122.057174\"}," + - "{\"x\":3,\"y\":-7,\"latlong\":\"S0.000007;E0.000003\"}]", pd); + "{\"x\":3,\"y\":-7,\"latlong\":\"S0.000007;E0.000003\"}]", pd); } private Value.ObjectValue createPosition(long x, long y, String latlong) { diff --git a/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java b/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java index d95a8068570..c0b0a90b682 100644 --- a/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java @@ -4,10 +4,10 @@ package com.yahoo.search.result.test; import com.yahoo.search.Query; import com.yahoo.search.Result; import com.yahoo.search.result.Coverage; -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 Steinar Knutsen @@ -15,14 +15,14 @@ import static org.junit.Assert.assertNull; public class CoverageTestCase { @Test - public void testZeroCoverage() { + void testZeroCoverage() { Coverage c = new Coverage(0L, 0, 0, 0); assertEquals(0, c.getResultPercentage()); assertEquals(0, c.getResultSets()); } @Test - public void testActiveCoverage() { + void testActiveCoverage() { Coverage c = new Coverage(6, 5); assertEquals(5, c.getActive()); assertEquals(6, c.getDocs()); @@ -34,7 +34,7 @@ public class CoverageTestCase { } @Test - public void testDefaultCoverage() { + void testDefaultCoverage() { boolean create = true; Result r1 = new Result(new Query()); @@ -46,18 +46,18 @@ public class CoverageTestCase { } @Test - public void testDefaultSearchScenario() { + void testDefaultSearchScenario() { boolean create = true; Result federationSearcherResult = new Result(new Query()); Result singleSourceResult = new Result(new Query()); federationSearcherResult.mergeWith(singleSourceResult); - assertNull(federationSearcherResult.getCoverage( !create)); + assertNull(federationSearcherResult.getCoverage(!create)); assertEquals(0, federationSearcherResult.getCoverage(create).getResultSets()); } @Test - public void testRequestingCoverageSearchScenario() { + void testRequestingCoverageSearchScenario() { boolean create = true; Result federationSearcherResult = new Result(new Query()); @@ -68,7 +68,7 @@ public class CoverageTestCase { } @Test - public void testCoverageConversion() { + void testCoverageConversion() { Coverage c = new Coverage(6, 10); c.setDegradedReason(7); com.yahoo.container.logging.Coverage lc = c.toLoggingCoverage(); diff --git a/container-search/src/test/java/com/yahoo/search/result/test/DeepHitIteratorTestCase.java b/container-search/src/test/java/com/yahoo/search/result/test/DeepHitIteratorTestCase.java index 1147cd67460..21a10bf8325 100644 --- a/container-search/src/test/java/com/yahoo/search/result/test/DeepHitIteratorTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/result/test/DeepHitIteratorTestCase.java @@ -7,12 +7,9 @@ import java.util.NoSuchElementException; import com.yahoo.search.result.DeepHitIterator; import com.yahoo.search.result.Hit; import com.yahoo.search.result.HitGroup; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.*; /** * Ensure that the {@link DeepHitIterator} works as intended. @@ -22,7 +19,7 @@ import static org.junit.Assert.fail; public class DeepHitIteratorTestCase { @Test - public void testEmpty() { + void testEmpty() { HitGroup hits = new HitGroup(); Iterator<Hit> it = hits.deepIterator(); assertFalse(it.hasNext()); @@ -35,7 +32,7 @@ public class DeepHitIteratorTestCase { } @Test - public void testRemove() { + void testRemove() { HitGroup hits = new HitGroup(); hits.add(new Hit("foo")); hits.add(new Hit("bar")); @@ -62,7 +59,7 @@ public class DeepHitIteratorTestCase { } @Test - public void testShallow() { + void testShallow() { HitGroup hits = new HitGroup(); hits.add(new Hit("foo")); hits.add(new Hit("bar")); @@ -79,7 +76,7 @@ public class DeepHitIteratorTestCase { } @Test - public void testDeep() { + void testDeep() { HitGroup grandParent = new HitGroup(); grandParent.add(new Hit("a")); HitGroup parent = new HitGroup(); @@ -114,7 +111,7 @@ public class DeepHitIteratorTestCase { } @Test - public void testFirstHitIsGroup() { + void testFirstHitIsGroup() { HitGroup root = new HitGroup(); HitGroup group = new HitGroup(); group.add(new Hit("foo")); @@ -130,7 +127,7 @@ public class DeepHitIteratorTestCase { } @Test - public void testSecondHitIsGroup() { + void testSecondHitIsGroup() { HitGroup root = new HitGroup(); root.add(new Hit("foo")); HitGroup group = new HitGroup(); @@ -146,7 +143,7 @@ public class DeepHitIteratorTestCase { } @Test - public void testOrder() { + void testOrder() { HitGroup root = new HitGroup(); MyHitGroup group = new MyHitGroup(); group.add(new Hit("foo")); diff --git a/container-search/src/test/java/com/yahoo/search/result/test/FillingTestCase.java b/container-search/src/test/java/com/yahoo/search/result/test/FillingTestCase.java index ea5c11cb055..8c833ca76f3 100644 --- a/container-search/src/test/java/com/yahoo/search/result/test/FillingTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/result/test/FillingTestCase.java @@ -3,13 +3,11 @@ package com.yahoo.search.result.test; import com.yahoo.search.result.Hit; import com.yahoo.search.result.HitGroup; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; -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 @@ -17,16 +15,16 @@ import static org.junit.Assert.assertTrue; public class FillingTestCase { @Test - public void testFillingAPIConsistency() { - HitGroup group=new HitGroup(); + void testFillingAPIConsistency() { + HitGroup group = new HitGroup(); group.add(new Hit("hit:1")); group.add(new Hit("hit:2")); assertTrue(group.isFilled("summary")); } @Test - public void testFillingAPIConsistencyTwoPhase() { - HitGroup group=new HitGroup(); + void testFillingAPIConsistencyTwoPhase() { + HitGroup group = new HitGroup(); group.add(createNonFilled("hit:1")); group.add(createNonFilled("hit:2")); assertFalse(group.isFilled("summary")); @@ -36,8 +34,8 @@ public class FillingTestCase { } @Test - public void testFillingAPIConsistencyThreePhase() { - HitGroup group=new HitGroup(); + void testFillingAPIConsistencyThreePhase() { + HitGroup group = new HitGroup(); group.add(createNonFilled("hit:1")); group.add(createNonFilled("hit:2")); assertFalse(group.isFilled("summary")); @@ -54,7 +52,7 @@ public class FillingTestCase { } @Test - public void testPartiallyFilledWith2Hits() { + void testPartiallyFilledWith2Hits() { Hit hit1 = new Hit("id1"); Hit hit2 = new Hit("id2"); @@ -69,7 +67,7 @@ public class FillingTestCase { } @Test - public void testPartiallyFilledDiverse() { + void testPartiallyFilledDiverse() { Hit hit1 = new Hit("id1"); Hit hit2 = new Hit("id2"); Hit hit3 = new Hit("id3"); diff --git a/container-search/src/test/java/com/yahoo/search/result/test/HitGroupTestCase.java b/container-search/src/test/java/com/yahoo/search/result/test/HitGroupTestCase.java index 8196cf4ac74..cc4e6193103 100644 --- a/container-search/src/test/java/com/yahoo/search/result/test/HitGroupTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/result/test/HitGroupTestCase.java @@ -7,17 +7,13 @@ import com.yahoo.search.result.ErrorHit; import com.yahoo.search.result.ErrorMessage; import com.yahoo.search.result.Hit; import com.yahoo.search.result.HitGroup; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; import java.util.Optional; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * @author bratseth @@ -25,21 +21,21 @@ import static org.junit.Assert.assertTrue; public class HitGroupTestCase { @Test - public void testErrorsConsistencyUsingErrorOperations() { + void testErrorsConsistencyUsingErrorOperations() { HitGroup hits = new HitGroup(); Query query = new Query(); query.errors().add(ErrorMessage.createIllegalQuery("test1")); query.errors().add(ErrorMessage.createTimeout("test2")); hits.setQuery(query); - + hits.addError(ErrorMessage.createForbidden("test3")); hits.addError(ErrorMessage.createUnspecifiedError("test4")); - + assertEquals(4, hits.getErrorHit().errors().size()); assertEquals(0, query.errors().size()); assertEquals(Optional.of(hits.getErrorHit()), errorHitIn(hits.asList())); - + DefaultErrorHit removedErrors = hits.removeErrorHit(); assertNotNull(removedErrors); assertEquals(4, removedErrors.errors().size()); @@ -50,7 +46,7 @@ public class HitGroupTestCase { } @Test - public void testErrorsConsistencyUsingHitOperations() { + void testErrorsConsistencyUsingHitOperations() { HitGroup hits = new HitGroup(); Query query = new Query(); @@ -66,7 +62,7 @@ public class HitGroupTestCase { assertEquals(0, query.errors().size()); assertEquals(Optional.of(hits.getErrorHit()), errorHitIn(hits.asList())); - DefaultErrorHit removedErrors = (DefaultErrorHit)hits.remove(errors.getId()); + DefaultErrorHit removedErrors = (DefaultErrorHit) hits.remove(errors.getId()); assertNotNull(removedErrors); assertEquals(4, removedErrors.errors().size()); assertNull(hits.get(removedErrors.getId().toString())); @@ -76,39 +72,39 @@ public class HitGroupTestCase { } @Test - public void testRecursiveGet() { + void testRecursiveGet() { // Level 1 - HitGroup g1=new HitGroup(); + HitGroup g1 = new HitGroup(); g1.add(new Hit("1")); // Level 2 - HitGroup g1_1=new HitGroup(); + HitGroup g1_1 = new HitGroup(); g1_1.add(new Hit("1.1")); g1.add(g1_1); - HitGroup g1_2=new HitGroup(); + HitGroup g1_2 = new HitGroup(); g1_2.add(new Hit("1.2")); g1.add(g1_2); // Level 3 - HitGroup g1_1_1=new HitGroup(); + HitGroup g1_1_1 = new HitGroup(); g1_1_1.add(new Hit("1.1.1")); g1_1.add(g1_1_1); - HitGroup g1_1_2=new HitGroup(); + HitGroup g1_1_2 = new HitGroup(); g1_1_2.add(new Hit("1.1.2")); g1_1.add(g1_1_2); - HitGroup g1_2_1=new HitGroup(); + HitGroup g1_2_1 = new HitGroup(); g1_2_1.add(new Hit("1.2.1")); g1_2.add(g1_2_1); - HitGroup g1_2_2=new HitGroup(); + HitGroup g1_2_2 = new HitGroup(); g1_2_2.add(new Hit("1.2.2")); g1_2.add(g1_2_2); // Level 4 - HitGroup g1_1_1_1=new HitGroup(); + HitGroup g1_1_1_1 = new HitGroup(); g1_1_1_1.add(new Hit("1.1.1.1")); g1_1_1.add(g1_1_1_1); @@ -121,49 +117,49 @@ public class HitGroupTestCase { assertNotNull(g1.get("1.2.2")); assertNotNull(g1.get("1.1.1.1")); - assertNotNull(g1.get("1",-1)); - assertNotNull(g1.get("1.1",-1)); - assertNotNull(g1.get("1.2",-1)); - assertNotNull(g1.get("1.1.1",-1)); - assertNotNull(g1.get("1.1.2",-1)); - assertNotNull(g1.get("1.2.1",-1)); - assertNotNull(g1.get("1.2.2",-1)); - assertNotNull(g1.get("1.1.1.1",-1)); - - assertNotNull(g1.get("1",0)); - assertNull(g1.get("1.1",0)); - assertNull(g1.get("1.2",0)); - assertNull(g1.get("1.1.1",0)); - assertNull(g1.get("1.1.2",0)); - assertNull(g1.get("1.2.1",0)); - assertNull(g1.get("1.2.2",0)); - assertNull(g1.get("1.1.1.1",0)); - - assertNotNull(g1.get("1",1)); - assertNotNull(g1.get("1.1",1)); - assertNotNull(g1.get("1.2",1)); - assertNull(g1.get("1.1.1",1)); - assertNull(g1.get("1.1.2",1)); - assertNull(g1.get("1.2.1",1)); - assertNull(g1.get("1.2.2",1)); - assertNull(g1.get("1.1.1.1",1)); - - assertNotNull(g1.get("1",2)); - assertNotNull(g1.get("1.1",2)); - assertNotNull(g1.get("1.2",2)); - assertNotNull(g1.get("1.1.1",2)); - assertNotNull(g1.get("1.1.2",2)); - assertNotNull(g1.get("1.2.1",2)); - assertNotNull(g1.get("1.2.2",2)); - assertNull(g1.get("1.1.1.1",2)); - - assertNotNull(g1.get("1.1.1.1",3)); - - assertNull(g1.get("3",2)); + assertNotNull(g1.get("1", -1)); + assertNotNull(g1.get("1.1", -1)); + assertNotNull(g1.get("1.2", -1)); + assertNotNull(g1.get("1.1.1", -1)); + assertNotNull(g1.get("1.1.2", -1)); + assertNotNull(g1.get("1.2.1", -1)); + assertNotNull(g1.get("1.2.2", -1)); + assertNotNull(g1.get("1.1.1.1", -1)); + + assertNotNull(g1.get("1", 0)); + assertNull(g1.get("1.1", 0)); + assertNull(g1.get("1.2", 0)); + assertNull(g1.get("1.1.1", 0)); + assertNull(g1.get("1.1.2", 0)); + assertNull(g1.get("1.2.1", 0)); + assertNull(g1.get("1.2.2", 0)); + assertNull(g1.get("1.1.1.1", 0)); + + assertNotNull(g1.get("1", 1)); + assertNotNull(g1.get("1.1", 1)); + assertNotNull(g1.get("1.2", 1)); + assertNull(g1.get("1.1.1", 1)); + assertNull(g1.get("1.1.2", 1)); + assertNull(g1.get("1.2.1", 1)); + assertNull(g1.get("1.2.2", 1)); + assertNull(g1.get("1.1.1.1", 1)); + + assertNotNull(g1.get("1", 2)); + assertNotNull(g1.get("1.1", 2)); + assertNotNull(g1.get("1.2", 2)); + assertNotNull(g1.get("1.1.1", 2)); + assertNotNull(g1.get("1.1.2", 2)); + assertNotNull(g1.get("1.2.1", 2)); + assertNotNull(g1.get("1.2.2", 2)); + assertNull(g1.get("1.1.1.1", 2)); + + assertNotNull(g1.get("1.1.1.1", 3)); + + assertNull(g1.get("3", 2)); } @Test - public void testThatHitGroupIsUnFillable() { + void testThatHitGroupIsUnFillable() { HitGroup hg = new HitGroup("test"); { Hit hit = new Hit("http://nalle.balle/1.html", 832); @@ -185,7 +181,7 @@ public class HitGroupTestCase { } @Test - public void testThatHitGroupIsFillable() { + void testThatHitGroupIsFillable() { HitGroup hg = new HitGroup("test"); { Hit hit = new Hit("http://nalle.balle/1.html", 832); @@ -209,7 +205,7 @@ public class HitGroupTestCase { } @Test - public void testThatHitGroupIsFillableAfterFillableChangeunderTheHood() { + void testThatHitGroupIsFillableAfterFillableChangeunderTheHood() { HitGroup hg = new HitGroup("test"); { Hit hit = new Hit("http://nalle.balle/1.html", 832); |