Attempt to fix mocks

Author: kotl

contrib/test/mock-firebase.h

@@ -10,36 +10,15 @@ namespace modem {
 
 class MockFirebase : public Firebase {
  public:
-  MOCK_METHOD1(getPtr, std::unique_ptr<FirebaseGet>(const std::string&));
-  MOCK_METHOD2(setPtr, std::unique_ptr<FirebaseSet>(const std::string&, const std::string&));
-  MOCK_METHOD2(pushPtr, std::unique_ptr<FirebasePush>(const std::string&, const std::string&));
-  MOCK_METHOD1(removePtr, std::unique_ptr<FirebaseRemove>(const std::string&));
-  MOCK_METHOD1(streamPtr, std::unique_ptr<FirebaseStream>(const std::string&));
 };
 
-class MockFirebaseGet : public FirebaseGet {
- public:
-  MOCK_CONST_METHOD0(response, const std::string&());
-  MOCK_CONST_METHOD0(error, const FirebaseError&());
-};
 
-class MockFirebaseSet : public FirebaseSet {
- public:
-  MOCK_CONST_METHOD0(json, const std::string&());
-  MOCK_CONST_METHOD0(error, const FirebaseError&());
-};
-
-class MockFirebasePush : public FirebasePush {
+class MockFirebaseRequest : public FirebaseRequest {
  public:
   MOCK_CONST_METHOD0(name, const std::string&());
   MOCK_CONST_METHOD0(error, const FirebaseError&());
 };
 
-class MockFirebaseRemove : public FirebaseRemove {
- public:
-  MOCK_CONST_METHOD0(error, const FirebaseError&());
-};
-
 class MockFirebaseStream : public FirebaseStream {
  public:
   MOCK_METHOD0(available, bool());

contrib/test/modem/get-command_test.cpp

@@ -16,7 +16,7 @@ using ::testing::_;
 class GetCommandTest : public ::testing::Test {
  protected:
   void SetUp() override {
-    get_.reset(new MockFirebaseGet());
+    get_.reset(new MockFirebaseRequest());
   }
 
   void FeedCommand(const String& path) {
@@ -39,7 +39,7 @@ class GetCommandTest : public ::testing::Test {
   MockInputStream in_;
   MockOutputStream out_;
   MockFirebase fbase_;
-  std::unique_ptr<MockFirebaseGet> get_;
+  std::unique_ptr<MockFirebaseRequest> get_;
 };
 
 TEST_F(GetCommandTest, gets) {

contrib/test/modem/push-command_test.cpp

@@ -17,7 +17,7 @@ using ::testing::_;
 class PushCommandTest : public ::testing::Test {
  protected:
   void SetUp() override {
-    push_.reset(new MockFirebasePush());
+    push_.reset(new MockFirebaseRequest());
   }
 
   void FeedCommand(const String& path, const String& data) {
@@ -54,7 +54,7 @@ class PushCommandTest : public ::testing::Test {
   MockInputStream in_;
   MockOutputStream out_;
   MockFirebase fbase_;
-  std::unique_ptr<MockFirebasePush> push_;
+  std::unique_ptr<MockFirebaseRequest> push_;
 };
 
 TEST_F(PushCommandTest, sendsData) {

contrib/test/modem/remove-command_test.cpp

@@ -16,7 +16,7 @@ using ::testing::_;
 class RemoveCommandTest : public ::testing::Test {
  protected:
   void SetUp() override {
-    remove_.reset(new MockFirebaseRemove());
+    remove_.reset(new MockFirebaseRequest());
   }
 
   void FeedCommand(const String& path) {
@@ -39,7 +39,7 @@ class RemoveCommandTest : public ::testing::Test {
   MockInputStream in_;
   MockOutputStream out_;
   MockFirebase fbase_;
-  std::unique_ptr<MockFirebaseRemove> remove_;
+  std::unique_ptr<MockFirebaseRequest> remove_;
 };
 
 TEST_F(RemoveCommandTest, success) {

contrib/test/modem/set-command_test.cpp

@@ -17,7 +17,7 @@ using ::testing::_;
 class SetCommandTest : public ::testing::Test {
  protected:
   void SetUp() override {
-    set_.reset(new MockFirebaseSet());
+    set_.reset(new MockFirebaseRequest());
   }
 
   void FeedCommand(const String& path, const String& data) {
@@ -54,7 +54,7 @@ class SetCommandTest : public ::testing::Test {
   MockInputStream in_;
   MockOutputStream out_;
   MockFirebase fbase_;
-  std::unique_ptr<MockFirebaseSet> set_;
+  std::unique_ptr<MockFirebaseRequest> set_;
 };
 
 TEST_F(SetCommandTest, sendsData) {