Style cleanup

[m6w6/libmemcached] / tests / plus.cpp

diff --git a/tests/plus.cpp b/tests/plus.cpp
index d988334fb89459b8df47671bb66dae37c3aaa043..ee898d4e4662379123a621ce4b355bd62b8bb49c 100644 (file)
--- a/tests/plus.cpp
+++ b/tests/plus.cpp
@@ -27,8 +27,9 @@ extern "C" {
    test_return_t increment_test(memcached_st *memc);
    test_return_t basic_master_key_test(memcached_st *memc);
    test_return_t mget_result_function(memcached_st *memc);
+   test_return_t basic_behavior(memcached_st *memc);
    test_return_t mget_test(memcached_st *memc);
-   memcached_return callback_counter(memcached_st *,
+   memcached_return_t callback_counter(memcached_st *,
                                      memcached_result_st *, 
                                      void *context);
    void *world_create(void);
@@ -151,9 +152,9 @@ test_return_t basic_master_key_test(memcached_st *memc)
 }
 
 /* Count the results */
-memcached_return callback_counter(memcached_st *,
-                                  memcached_result_st *, 
-                                  void *context)
+memcached_return_t callback_counter(memcached_st *,
+                                    memcached_result_st *, 
+                                    void *context)
 {
   unsigned int *counter= static_cast<unsigned int *>(context);
 
@@ -186,7 +187,7 @@ test_return_t mget_result_function(memcached_st *memc)
   values.push_back(&val2);
   values.push_back(&val3);
   unsigned int counter;
-  memcached_execute_function callbacks[1];
+  memcached_execute_fn callbacks[1];
 
   /* We need to empty the server before we continue the test */
   rc= mc.flush(0);
@@ -209,7 +210,7 @@ test_return_t mget_test(memcached_st *memc)
 {
   Memcache mc(memc);
   bool rc;
-  memcached_return mc_rc;
+  memcached_return_t mc_rc;
   vector<string> keys;
   vector< vector<char> *> values;
   keys.reserve(3);
@@ -259,12 +260,26 @@ test_return_t mget_test(memcached_st *memc)
   return TEST_SUCCESS;
 }
 
+test_return_t basic_behavior(memcached_st *memc)
+{
+  Memcache mc(memc);
+  bool rc;
+  uint64_t value = 1;
+  rc = mc.setBehavior(MEMCACHED_BEHAVIOR_VERIFY_KEY, value);
+  assert(rc);
+  uint64_t behavior = mc.getBehavior(MEMCACHED_BEHAVIOR_VERIFY_KEY);
+  assert(behavior == value);
+
+  return TEST_SUCCESS;
+}
+
 test_st tests[] ={
   { "basic", 0, basic_test },
   { "basic_master_key", 0, basic_master_key_test },
   { "increment_test", 0, increment_test },
   { "mget", 1, mget_test },
   { "mget_result_function", 1, mget_result_function },
+  { "basic_behavior", 0, basic_behavior },
   {0, 0, 0}
 };