testing: server_add

diff --git a/test/tests/memcached/servers.cpp b/test/tests/memcached/servers.cpp
index db96a845d1669d38142df316aff036d246cec246..6c66fdbd8dd25011648afd995a06cb3127542938 100644 (file)
--- a/test/tests/memcached/servers.cpp
+++ b/test/tests/memcached/servers.cpp
@@ -91,4 +91,45 @@ TEST_CASE("memcached_servers") {
     }
   }
 
+  SECTION("add null/empty") {
+    MemcachedPtr memc;
+
+    REQUIRE(MEMCACHED_SUCCESS == memcached_server_add(*memc, nullptr, 0));
+    REQUIRE(1 == memcached_server_count(*memc));
+
+    REQUIRE(MEMCACHED_SUCCESS == memcached_server_add(*memc, "", 0));
+    REQUIRE(2 == memcached_server_count(*memc));
+  }
+
+  SECTION("add many") {
+    MemcachedPtr memc;
+
+    for (auto i = 0; i < 100; ++i) {
+      REQUIRE(MEMCACHED_SUCCESS == memcached_server_add(*memc, "memc", 11211 + i));
+    }
+    REQUIRE(100 == memcached_server_count(*memc));
+  }
+
+  SECTION("add many weighted") {
+    MemcachedPtr memc;
+
+    for (auto i = 0; i < 100; ++i) {
+      REQUIRE(MEMCACHED_SUCCESS == memcached_server_add_with_weight(*memc, "memc", 11211 +i, i % 10));
+    }
+    REQUIRE(100 == memcached_server_count(*memc));
+  }
+
+  SECTION("reset") {
+    MemcachedPtr memc;
+
+    REQUIRE_FALSE(memcached_server_count(*memc));
+    REQUIRE(MEMCACHED_SUCCESS == memcached_server_add(*memc, "local", 12345));
+    REQUIRE(1 == memcached_server_count(*memc));
+    memcached_servers_reset(*memc);
+    REQUIRE_FALSE(memcached_server_count(*memc));
+    REQUIRE(MEMCACHED_SUCCESS == memcached_server_add(*memc, "local", 12345));
+    REQUIRE(1 == memcached_server_count(*memc));
+    memcached_servers_reset(*memc);
+    REQUIRE_FALSE(memcached_server_count(*memc));
+  }
 }

diff --git a/tests/libmemcached-1.0/server_add.cc b/tests/libmemcached-1.0/server_add.cc
deleted file mode 100644 (file)
index 3b42e98..0000000
--- a/tests/libmemcached-1.0/server_add.cc
+++ /dev/null
@@ -1,118 +0,0 @@
-/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  Libmemcached Client and Server 
- *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are
- *  met:
- *
- *      * Redistributions of source code must retain the above copyright
- *  notice, this list of conditions and the following disclaimer.
- *
- *      * Redistributions in binary form must reproduce the above
- *  copyright notice, this list of conditions and the following disclaimer
- *  in the documentation and/or other materials provided with the
- *  distribution.
- *
- *      * The names of its contributors may not be used to endorse or
- *  promote products derived from this software without specific prior
- *  written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include "mem_config.h"
-#include "libtest/yatl.h"
-
-#include <string>
-
-using namespace libtest;
-
-#include "libmemcached-1.0/memcached.h"
-
-#include "tests/server_add.h"
-
-static std::string random_hostname()
-{
-  libtest::vchar_t hostname;
-  libtest::vchar::make(hostname, 23);
-  libtest::vchar::append(hostname, ".com");
-
-  return std::string(&hostname[0]);
-}
-
-test_return_t memcached_server_add_null_test(memcached_st* memc)
-{
-  ASSERT_EQ(0, memcached_server_count(memc));
-
-  test_compare(MEMCACHED_SUCCESS, memcached_server_add(memc, NULL, 0));
-
-  return TEST_SUCCESS;
-}
-
-test_return_t memcached_server_add_empty_test(memcached_st* memc)
-{
-  ASSERT_EQ(0, memcached_server_count(memc));
-
-  test_compare(MEMCACHED_SUCCESS, memcached_server_add(memc, "", 0));
-
-  return TEST_SUCCESS;
-}
-
-test_return_t memcached_server_many_TEST(memcached_st* memc)
-{
-  ASSERT_EQ(0, memcached_server_count(memc));
-
-  in_port_t base_port= 5555;
-  for (in_port_t x= 0; x < 100; ++x)
-  {
-    std::string hostname(random_hostname());
-    ASSERT_TRUE(hostname.size());
-    test_compare(MEMCACHED_SUCCESS, memcached_server_add(memc, hostname.c_str(), base_port +x));
-  }
-
-  return TEST_SUCCESS;
-}
-
-test_return_t memcached_server_many_weighted_TEST(memcached_st* memc)
-{
-  ASSERT_EQ(0, memcached_server_count(memc));
-
-  in_port_t base_port= 5555;
-  for (in_port_t x= 0; x < 100; ++x)
-  {
-    std::string hostname(random_hostname());
-    ASSERT_TRUE(hostname.size());
-    test_compare(MEMCACHED_SUCCESS, memcached_server_add_with_weight(memc, hostname.c_str(), base_port +x, x % 10));
-  }
-
-  return TEST_SUCCESS;
-}
-
-test_return_t memcached_servers_reset_test(memcached_st* memc)
-{
-  ASSERT_EQ(0, memcached_server_count(memc));
-
-  test_compare(MEMCACHED_SUCCESS, memcached_server_add(memc, "localhost", 11511));
-
-  memcached_servers_reset(memc);
-
-  test_compare(MEMCACHED_SUCCESS, memcached_server_add(memc, "localhost", 11511));
-
-  return TEST_SUCCESS;
-}
-