From 69e9cf4ee1329bbc1473851023c372d335fa224a Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Thu, 18 Jan 2007 19:35:11 +0000
Subject: [PATCH] Fixed unit test for data length function.

---
 bacnet-stack/bacapp.c   |  10 +++++-----
 bacnet-stack/bacapp.ide | Bin 32878 -> 32822 bytes
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bacnet-stack/bacapp.c b/bacnet-stack/bacapp.c
index 607deb1d..ed99c65d 100644
--- a/bacnet-stack/bacapp.c
+++ b/bacnet-stack/bacapp.c
@@ -602,7 +602,7 @@ void testBACnetApplicationDataLength(Test * pTest)
     len = encode_closing_tag(&apdu[apdu_len], 3);
     apdu_len += len;
     /* verify the length of the data inside the opening/closing tags */
-    len = constructed_data_len(&apdu[0], apdu_len,
+    len = bacapp_data_len(&apdu[0], apdu_len,
         PROP_LIST_OF_OBJECT_PROPERTY_REFERENCES);
     ct_test(pTest, test_len == len);
 
@@ -617,7 +617,7 @@ void testBACnetApplicationDataLength(Test * pTest)
     len = encode_closing_tag(&apdu[apdu_len], 3);
     apdu_len += len;
     /* verify the length of the data inside the opening/closing tags */
-    len = constructed_data_len(&apdu[0], apdu_len,
+    len = bacapp_data_len(&apdu[0], apdu_len,
         PROP_OBJECT_IDENTIFIER);
     ct_test(pTest, test_len == len);
 
@@ -677,7 +677,7 @@ void testBACnetApplicationDataLength(Test * pTest)
     len = encode_closing_tag(&apdu[apdu_len], 3);
     apdu_len += len;
     /* verify the length of the data inside the opening/closing tags */
-    len = constructed_data_len(&apdu[0], apdu_len,
+    len = bacapp_data_len(&apdu[0], apdu_len,
         PROP_PRIORITY_ARRAY);
     ct_test(pTest, test_len == len);
 
@@ -709,7 +709,7 @@ void testBACnetApplicationDataLength(Test * pTest)
     len = encode_closing_tag(&apdu[apdu_len], 3);
     apdu_len += len;
     /* verify the length of the data inside the opening/closing tags */
-    len = constructed_data_len(&apdu[0], apdu_len,
+    len = bacapp_data_len(&apdu[0], apdu_len,
         PROP_START_TIME);
     ct_test(pTest, test_len == len);
 
@@ -728,7 +728,7 @@ void testBACnetApplicationDataLength(Test * pTest)
     len = encode_closing_tag(&apdu[apdu_len], 3);
     apdu_len += len;
     /* verify the length of the data inside the opening/closing tags */
-    len = constructed_data_len(&apdu[0], apdu_len,
+    len = bacapp_data_len(&apdu[0], apdu_len,
         PROP_REQUESTED_SHED_LEVEL);
     ct_test(pTest, test_len == len);
 }
diff --git a/bacnet-stack/bacapp.ide b/bacnet-stack/bacapp.ide
index e79ca367c4a5f8961d19776c62395b059885f15e..967d392c0bbd388742df85fe93d7b49a51a4a783 100644
GIT binary patch
delta 5077
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

delta 5154
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
TAMs1ztZzbrR6%U)6^{N5_I-LT