From 186f8ccf76df89e93ff5cbcd9a8f381927eb41e3 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Tue, 17 Nov 2020 20:50:18 +0100 Subject: [PATCH] bin: consolidate clients --- test/tests/bin/memrm.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/test/tests/bin/memrm.cpp b/test/tests/bin/memrm.cpp index d6a9f7d4..9c8d382c 100644 --- a/test/tests/bin/memrm.cpp +++ b/test/tests/bin/memrm.cpp @@ -12,19 +12,19 @@ TEST_CASE("bin/memrm") { SECTION("no servers provided") { string output; REQUIRE_FALSE(sh.run("memrm", output)); - REQUIRE(output == "No Servers provided\n"); + REQUIRE(output == "No servers provided.\n"); } SECTION("--help") { string output; REQUIRE(sh.run("memrm --help", output)); - REQUIRE_THAT(output, Contains("memrm")); - 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("memrm v1")); + REQUIRE_THAT(output, Contains("Usage:")); + REQUIRE_THAT(output, Contains("key [key ...]")); + 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") { @@ -40,8 +40,9 @@ TEST_CASE("bin/memrm") { SECTION("not found") { string output; - REQUIRE(sh.run(comm + "-v key1", output)); - REQUIRE_THAT(output, Contains("Could not find key \"key1\"")); + REQUIRE_FALSE(sh.run(comm + "-v key1", output)); + REQUIRE_THAT(output, Contains("Could not find key 'key1'")); + REQUIRE_THAT(output, Contains("NOT FOUND")); } SECTION("okay") { -- 2.30.2