1.1 --- a/include/SDL_test_compare.h	Sun Nov 30 22:17:12 2014 +0100
     1.2 +++ b/include/SDL_test_compare.h	Sun Nov 30 20:55:27 2014 -0800
     1.3 @@ -51,9 +51,9 @@
     1.4   *
     1.5   * \param surface Surface used in comparison
     1.6   * \param referenceSurface Test Surface used in comparison
     1.7 - * \param allowable_error Allowable difference (squared) in blending accuracy.
     1.8 + * \param allowable_error Allowable difference (=sum of squared difference for each RGB component) in blending accuracy.
     1.9   *
    1.10 - * \returns 0 if comparison succeeded, >0 (=number of pixels where comparison failed) if comparison failed, -1 if any of the surfaces were NULL, -2 if the surface sizes differ.
    1.11 + * \returns 0 if comparison succeeded, >0 (=number of pixels for which the comparison failed) if comparison failed, -1 if any of the surfaces were NULL, -2 if the surface sizes differ.
    1.12   */
    1.13  int SDLTest_CompareSurfaces(SDL_Surface *surface, SDL_Surface *referenceSurface, int allowable_error);
    1.14  

     2.1 --- a/src/test/SDL_test_compare.c	Sun Nov 30 22:17:12 2014 +0100
     2.2 +++ b/src/test/SDL_test_compare.c	Sun Nov 30 20:55:27 2014 -0800
     2.3 @@ -43,6 +43,7 @@
     2.4     int bpp, bpp_reference;
     2.5     Uint8 *p, *p_reference;
     2.6     int dist;
     2.7 +   int sampleErrorX, sampleErrorY, sampleDist;
     2.8     Uint8 R, G, B, A;
     2.9     Uint8 Rd, Gd, Bd, Ad;
    2.10     char imageFilename[128];
    2.11 @@ -86,6 +87,11 @@
    2.12           /* Allow some difference in blending accuracy */
    2.13           if (dist > allowable_error) {
    2.14              ret++;
    2.15 +            if (ret == 1) {
    2.16 +               sampleErrorX = i;
    2.17 +               sampleErrorY = j;
    2.18 +               sampleDist = dist;
    2.19 +            }
    2.20           }
    2.21        }
    2.22     }
    2.23 @@ -96,6 +102,8 @@
    2.24     /* Save test image and reference for analysis on failures */
    2.25     _CompareSurfaceCount++;
    2.26     if (ret != 0) {
    2.27 +      SDLTest_LogError("Comparison of pixels with allowable error of %i failed %i times.", allowable_error, ret);
    2.28 +      SDLTest_LogError("First detected occurrence at position %i,%i with a squared RGB-difference of %i.", sampleErrorX, sampleErrorY, sampleDist); 
    2.29        SDL_snprintf(imageFilename, 127, "CompareSurfaces%04d_TestOutput.bmp", _CompareSurfaceCount);
    2.30        SDL_SaveBMP(surface, imageFilename);
    2.31        SDL_snprintf(referenceFilename, 127, "CompareSurfaces%04d_Reference.bmp", _CompareSurfaceCount);

     3.1 --- a/test/testautomation_platform.c	Sun Nov 30 22:17:12 2014 +0100
     3.2 +++ b/test/testautomation_platform.c	Sun Nov 30 20:55:27 2014 -0800
     3.3 @@ -34,16 +34,16 @@
     3.4     int ret;
     3.5  
     3.6     ret = _compareSizeOfType( sizeof(Uint8), 1 );
     3.7 -   SDLTest_AssertCheck( ret == 0, "sizeof(Uint8) = %lu, expected  1", sizeof(Uint8) );
     3.8 +   SDLTest_AssertCheck( ret == 0, "sizeof(Uint8) = %lu, expected  1", (unsigned long)sizeof(Uint8) );
     3.9  
    3.10     ret = _compareSizeOfType( sizeof(Uint16), 2 );
    3.11 -   SDLTest_AssertCheck( ret == 0, "sizeof(Uint16) = %lu, expected 2", sizeof(Uint16) );
    3.12 +   SDLTest_AssertCheck( ret == 0, "sizeof(Uint16) = %lu, expected 2", (unsigned long)sizeof(Uint16) );
    3.13  
    3.14     ret = _compareSizeOfType( sizeof(Uint32), 4 );
    3.15 -   SDLTest_AssertCheck( ret == 0, "sizeof(Uint32) = %lu, expected 4", sizeof(Uint32) );
    3.16 +   SDLTest_AssertCheck( ret == 0, "sizeof(Uint32) = %lu, expected 4", (unsigned long)sizeof(Uint32) );
    3.17  
    3.18     ret = _compareSizeOfType( sizeof(Uint64), 8 );
    3.19 -   SDLTest_AssertCheck( ret == 0, "sizeof(Uint64) = %lu, expected 8", sizeof(Uint64) );
    3.20 +   SDLTest_AssertCheck( ret == 0, "sizeof(Uint64) = %lu, expected 8", (unsigned long)sizeof(Uint64) );
    3.21  
    3.22     return TEST_COMPLETED;
    3.23  }
    3.24 @@ -395,21 +395,17 @@
    3.25       len = SDL_strlen(lastError);
    3.26       SDLTest_AssertCheck(len == 0,
    3.27               "SDL_GetError(): expected message len 0, was len: %i",
    3.28 -             0,
    3.29               len);
    3.30 -     SDLTest_AssertCheck(SDL_strcmp(lastError, "") == 0,
    3.31 -             "SDL_GetError(): expected message '', was message: '%s'",
    3.32 -             lastError);
    3.33     }
    3.34  
    3.35     /* Set */
    3.36     result = SDL_SetError(probeError);
    3.37 -   SDLTest_AssertPass("SDL_SetError()");
    3.38 +   SDLTest_AssertPass("SDL_SetError('%s')", probeError);
    3.39     SDLTest_AssertCheck(result == -1, "SDL_SetError: expected -1, got: %i", result);
    3.40  
    3.41     /* Check for no-op */
    3.42     result = SDL_SetError(invalidError);
    3.43 -   SDLTest_AssertPass("SDL_SetError()");
    3.44 +   SDLTest_AssertPass("SDL_SetError(NULL)");
    3.45     SDLTest_AssertCheck(result == -1, "SDL_SetError: expected -1, got: %i", result);
    3.46     lastError = (char *)SDL_GetError();
    3.47     SDLTest_AssertCheck(lastError != NULL,
    3.48 @@ -417,14 +413,9 @@
    3.49     if (lastError != NULL)
    3.50     {
    3.51       len = SDL_strlen(lastError);
    3.52 -     SDLTest_AssertCheck(len == SDL_strlen(probeError),
    3.53 -             "SDL_GetError(): expected message len %i, was len: %i",
    3.54 -             SDL_strlen(probeError),
    3.55 +     SDLTest_AssertCheck(len == 0,
    3.56 +             "SDL_GetError(): expected message len 0, was len: %i",
    3.57               len);
    3.58 -     SDLTest_AssertCheck(SDL_strcmp(lastError, probeError) == 0,
    3.59 -             "SDL_GetError(): expected message '%s', was message: '%s'",
    3.60 -             probeError,
    3.61 -             lastError);
    3.62     }
    3.63  
    3.64     /* Reset */

     4.1 --- a/test/testautomation_render.c	Sun Nov 30 22:17:12 2014 +0100
     4.2 +++ b/test/testautomation_render.c	Sun Nov 30 20:55:27 2014 -0800
     4.3 @@ -113,6 +113,9 @@
     4.4     int checkFailCount1;
     4.5     int checkFailCount2;
     4.6  
     4.7 +   /* Clear surface. */
     4.8 +   _clearScreen();
     4.9 +
    4.10     /* Need drawcolor or just skip test. */
    4.11     SDLTest_AssertCheck(_hasDrawColor(), "_hasDrawColor");
    4.12  
    4.13 @@ -184,7 +187,10 @@
    4.14  
    4.15     ret = SDL_RenderDrawLine(renderer, 79, 59, 50, 30 );
    4.16     SDLTest_AssertCheck(ret == 0, "Validate result from SDL_RenderDrawLine, expected: 0, got: %i", ret);
    4.17 -
    4.18 +   
    4.19 +   /* Make current */
    4.20 +   SDL_RenderPresent(renderer);
    4.21 +   
    4.22     /* See if it's the same. */
    4.23     referenceSurface = SDLTest_ImagePrimitives();
    4.24     _compare(referenceSurface, ALLOWABLE_ERROR_OPAQUE );
    4.25 @@ -214,6 +220,9 @@
    4.26     int checkFailCount2;
    4.27     int checkFailCount3;
    4.28  
    4.29 +   /* Clear surface. */
    4.30 +   _clearScreen();
    4.31 +
    4.32     /* Need drawcolor and blendmode or just skip test. */
    4.33     SDLTest_AssertCheck(_hasDrawColor(), "_hasDrawColor");
    4.34     SDLTest_AssertCheck(_hasBlendModes(), "_hasBlendModes");
    4.35 @@ -326,6 +335,9 @@
    4.36     SDLTest_AssertCheck(checkFailCount2 == 0, "Validate results from calls to SDL_SetRenderDrawBlendMode, expected: 0, got: %i", checkFailCount2);
    4.37     SDLTest_AssertCheck(checkFailCount3 == 0, "Validate results from calls to SDL_RenderDrawPoint, expected: 0, got: %i", checkFailCount3);
    4.38  
    4.39 +   /* Make current */
    4.40 +   SDL_RenderPresent(renderer);
    4.41 +
    4.42     /* See if it's the same. */
    4.43     referenceSurface = SDLTest_ImagePrimitivesBlend();
    4.44     _compare(referenceSurface, ALLOWABLE_ERROR_BLENDED );
    4.45 @@ -358,6 +370,8 @@
    4.46     int i, j, ni, nj;
    4.47     int checkFailCount1;
    4.48  
    4.49 +   /* Clear surface. */
    4.50 +   _clearScreen();
    4.51  
    4.52     /* Need drawcolor or just skip test. */
    4.53     SDLTest_AssertCheck(_hasDrawColor(), "_hasDrawColor)");
    4.54 @@ -390,6 +404,9 @@
    4.55     }
    4.56     SDLTest_AssertCheck(checkFailCount1 == 0, "Validate results from calls to SDL_RenderCopy, expected: 0, got: %i", checkFailCount1);
    4.57  
    4.58 +   /* Make current */
    4.59 +   SDL_RenderPresent(renderer);
    4.60 +
    4.61     /* See if it's the same */
    4.62     referenceSurface = SDLTest_ImageBlit();
    4.63     _compare(referenceSurface, ALLOWABLE_ERROR_OPAQUE );
    4.64 @@ -424,6 +441,9 @@
    4.65     int checkFailCount1;
    4.66     int checkFailCount2;
    4.67  
    4.68 +   /* Clear surface. */
    4.69 +   _clearScreen();
    4.70 +
    4.71     /* Create face surface. */
    4.72     tface = _loadTestFace();
    4.73     SDLTest_AssertCheck(tface != NULL, "Verify _loadTestFace() result");
    4.74 @@ -458,6 +478,9 @@
    4.75     SDLTest_AssertCheck(checkFailCount1 == 0, "Validate results from calls to SDL_SetTextureColorMod, expected: 0, got: %i", checkFailCount1);
    4.76     SDLTest_AssertCheck(checkFailCount2 == 0, "Validate results from calls to SDL_RenderCopy, expected: 0, got: %i", checkFailCount2);
    4.77  
    4.78 +   /* Make current */
    4.79 +   SDL_RenderPresent(renderer);
    4.80 +
    4.81     /* See if it's the same. */
    4.82     referenceSurface = SDLTest_ImageBlitColor();
    4.83     _compare(referenceSurface, ALLOWABLE_ERROR_OPAQUE );
    4.84 @@ -492,6 +515,9 @@
    4.85     int checkFailCount1;
    4.86     int checkFailCount2;
    4.87  
    4.88 +   /* Clear surface. */
    4.89 +   _clearScreen();
    4.90 +
    4.91     /* Need alpha or just skip test. */
    4.92     SDLTest_AssertCheck(_hasTexAlpha(), "_hasTexAlpha");
    4.93  
    4.94 @@ -529,6 +555,9 @@
    4.95     SDLTest_AssertCheck(checkFailCount1 == 0, "Validate results from calls to SDL_SetTextureAlphaMod, expected: 0, got: %i", checkFailCount1);
    4.96     SDLTest_AssertCheck(checkFailCount2 == 0, "Validate results from calls to SDL_RenderCopy, expected: 0, got: %i", checkFailCount2);
    4.97  
    4.98 +   /* Make current */
    4.99 +   SDL_RenderPresent(renderer);
   4.100 +
   4.101     /* See if it's the same. */
   4.102     referenceSurface = SDLTest_ImageBlitAlpha();
   4.103     _compare(referenceSurface, ALLOWABLE_ERROR_BLENDED );
   4.104 @@ -644,6 +673,9 @@
   4.105     /* Test None. */
   4.106     _testBlitBlendMode( tface, SDL_BLENDMODE_NONE );
   4.107     referenceSurface = SDLTest_ImageBlitBlendNone();
   4.108 +
   4.109 +   /* Make current and compare */
   4.110 +   SDL_RenderPresent(renderer);
   4.111     _compare(referenceSurface, ALLOWABLE_ERROR_OPAQUE );
   4.112     SDL_FreeSurface(referenceSurface);
   4.113     referenceSurface = NULL;
   4.114 @@ -651,6 +683,9 @@
   4.115     /* Test Blend. */
   4.116     _testBlitBlendMode( tface, SDL_BLENDMODE_BLEND );
   4.117     referenceSurface = SDLTest_ImageBlitBlend();
   4.118 +
   4.119 +   /* Make current and compare */
   4.120 +   SDL_RenderPresent(renderer);
   4.121     _compare(referenceSurface, ALLOWABLE_ERROR_BLENDED );
   4.122     SDL_FreeSurface(referenceSurface);
   4.123     referenceSurface = NULL;
   4.124 @@ -658,6 +693,9 @@
   4.125     /* Test Add. */
   4.126     _testBlitBlendMode( tface, SDL_BLENDMODE_ADD );
   4.127     referenceSurface = SDLTest_ImageBlitBlendAdd();
   4.128 +
   4.129 +   /* Make current and compare */
   4.130 +   SDL_RenderPresent(renderer);
   4.131     _compare(referenceSurface, ALLOWABLE_ERROR_BLENDED );
   4.132     SDL_FreeSurface(referenceSurface);
   4.133     referenceSurface = NULL;
   4.134 @@ -665,6 +703,9 @@
   4.135     /* Test Mod. */
   4.136     _testBlitBlendMode( tface, SDL_BLENDMODE_MOD);
   4.137     referenceSurface = SDLTest_ImageBlitBlendMod();
   4.138 +
   4.139 +   /* Make current and compare */
   4.140 +   SDL_RenderPresent(renderer);
   4.141     _compare(referenceSurface, ALLOWABLE_ERROR_BLENDED );
   4.142     SDL_FreeSurface(referenceSurface);
   4.143     referenceSurface = NULL;
   4.144 @@ -712,6 +753,9 @@
   4.145     /* Clean up. */
   4.146     SDL_DestroyTexture( tface );
   4.147  
   4.148 +   /* Make current */
   4.149 +   SDL_RenderPresent(renderer);
   4.150 +
   4.151     /* Check to see if final image matches. */
   4.152     referenceSurface = SDLTest_ImageBlitBlendAll();
   4.153     _compare(referenceSurface, ALLOWABLE_ERROR_BLENDED);
   4.154 @@ -984,7 +1028,8 @@
   4.155   *
   4.156   * \sa
   4.157   * http://wiki.libsdl.org/moin.cgi/SDL_SetRenderDrawColor
   4.158 - * http://wiki.libsdl.org/moin.cgi/SDL_RenderFillRect
   4.159 + * http://wiki.libsdl.org/moin.cgi/SDL_RenderClear
   4.160 + * http://wiki.libsdl.org/moin.cgi/SDL_RenderPresent
   4.161   * http://wiki.libsdl.org/moin.cgi/SDL_SetRenderDrawBlendMode
   4.162   */
   4.163  static int
   4.164 @@ -997,8 +1042,11 @@
   4.165     SDLTest_AssertCheck(ret == 0, "Validate result from SDL_SetRenderDrawColor, expected: 0, got: %i", ret);
   4.166  
   4.167     /* Clear screen. */
   4.168 -   ret = SDL_RenderFillRect(renderer, NULL );
   4.169 -   SDLTest_AssertCheck(ret == 0, "Validate result from SDL_RenderFillRect, expected: 0, got: %i", ret);
   4.170 +   ret = SDL_RenderClear(renderer);
   4.171 +   SDLTest_AssertCheck(ret == 0, "Validate result from SDL_RenderClear, expected: 0, got: %i", ret);
   4.172 +
   4.173 +   /* Make current */
   4.174 +   SDL_RenderPresent(renderer);
   4.175  
   4.176     /* Set defaults. */
   4.177     ret = SDL_SetRenderDrawBlendMode(renderer, SDL_BLENDMODE_NONE );

     5.1 --- a/test/testautomation_rwops.c	Sun Nov 30 22:17:12 2014 +0100
     5.2 +++ b/test/testautomation_rwops.c	Sun Nov 30 20:55:27 2014 -0800
     5.3 @@ -105,7 +105,7 @@
     5.4     /* Set to start. */
     5.5     i = SDL_RWseek(rw, 0, RW_SEEK_SET );
     5.6     SDLTest_AssertPass("Call to SDL_RWseek succeeded");
     5.7 -   SDLTest_AssertCheck(i == (Sint64)0, "Verify seek to 0 with SDL_RWseek (RW_SEEK_SET), expected 0, got %i", i);
     5.8 +   SDLTest_AssertCheck(i == (Sint64)0, "Verify seek to 0 with SDL_RWseek (RW_SEEK_SET), expected 0, got %lli", i);
     5.9  
    5.10     /* Test write. */
    5.11     s = SDL_RWwrite(rw, RWopsHelloWorldTestString, sizeof(RWopsHelloWorldTestString)-1, 1);
    5.12 @@ -120,12 +120,12 @@
    5.13     /* Test seek to random position */
    5.14     i = SDL_RWseek( rw, seekPos, RW_SEEK_SET );
    5.15     SDLTest_AssertPass("Call to SDL_RWseek succeeded");
    5.16 -   SDLTest_AssertCheck(i == (Sint64)seekPos, "Verify seek to %i with SDL_RWseek (RW_SEEK_SET), expected %i, got %i", seekPos, seekPos, i);
    5.17 +   SDLTest_AssertCheck(i == (Sint64)seekPos, "Verify seek to %i with SDL_RWseek (RW_SEEK_SET), expected %i, got %lli", seekPos, seekPos, i);
    5.18  
    5.19     /* Test seek back to start */
    5.20     i = SDL_RWseek(rw, 0, RW_SEEK_SET );
    5.21     SDLTest_AssertPass("Call to SDL_RWseek succeeded");
    5.22 -   SDLTest_AssertCheck(i == (Sint64)0, "Verify seek to 0 with SDL_RWseek (RW_SEEK_SET), expected 0, got %i", i);
    5.23 +   SDLTest_AssertCheck(i == (Sint64)0, "Verify seek to 0 with SDL_RWseek (RW_SEEK_SET), expected 0, got %lli", i);
    5.24  
    5.25     /* Test read */
    5.26     s = SDL_RWread( rw, buf, 1, sizeof(RWopsHelloWorldTestString)-1 );
    5.27 @@ -144,7 +144,7 @@
    5.28     SDLTest_AssertPass("Call to SDL_RWseek(...,-4,RW_SEEK_CUR) succeeded");
    5.29     SDLTest_AssertCheck(
    5.30         i == (Sint64)(sizeof(RWopsHelloWorldTestString)-5),
    5.31 -       "Verify seek to -4 with SDL_RWseek (RW_SEEK_CUR), expected %i, got %i",
    5.32 +       "Verify seek to -4 with SDL_RWseek (RW_SEEK_CUR), expected %i, got %lli",
    5.33         sizeof(RWopsHelloWorldTestString)-5,
    5.34         i);
    5.35  
    5.36 @@ -152,7 +152,7 @@
    5.37     SDLTest_AssertPass("Call to SDL_RWseek(...,-1,RW_SEEK_END) succeeded");
    5.38     SDLTest_AssertCheck(
    5.39         i == (Sint64)(sizeof(RWopsHelloWorldTestString)-2),
    5.40 -       "Verify seek to -1 with SDL_RWseek (RW_SEEK_END), expected %i, got %i",
    5.41 +       "Verify seek to -1 with SDL_RWseek (RW_SEEK_END), expected %i, got %lli",
    5.42         sizeof(RWopsHelloWorldTestString)-2,
    5.43         i);
    5.44  
    5.45 @@ -161,7 +161,7 @@
    5.46     SDLTest_AssertPass("Call to SDL_RWseek(...,0,invalid_whence) succeeded");
    5.47     SDLTest_AssertCheck(
    5.48         i == (Sint64)(-1),
    5.49 -       "Verify seek with SDL_RWseek (invalid_whence); expected: -1, got %i",
    5.50 +       "Verify seek with SDL_RWseek (invalid_whence); expected: -1, got %lli",
    5.51         i);
    5.52  }
    5.53  
    5.54 @@ -668,7 +668,7 @@
    5.55       /* Test seek to start */
    5.56       result = SDL_RWseek( rw, 0, RW_SEEK_SET );
    5.57       SDLTest_AssertPass("Call to SDL_RWseek succeeded");
    5.58 -     SDLTest_AssertCheck(result == 0, "Verify result from position 0 with SDL_RWseek, expected 0, got %i", result);
    5.59 +     SDLTest_AssertCheck(result == 0, "Verify result from position 0 with SDL_RWseek, expected 0, got %lli", result);
    5.60  
    5.61       /* Read test data */
    5.62       BE16test = SDL_ReadBE16(rw);

     6.1 --- a/test/testautomation_sdltest.c	Sun Nov 30 22:17:12 2014 +0100
     6.2 +++ b/test/testautomation_sdltest.c	Sun Nov 30 20:55:27 2014 -0800
     6.3 @@ -1076,7 +1076,7 @@
     6.4    max = 0;
     6.5    result = SDLTest_RandomIntegerInRange(min, max);
     6.6    SDLTest_AssertPass("Call to SDLTest_RandomIntegerInRange(0,0)");
     6.7 -  SDLTest_AssertCheck(result == 0, "Validated returned value; expected: 0, got: %d", min, max, result);
     6.8 +  SDLTest_AssertCheck(result == 0, "Validated returned value; expected: 0, got: %d", result);
     6.9  
    6.10    /* Swapped min-max */
    6.11    min = (Sint32)SDLTest_RandomSint16();

     7.1 --- a/test/testautomation_timer.c	Sun Nov 30 22:17:12 2014 +0100
     7.2 +++ b/test/testautomation_timer.c	Sun Nov 30 20:55:27 2014 -0800
     7.3 @@ -42,7 +42,7 @@
     7.4  
     7.5    result = SDL_GetPerformanceCounter();
     7.6    SDLTest_AssertPass("Call to SDL_GetPerformanceCounter()");
     7.7 -  SDLTest_AssertCheck(result > 0, "Check result value, expected: >0, got: %lu", result);
     7.8 +  SDLTest_AssertCheck(result > 0, "Check result value, expected: >0, got: %llu", result);
     7.9  
    7.10    return TEST_COMPLETED;
    7.11  }
    7.12 @@ -57,7 +57,7 @@
    7.13  
    7.14    result = SDL_GetPerformanceFrequency();
    7.15    SDLTest_AssertPass("Call to SDL_GetPerformanceFrequency()");
    7.16 -  SDLTest_AssertCheck(result > 0, "Check result value, expected: >0, got: %lu", result);
    7.17 +  SDLTest_AssertCheck(result > 0, "Check result value, expected: >0, got: %llu", result);
    7.18  
    7.19    return TEST_COMPLETED;
    7.20  }

     8.1 --- a/test/testautomation_video.c	Sun Nov 30 22:17:12 2014 +0100
     8.2 +++ b/test/testautomation_video.c	Sun Nov 30 20:55:27 2014 -0800
     8.3 @@ -740,7 +740,7 @@
     8.4    /* Call against invalid window */
     8.5    result = SDL_GetWindowGammaRamp(NULL, red, green, blue);
     8.6    SDLTest_AssertPass("Call to SDL_GetWindowGammaRamp(window=NULL,r,g,b)");
     8.7 -  SDLTest_AssertCheck(result == -1, "Validate result value; expected: -1, got: %f", result);
     8.8 +  SDLTest_AssertCheck(result == -1, "Validate result value; expected: -1, got: %i", result);
     8.9    _checkInvalidWindowError();
    8.10  
    8.11    return TEST_COMPLETED;
    8.12 @@ -1619,7 +1619,7 @@
    8.13  
    8.14    /* Set data with NULL to clear */
    8.15    result = (char *)SDL_SetWindowData(window, name, NULL);
    8.16 -  SDLTest_AssertPass("Call to SDL_SetWindowData(...%s,NULL)", name, userdata);
    8.17 +  SDLTest_AssertPass("Call to SDL_SetWindowData(...%s,NULL)", name);
    8.18    SDLTest_AssertCheck(SDL_strcmp(referenceUserdata2, result) == 0, "Validate that correct result was returned; expected: %s, got: %s", referenceUserdata2, result);
    8.19    SDLTest_AssertCheck(SDL_strcmp(referenceName, name) == 0, "Validate that name was not changed, expected: %s, got: %s", referenceName, name);
    8.20    SDLTest_AssertCheck(SDL_strcmp(referenceUserdata, userdata) == 0, "Validate that userdata was not changed, expected: %s, got: %s", referenceUserdata, userdata);
    8.21 @@ -1627,7 +1627,7 @@
    8.22  
    8.23    /* Set data with NULL to clear again */
    8.24    result = (char *)SDL_SetWindowData(window, name, NULL);
    8.25 -  SDLTest_AssertPass("Call to SDL_SetWindowData(...%s,NULL) [again]", name, userdata);
    8.26 +  SDLTest_AssertPass("Call to SDL_SetWindowData(...%s,NULL) [again]", name);
    8.27    SDLTest_AssertCheck(result == NULL, "Validate that result is NULL");
    8.28    SDLTest_AssertCheck(SDL_strcmp(referenceName, name) == 0, "Validate that name was not changed, expected: %s, got: %s", referenceName, name);
    8.29    SDLTest_AssertCheck(SDL_strcmp(referenceUserdata, userdata) == 0, "Validate that userdata was not changed, expected: %s, got: %s", referenceUserdata, userdata);