Index: trunk/psLib/test/sysUtils/tst_psAbort.c =================================================================== --- trunk/psLib/test/sysUtils/tst_psAbort.c (revision 4444) +++ (revision ) @@ -1,76 +1,0 @@ -/** @file atst_psAbort_01.c - * - * @brief Test driver for psAbort function - * - * This test drivers contains the following test points for psAbort - * 1) Multiple type values in abort message - * - * @author Eric Van Alst, MHPCC - * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-07 20:27:42 $ - * - * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii - */ - -#include "pslib_strict.h" -#include "psTest.h" - -static psS32 testAbort00(void); -static psS32 testAbort01(void); -static psS32 testAbort02(void); - -testDescription tests[] = { - {testAbort00, 0, "Multiple type values in abort message", -6, false}, - {testAbort01, 1, "String values in abort message", -6, false}, - {testAbort02, 2, "Empty strings in abort message", -6, false}, - {NULL} - }; - -psS32 main( psS32 argc, char* argv[] ) -{ - psLogSetLevel( PS_LOG_INFO ); - - return ( ! runTestSuite( stderr, "psAbort", tests, argc, argv ) ); -} - -static psS32 testAbort00(void) -{ - psS32 intval = 1; - psS64 longval = 2; - float floatval = 3.01; - char charval = 'E'; - char *stringval = "E R R O R"; - - // Test point #1 Multiple type values placed in the error string - psAbort(__func__, - "ALL TYPES intval = %d longval = %lld floatval = %f charval = %c strval = %s", - intval, longval, floatval, charval, stringval ); - - // Program execution should have ended before this statement but if it - // does not return a zero since the expected return value of this test - // is a non-zero value - return 0; -} - -static psS32 testAbort01(void) -{ - // Test point #2 String values in abort message - psAbort(PS_STRING(__LINE__), "NO_VALUES"); - - // Program execution should have ended before this statement but if it - // does not return a zero since the expected return value of this test - // is a non-zero value - return 0; -} - -static psS32 testAbort02(void) -{ - // Test point #2 String values in abort message - psAbort("",""); - - // Program execution should have ended before this statement but if it - // does not return a zero since the expected return value of this test - // is a non-zero value - return 0; -} Index: trunk/psLib/test/sysUtils/tst_psConfigure.c =================================================================== --- trunk/psLib/test/sysUtils/tst_psConfigure.c (revision 4444) +++ (revision ) @@ -1,52 +1,0 @@ -/** @file tst_psConfigure.c - * - * @brief Test driver for psconfigure functions - * - * This test driver contains the following test points for psConfigure - * functions. - * 1) Return current psLib version - * - * Return: Number of test points which failed - * - * @author Ross Harman, MHPCC - * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-07 20:27:42 $ - * - * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii - * - */ - -#include "pslib_strict.h" -#include "psTest.h" - - -static psS32 psLibVersion00(void); - - -testDescription tests[] = { - {psLibVersion00, 0, "Return current psLib version", 0, false}, - {NULL} - }; - - -psS32 main(psS32 argc, char* argv[]) -{ - psLogSetLevel(PS_LOG_INFO); - - return(!runTestSuite( stderr, "psConfigure", tests, argc, argv)); -} - - -static psS32 psLibVersion00(void) -{ - char *stringVal = NULL; - - stringVal = psLibVersion(); - psLogMsg(__func__,PS_LOG_INFO,"Current psLib version is: %s", stringVal); - psFree(stringVal); - - - return 0; -} - Index: trunk/psLib/test/sysUtils/tst_psError.c =================================================================== --- trunk/psLib/test/sysUtils/tst_psError.c (revision 4444) +++ (revision ) @@ -1,393 +1,0 @@ -/** @file tst_psError.c - * - * @brief Test driver for psError function - * - * This test driver contains the following test points for psError - * testError00 - psError() (Testpoint #486) - * testError01 - psErrorMsg(), psErrorStackPrint() (Testpoint #725) - * testError02 - psErrorStackPrintV() (Testpoint #726) - * testError03 - psErrorGet(), psErrorLast() (Testpoint #727) - * testError04 - psErrorClear() (Testpoint #728) - * testError05 - psErrorCodeString() (Testpoint #729) - * - * @author Eric Van Alst, MHPCC - * - * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-07 20:27:42 $ - * - * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii - * - */ - -#include -#include -#include -#include "pslib_strict.h" -#include "psTest.h" - -static psS32 testError00(void); -static psS32 testError01(void); -static psS32 testError02(void); -static psS32 testError03(void); -static psS32 testError04(void); -static psS32 testError05(void); -static psS32 testErrorRegister(void); - -// Function used in testError02 to verify the psErrorStackPrintV function -static void myErrorStackPrint(FILE *fd, - const char *fmt, - ...) -{ - va_list ap; - - // Test whether psErrorStackPrintV() accept a va_list for output variables - va_start(ap, fmt); - psErrorStackPrintV(fd, fmt, ap); - va_end(ap); -} - -testDescription tests[] = { - {testError00, 486, "psError()", 0, false}, - {testError01, 725, "psErrorMsg(),psErrorStackPrint()", 0, false}, - {testError02, 726, "psErrorStackPrintV()", 0, false}, - {testError03, 727, "psErrorGet(),psErrorLast()", 0, false}, - {testError04, 728, "psErrorClear()", 0, false}, - {testError05, 729, "psErrorCodeString()", 0, false}, - {testErrorRegister, 751, "psErrorRegister()", 0, false}, - {NULL} - }; - -psS32 main( psS32 argc, char* argv[] ) -{ - psLogSetLevel( PS_LOG_INFO ); - - return ( !runTestSuite(stderr, "psError", tests, argc, argv) ); -} - -static psS32 testError05(void) -{ - psErrorCode code = PS_ERR_BAD_PARAMETER_VALUE; - - // Verify the return value of psErrorCodeString - psLogMsg("tst_psError05", PS_LOG_INFO, psErrorCodeString(code)); - - // Verify the return value of psErrorCodeString if code is negative - if( psErrorCodeString(-1) != NULL) { - psLogMsg("tst_psError05", PS_LOG_INFO, "Failed error string with neg. code"); - return 40; - } - - return 0; -} - -static psS32 testError04(void) -{ - psErrorCode code = PS_ERR_BAD_PARAMETER_VALUE; - psErr *last = NULL; - psErr *lastAfterClear = NULL; - - // With an attemp error stack call psErrorClear - psErrorClear(); - - // Get the last error message and verify PS_ERR_NONE (empty stack) - lastAfterClear = psErrorLast(); - if(lastAfterClear->code != PS_ERR_NONE) { - psLogMsg("tst_psError05", PS_LOG_ERROR, "psErrorLast did not return expected."); - return 30; - } - psFree(lastAfterClear); - - // Generate three error messages to have messages on error stack - if (psError(code, true, "Error code = %d", code) != code) { - psLogMsg("tst_psError04", PS_LOG_ERROR, "Failed return value verify."); - return 31; - } - if (psError((code+1), false, "Error code = %d", (code+1)) != (code+1)) { - psLogMsg("tst_psError04", PS_LOG_ERROR, "Failed return value verify."); - return 32; - } - if (psError((code+2), false, "Error code = %d", (code+2)) != (code+2)) { - psLogMsg("tst_psError04", PS_LOG_ERROR, "Failed return value verify."); - return 33; - } - - // Get the last error message and verify it has the expected code - last = psErrorLast(); - if(last->code != (code+2)) { - psLogMsg("tst_psError04", PS_LOG_ERROR, "psErrorLast did not return expected."); - return 34; - } - psFree(last); - - // Clear the error stack - psErrorClear(); - - // Get the last error message after clear and verify is has PS_ERR_NONE code - lastAfterClear = psErrorLast(); - if(lastAfterClear->code != PS_ERR_NONE) { - psLogMsg("tst_psError05", PS_LOG_ERROR, "psErrorLast did not return expected."); - return 35; - } - psFree(lastAfterClear); - - return 0; -} - -static psS32 testError03(void) -{ - psErrorCode code = PS_ERR_BAD_PARAMETER_VALUE; - psErr *last = NULL; - psErr *getErr = NULL; - - // Attempt to get last error message with an empty stack verify psErr with code PS_ERR_NONE - last = psErrorLast(); - if(last->code != PS_ERR_NONE) { - psLogMsg("tst_psError03", PS_LOG_ERROR, "psErrorLast did return PS_ERR_NONE for empty stack"); - return 20; - } - psFree(last); - - // Attempt to get specific error message with empty stack verify psErr with code PS_ERR_NONE - getErr= psErrorGet(2); - if(getErr->code != PS_ERR_NONE) { - psLogMsg("tst_psError03", PS_LOG_ERROR, "psErrorGet did not return PS_ERR_NONE for empty stack"); - return 21; - } - psFree(getErr); - - // Attempt to get error message with invalid index and an empty stack - getErr= psErrorGet(-1); - if(getErr->code != PS_ERR_NONE) { - psLogMsg("tst_psError03", PS_LOG_ERROR, "psErrorGet with invalid index/empty stack"); - return 22; - } - psFree(getErr); - - // Generate three error messages - if (psError(code, true, "Error code = %d", code) != code) { - psLogMsg("tst_psError03", PS_LOG_ERROR, "Failed return value verify."); - return 23; - } - if (psError((code+1), false, "Error code = %d", (code+1)) != (code+1)) { - psLogMsg("tst_psError03", PS_LOG_ERROR, "Failed return value verify."); - return 24; - } - if (psError((code+2), false, "Error code = %d", (code+2)) != (code+2)) { - psLogMsg("tst_psError03", PS_LOG_ERROR, "Failed return value verify."); - return 25; - } - - last = psErrorLast(); - getErr= psErrorGet(0); - - // Check that last and get with 0 index are equal - if(last != getErr) { - psLogMsg("tst_psError03", PS_LOG_ERROR, "psErrorGet(0) not equal to psErrorLast"); - return 26; - } - psFree(last); - - // Verify the last error message was returned - if ( getErr->code != (code+2) ) { - psLogMsg("tst_psError03", PS_LOG_ERROR, "psErrorLast() did not retrieve last error"); - return 27; - } - psFree(getErr); - - // Verify the middle error message can be retrieved - getErr= psErrorGet(1); - if ( getErr->code != (code+1)) { - psLogMsg("tst_psError03", PS_LOG_ERROR, "psErrorGet() did not retrieve proper error"); - return 28; - } - psFree(getErr); - - // Verify the psErrorGet returns NULL if an invalid index is given - getErr= psErrorGet(-1); - if ( getErr->code != PS_ERR_NONE ) { - psLogMsg("tst_psError03", PS_LOG_ERROR, "psErrorGet() did not return PS_ERR_NONE w/ invalid arg"); - return 29; - } - psFree(getErr); - - return 0; -} - -static psS32 testError02(void) -{ - psErrorCode code = PS_ERR_BAD_PARAMETER_VALUE; - - // Generate error message and verify return value - if (psError(code, true, "Error code = %d", code) != code ) { - psLogMsg("tst_psError02", PS_LOG_ERROR, "Failed return value verify."); - return 10; - } - myErrorStackPrint(stderr,"ERROR STACK PRINT Test%dA",2); - - return 0; -} - -static psS32 testError01(void) -{ - psErrorCode code=PS_ERR_BAD_PARAMETER_VALUE; - - // Verify the return value of psErrorMsg is the psErrorCode passed - if ( psError(code, true, "Error code = %d", code) != code) { - psLogMsg("tst_psError01", PS_LOG_ERROR, "Failed return value verify."); - return 1; - } - psErrorStackPrint(stderr,"ERROR STACK PRINT Test1A"); - - // test1B empty string in for name argument - if ( psError(code+1, true, "Error code = %d", code+1) != code+1) { - psLogMsg("tst_psError01", PS_LOG_ERROR, "Failed return with empty string."); - return 2; - } - psErrorStackPrint(stderr,"ERROR STACK PRINT Test1B"); - - // test1D undefined code - if ( psError(-1, true, "Error code = %d", -1) != -1) { - psLogMsg("test_psError01", PS_LOG_ERROR, "Failed return with undefined code."); - return 4; - } - psErrorStackPrint(stderr,"ERROR STACK PRINT Test1D"); - - // test1E set psErrorMsg argument to false - if( psError(code, false, "Error code = %d", code) != code) { - psLogMsg("test_psError01", PS_LOG_ERROR, "Failed return with false new arg."); - return 5; - } - psErrorStackPrint(stderr,"ERROR STACK PRINT Test1E"); - - // test1F psErrorMsg with a error code less then PS_ERR_BASE(256) - if( psError(9, true, "Errno code = %d", 9) != 9) { - psLogMsg("test_psError01", PS_LOG_ERROR, "Failed return with errno code."); - return 6; - } - psErrorStackPrint(stderr,"ERROR STACK PRINT Test1F"); - - return 0; -} - -static psS32 testError00(void) -{ - - psS32 intval=1; - psS64 longval = 2; - float floatval = 3.01; - char charval = 'E'; - char *stringval = "E R R O R"; - - // Test point #1 Multiple type values placed in the error string - psError(PS_ERR_UNKNOWN, true, - "ALL TYPES intval = %d longval = %lld floatval = %f charval = %c strval = %s", - intval,longval,floatval,charval,stringval); - - // Test point #2 String values in error message - psError(PS_ERR_UNKNOWN, true, "NO VALUES"); - - // Test point #3 Empty strings in error message - psError(PS_ERR_UNKNOWN, true, ""); - - return 0; -} - -static psS32 testErrorRegister(void) -{ - - psS32 numErr = 4; - psErrorDescription errDesc[] = { {PS_ERR_N_ERR_CLASSES+1,"first"}, - {PS_ERR_N_ERR_CLASSES+2,"second"}, - {PS_ERR_N_ERR_CLASSES+3,"third"}, - {PS_ERR_N_ERR_CLASSES+4,"fourth"} }; - /* - 1. invoke psErrorRegister with a n>1 array of psErrorDescriptions. Verify that: - a. Each error description given is retrievable with psErrorCodeString. - */ - psErrorRegister(errDesc,numErr); - - for (psS32 i = 0; i < numErr; i++) { - const char* desc = psErrorCodeString(PS_ERR_N_ERR_CLASSES+1+i); - if (desc == NULL) { - psLogMsg(__func__,PS_LOG_ERROR, - "psErrorCode didn't find registered error code."); - return 1+i*10; - } - if (strcmp(desc,errDesc[i].description) != 0) { - psLogMsg(__func__,PS_LOG_ERROR, - "psErrorCode didn't return the proper description. Got '%s', expected '%s'.", - desc,errDesc[i].description); - return 2+i*10; - } - } - - /* - 2. invoke psErrorCodeString with a static/builtin psLib error code. Verify: - a. the result is correct. - */ - const char* desc = psErrorCodeString(PS_ERR_N_ERR_CLASSES); - if (desc == NULL) { - psLogMsg(__func__,PS_LOG_ERROR, - "psErrorCode didn't find static error code."); - return 40; - } - if (strcmp(desc,"error classes end marker") != 0) { - psLogMsg(__func__,PS_LOG_ERROR, - "psErrorCode didn't return the proper description. Got '%s', expected '%s'.", - desc,"error classes end marker"); - return 41; - } - - desc = psErrorCodeString(PS_ERR_NONE); - if (desc == NULL) { - psLogMsg(__func__,PS_LOG_ERROR, - "psErrorCode didn't find static error code."); - return 42; - } - if (strcmp(desc,"not an error") != 0) { - psLogMsg(__func__,PS_LOG_ERROR, - "psErrorCode didn't return the proper description. Got '%s', expected '%s'.", - desc,"not an error"); - return 43; - } - - /* - 3. invoke psErrorCodeString with an invalid code. Verify a NULL is returned. - */ - desc = psErrorCodeString(PS_ERR_N_ERR_CLASSES+numErr+1); - if (desc != NULL) { - psLogMsg(__func__,PS_LOG_ERROR, - "psErrorCode didn't return a NULL with a bogus input code."); - return 44; - } - - /* - 4. invoke psErrorRegister with a NULL psErrorDescription. Verify that: - a. the execution does not cease. - b. an appropriate error is generated. - */ - psLogMsg(__func__,PS_LOG_INFO,"Following should be an error."); - psErrorClear(); - psErrorRegister(NULL,1); - psErr* err = psErrorLast(); - if (err->code != PS_ERR_BAD_PARAMETER_NULL) { - psLogMsg(__func__,PS_LOG_ERROR, - "psErrorCode didn't generate proper error code for NULL input."); - return 45; - } - psFree(err); - - /* - 5. invoke psErrorRegister with nerror=0. Verify that no error occurs. - */ - psErrorClear(); - psErrorRegister(errDesc,0); - err = psErrorLast(); - if (err->code != PS_ERR_NONE) { - psLogMsg(__func__,PS_LOG_ERROR, - "psErrorCode generated an error for nErrors = 0."); - return 46; - } - psFree(err); - return 0; -} Index: trunk/psLib/test/sysUtils/tst_psLogMsg.c =================================================================== --- trunk/psLib/test/sysUtils/tst_psLogMsg.c (revision 4444) +++ (revision ) @@ -1,219 +1,0 @@ -/***************************************************************************** - This code will test whether trace levels can be set successfully. - This code will test whether trace messages can be displayed with printf - style string. - *****************************************************************************/ -#include -#include "pslib_strict.h" -#include "psTest.h" - -static psS32 testLogMsg00(); -static psS32 testLogMsg01(); -static psS32 testLogMsg02(); -static psS32 testLogMsg03(); -static psS32 testLogMsg04(); -static psS32 testLogMsg05(); - -testDescription tests[] = { - { - testLogMsg00, 0, "default log levels, printf-style strings", 0, false - }, - { - testLogMsg01, 1, "default log levels, psVLogMsg()", 0, false - }, - { - testLogMsg02, 2, "psLogSetLevel()", 0, false - }, - { - testLogMsg03, 3, "psLogSetFormat()", 0, false - }, - { - testLogMsg04, 4, "Output Format", 0, false - }, - { - testLogMsg05, 5, "psLogSetDestination()", 0, false - }, - { - NULL - } - }; - -psS32 main( psS32 argc, char* argv[] ) -{ - psLogSetLevel( PS_LOG_INFO ); - - return ( ! runTestSuite( stderr, "psLogMsg", tests, argc, argv ) ); -} - - -static void myLogMsg(const char *name, - psS32 level, - const char *fmt, - ...) -{ - va_list ap; - - // Test whether psLogMsgV() accept a va_list for output variables. - va_start(ap, fmt); - psLogMsgV(name, level, fmt, ap); - va_end(ap); -} - -static psS32 testLogMsg00() -{ - psS32 i = 0; - - // Send a log messages for levels 0:9. Only the first four messages - // should actually be displayed. - for (i=0;i<10;i++) { - psLogMsg(__func__, i, "Hello World! My level is %d %f %s\n", i, - (float) i, "beep beep"); - } - - return 0; -} - -static psS32 testLogMsg01() -{ - psS32 i = 0; - - // Send a log messages for levels 0:9. Only the first four messages - // should actually be displayed. - for (i=0;i<10;i++) { - myLogMsg(__func__, i, "Hello World! My level is %d %f %s\n", i, - (float) i, "beep beep"); - } - - return 0; -} - -static psS32 testLogMsg02() -{ - - psLogSetLevel(9); - // Send a log messages for levels 0:9. - for (psS32 i=0;i<10;i++) { - psLogMsg(__func__, i, "Hello World! My level is %d\n", i); - } - - psLogSetLevel(5); - psLogMsg(__func__, 6, "This should not be displayed (level %d)\n", 6); - psLogSetLevel(4); - psLogMsg(__func__, 4, "This should be displayed (level %d)\n", 4); - - return 0; -} - -static psS32 testLogMsg03() -{ - psS32 i; - - fprintf(stderr,"------------- psLogSetFormat() -------------\n"); - psLogSetFormat(""); - for (i=0;i<10;i++) { - psLogMsg(__func__, i, "Hello World! My level is %d\n", i); - } - - fprintf(stderr,"------------- psLogSetFormat(NULL) -------------\n"); - psLogSetFormat(NULL); - for (i=0;i<10;i++) { - psLogMsg(__func__, i, "Hello World! My level is %d\n", i); - } - - fprintf(stderr,"------------- psLogSetFormat(T) -------------\n"); - psLogSetFormat("T"); - for (i=0;i<10;i++) { - psLogMsg(__func__, i, "Hello World! My level is %d\n", i); - } - - fprintf(stderr,"------------- psLogSetFormat(H) -------------\n"); - psLogSetFormat("H"); - for (i=0;i<10;i++) { - psLogMsg(__func__, i, "Hello World! My level is %d\n", i); - } - - fprintf(stderr,"------------- psLogSetFormat(L) -------------\n"); - psLogSetFormat("L"); - for (i=0;i<10;i++) { - psLogMsg(__func__, i, "Hello World! My level is %d\n", i); - } - - fprintf(stderr,"------------- psLogSetFormat(N) -------------\n"); - psLogSetFormat("N"); - for (i=0;i<10;i++) { - psLogMsg(__func__, i, "Hello World! My level is %d\n", i); - } - - fprintf(stderr,"------------- psLogSetFormat(M) -------------\n"); - psLogSetFormat("M"); - for (i=0;i<10;i++) { - psLogMsg(__func__, i, "Hello World! My level is %d\n", i); - } - - fprintf(stderr,"------------- psLogSetFormat(THLNM) -------------\n"); - psLogSetFormat("THLNM"); - for (i=0;i<10;i++) { - psLogMsg(__func__, i, "Hello World! My level is %d\n", i); - } - - return 0; -} - - -psS32 testLogMsg04() -{ - psLogMsg("Under 15 chars", 0, "Hello World!\n"); - psLogMsg("This string is more than 15 chars", 0, "Hello World!\n"); - psLogMsg(__func__, 0, "Line #1\n"); - psLogMsg(__func__, 0, "Line #2\n"); - psLogMsg(__func__, 0, "Line #3"); - psLogMsg(__func__, 0, "Line #4"); - - return 0; -} - -psS32 testLogMsg05() -{ - psS32 i = 0; - FILE* file; - char line[256]; - - printf("--------------- psLogSetDestination(PS_LOG_NONE) ----------------\n"); - psLogSetDestination("none"); - for (i=0;i<10;i++) { - psLogMsg(__func__, i, "Hello World! My level is %d\n", i); - } - - printf("------------- psLogSetDestination(PS_LOG_TO_STDERR) -------------\n"); - psLogSetDestination("dest:stderr"); - for (i=0;i<10;i++) { - psLogMsg(__func__, i, "Hello World! My level is %d\n", i); - } - - printf("------------- psLogSetDestination(PS_LOG_TO_STDOUT) -------------\n"); - psLogSetDestination("dest:stdout"); - for (i=0;i<10;i++) { - psLogMsg(__func__, i, "Hello World! My level is %d\n", i); - } - printf("--------------- psLogSetDestination(""file:log.txt"") ---------------\n"); - psLogSetDestination("file:log.txt"); - for (i=0;i<10;i++) { - psLogMsg(__func__, i, "Hello World! My level is %d\n", i); - } - - psLogSetDestination("none"); - printf("--------------------- The Contents of log.txt -------------------\n"); - file = fopen("log.txt","r"); - while ( fgets(line,256,file) != NULL ) { - printf("%s",line); - } - fclose(file); - - printf("--------------- psLogSetDestination(""file:/eva/log.txt"") ----------\n"); - psLogSetDestination("file:/eva/log.txt"); - for ( i=0;i<10;i++) { - psLogMsg(__func__, i, "Hello World! My level is %d\n", i); - } - - return 0; -} Index: trunk/psLib/test/sysUtils/tst_psMemory.c =================================================================== --- trunk/psLib/test/sysUtils/tst_psMemory.c (revision 4444) +++ (revision ) @@ -1,535 +1,0 @@ -/** @file tst_psMemory.c -* -* @brief Contains the tests for psMemory.[ch] -* -* -* @author Robert DeSonia, MHPCC -* -* @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-07-01 03:57:42 $ -* -* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii -*/ - -#include -#include -#include -#include -#include -#include - - -#include "psTest.h" -#include "pslib.h" // need to allow malloc for callback use - -static psS32 TPFreeReferencedMemory( void ); -static psS32 TPOutOfMemory( void ); -static psS32 TPReallocOutOfMemory( void ); -static psPtr TPOutOfMemoryExhaustedCallback( size_t size ); -static psS32 TPCheckBufferPositive( void ); -static psS32 TPrealloc( void ); -static psS32 TPallocCallback( void ); -static psMemId memAllocCallback( const psMemBlock *ptr ); -static psMemId memFreeCallback( const psMemBlock *ptr ); -static psS32 TPcheckLeaks( void ); -static psS32 TPmemCorruption( void ); -static psS32 TPmultipleFree( void ); -void memProblemCallback( psMemBlock *ptr, const char *filename, unsigned int lineno ); - -static psS32 problemCallbackCalled = 0; -static psS32 allocCallbackCalled = 0; -static psS32 freeCallbackCalled = 0; -static psS32 exhaustedCallbackCalled = 0; - -testDescription tests[] = { - {TPCheckBufferPositive, 449, "checkBufferPositive", 0, false}, - {TPOutOfMemory, 450, "outOfMemory", -6, false}, - {TPReallocOutOfMemory, 562, "reallocOutOfMemory", -6, false}, - {TPrealloc, 451, "psRealloc", 0, false}, - {TPallocCallback, 452, "allocCallback", 0, false}, - {TPallocCallback, 453, "allocCallback2", 0, true}, - {TPcheckLeaks, 454, "checkLeaks", 0, false}, - {TPmemCorruption, 455, "psMemCorruption", 0, false}, - {TPFreeReferencedMemory, 456, "freeReferencedMemory", 0, false}, - {TPmultipleFree, 699, "multipleFree", -6, false}, - {NULL} - }; - -psS32 main(psS32 argc, char* argv[]) -{ - psLogSetLevel( PS_LOG_INFO ); - - return ( ! runTestSuite( stderr, "psMemory", tests, argc, argv ) ); -} - -// Testpoint #449, psAlloc shall allocate memory blocks writeable by caller. -psS32 TPCheckBufferPositive( void ) -{ - psS32 * mem; - const psS32 size = 100; - psS32 failed = 0; - - psLogMsg( __func__, PS_LOG_INFO, "psAlloc shall allocate memory blocks writeable by caller.\n" ); - - mem = ( psS32* ) psAlloc( size * sizeof( psS32 ) ); - if ( mem == NULL ) { - psError(PS_ERR_UNKNOWN, true, "psAlloc returned a NULL value in %s!", __func__ ); - return 1; - } - - for ( psS32 index = 0;index < size;index++ ) { - mem[ index ] = index; - } - - for ( psS32 index = 0;index < size;index++ ) { - if ( mem[ index ] != index ) { - failed++; - } - } - - psFree( mem ); - - return failed; -} - -psS32 TPFreeReferencedMemory( void ) -{ - // create memory - psS32 * mem; - psS32 ref = 0; - - psLogMsg( __func__, PS_LOG_INFO, "memory reference count shall be incrementable/decrementable" ); - - mem = ( psS32* ) psAlloc( 100 * sizeof( psS32 ) ); - - ref = psMemGetRefCounter( mem ); - if ( ref != 1 ) { - psError(PS_ERR_UNKNOWN, true, "Expected to buffer reference count to be initially 1, but it was %d.", ref ); - return 1; - } - - psMemIncrRefCounter( mem ); - psMemIncrRefCounter( mem ); - psMemIncrRefCounter( mem ); - - ref = psMemGetRefCounter( mem ); - if ( ref != 4 ) { - psError(PS_ERR_UNKNOWN, true, "Expected to find buffer reference count to be 4, but it was %d.", ref ); - return 1; - } - - psMemDecrRefCounter( mem ); - psMemDecrRefCounter( mem ); - - ref = psMemGetRefCounter( mem ); - if ( ref != 2 ) { - psError(PS_ERR_UNKNOWN, true, "Expected to find buffer reference count to be 2, but it was %d.", ref ); - return 1; - } - - psLogMsg( __func__, PS_LOG_INFO, "psFree shall be just decrement a multiple refererenced pointer." ); - - psMemDecrRefCounter( mem ); - - ref = psMemGetRefCounter( mem ); - if ( ref != 1 ) { - psError(PS_ERR_UNKNOWN, true, "Expected to find buffer reference count to be 1, but it was %d.", ref ); - return 1; - } - - psFree( mem ); - - return 0; -} - -// Bug/Task #562 regression test. Upon requesting more memory than is available, psRealloc shall call -// the psMemExhaustedCallback. -psS32 TPReallocOutOfMemory( void ) -{ - psS32 * mem[ 100 ]; - psMemExhaustedCallback cb; - - for ( psS32 lcv = 0; lcv < 100; lcv++ ) { - mem[ lcv ] = NULL; - } - - psLogMsg( __func__, PS_LOG_INFO, "Upon requesting more memory than is available, psRealloc shall call " - "the psMemExhaustedCallback.\n" ); - - exhaustedCallbackCalled = 0; - - cb = psMemExhaustedCallbackSet( TPOutOfMemoryExhaustedCallback ); - - for ( psS32 lcv = 0; lcv < 100; lcv++ ) { - mem[ lcv ] = ( psS32* ) psAlloc( 10 ); - } - - for ( psS32 lcv = 0; lcv < 100; lcv++ ) { - mem[ lcv ] = ( psS32* ) psRealloc( mem[ lcv ], SIZE_MAX/2 - 1000 ); - } - - psMemExhaustedCallbackSet( cb ); - - if ( exhaustedCallbackCalled == 0 ) { - psError(PS_ERR_UNKNOWN,true, "Called psRealloc with HUGE memory requirement and survived in %s!", __func__ ); - return 1; - } - - for ( psS32 lcv = 0; lcv < 100; lcv++ ) { - psFree( mem[ lcv ] ); - } - - return 0; -} -// Testpoint #450, Upon requesting more memory than is available, psalloc shall call -// the psMemExhaustedCallback. -psS32 TPOutOfMemory( void ) -{ - psS32 * mem[ 100 ]; - psMemExhaustedCallback cb; - - for ( psS32 lcv = 0; lcv < 100; lcv++ ) { - mem[ lcv ] = NULL; - } - - psLogMsg( __func__, PS_LOG_INFO, "Upon requesting more memory than is available, psalloc shall call " - "the psMemExhaustedCallback.\n" ); - - exhaustedCallbackCalled = 0; - - cb = psMemExhaustedCallbackSet( TPOutOfMemoryExhaustedCallback ); - - for ( psS32 lcv = 0; lcv < 100; lcv++ ) { - mem[ lcv ] = ( psS32* ) psAlloc( SIZE_MAX/2 - 1000 ); - } - - psMemExhaustedCallbackSet( cb ); - - if ( exhaustedCallbackCalled == 0 ) { - psError(PS_ERR_UNKNOWN,true, "Called psAlloc with HUGE memory requirement and survived in %s!", __func__ ); - return 1; - } - - for ( psS32 lcv = 0; lcv < 100; lcv++ ) { - psFree( mem[ lcv ] ); - } - - return 0; -} - -// Testpoint #451, psRealloc shall increase/decrease memory buffer while preserving contents -psS32 TPrealloc( void ) -{ - psS32 * mem1; - psS32* mem2; - psS32* mem3; - const psS32 initialSize = 100; - - psLogMsg( __func__, PS_LOG_INFO, "psRealloc shall increase/decrease memory buffer while " - "preserving contents" ); - - // allocate buffer with known values. - mem1 = ( psS32* ) psAlloc( initialSize * sizeof( psS32 ) ); - mem2 = ( psS32* ) psAlloc( initialSize * sizeof( psS32 ) ); - mem3 = ( psS32* ) psAlloc( initialSize * sizeof( psS32 ) ); - for ( psS32 lcv = 0;lcv < initialSize;lcv++ ) { - mem1[ lcv ] = mem2[ lcv ] = mem3[ lcv ] = lcv; - } - - psMemCheckCorruption( 1 ); - psLogMsg( __func__, PS_LOG_INFO, "Expanding memory buffer." ); - - // realloc to 2x - mem1 = ( psS32* ) psRealloc( mem1, 2 * initialSize * sizeof( psS32 ) ); - mem2 = ( psS32* ) psRealloc( mem2, 2 * initialSize * sizeof( psS32 ) ); - mem3 = ( psS32* ) psRealloc( mem3, 2 * initialSize * sizeof( psS32 ) ); - - // check values of initial block - for ( psS32 i = 0;i < initialSize;i++ ) { - if ( mem1[ i ] != i || mem2[ i ] != i || mem3[ i ] != i ) { - psError(PS_ERR_UNKNOWN,true, "Realloc didn't preserve the contents with expanding buffer in %s.", - __func__ ); - break; - } - } - - psMemCheckCorruption( 1 ); - psLogMsg( __func__, PS_LOG_INFO, "Shrinking memory buffer." ); - - // realloc to 1/2 initial value. - mem1 = ( psS32* ) psRealloc( mem1, ( initialSize / 2 ) * sizeof( psS32 ) ); - mem2 = ( psS32* ) psRealloc( mem2, ( initialSize / 2 ) * sizeof( psS32 ) ); - mem3 = ( psS32* ) psRealloc( mem3, ( initialSize / 2 ) * sizeof( psS32 ) ); - - // check values of initial block - for ( psS32 i = 0;i < initialSize / 2;i++ ) { - if ( mem1[ i ] != i || mem2[ i ] != i || mem3[ i ] != i ) { - psError(PS_ERR_UNKNOWN,true, "Realloc didn't preserve the contents with shrinking buffer in %s.", - __func__ ); - break; - } - } - - psFree( mem1 ); - psFree( mem2 ); - psFree( mem3 ); - - return 0; -} - -psS32 TPallocCallback( void ) -{ - psS32 * mem1; - psS32* mem2; - psS32* mem3; - psS32 currentId = psMemGetId(); - const psS32 initialSize = 100; - psS32 mark; - - allocCallbackCalled = 0; - freeCallbackCalled = 0; - psMemAllocCallbackSet( memAllocCallback ); - psMemFreeCallbackSet( memFreeCallback ); - - psMemAllocCallbackSetID( currentId + 1 ); - psMemFreeCallbackSetID( currentId + 1 ); - - psLogMsg( __func__, PS_LOG_INFO, "call to psAlloc/psRealloc shall generate a callback if specified " - "memory ID is allocated." ); - - // allocate buffer with known values. - mem1 = ( psS32* ) psAlloc( initialSize * sizeof( psS32 ) ); - mem2 = ( psS32* ) psAlloc( initialSize * sizeof( psS32 ) ); - mem3 = ( psS32* ) psAlloc( initialSize * sizeof( psS32 ) ); - - psFree( mem1 ); - psFree( mem2 ); - psFree( mem3 ); - - if ( allocCallbackCalled != 2 || freeCallbackCalled != 2 ) { - psError(PS_ERR_UNKNOWN,true, "alloc/free callbacks were not called the proper number of times in %s", - __func__ ); - return 1; - } - - allocCallbackCalled = 0; - freeCallbackCalled = 0; - - mark = psMemGetId(); - - mem1 = ( psS32* ) psAlloc( initialSize * sizeof( psS32 ) ); - - psMemAllocCallbackSetID( mark ); - - mem1 = ( psS32* ) psRealloc( mem1, initialSize * 2 * sizeof( psS32 ) ); - - psFree( mem1 ); - - if ( allocCallbackCalled != 2 ) { - psError(PS_ERR_UNKNOWN,true, "realloc callbacks were not called the proper number of times in %s", - __func__ ); - return 1; - } - - return 0; - -} - -psS32 TPcheckLeaks( void ) -{ - const psS32 numBuffers = 5; - psS32* buffers[ 5 ]; - psS32 lcv; - psS32 currentId = psMemGetId(); - psMemBlock** blks; - psS32 nLeaks = 0; - psS32 lineMark = 0; - - psLogMsg( __func__, PS_LOG_INFO, "psMemCheckLeaks shall return the number of blocks above an ID " - "that are still allocated" ); - - for ( lcv = 0;lcv < numBuffers;lcv++ ) { - lineMark = __LINE__ + 1; - buffers[ lcv ] = psAlloc( sizeof( psS32 ) ); - } - - for ( lcv = 1;lcv < numBuffers;lcv++ ) { - psFree( buffers[ lcv ] ); - } - - psLogMsg( __func__, PS_LOG_INFO, "following psMemCheckLeaks call should produce one instance." ); - - nLeaks = psMemCheckLeaks( currentId, &blks, stderr, false ); - - if ( nLeaks != 1 ) { - psError(PS_ERR_UNKNOWN,true, "psMemCheckLeaks should have found 1 leak, but found %d in %s.", nLeaks, __func__ ); - return 1; - } - - if ( blks[ 0 ] ->lineno != lineMark ) { - psError(PS_ERR_UNKNOWN,true, "psMemCheckLeaks found a leak other than the expected one (line %d vs %d) in %s.", - lineMark, blks[ 0 ] ->lineno, __func__ ); - return 1; - } - - psFree( buffers[ 0 ] ); - psFree( blks ); - - psLogMsg( __func__, PS_LOG_INFO, "Testing psMemCheckLeaks again with a different leak location" ); - psMemCheckLeaks(currentId,NULL,stderr, false); - - for ( lcv = 0;lcv < numBuffers;lcv++ ) { - lineMark = __LINE__ + 1; - buffers[ lcv ] = psAlloc( sizeof( psS32 ) ); - } - - for ( lcv = 0;lcv < numBuffers - 1;lcv++ ) { - psFree( buffers[ lcv ] ); - } - - psLogMsg( __func__, PS_LOG_INFO, "following psMemCheckLeaks call should produce one error." ); - - nLeaks = psMemCheckLeaks( currentId, &blks, stderr, false ); - - if ( nLeaks != 1 ) { - psError(PS_ERR_UNKNOWN,true, "psMemCheckLeaks should have found 1 leak, but found %d in %s.", nLeaks, __func__ ); - return 1; - } - - if ( blks[ 0 ] ->lineno != lineMark ) { - psError(PS_ERR_UNKNOWN,true, "psMemCheckLeaks found a leak other than the expected one in %s.", __func__ ); - return 1; - } - - psFree( buffers[ 4 ] ); - psFree( blks ); - - psLogMsg( __func__, PS_LOG_INFO, "Testing psMemCheckLeaks again with multiple leak locations." ); - - for ( lcv = 0;lcv < numBuffers;lcv++ ) { - lineMark = __LINE__ + 1; - buffers[ lcv ] = psAlloc( sizeof( psS32 ) ); - } - - for ( lcv = 0;lcv < numBuffers;lcv++ ) { - if ( lcv % 2 == 0 ) { - psFree( buffers[ lcv ] ); - } - } - - psLogMsg( __func__, PS_LOG_INFO, "following psMemCheckLeaks call should produce two errors." ); - - nLeaks = psMemCheckLeaks( currentId, &blks, stderr, false ); - - if ( nLeaks != 2 ) { - psError(PS_ERR_UNKNOWN,true, "psMemCheckLeaks should have found 1 leak, but found %d in %s.", nLeaks, __func__ ); - return 1; - } - - if ( blks[ 0 ] ->lineno != lineMark ) { - psError(PS_ERR_UNKNOWN,true, "psMemCheckLeaks found a leak other than the expected one in %s.", __func__ ); - return 1; - } - - psFree( blks ); - psFree( buffers[ 1 ] ); - psFree( buffers[ 3 ] ); - - return 0; -} - -psS32 TPmemCorruption( void ) -{ - psS32 * buffer = NULL; - psS32 oldValue = 0; - psS32 corruptions = 0; - psMemProblemCallback cb; - - psLogMsg( __func__, PS_LOG_INFO, "psMemCheckCorruption shall detect memory corruptions" ); - - buffer = psAlloc( sizeof( psS32 ) ); - - // cause memory corruption via buffer underflow - *buffer = 1; - buffer--; - oldValue = *buffer; - *buffer = 2; - - problemCallbackCalled = 0; - cb = psMemProblemCallbackSet( memProblemCallback ); - - psLogMsg( __func__, PS_LOG_INFO, "psMemCheckCorruption should output an error message and " - "memProblemCallback callback should be called." ); - - corruptions = psMemCheckCorruption( 0 ); - - // restore the memory problem callback - psMemProblemCallbackSet( cb ); - - // restore the value, 'uncorrupting' the buffer - *buffer = oldValue; - buffer++; - - psFree( buffer ); - - if ( corruptions != 1 ) { - psError(PS_ERR_UNKNOWN,true, "Expected one memory corruption but found %d in %s.", - corruptions, __func__ ); - return 1; - } - - if ( problemCallbackCalled != 1 ) { - psError(PS_ERR_UNKNOWN,true, "The memProblemCallback was not invoked but should have been in %s", - __func__ ); - return 1; - } - - return 0; - -} - -void memProblemCallback( psMemBlock *ptr, const char *file, unsigned int lineno ) -{ - psLogMsg( __func__, PS_LOG_INFO, "memory callback called for id %lld (%s:%d).", - ptr->id, file, lineno ); - problemCallbackCalled++; - return ; -} - -psMemId memAllocCallback( const psMemBlock *ptr ) -{ - psLogMsg( __func__, PS_LOG_INFO, "block %lld was (re)allocated", ptr->id ); - allocCallbackCalled++; - return 1; -} - -psMemId memFreeCallback( const psMemBlock *ptr ) -{ - psLogMsg( __func__, PS_LOG_INFO, "block %lld was freed", ptr->id ); - freeCallbackCalled++; - return 1; -} - -psPtr TPOutOfMemoryExhaustedCallback( size_t size ) -{ - psLogMsg( __func__, PS_LOG_INFO, "Custom MemExhaustedCallback was invoked." ); - exhaustedCallbackCalled++; - return NULL; -} - -psS32 TPmultipleFree( void ) -{ - - psPtr buffer = psAlloc( 1024 ); - psPtr buffer2 = buffer; - - psFree( buffer ); - - psLogMsg( __func__, PS_LOG_INFO, "Next should abort due to multiple freeing." ); - psFree( buffer2 ); - - psError(PS_ERR_UNKNOWN,true, - "Multiple psFree call survived"); - - return 0; -} Index: trunk/psLib/test/sysUtils/tst_psString.c =================================================================== --- trunk/psLib/test/sysUtils/tst_psString.c (revision 4444) +++ (revision ) @@ -1,436 +1,0 @@ -/** @file tst_psString.c - * - * -*- mode: C; c-basic-indent: 4; tab-width: 8; indent-tabs-mode: nil -*- - * vim: set cindent ts=8 sw=4 expandtab: - * - * @brief Test driver for psString functions - * - * This test driver contains the following test points for psStringCopy - * and psStringNCopy, and related string functions. - * 1) Verify string copy - psStringCopy - * 2) Verify empty string copy - psStringCopy - * 3) Verify string copy with length - psStringNCopy - * 4) Verify empty string copy with length - psStringNCopy - * 5) Copy string to larger string - psStringNCopy - * 6) Copy string with negative size - psStringNCopy - * 7) Verifiy creation of string literal - PS_STRING - * - * Return: Number of test points which failed - * - * @author Eric Van Alst, MHPCC - * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-30 00:33:03 $ - * - * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii - * - */ - -#include -#include "pslib_strict.h" -#include "psTest.h" - -#define STR_0 "binky had a leeeetle lamb" - -static psS32 testStringCopy00(void); -static psS32 testStringCopy01(void); -static psS32 testStringCopy02(void); -static psS32 testStringCopy03(void); -static psS32 testStringCopy04(void); -//static psS32 testStringCopy05(void); -static psS32 testStringCopy06(void); - -static psS32 testStrAppend00(void); -static psS32 testStrAppend01(void); -static psS32 testStrAppend02(void); -static psS32 testStrAppend03(void); - -static psS32 testStrPrepend00(void); -static psS32 testStrPrepend01(void); -static psS32 testStrPrepend02(void); -static psS32 testStrPrepend03(void); - -testDescription tests[] = { - {testStringCopy00, 0, "Verify string copy", 0, false}, - {testStringCopy01, 1, "Verify empty string copy", 0, false}, - {testStringCopy02, 2, "Verify string copy with length", 0, false}, - {testStringCopy03, 3, "Verify empty string copy with length", 0, false}, - {testStringCopy04, 4, "Copy string to larger string", 0, false}, - // {testStringCopy05, 5, "Copy string with negative size", 0, false}, - {testStringCopy06, 6, "Verify creation of string literal", 0, false}, - - {testStrAppend00, 7, "Verify generic string append", 0, false}, - {testStrAppend01, 8, "Test append NULL handling", 0, false}, - {testStrAppend02, 9, "Verify append string creation", 0, false}, - {testStrAppend03, 10, "Test append null-op", 0, false}, - - {testStrPrepend00,11, "Verify generic string prepend", 0, false}, - {testStrPrepend01,12, "Test prepend NULL handling", 0, false}, - {testStrPrepend02,13, "Verify prepend string creation", 0, false}, - {testStrPrepend03,14, "Test prepend null-op", 0, false}, - {NULL} - }; - -psS32 main( psS32 argc, char* argv[] ) -{ - psLogSetLevel( PS_LOG_INFO ); - - return ( ! runTestSuite( stderr, "psString", tests, argc, argv ) ); -} - -/* -psS32 main( psS32 argc, - char * argv[] ) -{ - psBool tpResult = false; - char stringval[20] = "E R R O R"; - char stringval1[20] = "e r r o r"; - char *stringvalnocopy = "F A I L"; - char *substringval = "e r r"; - psS32 substringlen = 6; - char *emptyval = ""; - psS32 tpFails = 0; - char *strResult; - psS32 increaseSize = 5; - psS32 negativeSize = -5; - psS32 result = 0; - psS32 result1 = 0; - psS32 memBlockAllocated = 0; - psMemBlock ***memBlockPtr = NULL; - -*/ - -static psS32 testStringCopy00(void) -{ - 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'; - if ( ( result != 0 ) || ( result1 == 0) ) { - fprintf(stderr, "Failed test point #1 strcmp result = %d expected 0\n",result); - fprintf(stderr, " src = %s expected %s\n", - strResult, stringval); - fprintf(stderr, " changed strcmp result = %d expected 1\n",result1); - fprintf(stderr, " changed src = %s expected %s\n",strResult, - stringval); - return 1; - } - - // Free memory allocated - psFree(strResult); - - return 0; -} - -static psS32 testStringCopy01(void) -{ - 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); - if ( result != 0 ) { - fprintf(stderr,"Failed test point #2 strcmp result = %d expected 0\n",result); - fprintf(stderr," src = %s expected %s\n", - strResult, emptyval); - return 1; - } - - // Free memory allocated - psFree(strResult); - - return 0; -} - -static psS32 testStringCopy02(void) -{ - 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); - if ( ( result != 0 ) || ( result1 != 0 ) ) { - fprintf(stderr,"Failed test point #3 strcmp result = %d expected 0\n",result); - fprintf(stderr," src = %s expected %s\n", - strResult, substringval); - fprintf(stderr," changed strcmp result = %d expected 0\n",result1); - fprintf(stderr," src = %s expected %s\n", - strResult, substringval); - return 1; - } - // Free memory allocated - psFree(strResult); - - return 0; -} - -static psS32 testStringCopy03(void) -{ - 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); - if ( result == 0 ) { - fprintf(stderr,"Failed test point #4 strcmp result = %d didn't expected %d\n",result,0); - fprintf(stderr," src = %s didn't expected %s\n", - strResult, stringvalnocopy); - return 1; - } - // Free memory - psFree(strResult); - - return 0; -} - -static psS32 testStringCopy04(void) -{ - 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 - if ( ( result != 0 ) || - ( result1 != strlen(stringval) ) ) { - fprintf(stderr,"Failed test point #5 strcmp result = %d expected %d\n",result,0); - fprintf(stderr," src = %s expected %s\n", - strResult, stringval); - fprintf(stderr," strlne result = %d expected %d\n",result1, - (psS32)strlen(stringval)); - return 1; - } - // Free memory - psFree(strResult); - - return 0; -} - -// 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 -// -//static psS32 testStringCopy05(void) -//{ -// char *strResult; -// char stringval[20] = "E R R O R"; -// psS32 negativeSize = -5; -// -// // Test point #6 Copy string with negative size - psStringNCopy -// strResult = psStringNCopy(stringval, negativeSize); -// if ( strResult != NULL ) { -// fprintf(stderr,"Failed test point #6 return value = %p expected NULL\n", -// strResult); -// return 1; -// } -// // Memory should not have been allocated -// -// return 0; -//} - -static psS32 testStringCopy06(void) -{ - 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); - if ( result != 0 ) { - fprintf(stderr,"Failed test point #7 strcmp result = %d expected %d",result,0); - return 1; - } - // Memory should not have been allocated - - return 0; -} - -static psS32 testStrAppend00(void) -{ - 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"); - if ( result != 0 ) { - fprintf(stderr,"%s","Failed test point\n"); - return 1; - } - - psFree(str); - - return 0; -} - -static psS32 testStrAppend01(void) -{ - ssize_t sz; - char *str=NULL; - - // test nonsensical invocations ... - sz = psStringAppend(NULL, NULL); - if ( sz != 0 ) { - fprintf(stderr,"%s","Failed test point\n"); - return 1; - } - sz = psStringAppend(&str, NULL); - if ( sz != 0 ) { - fprintf(stderr,"%s","Failed test point\n"); - return 1; - } - - return 0; -} - -static psS32 testStrAppend02(void) -{ - char *str=NULL; - int result; - - // test string creation - psStringAppend(&str, "%s", "fubar"); - result = strcmp(str, "fubar"); - if ( result != 0 ) { - fprintf(stderr,"%s","Failed test point\n"); - return 1; - } - - psFree(str); - - return 0; -} - -static psS32 testStrAppend03(void) -{ - char *str=NULL; - int result; - - str = psStringCopy(STR_0); - - // test null-op - psStringAppend(&str, ""); - result = strcmp(str, STR_0); - if ( result != 0 ) { - fprintf(stderr,"Failed test point str=[%s]\n", str); - return 1; - } - - psFree(str); - - return 0; -} - -static psS32 testStrPrepend00(void) -{ - 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"); - if ( result != 0 ) { - fprintf(stderr,"%s","Failed test point\n"); - return 1; - } - - psFree(str); - - return 0; -} - -static psS32 testStrPrepend01(void) -{ - ssize_t sz; - char *str=NULL; - - // test nonsensical invocations ... - sz = psStringPrepend(NULL, NULL); - if ( sz != 0 ) { - fprintf(stderr,"%s","Failed test point\n"); - return 1; - } - sz = psStringPrepend(&str, NULL); - if ( sz != 0 ) { - fprintf(stderr,"%s","Failed test point\n"); - return 1; - } - - return 0; -} - -static psS32 testStrPrepend02(void) -{ - char *str=NULL; - int result; - - // test string creation - psStringPrepend(&str, "%s", "fubar"); - result = strcmp(str, "fubar"); - if ( result != 0 ) { - fprintf(stderr,"%s","Failed test point\n"); - return 1; - } - - psFree(str); - - return 0; -} - -static psS32 testStrPrepend03(void) -{ - char *str=NULL; - int result; - - str = psStringCopy(STR_0); - - // test null-op - psStringPrepend(&str, ""); - result = strcmp(str, STR_0); - if ( result != 0 ) { - fprintf(stderr,"Failed test point str=[%s]\n", str); - return 1; - } - - psFree(str); - - return 0; -} Index: trunk/psLib/test/sysUtils/tst_psTrace.c =================================================================== --- trunk/psLib/test/sysUtils/tst_psTrace.c (revision 4444) +++ (revision ) @@ -1,365 +1,0 @@ -/***************************************************************************** - This code will test whether trace levels can be set successfully. - - XXX: For the last two testpoints, must verify that the results are - correct, and put that verification in the test as well. - *****************************************************************************/ -#include -#include "pslib_strict.h" -#include "psTest.h" - - -static psS32 testTrace00(void); -static psS32 testTrace01(void); -static psS32 testTrace02(void); -static psS32 testTrace03(void); -static psS32 testTrace04(void); -static psS32 testTrace05(void); -static psS32 testTrace05a(void); -static psS32 testTrace06(void); -static psS32 testTrace08(void); - -testDescription tests[] = { - {testTrace00, 0, "psTraceSetLevel() and psTraceGetLevel()", 0, false}, - {testTrace01, 1, "psTraceSetLevel(): set multiple components in one call", 0, false}, - {testTrace02, 2, "psTraceSetLevel(): test static/dynamic inheritance", 0, false}, - {testTrace03, 3, "psTraceReset()", 0, false}, - {testTrace04, 4, "psTrace()", 0, false}, - {testTrace05, 5, "psTracePrintLevels()", 0, false}, - {testTrace05a, 5, "optional leading dot and psTracePrintLevels()", 0, false}, - {testTrace06, 6, "Testing psTraceReset", 0, false}, - {testTrace08, 8, "Testing ", 0, false}, - {NULL} - }; - -testDescription tests2[] = { - {testTrace08, 8, "Testing ", 0, false}, - }; - -psS32 main( psS32 argc, char* argv[] ) -{ - psLogSetLevel( PS_LOG_INFO ); - - return ( ! runTestSuite( stderr, "psTrace", tests, argc, argv ) ); -} - -static psS32 testTrace00(void) -{ - psS32 i; - psS32 lev = 0; - - psTraceSetDestination(stderr); - - for (i=0;i<10;i++) { - (void)psTraceSetLevel(".", i); - lev = psTraceGetLevel("."); - if (lev != i) { - fprintf(stderr,"ERROR: (.) expected trace level was %d, actual was %d\n", - i, lev); - return 1; - } - } - (void)psTraceSetLevel(".", 3); - - for (i=5;i<10;i++) { - (void)psTraceSetLevel(".NODE00", i); - lev = psTraceGetLevel(".NODE00"); - if (lev != i) { - fprintf(stderr,"ERROR: (.NODE00) expected trace level was %d, actual was %d\n", - i, lev); - return 2; - } - - lev = psTraceGetLevel("."); - if (lev != 3) { - fprintf(stderr,"ERROR: (.) expected trace level was %d, actual was %d\n", - i, 3); - return 3; - } - } - - - (void)psTraceSetLevel(".NODE00.NODE01", 4); - for (i=0;i<10;i++) { - (void)psTraceSetLevel(".NODE00.NODE01", i); - lev = psTraceGetLevel(".NODE00.NODE01"); - if (lev != i) { - fprintf(stderr,"ERROR: (.NODE00.NODE01) expected trace level was %d, actual was %d\n", - i, lev); - return 4; - } - } - - return 0; -} - -static psS32 testTrace01(void) -{ - psTraceSetDestination(stderr); - (void)psTraceSetLevel(".A.B.C.D.E", 5); - - psTrace(".A.C.D.C",1,"You should not see this.\n"); - psTrace(".A.B.C.D.E",2,"You should see this.\n"); - psTrace(".A.B.C.D.E.F",3,"You should see this too.\n"); - - psTracePrintLevels(); - - return 0; -} - -static psS32 testTrace02(void) -{ - psTraceReset(); - psTraceSetDestination(stderr); - psTraceSetLevel(".A.B", 2); - psTraceSetLevel(".A.B.C.D.E", 5); - psTracePrintLevels(); - psTraceSetLevel(".A.B", 10); - psTracePrintLevels(); - - if (10 != psTraceGetLevel(".A.B.C")) { - fprintf(stderr,"ERROR: .A.B.C did not dynamically inherit a trace level (%d)\n", - psTraceGetLevel(".A.B.C")); - return 2; - } - - if (10 != psTraceGetLevel(".A.B.C.D")) { - fprintf(stderr,"ERROR: .A.B.C.D did not dynamically inherit a trace level (%d)\n", psTraceGetLevel(".A.B.C.D")); - return 2; - } - - if (5 != psTraceGetLevel(".A.B.C.D.E")) { - fprintf(stderr,"ERROR: .A.B.C.D.E did dynamically inherit a trace level (%d)\n", psTraceGetLevel(".A.B.C.D.E")); - return 2; - } - - return 0; -} - -static psS32 testTrace03(void) -{ - psS32 i = 0; - psS32 lev = 0; - - psTraceSetDestination(stderr); - - for (i=0;i<10;i++) { - (void)psTraceSetLevel(".", i); - psTraceReset(); - - lev = psTraceGetLevel("."); - if (lev != PS_UNKNOWN_TRACE_LEVEL) { - fprintf(stderr,"ERROR: expected trace level was %d, actual was %d\n", - PS_UNKNOWN_TRACE_LEVEL, lev); - return 1; - } - } - (void)psTraceSetLevel(".", 5); - (void)psTraceSetLevel(".a", 4); - (void)psTraceSetLevel(".a.b", 3); - (void)psTraceSetLevel(".a.b.c", 2); - if ((5 != psTraceGetLevel(".")) || - (4 != psTraceGetLevel(".a")) || - (3 != psTraceGetLevel(".a.b")) || - (2 != psTraceGetLevel(".a.b.c"))) { - fprintf(stderr,"ERROR: trace successFlag = false;levels were not settable?\n"); - return 2; - } - - psTraceReset(); - if ((PS_UNKNOWN_TRACE_LEVEL != psTraceGetLevel(".")) || - (PS_UNKNOWN_TRACE_LEVEL != psTraceGetLevel(".a")) || - (PS_UNKNOWN_TRACE_LEVEL != psTraceGetLevel(".a.b")) || - (PS_UNKNOWN_TRACE_LEVEL != psTraceGetLevel(".a.b.c"))) { - fprintf(stderr,"ERROR: trace levels were not reset properly\n"); - return 3; - } - - return 0; -} - - -static psS32 testTrace04(void) -{ - FILE *fp; - psS32 nb = 0; - - fp = fopen("tst_psTrace02_OUT", "w"); - for (nb = 0 ; nb<4;nb++) { - if (nb == 0) - psTraceSetDestination(stdout); - if (nb == 1) - psTraceSetDestination(stderr); - if (nb == 2) - psTraceSetDestination(NULL); - if (nb == 3) - psTraceSetDestination(fp); - - (void)psTraceSetLevel(".", 4); - psTrace(".", 5, "(0) This message should not be displayed (%x)\n", - 0xbeefface); - (void)psTraceSetLevel(".", 7); - psTrace(".", 5, "(0) This message should be displayed (%x)\n", - 0xbeefface); - - (void)psTraceSetLevel(".a", 4); - psTrace(".a", 5, "(1) This message should not be displayed (%x)\n", - 0xbeefface); - (void)psTraceSetLevel(".a", 7); - psTrace(".a", 5, "(1) This message should be displayed (%x)\n", - 0xbeefface); - - - (void)psTraceSetLevel(".a.b", 4); - psTrace(".a.b", 5, "(2) This message should not be displayed (%x)\n", - 0xbeefface); - (void)psTraceSetLevel(".a.b", 7); - psTrace(".a.b", 5, "(2) This message should be displayed (%x)\n", - 0xbeefface); - - } - - fclose(fp); - - return(0); -} - -static psS32 testTrace05(void) -{ - psTraceSetDestination(stderr); - - (void)psTraceSetLevel(".", 9); - - (void)psTraceSetLevel(".a", 8); - (void)psTraceSetLevel(".b", 7); - (void)psTraceSetLevel(".c", 5); - - (void)psTraceSetLevel(".a.a", 4); - (void)psTraceSetLevel(".a.b", 3); - - (void)psTraceSetLevel(".b.a", 2); - (void)psTraceSetLevel(".b.b", 1); - - (void)psTraceSetLevel(".c.a", 0); - (void)psTraceSetLevel(".c.b", 3); - (void)psTraceSetLevel(".c.c", 5); - - psTracePrintLevels(); - - return 0; - -} - -static psS32 testTrace05a(void) -{ - (void)psTraceSetLevel(".", 9); - - (void)psTraceSetLevel("a", 8); - (void)psTraceSetLevel("b", 7); - (void)psTraceSetLevel("c", 5); - - (void)psTraceSetLevel("a.a", 4); - (void)psTraceSetLevel("a.b", 3); - - (void)psTraceSetLevel("b.a", 2); - (void)psTraceSetLevel("b.b", 1); - - (void)psTraceSetLevel("c.a", 0); - (void)psTraceSetLevel("c.b", 3); - (void)psTraceSetLevel("c.c", 5); - - psTracePrintLevels(); - - return 0; - -} - -static psS32 testTrace06(void) -{ - psTraceSetDestination(stderr); - - (void)psTraceSetLevel(".", 9); - - (void)psTraceSetLevel(".a", 8); - (void)psTraceSetLevel(".b", 7); - (void)psTraceSetLevel(".c", 5); - - (void)psTraceSetLevel(".a.a", 4); - (void)psTraceSetLevel(".a.b", 3); - - (void)psTraceSetLevel(".b.a", 2); - (void)psTraceSetLevel(".b.b", 1); - - (void)psTraceSetLevel(".c.a", 0); - (void)psTraceSetLevel(".c.b", 3); - (void)psTraceSetLevel(".c.c", 5); - - psTraceReset(); - - if ((psTraceGetLevel(".")!=PS_UNKNOWN_TRACE_LEVEL) || - (psTraceGetLevel(".a")!=PS_UNKNOWN_TRACE_LEVEL) || - (psTraceGetLevel(".b")!=PS_UNKNOWN_TRACE_LEVEL) || - (psTraceGetLevel(".c")!=PS_UNKNOWN_TRACE_LEVEL) || - (psTraceGetLevel(".a.a")!=PS_UNKNOWN_TRACE_LEVEL) || - (psTraceGetLevel(".a.b")!=PS_UNKNOWN_TRACE_LEVEL) || - (psTraceGetLevel(".b.a")!=PS_UNKNOWN_TRACE_LEVEL) || - (psTraceGetLevel(".b.b")!=PS_UNKNOWN_TRACE_LEVEL) || - (psTraceGetLevel(".c.a")!=PS_UNKNOWN_TRACE_LEVEL) || - (psTraceGetLevel(".c.b")!=PS_UNKNOWN_TRACE_LEVEL) || - (psTraceGetLevel(".c.c")!=PS_UNKNOWN_TRACE_LEVEL)) { - return 1; - } - - return 0; -} - -// Ensure that the leading dot in the component names are optional. -static psS32 testTrace08(void) -{ - psTraceReset(); - (void)psTraceSetLevel(".", 9); - - (void)psTraceSetLevel(".a", 8); - (void)psTraceSetLevel(".b", 7); - (void)psTraceSetLevel(".c", 5); - - (void)psTraceSetLevel(".a.a", 4); - (void)psTraceSetLevel(".a.b", 3); - - (void)psTraceSetLevel(".b.a", 2); - (void)psTraceSetLevel(".b.b", 1); - - (void)psTraceSetLevel(".c.a", 0); - (void)psTraceSetLevel(".c.b", 3); - (void)psTraceSetLevel(".c.c", 5); - - psTracePrintLevels(); - - if ((psTraceGetLevel(".")!=9) || - (psTraceGetLevel("a")!=8) || - (psTraceGetLevel("b")!=7) || - (psTraceGetLevel("c")!=5) || - (psTraceGetLevel("a.a")!=4) || - (psTraceGetLevel("a.b")!=3) || - (psTraceGetLevel("b.a")!=2) || - (psTraceGetLevel("b.b")!=1) || - (psTraceGetLevel("c.a")!=0) || - (psTraceGetLevel("c.b")!=3) || - (psTraceGetLevel("c.c")!=5)) { - printf("psTraceGetLevel(.) is %d\n", psTraceGetLevel(".")); - printf("psTraceGetLevel(a) is %d\n", psTraceGetLevel("a")); - printf("psTraceGetLevel(b) is %d\n", psTraceGetLevel("b")); - printf("psTraceGetLevel(c) is %d\n", psTraceGetLevel("c")); - printf("psTraceGetLevel(a.a) is %d\n", psTraceGetLevel("a.a")); - printf("psTraceGetLevel(a.b) is %d\n", psTraceGetLevel("a.b")); - printf("psTraceGetLevel(b.a) is %d\n", psTraceGetLevel("b.a")); - printf("psTraceGetLevel(b.b) is %d\n", psTraceGetLevel("b.b")); - printf("psTraceGetLevel(c.a) is %d\n", psTraceGetLevel("c.a")); - printf("psTraceGetLevel(c.b) is %d\n", psTraceGetLevel("c.b")); - printf("psTraceGetLevel(c.c) is %d\n", psTraceGetLevel("c.c")); - - return 1; - } - - return 0; -} Index: trunk/psLib/test/sysUtils/verified/tst_psAbort.stderr =================================================================== --- trunk/psLib/test/sysUtils/verified/tst_psAbort.stderr (revision 4444) +++ (revision ) @@ -1,32 +1,0 @@ -/***************************** TESTPOINT ******************************************\ -* TestFile: tst_psAbort.c * -* TestPoint: psAbort{Multiple type values in abort message} * -* TestType: Positive * -\**********************************************************************************/ - -