From 6f987b5a51947a44c2bcd8746d7fe1f581f78e2c Mon Sep 17 00:00:00 2001 From: Warren MacEvoy Date: Mon, 26 Mar 2018 19:34:40 -0600 Subject: [PATCH] forgotten commits --- library.properties | 2 +- meta/mkCompare.cpp | 4 ++-- src/ArduinoUnit.h | 15 +++++++-------- src/ArduinoUnitUtility/ArduinoUnitString.cpp | 2 +- src/ArduinoUnitUtility/ArduinoUnitString.h | 2 +- src/ArduinoUnitUtility/Compare.h | 4 ++-- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/library.properties b/library.properties index 52fcd63..e30e657 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=ArduinoUnit -version=2.3.0-alpha +version=2.3.2-alpha author=Matthew Murdoch maintainer=Matthew Murdoch sentence=Unit test framework for arduino projects. diff --git a/meta/mkCompare.cpp b/meta/mkCompare.cpp index 99dc0db..5ff09a2 100644 --- a/meta/mkCompare.cpp +++ b/meta/mkCompare.cpp @@ -314,9 +314,9 @@ int main(int argc, const char *argv[]) mk.out << "#include " << std::endl; if (includeFlash) { - mk.out << "#include " << std::endl; + mk.out << "#include \"ArduinoUnitUtility/Flash.h\"" << std::endl; } - mk.out << "#include " << std::endl; + mk.out << "#include \"ArduinoUnitUtility/ArduinoUnitWiden.h\"" << std::endl; if (includeString) { mk.out << "#include " << std::endl; } diff --git a/src/ArduinoUnit.h b/src/ArduinoUnit.h index 83973e2..ea142bd 100644 --- a/src/ArduinoUnit.h +++ b/src/ArduinoUnit.h @@ -10,13 +10,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include "ArduinoUnitUtility/Flash.h" +#include "ArduinoUnitUtility/ArduinoUnitWiden.h" +#include "ArduinoUnitUtility/ArduinoUnitString.h" +#include "ArduinoUnitUtility/Compare.h" +#include "ArduinoUnitUtility/FakeStream.h" +#include "ArduinoUnitUtility/FakeStreamBuffer.h" +#include "ArduinoUnitUtility/FreeMemory.h" /** \brief This is defined to manage the API transition to 2.X */ #define ARDUINO_UNIT_MAJOR_VERSION 2 @@ -742,4 +742,3 @@ is in another file (or defined after the assertion on it). */ #define ASSERT_TEST_NOT_SKIP_MACRO_CHOOSER(...) ASSERT_TEST_NOT_SKIP_CHOOSE(ASSERT_TEST_NOT_SKIP_NO_ARG_EXPANDER __VA_ARGS__ ()) /** macro generates optional output and calls skip() followed by a return if false. */ #define assertTestNotSkip(...) ASSERT_TEST_NOT_SKIP_MACRO_CHOOSER(__VA_ARGS__)(__VA_ARGS__) - diff --git a/src/ArduinoUnitUtility/ArduinoUnitString.cpp b/src/ArduinoUnitUtility/ArduinoUnitString.cpp index a0fc9d5..5f222d1 100644 --- a/src/ArduinoUnitUtility/ArduinoUnitString.cpp +++ b/src/ArduinoUnitUtility/ArduinoUnitString.cpp @@ -1,5 +1,5 @@ #include -#include +#include "ArduinoUnitUtility/ArduinoUnitString.h" #if ARDUINO_UNIT_USE_FLASH > 0 ArduinoUnitString::ArduinoUnitString(const __FlashStringHelper *_data) : data(0x80000000|(uint32_t)_data), debug(false) {} diff --git a/src/ArduinoUnitUtility/ArduinoUnitString.h b/src/ArduinoUnitUtility/ArduinoUnitString.h index 15a25b4..b80a0ef 100644 --- a/src/ArduinoUnitUtility/ArduinoUnitString.h +++ b/src/ArduinoUnitUtility/ArduinoUnitString.h @@ -3,7 +3,7 @@ #include #include #include -#include +#include "ArduinoUnitUtility/Flash.h" class ArduinoUnitString : public Printable { public: diff --git a/src/ArduinoUnitUtility/Compare.h b/src/ArduinoUnitUtility/Compare.h index ab43e2e..4650a23 100644 --- a/src/ArduinoUnitUtility/Compare.h +++ b/src/ArduinoUnitUtility/Compare.h @@ -1,7 +1,7 @@ #pragma once #include -#include -#include +#include "ArduinoUnitUtility/Flash.h" +#include "ArduinoUnitUtility/ArduinoUnitWiden.h" #include template < typename A, typename B > struct Compare