From fe4d9bcf92b504e4a67600f90aa57c1f9791c0a6 Mon Sep 17 00:00:00 2001 From: Harry Jeffery Date: Sun, 26 Nov 2017 14:10:33 +0000 Subject: Update loader unit tests --- Makefile | 2 +- test/loader.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index cbf8d20..15caa29 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ $(BUILDDIR): $(BUILDDIR)/%.o: src/%.c $(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $< -$(BUILDDIR)/test_%: test/%.c src/%.c +$(BUILDDIR)/test_%: test/%.c $(filter-out src/main.c, $(wildcard src/*.c)) $(CC) -o $@ -Isrc $(TFLAGS) $^ $(LDFLAGS) $(TLIBS) check: $(BUILDDIR) $(TESTS) diff --git a/test/loader.c b/test/loader.c index 04654ad..3456abc 100644 --- a/test/loader.c +++ b/test/loader.c @@ -4,9 +4,9 @@ #include #include #include -#include #include #include "loader.h" +#include "bitmap.h" static void test_jpeg_rotation(void **state) { @@ -20,7 +20,7 @@ static void test_jpeg_rotation(void **state) imv_loader_load(ldr, "test/orientation.jpg", NULL, 0); - FIBITMAP *bmp = NULL; + struct imv_bitmap *bmp = NULL; SDL_Event event; while(SDL_WaitEvent(&event)) { assert_false(event.type == BAD_IMAGE); @@ -32,10 +32,10 @@ static void test_jpeg_rotation(void **state) } assert_false(bmp == NULL); - unsigned int width = FreeImage_GetWidth(bmp); + unsigned int width = bmp->width; assert_true(width == 1); - FreeImage_Unload(bmp); + imv_bitmap_free(bmp); imv_loader_free(ldr); } -- cgit v1.2.3