Merge in trunk

[awesomized/libmemcached] / tests / mem_udp.cc

diff --git a/tests/mem_udp.cc b/tests/mem_udp.cc
index e33610daea2486c787d2a76a034da7ee5793e208..16fc1c73cbc3f3f2356ade8468131ff7bb4a9df7 100644 (file)
--- a/tests/mem_udp.cc
+++ b/tests/mem_udp.cc
@@ -173,17 +173,20 @@ static test_return_t udp_set_test(memcached_st *memc)
 {
   unsigned int num_iters= 1025; //request id rolls over at 1024
 
+  test_true(memc);
+
   for (size_t x= 0; x < num_iters;x++)
   {
     Expected expected_ids;
     get_udp_request_ids(memc, expected_ids);
     unsigned int server_key= memcached_generate_hash(memc, test_literal_param("foo"));
+    test_true(server_key < memcached_server_count(memc));
     memcached_server_instance_st instance= memcached_server_instance_by_position(memc, server_key);
     size_t init_offset= instance->write_buffer_offset;
 
     memcached_return_t rc= memcached_set(memc, test_literal_param("foo"),
                                          test_literal_param("when we sanitize"),
-                                         (time_t)0, (uint32_t)0);
+                                         time_t(0), uint32_t(0));
     test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED);
     /** NB, the check below assumes that if new write_ptr is less than
      *  the original write_ptr that we have flushed. For large payloads, this
@@ -212,12 +215,14 @@ static test_return_t udp_set_test(memcached_st *memc)
 
 static test_return_t udp_buffered_set_test(memcached_st *memc)
 {
+  test_true(memc);
   test_compare(MEMCACHED_INVALID_ARGUMENTS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, true));
   return TEST_SUCCESS;
 }
 
 static test_return_t udp_set_too_big_test(memcached_st *memc)
 {
+  test_true(memc);
   char value[MAX_UDP_DATAGRAM_LENGTH];
   Expected expected_ids;
   get_udp_request_ids(memc, expected_ids);
@@ -232,6 +237,8 @@ static test_return_t udp_set_too_big_test(memcached_st *memc)
 
 static test_return_t udp_delete_test(memcached_st *memc)
 {
+  test_true(memc);
+
   //request id rolls over at 1024
   for (size_t x= 0; x < 1025; x++)
   {
@@ -447,7 +454,7 @@ collection_st collection[] ={
 };
 
 #define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT +10
-#include "libmemcached_world.h"
+#include "tests/libmemcached_world.h"
 
 void get_world(Framework *world)
 {