IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Dec 4, 2006, 12:15:04 PM (19 years ago)
Author:
Paul Price
Message:

Changing API for psStringSubstitute to something less prone to user mistake

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/test/sys/tap_psStringSubstitute.c

    r8841 r10446  
    1818    {
    1919        psString input = psStringCopy(ORIGINAL);
    20         input = psStringSubstitute(input, ",", NULL);
     20        psStringSubstitute(&input, ",", NULL);
    2121        ok(input && strcmp(input, ORIGINAL) == 0, "output = %s", input);
    2222        psFree(input);
    … …  
    2828    {
    2929        psString input = psStringCopy(ORIGINAL);
    30         input = psStringSubstitute(input, "XXX", "");
     30        psStringSubstitute(&input, "XXX", "");
    3131        ok(input && strcmp(input, ORIGINAL) == 0, "output = %s", input);
    3232        psFree(input);
    … …  
    3838    {
    3939        psString input = psStringCopy(ORIGINAL);
    40         psString output = psStringSubstitute(input, NULL, ",");
    41         ok(output && strcmp(output, CORRECTED) == 0, "output = %s", output);
    42         psFree(output);
     40        psStringSubstitute(&input, NULL, ",");
     41        ok(input && strcmp(input, CORRECTED) == 0, "output = %s", input);
     42        psFree(input);
    4343        mem();
    4444    }
    … …  
    4747    {
    4848        psString input = psStringCopy(ORIGINAL);
    49         psString output = psStringSubstitute(input, "", ",");
    50         ok(output && strcmp(output, CORRECTED) == 0, "output = %s", output);
    51         psFree(output);
     49        psStringSubstitute(&input, "", ",");
     50        ok(input && strcmp(input, CORRECTED) == 0, "output = %s", input);
     51        psFree(input);
    5252        mem();
    5353    }
    … …  
    5555    // Return NULL for NULL input
    5656    {
    57         psString output = psStringSubstitute(NULL, "XXX", ",");
    58         ok(!output, "output = %s", output);
     57        int status = psStringSubstitute(NULL, "XXX", ",");
     58        ok(status == 0, "status = %d", status);
    5959        mem();
    6060    }
    … …  
    6363    {
    6464        psString input = psStringCopy("");
    65         psString output = psStringSubstitute(input, "XXX", ",");
    66         ok(output && strcmp(output, input) == 0, "output = %s", output);
    67         psFree(output);
     65        psStringSubstitute(&input, "XXX", ",");
     66        ok(input && strcmp(input, "") == 0, "output = %s", input);
     67        psFree(input);
    6868        mem();
    6969    }
    … …  
    7272    {
    7373        psString input = psStringCopy(ORIGINAL);
    74         psString output = psStringSubstitute(input, "!", ",");
    75         ok(output && strcmp(output, "This is! a! test case! to check.") == 0, "output = %s", output);
    76         psFree(output);
     74        psStringSubstitute(&input, "!", ",");
     75        ok(input && strcmp(input, "This is! a! test case! to check.") == 0, "output = %s", input);
     76        psFree(input);
    7777        mem();
    7878    }
    … …  
    8181    {
    8282        psString input = psStringCopy(ORIGINAL);
    83         psString output = psStringSubstitute(input, "; This string is too long to fit in input(35 chars)", ".");
    84         ok(output && strcmp(output, "This is, a, test case, to check; "
    85                             "This string is too long to fit in input(35 chars)") == 0,
    86            "output = %s", output);
    87         psFree(output);
     83        psStringSubstitute(&input, "; This string is too long to fit in input(35 chars)", ".");
     84        ok(input && strcmp(input, "This is, a, test case, to check; "
     85                           "This string is too long to fit in input(35 chars)") == 0,
     86           "output = %s", input);
     87        psFree(input);
    8888        mem();
    8989    }
Note: See TracChangeset for help on using the changeset viewer.