Cleanup tests

8 files changed, 38 insertions, 138 deletions

diff --git a/container-search/src/main/java/com/yahoo/fs4/PongPacket.java b/container-search/src/main/java/com/yahoo/fs4/PongPacket.java
index c521fde5c9b..e9a541b3ade 100644
--- a/container-search/src/main/java/com/yahoo/fs4/PongPacket.java
+++ b/container-search/src/main/java/com/yahoo/fs4/PongPacket.java
@@ -39,8 +39,7 @@ public class PongPacket extends BasicPacket {
     public int getCode() { return code; }
 
     public void decodeBody(ByteBuffer buffer) {
-        int features = MRF_MLD;
-        features = buffer.getInt();
+        int features = buffer.getInt();
         lowPartitionId = buffer.getInt();
         dispatchTimestamp = buffer.getInt();
         if ((features & MRF_MLD) != 0) {
diff --git a/container-search/src/test/java/com/yahoo/fs4/mplex/BackendTestCase.java b/container-search/src/test/java/com/yahoo/fs4/mplex/BackendTestCase.java
index f9c14a81d13..a6db31214ff 100644
--- a/container-search/src/test/java/com/yahoo/fs4/mplex/BackendTestCase.java
+++ b/container-search/src/test/java/com/yahoo/fs4/mplex/BackendTestCase.java
@@ -39,11 +39,17 @@ public class BackendTestCase {
         public volatile Socket connection;
         volatile int channelId;
 
-        public byte[] packetData = new byte[] { 0, 0, 0, 76, 0, 0, 0, 202 - 256, 0, 0,
-                                                0, 1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 5, 0x40,
-                                                0x39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 111, 1, 1, 1, 1, 1, 1, 1, 1,
-                                                1, 1, 1, 1, 0x40, 0x37, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2,
-                                                2, 2, 2, 2, 2, 0x40, 0x35, 0, 0, 0, 0, 0, 0 };
+        public byte[] packetData = new byte[] {0,0,0,104,
+                0,0,0,217-256,
+                0,0,0,1,
+                0,0,0,0,
+                0,0,0,2,
+                0,0,0,0,0,0,0,5,
+                0x40,0x39,0,0,0,0,0,0,
+                0,0,0,111,
+                0,0,0,97,
+                0,0,0,3, 1,1,1,1,1,1,1,1,1,1,1,1, 0x40,0x37,0,0,0,0,0,23, 0,0,0,7, 0,0,0,36,
+                0,0,0,4, 2,2,2,2,2,2,2,2,2,2,2,2, 0x40,0x35,0,0,0,0,0,21, 0,0,0,8, 0,0,0,37};
 
         public MockDispatch(ServerSocket socket) {
             this.socket = socket;
@@ -91,6 +97,9 @@ public class BackendTestCase {
                 e.printStackTrace();
             }
         }
+        public void setNoChannel() {
+            channelId = -1;
+        }
 
     }
 
@@ -125,8 +134,8 @@ public class BackendTestCase {
     private boolean initUseParent;
     FS4ResourcePool listeners;
 
-    public static final byte[] PONG = new byte[] { 0, 0, 0, 28, 0, 0, 0, 210 - 256,
-                                                   0, 0, 0, 42, 0, 0, 0, 127, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 1, 0,
+    public static final byte[] PONG = new byte[] { 0, 0, 0, 32, 0, 0, 0, 221 - 256,
+                                                   0,0,0,1, 0, 0, 0, 42, 0, 0, 0, 127, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 1, 0,
                                                    0, 0, 1 };
 
     @Before
@@ -164,7 +173,7 @@ public class BackendTestCase {
             fail("Could not get packets from simulated backend.");
         }
         assertEquals(1, b.length);
-        assertEquals(202, b[0].getCode());
+        assertEquals(217, b[0].getCode());
         channel.close();
     }
 
@@ -172,7 +181,7 @@ public class BackendTestCase {
     public void testPinging() throws IOException, InvalidChannelException {
         FS4Channel channel = backend.openPingChannel();
         BasicPacket[] b = null;
-        server.dispatch.channelId = -1;
+        server.dispatch.setNoChannel();
         server.dispatch.packetData = PONG;
 
         assertTrue(channel.sendPacket(new PingPacket()));
@@ -182,7 +191,7 @@ public class BackendTestCase {
             fail("Could not get packets from simulated backend.");
         }
         assertEquals(1, b.length);
-        assertEquals(210, b[0].getCode());
+        assertEquals(221, b[0].getCode());
         channel.close();
     }
 
diff --git a/container-search/src/test/java/com/yahoo/fs4/test/GetDocSumsPacketTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/GetDocSumsPacketTestCase.java
index df504aff852..fa5b7de222b 100644
--- a/container-search/src/test/java/com/yahoo/fs4/test/GetDocSumsPacketTestCase.java
+++ b/container-search/src/test/java/com/yahoo/fs4/test/GetDocSumsPacketTestCase.java
@@ -36,13 +36,13 @@ public class GetDocSumsPacketTestCase {
         FastHit hit = new FastHit();
         hit.setIgnoreRowBits(true);
         assertPacket(true, hit, new byte[] { 0, 0, 0, 57, 0, 0, 0, -37, 0, 0, 40, 21, 0, 0, 0, 0, IGNORE, IGNORE, IGNORE,
-                IGNORE, 7, 100, 101, 102, 97, 117, 108, 116, 0, 0, -128, 0, 0, 0, 0, 7,
+                IGNORE, 7, 100, 101, 102, 97, 117, 108, 116, 0, 0, 0, 0, 0, 0, 0, 7,
                 100, 101, 102, 97, 117, 108, 116, 0, 0, 0, 1, 0, 0, 0, 6, 4, 0, 3, 102, 111, 111, 0, 0, 0, 3 });
 
         hit = new FastHit();
         hit.setIgnoreRowBits(false);
         assertPacket(true, hit, new byte[] {0, 0, 0, 57, 0, 0, 0, -37, 0, 0, 40, 21, 0, 0, 0, 0, IGNORE, IGNORE, IGNORE,
-                IGNORE, 7, 100, 101, 102, 97, 117, 108, 116, 0, 0, -128, 0, 0, 0, 0, 7,
+                IGNORE, 7, 100, 101, 102, 97, 117, 108, 116, 0, 0, 0, 0, 0, 0, 0, 7,
                 100, 101, 102, 97, 117, 108, 116, 0, 0, 0, 1, 0, 0, 0, 6, 4, 0, 3, 102, 111, 111, 0, 0, 0, 2});
     }
 
@@ -51,14 +51,14 @@ public class GetDocSumsPacketTestCase {
         FastHit hit = new FastHit();
         hit.setIgnoreRowBits(true);
         assertPacket(false, hit, new byte[] { 0, 0, 0, 43, 0, 0, 0, -37, 0, 0, 40, 17, 0, 0, 0, 0, IGNORE, IGNORE, IGNORE,
-                     IGNORE, 7, 100, 101, 102, 97, 117, 108, 116, 0, 0, -128, 0, 0, 0, 0, 7,
+                     IGNORE, 7, 100, 101, 102, 97, 117, 108, 116, 0, 0, 0, 0, 0, 0, 0, 7,
                      100, 101, 102, 97, 117, 108, 116, 0, 0, 0, 3
         });
 
         hit = new FastHit();
         hit.setIgnoreRowBits(false);
         assertPacket(false, hit, new byte[] { 0, 0, 0, 43, 0, 0, 0, -37, 0, 0, 40, 17, 0, 0, 0, 0, IGNORE, IGNORE, IGNORE,
-                IGNORE, 7, 100, 101, 102, 97, 117, 108, 116, 0, 0, -128, 0, 0, 0, 0, 7, 100, 101, 102, 97, 117, 108, 116, 0, 0, 0, 2
+                IGNORE, 7, 100, 101, 102, 97, 117, 108, 116, 0, 0, 0, 0, 0, 0, 0, 7, 100, 101, 102, 97, 117, 108, 116, 0, 0, 0, 2
         });
     }
 
@@ -73,7 +73,7 @@ public class GetDocSumsPacketTestCase {
                 // query timeout
                 IGNORE, IGNORE, IGNORE, IGNORE,
                 // "default" - rank profile
-                7, 'd', 'e', 'f', 'a', 'u', 'l', 't', 0, 0, -128, 0,
+                7, 'd', 'e', 'f', 'a', 'u', 'l', 't', 0, 0, 0, 0,
                 // "default" - summaryclass
                 0, 0, 0, 7, 'd', 'e', 'f', 'a', 'u', 'l', 't',
                 // 2 property entries
diff --git a/container-search/src/test/java/com/yahoo/fs4/test/PacketDecoderTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/PacketDecoderTestCase.java
index 99c004806be..6e750ea0102 100644
--- a/container-search/src/test/java/com/yahoo/fs4/test/PacketDecoderTestCase.java
+++ b/container-search/src/test/java/com/yahoo/fs4/test/PacketDecoderTestCase.java
@@ -22,7 +22,7 @@ import static junit.framework.TestCase.*;
 public class PacketDecoderTestCase {
     static byte[] queryResultPacketData
         = new byte[] {0,0,0,104,
-                      0,0,0,214-256,
+                      0,0,0,217-256,
                       0,0,0,1,
                       0,0,0,0,
                       0,0,0,2,
diff --git a/container-search/src/test/java/com/yahoo/fs4/test/QueryResultTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/QueryResultTestCase.java
index b60e94a7641..1bd19a54355 100644
--- a/container-search/src/test/java/com/yahoo/fs4/test/QueryResultTestCase.java
+++ b/container-search/src/test/java/com/yahoo/fs4/test/QueryResultTestCase.java
@@ -23,115 +23,6 @@ public class QueryResultTestCase extends junit.framework.TestCase {
     private static GlobalId gid1 = new GlobalId(new byte[] {1,1,1,1,1,1,1,1,1,1,1,1});
     private static GlobalId gid2 = new GlobalId(new byte[] {2,2,2,2,2,2,2,2,2,2,2,2});
 
-    public void testDecodeQueryResult() {
-        byte[] packetData=new byte[] {0,0,0,76,
-                                      0,0,0,202-256,
-                                      0,0,0,1,
-                                      0,0,0,0,
-                                      0,0,0,2,
-                                      0,0,0,0,0,0,0,5,
-                                      0x40,0x39,0,0,0,0,0,0,
-                                      0,0,0,111,
-                                      1,1,1,1,1,1,1,1,1,1,1,1, 0x40,0x37,0,0,0,0,0,0,
-                                      2,2,2,2,2,2,2,2,2,2,2,2, 0x40,0x35,0,0,0,0,0,0}; // 4 + 40 + 2*12
-        ByteBuffer buffer=ByteBuffer.allocate(100);
-        buffer.put(packetData);
-        buffer.flip();
-        BasicPacket packet=PacketDecoder.decode(buffer);
-        assertTrue(packet instanceof QueryResultPacket);
-        QueryResultPacket result=(QueryResultPacket)packet;
-
-        assertTrue( ! result.getMldFeature());
-        assertTrue( ! result.getDatasetFeature());
-
-        assertEquals(25,result.getMaxRank());
-        assertEquals(111,result.getDocstamp());
-
-        assertEquals(2,result.getDocuments().size());
-        DocumentInfo document1= result.getDocuments().get(0);
-        assertEquals(gid1, document1.getGlobalId());
-        assertEquals(23.0,document1.getMetric());
-        DocumentInfo document2= result.getDocuments().get(1);
-        assertEquals(gid2, document2.getGlobalId());
-        assertEquals(21.0,document2.getMetric());
-    }
-
-    public void testDecodeQueryResultMld() {
-        byte[] packetData=new byte[] {0,0,0,92,
-                                      0,0,0,208-256,
-                                      0,0,0,1,
-                                      0,0,0,0,
-                                      0,0,0,2,
-                                      0,0,0,0,0,0,0,5,
-                                      0x40,0x39,0,0,0,0,0,0,
-                                      0,0,0,111,
-                                      1,1,1,1,1,1,1,1,1,1,1,1, 0x40,0x37,0,0,0,0,0,0, 0,0,0,7, 0,0,0,36,
-                                      2,2,2,2,2,2,2,2,2,2,2,2, 0x40,0x35,0,0,0,0,0,0, 0,0,0,8, 0,0,0,37};
-        ByteBuffer buffer=ByteBuffer.allocate(100);
-        buffer.put(packetData);
-        buffer.flip();
-        BasicPacket packet=PacketDecoder.decode(buffer);
-        assertTrue(packet instanceof QueryResultPacket);
-        QueryResultPacket result=(QueryResultPacket)packet;
-
-        assertTrue(   result.getMldFeature());
-        assertTrue( ! result.getDatasetFeature());
-
-        assertEquals(25,result.getMaxRank());
-        assertEquals(111,result.getDocstamp());
-
-        assertEquals(2,result.getDocuments().size());
-        DocumentInfo document1= result.getDocuments().get(0);
-        assertEquals(gid1,document1.getGlobalId());
-        assertEquals(23.0,document1.getMetric());
-        assertEquals(7,document1.getPartId());
-        assertEquals(36,document1.getDistributionKey());
-        DocumentInfo document2= result.getDocuments().get(1);
-        assertEquals(gid2,document2.getGlobalId());
-        assertEquals(21.0,document2.getMetric());
-        assertEquals(8,document2.getPartId());
-        assertEquals(37,document2.getDistributionKey());
-    }
-
-    public void testDecodeQueryResultMLD2() {
-        byte[] packetData=new byte[] {0,0,0,96,
-                                      0,0,0,214-256,
-                                      0,0,0,1,
-                                      0,0,0,0,
-                                      0,0,0,2,
-                                      0,0,0,0,0,0,0,5,
-                                      0x40,0x39,0,0,0,0,0,0,
-                                      0,0,0,111,
-                                      0,0,0,97,
-                                      1,1,1,1,1,1,1,1,1,1,1,1, 0x40,0x37,0,0,0,0,0,0, 0,0,0,7, 0,0,0,36,
-                                      2,2,2,2,2,2,2,2,2,2,2,2, 0x40,0x35,0,0,0,0,0,0, 0,0,0,8, 0,0,0,37};
-        ByteBuffer buffer=ByteBuffer.allocate(100);
-        buffer.put(packetData);
-        buffer.flip();
-        BasicPacket packet=PacketDecoder.decode(buffer);
-        assertTrue(packet instanceof QueryResultPacket);
-        QueryResultPacket result=(QueryResultPacket)packet;
-
-        assertTrue(   result.getMldFeature());
-        assertTrue(   result.getDatasetFeature());
-
-        assertEquals(25,result.getMaxRank());
-        assertEquals(111,result.getDocstamp());
-        assertEquals(97,result.getDataset());
-
-        assertEquals(2,result.getDocuments().size());
-        DocumentInfo document1= result.getDocuments().get(0);
-        assertEquals(gid1,document1.getGlobalId());
-        assertEquals(23.0,document1.getMetric());
-        assertEquals(7,document1.getPartId());
-        assertEquals(36,document1.getDistributionKey());
-        DocumentInfo document2= result.getDocuments().get(1);
-        assertEquals(gid2,document2.getGlobalId());
-        assertEquals(21.0,document2.getMetric());
-        assertEquals(8,document2.getPartId());
-        assertEquals(37,document2.getDistributionKey());
-    }
-
     public void testDecodeQueryResultX() {
          byte[] packetData=new byte[] {0,0,0,100,
                                        0,0,0,217-256,
diff --git a/container-search/src/test/java/com/yahoo/fs4/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/fs4/test/QueryTestCase.java
index 462685425eb..2129aa8107e 100644
--- a/container-search/src/test/java/com/yahoo/fs4/test/QueryTestCase.java
+++ b/container-search/src/test/java/com/yahoo/fs4/test/QueryTestCase.java
@@ -36,7 +36,7 @@ public class QueryTestCase extends junit.framework.TestCase {
                                          2,
                                          8,
                                          0,0,0,50, // querytimeout
-                                         0,0,-64,4,  // qflags
+                                         0,0,0x40,0,  // qflags
                                          7,
                                          'd', 'e', 'f', 'a', 'u', 'l', 't',
                                          0,0,0,1,0,0,0,8,4,
@@ -58,7 +58,7 @@ public class QueryTestCase extends junit.framework.TestCase {
                                          2,
                                          8,
                                          0,0,0,50, // querytimeout
-                                         0,0,-64,4,  // QFlags
+                                         0,0,0x40,0,  // QFlags
                                          3,
                                          't','w','o', // Ranking
                                          0,0,0,1,0,0,0,8,4,
@@ -88,7 +88,7 @@ public class QueryTestCase extends junit.framework.TestCase {
         byte[] encoded = packetToBytes(packet);
         // System.out.println(Arrays.toString(encoded));
         byte[] correctBuffer=new byte[] {
-            0, 0, 1, 23, 0, 0, 0, -38, 0, 0, 0, 0, 0, 16, 0, -122, 0, 10, ignored, ignored, ignored, ignored, 0, 0, -64, 4, 3, 't', 'w', 'o', 0, 0, 0, 3, 0, 0, 0, 4, 'r', 'a', 'n', 'k', 0, 0, 0, 5, 0, 0, 0, 11, 'p', 'r', 'o', 'p', 'e', 'r', 't', 'y', 46, 'p', '2', 0, 0, 0, 2, 'v', '2', 0, 0, 0, 11, 'p', 'r', 'o', 'p', 'e', 'r', 't', 'y', 46, 'p', '1', 0, 0, 0, 2, 'v', '1', 0, 0, 0, 3, 'f', 'o', 'o', 0, 0, 0, 4, '3', '0', 46, '3', 0, 0, 0, 3, 'b', 'a', 'r', 0, 0, 0, 1, '0', 0, 0, 0, 9, 'v', 'e', 's', 'p', 'a', 46, 'n', 'o', 'w', 0, 0, 0, 6, '1', '2', '3', '4', '5', '6', 0, 0, 0, 14, 'h', 'i', 'g', 'h', 'l', 'i', 'g', 'h', 't', 't', 'e', 'r', 'm', 's', 0, 0, 0, 3, 0, 0, 0, 6, 'f', 'i', 'e', 'l', 'd', '1', 0, 0, 0, 1, '2', 0, 0, 0, 6, 'f', 'i', 'e', 'l', 'd', '1', 0, 0, 0, 5, 't', 'e', 'r', 'm', '1', 0, 0, 0, 6, 'f', 'i', 'e', 'l', 'd', '1', 0, 0, 0, 5, 't', 'e', 'r', 'm', '2', 0, 0, 0, 5, 'm', 'o', 'd', 'e', 'l', 0, 0, 0, 1, 0, 0, 0, 10, 's', 'e', 'a', 'r', 'c', 'h', 'p', 'a', 't', 'h', 0, 0, 0, 3, '7', 47, '3', 0, 0, 0, 15, 43, 'f', 'i', 'e', 'l', 'd', '1', 32, 45, 'f', 'i', 'e', 'l', 'd', '2', 0, 0, 0, 1, 0, 0, 0, 9, 68, 1, 0, 5, 'c', 'h', 'a', 'i', 'n'
+            0, 0, 1, 23, 0, 0, 0, -38, 0, 0, 0, 0, 0, 16, 0, -122, 0, 10, ignored, ignored, ignored, ignored, 0, 0, 0x40, 0, 3, 't', 'w', 'o', 0, 0, 0, 3, 0, 0, 0, 4, 'r', 'a', 'n', 'k', 0, 0, 0, 5, 0, 0, 0, 11, 'p', 'r', 'o', 'p', 'e', 'r', 't', 'y', 46, 'p', '2', 0, 0, 0, 2, 'v', '2', 0, 0, 0, 11, 'p', 'r', 'o', 'p', 'e', 'r', 't', 'y', 46, 'p', '1', 0, 0, 0, 2, 'v', '1', 0, 0, 0, 3, 'f', 'o', 'o', 0, 0, 0, 4, '3', '0', 46, '3', 0, 0, 0, 3, 'b', 'a', 'r', 0, 0, 0, 1, '0', 0, 0, 0, 9, 'v', 'e', 's', 'p', 'a', 46, 'n', 'o', 'w', 0, 0, 0, 6, '1', '2', '3', '4', '5', '6', 0, 0, 0, 14, 'h', 'i', 'g', 'h', 'l', 'i', 'g', 'h', 't', 't', 'e', 'r', 'm', 's', 0, 0, 0, 3, 0, 0, 0, 6, 'f', 'i', 'e', 'l', 'd', '1', 0, 0, 0, 1, '2', 0, 0, 0, 6, 'f', 'i', 'e', 'l', 'd', '1', 0, 0, 0, 5, 't', 'e', 'r', 'm', '1', 0, 0, 0, 6, 'f', 'i', 'e', 'l', 'd', '1', 0, 0, 0, 5, 't', 'e', 'r', 'm', '2', 0, 0, 0, 5, 'm', 'o', 'd', 'e', 'l', 0, 0, 0, 1, 0, 0, 0, 10, 's', 'e', 'a', 'r', 'c', 'h', 'p', 'a', 't', 'h', 0, 0, 0, 3, '7', 47, '3', 0, 0, 0, 15, 43, 'f', 'i', 'e', 'l', 'd', '1', 32, 45, 'f', 'i', 'e', 'l', 'd', '2', 0, 0, 0, 1, 0, 0, 0, 9, 68, 1, 0, 5, 'c', 'h', 'a', 'i', 'n'
         };
         assertEqualArrays(correctBuffer,encoded);
     }
@@ -114,7 +114,7 @@ public class QueryTestCase extends junit.framework.TestCase {
         byte[] encoded = packetToBytes(packet);
         // System.out.println(Arrays.toString(encoded));
         byte[] correctBuffer=new byte[] {
-            0, 0, 1, 23, 0, 0, 0, -38, 0, 0, 0, 0, 0, 16, 0, -122, 0, 10, ignored, ignored, ignored, ignored, 0, 0, -64, 4, 3, 't', 'w', 'o', 0, 0, 0, 3, 0, 0, 0, 4, 'r', 'a', 'n', 'k', 0, 0, 0, 5, 0, 0, 0, 11, 'p', 'r', 'o', 'p', 'e', 'r', 't', 'y', 46, 'p', '2', 0, 0, 0, 2, 'v', '2', 0, 0, 0, 11, 'p', 'r', 'o', 'p', 'e', 'r', 't', 'y', 46, 'p', '1', 0, 0, 0, 2, 'v', '1', 0, 0, 0, 3, 'f', 'o', 'o', 0, 0, 0, 4, '3', '0', 46, '3', 0, 0, 0, 3, 'b', 'a', 'r', 0, 0, 0, 1, '0', 0, 0, 0, 9, 'v', 'e', 's', 'p', 'a', 46, 'n', 'o', 'w', 0, 0, 0, 6, '1', '2', '3', '4', '5', '6', 0, 0, 0, 14, 'h', 'i', 'g', 'h', 'l', 'i', 'g', 'h', 't', 't', 'e', 'r', 'm', 's', 0, 0, 0, 3, 0, 0, 0, 6, 'f', 'i', 'e', 'l', 'd', '1', 0, 0, 0, 1, '2', 0, 0, 0, 6, 'f', 'i', 'e', 'l', 'd', '1', 0, 0, 0, 5, 't', 'e', 'r', 'm', '1', 0, 0, 0, 6, 'f', 'i', 'e', 'l', 'd', '1', 0, 0, 0, 5, 't', 'e', 'r', 'm', '2', 0, 0, 0, 5, 'm', 'o', 'd', 'e', 'l', 0, 0, 0, 1, 0, 0, 0, 10, 's', 'e', 'a', 'r', 'c', 'h', 'p', 'a', 't', 'h', 0, 0, 0, 3, '7', 47, '3', 0, 0, 0, 15, 43, 'f', 'i', 'e', 'l', 'd', '1', 32, 45, 'f', 'i', 'e', 'l', 'd', '2', 0, 0, 0, 1, 0, 0, 0, 9, 68, 1, 0, 5, 'c', 'h', 'a', 'i', 'n'
+            0, 0, 1, 23, 0, 0, 0, -38, 0, 0, 0, 0, 0, 16, 0, -122, 0, 10, ignored, ignored, ignored, ignored, 0, 0, 0x40, 0, 3, 't', 'w', 'o', 0, 0, 0, 3, 0, 0, 0, 4, 'r', 'a', 'n', 'k', 0, 0, 0, 5, 0, 0, 0, 11, 'p', 'r', 'o', 'p', 'e', 'r', 't', 'y', 46, 'p', '2', 0, 0, 0, 2, 'v', '2', 0, 0, 0, 11, 'p', 'r', 'o', 'p', 'e', 'r', 't', 'y', 46, 'p', '1', 0, 0, 0, 2, 'v', '1', 0, 0, 0, 3, 'f', 'o', 'o', 0, 0, 0, 4, '3', '0', 46, '3', 0, 0, 0, 3, 'b', 'a', 'r', 0, 0, 0, 1, '0', 0, 0, 0, 9, 'v', 'e', 's', 'p', 'a', 46, 'n', 'o', 'w', 0, 0, 0, 6, '1', '2', '3', '4', '5', '6', 0, 0, 0, 14, 'h', 'i', 'g', 'h', 'l', 'i', 'g', 'h', 't', 't', 'e', 'r', 'm', 's', 0, 0, 0, 3, 0, 0, 0, 6, 'f', 'i', 'e', 'l', 'd', '1', 0, 0, 0, 1, '2', 0, 0, 0, 6, 'f', 'i', 'e', 'l', 'd', '1', 0, 0, 0, 5, 't', 'e', 'r', 'm', '1', 0, 0, 0, 6, 'f', 'i', 'e', 'l', 'd', '1', 0, 0, 0, 5, 't', 'e', 'r', 'm', '2', 0, 0, 0, 5, 'm', 'o', 'd', 'e', 'l', 0, 0, 0, 1, 0, 0, 0, 10, 's', 'e', 'a', 'r', 'c', 'h', 'p', 'a', 't', 'h', 0, 0, 0, 3, '7', 47, '3', 0, 0, 0, 15, 43, 'f', 'i', 'e', 'l', 'd', '1', 32, 45, 'f', 'i', 'e', 'l', 'd', '2', 0, 0, 0, 1, 0, 0, 0, 9, 68, 1, 0, 5, 'c', 'h', 'a', 'i', 'n'
         };
         assertEqualArrays(correctBuffer,encoded);
     }
@@ -143,7 +143,7 @@ public class QueryTestCase extends junit.framework.TestCase {
         QueryPacket packet=QueryPacket.create(query);
         byte[] encoded = packetToBytes(packet);
         byte[] correctBuffer=new byte[] {
-                0, 0, 1, 16, 0, 0, 0, -38, 0, 0, 0, 0, 0, 16, 0, 6, 0, 10, ignored, ignored, ignored, ignored, 0, 0, -64, 4, 7, 'd', 'e', 'f', 'a', 'u', 'l', 't', 0, 0, 0, 1, 0, 0, 0, 4, 'r', 'a', 'n', 'k', 0, 0, 0, 5, 0, 0, 0, 18, 'v', 'e', 's', 'p', 'a', 46, 'l', 'a', 'b', 'e', 'l', 46, 'b', 'a', 'r', 46, 'i', 'd', 0, 0, 0, 1, '1', 0, 0, 0, 22, 'v', 'e', 's', 'p', 'a', 46, 't', 'e', 'r', 'm', 46, '4', 46, 'c', 'o', 'n', 'n', 'e', 'x', 'i', 't', 'y', 0, 0, 0, 1, '3', 0, 0, 0, 22, 'v', 'e', 's', 'p', 'a', 46, 't', 'e', 'r', 'm', 46, '4', 46, 'c', 'o', 'n', 'n', 'e', 'x', 'i', 't', 'y', 0, 0, 0, 4, '0', 46, '1', '5', 0, 0, 0, 25, 'v', 'e', 's', 'p', 'a', 46, 't', 'e', 'r', 'm', 46, '3', 46, 's', 'i', 'g', 'n', 'i', 'f', 'i', 'c', 'a', 'n', 'c', 'e', 0, 0, 0, 4, '0', 46, '3', '7', 0, 0, 0, 25, 'v', 'e', 's', 'p', 'a', 46, 't', 'e', 'r', 'm', 46, '4', 46, 's', 'i', 'g', 'n', 'i', 'f', 'i', 'c', 'a', 'n', 'c', 'e', 0, 0, 0, 4, '0', 46, '8', '1', 0, 0, 0, 5, 0, 0, 0, '4', 1, 4, 79, 1, 0, 6, 'f', 'i', 'e', 'l', 'd', '1', 79, 2, 0, 6, 'f', 'i', 'e', 'l', 'd', '2', 68, 3, 6, 'f', 'i', 'e', 'l', 'd', '3', 5, 'w', 'o', 'r', 'd', '1', 68, 4, 6, 'f', 'i', 'e', 'l', 'd', '3', 5, 'w', 'o', 'r', 'd', 49
+                0, 0, 1, 16, 0, 0, 0, -38, 0, 0, 0, 0, 0, 16, 0, 6, 0, 10, ignored, ignored, ignored, ignored, 0, 0, 0x40, 0, 7, 'd', 'e', 'f', 'a', 'u', 'l', 't', 0, 0, 0, 1, 0, 0, 0, 4, 'r', 'a', 'n', 'k', 0, 0, 0, 5, 0, 0, 0, 18, 'v', 'e', 's', 'p', 'a', 46, 'l', 'a', 'b', 'e', 'l', 46, 'b', 'a', 'r', 46, 'i', 'd', 0, 0, 0, 1, '1', 0, 0, 0, 22, 'v', 'e', 's', 'p', 'a', 46, 't', 'e', 'r', 'm', 46, '4', 46, 'c', 'o', 'n', 'n', 'e', 'x', 'i', 't', 'y', 0, 0, 0, 1, '3', 0, 0, 0, 22, 'v', 'e', 's', 'p', 'a', 46, 't', 'e', 'r', 'm', 46, '4', 46, 'c', 'o', 'n', 'n', 'e', 'x', 'i', 't', 'y', 0, 0, 0, 4, '0', 46, '1', '5', 0, 0, 0, 25, 'v', 'e', 's', 'p', 'a', 46, 't', 'e', 'r', 'm', 46, '3', 46, 's', 'i', 'g', 'n', 'i', 'f', 'i', 'c', 'a', 'n', 'c', 'e', 0, 0, 0, 4, '0', 46, '3', '7', 0, 0, 0, 25, 'v', 'e', 's', 'p', 'a', 46, 't', 'e', 'r', 'm', 46, '4', 46, 's', 'i', 'g', 'n', 'i', 'f', 'i', 'c', 'a', 'n', 'c', 'e', 0, 0, 0, 4, '0', 46, '8', '1', 0, 0, 0, 5, 0, 0, 0, '4', 1, 4, 79, 1, 0, 6, 'f', 'i', 'e', 'l', 'd', '1', 79, 2, 0, 6, 'f', 'i', 'e', 'l', 'd', '2', 68, 3, 6, 'f', 'i', 'e', 'l', 'd', '3', 5, 'w', 'o', 'r', 'd', '1', 68, 4, 6, 'f', 'i', 'e', 'l', 'd', '3', 5, 'w', 'o', 'r', 'd', 49
         };
         assertEqualArrays(correctBuffer,encoded);
     }
@@ -163,7 +163,7 @@ public class QueryTestCase extends junit.framework.TestCase {
                                          2,   // offset
                                          8,   // maxhits
                                          0,0,0,50, // querytimeout
-                                         0,0,-64,4,  // qflags
+                                         0,0,0x40,0,  // qflags
                                          7,
                                          'd', 'e', 'f', 'a', 'u', 'l', 't',
                                          0,0,0,5,   // sortspec length
@@ -234,7 +234,7 @@ public class QueryTestCase extends junit.framework.TestCase {
                                          2,
                                          8,
                                          0,0,0,50, // querytimeout
-                                         0,0,-64,4,  // qflags
+                                         0,0,0x40,0,  // qflags
                                          7,
                                          'd', 'e', 'f', 'a', 'u', 'l', 't',
                                          0,0,0,1,0,0,0,8,4,
@@ -253,7 +253,7 @@ public class QueryTestCase extends junit.framework.TestCase {
                                   2,
                                   8,
                                   0,0,0,50, // querytimeout
-                                  0,0,-64,4,  // qflags
+                                  0,0,0x40,0,  // qflags
                                   7,
                                   'd', 'e', 'f', 'a', 'u', 'l', 't',
                                   0,0,0,1,0,0,0,8,4,
diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java
index 8dd56ad15a1..3d08844038e 100644
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java
@@ -118,7 +118,7 @@ public class FastSearcherTestCase {
         byte[] correct = new byte[] {
             0, 0, 0, 100, 0, 0, 0, -38, 0, 0, 0, 0, 0, 16, 0, 6, 0, 10,
             QueryTestCase.ignored, QueryTestCase.ignored, QueryTestCase.ignored, QueryTestCase.ignored, // time left
-            0, 0, -64, 4, 7, 100, 101, 102, 97, 117, 108, 116, 0, 0, 0, 1, 0, 0, 0, 5, 109, 97, 116, 99, 104, 0, 0, 0, 1, 0, 0, 0, 24, 100, 111, 99, 117, 109, 101, 110, 116, 100, 98, 46, 115, 101, 97, 114, 99, 104, 100, 111, 99, 116, 121, 112, 101, 0, 0, 0, 6, 116, 101, 115, 116, 68, 98, 0, 0, 0, 1, 0, 0, 0, 7, 68, 1, 0, 3, 102, 111, 111
+            0, 0, 0x40, 0, 7, 100, 101, 102, 97, 117, 108, 116, 0, 0, 0, 1, 0, 0, 0, 5, 109, 97, 116, 99, 104, 0, 0, 0, 1, 0, 0, 0, 24, 100, 111, 99, 117, 109, 101, 110, 116, 100, 98, 46, 115, 101, 97, 114, 99, 104, 100, 111, 99, 116, 121, 112, 101, 0, 0, 0, 6, 116, 101, 115, 116, 68, 98, 0, 0, 0, 1, 0, 0, 0, 7, 68, 1, 0, 3, 102, 111, 111
         };
         QueryTestCase.assertEqualArrays(correct, encoded);
     }
@@ -260,7 +260,7 @@ public class FastSearcherTestCase {
                 // query timeout
                 IGNORE, IGNORE, IGNORE, IGNORE,
                 // "default" - rank profile
-                7, 'd', 'e', 'f', 'a', 'u', 'l', 't', 0, 0, -128, 0,
+                7, 'd', 'e', 'f', 'a', 'u', 'l', 't', 0, 0, 0, 0,
                 // 3 property entries (rank, match, caches)
                 0, 0, 0, 3,
                 // rank: sessionId => qrserver.0.XXXXXXXXXXXXX.0
@@ -388,6 +388,7 @@ public class FastSearcherTestCase {
                                                      new CacheParams(0, 0.0d),
                                                      documentdbInfoConfig);
         server.dispatch.packetData = BackendTestCase.PONG;
+        server.dispatch.setNoChannel();
         Chain<Searcher> chain = new Chain<>(fastSearcher);
         Execution e = new Execution(chain, Execution.Context.createContextStub());
         Pong pong = e.ping(new Ping());
diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java
index 02d8f83bca7..fc99bc05bb4 100644
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/PacketCacheTestCase.java
@@ -23,7 +23,7 @@ public class PacketCacheTestCase extends junit.framework.TestCase {
 
     static byte[] queryResultPacketData = new byte[] {
         0, 0, 0, 104,
-        0, 0, 0,214 - 256,
+        0, 0, 0,217 - 256,
         0, 0, 0, 1,
         0, 0, 0, 0,
         0, 0, 0, 2,