Merge branch 'fakeit_integration'

RobertByrnes · RobertByrnes · commit 99384205f76b · 2023-05-17T21:09:29.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,13 +1,14 @@
 cmake_minimum_required(VERSION 3.2.2)
 project(ArduinoFake VERSION 0.1)
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
 
 # Include external libs
-add_subdirectory(external)
+add_subdirectory(external/fakeit)
+add_subdirectory(external/unity)
 
 # Targets that we develop here
 enable_testing()
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -1,2 +1,3 @@
 # Include external libs
 add_subdirectory(unity)
+add_subdirectory(fakeit)
diff --git a/external/fakeit/CMakeLists.txt b/external/fakeit/CMakeLists.txt
@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 3.2.2)
+project(fakeit VERSION 2.4.0 LANGUAGES CXX)
+
+include(git-download)
+
+set(REPO_DIR ${PROJECT_SOURCE_DIR}/${PROJECT_NAME}-repo)
+
+download_repo(
+    URL "https://github.com/eranpeer/FakeIt.git"
+    TAG ${PROJECT_VERSION}
+    CLONE_DIR ${REPO_DIR}
+)
+
+add_library(${PROJECT_NAME} INTERFACE)
+
+target_include_directories(${PROJECT_NAME} INTERFACE
+    ${REPO_DIR}/single_header/standalone/
+)
diff --git a/platformio.ini b/platformio.ini
@@ -10,9 +10,5 @@
 
 [env:native]
 platform = native
-build_flags = -std=gnu++11
-	-I .pio/libdeps/native/FakeIt/single_header/standalone
+build_flags = -std=gnu++17
 test_build_src = yes
-lib_deps = 
-	https://github.com/eranpeer/FakeIt.git
-	throwtheswitch/Unity@^2.5.2
diff --git a/src/ArduinoFake.h b/src/ArduinoFake.h
@@ -8,7 +8,7 @@
 #include <cstring>
 #include <cstdint>
 #include <stdexcept>
-#include "fakeit.hpp"
+#include <fakeit.hpp>
 
 #include "arduino/Arduino.h"
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -3,3 +3,5 @@ aux_source_directory(./fakeit SRC_LIST)
 aux_source_directory(./arduino SRC_LIST)
 
 add_library(${PROJECT_NAME} SHARED ${SRC_LIST})
+
+target_link_libraries(${PROJECT_NAME} fakeit)
diff --git a/src/FunctionFake.h b/src/FunctionFake.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "fakeit.hpp"
+#include <fakeit.hpp>
 
 struct FunctionFake
 {
diff --git a/test/test_client.h b/test/test_client.h
@@ -4,6 +4,8 @@ const char * host = "localhost";
 
 namespace ClientTest
 {
+    const char * localhost = "localhost";
+
     class MyService
     {
         public:
@@ -32,7 +34,7 @@ namespace ClientTest
         Client* client = ArduinoFakeMock(Client);
 
         TEST_ASSERT_EQUAL(0, client->connected());
-        TEST_ASSERT_EQUAL(1, client->connect(host, 8080));
+        TEST_ASSERT_EQUAL(1, client->connect(localhost, 8080));
         TEST_ASSERT_EQUAL(1, client->connected());
         TEST_ASSERT_EQUAL(2, client->peek());
 
@@ -43,7 +45,7 @@ namespace ClientTest
         Verify(Method(ArduinoFake(Client), peek)).Once();
         Verify(Method(ArduinoFake(Client), flush)).Once();
         Verify(Method(ArduinoFake(Client), connected)).Exactly(2_Times);
-        Verify(OverloadedMethod(ArduinoFake(Client), connect, int(const char*, uint16_t)).Using(host, 8080)).Once();
+        Verify(OverloadedMethod(ArduinoFake(Client), connect, int(const char*, uint16_t)).Using(localhost, 8080)).Once();
     }
 
     void test_connect(void)
@@ -56,14 +58,14 @@ namespace ClientTest
 
         Client* client = ArduinoFakeMock(Client);
 
-        TEST_ASSERT_EQUAL(1, client->connect(host, 8080));
-        TEST_ASSERT_EQUAL(0, client->connect(host, 80));
+        TEST_ASSERT_EQUAL(1, client->connect(localhost, 8080));
+        TEST_ASSERT_EQUAL(0, client->connect(localhost, 80));
 
         TEST_ASSERT_EQUAL(0, client->connect(ipAddress1, 8080));
         TEST_ASSERT_EQUAL(1, client->connect(ipAddress2, 8080));
 
-        Verify(OverloadedMethod(ArduinoFake(Client), connect, int(const char*, uint16_t)).Using(host, 8080)).Once();
-        Verify(OverloadedMethod(ArduinoFake(Client), connect, int(const char*, uint16_t)).Using(host, 80)).Once();
+        Verify(OverloadedMethod(ArduinoFake(Client), connect, int(const char*, uint16_t)).Using(localhost, 8080)).Once();
+        Verify(OverloadedMethod(ArduinoFake(Client), connect, int(const char*, uint16_t)).Using(localhost, 80)).Once();
 
         Verify(OverloadedMethod(ArduinoFake(Client), connect, int(IPAddress, uint16_t)).Using(ipAddress1, 8080)).Once();
         Verify(OverloadedMethod(ArduinoFake(Client), connect, int(IPAddress, uint16_t)).Using(ipAddress2, 8080)).Once();

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`# Include external libs`
`2`	`2`	`add_subdirectory(unity)`
	`3`	`+add_subdirectory(fakeit)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#pragma once`
`2`	`2`
`3`		`-#include "fakeit.hpp"`
	`3`	`+#include <fakeit.hpp>`
`4`	`4`
`5`	`5`	`struct FunctionFake`
`6`	`6`	`{`