Improve coverage

vvromanov · Dec 8, 2024 · a0cb197 · a0cb197
1 parent 2605a19
commit a0cb197
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 20 deletions.
diff --git a/rrd-writer/rrd_utils.cpp b/rrd-writer/rrd_utils.cpp
@@ -248,8 +248,6 @@ static bool rrd_update_history_counter(HistoryCounters::name_rec_t &counter) {
                     return false;
                 }
                 break;
-            case HistoryUnknown:
-                return true;
         }
     }
     char update[256];
@@ -263,8 +261,6 @@ static bool rrd_update_history_counter(HistoryCounters::name_rec_t &counter) {
         case HistoryCall: //Учитываем количество и среднее время вызова
             snprintf(update, sizeof(update), "%lu:%ld:%ld", time(NULL), d->GetLastCount(), d->GetLastAvg());
             break;
-        case HistoryUnknown:
-            return true;
     }
     return rrd_update(filename, update);
 }

diff --git a/src/HistoryCounterData.cpp b/src/HistoryCounterData.cpp
@@ -88,8 +88,6 @@ void HistoryCounterData::DumpSimple(std::ostream &s) {
             s << ' ' << GetTotalCount();
             s << ' ' << GetTotalAvg();
             break;
-        case HistoryUnknown:
-            s << '?';
     }
 }
 
@@ -132,8 +130,6 @@ void HistoryCounterData::DumpTable(std::ostream &s) {
             s << '|';
             DumpNumber(s, GetTotalAvg(), 6);
             break;
-        case HistoryUnknown:
-            break;
     }
     s << "|" << std::endl;
 }
@@ -152,8 +148,6 @@ void HistoryCounterData::DumpHtml(std::ostream &s) {
         case HistoryCall:
             DumpNumber(s, GetLastAvg(), 6);
             break;
-        case HistoryUnknown:
-            break;
     }
     s << "</td><td align='right'>";
     DumpNumber(s, GetIntervalCount(), 6);
@@ -168,8 +162,6 @@ void HistoryCounterData::DumpHtml(std::ostream &s) {
         case HistoryCall:
             DumpNumber(s, GetIntervalAvg(), 6);
             break;
-        case HistoryUnknown:
-            break;
     }
 
     s << "</td><td align='right'>";
@@ -185,8 +177,6 @@ void HistoryCounterData::DumpHtml(std::ostream &s) {
         case HistoryCall:
             DumpNumber(s, GetTotalAvg(), 6);
             break;
-        case HistoryUnknown:
-            break;
     }
     s << "</td></tr>" << std::endl;
 }
diff --git a/src/HistoryCounterData.h b/src/HistoryCounterData.h
@@ -14,7 +14,6 @@ struct HistoryRec {
 } __attribute__((__packed__));
 
 typedef enum {
-    HistoryUnknown,
     HistoryCount, //Просто какое-то событие
     HistoryVolume, //Учитываем количество и объем. Например, сколько данных передано по сети
     HistoryCall //Учитываем количество и среднее время вызова

diff --git a/src/HistoryCounters.cpp b/src/HistoryCounters.cpp
@@ -77,7 +77,6 @@ void HistoryCounters::Dump(std::ostream &s, const char *prefix, counters_format_
                 s << '=' << c->GetLastCount();
                 switch (c->GetType()) {
                     case HistoryCount:
-                    case HistoryUnknown:
                         break;
                     case HistoryVolume:
                         s << ' ' << name;
@@ -94,7 +93,6 @@ void HistoryCounters::Dump(std::ostream &s, const char *prefix, counters_format_
                 s << '=' << c->GetTotalCount();
                 switch (c->GetType()) {
                     case HistoryCount:
-                    case HistoryUnknown:
                         break;
                     case HistoryVolume:
                         s << ' ' << name;
@@ -111,7 +109,6 @@ void HistoryCounters::Dump(std::ostream &s, const char *prefix, counters_format_
                 s << '=' << c->GetIntervalCount();
                 switch (c->GetType()) {
                     case HistoryCount:
-                    case HistoryUnknown:
                         break;
                     case HistoryVolume:
                         s << ' ' << name;

diff --git a/src/HistoryCounters.h b/src/HistoryCounters.h
@@ -19,7 +19,7 @@ class HistoryCountersData {
     void Init(size_t size) {
         dict.Clear();
         for (int i = 0; i < COUNTER_MAX_AMOUNT_HISTORY; i++) {
-            counters[i].Init(HistoryUnknown);
+            counters[i].Init(HistoryCount);
         }
     }
 

diff --git a/tests/TestHistoryCounters.cpp b/tests/TestHistoryCounters.cpp
@@ -63,14 +63,15 @@ TEST_F(TestHistoryCounters, GetCategory) {
 	EXPECT_TRUE(HistoryCountersClear());
 }
 
-static bool HC_TestDump(counters_format_t format, const char* expected, const char* prefix = NULL) {
+static bool HC_TestDump(counters_format_t format, const char* expected, const char* prefix = NULL, int interval_before_dump=0) {
 	EXPECT_TRUE(HistoryCountersClear());
 	HistoryCounter c1(TEST_COUNTER ".c1", HistoryCount);
 	HistoryCounter c2(TEST_COUNTER ".c2", HistoryCall);
 	HistoryCounter c3(TEST_COUNTER ".c3", HistoryVolume);
 	HistoryCounter xxx("xxx", HistoryVolume);
 	ClockOverride co;
 	FillTestData(co, c1, c2, c3);
+	co.AddSeconds(interval_before_dump);
 	std::stringstream ss;
 	GetHistoryCounters().Dump(ss, prefix ? prefix : TEST_COUNTER, format, false);
 	EXPECT_EQ(expected, ss.str());
@@ -85,6 +86,15 @@ TEST_F(TestHistoryCounters, DumpSimple) {
 	));
 }
 
+TEST_F(TestHistoryCounters, DumpSimpleBigDelay) {
+	EXPECT_TRUE(HC_TestDump(format_simple,		
+		"test.level1.level2.c1 0 0 1800\n"
+		"test.level1.level2.c2 0 0 0 0 360600 10\n"
+		"test.level1.level2.c3 0 0 0 0 600 18030000\n"
+		,NULL, 60*10
+	));
+}
+
 TEST_F(TestHistoryCounters, DumpRaw) {
 	EXPECT_TRUE(HC_TestDump(format_raw,
 		" 1 60000 300 13515000 600 18030000\n",