X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fparser.cc;h=68a65a40f011aaeab15e8e71da5601e8cfb298ec;hb=a6c3e3a3d04f379b1480c8c88a8eae17e54b1449;hp=b330db64e4f2aad0d496d9580bc9de55dcf6d510;hpb=de161b27e5e394ea0ae4a88e58fc9ebb21e821d0;p=m6w6%2Flibmemcached diff --git a/tests/parser.cc b/tests/parser.cc index b330db64..68a65a40 100644 --- a/tests/parser.cc +++ b/tests/parser.cc @@ -40,9 +40,11 @@ #include #include #include +#include #define BUILDING_LIBMEMCACHED -#include +// !NEVER use common.h, always use memcached.h in your own apps +#include #include "tests/parser.h" #include "tests/print.h" @@ -118,30 +120,26 @@ static test_return_t __check_IO_MSG_WATERMARK(memcached_st *memc, const scanner_ return TEST_SUCCESS; } -static test_return_t __check_AUTO_EJECT_HOSTS(memcached_st *memc, const scanner_string_st &value) +static test_return_t __check_REMOVE_FAILED_SERVERS(memcached_st *memc, const scanner_string_st &) { - (void)value; - test_true(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS)); + test_true(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS)); return TEST_SUCCESS; } -static test_return_t __check_NOREPLY(memcached_st *memc, const scanner_string_st &value) +static test_return_t __check_NOREPLY(memcached_st *memc, const scanner_string_st &) { - (void)value; test_true(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NOREPLY)); return TEST_SUCCESS; } -static test_return_t __check_VERIFY_KEY(memcached_st *memc, const scanner_string_st &value) +static test_return_t __check_VERIFY_KEY(memcached_st *memc, const scanner_string_st &) { - (void)value; test_true(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_VERIFY_KEY)); return TEST_SUCCESS; } -static test_return_t __check_distribution_RANDOM(memcached_st *memc, const scanner_string_st &value) +static test_return_t __check_distribution_RANDOM(memcached_st *memc, const scanner_string_st &) { - (void)value; test_true(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION) == MEMCACHED_DISTRIBUTION_RANDOM); return TEST_SUCCESS; } @@ -175,42 +173,41 @@ scanner_variable_t bad_test_strings[]= { }; scanner_variable_t test_number_options[]= { - { ARRAY, make_scanner_string("--CONNECT_TIMEOUT=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--IO_MSG_WATERMARK=456"), make_scanner_string("456"), __check_IO_MSG_WATERMARK }, - { ARRAY, make_scanner_string("--IO_BYTES_WATERMARK=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--IO_KEY_PREFETCH=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--NUMBER_OF_REPLICAS=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--POLL_TIMEOUT=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--RCV_TIMEOUT=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--RETRY_TIMEOUT=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--SERVER_FAILURE_LIMIT=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--SND_TIMEOUT=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--SOCKET_RECV_SIZE=456"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--SOCKET_SEND_SIZE=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--CONNECT-TIMEOUT=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--IO-BYTES-WATERMARK=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--IO-KEY-PREFETCH=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--IO-MSG-WATERMARK=456"), make_scanner_string("456"), __check_IO_MSG_WATERMARK }, + { ARRAY, make_scanner_string("--NUMBER-OF-REPLICAS=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--POLL-TIMEOUT=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--RCV-TIMEOUT=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--REMOVE-FAILED-SERVERS=3"), scanner_string_null, __check_REMOVE_FAILED_SERVERS }, + { ARRAY, make_scanner_string("--RETRY-TIMEOUT=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--SND-TIMEOUT=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--SOCKET-RECV-SIZE=456"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--SOCKET-SEND-SIZE=456"), scanner_string_null, NULL }, { NIL, scanner_string_null, scanner_string_null, NULL} }; scanner_variable_t test_boolean_options[]= { - { ARRAY, make_scanner_string("--AUTO_EJECT_HOSTS"), scanner_string_null, __check_AUTO_EJECT_HOSTS }, - { ARRAY, make_scanner_string("--BINARY_PROTOCOL"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--BUFFER_REQUESTS"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--HASH_WITH_PREFIX_KEY"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--BINARY-PROTOCOL"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--BUFFER-REQUESTS"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--HASH-WITH-NAMESPACE"), scanner_string_null, NULL }, { ARRAY, make_scanner_string("--NOREPLY"), scanner_string_null, __check_NOREPLY }, - { ARRAY, make_scanner_string("--RANDOMIZE_REPLICA_READ"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--SORT_HOSTS"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--SUPPORT_CAS"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--TCP_NODELAY"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--TCP_KEEPALIVE"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--TCP_KEEPIDLE"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--USE_UDP"), scanner_string_null, NULL }, - { ARRAY, make_scanner_string("--VERIFY_KEY"), scanner_string_null, __check_VERIFY_KEY }, + { ARRAY, make_scanner_string("--RANDOMIZE-REPLICA-READ"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--SORT-HOSTS"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--SUPPORT-CAS"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--TCP-NODELAY"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--TCP-KEEPALIVE"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--TCP-KEEPIDLE"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--USE-UDP"), scanner_string_null, NULL }, + { ARRAY, make_scanner_string("--VERIFY-KEY"), scanner_string_null, __check_VERIFY_KEY }, { NIL, scanner_string_null, scanner_string_null, NULL} }; scanner_variable_t prefix_key_strings[]= { - { ARRAY, make_scanner_string("--PREFIX_KEY=foo"), make_scanner_string("foo"), __check_prefix_key }, - { ARRAY, make_scanner_string("--PREFIX-KEY=\"foo\""), make_scanner_string("foo"), __check_prefix_key }, - { ARRAY, make_scanner_string("--PREFIX-KEY=\"This is a very long key\""), make_scanner_string("This is a very long key"), __check_prefix_key }, + { 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 }, { NIL, scanner_string_null, scanner_string_null, NULL} }; @@ -239,36 +236,39 @@ scanner_variable_t hash_strings[]= { static test_return_t _test_option(scanner_variable_t *scanner, bool test_true= true) { (void)test_true; - memcached_st *memc; - memc= memcached_create(NULL); for (scanner_variable_t *ptr= scanner; ptr->type != NIL; ptr++) { - memcached_return_t rc; - rc= memcached_parse_configuration(memc, ptr->option.c_str, ptr->option.size); + memcached_st *memc; + memc= memcached(ptr->option.c_str, ptr->option.size); if (test_true) { - if (rc != MEMCACHED_SUCCESS) + if (not memc) { - memcached_error_print(memc); + char buffer[2048]; + memcached_return_t rc= libmemcached_check_configuration(ptr->option.c_str, ptr->option.size, buffer, sizeof(buffer)); + std::cerr << "About error for " << memcached_strerror(NULL, rc) << " : " << buffer << std::endl; } - test_true(rc == MEMCACHED_SUCCESS); + test_true(memc); if (ptr->check_func) { test_return_t test_rc= (*ptr->check_func)(memc, ptr->result); if (test_rc != TEST_SUCCESS) + { + memcached_free(memc); return test_rc; + } } + + memcached_free(memc); } else { - test_false_with(rc == MEMCACHED_SUCCESS, ptr->option.c_str); + test_false_with(memc, ptr->option.c_str); } - memcached_reset(memc); } - memcached_free(memc); return TEST_SUCCESS; } @@ -326,31 +326,15 @@ test_return_t parser_key_prefix_test(memcached_st*) #define SUPPORT_EXAMPLE_CNF "support/example.cnf" -test_return_t memcached_parse_configure_file_test(memcached_st*) -{ - if (access(SUPPORT_EXAMPLE_CNF, R_OK)) - return TEST_SKIPPED; - - memcached_st memc; - memcached_st *memc_ptr= memcached_create(&memc); - - test_true(memc_ptr); - - memcached_return_t rc= memcached_parse_configure_file(memc_ptr, memcached_string_with_size(SUPPORT_EXAMPLE_CNF)); - test_true_got(rc == MEMCACHED_SUCCESS, memcached_last_error_message(memc_ptr) ? memcached_last_error_message(memc_ptr) : memcached_strerror(NULL, rc)); - memcached_free(memc_ptr); - - return TEST_SUCCESS; -} - test_return_t memcached_create_with_options_with_filename(memcached_st*) { if (access(SUPPORT_EXAMPLE_CNF, R_OK)) return TEST_SKIPPED; memcached_st *memc_ptr; - memc_ptr= memcached_create_with_options(STRING_WITH_LEN("--CONFIGURE-FILE=\"support/example.cnf\"")); - test_true_got(memc_ptr, memcached_last_error_message(memc_ptr)); + memc_ptr= memcached(STRING_WITH_LEN("--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; @@ -365,13 +349,13 @@ test_return_t libmemcached_check_configuration_with_filename_test(memcached_st*) char buffer[BUFSIZ]; rc= libmemcached_check_configuration(STRING_WITH_LEN("--CONFIGURE-FILE=\"support/example.cnf\""), buffer, sizeof(buffer)); - test_true_got(rc == MEMCACHED_SUCCESS, buffer); + test_true_got(rc == MEMCACHED_SUCCESS, (rc == MEMCACHED_ERRNO) ? strerror(errno) : memcached_strerror(NULL, rc)); rc= libmemcached_check_configuration(STRING_WITH_LEN("--CONFIGURE-FILE=support/example.cnf"), buffer, sizeof(buffer)); - test_false_with(rc == MEMCACHED_SUCCESS, buffer); + test_false_with(rc == MEMCACHED_SUCCESS, memcached_strerror(NULL, rc)); rc= libmemcached_check_configuration(STRING_WITH_LEN("--CONFIGURE-FILE=\"bad-path/example.cnf\""), buffer, sizeof(buffer)); - test_true_got(rc == MEMCACHED_ERRNO, buffer); + test_true_got(rc == MEMCACHED_ERRNO, memcached_strerror(NULL, rc)); return TEST_SUCCESS; } @@ -394,11 +378,11 @@ test_return_t libmemcached_check_configuration_test(memcached_st*) test_return_t memcached_create_with_options_test(memcached_st*) { memcached_st *memc_ptr; - memc_ptr= memcached_create_with_options(STRING_WITH_LEN("--server=localhost")); + memc_ptr= memcached(STRING_WITH_LEN("--server=localhost")); test_true_got(memc_ptr, memcached_last_error_message(memc_ptr)); memcached_free(memc_ptr); - memc_ptr= memcached_create_with_options(STRING_WITH_LEN("--dude=localhost")); + memc_ptr= memcached(STRING_WITH_LEN("--dude=localhost")); test_false_with(memc_ptr, memcached_last_error_message(memc_ptr)); return TEST_SUCCESS; @@ -447,7 +431,7 @@ test_return_t test_error_keyword(memcached_st*) return TEST_SUCCESS; } -#define RANDOM_STRINGS 50 +#define RANDOM_STRINGS 100 test_return_t random_statement_build_test(memcached_st*) { std::vector option_list; @@ -481,13 +465,32 @@ test_return_t random_statement_build_test(memcached_st*) random_options+= " "; } - memcached_return_t rc; - memcached_st *memc_ptr= memcached_create(NULL); - rc= memcached_parse_configuration(memc_ptr, random_options.c_str(), random_options.size() -1); - if (rc == MEMCACHED_PARSE_ERROR) + memcached_st *memc_ptr= memcached(random_options.c_str(), random_options.size() -1); + if (not memc_ptr) { - std::cerr << std::endl << "Failed to parse(" << memcached_strerror(NULL, rc) << "): " << random_options << std::endl; - memcached_error_print(memc_ptr); + switch (errno) + { + case EINVAL: +#if 0 // Testing framework is not smart enough for this just yet. + { + // We will try to find the specific error + char buffer[2048]; + memcached_return_t rc= libmemcached_check_configuration(random_options.c_str(), random_options.size(), buffer, sizeof(buffer)); + test_true_got(rc != MEMCACHED_SUCCESS, "memcached_create_with_options() failed whiled libmemcached_check_configuration() was successful"); + std::cerr << "Error occured on " << random_options.c_str() << " : " << buffer << std::endl; + return TEST_FAILURE; + } +#endif + break; + case ENOMEM: + std::cerr << "Failed to allocate memory for memcached_create_with_options()" << std::endl; + memcached_free(memc_ptr); + return TEST_FAILURE; + default: + std::cerr << "Unknown error from memcached_create_with_options?!!" << std::endl; + memcached_free(memc_ptr); + return TEST_FAILURE; + } } memcached_free(memc_ptr); }