1 files changed, 13 insertions, 9 deletions

diff --git a/tests/unit/unit.c b/tests/unit/unit.c
index 75157a0a7..5ebbf36bc 100644
--- a/tests/unit/unit.c
+++ b/tests/unit/unit.c
@@ -95,16 +95,23 @@ int serializerUnitTest() {
 
     for(i=0; i<16; i++) {
       char kbuf[32], vbuf[32];
-      ndpi_snprintf(kbuf, sizeof(kbuf), "Key %d", i);
+      int j = 0;
       ndpi_snprintf(vbuf, sizeof(vbuf), "Value %d", i);
-      assert(ndpi_serialize_uint32_uint32(&serializer, i, i*i) != -1);
-      assert(ndpi_serialize_uint32_string(&serializer, i, "Data") != -1);
+      assert(ndpi_serialize_uint32_uint32(&serializer, j++, i*i) != -1);
+      assert(ndpi_serialize_uint32_string(&serializer, j++, "Data") != -1);
+      ndpi_snprintf(kbuf, sizeof(kbuf), "Key %d", j++);
       assert(ndpi_serialize_string_string(&serializer, kbuf, vbuf) != -1);
+      ndpi_snprintf(kbuf, sizeof(kbuf), "Key %d", j++);
       assert(ndpi_serialize_string_uint32(&serializer, kbuf, i*i) != -1);
+      ndpi_snprintf(kbuf, sizeof(kbuf), "Key %d", j++);
       assert(ndpi_serialize_string_float(&serializer,  kbuf, (float)(i*i), "%f") != -1);
-      if (fmt != ndpi_serialization_format_tlv)
+      if (fmt != ndpi_serialization_format_tlv) {
+        ndpi_snprintf(kbuf, sizeof(kbuf), "Key %d", j++);
         assert(ndpi_serialize_string_double(&serializer, kbuf, ((double)(FLT_MAX))*2, "%lf") != -1);
+      }
+      ndpi_snprintf(kbuf, sizeof(kbuf), "Key %d", j++);
       assert(ndpi_serialize_string_int64(&serializer,  kbuf, INT64_MAX) != -1);
+      assert(ndpi_serialize_string_string(&serializer, "utf-8", "küche") != -1);
       if ((i&0x3) == 0x3) ndpi_serialize_end_of_record(&serializer);
     }
 
@@ -371,8 +378,6 @@ int main(int argc, char **argv) {
 #endif
   (void)argc;
   (void)argv;
-
-  NDPI_PROTOCOL_BITMASK all;
   
   if (ndpi_get_api_version() != NDPI_API_VERSION) {
     printf("nDPI Library version mismatch: please make sure this code and the nDPI library are in sync\n");
@@ -384,9 +389,8 @@ int main(int argc, char **argv) {
   if (ndpi_info_mod == NULL)
     return -1;
 
-  NDPI_BITMASK_SET_ALL(all);
-  ndpi_set_protocol_detection_bitmask2(ndpi_info_mod, &all);
-  ndpi_finalize_initialization(ndpi_info_mod);
+  if(ndpi_finalize_initialization(ndpi_info_mod) != 0)
+    return -1;
 
 /*
  * If we want argument parsing on Windows,