X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Fall_tests.h;h=92db0b8b704bcdfae083d5d5a12c603d1eda3971;hb=5c09a7ed2edbb9876493f30d59433331b63f6bfc;hp=4dab69ff7310ddc63e11c448a205f5e81af6780d;hpb=556d9cca3738f2dcecbe0cda93ba9dd89d1a7a31;p=m6w6%2Flibmemcached

diff --git a/tests/libmemcached-1.0/all_tests.h b/tests/libmemcached-1.0/all_tests.h
index 4dab69ff..92db0b8b 100644
--- a/tests/libmemcached-1.0/all_tests.h
+++ b/tests/libmemcached-1.0/all_tests.h
@@ -37,7 +37,7 @@
 
 #pragma once
 
-#include <tests/libmemcached-1.0/memcached_get.h>
+#include "tests/libmemcached-1.0/memcached_get.h"
 
 
 /* Clean the server before beginning testing */
@@ -58,6 +58,7 @@ test_st tests[] ={
   {"memcached_set()", false, (test_callback_fn*)set_test },
   {"memcached_set() 2", false, (test_callback_fn*)set_test2 },
   {"memcached_set() 3", false, (test_callback_fn*)set_test3 },
+  {"memcached_add(SUCCESS)", true, (test_callback_fn*)memcached_add_SUCCESS_TEST },
   {"add", true, (test_callback_fn*)add_test },
   {"memcached_fetch_result(MEMCACHED_NOTFOUND)", true, (test_callback_fn*)memcached_fetch_result_NOT_FOUND },
   {"replace", true, (test_callback_fn*)replace_test },
@@ -148,7 +149,7 @@ test_st behavior_tests[] ={
 };
 
 test_st libmemcachedutil_tests[] ={
-  {"libmemcached_util_ping()", true, (test_callback_fn*)ping_test },
+  {"libmemcached_util_ping()", true, (test_callback_fn*)libmemcached_util_ping_TEST },
   {"libmemcached_util_getpid()", true, (test_callback_fn*)getpid_test },
   {"libmemcached_util_getpid(MEMCACHED_CONNECTION_FAILURE)", true, (test_callback_fn*)getpid_connection_failure_test },
   {0, 0, 0}
@@ -238,6 +239,7 @@ test_st user_tests[] ={
 };
 
 test_st replication_tests[]= {
+  {"validate replication setup", true, (test_callback_fn*)check_replication_sanity_TEST },
   {"set", true, (test_callback_fn*)replication_set_test },
   {"get", false, (test_callback_fn*)replication_get_test },
   {"mget", false, (test_callback_fn*)replication_mget_test },
@@ -272,6 +274,8 @@ test_st regression_tests[]= {
   {"lp:655423", true, (test_callback_fn*)regression_bug_655423 },
   {"lp:490520", true, (test_callback_fn*)regression_bug_490520 },
   {"lp:854604", true, (test_callback_fn*)regression_bug_854604 },
+  {"lp:996813", true, (test_callback_fn*)regression_996813_TEST },
+  {"lp:994772", true, (test_callback_fn*)regression_994772_TEST },
   {0, false, (test_callback_fn*)0}
 };
 
@@ -282,12 +286,14 @@ test_st ketama_compatibility[]= {
 };
 
 test_st generate_tests[] ={
-  {"generate_pairs", true, (test_callback_fn*)generate_pairs },
   {"generate_data", true, (test_callback_fn*)generate_data },
   {"get_read", false, (test_callback_fn*)get_read },
   {"delete_generate", false, (test_callback_fn*)delete_generate },
-  {"generate_buffer_data", true, (test_callback_fn*)generate_buffer_data },
-  {"delete_buffer", false, (test_callback_fn*)delete_buffer_generate},
+  {"cleanup", true, (test_callback_fn*)cleanup_pairs },
+  {0, 0, (test_callback_fn*)0}
+};
+  // New start
+test_st generate_mget_TESTS[] ={
   {"generate_data", true, (test_callback_fn*)generate_data },
   {"mget_read", false, (test_callback_fn*)mget_read },
   {"mget_read_result", false, (test_callback_fn*)mget_read_result },
@@ -295,15 +301,16 @@ test_st generate_tests[] ={
   {"memcached_fetch_result() partial read", false, (test_callback_fn*)mget_read_partial_result },
   {"mget_read_function", false, (test_callback_fn*)mget_read_function },
   {"cleanup", true, (test_callback_fn*)cleanup_pairs },
+  {0, 0, (test_callback_fn*)0}
+};
+
+test_st generate_large_TESTS[] ={
   {"generate_large_pairs", true, (test_callback_fn*)generate_large_pairs },
-  {"generate_data", true, (test_callback_fn*)generate_data },
-  {"generate_buffer_data", true, (test_callback_fn*)generate_buffer_data },
   {"cleanup", true, (test_callback_fn*)cleanup_pairs },
   {0, 0, (test_callback_fn*)0}
 };
 
 test_st consistent_tests[] ={
-  {"generate_pairs", true, (test_callback_fn*)generate_pairs },
   {"generate_data", true, (test_callback_fn*)generate_data },
   {"get_read", 0, (test_callback_fn*)get_read_count },
   {"cleanup", true, (test_callback_fn*)cleanup_pairs },
@@ -311,7 +318,6 @@ test_st consistent_tests[] ={
 };
 
 test_st consistent_weighted_tests[] ={
-  {"generate_pairs", true, (test_callback_fn*)generate_pairs },
   {"generate_data", true, (test_callback_fn*)generate_data_with_stats },
   {"get_read", false, (test_callback_fn*)get_read_count },
   {"cleanup", true, (test_callback_fn*)cleanup_pairs },
@@ -468,6 +474,9 @@ collection_st collection[] ={
   {"Cal Haldenbrand's tests", 0, 0, haldenbrand_TESTS},
   {"user written tests", 0, 0, user_tests},
   {"generate", 0, 0, generate_tests},
+  {"generate MEMCACHED_BEHAVIOR_BUFFER_REQUESTS", (test_callback_fn*)pre_buffer, 0, generate_tests},
+  {"mget generate MEMCACHED_BEHAVIOR_BUFFER_REQUESTS", (test_callback_fn*)pre_buffer, 0, generate_mget_TESTS},
+  {"generate large", 0, 0, generate_large_TESTS},
   {"generate_hsieh", (test_callback_fn*)pre_hsieh, 0, generate_tests},
   {"generate_ketama", (test_callback_fn*)pre_behavior_ketama, 0, generate_tests},
   {"generate_hsieh_consistent", (test_callback_fn*)enable_consistent_hsieh, 0, generate_tests},
@@ -475,9 +484,7 @@ collection_st collection[] ={
   {"generate_murmur", (test_callback_fn*)pre_murmur, 0, generate_tests},
   {"generate_jenkins", (test_callback_fn*)pre_jenkins, 0, generate_tests},
   {"generate_nonblock", (test_callback_fn*)pre_nonblock, 0, generate_tests},
-  // Too slow
-  {"generate_corked", (test_callback_fn*)pre_cork, 0, generate_tests},
-  {"generate_corked_and_nonblock", (test_callback_fn*)pre_cork_and_nonblock, 0, generate_tests},
+  {"mget generate_nonblock", (test_callback_fn*)pre_nonblock, 0, generate_mget_TESTS},
   {"consistent_not", 0, 0, consistent_tests},
   {"consistent_ketama", (test_callback_fn*)pre_behavior_ketama, 0, consistent_tests},
   {"consistent_ketama_weighted", (test_callback_fn*)pre_behavior_ketama_weighted, 0, consistent_weighted_tests},