X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=test%2Ftests%2Fbin%2Fmemcat.cpp;h=f5d63cc5991c6a4115f662caeae2b45307e27c8a;hb=6e77392804b33fec81b9d6d3fc3fd65c4b879ce1;hp=b7390aeaf1226340c8f055e4d31e97a9606e1656;hpb=582d5c93bcd01e2b44ce41dd81094cb20317caaf;p=awesomized%2Flibmemcached

diff --git a/test/tests/bin/memcat.cpp b/test/tests/bin/memcat.cpp
index b7390aea..f5d63cc5 100644
--- a/test/tests/bin/memcat.cpp
+++ b/test/tests/bin/memcat.cpp
@@ -12,7 +12,7 @@ TEST_CASE("bin/memcat") {
   SECTION("no servers provided") {
     string output;
     REQUIRE_FALSE(sh.run("memcat", output));
-    REQUIRE(output == "No servers provided\n");
+    REQUIRE(output == "No servers provided.\n");
   }
 
   SECTION("connection failure") {
@@ -24,13 +24,14 @@ TEST_CASE("bin/memcat") {
   SECTION("--help") {
     string output;
     REQUIRE(sh.run("memcat --help", output));
-    REQUIRE_THAT(output, Contains("memcat"));
-    REQUIRE_THAT(output, Contains("v1"));
-    REQUIRE_THAT(output, Contains("help"));
-    REQUIRE_THAT(output, Contains("version"));
-    REQUIRE_THAT(output, Contains("option"));
-    REQUIRE_THAT(output, Contains("--"));
-    REQUIRE_THAT(output, Contains("="));
+    REQUIRE_THAT(output, Contains("memcat v1"));
+    REQUIRE_THAT(output, Contains("Usage:"));
+    REQUIRE_THAT(output, Contains("key [key ...]"));
+    REQUIRE_THAT(output, Contains("Options:"));
+    REQUIRE_THAT(output, Contains("-h|--help"));
+    REQUIRE_THAT(output, Contains("-V|--version"));
+    REQUIRE_THAT(output, Contains("Environment:"));
+    REQUIRE_THAT(output, Contains("MEMCACHED_SERVERS"));
   }
 
   SECTION("with server") {
@@ -49,6 +50,13 @@ TEST_CASE("bin/memcat") {
 
       string output;
       REQUIRE_FALSE(sh.run(comm + "memcat", output));
+      REQUIRE(output.empty());
+    }
+    SECTION("not found --verbose") {
+      memcached_delete(*memc, S("memcat"), 0);
+
+      string output;
+      REQUIRE_FALSE(sh.run(comm + " -v memcat", output));
       REQUIRE_THAT(output, !Contains("MEMCAT-SET"));
       REQUIRE_THAT(output, Contains("NOT FOUND"));
     }
@@ -62,10 +70,10 @@ TEST_CASE("bin/memcat") {
       }
       SECTION("flags") {
         REQUIRE(sh.run(comm + "--flag memcat", output));
-        REQUIRE(output == "123\n");
+        REQUIRE(output == "123\nMEMCAT-SET\n");
         output.clear();
         REQUIRE(sh.run(comm + "--flag -v memcat", output));
-        REQUIRE(output == "key: memcat\nflags: 123\n");
+        REQUIRE(output == "key: memcat\nflags: 123\nvalue: MEMCAT-SET\n");
       }
       SECTION("file") {
         Tempfile temp;