Simplify documentapi deserialization unit test (C++).

1 files changed, 26 insertions, 85 deletions

diff --git a/documentapi/src/tests/messages/messages50test.cpp b/documentapi/src/tests/messages/messages50test.cpp
index 40674b2a799..cee0af5ad8e 100644
--- a/documentapi/src/tests/messages/messages50test.cpp
+++ b/documentapi/src/tests/messages/messages50test.cpp
@@ -258,38 +258,27 @@ Messages50Test::testDocumentSummaryMessage()
     EXPECT_EQUAL(srm.hasSequenceId(), false);
     EXPECT_EQUAL(srm.getSummaryCount(), size_t(0));
 
-    mbus::Blob data = encode(srm);
+    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + size_t(12), serialize("DocumentSummaryMessage-1", srm));
 
-    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + size_t(12), data.size());
-
-    writeFile(getPath("5-cpp-DocumentSummaryMessage-1.dat"), data);
-    // print(data);
-
-    mbus::Routable::UP routable = decode(data);
+    mbus::Routable::UP routable = deserialize("DocumentSummaryMessage-1", DocumentProtocol::MESSAGE_DOCUMENTSUMMARY, LANG_CPP);
     if (!EXPECT_TRUE(routable.get() != NULL)) {
         return false;
     }
-    EXPECT_EQUAL(routable->getType(), (uint32_t)DocumentProtocol::MESSAGE_DOCUMENTSUMMARY);
     DocumentSummaryMessage * dm = static_cast<DocumentSummaryMessage *>(routable.get());
     EXPECT_EQUAL(dm->getSummaryCount(), size_t(0));
 
     srm.addSummary("doc1", "summary1", 8);
     srm.addSummary("aoc17", "summary45", 9);
 
-    data = encode(srm);
-    //print(data);
-
     const void *summary(NULL);
     const char *docId(NULL);
     size_t sz(0);
 
-    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 52u, data.size());
-    writeFile(getPath("5-cpp-DocumentSummaryMessage-2.dat"), data);
-    routable = decode(data);
+    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 52u, serialize("DocumentSummaryMessage-2", srm));
+    routable = deserialize("DocumentSummaryMessage-2", DocumentProtocol::MESSAGE_DOCUMENTSUMMARY, LANG_CPP);
     if (!EXPECT_TRUE(routable.get() != NULL)) {
         return false;
     }
-    EXPECT_EQUAL(routable->getType(), (uint32_t)DocumentProtocol::MESSAGE_DOCUMENTSUMMARY);
     dm = static_cast<DocumentSummaryMessage *>(routable.get());
     EXPECT_EQUAL(dm->getSummaryCount(), size_t(2));
     dm->getSummary(0, docId, summary, sz);
@@ -303,14 +292,11 @@ Messages50Test::testDocumentSummaryMessage()
 
     srm.sort();
 
-    data = encode(srm);
-    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 52u, data.size());
-    writeFile(getPath("5-cpp-DocumentSummaryMessage-3.dat"), data);
-    routable = decode(data);
+    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 52u, serialize("DocumentSummaryMessage-3", srm));
+    routable = deserialize("DocumentSummaryMessage-3", DocumentProtocol::MESSAGE_DOCUMENTSUMMARY, LANG_CPP);
     if (!EXPECT_TRUE(routable.get() != NULL)) {
         return false;
     }
-    EXPECT_EQUAL(routable->getType(), (uint32_t)DocumentProtocol::MESSAGE_DOCUMENTSUMMARY);
     dm = static_cast<DocumentSummaryMessage *>(routable.get());
     EXPECT_EQUAL(dm->getSummaryCount(), size_t(2));
     dm->getSummary(0, docId, summary, sz);
@@ -523,38 +509,25 @@ Messages50Test::testSearchResultMessage()
     EXPECT_EQUAL(srm.vdslib::SearchResult::getSerializedSize(), 20u);
     EXPECT_EQUAL(srm.getSerializedSize(), 20u);
 
-    mbus::Blob data = encode(srm);
-
-    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + size_t(24), data.size());
-
-    writeFile(getPath("5-cpp-SearchResultMessage-1.dat"), data);
-    // print(data);
+    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + size_t(24), serialize("SearchResultMessage-1", srm));
 
-    mbus::Routable::UP routable = decode(data);
+    mbus::Routable::UP routable = deserialize("SearchResultMessage-1", DocumentProtocol::MESSAGE_SEARCHRESULT, LANG_CPP);
     if (!EXPECT_TRUE(routable.get() != NULL)) {
         return false;
     }
-    EXPECT_EQUAL(routable->getType(), (uint32_t)DocumentProtocol::MESSAGE_SEARCHRESULT);
     SearchResultMessage * dm = static_cast<SearchResultMessage *>(routable.get());
     EXPECT_EQUAL(dm->getSequenceId(), size_t(0));
     EXPECT_EQUAL(dm->getHitCount(), size_t(0));
 
     srm.addHit(0, "doc1", 89);
     srm.addHit(1, "doc17", 109);
-    //srm.setSequenceId(567);
 
-    data = encode(srm);
-    //EXPECT_EQUAL(srm.getSequenceId(), size_t(567));
-
-    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 55u, data.size());
-    writeFile(getPath("5-cpp-SearchResultMessage-2.dat"), data);
-    routable = decode(data);
+    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 55u, serialize("SearchResultMessage-2", srm));
+    routable = deserialize("SearchResultMessage-2", DocumentProtocol::MESSAGE_SEARCHRESULT, LANG_CPP);
     if (!EXPECT_TRUE(routable.get() != NULL)) {
         return false;
     }
-    EXPECT_EQUAL(routable->getType(), (uint32_t)DocumentProtocol::MESSAGE_SEARCHRESULT);
     dm = static_cast<SearchResultMessage *>(routable.get());
-//    EXPECT_EQUAL(dm->getSequenceId(), size_t(567));
     EXPECT_EQUAL(dm->getHitCount(), size_t(2));
     const char *docId;
     SearchResultMessage::RankType rank;
@@ -567,16 +540,12 @@ Messages50Test::testSearchResultMessage()
 
     srm.sort();
 
-    data = encode(srm);
-    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 55u, data.size());
-    writeFile(getPath("5-cpp-SearchResultMessage-3.dat"), data);
-    routable = decode(data);
+    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 55u, serialize("SearchResultMessage-3", srm));
+    routable = deserialize("SearchResultMessage-3", DocumentProtocol::MESSAGE_SEARCHRESULT, LANG_CPP);
     if (!EXPECT_TRUE(routable.get() != NULL)) {
         return false;
     }
-    EXPECT_EQUAL(routable->getType(), (uint32_t)DocumentProtocol::MESSAGE_SEARCHRESULT);
     dm = static_cast<SearchResultMessage *>(routable.get());
-//    EXPECT_EQUAL(dm->getSequenceId(), size_t(567));
     EXPECT_EQUAL(dm->getHitCount(), size_t(2));
     dm->getHit(0, docId, rank);
     EXPECT_EQUAL(rank, SearchResultMessage::RankType(109));
@@ -589,18 +558,13 @@ Messages50Test::testSearchResultMessage()
     srm2.addHit(0, "doc1", 89, "sortdata2", 9);
     srm2.addHit(1, "doc17", 109, "sortdata1", 9);
     srm2.addHit(2, "doc18", 90, "sortdata3", 9);
-    //srm2.setSequenceId(567);
-    data = encode(srm2);
 
-    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 108u, data.size());
-    writeFile(getPath("5-cpp-SearchResultMessage-4.dat"), data);
-    routable = decode(data);
+    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 108u, serialize("SearchResultMessage-4", srm2));
+    routable = deserialize("SearchResultMessage-4", DocumentProtocol::MESSAGE_SEARCHRESULT, LANG_CPP);
     if (!EXPECT_TRUE(routable.get() != NULL)) {
         return false;
     }
-    EXPECT_EQUAL(routable->getType(), (uint32_t)DocumentProtocol::MESSAGE_SEARCHRESULT);
     dm = static_cast<SearchResultMessage *>(routable.get());
-    //EXPECT_EQUAL(dm->getSequenceId(), size_t(567));
     EXPECT_EQUAL(dm->getHitCount(), size_t(3));
     dm->getHit(0, docId, rank);
     EXPECT_EQUAL(rank, SearchResultMessage::RankType(89));
@@ -634,16 +598,12 @@ Messages50Test::testSearchResultMessage()
     EXPECT_EQUAL(rank, SearchResultMessage::RankType(90));
     EXPECT_EQUAL(strcmp("doc18", docId), 0);
 
-    data = encode(srm2);
-    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 108u, data.size());
-    writeFile(getPath("5-cpp-SearchResultMessage-5.dat"), data);
-    routable = decode(data);
+    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 108u, serialize("SearchResultMessage-5", srm2));
+    routable = deserialize("SearchResultMessage-5", DocumentProtocol::MESSAGE_SEARCHRESULT, LANG_CPP);
     if (!EXPECT_TRUE(routable.get() != NULL)) {
         return false;
     }
-    EXPECT_EQUAL(routable->getType(), (uint32_t)DocumentProtocol::MESSAGE_SEARCHRESULT);
     dm = static_cast<SearchResultMessage *>(routable.get());
-//    EXPECT_EQUAL(dm->getSequenceId(), size_t(567));
     EXPECT_EQUAL(dm->getHitCount(), size_t(3));
     dm->getHit(0, docId, rank);
     dm->getSortBlob(0, buf, sz);
@@ -702,18 +662,12 @@ Messages50Test::testQueryResultMessage()
     EXPECT_EQUAL(sr.getSerializedSize(), 20u);
     EXPECT_EQUAL(srm.getApproxSize(), 28u);
 
-    mbus::Blob data = encode(srm);
-
-    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + size_t(32), data.size());
+    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + size_t(32), serialize("QueryResultMessage-1", srm));
 
-    writeFile(getPath("5-cpp-QueryResultMessage-1.dat"), data);
-    // print(data);
-
-    mbus::Routable::UP routable = decode(data);
+    mbus::Routable::UP routable = deserialize("QueryResultMessage-1", DocumentProtocol::MESSAGE_QUERYRESULT, LANG_CPP);
     if (!EXPECT_TRUE(routable.get() != NULL)) {
         return false;
     }
-    EXPECT_EQUAL(routable->getType(), (uint32_t)DocumentProtocol::MESSAGE_QUERYRESULT);
     QueryResultMessage * dm = static_cast<QueryResultMessage *>(routable.get());
     vdslib::SearchResult * dr(&dm->getSearchResult());
     EXPECT_EQUAL(dm->getSequenceId(), size_t(0));
@@ -722,15 +676,11 @@ Messages50Test::testQueryResultMessage()
     sr.addHit(0, "doc1", 89);
     sr.addHit(1, "doc17", 109);
 
-    data = encode(srm);
-
-    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 63u, data.size());
-    writeFile(getPath("5-cpp-QueryResultMessage-2.dat"), data);
-    routable = decode(data);
+    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 63u, serialize("QueryResultMessage-2", srm));
+    routable = deserialize("QueryResultMessage-2", DocumentProtocol::MESSAGE_QUERYRESULT, LANG_CPP);
     if (!EXPECT_TRUE(routable.get() != NULL)) {
         return false;
     }
-    EXPECT_EQUAL(routable->getType(), (uint32_t)DocumentProtocol::MESSAGE_QUERYRESULT);
     dm = static_cast<QueryResultMessage *>(routable.get());
     dr = &dm->getSearchResult();
     EXPECT_EQUAL(dr->getHitCount(), size_t(2));
@@ -745,14 +695,11 @@ Messages50Test::testQueryResultMessage()
 
     sr.sort();
 
-    data = encode(srm);
-    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 63u, data.size());
-    writeFile(getPath("5-cpp-QueryResultMessage-3.dat"), data);
-    routable = decode(data);
+    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 63u, serialize("QueryResultMessage-3", srm));
+    routable = deserialize("QueryResultMessage-3", DocumentProtocol::MESSAGE_QUERYRESULT, LANG_CPP);
     if (!EXPECT_TRUE(routable.get() != NULL)) {
         return false;
     }
-    EXPECT_EQUAL(routable->getType(), (uint32_t)DocumentProtocol::MESSAGE_QUERYRESULT);
     dm = static_cast<QueryResultMessage *>(routable.get());
     dr = &dm->getSearchResult();
     EXPECT_EQUAL(dr->getHitCount(), size_t(2));
@@ -768,15 +715,12 @@ Messages50Test::testQueryResultMessage()
     sr2.addHit(0, "doc1", 89, "sortdata2", 9);
     sr2.addHit(1, "doc17", 109, "sortdata1", 9);
     sr2.addHit(2, "doc18", 90, "sortdata3", 9);
-    data = encode(srm2);
 
-    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 116u, data.size());
-    writeFile(getPath("5-cpp-QueryResultMessage-4.dat"), data);
-    routable = decode(data);
+    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 116u, serialize("QueryResultMessage-4", srm2));
+    routable = deserialize("QueryResultMessage-4", DocumentProtocol::MESSAGE_QUERYRESULT, LANG_CPP);
     if (!EXPECT_TRUE(routable.get() != NULL)) {
         return false;
     }
-    EXPECT_EQUAL(routable->getType(), (uint32_t)DocumentProtocol::MESSAGE_QUERYRESULT);
     dm = static_cast<QueryResultMessage *>(routable.get());
     dr = &dm->getSearchResult();
     EXPECT_EQUAL(dr->getHitCount(), size_t(3));
@@ -812,14 +756,11 @@ Messages50Test::testQueryResultMessage()
     EXPECT_EQUAL(rank, vdslib::SearchResult::RankType(90));
     EXPECT_EQUAL(strcmp("doc18", docId), 0);
 
-    data = encode(srm2);
-    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 116u, data.size());
-    writeFile(getPath("5-cpp-QueryResultMessage-5.dat"), data);
-    routable = decode(data);
+    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 116u, serialize("QueryResultMessage-5", srm2));
+    routable = deserialize("QueryResultMessage-5", DocumentProtocol::MESSAGE_QUERYRESULT, LANG_CPP);
     if (!EXPECT_TRUE(routable.get() != NULL)) {
         return false;
     }
-    EXPECT_EQUAL(routable->getType(), (uint32_t)DocumentProtocol::MESSAGE_QUERYRESULT);
     dm = static_cast<QueryResultMessage *>(routable.get());
     dr = &dm->getSearchResult();
     EXPECT_EQUAL(dr->getHitCount(), size_t(3));