2 files changed, 6 insertions, 24 deletions

diff --git a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupingSerializationTest.java b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupingSerializationTest.java
index 969bc318391..b9d3bc3bd4d 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupingSerializationTest.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupingSerializationTest.java
@@ -72,7 +72,6 @@ public class GroupingSerializationTest {
             t.assertMatch(new AttributeNode("testattribute"));
             t.assertMatch(new DocumentFieldNode("testdocumentfield"));
             t.assertMatch(new GetDocIdNamespaceSpecificFunctionNode(new IntegerResultNode(7)));
-            t.assertMatch(new GetYMUMChecksumFunctionNode());
         }
     }
 
@@ -363,11 +362,13 @@ public class GroupingSerializationTest {
 
         @Override
         public void close() throws IOException {
-            boolean moreDataAvailable = in.read() != -1;
+            int bytesLeft = 0;
+            while (in.read() != -1)
+                bytesLeft++;
             in.close();
-            if (moreDataAvailable) {
-                fail("The file was not fully consumed. Did you forget to deserialize an object on Java side?");
-            }
+            if (bytesLeft > 0)
+                fail(FILE_PATH + "/" + fileName + " has " + bytesLeft + " bytes left. " +
+                     "Did you forget to deserialize an object on Java side?");
         }
 
         private static String toHexString(byte[] data) {
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java
index 1fa012c83f7..d282dc17aaa 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java
@@ -401,25 +401,6 @@ public class ExpressionTestCase {
     }
 
     @Test
-    public void testGetYMUMChecksumFunctionNode() {
-        GetYMUMChecksumFunctionNode a = new GetYMUMChecksumFunctionNode();
-        assertTrue(a.getResult() instanceof IntegerResultNode);
-        assertSerialize(a);
-        try {
-            new GetYMUMChecksumFunctionNode().prepare();
-            fail("Should not be able to prepare documentfieldnode");
-        } catch (RuntimeException e) {
-            // expected
-        }
-        try {
-            new GetYMUMChecksumFunctionNode().execute();
-            fail("Should not be able to execute documentfieldnode");
-        } catch (RuntimeException e) {
-            // expected
-        }
-    }
-
-    @Test
     public void testIntegerResultNode() {
         IntegerResultNode a = new IntegerResultNode(7);
         assertEquals(a.getInteger(), 7);