projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Address trond's comments
[m6w6/libmemcached]
/
tests
/
plus.cpp
diff --git
a/tests/plus.cpp
b/tests/plus.cpp
index 3431fd188dd0b2a6dc5ecf3857f35eb8700756f7..7ede21564c93d00eb07c7ce2fec097a8a5ed258a 100644
(file)
--- a/
tests/plus.cpp
+++ b/
tests/plus.cpp
@@
-17,6
+17,7
@@
#include "test.h"
#include <string>
#include "test.h"
#include <string>
+#include <iostream>
using namespace std;
using namespace memcache;
using namespace std;
using namespace memcache;
@@
-59,11
+60,24
@@
test_return basic_test(memcached_st *memc)
populate_vector(value, value_set);
foo.set("mine", value, 0, 0);
populate_vector(value, value_set);
foo.set("mine", value, 0, 0);
-
test_value=
foo.get("mine", test_value);
+ foo.get("mine", test_value);
assert((memcmp(&test_value[0], &value[0], test_value.size()) == 0));
assert((memcmp(&test_value[0], &value[0], test_value.size()) == 0));
- return TEST_SUCCESS;
+ /*
+ * Simple test of the exceptions here...this should throw an exception
+ * saying that the key is empty.
+ */
+ try
+ {
+ foo.set("", value, 0, 0);
+ }
+ catch (Error &err)
+ {
+ return TEST_SUCCESS;
+ }
+
+ return TEST_FAILURE;
}
test_return increment_test(memcached_st *memc)
}
test_return increment_test(memcached_st *memc)
@@
-85,7
+99,7
@@
test_return increment_test(memcached_st *memc)
{
return TEST_FAILURE;
}
{
return TEST_FAILURE;
}
-
ret_value=
mcach.get(key, ret_value);
+ mcach.get(key, ret_value);
if (ret_value.empty())
{
return TEST_FAILURE;
if (ret_value.empty())
{
return TEST_FAILURE;
@@
-124,13
+138,13
@@
test_return basic_master_key_test(memcached_st *memc)
populate_vector(value, value_set);
foo.setByKey(master_key_a, key, value, 0, 0);
populate_vector(value, value_set);
foo.setByKey(master_key_a, key, value, 0, 0);
-
test_value=
foo.getByKey(master_key_a, key, test_value);
+ foo.getByKey(master_key_a, key, test_value);
assert((memcmp(&value[0], &test_value[0], value.size()) == 0));
test_value.clear();
assert((memcmp(&value[0], &test_value[0], value.size()) == 0));
test_value.clear();
-
test_value=
foo.getByKey(master_key_b, key, test_value);
+ foo.getByKey(master_key_b, key, test_value);
assert((memcmp(&value[0], &test_value[0], value.size()) == 0));
return TEST_SUCCESS;
assert((memcmp(&value[0], &test_value[0], value.size()) == 0));
return TEST_SUCCESS;
@@
-212,7
+226,6
@@
test_return mget_test(memcached_st *memc)
values.push_back(&val1);
values.push_back(&val2);
values.push_back(&val3);
values.push_back(&val1);
values.push_back(&val2);
values.push_back(&val3);
- uint32_t flags;
string return_key;
vector<char> return_value;
string return_key;
vector<char> return_value;
@@
-224,8
+237,7
@@
test_return mget_test(memcached_st *memc)
rc= mc.mget(keys);
assert(rc == true);
rc= mc.mget(keys);
assert(rc == true);
- while (mc.fetch(return_key, return_value,
- &flags, &mc_rc))
+ while ((mc_rc= mc.fetch(return_key, return_value)) != MEMCACHED_END)
{
assert(return_value.size() != 0);
return_value.clear();
{
assert(return_value.size() != 0);
return_value.clear();
@@
-238,10
+250,8
@@
test_return mget_test(memcached_st *memc)
rc= mc.mget(keys);
assert(rc == true);
rc= mc.mget(keys);
assert(rc == true);
- while ((mc.fetch(return_key, return_value,
- &flags, &mc_rc)))
+ while ((mc_rc= mc.fetch(return_key, return_value)) != MEMCACHED_END)
{
{
- assert(mc_rc == MEMCACHED_SUCCESS);
assert(return_key.length() == return_value.size());
assert(!memcmp(&return_value[0], return_key.c_str(), return_value.size()));
}
assert(return_key.length() == return_value.size());
assert(!memcmp(&return_value[0], return_key.c_str(), return_value.size()));
}