From 752d30aed2e66588f7aa2931058c175a3c6d2606 Mon Sep 17 00:00:00 2001 From: xerus2000 <27jf@pm.me> Date: Fri, 31 Jul 2020 17:49:09 +0200 Subject: test: Simplify dbconnectionpool_test.cpp --- src/test/dbconnectionpool_test.cpp | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/src/test/dbconnectionpool_test.cpp b/src/test/dbconnectionpool_test.cpp index cfef128462..77585d1b76 100644 --- a/src/test/dbconnectionpool_test.cpp +++ b/src/test/dbconnectionpool_test.cpp @@ -1,29 +1,14 @@ #include -#include "test/mixxxtest.h" - -#include "database/mixxxdb.h" -#include "util/db/dbconnectionpooler.h" -#include "util/db/dbconnectionpooled.h" - #include "library/dao/settingsdao.h" +#include "test/mixxxdbtest.h" +#include "util/db/dbconnectionpooler.h" -#include "util/assert.h" - - -class DbConnectionPoolTest : public MixxxTest { - protected: - DbConnectionPoolTest() - : m_mixxxDb(config()) { - } - - protected: - const MixxxDb m_mixxxDb; -}; +class DbConnectionPoolTest : public MixxxTest {}; TEST_F(DbConnectionPoolTest, MoveSemantics) { - mixxx::DbConnectionPooler p1(m_mixxxDb.connectionPool()); - EXPECT_TRUE(p1.isPooling()); + mixxx::DbConnectionPooler p1(MixxxDb(config()).connectionPool()); + ASSERT_TRUE(p1.isPooling()); // Move construction mixxx::DbConnectionPooler p2(std::move(p1)); -- cgit v1.2.3