diff options
Diffstat (limited to 'vdslib/src/tests/container/parameterstest.cpp')
-rw-r--r-- | vdslib/src/tests/container/parameterstest.cpp | 38 |
1 files changed, 12 insertions, 26 deletions
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)); } |