changeset 760:35c1517d705d

Tests: make consistency
author David Demelier <markand@malikania.fr>
date Fri, 10 Aug 2018 12:29:00 +0200
parents 791d7591eca7
children f25c878d823b
files tests/src/irccdctl/cli-plugin-config/main.cpp tests/src/libcommon/io/main.cpp tests/src/libcommon/string-util/main.cpp tests/src/libirccd-js/js-api-directory/main.cpp tests/src/libirccd-js/js-api-elapsedtimer/main.cpp tests/src/libirccd-js/js-api-file/main.cpp tests/src/libirccd-js/js-api-irccd/main.cpp tests/src/libirccd-js/js-api-logger/main.cpp tests/src/libirccd-js/js-api-system/main.cpp tests/src/libirccd-js/js-api-timer/main.cpp tests/src/libirccd-js/js-api-unicode/main.cpp tests/src/libirccd-js/js-api-util/main.cpp tests/src/libirccd-js/js-plugin/main.cpp tests/src/libirccd/command-plugin-config/main.cpp tests/src/libirccd/command-plugin-info/main.cpp tests/src/libirccd/command-plugin-list/main.cpp tests/src/libirccd/command-plugin-load/main.cpp tests/src/libirccd/command-plugin-reload/main.cpp tests/src/libirccd/command-plugin-unload/main.cpp tests/src/libirccd/command-rule-add/main.cpp tests/src/libirccd/command-rule-edit/main.cpp tests/src/libirccd/command-rule-info/main.cpp tests/src/libirccd/command-rule-list/main.cpp tests/src/libirccd/command-rule-move/main.cpp tests/src/libirccd/command-rule-remove/main.cpp tests/src/libirccd/command-server-connect/main.cpp tests/src/libirccd/command-server-disconnect/main.cpp tests/src/libirccd/command-server-info/main.cpp tests/src/libirccd/command-server-invite/main.cpp tests/src/libirccd/command-server-join/main.cpp tests/src/libirccd/command-server-kick/main.cpp tests/src/libirccd/command-server-list/main.cpp tests/src/libirccd/command-server-me/main.cpp tests/src/libirccd/command-server-message/main.cpp tests/src/libirccd/command-server-mode/main.cpp tests/src/libirccd/command-server-nick/main.cpp tests/src/libirccd/command-server-notice/main.cpp tests/src/libirccd/command-server-part/main.cpp tests/src/libirccd/command-server-reconnect/main.cpp tests/src/libirccd/command-server-topic/main.cpp tests/src/libirccd/rule-util/main.cpp
diffstat 41 files changed, 181 insertions(+), 110 deletions(-) [+]
line wrap: on
line diff
--- a/tests/src/irccdctl/cli-plugin-config/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/irccdctl/cli-plugin-config/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -22,7 +22,9 @@
 #include <irccd/test/cli_fixture.hpp>
 #include <irccd/test/mock_plugin.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -115,4 +117,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libcommon/io/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libcommon/io/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -48,7 +48,7 @@
 
 namespace {
 
-class io_test {
+class io_fixture {
 public:
     io_service service_;
 
@@ -58,9 +58,9 @@
     std::shared_ptr<io::stream> stream1_;
     std::shared_ptr<io::stream> stream2_;
 
-    virtual std::unique_ptr<io::acceptor> create_acceptor() = 0;
+    virtual auto create_acceptor() -> std::unique_ptr<io::acceptor> = 0;
 
-    virtual std::unique_ptr<io::connector> create_connector() = 0;
+    virtual auto create_connector() -> std::unique_ptr<io::connector> = 0;
 
     void init()
     {
@@ -85,15 +85,15 @@
     }
 };
 
-class ip_io_test : public io_test {
+class ip_io_fixture : public io_fixture {
 private:
     tcp::endpoint endpoint_;
 
 protected:
     /**
-     * \copydoc io_test::create_acceptor
+     * \copydoc io_fixture::create_acceptor
      */
-    std::unique_ptr<io::acceptor> create_acceptor() override
+    auto create_acceptor() -> std::unique_ptr<io::acceptor> override
     {
         tcp::endpoint endpoint(tcp::v4(), 0U);
         tcp::acceptor acceptor(service_, std::move(endpoint));
@@ -104,9 +104,9 @@
     }
 
     /**
-     * \copydoc io_test::create_connector
+     * \copydoc io_fixture::create_connector
      */
-    std::unique_ptr<io::connector> create_connector() override
+    auto create_connector() -> std::unique_ptr<io::connector> override
     {
         return std::make_unique<io::ip_connector>(service_, endpoint_);
     }
@@ -114,15 +114,15 @@
 
 #if defined(IRCCD_HAVE_SSL)
 
-class ssl_io_test : public io_test {
+class ssl_io_fixture : public io_fixture {
 private:
     tcp::endpoint endpoint_;
 
 protected:
     /**
-     * \copydoc io_test::create_acceptor
+     * \copydoc io_fixture::create_acceptor
      */
-    std::unique_ptr<io::acceptor> create_acceptor() override
+    auto create_acceptor() -> std::unique_ptr<io::acceptor> override
     {
         context context(context::sslv23);
 
@@ -138,9 +138,9 @@
     }
 
     /**
-     * \copydoc io_test::create_connector
+     * \copydoc io_fixture::create_connector
      */
-    std::unique_ptr<io::connector> create_connector() override
+    auto create_connector() -> std::unique_ptr<io::connector> override
     {
         return std::make_unique<io::tls_connector<>>(context(context::sslv23), service_, endpoint_);
     }
@@ -150,12 +150,12 @@
 
 #if !BOOST_OS_WINDOWS
 
-class local_io_test : public io_test {
+class local_io_fixture : public io_fixture {
 public:
     /**
-     * \copydoc io_test::create_acceptor
+     * \copydoc io_fixture::create_acceptor
      */
-    std::unique_ptr<io::acceptor> create_acceptor() override
+    auto create_acceptor() -> std::unique_ptr<io::acceptor> override
     {
         std::remove(CMAKE_BINARY_DIR "/tmp/io-test.sock");
 
@@ -165,9 +165,9 @@
     }
 
     /**
-     * \copydoc io_test::create_connector
+     * \copydoc io_fixture::create_connector
      */
-    std::unique_ptr<io::connector> create_connector() override
+    auto create_connector() -> std::unique_ptr<io::connector> override
     {
         return std::make_unique<io::local_connector>(service_, CMAKE_BINARY_DIR "/tmp/io-test.sock");
     }
@@ -179,12 +179,12 @@
  * List of fixtures to tests.
  */
 using list = boost::mpl::list<
-    ip_io_test
+    ip_io_fixture
 #if defined(IRCCD_HAVE_SSL)
-    , ssl_io_test
+    , ssl_io_fixture
 #endif
 #if !BOOST_OS_WINDOWS
-    , local_io_test
+    , local_io_fixture
 #endif
 >;
 
--- a/tests/src/libcommon/string-util/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libcommon/string-util/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -220,7 +220,7 @@
     BOOST_TEST(result == "without");
 }
 
-BOOST_AUTO_TEST_CASE(betweenEmpty)
+BOOST_AUTO_TEST_CASE(between_empty)
 {
     std::string value = "one list";
     std::string result = string_util::strip(value);
@@ -228,7 +228,7 @@
     BOOST_TEST(result == "one list");
 }
 
-BOOST_AUTO_TEST_CASE(betweenLeft)
+BOOST_AUTO_TEST_CASE(between_left)
 {
     std::string value = "  space at left";
     std::string result = string_util::strip(value);
@@ -236,7 +236,7 @@
     BOOST_TEST(result == "space at left");
 }
 
-BOOST_AUTO_TEST_CASE(betweenRight)
+BOOST_AUTO_TEST_CASE(between_right)
 {
     std::string value = "space at right  ";
     std::string result = string_util::strip(value);
@@ -244,7 +244,7 @@
     BOOST_TEST(result == "space at right");
 }
 
-BOOST_AUTO_TEST_CASE(betweenBoth)
+BOOST_AUTO_TEST_CASE(between_both)
 {
     std::string value = "  space at both  ";
     std::string result = string_util::strip(value);
@@ -293,7 +293,7 @@
     BOOST_TEST(expected == result);
 }
 
-BOOST_AUTO_TEST_CASE(delimiterString)
+BOOST_AUTO_TEST_CASE(delimiter_string)
 {
     std::string expected = "1;;2;;3";
     std::string result = string_util::join({1, 2, 3}, ";;");
@@ -301,7 +301,7 @@
     BOOST_TEST(expected == result);
 }
 
-BOOST_AUTO_TEST_CASE(delimiterChar)
+BOOST_AUTO_TEST_CASE(delimiter_char)
 {
     std::string expected = "1@2@3@4";
     std::string result = string_util::join({1, 2, 3, 4}, '@');
--- a/tests/src/libirccd-js/js-api-directory/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd-js/js-api-directory/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -21,9 +21,10 @@
 
 #include <irccd/test/js_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::js;
+using namespace irccd::test;
 
-using namespace irccd::js;
+namespace irccd {
 
 namespace {
 
@@ -57,4 +58,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd-js/js-api-elapsedtimer/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd-js/js-api-elapsedtimer/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -25,7 +25,10 @@
 
 using namespace std::chrono_literals;
 
-namespace irccd::test {
+using namespace irccd::js;
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -34,12 +37,12 @@
 BOOST_AUTO_TEST_CASE(standard)
 {
     if (duk_peval_string(plugin_->get_context(), "timer = new Irccd.ElapsedTimer();") != 0)
-        throw js::duk::get_stack(plugin_->get_context(), -1);
+        throw duk::get_stack(plugin_->get_context(), -1);
 
     std::this_thread::sleep_for(300ms);
 
     if (duk_peval_string(plugin_->get_context(), "result = timer.elapsed();") != 0)
-        throw js::duk::get_stack(plugin_->get_context(), -1);
+        throw duk::get_stack(plugin_->get_context(), -1);
 
     BOOST_REQUIRE(duk_get_global_string(plugin_->get_context(), "result"));
     BOOST_REQUIRE_GE(duk_get_int(plugin_->get_context(), -1), 250);
@@ -50,4 +53,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd-js/js-api-file/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd-js/js-api-file/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -24,8 +24,9 @@
 #include <irccd/test/js_fixture.hpp>
 
 using namespace irccd::js;
+using namespace irccd::test;
 
-namespace irccd::test {
+namespace irccd {
 
 namespace {
 
@@ -317,4 +318,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd-js/js-api-irccd/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd-js/js-api-irccd/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -22,8 +22,9 @@
 #include <irccd/test/js_fixture.hpp>
 
 using namespace irccd::js;
+using namespace irccd::test;
 
-namespace irccd::test {
+namespace irccd {
 
 namespace {
 
@@ -115,4 +116,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd-js/js-api-logger/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd-js/js-api-logger/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -23,9 +23,10 @@
 
 #include <irccd/test/js_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::js;
+using namespace irccd::test;
 
-using namespace irccd::js;
+namespace irccd {
 
 namespace {
 
@@ -102,4 +103,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd-js/js-api-system/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd-js/js-api-system/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -23,9 +23,10 @@
 
 #include <irccd/test/js_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::js;
+using namespace irccd::test;
 
-using namespace irccd::js;
+namespace irccd {
 
 namespace {
 
@@ -61,4 +62,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd-js/js-api-timer/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd-js/js-api-timer/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -22,7 +22,9 @@
 
 #include <irccd/test/js_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -82,4 +84,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd-js/js-api-unicode/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd-js/js-api-unicode/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -25,7 +25,9 @@
 
 #include <irccd/test/js_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -68,4 +70,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd-js/js-api-util/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd-js/js-api-util/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -21,9 +21,10 @@
 
 #include <irccd/test/js_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::js;
+using namespace irccd::test;
 
-using namespace irccd::js;
+namespace irccd {
 
 namespace {
 
@@ -261,4 +262,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd-js/js-plugin/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd-js/js-plugin/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -26,7 +26,9 @@
 
 #include <irccd/test/irccd_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -150,4 +152,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-plugin-config/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-plugin-config/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -21,7 +21,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -117,4 +119,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-plugin-info/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-plugin-info/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -21,7 +21,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -72,4 +74,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-plugin-list/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-plugin-list/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -21,7 +21,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -53,4 +55,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-plugin-load/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-plugin-load/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -21,7 +21,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -164,4 +166,4 @@
 
 BOOST_AUTO_TEST_SUITE_END()
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-plugin-reload/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-plugin-reload/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -21,7 +21,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -112,4 +114,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-plugin-unload/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-plugin-unload/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -21,7 +21,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -113,4 +115,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-rule-add/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-rule-add/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -23,7 +23,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -142,4 +144,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-rule-edit/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-rule-edit/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -23,7 +23,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -398,4 +400,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-rule-info/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-rule-info/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -23,7 +23,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -120,4 +122,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-rule-list/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-rule-list/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -23,7 +23,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -111,4 +113,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-rule-move/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-rule-move/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -23,7 +23,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -357,4 +359,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-rule-remove/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-rule-remove/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -23,7 +23,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -125,4 +127,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-server-connect/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-server-connect/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -21,7 +21,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -220,4 +222,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-server-disconnect/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-server-disconnect/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -21,7 +21,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -99,4 +101,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-server-info/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-server-info/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -21,7 +21,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -102,4 +104,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-server-invite/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-server-invite/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -21,7 +21,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -149,4 +151,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-server-join/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-server-join/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -21,7 +21,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -145,4 +147,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-server-kick/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-server-kick/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -21,7 +21,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -183,4 +185,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-server-list/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-server-list/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -21,7 +21,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -55,4 +57,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-server-me/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-server-me/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -21,7 +21,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -121,4 +123,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-server-message/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-server-message/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -21,7 +21,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -121,4 +123,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-server-mode/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-server-mode/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -21,7 +21,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -148,4 +150,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-server-nick/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-server-nick/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -21,7 +21,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -112,4 +114,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-server-notice/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-server-notice/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -21,7 +21,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -121,4 +123,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-server-part/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-server-part/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -21,7 +21,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -131,4 +133,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-server-reconnect/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-server-reconnect/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -21,7 +21,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -112,4 +114,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/command-server-topic/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/command-server-topic/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -21,7 +21,9 @@
 
 #include <irccd/test/command_fixture.hpp>
 
-namespace irccd::test {
+using namespace irccd::test;
+
+namespace irccd {
 
 namespace {
 
@@ -121,4 +123,4 @@
 
 } // !namespace
 
-} // !irccd::test
+} // !irccd
--- a/tests/src/libirccd/rule-util/main.cpp	Thu Aug 09 13:29:00 2018 +0200
+++ b/tests/src/libirccd/rule-util/main.cpp	Fri Aug 10 12:29:00 2018 +0200
@@ -29,7 +29,7 @@
 
 namespace {
 
-ini::document open(const std::string& config)
+auto open(const std::string& config) -> ini::document
 {
     boost::filesystem::path path;