projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
OSX fixes, make memcapable a test.
[m6w6/libmemcached]
/
tests
/
parser.cc
diff --git
a/tests/parser.cc
b/tests/parser.cc
index 5d23e9d4f0e3c444688084a313da4c6d4b75428c..b29a6fdcfb66f1c36397bc27706cf0aadf230728 100644
(file)
--- a/
tests/parser.cc
+++ b/
tests/parser.cc
@@
-35,7
+35,10
@@
*
*/
*
*/
-#include <libtest/common.h>
+#include <config.h>
+#include <libtest/test.hpp>
+
+using namespace libtest;
#include <vector>
#include <iostream>
#include <vector>
#include <iostream>
@@
-235,20
+238,24
@@
static test_return_t _test_option(scanner_variable_t *scanner, bool test_true_op
for (scanner_variable_t *ptr= scanner; ptr->type != NIL; ptr++)
{
memcached_st *memc= memcached(ptr->option.c_str, ptr->option.size);
for (scanner_variable_t *ptr= scanner; ptr->type != NIL; ptr++)
{
memcached_st *memc= memcached(ptr->option.c_str, ptr->option.size);
- if (test_true_opt)
+
+ // The case that it should have parsed, but it didn't. We will inspect
+ // for an error with libmemcached_check_configuration()
+ if (not memc and test_true_opt)
{
char buffer[2048];
{
char buffer[2048];
- if (not memc)
- {
- libmemcached_check_configuration(ptr->option.c_str, ptr->option.size, buffer, sizeof(buffer));
- }
+ bool success= libmemcached_check_configuration(ptr->option.c_str, ptr->option.size, buffer, sizeof(buffer));
std::string temp(buffer);
temp+= " with option string:";
temp+= ptr->option.c_str;
std::string temp(buffer);
temp+= " with option string:";
temp+= ptr->option.c_str;
+ test_true_got(success, temp.c_str());
- test_true_got(memc, temp.c_str());
+ return TEST_FAILURE; // The line above should fail since memc should be null
+ }
+ if (test_true_opt)
+ {
if (ptr->check_func)
{
test_return_t test_rc= (*ptr->check_func)(memc, ptr->result);
if (ptr->check_func)
{
test_return_t test_rc= (*ptr->check_func)(memc, ptr->result);
@@
-367,8
+374,8
@@
test_return_t libmemcached_check_configuration_test(memcached_st*)
memcached_return_t rc;
char buffer[BUFSIZ];
memcached_return_t rc;
char buffer[BUFSIZ];
- rc= libmemcached_check_configuration(test_literal_param("--server=localhost"), buffer, sizeof(buffer));
-
test_true_got(rc == MEMCACHED_SUCCESS, buffer
);
+ test_compare(MEMCACHED_SUCCESS,
+
libmemcached_check_configuration(test_literal_param("--server=localhost"), buffer, sizeof(buffer))
);
rc= libmemcached_check_configuration(test_literal_param("--dude=localhost"), buffer, sizeof(buffer));
test_false_with(rc == MEMCACHED_SUCCESS, buffer);
rc= libmemcached_check_configuration(test_literal_param("--dude=localhost"), buffer, sizeof(buffer));
test_false_with(rc == MEMCACHED_SUCCESS, buffer);
@@
-396,9
+403,8
@@
test_return_t test_include_keyword(memcached_st*)
return TEST_SKIPPED;
char buffer[BUFSIZ];
return TEST_SKIPPED;
char buffer[BUFSIZ];
- memcached_return_t rc;
- rc= libmemcached_check_configuration(test_literal_param("INCLUDE \"support/example.cnf\""), buffer, sizeof(buffer));
- test_true_got(rc == MEMCACHED_SUCCESS, buffer);
+ test_compare(MEMCACHED_SUCCESS,
+ libmemcached_check_configuration(test_literal_param("INCLUDE \"support/example.cnf\""), buffer, sizeof(buffer)));
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-406,9
+412,8
@@
test_return_t test_include_keyword(memcached_st*)
test_return_t test_end_keyword(memcached_st*)
{
char buffer[BUFSIZ];
test_return_t test_end_keyword(memcached_st*)
{
char buffer[BUFSIZ];
- memcached_return_t rc;
- rc= libmemcached_check_configuration(test_literal_param("--server=localhost END bad keywords"), buffer, sizeof(buffer));
- test_true_got(rc == MEMCACHED_SUCCESS, buffer);
+ test_compare(MEMCACHED_SUCCESS,
+ libmemcached_check_configuration(test_literal_param("--server=localhost END bad keywords"), buffer, sizeof(buffer)));
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-416,9
+421,8
@@
test_return_t test_end_keyword(memcached_st*)
test_return_t test_reset_keyword(memcached_st*)
{
char buffer[BUFSIZ];
test_return_t test_reset_keyword(memcached_st*)
{
char buffer[BUFSIZ];
- memcached_return_t rc;
- rc= libmemcached_check_configuration(test_literal_param("--server=localhost reset --server=bad.com"), buffer, sizeof(buffer));
- test_true_got(rc == MEMCACHED_SUCCESS, buffer);
+ test_compare(MEMCACHED_SUCCESS,
+ libmemcached_check_configuration(test_literal_param("--server=localhost reset --server=bad.com"), buffer, sizeof(buffer)));
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-531,10
+535,8
@@
test_return_t test_hostname_port_weight(memcached_st *)
const char *server_string= "--server=localhost:8888/?2 --server=localhost:8889/?3 --server=localhost:8890/?4 --server=localhost:8891/?5 --server=localhost:8892/?3";
char buffer[BUFSIZ];
const char *server_string= "--server=localhost:8888/?2 --server=localhost:8889/?3 --server=localhost:8890/?4 --server=localhost:8891/?5 --server=localhost:8892/?3";
char buffer[BUFSIZ];
- memcached_return_t rc;
test_compare_got(MEMCACHED_SUCCESS,
test_compare_got(MEMCACHED_SUCCESS,
- rc= libmemcached_check_configuration(server_string, strlen(server_string), buffer, sizeof(buffer)),
- memcached_strerror(NULL, rc));
+ libmemcached_check_configuration(server_string, strlen(server_string), buffer, sizeof(buffer)), buffer);
memcached_st *memc= memcached(server_string, strlen(server_string));
test_true(memc);
memcached_st *memc= memcached(server_string, strlen(server_string));
test_true(memc);
@@
-615,17
+617,17
@@
test_return_t regression_bug_71231153_connect(memcached_st *)
return TEST_SKIPPED;
{ // Test the connect-timeout, on a bad host we should get MEMCACHED_CONNECTION_FAILURE
return TEST_SKIPPED;
{ // Test the connect-timeout, on a bad host we should get MEMCACHED_CONNECTION_FAILURE
- memcached_st *memc= memcached(
memcached
_literal_param("--SERVER=10.0.2.252 --CONNECT-TIMEOUT=0"));
+ memcached_st *memc= memcached(
test
_literal_param("--SERVER=10.0.2.252 --CONNECT-TIMEOUT=0"));
test_true(memc);
test_true(memc);
- test_
compare(0,
memc->connect_timeout);
+ test_
zero(
memc->connect_timeout);
test_compare(MEMCACHED_DEFAULT_TIMEOUT, memc->poll_timeout);
memcached_return_t rc;
size_t value_len;
test_compare(MEMCACHED_DEFAULT_TIMEOUT, memc->poll_timeout);
memcached_return_t rc;
size_t value_len;
- char *value= memcached_get(memc,
memcached
_literal_param("test"), &value_len, NULL, &rc);
+ char *value= memcached_get(memc,
test
_literal_param("test"), &value_len, NULL, &rc);
test_false(value);
test_false(value);
- test_
compare(0,
value_len);
- test_compare_got(MEMCACHED_TIMEOUT, rc, memcached_
strerror(NULL, r
c));
+ test_
zero(
value_len);
+ test_compare_got(MEMCACHED_TIMEOUT, rc, memcached_
last_error_message(mem
c));
memcached_free(memc);
}
memcached_free(memc);
}
@@
-639,17
+641,17
@@
test_return_t regression_bug_71231153_poll(memcached_st *)
return TEST_SKIPPED;
{ // Test the poll timeout, on a bad host we should get MEMCACHED_CONNECTION_FAILURE
return TEST_SKIPPED;
{ // Test the poll timeout, on a bad host we should get MEMCACHED_CONNECTION_FAILURE
- memcached_st *memc= memcached(
memcached
_literal_param("--SERVER=10.0.2.252 --POLL-TIMEOUT=0"));
+ memcached_st *memc= memcached(
test
_literal_param("--SERVER=10.0.2.252 --POLL-TIMEOUT=0"));
test_true(memc);
test_compare(MEMCACHED_DEFAULT_CONNECT_TIMEOUT, memc->connect_timeout);
test_true(memc);
test_compare(MEMCACHED_DEFAULT_CONNECT_TIMEOUT, memc->connect_timeout);
- test_
compare(0,
memc->poll_timeout);
+ test_
zero(
memc->poll_timeout);
memcached_return_t rc;
size_t value_len;
memcached_return_t rc;
size_t value_len;
- char *value= memcached_get(memc,
memcached
_literal_param("test"), &value_len, NULL, &rc);
+ char *value= memcached_get(memc,
test
_literal_param("test"), &value_len, NULL, &rc);
test_false(value);
test_false(value);
- test_
compare(0,
value_len);
- test_compare_got(MEMCACHED_TIMEOUT, rc, memcached_
strerror(NULL, r
c));
+ test_
zero(
value_len);
+ test_compare_got(MEMCACHED_TIMEOUT, rc, memcached_
last_error_message(mem
c));
memcached_free(memc);
}
memcached_free(memc);
}