Put utility function in their own files

Author: cmaglie

extras/test/CMakeLists.txt

@@ -33,6 +33,7 @@ set(TEST_TARGET ${CMAKE_PROJECT_NAME})
 
 set(TEST_SRCS
   src/RPC/test_RPCClient.cpp
+  src/RPC/utils.cpp
 )
 
 set(TEST_DUT_SRCS

extras/test/src/RPC/test_RPCClient.cpp

@@ -7,27 +7,7 @@
 #include <catch.hpp>
 #include <StreamMock.h>
 #include <Arduino_RPClite.h>
-
-// Poor-man MsgPack encoder
-#define ARRAY_N(x) (0x90 + (x))
-#define STRING_N(x) (0xA0 + (x))
-#define NIL 0xc0
-#define FLOAT_32 0xcb
-#define CALL_TAG 0x00
-#define RESP_TAG 0x01
-
-// convert a byte array into an hex string
-std::string to_hex_string(const unsigned char* data, size_t size) {
-  std::ostringstream oss;
-  oss << std::hex << std::setw(2) << std::setfill('0');
-  for (size_t i = 0; i < size; ++i) {
-    oss << static_cast<int>(data[i]);
-  }
-  return oss.str();
-}
-
-#define COMPARE_ARRAYS(expected, got) \
-  REQUIRE(to_hex_string(expected, sizeof(expected)) == to_hex_string(got, sizeof(expected)))
+#include "utils.h"
 
 TEST_CASE("RPCClient::call", "[RPCClient-01]")
 {

extras/test/src/RPC/utils.cpp

@@ -0,0 +1,13 @@
+#include <string>
+#include <sstream>
+#include <iomanip>
+
+// convert a byte array into an hex string
+std::string to_hex_string(const unsigned char* data, size_t size) {
+  std::ostringstream oss;
+  oss << std::hex << std::setw(2) << std::setfill('0');
+  for (size_t i = 0; i < size; ++i) {
+    oss << static_cast<int>(data[i]);
+  }
+  return oss.str();
+}

extras/test/src/RPC/utils.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include <string>
+
+// Poor-man MsgPack encoder
+#define ARRAY_N(x) (0x90 + (x))
+#define STRING_N(x) (0xA0 + (x))
+#define NIL 0xc0
+#define FLOAT_32 0xcb
+#define CALL_TAG 0x00
+#define RESP_TAG 0x01
+
+#define COMPARE_ARRAYS(expected, got) \
+  REQUIRE(to_hex_string(expected, sizeof(expected)) == to_hex_string(got, sizeof(expected)))
+
+std::string to_hex_string(const unsigned char* data, size_t size);