diff options
author | Jon Bratseth <bratseth@oath.com> | 2019-01-04 13:49:02 +0100 |
---|---|---|
committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:30 +0100 |
commit | 21c6924e98b35a93edc3322296a8d7a3bfd39a2c (patch) | |
tree | e7511afd14c4e2a34b1582b32596e376ac6a67a5 /searchlib/src/test | |
parent | cfe2b69068f5d022ea6cf3cfd22b86f1bcf49e94 (diff) |
Remove ymum from grouping
Diffstat (limited to 'searchlib/src/test')
-rw-r--r-- | searchlib/src/test/files/testSpecialNodes | bin | 93 -> 77 bytes | |||
-rw-r--r-- | searchlib/src/test/java/com/yahoo/searchlib/aggregation/GroupingSerializationTest.java | 11 | ||||
-rw-r--r-- | searchlib/src/test/java/com/yahoo/searchlib/expression/ExpressionTestCase.java | 19 |
3 files changed, 6 insertions, 24 deletions
diff --git a/searchlib/src/test/files/testSpecialNodes b/searchlib/src/test/files/testSpecialNodes Binary files differindex 149cc17f99b..d1a65b16666 100644 --- a/searchlib/src/test/files/testSpecialNodes +++ b/searchlib/src/test/files/testSpecialNodes 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); |