test: Convert test/sbuild/parse-value to use gtest

2 files changed, 51 insertions, 90 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
index 2d011c53..364488c5 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -163,7 +163,7 @@ test_sbuild_nostream_SOURCES = test/sbuild/nostream.cc
 test_sbuild_nostream_LDADD = lib/test/libtest2.la
 
 test_sbuild_parse_value_SOURCES = test/sbuild/parse-value.cc
-test_sbuild_parse_value_LDADD = lib/test/libtest.la
+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
diff --git a/test/sbuild/parse-value.cc b/test/sbuild/parse-value.cc
index a5f2c8d5..928bfc2a 100644
--- a/test/sbuild/parse-value.cc
+++ b/test/sbuild/parse-value.cc
@@ -16,101 +16,62 @@
  *
  *********************************************************************/
 
-#include <sbuild/parse-value.h>
-
-#include <cppunit/extensions/HelperMacros.h>
+#include <gtest/gtest.h>
 
-using namespace CppUnit;
+#include <sbuild/parse-value.h>
 
-class test_parse_value : public TestCase
+TEST(ParseValue, Bool)
 {
-  CPPUNIT_TEST_SUITE(test_parse_value);
-  CPPUNIT_TEST(test_bool);
-  CPPUNIT_TEST(test_bool_fail);
-  CPPUNIT_TEST(test_int);
-  CPPUNIT_TEST(test_int_fail);
-  CPPUNIT_TEST(test_string);
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  test_parse_value()
-  {}
-
-  void test_bool()
-  {
-    bool result;
-
-    result = false;
-    sbuild::parse_value("true", result);
-    CPPUNIT_ASSERT(result == true);
-    result = false;
-    sbuild::parse_value("yes", result);
-    CPPUNIT_ASSERT(result == true);
-    result = false;
-    sbuild::parse_value("1", result);
-    CPPUNIT_ASSERT(result == true);
-
-    result = true;
-    sbuild::parse_value("false", result);
-    CPPUNIT_ASSERT(result == false);
-    result = true;
-    sbuild::parse_value("no", result);
-    CPPUNIT_ASSERT(result == false);
-    result = true;
-    sbuild::parse_value("0", result);
-    CPPUNIT_ASSERT(result == false);
-  }
-
-  void test_bool_fail()
-  {
-    bool result = true;
-
-    try
-      {
-        sbuild::parse_value("invalid", result);
-      }
-    catch (const sbuild::parse_value_error& e)
-      {
-        // Exception thown, and original value unmodified.
-        CPPUNIT_ASSERT(result == true);
-        return;
-      }
-    // Should never be reached
-    CPPUNIT_ASSERT(false);
-  }
+  bool result;
+
+  result = false;
+  sbuild::parse_value("true", result);
+  EXPECT_TRUE(result);
+  result = false;
+  sbuild::parse_value("yes", result);
+  EXPECT_TRUE(result);
+  result = false;
+  sbuild::parse_value("1", result);
+  EXPECT_TRUE(result);
+
+  result = true;
+  sbuild::parse_value("false", result);
+  EXPECT_FALSE(result);
+  result = true;
+  sbuild::parse_value("no", result);
+  EXPECT_FALSE(result);
+  result = true;
+  sbuild::parse_value("0", result);
+  EXPECT_FALSE(result);
+}
+
+TEST(ParseValue, BoolFail)
+{
+  bool result = true;
 
-  void test_int()
-  {
-    int result = 0;
-    sbuild::parse_value("23", result);
-    CPPUNIT_ASSERT(result == 23);
-  }
+  EXPECT_THROW(sbuild::parse_value("invalid", result), sbuild::parse_value_error);
+  EXPECT_TRUE(result);
+}
 
-  void test_int_fail()
-  {
-    int result = 22;
+TEST(ParseValue, Int)
+{
+  int result = 0;
+  sbuild::parse_value("23", result);
+  EXPECT_EQ(result, 23);
+}
 
-    try
-      {
-        sbuild::parse_value("invalid", result);
-      }
-    catch (const sbuild::parse_value_error& e)
-      {
-        // Exception thown, and original value unmodified.
-        CPPUNIT_ASSERT(result == 22);
-        return;
-      }
-    // Should never be reached
-    CPPUNIT_ASSERT(false);
-  }
+TEST(ParseValue, IntFail)
+{
+  int result = 22;
 
-  void test_string()
-  {
-    std::string result;
+  EXPECT_THROW(sbuild::parse_value("invalid", result), sbuild::parse_value_error);
+  EXPECT_EQ(result, 22);
+}
 
-    sbuild::parse_value("test string", result);
-    CPPUNIT_ASSERT(result == "test string");
-  }
-};
+TEST(ParseValue, String)
+{
+  std::string result;
 
-CPPUNIT_TEST_SUITE_REGISTRATION(test_parse_value);
+  sbuild::parse_value("test string", result);
+  EXPECT_EQ(result, "test string");
+}