1 files changed, 44 insertions, 65 deletions
diff --git a/test/sbuild/util.cc b/test/sbuild/util.cc
index 6a6fa661..46856d10 100644
--- a/test/sbuild/util.cc
+++ b/test/sbuild/util.cc
@@ -16,79 +16,58 @@
  *
  *********************************************************************/
 
+#include <gtest/gtest.h>
+
 #include <sbuild/util.h>
 
 #include <cstdlib>
 
-#include <cppunit/extensions/HelperMacros.h>
-
-using namespace CppUnit;
-
-class test_util : public TestCase
+TEST(Util, Basename)
 {
-  CPPUNIT_TEST_SUITE(test_util);
-  CPPUNIT_TEST(test_basename);
-  CPPUNIT_TEST(test_dirname);
-  CPPUNIT_TEST(test_string_list_to_string);
-  CPPUNIT_TEST(test_split_string);
-  CPPUNIT_TEST(test_find_program_in_path);
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  test_util()
-  {}
-
-  void test_basename()
-  {
-    CPPUNIT_ASSERT(sbuild::basename("/usr/bin/perl") == "perl");
-    CPPUNIT_ASSERT(sbuild::basename("/usr/lib") == "lib");
-    CPPUNIT_ASSERT(sbuild::basename("/usr/") == "usr");
-    CPPUNIT_ASSERT(sbuild::basename("usr") == "usr");
-    CPPUNIT_ASSERT(sbuild::basename("/") == "/");
-    CPPUNIT_ASSERT(sbuild::basename(".") == ".");
-    CPPUNIT_ASSERT(sbuild::basename("..") == "..");
-  }
-
-  void test_dirname()
-  {
-    CPPUNIT_ASSERT(sbuild::dirname("/usr/bin/perl") == "/usr/bin");
-    CPPUNIT_ASSERT(sbuild::dirname("/usr/lib") == "/usr");
-    CPPUNIT_ASSERT(sbuild::dirname("/usr/") == "/");
-    CPPUNIT_ASSERT(sbuild::dirname("usr") == ".");
-    CPPUNIT_ASSERT(sbuild::dirname("/") == "/");
-    CPPUNIT_ASSERT(sbuild::dirname(".") == ".");
-    CPPUNIT_ASSERT(sbuild::dirname("..") == ".");
-  }
+  ASSERT_EQ(sbuild::basename("/usr/bin/perl"), "perl");
+  ASSERT_EQ(sbuild::basename("/usr/lib"), "lib");
+  ASSERT_EQ(sbuild::basename("/usr/"), "usr");
+  ASSERT_EQ(sbuild::basename("usr"), "usr");
+  ASSERT_EQ(sbuild::basename("/"), "/");
+  ASSERT_EQ(sbuild::basename("."), ".");
+  ASSERT_EQ(sbuild::basename(".."), "..");
+}
 
-  void test_string_list_to_string()
-  {
-    sbuild::string_list items;
-    items.push_back("foo");
-    items.push_back("bar");
-    items.push_back("baz");
-
-    CPPUNIT_ASSERT(sbuild::string_list_to_string(items, "--") ==
-                   "foo--bar--baz");
-  }
+TEST(Util, Dirname)
+{
+  ASSERT_EQ(sbuild::dirname("/usr/bin/perl"), "/usr/bin");
+  ASSERT_EQ(sbuild::dirname("/usr/lib"), "/usr");
+  ASSERT_EQ(sbuild::dirname("/usr/"), "/");
+  ASSERT_EQ(sbuild::dirname("usr"), ".");
+  ASSERT_EQ(sbuild::dirname("/"), "/");
+  ASSERT_EQ(sbuild::dirname("."), ".");
+  ASSERT_EQ(sbuild::dirname(".."), ".");
+}
 
-  void test_split_string()
-  {
-    sbuild::string_list items =
-      sbuild::split_string("/usr/share/info", "/");
+TEST(Util, StringListToString)
+{
+  sbuild::string_list items;
+  items.push_back("foo");
+  items.push_back("bar");
+  items.push_back("baz");
 
-    CPPUNIT_ASSERT(items.size() == 3 &&
-                   items[0] == "usr" &&
-                   items[1] == "share" &&
-                   items[2] == "info");
-  }
+  ASSERT_EQ(sbuild::string_list_to_string(items, "--"), "foo--bar--baz");
+}
 
-  void test_find_program_in_path()
-  {
-    std::string path("/usr/local/bin:/usr/bin:/bin");
-    CPPUNIT_ASSERT(sbuild::find_program_in_path("sh", path, "") == "/bin/sh");
-    CPPUNIT_ASSERT(sbuild::find_program_in_path("sed", path, "") == "/bin/sed");
-  }
+TEST(Util, SplitString)
+{
+  sbuild::string_list items =
+    sbuild::split_string("/usr/share/info", "/");
 
-};
+  ASSERT_EQ(items.size(), 3);
+  ASSERT_EQ(items[0], "usr");
+  ASSERT_EQ(items[1], "share");
+  ASSERT_EQ(items[2], "info");
+}
 
-CPPUNIT_TEST_SUITE_REGISTRATION(test_util);
+TEST(Util, FindProgramInPath)
+{
+  std::string path("/usr/local/bin:/usr/bin:/bin");
+  ASSERT_EQ(sbuild::find_program_in_path("sh", path, ""), "/bin/sh");
+  ASSERT_EQ(sbuild::find_program_in_path("sed", path, ""), "/bin/sed");
+}