X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fparser.cc;h=4e0e23ff6d1aa4d118748ccd73cb0a5747728037;hb=ecf02b501d387ee5761eb31db6f760de60ac09a1;hp=b69e4486ee4fcadd23655be88dfc70e4f5e707ce;hpb=9da805a13af25708dcf567f15ea7c1acf31462f1;p=awesomized%2Flibmemcached

diff --git a/tests/parser.cc b/tests/parser.cc
index b69e4486..4e0e23ff 100644
--- a/tests/parser.cc
+++ b/tests/parser.cc
@@ -37,6 +37,10 @@
 
 #include <config.h>
 
+#include <vector>
+#include <iostream>
+#include <string>
+
 #include <libmemcached/memcached.h>
 
 #include "tests/parser.h"
@@ -194,7 +198,9 @@ scanner_variable_t test_boolean_options[]= {
   { ARRAY,  make_scanner_string("--BINARY_PROTOCOL"), scanner_string_null, NULL },
   { ARRAY,  make_scanner_string("--BUFFER_REQUESTS"), scanner_string_null, NULL },
   { ARRAY,  make_scanner_string("--CACHE_LOOKUPS"), scanner_string_null, __check_CACHE_LOOKUPS },
+#if 0 // Not all platforms support
   { ARRAY,  make_scanner_string("--CORK"), scanner_string_null, NULL },
+#endif
   { ARRAY,  make_scanner_string("--HASH_WITH_PREFIX_KEY"), scanner_string_null, NULL },
   { ARRAY,  make_scanner_string("--KETAMA"), scanner_string_null, NULL },
   { ARRAY,  make_scanner_string("--KETAMA_WEIGHTED"), scanner_string_null, NULL },
@@ -225,14 +231,14 @@ scanner_variable_t distribution_strings[]= {
 };
 
 scanner_variable_t hash_strings[]= {
-  { ARRAY,  make_scanner_string("--HASH=MD5"), scanner_string_null, NULL },
   { ARRAY,  make_scanner_string("--HASH=CRC"), scanner_string_null, NULL },
-  { ARRAY,  make_scanner_string("--HASH=FNV1_64"), scanner_string_null, NULL },
+  { ARRAY,  make_scanner_string("--HASH=FNV1A_32"), scanner_string_null, NULL },
   { ARRAY,  make_scanner_string("--HASH=FNV1A_64"), scanner_string_null, NULL },
   { ARRAY,  make_scanner_string("--HASH=FNV1_32"), scanner_string_null, NULL },
-  { ARRAY,  make_scanner_string("--HASH=FNV1A_32"), scanner_string_null, NULL },
-  { ARRAY,  make_scanner_string("--HASH=MURMUR"), scanner_string_null, NULL },
+  { ARRAY,  make_scanner_string("--HASH=FNV1_64"), scanner_string_null, NULL },
   { ARRAY,  make_scanner_string("--HASH=JENKINS"), scanner_string_null, NULL },
+  { ARRAY,  make_scanner_string("--HASH=MD5"), scanner_string_null, NULL },
+  { ARRAY,  make_scanner_string("--HASH=MURMUR"), scanner_string_null, NULL },
   { NIL, scanner_string_null, scanner_string_null, NULL}
 };
 
@@ -249,7 +255,10 @@ static test_return_t _test_option(scanner_variable_t *scanner, bool test_true= t
     rc= memcached_parse_configuration(memc, ptr->option.c_str, ptr->option.size);
     if (test_true)
     {
-      test_true_got(rc == MEMCACHED_SUCCESS, memcached_last_error_message(memc));
+      if (rc != MEMCACHED_SUCCESS)
+        memcached_error_print(memc);
+
+      test_true(rc == MEMCACHED_SUCCESS);
 
       if (ptr->check_func)
       {
@@ -354,7 +363,7 @@ test_return_t memcached_create_with_options_with_filename(memcached_st *junk)
 
   memcached_st *memc_ptr;
   memc_ptr= memcached_create_with_options(STRING_WITH_LEN("--CONFIGURE-FILE=\"support/example.cnf\""));
-  test_true(memc_ptr);
+  test_true_got(memc_ptr, memcached_last_error_message(memc_ptr));
   memcached_free(memc_ptr);
 
   return TEST_SUCCESS;
@@ -364,15 +373,16 @@ test_return_t libmemcached_check_configuration_with_filename_test(memcached_st *
 {
   (void)junk;
   memcached_return_t rc;
+  char buffer[BUFSIZ];
 
-  rc= libmemcached_check_configuration(STRING_WITH_LEN("--CONFIGURE-FILE=\"support/example.cnf\""), NULL, 0);
-  test_true(rc == MEMCACHED_SUCCESS);
+  rc= libmemcached_check_configuration(STRING_WITH_LEN("--CONFIGURE-FILE=\"support/example.cnf\""), buffer, sizeof(buffer));
+  test_true_got(rc == MEMCACHED_SUCCESS, buffer);
 
-  rc= libmemcached_check_configuration(STRING_WITH_LEN("--CONFIGURE-FILE=support/example.cnf"), NULL, 0);
-  test_false(rc == MEMCACHED_SUCCESS);
+  rc= libmemcached_check_configuration(STRING_WITH_LEN("--CONFIGURE-FILE=support/example.cnf"), buffer, sizeof(buffer));
+  test_false_with(rc == MEMCACHED_SUCCESS, buffer);
 
-  rc= libmemcached_check_configuration(STRING_WITH_LEN("--CONFIGURE-FILE=\"bad-path/example.cnf\""), NULL, 0);
-  test_true_got(rc == MEMCACHED_ERRNO, 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);
 
   return TEST_SUCCESS;
 }
@@ -382,12 +392,13 @@ test_return_t libmemcached_check_configuration_test(memcached_st *junk)
   (void)junk;
 
   memcached_return_t rc;
+  char buffer[BUFSIZ];
 
-  rc= libmemcached_check_configuration(STRING_WITH_LEN("--server=localhost"), NULL, 0);
-  test_true(rc == MEMCACHED_SUCCESS);
+  rc= libmemcached_check_configuration(STRING_WITH_LEN("--server=localhost"), buffer, sizeof(buffer));
+  test_true_got(rc == MEMCACHED_SUCCESS, buffer);
 
-  rc= libmemcached_check_configuration(STRING_WITH_LEN("--dude=localhost"), NULL, 0);
-  test_false(rc == MEMCACHED_SUCCESS);
+  rc= libmemcached_check_configuration(STRING_WITH_LEN("--dude=localhost"), buffer, sizeof(buffer));
+  test_false_with(rc == MEMCACHED_SUCCESS, buffer);
   test_true(rc == MEMCACHED_PARSE_ERROR);
 
   return TEST_SUCCESS;
@@ -399,11 +410,66 @@ test_return_t memcached_create_with_options_test(memcached_st *junk)
 
   memcached_st *memc_ptr;
   memc_ptr= memcached_create_with_options(STRING_WITH_LEN("--server=localhost"));
-  test_true(memc_ptr);
+  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"));
-  test_false(memc_ptr);
+  test_false_with(memc_ptr, memcached_last_error_message(memc_ptr));
+
+  return TEST_SUCCESS;
+}
+
+#define RANDOM_STRINGS 50
+test_return_t random_statement_build_test(memcached_st *junk)
+{
+  (void)junk;
+  std::vector<scanner_string_st *> option_list;
+
+  for (scanner_variable_t *ptr= test_server_strings; ptr->type != NIL; ptr++)
+    option_list.push_back(&ptr->option);
+
+#if 0
+  for (scanner_variable_t *ptr= test_servers_strings; ptr->type != NIL; ptr++)
+    option_list.push_back(&ptr->option);
+#endif
+
+  for (scanner_variable_t *ptr= test_number_options; ptr->type != NIL; ptr++)
+    option_list.push_back(&ptr->option);
+
+  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++)
+    option_list.push_back(&ptr->option);
+
+  for (scanner_variable_t *ptr= distribution_strings; ptr->type != NIL; ptr++)
+    option_list.push_back(&ptr->option);
+
+  for (scanner_variable_t *ptr= hash_strings; ptr->type != NIL; ptr++)
+    option_list.push_back(&ptr->option);
+
+  for (uint32_t x= 0; x < RANDOM_STRINGS; x++)
+  {
+    std::string random_options;
+
+    uint32_t number_of= random() % option_list.size();
+    for (uint32_t options= 0; options < number_of; options++)
+    {
+      random_options+= option_list[random() % option_list.size()]->c_str;
+      random_options+= " ";
+    }
+    random_options.resize(random_options.size() -1);
+
+    memcached_return_t rc;
+    memcached_st *memc_ptr= memcached_create(NULL);
+    rc= memcached_parse_configuration(memc_ptr, random_options.c_str(), random_options.size());
+    if (rc == MEMCACHED_PARSE_ERROR)
+    {
+      std::cerr << std::endl << "Failed to parse(" << memcached_strerror(NULL, rc) << "): " << random_options << std::endl;
+      memcached_error_print(memc_ptr);
+    }
+    memcached_free(memc_ptr);
+  }
 
   return TEST_SUCCESS;
 }