Test label loading

Author: BlockoS

label/load.c

@@ -40,25 +40,23 @@
 
 #define MAX_LABEL_NAME 128
 
-/**
- * Load labels from file.
- * \param [in]  filename Input filename.
- * \param [out] repository Label repository.
- * \return 1 if the labels contained in the file were succesfully added to the repository.
- *         0 if an error occured.
- */
-int label_repository_load(const char* filename, label_repository_t* repository) {
-    json_t* root;
+// Load labels from file.
+bool label_repository_load(LabelRepository* repository, const char* filename) {
+    assert(repository != NULL);
+    assert(filename != NULL);
+
+    bool ret = false;
+
     json_error_t err;
-    json_t* value;
-    int ret = 0, index = 0;
-    root = json_load_file(filename, 0, &err);
+    json_t* root = json_load_file(filename, 0, &err);
     if(!root) {
         ERROR_MSG("Failed to parse %s:%d:%d: %s", filename, err.line, err.column, err.text);
     } else {
+        json_t* value = NULL;
+        int index = 0;
         if(!json_is_array(root)) {
             ERROR_MSG("Array expected.");
-        } else for (index = 0, ret = 1; ret && (index < json_array_size(root)) && (value = json_array_get(root, index)); index++) {
+        } else for (index = 0, ret = true; ret && (index < json_array_size(root)) && (value = json_array_get(root, index)); index++) {
             ret = 0;
             if(!json_is_object(value)) {
                 ERROR_MSG("Expected object.");
@@ -74,7 +72,7 @@ int label_repository_load(const char* filename, label_repository_t* repository)
                     tmp = json_object_get(value, "logical");
                     if(!json_validate_int(tmp, &num)) {
                         ERROR_MSG("Invalid or missing logical address.");
-                    } else if((num < 0) || (num > 0xffff)) {
+                    } else if((num < 0) || (num > 0xFFFF)) {
                         ERROR_MSG("Logical address out of range.");
                     } else {
                         uint16_t logical = (uint16_t)num;
@@ -88,7 +86,7 @@ int label_repository_load(const char* filename, label_repository_t* repository)
                             if((num < 0) || (num > 0xff)) {
                                 ERROR_MSG("Page value out of range.");
                             } else if(label_repository_add(repository, key, logical, (uint8_t)num, description)) {
-                                ret = 1;
+                                ret = true;
                             }
                             free(description);
                         }

test/CMakeLists.txt

@@ -95,9 +95,11 @@ add_unit_test(
     SOURCES 
         label.c 
         ${PROJECT_SOURCE_DIR}/label.c
+        ${PROJECT_SOURCE_DIR}/label/load.c
         ${PROJECT_SOURCE_DIR}/message.c
+        ${PROJECT_SOURCE_DIR}/jsonhelpers.c
         ${PROJECT_SOURCE_DIR}/message/console.c
-    LIBRARIES cwalk
+    LIBRARIES cwalk jansson
     INCLUDE_DIRECTORIES ${PROJECT_SOURCE_DIR}
 )
 

test/data/label_0.json

@@ -0,0 +1,11 @@
+[
+    { "name": "var", "logical": "31dc", "page": "f8" },
+    { "name": "do_something", "logical": "eabc", "page": "00", "description": "do something" },
+    { "name": "run", "logical" : "d6f7", "page": "1f", "description": [
+            "line0",
+            "line1",
+            "line2",
+            "line3"
+        ]
+    }
+]

test/data/label_1.json

@@ -0,0 +1,4 @@
+[
+    { "name": "ok", "logical": "5030", "page": "04" },
+    { "name": "broken", "logical": "cafe", "page": ["5a"], "description": "!" }
+]

test/label.c

@@ -121,9 +121,62 @@ MunitResult label_delete_test(const MunitParameter params[] __attribute__((unuse
     return MUNIT_OK;
 }
 
+MunitResult label_load_test(const MunitParameter params[] __attribute__((unused)), void* fixture __attribute__((unused))) {
+    Label label = {};
+    LabelRepository* repository = label_repository_create();
+    munit_assert_not_null(repository);
+
+    munit_assert_false(label_repository_load(repository, "/not_here/label.json"));
+    munit_assert_int(label_repository_size(repository), ==, 0);
+
+    munit_assert_false(label_repository_load(repository, "data/label_1.json"));
+    munit_assert_int(label_repository_size(repository), ==, 1);
+    
+    munit_assert_true(label_repository_get(repository, 0, &label));
+    munit_assert_uint16(label.logical, ==, 0x5030U);
+    munit_assert_uint8(label.page, ==, 4);
+    munit_assert_string_equal(label.name, "ok");
+    munit_assert_null(label.description);
+
+    label_repository_destroy(repository);    
+
+    munit_assert_true(label_repository_load(repository, "data/label_0.json"));
+    munit_assert_int(label_repository_size(repository), ==, 3);
+
+    munit_assert_true(label_repository_find(repository, 0x31DC, 0xF8, &label));
+    munit_assert_uint16(label.logical, ==, 0x31DCU);
+    munit_assert_uint8(label.page, ==, 0xF8);
+    munit_assert_string_equal(label.name, "var");
+    munit_assert_null(label.description);
+
+    munit_assert_true(label_repository_find(repository, 0xEABC, 0x00, &label));
+    munit_assert_uint16(label.logical, ==, 0xEABCU);
+    munit_assert_uint8(label.page, ==, 0x00);
+    munit_assert_string_equal(label.name, "do_something");
+    munit_assert_string_equal(label.description, "do something");
+    
+    munit_assert_true(label_repository_find(repository, 0xD6F7, 0x1F, &label));
+    munit_assert_uint16(label.logical, ==, 0xD6F7U);
+    munit_assert_uint8(label.page, ==, 0x1F);
+    munit_assert_string_equal(label.name, "run");
+    munit_assert_string_equal(label.description, "line0\nline1\nline2\nline3");
+
+    label_repository_destroy(repository);    
+
+    return MUNIT_OK;
+}
+
+MunitResult label_save_test(const MunitParameter params[] __attribute__((unused)), void* fixture __attribute__((unused))) {
+    // [todo]
+    return MUNIT_OK;
+}
+
+
 static MunitTest Labelests[] = {
     { "/add", label_add_test, setup, tear_down, MUNIT_TEST_OPTION_NONE, NULL },
     { "/delete", label_delete_test, setup, tear_down, MUNIT_TEST_OPTION_NONE, NULL },
+    { "/load", label_load_test, setup, tear_down, MUNIT_TEST_OPTION_NONE, NULL },
+    { "/save", label_save_test, setup, tear_down, MUNIT_TEST_OPTION_NONE, NULL },
     { NULL, NULL, NULL, NULL, MUNIT_TEST_OPTION_NONE, NULL }
 };