X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fparser.cc;h=45ffd2d0e6554185fb41f0490ef2e199e0dfacff;hb=062c820f9d12a06ba5845a03e0083d9f3becc930;hp=f1020ff45f6471f15412218bf4e9295687a16b2f;hpb=5a65c28db362c4d62419075c5c9e416fd855a9f9;p=m6w6%2Flibmemcached diff --git a/tests/parser.cc b/tests/parser.cc index f1020ff4..45ffd2d0 100644 --- a/tests/parser.cc +++ b/tests/parser.cc @@ -35,7 +35,10 @@ * */ -#include +#include +#include + +using namespace libtest; #include #include @@ -43,9 +46,7 @@ #include #include -#define BUILDING_LIBMEMCACHED -// !NEVER use common.h, always use memcached.h in your own apps -#include +#include #include #include @@ -98,16 +99,11 @@ static test_return_t __check_host(memcached_st *memc, const scanner_string_st &h } // Check and make sure the prefix_key is what we expect it to be -static test_return_t __check_prefix_key(memcached_st *memc, const scanner_string_st &hostname) +static test_return_t __check_namespace(memcached_st *memc, const scanner_string_st &arg) { - memcached_server_instance_st instance= - memcached_server_instance_by_position(memc, 0); - - test_true(instance); - - const char *first_hostname = memcached_server_name(instance); - test_true(first_hostname); - test_strcmp(first_hostname, hostname.c_str); + const char *_namespace = memcached_get_namespace(memc); + test_true(_namespace); + test_strcmp(_namespace, arg.c_str); return TEST_SUCCESS; } @@ -206,10 +202,10 @@ scanner_variable_t test_boolean_options[]= { { NIL, scanner_string_null, scanner_string_null, NULL} }; -scanner_variable_t prefix_key_strings[]= { - { ARRAY, make_scanner_string("--NAMESPACE=foo"), make_scanner_string("foo"), __check_prefix_key }, - { ARRAY, make_scanner_string("--NAMESPACE=\"foo\""), make_scanner_string("foo"), __check_prefix_key }, - { ARRAY, make_scanner_string("--NAMESPACE=\"This_is_a_very_long_key\""), make_scanner_string("This_is_a_very_long_key"), __check_prefix_key }, +scanner_variable_t namespace_strings[]= { + { ARRAY, make_scanner_string("--NAMESPACE=foo"), make_scanner_string("foo"), __check_namespace }, + { ARRAY, make_scanner_string("--NAMESPACE=\"foo\""), make_scanner_string("foo"), __check_namespace }, + { ARRAY, make_scanner_string("--NAMESPACE=\"This_is_a_very_long_key\""), make_scanner_string("This_is_a_very_long_key"), __check_namespace }, { NIL, scanner_string_null, scanner_string_null, NULL} }; @@ -240,16 +236,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); - 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]; - 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)); - test_true_got(memc, buffer); + std::string temp(buffer); + temp+= " with option string:"; + temp+= ptr->option.c_str; + test_true_got(success, 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); @@ -322,6 +326,11 @@ test_return_t parser_key_prefix_test(memcached_st*) return _test_option(distribution_strings); } +test_return_t test_namespace_keyword(memcached_st*) +{ + return _test_option(namespace_strings); +} + #define SUPPORT_EXAMPLE_CNF "support/example.cnf" test_return_t memcached_create_with_options_with_filename(memcached_st*) @@ -332,7 +341,6 @@ test_return_t memcached_create_with_options_with_filename(memcached_st*) memcached_st *memc_ptr; memc_ptr= memcached(test_literal_param("--CONFIGURE-FILE=\"support/example.cnf\"")); test_true_got(memc_ptr, "memcached() failed"); - test_strcmp(SUPPORT_EXAMPLE_CNF, memcached_array_string(memc_ptr->configure.filename)); memcached_free(memc_ptr); return TEST_SUCCESS; @@ -363,8 +371,8 @@ test_return_t libmemcached_check_configuration_test(memcached_st*) 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); @@ -392,9 +400,8 @@ test_return_t test_include_keyword(memcached_st*) 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; } @@ -402,9 +409,8 @@ test_return_t test_include_keyword(memcached_st*) 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; } @@ -412,9 +418,8 @@ test_return_t test_end_keyword(memcached_st*) 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; } @@ -443,7 +448,7 @@ test_return_t random_statement_build_test(memcached_st*) for (scanner_variable_t *ptr= test_boolean_options; ptr->type != NIL; ptr++) option_list.push_back(&ptr->option); - for (scanner_variable_t *ptr= prefix_key_strings; ptr->type != NIL; ptr++) + for (scanner_variable_t *ptr= namespace_strings; ptr->type != NIL; ptr++) option_list.push_back(&ptr->option); for (scanner_variable_t *ptr= distribution_strings; ptr->type != NIL; ptr++) @@ -527,10 +532,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]; - memcached_return_t rc; 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); @@ -611,17 +614,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 - 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_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; - 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_compare(0, value_len); - test_compare_got(MEMCACHED_TIMEOUT, rc, memcached_strerror(NULL, rc)); + test_zero(value_len); + test_compare_got(MEMCACHED_TIMEOUT, rc, memcached_last_error_message(memc)); memcached_free(memc); } @@ -635,17 +638,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 - 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_compare(0, memc->poll_timeout); + test_zero(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_compare(0, value_len); - test_compare_got(MEMCACHED_TIMEOUT, rc, memcached_strerror(NULL, rc)); + test_zero(value_len); + test_compare_got(MEMCACHED_TIMEOUT, rc, memcached_last_error_message(memc)); memcached_free(memc); }