convert test progress

zussel · May 8, 2024 · 7eb9899 · 7eb9899
1 parent 1db2f95
commit 7eb9899
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/include/matador/utils/convert.hpp b/include/matador/utils/convert.hpp
@@ -73,41 +73,41 @@ unsigned long long to_unsigned_long_long(const char *source);
 template < typename DestType >
 void convert(DestType &dest, const std::string &source, typename std::enable_if<std::is_integral<DestType>::value && std::is_unsigned<DestType>::value>::type* = nullptr)
 {
-  dest = to_unsigned_long_long(source.c_str());
+  dest = static_cast<DestType>(to_unsigned_long_long(source.c_str()));
 }
 
 template < typename DestType >
 void convert(DestType &dest, const char *source, typename std::enable_if<std::is_integral<DestType>::value && std::is_unsigned<DestType>::value>::type* = nullptr)
 {
-  dest = to_unsigned_long_long(source);
+  dest = static_cast<DestType>(to_unsigned_long_long(source));
 }
 
 long long to_long_long(const char *source);
 
 template < typename DestType >
 void convert(DestType &dest, const std::string &source, typename std::enable_if<std::is_integral<DestType>::value && std::is_signed<DestType>::value>::type* = nullptr)
 {
-  dest = to_long_long(source.c_str());
+  dest = static_cast<DestType>(to_long_long(source.c_str()));
 }
 
 template < typename DestType >
 void convert(DestType &dest, const char *source, typename std::enable_if<std::is_integral<DestType>::value && std::is_signed<DestType>::value>::type* = nullptr)
 {
-  dest = to_long_long(source);
+  dest = static_cast<DestType>(to_long_long(source));
 }
 
 long double to_double(const char *source);
 
 template < typename DestType >
 void convert(DestType &dest, const std::string &source, typename std::enable_if<std::is_floating_point<DestType>::value>::type* = nullptr)
 {
-  dest = to_double(source.c_str());
+  dest = static_cast<DestType>(to_double(source.c_str()));
 }
 
 template < typename DestType >
 void convert(DestType &dest, const char *source, typename std::enable_if<std::is_floating_point<DestType>::value>::type* = nullptr)
 {
-  dest = to_double(source);
+  dest = static_cast<DestType>(to_double(source));
 }
 
 template < typename DestType >

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -38,7 +38,9 @@ SET (TEST_TOOLS_SOURCES
   utils/DependencyInjectionTest.cpp
   utils/DependencyInjectionTest.hpp
   utils/VersionTest.cpp
-  utils/VersionTest.hpp)
+  utils/VersionTest.hpp
+  utils/ConvertTest.cpp
+  utils/ConvertTest.hpp)
 
 SET (TEST_JSON_SOURCES
   json/JsonTestUnit.cpp

diff --git a/test/test_matador.cpp b/test/test_matador.cpp
@@ -8,6 +8,7 @@
 
 #include "matador/utils/os.hpp"
 
+#include "utils/ConvertTest.hpp"
 #include "utils/TimeTestUnit.hpp"
 #include "utils/Base64Test.hpp"
 #include "utils/BufferViewTest.hpp"

diff --git a/test/utils/BlobTestUnit.cpp b/test/utils/BlobTestUnit.cpp
@@ -9,7 +9,7 @@ using namespace matador;
 BlobTestUnit::BlobTestUnit()
   : unit_test("blob", "blob test unit")
 {
-  add_test("create", std::bind(&BlobTestUnit::test_create, this), "create blob");
+  add_test("create", [this] { test_create(); }, "create blob");
 }
 
 void BlobTestUnit::test_create()