From 2dd16e5be2d1afd6cd18f0ae0076ff4bbff00ad6 Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Thu, 5 Jan 2006 19:54:52 +0000
Subject: [PATCH] corrected unit tests for character set encodings.

---
 bacnet-stack/bacdcode.c         | 4 ++--
 bacnet-stack/bacstr.c           | 8 ++++----
 bacnet-stack/ports/linux/main.c | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bacnet-stack/bacdcode.c b/bacnet-stack/bacdcode.c
index b593e0b6..3407c497 100644
--- a/bacnet-stack/bacdcode.c
+++ b/bacnet-stack/bacdcode.c
@@ -1529,7 +1529,7 @@ void testBACDCodeCharacterString(Test * pTest)
 
     status = characterstring_init(
       &char_string,
-      CHARACTER_ANSI,
+      CHARACTER_ANSI_X34,
       NULL,
       0);
     ct_test(pTest,status == true);
@@ -1541,7 +1541,7 @@ void testBACDCodeCharacterString(Test * pTest)
     diff = memcmp(characterstring_value(&char_string), &test_value[0],
       characterstring_length(&char_string));
     ct_test(pTest, diff == 0);
-    for (i = 0; i < (MAX_APDU - 6); i++) {
+    for (i = 0; i < MAX_CHARACTER_STRING_BYTES-1; i++) {
         test_value[i] = 'S';
         test_value[i + 1] = '\0';
         status = characterstring_init_ansi(&char_string, test_value);
diff --git a/bacnet-stack/bacstr.c b/bacnet-stack/bacstr.c
index 81d9cfc9..01ebdbd6 100644
--- a/bacnet-stack/bacstr.c
+++ b/bacnet-stack/bacstr.c
@@ -495,14 +495,14 @@ void testCharacterString(Test * pTest)
   size_t i = 0;
 
   // verify initialization
-  status = characterstring_init(&bacnet_string,CHARACTER_ANSI,NULL,0);
+  status = characterstring_init(&bacnet_string,CHARACTER_ANSI_X34,NULL,0);
   ct_test(pTest, status == true);
   ct_test(pTest,characterstring_length(&bacnet_string) == 0);
-  ct_test(pTest,characterstring_encoding(&bacnet_string) == CHARACTER_ANSI);
+  ct_test(pTest,characterstring_encoding(&bacnet_string) == CHARACTER_ANSI_X34);
   /* bounds check */
   status = characterstring_init(
       &bacnet_string,
-      CHARACTER_ANSI,
+      CHARACTER_ANSI_X34,
       NULL,
       characterstring_capacity(&bacnet_string)+1);
   ct_test(pTest, status == false);
@@ -516,7 +516,7 @@ void testCharacterString(Test * pTest)
   test_length = strlen(test_value); 
   status = characterstring_init(
     &bacnet_string,
-    CHARACTER_ANSI,
+    CHARACTER_ANSI_X34,
     &test_value[0],
     test_length);
   ct_test(pTest, status == true);
diff --git a/bacnet-stack/ports/linux/main.c b/bacnet-stack/ports/linux/main.c
index 97f995a4..0d77b688 100644
--- a/bacnet-stack/ports/linux/main.c
+++ b/bacnet-stack/ports/linux/main.c
@@ -321,7 +321,7 @@ int main(int argc, char *argv[])
     {
       case 1:
         // used for testing, but kind of noisy on the network
-        Read_Properties();
+        //Read_Properties();
         break;
       case 2:
         break;