From: Tomek Mrugalski <tomasz@isc.org>
Date: Thu, 7 Sep 2017 14:33:44 +0000 (+0200)
Subject: [5305] Minor tweaks in tests.
X-Git-Tag: trac5073a_base~11^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a92d0500423cd66e89399bf37050892ea8295bbc;p=thirdparty%2Fkea.git

[5305] Minor tweaks in tests.
---

diff --git a/src/lib/dhcpsrv/tests/cfg_shared_networks4_unittest.cc b/src/lib/dhcpsrv/tests/cfg_shared_networks4_unittest.cc
index ff625e87aa..c90d21f0e8 100644
--- a/src/lib/dhcpsrv/tests/cfg_shared_networks4_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cfg_shared_networks4_unittest.cc
@@ -29,6 +29,9 @@ TEST(CfgSharedNetworks4Test, getByName) {
     ASSERT_TRUE(returned_network1);
     SharedNetwork4Ptr returned_network2 = cfg.getByName("dog");
     ASSERT_TRUE(returned_network2);
+
+    // Check that non-existent name does not return bogus data.
+    EXPECT_FALSE(cfg.getByName("ant"));
 }
 
 // This test verifies that it is possible to delete a network.
@@ -53,6 +56,10 @@ TEST(CfgSharedNetworks4Test, deleteByName) {
     ASSERT_NO_THROW(cfg.del(network2->getName()));
     ASSERT_FALSE(cfg.getByName(network1->getName()));
     ASSERT_FALSE(cfg.getByName(network2->getName()));
+
+    // Check that attempting to delete the same subnet twice will fail.
+    ASSERT_THROW(cfg.del(network1->getName()), BadValue);
+    ASSERT_THROW(cfg.del(network2->getName()), BadValue);
 }
 
 // This test verifies that shared networks must have unique names.
diff --git a/src/lib/dhcpsrv/tests/cfg_shared_networks6_unittest.cc b/src/lib/dhcpsrv/tests/cfg_shared_networks6_unittest.cc
index 3f261782fb..5763cd6bd9 100644
--- a/src/lib/dhcpsrv/tests/cfg_shared_networks6_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cfg_shared_networks6_unittest.cc
@@ -29,6 +29,9 @@ TEST(CfgSharedNetworks6Test, getByName) {
     ASSERT_TRUE(returned_network1);
     SharedNetwork6Ptr returned_network2 = cfg.getByName("dog");
     ASSERT_TRUE(returned_network2);
+
+    // Check that non-existent name does not return bogus data.
+    EXPECT_FALSE(cfg.getByName("ant"));
 }
 
 // This test verifies that it is possible to delete a network.
@@ -53,6 +56,10 @@ TEST(CfgSharedNetworks6Test, deleteByName) {
     ASSERT_NO_THROW(cfg.del(network2->getName()));
     ASSERT_FALSE(cfg.getByName(network1->getName()));
     ASSERT_FALSE(cfg.getByName(network2->getName()));
+
+    // Check that attempting to delete the same subnet twice will fail.
+    ASSERT_THROW(cfg.del(network1->getName()), BadValue);
+    ASSERT_THROW(cfg.del(network2->getName()), BadValue);
 }
 
 // This test verifies that shared networks must have unique names.
diff --git a/src/lib/dhcpsrv/tests/shared_network_unittest.cc b/src/lib/dhcpsrv/tests/shared_network_unittest.cc
index 8a90bb51c1..7a342ff892 100644
--- a/src/lib/dhcpsrv/tests/shared_network_unittest.cc
+++ b/src/lib/dhcpsrv/tests/shared_network_unittest.cc
@@ -287,7 +287,7 @@ TEST(SharedNetwork4Test, destructSharedNetwork) {
 // This test verifies that shared network can be given a name and that
 // this name can be retrieved.
 TEST(SharedNetwork6Test, getName) {
-    // Create shared network with an initial name "dog".
+    // Create shared network with an initial name "frog".
     SharedNetwork6Ptr network(new SharedNetwork6("frog"));
     EXPECT_EQ("frog", network->getName());