test: Simplify dbconnectionpool_test.cpp

mixxxdj · Jul 31, 2020 · 757d6bd · 757d6bd
1 parent ac6270d
commit 757d6bd
Showing 1 changed file with 5 additions and 20 deletions.
diff --git a/src/test/dbconnectionpool_test.cpp b/src/test/dbconnectionpool_test.cpp
@@ -1,29 +1,14 @@
 #include <gtest/gtest.h>
 
-#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));