Changeset 7880 for trunk/psLib/test/sys

Timestamp:

Jul 12, 2006, 11:25:39 AM (20 years ago)

Author:

Paul Price

Message:

Moving psStringSubstitute tests to libtap; resetting stderr output for tst_psString.

Location:

trunk/psLib/test/sys

Files:

• . (modified) (1 prop)
• .cvsignore (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• tap_psStringSubstitute.c (added)
• tst_psString.c (modified) (4 diffs)
• verified/tst_psString.stderr (modified) (1 diff)

trunk/psLib/test/sys

@@ -17 +17 @@
 core
 core.*
+tap_psStringSubstitute

@@ -17 +17 @@
 core
 core.*
+tap_psStringSubstitute

trunk/psLib/test/sys/.cvsignore

@@ -17 +17 @@
 core
 core.*
+tap_psStringSubstitute

trunk/psLib/test/sys/Makefile.am

@@ -11 +11 @@
         tst_psMemory \
         tst_psString \
-        tst_psTrace
+        tst_psTrace \
+        tap_psStringSubstitute
 
 tst_psAbort_SOURCES =  tst_psAbort.c
@@ -20 +21 @@
 tst_psString_SOURCES =  tst_psString.c
 tst_psTrace_SOURCES =  tst_psTrace.c
+
+tap_psStringSubstitute_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/test/tap/src
+tap_psStringSubstitute_LDFLAGS  = $(AM_LDFLAGS) $(top_builddir)/test/tap/src/libtap.la
 
 check_DATA =

trunk/psLib/test/sys/tst_psString.c

@@ -20 +20 @@
  *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2006-07-06 22:26:13 $
+ *  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2006-07-12 21:25:39 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -53 +53 @@
 static psS32 testStrSplit00(void);
 static psS32 testNULLStrings(void);
-static psS32 testStrSub(void);
 
 testDescription tests[] = {
@@ -75 +74 @@
                               {testStrSplit00,15, "Test String Splitting", 0, false},
                               {testNULLStrings,666, "Test NULL String Error Handling", 0, false},
-                              {testStrSub,16, "Test String Substitute", 0, false},
                               {NULL}
                           };
@@ -711 +709 @@
     return 0;
 }
-
-static psS32 testStrSub(void)
-{
-    psString input = NULL;
-    char str[35];
-    strncpy(str, "This is, a, test case, to check.", 35);
-
-    //Return str for NULL key
-    input = psStringSubstitute(str, ",", NULL);
-    if (input != NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                "psStringSubstitute failed to return unchanged str for NULL key.\n");
-        psFree(input);
-        return 1;
-    }
-    //Return NULL for empty key
-    input = psStringSubstitute(str, ",", "");
-    if (input != NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                "psStringSubstitute failed to return unchanged str for empty key.\n");
-        psFree(input);
-        return 2;
-    }
-    //Return NULL for NULL replace
-    input = psStringSubstitute(str, NULL, ",");
-    if (input != NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                "psStringSubstitute failed to return unchanged str for NULL replace.\n");
-        psFree(input);
-        return 3;
-    }
-    //Return NULL for NULL input
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
-    input = psStringSubstitute(NULL, "", ",");
-    if (input != NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                "psStringSubstitute failed to return NULL for NULL input.\n");
-        psFree(input);
-        return 4;
-    }
-    //Return empty string for empty input string
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
-    input = psStringSubstitute("", "", ",");
-    if (input != NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                "psStringSubstitute failed to return empty string for empty input string.\n");
-        psFree(input);
-        return 5;
-    }
-    //Check valid test case, changing commas to exclamation points
-    input = psStringSubstitute(str, "!", ",");
-    if (strcmp(input, "This is! a! test case! to check.") != 0 ) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                "psStringSubstitute failed to return the correct output string.\n");
-        psFree(input);
-        return 7;
-    }
-    psFree(input);
-    input = NULL;
-    //Check valid test case, remove exclamation points
-    input = psStringSubstitute(str, "", ",");
-    if (strcmp(input, "This is a test case to check.") != 0 ) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                "psStringSubstitute failed to return the correct output string.\n");
-        psFree(input);
-        return 8;
-    }
-    psFree(input);
-    input = NULL;
-    //Check case where replacement is long.  Should still work now.
-    input = psStringSubstitute(str, "; This string is too long to fit in str(35 chars)", ".");
-    if (strcmp(input,"This is, a, test case, to check; This string is too long to fit in str(35 chars)") != 0 ) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                "psStringSubstitute failed to return the correct output string.\n");
-        psFree(input);
-        return 9;
-    }
-    psFree(input);
-
-    return 0;
-}

trunk/psLib/test/sys/verified/tst_psString.stderr

@@ -175 +175 @@
 ---> TESTPOINT PASSED (psString{Test NULL String Error Handling} | tst_psString.c)
 
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psString.c                                             *
-*            TestPoint: psString{Test String Substitute}                           *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testStrSub
-    Following should generate error message
-<DATE><TIME>|<HOST>|E|psStringSubstitute (FILE:LINENO)
-    Invalid string in psStringSubstitute.  Input cannot be NULL or empty.
-<DATE><TIME>|<HOST>|I|testStrSub
-    Following should generate error message
-<DATE><TIME>|<HOST>|E|psStringSubstitute (FILE:LINENO)
-    Invalid string in psStringSubstitute.  Input cannot be NULL or empty.
-
----> TESTPOINT PASSED (psString{Test String Substitute} | tst_psString.c)
-

@@ -17 +17 @@
 core
 core.*
+tap_psStringSubstitute