From: Florian Forster <octo@collectd.org>
Date: Wed, 15 Jul 2020 21:38:16 +0000 (+0200)
Subject: common: Fix unit test.
X-Git-Tag: 6.0.0-rc0~144^2~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce37b82ebeb1491e74afc0fa9fad8cf14fd314ca;p=thirdparty%2Fcollectd.git

common: Fix unit test.
---

diff --git a/Makefile.am b/Makefile.am
index 1e906133b..a8c45e783 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 \
diff --git a/src/utils/common/common_test.c b/src/utils/common/common_test.c
index f2f388883..f2fd190e4 100644
--- a/src/utils/common/common_test.c
+++ b/src/utils/common/common_test.c
@@ -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;