X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=test%2Flib%2FReturnMatcher.cpp;fp=test%2Flib%2FReturnMatcher.cpp;h=ab3b33f7fb4c39c03af9411dde448d826a95cffc;hb=d02c98cff56892d4c561aec87e4bec4a49e83051;hp=926214e74a829a998e9106e18708af7860c92650;hpb=c98c359a7ea03a0919a385bc88bf1387a47a41e8;p=m6w6%2Flibmemcached diff --git a/test/lib/ReturnMatcher.cpp b/test/lib/ReturnMatcher.cpp index 926214e7..ab3b33f7 100644 --- a/test/lib/ReturnMatcher.cpp +++ b/test/lib/ReturnMatcher.cpp @@ -1,6 +1,8 @@ #include "ReturnMatcher.hpp" +#include "libmemcached/error.hpp" bool ReturnMatcher::match(const memcached_return_t &arg) const { + actual->v = arg; if (arg != expected) { if (expected == MEMCACHED_SUCCESS && arg == MEMCACHED_BUFFERED && memc) { return memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS); @@ -24,7 +26,11 @@ ReturnMatcher &ReturnMatcher::operator=(memcached_st *memc_) { } string ReturnMatcher::describe() const { - return "is " + to_string(expected) - + "\n actual: " + memcached_last_error_message(memc); + return "is " + to_string(expected) + "\n" + + "expected:\n" + + " " + memcached_strerror(memc, expected) + "\n" + + "actual:\n" + + " " + memcached_strerror(memc, actual->v) + "\n" + + " " + (memcached_has_current_error(*memc) ? memcached_last_error_message(memc) : ""); }