From 7ca6523bad267ba1d2886f6bfae1e88cfa8f7c24 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Tue, 1 Aug 2017 21:13:22 +0100 Subject: Mocks should accept and pass through options for DryIce --- p2pvr/daemon/unittests/mockDefs.cpp | 15 +++++++++------ p2pvr/daemon/unittests/mockDefs.h | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/p2pvr/daemon/unittests/mockDefs.cpp b/p2pvr/daemon/unittests/mockDefs.cpp index 49066da..0bba8c0 100644 --- a/p2pvr/daemon/unittests/mockDefs.cpp +++ b/p2pvr/daemon/unittests/mockDefs.cpp @@ -3,24 +3,27 @@ namespace P2PVR { namespace Testing { -SchemaOnlyMockDatabase::SchemaOnlyMockDatabase() : +SchemaOnlyMockDatabase::SchemaOnlyMockDatabase(const Ice::StringSeq & opts) : PQ::Mock("user=postgres dbname=postgres", "postgres", { - rootDir.parent_path().parent_path() / "datasources" / "schema.sql" }) + rootDir.parent_path().parent_path() / "datasources" / "schema.sql" }), + IceTray::DryIce(opts) { } -StandardMockDatabase::StandardMockDatabase() : +StandardMockDatabase::StandardMockDatabase(const Ice::StringSeq & opts) : PQ::Mock("user=postgres dbname=postgres", "postgres", { rootDir.parent_path().parent_path() / "datasources/schema.sql", - rootDir / "datasources" / "data.sql" }) + rootDir / "datasources" / "data.sql" }), + IceTray::DryIce(opts) { } -StandardMockDatabasePlusOffset::StandardMockDatabasePlusOffset() : +StandardMockDatabasePlusOffset::StandardMockDatabasePlusOffset(const Ice::StringSeq & opts) : PQ::Mock("user=postgres dbname=postgres", "postgres", { rootDir.parent_path().parent_path() / "datasources" / "schema.sql", rootDir / "datasources" / "data.sql", - rootDir / "datasources" / "eventOffset.sql" }) + rootDir / "datasources" / "eventOffset.sql" }), + IceTray::DryIce(opts) { } diff --git a/p2pvr/daemon/unittests/mockDefs.h b/p2pvr/daemon/unittests/mockDefs.h index 2874ef1..fa6490c 100644 --- a/p2pvr/daemon/unittests/mockDefs.h +++ b/p2pvr/daemon/unittests/mockDefs.h @@ -8,7 +8,7 @@ namespace P2PVR { namespace Testing { -#define DECLAREMOCK(Name) class DLL_PUBLIC Name : public PQ::Mock, public IceTray::DryIce { public: Name(); } +#define DECLAREMOCK(Name) class DLL_PUBLIC Name : public PQ::Mock, public IceTray::DryIce { public: Name(const Ice::StringSeq & opts = {}); } DECLAREMOCK(SchemaOnlyMockDatabase); DECLAREMOCK(StandardMockDatabase); -- cgit v1.2.3