X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fcomparison.hpp;h=98ea1c8b68f4620ba9a91e250b8351d595c66cb1;hb=90c96090380d18b6bb7a553d6b9c7e1ce93e248c;hp=a04038b6c9ab0de7a86708f9f6cbcdc23568a889;hpb=60c68bea5d034012f935eb849d92781c345c7214;p=m6w6%2Flibmemcached

diff --git a/libtest/comparison.hpp b/libtest/comparison.hpp
index a04038b6..98ea1c8b 100644
--- a/libtest/comparison.hpp
+++ b/libtest/comparison.hpp
@@ -24,15 +24,18 @@
 #include <typeinfo>
 
 #if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
+#include <libmemcachedutil-1.0/ostream.hpp>
 #endif
 
 #if defined(HAVE_LIBGEARMAN) && HAVE_LIBGEARMAN
-#include <libgearman/gearman.h>
+#include <libgearman-1.0/ostream.hpp>
 #endif
 
 namespace libtest {
 
+bool _in_valgrind(const char *file, int line, const char *func);
+
 template <class T_comparable, class T_hint>
 bool _compare_truth_hint(const char *file, int line, const char *func, T_comparable __expected, const char *assertation_label,  T_hint __hint)
 {
@@ -45,44 +48,16 @@ bool _compare_truth_hint(const char *file, int line, const char *func, T_compara
   return true;
 }
 
-template <class T_comparable>
-bool _compare(const char *file, int line, const char *func, const T_comparable __expected, const T_comparable __actual)
+template <class T1_comparable, class T2_comparable>
+bool _compare(const char *file, int line, const char *func, const T1_comparable& __expected, const T2_comparable& __actual, bool use_io)
 {
   if (__expected != __actual)
   {
-    if (typeid(__expected) == typeid(test_return_t))
-    {
-      const char *expected_str= test_strerror(test_return_t(__expected));
-      const char *got_str= test_strerror(test_return_t(__actual));
-
-      libtest::stream::make_cerr(file, line, func) << "Expected \"" 
-        << expected_str
-        << "\" got \"" 
-        << got_str
-        << "\"";
-    }
-#if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED
-    else if (typeid(__expected) == typeid(memcached_return_t))
-    {
-      libtest::stream::make_cerr(file, line, func) << "Expected \"" 
-        << memcached_strerror(NULL, memcached_return_t(__expected)) 
-        << "\" got \"" 
-        << memcached_strerror(NULL, memcached_return_t(__actual)) << "\"";
-    }
-#endif
-#if defined(HAVE_LIBGEARMAN) && HAVE_LIBGEARMAN
-    else if (typeid(__expected) == typeid(gearman_return_t))
-    {
-      libtest::stream::make_cerr(file, line, func) << "Expected \"" 
-        << gearman_strerror(gearman_return_t(__expected)) 
-        << "\" got \"" 
-        << gearman_strerror(gearman_return_t(__actual)) << "\"";
-    }
-#endif
-    else
+    if (use_io)
     {
       libtest::stream::make_cerr(file, line, func) << "Expected \"" << __expected << "\" got \"" << __actual << "\"";
     }
+
     return false;
   }
 
@@ -113,48 +88,16 @@ bool _truth(const char *file, int line, const char *func, T_comparable __truth)
   return true;
 }
 
-template <class T_comparable, class T_hint>
-bool _compare_hint(const char *file, int line, const char *func, T_comparable __expected, T_comparable __actual, T_hint __hint)
+template <class T1_comparable, class T2_comparable, class T_hint>
+bool _compare_hint(const char *file, int line, const char *func, T1_comparable __expected, T2_comparable __actual, T_hint __hint, bool io_error= true)
 {
   if (__expected != __actual)
   {
-    if (typeid(__expected) == typeid(test_return_t))
-    {
-      const char *expected_str= test_strerror(test_return_t(__expected));
-      const char *got_str= test_strerror(test_return_t(__actual));
-
-      libtest::stream::make_cerr(file, line, func) << "Expected \"" 
-        << expected_str
-        << "\" got \"" 
-        << got_str
-        << "\""
-        << " Additionally: \"" << __hint << "\"";
-    }
-#if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED
-    else if (typeid(__expected) == typeid(memcached_return_t))
-    {
-      libtest::stream::make_cerr(file, line, func) << "Expected \"" 
-        << memcached_strerror(NULL, memcached_return_t(__expected)) 
-        << "\" got \"" 
-        << memcached_strerror(NULL, memcached_return_t(__actual)) << "\""
-        << " Additionally: \"" << __hint << "\"";
-    }
-#endif
-#if defined(HAVE_LIBGEARMAN) && HAVE_LIBGEARMAN
-    else if (typeid(__expected) == typeid(gearman_return_t))
-    {
-      libtest::stream::make_cerr(file, line, func) << "Expected \"" 
-        << gearman_strerror(gearman_return_t(__expected)) 
-        << "\" got \"" 
-        << gearman_strerror(gearman_return_t(__actual)) << "\""
-        << " Additionally: \"" << __hint << "\"";
-    }
-#endif
-    else
+    if (io_error)
     {
-      libtest::stream::make_cerr(file, line, func) << "Expected \"" << __expected << "\" got \"" << __actual << "\""
-        << " Additionally: \"" << __hint << "\"";
+      libtest::stream::make_cerr(file, line, func) << "Expected \"" << __expected << "\" got \"" << __actual << "\"" << " Additionally: \"" << __hint << "\"";
     }
+
     return false;
   }