X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Fstat.cc;h=f92c88e5808b1f738169e1ac08bbaf35d8d9898f;hb=ff3501d8602ddcf33b99d203f4ceb017ac411ce6;hp=60318790dbf75454b34921642f3b32c242517c58;hpb=23dca174eef8d846e3d4402729b57f6ded035e64;p=m6w6%2Flibmemcached

diff --git a/tests/libmemcached-1.0/stat.cc b/tests/libmemcached-1.0/stat.cc
index 60318790..f92c88e5 100644
--- a/tests/libmemcached-1.0/stat.cc
+++ b/tests/libmemcached-1.0/stat.cc
@@ -57,10 +57,7 @@ static memcached_return_t item_counter(memcached_server_instance_st ,
   {
     uint64_t* counter= (uint64_t*)context;
     unsigned long number_value= strtoul(value, (char **)NULL, 10);
-    if (number_value == ULONG_MAX)
-    {
-      return MEMCACHED_FAILURE;
-    }
+    ASSERT_NEQ(number_value, ULONG_MAX);
     *counter= *counter +number_value;
   }
 
@@ -85,10 +82,9 @@ test_return_t memcached_stat_TEST2(memcached_st *memc)
   for (uint32_t x= 0; x < memcached_dump_TEST2_COUNT; x++)
   {
     char key[1024];
-
     int length= snprintf(key, sizeof(key), "%s%u", __func__, x);
 
-    test_true(length > 0);
+    ASSERT_TRUE(length > 0);
 
     test_compare(MEMCACHED_SUCCESS,
                  memcached_set(memc, key, length,
@@ -98,9 +94,9 @@ test_return_t memcached_stat_TEST2(memcached_st *memc)
   memcached_quit(memc);
 
   uint64_t counter= 0;
-  test_compare(MEMCACHED_SUCCESS,
-               memcached_stat_execute(memc, NULL, item_counter, &counter));
-  test_true(counter);
+  ASSERT_EQ(MEMCACHED_SUCCESS,
+            memcached_stat_execute(memc, NULL, item_counter, &counter));
+  ASSERT_TRUE(counter);
 
   return TEST_SUCCESS;
 }