Fix labels unit test (#13156)
Stelios Fragkakis committed
Jun 16, 2022 at 15:08 UTC
e8903cb72ade822bcc8dd3d3a700fa72026f0598
2 files changed
+10
-5
daemon/main.c
+4
@@ -888,6 +888,10 @@ int main(int argc, char **argv) {
888
if(test_dbengine()) return 1;
889
#endif
890
if(test_sqlite()) return 1;
891
+ if (dictionary_unittest(10000))
892
+ return 1;
893
+ if (rrdlabels_unittest())
894
+ return 1;
895
fprintf(stderr, "\n\nALL TESTS PASSED\n\n");
896
return 0;
897
}
database/rrdlabels.c
+6
-5
@@ -1043,8 +1043,9 @@ int rrdlabels_unittest_add_pairs() {
1043
errors += rrdlabels_unittest_add_a_pair("\"tag=1\": country:\"Gre\\\"ece\"", "tag_1", "country:Gre_ece");
1044
errors += rrdlabels_unittest_add_a_pair("\"tag=1\" = country:\"Gre\\\"ece\"", "tag_1", "country:Gre_ece");
1045
1046
- errors += rrdlabels_unittest_add_a_pair("\t'LABE=L'\t=\t\"World\" peace", "labe_l", "World_peace");
1046
+ errors += rrdlabels_unittest_add_a_pair("\t'LABE=L'\t=\t\"World\" peace", "labe_l", "World peace");
1047
errors += rrdlabels_unittest_add_a_pair("\t'LA\\'B:EL'\t=\tcountry:\"World\":\"Europe\":\"Greece\"", "la_b_el", "country:World:Europe:Greece");
1048
+ errors += rrdlabels_unittest_add_a_pair("\t'LA\\'B:EL'\t=\tcountry\\\"World\"\\\"Europe\"\\\"Greece\"", "la_b_el", "country/World/Europe/Greece");
1049
1050
errors += rrdlabels_unittest_add_a_pair("NAME=\"VALUE\"", "name", "VALUE");
1051
errors += rrdlabels_unittest_add_a_pair("\"NAME\" : \"VALUE\"", "name", "VALUE");
@@ -1113,22 +1114,22 @@ int rrdlabels_unittest_sanitization() {
1114
1115
errors += rrdlabels_unittest_sanitize_value("", "");
1116
errors += rrdlabels_unittest_sanitize_value("1", "1");
1116
- errors += rrdlabels_unittest_sanitize_value(" hello world ", "hello_world");
1117
+ errors += rrdlabels_unittest_sanitize_value(" hello world ", "hello world");
1118
1119
// 2-byte UTF-8
1120
errors += rrdlabels_unittest_sanitize_value(" Ελλάδα ", "Ελλάδα");
1121
errors += rrdlabels_unittest_sanitize_value("aŰbŲcŴ", "aŰbŲcŴ");
1121
- errors += rrdlabels_unittest_sanitize_value("Ű b Ų c Ŵ", "Ű_b_Ų_c_Ŵ");
1122
+ errors += rrdlabels_unittest_sanitize_value("Ű b Ų c Ŵ", "Ű b Ų c Ŵ");
1123
1124
// 3-byte UTF-8
1125
errors += rrdlabels_unittest_sanitize_value("‱", "‱");
1126
errors += rrdlabels_unittest_sanitize_value("a‱b", "a‱b");
1126
- errors += rrdlabels_unittest_sanitize_value("a ‱ b", "a_‱_b");
1127
+ errors += rrdlabels_unittest_sanitize_value("a ‱ b", "a ‱ b");
1128
1129
// 4-byte UTF-8
1130
errors += rrdlabels_unittest_sanitize_value("𩸽", "𩸽");
1131
errors += rrdlabels_unittest_sanitize_value("a𩸽b", "a𩸽b");
1131
- errors += rrdlabels_unittest_sanitize_value("a 𩸽 b", "a_𩸽_b");
1132
+ errors += rrdlabels_unittest_sanitize_value("a 𩸽 b", "a 𩸽 b");
1133
1134
// mixed multi-byte
1135
errors += rrdlabels_unittest_sanitize_value("Ű‱𩸽‱Ű", "Ű‱𩸽‱Ű");