Changeset 7045

Timestamp:

May 2, 2006, 1:55:53 PM (20 years ago)

Author:

Paul Price

Message:

Fixing psStringSplit following code update.

File:

• trunk/psLib/test/sys/tst_psString.c (modified) (11 diffs)

trunk/psLib/test/sys/tst_psString.c

@@ -20 +20 @@
  *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2006-04-26 02:19:23 $
+ *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2006-05-02 23:55:53 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -455 +455 @@
     //Return NULL for NULL inputs
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
-    strList = psStringSplit(NULL, NULL);
+    strList = psStringSplit(NULL, NULL, true);
     //    if (strList != NULL) {
-    if ( psListLength(strList) ) {
+    if (strList) {
         psFree(strList);
         return 1;
@@ -465 +465 @@
     //Return NULL for NULL string input
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
-    strList = psStringSplit(NULL, split);
+    strList = psStringSplit(NULL, split, true);
     //    if (strList != NULL) {
     if ( psListLength(strList) ) {
@@ -475 +475 @@
     //Return NULL for NULL splitter input
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
-    strList = psStringSplit(str, NULL);
+    strList = psStringSplit(str, NULL, true);
     //    if (strList != NULL) {
-    if ( psListLength(strList) ) {
+    if ( strList ) {
         psFree(strList);
         return 3;
@@ -484 +484 @@
     strList = NULL;
     //Return a psList* of psStrings
-    strList = psStringSplit(str, split);
+    strList = psStringSplit(str, split, true);
     if (strList->n != 4) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false,
@@ -512 +512 @@
     psFree(strList);
     //Return correct psList when using (psString, char*)
-    strList = psStringSplit(psStr, split);
+    strList = psStringSplit(psStr, split, true);
     if (strList->n != 4) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false,
@@ -540 +540 @@
     psFree(strList);
     //Return correct psList when using (char*, psString)
-    strList = psStringSplit(str, psSplit);
+    strList = psStringSplit(str, psSplit, true);
     if (strList->n != 4) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false,
@@ -568 +568 @@
     psFree(strList);
     //Return correct psList when using (psString, psString)
-    strList = psStringSplit(psStr, psSplit);
+    strList = psStringSplit(psStr, psSplit, true);
     if (strList->n != 4) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false,
@@ -597 +597 @@
     //Return correct psList output for string of zero length case
     strncpy(str, "This is,, a,, test case,, to check.", 35);
-    strList = psStringSplit(str, split);
+    strList = psStringSplit(str, split, false);
     if (strList->n != 4) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false,
@@ -687 +687 @@
     psList *nullList = NULL;
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
-    nullList = psStringSplit(nullTest, ",");
+    nullList = psStringSplit(nullTest, ",", true);
     //    if (nullList != NULL) {
     if ( psListLength(nullList) ) {
@@ -698 +698 @@
     //psStringSplit should return NULL for NULL input splitter
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
-    nullList = psStringSplit("Hello World", nullTest);
+    nullList = psStringSplit("Hello World", nullTest, true);
     //    if (nullList != NULL) {
-    if ( psListLength(nullList) ) {
+    if ( nullList ) {
         psError(PS_ERR_BAD_PARAMETER_NULL, false,
                 "psStringSplit failed to return NULL for NULL input splitter.\n");