test/testautomation_video.c
changeset 7134 09ee216e6a25
parent 7101 ea2e8eb622e1
child 7191 75360622e65f
     1.1 --- a/test/testautomation_video.c	Wed May 01 11:59:54 2013 +0200
     1.2 +++ b/test/testautomation_video.c	Wed May 01 22:14:29 2013 -0700
     1.3 @@ -1534,7 +1534,7 @@
     1.4    	returnValue = TEST_ABORTED; 
     1.5    	goto cleanup; 
     1.6    }
     1.7 -  userdata2 = (char *)strdup(referenceUserdata2);
     1.8 +  userdata2 = (char *)SDL_strdup(referenceUserdata2);
     1.9    if (userdata2 == NULL) {
    1.10    	returnValue = TEST_ABORTED;
    1.11    	goto cleanup;
    1.12 @@ -1547,7 +1547,7 @@
    1.13    SDLTest_AssertCheck(SDL_strcmp(referenceName, name) == 0, "Validate that name was not changed, expected: %s, got: %s", referenceName, name);
    1.14    
    1.15    /* Set data */
    1.16 -  result = SDL_SetWindowData(window, name, userdata);
    1.17 +  result = (char *)SDL_SetWindowData(window, name, userdata);
    1.18    SDLTest_AssertPass("Call to SDL_SetWindowData(...%s,%s)", name, userdata);
    1.19    SDLTest_AssertCheck(result == NULL, "Validate that result is NULL");
    1.20    SDLTest_AssertCheck(SDL_strcmp(referenceName, name) == 0, "Validate that name was not changed, expected: %s, got: %s", referenceName, name);
    1.21 @@ -1563,7 +1563,7 @@
    1.22    
    1.23    /* Set data again twice */
    1.24    for (iteration = 1; iteration <= 2; iteration++) {
    1.25 -    result = SDL_SetWindowData(window, name, userdata);
    1.26 +    result = (char *)SDL_SetWindowData(window, name, userdata);
    1.27      SDLTest_AssertPass("Call to SDL_SetWindowData(...%s,%s) [iteration %d]", name, userdata, iteration);
    1.28      SDLTest_AssertCheck(SDL_strcmp(referenceUserdata, result) == 0, "Validate that correct result was returned; expected: %s, got: %s", referenceUserdata, result);
    1.29      SDLTest_AssertCheck(SDL_strcmp(referenceName, name) == 0, "Validate that name was not changed, expected: %s, got: %s", referenceName, name);
    1.30 @@ -1577,7 +1577,7 @@
    1.31    SDLTest_AssertCheck(SDL_strcmp(referenceName, name) == 0, "Validate that name was not changed, expected: %s, got: %s", referenceName, name);
    1.32  
    1.33    /* Set data with new data */
    1.34 -  result = SDL_SetWindowData(window, name, userdata2);
    1.35 +  result = (char *)SDL_SetWindowData(window, name, userdata2);
    1.36    SDLTest_AssertPass("Call to SDL_SetWindowData(...%s,%s) [new userdata]", name, userdata2);
    1.37    SDLTest_AssertCheck(SDL_strcmp(referenceUserdata, result) == 0, "Validate that correct result was returned; expected: %s, got: %s", referenceUserdata, result);
    1.38    SDLTest_AssertCheck(SDL_strcmp(referenceName, name) == 0, "Validate that name was not changed, expected: %s, got: %s", referenceName, name);
    1.39 @@ -1585,7 +1585,7 @@
    1.40    SDLTest_AssertCheck(SDL_strcmp(referenceUserdata2, userdata2) == 0, "Validate that userdata2 was not changed, expected: %s, got: %s", referenceUserdata2, userdata2);
    1.41  
    1.42    /* Set data with new data again */
    1.43 -  result = SDL_SetWindowData(window, name, userdata2);
    1.44 +  result = (char *)SDL_SetWindowData(window, name, userdata2);
    1.45    SDLTest_AssertPass("Call to SDL_SetWindowData(...%s,%s) [new userdata again]", name, userdata2);
    1.46    SDLTest_AssertCheck(SDL_strcmp(referenceUserdata2, result) == 0, "Validate that correct result was returned; expected: %s, got: %s", referenceUserdata2, result);
    1.47    SDLTest_AssertCheck(SDL_strcmp(referenceName, name) == 0, "Validate that name was not changed, expected: %s, got: %s", referenceName, name);
    1.48 @@ -1599,7 +1599,7 @@
    1.49    SDLTest_AssertCheck(SDL_strcmp(referenceName, name) == 0, "Validate that name was not changed, expected: %s, got: %s", referenceName, name);
    1.50  
    1.51    /* Set data with NULL to clear */
    1.52 -  result = SDL_SetWindowData(window, name, NULL);
    1.53 +  result = (char *)SDL_SetWindowData(window, name, NULL);
    1.54    SDLTest_AssertPass("Call to SDL_SetWindowData(...%s,NULL)", name, userdata);
    1.55    SDLTest_AssertCheck(SDL_strcmp(referenceUserdata2, result) == 0, "Validate that correct result was returned; expected: %s, got: %s", referenceUserdata2, result);
    1.56    SDLTest_AssertCheck(SDL_strcmp(referenceName, name) == 0, "Validate that name was not changed, expected: %s, got: %s", referenceName, name);
    1.57 @@ -1607,7 +1607,7 @@
    1.58    SDLTest_AssertCheck(SDL_strcmp(referenceUserdata2, userdata2) == 0, "Validate that userdata2 was not changed, expected: %s, got: %s", referenceUserdata2, userdata2);
    1.59  
    1.60    /* Set data with NULL to clear again */
    1.61 -  result = SDL_SetWindowData(window, name, NULL);
    1.62 +  result = (char *)SDL_SetWindowData(window, name, NULL);
    1.63    SDLTest_AssertPass("Call to SDL_SetWindowData(...%s,NULL) [again]", name, userdata);
    1.64    SDLTest_AssertCheck(result == NULL, "Validate that result is NULL");
    1.65    SDLTest_AssertCheck(SDL_strcmp(referenceName, name) == 0, "Validate that name was not changed, expected: %s, got: %s", referenceName, name);
    1.66 @@ -1627,7 +1627,7 @@
    1.67    SDLTest_AssertCheck(SDL_strcmp(referenceName2, name2) == 0, "Validate that name2 was not changed, expected: %s, got: %s", referenceName2, name2);
    1.68  
    1.69    /* Set data (again) */
    1.70 -  result = SDL_SetWindowData(window, name, userdata);
    1.71 +  result = (char *)SDL_SetWindowData(window, name, userdata);
    1.72    SDLTest_AssertPass("Call to SDL_SetWindowData(...%s,%s) [again, after clear]", name, userdata);
    1.73    SDLTest_AssertCheck(result == NULL, "Validate that result is NULL");
    1.74    SDLTest_AssertCheck(SDL_strcmp(referenceName, name) == 0, "Validate that name was not changed, expected: %s, got: %s", referenceName, name);
    1.75 @@ -1644,49 +1644,49 @@
    1.76    SDLTest_AssertPass("Call to SDL_ClearError()");
    1.77  
    1.78    /* Set with invalid window */ 
    1.79 -  result = SDL_SetWindowData(NULL, name, userdata);
    1.80 +  result = (char *)SDL_SetWindowData(NULL, name, userdata);
    1.81    SDLTest_AssertPass("Call to SDL_SetWindowData(window=NULL)");
    1.82    SDLTest_AssertCheck(result == NULL, "Validate that result is NULL");
    1.83    _checkInvalidWindowError();
    1.84    
    1.85    /* Set data with NULL name, valid userdata */
    1.86 -  result = SDL_SetWindowData(window, NULL, userdata);
    1.87 +  result = (char *)SDL_SetWindowData(window, NULL, userdata);
    1.88    SDLTest_AssertPass("Call to SDL_SetWindowData(name=NULL)");
    1.89    SDLTest_AssertCheck(result == NULL, "Validate that result is NULL");
    1.90    _checkInvalidParameterError();
    1.91  
    1.92    /* Set data with empty name, valid userdata */
    1.93 -  result = SDL_SetWindowData(window, "", userdata);
    1.94 +  result = (char *)SDL_SetWindowData(window, "", userdata);
    1.95    SDLTest_AssertPass("Call to SDL_SetWindowData(name='')");
    1.96    SDLTest_AssertCheck(result == NULL, "Validate that result is NULL");
    1.97    _checkInvalidParameterError();
    1.98  
    1.99    /* Set data with NULL name, NULL userdata */
   1.100 -  result = SDL_SetWindowData(window, NULL, NULL);
   1.101 +  result = (char *)SDL_SetWindowData(window, NULL, NULL);
   1.102    SDLTest_AssertPass("Call to SDL_SetWindowData(name=NULL,userdata=NULL)");
   1.103    SDLTest_AssertCheck(result == NULL, "Validate that result is NULL");
   1.104    _checkInvalidParameterError();
   1.105  
   1.106    /* Set data with empty name, NULL userdata */
   1.107 -  result = SDL_SetWindowData(window, "", NULL);
   1.108 +  result = (char *)SDL_SetWindowData(window, "", NULL);
   1.109    SDLTest_AssertPass("Call to SDL_SetWindowData(name='',userdata=NULL)");
   1.110    SDLTest_AssertCheck(result == NULL, "Validate that result is NULL");
   1.111    _checkInvalidParameterError();
   1.112  
   1.113    /* Get with invalid window */
   1.114 -  result = SDL_GetWindowData(NULL, name);
   1.115 +  result = (char *)SDL_GetWindowData(NULL, name);
   1.116    SDLTest_AssertPass("Call to SDL_GetWindowData(window=NULL)");
   1.117    SDLTest_AssertCheck(result == NULL, "Validate that result is NULL");
   1.118    _checkInvalidWindowError();
   1.119    
   1.120    /* Get data with NULL name */
   1.121 -  result = SDL_GetWindowData(window, NULL);
   1.122 +  result = (char *)SDL_GetWindowData(window, NULL);
   1.123    SDLTest_AssertPass("Call to SDL_GetWindowData(name=NULL)");
   1.124    SDLTest_AssertCheck(result == NULL, "Validate that result is NULL");
   1.125    _checkInvalidParameterError();
   1.126  
   1.127    /* Get data with empty name */
   1.128 -  result = SDL_GetWindowData(window, "");
   1.129 +  result = (char *)SDL_GetWindowData(window, "");
   1.130    SDLTest_AssertPass("Call to SDL_GetWindowData(name='')");
   1.131    SDLTest_AssertCheck(result == NULL, "Validate that result is NULL");
   1.132    _checkInvalidParameterError();