projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updating the mget function in the C++ interface to take a std::vector of
[m6w6/libmemcached]
/
tests
/
plus.cpp
diff --git
a/tests/plus.cpp
b/tests/plus.cpp
index ec29b159f9ae5392abee9c02713ae4b88cc3ba23..fdc7e916948e07e5c20f7f2445e1cae1f1ae8c64 100644
(file)
--- a/
tests/plus.cpp
+++ b/
tests/plus.cpp
@@
-1,8
+1,9
@@
/*
C++ interface test
*/
/*
C++ interface test
*/
+#include "libmemcached/memcached.hh"
+
#include <assert.h>
#include <assert.h>
-#include <memcached.hh>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-15,79
+16,92
@@
#include "test.h"
#include "test.h"
-extern "C" test_return basic_test(memcached_st *memc)
+#include <string>
+
+using namespace std;
+
+extern "C" {
+ test_return basic_test(memcached_st *memc);
+ test_return increment_test(memcached_st *memc);
+ test_return basic_master_key_test(memcached_st *memc);
+ void *world_create(void);
+ void world_destroy(void *p);
+}
+
+test_return basic_test(memcached_st *memc)
{
Memcached foo(memc);
{
Memcached foo(memc);
- const
char *value_set= "This is some data"
;
-
char *
value;
+ const
string value_set("This is some data")
;
+
string
value;
size_t value_length;
size_t value_length;
- foo.set("mine", value_set
, strlen(value_set)
);
+ foo.set("mine", value_set);
value= foo.get("mine", &value_length);
value= foo.get("mine", &value_length);
- assert((memcmp(value
, value_set
, value_length) == 0));
+ assert((memcmp(value
.c_str(), value_set.c_str()
, value_length) == 0));
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
-
extern "C" uint8_t
increment_test(memcached_st *memc)
+
test_return
increment_test(memcached_st *memc)
{
Memcached mcach(memc);
{
Memcached mcach(memc);
-
memcached_return
rc;
- const
char *key= "inctest"
;
- const
char *inc_value= "1"
;
-
char *
ret_value;
+
bool
rc;
+ const
string key("inctest")
;
+ const
string inc_value("1")
;
+
string
ret_value;
uint64_t int_inc_value;
uint64_t int_ret_value;
size_t value_length;
uint64_t int_inc_value;
uint64_t int_ret_value;
size_t value_length;
- mcach.set(key, inc_value
, strlen(inc_value)
);
+ mcach.set(key, inc_value);
ret_value= mcach.get(key, &value_length);
ret_value= mcach.get(key, &value_length);
- printf("\nretvalue %s\n",ret_value);
- int_inc_value=
atoi(inc_value
);
- int_ret_value=
atoi(ret_value
);
+ printf("\nretvalue %s\n",ret_value
.c_str()
);
+ int_inc_value=
uint64_t(atol(inc_value.c_str())
);
+ int_ret_value=
uint64_t(atol(ret_value.c_str())
);
assert(int_ret_value == int_inc_value);
rc= mcach.increment(key, 1, &int_ret_value);
assert(int_ret_value == int_inc_value);
rc= mcach.increment(key, 1, &int_ret_value);
- assert(rc ==
MEMCACHED_SUCCESS
);
+ assert(rc ==
true
);
assert(int_ret_value == 2);
rc= mcach.increment(key, 1, &int_ret_value);
assert(int_ret_value == 2);
rc= mcach.increment(key, 1, &int_ret_value);
- assert(rc ==
MEMCACHED_SUCCESS
);
+ assert(rc ==
true
);
assert(int_ret_value == 3);
rc= mcach.increment(key, 5, &int_ret_value);
assert(int_ret_value == 3);
rc= mcach.increment(key, 5, &int_ret_value);
- assert(rc ==
MEMCACHED_SUCCESS
);
+ assert(rc ==
true
);
assert(int_ret_value == 8);
assert(int_ret_value == 8);
- return
0
;
+ return
TEST_SUCCESS
;
}
}
-
extern "C"
test_return basic_master_key_test(memcached_st *memc)
+test_return basic_master_key_test(memcached_st *memc)
{
{
-
Memcached foo(memc);
- const
char *value_set= "Data for server A"
;
- const
char *master_key_a= "server-a"
;
- const
char *master_key_b= "server-b"
;
- const
char *key= "xyz"
;
-
char *
value;
+ Memcached foo(memc);
+ const
string value_set("Data for server A")
;
+ const
string master_key_a("server-a")
;
+ const
string master_key_b("server-b")
;
+ const
string key("xyz")
;
+
string
value;
size_t value_length;
size_t value_length;
- foo.set_by_key(master_key_a, key, value_set
, strlen(value_set)
);
+ foo.set_by_key(master_key_a, key, value_set);
value= foo.get_by_key(master_key_a, key, &value_length);
value= foo.get_by_key(master_key_a, key, &value_length);
- assert((memcmp(value
, value_set
, value_length) == 0));
+ assert((memcmp(value
.c_str(), value_set.c_str()
, value_length) == 0));
value= foo.get_by_key(master_key_b, key, &value_length);
value= foo.get_by_key(master_key_b, key, &value_length);
- assert((memcmp(value
, value_set
, value_length) == 0));
+ assert((memcmp(value
.c_str(), value_set.c_str()
, value_length) == 0));
return TEST_SUCCESS;
}
test_st tests[] ={
return TEST_SUCCESS;
}
test_st tests[] ={
- {"basic", 0, basic_test },
- {"basic_master_key", 0, basic_master_key_test },
+ { "basic", 0, basic_test },
+ { "basic_master_key", 0, basic_master_key_test },
+ { "increment_test", 0, increment_test },
{0, 0, 0}
};
{0, 0, 0}
};
@@
-111,10
+125,11
@@
extern "C" void *world_create(void)
return construct;
}
return construct;
}
-
extern "C"
void world_destroy(void *p)
+void world_destroy(void *p)
{
{
- server_startup_st *construct= (server_startup_st *)p;
- memcached_server_st *servers= (memcached_server_st *)construct->servers;
+ server_startup_st *construct= static_cast<server_startup_st *>(p);
+ memcached_server_st *servers=
+ static_cast<memcached_server_st *>(construct->servers);
memcached_server_list_free(servers);
server_shutdown(construct);
memcached_server_list_free(servers);
server_shutdown(construct);