From 47b573a4dc2b30b10b8bdec3d790107eed683891 Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Sun, 8 Sep 2013 10:50:53 +0100 Subject: test: Convert test/sbuild/personality to use gtest --- test/Makefile.am | 2 +- test/sbuild/personality.cc | 164 ++++++++++++++++----------------------------- 2 files changed, 60 insertions(+), 106 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 602d351d..23759b1e 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -166,7 +166,7 @@ test_sbuild_parse_value_SOURCES = test/sbuild/parse-value.cc test_sbuild_parse_value_LDADD = lib/test/libtest2.la test_sbuild_personality_SOURCES = test/sbuild/personality.cc -test_sbuild_personality_LDADD = lib/test/libtest.la +test_sbuild_personality_LDADD = lib/test/libtest2.la test_sbuild_regex_SOURCES = test/sbuild/regex.cc test_sbuild_regex_LDADD = lib/test/libtest2.la diff --git a/test/sbuild/personality.cc b/test/sbuild/personality.cc index 651c9f7e..aa5a6110 100644 --- a/test/sbuild/personality.cc +++ b/test/sbuild/personality.cc @@ -16,125 +16,79 @@ * *********************************************************************/ +#include + #include #include #include -#include - -using namespace CppUnit; - -class test_personality : public TestCase +TEST(Personality, Construct1) { - CPPUNIT_TEST_SUITE(test_personality); - CPPUNIT_TEST(test_construction); - CPPUNIT_TEST_EXCEPTION(test_construction_fail, sbuild::personality::error); - CPPUNIT_TEST(test_output); - CPPUNIT_TEST(test_input); - CPPUNIT_TEST_EXCEPTION(test_input_fail, sbuild::personality::error); - CPPUNIT_TEST(test_set); - CPPUNIT_TEST_EXCEPTION(test_set_fail, sbuild::personality::error); - CPPUNIT_TEST_SUITE_END(); - -public: - test_personality() - {} - - virtual ~test_personality() - {} + sbuild::personality p; + ASSERT_EQ(p.get_name(), "undefined"); +} - void - test_construction() - { - sbuild::personality p1; - CPPUNIT_ASSERT(p1.get_name() == "undefined"); - -#if defined(SBUILD_FEATURE_PERSONALITY) && defined (__linux__) - sbuild::personality p4("linux"); - CPPUNIT_ASSERT(p4.get_name() == "linux"); -#endif - } - - void - test_construction_fail() - { - sbuild::personality p3("invalid_personality"); - } - - void - test_output() - { -#if defined(SBUILD_FEATURE_PERSONALITY) && defined (__linux__) - sbuild::personality p4("linux"); -#else - sbuild::personality p4; -#endif +TEST(Personality, Construct2) +{ + sbuild::personality p("linux"); + ASSERT_EQ(p.get_name(), "linux"); +} - std::ostringstream ps4; - ps4 << p4; +TEST(Personality, Construct3) +{ + ASSERT_THROW(sbuild::personality p("invalid_personality"), sbuild::personality::error); +} -#if defined(SBUILD_FEATURE_PERSONALITY) && defined (__linux__) - CPPUNIT_ASSERT(ps4.str() == "linux"); -#else - CPPUNIT_ASSERT(ps4.str() == "undefined"); -#endif - } +TEST(Personality, StreamOutput) +{ + sbuild::personality p("linux"); - void - test_input() - { - sbuild::personality p2; - std::istringstream ps2("undefined"); - ps2 >> p2; - CPPUNIT_ASSERT(p2.get_name() == "undefined"); + std::ostringstream os; + os << p; - sbuild::personality p4; -#if defined(SBUILD_FEATURE_PERSONALITY) && defined (__linux__) - std::istringstream ps4("linux"); -#else - std::istringstream ps4("undefined"); -#endif - ps4 >> p4; -#if defined(SBUILD_FEATURE_PERSONALITY) && defined (__linux__) - CPPUNIT_ASSERT(p4.get_name() == "linux"); -#else - CPPUNIT_ASSERT(p4.get_name() == "undefined"); -#endif - } + ASSERT_EQ(os.str(), "linux"); +} - void - test_input_fail() - { - sbuild::personality p3; - std::istringstream ps3("invalid_personality"); - ps3 >> p3; - } +TEST(Personality, StreamInput1) +{ + sbuild::personality p; + std::istringstream is("undefined"); + ASSERT_NO_THROW(is >> p); + ASSERT_EQ(p.get_name(), "undefined"); +} - void - test_set() - { - sbuild::personality p2; - p2.set_name("undefined"); - CPPUNIT_ASSERT(p2.get_name() == "undefined"); +TEST(Personality, StreamInput2) +{ + sbuild::personality p; + std::istringstream is("linux"); + ASSERT_NO_THROW(is >> p); + ASSERT_EQ(p.get_name(), "linux"); +} - sbuild::personality p4; -#if defined(SBUILD_FEATURE_PERSONALITY) && defined (__linux__) - p4.set_name("linux"); - CPPUNIT_ASSERT(p4.get_name() == "linux"); -#else - p4.set_name("undefined"); - CPPUNIT_ASSERT(p4.get_name() == "undefined"); -#endif - } +TEST(Personality, StreamInput3) +{ + sbuild::personality p; + std::istringstream is("invalid_personality"); + ASSERT_THROW(is >> p, sbuild::personality::error); +} - void - test_set_fail() - { - sbuild::personality p3; - p3.set_name("invalid_personality"); - } +TEST(Personality, Set1) +{ + sbuild::personality p; + p.set_name("undefined"); + ASSERT_EQ(p.get_name(), "undefined"); +} -}; +TEST(Personality, Set2) +{ + sbuild::personality p; + p.set_name("linux"); + ASSERT_EQ(p.get_name(), "linux"); +} -CPPUNIT_TEST_SUITE_REGISTRATION(test_personality); +TEST(Personality, Set3) +{ + sbuild::personality p; + ASSERT_THROW(p.set_name("invalid_personality"), sbuild::personality::error); +} -- cgit v1.2.3