Fixed BACnetAccessRule application integration into Access Rights object. Improved unit testing and code coverage. (#790)

src/bacnet/access_rule.h

@@ -13,7 +13,6 @@
 /* BACnet Stack defines - first */
 #include "bacnet/bacdef.h"
 /* BACnet Stack API */
-#include "bacnet/bacapp.h"
 #include "bacnet/bacdevobjpropref.h"
 
 typedef enum {
@@ -28,7 +27,7 @@ typedef enum {
     LOCATION_SPECIFIER_MAX = 2
 } BACNET_ACCESS_RULE_LOCATION_SPECIFIER;
 
-typedef struct {
+typedef struct BACnetAccessRule {
     BACNET_ACCESS_RULE_TIME_RANGE_SPECIFIER time_range_specifier;
     BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE time_range;
     BACNET_ACCESS_RULE_LOCATION_SPECIFIER location_specifier;
@@ -42,26 +41,19 @@ extern "C" {
 
 BACNET_STACK_EXPORT
 int bacapp_encode_access_rule(uint8_t *apdu, const BACNET_ACCESS_RULE *rule);
-BACNET_STACK_EXPORT
-int bacapp_encode_context_access_rule(
-    uint8_t *apdu, uint8_t tag_number, const BACNET_ACCESS_RULE *rule);
 BACNET_STACK_DEPRECATED("Use bacnet_access_rule_decode() instead")
 BACNET_STACK_EXPORT
 int bacapp_decode_access_rule(const uint8_t *apdu, BACNET_ACCESS_RULE *rule);
-BACNET_STACK_DEPRECATED("Use bacnet_access_rule_context_decode() instead")
-BACNET_STACK_EXPORT
-int bacapp_decode_context_access_rule(
-    const uint8_t *apdu, uint8_t tag_number, BACNET_ACCESS_RULE *rule);
 
 BACNET_STACK_EXPORT
 int bacnet_access_rule_decode(
     const uint8_t *apdu, size_t apdu_size, BACNET_ACCESS_RULE *data);
+
 BACNET_STACK_EXPORT
-int bacnet_access_rule_context_decode(
-    const uint8_t *apdu,
-    size_t apdu_size,
-    uint8_t tag_number,
-    BACNET_ACCESS_RULE *data);
+bool bacnet_access_rule_from_ascii(BACNET_ACCESS_RULE *value, const char *argv);
+BACNET_STACK_EXPORT
+bool bacnet_access_rule_same(
+    const BACNET_ACCESS_RULE *value1, const BACNET_ACCESS_RULE *value2);
 
 #ifdef __cplusplus
 }