testing: cleanup

[awesomized/libmemcached] / test / lib / common.hpp

diff --git a/test/lib/common.hpp b/test/lib/common.hpp
index a0fdf3846208dab4607ef7d9907cd3c6f0b5246e..8942a729c35f67c0d6f7e43d34b6bee92d4f1520 100644 (file)
--- a/test/lib/common.hpp
+++ b/test/lib/common.hpp
@@ -28,6 +28,7 @@
 
 #include "test/conf.h"
 #include "test/lib/catch.hpp"
+#include "test/lib/env.hpp"
 #include "test/lib/random.hpp"
 
 #include "libmemcached/memcached.h"
@@ -38,8 +39,7 @@ using socket_or_port_t = variant<string, int>;
 /**
  * Useful macros for testing
  */
-#define S(s)             (s), strlen(s)
-#define DECLARE_STREQUAL static auto strequal = equal_to<string>();
+#define S(s) (s), strlen(s)
 #define LOOPED_SECTION(tests) \
   for (auto &[name, test] : tests) DYNAMIC_SECTION("test " << name)
 #define REQUIRE_SUCCESS(rc) \
@@ -53,8 +53,6 @@ using socket_or_port_t = variant<string, int>;
     REQUIRE_THAT(call, test.returns(rc)); \
   } while (0)
 
-const char *getenv_else(const char *var, const char *defval);
-
 inline memcached_return_t fetch_all_results(memcached_st *memc, unsigned int &keys_returned,
                                             memcached_return_t &rc) {
   keys_returned = 0;
@@ -102,12 +100,20 @@ class MemcachedPtr {
 public:
   memcached_st *memc;
 
-  explicit MemcachedPtr(memcached_st *memc_) { memc = memc_; }
+  explicit MemcachedPtr(memcached_st *memc_) {
+    memc = memc_;
+  }
   MemcachedPtr()
   : MemcachedPtr(memcached_create(nullptr)) {}
-  ~MemcachedPtr() { memcached_free(memc); }
-  memcached_st *operator*() const { return memc; }
-  auto operator->() const { return memc; }
+  ~MemcachedPtr() {
+    memcached_free(memc);
+  }
+  memcached_st *operator*() const {
+    return memc;
+  }
+  auto operator->() const {
+    return memc;
+  }
 };
 
 template<class T>
@@ -127,6 +133,6 @@ public:
     if (ptr)
       free(ptr);
   }
-  auto operator*() { return ptr; }
-  auto operator->() { return ptr; }
+  auto operator*() const { return ptr; }
+  auto operator->() const { return ptr; }
 };