Skip to content

Commit 274a35d

Browse files
wraverywravery
committed
Reset the mock service state for each test
1 parent 7d56338 commit 274a35d

File tree

3 files changed

+45
-38
lines changed

3 files changed

+45
-38
lines changed

‎test/ClientTests.cpp

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,25 @@ class ClientCase : public ::testing::Test
3030
std::string fakeFolderId("fakeFolderId");
3131
_fakeFolderId.resize(fakeFolderId.size());
3232
std::copy(fakeFolderId.cbegin(), fakeFolderId.cend(), _fakeFolderId.begin());
33+
}
3334

35+
void SetUp() override
36+
{
3437
auto query = std::make_shared<today::Query>(
35-
[]() -> std::vector<std::shared_ptr<today::Appointment>> {
38+
[this]() -> std::vector<std::shared_ptr<today::Appointment>> {
3639
++_getAppointmentsCount;
3740
return { std::make_shared<today::Appointment>(response::IdType(_fakeAppointmentId),
3841
"tomorrow",
3942
"Lunch?",
4043
false) };
4144
},
42-
[]() -> std::vector<std::shared_ptr<today::Task>> {
45+
[this]() -> std::vector<std::shared_ptr<today::Task>> {
4346
++_getTasksCount;
4447
return { std::make_shared<today::Task>(response::IdType(_fakeTaskId),
4548
"Don't forget",
4649
true) };
4750
},
48-
[]() -> std::vector<std::shared_ptr<today::Folder>> {
51+
[this]() -> std::vector<std::shared_ptr<today::Folder>> {
4952
++_getUnreadCountsCount;
5053
return { std::make_shared<today::Folder>(response::IdType(_fakeFolderId),
5154
"\"Fake\" Inbox",
@@ -71,34 +74,33 @@ class ClientCase : public ::testing::Test
7174
_service = std::make_shared<today::Operations>(query, mutation, subscription);
7275
}
7376

77+
void TearDown() override
78+
{
79+
_service.reset();
80+
}
81+
7482
static void TearDownTestCase()
7583
{
7684
_fakeAppointmentId.clear();
7785
_fakeTaskId.clear();
7886
_fakeFolderId.clear();
79-
_service.reset();
8087
}
8188

8289
protected:
8390
static response::IdType _fakeAppointmentId;
8491
static response::IdType _fakeTaskId;
8592
static response::IdType _fakeFolderId;
8693

87-
static std::shared_ptr<today::Operations> _service;
88-
static size_t _getAppointmentsCount;
89-
static size_t _getTasksCount;
90-
static size_t _getUnreadCountsCount;
94+
std::shared_ptr<today::Operations> _service {};
95+
size_t _getAppointmentsCount {};
96+
size_t _getTasksCount {};
97+
size_t _getUnreadCountsCount {};
9198
};
9299

93100
response::IdType ClientCase::_fakeAppointmentId;
94101
response::IdType ClientCase::_fakeTaskId;
95102
response::IdType ClientCase::_fakeFolderId;
96103

97-
std::shared_ptr<today::Operations> ClientCase::_service;
98-
size_t ClientCase::_getAppointmentsCount = 0;
99-
size_t ClientCase::_getTasksCount = 0;
100-
size_t ClientCase::_getUnreadCountsCount = 0;
101-
102104
TEST_F(ClientCase, QueryEverything)
103105
{
104106
using namespace client::query::Query;

‎test/NoIntrospectionTests.cpp

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,25 @@ class NoIntrospectionServiceCase : public ::testing::Test
3232
std::string fakeFolderId("fakeFolderId");
3333
_fakeFolderId.resize(fakeFolderId.size());
3434
std::copy(fakeFolderId.cbegin(), fakeFolderId.cend(), _fakeFolderId.begin());
35+
}
3536

37+
void SetUp() override
38+
{
3639
auto query = std::make_shared<today::Query>(
37-
[]() -> std::vector<std::shared_ptr<today::Appointment>> {
40+
[this]() -> std::vector<std::shared_ptr<today::Appointment>> {
3841
++_getAppointmentsCount;
3942
return { std::make_shared<today::Appointment>(response::IdType(_fakeAppointmentId),
4043
"tomorrow",
4144
"Lunch?",
4245
false) };
4346
},
44-
[]() -> std::vector<std::shared_ptr<today::Task>> {
47+
[this]() -> std::vector<std::shared_ptr<today::Task>> {
4548
++_getTasksCount;
4649
return { std::make_shared<today::Task>(response::IdType(_fakeTaskId),
4750
"Don't forget",
4851
true) };
4952
},
50-
[]() -> std::vector<std::shared_ptr<today::Folder>> {
53+
[this]() -> std::vector<std::shared_ptr<today::Folder>> {
5154
++_getUnreadCountsCount;
5255
return { std::make_shared<today::Folder>(response::IdType(_fakeFolderId),
5356
"\"Fake\" Inbox",
@@ -73,33 +76,33 @@ class NoIntrospectionServiceCase : public ::testing::Test
7376
_service = std::make_shared<today::Operations>(query, mutation, subscription);
7477
}
7578

79+
void TearDown() override
80+
{
81+
_service.reset();
82+
}
83+
7684
static void TearDownTestCase()
7785
{
7886
_fakeAppointmentId.clear();
7987
_fakeTaskId.clear();
8088
_fakeFolderId.clear();
81-
_service.reset();
8289
}
8390

8491
protected:
8592
static response::IdType _fakeAppointmentId;
8693
static response::IdType _fakeTaskId;
8794
static response::IdType _fakeFolderId;
8895

89-
static std::shared_ptr<today::Operations> _service;
90-
static size_t _getAppointmentsCount;
91-
static size_t _getTasksCount;
92-
static size_t _getUnreadCountsCount;
96+
std::shared_ptr<today::Operations> _service {};
97+
size_t _getAppointmentsCount {};
98+
size_t _getTasksCount {};
99+
size_t _getUnreadCountsCount {};
93100
};
94101

95102
response::IdType NoIntrospectionServiceCase::_fakeAppointmentId;
96103
response::IdType NoIntrospectionServiceCase::_fakeTaskId;
97104
response::IdType NoIntrospectionServiceCase::_fakeFolderId;
98105

99-
std::shared_ptr<today::Operations> NoIntrospectionServiceCase::_service;
100-
size_t NoIntrospectionServiceCase::_getAppointmentsCount = 0;
101-
size_t NoIntrospectionServiceCase::_getTasksCount = 0;
102-
size_t NoIntrospectionServiceCase::_getUnreadCountsCount = 0;
103106
size_t today::NextAppointmentChange::_notifySubscribeCount = 0;
104107
size_t today::NextAppointmentChange::_subscriptionCount = 0;
105108
size_t today::NextAppointmentChange::_notifyUnsubscribeCount = 0;

‎test/TodayTests.cpp

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,25 @@ class TodayServiceCase : public ::testing::Test
2929
std::string fakeFolderId("fakeFolderId");
3030
_fakeFolderId.resize(fakeFolderId.size());
3131
std::copy(fakeFolderId.cbegin(), fakeFolderId.cend(), _fakeFolderId.begin());
32+
}
3233

34+
void SetUp() override
35+
{
3336
auto query = std::make_shared<today::Query>(
34-
[]() -> std::vector<std::shared_ptr<today::Appointment>> {
37+
[this]() -> std::vector<std::shared_ptr<today::Appointment>> {
3538
++_getAppointmentsCount;
3639
return { std::make_shared<today::Appointment>(response::IdType(_fakeAppointmentId),
3740
"tomorrow",
3841
"Lunch?",
3942
false) };
4043
},
41-
[]() -> std::vector<std::shared_ptr<today::Task>> {
44+
[this]() -> std::vector<std::shared_ptr<today::Task>> {
4245
++_getTasksCount;
4346
return { std::make_shared<today::Task>(response::IdType(_fakeTaskId),
4447
"Don't forget",
4548
true) };
4649
},
47-
[]() -> std::vector<std::shared_ptr<today::Folder>> {
50+
[this]() -> std::vector<std::shared_ptr<today::Folder>> {
4851
++_getUnreadCountsCount;
4952
return { std::make_shared<today::Folder>(response::IdType(_fakeFolderId),
5053
"\"Fake\" Inbox",
@@ -70,34 +73,33 @@ class TodayServiceCase : public ::testing::Test
7073
_service = std::make_shared<today::Operations>(query, mutation, subscription);
7174
}
7275

76+
void TearDown() override
77+
{
78+
_service.reset();
79+
}
80+
7381
static void TearDownTestCase()
7482
{
7583
_fakeAppointmentId.clear();
7684
_fakeTaskId.clear();
7785
_fakeFolderId.clear();
78-
_service.reset();
7986
}
8087

8188
protected:
8289
static response::IdType _fakeAppointmentId;
8390
static response::IdType _fakeTaskId;
8491
static response::IdType _fakeFolderId;
8592

86-
static std::shared_ptr<today::Operations> _service;
87-
static size_t _getAppointmentsCount;
88-
static size_t _getTasksCount;
89-
static size_t _getUnreadCountsCount;
93+
std::shared_ptr<today::Operations> _service {};
94+
size_t _getAppointmentsCount {};
95+
size_t _getTasksCount {};
96+
size_t _getUnreadCountsCount {};
9097
};
9198

9299
response::IdType TodayServiceCase::_fakeAppointmentId;
93100
response::IdType TodayServiceCase::_fakeTaskId;
94101
response::IdType TodayServiceCase::_fakeFolderId;
95102

96-
std::shared_ptr<today::Operations> TodayServiceCase::_service;
97-
size_t TodayServiceCase::_getAppointmentsCount = 0;
98-
size_t TodayServiceCase::_getTasksCount = 0;
99-
size_t TodayServiceCase::_getUnreadCountsCount = 0;
100-
101103
TEST_F(TodayServiceCase, QueryEverything)
102104
{
103105
auto query = R"(

0 commit comments

Comments
 (0)