corrected unit tests for character set encodings.

This commit is contained in:
skarg
2006-01-05 19:54:52 +00:00
parent 137f36a977
commit 2dd16e5be2
3 changed files with 7 additions and 7 deletions
+2 -2
View File
@@ -1529,7 +1529,7 @@ void testBACDCodeCharacterString(Test * pTest)
status = characterstring_init( status = characterstring_init(
&char_string, &char_string,
CHARACTER_ANSI, CHARACTER_ANSI_X34,
NULL, NULL,
0); 0);
ct_test(pTest,status == true); ct_test(pTest,status == true);
@@ -1541,7 +1541,7 @@ void testBACDCodeCharacterString(Test * pTest)
diff = memcmp(characterstring_value(&char_string), &test_value[0], diff = memcmp(characterstring_value(&char_string), &test_value[0],
characterstring_length(&char_string)); characterstring_length(&char_string));
ct_test(pTest, diff == 0); 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] = 'S';
test_value[i + 1] = '\0'; test_value[i + 1] = '\0';
status = characterstring_init_ansi(&char_string, test_value); status = characterstring_init_ansi(&char_string, test_value);
+4 -4
View File
@@ -495,14 +495,14 @@ void testCharacterString(Test * pTest)
size_t i = 0; size_t i = 0;
// verify initialization // 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, status == true);
ct_test(pTest,characterstring_length(&bacnet_string) == 0); 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 */ /* bounds check */
status = characterstring_init( status = characterstring_init(
&bacnet_string, &bacnet_string,
CHARACTER_ANSI, CHARACTER_ANSI_X34,
NULL, NULL,
characterstring_capacity(&bacnet_string)+1); characterstring_capacity(&bacnet_string)+1);
ct_test(pTest, status == false); ct_test(pTest, status == false);
@@ -516,7 +516,7 @@ void testCharacterString(Test * pTest)
test_length = strlen(test_value); test_length = strlen(test_value);
status = characterstring_init( status = characterstring_init(
&bacnet_string, &bacnet_string,
CHARACTER_ANSI, CHARACTER_ANSI_X34,
&test_value[0], &test_value[0],
test_length); test_length);
ct_test(pTest, status == true); ct_test(pTest, status == true);
+1 -1
View File
@@ -321,7 +321,7 @@ int main(int argc, char *argv[])
{ {
case 1: case 1:
// used for testing, but kind of noisy on the network // used for testing, but kind of noisy on the network
Read_Properties(); //Read_Properties();
break; break;
case 2: case 2:
break; break;