Skip to content
This repository has been archived by the owner on Feb 11, 2021. It is now read-only.

Commit

Permalink
Using common infrastructure.
Browse files Browse the repository at this point in the history
  • Loading branch information
@bobbens
bobbens committed Jul 11, 2009
1 parent 343825a commit aaab305
Show file tree
Hide file tree
Showing 10 changed files with 179 additions and 86 deletions.
4 changes: 2 additions & 2 deletions test/automated/Makefile
View file
@@ -1,13 +1,13 @@


CFLAGS := -W -Wall -Wextra -I. `sdl-config --cflags`
CFLAGS := -W -Wall -Wextra -g -I. `sdl-config --cflags`
LDFLAGS := `sdl-config --libs`

# If it doesn't pick up defaults
#CFLAGS := -I. -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/local/include/SDL
#LDFLAGS := -lm -ldl -lesd -lpthread

COMMON_SRC := SDL_at.c /usr/local/lib/libSDL.a
COMMON_SRC := SDL_at.c common/common.c
COMMON_INCLUDE := SDL_at.h

TESTS_ALL := rwops/rwops surface/surface
Expand Down
60 changes: 60 additions & 0 deletions test/automated/common/common.c
View file
@@ -0,0 +1,60 @@
/**
* Automated SDL_Surface test.
*
* Written by Edgar Simo "bobbens"
*
* Released under Public Domain.
*/


#include "SDL.h"
#include "SDL_at.h"

#include "common/common.h"


/**
* @brief Compares a surface and a surface image for equality.
*/
int surface_compare( SDL_Surface *sur, const SurfaceImage_t *img )
{
int ret;
int i,j;
int bpp;
Uint8 *p, *pd;

/* Make sure size is the same. */
if ((sur->w != img->width) || (sur->h != img->height))
return -1;

SDL_LockSurface( sur );

ret = 0;
bpp = sur->format->BytesPerPixel;

/* Compare image - should be same format. */
for (j=0; j<sur->h; j++) {
for (i=0; i<sur->w; i++) {
p = (Uint8 *)sur->pixels + j * sur->pitch + i * bpp;
pd = (Uint8 *)img->pixel_data + (j*img->width + i) * img->bytes_per_pixel;
switch (bpp) {
case 1:
case 2:
case 3:
ret += 1;
printf("%d BPP not supported yet.\n",bpp);
break;

case 4:
ret += !( (p[0] == pd[0]) &&
(p[1] == pd[1]) &&
(p[2] == pd[2]) );
break;
}
}
}

SDL_UnlockSurface( sur );

return ret;
}
46 changes: 46 additions & 0 deletions test/automated/common/common.h
View file
@@ -0,0 +1,46 @@
/**
* Automated SDL test common framework.
*
* Written by Edgar Simo "bobbens"
*
* Released under Public Domain.
*/


#ifndef COMMON_H
# define COMMON_H


#if (SDL_BYTEORDER == SDL_BIG_ENDIAN)
# define RMASK 0xff000000 /**< Red bit mask. */
# define GMASK 0x00ff0000 /**< Green bit mask. */
# define BMASK 0x0000ff00 /**< Blue bit mask. */
# define AMASK 0x000000ff /**< Alpha bit mask. */
#else
# define RMASK 0x000000ff /**< Red bit mask. */
# define GMASK 0x0000ff00 /**< Green bit mask. */
# define BMASK 0x00ff0000 /**< Blue bit mask. */
# define AMASK 0xff000000 /**< Alpha bit mask. */
#endif


typedef struct SurfaceImage_s {
int width;
int height;
unsigned int bytes_per_pixel; /* 3:RGB, 4:RGBA */
const unsigned char pixel_data[];
} SurfaceImage_t;


/**
* @brief Compares a surface and a surface image for equality.
*
* @param sur Surface to compare.
* @param img Image to compare against.
* @return 0 if they are the same, -1 on error and positive if different.
*/
int surface_compare( SDL_Surface *sur, const SurfaceImage_t *img );


#endif /* COMMON_H */

22 changes: 22 additions & 0 deletions test/automated/common/images.h
View file
@@ -0,0 +1,22 @@


#ifndef IMAGES_H
# define IMAGES_H


#include "common/common.h"


/*
* Pull in images for testcases.
*/
#include "common/img_primitives.c"
#include "common/img_primitivesblend.c"
#include "common/img_face.c"
#include "common/img_blit.c"
#include "common/img_blitblend.c"


#endif /* IMAGES_H */


0 test/automated/surface/blit.c → test/automated/common/img_blit.c
View file
File renamed without changes.
0 test/automated/surface/blitblend.c → test/automated/common/img_blitblend.c
View file
File renamed without changes.
0 test/automated/surface/face.c → test/automated/common/img_face.c
View file
File renamed without changes.
0 test/automated/surface/primitives.c → test/automated/common/img_primitives.c
View file
File renamed without changes.
0 test/automated/surface/blend.c → test/automated/common/img_primitivesblend.c
View file
File renamed without changes.
133 changes: 49 additions & 84 deletions test/automated/surface/surface.c
View file
Expand Up @@ -8,89 +8,29 @@


#include "SDL.h"
#include "SDL_surface.h"
#include "SDL_video.h"
#include "SDL_at.h"


#if (SDL_BYTEORDER == SDL_BIG_ENDIAN)
# define RMASK 0xff000000 /**< Red bit mask. */
# define GMASK 0x00ff0000 /**< Green bit mask. */
# define BMASK 0x0000ff00 /**< Blue bit mask. */
# define AMASK 0x000000ff /**< Alpha bit mask. */
#else
# define RMASK 0x000000ff /**< Red bit mask. */
# define GMASK 0x0000ff00 /**< Green bit mask. */
# define BMASK 0x00ff0000 /**< Blue bit mask. */
# define AMASK 0xff000000 /**< Alpha bit mask. */
#endif


typedef struct SurfaceImage_s {
int width;
int height;
unsigned int bytes_per_pixel; /* 3:RGB, 4:RGBA */
const unsigned char pixel_data[];
} SurfaceImage_t;
#include "common/common.h"


/*
* Pull in images for testcases.
*/
#include "primitives.c"
#include "blend.c"
#include "face.c"
#include "blit.c"
#include "blitblend.c"
#include "common/images.h"


/**
* @brief Compares a surface and a surface image for equality.
*
* @param sur Surface to compare.
* @param img Image to compare against.
* @return 0 if they are the same, -1 on error and positive if different.
/*
* Prototypes.
*/
static int surface_compare( SDL_Surface *sur, const SurfaceImage_t *img )
{
int ret;
int i,j;
int bpp;
Uint8 *p, *pd;

/* Make sure size is the same. */
if ((sur->w != img->width) || (sur->h != img->height))
return -1;

SDL_LockSurface( sur );

ret = 0;
bpp = sur->format->BytesPerPixel;

/* Compare image - should be same format. */
for (j=0; j<sur->h; j++) {
for (i=0; i<sur->w; i++) {
p = (Uint8 *)sur->pixels + j * sur->pitch + i * bpp;
pd = (Uint8 *)img->pixel_data + (j*img->width + i) * img->bytes_per_pixel;
switch (bpp) {
case 1:
case 2:
case 3:
ret += 1;
printf("%d BPP not supported yet.\n",bpp);
break;

case 4:
ret += !( (p[0] == pd[0]) &&
(p[1] == pd[1]) &&
(p[2] == pd[2]) );
break;
}
}
}

SDL_UnlockSurface( sur );

return ret;
}
/* Testcases. */
static void surface_testLoad( SDL_Surface *testsur );
static void surface_testPrimitives( SDL_Surface *testsur );
static void surface_testPrimitivesBlend( SDL_Surface *testsur );
static void surface_testBlit( SDL_Surface *testsur );
static int surface_testBlitBlendMode( SDL_Surface *testsur, SDL_Surface *face, int mode );
static void surface_testBlitBlend( SDL_Surface *testsur );


/**
Expand Down Expand Up @@ -586,40 +526,65 @@ static void surface_testBlitBlend( SDL_Surface *testsur )
}


/**
* @brief Runs all the tests on the surface.
*
* @param testsur Surface to run tests on.
*/
void surface_runTests( SDL_Surface *testsur )
{
/* Software surface blitting. */
surface_testPrimitives( testsur );
surface_testPrimitivesBlend( testsur );
surface_testBlit( testsur );
surface_testBlitBlend( testsur );
}


/**
* @brief Entry point.
*/
int main( int argc, const char *argv[] )
{
(void) argc;
(void) argv;
int ret;
SDL_Surface *testsur;

SDL_ATinit( "SDL_Surface" );

SDL_ATbegin( "Initializing" );
/* Initializes the SDL subsystems. */
SDL_Init(0);

SDL_ATbegin( "Creating Testsurface" );
ret = SDL_Init(0);
if (SDL_ATassert( "SDL_Init(0)", ret == 0))
goto err;

/* Now run on the video mode. */
ret = SDL_InitSubSystem( SDL_INIT_VIDEO );
if (SDL_ATassert( "SDL_InitSubSystem( SDL_INIT_VIDEO )", ret == 0))
goto err;

/*
* Surface on surface tests.
*/
/* Create the test surface. */
testsur = SDL_CreateRGBSurface( 0, 80, 60, 32,
RMASK, GMASK, BMASK, AMASK );
if (SDL_ATassert( "SDL_CreateRGBSurface", testsur != NULL))
return -1;
goto err;
SDL_ATend();

/* Software blitting. */
/* Run surface on surface tests. */
surface_testLoad( testsur );
surface_testPrimitives( testsur );
surface_testPrimitivesBlend( testsur );
surface_testBlit( testsur );
surface_testBlitBlend( testsur );

surface_runTests( testsur );
/* Clean up. */
SDL_FreeSurface( testsur );

/* Exit SDL. */
SDL_Quit();

return SDL_ATfinish(1);

err:
return SDL_ATfinish(1);
}

0 comments on commit aaab305

Please sign in to comment.