Ubuntu 10.10 32bit fixes.

[m6w6/libmemcached] / libtest / comparison.hpp

diff --git a/libtest/comparison.hpp b/libtest/comparison.hpp
index 6f7c5a5b4b9e3e29f2d2b05576ffd9ea12a0bb6c..eb240d47f9195a16e0a88383a3e87416130f96de 100644 (file)
--- a/libtest/comparison.hpp
+++ b/libtest/comparison.hpp
@@ -22,7 +22,6 @@
 #pragma once
 
 #include <typeinfo>
-#include <libtest/strerror.h>
 
 #if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED
 #include <libmemcached/memcached.h>
@@ -35,7 +34,7 @@
 namespace libtest {
 
 template <class T_comparable, class T_hint>
-bool _compare_true_hint(const char *file, int line, const char *func, T_comparable __expected, const char *assertation_label,  T_hint __hint)
+bool _compare_truth_hint(const char *file, int line, const char *func, T_comparable __expected, const char *assertation_label,  T_hint __hint)
 {
   if (__expected == false)
   {
@@ -46,17 +45,21 @@ bool _compare_true_hint(const char *file, int line, const char *func, T_comparab
   return true;
 }
 
-template <class T_comparable>
-bool _compare(const char *file, int line, const char *func, T_comparable __expected, 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)
 {
   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 \"" 
-        << test_strerror(test_return_t(__expected)) 
+        << expected_str
         << "\" got \"" 
-        << test_strerror(test_return_t(__actual)) << "\"";
+        << got_str
+        << "\"";
     }
 #if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED
     else if (typeid(__expected) == typeid(memcached_return_t))
@@ -98,13 +101,60 @@ bool _compare_zero(const char *file, int line, const char *func, T_comparable __
   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 T_comparable>
+bool _truth(const char *file, int line, const char *func, T_comparable __truth)
+{
+  if (bool(__truth))
+  {
+    libtest::stream::make_cerr(file, line, func) << "Assertion failed for " << func << "() with \"" << __truth << "\"";
+    return false;
+  }
+
+  return true;
+}
+
+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)
 {
   if (__expected != __actual)
   {
-    libtest::stream::make_cerr(file, line, func) << "Expected \"" << __expected << "\" got \"" << __actual << "\" Additionally: \"" << __hint << "\"";
+    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 << "\"";
+    }
     return false;
   }