]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
common: Fix unit test.
authorFlorian Forster <octo@collectd.org>
Wed, 15 Jul 2020 21:38:16 +0000 (23:38 +0200)
committerFlorian Forster <octo@google.com>
Wed, 29 Jul 2020 11:40:54 +0000 (13:40 +0200)
Makefile.am
src/utils/common/common_test.c

index 1e906133b5bccdc5f70d7333fa0a4c0faf2b0991..a8c45e783adf0127569ab59e83ec0c7f35352569 100644 (file)
@@ -349,7 +349,7 @@ endif
 test_common_SOURCES = \
        src/utils/common/common_test.c \
        src/testing.h
-test_common_LDADD = libplugin_mock.la
+test_common_LDADD = libmetric.la libplugin_mock.la
 
 test_meta_data_SOURCES = \
        src/utils/metadata/meta_data_test.c \
index f2f3888831b641890435f247a815b668509bad46..f2fd190e4687e518936e9c2609fc8102aaf107f8 100644 (file)
@@ -388,23 +388,24 @@ DEF_TEST(format_values) {
   };
 
   for (size_t i = 0; i < STATIC_ARRAY_SIZE(cases); i++) {
-    metric_family_t fam =
-        {
-            .name = "testing",
-            .type = cases[i].type,
-        } metric_t m = {
-            .family = &fam,
-            .value = cases[i].value,
-            .time = MS_TO_CDTIME_T(1592558427435),
-        };
-    metric_list_add(&fam.metric, m);
+    metric_family_t fam = {
+        .name = "testing",
+        .type = cases[i].type,
+    };
+    metric_t m = {
+        .family = &fam,
+        .value = cases[i].value,
+        .time = MS_TO_CDTIME_T(1592558427435),
+    };
+    metric_family_metric_append(&fam, m);
 
     strbuf_t buf = STRBUF_CREATE;
 
     EXPECT_EQ_INT(0, format_values(&buf, &m, false));
-    EXPECT_EQ_STR(cases[i].want, buf);
+    EXPECT_EQ_STR(cases[i].want, buf.ptr);
 
     STRBUF_DESTROY(buf);
+    metric_family_metric_reset(&fam);
   }
 
   return 0;