Merge pull request FabioBatSilva#45 from RobertByrnes/master

FabioBatSilva · web-flow · commit e8f5f2ff3a79 · 2023-06-03T12:55:21.000-04:00
Use of FakeIt as a dependency with supporting fixes
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 .pioenvs
 .piolibdeps
 /external/unity/*-repo/
+/external/fakeit/*-repo/
 /build/
 /.cproject
 /.project
@@ -11,4 +12,7 @@
 !/Makefile
 /Testing/*
 .pio/*
-.vscode/*
+.vscode/*
+/test/test_main.cpp
+output.txt
+error.txt
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/Makefile b/Makefile
@@ -1,7 +1,7 @@
 default_target: all
 
 .PHONY: all
-all: clean build test clean
+all: clean build deploy test clean
 
 .PHONY: cmake
 cmake:
@@ -27,3 +27,8 @@ clean:
 	@rm -rf $(CURDIR)/build/*
 	@rm -rf $(CURDIR)/.pioenvs/*
 	@rm -rf $(CURDIR)/.pio/*
+
+.PHONY: deploy
+deploy:
+	cp $(CURDIR)/external/fakeit/fakeit-repo/single_header/standalone/* $(CURDIR)/src
+
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 `ArduinoFake` is a simple mocking framework for Arduino.
 `ArduinoFake` is based on [FakeIt](https://github.com/eranpeer/FakeIt) and can be used for testing your arduino project natively. No arduino required !
-
+#
 
 ## Quickstart
 
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
@@ -1,4 +1,14 @@
+; PlatformIO Project Configuration File
+;
+;   Build options: build flags, source filter
+;   Upload options: custom upload port, speed and extra flags
+;   Library options: dependencies, extra library storages
+;   Advanced options: extra scripting
+;
+; Please visit documentation for the other options and examples
+; https://docs.platformio.org/page/projectconf.html
+
 [env:native]
 platform = native
-build_flags = -std=gnu++11
-test_build_src = yes
+build_flags = -std=gnu++17
+test_build_src = yes
diff --git a/src/ArduinoFake.h b/src/ArduinoFake.h
@@ -5,11 +5,11 @@
     #define USBCON
 #endif
 
-#include <map>
+#include <unordered_map>  
 #include <cstring>
 #include <cstdint>
 #include <stdexcept>
-#include "fakeit/fakeit.hpp"
+#include "fakeit.hpp"
 
 #include "arduino/Arduino.h"
 
@@ -96,7 +96,7 @@ class ArduinoFakeContext
     public:
         ArduinoFakeInstances* Instances = new ArduinoFakeInstances();
         ArduinoFakeMocks* Mocks = new ArduinoFakeMocks();
-        std::map<void*, void*> Mapping;
+        std::unordered_map<void*, void*> Mapping;
 
         _ArduinoFakeInstanceGetter1(Print)
         _ArduinoFakeInstanceGetter1(Stream)
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/fakeit.hpp"
+#include "fakeit.hpp"
 
 struct FunctionFake
 {
diff --git a/src/fakeit.hpp b/src/fakeit.hpp
diff --git a/src/fakeit/README.md b/src/fakeit/README.md
diff --git a/test/test_client.h b/test/test_client.h
diff --git a/test/test_print.h b/test/test_print.h

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/fakeit.hpp"`
	`3`	`+#include "fakeit.hpp"`
`4`	`4`
`5`	`5`	`struct FunctionFake`
`6`	`6`	`{`