From e9d383d19a9535180dad5776458358586ac853a6 Mon Sep 17 00:00:00 2001
From: Jeremy Boynes <jeremy@boynes.com>
Date: Thu, 7 Sep 2023 23:16:25 +0100
Subject: [PATCH 1/4] Allow tests to run on systems with case-insensive files.
Also adds pragmas to suppress warnings treated as fatal
---
api/IPAddress.cpp | 6 ++++++
api/deprecated-avr-comp/avr/dtostrf.c.impl | 3 +++
test/CMakeLists.txt | 2 +-
test/include/MillisFake.h | 2 +-
test/include/PrintMock.h | 2 +-
test/include/PrintableMock.h | 2 +-
test/include/StreamMock.h | 2 +-
test/src/CanMsg/test_CanExtendedId.cpp | 2 +-
test/src/CanMsg/test_CanMsg.cpp | 2 +-
test/src/CanMsg/test_CanMsg_CopyCtor.cpp | 2 +-
test/src/CanMsg/test_CanStandardId.cpp | 2 +-
test/src/CanMsg/test_isExtendedId.cpp | 2 +-
test/src/CanMsg/test_isStandardId.cpp | 2 +-
test/src/CanMsg/test_operator_assignment.cpp | 2 +-
test/src/CanMsg/test_printTo.cpp | 2 +-
test/src/CanMsgRingbuffer/test_available.cpp | 2 +-
test/src/Common/test_makeWord.cpp | 2 +-
test/src/Common/test_map.cpp | 2 +-
test/src/Common/test_max.cpp | 6 +++---
test/src/Common/test_min.cpp | 6 +++---
test/src/IPAddress/test_IPAddress.cpp | 2 +-
test/src/IPAddress/test_IPAddress6.cpp | 2 +-
test/src/IPAddress/test_fromString.cpp | 4 ++--
test/src/IPAddress/test_fromString6.cpp | 4 ++--
test/src/IPAddress/test_operator_assignment.cpp | 2 +-
test/src/IPAddress/test_operator_comparison.cpp | 2 +-
test/src/IPAddress/test_operator_comparison6.cpp | 2 +-
test/src/IPAddress/test_operator_parentheses.cpp | 2 +-
test/src/IPAddress/test_operator_parentheses6.cpp | 2 +-
test/src/IPAddress/test_printTo.cpp | 2 +-
test/src/IPAddress/test_printTo6.cpp | 2 +-
test/src/IPAddress/test_toString.cpp | 4 ++--
test/src/Print/test_availableForWrite.cpp | 2 +-
test/src/Print/test_clearWriteError.cpp | 2 +-
test/src/Print/test_getWriteError.cpp | 2 +-
test/src/Print/test_print.cpp | 2 +-
test/src/Print/test_println.cpp | 2 +-
test/src/Ringbuffer/test_available.cpp | 2 +-
test/src/Ringbuffer/test_availableForStore.cpp | 2 +-
test/src/Ringbuffer/test_clear.cpp | 2 +-
test/src/Ringbuffer/test_isFull.cpp | 2 +-
test/src/Ringbuffer/test_peek.cpp | 2 +-
test/src/Ringbuffer/test_read_char.cpp | 2 +-
test/src/Ringbuffer/test_store_char.cpp | 2 +-
test/src/String/StringPrinter.h | 2 +-
test/src/String/test_String.cpp | 2 +-
test/src/String/test_characterAccessFunc.cpp | 2 +-
test/src/String/test_compareTo.cpp | 2 +-
test/src/String/test_comparisonFunc.cpp | 2 +-
test/src/String/test_concat.cpp | 2 +-
test/src/String/test_indexOf.cpp | 2 +-
test/src/String/test_lastIndexOf.cpp | 2 +-
test/src/String/test_length.cpp | 2 +-
test/src/String/test_move.cpp | 5 ++++-
test/src/String/test_operators.cpp | 2 +-
test/src/String/test_remove.cpp | 2 +-
test/src/String/test_replace.cpp | 2 +-
test/src/String/test_substring.cpp | 2 +-
test/src/String/test_toDouble.cpp | 2 +-
test/src/String/test_toFloat.cpp | 2 +-
test/src/String/test_toInt.cpp | 2 +-
test/src/String/test_toLowerCase.cpp | 2 +-
test/src/String/test_toUpperCase.cpp | 2 +-
test/src/String/test_trim.cpp | 2 +-
test/src/WCharacter/test_isAscii.cpp | 2 +-
test/src/WCharacter/test_isControl.cpp | 2 +-
test/src/WCharacter/test_isDigit.cpp | 2 +-
test/src/WCharacter/test_isHexadecimalDigit.cpp | 2 +-
test/src/WCharacter/test_isLowerCase.cpp | 2 +-
test/src/WCharacter/test_isPunct.cpp | 2 +-
test/src/WCharacter/test_isSpace.cpp | 2 +-
test/src/WCharacter/test_isUpperCase.cpp | 2 +-
test/src/WCharacter/test_isWhitespace.cpp | 2 +-
test/src/WCharacter/test_toAscii.cpp | 2 +-
test/src/dtostrf.cpp | 4 ++--
test/src/itoa.cpp | 14 +++++++++++++-
76 files changed, 106 insertions(+), 82 deletions(-)
diff --git a/api/IPAddress.cpp b/api/IPAddress.cpp
index 1d775906..4053be61 100644
--- a/api/IPAddress.cpp
+++ b/api/IPAddress.cpp
@@ -96,13 +96,18 @@ IPAddress::IPAddress(const char *address)
String IPAddress::toString4() const
{
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
char szRet[16];
sprintf(szRet,"%u.%u.%u.%u", _address.bytes[IPADDRESS_V4_BYTES_INDEX], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 1], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 2], _address.bytes[IPADDRESS_V4_BYTES_INDEX + 3]);
return String(szRet);
+#pragma GCC diagnostic pop
}
String IPAddress::toString6() const
{
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
char szRet[40];
sprintf(szRet,"%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x",
_address.bytes[0], _address.bytes[1], _address.bytes[2], _address.bytes[3],
@@ -110,6 +115,7 @@ String IPAddress::toString6() const
_address.bytes[8], _address.bytes[9], _address.bytes[10], _address.bytes[11],
_address.bytes[12], _address.bytes[13], _address.bytes[14], _address.bytes[15]);
return String(szRet);
+#pragma GCC diagnostic pop
}
String IPAddress::toString() const
diff --git a/api/deprecated-avr-comp/avr/dtostrf.c.impl b/api/deprecated-avr-comp/avr/dtostrf.c.impl
index 96987a8f..f410886c 100644
--- a/api/deprecated-avr-comp/avr/dtostrf.c.impl
+++ b/api/deprecated-avr-comp/avr/dtostrf.c.impl
@@ -29,9 +29,12 @@
char *dtostrf (double val, signed char width, unsigned char prec, char *sout) {
asm(".global _printf_float");
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
char fmt[20];
sprintf(fmt, "%%%d.%df", width, prec);
sprintf(sout, fmt, val);
return sout;
+#pragma GCC diagnostic pop
}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a564faa4..f6bcc123 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -8,7 +8,7 @@ project(test-ArduinoCore-API)
##########################################################################
-include_directories(../api)
+include_directories(..)
include_directories(include)
include_directories(external/catch/v2.13.9/include)
diff --git a/test/include/MillisFake.h b/test/include/MillisFake.h
index da21049b..4f44387e 100644
--- a/test/include/MillisFake.h
+++ b/test/include/MillisFake.h
@@ -9,7 +9,7 @@
* INCLUDE
**************************************************************************************/
-#include <Common.h>
+#include "api/Common.h"
/**************************************************************************************
* FUNCTION DECLARATION
diff --git a/test/include/PrintMock.h b/test/include/PrintMock.h
index 87c83313..188fc1a0 100644
--- a/test/include/PrintMock.h
+++ b/test/include/PrintMock.h
@@ -11,7 +11,7 @@
#include <string>
-#include <Print.h>
+#include "api/Print.h"
/**************************************************************************************
* CLASS DECLARATION
diff --git a/test/include/PrintableMock.h b/test/include/PrintableMock.h
index cfc00555..59282d1d 100644
--- a/test/include/PrintableMock.h
+++ b/test/include/PrintableMock.h
@@ -11,7 +11,7 @@
#include <string>
-#include <Printable.h>
+#include "api/Printable.h"
/**************************************************************************************
* CLASS DECLARATION
diff --git a/test/include/StreamMock.h b/test/include/StreamMock.h
index 91eb3c26..1e0adaaf 100644
--- a/test/include/StreamMock.h
+++ b/test/include/StreamMock.h
@@ -11,7 +11,7 @@
#include <deque>
-#include <Stream.h>
+#include "api/Stream.h"
/**************************************************************************************
* CLASS DECLARATION
diff --git a/test/src/CanMsg/test_CanExtendedId.cpp b/test/src/CanMsg/test_CanExtendedId.cpp
index 72f8ece5..6d3d71d5 100644
--- a/test/src/CanMsg/test_CanExtendedId.cpp
+++ b/test/src/CanMsg/test_CanExtendedId.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <CanMsg.h>
+#include "api/CanMsg.h"
/**************************************************************************************
* NAMESPACE
diff --git a/test/src/CanMsg/test_CanMsg.cpp b/test/src/CanMsg/test_CanMsg.cpp
index 14b8a76a..d4972a20 100644
--- a/test/src/CanMsg/test_CanMsg.cpp
+++ b/test/src/CanMsg/test_CanMsg.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <CanMsg.h>
+#include "api/CanMsg.h"
/**************************************************************************************
* NAMESPACE
diff --git a/test/src/CanMsg/test_CanMsg_CopyCtor.cpp b/test/src/CanMsg/test_CanMsg_CopyCtor.cpp
index b303369a..679c4059 100644
--- a/test/src/CanMsg/test_CanMsg_CopyCtor.cpp
+++ b/test/src/CanMsg/test_CanMsg_CopyCtor.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <CanMsg.h>
+#include "api/CanMsg.h"
/**************************************************************************************
* NAMESPACE
diff --git a/test/src/CanMsg/test_CanStandardId.cpp b/test/src/CanMsg/test_CanStandardId.cpp
index 02496241..d274e688 100644
--- a/test/src/CanMsg/test_CanStandardId.cpp
+++ b/test/src/CanMsg/test_CanStandardId.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <CanMsg.h>
+#include "api/CanMsg.h"
/**************************************************************************************
* NAMESPACE
diff --git a/test/src/CanMsg/test_isExtendedId.cpp b/test/src/CanMsg/test_isExtendedId.cpp
index 3a12ab8f..16430512 100644
--- a/test/src/CanMsg/test_isExtendedId.cpp
+++ b/test/src/CanMsg/test_isExtendedId.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <CanMsg.h>
+#include "api/CanMsg.h"
/**************************************************************************************
* NAMESPACE
diff --git a/test/src/CanMsg/test_isStandardId.cpp b/test/src/CanMsg/test_isStandardId.cpp
index 718d2535..b63625a6 100644
--- a/test/src/CanMsg/test_isStandardId.cpp
+++ b/test/src/CanMsg/test_isStandardId.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <CanMsg.h>
+#include "api/CanMsg.h"
/**************************************************************************************
* NAMESPACE
diff --git a/test/src/CanMsg/test_operator_assignment.cpp b/test/src/CanMsg/test_operator_assignment.cpp
index ae2d2ecb..943c228c 100644
--- a/test/src/CanMsg/test_operator_assignment.cpp
+++ b/test/src/CanMsg/test_operator_assignment.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <CanMsg.h>
+#include "api/CanMsg.h"
/**************************************************************************************
* NAMESPACE
diff --git a/test/src/CanMsg/test_printTo.cpp b/test/src/CanMsg/test_printTo.cpp
index dd1fb4b8..2efd8602 100644
--- a/test/src/CanMsg/test_printTo.cpp
+++ b/test/src/CanMsg/test_printTo.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <CanMsg.h>
+#include "api/CanMsg.h"
#include <PrintMock.h>
/**************************************************************************************
diff --git a/test/src/CanMsgRingbuffer/test_available.cpp b/test/src/CanMsgRingbuffer/test_available.cpp
index ba857c4b..a1b68f06 100644
--- a/test/src/CanMsgRingbuffer/test_available.cpp
+++ b/test/src/CanMsgRingbuffer/test_available.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <CanMsgRingbuffer.h>
+#include "api/CanMsgRingbuffer.h"
/**************************************************************************************
* TEST CODE
diff --git a/test/src/Common/test_makeWord.cpp b/test/src/Common/test_makeWord.cpp
index 2e0a29dc..5f57075a 100644
--- a/test/src/Common/test_makeWord.cpp
+++ b/test/src/Common/test_makeWord.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <Common.h>
+#include "api/Common.h"
/**************************************************************************************
* TEST CODE
diff --git a/test/src/Common/test_map.cpp b/test/src/Common/test_map.cpp
index aef3e72a..0c2a2b2a 100644
--- a/test/src/Common/test_map.cpp
+++ b/test/src/Common/test_map.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <Common.h>
+#include "api/Common.h"
/**************************************************************************************
* TEST CODE
diff --git a/test/src/Common/test_max.cpp b/test/src/Common/test_max.cpp
index 6612cc95..7afd201e 100644
--- a/test/src/Common/test_max.cpp
+++ b/test/src/Common/test_max.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <Common.h>
+#include "api/Common.h"
/**************************************************************************************
* TEST CODE
@@ -53,7 +53,7 @@ TEST_CASE ("Calling 'max(a,b)' with type(a) != type(b)", "[max-04]")
{
uint32_t const a = 32;
uint64_t const b = 10;
- REQUIRE(typeid(max(a,b)) == typeid(unsigned long));
+ REQUIRE(typeid(max(a,b)) == typeid(uint64_t));
}
WHEN("type(A) = int8_t, type(b) = int16_t")
{
@@ -71,6 +71,6 @@ TEST_CASE ("Calling 'max(a,b)' with type(a) != type(b)", "[max-04]")
{
int32_t const a = -32;
int64_t const b = -10;
- REQUIRE(typeid(max(a,b)) == typeid(long));
+ REQUIRE(typeid(max(a,b)) == typeid(int64_t));
}
}
diff --git a/test/src/Common/test_min.cpp b/test/src/Common/test_min.cpp
index 2298dc6c..d9c3775a 100644
--- a/test/src/Common/test_min.cpp
+++ b/test/src/Common/test_min.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <Common.h>
+#include "api/Common.h"
/**************************************************************************************
* TEST CODE
@@ -53,7 +53,7 @@ TEST_CASE ("Calling 'min(a,b)' with type(a) != type(b)", "[min-04]")
{
uint32_t const a = 32;
uint64_t const b = 10;
- REQUIRE(typeid(min(a,b)) == typeid(unsigned long));
+ REQUIRE(typeid(min(a,b)) == typeid(uint64_t));
}
WHEN("type(A) = int8_t, type(b) = int16_t")
{
@@ -71,6 +71,6 @@ TEST_CASE ("Calling 'min(a,b)' with type(a) != type(b)", "[min-04]")
{
int32_t const a = -32;
int64_t const b = -10;
- REQUIRE(typeid(min(a,b)) == typeid(long));
+ REQUIRE(typeid(min(a,b)) == typeid(int64_t));
}
}
diff --git a/test/src/IPAddress/test_IPAddress.cpp b/test/src/IPAddress/test_IPAddress.cpp
index d12db0f3..91ff6e49 100644
--- a/test/src/IPAddress/test_IPAddress.cpp
+++ b/test/src/IPAddress/test_IPAddress.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <IPAddress.h>
+#include "api/IPAddress.h"
/**************************************************************************************
* TEST CODE
diff --git a/test/src/IPAddress/test_IPAddress6.cpp b/test/src/IPAddress/test_IPAddress6.cpp
index a6941b71..7fe0f690 100644
--- a/test/src/IPAddress/test_IPAddress6.cpp
+++ b/test/src/IPAddress/test_IPAddress6.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <IPAddress.h>
+#include "api/IPAddress.h"
/**************************************************************************************
* TEST CODE
diff --git a/test/src/IPAddress/test_fromString.cpp b/test/src/IPAddress/test_fromString.cpp
index 2c918052..d3246ee1 100644
--- a/test/src/IPAddress/test_fromString.cpp
+++ b/test/src/IPAddress/test_fromString.cpp
@@ -8,8 +8,8 @@
#include <catch.hpp>
-#include <String.h>
-#include <IPAddress.h>
+#include "api/String.h"
+#include "api/IPAddress.h"
/**************************************************************************************
* TEST CODE
diff --git a/test/src/IPAddress/test_fromString6.cpp b/test/src/IPAddress/test_fromString6.cpp
index a0f09c73..0871322a 100644
--- a/test/src/IPAddress/test_fromString6.cpp
+++ b/test/src/IPAddress/test_fromString6.cpp
@@ -8,8 +8,8 @@
#include <catch.hpp>
-#include <String.h>
-#include <IPAddress.h>
+#include "api/String.h"
+#include "api/IPAddress.h"
/**************************************************************************************
* TEST CODE
diff --git a/test/src/IPAddress/test_operator_assignment.cpp b/test/src/IPAddress/test_operator_assignment.cpp
index e9fc8691..3751f2a6 100644
--- a/test/src/IPAddress/test_operator_assignment.cpp
+++ b/test/src/IPAddress/test_operator_assignment.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <IPAddress.h>
+#include "api/IPAddress.h"
/**************************************************************************************
* TEST CODE
diff --git a/test/src/IPAddress/test_operator_comparison.cpp b/test/src/IPAddress/test_operator_comparison.cpp
index c3283b71..44521148 100644
--- a/test/src/IPAddress/test_operator_comparison.cpp
+++ b/test/src/IPAddress/test_operator_comparison.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <IPAddress.h>
+#include "api/IPAddress.h"
/**************************************************************************************
* TEST CODE
diff --git a/test/src/IPAddress/test_operator_comparison6.cpp b/test/src/IPAddress/test_operator_comparison6.cpp
index a5e1b87c..ea811396 100644
--- a/test/src/IPAddress/test_operator_comparison6.cpp
+++ b/test/src/IPAddress/test_operator_comparison6.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <IPAddress.h>
+#include "api/IPAddress.h"
/**************************************************************************************
* TEST CODE
diff --git a/test/src/IPAddress/test_operator_parentheses.cpp b/test/src/IPAddress/test_operator_parentheses.cpp
index 27fce3a5..78f76582 100644
--- a/test/src/IPAddress/test_operator_parentheses.cpp
+++ b/test/src/IPAddress/test_operator_parentheses.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <IPAddress.h>
+#include "api/IPAddress.h"
/**************************************************************************************
* TEST CODE
diff --git a/test/src/IPAddress/test_operator_parentheses6.cpp b/test/src/IPAddress/test_operator_parentheses6.cpp
index 5b4740c8..d795e4df 100644
--- a/test/src/IPAddress/test_operator_parentheses6.cpp
+++ b/test/src/IPAddress/test_operator_parentheses6.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <IPAddress.h>
+#include "api/IPAddress.h"
/**************************************************************************************
* TEST CODE
diff --git a/test/src/IPAddress/test_printTo.cpp b/test/src/IPAddress/test_printTo.cpp
index 05e43fa5..e00a0163 100644
--- a/test/src/IPAddress/test_printTo.cpp
+++ b/test/src/IPAddress/test_printTo.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <IPAddress.h>
+#include "api/IPAddress.h"
#include <PrintMock.h>
/**************************************************************************************
diff --git a/test/src/IPAddress/test_printTo6.cpp b/test/src/IPAddress/test_printTo6.cpp
index 621008af..f1e72243 100644
--- a/test/src/IPAddress/test_printTo6.cpp
+++ b/test/src/IPAddress/test_printTo6.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <IPAddress.h>
+#include "api/IPAddress.h"
#include <PrintMock.h>
/**************************************************************************************
diff --git a/test/src/IPAddress/test_toString.cpp b/test/src/IPAddress/test_toString.cpp
index a5a5f004..a172d9f4 100644
--- a/test/src/IPAddress/test_toString.cpp
+++ b/test/src/IPAddress/test_toString.cpp
@@ -8,8 +8,8 @@
#include <catch.hpp>
-#include <String.h>
-#include <IPAddress.h>
+#include "api/String.h"
+#include "api/IPAddress.h"
/**************************************************************************************
* TEST CODE
diff --git a/test/src/Print/test_availableForWrite.cpp b/test/src/Print/test_availableForWrite.cpp
index 47f599cf..eed150dd 100644
--- a/test/src/Print/test_availableForWrite.cpp
+++ b/test/src/Print/test_availableForWrite.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <Print.h>
+#include "api/Print.h"
#include <PrintMock.h>
diff --git a/test/src/Print/test_clearWriteError.cpp b/test/src/Print/test_clearWriteError.cpp
index 295f4984..c7b7d2b7 100644
--- a/test/src/Print/test_clearWriteError.cpp
+++ b/test/src/Print/test_clearWriteError.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <Print.h>
+#include "api/Print.h"
#include <PrintMock.h>
diff --git a/test/src/Print/test_getWriteError.cpp b/test/src/Print/test_getWriteError.cpp
index ef2b1435..5f85efda 100644
--- a/test/src/Print/test_getWriteError.cpp
+++ b/test/src/Print/test_getWriteError.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <Print.h>
+#include "api/Print.h"
#include <PrintMock.h>
diff --git a/test/src/Print/test_print.cpp b/test/src/Print/test_print.cpp
index ac731a89..06e40f52 100644
--- a/test/src/Print/test_print.cpp
+++ b/test/src/Print/test_print.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <Print.h>
+#include "api/Print.h"
#include <PrintMock.h>
#include <PrintableMock.h>
diff --git a/test/src/Print/test_println.cpp b/test/src/Print/test_println.cpp
index 977ed532..1147decd 100644
--- a/test/src/Print/test_println.cpp
+++ b/test/src/Print/test_println.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <Print.h>
+#include "api/Print.h"
#include <PrintMock.h>
#include <PrintableMock.h>
diff --git a/test/src/Ringbuffer/test_available.cpp b/test/src/Ringbuffer/test_available.cpp
index 3a79e5bc..0cb18030 100644
--- a/test/src/Ringbuffer/test_available.cpp
+++ b/test/src/Ringbuffer/test_available.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <RingBuffer.h>
+#include "api/RingBuffer.h"
/**************************************************************************************
* TEST CODE
diff --git a/test/src/Ringbuffer/test_availableForStore.cpp b/test/src/Ringbuffer/test_availableForStore.cpp
index 7d73d8da..35c674e0 100644
--- a/test/src/Ringbuffer/test_availableForStore.cpp
+++ b/test/src/Ringbuffer/test_availableForStore.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <RingBuffer.h>
+#include "api/RingBuffer.h"
/**************************************************************************************
* TEST CODE
diff --git a/test/src/Ringbuffer/test_clear.cpp b/test/src/Ringbuffer/test_clear.cpp
index 165a5bbb..3c9055dc 100644
--- a/test/src/Ringbuffer/test_clear.cpp
+++ b/test/src/Ringbuffer/test_clear.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <RingBuffer.h>
+#include "api/RingBuffer.h"
/**************************************************************************************
* TEST CODE
diff --git a/test/src/Ringbuffer/test_isFull.cpp b/test/src/Ringbuffer/test_isFull.cpp
index 8d9c4aaa..f05b379a 100644
--- a/test/src/Ringbuffer/test_isFull.cpp
+++ b/test/src/Ringbuffer/test_isFull.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <RingBuffer.h>
+#include "api/RingBuffer.h"
/**************************************************************************************
* TEST CODE
diff --git a/test/src/Ringbuffer/test_peek.cpp b/test/src/Ringbuffer/test_peek.cpp
index 3811dd39..596b3a46 100644
--- a/test/src/Ringbuffer/test_peek.cpp
+++ b/test/src/Ringbuffer/test_peek.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <RingBuffer.h>
+#include "api/RingBuffer.h"
/**************************************************************************************
* TEST CODE
diff --git a/test/src/Ringbuffer/test_read_char.cpp b/test/src/Ringbuffer/test_read_char.cpp
index de754275..525baf4a 100644
--- a/test/src/Ringbuffer/test_read_char.cpp
+++ b/test/src/Ringbuffer/test_read_char.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <RingBuffer.h>
+#include "api/RingBuffer.h"
/**************************************************************************************
* TEST CODE
diff --git a/test/src/Ringbuffer/test_store_char.cpp b/test/src/Ringbuffer/test_store_char.cpp
index 6e127b28..932542f0 100644
--- a/test/src/Ringbuffer/test_store_char.cpp
+++ b/test/src/Ringbuffer/test_store_char.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <RingBuffer.h>
+#include "api/RingBuffer.h"
/**************************************************************************************
* TEST CODE
diff --git a/test/src/String/StringPrinter.h b/test/src/String/StringPrinter.h
index f338a902..00cca761 100644
--- a/test/src/String/StringPrinter.h
+++ b/test/src/String/StringPrinter.h
@@ -1,7 +1,7 @@
#pragma once
#include <catch.hpp>
-#include <String.h>
+#include "api/String.h"
namespace Catch {
/**
diff --git a/test/src/String/test_String.cpp b/test/src/String/test_String.cpp
index 461f2d08..c6af21b7 100644
--- a/test/src/String/test_String.cpp
+++ b/test/src/String/test_String.cpp
@@ -10,7 +10,7 @@
#include <catch.hpp>
-#include <String.h>
+#include "api/String.h"
#include "StringPrinter.h"
diff --git a/test/src/String/test_characterAccessFunc.cpp b/test/src/String/test_characterAccessFunc.cpp
index d0f02383..e8dfe12e 100644
--- a/test/src/String/test_characterAccessFunc.cpp
+++ b/test/src/String/test_characterAccessFunc.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <String.h>
+#include "api/String.h"
#include "StringPrinter.h"
diff --git a/test/src/String/test_compareTo.cpp b/test/src/String/test_compareTo.cpp
index 714d169a..ed5c2303 100644
--- a/test/src/String/test_compareTo.cpp
+++ b/test/src/String/test_compareTo.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <String.h>
+#include "api/String.h"
#include "StringPrinter.h"
diff --git a/test/src/String/test_comparisonFunc.cpp b/test/src/String/test_comparisonFunc.cpp
index 89a7f3be..3687d5a7 100644
--- a/test/src/String/test_comparisonFunc.cpp
+++ b/test/src/String/test_comparisonFunc.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <String.h>
+#include "api/String.h"
#include "StringPrinter.h"
diff --git a/test/src/String/test_concat.cpp b/test/src/String/test_concat.cpp
index b7390b64..6b4be20c 100644
--- a/test/src/String/test_concat.cpp
+++ b/test/src/String/test_concat.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <String.h>
+#include "api/String.h"
#include "StringPrinter.h"
diff --git a/test/src/String/test_indexOf.cpp b/test/src/String/test_indexOf.cpp
index bcaf65ef..3faaa518 100644
--- a/test/src/String/test_indexOf.cpp
+++ b/test/src/String/test_indexOf.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <String.h>
+#include "api/String.h"
#include "StringPrinter.h"
diff --git a/test/src/String/test_lastIndexOf.cpp b/test/src/String/test_lastIndexOf.cpp
index 2ae95f54..62b36717 100644
--- a/test/src/String/test_lastIndexOf.cpp
+++ b/test/src/String/test_lastIndexOf.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <String.h>
+#include "api/String.h"
#include "StringPrinter.h"
diff --git a/test/src/String/test_length.cpp b/test/src/String/test_length.cpp
index 3b47faed..977d98d9 100644
--- a/test/src/String/test_length.cpp
+++ b/test/src/String/test_length.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <String.h>
+#include "api/String.h"
#include "StringPrinter.h"
diff --git a/test/src/String/test_move.cpp b/test/src/String/test_move.cpp
index d37630c4..ab8b4398 100644
--- a/test/src/String/test_move.cpp
+++ b/test/src/String/test_move.cpp
@@ -1,6 +1,6 @@
#include <catch.hpp>
-#include <String.h>
+#include "api/String.h"
#include "StringPrinter.h"
@@ -32,6 +32,9 @@ TEST_CASE("Testing String move assignment", "[String-move-02]")
TEST_CASE("Testing String move self assignment", "[String-move-03]")
{
arduino::String a("src");
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wself-move"
a = std::move(a);
+#pragma GCC diagnostic pop
REQUIRE(a == "src");
}
diff --git a/test/src/String/test_operators.cpp b/test/src/String/test_operators.cpp
index 67cb39be..c1c77ead 100644
--- a/test/src/String/test_operators.cpp
+++ b/test/src/String/test_operators.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <String.h>
+#include "api/String.h"
#include "StringPrinter.h"
diff --git a/test/src/String/test_remove.cpp b/test/src/String/test_remove.cpp
index e8c19536..1c09fa93 100644
--- a/test/src/String/test_remove.cpp
+++ b/test/src/String/test_remove.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <String.h>
+#include "api/String.h"
#include "StringPrinter.h"
diff --git a/test/src/String/test_replace.cpp b/test/src/String/test_replace.cpp
index d4f28bf5..b6b795a8 100644
--- a/test/src/String/test_replace.cpp
+++ b/test/src/String/test_replace.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <String.h>
+#include "api/String.h"
#include "StringPrinter.h"
diff --git a/test/src/String/test_substring.cpp b/test/src/String/test_substring.cpp
index 8fa43086..94323690 100644
--- a/test/src/String/test_substring.cpp
+++ b/test/src/String/test_substring.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <String.h>
+#include "api/String.h"
#include "StringPrinter.h"
diff --git a/test/src/String/test_toDouble.cpp b/test/src/String/test_toDouble.cpp
index 246f25d4..05d75bb7 100644
--- a/test/src/String/test_toDouble.cpp
+++ b/test/src/String/test_toDouble.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <String.h>
+#include "api/String.h"
#include "StringPrinter.h"
diff --git a/test/src/String/test_toFloat.cpp b/test/src/String/test_toFloat.cpp
index afef02c5..6ea6031a 100644
--- a/test/src/String/test_toFloat.cpp
+++ b/test/src/String/test_toFloat.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <String.h>
+#include "api/String.h"
#include "StringPrinter.h"
diff --git a/test/src/String/test_toInt.cpp b/test/src/String/test_toInt.cpp
index 43397b76..f7916de7 100644
--- a/test/src/String/test_toInt.cpp
+++ b/test/src/String/test_toInt.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <String.h>
+#include "api/String.h"
#include "StringPrinter.h"
diff --git a/test/src/String/test_toLowerCase.cpp b/test/src/String/test_toLowerCase.cpp
index 1ff81e91..120816ca 100644
--- a/test/src/String/test_toLowerCase.cpp
+++ b/test/src/String/test_toLowerCase.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <String.h>
+#include "api/String.h"
#include "StringPrinter.h"
diff --git a/test/src/String/test_toUpperCase.cpp b/test/src/String/test_toUpperCase.cpp
index b8ae6aaf..baef69d4 100644
--- a/test/src/String/test_toUpperCase.cpp
+++ b/test/src/String/test_toUpperCase.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <String.h>
+#include "api/String.h"
#include "StringPrinter.h"
diff --git a/test/src/String/test_trim.cpp b/test/src/String/test_trim.cpp
index 539d6568..480d3c61 100644
--- a/test/src/String/test_trim.cpp
+++ b/test/src/String/test_trim.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <String.h>
+#include "api/String.h"
#include "StringPrinter.h"
diff --git a/test/src/WCharacter/test_isAscii.cpp b/test/src/WCharacter/test_isAscii.cpp
index 8c2763c4..e5bb196c 100644
--- a/test/src/WCharacter/test_isAscii.cpp
+++ b/test/src/WCharacter/test_isAscii.cpp
@@ -10,7 +10,7 @@
#include <vector>
-#include <WCharacter.h>
+#include "api/WCharacter.h"
/**************************************************************************************
* CONSTANTS
diff --git a/test/src/WCharacter/test_isControl.cpp b/test/src/WCharacter/test_isControl.cpp
index 157c8bc8..d6d5d249 100644
--- a/test/src/WCharacter/test_isControl.cpp
+++ b/test/src/WCharacter/test_isControl.cpp
@@ -10,7 +10,7 @@
#include <vector>
-#include <WCharacter.h>
+#include "api/WCharacter.h"
/**************************************************************************************
* CONSTANTS
diff --git a/test/src/WCharacter/test_isDigit.cpp b/test/src/WCharacter/test_isDigit.cpp
index 58b1808a..23178585 100644
--- a/test/src/WCharacter/test_isDigit.cpp
+++ b/test/src/WCharacter/test_isDigit.cpp
@@ -10,7 +10,7 @@
#include <vector>
-#include <WCharacter.h>
+#include "api/WCharacter.h"
/**************************************************************************************
* CONSTANTS
diff --git a/test/src/WCharacter/test_isHexadecimalDigit.cpp b/test/src/WCharacter/test_isHexadecimalDigit.cpp
index 0eba5846..0aafe6d7 100644
--- a/test/src/WCharacter/test_isHexadecimalDigit.cpp
+++ b/test/src/WCharacter/test_isHexadecimalDigit.cpp
@@ -10,7 +10,7 @@
#include <vector>
-#include <WCharacter.h>
+#include "api/WCharacter.h"
/**************************************************************************************
* CONSTANTS
diff --git a/test/src/WCharacter/test_isLowerCase.cpp b/test/src/WCharacter/test_isLowerCase.cpp
index 79e1dbc4..85642d06 100644
--- a/test/src/WCharacter/test_isLowerCase.cpp
+++ b/test/src/WCharacter/test_isLowerCase.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <WCharacter.h>
+#include "api/WCharacter.h"
/**************************************************************************************
* TEST CODE
diff --git a/test/src/WCharacter/test_isPunct.cpp b/test/src/WCharacter/test_isPunct.cpp
index 5f6875d1..ad0edbf2 100644
--- a/test/src/WCharacter/test_isPunct.cpp
+++ b/test/src/WCharacter/test_isPunct.cpp
@@ -10,7 +10,7 @@
#include <vector>
-#include <WCharacter.h>
+#include "api/WCharacter.h"
/**************************************************************************************
* CONSTANTS
diff --git a/test/src/WCharacter/test_isSpace.cpp b/test/src/WCharacter/test_isSpace.cpp
index c96557d6..f9d643e5 100644
--- a/test/src/WCharacter/test_isSpace.cpp
+++ b/test/src/WCharacter/test_isSpace.cpp
@@ -10,7 +10,7 @@
#include <vector>
-#include <WCharacter.h>
+#include "api/WCharacter.h"
/**************************************************************************************
* CONSTANTS
diff --git a/test/src/WCharacter/test_isUpperCase.cpp b/test/src/WCharacter/test_isUpperCase.cpp
index e21e33db..ecbdd4fa 100644
--- a/test/src/WCharacter/test_isUpperCase.cpp
+++ b/test/src/WCharacter/test_isUpperCase.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <WCharacter.h>
+#include "api/WCharacter.h"
/**************************************************************************************
* TEST CODE
diff --git a/test/src/WCharacter/test_isWhitespace.cpp b/test/src/WCharacter/test_isWhitespace.cpp
index 6eb3f7a6..1ed7b20c 100644
--- a/test/src/WCharacter/test_isWhitespace.cpp
+++ b/test/src/WCharacter/test_isWhitespace.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include <WCharacter.h>
+#include "api/WCharacter.h"
/**************************************************************************************
* TEST CODE
diff --git a/test/src/WCharacter/test_toAscii.cpp b/test/src/WCharacter/test_toAscii.cpp
index 10b54625..9954dda6 100644
--- a/test/src/WCharacter/test_toAscii.cpp
+++ b/test/src/WCharacter/test_toAscii.cpp
@@ -10,7 +10,7 @@
#include <vector>
-#include <WCharacter.h>
+#include "api/WCharacter.h"
/**************************************************************************************
* CONSTANTS
diff --git a/test/src/dtostrf.cpp b/test/src/dtostrf.cpp
index 0635b492..d21c8737 100644
--- a/test/src/dtostrf.cpp
+++ b/test/src/dtostrf.cpp
@@ -6,7 +6,7 @@
* INCLUDE
**************************************************************************************/
-#include <deprecated-avr-comp/avr/dtostrf.h>
+#include "api/deprecated-avr-comp/avr/dtostrf.h"
#include <stdlib.h>
@@ -18,7 +18,7 @@
extern "C" {
#endif
-#include <deprecated-avr-comp/avr/dtostrf.c.impl>
+#include "api/deprecated-avr-comp/avr/dtostrf.c.impl"
#ifdef __cplusplus
} // extern "C"
diff --git a/test/src/itoa.cpp b/test/src/itoa.cpp
index 84d640c3..5c893905 100644
--- a/test/src/itoa.cpp
+++ b/test/src/itoa.cpp
@@ -6,7 +6,7 @@
* INCLUDE
**************************************************************************************/
-#include <itoa.h>
+#include "api/itoa.h"
#include <string>
#include <stdexcept>
@@ -27,24 +27,36 @@ std::string radixToFmtString(int const radix)
char * itoa(int value, char * str, int radix)
{
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
sprintf(str, radixToFmtString(radix).c_str(), value);
+#pragma GCC diagnostic pop
return str;
}
char * ltoa(long value, char * str, int radix)
{
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
sprintf(str, radixToFmtString(radix).c_str(), value);
+#pragma GCC diagnostic pop
return str;
}
char * utoa(unsigned value, char *str, int radix)
{
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
sprintf(str, radixToFmtString(radix).c_str(), value);
+#pragma GCC diagnostic pop
return str;
}
char * ultoa(unsigned long value, char * str, int radix)
{
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
sprintf(str, radixToFmtString(radix).c_str(), value);
+#pragma GCC diagnostic pop
return str;
}
From 59b42bbed6c1773a78fe6052870bc7b2ecc162c4 Mon Sep 17 00:00:00 2001
From: Jeremy Boynes <jeremy@boynes.com>
Date: Thu, 7 Sep 2023 23:32:49 +0100
Subject: [PATCH 2/4] -Wself-move was added in GCC 13
---
test/src/String/test_move.cpp | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/test/src/String/test_move.cpp b/test/src/String/test_move.cpp
index ab8b4398..4ac5deab 100644
--- a/test/src/String/test_move.cpp
+++ b/test/src/String/test_move.cpp
@@ -31,10 +31,14 @@ TEST_CASE("Testing String move assignment", "[String-move-02]")
TEST_CASE("Testing String move self assignment", "[String-move-03]")
{
- arduino::String a("src");
+#if defined(GCC_VERSION) && GCC_VERSION >= 13
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wself-move"
+#endif
+ arduino::String a("src");
a = std::move(a);
-#pragma GCC diagnostic pop
REQUIRE(a == "src");
+#if defined(GCC_VERSION) && GCC_VERSION >= 13
+#pragma GCC diagnostic pop
+#endif
}
From 21ef2c619bbe15890562193e97ade37cf6436f52 Mon Sep 17 00:00:00 2001
From: Jeremy Boynes <jeremy@boynes.com>
Date: Thu, 7 Sep 2023 23:56:03 +0100
Subject: [PATCH 3/4] Also check the versioa for clang
---
test/src/String/test_move.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/src/String/test_move.cpp b/test/src/String/test_move.cpp
index 4ac5deab..f5b65032 100644
--- a/test/src/String/test_move.cpp
+++ b/test/src/String/test_move.cpp
@@ -31,7 +31,7 @@ TEST_CASE("Testing String move assignment", "[String-move-02]")
TEST_CASE("Testing String move self assignment", "[String-move-03]")
{
-#if defined(GCC_VERSION) && GCC_VERSION >= 13
+#if (defined(GCC_VERSION) && GCC_VERSION >= 13) || (defined(__clang_major__) && __clang_major__ >= 14)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wself-move"
#endif
From da415e6da3a634701704df85c6842e66ed4777b5 Mon Sep 17 00:00:00 2001
From: Jeremy Boynes <jeremy@boynes.com>
Date: Fri, 8 Sep 2023 07:30:00 +0100
Subject: [PATCH 4/4] Use <> style includes in tests
---
test/include/MillisFake.h | 2 +-
test/include/PrintMock.h | 2 +-
test/include/PrintableMock.h | 2 +-
test/include/StreamMock.h | 2 +-
test/src/CanMsg/test_CanExtendedId.cpp | 2 +-
test/src/CanMsg/test_CanMsg.cpp | 2 +-
test/src/CanMsg/test_CanMsg_CopyCtor.cpp | 2 +-
test/src/CanMsg/test_CanStandardId.cpp | 2 +-
test/src/CanMsg/test_isExtendedId.cpp | 2 +-
test/src/CanMsg/test_isStandardId.cpp | 2 +-
test/src/CanMsg/test_operator_assignment.cpp | 2 +-
test/src/CanMsg/test_printTo.cpp | 2 +-
test/src/CanMsgRingbuffer/test_available.cpp | 2 +-
test/src/Common/test_makeWord.cpp | 2 +-
test/src/Common/test_map.cpp | 2 +-
test/src/Common/test_max.cpp | 2 +-
test/src/Common/test_min.cpp | 2 +-
test/src/IPAddress/test_IPAddress.cpp | 2 +-
test/src/IPAddress/test_IPAddress6.cpp | 2 +-
test/src/IPAddress/test_fromString.cpp | 4 ++--
test/src/IPAddress/test_fromString6.cpp | 4 ++--
test/src/IPAddress/test_operator_assignment.cpp | 2 +-
test/src/IPAddress/test_operator_comparison.cpp | 2 +-
test/src/IPAddress/test_operator_comparison6.cpp | 2 +-
test/src/IPAddress/test_operator_parentheses.cpp | 2 +-
test/src/IPAddress/test_operator_parentheses6.cpp | 2 +-
test/src/IPAddress/test_printTo.cpp | 2 +-
test/src/IPAddress/test_printTo6.cpp | 2 +-
test/src/IPAddress/test_toString.cpp | 4 ++--
test/src/Print/test_availableForWrite.cpp | 2 +-
test/src/Print/test_clearWriteError.cpp | 2 +-
test/src/Print/test_getWriteError.cpp | 2 +-
test/src/Print/test_print.cpp | 2 +-
test/src/Print/test_println.cpp | 2 +-
test/src/Ringbuffer/test_available.cpp | 2 +-
test/src/Ringbuffer/test_availableForStore.cpp | 2 +-
test/src/Ringbuffer/test_clear.cpp | 2 +-
test/src/Ringbuffer/test_isFull.cpp | 2 +-
test/src/Ringbuffer/test_peek.cpp | 2 +-
test/src/Ringbuffer/test_read_char.cpp | 2 +-
test/src/Ringbuffer/test_store_char.cpp | 2 +-
test/src/String/StringPrinter.h | 2 +-
test/src/String/test_String.cpp | 2 +-
test/src/String/test_characterAccessFunc.cpp | 2 +-
test/src/String/test_compareTo.cpp | 2 +-
test/src/String/test_comparisonFunc.cpp | 2 +-
test/src/String/test_concat.cpp | 2 +-
test/src/String/test_indexOf.cpp | 2 +-
test/src/String/test_lastIndexOf.cpp | 2 +-
test/src/String/test_length.cpp | 2 +-
test/src/String/test_move.cpp | 2 +-
test/src/String/test_operators.cpp | 2 +-
test/src/String/test_remove.cpp | 2 +-
test/src/String/test_replace.cpp | 2 +-
test/src/String/test_substring.cpp | 2 +-
test/src/String/test_toDouble.cpp | 2 +-
test/src/String/test_toFloat.cpp | 2 +-
test/src/String/test_toInt.cpp | 2 +-
test/src/String/test_toLowerCase.cpp | 2 +-
test/src/String/test_toUpperCase.cpp | 2 +-
test/src/String/test_trim.cpp | 2 +-
test/src/WCharacter/test_isAscii.cpp | 2 +-
test/src/WCharacter/test_isControl.cpp | 2 +-
test/src/WCharacter/test_isDigit.cpp | 2 +-
test/src/WCharacter/test_isHexadecimalDigit.cpp | 2 +-
test/src/WCharacter/test_isLowerCase.cpp | 2 +-
test/src/WCharacter/test_isPunct.cpp | 2 +-
test/src/WCharacter/test_isSpace.cpp | 2 +-
test/src/WCharacter/test_isUpperCase.cpp | 2 +-
test/src/WCharacter/test_isWhitespace.cpp | 2 +-
test/src/WCharacter/test_toAscii.cpp | 2 +-
test/src/dtostrf.cpp | 4 ++--
test/src/itoa.cpp | 2 +-
73 files changed, 77 insertions(+), 77 deletions(-)
diff --git a/test/include/MillisFake.h b/test/include/MillisFake.h
index 4f44387e..be078bd0 100644
--- a/test/include/MillisFake.h
+++ b/test/include/MillisFake.h
@@ -9,7 +9,7 @@
* INCLUDE
**************************************************************************************/
-#include "api/Common.h"
+#include <api/Common.h>
/**************************************************************************************
* FUNCTION DECLARATION
diff --git a/test/include/PrintMock.h b/test/include/PrintMock.h
index 188fc1a0..d41e78fa 100644
--- a/test/include/PrintMock.h
+++ b/test/include/PrintMock.h
@@ -11,7 +11,7 @@
#include <string>
-#include "api/Print.h"
+#include <api/Print.h>
/**************************************************************************************
* CLASS DECLARATION
diff --git a/test/include/PrintableMock.h b/test/include/PrintableMock.h
index 59282d1d..39121928 100644
--- a/test/include/PrintableMock.h
+++ b/test/include/PrintableMock.h
@@ -11,7 +11,7 @@
#include <string>
-#include "api/Printable.h"
+#include <api/Printable.h>
/**************************************************************************************
* CLASS DECLARATION
diff --git a/test/include/StreamMock.h b/test/include/StreamMock.h
index 1e0adaaf..a7d9da1a 100644
--- a/test/include/StreamMock.h
+++ b/test/include/StreamMock.h
@@ -11,7 +11,7 @@
#include <deque>
-#include "api/Stream.h"
+#include <api/Stream.h>
/**************************************************************************************
* CLASS DECLARATION
diff --git a/test/src/CanMsg/test_CanExtendedId.cpp b/test/src/CanMsg/test_CanExtendedId.cpp
index 6d3d71d5..a812f08b 100644
--- a/test/src/CanMsg/test_CanExtendedId.cpp
+++ b/test/src/CanMsg/test_CanExtendedId.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/CanMsg.h"
+#include <api/CanMsg.h>
/**************************************************************************************
* NAMESPACE
diff --git a/test/src/CanMsg/test_CanMsg.cpp b/test/src/CanMsg/test_CanMsg.cpp
index d4972a20..03704623 100644
--- a/test/src/CanMsg/test_CanMsg.cpp
+++ b/test/src/CanMsg/test_CanMsg.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/CanMsg.h"
+#include <api/CanMsg.h>
/**************************************************************************************
* NAMESPACE
diff --git a/test/src/CanMsg/test_CanMsg_CopyCtor.cpp b/test/src/CanMsg/test_CanMsg_CopyCtor.cpp
index 679c4059..ccf62931 100644
--- a/test/src/CanMsg/test_CanMsg_CopyCtor.cpp
+++ b/test/src/CanMsg/test_CanMsg_CopyCtor.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/CanMsg.h"
+#include <api/CanMsg.h>
/**************************************************************************************
* NAMESPACE
diff --git a/test/src/CanMsg/test_CanStandardId.cpp b/test/src/CanMsg/test_CanStandardId.cpp
index d274e688..81d2301d 100644
--- a/test/src/CanMsg/test_CanStandardId.cpp
+++ b/test/src/CanMsg/test_CanStandardId.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/CanMsg.h"
+#include <api/CanMsg.h>
/**************************************************************************************
* NAMESPACE
diff --git a/test/src/CanMsg/test_isExtendedId.cpp b/test/src/CanMsg/test_isExtendedId.cpp
index 16430512..242866e9 100644
--- a/test/src/CanMsg/test_isExtendedId.cpp
+++ b/test/src/CanMsg/test_isExtendedId.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/CanMsg.h"
+#include <api/CanMsg.h>
/**************************************************************************************
* NAMESPACE
diff --git a/test/src/CanMsg/test_isStandardId.cpp b/test/src/CanMsg/test_isStandardId.cpp
index b63625a6..a73bf7c1 100644
--- a/test/src/CanMsg/test_isStandardId.cpp
+++ b/test/src/CanMsg/test_isStandardId.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/CanMsg.h"
+#include <api/CanMsg.h>
/**************************************************************************************
* NAMESPACE
diff --git a/test/src/CanMsg/test_operator_assignment.cpp b/test/src/CanMsg/test_operator_assignment.cpp
index 943c228c..0dd35543 100644
--- a/test/src/CanMsg/test_operator_assignment.cpp
+++ b/test/src/CanMsg/test_operator_assignment.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/CanMsg.h"
+#include <api/CanMsg.h>
/**************************************************************************************
* NAMESPACE
diff --git a/test/src/CanMsg/test_printTo.cpp b/test/src/CanMsg/test_printTo.cpp
index 2efd8602..bf532c81 100644
--- a/test/src/CanMsg/test_printTo.cpp
+++ b/test/src/CanMsg/test_printTo.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/CanMsg.h"
+#include <api/CanMsg.h>
#include <PrintMock.h>
/**************************************************************************************
diff --git a/test/src/CanMsgRingbuffer/test_available.cpp b/test/src/CanMsgRingbuffer/test_available.cpp
index a1b68f06..684eaeec 100644
--- a/test/src/CanMsgRingbuffer/test_available.cpp
+++ b/test/src/CanMsgRingbuffer/test_available.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/CanMsgRingbuffer.h"
+#include <api/CanMsgRingbuffer.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/Common/test_makeWord.cpp b/test/src/Common/test_makeWord.cpp
index 5f57075a..dcb3ea33 100644
--- a/test/src/Common/test_makeWord.cpp
+++ b/test/src/Common/test_makeWord.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/Common.h"
+#include <api/Common.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/Common/test_map.cpp b/test/src/Common/test_map.cpp
index 0c2a2b2a..59441cac 100644
--- a/test/src/Common/test_map.cpp
+++ b/test/src/Common/test_map.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/Common.h"
+#include <api/Common.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/Common/test_max.cpp b/test/src/Common/test_max.cpp
index 7afd201e..ccb5e5e1 100644
--- a/test/src/Common/test_max.cpp
+++ b/test/src/Common/test_max.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/Common.h"
+#include <api/Common.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/Common/test_min.cpp b/test/src/Common/test_min.cpp
index d9c3775a..750f41ae 100644
--- a/test/src/Common/test_min.cpp
+++ b/test/src/Common/test_min.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/Common.h"
+#include <api/Common.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/IPAddress/test_IPAddress.cpp b/test/src/IPAddress/test_IPAddress.cpp
index 91ff6e49..6b66e118 100644
--- a/test/src/IPAddress/test_IPAddress.cpp
+++ b/test/src/IPAddress/test_IPAddress.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/IPAddress.h"
+#include <api/IPAddress.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/IPAddress/test_IPAddress6.cpp b/test/src/IPAddress/test_IPAddress6.cpp
index 7fe0f690..3a8a5315 100644
--- a/test/src/IPAddress/test_IPAddress6.cpp
+++ b/test/src/IPAddress/test_IPAddress6.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/IPAddress.h"
+#include <api/IPAddress.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/IPAddress/test_fromString.cpp b/test/src/IPAddress/test_fromString.cpp
index d3246ee1..d058b529 100644
--- a/test/src/IPAddress/test_fromString.cpp
+++ b/test/src/IPAddress/test_fromString.cpp
@@ -8,8 +8,8 @@
#include <catch.hpp>
-#include "api/String.h"
-#include "api/IPAddress.h"
+#include <api/String.h>
+#include <api/IPAddress.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/IPAddress/test_fromString6.cpp b/test/src/IPAddress/test_fromString6.cpp
index 0871322a..deb54458 100644
--- a/test/src/IPAddress/test_fromString6.cpp
+++ b/test/src/IPAddress/test_fromString6.cpp
@@ -8,8 +8,8 @@
#include <catch.hpp>
-#include "api/String.h"
-#include "api/IPAddress.h"
+#include <api/String.h>
+#include <api/IPAddress.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/IPAddress/test_operator_assignment.cpp b/test/src/IPAddress/test_operator_assignment.cpp
index 3751f2a6..fdf641d4 100644
--- a/test/src/IPAddress/test_operator_assignment.cpp
+++ b/test/src/IPAddress/test_operator_assignment.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/IPAddress.h"
+#include <api/IPAddress.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/IPAddress/test_operator_comparison.cpp b/test/src/IPAddress/test_operator_comparison.cpp
index 44521148..3978c8e2 100644
--- a/test/src/IPAddress/test_operator_comparison.cpp
+++ b/test/src/IPAddress/test_operator_comparison.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/IPAddress.h"
+#include <api/IPAddress.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/IPAddress/test_operator_comparison6.cpp b/test/src/IPAddress/test_operator_comparison6.cpp
index ea811396..da03a0b3 100644
--- a/test/src/IPAddress/test_operator_comparison6.cpp
+++ b/test/src/IPAddress/test_operator_comparison6.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/IPAddress.h"
+#include <api/IPAddress.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/IPAddress/test_operator_parentheses.cpp b/test/src/IPAddress/test_operator_parentheses.cpp
index 78f76582..c1c2e375 100644
--- a/test/src/IPAddress/test_operator_parentheses.cpp
+++ b/test/src/IPAddress/test_operator_parentheses.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/IPAddress.h"
+#include <api/IPAddress.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/IPAddress/test_operator_parentheses6.cpp b/test/src/IPAddress/test_operator_parentheses6.cpp
index d795e4df..b4575f4e 100644
--- a/test/src/IPAddress/test_operator_parentheses6.cpp
+++ b/test/src/IPAddress/test_operator_parentheses6.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/IPAddress.h"
+#include <api/IPAddress.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/IPAddress/test_printTo.cpp b/test/src/IPAddress/test_printTo.cpp
index e00a0163..a0ed7c16 100644
--- a/test/src/IPAddress/test_printTo.cpp
+++ b/test/src/IPAddress/test_printTo.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/IPAddress.h"
+#include <api/IPAddress.h>
#include <PrintMock.h>
/**************************************************************************************
diff --git a/test/src/IPAddress/test_printTo6.cpp b/test/src/IPAddress/test_printTo6.cpp
index f1e72243..7d924b63 100644
--- a/test/src/IPAddress/test_printTo6.cpp
+++ b/test/src/IPAddress/test_printTo6.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/IPAddress.h"
+#include <api/IPAddress.h>
#include <PrintMock.h>
/**************************************************************************************
diff --git a/test/src/IPAddress/test_toString.cpp b/test/src/IPAddress/test_toString.cpp
index a172d9f4..f36ae549 100644
--- a/test/src/IPAddress/test_toString.cpp
+++ b/test/src/IPAddress/test_toString.cpp
@@ -8,8 +8,8 @@
#include <catch.hpp>
-#include "api/String.h"
-#include "api/IPAddress.h"
+#include <api/String.h>
+#include <api/IPAddress.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/Print/test_availableForWrite.cpp b/test/src/Print/test_availableForWrite.cpp
index eed150dd..c5dfbcda 100644
--- a/test/src/Print/test_availableForWrite.cpp
+++ b/test/src/Print/test_availableForWrite.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/Print.h"
+#include <api/Print.h>
#include <PrintMock.h>
diff --git a/test/src/Print/test_clearWriteError.cpp b/test/src/Print/test_clearWriteError.cpp
index c7b7d2b7..720a1210 100644
--- a/test/src/Print/test_clearWriteError.cpp
+++ b/test/src/Print/test_clearWriteError.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/Print.h"
+#include <api/Print.h>
#include <PrintMock.h>
diff --git a/test/src/Print/test_getWriteError.cpp b/test/src/Print/test_getWriteError.cpp
index 5f85efda..3b616411 100644
--- a/test/src/Print/test_getWriteError.cpp
+++ b/test/src/Print/test_getWriteError.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/Print.h"
+#include <api/Print.h>
#include <PrintMock.h>
diff --git a/test/src/Print/test_print.cpp b/test/src/Print/test_print.cpp
index 06e40f52..2598b7f7 100644
--- a/test/src/Print/test_print.cpp
+++ b/test/src/Print/test_print.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/Print.h"
+#include <api/Print.h>
#include <PrintMock.h>
#include <PrintableMock.h>
diff --git a/test/src/Print/test_println.cpp b/test/src/Print/test_println.cpp
index 1147decd..2d2d7306 100644
--- a/test/src/Print/test_println.cpp
+++ b/test/src/Print/test_println.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/Print.h"
+#include <api/Print.h>
#include <PrintMock.h>
#include <PrintableMock.h>
diff --git a/test/src/Ringbuffer/test_available.cpp b/test/src/Ringbuffer/test_available.cpp
index 0cb18030..75b86a7f 100644
--- a/test/src/Ringbuffer/test_available.cpp
+++ b/test/src/Ringbuffer/test_available.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/RingBuffer.h"
+#include <api/RingBuffer.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/Ringbuffer/test_availableForStore.cpp b/test/src/Ringbuffer/test_availableForStore.cpp
index 35c674e0..5b8415f6 100644
--- a/test/src/Ringbuffer/test_availableForStore.cpp
+++ b/test/src/Ringbuffer/test_availableForStore.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/RingBuffer.h"
+#include <api/RingBuffer.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/Ringbuffer/test_clear.cpp b/test/src/Ringbuffer/test_clear.cpp
index 3c9055dc..93da03a2 100644
--- a/test/src/Ringbuffer/test_clear.cpp
+++ b/test/src/Ringbuffer/test_clear.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/RingBuffer.h"
+#include <api/RingBuffer.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/Ringbuffer/test_isFull.cpp b/test/src/Ringbuffer/test_isFull.cpp
index f05b379a..c575981e 100644
--- a/test/src/Ringbuffer/test_isFull.cpp
+++ b/test/src/Ringbuffer/test_isFull.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/RingBuffer.h"
+#include <api/RingBuffer.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/Ringbuffer/test_peek.cpp b/test/src/Ringbuffer/test_peek.cpp
index 596b3a46..9efe28ea 100644
--- a/test/src/Ringbuffer/test_peek.cpp
+++ b/test/src/Ringbuffer/test_peek.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/RingBuffer.h"
+#include <api/RingBuffer.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/Ringbuffer/test_read_char.cpp b/test/src/Ringbuffer/test_read_char.cpp
index 525baf4a..babc27df 100644
--- a/test/src/Ringbuffer/test_read_char.cpp
+++ b/test/src/Ringbuffer/test_read_char.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/RingBuffer.h"
+#include <api/RingBuffer.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/Ringbuffer/test_store_char.cpp b/test/src/Ringbuffer/test_store_char.cpp
index 932542f0..0becdc0f 100644
--- a/test/src/Ringbuffer/test_store_char.cpp
+++ b/test/src/Ringbuffer/test_store_char.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/RingBuffer.h"
+#include <api/RingBuffer.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/String/StringPrinter.h b/test/src/String/StringPrinter.h
index 00cca761..1ddee147 100644
--- a/test/src/String/StringPrinter.h
+++ b/test/src/String/StringPrinter.h
@@ -1,7 +1,7 @@
#pragma once
#include <catch.hpp>
-#include "api/String.h"
+#include <api/String.h>
namespace Catch {
/**
diff --git a/test/src/String/test_String.cpp b/test/src/String/test_String.cpp
index c6af21b7..6d1b8152 100644
--- a/test/src/String/test_String.cpp
+++ b/test/src/String/test_String.cpp
@@ -10,7 +10,7 @@
#include <catch.hpp>
-#include "api/String.h"
+#include <api/String.h>
#include "StringPrinter.h"
diff --git a/test/src/String/test_characterAccessFunc.cpp b/test/src/String/test_characterAccessFunc.cpp
index e8dfe12e..49d257af 100644
--- a/test/src/String/test_characterAccessFunc.cpp
+++ b/test/src/String/test_characterAccessFunc.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/String.h"
+#include <api/String.h>
#include "StringPrinter.h"
diff --git a/test/src/String/test_compareTo.cpp b/test/src/String/test_compareTo.cpp
index ed5c2303..74a3da7b 100644
--- a/test/src/String/test_compareTo.cpp
+++ b/test/src/String/test_compareTo.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/String.h"
+#include <api/String.h>
#include "StringPrinter.h"
diff --git a/test/src/String/test_comparisonFunc.cpp b/test/src/String/test_comparisonFunc.cpp
index 3687d5a7..3b49bacc 100644
--- a/test/src/String/test_comparisonFunc.cpp
+++ b/test/src/String/test_comparisonFunc.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/String.h"
+#include <api/String.h>
#include "StringPrinter.h"
diff --git a/test/src/String/test_concat.cpp b/test/src/String/test_concat.cpp
index 6b4be20c..ef6c6fa1 100644
--- a/test/src/String/test_concat.cpp
+++ b/test/src/String/test_concat.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/String.h"
+#include <api/String.h>
#include "StringPrinter.h"
diff --git a/test/src/String/test_indexOf.cpp b/test/src/String/test_indexOf.cpp
index 3faaa518..9f32a07e 100644
--- a/test/src/String/test_indexOf.cpp
+++ b/test/src/String/test_indexOf.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/String.h"
+#include <api/String.h>
#include "StringPrinter.h"
diff --git a/test/src/String/test_lastIndexOf.cpp b/test/src/String/test_lastIndexOf.cpp
index 62b36717..7f776fa6 100644
--- a/test/src/String/test_lastIndexOf.cpp
+++ b/test/src/String/test_lastIndexOf.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/String.h"
+#include <api/String.h>
#include "StringPrinter.h"
diff --git a/test/src/String/test_length.cpp b/test/src/String/test_length.cpp
index 977d98d9..fae358fa 100644
--- a/test/src/String/test_length.cpp
+++ b/test/src/String/test_length.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/String.h"
+#include <api/String.h>
#include "StringPrinter.h"
diff --git a/test/src/String/test_move.cpp b/test/src/String/test_move.cpp
index f5b65032..a2529b50 100644
--- a/test/src/String/test_move.cpp
+++ b/test/src/String/test_move.cpp
@@ -1,6 +1,6 @@
#include <catch.hpp>
-#include "api/String.h"
+#include <api/String.h>
#include "StringPrinter.h"
diff --git a/test/src/String/test_operators.cpp b/test/src/String/test_operators.cpp
index c1c77ead..5a3b677c 100644
--- a/test/src/String/test_operators.cpp
+++ b/test/src/String/test_operators.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/String.h"
+#include <api/String.h>
#include "StringPrinter.h"
diff --git a/test/src/String/test_remove.cpp b/test/src/String/test_remove.cpp
index 1c09fa93..17b8dabb 100644
--- a/test/src/String/test_remove.cpp
+++ b/test/src/String/test_remove.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/String.h"
+#include <api/String.h>
#include "StringPrinter.h"
diff --git a/test/src/String/test_replace.cpp b/test/src/String/test_replace.cpp
index b6b795a8..cfcaead0 100644
--- a/test/src/String/test_replace.cpp
+++ b/test/src/String/test_replace.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/String.h"
+#include <api/String.h>
#include "StringPrinter.h"
diff --git a/test/src/String/test_substring.cpp b/test/src/String/test_substring.cpp
index 94323690..bb05d439 100644
--- a/test/src/String/test_substring.cpp
+++ b/test/src/String/test_substring.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/String.h"
+#include <api/String.h>
#include "StringPrinter.h"
diff --git a/test/src/String/test_toDouble.cpp b/test/src/String/test_toDouble.cpp
index 05d75bb7..af6960e9 100644
--- a/test/src/String/test_toDouble.cpp
+++ b/test/src/String/test_toDouble.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/String.h"
+#include <api/String.h>
#include "StringPrinter.h"
diff --git a/test/src/String/test_toFloat.cpp b/test/src/String/test_toFloat.cpp
index 6ea6031a..75cf94b2 100644
--- a/test/src/String/test_toFloat.cpp
+++ b/test/src/String/test_toFloat.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/String.h"
+#include <api/String.h>
#include "StringPrinter.h"
diff --git a/test/src/String/test_toInt.cpp b/test/src/String/test_toInt.cpp
index f7916de7..060fdd27 100644
--- a/test/src/String/test_toInt.cpp
+++ b/test/src/String/test_toInt.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/String.h"
+#include <api/String.h>
#include "StringPrinter.h"
diff --git a/test/src/String/test_toLowerCase.cpp b/test/src/String/test_toLowerCase.cpp
index 120816ca..9f6f7c9d 100644
--- a/test/src/String/test_toLowerCase.cpp
+++ b/test/src/String/test_toLowerCase.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/String.h"
+#include <api/String.h>
#include "StringPrinter.h"
diff --git a/test/src/String/test_toUpperCase.cpp b/test/src/String/test_toUpperCase.cpp
index baef69d4..1bcf93fb 100644
--- a/test/src/String/test_toUpperCase.cpp
+++ b/test/src/String/test_toUpperCase.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/String.h"
+#include <api/String.h>
#include "StringPrinter.h"
diff --git a/test/src/String/test_trim.cpp b/test/src/String/test_trim.cpp
index 480d3c61..c5168ecd 100644
--- a/test/src/String/test_trim.cpp
+++ b/test/src/String/test_trim.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/String.h"
+#include <api/String.h>
#include "StringPrinter.h"
diff --git a/test/src/WCharacter/test_isAscii.cpp b/test/src/WCharacter/test_isAscii.cpp
index e5bb196c..c6792719 100644
--- a/test/src/WCharacter/test_isAscii.cpp
+++ b/test/src/WCharacter/test_isAscii.cpp
@@ -10,7 +10,7 @@
#include <vector>
-#include "api/WCharacter.h"
+#include <api/WCharacter.h>
/**************************************************************************************
* CONSTANTS
diff --git a/test/src/WCharacter/test_isControl.cpp b/test/src/WCharacter/test_isControl.cpp
index d6d5d249..adb41ccf 100644
--- a/test/src/WCharacter/test_isControl.cpp
+++ b/test/src/WCharacter/test_isControl.cpp
@@ -10,7 +10,7 @@
#include <vector>
-#include "api/WCharacter.h"
+#include <api/WCharacter.h>
/**************************************************************************************
* CONSTANTS
diff --git a/test/src/WCharacter/test_isDigit.cpp b/test/src/WCharacter/test_isDigit.cpp
index 23178585..146a863b 100644
--- a/test/src/WCharacter/test_isDigit.cpp
+++ b/test/src/WCharacter/test_isDigit.cpp
@@ -10,7 +10,7 @@
#include <vector>
-#include "api/WCharacter.h"
+#include <api/WCharacter.h>
/**************************************************************************************
* CONSTANTS
diff --git a/test/src/WCharacter/test_isHexadecimalDigit.cpp b/test/src/WCharacter/test_isHexadecimalDigit.cpp
index 0aafe6d7..486a3e44 100644
--- a/test/src/WCharacter/test_isHexadecimalDigit.cpp
+++ b/test/src/WCharacter/test_isHexadecimalDigit.cpp
@@ -10,7 +10,7 @@
#include <vector>
-#include "api/WCharacter.h"
+#include <api/WCharacter.h>
/**************************************************************************************
* CONSTANTS
diff --git a/test/src/WCharacter/test_isLowerCase.cpp b/test/src/WCharacter/test_isLowerCase.cpp
index 85642d06..9b05b458 100644
--- a/test/src/WCharacter/test_isLowerCase.cpp
+++ b/test/src/WCharacter/test_isLowerCase.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/WCharacter.h"
+#include <api/WCharacter.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/WCharacter/test_isPunct.cpp b/test/src/WCharacter/test_isPunct.cpp
index ad0edbf2..7e6b49dc 100644
--- a/test/src/WCharacter/test_isPunct.cpp
+++ b/test/src/WCharacter/test_isPunct.cpp
@@ -10,7 +10,7 @@
#include <vector>
-#include "api/WCharacter.h"
+#include <api/WCharacter.h>
/**************************************************************************************
* CONSTANTS
diff --git a/test/src/WCharacter/test_isSpace.cpp b/test/src/WCharacter/test_isSpace.cpp
index f9d643e5..29ed8107 100644
--- a/test/src/WCharacter/test_isSpace.cpp
+++ b/test/src/WCharacter/test_isSpace.cpp
@@ -10,7 +10,7 @@
#include <vector>
-#include "api/WCharacter.h"
+#include <api/WCharacter.h>
/**************************************************************************************
* CONSTANTS
diff --git a/test/src/WCharacter/test_isUpperCase.cpp b/test/src/WCharacter/test_isUpperCase.cpp
index ecbdd4fa..598bb55b 100644
--- a/test/src/WCharacter/test_isUpperCase.cpp
+++ b/test/src/WCharacter/test_isUpperCase.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/WCharacter.h"
+#include <api/WCharacter.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/WCharacter/test_isWhitespace.cpp b/test/src/WCharacter/test_isWhitespace.cpp
index 1ed7b20c..483c6477 100644
--- a/test/src/WCharacter/test_isWhitespace.cpp
+++ b/test/src/WCharacter/test_isWhitespace.cpp
@@ -8,7 +8,7 @@
#include <catch.hpp>
-#include "api/WCharacter.h"
+#include <api/WCharacter.h>
/**************************************************************************************
* TEST CODE
diff --git a/test/src/WCharacter/test_toAscii.cpp b/test/src/WCharacter/test_toAscii.cpp
index 9954dda6..96a2cfb9 100644
--- a/test/src/WCharacter/test_toAscii.cpp
+++ b/test/src/WCharacter/test_toAscii.cpp
@@ -10,7 +10,7 @@
#include <vector>
-#include "api/WCharacter.h"
+#include <api/WCharacter.h>
/**************************************************************************************
* CONSTANTS
diff --git a/test/src/dtostrf.cpp b/test/src/dtostrf.cpp
index d21c8737..0700debb 100644
--- a/test/src/dtostrf.cpp
+++ b/test/src/dtostrf.cpp
@@ -6,7 +6,7 @@
* INCLUDE
**************************************************************************************/
-#include "api/deprecated-avr-comp/avr/dtostrf.h"
+#include <api/deprecated-avr-comp/avr/dtostrf.h>
#include <stdlib.h>
@@ -18,7 +18,7 @@
extern "C" {
#endif
-#include "api/deprecated-avr-comp/avr/dtostrf.c.impl"
+#include <api/deprecated-avr-comp/avr/dtostrf.c.impl>
#ifdef __cplusplus
} // extern "C"
diff --git a/test/src/itoa.cpp b/test/src/itoa.cpp
index 5c893905..292d0ef0 100644
--- a/test/src/itoa.cpp
+++ b/test/src/itoa.cpp
@@ -6,7 +6,7 @@
* INCLUDE
**************************************************************************************/
-#include "api/itoa.h"
+#include <api/itoa.h>
#include <string>
#include <stdexcept>