1 files changed, 97 insertions, 108 deletions

diff --git a/test/sbuild/chroot/facet/userdata.cc b/test/sbuild/chroot/facet/userdata.cc
index 7cd4662f..c7baa229 100644
--- a/test/sbuild/chroot/facet/userdata.cc
+++ b/test/sbuild/chroot/facet/userdata.cc
@@ -16,49 +16,37 @@
  *
  *********************************************************************/
 
+#include <gtest/gtest.h>
+
 #include <config.h>
 
 #include <sbuild/chroot/facet/directory.h>
 #include <sbuild/chroot/facet/userdata.h>
 
-#include <cppunit/extensions/HelperMacros.h>
-
-using namespace CppUnit;
-
 using sbuild::_;
 
-class test_chroot_facet_userdata : public TestFixture
+class Userdata : public ::testing::Test
 {
-  CPPUNIT_TEST_SUITE(test_chroot_facet_userdata);
-  CPPUNIT_TEST(test_data_set);
-  CPPUNIT_TEST_EXCEPTION(test_data_fail1, sbuild::chroot::facet::userdata::error);
-  CPPUNIT_TEST_EXCEPTION(test_data_fail2, sbuild::chroot::facet::userdata::error);
-  CPPUNIT_TEST_EXCEPTION(test_data_fail3, sbuild::chroot::facet::userdata::error);
-  CPPUNIT_TEST_EXCEPTION(test_data_fail4, sbuild::chroot::facet::userdata::error);
-  CPPUNIT_TEST(test_user_set);
-  CPPUNIT_TEST_EXCEPTION(test_user_fail1, sbuild::chroot::facet::userdata::error);
-  CPPUNIT_TEST_EXCEPTION(test_user_fail2, sbuild::chroot::facet::userdata::error);
-  CPPUNIT_TEST(test_root_set);
-  CPPUNIT_TEST_EXCEPTION(test_root_fail, sbuild::chroot::facet::userdata::error);
-  CPPUNIT_TEST_SUITE_END();
-
 public:
-  test_chroot_facet_userdata():
+  sbuild::chroot::chroot::ptr chroot;
+  sbuild::chroot::facet::userdata::ptr userdata;
+
+  Userdata():
     chroot(),
     userdata()
   {}
 
-  void setUp()
+  void SetUp()
   {
     chroot = sbuild::chroot::chroot::create("directory");
-    CPPUNIT_ASSERT(chroot);
+    ASSERT_NE(chroot, nullptr);
 
     sbuild::chroot::facet::directory::ptr dirfac = chroot->get_facet<sbuild::chroot::facet::directory>();
-    CPPUNIT_ASSERT(dirfac);
+    ASSERT_NE(dirfac, nullptr);
     dirfac->set_directory("/chroots/test");
 
     userdata = chroot->get_facet<sbuild::chroot::facet::userdata>();
-    CPPUNIT_ASSERT(userdata);
+    ASSERT_NE(userdata, nullptr);
 
     sbuild::string_set userkeys;
     userkeys.insert("sbuild.resolver");
@@ -70,108 +58,109 @@ public:
     userdata->set_root_modifiable_keys(rootkeys);
   }
 
-  void tearDown()
+  void TearDown()
   {
     this->chroot = sbuild::chroot::chroot::ptr();
     this->userdata = sbuild::chroot::facet::userdata::ptr();
   }
+};
 
-  void test_data_set()
-  {
-    userdata->set_data("custom.test1", "testval");
-    userdata->set_data("sbuild.resolver", "apt");
-    userdata->set_data("setup.fstab", "custom/fstab");
+TEST_F(Userdata, Set)
+{
+  userdata->set_data("custom.test1", "testval");
+  userdata->set_data("sbuild.resolver", "apt");
+  userdata->set_data("setup.fstab", "custom/fstab");
 
-    std::string t1;
-    CPPUNIT_ASSERT(userdata->get_data("custom.test1", t1));
-    CPPUNIT_ASSERT(t1 == "testval");
+  std::string t1;
+  ASSERT_TRUE(userdata->get_data("custom.test1", t1));
+  ASSERT_EQ(t1, "testval");
 
-    std::string t2;
-    CPPUNIT_ASSERT(userdata->get_data("sbuild.resolver", t2));
-    CPPUNIT_ASSERT(t2 == "apt");
+  std::string t2;
+  ASSERT_TRUE(userdata->get_data("sbuild.resolver", t2));
+  ASSERT_EQ(t2, "apt");
 
-    std::string t3;
-    CPPUNIT_ASSERT(userdata->get_data("setup.fstab", t3));
-    CPPUNIT_ASSERT(t3 == "custom/fstab");
+  std::string t3;
+  ASSERT_TRUE(userdata->get_data("setup.fstab", t3));
+  ASSERT_EQ(t3, "custom/fstab");
 
-    std::string t4("invalid");
-    CPPUNIT_ASSERT(!userdata->get_data("invalidkey", t4));
-    CPPUNIT_ASSERT(t4 == "invalid");
-  }
+  std::string t4("invalid");
+  ASSERT_TRUE(!userdata->get_data("invalidkey", t4));
+  ASSERT_EQ(t4, "invalid");
+}
 
-  void test_data_fail1()
-  {
-    userdata->set_data("custom", "testval");
-  }
-
-  void test_data_fail2()
-  {
-    userdata->set_data("custom.key.set", "testval1");
-    userdata->set_data("custom.key_set", "testval2");
-  }
+TEST_F(Userdata, SetFail1)
+{
+  EXPECT_THROW(userdata->set_data("custom", "testval"),
+               sbuild::chroot::facet::userdata::error);
+}
 
-  void test_data_fail3()
-  {
-    userdata->set_data("setup-data-dir", "testval3");
-  }
+TEST_F(Userdata, SetFail2)
+{
+  EXPECT_NO_THROW(userdata->set_data("custom.key.set", "testval1"));
+  EXPECT_THROW(userdata->set_data("custom.key_set", "testval2"),
+               sbuild::chroot::facet::userdata::error);
+}
 
-  void test_data_fail4()
-  {
-    userdata->set_data("setup.data.dir", "testval4");
-  }
+TEST_F(Userdata, SetFail3)
+{
+  EXPECT_THROW(userdata->set_data("setup-data-dir", "testval3"),
+               sbuild::chroot::facet::userdata::error);
+}
 
-  void test_user_set()
-  {
-    sbuild::string_map d;
-    d.insert(std::make_pair("sbuild.resolver", "aptitude"));
-    userdata->set_user_data(d);
+TEST_F(Userdata, SetFail4)
+{
+  EXPECT_THROW(userdata->set_data("setup.data.dir", "testval4"),
+               sbuild::chroot::facet::userdata::error);
+}
 
-    std::string t1;
-    CPPUNIT_ASSERT(userdata->get_data("sbuild.resolver", t1));
-    CPPUNIT_ASSERT(t1 == "aptitude");
-  }
+TEST_F(Userdata, UserSet)
+{
+  sbuild::string_map d;
+  d.insert(std::make_pair("sbuild.resolver", "aptitude"));
+  userdata->set_user_data(d);
 
-  void test_user_fail1()
-  {
-    sbuild::string_map d;
-    d.insert(std::make_pair("sbuild.apt-update", "true"));
-    userdata->set_user_data(d);
-  }
+  std::string t1;
+  ASSERT_TRUE(userdata->get_data("sbuild.resolver", t1));
+  ASSERT_EQ(t1, "aptitude");
+}
 
-  void test_user_fail2()
-  {
-    // Use root key.
-    sbuild::string_map d;
-    d.insert(std::make_pair("debian.apt-update", "false"));
-    userdata->set_user_data(d);
-  }
+TEST_F(Userdata, UserSetFail1)
+{
+  sbuild::string_map d;
+  d.insert(std::make_pair("sbuild.apt-update", "true"));
+  EXPECT_THROW(userdata->set_user_data(d),
+               sbuild::chroot::facet::userdata::error);
+}
 
-  void test_root_set()
-  {
-    sbuild::string_map d;
-    d.insert(std::make_pair("sbuild.resolver", "aptitude"));
-    d.insert(std::make_pair("debian.apt-update", "false"));
-    userdata->set_root_data(d);
-
-    std::string t1;
-    CPPUNIT_ASSERT(userdata->get_data("sbuild.resolver", t1));
-    CPPUNIT_ASSERT(t1 == "aptitude");
-
-    std::string t2;
-    CPPUNIT_ASSERT(userdata->get_data("debian.apt-update", t2));
-    CPPUNIT_ASSERT(t2 == "false");
-  }
+TEST_F(Userdata, UserSetFail2)
+{
+  // Use root key.
+  sbuild::string_map d;
+  d.insert(std::make_pair("debian.apt-update", "false"));
+  EXPECT_THROW(userdata->set_user_data(d),
+               sbuild::chroot::facet::userdata::error);
+}
+
+TEST_F(Userdata, RootSet)
+{
+  sbuild::string_map d;
+  d.insert(std::make_pair("sbuild.resolver", "aptitude"));
+  d.insert(std::make_pair("debian.apt-update", "false"));
+  userdata->set_root_data(d);
 
-  void test_root_fail()
-  {
-    sbuild::string_map d;
-    d.insert(std::make_pair("invalid.key", "testv"));
-    userdata->set_root_data(d);
-  }
+  std::string t1;
+  ASSERT_TRUE(userdata->get_data("sbuild.resolver", t1));
+  ASSERT_EQ(t1, "aptitude");
 
-private:
-  sbuild::chroot::chroot::ptr chroot;
-  sbuild::chroot::facet::userdata::ptr userdata;
-};
+  std::string t2;
+  ASSERT_TRUE(userdata->get_data("debian.apt-update", t2));
+  ASSERT_EQ(t2, "false");
+}
 
-CPPUNIT_TEST_SUITE_REGISTRATION(test_chroot_facet_userdata);
+TEST_F(Userdata, RootSetFail)
+{
+  sbuild::string_map d;
+  d.insert(std::make_pair("invalid.key", "testv"));
+  EXPECT_THROW(userdata->set_root_data(d),
+               sbuild::chroot::facet::userdata::error);
+}