arduino · aentinger · Sep 8, 2023 · Sep 7, 2023 · Sep 7, 2023 · Sep 7, 2023
diff --git a/api/IPAddress.cpp b/api/IPAddress.cpp
@@ -96,20 +96,26 @@ 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],
             _address.bytes[4], _address.bytes[5], _address.bytes[6], _address.bytes[7],
             _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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -8,7 +8,7 @@
 
 #include <catch.hpp>
 
-#include <Print.h>
+#include <api/Print.h>
 
 #include <PrintMock.h>
 #include <PrintableMock.h>