X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fcomparison.hpp;h=32dc22fa1ab77fa5546be224f29658fb4f68aade;hb=458694809f0633be65695c2e845e2333652e4b91;hp=2a00284fbddef1a881feaf475c013d02ae72ecc6;hpb=47f45992107361ad58c170bdf78fdc92523fab06;p=awesomized%2Flibmemcached

diff --git a/libtest/comparison.hpp b/libtest/comparison.hpp
index 2a00284f..32dc22fa 100644
--- a/libtest/comparison.hpp
+++ b/libtest/comparison.hpp
@@ -41,6 +41,7 @@
 #if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED
 #include <libmemcached-1.0/memcached.h>
 #include <libmemcachedutil-1.0/ostream.hpp>
+#include <libtest/memcached.hpp>
 #endif
 
 #if defined(HAVE_LIBGEARMAN) && HAVE_LIBGEARMAN
@@ -58,12 +59,12 @@ bool valgrind_is_caller(void);
 LIBTEST_API
 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)
+template <class T_comparable>
+bool _compare_truth(const char *file, int line, const char *func, T_comparable __expected, const char *assertation_label)
 {
   if (__expected == false)
   {
-    libtest::stream::make_cerr(file, line, func) << "Assertation  \"" << assertation_label << "\" failed, hint: " << __hint;
+    libtest::stream::make_cerr(file, line, func) << "Assertation  \"" << assertation_label << "\"";
     return false;
   }
 
@@ -86,12 +87,23 @@ bool _compare(const char *file, int line, const char *func, const T1_comparable&
   return true;
 }
 
-template <class T_comparable>
-bool _compare_zero(const char *file, int line, const char *func, T_comparable __actual)
+template <class T1_comparable, class T2_comparable>
+bool _compare_strcmp(const char *file, int line, const char *func, const T1_comparable& __expected, const T2_comparable& __actual)
 {
-  if (T_comparable(0) != __actual)
+  if (__expected == NULL)
   {
-    libtest::stream::make_cerr(file, line, func) << "Expected 0 got \"" << __actual << "\"";
+    fatal_message("Expected value was NULL, programmer error");
+  }
+
+  if (__actual == NULL)
+  {
+    libtest::stream::make_cerr(file, line, func) << "Expected " << __expected << " but got NULL";
+    return false;
+  }
+
+  if (strncmp(__expected, __actual, strlen(__expected)))
+  {
+    libtest::stream::make_cerr(file, line, func) << "Expected " << __expected << " passed \"" << __actual << "\"";
     return false;
   }
 
@@ -99,25 +111,25 @@ bool _compare_zero(const char *file, int line, const char *func, T_comparable __
 }
 
 template <class T_comparable>
-bool _truth(const char *file, int line, const char *func, T_comparable __truth)
+bool _compare_zero(const char *file, int line, const char *func, T_comparable __actual)
 {
-  if (bool(__truth))
+  if (T_comparable(0) != __actual)
   {
-    libtest::stream::make_cerr(file, line, func) << "Assertion failed for " << func << "() with \"" << __truth << "\"";
+    libtest::stream::make_cerr(file, line, func) << "Expected 0 got \"" << __actual << "\"";
     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, bool io_error= true)
+template <class T1_comparable, class T2_comparable>
+bool _ne_compare(const char *file, int line, const char *func, T1_comparable __expected, T2_comparable __actual, bool io_error= true)
 {
-  if (__expected != __actual)
+  if (__expected == __actual)
   {
     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 << "\"";
     }
 
     return false;
@@ -126,20 +138,20 @@ bool _compare_hint(const char *file, int line, const char *func, T1_comparable _
   return true;
 }
 
-template <class T1_comparable, class T2_comparable, class T_hint>
-bool _ne_compare_hint(const char *file, int line, const char *func, T1_comparable __expected, T2_comparable __actual, T_hint __hint, bool io_error= true)
+template <class T_comparable, class T_expression_string>
+bool _assert_truth(const char *file, int line, const char *func, T_comparable __truth, T_expression_string __expression, const char* __explain= NULL)
 {
-  if (__expected == __actual)
+  if (__truth)
   {
-    if (io_error)
-    {
-      libtest::stream::make_cerr(file, line, func) << "Expected \"" << __expected << "\" got \"" << __actual << "\"" << " Additionally: \"" << __hint << "\"";
-    }
+    return true;
+  }
 
-    return false;
+  if (__explain)
+  {
+    libtest::stream::make_cerr(file, line, func) << "Assertion \"" << __expression << "\" warning:" << __explain;
   }
 
-  return true;
+  return false;
 }
 
 } // namespace libtest