X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fcomparison.hpp;h=bcb7558e61cd907da977208989fa4185cd02fff5;hb=1d6aaf09ebb2aafad07307f736d7bab6fdb79d2c;hp=eb240d47f9195a16e0a88383a3e87416130f96de;hpb=77606accc7f17a79feaaf54041408cdba6febaf2;p=m6w6%2Flibmemcached

diff --git a/libtest/comparison.hpp b/libtest/comparison.hpp
index eb240d47..bcb7558e 100644
--- a/libtest/comparison.hpp
+++ b/libtest/comparison.hpp
@@ -24,11 +24,12 @@
 #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 {
@@ -46,43 +47,11 @@ bool _compare_truth_hint(const char *file, int line, const char *func, T_compara
 }
 
 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 _compare(const char *file, int line, const char *func, const T1_comparable& __expected, const T2_comparable& __actual)
 {
   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
-    {
-      libtest::stream::make_cerr(file, line, func) << "Expected \"" << __expected << "\" got \"" << __actual << "\"";
-    }
+    libtest::stream::make_cerr(file, line, func) << "Expected \"" << __expected << "\" got \"" << __actual << "\"";
     return false;
   }
 
@@ -118,43 +87,8 @@ bool _compare_hint(const char *file, int line, const char *func, T1_comparable _
 {
   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
-    {
-      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;
   }