remaining unit tests for push/set/remove for modem

Author: kotl

contrib/test/modem/get-command_test.cpp

@@ -37,11 +37,12 @@ class GetCommandTest : public ::testing::Test {
 TEST_F(GetCommandTest, gets) {
   const String path("/test/path");
   const String command_fragment(" /test/path");
-  const String no_error = "";
   FeedCommand(path);
 
   const String value("Test value");
   EXPECT_CALL(fbase_, getString(command_fragment)).WillOnce(Return("Test value"));
+
+  const String no_error = "";
   EXPECT_CALL(fbase_, error()).WillOnce(ReturnRef(no_error));
 
   EXPECT_CALL(out_, print(String("+")))
@@ -57,10 +58,11 @@ TEST_F(GetCommandTest, handlesError) {
   FirebaseError error(-200, "Test Error.");
   const String command_fragment(" /test/path");
   const String path("/test/path");
-  const String error_value = "Test Error.";
   FeedCommand(path);
 
+  const String error_value = "Test Error.";
   EXPECT_CALL(fbase_, error()).WillRepeatedly(ReturnRef(error_value));
+
   EXPECT_CALL(fbase_, getString(command_fragment)).WillOnce(Return(""));
 
   EXPECT_CALL(out_, print(String("-FAIL ")))

contrib/test/modem/push-command_test.cpp

@@ -39,7 +39,7 @@ class PushCommandTest : public ::testing::Test {
         .WillOnce(Return(error_message.length()));
   }
 
-  bool RunExpectingData(const String& data, const FirebaseError& error) {
+  bool RunCommand() {
     PushCommand pushCmd(&fbase_);
     return pushCmd.execute("PUSH", &in_, &out_);
   }
@@ -54,22 +54,26 @@ TEST_F(PushCommandTest, sendsData) {
   const String data("This is a test payload.");
 
   FeedCommand(path, data);
+  const String no_error = "";
+  EXPECT_CALL(fbase_, error()).WillOnce(ReturnRef(no_error));
+
   ExpectOutput("+OK");
 
-  ASSERT_TRUE(RunExpectingData(data, FirebaseError()));
+  ASSERT_TRUE(RunCommand());
 }
 
 TEST_F(PushCommandTest, HandlesError) {
   const String path("/test/path");
   const String data("This is a test payload.");
-  FirebaseError error(-200, "Test error.");
 
   FeedCommand(path, data);
-  ExpectErrorOutput(error.message());
+  const String error = "Test Error.";
+  EXPECT_CALL(fbase_, error()).WillRepeatedly(ReturnRef(error));
+
+  ExpectErrorOutput(error);
 
-  ASSERT_FALSE(RunExpectingData(data, error));
+  ASSERT_FALSE(RunCommand());
 }
 
 }  // modem
 }  // firebase
-

contrib/test/modem/remove-command_test.cpp

@@ -24,8 +24,7 @@ class RemoveCommandTest : public ::testing::Test {
         .WillOnce(Return(command_fragment));
   }
 
-  bool RunCommand(const FirebaseError& error) {
-
+  bool RunCommand() {
     RemoveCommand command(&fbase_);
     return command.execute("REMOVE", &in_, &out_);
   }
@@ -39,23 +38,28 @@ TEST_F(RemoveCommandTest, success) {
   const String path("/test/path");
   FeedCommand(path);
 
+  const String no_error = "";
+  EXPECT_CALL(fbase_, error()).WillOnce(ReturnRef(no_error));
+
   EXPECT_CALL(out_, println(String("+OK")))
       .WillOnce(Return(3));
 
-  ASSERT_TRUE(RunCommand(FirebaseError()));
+  ASSERT_TRUE(RunCommand());
 }
 
 TEST_F(RemoveCommandTest, handlesError) {
-  FirebaseError error(-200, "Test Error.");
   const String path("/test/path");
   FeedCommand(path);
 
   EXPECT_CALL(out_, print(String("-FAIL ")))
       .WillOnce(Return(1));
 
-  EXPECT_CALL(out_, println(String(error.message().c_str())))
+  const String error = "Test Error.";
+  EXPECT_CALL(fbase_, error()).WillRepeatedly(ReturnRef(error));
+
+  EXPECT_CALL(out_, println(String(error.c_str())))
       .WillOnce(Return(1));
-  ASSERT_FALSE(RunCommand(error));
+  ASSERT_FALSE(RunCommand());
 }
 
 }  // modem

contrib/test/modem/set-command_test.cpp

@@ -39,8 +39,7 @@ class SetCommandTest : public ::testing::Test {
         .WillOnce(Return(error_message.length()));
   }
 
-  bool RunExpectingData(const String& data, const FirebaseError& error) {
-
+  bool RunCommand() {
     SetCommand setCmd(&fbase_);
     return setCmd.execute("SET", &in_, &out_);
   }
@@ -53,22 +52,25 @@ class SetCommandTest : public ::testing::Test {
 TEST_F(SetCommandTest, sendsData) {
   const String path("/test/path");
   const String data("This is a test payload.");
+  const String no_error = "";
+  EXPECT_CALL(fbase_, error()).WillOnce(ReturnRef(no_error));
 
   FeedCommand(path, data);
   ExpectOutput("+OK");
 
-  ASSERT_TRUE(RunExpectingData(data, FirebaseError()));
+  ASSERT_TRUE(RunCommand());
 }
 
 TEST_F(SetCommandTest, HandlesError) {
   const String path("/test/path");
   const String data("This is a test payload.");
-  FirebaseError error(-200, "Test error.");
+  const String error = "TestError";
+  EXPECT_CALL(fbase_, error()).WillRepeatedly(ReturnRef(error));
 
   FeedCommand(path, data);
-  ExpectErrorOutput(error.message());
+  ExpectErrorOutput(error);
 
-  ASSERT_FALSE(RunExpectingData(data, error));
+  ASSERT_FALSE(RunCommand());
 }
 }  // modem
 }  // firebase