Get unit tests working with arduino json

Author: ed7coyne

src/Firebase.h

@@ -23,6 +23,9 @@
 #include <Arduino.h>
 #include <memory>
 #include "FirebaseHttpClient.h"
+// TODO(edcoyne): move this into our mock_arduino fork where we actually do the
+// override.
+#define ARDUINO_STRING_OVERRIDE
 #include "third-party/arduino-json-5.1.1/include/ArduinoJson.h"
 
 class FirebaseGet;

src/third-party/arduino-json-5.1.1/include/ArduinoJson/Arduino/String.hpp

@@ -9,8 +9,11 @@
 
 #ifndef ARDUINO
 
+#ifndef ARDUINO_STRING_OVERRIDE
+#define ARDUINO_STRING_OVERRIDE
 #include <string>
-//typedef std::string String;
+typedef std::string String;
+#endif
 
 #else
 

test/mock-firebase.h

@@ -19,7 +19,7 @@ class MockFirebase : public Firebase {
 
 class MockFirebaseGet : public FirebaseGet {
  public:
-  MOCK_CONST_METHOD0(json, const String&());
+  MOCK_CONST_METHOD0(response, const String&());
   MOCK_CONST_METHOD0(error, const FirebaseError&());
 };
 

test/modem/Makefile

@@ -76,7 +76,7 @@ test : $(TESTS)
 	for t in $(TESTS); do ./$$t; done;
 
 clean :
-	rm -f $(TESTS) gmock.a gmock_main.a arduino_mock_all.a *.o
+	rm -f $(TESTS) gmock.a gmock_main.a arduino_mock_all.a arduino_json.a *.o
 
 # Builds gmock.a and gmock_main.a.  These libraries contain both
 # Google Mock and Google Test.  A test should link with either gmock.a
@@ -122,6 +122,45 @@ ArduinoMockAll.o : $(ARDUINO_MOCK_SRCS_)
 arduino_mock_all.a : ArduinoMockAll.o
 	$(AR) $(ARFLAGS) $@ $^
 
+# Builds ArduinoJson
+ARDUINO_JSON_SRC_ = ../../src/third-party/arduino-json-5.1.1/src
+JsonObject.o : $(ARDUINO_JSON_SRC_)
+	$(CXX) $(CPPFLAGS) -I$(ARDUINO_JSON_SRC_) $(CXXFLAGS) -c \
+		$(ARDUINO_JSON_SRC_)/JsonObject.cpp
+
+JsonBuffer.o : $(ARDUINO_JSON_SRC_)
+	$(CXX) $(CPPFLAGS) -I$(ARDUINO_JSON_SRC_) $(CXXFLAGS) -c \
+		$(ARDUINO_JSON_SRC_)/JsonBuffer.cpp
+
+JsonVariant.o : $(ARDUINO_JSON_SRC_)
+	$(CXX) $(CPPFLAGS) -I$(ARDUINO_JSON_SRC_) $(CXXFLAGS) -c \
+		$(ARDUINO_JSON_SRC_)/JsonVariant.cpp
+
+JsonArray.o : $(ARDUINO_JSON_SRC_)
+	$(CXX) $(CPPFLAGS) -I$(ARDUINO_JSON_SRC_) $(CXXFLAGS) -c \
+		$(ARDUINO_JSON_SRC_)/JsonArray.cpp
+
+JsonParser.o : $(ARDUINO_JSON_SRC_)
+	$(CXX) $(CPPFLAGS) -I$(ARDUINO_JSON_SRC_) $(CXXFLAGS) -c \
+		$(ARDUINO_JSON_SRC_)/Internals/JsonParser.cpp
+
+Comments.o : $(ARDUINO_JSON_SRC_)
+	$(CXX) $(CPPFLAGS) -I$(ARDUINO_JSON_SRC_) $(CXXFLAGS) -c \
+		$(ARDUINO_JSON_SRC_)/Internals/Comments.cpp
+
+List.o : $(ARDUINO_JSON_SRC_)
+	$(CXX) $(CPPFLAGS) -I$(ARDUINO_JSON_SRC_) $(CXXFLAGS) -c \
+		$(ARDUINO_JSON_SRC_)/Internals/List.cpp
+
+Encoding.o : $(ARDUINO_JSON_SRC_)
+	$(CXX) $(CPPFLAGS) -I$(ARDUINO_JSON_SRC_) $(CXXFLAGS) -c \
+		$(ARDUINO_JSON_SRC_)/Internals/Encoding.cpp
+
+arduino_json.a : JsonObject.o JsonBuffer.o JsonVariant.o JsonArray.o \
+	JsonParser.o Comments.o List.o Encoding.o
+	$(AR) $(ARFLAGS) $@ $^
+
+
 # Builds shared objects.
 
 Firebase.o : $(SRC_ROOT)/Firebase.cpp
@@ -139,7 +178,7 @@ get-command_test.o : $(TEST_DIR)/get-command_test.cpp $(GMOCK_HEADERS)
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(TEST_DIR)/get-command_test.cpp
 
 get-command_test : get-command_test.o Firebase.o FirebaseHttpClient_dummy.o get-command.o gmock_main.a \
-		arduino_mock_all.a
+		arduino_mock_all.a arduino_json.a
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $@
 
 
@@ -150,7 +189,7 @@ set-command_test.o : $(TEST_DIR)/set-command_test.cpp $(GMOCK_HEADERS)
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(TEST_DIR)/set-command_test.cpp
 
 set-command_test : set-command.o set-command_test.o Firebase.o FirebaseHttpClient_dummy.o gmock_main.a \
-		arduino_mock_all.a
+		arduino_mock_all.a arduino_json.a
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $@
 
 
@@ -161,7 +200,7 @@ remove-command_test.o : $(TEST_DIR)/remove-command_test.cpp $(GMOCK_HEADERS)
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(TEST_DIR)/remove-command_test.cpp
 
 remove-command_test : remove-command.o remove-command_test.o Firebase.o FirebaseHttpClient_dummy.o gmock_main.a \
-		arduino_mock_all.a
+		arduino_mock_all.a arduino_json.a
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $@
 
 
@@ -172,7 +211,7 @@ push-command_test.o : $(TEST_DIR)/push-command_test.cpp $(GMOCK_HEADERS)
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(TEST_DIR)/push-command_test.cpp
 
 push-command_test : push-command.o push-command_test.o Firebase.o FirebaseHttpClient_dummy.o gmock_main.a \
-		arduino_mock_all.a
+		arduino_mock_all.a arduino_json.a
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $@
 
 begin-command.o : $(SRC_ROOT)/modem/begin-command.cpp
@@ -182,7 +221,7 @@ begin-command_test.o : $(TEST_DIR)/begin-command_test.cpp $(GMOCK_HEADERS)
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(TEST_DIR)/begin-command_test.cpp
 
 begin-command_test : begin-command.o begin-command_test.o Firebase.o FirebaseHttpClient_dummy.o gmock_main.a \
-		arduino_mock_all.a
+		arduino_mock_all.a arduino_json.a
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $@
 
 stream-command.o : $(SRC_ROOT)/modem/stream-command.cpp
@@ -192,6 +231,6 @@ stream-command_test.o : $(TEST_DIR)/stream-command_test.cpp $(GMOCK_HEADERS)
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(TEST_DIR)/stream-command_test.cpp
 
 stream-command_test : stream-command.o stream-command_test.o Firebase.o FirebaseHttpClient_dummy.o gmock_main.a \
-		arduino_mock_all.a
+		arduino_mock_all.a arduino_json.a
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $@
 

test/modem/get-command_test.cpp

@@ -47,7 +47,7 @@ TEST_F(GetCommandTest, gets) {
   FeedCommand(path);
 
   const String value("Test value");
-  EXPECT_CALL(*get_, json())
+  EXPECT_CALL(*get_, response())
       .WillOnce(ReturnRef(value));
 
   EXPECT_CALL(out_, print(String("+")))