comparison test/automated/rwops/rwops.c @ 4447:947201caa46e

Added automated test to Xcode project plus needed changes to SDL_RWFromFile to be OS X bundle aware. The Mac OS X project has a new target called testsdl which builds the automated test. I looked at using Xcode's native unit test support, but the impedance mismatch between the existing automated test structure and Apple's was more than I could handle. As such, the testsdl application is a full blown proper OS X application, which means it is a self-contained .app bundle. This immediately revealed some problems from the automated test. The largest problem was the assumption about the current working directory and where to find resources. (I suspect Windows may have a similar problem depending on circumstance.) To open resources, the test was looking in directories relative to the SDL source directory, but this will not work well with self-contained .app bundles and Xcode which can place its built applications almost anywhere. And for real-world situations, this is pretty useless anyway. So I modified SDL_RWFromFile to do special things on OS X. First, it will look for a file in the .app bundle. If not found, it will fallback and just call fopen as it used to do. I also had to modify the automated test itself because it had a contrieved test which called fopen directly to do read from an existing FILE pointer. In addition, there was a write test. Since a .app bundle is likely going to be read-only, I added a special case for OS X to write to NSTemporaryDirectory. I expect these changes should work for both Mac and iPhone OS (which includes iPad). I will update the iPhone Xcode project next. Finally, FYI, the X11 automated test seems to be failing. Below is my output. Pending breakpoint 4 - "-[NSException raise]" resolved Platform : All tests successful (2) SDL_RWops : All tests successful (5) Rect : All tests successful (1) SDL_Surface : All tests successful (6) Rendering with cocoa driver : All tests successful (3) Assert Failed! Blit output not the same. Test Case 'Renderer x11' Test Suite 'Rendering with x11 driver' Last SDL error '' Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetSurfaceBounds Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorFailure: Set a breakpoint @ CGErrorBreakpoint() to catch errors as they are logged. Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150 Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150 Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150 Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetWindowBounds Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetSurfaceBounds Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150 Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150 Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150 Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetWindowBounds Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetSurfaceBounds Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150 Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150 Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150 Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetWindowBounds Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetSurfaceBounds Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150 Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150 Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150 Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetWindowBounds Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetSurfaceBounds Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150 Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150 Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150 Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetWindowBounds Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetSurfaceBounds Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150 Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150 Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150 Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetWindowBounds Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSGetSurfaceBounds Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150 Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150 Sat May 8 00:30:34 iMacAL.local testsdl[71586] <Error>: kCGErrorIllegalArgument: CGSBindSurface: Invalid window 0xa150 Rendering with x11 driver : Failed 1 out of 4 testcases! Rendering with dummy driver : All tests successful (3) SDL_Audio : All tests successful (1) Tests run with SDL 1.3.0 revision 1095906 System is running Mac OS X and is little endian
author Eric Wing <ewing . public |-at-| gmail . com>
date Sat, 08 May 2010 00:54:22 -0700
parents 78db4f7ae2f3
children 8f73f4a3c972
comparison
equal deleted inserted replaced
4446:8b03a20b320f 4447:947201caa46e
7 */ 7 */
8 8
9 9
10 #include "SDL.h" 10 #include "SDL.h"
11 #include "../SDL_at.h" 11 #include "../SDL_at.h"
12 12 #if __APPLE__
13 #include "Test_rwopsbundlesupport.h"
14 #endif
13 15
14 #define RWOPS_READ "rwops/read" 16 #define RWOPS_READ "rwops/read"
17
18 #if __APPLE__
19 #define RWOPS_WRITE "write"
20 #else
15 #define RWOPS_WRITE "rwops/write" 21 #define RWOPS_WRITE "rwops/write"
22 #endif
16 23
17 static const char hello_world[] = "Hello World!"; 24 static const char hello_world[] = "Hello World!";
18 25
19 26
20 /** 27 /**
217 224
218 /* Begin testcase. */ 225 /* Begin testcase. */
219 SDL_ATbegin( "SDL_RWFromFP" ); 226 SDL_ATbegin( "SDL_RWFromFP" );
220 227
221 /* Run read tests. */ 228 /* Run read tests. */
229 #if __APPLE__
230 /* Cheating: Using private API in SDL */
231 fp = Test_OpenFPFromBundleOrFallback( RWOPS_READ, "r" );
232 #else
222 fp = fopen( RWOPS_READ, "r" ); 233 fp = fopen( RWOPS_READ, "r" );
234 #endif
223 if (SDL_ATassert( "Failed to open file '"RWOPS_READ"'", fp != NULL)) 235 if (SDL_ATassert( "Failed to open file '"RWOPS_READ"'", fp != NULL))
224 return; 236 return;
225 rw = SDL_RWFromFP( fp, 1 ); 237 rw = SDL_RWFromFP( fp, 1 );
226 if (SDL_ATassert( "Opening memory with SDL_RWFromFP", rw != NULL )) 238 if (SDL_ATassert( "Opening memory with SDL_RWFromFP", rw != NULL ))
227 return; 239 return;
228 if (rwops_testGeneric( rw, 0 )) 240 if (rwops_testGeneric( rw, 0 ))
229 return; 241 return;
230 SDL_FreeRW( rw ); 242 SDL_FreeRW( rw );
231 243
232 /* Run write tests. */ 244 /* Run write tests. */
245 #if __APPLE__
246 /* Cheating: Using private API in SDL */
247 fp = Test_OpenFPFromTemporaryDir( RWOPS_WRITE, "w+" );
248 #else
233 fp = fopen( RWOPS_WRITE, "w+" ); 249 fp = fopen( RWOPS_WRITE, "w+" );
250 #endif
234 if (SDL_ATassert( "Failed to open file '"RWOPS_WRITE"'", fp != NULL)) 251 if (SDL_ATassert( "Failed to open file '"RWOPS_WRITE"'", fp != NULL))
235 return; 252 return;
236 rw = SDL_RWFromFP( fp, 1 ); 253 rw = SDL_RWFromFP( fp, 1 );
237 if (SDL_ATassert( "Opening memory with SDL_RWFromFP", rw != NULL )) 254 if (SDL_ATassert( "Opening memory with SDL_RWFromFP", rw != NULL ))
238 return; 255 return;