From 1e0f1119e294e795a8f55c2e065d74755ca96b7f Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Wed, 14 Sep 2016 16:43:53 -0500
Subject: [PATCH] testTypeCast: mangle values to be printable

print  (u)int8 as integer instead of character

(cherry picked from commit da8ba56dd1cd87c532b5fa625644151b655005fe)
---
 testApp/misc/testTypeCast.cpp | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/testApp/misc/testTypeCast.cpp b/testApp/misc/testTypeCast.cpp
index 1f2516e..03cdb43 100644
--- a/testApp/misc/testTypeCast.cpp
+++ b/testApp/misc/testTypeCast.cpp
@@ -29,6 +29,13 @@
 using std::string;
 
 namespace {
+    // Mangle value to be printable as per print_convolute<>
+    template<typename T>
+    inline
+    typename epics::pvData::detail::print_convolute<T>::return_t
+    print(T v) {
+        return epics::pvData::detail::print_convolute<T>::op(v);
+    }
 
     template<typename T>
     struct testequal {
@@ -54,24 +61,24 @@ namespace {
                 //actual = ::epics::pvData::detail::cast_helper<TO,FROM>::op(inp);
             } catch(std::runtime_error& e) {
                 msg<<"Failed to cast "
-                   <<inp<<" ("<<typeid(FROM).name()<<") -> "
-                   <<expect<<" ("<<typeid(TO).name()<<")\n Error: "
+                   <<print(inp)<<" ("<<typeid(FROM).name()<<") -> "
+                   <<print(expect)<<" ("<<typeid(TO).name()<<")\n Error: "
                    <<typeid(e).name()<<"("<<e.what()<<")";
                 testFail("%s", msg.str().c_str());
                 return;
             }
             if(!testequal<TO>::op(actual, expect)) {
                 msg<<"Failed cast gives unexpected value "
-                   <<inp<<" ("<<typeid(FROM).name()<<") -> "
-                   <<expect<<" ("<<typeid(TO).name()<<") yields: "
-                   <<actual;
+                   <<print(inp)<<" ("<<typeid(FROM).name()<<") -> "
+                   <<print(expect)<<" ("<<typeid(TO).name()<<") yields: "
+                   <<print(actual);
                 testFail("%s", msg.str().c_str());
                 return;
             }
             msg<<"cast "
-               <<inp<<" ("<<typeid(FROM).name()<<") -> "
-               <<expect<<" ("<<typeid(TO).name()<<") yields: "
-               <<actual;
+               <<print(inp)<<" ("<<typeid(FROM).name()<<") -> "
+               <<print(expect)<<" ("<<typeid(TO).name()<<") yields: "
+               <<print(actual);
             testPass("%s", msg.str().c_str());
             return;
         }
@@ -86,14 +93,14 @@ namespace {
             try {
                 actual = ::epics::pvData::castUnsafe<TO,FROM>(inp);
                 msg<<"Failed to generate expected error "
-                   <<inp<<" ("<<typeid(FROM).name()<<") -> ("
+                   <<print(inp)<<" ("<<typeid(FROM).name()<<") -> ("
                    <<typeid(TO).name()<<") yields: "
                    <<actual;
                 testFail("%s", msg.str().c_str());
                 return;
             } catch(std::runtime_error& e) {
                 msg<<"Got expected error "
-                   <<inp<<" ("<<typeid(FROM).name()<<") -> ("
+                   <<print(inp)<<" ("<<typeid(FROM).name()<<") -> ("
                    <<typeid(TO).name()<<") fails with: "
                    <<e.what();
                 testPass("%s", msg.str().c_str());