Issue 187 enable skipped ztest suites (#189)

* Fix some ztests that were skipped

* Expose bacapp_same_value()

* Fix bacapp, ptransfer tests

* Fix bugs in Load_Control object & tests

* refactor days functions from datetime module

* fix legacy ctests

* Add bacnet/basic/sys/days.[ch] to Zephyr build

* Update ztest to match from Zephyr v2.6.0; update ringbuf, datetime to build

* Fixup ztest test for object/acc

* Fix bvlc_address_from_ascii; enable/fix bvlc test

* Comment cleanup

* test/bacnet/basic/object/lc partially enabled

* Fix bacapp_decode_data_len return status on erroneous input

* fix ztest include fatal error

* fix ztest strsignal reference fatal error

* fix zassert_mem_equal reference syntax error

* fix zassert_mem_equal reference syntax error

Co-authored-by: Gregory Shue <gregory.shue@legrand.us>
Co-authored-by: Steve Karg <skarg@users.sourceforge.net>

test/bacnet/basic/object/acc/CMakeLists.txt

@@ -45,6 +45,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/datetime.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
     # Test and test library files
 	./src/main.c
 	${ZTST_DIR}/ztest_mock.c

test/bacnet/basic/object/acc/src/main.c

@@ -10,6 +10,7 @@
 
 #include <ztest.h>
 #include <bacnet/basic/object/acc.h>
+#include <bacnet/bactext.h>
 
 /**
  * @addtogroup bacnet_tests
@@ -26,7 +27,7 @@ static void test_Accumulator(void)
     int test_len = 0;
     BACNET_READ_PROPERTY_DATA rpdata = {0};
     BACNET_APPLICATION_DATA_VALUE value = {0};
-    int *required_property = NULL;
+    const int *required_property = NULL;
     BACNET_UNSIGNED_INTEGER unsigned_value = 1;
 
     Accumulator_Init();

test/bacnet/basic/object/access_credential/CMakeLists.txt

@@ -46,6 +46,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/basic/sys/bigend.c
 	${SRC_DIR}/bacnet/credential_authentication_factor.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
 	${SRC_DIR}/bacnet/wp.c

test/bacnet/basic/object/access_credential/src/main.c

@@ -27,7 +27,7 @@ static void testAccessCredential(void)
     BACNET_READ_PROPERTY_DATA rpdata = {0};
     BACNET_APPLICATION_DATA_VALUE value = {0};
     BACNET_APPLICATION_DATA_VALUE value2 = {0};
-    int *required_property = NULL;
+    const int *required_property = NULL;
     BACNET_UNSIGNED_INTEGER unsigned_value = 1;
 
     Access_Credential_Init();

test/bacnet/basic/object/access_door/CMakeLists.txt

@@ -43,6 +43,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/bactext.c
 	${SRC_DIR}/bacnet/basic/sys/bigend.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
 	${SRC_DIR}/bacnet/wp.c

test/bacnet/basic/object/access_door/src/main.c

@@ -5,7 +5,7 @@
  */
 
 /* @file
- * @brief test BACnet integer encode/decode APIs
+ * @brief test BACnet access_door object APIs
  */
 
 #include <ztest.h>
@@ -19,45 +19,57 @@
 /**
  * @brief Test
  */
-#if 0
-bool WPValidateArgType(BACNET_APPLICATION_DATA_VALUE *pValue,
-    uint8_t ucExpectedTag,
-    BACNET_ERROR_CLASS *pErrorClass,
-    BACNET_ERROR_CODE *pErrorCode)
-{
-    pValue = pValue;
-    ucExpectedTag = ucExpectedTag;
-    pErrorClass = pErrorClass;
-    pErrorCode = pErrorCode;
-
-    return false;
-}
-#endif
-
-static void testAccessDoor(void)
+static void test_object_access_door(void)
 {
     uint8_t apdu[MAX_APDU] = { 0 };
     int len = 0;
-    uint32_t len_value = 0;
-    uint8_t tag_number = 0;
-    uint32_t decoded_instance = 0;
-    BACNET_OBJECT_TYPE decoded_type = 0;
+    int test_len = 0;
     BACNET_READ_PROPERTY_DATA rpdata;
+    /* for decode value data */
+    BACNET_APPLICATION_DATA_VALUE value;
+    const int *pRequired = NULL;
+    const int *pOptional = NULL;
+    const int *pProprietary = NULL;
+    unsigned port = 0;
+    unsigned count = 0;
+    uint32_t object_instance = 0;
 
+    object_instance = Access_Door_Index_To_Instance(0);
     Access_Door_Init();
+    count = Access_Door_Count();
+    zassert_true(count > 0, NULL);
     rpdata.application_data = &apdu[0];
     rpdata.application_data_len = sizeof(apdu);
     rpdata.object_type = OBJECT_ACCESS_DOOR;
-    rpdata.object_instance = 1;
-    rpdata.object_property = PROP_OBJECT_IDENTIFIER;
-    rpdata.array_index = BACNET_ARRAY_ALL;
-    len = Access_Door_Read_Property(&rpdata);
-    zassert_not_equal(len, 0, NULL);
-    len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
-    zassert_equal(tag_number, BACNET_APPLICATION_TAG_OBJECT_ID, NULL);
-    len = decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
-    zassert_equal(decoded_type, rpdata.object_type, NULL);
-    zassert_equal(decoded_instance, rpdata.object_instance, NULL);
+    rpdata.object_instance = object_instance;
+    Access_Door_Property_Lists(&pRequired, &pOptional, &pProprietary);
+    while ((*pRequired) != -1) {
+	rpdata.object_property = *pRequired;
+	rpdata.array_index = BACNET_ARRAY_ALL;
+	len = Access_Door_Read_Property(&rpdata);
+	zassert_not_equal(len, BACNET_STATUS_ERROR, NULL);
+	if (len > 0) {
+	    test_len = bacapp_decode_application_data(
+		rpdata.application_data,
+		(uint8_t)rpdata.application_data_len, &value);
+	    zassert_true(test_len >= 0, NULL);
+	}
+	pRequired++;
+    }
+    while ((*pOptional) != -1) {
+	rpdata.object_property = *pOptional;
+	rpdata.array_index = BACNET_ARRAY_ALL;
+	len = Access_Door_Read_Property(&rpdata);
+	zassert_not_equal(len, BACNET_STATUS_ERROR, NULL);
+	if (len > 0) {
+	    test_len = bacapp_decode_application_data(
+		rpdata.application_data,
+		(uint8_t)rpdata.application_data_len, &value);
+	    zassert_true(test_len >= 0, NULL);
+	}
+	pOptional++;
+    }
+    port++;
 
     return;
 }
@@ -68,9 +80,9 @@ static void testAccessDoor(void)
 
 void test_main(void)
 {
-    ztest_test_suite(access_door_tests,
-     ztest_unit_test(testAccessDoor)
+    ztest_test_suite(tests_object_access_door,
+     ztest_unit_test(test_object_access_door)
      );
 
-    ztest_run_test_suite(access_door_tests);
+    ztest_run_test_suite(tests_object_access_door);
 }

test/bacnet/basic/object/access_point/CMakeLists.txt

@@ -43,6 +43,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/bactext.c
 	${SRC_DIR}/bacnet/basic/sys/bigend.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
 	${SRC_DIR}/bacnet/timestamp.c

test/bacnet/basic/object/access_rights/CMakeLists.txt

@@ -44,6 +44,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/bactext.c
 	${SRC_DIR}/bacnet/basic/sys/bigend.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
 	${SRC_DIR}/bacnet/wp.c

test/bacnet/basic/object/access_user/CMakeLists.txt

@@ -43,6 +43,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/bactext.c
 	${SRC_DIR}/bacnet/basic/sys/bigend.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
 	${SRC_DIR}/bacnet/wp.c

test/bacnet/basic/object/access_zone/CMakeLists.txt

@@ -47,6 +47,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/basic/sys/bigend.c
 	${SRC_DIR}/bacnet/credential_authentication_factor.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
 	${SRC_DIR}/bacnet/wp.c

test/bacnet/basic/object/ai/CMakeLists.txt

@@ -44,6 +44,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/basic/sys/bigend.c
 	${SRC_DIR}/bacnet/cov.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
 	${SRC_DIR}/bacnet/memcopy.c

test/bacnet/basic/object/ao/CMakeLists.txt

@@ -43,6 +43,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/bactext.c
 	${SRC_DIR}/bacnet/basic/sys/bigend.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
 	${SRC_DIR}/bacnet/wp.c

test/bacnet/basic/object/av/CMakeLists.txt

@@ -44,6 +44,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/basic/sys/bigend.c
 	${SRC_DIR}/bacnet/cov.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
 	${SRC_DIR}/bacnet/memcopy.c

test/bacnet/basic/object/bi/CMakeLists.txt

@@ -44,6 +44,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/basic/sys/bigend.c
 	${SRC_DIR}/bacnet/cov.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
 	${SRC_DIR}/bacnet/memcopy.c

test/bacnet/basic/object/bo/CMakeLists.txt

@@ -43,6 +43,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/bactext.c
 	${SRC_DIR}/bacnet/basic/sys/bigend.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
 	${SRC_DIR}/bacnet/wp.c

test/bacnet/basic/object/bv/CMakeLists.txt

@@ -43,6 +43,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/bactext.c
 	${SRC_DIR}/bacnet/basic/sys/bigend.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
 	${SRC_DIR}/bacnet/wp.c

test/bacnet/basic/object/command/CMakeLists.txt

@@ -43,6 +43,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/bactext.c
 	${SRC_DIR}/bacnet/basic/sys/bigend.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
 	${SRC_DIR}/bacnet/wp.c

test/bacnet/basic/object/command/src/main.c

@@ -5,7 +5,7 @@
  */
 
 /* @file
- * @brief test BACnet integer encode/decode APIs
+ * @brief test BACnet command object APIs
  */
 
 #include <ztest.h>
@@ -19,66 +19,59 @@
 /**
  * @brief Test
  */
-static void testCommand(void)
+static void test_object_command(void)
 {
-#if 0 /*TODO: Test does not pass */
     uint8_t apdu[MAX_APDU] = { 0 };
     int len = 0;
-    uint32_t len_value = 0;
-    uint8_t tag_number = 0;
-    uint32_t decoded_instance = 0;
-    BACNET_OBJECT_TYPE decoded_type = 0;
+    int test_len = 0;
     BACNET_READ_PROPERTY_DATA rpdata;
-    BACNET_ACTION_LIST clist, clist_test;
+    /* for decode value data */
+    BACNET_APPLICATION_DATA_VALUE value;
+    const int *pRequired = NULL;
+    const int *pOptional = NULL;
+    const int *pProprietary = NULL;
+    unsigned port = 0;
+    unsigned count = 0;
+    uint32_t object_instance = 0;
+
+    object_instance = Command_Index_To_Instance(0);
     Command_Init();
+    count = Command_Count();
+    zassert_true(count > 0, NULL);
     rpdata.application_data = &apdu[0];
     rpdata.application_data_len = sizeof(apdu);
     rpdata.object_type = OBJECT_COMMAND;
-    rpdata.object_instance = 1;
-    rpdata.object_property = PROP_OBJECT_IDENTIFIER;
-    rpdata.array_index = BACNET_ARRAY_ALL;
-    len = Command_Read_Property(&rpdata);
-    zassert_not_equal(len, 0, NULL);
-    len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
-    zassert_equal(tag_number, BACNET_APPLICATION_TAG_OBJECT_ID, NULL);
-    len = decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
-    zassert_equal(decoded_type, rpdata.object_type, NULL);
-    zassert_equal(decoded_instance, rpdata.object_instance, NULL);
-    memset(&clist, 0, sizeof(BACNET_ACTION_LIST));
-    memset(&clist_test, 0, sizeof(BACNET_ACTION_LIST));
-    clist.Device_Id.type = OBJECT_DEVICE;
-    clist.Device_Id.instance = 3389;
-    clist.Object_Id.type = OBJECT_ANALOG_VALUE;
-    clist.Object_Id.instance = 42;
-    clist.Property_Identifier = PROP_PRESENT_VALUE;
-    clist.Property_Array_Index = BACNET_ARRAY_ALL;
-    clist.Value.tag = BACNET_APPLICATION_TAG_REAL;
-    clist.Value.type.Real = 39.0f;
-    clist.Priority = 4;
-    clist.Post_Delay = 0xFFFFFFFFU;
-    clist.Quit_On_Failure = true;
-    clist.Write_Successful = false;
-    clist.next = NULL;
-    len = cl_encode_apdu(apdu, &clist);
-    zassert_true(len > 0, NULL);
-    len = cl_decode_apdu(apdu, len, BACNET_APPLICATION_TAG_REAL, &clist_test);
-    zassert_true(len > 0, NULL);
-    zassert_equal(clist.Device_Id.type, clist_test.Device_Id.type, NULL);
-    zassert_equal(clist.Device_Id.instance, clist_test.Device_Id.instance, NULL);
-    zassert_equal(clist.Object_Id.type, clist_test.Object_Id.type, NULL);
-    zassert_equal(clist.Object_Id.instance, clist_test.Object_Id.instance, NULL);
-    zassert_equal(clist.Property_Identifier, clist_test.Property_Identifier, NULL);
-    zassert_equal(clist.Property_Array_Index, clist_test.Property_Array_Index, NULL);
-    zassert_equal(clist.Value.tag, clist_test.Value.tag, NULL);
-    zassert_equal(clist.Value.type.Real, clist_test.Value.type.Real, NULL);
-    zassert_equal(clist.Priority, clist_test.Priority, NULL);
-    zassert_equal(clist.Post_Delay, clist_test.Post_Delay, NULL);
-    zassert_equal(clist.Quit_On_Failure, clist_test.Quit_On_Failure, NULL);
-    zassert_equal(clist.Write_Successful, clist_test.Write_Successful, NULL);
+    rpdata.object_instance = object_instance;
+    Command_Property_Lists(&pRequired, &pOptional, &pProprietary);
+    while ((*pRequired) != -1) {
+	rpdata.object_property = *pRequired;
+	rpdata.array_index = BACNET_ARRAY_ALL;
+	len = Command_Read_Property(&rpdata);
+	zassert_not_equal(len, BACNET_STATUS_ERROR, NULL);
+	if (len > 0) {
+	    test_len = bacapp_decode_application_data(
+		rpdata.application_data,
+		(uint8_t)rpdata.application_data_len, &value);
+	    zassert_true(test_len >= 0, NULL);
+	}
+	pRequired++;
+    }
+    while ((*pOptional) != -1) {
+	rpdata.object_property = *pOptional;
+	rpdata.array_index = BACNET_ARRAY_ALL;
+	len = Command_Read_Property(&rpdata);
+	zassert_not_equal(len, BACNET_STATUS_ERROR, NULL);
+	if (len > 0) {
+	    test_len = bacapp_decode_application_data(
+		rpdata.application_data,
+		(uint8_t)rpdata.application_data_len, &value);
+	    zassert_true(test_len >= 0, NULL);
+	}
+	pOptional++;
+    }
+    port++;
+
     return;
-#else
-    ztest_test_skip();
-#endif
 }
 /**
  * @}
@@ -87,9 +80,9 @@ static void testCommand(void)
 
 void test_main(void)
 {
-    ztest_test_suite(command_tests,
-     ztest_unit_test(testCommand)
+    ztest_test_suite(tests_object_command,
+     ztest_unit_test(test_object_command)
      );
 
-    ztest_run_test_suite(command_tests);
+    ztest_run_test_suite(tests_object_command);
 }

test/bacnet/basic/object/credential_data_input/CMakeLists.txt

@@ -46,6 +46,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/basic/sys/bigend.c
 	${SRC_DIR}/bacnet/credential_authentication_factor.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
 	${SRC_DIR}/bacnet/timestamp.c

test/bacnet/basic/object/device/CMakeLists.txt

@@ -76,6 +76,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/datalink/bvlc.c
 	${SRC_DIR}/bacnet/cov.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/dcc.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c

test/bacnet/basic/object/lc/CMakeLists.txt

@@ -45,6 +45,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/basic/object/ao.c
 	${SRC_DIR}/bacnet/basic/sys/bigend.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
 	${SRC_DIR}/bacnet/wp.c

test/bacnet/basic/object/lc/src/main.c

@@ -10,6 +10,7 @@
 
 #include <ztest.h>
 #include <bacnet/bacdcode.h>
+#include <bacnet/bacstr.h>
 #include <bacnet/basic/object/ao.h>
 #include <bacnet/basic/object/lc.h>
 
@@ -26,10 +27,198 @@
  * @{
  */
 
+#if 0
+/* Mocks */
+
+void bacapp_value_list_init(
+    BACNET_APPLICATION_DATA_VALUE *value,
+    size_t count)
+{
+}
+
+void bacapp_property_value_list_init(
+    BACNET_PROPERTY_VALUE *value,
+    size_t count)
+{
+}
+
+
+int bacapp_encode_data(
+    uint8_t * apdu,
+    BACNET_APPLICATION_DATA_VALUE * value)
+{
+    return -1;
+}
+
+int bacapp_decode_data(
+    uint8_t * apdu,
+    uint8_t tag_data_type,
+    uint32_t len_value_type,
+    BACNET_APPLICATION_DATA_VALUE * value)
+{
+    return -1;
+}
+
+
+int bacapp_decode_application_data(
+    uint8_t * apdu,
+    unsigned max_apdu_len,
+    BACNET_APPLICATION_DATA_VALUE * value)
+{
+    return -1;
+}
+
+
+bool bacapp_decode_application_data_safe(
+    uint8_t * new_apdu,
+    uint32_t new_apdu_len,
+    BACNET_APPLICATION_DATA_VALUE * value)
+{
+    return false;
+}
+
+
+int bacapp_encode_application_data(
+    uint8_t * apdu,
+    BACNET_APPLICATION_DATA_VALUE * value)
+{
+    return -1;
+}
+
+
+int bacapp_decode_context_data(
+    uint8_t * apdu,
+    unsigned max_apdu_len,
+    BACNET_APPLICATION_DATA_VALUE * value,
+    BACNET_PROPERTY_ID property)
+{
+    return -1;
+}
+
+
+int bacapp_encode_context_data(
+    uint8_t * apdu,
+    BACNET_APPLICATION_DATA_VALUE * value,
+    BACNET_PROPERTY_ID property)
+{
+    return -1;
+}
+
+
+int bacapp_encode_context_data_value(
+    uint8_t * apdu,
+    uint8_t context_tag_number,
+    BACNET_APPLICATION_DATA_VALUE * value)
+{
+    return -1;
+}
+
+
+BACNET_APPLICATION_TAG bacapp_context_tag_type(
+    BACNET_PROPERTY_ID property,
+    uint8_t tag_number)
+{
+    return MAX_BACNET_APPLICATION_TAG;
+}
+
+
+bool bacapp_copy(
+    BACNET_APPLICATION_DATA_VALUE * dest_value,
+    BACNET_APPLICATION_DATA_VALUE * src_value)
+{
+    return false;
+}
+
+
+int bacapp_data_len(
+    uint8_t * apdu,
+    unsigned max_apdu_len,
+    BACNET_PROPERTY_ID property)
+{
+    return -1;
+}
+
+int bacapp_decode_data_len(
+    uint8_t * apdu,
+    uint8_t tag_data_type,
+    uint32_t len_value_type)
+{
+    return -1;
+}
+
+int bacapp_decode_application_data_len(
+    uint8_t * apdu,
+    unsigned max_apdu_len)
+{
+    return -1;
+}
+
+int bacapp_decode_context_data_len(
+    uint8_t * apdu,
+    unsigned max_apdu_len,
+    BACNET_PROPERTY_ID property)
+{
+    return -1;
+}
+
+int bacapp_snprintf_value(
+    char *str,
+    size_t str_len,
+    BACNET_OBJECT_PROPERTY_VALUE * object_value)
+{
+    return -1;
+}
+
+
+#ifdef BACAPP_PRINT_ENABLED
+bool bacapp_parse_application_data(
+    BACNET_APPLICATION_TAG tag_number,
+    const char *argv,
+    BACNET_APPLICATION_DATA_VALUE * value)
+{
+    return false;
+}
+
+bool bacapp_print_value(
+    FILE * stream,
+    BACNET_OBJECT_PROPERTY_VALUE * value)
+{
+    return false;
+}
+
+#endif
+
+bool bacapp_same_value(
+    BACNET_APPLICATION_DATA_VALUE * value,
+    BACNET_APPLICATION_DATA_VALUE * test_value)
+{
+    return false;
+}
+#endif
+
+
+
 /**
  * @brief Test
  */
-#if 0 /* TODO: How should this get exposed? */
+
+static void test_Load_Control_Count(void)
+{
+    /* Verify the same value is returned on successive calls without init */
+    zassert_equal(Load_Control_Count(), MAX_LOAD_CONTROLS, NULL);
+    zassert_equal(Load_Control_Count(), MAX_LOAD_CONTROLS, NULL);
+
+    /* Verify the same value is returned on successive calls with init */
+    Load_Control_Init();
+    zassert_equal(Load_Control_Count(), MAX_LOAD_CONTROLS, NULL);
+    zassert_equal(Load_Control_Count(), MAX_LOAD_CONTROLS, NULL);
+
+    /* Verify the same value is returned on successive calls with re-init */
+    Load_Control_Init();
+    zassert_equal(Load_Control_Count(), MAX_LOAD_CONTROLS, NULL);
+    zassert_equal(Load_Control_Count(), MAX_LOAD_CONTROLS, NULL);
+}
+
 static void Load_Control_WriteProperty_Request_Shed_Level(
     int instance, unsigned level)
 {
@@ -52,9 +241,7 @@ static void Load_Control_WriteProperty_Request_Shed_Level(
     status = Load_Control_Write_Property(&wp_data);
     zassert_true(status, NULL);
 }
-#endif
 
-#if 0 /* TODO: How should this get exposed? */
 static void Load_Control_WriteProperty_Enable(
     int instance, bool enable)
 {
@@ -78,9 +265,7 @@ static void Load_Control_WriteProperty_Enable(
     status = Load_Control_Write_Property(&wp_data);
     zassert_true(status, NULL);
 }
-#endif
 
-#if 0 /* TODO: How should this get exposed? */
 static void Load_Control_WriteProperty_Shed_Duration(
     int instance, unsigned duration)
 {
@@ -103,9 +288,7 @@ static void Load_Control_WriteProperty_Shed_Duration(
     status = Load_Control_Write_Property(&wp_data);
     zassert_true(status, NULL);
 }
-#endif
 
-#if 0 /* TODO: How should this get exposed? */
 static void Load_Control_WriteProperty_Duty_Window(
     int instance, unsigned duration)
 {
@@ -128,9 +311,7 @@ static void Load_Control_WriteProperty_Duty_Window(
     status = Load_Control_Write_Property(&wp_data);
     zassert_true(status, NULL);
 }
-#endif
 
-#if 0 /* TODO: How should this get exposed? */
 static void Load_Control_WriteProperty_Start_Time_Wildcards(
     int instance)
 {
@@ -161,9 +342,7 @@ static void Load_Control_WriteProperty_Start_Time_Wildcards(
     status = Load_Control_Write_Property(&wp_data);
     zassert_true(status, NULL);
 }
-#endif
 
-#if 0 /* TODO: How should this get exposed? */
 static void Load_Control_WriteProperty_Start_Time(
     int instance,
     uint16_t year,
@@ -201,179 +380,355 @@ static void Load_Control_WriteProperty_Start_Time(
     status = Load_Control_Write_Property(&wp_data);
     zassert_true(status, NULL);
 }
-#endif
 
 static void testLoadControlStateMachine(void)
 {
-#if 0 /*TODO: Need visiblity inside LoadControlStateMachine */
-    unsigned i = 0, j = 0;
+//TODO:    unsigned i = 0, j = 0;
     uint8_t level = 0;
 
     Load_Control_Init();
-    /* validate the triggers for each state change */
-    for (j = 0; j < 20; j++) {
-        Load_Control_State_Machine(0);
-        for (i = 0; i < MAX_LOAD_CONTROLS; i++) {
-            zassert_equal(Load_Control_State[i], SHED_INACTIVE, NULL);
-        }
-    }
+
+//TODO:    /* validate the triggers for each state change */
+//TODO:    for (j = 0; j < 20; j++) {
+//TODO:        Load_Control_State_Machine(0);
+//TODO:        for (i = 0; i < MAX_LOAD_CONTROLS; i++) {
+//TODO:            zassert_equal(Load_Control_State[i], SHED_INACTIVE, NULL);
+//TODO:        }
+//TODO:    }
+
     /* SHED_REQUEST_PENDING */
     /* CancelShed - Start time has wildcards */
-    Load_Control_WriteProperty_Enable(pTest, 0, true);
-    Load_Control_WriteProperty_Shed_Duration(pTest, 0, 60);
-    Load_Control_WriteProperty_Start_Time_Wildcards(pTest, 0);
+    Load_Control_WriteProperty_Enable(0, true);
+    Load_Control_WriteProperty_Shed_Duration(0, 60);
+    Load_Control_WriteProperty_Start_Time_Wildcards(0);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_INACTIVE, NULL);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_INACTIVE, NULL);
 
     /* CancelShed - Requested_Shed_Level equal to default value */
     Load_Control_Init();
-    Load_Control_WriteProperty_Request_Shed_Level(pTest, 0, 0);
-    Load_Control_WriteProperty_Start_Time(pTest, 0, 2007, 2, 27, 15, 0, 0, 0);
-    Load_Control_WriteProperty_Shed_Duration(pTest, 0, 5);
-    datetime_set_values(&Current_Time, 2007, 2, 27, 15, 0, 0, 0);
+    Load_Control_WriteProperty_Request_Shed_Level(0, 0);
+    Load_Control_WriteProperty_Start_Time(0, 2007, 2, 27, 15, 0, 0, 0);
+    Load_Control_WriteProperty_Shed_Duration(0, 5);
+//TODO:    datetime_set_values(&Current_Time, 2007, 2, 27, 15, 0, 0, 0);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_INACTIVE, NULL);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_INACTIVE, NULL);
 
     /* CancelShed - Non-default values, but Start time is passed */
     Load_Control_Init();
-    Load_Control_WriteProperty_Enable(pTest, 0, true);
-    Load_Control_WriteProperty_Request_Shed_Level(pTest, 0, 1);
-    Load_Control_WriteProperty_Shed_Duration(pTest, 0, 5);
-    Load_Control_WriteProperty_Start_Time(pTest, 0, 2007, 2, 27, 15, 0, 0, 0);
-    datetime_set_values(&Current_Time, 2007, 2, 28, 15, 0, 0, 0);
+    Load_Control_WriteProperty_Enable(0, true);
+    Load_Control_WriteProperty_Request_Shed_Level(0, 1);
+    Load_Control_WriteProperty_Shed_Duration(0, 5);
+    Load_Control_WriteProperty_Start_Time(0, 2007, 2, 27, 15, 0, 0, 0);
+//TODO:    datetime_set_values(&Current_Time, 2007, 2, 28, 15, 0, 0, 0);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_INACTIVE, NULL);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_INACTIVE, NULL);
 
     /* ReconfigurePending - new write received while pending */
     Load_Control_Init();
-    Load_Control_WriteProperty_Enable(pTest, 0, true);
-    Load_Control_WriteProperty_Request_Shed_Level(pTest, 0, 1);
-    Load_Control_WriteProperty_Shed_Duration(pTest, 0, 5);
-    Load_Control_WriteProperty_Start_Time(pTest, 0, 2007, 2, 27, 15, 0, 0, 0);
-    datetime_set_values(&Current_Time, 2007, 2, 27, 5, 0, 0, 0);
+    Load_Control_WriteProperty_Enable(0, true);
+    Load_Control_WriteProperty_Request_Shed_Level(0, 1);
+    Load_Control_WriteProperty_Shed_Duration(0, 5);
+    Load_Control_WriteProperty_Start_Time(0, 2007, 2, 27, 15, 0, 0, 0);
+//TODO:    datetime_set_values(&Current_Time, 2007, 2, 27, 5, 0, 0, 0);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
-    Load_Control_WriteProperty_Request_Shed_Level(pTest, 0, 2);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
+    Load_Control_WriteProperty_Request_Shed_Level(0, 2);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
-    Load_Control_WriteProperty_Shed_Duration(pTest, 0, 6);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
+    Load_Control_WriteProperty_Shed_Duration(0, 6);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
-    Load_Control_WriteProperty_Duty_Window(pTest, 0, 60);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
+    Load_Control_WriteProperty_Duty_Window(0, 60);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
-    Load_Control_WriteProperty_Start_Time(pTest, 0, 2007, 2, 27, 15, 0, 0, 1);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
+    Load_Control_WriteProperty_Start_Time(0, 2007, 2, 27, 15, 0, 0, 1);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
 
     /* CannotMeetShed -> FinishedUnsuccessfulShed */
     Load_Control_Init();
-    Load_Control_WriteProperty_Enable(pTest, 0, true);
-    Load_Control_WriteProperty_Request_Shed_Level(pTest, 0, 1);
-    Load_Control_WriteProperty_Shed_Duration(pTest, 0, 120);
-    Load_Control_WriteProperty_Start_Time(pTest, 0, 2007, 2, 27, 15, 0, 0, 0);
-    datetime_set_values(&Current_Time, 2007, 2, 27, 5, 0, 0, 0);
+    Load_Control_WriteProperty_Enable(0, true);
+    Load_Control_WriteProperty_Request_Shed_Level(0, 1);
+    Load_Control_WriteProperty_Shed_Duration(0, 120);
+    Load_Control_WriteProperty_Start_Time(0, 2007, 2, 27, 15, 0, 0, 0);
+//TODO:    datetime_set_values(&Current_Time, 2007, 2, 27, 5, 0, 0, 0);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
     /* set to lowest value so we cannot meet the shed level */
-    datetime_set_values(&Current_Time, 2007, 2, 27, 16, 0, 0, 0);
+//TODO:    datetime_set_values(&Current_Time, 2007, 2, 27, 16, 0, 0, 0);
     Analog_Output_Present_Value_Set(0, 0, 16);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_NON_COMPLIANT, NULL);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_NON_COMPLIANT, NULL);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_NON_COMPLIANT, NULL);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_NON_COMPLIANT, NULL);
     /* FinishedUnsuccessfulShed */
-    datetime_set_values(&Current_Time, 2007, 2, 27, 23, 0, 0, 0);
+//TODO:    datetime_set_values(&Current_Time, 2007, 2, 27, 23, 0, 0, 0);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_INACTIVE, NULL);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_INACTIVE, NULL);
 
     /* CannotMeetShed -> UnsuccessfulShedReconfigured */
     Load_Control_Init();
-    Load_Control_WriteProperty_Enable(pTest, 0, true);
-    Load_Control_WriteProperty_Request_Shed_Level(pTest, 0, 1);
-    Load_Control_WriteProperty_Shed_Duration(pTest, 0, 120);
-    Load_Control_WriteProperty_Start_Time(pTest, 0, 2007, 2, 27, 15, 0, 0, 0);
-    datetime_set_values(&Current_Time, 2007, 2, 27, 5, 0, 0, 0);
+    Load_Control_WriteProperty_Enable(0, true);
+    Load_Control_WriteProperty_Request_Shed_Level(0, 1);
+    Load_Control_WriteProperty_Shed_Duration(0, 120);
+    Load_Control_WriteProperty_Start_Time(0, 2007, 2, 27, 15, 0, 0, 0);
+//TODO:    datetime_set_values(&Current_Time, 2007, 2, 27, 5, 0, 0, 0);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
     /* set to lowest value so we cannot meet the shed level */
-    datetime_set_values(&Current_Time, 2007, 2, 27, 16, 0, 0, 0);
+//TODO:    datetime_set_values(&Current_Time, 2007, 2, 27, 16, 0, 0, 0);
     Analog_Output_Present_Value_Set(0, 0, 16);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_NON_COMPLIANT, NULL);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_NON_COMPLIANT, NULL);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_NON_COMPLIANT, NULL);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_NON_COMPLIANT, NULL);
     /* FinishedUnsuccessfulShed */
-    Load_Control_WriteProperty_Start_Time(pTest, 0, 2007, 2, 27, 16, 0, 0, 0);
+    Load_Control_WriteProperty_Start_Time(0, 2007, 2, 27, 16, 0, 0, 0);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
-    datetime_set_values(&Current_Time, 2007, 2, 27, 16, 0, 1, 0);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_REQUEST_PENDING, NULL);
+//TODO:    datetime_set_values(&Current_Time, 2007, 2, 27, 16, 0, 1, 0);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_NON_COMPLIANT, NULL);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_NON_COMPLIANT, NULL);
     /* CanNowComplyWithShed */
     Analog_Output_Present_Value_Set(0, 100, 16);
-    datetime_set_values(&Current_Time, 2007, 2, 27, 16, 0, 2, 0);
+//TODO:    datetime_set_values(&Current_Time, 2007, 2, 27, 16, 0, 2, 0);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_COMPLIANT, NULL);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_COMPLIANT, NULL);
     level = Analog_Output_Present_Value(0);
-    zassert_equal(level, 90, NULL);
+//TODO: Fails:    zassert_equal(level, 90, NULL);
     /* FinishedSuccessfulShed */
-    datetime_set_values(&Current_Time, 2007, 2, 27, 23, 0, 0, 0);
+//TODO:    datetime_set_values(&Current_Time, 2007, 2, 27, 23, 0, 0, 0);
     Load_Control_State_Machine(0);
-    zassert_equal(Load_Control_State[0], SHED_INACTIVE, NULL);
+//TODO:    zassert_equal(Load_Control_State[0], SHED_INACTIVE, NULL);
     level = Analog_Output_Present_Value(0);
-    zassert_equal(level, 100, NULL);
-#else
-    ztest_test_skip();
-#endif
+//TODO: Fails:    zassert_equal(level, 100, NULL);
 }
 
-static void testLoadControl(void)
+
+#ifndef MAX_LOAD_CONTROLS
+#define MAX_LOAD_CONTROLS (4)
+#endif
+
+static void test_api_stubs(void)
+{
+    BACNET_CHARACTER_STRING object_name_st = { 0 };
+
+    zassert_equal(Load_Control_Count(), MAX_LOAD_CONTROLS, NULL);
+
+    zassert_false(Load_Control_Valid_Instance(MAX_LOAD_CONTROLS), NULL);
+    zassert_equal(Load_Control_Index_To_Instance(MAX_LOAD_CONTROLS), Load_Control_Count(), NULL);
+    zassert_equal(Load_Control_Instance_To_Index(MAX_LOAD_CONTROLS), Load_Control_Count(), NULL);
+
+    zassert_false(Load_Control_Valid_Instance(UINT32_MAX), NULL);
+    zassert_equal(Load_Control_Index_To_Instance(UINT32_MAX), Load_Control_Count(), NULL);
+    zassert_equal(Load_Control_Instance_To_Index(UINT32_MAX), Load_Control_Count(), NULL);
+
+    zassert_true(Load_Control_Valid_Instance(0), NULL);
+    zassert_equal(Load_Control_Index_To_Instance(0), 0, NULL);
+    zassert_equal(Load_Control_Instance_To_Index(0), 0, NULL);
+
+    zassert_false(Load_Control_Object_Name(0, NULL), NULL);
+    zassert_false(Load_Control_Object_Name(UINT32_MAX, &object_name_st), NULL);
+
+
+    zassert_true(Load_Control_Object_Name(0, &object_name_st), NULL);
+    zassert_true(characterstring_valid(&object_name_st), NULL);
+    zassert_true(characterstring_printable(&object_name_st), NULL);
+}
+
+static void test_Load_Control_Read_Write_Property(void)
 {
     uint8_t apdu[MAX_APDU] = { 0 };
     int len = 0;
-    uint32_t len_value = 0;
-    uint8_t tag_number = 0;
-    BACNET_OBJECT_TYPE decoded_type = 0;
-    uint32_t decoded_instance = 0;
+    int test_len = 0;
     BACNET_READ_PROPERTY_DATA rpdata;
+    /* for decode value data */
+    BACNET_APPLICATION_DATA_VALUE value;
+    const int *pRequired = NULL;
+    const int *pOptional = NULL;
+    const int *pProprietary = NULL;
+    unsigned count = 0;
+    uint32_t object_instance = 0;
 
-    Analog_Output_Init();
+
+    zassert_equal(Load_Control_Read_Property(NULL), 0, NULL);
+    zassert_false(Load_Control_Write_Property(NULL), NULL);
+
+    object_instance = Load_Control_Index_To_Instance(0);
     Load_Control_Init();
+    count = Load_Control_Count();
+    zassert_true(count > 0, NULL);
     rpdata.application_data = &apdu[0];
     rpdata.application_data_len = sizeof(apdu);
     rpdata.object_type = OBJECT_LOAD_CONTROL;
-    rpdata.object_instance = 1;
-    rpdata.object_property = PROP_OBJECT_IDENTIFIER;
-    rpdata.array_index = BACNET_ARRAY_ALL;
-    len = Load_Control_Read_Property(&rpdata);
-    zassert_true(len != 0, NULL);
-    len = decode_tag_number_and_value(&apdu[0], &tag_number, &len_value);
-    zassert_equal(tag_number, BACNET_APPLICATION_TAG_OBJECT_ID, NULL);
-    len = decode_object_id(&apdu[len], &decoded_type, &decoded_instance);
-    zassert_equal(decoded_type, rpdata.object_type, NULL);
-    zassert_equal(decoded_instance, rpdata.object_instance, NULL);
-
-    return;
+    rpdata.object_instance = object_instance;
+    Load_Control_Property_Lists(&pRequired, &pOptional, &pProprietary);
+    while ((*pRequired) != -1) {
+	rpdata.object_property = *pRequired;
+	rpdata.array_index = BACNET_ARRAY_ALL;
+	len = Load_Control_Read_Property(&rpdata);
+	zassert_not_equal(len, BACNET_STATUS_ERROR, NULL);
+	if (len > 0) {
+	    test_len = bacapp_decode_application_data(
+		rpdata.application_data,
+		(uint8_t)rpdata.application_data_len, &value);
+	    zassert_true(test_len >= 0, NULL);
+	}
+	pRequired++;
+    }
+    while ((*pOptional) != -1) {
+	rpdata.object_property = *pOptional;
+	rpdata.array_index = BACNET_ARRAY_ALL;
+	len = Load_Control_Read_Property(&rpdata);
+	zassert_not_equal(len, BACNET_STATUS_ERROR, NULL);
+	if (len > 0) {
+	    test_len = bacapp_decode_application_data(
+		rpdata.application_data,
+		(uint8_t)rpdata.application_data_len, &value);
+	    zassert_true(test_len >= 0, NULL);
+	}
+	pOptional++;
+    }
 }
+
+static bool init_wp_data_and_value(
+    BACNET_WRITE_PROPERTY_DATA *wp_data,
+    BACNET_APPLICATION_DATA_VALUE * value)
+{
+    bool status = false;
+    if ((wp_data != NULL) && (value != NULL))
+    {
+	memset(&value, 0, sizeof(value));
+	memset(&wp_data, 0, sizeof(wp_data));
+
+	wp_data->object_type = OBJECT_LOAD_CONTROL;
+	wp_data->object_instance = 0;
+	wp_data->array_index = BACNET_ARRAY_ALL;
+	wp_data->priority = BACNET_NO_PRIORITY;
+	wp_data->object_property = PROP_SHED_DURATION;
+	value->context_specific = false;
+	value->context_tag = 0;
+	value->tag = BACNET_APPLICATION_TAG_UNSIGNED_INT;
+	value->type.Unsigned_Int = 0;  /* duration */
+	wp_data->application_data_len = bacapp_encode_application_data(&wp_data->application_data[0], value);
+	zassert_true(wp_data->application_data_len >= 0, NULL);
+	zassert_equal(wp_data->error_class, 0, NULL);
+	zassert_equal(wp_data->error_code, 0, NULL);
+
+	status = true;
+    }
+
+    return status;
+}
+
+static void test_ShedInactive_gets_RcvShedRequests(void)
+{
+    BACNET_APPLICATION_DATA_VALUE value = { 0 };
+    BACNET_WRITE_PROPERTY_DATA wp_data = { 0 };
+
+    /* Verify invalid parameters cause failure */
+    zassert_false(Load_Control_Write_Property(NULL), NULL);
+
+    /* Verify invalid parameter value of application_data_len cause failure */
+    zassert_true(init_wp_data_and_value(&wp_data, &value), NULL);
+    wp_data.application_data_len = -1;
+
+    zassert_false(Load_Control_Write_Property(&wp_data), NULL);
+    zassert_equal(wp_data.error_class, ERROR_CLASS_PROPERTY, NULL);
+    zassert_equal(wp_data.error_code, ERROR_CODE_VALUE_OUT_OF_RANGE, NULL);
+
+    /* Verify invalid parameter value of application_data_len cause failure */
+    zassert_true(init_wp_data_and_value(&wp_data, &value), NULL);
+    wp_data.application_data_len = -1;
+
+    zassert_false(Load_Control_Write_Property(&wp_data), NULL);
+    zassert_equal(wp_data.error_class, ERROR_CLASS_PROPERTY, NULL);
+    zassert_equal(wp_data.error_code, ERROR_CODE_VALUE_OUT_OF_RANGE, NULL);
+
+
+    /* Verify calls to dependencies are properly made */
+    // object_property == PROP_REQUESTED_SHED_LEVEL calls bacapp_decode_context_data()
+    // object_property == PROP_START_TIME calls bacapp_decode_application_data()
+    // object_property == PROP_SHED_DURATION calls nothing
+    // object_property == PROP_DUTY_WINDOW calls nothing
+    // object_property == PROP_SHED_LEVELS calls nothing
+    // object_property == PROP_ENABLE calls nothing
+    // default returns error
+}
+
+static void test_ShedReqPending_gets_ReconfigPending(void)
+{
+    ztest_test_skip();
+}
+
+static void test_ShedReqPending_gets_CancelShed(void)
+{
+    ztest_test_skip();
+}
+
+static void test_ShedReqPending_gets_CannotMeetShed(void)
+{
+    ztest_test_skip();
+}
+
+static void test_ShedReqPending_gets_PrepareToShed(void)
+{
+    ztest_test_skip();
+}
+
+static void test_ShedReqPending_gets_AbleToMeetShed(void)
+{
+    ztest_test_skip();
+}
+
+static void test_ShedNonCommpliant_gets_UnsuccessfulShedReconfig(void)
+{
+    ztest_test_skip();
+}
+
+static void test_ShedNonCommpliant_gets_FinishedUnsuccessfulShed(void)
+{
+    ztest_test_skip();
+}
+
+static void test_ShedNonCommpliant_gets_CanNowComplyWithShed(void)
+{
+    ztest_test_skip();
+}
+
+static void test_ShedCommpliant_gets_FinishedSuccessfulShed(void)
+{
+    ztest_test_skip();
+}
+
+static void test_ShedCommpliant_gets_SuccessfulShedReconfig(void)
+{
+    ztest_test_skip();
+}
+
+static void test_ShedCommpliant_gets_CanNoLongerComplyWithShed(void)
+{
+    ztest_test_skip();
+}
+
 /**
  * @}
  */
@@ -382,8 +737,22 @@ static void testLoadControl(void)
 void test_main(void)
 {
     ztest_test_suite(lc_tests,
-     ztest_unit_test(testLoadControl),
-     ztest_unit_test(testLoadControlStateMachine)
+     ztest_unit_test(test_api_stubs),
+     ztest_unit_test(test_Load_Control_Count),
+     ztest_unit_test(test_Load_Control_Read_Write_Property),
+     ztest_unit_test(testLoadControlStateMachine),
+     ztest_unit_test(test_ShedInactive_gets_RcvShedRequests),
+     ztest_unit_test(test_ShedReqPending_gets_ReconfigPending),
+     ztest_unit_test(test_ShedReqPending_gets_CancelShed),
+     ztest_unit_test(test_ShedReqPending_gets_CannotMeetShed),
+     ztest_unit_test(test_ShedReqPending_gets_PrepareToShed),
+     ztest_unit_test(test_ShedReqPending_gets_AbleToMeetShed),
+     ztest_unit_test(test_ShedNonCommpliant_gets_UnsuccessfulShedReconfig),
+     ztest_unit_test(test_ShedNonCommpliant_gets_FinishedUnsuccessfulShed),
+     ztest_unit_test(test_ShedNonCommpliant_gets_CanNowComplyWithShed),
+     ztest_unit_test(test_ShedCommpliant_gets_FinishedSuccessfulShed),
+     ztest_unit_test(test_ShedCommpliant_gets_SuccessfulShedReconfig),
+     ztest_unit_test(test_ShedCommpliant_gets_CanNoLongerComplyWithShed)
      );
 
     ztest_run_test_suite(lc_tests);

test/bacnet/basic/object/lo/CMakeLists.txt

@@ -45,6 +45,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/basic/object/ao.c
 	${SRC_DIR}/bacnet/basic/sys/bigend.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
 	${SRC_DIR}/bacnet/wp.c

test/bacnet/basic/object/lsp/CMakeLists.txt

@@ -44,6 +44,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/bactext.c
 	${SRC_DIR}/bacnet/basic/sys/bigend.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
 	${SRC_DIR}/bacnet/wp.c

test/bacnet/basic/object/ms-input/CMakeLists.txt

@@ -43,6 +43,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/bactext.c
 	${SRC_DIR}/bacnet/basic/sys/bigend.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
 	${SRC_DIR}/bacnet/wp.c

test/bacnet/basic/object/mso/CMakeLists.txt

@@ -43,6 +43,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/bactext.c
 	${SRC_DIR}/bacnet/basic/sys/bigend.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
 	${SRC_DIR}/bacnet/wp.c

test/bacnet/basic/object/msv/CMakeLists.txt

@@ -44,6 +44,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/basic/sys/bigend.c
 	${SRC_DIR}/bacnet/cov.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
 	${SRC_DIR}/bacnet/memcopy.c

test/bacnet/basic/object/netport/CMakeLists.txt

@@ -45,6 +45,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/basic/sys/bigend.c
 	${SRC_DIR}/bacnet/datalink/bvlc.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
 	${SRC_DIR}/bacnet/proplist.c

test/bacnet/basic/object/objects/main.c

@@ -53,6 +53,7 @@ void testBACnetObjects(Test *pTest)
     unsigned test_point = 0;
     const unsigned max_test_points = 20;
     OBJECT_DEVICE_T *pDevice;
+    bool status = false;
 
     for (test_point = 0; test_point < max_test_points; test_point++) {
         device_id = test_point * (BACNET_MAX_INSTANCE / max_test_points);
@@ -74,7 +75,8 @@ void testBACnetObjects(Test *pTest)
             pTest, pDevice, objects_device_id(test_point));
     }
     for (test_point = 0; test_point < max_test_points; test_point++) {
-        pDevice = objects_device_delete(0);
+        status = objects_device_delete(0);
+        ct_test(pTest, status);
     }
 }
 

test/bacnet/basic/object/objects/src/main.c

@@ -20,53 +20,60 @@
 /**
  * @brief Test
  */
-#if 0 /*TODO: Change to use external methods */
 static void testBACnetObjectsCompare(
-    OBJECT_DEVICE_T *pDevice, uint32_t device_id)
+    OBJECT_DEVICE_T *pDevice, uint32_t expected_device_id)
 {
     zassert_not_null(pDevice, NULL);
     if (pDevice) {
         zassert_not_null(pDevice->Object_List, NULL);
-        zassert_equal(pDevice->Object_Identifier.instance, device_id, NULL);
+        zassert_equal(pDevice->Object_Identifier.instance, expected_device_id, NULL);
         zassert_equal(pDevice->Object_Identifier.type, OBJECT_DEVICE, NULL);
         zassert_equal(pDevice->Object_Type, OBJECT_DEVICE, NULL);
     }
 }
-#endif
 
 static void testBACnetObjects(void)
 {
-#if 0 /*TODO: Change to use external methods */
     uint32_t device_id = 0;
     unsigned test_point = 0;
     const unsigned max_test_points = 20;
     OBJECT_DEVICE_T *pDevice;
 
+
+    /* Verify deleting a non-existant object returns the correct value */
+    zassert_false(objects_device_delete(0), NULL);
+
+    /* Create devices */
     for (test_point = 0; test_point < max_test_points; test_point++) {
         device_id = test_point * (BACNET_MAX_INSTANCE / max_test_points);
         pDevice = objects_device_new(device_id);
         testBACnetObjectsCompare(pDevice, device_id);
+
+	/* Verify the last created device can be fetched by ID */
         pDevice = objects_device_by_instance(device_id);
         testBACnetObjectsCompare(pDevice, device_id);
     }
     zassert_equal(max_test_points, objects_device_count(), NULL);
+
+    /* Verify each of the expected IDs can be fetched by ID */
     for (test_point = 0; test_point < max_test_points; test_point++) {
         device_id = test_point * (BACNET_MAX_INSTANCE / max_test_points);
         pDevice = objects_device_by_instance(device_id);
         testBACnetObjectsCompare(pDevice, device_id);
     }
+    /* Verify each of the expected IDs can be fetched by index */
     for (test_point = 0; test_point < max_test_points; test_point++) {
         device_id = test_point * (BACNET_MAX_INSTANCE / max_test_points);
         pDevice = objects_device_data(test_point);
-        testBACnetObjectsCompare(
-            pDevice, Keylist_Key(Device_List, test_point));
+        testBACnetObjectsCompare(pDevice, device_id);
     }
+    /* Delete every object */
     for (test_point = 0; test_point < max_test_points; test_point++) {
-        pDevice = objects_device_delete(0);
+        device_id = test_point * (BACNET_MAX_INSTANCE / max_test_points);
+        zassert_true(objects_device_delete(0), NULL);
+        zassert_equal(objects_device_by_instance(device_id), NULL, NULL);
     }
-#else
-    ztest_test_skip();
-#endif
+    zassert_false(objects_device_delete(0), NULL);
 }
 /**
  * @}

test/bacnet/basic/object/osv/CMakeLists.txt

@@ -43,6 +43,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/bactext.c
 	${SRC_DIR}/bacnet/basic/sys/bigend.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
 	${SRC_DIR}/bacnet/wp.c

test/bacnet/basic/object/piv/CMakeLists.txt

@@ -43,6 +43,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/bactext.c
 	${SRC_DIR}/bacnet/basic/sys/bigend.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
 	${SRC_DIR}/bacnet/wp.c

test/bacnet/basic/object/schedule/CMakeLists.txt

@@ -44,6 +44,7 @@ add_executable(${PROJECT_NAME}
 	${SRC_DIR}/bacnet/bactimevalue.c
 	${SRC_DIR}/bacnet/basic/sys/bigend.c
 	${SRC_DIR}/bacnet/datetime.c
+	${SRC_DIR}/bacnet/basic/sys/days.c
 	${SRC_DIR}/bacnet/indtext.c
 	${SRC_DIR}/bacnet/lighting.c
 	${SRC_DIR}/bacnet/wp.c