summaryrefslogtreecommitdiff
path: root/tests/test-common.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test-common.cpp')
-rw-r--r--tests/test-common.cpp35
1 files changed, 31 insertions, 4 deletions
diff --git a/tests/test-common.cpp b/tests/test-common.cpp
index 3e9e331..3157ca6 100644
--- a/tests/test-common.cpp
+++ b/tests/test-common.cpp
@@ -38,15 +38,42 @@ std::string bytes_to_hex(const std::vector<unsigned char> &bytes)
return ss.str();
}
-std::vector<unsigned char> bytearr_to_vec(const unsigned char *bytes, size_t len)
+std::string bytes_to_hex(const raw_buffer_s *rb)
{
- if (bytes == nullptr || len == 0)
+ if (!is_buffer_valid(rb))
+ return std::string();
+
+ return bytes_to_hex(rb->buf, rb->size);
+}
+
+std::string bytes_to_hex(const unsigned char *ptr, size_t len)
+{
+ std::stringstream ss;
+ ss << std::hex;
+
+ for (size_t i = 0; i < len; ++i)
+ ss << std::setw(2) << std::setfill('0') << static_cast<int>(ptr[i]);
+
+ return ss.str();
+}
+
+std::vector<unsigned char> bytearr_to_vec(const raw_buffer_s *rb)
+{
+ if (!is_buffer_valid(rb))
+ return std::vector<unsigned char>();
+
+ return bytearr_to_vec(rb->buf, rb->size);
+}
+
+std::vector<unsigned char> bytearr_to_vec(const unsigned char *ptr, size_t len)
+{
+ if (ptr == nullptr || len == 0)
return std::vector<unsigned char>();
- std::vector<unsigned char> vec;
+ std::vector<unsigned char> vec(len);
for (size_t i = 0; i < len; ++i)
- vec.push_back(bytes[i]);
+ vec[i] = ptr[i];
return vec;
}