From dbeaeac69c4b1a3ae02ee2ced7bceb9b113fea71 Mon Sep 17 00:00:00 2001 From: SMJSGaming Date: Fri, 11 Jun 2021 09:39:50 +0200 Subject: [PATCH 01/10] Updated to the current release --- CMakeLists.txt | 8 +++----- build.sh | 8 +++++++- lib/gmock/CMakeLists.txt | 17 ----------------- lib/gtest/CMakeLists.txt | 8 +++++--- test/CMakeLists.txt | 1 + 5 files changed, 16 insertions(+), 26 deletions(-) delete mode 100644 lib/gmock/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index f44785f..70a41f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,8 @@ -cmake_minimum_required (VERSION 2.8.8) +cmake_minimum_required (VERSION 3.20.0) project (arduino_mock) find_package(Threads REQUIRED) add_subdirectory(lib/gtest) -add_subdirectory(lib/gmock) message ("building arduino_mock") message("Gtest include: ${GTEST_INCLUDE_DIRS}") @@ -25,14 +24,13 @@ target_link_libraries(arduino_mock ${CMAKE_THREAD_LIBS_INIT} ) -set_target_properties( arduino_mock - PROPERTIES +set_target_properties(arduino_mock PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/dist/lib" LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/dist/lib" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/dist/bin" ) -add_dependencies(arduino_mock gtest gmock) +add_dependencies(arduino_mock gtest) option(test "Build all tests." OFF) diff --git a/build.sh b/build.sh index cf88fa9..8f5f375 100755 --- a/build.sh +++ b/build.sh @@ -4,6 +4,12 @@ set -eu cd -- "$(dirname -- "$0")" mkdir -p build cd build -cmake -Dtest=ON .. + +if [ "$OSTYPE" == "win32" -o "$OSTYPE" == "msys" ] ; then + cmake -Dtest=ON .. -G "MSYS Makefiles"; +else + cmake -Dtest=ON .. -G "Unix Makefiles"; +fi + make ctest -V diff --git a/lib/gmock/CMakeLists.txt b/lib/gmock/CMakeLists.txt deleted file mode 100644 index 4ca057e..0000000 --- a/lib/gmock/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -cmake_minimum_required(VERSION 2.8.8) -project(gmock_builder C CXX) -include(ExternalProject) - -ExternalProject_Add(gmock - URL https://github.com/paulsapps/gmock-1.7.0/archive/master.zip - PREFIX ${CMAKE_CURRENT_BINARY_DIR}/gmock - INSTALL_COMMAND "" -) - -# Specify include dir -ExternalProject_Get_Property(gmock source_dir) -set(GMOCK_INCLUDE_DIRS ${source_dir}/include PARENT_SCOPE) - -# Specify MainTest's link libraries -ExternalProject_Get_Property(gmock binary_dir) -set(GMOCK_LIBS_DIR ${binary_dir} PARENT_SCOPE) diff --git a/lib/gtest/CMakeLists.txt b/lib/gtest/CMakeLists.txt index 59f285f..adf150b 100644 --- a/lib/gtest/CMakeLists.txt +++ b/lib/gtest/CMakeLists.txt @@ -3,15 +3,17 @@ project(gtest_builder C CXX) include(ExternalProject) ExternalProject_Add(gtest - URL https://github.com/google/googletest/archive/release-1.7.0.zip + URL https://github.com/google/googletest/archive/release-1.10.0.zip PREFIX ${CMAKE_CURRENT_BINARY_DIR}/gtest INSTALL_COMMAND "" ) # Specify include dir ExternalProject_Get_Property(gtest source_dir) -set(GTEST_INCLUDE_DIRS ${source_dir}/include PARENT_SCOPE) +set(GTEST_INCLUDE_DIRS ${source_dir}/googletest/include PARENT_SCOPE) +set(GMOCK_INCLUDE_DIRS ${source_dir}/googlemock/include PARENT_SCOPE) # Specify MainTest's link libraries ExternalProject_Get_Property(gtest binary_dir) -set(GTEST_LIBS_DIR ${binary_dir} PARENT_SCOPE) +set(GTEST_LIBS_DIR ${binary_dir}/lib PARENT_SCOPE) +set(GMOCK_LIBS_DIR ${binary_dir}/lib PARENT_SCOPE) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 85d98b9..a583a13 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -9,6 +9,7 @@ target_link_libraries(test_all ${GTEST_LIBS_DIR}/libgtest.a ${GTEST_LIBS_DIR}/libgtest_main.a ${GMOCK_LIBS_DIR}/libgmock.a + ${GMOCK_LIBS_DIR}/libgmock_main.a ${CMAKE_THREAD_LIBS_INIT} ) From 2375879923bcf6f1072c9fa2511bc4c5ce90ea7c Mon Sep 17 00:00:00 2001 From: SMJSGaming Date: Mon, 14 Jun 2021 09:37:49 +0200 Subject: [PATCH 02/10] Moved the mocked library to the global include to prevent import problems during a test --- include/{arduino-mock => }/Arduino.h | 0 include/{arduino-mock => }/EEPROM.h | 0 include/{arduino-mock => }/IRremote.h | 0 include/{arduino-mock => }/SPI.h | 0 include/{arduino-mock => }/Serial.h | 0 include/{arduino-mock => }/Spark.h | 0 include/{arduino-mock => }/WiFi.h | 0 include/{arduino-mock => }/Wire.h | 0 include/{arduino-mock => }/serialHelper.h | 0 src/Arduino.cc | 2 +- src/EEPROM.cc | 2 +- src/IRremote.cc | 2 +- src/SPI.cc | 2 +- src/Serial.cc | 2 +- src/Spark.cc | 2 +- src/WiFi.cc | 2 +- src/Wire.cc | 2 +- src/serialHelper.cc | 2 +- test/Arduino_unittest.cc | 2 +- test/EEPROM_unittest.cc | 4 ++-- test/SPI_unittest.cc | 4 ++-- test/Serial_unittest.cc | 6 +++--- test/Spark_unittest.cc | 4 ++-- test/WiFi_unittest.cc | 4 ++-- test/Wire_unittest.cc | 4 ++-- test/serialHelper_unittest.cc | 6 +++--- 26 files changed, 26 insertions(+), 26 deletions(-) rename include/{arduino-mock => }/Arduino.h (100%) rename include/{arduino-mock => }/EEPROM.h (100%) rename include/{arduino-mock => }/IRremote.h (100%) rename include/{arduino-mock => }/SPI.h (100%) rename include/{arduino-mock => }/Serial.h (100%) rename include/{arduino-mock => }/Spark.h (100%) rename include/{arduino-mock => }/WiFi.h (100%) rename include/{arduino-mock => }/Wire.h (100%) rename include/{arduino-mock => }/serialHelper.h (100%) diff --git a/include/arduino-mock/Arduino.h b/include/Arduino.h similarity index 100% rename from include/arduino-mock/Arduino.h rename to include/Arduino.h diff --git a/include/arduino-mock/EEPROM.h b/include/EEPROM.h similarity index 100% rename from include/arduino-mock/EEPROM.h rename to include/EEPROM.h diff --git a/include/arduino-mock/IRremote.h b/include/IRremote.h similarity index 100% rename from include/arduino-mock/IRremote.h rename to include/IRremote.h diff --git a/include/arduino-mock/SPI.h b/include/SPI.h similarity index 100% rename from include/arduino-mock/SPI.h rename to include/SPI.h diff --git a/include/arduino-mock/Serial.h b/include/Serial.h similarity index 100% rename from include/arduino-mock/Serial.h rename to include/Serial.h diff --git a/include/arduino-mock/Spark.h b/include/Spark.h similarity index 100% rename from include/arduino-mock/Spark.h rename to include/Spark.h diff --git a/include/arduino-mock/WiFi.h b/include/WiFi.h similarity index 100% rename from include/arduino-mock/WiFi.h rename to include/WiFi.h diff --git a/include/arduino-mock/Wire.h b/include/Wire.h similarity index 100% rename from include/arduino-mock/Wire.h rename to include/Wire.h diff --git a/include/arduino-mock/serialHelper.h b/include/serialHelper.h similarity index 100% rename from include/arduino-mock/serialHelper.h rename to include/serialHelper.h diff --git a/src/Arduino.cc b/src/Arduino.cc index bd0a28e..7b06464 100644 --- a/src/Arduino.cc +++ b/src/Arduino.cc @@ -1,4 +1,4 @@ -#include "arduino-mock/Arduino.h" +#include "Arduino.h" static ArduinoMock* arduinoMock = NULL; ArduinoMock* arduinoMockInstance() { diff --git a/src/EEPROM.cc b/src/EEPROM.cc index f558340..c6f05cf 100644 --- a/src/EEPROM.cc +++ b/src/EEPROM.cc @@ -1,6 +1,6 @@ /** Implementation of EEPROM mock **/ -#include "arduino-mock/EEPROM.h" +#include "EEPROM.h" static EEPROMMock* p_EEPROMMock = NULL; EEPROMMock* EEPROMMockInstance() { diff --git a/src/IRremote.cc b/src/IRremote.cc index e043c1d..40f887a 100644 --- a/src/IRremote.cc +++ b/src/IRremote.cc @@ -1,4 +1,4 @@ -#include "arduino-mock/IRremote.h" +#include "IRremote.h" // Taken from IRremoteInt.h #define ERR 0 diff --git a/src/SPI.cc b/src/SPI.cc index ffd8b7f..f1d8342 100644 --- a/src/SPI.cc +++ b/src/SPI.cc @@ -1,4 +1,4 @@ -#include "arduino-mock/SPI.h" +#include "SPI.h" static SPIMock* p_SPIMock = NULL; SPIMock* SPIMockInstance() { diff --git a/src/Serial.cc b/src/Serial.cc index 708ca70..923ee1c 100644 --- a/src/Serial.cc +++ b/src/Serial.cc @@ -1,6 +1,6 @@ // Copyright 2014 http://switchdevice.com -#include "arduino-mock/Serial.h" +#include "Serial.h" static SerialMock* gSerialMock = NULL; SerialMock* serialMockInstance() { diff --git a/src/Spark.cc b/src/Spark.cc index d933b1b..b60ec1f 100644 --- a/src/Spark.cc +++ b/src/Spark.cc @@ -1,6 +1,6 @@ // Copyright 2014 http://switchdevice.com -#include "arduino-mock/Spark.h" +#include "Spark.h" static SparkMock* gSparkMock = NULL; SparkMock* sparkMockInstance() { diff --git a/src/WiFi.cc b/src/WiFi.cc index 3f0ff5c..640678b 100755 --- a/src/WiFi.cc +++ b/src/WiFi.cc @@ -1,4 +1,4 @@ -#include "arduino-mock/WiFi.h" +#include "WiFi.h" static WiFiMock* p_WiFiMock = NULL; WiFiMock* WiFiMockInstance() { diff --git a/src/Wire.cc b/src/Wire.cc index f0a21bd..59ddb3c 100644 --- a/src/Wire.cc +++ b/src/Wire.cc @@ -1,4 +1,4 @@ -#include "arduino-mock/Wire.h" +#include "Wire.h" static WireMock* p_WireMock = NULL; WireMock* WireMockInstance() { diff --git a/src/serialHelper.cc b/src/serialHelper.cc index 1e88fee..dbd3ba8 100644 --- a/src/serialHelper.cc +++ b/src/serialHelper.cc @@ -1,4 +1,4 @@ -#include "arduino-mock/serialHelper.h" +#include "serialHelper.h" stringCapture::stringCapture() : d() { diff --git a/test/Arduino_unittest.cc b/test/Arduino_unittest.cc index c5d3dff..76ce2bf 100644 --- a/test/Arduino_unittest.cc +++ b/test/Arduino_unittest.cc @@ -2,7 +2,7 @@ // This example code is in the public domain. #include "gtest/gtest.h" -#include "arduino-mock/Arduino.h" +#include "Arduino.h" using ::testing::Return; TEST(digitalRead, 2) { diff --git a/test/EEPROM_unittest.cc b/test/EEPROM_unittest.cc index 92ce5d3..b90b259 100644 --- a/test/EEPROM_unittest.cc +++ b/test/EEPROM_unittest.cc @@ -1,6 +1,6 @@ #include "gtest/gtest.h" -#include "arduino-mock/EEPROM.h" -#include "arduino-mock/Arduino.h" +#include "EEPROM.h" +#include "Arduino.h" using ::testing::Return; TEST(EEPROM, access) { diff --git a/test/SPI_unittest.cc b/test/SPI_unittest.cc index 50a6758..9b4966c 100644 --- a/test/SPI_unittest.cc +++ b/test/SPI_unittest.cc @@ -1,6 +1,6 @@ #include "gtest/gtest.h" -#include "arduino-mock/SPI.h" -#include "arduino-mock/Arduino.h" +#include "SPI.h" +#include "Arduino.h" using ::testing::Return; diff --git a/test/Serial_unittest.cc b/test/Serial_unittest.cc index d899df2..c4a46f1 100644 --- a/test/Serial_unittest.cc +++ b/test/Serial_unittest.cc @@ -2,9 +2,9 @@ // This example code is in the public domain. #include "gtest/gtest.h" -#include "arduino-mock/Arduino.h" -#include "arduino-mock/Serial.h" -#include "arduino-mock/serialHelper.h" +#include "Arduino.h" +#include "Serial.h" +#include "serialHelper.h" using ::testing::_; using ::testing::Return; diff --git a/test/Spark_unittest.cc b/test/Spark_unittest.cc index 3acd534..eb0d72e 100644 --- a/test/Spark_unittest.cc +++ b/test/Spark_unittest.cc @@ -5,9 +5,9 @@ #define DEBUG_LOG false #include "gtest/gtest.h" -#include "arduino-mock/Arduino.h" +#include "Arduino.h" -#include "arduino-mock/Spark.h" +#include "Spark.h" using ::testing::StrCaseEq; diff --git a/test/WiFi_unittest.cc b/test/WiFi_unittest.cc index eff17e6..e9827b5 100755 --- a/test/WiFi_unittest.cc +++ b/test/WiFi_unittest.cc @@ -1,6 +1,6 @@ #include "gtest/gtest.h" -#include "arduino-mock/WiFi.h" -#include "arduino-mock/Arduino.h" +#include "WiFi.h" +#include "Arduino.h" WiFi_ wifi; diff --git a/test/Wire_unittest.cc b/test/Wire_unittest.cc index 63c16fc..ef54249 100644 --- a/test/Wire_unittest.cc +++ b/test/Wire_unittest.cc @@ -1,6 +1,6 @@ #include "gtest/gtest.h" -#include "arduino-mock/Wire.h" -#include "arduino-mock/Arduino.h" +#include "Wire.h" +#include "Arduino.h" using ::testing::Return; TEST(Wire, access) { diff --git a/test/serialHelper_unittest.cc b/test/serialHelper_unittest.cc index d11dce1..d3f42de 100644 --- a/test/serialHelper_unittest.cc +++ b/test/serialHelper_unittest.cc @@ -1,8 +1,8 @@ #include "gtest/gtest.h" -#include "arduino-mock/Arduino.h" -#include "arduino-mock/Serial.h" +#include "Arduino.h" +#include "Serial.h" -#include "arduino-mock/serialHelper.h" +#include "serialHelper.h" using ::testing::_; using ::testing::Return; From 9fc9ee62367c5cb0af8925a8e2451463a0c01660 Mon Sep 17 00:00:00 2001 From: SMJSGaming Date: Mon, 14 Jun 2021 15:35:07 +0200 Subject: [PATCH 03/10] Fixed the SPI class name --- include/SPI.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/SPI.h b/include/SPI.h index 8cdf0ff..a493726 100644 --- a/include/SPI.h +++ b/include/SPI.h @@ -18,7 +18,7 @@ class SPISettings { } }; -class SPI_ { +class SPIClass { public: void begin(); void usingInterrupt(uint8_t ); From b26c780732fbc5252c6eb690fc373ddc6cdaf894 Mon Sep 17 00:00:00 2001 From: SMJSGaming Date: Mon, 14 Jun 2021 15:39:14 +0200 Subject: [PATCH 04/10] Forgot the references --- include/SPI.h | 2 +- src/SPI.cc | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/SPI.h b/include/SPI.h index a493726..92862fb 100644 --- a/include/SPI.h +++ b/include/SPI.h @@ -36,7 +36,7 @@ class SPIClass { void detachInterrupt(); }; -extern SPI_ SPI; +extern SPIClass SPI; class SPIMock { public: diff --git a/src/SPI.cc b/src/SPI.cc index f1d8342..2d39408 100644 --- a/src/SPI.cc +++ b/src/SPI.cc @@ -15,62 +15,62 @@ void releaseSPIMock() { } } -void SPI_::begin() { +void SPIClass::begin() { p_SPIMock->begin(); } -void SPI_::usingInterrupt(uint8_t a) { +void SPIClass::usingInterrupt(uint8_t a) { p_SPIMock->usingInterrupt(a); } -void SPI_::notUsingInterrupt(uint8_t a) { +void SPIClass::notUsingInterrupt(uint8_t a) { p_SPIMock->notUsingInterrupt(a); } -void SPI_::beginTransaction(SPISettings a) { +void SPIClass::beginTransaction(SPISettings a) { return p_SPIMock->beginTransaction(a); } -uint8_t SPI_::transfer(uint8_t a) { +uint8_t SPIClass::transfer(uint8_t a) { return p_SPIMock->transfer(a); } -uint16_t SPI_::transfer16(uint16_t a) { +uint16_t SPIClass::transfer16(uint16_t a) { return p_SPIMock->transfer16(a); } -void SPI_::transfer(void * a, size_t b) { +void SPIClass::transfer(void * a, size_t b) { return p_SPIMock->transfer(a, b); } -void SPI_::endTransaction(void) { +void SPIClass::endTransaction(void) { return p_SPIMock->endTransaction(); } -void SPI_::end(void) { +void SPIClass::end(void) { return p_SPIMock->end(); } -void SPI_::setBitOrder(uint8_t a) { +void SPIClass::setBitOrder(uint8_t a) { p_SPIMock->setBitOrder(a); } -void SPI_::setDataMode(uint8_t a) { +void SPIClass::setDataMode(uint8_t a) { p_SPIMock->setDataMode(a); } -void SPI_::setClockDivider(uint8_t a) { +void SPIClass::setClockDivider(uint8_t a) { return p_SPIMock->setClockDivider(a); } -void SPI_::attachInterrupt() { +void SPIClass::attachInterrupt() { return p_SPIMock->attachInterrupt(); } -void SPI_::detachInterrupt() { +void SPIClass::detachInterrupt() { return p_SPIMock->detachInterrupt(); } // Preinstantiate Objects -SPI_ SPI; +SPIClass SPI; From a0c420903965ca57a34b86666c3bf898b0bee76b Mon Sep 17 00:00:00 2001 From: SMJSGaming Date: Mon, 14 Jun 2021 15:47:04 +0200 Subject: [PATCH 05/10] Fixed the serial name --- include/Serial.h | 4 ++-- src/Serial.cc | 54 ++++++++++++++++++++++++------------------------ 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/include/Serial.h b/include/Serial.h index f0b4c8b..39d216f 100644 --- a/include/Serial.h +++ b/include/Serial.h @@ -50,7 +50,7 @@ class SerialMock { */ }; -class Serial_ { +class Serial { private: static bool printToCout; @@ -101,7 +101,7 @@ class Serial_ { static size_t println(const Printable&); */ }; -extern Serial_ Serial; +extern Serial SerialClass; SerialMock* serialMockInstance(); void releaseSerialMock(); diff --git a/src/Serial.cc b/src/Serial.cc index 923ee1c..718048d 100644 --- a/src/Serial.cc +++ b/src/Serial.cc @@ -50,13 +50,13 @@ template void printBase(T num, int base) { std::cout << num << std::dec; } -bool Serial_::printToCout = false; +bool Serial::printToCout = false; -void Serial_::setPrintToCout(bool flag) { +void Serial::setPrintToCout(bool flag) { printToCout = flag; } -size_t Serial_::print(const char *s) { +size_t Serial::print(const char *s) { if (printToCout) { std::cout << s; return 0; @@ -65,7 +65,7 @@ size_t Serial_::print(const char *s) { return gSerialMock->print(s); } -size_t Serial_::print(char c) { +size_t Serial::print(char c) { if (printToCout) { std::cout << c; return 0; @@ -74,7 +74,7 @@ size_t Serial_::print(char c) { return gSerialMock->print(c); } -size_t Serial_::print(unsigned char c, int base) { +size_t Serial::print(unsigned char c, int base) { if (printToCout) { printBase(c, base); return 0; @@ -83,7 +83,7 @@ size_t Serial_::print(unsigned char c, int base) { return gSerialMock->print(c, base); } -size_t Serial_::print(int num, int base) { +size_t Serial::print(int num, int base) { if (printToCout) { printBase(num, base); return 0; @@ -92,7 +92,7 @@ size_t Serial_::print(int num, int base) { return gSerialMock->print(num, base); } -size_t Serial_::print(unsigned int num, int base) { +size_t Serial::print(unsigned int num, int base) { if (printToCout) { printBase(num, base); return 0; @@ -101,7 +101,7 @@ size_t Serial_::print(unsigned int num, int base) { return gSerialMock->print(num, base); } -size_t Serial_::print(long num, int base) { +size_t Serial::print(long num, int base) { if (printToCout) { printBase(num, base); return 0; @@ -110,7 +110,7 @@ size_t Serial_::print(long num, int base) { return gSerialMock->print(num, base); } -size_t Serial_::print(unsigned long num, int base) { +size_t Serial::print(unsigned long num, int base) { if (printToCout) { printBase(num, base); return 0; @@ -119,7 +119,7 @@ size_t Serial_::print(unsigned long num, int base) { return gSerialMock->print(num, base); } -size_t Serial_::print(double num, int digits) { +size_t Serial::print(double num, int digits) { if (printToCout) { printDouble(num, digits); return 0; @@ -128,7 +128,7 @@ size_t Serial_::print(double num, int digits) { return gSerialMock->print(num, digits); } -size_t Serial_::println(const char *s) { +size_t Serial::println(const char *s) { if (printToCout) { std::cout << s << std::endl; return 0; @@ -137,7 +137,7 @@ size_t Serial_::println(const char *s) { return gSerialMock->println(s); } -size_t Serial_::println(char c) { +size_t Serial::println(char c) { if (printToCout) { std::cout << c << std::endl; return 0; @@ -146,37 +146,37 @@ size_t Serial_::println(char c) { return gSerialMock->println(c); } -size_t Serial_::println(unsigned char c, int base) { +size_t Serial::println(unsigned char c, int base) { assert (gSerialMock != NULL); return gSerialMock->println(c, base); } -size_t Serial_::println(int num, int base) { +size_t Serial::println(int num, int base) { assert (gSerialMock != NULL); return gSerialMock->println(num, base); } -size_t Serial_::println(unsigned int num, int base) { +size_t Serial::println(unsigned int num, int base) { assert (gSerialMock != NULL); return gSerialMock->println(num, base); } -size_t Serial_::println(long num, int base) { +size_t Serial::println(long num, int base) { assert (gSerialMock != NULL); return gSerialMock->println(num, base); } -size_t Serial_::println(unsigned long num, int base) { +size_t Serial::println(unsigned long num, int base) { assert (gSerialMock != NULL); return gSerialMock->println(num, base); } -size_t Serial_::println(double num, int digits) { +size_t Serial::println(double num, int digits) { assert (gSerialMock != NULL); return gSerialMock->println(num, digits); } -size_t Serial_::println(void) { +size_t Serial::println(void) { if (printToCout) { std::cout << std::endl; return 0; @@ -185,40 +185,40 @@ size_t Serial_::println(void) { return gSerialMock->println(); } -size_t Serial_::write(uint8_t val) { +size_t Serial::write(uint8_t val) { assert (gSerialMock != NULL); return gSerialMock->write(val); } -size_t Serial_::write(const char *str) { +size_t Serial::write(const char *str) { assert (gSerialMock != NULL); return gSerialMock->write(str); } -size_t Serial_::write(const uint8_t *buffer, size_t size) { +size_t Serial::write(const uint8_t *buffer, size_t size) { assert (gSerialMock != NULL); return gSerialMock->write(buffer, size); } -uint8_t Serial_::begin(uint32_t port) { +uint8_t Serial::begin(uint32_t port) { assert (gSerialMock != NULL); return gSerialMock->begin(port); } -void Serial_::flush() { +void Serial::flush() { assert (gSerialMock != NULL); return gSerialMock->flush(); } -uint8_t Serial_::available() { +uint8_t Serial::available() { assert (gSerialMock != NULL); return gSerialMock->available(); } -uint8_t Serial_::read() { +uint8_t Serial::read() { assert (gSerialMock != NULL); return gSerialMock->read(); } // Preinstantiate Objects -Serial_ Serial; +Serial SerialClass; From 8f910f1a1fe9558dddf298da2f7889e9474c4099 Mon Sep 17 00:00:00 2001 From: SMJSGaming Date: Tue, 15 Jun 2021 08:42:42 +0200 Subject: [PATCH 06/10] Changed a few name conventions --- include/SPI.h | 2 +- include/Serial.h | 3 ++- src/SPI.cc | 2 +- src/Serial.cc | 2 +- test/SPI_unittest.cc | 28 +++++++++++++------------- test/Serial_unittest.cc | 44 ++++++++++++++++++++--------------------- 6 files changed, 41 insertions(+), 40 deletions(-) diff --git a/include/SPI.h b/include/SPI.h index 92862fb..1b2f91e 100644 --- a/include/SPI.h +++ b/include/SPI.h @@ -36,7 +36,7 @@ class SPIClass { void detachInterrupt(); }; -extern SPIClass SPI; +extern SPIClass SPIInstance; class SPIMock { public: diff --git a/include/Serial.h b/include/Serial.h index 39d216f..dba1f6b 100644 --- a/include/Serial.h +++ b/include/Serial.h @@ -101,7 +101,8 @@ class Serial { static size_t println(const Printable&); */ }; -extern Serial SerialClass; + +extern Serial SerialInstance; SerialMock* serialMockInstance(); void releaseSerialMock(); diff --git a/src/SPI.cc b/src/SPI.cc index 2d39408..4883ba0 100644 --- a/src/SPI.cc +++ b/src/SPI.cc @@ -73,4 +73,4 @@ void SPIClass::detachInterrupt() { } // Preinstantiate Objects -SPIClass SPI; +SPIClass SPIInstance; diff --git a/src/Serial.cc b/src/Serial.cc index 718048d..257766f 100644 --- a/src/Serial.cc +++ b/src/Serial.cc @@ -221,4 +221,4 @@ uint8_t Serial::read() { } // Preinstantiate Objects -Serial SerialClass; +Serial SerialInstance; diff --git a/test/SPI_unittest.cc b/test/SPI_unittest.cc index 9b4966c..32a9006 100644 --- a/test/SPI_unittest.cc +++ b/test/SPI_unittest.cc @@ -31,20 +31,20 @@ TEST(SPITest, access) { EXPECT_CALL(*mock, detachInterrupt()); - SPI.begin(); - SPI.usingInterrupt(value1); - SPI.notUsingInterrupt(value1); - SPI.beginTransaction(settings); - SPI.transfer(value1); - SPI.transfer16(value); - SPI.transfer(voidTest, value1); - SPI.endTransaction(); - SPI.end(); - SPI.setBitOrder(value1); - SPI.setDataMode(value1); - SPI.setClockDivider(value1); - SPI.attachInterrupt(); - SPI.detachInterrupt(); + SPIInstance.begin(); + SPIInstance.usingInterrupt(value1); + SPIInstance.notUsingInterrupt(value1); + SPIInstance.beginTransaction(settings); + SPIInstance.transfer(value1); + SPIInstance.transfer16(value); + SPIInstance.transfer(voidTest, value1); + SPIInstance.endTransaction(); + SPIInstance.end(); + SPIInstance.setBitOrder(value1); + SPIInstance.setDataMode(value1); + SPIInstance.setClockDivider(value1); + SPIInstance.attachInterrupt(); + SPIInstance.detachInterrupt(); releaseSPIMock(); } diff --git a/test/Serial_unittest.cc b/test/Serial_unittest.cc index c4a46f1..d8f42a7 100644 --- a/test/Serial_unittest.cc +++ b/test/Serial_unittest.cc @@ -18,7 +18,7 @@ TEST(serial, println1) { SerialMock* serialMock = serialMockInstance(); EXPECT_CALL(*serialMock, println(1, 10)) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, Serial.println(1, 10)); + EXPECT_EQ(1, SerialInstance.println(1, 10)); releaseSerialMock(); } @@ -28,7 +28,7 @@ TEST(serial, println2) { const char lala[] = "haha"; EXPECT_CALL(*serialMock, println(lala)) .WillRepeatedly(Return(4)); - EXPECT_EQ(4, Serial.println(lala)); + EXPECT_EQ(4, SerialInstance.println(lala)); releaseSerialMock(); } @@ -38,7 +38,7 @@ TEST(serial, println3) { char lala = 'a'; EXPECT_CALL(*serialMock, println(lala)) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, Serial.println(lala)); + EXPECT_EQ(1, SerialInstance.println(lala)); releaseSerialMock(); } @@ -48,7 +48,7 @@ TEST(serial, println4) { unsigned char lala = 'a'; EXPECT_CALL(*serialMock, println(lala, DEC)) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, Serial.println(lala)); + EXPECT_EQ(1, SerialInstance.println(lala)); releaseSerialMock(); } @@ -58,7 +58,7 @@ TEST(serial, println5) { unsigned int lala = 1234; EXPECT_CALL(*serialMock, println(lala, DEC)) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, Serial.println(lala, DEC)); + EXPECT_EQ(1, SerialInstance.println(lala, DEC)); releaseSerialMock(); } @@ -68,7 +68,7 @@ TEST(serial, println6) { long lala = 1234567; EXPECT_CALL(*serialMock, println(lala, DEC)) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, Serial.println(lala, DEC)); + EXPECT_EQ(1, SerialInstance.println(lala, DEC)); releaseSerialMock(); } @@ -78,7 +78,7 @@ TEST(serial, println7) { unsigned long lala = 2345678; EXPECT_CALL(*serialMock, println(lala, DEC)) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, Serial.println(lala, DEC)); + EXPECT_EQ(1, SerialInstance.println(lala, DEC)); releaseSerialMock(); } @@ -88,7 +88,7 @@ TEST(serial, println8) { double lala = 3.14; EXPECT_CALL(*serialMock, println(lala, 2)) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, Serial.println(lala, 2)); + EXPECT_EQ(1, SerialInstance.println(lala, 2)); releaseSerialMock(); } @@ -97,7 +97,7 @@ TEST(serial, println9) { SerialMock* serialMock = serialMockInstance(); EXPECT_CALL(*serialMock, println()) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, Serial.println()); + EXPECT_EQ(1, SerialInstance.println()); releaseSerialMock(); } @@ -107,7 +107,7 @@ TEST(serial, print1) { int lala = 123; EXPECT_CALL(*serialMock, print(Matcher(lala), Matcher(10))) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, Serial.print(lala, 10)); + EXPECT_EQ(1, SerialInstance.print(lala, 10)); releaseSerialMock(); } @@ -117,7 +117,7 @@ TEST(serial, print2) { const char lala[] = "haha"; EXPECT_CALL(*serialMock, print(Matcher(lala))) .WillRepeatedly(Return(4)); - EXPECT_EQ(4, Serial.print(lala)); + EXPECT_EQ(4, SerialInstance.print(lala)); releaseSerialMock(); } @@ -127,7 +127,7 @@ TEST(serial, print3) { char lala = 'a'; EXPECT_CALL(*serialMock, print(Matcher(lala))) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, Serial.print(lala)); + EXPECT_EQ(1, SerialInstance.print(lala)); releaseSerialMock(); } @@ -137,7 +137,7 @@ TEST(serial, print4) { unsigned char lala = 'a'; EXPECT_CALL(*serialMock, print(Matcher(lala), Matcher(DEC))) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, Serial.print(lala)); + EXPECT_EQ(1, SerialInstance.print(lala)); releaseSerialMock(); } @@ -147,7 +147,7 @@ TEST(serial, print5) { unsigned int lala = 1234; EXPECT_CALL(*serialMock, print(Matcher(lala), Matcher(DEC))) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, Serial.print(lala, DEC)); + EXPECT_EQ(1, SerialInstance.print(lala, DEC)); releaseSerialMock(); } @@ -157,7 +157,7 @@ TEST(serial, print6) { long lala = 1234567; EXPECT_CALL(*serialMock, print(Matcher(lala), Matcher(DEC))) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, Serial.print(lala, DEC)); + EXPECT_EQ(1, SerialInstance.print(lala, DEC)); releaseSerialMock(); } @@ -167,7 +167,7 @@ TEST(serial, print7) { unsigned long lala = 2345678; EXPECT_CALL(*serialMock, print(Matcher(lala), Matcher(DEC))) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, Serial.print(lala, DEC)); + EXPECT_EQ(1, SerialInstance.print(lala, DEC)); releaseSerialMock(); } @@ -177,21 +177,21 @@ TEST(serial, print8) { double lala = 3.14; EXPECT_CALL(*serialMock, print(Matcher(lala), Matcher(2))) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, Serial.print(lala, 2)); + EXPECT_EQ(1, SerialInstance.print(lala, 2)); releaseSerialMock(); } TEST(serial, flush) { SerialMock* serialMock = serialMockInstance(); EXPECT_CALL(*serialMock, flush()); - Serial.flush(); + SerialInstance.flush(); releaseSerialMock(); } TEST(serial, write1) { SerialMock* serialMock = serialMockInstance(); EXPECT_CALL(*serialMock, write('a')); - Serial.write('a'); + SerialInstance.write('a'); releaseSerialMock(); } @@ -199,7 +199,7 @@ TEST(serial, available) { SerialMock* serialMock = serialMockInstance(); EXPECT_CALL(*serialMock, available()) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, Serial.available()); + EXPECT_EQ(1, SerialInstance.available()); releaseSerialMock(); } @@ -207,7 +207,7 @@ TEST(serial, read1) { SerialMock* serialMock = serialMockInstance(); EXPECT_CALL(*serialMock, read()) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, Serial.read()); + EXPECT_EQ(1, SerialInstance.read()); releaseSerialMock(); } @@ -215,6 +215,6 @@ TEST(serial, read2) { SerialMock* serialMock = serialMockInstance(); EXPECT_CALL(*serialMock, read()) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, Serial.read()); + EXPECT_EQ(1, SerialInstance.read()); releaseSerialMock(); } From 4a4913d066225310eaeea1b123efe0433cdf5c31 Mon Sep 17 00:00:00 2001 From: SMJSGaming Date: Tue, 15 Jun 2021 08:52:13 +0200 Subject: [PATCH 07/10] Added serial to the general arduino mock --- .gitignore | 3 +++ include/Arduino.h | 1 + 2 files changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 30f42e5..ee24150 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,6 @@ test/test_all #ignore external lib /lib/gmock/gmock/ /lib/gtest/gtest/ + +#ingore IDE files +.vscode \ No newline at end of file diff --git a/include/Arduino.h b/include/Arduino.h index 6247a4f..6796278 100644 --- a/include/Arduino.h +++ b/include/Arduino.h @@ -5,6 +5,7 @@ #define ARDUINO_H #include +#include #ifdef __cplusplus extern "C" { From 868afcff5a0f7adf19ca8cce86d61703a2373c84 Mon Sep 17 00:00:00 2001 From: SMJSGaming Date: Tue, 15 Jun 2021 09:00:41 +0200 Subject: [PATCH 08/10] Found the cause of the error and removed the other attempts on fixing it --- include/Serial.h | 4 +-- src/Serial.cc | 54 ++++++++++++++++++++--------------------- test/Serial_unittest.cc | 44 ++++++++++++++++----------------- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/include/Serial.h b/include/Serial.h index dba1f6b..53b2e3c 100644 --- a/include/Serial.h +++ b/include/Serial.h @@ -50,7 +50,7 @@ class SerialMock { */ }; -class Serial { +class Serial_ { private: static bool printToCout; @@ -102,7 +102,7 @@ class Serial { */ }; -extern Serial SerialInstance; +extern Serial_ Serial; SerialMock* serialMockInstance(); void releaseSerialMock(); diff --git a/src/Serial.cc b/src/Serial.cc index 257766f..923ee1c 100644 --- a/src/Serial.cc +++ b/src/Serial.cc @@ -50,13 +50,13 @@ template void printBase(T num, int base) { std::cout << num << std::dec; } -bool Serial::printToCout = false; +bool Serial_::printToCout = false; -void Serial::setPrintToCout(bool flag) { +void Serial_::setPrintToCout(bool flag) { printToCout = flag; } -size_t Serial::print(const char *s) { +size_t Serial_::print(const char *s) { if (printToCout) { std::cout << s; return 0; @@ -65,7 +65,7 @@ size_t Serial::print(const char *s) { return gSerialMock->print(s); } -size_t Serial::print(char c) { +size_t Serial_::print(char c) { if (printToCout) { std::cout << c; return 0; @@ -74,7 +74,7 @@ size_t Serial::print(char c) { return gSerialMock->print(c); } -size_t Serial::print(unsigned char c, int base) { +size_t Serial_::print(unsigned char c, int base) { if (printToCout) { printBase(c, base); return 0; @@ -83,7 +83,7 @@ size_t Serial::print(unsigned char c, int base) { return gSerialMock->print(c, base); } -size_t Serial::print(int num, int base) { +size_t Serial_::print(int num, int base) { if (printToCout) { printBase(num, base); return 0; @@ -92,7 +92,7 @@ size_t Serial::print(int num, int base) { return gSerialMock->print(num, base); } -size_t Serial::print(unsigned int num, int base) { +size_t Serial_::print(unsigned int num, int base) { if (printToCout) { printBase(num, base); return 0; @@ -101,7 +101,7 @@ size_t Serial::print(unsigned int num, int base) { return gSerialMock->print(num, base); } -size_t Serial::print(long num, int base) { +size_t Serial_::print(long num, int base) { if (printToCout) { printBase(num, base); return 0; @@ -110,7 +110,7 @@ size_t Serial::print(long num, int base) { return gSerialMock->print(num, base); } -size_t Serial::print(unsigned long num, int base) { +size_t Serial_::print(unsigned long num, int base) { if (printToCout) { printBase(num, base); return 0; @@ -119,7 +119,7 @@ size_t Serial::print(unsigned long num, int base) { return gSerialMock->print(num, base); } -size_t Serial::print(double num, int digits) { +size_t Serial_::print(double num, int digits) { if (printToCout) { printDouble(num, digits); return 0; @@ -128,7 +128,7 @@ size_t Serial::print(double num, int digits) { return gSerialMock->print(num, digits); } -size_t Serial::println(const char *s) { +size_t Serial_::println(const char *s) { if (printToCout) { std::cout << s << std::endl; return 0; @@ -137,7 +137,7 @@ size_t Serial::println(const char *s) { return gSerialMock->println(s); } -size_t Serial::println(char c) { +size_t Serial_::println(char c) { if (printToCout) { std::cout << c << std::endl; return 0; @@ -146,37 +146,37 @@ size_t Serial::println(char c) { return gSerialMock->println(c); } -size_t Serial::println(unsigned char c, int base) { +size_t Serial_::println(unsigned char c, int base) { assert (gSerialMock != NULL); return gSerialMock->println(c, base); } -size_t Serial::println(int num, int base) { +size_t Serial_::println(int num, int base) { assert (gSerialMock != NULL); return gSerialMock->println(num, base); } -size_t Serial::println(unsigned int num, int base) { +size_t Serial_::println(unsigned int num, int base) { assert (gSerialMock != NULL); return gSerialMock->println(num, base); } -size_t Serial::println(long num, int base) { +size_t Serial_::println(long num, int base) { assert (gSerialMock != NULL); return gSerialMock->println(num, base); } -size_t Serial::println(unsigned long num, int base) { +size_t Serial_::println(unsigned long num, int base) { assert (gSerialMock != NULL); return gSerialMock->println(num, base); } -size_t Serial::println(double num, int digits) { +size_t Serial_::println(double num, int digits) { assert (gSerialMock != NULL); return gSerialMock->println(num, digits); } -size_t Serial::println(void) { +size_t Serial_::println(void) { if (printToCout) { std::cout << std::endl; return 0; @@ -185,40 +185,40 @@ size_t Serial::println(void) { return gSerialMock->println(); } -size_t Serial::write(uint8_t val) { +size_t Serial_::write(uint8_t val) { assert (gSerialMock != NULL); return gSerialMock->write(val); } -size_t Serial::write(const char *str) { +size_t Serial_::write(const char *str) { assert (gSerialMock != NULL); return gSerialMock->write(str); } -size_t Serial::write(const uint8_t *buffer, size_t size) { +size_t Serial_::write(const uint8_t *buffer, size_t size) { assert (gSerialMock != NULL); return gSerialMock->write(buffer, size); } -uint8_t Serial::begin(uint32_t port) { +uint8_t Serial_::begin(uint32_t port) { assert (gSerialMock != NULL); return gSerialMock->begin(port); } -void Serial::flush() { +void Serial_::flush() { assert (gSerialMock != NULL); return gSerialMock->flush(); } -uint8_t Serial::available() { +uint8_t Serial_::available() { assert (gSerialMock != NULL); return gSerialMock->available(); } -uint8_t Serial::read() { +uint8_t Serial_::read() { assert (gSerialMock != NULL); return gSerialMock->read(); } // Preinstantiate Objects -Serial SerialInstance; +Serial_ Serial; diff --git a/test/Serial_unittest.cc b/test/Serial_unittest.cc index d8f42a7..c4a46f1 100644 --- a/test/Serial_unittest.cc +++ b/test/Serial_unittest.cc @@ -18,7 +18,7 @@ TEST(serial, println1) { SerialMock* serialMock = serialMockInstance(); EXPECT_CALL(*serialMock, println(1, 10)) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, SerialInstance.println(1, 10)); + EXPECT_EQ(1, Serial.println(1, 10)); releaseSerialMock(); } @@ -28,7 +28,7 @@ TEST(serial, println2) { const char lala[] = "haha"; EXPECT_CALL(*serialMock, println(lala)) .WillRepeatedly(Return(4)); - EXPECT_EQ(4, SerialInstance.println(lala)); + EXPECT_EQ(4, Serial.println(lala)); releaseSerialMock(); } @@ -38,7 +38,7 @@ TEST(serial, println3) { char lala = 'a'; EXPECT_CALL(*serialMock, println(lala)) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, SerialInstance.println(lala)); + EXPECT_EQ(1, Serial.println(lala)); releaseSerialMock(); } @@ -48,7 +48,7 @@ TEST(serial, println4) { unsigned char lala = 'a'; EXPECT_CALL(*serialMock, println(lala, DEC)) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, SerialInstance.println(lala)); + EXPECT_EQ(1, Serial.println(lala)); releaseSerialMock(); } @@ -58,7 +58,7 @@ TEST(serial, println5) { unsigned int lala = 1234; EXPECT_CALL(*serialMock, println(lala, DEC)) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, SerialInstance.println(lala, DEC)); + EXPECT_EQ(1, Serial.println(lala, DEC)); releaseSerialMock(); } @@ -68,7 +68,7 @@ TEST(serial, println6) { long lala = 1234567; EXPECT_CALL(*serialMock, println(lala, DEC)) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, SerialInstance.println(lala, DEC)); + EXPECT_EQ(1, Serial.println(lala, DEC)); releaseSerialMock(); } @@ -78,7 +78,7 @@ TEST(serial, println7) { unsigned long lala = 2345678; EXPECT_CALL(*serialMock, println(lala, DEC)) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, SerialInstance.println(lala, DEC)); + EXPECT_EQ(1, Serial.println(lala, DEC)); releaseSerialMock(); } @@ -88,7 +88,7 @@ TEST(serial, println8) { double lala = 3.14; EXPECT_CALL(*serialMock, println(lala, 2)) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, SerialInstance.println(lala, 2)); + EXPECT_EQ(1, Serial.println(lala, 2)); releaseSerialMock(); } @@ -97,7 +97,7 @@ TEST(serial, println9) { SerialMock* serialMock = serialMockInstance(); EXPECT_CALL(*serialMock, println()) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, SerialInstance.println()); + EXPECT_EQ(1, Serial.println()); releaseSerialMock(); } @@ -107,7 +107,7 @@ TEST(serial, print1) { int lala = 123; EXPECT_CALL(*serialMock, print(Matcher(lala), Matcher(10))) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, SerialInstance.print(lala, 10)); + EXPECT_EQ(1, Serial.print(lala, 10)); releaseSerialMock(); } @@ -117,7 +117,7 @@ TEST(serial, print2) { const char lala[] = "haha"; EXPECT_CALL(*serialMock, print(Matcher(lala))) .WillRepeatedly(Return(4)); - EXPECT_EQ(4, SerialInstance.print(lala)); + EXPECT_EQ(4, Serial.print(lala)); releaseSerialMock(); } @@ -127,7 +127,7 @@ TEST(serial, print3) { char lala = 'a'; EXPECT_CALL(*serialMock, print(Matcher(lala))) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, SerialInstance.print(lala)); + EXPECT_EQ(1, Serial.print(lala)); releaseSerialMock(); } @@ -137,7 +137,7 @@ TEST(serial, print4) { unsigned char lala = 'a'; EXPECT_CALL(*serialMock, print(Matcher(lala), Matcher(DEC))) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, SerialInstance.print(lala)); + EXPECT_EQ(1, Serial.print(lala)); releaseSerialMock(); } @@ -147,7 +147,7 @@ TEST(serial, print5) { unsigned int lala = 1234; EXPECT_CALL(*serialMock, print(Matcher(lala), Matcher(DEC))) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, SerialInstance.print(lala, DEC)); + EXPECT_EQ(1, Serial.print(lala, DEC)); releaseSerialMock(); } @@ -157,7 +157,7 @@ TEST(serial, print6) { long lala = 1234567; EXPECT_CALL(*serialMock, print(Matcher(lala), Matcher(DEC))) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, SerialInstance.print(lala, DEC)); + EXPECT_EQ(1, Serial.print(lala, DEC)); releaseSerialMock(); } @@ -167,7 +167,7 @@ TEST(serial, print7) { unsigned long lala = 2345678; EXPECT_CALL(*serialMock, print(Matcher(lala), Matcher(DEC))) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, SerialInstance.print(lala, DEC)); + EXPECT_EQ(1, Serial.print(lala, DEC)); releaseSerialMock(); } @@ -177,21 +177,21 @@ TEST(serial, print8) { double lala = 3.14; EXPECT_CALL(*serialMock, print(Matcher(lala), Matcher(2))) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, SerialInstance.print(lala, 2)); + EXPECT_EQ(1, Serial.print(lala, 2)); releaseSerialMock(); } TEST(serial, flush) { SerialMock* serialMock = serialMockInstance(); EXPECT_CALL(*serialMock, flush()); - SerialInstance.flush(); + Serial.flush(); releaseSerialMock(); } TEST(serial, write1) { SerialMock* serialMock = serialMockInstance(); EXPECT_CALL(*serialMock, write('a')); - SerialInstance.write('a'); + Serial.write('a'); releaseSerialMock(); } @@ -199,7 +199,7 @@ TEST(serial, available) { SerialMock* serialMock = serialMockInstance(); EXPECT_CALL(*serialMock, available()) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, SerialInstance.available()); + EXPECT_EQ(1, Serial.available()); releaseSerialMock(); } @@ -207,7 +207,7 @@ TEST(serial, read1) { SerialMock* serialMock = serialMockInstance(); EXPECT_CALL(*serialMock, read()) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, SerialInstance.read()); + EXPECT_EQ(1, Serial.read()); releaseSerialMock(); } @@ -215,6 +215,6 @@ TEST(serial, read2) { SerialMock* serialMock = serialMockInstance(); EXPECT_CALL(*serialMock, read()) .WillRepeatedly(Return(1)); - EXPECT_EQ(1, SerialInstance.read()); + EXPECT_EQ(1, Serial.read()); releaseSerialMock(); } From a543e2a3f1e0d70aed379a7e5509f5946fdecc28 Mon Sep 17 00:00:00 2001 From: SMJSGaming Date: Tue, 15 Jun 2021 09:06:05 +0200 Subject: [PATCH 09/10] Forgot to remove a certain change --- include/SPI.h | 2 +- src/SPI.cc | 2 +- test/SPI_unittest.cc | 28 ++++++++++++++-------------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/SPI.h b/include/SPI.h index 1b2f91e..92862fb 100644 --- a/include/SPI.h +++ b/include/SPI.h @@ -36,7 +36,7 @@ class SPIClass { void detachInterrupt(); }; -extern SPIClass SPIInstance; +extern SPIClass SPI; class SPIMock { public: diff --git a/src/SPI.cc b/src/SPI.cc index 4883ba0..2d39408 100644 --- a/src/SPI.cc +++ b/src/SPI.cc @@ -73,4 +73,4 @@ void SPIClass::detachInterrupt() { } // Preinstantiate Objects -SPIClass SPIInstance; +SPIClass SPI; diff --git a/test/SPI_unittest.cc b/test/SPI_unittest.cc index 32a9006..9b4966c 100644 --- a/test/SPI_unittest.cc +++ b/test/SPI_unittest.cc @@ -31,20 +31,20 @@ TEST(SPITest, access) { EXPECT_CALL(*mock, detachInterrupt()); - SPIInstance.begin(); - SPIInstance.usingInterrupt(value1); - SPIInstance.notUsingInterrupt(value1); - SPIInstance.beginTransaction(settings); - SPIInstance.transfer(value1); - SPIInstance.transfer16(value); - SPIInstance.transfer(voidTest, value1); - SPIInstance.endTransaction(); - SPIInstance.end(); - SPIInstance.setBitOrder(value1); - SPIInstance.setDataMode(value1); - SPIInstance.setClockDivider(value1); - SPIInstance.attachInterrupt(); - SPIInstance.detachInterrupt(); + SPI.begin(); + SPI.usingInterrupt(value1); + SPI.notUsingInterrupt(value1); + SPI.beginTransaction(settings); + SPI.transfer(value1); + SPI.transfer16(value); + SPI.transfer(voidTest, value1); + SPI.endTransaction(); + SPI.end(); + SPI.setBitOrder(value1); + SPI.setDataMode(value1); + SPI.setClockDivider(value1); + SPI.attachInterrupt(); + SPI.detachInterrupt(); releaseSPIMock(); } From 556c442ba8925a5cee9ab98afee8ff4a1b3f3d44 Mon Sep 17 00:00:00 2001 From: SMJSGaming Date: Tue, 15 Jun 2021 10:12:14 +0200 Subject: [PATCH 10/10] Added a required type --- include/Serial.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/Serial.h b/include/Serial.h index 53b2e3c..db102da 100644 --- a/include/Serial.h +++ b/include/Serial.h @@ -102,6 +102,8 @@ class Serial_ { */ }; +class HardwareSerial : public Serial_ {}; + extern Serial_ Serial; SerialMock* serialMockInstance();