From: Razvan Becheriu <razvan@isc.org>
Date: Fri, 5 Jul 2019 18:04:01 +0000 (+0300)
Subject: changes addressing coding standards and added extra verification in unittests
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8efd79fa1d8cc2761b1d9e746ccb1f30b2e54a8;p=thirdparty%2Fkea.git

changes addressing coding standards and added extra verification in unittests
---

diff --git a/src/lib/stats/tests/observation_unittest.cc b/src/lib/stats/tests/observation_unittest.cc
index b3befedb9f..fd917cf571 100644
--- a/src/lib/stats/tests/observation_unittest.cc
+++ b/src/lib/stats/tests/observation_unittest.cc
@@ -568,6 +568,11 @@ TEST_F(ObservationTest, names) {
     EXPECT_EQ("beta", b.getName());
     EXPECT_EQ("gamma", c.getName());
     EXPECT_EQ("delta", d.getName());
+
+    ASSERT_EQ(a.getSize(), 1);
+    ASSERT_EQ(b.getSize(), 1);
+    ASSERT_EQ(c.getSize(), 1);
+    ASSERT_EQ(d.getSize(), 1);
 }
 
 };
diff --git a/src/lib/stats/tests/stats_mgr_unittest.cc b/src/lib/stats/tests/stats_mgr_unittest.cc
index d19a69da53..f0513bc75e 100644
--- a/src/lib/stats/tests/stats_mgr_unittest.cc
+++ b/src/lib/stats/tests/stats_mgr_unittest.cc
@@ -718,134 +718,6 @@ TEST_F(StatsMgrTest, commandRemoveAll) {
     EXPECT_EQ(0, StatsMgr::instance().count());
 }
 
-// This test checks whether statistic-set-max-sample-age command really set
-// max_sample_age limit correctly.
-TEST_F(StatsMgrTest, commandSetMaxSampleAge) {
-    StatsMgr::instance().setValue("alpha", static_cast<int64_t>(1234));
-
-    ElementPtr params = Element::createMap();
-    params->set("name", Element::create("alpha"));
-    params->set("hours", Element::create(0));
-    params->set("minutes", Element::create(0));
-    params->set("seconds", Element::create(1));
-    params->set("milliseconds", Element::create(0));
-
-    ConstElementPtr rsp =
-        StatsMgr::instance().statisticSetMaxSampleAgeHandler("statistic-set-max-sample-age", params);
-    int status_code;
-    ASSERT_NO_THROW(parseAnswer(status_code, rsp));
-    EXPECT_EQ(CONTROL_RESULT_SUCCESS, status_code);
-
-    // Now check if time limit work
-    for (uint32_t i = 0; i < 10; ++i) {
-        if (i == 5) {
-            sleep(1); // wait one second to force exceeding the time limit
-        }
-        StatsMgr::instance().setValue("alpha", static_cast<int64_t>(i));
-    }
-
-    // It should be equal
-    EXPECT_EQ(StatsMgr::instance().getSize("alpha"), 5);
-}
-
-// Test checks if statistic-set-max-sample-age is able to handle:
-// - a request without parameters
-// - a request without at least one of duration parameters
-// - a request with missing statistic name
-// - a request for non-existing statistic.
-TEST_F(StatsMgrTest, commandSetMaxSampleAgeNegative) {
-
-    // Case 1: a request without parameters
-    ConstElementPtr rsp =
-        StatsMgr::instance().statisticSetMaxSampleAgeHandler("statistic-set-max-sample-age", ElementPtr());
-    int status_code;
-    ASSERT_NO_THROW(parseAnswer(status_code, rsp));
-    EXPECT_EQ(status_code, CONTROL_RESULT_ERROR);
-
-    // Case 2: a request without at least one of duration parameters
-    ElementPtr params = Element::createMap();
-    params->set("seconds", Element::create(2));
-    params->set("milliseconds", Element::create(3));
-    rsp = StatsMgr::instance().statisticSetMaxSampleAgeHandler("statistic-set-max-sample-age", params);
-    ASSERT_NO_THROW(parseAnswer(status_code, rsp));
-    EXPECT_EQ(status_code, CONTROL_RESULT_ERROR);
-
-    // Case 3: a request with missing statistic name
-    params = Element::createMap();
-    params->set("hours", Element::create(0));
-    params->set("minutes", Element::create(1));
-    params->set("seconds", Element::create(2));
-    params->set("milliseconds", Element::create(3));
-    rsp = StatsMgr::instance().statisticSetMaxSampleAgeHandler("statistic-set-max-sample-age", params);
-    ASSERT_NO_THROW(parseAnswer(status_code, rsp));
-    EXPECT_EQ(status_code, CONTROL_RESULT_ERROR);
-
-    // Case 4: a request for non-existing statistic
-    params->set("name", Element::create("alpha"));
-    rsp = StatsMgr::instance().statisticSetMaxSampleAgeHandler("statistic-set-max-sample-age", params);
-    EXPECT_EQ("{ \"result\": 1, \"text\": \"No 'alpha' statistic found\" }",
-              rsp->str());
-}
-
-// This test checks whether statistic-set-max-sample-count command really set
-// max_sample_count limit correctly.
-TEST_F(StatsMgrTest, commandSetMaxSampleCount) {
-    StatsMgr::instance().setValue("alpha", static_cast<int64_t>(1234));
-
-    ElementPtr params = Element::createMap();
-    params->set("name", Element::create("alpha"));
-    params->set("max-samples", Element::create(15));
-
-    ConstElementPtr rsp =
-        StatsMgr::instance().statisticSetMaxSampleCountHandler("statistic-set-max-sample-count", params);
-    int status_code;
-    ASSERT_NO_THROW(parseAnswer(status_code, rsp));
-    EXPECT_EQ(CONTROL_RESULT_SUCCESS, status_code);
-
-    // Now check if time limit work
-    for (uint32_t i = 0; i < 15; ++i) {
-        StatsMgr::instance().setValue("alpha", static_cast<int64_t>(i));
-    }
-
-    // It should be equal
-    EXPECT_EQ(StatsMgr::instance().getSize("alpha"), 15);
-}
-
-// Test checks if statistic-set-max-sample-age is able to handle:
-// - a request without parameters
-// - a request without max-samples parameter
-// - a request with missing statistic name
-// - a request for non-existing statistic.
-TEST_F(StatsMgrTest, commandSetMaxSampleCountNegative) {
-
-    // Case 1: a request without parameters
-    ConstElementPtr rsp =
-        StatsMgr::instance().statisticSetMaxSampleCountHandler("statistic-set-max-sample-count", ElementPtr());
-    int status_code;
-    ASSERT_NO_THROW(parseAnswer(status_code, rsp));
-    EXPECT_EQ(status_code, CONTROL_RESULT_ERROR);
-
-    // Case 2: a request without max-samples parameter
-    ElementPtr params = Element::createMap();
-    params->set("name", Element::create("beta"));
-    rsp = StatsMgr::instance().statisticSetMaxSampleCountHandler("statistic-set-max-sample-count", params);
-    ASSERT_NO_THROW(parseAnswer(status_code, rsp));
-    EXPECT_EQ(status_code, CONTROL_RESULT_ERROR);
-
-    // Case 3: a request with missing statistic name
-    params = Element::createMap();
-    params->set("max-samples", Element::create(10));
-    rsp = StatsMgr::instance().statisticSetMaxSampleCountHandler("statistic-set-max-sample-count", params);
-    ASSERT_NO_THROW(parseAnswer(status_code, rsp));
-    EXPECT_EQ(status_code, CONTROL_RESULT_ERROR);
-
-    // Case 4: a request for non-existing statistic
-    params->set("name", Element::create("alpha"));
-    rsp = StatsMgr::instance().statisticSetMaxSampleCountHandler("statistic-set-max-sample-count", params);
-    EXPECT_EQ("{ \"result\": 1, \"text\": \"No 'alpha' statistic found\" }",
-              rsp->str());
-}
-
 // This test checks whether statistic-setMaxSampleAge command really set
 // max_sample_age limit correctly.
 TEST_F(StatsMgrTest, commandSetMaxSampleAge) {