From 9e79e50fdc60a3a5ad48308f3acf760a6b34c2e6 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Thu, 19 Mar 2020 13:13:16 -0700
Subject: [PATCH] test Value::copyIn/copyOut

---
 src/pvxs/data.h   | 24 ++++++++++++++++++++++++
 test/testdata.cpp | 43 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/src/pvxs/data.h b/src/pvxs/data.h
index e67ff17..d10ea89 100644
--- a/src/pvxs/data.h
+++ b/src/pvxs/data.h
@@ -182,6 +182,30 @@ inline std::ostream& operator<<(std::ostream& strm, TypeCode c) {
     return strm;
 }
 
+namespace impl {
+template<typename T>
+struct ScalarMap;
+
+#define CASE(TYPE, STORE, CODE) \
+template<> struct ScalarMap<TYPE> { typedef STORE store_t; static constexpr TypeCode::code_t code{TypeCode::CODE}; }
+
+CASE(bool    , uint64_t, Bool);
+CASE(uint8_t , uint64_t, UInt8);
+CASE(uint16_t, uint64_t, UInt16);
+CASE(uint32_t, uint64_t, UInt32);
+CASE(uint64_t, uint64_t, UInt64);
+CASE(int8_t  , int64_t , Int8);
+CASE(int16_t , int64_t , Int16);
+CASE(int32_t , int64_t , Int32);
+CASE(int64_t , int64_t , Int64);
+CASE(float   , double  , Float32);
+CASE(double  , double  , Float64);
+CASE(std::string, std::string, String);
+
+#undef CASE
+
+} // namespace
+
 //! Definition of a member of a Struct/Union for use with TypeDef
 struct Member {
 private:
diff --git a/test/testdata.cpp b/test/testdata.cpp
index 4fc6b57..e6963ce 100644
--- a/test/testdata.cpp
+++ b/test/testdata.cpp
@@ -172,16 +172,57 @@ void testPvRequest()
     }
 }
 
+template<typename Store, typename Inout>
+void testConvertScalar(const Store& store, const Inout& inout)
+{
+    testShow()<<__func__<<"("<<store<<","<<inout<<")";
+
+    typedef impl::ScalarMap<Store> store_t;
+
+    auto cont = TypeDef(store_t::code).create();
+
+    try {
+        cont.from(inout);
+    }catch(std::exception& e){
+        testCase(false)<<"Error storing as "<<typeid (Store).name()<<" "<<inout<<" : "<<e.what();
+    }
+
+    testEq(store, cont.as<Store>())<<typeid(Store).name();
+
+    testEq(inout, cont.as<Inout>())<<typeid(Store).name()<<"->"<<typeid(Inout).name();
+}
+
 } // namespace
 
 MAIN(testdata)
 {
-    testPlan(20);
+    testPlan(62);
     testTraverse();
     testAssign();
     testName();
     testIter();
     testPvRequest();
+    testConvertScalar<double, bool>(1.0, true);
+    testConvertScalar<double, bool>(0.0, false);
+    testConvertScalar<double, uint32_t>(5.0, 5);
+    testConvertScalar<double, int32_t>(5.0, 5);
+    testConvertScalar<double, int32_t>(-5.0, -5);
+    testConvertScalar<double, double>(-5.0, -5.0);
+    testConvertScalar<double, std::string>(-5.0, "-5");
+    testConvertScalar<int32_t, bool>(1, true);
+    testConvertScalar<int32_t, bool>(0, false);
+    testConvertScalar<int32_t, uint32_t>(5, 5);
+    testConvertScalar<int32_t, int32_t>(5, 5);
+    testConvertScalar<int32_t, int32_t>(-5, -5);
+    testConvertScalar<int32_t, double>(-5, -5.0);
+    testConvertScalar<int32_t, std::string>(-5, "-5");
+    testConvertScalar<std::string, bool>("true", true);
+    testConvertScalar<std::string, bool>("false", false);
+    testConvertScalar<std::string, uint32_t>("5", 5);
+    testConvertScalar<std::string, int32_t>("5", 5);
+    testConvertScalar<std::string, int32_t>("-5", -5);
+    testConvertScalar<std::string, double>("-5", -5.0);
+    testConvertScalar<std::string, std::string>("-5", "-5");
     cleanup_for_valgrind();
     return testDone();
 }