1 files changed, 22 insertions, 24 deletions

diff --git a/tests/database.cpp b/tests/database.cpp
index 4e2be14..47dfd7c 100644
--- a/tests/database.cpp
+++ b/tests/database.cpp
@@ -8,24 +8,22 @@ TEST_CASE("Database")
 {
 #ifdef USE_DATABASE
   Database::open(":memory:");
-  Database::set_verbose(false);
 
   SECTION("Basic retrieve and update")
     {
       auto o = Database::get_irc_server_options("zouzou@example.com", "irc.example.com");
-      o.update();
+      o.save(Database::db);
       auto a = Database::get_irc_server_options("zouzou@example.com", "irc.example.com");
       auto b = Database::get_irc_server_options("moumou@example.com", "irc.example.com");
 
       // b does not yet exist in the db, the object is created but not yet
       // inserted
-      CHECK(1 == Database::count<db::IrcServerOptions>());
+      CHECK(1 == Database::count(Database::irc_server_options));
 
-      b.update();
-      CHECK(2 == Database::count<db::IrcServerOptions>());
+      b.save(Database::db);
+      CHECK(2 == Database::count(Database::irc_server_options));
 
-      CHECK(b.pass == "");
-      CHECK(b.pass.value() == "");
+      CHECK(b.col<Database::Pass>() == "");
     }
 
   SECTION("channel options")
@@ -33,16 +31,16 @@ TEST_CASE("Database")
       Config::set("db_name", ":memory:");
       auto o = Database::get_irc_channel_options("zouzou@example.com", "irc.example.com", "#foo");
 
-      CHECK(o.encodingIn == "");
-      o.encodingIn = "ISO-8859-1";
-      o.update();
+      CHECK(o.col<Database::EncodingIn>() == "");
+      o.col<Database::EncodingIn>() = "ISO-8859-1";
+      o.save(Database::db);
       auto b = Database::get_irc_channel_options("zouzou@example.com", "irc.example.com", "#foo");
-      CHECK(o.encodingIn == "ISO-8859-1");
+      CHECK(o.col<Database::EncodingIn>() == "ISO-8859-1");
     }
 
   SECTION("Channel options with server default")
     {
-      const std::string owner{"zouzou@example.com"};
+      const std::string owner{"CACA@example.com"};
       const std::string server{"irc.example.com"};
       const std::string chan1{"#foo"};
 
@@ -51,43 +49,43 @@ TEST_CASE("Database")
 
       GIVEN("An option defined for the channel but not the server")
       {
-        c.encodingIn = "channelEncoding";
-        c.update();
+        c.col<Database::EncodingIn>() = "channelEncoding";
+        c.save(Database::db);
         WHEN("we fetch that option")
           {
             auto r = Database::get_irc_channel_options_with_server_default(owner, server, chan1);
             THEN("we get the channel option")
-              CHECK(r.encodingIn == "channelEncoding");
+              CHECK(r.col<Database::EncodingIn>() == "channelEncoding");
           }
       }
       GIVEN("An option defined for the server but not the channel")
         {
-          s.encodingIn = "serverEncoding";
-          s.update();
+          s.col<Database::EncodingIn>() = "serverEncoding";
+          s.save(Database::db);
         WHEN("we fetch that option")
           {
             auto r = Database::get_irc_channel_options_with_server_default(owner, server, chan1);
             THEN("we get the server option")
-              CHECK(r.encodingIn == "serverEncoding");
+              CHECK(r.col<Database::EncodingIn>() == "serverEncoding");
           }
         }
       GIVEN("An option defined for both the server and the channel")
         {
-          s.encodingIn = "serverEncoding";
-          s.update();
-          c.encodingIn = "channelEncoding";
-          c.update();
+          s.col<Database::EncodingIn>() = "serverEncoding";
+          s.save(Database::db);
+          c.col<Database::EncodingIn>() = "channelEncoding";
+          c.save(Database::db);
         WHEN("we fetch that option")
           {
             auto r = Database::get_irc_channel_options_with_server_default(owner, server, chan1);
             THEN("we get the channel option")
-              CHECK(r.encodingIn == "channelEncoding");
+              CHECK(r.col<Database::EncodingIn>() == "channelEncoding");
           }
         WHEN("we fetch that option, with no channel specified")
           {
             auto r = Database::get_irc_channel_options_with_server_default(owner, server, "");
             THEN("we get the server option")
-              CHECK(r.encodingIn == "serverEncoding");
+              CHECK(r.col<Database::EncodingIn>() == "serverEncoding");
           }
         }
     }