Преглед на файлове

Fix string content length for CIP string unit tests.

The mock source C strings are NULL-terminated, but CIP strings
are not; they have an explicit length member. Using strlen()
instead of sizeof() does not require the output CIP string to
contain a NULL terminator.
Jason Valenzuela преди 4 години
родител
ревизия
9b2e88d3ba
променени са 1 файла, в които са добавени 4 реда и са изтрити 4 реда
  1. 4 4
      source/tests/cip/cipstringtests.cpp

+ 4 - 4
source/tests/cip/cipstringtests.cpp

@@ -68,7 +68,7 @@ TEST (CipString, CreateStringNFromCString) {
   SetCipStringNByCstr(string, data, 3);
   CHECK_EQUAL(3, string->size);
   CHECK_EQUAL(4, string->length);
-  MEMCMP_EQUAL(data, string->string, sizeof(data) );
+  MEMCMP_EQUAL(data, string->string, strlen(data) );
 }
 
 /*** CipString2 ***/
@@ -116,7 +116,7 @@ TEST (CipString, CreateString2FromCString) {
   string = (CipString2 *) CipCalloc(1, sizeof(CipString2) );
   SetCipString2ByCstr(string, data);
   CHECK_EQUAL(6, string->length);
-  MEMCMP_EQUAL(data, string->string, sizeof(data) );
+  MEMCMP_EQUAL(data, string->string, strlen(data) );
 }
 
 /*** CipString ***/
@@ -164,7 +164,7 @@ TEST (CipString, CreateStringFromCString) {
   string = (CipString *) CipCalloc(1, sizeof(CipString) );
   SetCipStringByCstr(string, data);
   CHECK_EQUAL(12, string->length);
-  MEMCMP_EQUAL(data, string->string, sizeof(data) );
+  MEMCMP_EQUAL(data, string->string, strlen(data) );
 }
 
 /*** CipShortString ***/
@@ -212,5 +212,5 @@ TEST (CipString, CreateShortStringFromCString) {
   string = (CipShortString *) CipCalloc(1, sizeof(CipShortString) );
   SetCipShortStringByCstr(string, data);
   CHECK_EQUAL(12, string->length);
-  MEMCMP_EQUAL(data, string->string, sizeof(data) );
+  MEMCMP_EQUAL(data, string->string, strlen(data) );
 }