From dd45c6cc17a501d5332569dec7bf642402c51264 Mon Sep 17 00:00:00 2001
From: Francis Dupont <fdupont@isc.org>
Date: Tue, 16 Jul 2019 14:43:55 +0200
Subject: [PATCH] [418-cb_cmds-embedded-commands] Added hasNoTags

---
 src/lib/database/server_selector.h                 |  7 +++++++
 src/lib/database/tests/server_selector_unittest.cc | 10 ++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/lib/database/server_selector.h b/src/lib/database/server_selector.h
index 39ff19d8c4..99a5d10971 100644
--- a/src/lib/database/server_selector.h
+++ b/src/lib/database/server_selector.h
@@ -99,6 +99,13 @@ public:
         return (tags_);
     }
 
+    /// @brief Convenience method checking if the server selector has no tags.
+    ///
+    /// @return true when the server selector has no tags, false otherwise.
+    bool hasNoTags() const {
+        return (tags_.empty());
+    }
+
     /// @brief Convenience method checking if the server selector is "unassigned".
     ///
     /// @return true if the selector is "unassigned", false otherwise.
diff --git a/src/lib/database/tests/server_selector_unittest.cc b/src/lib/database/tests/server_selector_unittest.cc
index 418ab98a47..00328ba5e3 100644
--- a/src/lib/database/tests/server_selector_unittest.cc
+++ b/src/lib/database/tests/server_selector_unittest.cc
@@ -19,7 +19,7 @@ TEST(ServerSelectorTest, unassigned) {
     ServerSelector selector = ServerSelector::UNASSIGNED();
     EXPECT_EQ(ServerSelector::Type::UNASSIGNED, selector.getType());
     EXPECT_TRUE(selector.amUnassigned());
-    EXPECT_TRUE(selector.getTags().empty());
+    EXPECT_TRUE(selector.hasNoTags());
     EXPECT_FALSE(selector.hasMultipleTags());
 }
 
@@ -29,6 +29,7 @@ TEST(ServerSelectorTest, all) {
     EXPECT_EQ(ServerSelector::Type::ALL, selector.getType());
     EXPECT_FALSE(selector.amUnassigned());
 
+    EXPECT_FALSE(selector.hasNoTags());
     auto tags = selector.getTags();
     EXPECT_EQ(1, tags.size());
     EXPECT_EQ(1, tags.count(ServerTag("all")));
@@ -42,6 +43,7 @@ TEST(ServerSelectorTest, one) {
     EXPECT_EQ(ServerSelector::Type::SUBSET, selector.getType());
     EXPECT_FALSE(selector.amUnassigned());
 
+    EXPECT_FALSE(selector.hasNoTags());
     auto tags = selector.getTags();
     ASSERT_EQ(1, tags.size());
     EXPECT_EQ(1, tags.count(ServerTag("some-tag")));
@@ -54,6 +56,7 @@ TEST(ServerSelectorTest, multiple) {
     EXPECT_EQ(ServerSelector::Type::SUBSET, selector.getType());
     EXPECT_FALSE(selector.amUnassigned());
 
+    EXPECT_FALSE(selector.hasNoTags());
     auto tags = selector.getTags();
     ASSERT_EQ(3, tags.size());
     EXPECT_EQ(1, tags.count(ServerTag("tag1")));
@@ -62,14 +65,13 @@ TEST(ServerSelectorTest, multiple) {
     EXPECT_TRUE(selector.hasMultipleTags());
 }
 
-// Check that server selector can be set to ALL.
+// Check that server selector can be set to ANY.
 TEST(ServerSelectorTest, any) {
     ServerSelector selector = ServerSelector::ANY();
     EXPECT_EQ(ServerSelector::Type::ANY, selector.getType());
     EXPECT_FALSE(selector.amUnassigned());
 
-    auto tags = selector.getTags();
-    EXPECT_EQ(0, tags.size());
+    EXPECT_TRUE(selector.hasNoTags());
 }
 
 }
-- 
2.47.2