2 files changed, 15 insertions, 15 deletions
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 {