Simplify documentapi deserialization unit test (java).

14 files changed, 54 insertions, 103 deletions

diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages50TestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages50TestCase.java
index 5eca8f49967..18411fd26fa 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages50TestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages50TestCase.java
@@ -344,73 +344,56 @@ public class Messages50TestCase extends MessagesTestBase {
 
         @Override
         public void run() {
-            try {
-                FileInputStream stream = new FileInputStream(getPath("5-cpp-DocumentSummaryMessage-1.dat"));
-                byte[] data = new byte[stream.available()];
-                assertEquals(data.length, stream.read(data));
-
-                Routable routable = decode(data);
-                assertTrue(routable instanceof DocumentSummaryMessage);
-
-                DocumentSummaryMessage msg = (DocumentSummaryMessage)routable;
-                assertEquals(0, msg.getResult().getSummaryCount());
-
-                stream = new FileInputStream(getPath("5-cpp-DocumentSummaryMessage-2.dat"));
-                data = new byte[stream.available()];
-                assertEquals(data.length, stream.read(data));
-
-                routable = decode(data);
-                assertTrue(routable instanceof DocumentSummaryMessage);
-
-                msg = (DocumentSummaryMessage)routable;
-                assertEquals(2, msg.getResult().getSummaryCount());
-                com.yahoo.vdslib.DocumentSummary.Summary s = msg.getResult().getSummary(0);
-                assertEquals("doc1", s.getDocId());
-                byte[] b = s.getSummary();
-                assertEquals(8, b.length);
-                byte[] c = { 's', 'u', 'm', 'm', 'a', 'r', 'y', '1' };
-                for (int i = 0; i < b.length; i++) {
-                    assertEquals(c[i], b[i]);
-                }
-
-                s = msg.getResult().getSummary(1);
-                assertEquals("aoc17", s.getDocId());
-                b = s.getSummary();
-                assertEquals(9, b.length);
-                byte[] d = { 's', 'u', 'm', 'm', 'a', 'r', 'y', '4', '5' };
-                for (int i = 0; i < b.length; i++) {
-                    assertEquals(d[i], b[i]);
-                }
-
-                stream = new FileInputStream(getPath("5-cpp-DocumentSummaryMessage-3.dat"));
-                data = new byte[stream.available()];
-                assertEquals(data.length, stream.read(data));
+            Routable routable = deserialize("DocumentSummaryMessage-1", DocumentProtocol.MESSAGE_DOCUMENTSUMMARY, Language.CPP);
+            assertTrue(routable instanceof DocumentSummaryMessage);
+
+            DocumentSummaryMessage msg = (DocumentSummaryMessage) routable;
+            assertEquals(0, msg.getResult().getSummaryCount());
+
+            routable = deserialize("DocumentSummaryMessage-2", DocumentProtocol.MESSAGE_DOCUMENTSUMMARY, Language.CPP);
+            assertTrue(routable instanceof DocumentSummaryMessage);
+
+            msg = (DocumentSummaryMessage) routable;
+            assertEquals(2, msg.getResult().getSummaryCount());
+            com.yahoo.vdslib.DocumentSummary.Summary s = msg.getResult().getSummary(0);
+            assertEquals("doc1", s.getDocId());
+            byte[] b = s.getSummary();
+            assertEquals(8, b.length);
+            byte[] c = {'s', 'u', 'm', 'm', 'a', 'r', 'y', '1'};
+            for (int i = 0; i < b.length; i++) {
+                assertEquals(c[i], b[i]);
+            }
 
-                routable = decode(data);
-                assertTrue(routable instanceof DocumentSummaryMessage);
+            s = msg.getResult().getSummary(1);
+            assertEquals("aoc17", s.getDocId());
+            b = s.getSummary();
+            assertEquals(9, b.length);
+            byte[] d = {'s', 'u', 'm', 'm', 'a', 'r', 'y', '4', '5'};
+            for (int i = 0; i < b.length; i++) {
+                assertEquals(d[i], b[i]);
+            }
+            routable = deserialize("DocumentSummaryMessage-3", DocumentProtocol.MESSAGE_DOCUMENTSUMMARY, Language.CPP);
+            assertTrue(routable instanceof DocumentSummaryMessage);
 
-                msg = (DocumentSummaryMessage)routable;
-                assertEquals(2, msg.getResult().getSummaryCount());
+            msg = (DocumentSummaryMessage) routable;
+            assertEquals(2, msg.getResult().getSummaryCount());
 
-                s = msg.getResult().getSummary(0);
-                assertEquals("aoc17", s.getDocId());
-                b = s.getSummary();
-                assertEquals(9, b.length);
-                byte[] e = { 's', 'u', 'm', 'm', 'a', 'r', 'y', '4', '5' };
-                for (int i = 0; i < b.length; i++) {
-                    assertEquals(e[i], b[i]);
-                }
+            s = msg.getResult().getSummary(0);
+            assertEquals("aoc17", s.getDocId());
+            b = s.getSummary();
+            assertEquals(9, b.length);
+            byte[] e = {'s', 'u', 'm', 'm', 'a', 'r', 'y', '4', '5'};
+            for (int i = 0; i < b.length; i++) {
+                assertEquals(e[i], b[i]);
+            }
 
-                s = msg.getResult().getSummary(1);
-                assertEquals("doc1", s.getDocId());
-                b = s.getSummary();
-                assertEquals(8, b.length);
-                byte[] f = { 's', 'u', 'm', 'm', 'a', 'r', 'y', '1' };
-                for (int i = 0; i < b.length; i++) {
-                    assertEquals(f[i], b[i]);
-                }
-            } catch (IOException e) {
-                fail(e.toString());
+            s = msg.getResult().getSummary(1);
+            assertEquals("doc1", s.getDocId());
+            b = s.getSummary();
+            assertEquals(8, b.length);
+            byte[] f = {'s', 'u', 'm', 'm', 'a', 'r', 'y', '1'};
+            for (int i = 0; i < b.length; i++) {
+                assertEquals(f[i], b[i]);
             }
         }
     }
@@ -488,21 +471,13 @@ public class Messages50TestCase extends MessagesTestBase {
 
         @Override
         public void run() throws Exception {
-            FileInputStream stream = new FileInputStream(getPath("5-cpp-SearchResultMessage-1.dat"));
-            byte[] data = new byte[stream.available()];
-            assertEquals(data.length, stream.read(data));
-
-            Routable routable = decode(data);
+            Routable routable = deserialize("SearchResultMessage-1", DocumentProtocol.MESSAGE_SEARCHRESULT, Language.CPP);
             assertTrue(routable instanceof SearchResultMessage);
 
             SearchResultMessage msg = (SearchResultMessage)routable;
             assertEquals(0, msg.getResult().getHitCount());
 
-            stream = new FileInputStream(getPath("5-cpp-SearchResultMessage-2.dat"));
-            data = new byte[stream.available()];
-            assertEquals(data.length, stream.read(data));
-
-            routable = decode(data);
+            routable = deserialize("SearchResultMessage-2", DocumentProtocol.MESSAGE_SEARCHRESULT, Language.CPP);
             assertTrue(routable instanceof SearchResultMessage);
 
             msg = (SearchResultMessage)routable;
@@ -514,11 +489,7 @@ public class Messages50TestCase extends MessagesTestBase {
             assertEquals(109.0, h.getRank(), 1E-6);
             assertEquals("doc17", h.getDocId());
 
-            stream = new FileInputStream(getPath("5-cpp-SearchResultMessage-3.dat"));
-            data = new byte[stream.available()];
-            assertEquals(data.length, stream.read(data));
-
-            routable = decode(data);
+            routable = deserialize("SearchResultMessage-3", DocumentProtocol.MESSAGE_SEARCHRESULT, Language.CPP);
             assertTrue(routable instanceof SearchResultMessage);
 
             msg = (SearchResultMessage)routable;
@@ -530,11 +501,7 @@ public class Messages50TestCase extends MessagesTestBase {
             assertEquals(89.0, h.getRank(), 1E-6);
             assertEquals("doc1", h.getDocId());
 
-            stream = new FileInputStream(getPath("5-cpp-SearchResultMessage-4.dat"));
-            data = new byte[stream.available()];
-            assertEquals(data.length, stream.read(data));
-
-            routable = decode(data);
+            routable = deserialize("SearchResultMessage-4", DocumentProtocol.MESSAGE_SEARCHRESULT, Language.CPP);
             assertTrue(routable instanceof SearchResultMessage);
 
             msg = (SearchResultMessage)routable;
@@ -732,21 +699,13 @@ public class Messages50TestCase extends MessagesTestBase {
 
         @Override
         public void run() throws Exception {
-            FileInputStream stream = new FileInputStream(getPath("5-cpp-QueryResultMessage-1.dat"));
-            byte[] data = new byte[stream.available()];
-            assertEquals(data.length, stream.read(data));
-
-            Routable routable = decode(data);
+            Routable routable = deserialize("QueryResultMessage-1", DocumentProtocol.MESSAGE_QUERYRESULT, Language.CPP);
             assertTrue(routable instanceof QueryResultMessage);
 
             QueryResultMessage msg = (QueryResultMessage)routable;
             assertEquals(0, msg.getResult().getHitCount());
 
-            stream = new FileInputStream(getPath("5-cpp-QueryResultMessage-2.dat"));
-            data = new byte[stream.available()];
-            assertEquals(data.length, stream.read(data));
-
-            routable = decode(data);
+            routable = deserialize("QueryResultMessage-2", DocumentProtocol.MESSAGE_QUERYRESULT, Language.CPP);
             assertTrue(routable instanceof QueryResultMessage);
 
             msg = (QueryResultMessage)routable;
@@ -758,11 +717,7 @@ public class Messages50TestCase extends MessagesTestBase {
             assertEquals(109.0, h.getRank(), 1E-6);
             assertEquals("doc17", h.getDocId());
 
-            stream = new FileInputStream(getPath("5-cpp-QueryResultMessage-3.dat"));
-            data = new byte[stream.available()];
-            assertEquals(data.length, stream.read(data));
-
-            routable = decode(data);
+            routable = deserialize("QueryResultMessage-3", DocumentProtocol.MESSAGE_QUERYRESULT, Language.CPP);
             assertTrue(routable instanceof QueryResultMessage);
 
             msg = (QueryResultMessage)routable;
@@ -774,11 +729,7 @@ public class Messages50TestCase extends MessagesTestBase {
             assertEquals(89.0, h.getRank(), 1E-6);
             assertEquals("doc1", h.getDocId());
 
-            stream = new FileInputStream(getPath("5-cpp-QueryResultMessage-4.dat"));
-            data = new byte[stream.available()];
-            assertEquals(data.length, stream.read(data));
-
-            routable = decode(data);
+            routable = deserialize("QueryResultMessage-4", DocumentProtocol.MESSAGE_QUERYRESULT, Language.CPP);
             assertTrue(routable instanceof QueryResultMessage);
 
             msg = (QueryResultMessage)routable;
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentSummaryMessage-1.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentSummaryMessage-1.dat
new file mode 100644
index 00000000000..0107dd5f350
--- /dev/null
+++ b/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentSummaryMessage-1.dat
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentSummaryMessage-2.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentSummaryMessage-2.dat
new file mode 100644
index 00000000000..57187093f28
--- /dev/null
+++ b/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentSummaryMessage-2.dat
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentSummaryMessage-3.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentSummaryMessage-3.dat
new file mode 100644
index 00000000000..6a516d38d17
--- /dev/null
+++ b/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentSummaryMessage-3.dat
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-QueryResultMessage-1.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-QueryResultMessage-1.dat
new file mode 100644
index 00000000000..dbf830c9365
--- /dev/null
+++ b/documentapi/test/crosslanguagefiles/6.221-cpp-QueryResultMessage-1.dat
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-QueryResultMessage-2.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-QueryResultMessage-2.dat
new file mode 100644
index 00000000000..094143cf78d
--- /dev/null
+++ b/documentapi/test/crosslanguagefiles/6.221-cpp-QueryResultMessage-2.dat
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-QueryResultMessage-3.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-QueryResultMessage-3.dat
new file mode 100644
index 00000000000..3341d74052b
--- /dev/null
+++ b/documentapi/test/crosslanguagefiles/6.221-cpp-QueryResultMessage-3.dat
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-QueryResultMessage-4.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-QueryResultMessage-4.dat
new file mode 100644
index 00000000000..8aaaefff491
--- /dev/null
+++ b/documentapi/test/crosslanguagefiles/6.221-cpp-QueryResultMessage-4.dat
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-QueryResultMessage-5.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-QueryResultMessage-5.dat
new file mode 100644
index 00000000000..e66ed1f07d4
--- /dev/null
+++ b/documentapi/test/crosslanguagefiles/6.221-cpp-QueryResultMessage-5.dat
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-1.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-1.dat
new file mode 100644
index 00000000000..988f9fdab1f
--- /dev/null
+++ b/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-1.dat
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-2.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-2.dat
new file mode 100644
index 00000000000..ac277d09643
--- /dev/null
+++ b/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-2.dat
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-3.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-3.dat
new file mode 100644
index 00000000000..03b49c8a0ac
--- /dev/null
+++ b/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-3.dat
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-4.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-4.dat
new file mode 100644
index 00000000000..d52e574ea44
--- /dev/null
+++ b/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-4.dat
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-5.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-5.dat
new file mode 100644
index 00000000000..e68654e9941
--- /dev/null
+++ b/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-5.dat