Rewrite tests from cppunit to gtest.

5 files changed, 71 insertions, 108 deletions

diff --git a/vdslib/src/tests/CMakeLists.txt b/vdslib/src/tests/CMakeLists.txt
index 1fdc45a3163..0c9ae7e0048 100644
--- a/vdslib/src/tests/CMakeLists.txt
+++ b/vdslib/src/tests/CMakeLists.txt
@@ -7,6 +7,7 @@ vespa_add_executable(vdslib_gtest_runner_app TEST
     gtest_runner.cpp
     DEPENDS
     vdslib_bucketdistributiontest
+    vdslib_containertest
     gtest
 )
 
@@ -20,7 +21,6 @@ vespa_add_executable(vdslib_testrunner_app TEST
     SOURCES
     testrunner.cpp
     DEPENDS
-    vdslib_containertest
     vdslib_testdistribution
     vdslib_teststate
     vdslib_testthread
diff --git a/vdslib/src/tests/container/CMakeLists.txt b/vdslib/src/tests/container/CMakeLists.txt
index 8f82bf17a28..9f7b2e33efa 100644
--- a/vdslib/src/tests/container/CMakeLists.txt
+++ b/vdslib/src/tests/container/CMakeLists.txt
@@ -6,4 +6,5 @@ vespa_add_library(vdslib_containertest
     documentsummarytest.cpp
     DEPENDS
     vdslib
+    gtest
 )
diff --git a/vdslib/src/tests/container/documentsummarytest.cpp b/vdslib/src/tests/container/documentsummarytest.cpp
index 94bc737a499..1a74e2970a3 100644
--- a/vdslib/src/tests/container/documentsummarytest.cpp
+++ b/vdslib/src/tests/container/documentsummarytest.cpp
@@ -2,51 +2,40 @@
 
 #include <vespa/document/base/testdocman.h>
 #include <vespa/vdslib/container/documentsummary.h>
-#include <cppunit/extensions/HelperMacros.h>
+#include <vespa/vespalib/gtest/gtest.h>
 
 namespace vdslib {
 
-struct DocumentSummaryTest : public CppUnit::TestFixture {
-
-    void testSimple();
-
-    CPPUNIT_TEST_SUITE(DocumentSummaryTest);
-    CPPUNIT_TEST(testSimple);
-    CPPUNIT_TEST_SUITE_END();
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(DocumentSummaryTest);
-
-void DocumentSummaryTest::testSimple()
+TEST(DocumentSummaryTest, test_simple)
 {
     DocumentSummary a;
-    CPPUNIT_ASSERT(a.getSummaryCount() == 0);
+    EXPECT_EQ(0, a.getSummaryCount());
     a.addSummary("doc1", "summary1", 8);
-    CPPUNIT_ASSERT(a.getSummaryCount() == 1);
+    ASSERT_EQ(1, a.getSummaryCount());
     a.addSummary("aoc12", "summary17", 9);
-    CPPUNIT_ASSERT(a.getSummaryCount() == 2);
+    ASSERT_EQ(2, a.getSummaryCount());
 
     size_t r;
     const char * docId;
-    const void * buf(NULL);
+    const void * buf(nullptr);
     a.getSummary(0, docId, buf, r);
-    CPPUNIT_ASSERT(r == 8);
-    CPPUNIT_ASSERT(strcmp(docId, "doc1") == 0);
-    CPPUNIT_ASSERT(memcmp(buf, "summary1", r) == 0);
+    EXPECT_EQ(8, r);
+    EXPECT_EQ("doc1", std::string(docId));
+    EXPECT_TRUE(memcmp(buf, "summary1", r) == 0);
     a.getSummary(1, docId, buf, r);
-    CPPUNIT_ASSERT(r == 9);
-    CPPUNIT_ASSERT(strcmp(docId, "aoc12") == 0);
-    CPPUNIT_ASSERT(memcmp(buf, "summary17", r) == 0);
+    EXPECT_EQ(9, r);
+    EXPECT_EQ("aoc12", std::string(docId));
+    EXPECT_TRUE(memcmp(buf, "summary17", r) == 0);
 
     a.sort();
     a.getSummary(0, docId, buf, r);
-    CPPUNIT_ASSERT(r == 9);
-    CPPUNIT_ASSERT(strcmp(docId, "aoc12") == 0);
-    CPPUNIT_ASSERT(memcmp(buf, "summary17", r) == 0);
+    EXPECT_EQ(9, r);
+    EXPECT_EQ("aoc12", std::string(docId));
+    EXPECT_TRUE(memcmp(buf, "summary17", r) == 0);
     a.getSummary(1, docId, buf, r);
-    CPPUNIT_ASSERT(r == 8);
-    CPPUNIT_ASSERT(strcmp(docId, "doc1") == 0);
-    CPPUNIT_ASSERT(memcmp(buf, "summary1", r) == 0);
+    EXPECT_EQ(8, r);
+    EXPECT_EQ("doc1", std::string(docId));
+    EXPECT_TRUE(memcmp(buf, "summary1", r) == 0);
 }
 
 }
diff --git a/vdslib/src/tests/container/parameterstest.cpp b/vdslib/src/tests/container/parameterstest.cpp
index 29cf02f0da6..af0aca2b3c7 100644
--- a/vdslib/src/tests/container/parameterstest.cpp
+++ b/vdslib/src/tests/container/parameterstest.cpp
@@ -2,26 +2,12 @@
 
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/vdslib/container/parameters.h>
-#include <cppunit/extensions/HelperMacros.h>
+#include <vespa/vespalib/gtest/gtest.h>
 
 using document::DocumentTypeRepo;
 using namespace vdslib;
 
-class Parameters_Test : public CppUnit::TestFixture {
-    CPPUNIT_TEST_SUITE(Parameters_Test);
-    CPPUNIT_TEST(testParameters);
-    CPPUNIT_TEST_SUITE_END();
-
-protected:
-    void testParameters();
-};
-
-#ifndef FASTOS_NO_THREADS
-CPPUNIT_TEST_SUITE_REGISTRATION(Parameters_Test);
-#endif
-
-void
-Parameters_Test::testParameters()
+TEST(ParametersTest, test_parameters)
 {
     Parameters par;
     par.set("fast", "overture");
@@ -35,18 +21,18 @@ Parameters_Test::testParameters()
     DocumentTypeRepo repo;
     Parameters par2(repo, *buffer);
 
-    CPPUNIT_ASSERT_EQUAL(vespalib::stringref("overture"), par2.get("fast"));
-    CPPUNIT_ASSERT_EQUAL(vespalib::stringref("yahoo"), par2.get("overture"));
+    EXPECT_EQ(vespalib::stringref("overture"), par2.get("fast"));
+    EXPECT_EQ(vespalib::stringref("yahoo"), par2.get("overture"));
     std::string stringDefault = "wayne corp";
     int numberDefault = 123;
     long longDefault = 456;
     double doubleDefault = 0.5;
-    CPPUNIT_ASSERT_EQUAL(6, par2.get("number", numberDefault));
-    CPPUNIT_ASSERT_EQUAL(8589934590L, par2.get("long", longDefault));
-    CPPUNIT_ASSERT_DOUBLES_EQUAL(0.25, par2.get("double", doubleDefault), 0.0001);
-
-    CPPUNIT_ASSERT_EQUAL(stringDefault, par2.get("nonexistingstring", stringDefault));
-    CPPUNIT_ASSERT_EQUAL(numberDefault, par2.get("nonexistingnumber", numberDefault));
-    CPPUNIT_ASSERT_EQUAL(longDefault,   par2.get("nonexistinglong", longDefault));
-    CPPUNIT_ASSERT_EQUAL(doubleDefault, par2.get("nonexistingdouble", doubleDefault));
+    EXPECT_EQ(6, par2.get("number", numberDefault));
+    EXPECT_EQ(8589934590L, par2.get("long", longDefault));
+    EXPECT_DOUBLE_EQ(0.25, par2.get("double", doubleDefault));
+
+    EXPECT_EQ(stringDefault, par2.get("nonexistingstring", stringDefault));
+    EXPECT_EQ(numberDefault, par2.get("nonexistingnumber", numberDefault));
+    EXPECT_EQ(longDefault,   par2.get("nonexistinglong", longDefault));
+    EXPECT_EQ(doubleDefault, par2.get("nonexistingdouble", doubleDefault));
 }
diff --git a/vdslib/src/tests/container/searchresulttest.cpp b/vdslib/src/tests/container/searchresulttest.cpp
index 9092983fd47..76cbe0b8ceb 100644
--- a/vdslib/src/tests/container/searchresulttest.cpp
+++ b/vdslib/src/tests/container/searchresulttest.cpp
@@ -2,83 +2,70 @@
 
 #include <vespa/document/base/testdocman.h>
 #include <vespa/vdslib/container/searchresult.h>
-#include <cppunit/extensions/HelperMacros.h>
+#include <vespa/vespalib/gtest/gtest.h>
 
 namespace vdslib {
 
-struct SearchResultTest : public CppUnit::TestFixture {
-
-    void testSimple();
-    void testSimpleSortData();
-
-    CPPUNIT_TEST_SUITE(SearchResultTest);
-    CPPUNIT_TEST(testSimple);
-    CPPUNIT_TEST(testSimpleSortData);
-    CPPUNIT_TEST_SUITE_END();
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(SearchResultTest);
-
-void SearchResultTest::testSimple()
+TEST(SearchResultTest, test_simple)
 {
     SearchResult a;
-    CPPUNIT_ASSERT(a.getHitCount() == 0);
+    EXPECT_EQ(0, a.getHitCount());
     a.addHit(7, "doc1", 6);
-    CPPUNIT_ASSERT(a.getHitCount() == 1);
+    ASSERT_EQ(1, a.getHitCount());
     a.addHit(8, "doc2", 7);
-    CPPUNIT_ASSERT(a.getHitCount() == 2);
+    ASSERT_EQ(2, a.getHitCount());
     const char *docId;
     SearchResult::RankType r;
-    CPPUNIT_ASSERT_EQUAL(a.getHit(0, docId, r), 7ul);
-    CPPUNIT_ASSERT(strcmp(docId, "doc1") == 0);
-    CPPUNIT_ASSERT(r == 6);
-    CPPUNIT_ASSERT_EQUAL(a.getHit(1, docId, r), 8ul);
-    CPPUNIT_ASSERT(strcmp(docId, "doc2") == 0);
-    CPPUNIT_ASSERT(r == 7);
+    EXPECT_EQ(7, a.getHit(0, docId, r));
+    EXPECT_EQ("doc1", std::string(docId));
+    EXPECT_EQ(6, r);
+    EXPECT_EQ(8, a.getHit(1, docId, r));
+    EXPECT_EQ("doc2", std::string(docId));
+    EXPECT_EQ(7, r);
     a.sort();
-    CPPUNIT_ASSERT_EQUAL(a.getHit(0, docId, r), 8ul);
-    CPPUNIT_ASSERT(strcmp(docId, "doc2") == 0);
-    CPPUNIT_ASSERT(r == 7);
-    CPPUNIT_ASSERT_EQUAL(a.getHit(1, docId, r), 7ul);
-    CPPUNIT_ASSERT(strcmp(docId, "doc1") == 0);
-    CPPUNIT_ASSERT(r == 6);
+    EXPECT_EQ(8, a.getHit(0, docId, r));
+    EXPECT_EQ("doc2", std::string(docId));
+    EXPECT_EQ(7, r);
+    EXPECT_EQ(7, a.getHit(1, docId, r));
+    EXPECT_EQ("doc1", std::string(docId));
+    EXPECT_EQ(6, r);
 }
 
-void SearchResultTest::testSimpleSortData()
+TEST(SearchResultTest, test_simple_sort_data)
 {
     SearchResult a;
-    CPPUNIT_ASSERT(a.getHitCount() == 0);
+    EXPECT_EQ(0, a.getHitCount());
     a.addHit(7, "doc1", 6, "abce", 4);
-    CPPUNIT_ASSERT(a.getHitCount() == 1);
+    ASSERT_EQ(1, a.getHitCount());
     a.addHit(8, "doc2", 7, "abcde", 5);
-    CPPUNIT_ASSERT(a.getHitCount() == 2);
+    ASSERT_EQ(2, a.getHitCount());
     const char *docId;
     SearchResult::RankType r;
-    CPPUNIT_ASSERT_EQUAL(a.getHit(0, docId, r), 7ul);
-    CPPUNIT_ASSERT(strcmp(docId, "doc1") == 0);
-    CPPUNIT_ASSERT(r == 6);
+    EXPECT_EQ(7, a.getHit(0, docId, r));
+    EXPECT_EQ("doc1", std::string(docId));
+    EXPECT_EQ(6, r);
     const void *buf;
     size_t sz;
     a.getSortBlob(0, buf, sz);
-    CPPUNIT_ASSERT(sz == 4);
-    CPPUNIT_ASSERT(memcmp("abce", buf, sz) == 0);
-    CPPUNIT_ASSERT_EQUAL(a.getHit(1, docId, r), 8ul);
-    CPPUNIT_ASSERT(strcmp(docId, "doc2") == 0);
-    CPPUNIT_ASSERT(r == 7);
+    EXPECT_EQ(4, sz);
+    EXPECT_TRUE(memcmp("abce", buf, sz) == 0);
+    EXPECT_EQ(8, a.getHit(1, docId, r));
+    EXPECT_EQ("doc2", std::string(docId));
+    EXPECT_EQ(7, r);
     a.getSortBlob(1, buf, sz);
-    CPPUNIT_ASSERT(sz == 5);
-    CPPUNIT_ASSERT(memcmp("abcde", buf, sz) == 0);
+    EXPECT_EQ(5, sz);
+    EXPECT_TRUE(memcmp("abcde", buf, sz) == 0);
     a.sort();
-    CPPUNIT_ASSERT_EQUAL(a.getHit(0, docId, r), 8ul);
-    CPPUNIT_ASSERT(strcmp(docId, "doc2") == 0);
-    CPPUNIT_ASSERT(r == 7);
+    EXPECT_EQ(8, a.getHit(0, docId, r));
+    EXPECT_EQ("doc2", std::string(docId));
+    EXPECT_EQ(7, r);
     a.getSortBlob(0, buf, sz);
-    CPPUNIT_ASSERT(sz == 5);
-    CPPUNIT_ASSERT_EQUAL(a.getHit(1, docId, r), 7ul);
-    CPPUNIT_ASSERT(strcmp(docId, "doc1") == 0);
-    CPPUNIT_ASSERT(r == 6);
+    EXPECT_EQ(5, sz);
+    EXPECT_EQ(7, a.getHit(1, docId, r));
+    EXPECT_EQ("doc1", std::string(docId));
+    EXPECT_EQ(6, r);
     a.getSortBlob(1, buf, sz);
-    CPPUNIT_ASSERT(sz == 4);
+    EXPECT_EQ(4, sz);
 }
 
 }