Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit55a2ec6

Browse files
committed
Attempt to fix mocks
1 parent3d05b41 commit55a2ec6

File tree

5 files changed

+9
-30
lines changed

5 files changed

+9
-30
lines changed

‎contrib/test/mock-firebase.h

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,15 @@ namespace modem {
1010

1111
classMockFirebase :publicFirebase {
1212
public:
13-
MOCK_METHOD1(getPtr, std::unique_ptr<FirebaseGet>(const std::string&));
14-
MOCK_METHOD2(setPtr, std::unique_ptr<FirebaseSet>(const std::string&,const std::string&));
15-
MOCK_METHOD2(pushPtr, std::unique_ptr<FirebasePush>(const std::string&,const std::string&));
16-
MOCK_METHOD1(removePtr, std::unique_ptr<FirebaseRemove>(const std::string&));
17-
MOCK_METHOD1(streamPtr, std::unique_ptr<FirebaseStream>(const std::string&));
1813
};
1914

20-
classMockFirebaseGet :publicFirebaseGet {
21-
public:
22-
MOCK_CONST_METHOD0(response,const std::string&());
23-
MOCK_CONST_METHOD0(error,const FirebaseError&());
24-
};
2515

26-
classMockFirebaseSet :publicFirebaseSet {
27-
public:
28-
MOCK_CONST_METHOD0(json,const std::string&());
29-
MOCK_CONST_METHOD0(error,const FirebaseError&());
30-
};
31-
32-
classMockFirebasePush :publicFirebasePush {
16+
classMockFirebaseRequest :publicFirebaseRequest {
3317
public:
3418
MOCK_CONST_METHOD0(name,const std::string&());
3519
MOCK_CONST_METHOD0(error,const FirebaseError&());
3620
};
3721

38-
classMockFirebaseRemove :publicFirebaseRemove {
39-
public:
40-
MOCK_CONST_METHOD0(error,const FirebaseError&());
41-
};
42-
4322
classMockFirebaseStream :publicFirebaseStream {
4423
public:
4524
MOCK_METHOD0(available,bool());

‎contrib/test/modem/get-command_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ using ::testing::_;
1616
classGetCommandTest : public ::testing::Test {
1717
protected:
1818
voidSetUp()override {
19-
get_.reset(newMockFirebaseGet());
19+
get_.reset(newMockFirebaseRequest());
2020
}
2121

2222
voidFeedCommand(const String& path) {
@@ -39,7 +39,7 @@ class GetCommandTest : public ::testing::Test {
3939
MockInputStream in_;
4040
MockOutputStream out_;
4141
MockFirebase fbase_;
42-
std::unique_ptr<MockFirebaseGet> get_;
42+
std::unique_ptr<MockFirebaseRequest> get_;
4343
};
4444

4545
TEST_F(GetCommandTest, gets) {

‎contrib/test/modem/push-command_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ using ::testing::_;
1717
classPushCommandTest : public ::testing::Test {
1818
protected:
1919
voidSetUp()override {
20-
push_.reset(newMockFirebasePush());
20+
push_.reset(newMockFirebaseRequest());
2121
}
2222

2323
voidFeedCommand(const String& path,const String& data) {
@@ -54,7 +54,7 @@ class PushCommandTest : public ::testing::Test {
5454
MockInputStream in_;
5555
MockOutputStream out_;
5656
MockFirebase fbase_;
57-
std::unique_ptr<MockFirebasePush> push_;
57+
std::unique_ptr<MockFirebaseRequest> push_;
5858
};
5959

6060
TEST_F(PushCommandTest, sendsData) {

‎contrib/test/modem/remove-command_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ using ::testing::_;
1616
classRemoveCommandTest : public ::testing::Test {
1717
protected:
1818
voidSetUp()override {
19-
remove_.reset(newMockFirebaseRemove());
19+
remove_.reset(newMockFirebaseRequest());
2020
}
2121

2222
voidFeedCommand(const String& path) {
@@ -39,7 +39,7 @@ class RemoveCommandTest : public ::testing::Test {
3939
MockInputStream in_;
4040
MockOutputStream out_;
4141
MockFirebase fbase_;
42-
std::unique_ptr<MockFirebaseRemove> remove_;
42+
std::unique_ptr<MockFirebaseRequest> remove_;
4343
};
4444

4545
TEST_F(RemoveCommandTest, success) {

‎contrib/test/modem/set-command_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ using ::testing::_;
1717
classSetCommandTest : public ::testing::Test {
1818
protected:
1919
voidSetUp()override {
20-
set_.reset(newMockFirebaseSet());
20+
set_.reset(newMockFirebaseRequest());
2121
}
2222

2323
voidFeedCommand(const String& path,const String& data) {
@@ -54,7 +54,7 @@ class SetCommandTest : public ::testing::Test {
5454
MockInputStream in_;
5555
MockOutputStream out_;
5656
MockFirebase fbase_;
57-
std::unique_ptr<MockFirebaseSet> set_;
57+
std::unique_ptr<MockFirebaseRequest> set_;
5858
};
5959

6060
TEST_F(SetCommandTest, sendsData) {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp