Index: trunk/psLib/test/sys/tap_psString.c =================================================================== --- trunk/psLib/test/sys/tap_psString.c (revision 12607) +++ trunk/psLib/test/sys/tap_psString.c (revision 12781) @@ -20,6 +20,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-03-27 22:52:03 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-04-10 21:09:31 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -35,182 +35,124 @@ #define STR_0 "binky had a leeeetle lamb" -psS32 testStringCopy00(void); -psS32 testStringCopy01(void); -psS32 testStringCopy02(void); -psS32 testStringCopy03(void); -psS32 testStringCopy04(void); -//psS32 testStringCopy05(void); -psS32 testStringCopy06(void); - -psS32 testStrAppend00(void); -psS32 testStrAppend01(void); -psS32 testStrAppend02(void); -psS32 testStrAppend03(void); - -psS32 testStrPrepend00(void); -psS32 testStrPrepend01(void); -psS32 testStrPrepend02(void); -psS32 testStrPrepend03(void); - -psS32 testStrSplit00(void); -psS32 testNULLStrings(void); -psS32 testStrCheck(void); - psS32 main( psS32 argc, char* argv[] ) { - plan_tests(55); - - testStringCopy00(); - testStringCopy01(); - testStringCopy02(); - testStringCopy03(); - testStringCopy04(); - testStringCopy06(); - - testStrAppend00(); - testStrAppend01(); - testStrAppend02(); - testStrAppend03(); - - testStrPrepend00(); - testStrPrepend01(); - testStrPrepend02(); - testStrPrepend03(); - - testStrSplit00(); - testNULLStrings(); - testStrCheck(); -} - - -psS32 testStringCopy00(void) -{ -// diag("testStringCopy00"); - - char stringval[20] = "E R R O R"; - psS32 result = 0; - psS32 result1 = 0; - char *strResult; - - // Test point #1 Verify string copy - psStringCopy - strResult = psStringCopy(stringval); - // Perform string compare - result = strcmp(strResult, stringval); - // Modify original string - stringval[0]='G'; - result1 = strcmp(strResult, stringval); - stringval[0]='E'; - ok ( ( result == 0 ) && ( result1 != 0), - "Failed test point #1 strcmp result = %d expected 0\n",result); - - // Free memory allocated - psFree(strResult); - - return 0; -} - - -psS32 testStringCopy01(void) -{ -// diag("testStringCopy01"); - - char *emptyval = ""; - psS32 result = 0; - char *strResult; - - // Test point #2 Verify empty string copy - psStringCopy - strResult = psStringCopy(emptyval); - // Perform string compare - result = strcmp(strResult, emptyval); - ok ( result == 0, - "test point #2 strcmp result = %d expected 0\n",result); - - // Free memory allocated - psFree(strResult); - - return 0; -} - - -psS32 testStringCopy02(void) -{ -// diag("testStringCopy02"); - - psS32 result = 0; - psS32 result1 = 0; - char *strResult; - char stringval1[20] = "e r r o r"; - psS32 substringlen = 5; - char *substringval = "e r r"; - - // Test point #3 Verify string copy with length - psStringNCopy - strResult = psStringNCopy(stringval1, substringlen); - // Perform string compare and get string length - result = strncmp(strResult, substringval, substringlen); - // Change original string - stringval1[0] = 'g'; - result1 = strncmp(strResult, substringval, substringlen); - ok ( ( result == 0 ) && ( result1 == 0 ), - "Failed test point #3 strcmp result = %d expected 0\n",result); - - // Free memory allocated - psFree(strResult); - - return 0; -} - -psS32 testStringCopy03(void) -{ -// diag("testStringCopy03"); - - psS32 result = 0; - psS32 result1 = 0; - char *strResult; - char *stringvalnocopy = "F A I L"; - - // Test point #4 Verify empty string copy with length - psStringNCopy - strResult = psStringNCopy(stringvalnocopy, 0); - // Perform string compare and get sting length - result = strcmp(strResult, stringvalnocopy); - result1 = strlen(strResult); - ok ( result != 0, - "test point #4 strcmp result = %d didn't expected %d\n",result,0); - - // Free memory - psFree(strResult); - - return 0; -} - -psS32 testStringCopy04(void) -{ -// diag("testStringCopy04"); - - psS32 result = 0; - psS32 result1 = 0; - char *strResult; - char stringval[20] = "E R R O R"; - psS32 increaseSize = 5; - - // Test point #5 Copy string to larger string - psStringNCopy - strResult = psStringNCopy(stringval, (strlen(stringval) + increaseSize)); - // Perform string compare and get string length - result = strcmp(strResult, stringval); - result1 = strlen(strResult); - // The strings should still compare - ok ( result == 0 && result1 == strlen(stringval), - "test point #5 strcmp result = %d expected %d\n",result,0); - - // Free memory - psFree(strResult); - - return 0; -} + psLogSetFormat("HLNM"); + psLogSetLevel(PS_LOG_INFO); + plan_tests(72); + + + //testStringCopy00() + { + psMemId id = psMemGetId(); + char stringval[20] = "E R R O R"; + psS32 result = 0; + psS32 result1 = 0; + char *strResult; + + // Test point #1 Verify string copy - psStringCopy + strResult = psStringCopy(stringval); + // Perform string compare + result = strcmp(strResult, stringval); + // Modify original string + stringval[0]='G'; + result1 = strcmp(strResult, stringval); + stringval[0]='E'; + ok(( result == 0 ) && ( result1 != 0), + "Failed test point #1 strcmp result = %d expected 0",result); + // Free memory allocated + psFree(strResult); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // testStringCopy01() + { + psMemId id = psMemGetId(); + char *emptyval = ""; + psS32 result = 0; + char *strResult; + + // Test point #2 Verify empty string copy - psStringCopy + strResult = psStringCopy(emptyval); + // Perform string compare + result = strcmp(strResult, emptyval); + ok(result == 0, + "test point #2 strcmp result = %d expected 0",result); + // Free memory allocated + psFree(strResult); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // testStringCopy02() + { + psMemId id = psMemGetId(); + psS32 result = 0; + psS32 result1 = 0; + char *strResult; + char stringval1[20] = "e r r o r"; + psS32 substringlen = 5; + char *substringval = "e r r"; + + // Test point #3 Verify string copy with length - psStringNCopy + strResult = psStringNCopy(stringval1, substringlen); + // Perform string compare and get string length + result = strncmp(strResult, substringval, substringlen); + // Change original string + stringval1[0] = 'g'; + result1 = strncmp(strResult, substringval, substringlen); + ok(( result == 0 ) && ( result1 == 0 ), + "Failed test point #3 strcmp result = %d expected 0",result); + psFree(strResult); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // testStringCopy03() + { + psMemId id = psMemGetId(); + psS32 result = 0; + psS32 result1 = 0; + char *strResult; + char *stringvalnocopy = "F A I L"; + + // Test point #4 Verify empty string copy with length - psStringNCopy + strResult = psStringNCopy(stringvalnocopy, 0); + // Perform string compare and get sting length + result = strcmp(strResult, stringvalnocopy); + result1 = strlen(strResult); + ok(result != 0, + "test point #4 strcmp result = %d didn't expected %d",result,0); + psFree(strResult); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // testStringCopy04() + { + psMemId id = psMemGetId(); + psS32 result = 0; + psS32 result1 = 0; + char *strResult; + char stringval[20] = "E R R O R"; + psS32 increaseSize = 5; + + // Test point #5 Copy string to larger string - psStringNCopy + strResult = psStringNCopy(stringval, (strlen(stringval) + increaseSize)); + // Perform string compare and get string length + result = strcmp(strResult, stringval); + result1 = strlen(strResult); + // The strings should still compare + ok(result == 0 && result1 == strlen(stringval), + "test point #5 strcmp result = %d expected %d",result,0); + psFree(strResult); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } // XXX This test needs to be modified to check for maximum size // This will require a mod to psStringNCopy source to check for maximum size // -//psS32 testStringCopy05(void) +//psS32 testStringCopy05() //{ // char *strResult; @@ -231,369 +173,293 @@ -psS32 testStringCopy06(void) -{ -// diag("testStringCopy06"); - - char *strResult; - char stringval[20] = "E R R O R"; - psS32 result = 0; - - // Test point #7 Verify creation of string literal - PS_STRING - strResult = PS_STRING(E R R O R); - result = strcmp(strResult, stringval); - ok ( result == 0, - "test point #7 strcmp result = %d expected %d",result,0); - - // Memory should not have been allocated - return 0; + // testStringCopy06() + { + psMemId id = psMemGetId(); + char *strResult; + char stringval[20] = "E R R O R"; + psS32 result = 0; + + // Test point #7 Verify creation of string literal - PS_STRING + strResult = PS_STRING(E R R O R); + result = strcmp(strResult, stringval); + ok(result == 0, + "test point #7 strcmp result = %d expected %d",result,0); + // Memory should not have been allocated + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // testStrAppend00() + { + psMemId id = psMemGetId(); + char *str = psStringCopy("3.14159"); + psStringAppend(&str, "%d%s", 2653589, "79323846"); + // Test point: Verify string append + int result = strcmp(str, "3.14159265358979323846"); + ok(result == 0, "Failed test point"); + psFree(str); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // testStrAppend01() + { + psMemId id = psMemGetId(); + char *str=NULL; + // test nonsensical invocations ... + ssize_t sz = psStringAppend(NULL, NULL); + ok(sz == 0, "Failed test point"); + sz = psStringAppend(&str, NULL); + ok(sz == 0, "Failed test point"); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // testStrAppend02() + { + psMemId id = psMemGetId(); + char *str=NULL; + // test string creation + psStringAppend(&str, "%s", "fubar"); + int result = strcmp(str, "fubar"); + ok(result == 0, "Failed test point"); + psFree(str); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // testStrAppend03() + { + psMemId id = psMemGetId(); + char *str =psStringCopy(STR_0); + // test null-op + psStringAppend(&str, "%s", ""); + is_str(str, STR_0, "Failed test point"); + psFree(str); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // testStrPrepend00() + { + psMemId id = psMemGetId(); + char *str = psStringCopy("79323846"); + psStringPrepend(&str, "%s%d","3.14159", 2653589 ); + // Test point: Verify string append + int result = strcmp(str, "3.14159265358979323846"); + ok(result == 0, "Failed test point"); + psFree(str); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // testStrPrepend01() + { + psMemId id = psMemGetId(); + char *str=NULL; + // test nonsensical invocations ... + ssize_t sz = psStringPrepend(NULL, NULL); + ok(sz == 0, "Failed test point"); + sz = psStringPrepend(&str, NULL); + ok(sz == 0, "Failed test point"); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // testStrPrepend02() + { + psMemId id = psMemGetId(); + char *str=NULL; + // test string creation + psStringPrepend(&str, "%s", "fubar"); + int result = strcmp(str, "fubar"); + ok(result == 0, "Failed test point"); + psFree(str); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // testStrPrepend03() + { + // test null-op + psMemId id = psMemGetId(); + char *str = psStringCopy(STR_0); + psStringPrepend(&str, "%s", ""); + int result = strcmp(str, STR_0); + ok(result == 0, "test point str=[%s]", str); + psFree(str); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // testStrSplit00() + { + psMemId id = psMemGetId(); + psList *strList = NULL; + char str[35]; + char split[5]; + strncpy(str, "This is, a, test case, to check", 35); + strncpy(split, ",", 2); + psString psStr; + psString psSplit; + psStr = psStringCopy(str); + psSplit = psStringCopy(split); + + //Return NULL for NULL inputs + strList = psStringSplit(NULL, NULL, true); + ok(!strList, "psStringSplit" ); + psFree(strList); + + strList = NULL; + //Return empty list for NULL string input + strList = psStringSplit(NULL, split, true); + ok(!psListLength(strList), "psListLength()" ); + psFree(strList); + + strList = NULL; + //Return NULL for NULL splitter input + strList = psStringSplit(str, NULL, true); + ok(!strList, "psStringSplit" ); + psFree(strList); + + strList = NULL; + //Return a psList* of psStrings + strList = psStringSplit(str, split, true); + ok(strList->n == 4, + "psStringSplit to return the correct number of strings"); + ok(!strncmp((psString)(strList->head->data), "This is", 10), + "psStringSplit to return expected strings"); + ok(!strncmp((psString)(strList->head->next->data), " a", 10), + "psStringSplit to return expected strings"); + ok(!strncmp((psString)(strList->head->next->next->data), " test case",10), + "psStringSplit to return expected strings"); + ok(!strncmp((psString)(strList->head->next->next->next->data), " to check", 10), + "psStringSplit failed to return expected strings"); + + psFree(strList); + //Return correct psList when using (psString, char*) + strList = psStringSplit(psStr, split, true); + ok(strList->n == 4, + "psStringSplit to return the correct number of strings"); + ok(!strncmp((psString)(strList->head->data), "This is", 10), + "psStringSplit to return expected strings"); + ok(!strncmp((psString)(strList->head->next->data), " a", 10), + "psStringSplit failed to return expected strings"); + ok(!strncmp((psString)(strList->head->next->next->data), " test case",10), + "psStringSplit failed to return expected strings"); + ok(!strncmp((psString)(strList->head->next->next->next->data), " to check", 10), + "psStringSplit to return expected strings"); + + psFree(strList); + //Return correct psList when using (char*, psString) + strList = psStringSplit(str, psSplit, true); + ok(strList->n == 4, + "psStringSplit to return the correct number of strings"); + ok(!strncmp((psString)(strList->head->data), "This is", 10), + "psStringSplit to return expected strings"); + ok(!strncmp((psString)(strList->head->next->data), " a", 10), + "psStringSplit to return expected strings"); + ok(!strncmp((psString)(strList->head->next->next->data), " test case",10), + "psStringSplit to return expected strings"); + ok(!strncmp((psString)(strList->head->next->next->next->data), " to check", 10), + "psStringSplit to return expected strings"); + + psFree(strList); + //Return correct psList when using (psString, psString) + strList = psStringSplit(psStr, psSplit, true); + ok(strList->n == 4, + "psStringSplit to return the correct number of strings"); + ok(!strncmp((psString)(strList->head->data), "This is", 10), + "psStringSplit to return expected strings"); + ok(!strncmp((psString)(strList->head->next->data), " a", 10), + "psStringSplit to return expected strings"); + ok(!strncmp((psString)(strList->head->next->next->data), " test case",10), + "psStringSplit to return expected strings"); + ok(!strncmp((psString)(strList->head->next->next->next->data), " to check", 10), + "psStringSplit to return expected strings"); + + psFree(strList); + //Return correct psList output for string of zero length case + strncpy(str, "This is,, a,, test case,, to check", 35); + strList = psStringSplit(str, split, false); + ok(strList->n == 4, + "psStringSplit to return the correct number of strings"); + ok(!strncmp((psString)(strList->head->data), "This is", 10), + "psStringSplit to return expected strings"); + ok(!strncmp((psString)(strList->head->next->data), " a", 10), + "psStringSplit to return expected strings"); + ok(!strncmp((psString)(strList->head->next->next->data), " test case",10), + "psStringSplit to return expected strings"); + ok(!strncmp((psString)(strList->head->next->next->next->data), " to check", 10), + "psStringSplit to return expected strings"); + psFree(strList); + psFree(psStr); + psFree(psSplit); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // testNULLStrings() + { + psMemId id = psMemGetId(); + psString nullTest = NULL; + psString output = NULL; + ssize_t outSize = 0; + char** nullDest = NULL; + char** test = NULL; + //psStringCopy should return NULL for NULL input string + // psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message"); + output = psStringCopy(nullTest); + ok(output == NULL, "psStringCopy to return NULL for NULL input string"); + + //psStringNCopy should return NULL for NULL input string + output = psStringNCopy(nullTest, 100); + ok(output == NULL, "psStringNCopy to return NULL for NULL input string"); + + //psStringAppend should return 0 for NULL input destination + outSize = psStringAppend(nullDest, "%s", ""); + ok(outSize == 0, "psStringAppend to return 0 for NULL input destination"); + + //psStringAppend should return 0 for NULL input format + outSize = psStringAppend(test, nullTest); + ok(outSize == 0, "psStringAppend to return 0 for NULL input format"); + + //psStringPrepend should return 0 for NULL input destination + outSize = psStringPrepend(nullDest, " "); + ok(outSize == 0, "psStringPrepend to return 0 for NULL input destination"); + + //psStringPrepend should return 0 for NULL input format + outSize = psStringPrepend(test, nullTest); + ok(outSize == 0, "psStringPrepend to return 0 for NULL input format"); + + //psStringSplit should return empty list for NULL input string + psList *nullList = NULL; + nullList = psStringSplit(nullTest, ",", true); + ok(!psListLength(nullList), "psStringSplit to return NULL for NULL input string"); + psFree(nullList); + + nullList = NULL; + //psStringSplit should return NULL for NULL input splitter + nullList = psStringSplit("Hello World", nullTest, true); + ok(!nullList, "psStringSplit to return NULL for NULL input splitter"); + psFree(nullList); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + + // testStrCheck() + { + psMemId id = psMemGetId(); + psString str = psStringAlloc(10); + strcpy(str, "Hello"); + ok(psMemCheckString(str), "psString allocated!"); + ok(psMemCheckType(PS_DATA_STRING, str), "psString allocated"); + psFree(str); + + char charStr[10]; + ok(!psMemCheckType(PS_DATA_STRING, charStr), + "Input string is a psDataType"); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } } - - -psS32 testStrAppend00(void) -{ -// diag("testStrAppend00"); - - char *str=NULL; - int result = 0; - - str = psStringCopy("3.14159"); - - psStringAppend(&str, "%d%s", 2653589, "79323846"); - - // Test point: Verify string append - result = strcmp(str, "3.14159265358979323846"); - ok ( result == 0, "Failed test point\n"); - - psFree(str); - - return 0; -} - -psS32 testStrAppend01(void) -{ -// diag("testStrAppend01"); - - ssize_t sz; - char *str=NULL; - - // test nonsensical invocations ... - sz = psStringAppend(NULL, NULL); - ok ( sz == 0, "Failed test point\n"); - - sz = psStringAppend(&str, NULL); - ok ( sz == 0, "Failed test point\n"); - - return 0; -} - - -psS32 testStrAppend02(void) -{ -// diag("testStrAppend02"); - - char *str=NULL; - int result; - - // test string creation - psStringAppend(&str, "%s", "fubar"); - result = strcmp(str, "fubar"); - ok ( result == 0, "Failed test point\n"); - - psFree(str); - - return 0; -} - -psS32 testStrAppend03(void) -{ -// diag("testStrAppend03"); - - char *str =psStringCopy(STR_0); - - // test null-op - psStringAppend(&str, "%s", ""); - is_str(str, STR_0, "Failed test point"); - psFree(str); - - return 0; -} - - -psS32 testStrPrepend00(void) -{ -// diag("testStrPrepend00"); - - char *str=NULL; - int result = 0; - - str = psStringCopy("79323846"); - - psStringPrepend(&str, "%s%d","3.14159", 2653589 ); - - // Test point: Verify string append - result = strcmp(str, "3.14159265358979323846"); - ok ( result == 0, "Failed test point\n"); - - psFree(str); - - return 0; -} - - -psS32 testStrPrepend01(void) -{ -// diag("testStrPrepend01"); - - ssize_t sz; - char *str=NULL; - - // test nonsensical invocations ... - sz = psStringPrepend(NULL, NULL); - ok ( sz == 0, "Failed test point\n"); - - sz = psStringPrepend(&str, NULL); - ok ( sz == 0, "Failed test point\n"); - - return 0; -} - -psS32 testStrPrepend02(void) -{ -// diag("testStrPrepend02"); - - char *str=NULL; - int result; - - // test string creation - psStringPrepend(&str, "%s", "fubar"); - result = strcmp(str, "fubar"); - ok ( result == 0, "Failed test point\n"); - - psFree(str); - - return 0; -} - -psS32 testStrPrepend03(void) -{ -// diag("testStrPrepend03"); - - char *str=NULL; - int result; - - str = psStringCopy(STR_0); - - // test null-op - psStringPrepend(&str, "%s", ""); - result = strcmp(str, STR_0); - ok ( result == 0, "test point str=[%s]\n", str); - - psFree(str); - - return 0; -} - - -psS32 testStrSplit00(void) -{ -// diag("testStrSplit00"); - - psList *strList = NULL; - char str[35]; - char split[5]; - strncpy(str, "This is, a, test case, to check.", 35); - strncpy(split, ",", 2); - psString psStr; - psString psSplit; - psStr = psStringCopy(str); - psSplit = psStringCopy(split); - - //Return NULL for NULL inputs - strList = psStringSplit(NULL, NULL, true); - ok (!strList, "psStringSplit" ); - psFree(strList); - - strList = NULL; - //Return empty list for NULL string input - strList = psStringSplit(NULL, split, true); - ok ( !psListLength(strList), "psListLength()" ); - psFree(strList); - - strList = NULL; - //Return NULL for NULL splitter input - strList = psStringSplit(str, NULL, true); - ok ( !strList, "psStringSplit" ); - psFree(strList); - - strList = NULL; - //Return a psList* of psStrings - strList = psStringSplit(str, split, true); - ok (strList->n == 4, - "psStringSplit to return the correct number of strings.\n"); - - ok ( !strncmp((psString)(strList->head->data), "This is", 10), - "psStringSplit to return expected strings."); - - ok ( !strncmp((psString)(strList->head->next->data), " a", 10), - "psStringSplit to return expected strings."); - - ok ( !strncmp((psString)(strList->head->next->next->data), " test case",10), - "psStringSplit to return expected strings."); - - ok ( !strncmp((psString)(strList->head->next->next->next->data), " to check.", 10), - "psStringSplit failed to return expected strings."); - - psFree(strList); - //Return correct psList when using (psString, char*) - strList = psStringSplit(psStr, split, true); - ok (strList->n == 4, - "psStringSplit to return the correct number of strings.\n"); - - ok ( !strncmp((psString)(strList->head->data), "This is", 10), - "psStringSplit to return expected strings."); - - ok ( !strncmp((psString)(strList->head->next->data), " a", 10), - "psStringSplit failed to return expected strings."); - - ok ( !strncmp((psString)(strList->head->next->next->data), " test case",10), - "psStringSplit failed to return expected strings."); - - ok ( !strncmp((psString)(strList->head->next->next->next->data), " to check.", 10), - "psStringSplit to return expected strings."); - - psFree(strList); - //Return correct psList when using (char*, psString) - strList = psStringSplit(str, psSplit, true); - ok (strList->n == 4, - "psStringSplit to return the correct number of strings.\n"); - - ok ( !strncmp((psString)(strList->head->data), "This is", 10), - "psStringSplit to return expected strings."); - - ok ( !strncmp((psString)(strList->head->next->data), " a", 10), - "psStringSplit to return expected strings."); - - ok ( !strncmp((psString)(strList->head->next->next->data), " test case",10), - "psStringSplit to return expected strings."); - - ok ( !strncmp((psString)(strList->head->next->next->next->data), " to check.", 10), - "psStringSplit to return expected strings."); - - psFree(strList); - //Return correct psList when using (psString, psString) - strList = psStringSplit(psStr, psSplit, true); - ok (strList->n == 4, - "psStringSplit to return the correct number of strings.\n"); - - ok ( !strncmp((psString)(strList->head->data), "This is", 10), - "psStringSplit to return expected strings."); - - ok ( !strncmp((psString)(strList->head->next->data), " a", 10), - "psStringSplit to return expected strings."); - - ok ( !strncmp((psString)(strList->head->next->next->data), " test case",10), - "psStringSplit to return expected strings."); - - ok ( !strncmp((psString)(strList->head->next->next->next->data), " to check.", 10), - "psStringSplit to return expected strings."); - - psFree(strList); - //Return correct psList output for string of zero length case - strncpy(str, "This is,, a,, test case,, to check.", 35); - strList = psStringSplit(str, split, false); - ok (strList->n == 4, - "psStringSplit to return the correct number of strings.\n"); - - ok ( !strncmp((psString)(strList->head->data), "This is", 10), - "psStringSplit to return expected strings."); - - ok ( !strncmp((psString)(strList->head->next->data), " a", 10), - "psStringSplit to return expected strings."); - - ok ( !strncmp((psString)(strList->head->next->next->data), " test case",10), - "psStringSplit to return expected strings."); - - ok ( !strncmp((psString)(strList->head->next->next->next->data), " to check.", 10), - "psStringSplit to return expected strings."); - - psFree(strList); - psFree(psStr); - psFree(psSplit); - return 0; -} - -psS32 testNULLStrings(void) -{ -// diag("test""s"); - - psString nullTest = NULL; - psString output = NULL; - ssize_t outSize = 0; - char** nullDest = NULL; - char** test = NULL; - //psStringCopy should return NULL for NULL input string - // psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message"); - output = psStringCopy(nullTest); - ok (output == NULL, - "psStringCopy to return NULL for NULL input string.\n"); - - //psStringNCopy should return NULL for NULL input string - output = psStringNCopy(nullTest, 100); - ok (output == NULL, - "psStringNCopy to return NULL for NULL input string.\n"); - - //psStringAppend should return 0 for NULL input destination - outSize = psStringAppend(nullDest, "%s", ""); - ok (outSize == 0, - "psStringAppend to return 0 for NULL input destination.\n"); - - //psStringAppend should return 0 for NULL input format - outSize = psStringAppend(test, nullTest); - ok (outSize == 0, - "psStringAppend to return 0 for NULL input format.\n"); - - //psStringPrepend should return 0 for NULL input destination - outSize = psStringPrepend(nullDest, " "); - ok (outSize == 0, - "psStringPrepend to return 0 for NULL input destination.\n"); - - //psStringPrepend should return 0 for NULL input format - outSize = psStringPrepend(test, nullTest); - ok (outSize == 0, - "psStringPrepend to return 0 for NULL input format.\n"); - - //psStringSplit should return empty list for NULL input string - psList *nullList = NULL; - nullList = psStringSplit(nullTest, ",", true); - ok ( !psListLength(nullList), - "psStringSplit to return NULL for NULL input string.\n"); - psFree(nullList); - - nullList = NULL; - //psStringSplit should return NULL for NULL input splitter - nullList = psStringSplit("Hello World", nullTest, true); - ok ( !nullList, - "psStringSplit to return NULL for NULL input splitter.\n"); - psFree(nullList); - - return 0; -} - -psS32 testStrCheck(void) -{ -// diag("testStrCheck"); - - psString str = NULL; - str = psStringAlloc(10); - strcpy(str, "Hello"); - ok (psMemCheckString(str), "psString allocated!\n"); - - ok (psMemCheckType(PS_DATA_STRING, str), "psString allocated!\n"); - psFree(str); - - char charStr[10]; - ok (!psMemCheckType(PS_DATA_STRING, charStr), - "Input string is a psDataType"); - - return 0; -} +// HERE