diff options
Diffstat (limited to 'container-search/src/test')
5 files changed, 21 insertions, 21 deletions
diff --git a/container-search/src/test/java/com/yahoo/fs4/test/RankFeaturesTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/RankFeaturesTestCase.java index 4671ada6545..69ca646dbd5 100644 --- a/container-search/src/test/java/com/yahoo/fs4/test/RankFeaturesTestCase.java +++ b/container-search/src/test/java/com/yahoo/fs4/test/RankFeaturesTestCase.java @@ -24,7 +24,7 @@ public class RankFeaturesTestCase { public void requireThatRankPropertiesTakesBothStringAndObject() { RankProperties p = new RankProperties(); p.put("string", "b"); - p.put("object", new Integer(7)); + p.put("object", Integer.valueOf(7)); assertEquals("7", p.get("object").get(0)); assertEquals("b", p.get("string").get(0)); } diff --git a/container-search/src/test/java/com/yahoo/prelude/query/ItemsCommonStuffTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/ItemsCommonStuffTestCase.java index 5806a08bb24..38911ef83c5 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/ItemsCommonStuffTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/ItemsCommonStuffTestCase.java @@ -388,7 +388,7 @@ public class ItemsCommonStuffTestCase { @Test public final void testTermTypeBasic() { assertFalse(TermType.AND.equals(TermType.DEFAULT)); - assertFalse(TermType.AND.equals(new Integer(10))); + assertFalse(TermType.AND.equals(Integer.valueOf(10))); assertTrue(TermType.AND.equals(TermType.AND)); assertSame(AndItem.class, TermType.DEFAULT.createItemClass().getClass()); assertSame(CompositeItem.class, TermType.DEFAULT.getItemClass()); diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/WeightedSetItemTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/test/WeightedSetItemTestCase.java index 3d31bc67df1..0aff28c746d 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/test/WeightedSetItemTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/test/WeightedSetItemTestCase.java @@ -24,28 +24,28 @@ public class WeightedSetItemTestCase { assertNull(ws.getTokenWeight("bogus")); // insert tokens - assertEquals(new Integer(1), ws.addToken("foo")); - assertEquals(new Integer(2), ws.addToken("bar", 2)); - assertEquals(new Integer(3), ws.addToken("baz", 3)); + assertEquals(Integer.valueOf(1), ws.addToken("foo")); + assertEquals(Integer.valueOf(2), ws.addToken("bar", 2)); + assertEquals(Integer.valueOf(3), ws.addToken("baz", 3)); // check state assertEquals(3, ws.getNumTokens()); - assertEquals(new Integer(1), ws.getTokenWeight("foo")); - assertEquals(new Integer(2), ws.getTokenWeight("bar")); - assertEquals(new Integer(3), ws.getTokenWeight("baz")); + assertEquals(Integer.valueOf(1), ws.getTokenWeight("foo")); + assertEquals(Integer.valueOf(2), ws.getTokenWeight("bar")); + assertEquals(Integer.valueOf(3), ws.getTokenWeight("baz")); // add duplicate tokens - assertEquals(new Integer(2), ws.addToken("foo", 2)); - assertEquals(new Integer(3), ws.addToken("baz", 2)); + assertEquals(Integer.valueOf(2), ws.addToken("foo", 2)); + assertEquals(Integer.valueOf(3), ws.addToken("baz", 2)); // check state assertEquals(3, ws.getNumTokens()); - assertEquals(new Integer(2), ws.getTokenWeight("foo")); - assertEquals(new Integer(2), ws.getTokenWeight("bar")); - assertEquals(new Integer(3), ws.getTokenWeight("baz")); + assertEquals(Integer.valueOf(2), ws.getTokenWeight("foo")); + assertEquals(Integer.valueOf(2), ws.getTokenWeight("bar")); + assertEquals(Integer.valueOf(3), ws.getTokenWeight("baz")); // remove token - assertEquals(new Integer(2), ws.removeToken("bar")); + assertEquals(Integer.valueOf(2), ws.removeToken("bar")); assertEquals(2, ws.getNumTokens()); assertNull(ws.getTokenWeight("bar")); @@ -57,9 +57,9 @@ public class WeightedSetItemTestCase { @Test public void testNegativeWeight() { WeightedSetItem ws = new WeightedSetItem("index"); - assertEquals(new Integer(-10), ws.addToken("bad", -10)); + assertEquals(Integer.valueOf(-10), ws.addToken("bad", -10)); assertEquals(1, ws.getNumTokens()); - assertEquals(new Integer(-10), ws.getTokenWeight("bad")); + assertEquals(Integer.valueOf(-10), ws.getTokenWeight("bad")); } static class FakeWSItem extends CompositeIndexedItem { diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java index 6c4253bff2d..ee735104caa 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java @@ -114,12 +114,12 @@ public class QuotingSearcherTestCase { Hit hit = new FastHit(); hit.setId("http://abc.html"); hit.setRelevance(new Relevance(1)); - hit.setField("title", new Integer(42)); + hit.setField("title", Integer.valueOf(42)); r.hits().add(hit); docsource.addResultSet(q, r); Result check = doSearch(s, q, 0, 10, chained); // should not quote non-string properties - assertEquals(new Integer(42), check.hits().get(0).getField("title")); + assertEquals(Integer.valueOf(42), check.hits().get(0).getField("title")); } private Result doSearch(Searcher searcher, Query query, int offset, int hits, Map<Searcher, Searcher> chained) { diff --git a/container-search/src/test/java/com/yahoo/search/querytransform/WandSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/querytransform/WandSearcherTestCase.java index be6256c1711..93955da383e 100644 --- a/container-search/src/test/java/com/yahoo/search/querytransform/WandSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/querytransform/WandSearcherTestCase.java @@ -197,9 +197,9 @@ public class WandSearcherTestCase { private void assertWeightedSetItem(WeightedSetItem item) { assertEquals(3, item.getNumTokens()); - assertEquals(new Integer(1), item.getTokenWeight("a")); - assertEquals(new Integer(2), item.getTokenWeight("b")); - assertEquals(new Integer(3), item.getTokenWeight("c")); + assertEquals(Integer.valueOf(1), item.getTokenWeight("a")); + assertEquals(Integer.valueOf(2), item.getTokenWeight("b")); + assertEquals(Integer.valueOf(3), item.getTokenWeight("c")); } @Test |