Removed unit tests

CMakeLists.txt

@@ -62,7 +62,6 @@ set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -fomit-frame-
 
 # Add subdirectories
 add_subdirectory (src)
-add_subdirectory (test)
 
 #################################################################
 

ChangeLog

@@ -5,6 +5,10 @@
 
  OpenRaider (0.1.2) xythobuz <xythobuz@xythobuz.de>
 
+	[ 20140313 ]
+	* Removed unit tests. No unit tests are better then some half-assed
+	  non working ones...
+
 	[ 20140312 ]
 	* Resizing the window works properly (except for fixed string positions)
 	* Removed FullScreen config command and flag that had no effect

README.md

@@ -30,7 +30,6 @@ Basically, OpenRaider depends on the following:
 * OpenGL
 * SDL2 & SDL2-TTF
 * OpenAL & ALUT
-* Posix Threads
 * zlib
 * cmake as build system
 
@@ -62,10 +61,6 @@ Do a standard cmake out-of-source build to get a debug configuration and then ru
 
 On Mac OS X, running `make install` will produce a (more or less) distributable OpenRaider.app bundle.
 
-To build all Unit Tests run `make tests`, to build and run most of them use `make testRun`.
-
-To run a TombRaider level loader regression test use `make testReg`. The results will be put into log files in your build folder.
-
 You can run a static analysis with cppcheck using `make check`, `make checkFull` or `make checkConfig`.
 
 A Doxygen API documentation can be created with `make doc`.
@@ -214,10 +209,6 @@ These commands have to be entered as `stat COMMAND`.
 
 The included example Font, [Droid Sans Mono](http://www.droidfonts.com/licensing/), was created by Steve Matteson and is licensed under the [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0).
 
-The included sample WAV file is made from the [Falling Mate ringtone](http://brechler-web.de/fallingmate/) by [Plaetzchen](http://plaetzchen.cc).
-
-The included Unit Test Framework [greatest](https://github.com/silentbicycle/greatest/) by Scott Vokes is licensed under the [ISC License](http://www.isc.org/downloads/software-support-policy/isc-license/).
-
 There are some included cmake scripts:
 
 * [FindALUT](https://github.com/rpavlik/cmake-modules/blob/master/FindALUT.cmake)

cmake/setup.sh

@@ -9,6 +9,5 @@ mkdir -p ~/.OpenRaider/music
 mkdir -p ~/.OpenRaider/data
 mkdir -p ~/.OpenRaider/sshots
 cp data/*.tga ~/.OpenRaider/data
-cp data/*.wav ~/.OpenRaider/data
 cp data/*.ttf ~/.OpenRaider/data
 echo "DONE"

cmake/setup_mac.sh

@@ -10,7 +10,6 @@ if [ ! -d "${HOME}/.OpenRaider" ]; then
     mkdir -p ~/.OpenRaider/data
     mkdir -p ~/.OpenRaider/sshots
     cp ../Resources/defaults/*.tga ~/.OpenRaider/data
-    cp ../Resources/defaults/*.wav ~/.OpenRaider/data
     cp ../Resources/defaults/*.ttf ~/.OpenRaider/data
     echo "DONE"
     osascript -e 'tell app "System Events" to display alert "Initial Configuration stored in ~/.OpenRaider\n\nView and edit OpenRaider.init to your needs..."'

src/CMakeLists.txt

@@ -38,9 +38,8 @@ if (APPLE)
     set (SRCS ${SRCS} ${MAC_ICON})
 
     # Copy Data
-    set (MAC_DATA "../data/custom.cfg" "../data/OpenRaider.init" "../data/particle.tga" "../data/sample.wav")
-    set (MAC_DATA ${MAC_DATA} "../data/snow.tga" "../data/snow2.tga" "../data/splash.tga" "../data/test.ttf")
-    set (MAC_DATA ${MAC_DATA} "../data/white.tga")
+    set (MAC_DATA "../data/custom.cfg" "../data/OpenRaider.init" "../data/test.ttf")
+    set (MAC_DATA ${MAC_DATA} "../data/snow.tga" "../data/snow2.tga" "../data/splash.tga")
     set_source_files_properties (${MAC_DATA} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/defaults)
     set (SRCS ${SRCS} ${MAC_DATA})
 endif (APPLE)
@@ -164,10 +163,6 @@ find_package (ZLIB REQUIRED)
 include_directories (SYSTEM ${ZLIB_INCLUDE_DIRS})
 set (LIBS ${LIBS} ${ZLIB_LIBRARIES})
 
-# Add Thread Library
-find_package (Threads REQUIRED)
-set (LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT})
-
 # Add utils Library
 set (LIBS ${LIBS} utilities)
 

test/CMakeLists.txt

@@ -1,133 +0,0 @@
-# Include directory
-include_directories ("${PROJECT_SOURCE_DIR}/include")
-
-# Include External Modules
-set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
-
-# Flags for all builds
-set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -std=c++11")
-set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -g -O0 ${WARNINGS}")
-set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -DDEBUG")
-set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -DUNIT_TEST")
-
-#################################################################
-
-# TGA Test
-set (TGASRCS "${PROJECT_SOURCE_DIR}/test/tga.cpp" "${PROJECT_SOURCE_DIR}/src/utils/tga.cpp")
-add_executable (TGATest EXCLUDE_FROM_ALL ${TGASRCS})
-set_target_properties (TGATest PROPERTIES COMPILE_FLAGS ${OpenRaider_CXX_FLAGS})
-
-#################################################################
-
-# Add OpenAL Library
-find_package (OpenAL REQUIRED)
-include_directories (SYSTEM ${OPENAL_INCLUDE_DIRS})
-set (SOUNDLIBS ${SOUNDLIBS} ${OPENAL_LIBRARIES})
-
-# Add ALUT Library
-find_package (ALUT REQUIRED)
-include_directories (SYSTEM ${ALUT_INCLUDE_DIRS})
-set (SOUNDLIBS ${SOUNDLIBS} ${ALUT_LIBRARIES})
-
-# Sound Test
-set (SOUNDSRCS "${PROJECT_SOURCE_DIR}/test/Sound.cpp" "${PROJECT_SOURCE_DIR}/src/Sound.cpp")
-add_executable (SoundTest EXCLUDE_FROM_ALL ${SOUNDSRCS})
-set_target_properties (SoundTest PROPERTIES COMPILE_FLAGS ${OpenRaider_CXX_FLAGS})
-target_link_libraries (SoundTest ${SOUNDLIBS})
-
-#################################################################
-
-# Math Test
-set (MATHSRCS "${PROJECT_SOURCE_DIR}/test/math.cpp" "${PROJECT_SOURCE_DIR}/src/utils/math.cpp" "${PROJECT_SOURCE_DIR}/src/Vector3d.cpp")
-add_executable (MathTest EXCLUDE_FROM_ALL ${MATHSRCS})
-set_target_properties (MathTest PROPERTIES COMPILE_FLAGS ${OpenRaider_CXX_FLAGS})
-
-#################################################################
-
-# Matrix Test
-set (MATRIXSRCS "${PROJECT_SOURCE_DIR}/test/Matrix.cpp" "${PROJECT_SOURCE_DIR}/src/Matrix.cpp")
-set (MATRIXSRCS ${MATRIXSRCS} "${PROJECT_SOURCE_DIR}/src/Vector3d.cpp" "${PROJECT_SOURCE_DIR}/src/utils/math.cpp")
-set (MATRIXSRCS ${MATRIXSRCS} "${PROJECT_SOURCE_DIR}/src/Quaternion.cpp")
-add_executable (MatrixTest EXCLUDE_FROM_ALL ${MATRIXSRCS})
-set_target_properties (MatrixTest PROPERTIES COMPILE_FLAGS ${OpenRaider_CXX_FLAGS})
-target_link_libraries (MatrixTest m)
-
-#################################################################
-
-# Add SDL2 Library
-find_package (SDL2 REQUIRED)
-include_directories (SYSTEM ${SDL2_INCLUDE_DIR})
-set (GLLIBS ${GLLIBS} ${SDL2_LIBRARY})
-
-# Add SDL2_ttf Library
-find_package (SDL2TTF REQUIRED)
-include_directories (SYSTEM ${SDL2TTF_INCLUDE_DIR})
-set (GLLIBS ${GLLIBS} ${SDL2TTF_LIBRARY})
-
-# Add OpenGL Library
-find_package (OpenGL REQUIRED)
-include_directories (SYSTEM ${OPENGL_INCLUDE_DIRS})
-set (GLLIBS ${GLLIBS} ${OPENGL_LIBRARIES})
-
-# GLString Test
-set (GLSTRINGSRCS "${PROJECT_SOURCE_DIR}/test/GLString.cpp" "${PROJECT_SOURCE_DIR}/src/GLString.cpp")
-set (GLSTRINGSRCS ${GLSTRINGSRCS} "${PROJECT_SOURCE_DIR}/src/utils/tga.cpp" "${PROJECT_SOURCE_DIR}/src/Texture.cpp")
-add_executable (GLStringTest EXCLUDE_FROM_ALL ${GLSTRINGSRCS})
-set_target_properties (GLStringTest PROPERTIES COMPILE_FLAGS ${OpenRaider_CXX_FLAGS})
-target_link_libraries (GLStringTest m ${GLLIBS})
-
-#################################################################
-
-# Add Z Library
-find_package (ZLIB REQUIRED)
-include_directories (SYSTEM ${ZLIB_INCLUDE_DIRS})
-set (ZLIBS ${ZLIBS} ${ZLIB_LIBRARIES})
-
-# TombRaider Test
-set (TOMB_FLAGS "-D__TEST_TR5_DUMP_TGA -D__TEST_32BIT_TEXTILES")
-set (TOMBSRCS "${PROJECT_SOURCE_DIR}/test/TombRaider.cpp" "${PROJECT_SOURCE_DIR}/src/TombRaider.cpp")
-set (TOMBSRCS ${TOMBSRCS} "${PROJECT_SOURCE_DIR}/src/utils/tga.cpp")
-add_executable (TombRaiderTest EXCLUDE_FROM_ALL ${TOMBSRCS})
-set_target_properties (TombRaiderTest PROPERTIES COMPILE_FLAGS "${OpenRaider_CXX_FLAGS} ${TOMB_FLAGS}")
-target_link_libraries (TombRaiderTest ${ZLIBS})
-
-#################################################################
-
-# Add test build target
-add_custom_target (tests)
-add_dependencies (tests GLStringTest MathTest MatrixTest SoundTest TGATest TombRaiderTest)
-
-# Add test run target
-add_custom_target (testRun echo "Running Unit Tests..."
-    COMMAND TGATest
-    COMMAND SoundTest
-    COMMAND MatrixTest
-    COMMAND MathTest
-    COMMAND GLStringTest
-)
-add_dependencies (testRun tests)
-
-# Add TombRaider regression test target
-set (REGTEST_TR1 "~/.OpenRaider/paks/tr1/level1.phd")
-set (REGTEST_TR2 "~/.OpenRaider/paks/tr2/unwater.tr2")
-#set (REGTEST_TR3 "~/.OpenRaider/paks/tr3/scotland.tr2")
-set (REGTEST_TR3 "~/.OpenRaider/paks/tr3/HOUSE.TR2")
-set (REGTEST_TR4 "~/.OpenRaider/paks/tr4/angkor1.tr4")
-#set (REGTEST_TR5 "~/.OpenRaider/paks/tr5/demo.trc")
-set (REGTEST_TR5 "~/.OpenRaider/paks/tr5/andy1.trc")
-add_custom_target (testReg echo "Running TombRaider 1 Regression Test..."
-    COMMAND TombRaiderTest load ${REGTEST_TR1} > ../log.tr1
-    COMMAND echo "Running TombRaider 2 Regression Test..."
-    COMMAND TombRaiderTest load ${REGTEST_TR2} > ../log.tr2
-    COMMAND echo "Running TombRaider 3 Regression Test..."
-    COMMAND TombRaiderTest load ${REGTEST_TR3} > ../log.tr3
-    COMMAND echo "Running TombRaider 4 Regression Test..."
-    COMMAND TombRaiderTest load ${REGTEST_TR4} > ../log.tr4
-    COMMAND echo "Running TombRaider 5 Regression Test..."
-    COMMAND TombRaiderTest load ${REGTEST_TR5} > ../log.tr5
-)
-add_dependencies (testReg TombRaiderTest)
-
-# Clean regression test logs
-set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
-    "../log.tr1;../log.tr2;../log.tr3;../log.tr4;../log.tr5")

test/GLString.cpp

@@ -1,275 +0,0 @@
-/*!
- * \file test/GLString.cpp
- * \brief Open GL rendering font/string Unit Test
- *
- * \author Mongoose
- * \author xythobuz
- */
-
-#include <math.h>
-#include <SDL2/SDL.h>
-#ifdef __APPLE__
-#include <OpenGL/glu.h>
-#else
-#include <GL/glu.h>
-#endif
-
-#include <Texture.h>
-#include <GLString.h>
-
-GLString *TEXT;
-SDL_Window *sdlWindow;
-SDL_GLContext glContext;
-Texture gTexture;
-
-void swap_buffers();
-
-void event_resize(int width, int height) {
-    glMatrixMode(GL_PROJECTION);
-    GLfloat aspect = (GLfloat)width/(GLfloat)height;
-
-    // Mongoose 2002.01.01, Setup view volume, with a nice FOV
-    // xythobuz:
-    // gluPerspective is deprecated!
-    // gluPerspective(40.0, aspect, 1, 2000);
-    // fix: http://stackoverflow.com/a/2417756
-    GLfloat fH = tanf(40.0f / 360.0f * 3.14159f);
-    GLfloat fW = fH * aspect;
-    glFrustum(-fW, fW, -fH, fH, 1, 2000);
-
-    glMatrixMode(GL_MODELVIEW);
-}
-
-void event_display(int width, int height) {
-    static float r = 0.0f;
-    float x = 0.0f, y = 0.0f, z = -150.0f;
-
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-    glLoadIdentity();
-
-    glTranslatef(0.0f, 0.0f, -20.0f);
-    glRotatef((float)cosf(r)*180.0f, 0.0f, 0.0f, 1.0f);
-    r += 0.01f;
-
-    // Mongoose 2002.01.01, Render color quad
-    glDisable(GL_TEXTURE_2D);
-    glBegin(GL_TRIANGLE_STRIP);
-    glColor3f(1.0, 0.0, 0.0);
-    glVertex3f(x + 50, y + 50, z);
-    glColor3f(0.0, 1.0, 0.0);
-    glVertex3f(x - 50, y + 50, z);
-    glColor3f(0.0, 0.0, 1.0);
-    glVertex3f(x + 50, y - 50, z);
-    glColor3f(0.5, 0.5, 0.5);
-    glVertex3f(x - 50, y - 50, z);
-    glEnd();
-
-    // Mongoose 2002.01.01, Render text
-    glDisable(GL_CULL_FACE);
-    glEnable(GL_BLEND);
-    glEnable(GL_TEXTURE_2D);
-    glColor3f(0.5f, 0.7f, 1.0f);
-
-    glEnterMode2d(width, height);
-    TEXT->Render();
-    glExitMode2d();
-
-    glFlush();
-    swap_buffers();
-}
-
-void swap_buffers() {
-    SDL_GL_SwapWindow(sdlWindow);
-}
-
-
-void shutdown_gl() {
-    SDL_GL_DeleteContext(glContext);
-    SDL_DestroyWindow(sdlWindow);
-    SDL_Quit();
-}
-
-void init_gl() {
-    // Setup GL
-    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
-    glShadeModel(GL_SMOOTH);
-    glEnable(GL_DEPTH_TEST);
-    glDepthFunc(GL_LESS);
-    glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-}
-
-void init_text() {
-    int i;
-
-    // Mongoose 2002.01.01, Texture setup
-    gTexture.reset();
-    gTexture.setFlag(Texture::fUseMipmaps);
-    gTexture.setMaxTextureCount(32);
-
-    gTexture.loadFontTTF("../../data/test.ttf", 32, 126 - 32);  // ASCII
-
-    TEXT->Init(4);
-    i = TEXT->glPrintf(50, 50, "OpenRaider GLString");
-    if (i) {
-        printf("TEXT->glPrintf> ERROR code %i\n", i);
-    }
-    i = TEXT->glPrintf(50, 100, "Unit Test by Mongoose");
-    if (i) {
-        printf("TEXT->glPrintf> ERROR code %i\n", i);
-    }
-    TEXT->Scale(1.2f);
-    i = TEXT->glPrintf(50, 150, "ported to SDL2 & TTF");
-    if (i) {
-        printf("TEXT->glPrintf> ERROR code %i\n", i);
-    }
-    i = TEXT->glPrintf(50, 200, "by xythobuz");
-    if (i) {
-        printf("TEXT->glPrintf> ERROR code %i\n", i);
-    }
-    TEXT->setActive(0, true);
-    TEXT->setActive(1, true);
-    TEXT->setActive(2, true);
-    TEXT->setActive(3, true);
-}
-
-[[noreturn]] void main_gl() {
-    SDL_Event event;
-    unsigned int mkeys, mod, key;
-    int flags;
-    unsigned int width = 640;
-    unsigned int height = 480;
-    bool fullscreen = false;
-#ifndef __APPLE__
-    char *driver = NULL;
-#endif
-
-    // Setup clean up on exit
-    atexit(shutdown_gl);
-
-    // Create GL context
-    SDL_Init(SDL_INIT_VIDEO);
-
-#ifndef __APPLE__
-    if (!driver || !driver[0] || SDL_GL_LoadLibrary(driver) < 0) {
-        SDL_ClearError();
-
-        // Fallback 1
-        if (SDL_GL_LoadLibrary("libGL.so") < 0) {
-            SDL_ClearError();
-
-            // Fallback 2
-            if (SDL_GL_LoadLibrary("libGL.so.1") < 0) {
-                fprintf(stderr, "main_gl> SDL_GL_LoadLibrary failed!\n");
-                fprintf(stderr, "main_gl> Error is [%s].\n", SDL_GetError());
-                exit(1);
-            }
-        }
-    }
-#endif
-
-    flags = SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE;
-
-    if (fullscreen) {
-        flags |= SDL_WINDOW_FULLSCREEN;
-        SDL_ShowCursor(SDL_DISABLE);
-    }
-
-    SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5);
-    SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5);
-    SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5);
-    SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
-    SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
-
-    sdlWindow = SDL_CreateWindow("GLString Test", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, width, height, flags);
-    glContext = SDL_GL_CreateContext(sdlWindow);
-
-    // Init rendering
-    init_gl();
-    event_resize(width, height);
-    init_text();
-
-    for (;;) {
-        // Pause for 10-20 ms
-        SDL_Delay(10);
-
-        event_display(width, height);
-
-        while (SDL_PollEvent(&event)) {
-            switch (event.type) {
-                case SDL_QUIT:
-                    exit(0);
-                case SDL_MOUSEMOTION:
-                    break;
-                case SDL_MOUSEBUTTONDOWN:
-                case SDL_MOUSEBUTTONUP:
-                    break;
-                case SDL_KEYDOWN:
-                    mkeys = (unsigned int)SDL_GetModState();
-                    mod = 0;
-
-                    if (mkeys & KMOD_LSHIFT)
-                        mod |= KMOD_LSHIFT;
-
-                    if (mkeys & KMOD_RSHIFT)
-                        mod |= KMOD_RSHIFT;
-
-                    if (mkeys & KMOD_LCTRL)
-                        mod |= KMOD_LCTRL;
-
-                    if (mkeys & KMOD_RCTRL)
-                        mod |= KMOD_RCTRL;
-
-                    if (mkeys & KMOD_LALT)
-                        mod |= KMOD_LALT;
-
-                    if (mkeys & KMOD_RALT)
-                        mod |= KMOD_RALT;
-
-                    if (mkeys & KMOD_LGUI)
-                        mod |= KMOD_LGUI;
-
-                    if (mkeys & KMOD_RGUI)
-                        mod |= KMOD_RGUI;
-
-                    key = event.key.keysym.sym;
-
-                    switch (key)
-                    {
-                        case 0x1B: // 27d, ESC
-                            exit(0);
-#ifdef __APPLE__
-                        case 113: // q
-                            if ((mod & KMOD_RGUI) || (mod & KMOD_LGUI))
-                                exit(0);
-                            break;
-#endif
-                    }
-                    break;
-                case SDL_KEYUP:
-                    break;
-                case SDL_WINDOWEVENT:
-                    switch(event.window.event) {
-                        case SDL_WINDOWEVENT_RESIZED:
-                            width = event.window.data1;
-                            height = event.window.data2;
-                            event_resize(width, height);
-                            event_display(width, height);
-                            break;
-                    }
-                    break;
-            }
-        }
-    }
-}
-
-int main(int argc, char *argv[]) {
-    if (argc == 1) {
-        TEXT = new GLString();
-        main_gl();
-    } else {
-        printf("Usage:\n\t%s\n", argv[0]);
-        return 1;
-    }
-}
-

test/Matrix.cpp

@@ -1,140 +0,0 @@
-/*!
- * \file test/Matrix.cpp
- * \brief Matrix Unit Test
- *
- * \author Mongoose
- * \author xythobuz
- */
-#include <stdio.h>
-#include <math.h>
-#include <strings.h>
-#include <Matrix.h>
-#include "greatest.h"
-
-#ifdef COLUMN_ORDER
-unsigned char i0  =  0, i1  =  4, i2  =  8; // i3  = 12
-unsigned char i4  =  1, i6  =  9; // i5  =  5, i7  = 13
-unsigned char i8  =  2, i9  =  6, i10 = 10; // i11 = 14
-unsigned char i12 =  3, i13 =  7, i14 = 11, i15 = 15;
-#else
-unsigned char i0  =  0, i1  =  1, i2  =  2; // i3  =  3
-unsigned char i4  =  4, i6  =  6; // i5  =  5, i7  =  7
-unsigned char i8  =  8, i9  =  9, i10 = 10; // i11 = 11
-unsigned char i12 = 12, i13 = 13, i14 = 14, i15 = 15;
-#endif
-
-vec_t initialValues[][4] = {
-    { 45.0f, 90.0f, 180.0f, 270.0f },
-    { 10.0, 20.0, 30.0, 40.0 }
-};
-
-TEST identity(vec_t init[4], int mode) {
-    Matrix a, b, c;
-    matrix_t m;
-
-    // Fill A matrix with garbage
-    m[ 0] = m[ 1] = m[ 2] = m[ 3] = init[0];
-    m[ 4] = m[ 5] = m[ 6] = m[ 7] = init[1];
-    m[ 8] = m[ 9] = m[10] = m[11] = init[2];
-    m[12] = m[13] = m[14] = m[15] = init[3];
-    a.setMatrix(m);
-
-    switch (mode) {
-        case 0:
-            a.setIdentity();
-            break;
-        case 1:
-            c.setIdentity();
-            b.setIdentity();
-            a = c * b;
-            break;
-        case 2:
-            a.setIdentity();
-            b.setIdentity();
-            a = a * b;
-            break;
-    }
-    ASSERT(a.isIdentity());
-    PASS();
-}
-
-TEST translation() {
-    Matrix a;
-    a.setIdentity();
-    a.translate(10, 20, 30);
-    ASSERT(equalEpsilon(a.mMatrix[i12], 10));
-    ASSERT(equalEpsilon(a.mMatrix[i13], 20));
-    ASSERT(equalEpsilon(a.mMatrix[i14], 30));
-    PASS();
-}
-
-TEST rotation(int axis) {
-    Matrix a;
-    a.setIdentity();
-    vec_t rot = 90 * 0.01745329251994329f;
-    a.rotate((axis == 0) ? rot : 0, (axis == 1) ? rot : 0, (axis == 2) ? rot : 0);
-    if (axis == 0) {
-        ASSERT(equalEpsilon(a.mMatrix[i0], 1));
-        ASSERT(equalEpsilon(a.mMatrix[i15], 1));
-        ASSERT(equalEpsilon(a.mMatrix[i9], -1));
-        ASSERT(equalEpsilon(a.mMatrix[i6], 1));
-    } else if (axis == 1) {
-        ASSERT(equalEpsilon(a.mMatrix[i8], 1));
-        ASSERT(equalEpsilon(a.mMatrix[i2], -1));
-        ASSERT(equalEpsilon(a.mMatrix[i15], 1));
-    } else if (axis == 2) {
-        ASSERT(equalEpsilon(a.mMatrix[i4], -1));
-        ASSERT(equalEpsilon(a.mMatrix[i15], 1));
-        ASSERT(equalEpsilon(a.mMatrix[i1], 1));
-        ASSERT(equalEpsilon(a.mMatrix[i10], 1));
-    } else {
-        FAIL();
-    }
-    PASS();
-}
-
-TEST precision() {
-    Matrix a;
-    printf("Prescision test...\n");
-    a.setIdentity();
-    printf(" -> Rotate (0, 0, 90 degrees)\n");
-    a.rotate(0, 0, 90*0.01745329251994329f);
-    printf(" -> Translate (10, 20, 30)\n");
-    a.translate(10, 20, 30);
-    printf(" -> scale (10, 10, 10)\n");
-    a.scale(10, 10, 10);
-    a.print();
-    printf("\n -> scale (0.1, 0.1, 0.1)\n");
-    a.scale(0.1f, 0.1f, 0.1f);
-    printf(" -> Translate (-10, -20, -30)\n");
-    a.translate(-10, -20, -30);
-    printf(" -> Rotate (0, 0, -90 degrees)\n");
-    a.rotate(0, 0, -90*0.01745329251994329f);
-    a.print();
-    PASS();
-}
-
-SUITE(matrixSuite) {
-    for (unsigned int i = 0; i < sizeof(initialValues) / sizeof(initialValues[0]); i++) {
-        for (int mode = 0; mode < 3; mode++) {
-            RUN_TESTp(identity, initialValues[i], mode);
-        }
-    }
-
-    //! \fixme These tests are weak and only spot check some of the matrix -- Mongoose, 2003.06.18
-    RUN_TEST(translation);
-    RUN_TESTp(rotation, 0);
-    RUN_TESTp(rotation, 1);
-    RUN_TESTp(rotation, 2);
-
-    RUN_TEST(precision);
-}
-
-GREATEST_MAIN_DEFS();
-
-int main(int argc, char *argv[]) {
-    GREATEST_MAIN_BEGIN();
-    RUN_SUITE(matrixSuite);
-    GREATEST_MAIN_END();
-}
-

test/Sound.cpp

@@ -1,81 +0,0 @@
-/*!
- * \file test/Sound.cpp
- * \brief This is the audio manager Unit Test
- *
- * \author Mongoose
- * \author xythobuz
- */
-#include <stdio.h>
-#include <unistd.h>
-
-#include <Sound.h>
-
-#include "greatest.h"
-
-#define TESTFILE "../../data/sample.wav"
-
-Sound sound;
-bool inited = false;
-
-GREATEST_MAIN_DEFS();
-
-TEST initSound() {
-    int ret;
-    if ((ret = sound.init()) != 0) {
-        printf("Couldn't initialize Sound (%d)!", ret);
-        FAIL();
-    }
-    inited = true;
-    PASS();
-}
-
-TEST playFile() {
-    int id, ret;
-    ASSERT_EQm("Sound not initialized!", inited, true);
-    if ((ret = sound.addFile(TESTFILE, &id, sound.SoundFlagsNone)) != 0) {
-        printf("Couldn't add file (%d)!", ret);
-        FAIL();
-    }
-    sound.play(id);
-    sleep(2);
-    PASS();
-}
-
-TEST loadFile() {
-    int id, ret;
-    unsigned int l;
-    unsigned char *buf;
-    FILE *f;
-    ASSERT_EQm("Sound not initialized!", inited, true);
-    if (!(f = fopen(TESTFILE, "rb"))) {
-        printf("Couldn't open %s!", TESTFILE);
-        FAIL();
-    }
-    fseek(f, 0, SEEK_END);
-    l = ftell(f);
-    fseek(f, 0, SEEK_SET);
-    buf = new unsigned char[l];
-    fread(buf, l, 1, f);
-    fclose(f);
-    if ((ret = sound.addWave(buf, l, &id, sound.SoundFlagsNone)) != 0) {
-        printf("Couldn't add buffer (%d)!", ret);
-        FAIL();
-    }
-    sound.play(id);
-    delete [] buf;
-    sleep(2);
-    PASS();
-}
-
-SUITE(soundSuite) {
-    RUN_TEST(initSound);
-    RUN_TEST(playFile);
-    RUN_TEST(loadFile);
-}
-
-int main(int argc, char *argv[]) {
-    GREATEST_MAIN_BEGIN();
-    RUN_SUITE(soundSuite);
-    GREATEST_MAIN_END();
-}
-

test/TombRaider.cpp

@@ -1,589 +0,0 @@
-/*!
- * \file test/TombRaider.cpp
- * \brief Loads maps, meshes, textures...
- *
- * \author Mongoose
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <string.h>
-#include <stdarg.h>
-
-#include <TombRaider.h>
-
-#ifdef __TEST_TR5_DUMP_TGA
-#include <utils/tga.h>
-#endif
-
-#ifdef DEBUG_MEMORY
-#include <memory_test.h>
-#endif
-
-
-void dump_textures(TombRaider *tr, char *mapname)
-{
-#ifdef __TEST_TR5_DUMP_TGA
-    int i;
-    unsigned char *image;
-    unsigned char *bumpmap;
-    char buffer[128];
-    FILE *f;
-
-
-    if (!tr || !mapname)
-        return;
-
-    // Dump textures
-    printf("\n\t[Texture dumping for '%s']\n", mapname);
-
-    for (i = 0; i < tr->NumTextures(); i++)
-    {
-        tr->Texture(i, &image, &bumpmap);
-
-        if (image)
-        {
-            snprintf(buffer, 128, "%s-%03i-texture.tga", mapname, i);
-
-            f = fopen(buffer, "wb");
-
-            if (f)
-            {
-                if (!tga_save(f, image, 256, 256, 4))
-                    printf("\tWrote texture %s\n", buffer);
-
-                fclose(f);
-            }
-
-            snprintf(buffer, 128, "%s.lst", mapname);
-
-            f = fopen(buffer, "a");
-
-            if (f)
-            {
-                fprintf(f, "%s-%03i-texture.tga;\n", mapname, i);
-                fclose(f);
-            }
-
-            delete [] image;
-        }
-
-        if (bumpmap)
-        {
-            snprintf(buffer, 64, "%s-%03i-bumpmap.tga", mapname, i);
-
-            f = fopen(buffer, "wb");
-
-            if (f)
-            {
-                if (!tga_save(f, bumpmap, 256, 256, 4))
-                    printf("\tWrote texture %s\n", buffer);
-
-                fclose(f);
-            }
-
-            delete [] bumpmap;
-        }
-    }
-
-    for (i = 0; i < tr->NumSpecialTextures(); i++)
-    {
-        image = tr->SpecialTexTile(i);
-
-        snprintf(buffer, 128, "%s-%03i-special.tga", mapname, i);
-
-        f = fopen(buffer, "wb");
-
-        if (f)
-        {
-            if (!tga_save(f, image, 256, 256, 4))
-                printf("\tWrote texture %s\n", buffer);
-
-            fclose(f);
-        }
-        else
-        {
-            printf("\tFailed to write texture %s\n", buffer);
-        }
-
-        delete [] image;
-    }
-#else
-    printf("Texture dumping not in this build\n");
-#endif
-}
-
-
-void dump_mesh(TombRaider *tr, char *mapname, int index)
-{
-    tr2_object_texture_t *object_texture = NULL;
-    tr2_mesh_t *meshes = NULL;
-    unsigned int v, check;
-    int i, triangles, rectangles, t_index;
-    char buffer[128];
-    float rgba[4];
-    float s, t;
-    char id[8];
-    FILE *f;
-
-
-    if (!mapname || !tr)
-    {
-        return;
-    }
-
-    snprintf(buffer, 128, "%s-%03i.mesh", mapname, index);
-
-    object_texture = tr->ObjectTextures();
-    meshes = tr->Mesh();
-
-
-    f = fopen(buffer, "wb");
-
-    if (!f)
-    {
-        perror("Failed to write mesh :");
-        return;
-    }
-
-    // Setup header id and check points
-    strncpy(id, "TRMESH", 7);
-    id[7] = 0;
-    check = 0xcdcdcdcd;
-
-
-    fwrite(id, 8, 1, f);
-    fwrite(&meshes[index].num_vertices, 2, 1, f);
-    fwrite(&meshes[index].num_textured_triangles, 2, 1, f);
-    fwrite(&meshes[index].num_textured_rectangles, 2, 1, f);
-    fwrite(&meshes[index].num_coloured_triangles, 2, 1, f);
-    fwrite(&meshes[index].num_coloured_rectangles, 2, 1, f);
-    fwrite(&meshes[index].collision_size, 4, 1, f);
-
-
-    // Textured triangles ////////////////////////
-    fwrite(&check, 4, 1, f);
-    triangles = meshes[index].num_textured_triangles;
-
-    for (i = 0; triangles > 0 && i < triangles; i++)
-    {
-        t_index = meshes[index].textured_triangles[i].texture;
-
-        // Store texture info
-        fwrite(&object_texture[t_index].tile, 2, 1, f);
-        fwrite(&object_texture[t_index].transparency_flags, 2, 1, f);
-
-        // Store vertices
-        v = meshes[index].textured_triangles[i].vertices[0];
-        fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-        v = meshes[index].textured_triangles[i].vertices[1];
-        fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-        v = meshes[index].textured_triangles[i].vertices[2];
-        fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-        // Store texels
-        s = tr->adjustTexel(object_texture[t_index].vertices[0].xpixel,
-                object_texture[t_index].vertices[0].xcoordinate);
-        t = tr->adjustTexel(object_texture[t_index].vertices[0].ypixel,
-                object_texture[t_index].vertices[0].ycoordinate);
-        fwrite(&s, 4, 1, f);
-        fwrite(&t, 4, 1, f);
-
-
-        s = tr->adjustTexel(object_texture[t_index].vertices[1].xpixel,
-                object_texture[t_index].vertices[1].xcoordinate);
-        t = tr->adjustTexel(object_texture[t_index].vertices[1].ypixel,
-                object_texture[t_index].vertices[1].ycoordinate);
-        fwrite(&s, 4, 1, f);
-        fwrite(&t, 4, 1, f);
-
-        s = tr->adjustTexel(object_texture[t_index].vertices[2].xpixel,
-                object_texture[t_index].vertices[2].xcoordinate);
-        t = tr->adjustTexel(object_texture[t_index].vertices[2].ypixel,
-                object_texture[t_index].vertices[2].ycoordinate);
-        fwrite(&s, 4, 1, f);
-        fwrite(&t, 4, 1, f);
-    }
-
-    fwrite(&check, 4, 1, f);
-
-
-    // Textured rectangles ////////////////////////
-    fwrite(&check, 4, 1, f);
-    rectangles = meshes[index].num_textured_rectangles;
-
-    for (i = 0; rectangles > 0 && i < rectangles; i++)
-    {
-        t_index = meshes[index].textured_rectangles[i].texture;
-
-        // Store texture info
-        fwrite(&object_texture[t_index].tile, 2, 1, f);
-        fwrite(&object_texture[t_index].transparency_flags, 2, 1, f);
-
-        // Store vertices
-        v = meshes[index].textured_rectangles[i].vertices[0];
-        fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-        v = meshes[index].textured_rectangles[i].vertices[1];
-        fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-        v = meshes[index].textured_rectangles[i].vertices[2];
-        fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-        v = meshes[index].textured_rectangles[i].vertices[3];
-        fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-        // Store texels
-        s = tr->adjustTexel(object_texture[t_index].vertices[0].xpixel,
-                object_texture[t_index].vertices[0].xcoordinate);
-        t = tr->adjustTexel(object_texture[t_index].vertices[0].ypixel,
-                object_texture[t_index].vertices[0].ycoordinate);
-        fwrite(&s, 4, 1, f);
-        fwrite(&t, 4, 1, f);
-
-
-        s = tr->adjustTexel(object_texture[t_index].vertices[1].xpixel,
-                object_texture[t_index].vertices[1].xcoordinate);
-        t = tr->adjustTexel(object_texture[t_index].vertices[1].ypixel,
-                object_texture[t_index].vertices[1].ycoordinate);
-        fwrite(&s, 4, 1, f);
-        fwrite(&t, 4, 1, f);
-
-        s = tr->adjustTexel(object_texture[t_index].vertices[2].xpixel,
-                object_texture[t_index].vertices[2].xcoordinate);
-        t = tr->adjustTexel(object_texture[t_index].vertices[2].ypixel,
-                object_texture[t_index].vertices[2].ycoordinate);
-        fwrite(&s, 4, 1, f);
-        fwrite(&t, 4, 1, f);
-
-        s = tr->adjustTexel(object_texture[t_index].vertices[3].xpixel,
-                object_texture[t_index].vertices[3].xcoordinate);
-        t = tr->adjustTexel(object_texture[t_index].vertices[3].ypixel,
-                object_texture[t_index].vertices[3].ycoordinate);
-        fwrite(&s, 4, 1, f);
-        fwrite(&t, 4, 1, f);
-    }
-
-    fwrite(&check, 4, 1, f);
-
-    // Coloured triangles ////////////////////////
-    fwrite(&check, 4, 1, f);
-    triangles = meshes[index].num_coloured_triangles;
-
-    for (i = 0; triangles > 0 && i < triangles; i++)
-    {
-        // Store vertices
-        v = meshes[index].coloured_triangles[i].vertices[0];
-        fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-        v = meshes[index].coloured_triangles[i].vertices[1];
-        fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-        v = meshes[index].coloured_triangles[i].vertices[2];
-        fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-        // Store color
-        switch (tr->Engine())
-        {
-            case TR_VERSION_1:
-                tr->getColor(meshes[index].coloured_triangles[i].texture
-                        & 0xff, rgba);
-                break;
-            case TR_VERSION_UNKNOWN:
-            case TR_VERSION_2:
-            case TR_VERSION_3:
-            case TR_VERSION_4:
-            case TR_VERSION_5:
-                tr->getColor((meshes[index].coloured_triangles[i].texture>>8)
-                        & 0xff, rgba);
-                break;
-        }
-
-        s = rgba[0];
-        t = rgba[1];
-        fwrite(&s, 4, 1, f);
-        fwrite(&t, 4, 1, f);
-
-        s = rgba[2];
-        t = rgba[3];
-        fwrite(&s, 4, 1, f);
-        fwrite(&t, 4, 1, f);
-    }
-
-    fwrite(&check, 4, 1, f);
-
-    // Coloured rectangles ////////////////////////
-    fwrite(&check, 4, 1, f);
-    rectangles = meshes[index].num_coloured_rectangles;
-
-    for (i = 0; rectangles > 0 && i < rectangles; i++)
-    {
-        // Store vertices
-        v = meshes[index].coloured_rectangles[i].vertices[0];
-        fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-        v = meshes[index].coloured_rectangles[i].vertices[1];
-        fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-        v = meshes[index].coloured_rectangles[i].vertices[2];
-        fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-        v = meshes[index].coloured_rectangles[i].vertices[3];
-        fwrite(&meshes[index].vertices[v].x, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].y, 2, 1, f);
-        fwrite(&meshes[index].vertices[v].z, 2, 1, f);
-
-        // Store color
-        switch (tr->Engine())
-        {
-            case TR_VERSION_1:
-                tr->getColor(meshes[index].coloured_rectangles[i].texture
-                        & 0xff, rgba);
-                break;
-            case TR_VERSION_UNKNOWN:
-            case TR_VERSION_2:
-            case TR_VERSION_3:
-            case TR_VERSION_4:
-            case TR_VERSION_5:
-                tr->getColor((meshes[index].coloured_rectangles[i].texture>>8)
-                        & 0xff, rgba);
-                break;
-        }
-
-        s = rgba[0];
-        t = rgba[1];
-        fwrite(&s, 4, 1, f);
-        fwrite(&t, 4, 1, f);
-
-        s = rgba[2];
-        t = rgba[3];
-        fwrite(&s, 4, 1, f);
-        fwrite(&t, 4, 1, f);
-    }
-
-    fwrite(&check, 4, 1, f);
-    fclose(f);
-
-    printf(".");
-    fflush(stdout);
-}
-
-
-void dump_lara_stuff(char *mapname, TombRaider &tr)
-{
-    unsigned int i, j, k, n;
-    tr2_moveable_t *moveable = tr.Moveable();
-    unsigned int numMoveables = tr.NumMoveables();
-    char filename[64];
-    unsigned char *riff;
-    unsigned int riffSz, total = 0;
-    FILE *f;
-
-
-    snprintf(filename, 63, "%s-lara.nfo", mapname);
-    f = fopen(filename, "w");
-
-    if (!f)
-    {
-        perror("Failed to write lara.nfo: ");
-        return;
-    }
-
-    for (i = 0; i < numMoveables; ++i)
-    {
-        j = n = 0;
-
-        if (moveable[i].object_id == 0)
-        {
-            j = moveable[i].starting_mesh;
-            n = moveable[i].num_meshes + j;
-
-            fprintf(f, "Lara (%u)\n", i);
-        }
-        else if (moveable[i].object_id == 30)
-        {
-            j = moveable[i].starting_mesh;
-            n = moveable[i].num_meshes + j;
-
-            fprintf(f, "Lara ponytail\n");
-        }
-        else if (tr.Engine() == TR_VERSION_4)
-        {
-            switch (moveable[i].object_id)
-            {
-                case 8: // Joints, ( interconnecting skin/ploys )
-                case 9:
-                    fprintf(f, "TR4 lara joints (%u)\n", i);
-                    j = moveable[i].starting_mesh;
-                    n = moveable[i].num_meshes + j;
-            }
-        }
-
-        for (k = j; j < n; ++j)
-        {
-            fprintf(f, "\tMesh[%i] = %u\n", (j - k), j);
-        }
-    }
-
-    fclose(f);
-
-    printf("\nDumping %u audio samples: ", tr.getSoundSamplesCount());
-
-    for (i = 0, j = 0; i < tr.getSoundSamplesCount(); ++i)
-    {
-        tr.getSoundSample(i, &riffSz, &riff);
-
-        total += riffSz;
-
-        snprintf(filename, 63, "%s-%03i.wav", mapname, j++);
-        f = fopen(filename, "wb");
-
-        if (!f)
-        {
-            perror("Failed to write riff.wav: ");
-            continue;
-        }
-
-        fwrite(riff, 1, riffSz, f);
-        fclose(f);
-
-        delete [] riff;
-
-        printf(".");
-        fflush(stdout);
-    }
-
-    printf("\n");
-
-    if (total)
-    {
-        printf("Dumped %ubytes (%.2f MB) of audio samples\n",
-                total, (float)total/1024000.0);
-    }
-}
-
-
-void percent_callback(int p)
-{
-    printf("Level %i%% loaded\n", p);
-}
-
-
-int test_main(int argc, char *argv[])
-{
-    TombRaider tr;
-    char mapname[128];
-    int len, i, j;
-
-
-    printf("[TombRaider class test]\n");
-
-    tr.setDebug(true);
-
-    if (argc > 2)
-    {
-        // Strip for mapname //////////////////////////////
-        len = strlen(argv[2]);
-
-        for (i = len, j = 0; i > 0; i--, j++)
-            if (argv[2][i] == '/' || argv[2][i] == '\\')
-                break;
-
-        j--;
-
-        memset(mapname, 0, 128);
-
-        for (i = 0; i < len - j && i < 30; i++)
-            mapname[i] = argv[2][i + len - j];
-
-        ////////////////////////////////////////////////////
-
-
-        if (strncmp(argv[1], "load", 4) == 0)
-        {
-            if (!tr.Load(argv[2], percent_callback))
-            {
-                printf("\nmain: Load reports success.\n");
-            }
-        }
-        else if (strncmp(argv[1], "dump", 4) == 0)
-        {
-            if (!tr.Load(argv[2], percent_callback))
-            {
-                printf("\nmain: Load reports success.\n");
-
-                dump_textures(&tr, mapname);
-
-                printf("Mesh dumping: ");
-                for (i = 0; i < tr.getMeshCount(); i++)
-                {
-                    dump_mesh(&tr, mapname, i);
-                }
-
-                if (argc > 3)
-                {
-                    printf("\nLoading external sound SFX.\n");
-                    tr.loadSFX(argv[3]);
-                }
-
-                dump_lara_stuff(mapname, tr);
-
-                printf("\n");
-            }
-            else
-            {
-                printf("\nmain: Load failed.\n");
-            }
-        }
-        else
-            printf("\n\n%s [ load | dump ] filename [sound.sfx]\n", argv[0]);
-    }
-    else
-    {
-        printf("\n\n%s [ load | dump ] filename [sound.sfx]\n", argv[0]);
-    }
-
-    return 0;
-}
-
-
-int main(int argc, char *argv[])
-{
-    test_main(argc, argv);
-
-#ifdef DEBUG_MEMORY
-    dump_memory_report();
-#endif
-
-    return 0;
-}
-

test/greatest.h

@@ -1,636 +0,0 @@
-/*
- * Copyright (c) 2011 Scott Vokes <vokes.s@gmail.com>
- *
- * Modified 2014 by Thomas Buck <xythobuz@xythobuz.de>
- * --> C++ support
- * --> Included janoskk color output patch
- * --> Modified it so a tty output is detected at runtime (now unix only)
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef GREATEST_H
-#define GREATEST_H
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#define GREATEST_VERSION_MAJOR 0
-#define GREATEST_VERSION_MINOR 9
-#define GREATEST_VERSION_PATCH 3
-
-/* A unit testing system for C, contained in 1 file.
- * It doesn't use dynamic allocation or depend on anything
- * beyond ANSI C89. */
-
-
-/*********************************************************************
- * Minimal test runner template
- *********************************************************************/
-#if 0
-
-#include "greatest.h"
-
-TEST foo_should_foo() {
-    PASS();
-}
-
-static void setup_cb(void *data) {
-    printf("setup callback for each test case\n");
-}
-
-static void teardown_cb(void *data) {
-    printf("teardown callback for each test case\n");
-}
-
-SUITE(suite) {
-    /* Optional setup/teardown callbacks which will be run before/after
-     * every test case in the suite.
-     * Cleared when the suite finishes. */
-    SET_SETUP(setup_cb, voidp_to_callback_data);
-    SET_TEARDOWN(teardown_cb, voidp_to_callback_data);
-
-    RUN_TEST(foo_should_foo);
-}
-
-/* Add all the definitions that need to be in the test runner's main file. */
-GREATEST_MAIN_DEFS();
-
-int main(int argc, char **argv) {
-    GREATEST_MAIN_BEGIN();      /* command-line arguments, initialization. */
-    RUN_SUITE(suite);
-    GREATEST_MAIN_END();        /* display results */
-}
-
-#endif
-/*********************************************************************/
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-
-/***********
- * Options *
- ***********/
-
-/* Default column width for non-verbose output. */
-#ifndef GREATEST_DEFAULT_WIDTH
-#define GREATEST_DEFAULT_WIDTH 72
-#endif
-
-/* FILE *, for test logging. */
-#ifndef GREATEST_STDOUT
-#define GREATEST_STDOUT stdout
-#endif
-
-/* Remove GREATEST_ prefix from most commonly used symbols? */
-#ifndef GREATEST_USE_ABBREVS
-#define GREATEST_USE_ABBREVS 1
-#endif
-
-/* Colorize the passed/failed results */
-#ifndef COLOR_FAIL
-#define COLOR_FAIL  "\033[22;31;1m"
-#endif
-#ifndef COLOR_PASS
-#define COLOR_PASS  "\033[22;32m"
-#endif
-#define COLOR_RESET "\033[22;0m"
-
-
-/*********
- * Types *
- *********/
-
-/* Info for the current running suite. */
-typedef struct greatest_suite_info {
-    unsigned int tests_run;
-    unsigned int passed;
-    unsigned int failed;
-    unsigned int skipped;
-
-    /* timers, pre/post running suite and individual tests */
-    clock_t pre_suite;
-    clock_t post_suite;
-    clock_t pre_test;
-    clock_t post_test;
-} greatest_suite_info;
-
-/* Type for a suite function. */
-typedef void (greatest_suite_cb)(void);
-
-/* Types for setup/teardown callbacks. If non-NULL, these will be run
- * and passed the pointer to their additional data. */
-typedef void (greatest_setup_cb)(void *udata);
-typedef void (greatest_teardown_cb)(void *udata);
-
-typedef enum {
-    GREATEST_FLAG_VERBOSE = 0x01,
-    GREATEST_FLAG_FIRST_FAIL = 0x02,
-    GREATEST_FLAG_LIST_ONLY = 0x04
-} GREATEST_FLAG;
-
-typedef struct greatest_run_info {
-    unsigned int flags;
-    unsigned int tests_run;     /* total test count */
-
-    /* Overall pass/fail/skip counts. */
-    unsigned int passed;
-    unsigned int failed;
-    unsigned int skipped;
-
-    /* currently running test suite */
-    greatest_suite_info suite;
-
-    /* info to print about the most recent failure */
-    const char *fail_file;
-    unsigned int fail_line;
-    const char *msg;
-
-    /* current setup/teardown hooks and userdata */
-    greatest_setup_cb *setup;
-    void *setup_udata;
-    greatest_teardown_cb *teardown;
-    void *teardown_udata;
-
-    /* formatting info for ".....s...F"-style output */
-    unsigned int col;
-    unsigned int width;
-
-    /* only run a specific suite or test */
-    char *suite_filter;
-    char *test_filter;
-
-    /* overall timers */
-    clock_t begin;
-    clock_t end;
-} greatest_run_info;
-
-/* Global var for the current testing context.
- * Initialized by GREATEST_MAIN_DEFS(). */
-extern greatest_run_info greatest_info;
-
-
-/**********************
- * Exported functions *
- **********************/
-
-void greatest_do_pass(const char *name);
-void greatest_do_fail(const char *name);
-void greatest_do_skip(const char *name);
-int greatest_pre_test(const char *name);
-void greatest_post_test(const char *name, int res);
-void greatest_usage(const char *name);
-void GREATEST_SET_SETUP_CB(greatest_setup_cb *cb, void *udata);
-void GREATEST_SET_TEARDOWN_CB(greatest_teardown_cb *cb, void *udata);
-
-
-/**********
- * Macros *
- **********/
-
-/* Define a suite. */
-#define GREATEST_SUITE(NAME) void NAME(void)
-
-/* Start defining a test function.
- * The arguments are not included, to allow parametric testing. */
-#define GREATEST_TEST static int
-
-/* Run a suite. */
-#define GREATEST_RUN_SUITE(S_NAME) greatest_run_suite(S_NAME, #S_NAME)
-
-/* Run a test in the current suite. */
-#define GREATEST_RUN_TEST(TEST)                                         \
-    do {                                                                \
-        if (greatest_pre_test(#TEST) == 1) {                            \
-            int res = TEST();                                           \
-            greatest_post_test(#TEST, res);                             \
-        } else if (GREATEST_LIST_ONLY()) {                              \
-            fprintf(GREATEST_STDOUT, "  %s\n", #TEST);                  \
-        }                                                               \
-    } while (0)
-
-/* Run a test in the current suite with one void* argument,
- * which can be a pointer to a struct with multiple arguments. */
-#define GREATEST_RUN_TEST1(TEST, ENV)                                   \
-    do {                                                                \
-        if (greatest_pre_test(#TEST) == 1) {                            \
-            int res = TEST(ENV);                                        \
-            greatest_post_test(#TEST, res);                             \
-        } else if (GREATEST_LIST_ONLY()) {                              \
-            fprintf(GREATEST_STDOUT, "  %s\n", #TEST);                  \
-        }                                                               \
-    } while (0)
-
-/* If __VA_ARGS__ (C99) is supported, allow parametric testing
- * without needing to manually manage the argument struct. */
-#if defined __cplusplus || (__STDC_VERSION__ >= 19901L)
-#define GREATEST_RUN_TESTp(TEST, ...)                                   \
-    do {                                                                \
-        if (greatest_pre_test(#TEST) == 1) {                            \
-            int res = TEST(__VA_ARGS__);                                \
-            greatest_post_test(#TEST, res);                             \
-        } else if (GREATEST_LIST_ONLY()) {                              \
-            fprintf(GREATEST_STDOUT, "  %s\n", #TEST);                  \
-        }                                                               \
-    } while (0)
-#endif
-
-
-/* Check if the test runner is in verbose mode. */
-#define GREATEST_IS_VERBOSE() (greatest_info.flags & GREATEST_FLAG_VERBOSE)
-#define GREATEST_LIST_ONLY() (greatest_info.flags & GREATEST_FLAG_LIST_ONLY)
-#define GREATEST_FIRST_FAIL() (greatest_info.flags & GREATEST_FLAG_FIRST_FAIL)
-#define GREATEST_FAILURE_ABORT() (greatest_info.suite.failed > 0 && GREATEST_FIRST_FAIL())
-
-/* Message-less forms. */
-#define GREATEST_PASS() GREATEST_PASSm(NULL)
-#define GREATEST_FAIL() GREATEST_FAILm(NULL)
-#define GREATEST_SKIP() GREATEST_SKIPm(NULL)
-#define GREATEST_ASSERT(COND) GREATEST_ASSERTm(#COND, COND)
-#define GREATEST_ASSERT_FALSE(COND) GREATEST_ASSERT_FALSEm(#COND, COND)
-#define GREATEST_ASSERT_EQ(EXP, GOT) GREATEST_ASSERT_EQm(#EXP " != " #GOT, EXP, GOT)
-#define GREATEST_ASSERT_STR_EQ(EXP, GOT) GREATEST_ASSERT_STR_EQm(#EXP " != " #GOT, EXP, GOT)
-
-/* The following forms take an additional message argument first,
- * to be displayed by the test runner. */
-
-/* Fail if a condition is not true, with message. */
-#define GREATEST_ASSERTm(MSG, COND)                                     \
-    do {                                                                \
-        greatest_info.msg = MSG;                                        \
-        greatest_info.fail_file = __FILE__;                             \
-        greatest_info.fail_line = __LINE__;                             \
-        if (!(COND)) return -1;                                         \
-        greatest_info.msg = NULL;                                       \
-    } while (0)
-
-#define GREATEST_ASSERT_FALSEm(MSG, COND)                               \
-    do {                                                                \
-        greatest_info.msg = MSG;                                        \
-        greatest_info.fail_file = __FILE__;                             \
-        greatest_info.fail_line = __LINE__;                             \
-        if ((COND)) return -1;                                          \
-        greatest_info.msg = NULL;                                       \
-    } while (0)
-
-#define GREATEST_ASSERT_EQm(MSG, EXP, GOT)                              \
-    do {                                                                \
-        greatest_info.msg = MSG;                                        \
-        greatest_info.fail_file = __FILE__;                             \
-        greatest_info.fail_line = __LINE__;                             \
-        if ((EXP) != (GOT)) return -1;                                  \
-        greatest_info.msg = NULL;                                       \
-    } while (0)
-
-#define GREATEST_ASSERT_STR_EQm(MSG, EXP, GOT)                          \
-    do {                                                                \
-        const char *exp_s = (EXP);                                      \
-        const char *got_s = (GOT);                                      \
-        greatest_info.msg = MSG;                                        \
-        greatest_info.fail_file = __FILE__;                             \
-        greatest_info.fail_line = __LINE__;                             \
-        if (0 != strcmp(exp_s, got_s)) {                                \
-            fprintf(GREATEST_STDOUT,                                    \
-                "Expected:\n####\n%s\n####\n", exp_s);                  \
-            fprintf(GREATEST_STDOUT,                                    \
-                "Got:\n####\n%s\n####\n", got_s);                       \
-            return -1;                                                  \
-        }                                                               \
-        greatest_info.msg = NULL;                                       \
-    } while (0)
-
-#define GREATEST_PASSm(MSG)                                             \
-    do {                                                                \
-        greatest_info.msg = MSG;                                        \
-        return 0;                                                       \
-    } while (0)
-
-#define GREATEST_FAILm(MSG)                                             \
-    do {                                                                \
-        greatest_info.fail_file = __FILE__;                             \
-        greatest_info.fail_line = __LINE__;                             \
-        greatest_info.msg = MSG;                                        \
-        return -1;                                                      \
-    } while (0)
-
-#define GREATEST_SKIPm(MSG)                                             \
-    do {                                                                \
-        greatest_info.msg = MSG;                                        \
-        return 1;                                                       \
-    } while (0)
-
-#define GREATEST_SET_TIME(NAME)                                         \
-    NAME = clock();                                                     \
-    if (NAME == (clock_t) -1) {                                         \
-        fprintf(GREATEST_STDOUT,                                        \
-            "clock error: %s\n", #NAME);                                \
-        exit(EXIT_FAILURE);                                             \
-    }
-
-#define GREATEST_CLOCK_DIFF(C1, C2)                                     \
-    fprintf(GREATEST_STDOUT, " (%lu ticks, %.3f sec)",                  \
-        (long unsigned int) (C2) - (C1),                                \
-        (double)((C2) - (C1)) / (1.0 * (double)CLOCKS_PER_SEC))         \
-
-/* Include several function definitions in the main test file. */
-#define GREATEST_MAIN_DEFS()                                            \
-                                                                        \
-/* Is FILTER a subset of NAME? */                                       \
-static int greatest_name_match(const char *name,                        \
-    const char *filter) {                                               \
-    size_t offset = 0;                                                  \
-    size_t filter_len = strlen(filter);                                 \
-    while (name[offset] != '\0') {                                      \
-        if (name[offset] == filter[0]) {                                \
-            if (0 == strncmp(&name[offset], filter, filter_len)) {      \
-                return 1;                                               \
-            }                                                           \
-        }                                                               \
-        offset++;                                                       \
-    }                                                                   \
-                                                                        \
-    return 0;                                                           \
-}                                                                       \
-                                                                        \
-int greatest_pre_test(const char *name) {                               \
-    if (!GREATEST_LIST_ONLY()                                           \
-        && (!GREATEST_FIRST_FAIL() || greatest_info.suite.failed == 0)  \
-        && (greatest_info.test_filter == NULL ||                        \
-            greatest_name_match(name, greatest_info.test_filter))) {    \
-        GREATEST_SET_TIME(greatest_info.suite.pre_test);                \
-        if (greatest_info.setup) {                                      \
-            greatest_info.setup(greatest_info.setup_udata);             \
-        }                                                               \
-        return 1;               /* test should be run */                \
-    } else {                                                            \
-        return 0;               /* skipped */                           \
-    }                                                                   \
-}                                                                       \
-                                                                        \
-void greatest_post_test(const char *name, int res) {                    \
-    GREATEST_SET_TIME(greatest_info.suite.post_test);                   \
-    if (greatest_info.teardown) {                                       \
-        void *udata = greatest_info.teardown_udata;                     \
-        greatest_info.teardown(udata);                                  \
-    }                                                                   \
-                                                                        \
-    if (res < 0) {                                                      \
-        greatest_do_fail(name);                                         \
-    } else if (res > 0) {                                               \
-        greatest_do_skip(name);                                         \
-    } else if (res == 0) {                                              \
-        greatest_do_pass(name);                                         \
-    }                                                                   \
-    greatest_info.suite.tests_run++;                                    \
-    greatest_info.col++;                                                \
-    if (GREATEST_IS_VERBOSE()) {                                        \
-        GREATEST_CLOCK_DIFF(greatest_info.suite.pre_test,               \
-            greatest_info.suite.post_test);                             \
-        fprintf(GREATEST_STDOUT, "\n");                                 \
-    } else if (greatest_info.col % greatest_info.width == 0) {          \
-        fprintf(GREATEST_STDOUT, "\n");                                 \
-        greatest_info.col = 0;                                          \
-    }                                                                   \
-    if (GREATEST_STDOUT == stdout) fflush(stdout);                      \
-}                                                                       \
-                                                                        \
-static void greatest_run_suite(greatest_suite_cb *suite_cb,             \
-                               const char *suite_name) {                \
-    if (greatest_info.suite_filter &&                                   \
-        !greatest_name_match(suite_name, greatest_info.suite_filter))   \
-        return;                                                         \
-    if (GREATEST_FIRST_FAIL() && greatest_info.failed > 0) return;      \
-    greatest_info.suite.tests_run = 0;                                  \
-    greatest_info.suite.failed = 0;                                     \
-    greatest_info.suite.passed = 0;                                     \
-    greatest_info.suite.skipped = 0;                                    \
-    greatest_info.suite.pre_suite = 0;                                  \
-    greatest_info.suite.post_suite = 0;                                 \
-    greatest_info.suite.pre_test = 0;                                   \
-    greatest_info.suite.post_test = 0;                                  \
-    greatest_info.col = 0;                                              \
-    fprintf(GREATEST_STDOUT, "\n* Suite %s:\n", suite_name);            \
-    GREATEST_SET_TIME(greatest_info.suite.pre_suite);                   \
-    suite_cb();                                                         \
-    GREATEST_SET_TIME(greatest_info.suite.post_suite);                  \
-    if (greatest_info.suite.tests_run > 0) {                            \
-        fprintf(GREATEST_STDOUT,                                        \
-            "\n%u tests - %u %spass%s, %u %sfail%s, %u skipped",        \
-            greatest_info.suite.tests_run,                              \
-            greatest_info.suite.passed,                                 \
-            (isatty(fileno(GREATEST_STDOUT))) ? (                       \
-            (!greatest_info.suite.failed) ? COLOR_PASS : COLOR_RESET    \
-            ) : "",                                                     \
-            (isatty(fileno(GREATEST_STDOUT))) ? COLOR_RESET : "",       \
-            greatest_info.suite.failed,                                 \
-            (isatty(fileno(GREATEST_STDOUT))) ? (                       \
-            (greatest_info.suite.failed) ? COLOR_FAIL : COLOR_RESET     \
-            ) : "",                                                     \
-            (isatty(fileno(GREATEST_STDOUT))) ? COLOR_RESET : "",       \
-            greatest_info.suite.skipped);                               \
-        GREATEST_CLOCK_DIFF(greatest_info.suite.pre_suite,              \
-            greatest_info.suite.post_suite);                            \
-        fprintf(GREATEST_STDOUT, "\n");                                 \
-    }                                                                   \
-    greatest_info.setup = NULL;                                         \
-    greatest_info.setup_udata = NULL;                                   \
-    greatest_info.teardown = NULL;                                      \
-    greatest_info.teardown_udata = NULL;                                \
-    greatest_info.passed += greatest_info.suite.passed;                 \
-    greatest_info.failed += greatest_info.suite.failed;                 \
-    greatest_info.skipped += greatest_info.suite.skipped;               \
-    greatest_info.tests_run += greatest_info.suite.tests_run;           \
-}                                                                       \
-                                                                        \
-void greatest_do_pass(const char *name) {                               \
-    if (GREATEST_IS_VERBOSE()) {                                        \
-        fprintf(GREATEST_STDOUT,                                        \
-                (isatty(fileno(GREATEST_STDOUT))) ?                     \
-                COLOR_PASS "PASS" COLOR_RESET " %s: %s" :               \
-                "PASS %s: %s",                                          \
-                name, greatest_info.msg ? greatest_info.msg : "");      \
-    } else {                                                            \
-        fprintf(GREATEST_STDOUT, ".");                                  \
-    }                                                                   \
-    greatest_info.suite.passed++;                                       \
-}                                                                       \
-                                                                        \
-void greatest_do_fail(const char *name) {                               \
-    if (GREATEST_IS_VERBOSE()) {                                        \
-        fprintf(GREATEST_STDOUT,                                        \
-            (isatty(fileno(GREATEST_STDOUT))) ?                         \
-            COLOR_FAIL "FAIL" COLOR_RESET " %s: %s (%s:%u)" :           \
-            "FAIL %s: %s (%s:%u)",                                      \
-            name, greatest_info.msg ? greatest_info.msg : "",           \
-            greatest_info.fail_file, greatest_info.fail_line);          \
-    } else {                                                            \
-        fprintf(GREATEST_STDOUT, "F");                                  \
-        /* add linebreak if in line of '.'s */                          \
-        if (greatest_info.col % greatest_info.width != 0)               \
-            fprintf(GREATEST_STDOUT, "\n");                             \
-        greatest_info.col = 0;                                          \
-        fprintf(GREATEST_STDOUT,                                        \
-            (isatty(fileno(GREATEST_STDOUT))) ?                         \
-            COLOR_FAIL "FAIL" COLOR_RESET " %s: %s (%s:%u)\n" :         \
-            "FAIL %s: %s (%s:%u)\n",                                    \
-            name,                                                       \
-            greatest_info.msg ? greatest_info.msg : "",                 \
-            greatest_info.fail_file, greatest_info.fail_line);          \
-    }                                                                   \
-    greatest_info.suite.failed++;                                       \
-}                                                                       \
-                                                                        \
-void greatest_do_skip(const char *name) {                               \
-    if (GREATEST_IS_VERBOSE()) {                                        \
-        fprintf(GREATEST_STDOUT, "SKIP %s: %s",                         \
-            name,                                                       \
-            greatest_info.msg ?                                         \
-            greatest_info.msg : "" );                                   \
-    } else {                                                            \
-        fprintf(GREATEST_STDOUT, "s");                                  \
-    }                                                                   \
-    greatest_info.suite.skipped++;                                      \
-}                                                                       \
-                                                                        \
-void greatest_usage(const char *name) {                                 \
-    fprintf(GREATEST_STDOUT,                                            \
-        "Usage: %s [-hlfv] [-s SUITE] [-t TEST]\n"                      \
-        "  -h        print this Help\n"                                 \
-        "  -l        List suites and their tests, then exit\n"          \
-        "  -f        Stop runner after first failure\n"                 \
-        "  -v        Verbose output\n"                                  \
-        "  -s SUITE  only run suite named SUITE\n"                      \
-        "  -t TEST   only run test named TEST\n",                       \
-        name);                                                          \
-}                                                                       \
-                                                                        \
-void GREATEST_SET_SETUP_CB(greatest_setup_cb *cb, void *udata) {        \
-    greatest_info.setup = cb;                                           \
-    greatest_info.setup_udata = udata;                                  \
-}                                                                       \
-                                                                        \
-void GREATEST_SET_TEARDOWN_CB(greatest_teardown_cb *cb,                 \
-                                    void *udata) {                      \
-    greatest_info.teardown = cb;                                        \
-    greatest_info.teardown_udata = udata;                               \
-}                                                                       \
-                                                                        \
-greatest_run_info greatest_info
-
-/* Handle command-line arguments, etc. */
-#define GREATEST_MAIN_BEGIN()                                           \
-    do {                                                                \
-        int _i = 0;                                                     \
-        memset(&greatest_info, 0, sizeof(greatest_info));               \
-        if (greatest_info.width == 0) {                                 \
-            greatest_info.width = GREATEST_DEFAULT_WIDTH;               \
-        }                                                               \
-        for (_i = 1; _i < argc; _i++) {                                 \
-            if (0 == strcmp("-t", argv[_i])) {                          \
-                if (argc <= _i + 1) {                                   \
-                    greatest_usage(argv[0]);                            \
-                    exit(EXIT_FAILURE);                                 \
-                }                                                       \
-                greatest_info.test_filter = argv[_i+1];                 \
-                _i++;                                                   \
-            } else if (0 == strcmp("-s", argv[_i])) {                   \
-                if (argc <= _i + 1) {                                   \
-                    greatest_usage(argv[0]);                            \
-                    exit(EXIT_FAILURE);                                 \
-                }                                                       \
-                greatest_info.suite_filter = argv[_i+1];                \
-                _i++;                                                   \
-            } else if (0 == strcmp("-f", argv[_i])) {                   \
-                greatest_info.flags |= GREATEST_FLAG_FIRST_FAIL;        \
-            } else if (0 == strcmp("-v", argv[_i])) {                   \
-                greatest_info.flags |= GREATEST_FLAG_VERBOSE;           \
-            } else if (0 == strcmp("-l", argv[_i])) {                   \
-                greatest_info.flags |= GREATEST_FLAG_LIST_ONLY;         \
-            } else if (0 == strcmp("-h", argv[_i])) {                   \
-                greatest_usage(argv[0]);                                \
-                exit(EXIT_SUCCESS);                                     \
-            } else {                                                    \
-                fprintf(GREATEST_STDOUT,                                \
-                    "Unknown argument '%s'\n", argv[_i]);               \
-                greatest_usage(argv[0]);                                \
-                exit(EXIT_FAILURE);                                     \
-            }                                                           \
-        }                                                               \
-    } while (0);                                                        \
-    GREATEST_SET_TIME(greatest_info.begin)
-
-#define GREATEST_MAIN_END()                                             \
-    do {                                                                \
-        if (!GREATEST_LIST_ONLY()) {                                    \
-            GREATEST_SET_TIME(greatest_info.end);                       \
-            fprintf(GREATEST_STDOUT,                                    \
-                "\nTotal: %u tests", greatest_info.tests_run);          \
-            GREATEST_CLOCK_DIFF(greatest_info.begin,                    \
-                greatest_info.end);                                     \
-            fprintf(GREATEST_STDOUT, "\n");                             \
-            fprintf(GREATEST_STDOUT,                                    \
-                "%sPass: %u, fail: %u, "                                \
-                "skip: %u.%s\n",                                        \
-                (isatty(fileno(GREATEST_STDOUT))) ?                     \
-                ((greatest_info.failed) ? COLOR_FAIL : COLOR_PASS) :    \
-                "", greatest_info.passed,                               \
-                greatest_info.failed,                                   \
-                greatest_info.skipped,                                  \
-                (isatty(fileno(GREATEST_STDOUT))) ? COLOR_RESET : "");  \
-        }                                                               \
-        return (greatest_info.failed > 0                                \
-            ? EXIT_FAILURE : EXIT_SUCCESS);                             \
-    } while (0)
-
-/* Make abbreviations without the GREATEST_ prefix for the
- * most commonly used symbols. */
-#if GREATEST_USE_ABBREVS
-#define TEST           GREATEST_TEST
-#define SUITE          GREATEST_SUITE
-#define RUN_TEST       GREATEST_RUN_TEST
-#define RUN_TEST1      GREATEST_RUN_TEST1
-#define RUN_SUITE      GREATEST_RUN_SUITE
-#define ASSERT         GREATEST_ASSERT
-#define ASSERTm        GREATEST_ASSERTm
-#define ASSERT_FALSE   GREATEST_ASSERT_FALSE
-#define ASSERT_EQ      GREATEST_ASSERT_EQ
-#define ASSERT_STR_EQ  GREATEST_ASSERT_STR_EQ
-#define ASSERT_FALSEm  GREATEST_ASSERT_FALSEm
-#define ASSERT_EQm     GREATEST_ASSERT_EQm
-#define ASSERT_STR_EQm GREATEST_ASSERT_STR_EQm
-#define PASS           GREATEST_PASS
-#define FAIL           GREATEST_FAIL
-#define SKIP           GREATEST_SKIP
-#define PASSm          GREATEST_PASSm
-#define FAILm          GREATEST_FAILm
-#define SKIPm          GREATEST_SKIPm
-#define SET_SETUP      GREATEST_SET_SETUP_CB
-#define SET_TEARDOWN   GREATEST_SET_TEARDOWN_CB
-
-#if defined __cplusplus || (__STDC_VERSION__ >= 19901L)
-#define RUN_TESTp      GREATEST_RUN_TESTp
-#endif
-#endif /* USE_ABBREVS */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

test/math.cpp

@@ -1,92 +0,0 @@
-/*!
- * \file test/math.cpp
- * \brief Mat Math Unit Test
- *
- * \todo Also test the geometric methods (intersection, distance, midpoint)
- *
- * \author xythobuz
- */
-#include <stdio.h>
-#include <math.h>
-#include <MatMath.h>
-#include "greatest.h"
-
-vec_t testDegrees[] = { 0.0f, 30.0f, 45.0f, 60.0f, 90.0f, 360.0f, -100.0f };
-vec_t testRads[] = { 0.0f, 0.5236f, 0.7854f, 1.0472f, 1.5708f, 6.2832f, -1.7453f };
-vec_t testBounds[][2] = {
-    { 0.0f, 1.0f },
-    { -5.0f, 5.0f },
-    { 1.0f, 1.0f },
-};
-
-TEST constants() {
-    ASSERTm("Pi not correct!", equalEpsilon(HEL_PI, (vec_t)M_PI));
-    ASSERTm("2Pi not correct!", equalEpsilon(HEL_2_PI, ((vec_t)M_PI * 2.0f)));
-    ASSERTm("Pi/4 not correct!", equalEpsilon(HEL_PI_OVER_4, ((vec_t)M_PI / 4.0f)));
-    ASSERTm("Pi/180 not correct!", equalEpsilon(HEL_PI_OVER_180, ((vec_t)M_PI / 180.0f)));
-    ASSERTm("180/Pi not correct!", equalEpsilon(HEL_180_OVER_PI, (180.0f / (vec_t)M_PI)));
-    PASS();
-}
-
-TEST types() {
-    ASSERT_EQ(sizeof(vec2_t), (2 * sizeof(vec_t)));
-    ASSERT_EQ(sizeof(vec3_t), (3 * sizeof(vec_t)));
-    ASSERT_EQ(sizeof(vec4_t), (4 * sizeof(vec_t)));
-    ASSERT_EQ(sizeof(matrix_t), (16 * sizeof(vec_t)));
-    PASS();
-}
-
-TEST conversionToRad(vec_t deg) {
-    vec_t conv = HEL_DEG_TO_RAD(deg);
-    vec_t hand = (deg * (vec_t)M_PI / 180.0f);
-    if (!equalEpsilon(conv, hand)) {
-        printf("Degree to Radian conversion failed: %f != %f\n", conv, hand);
-        FAIL();
-    } else {
-        PASS();
-    }
-}
-
-TEST conversionToDeg(vec_t rad) {
-    vec_t conv = HEL_RAD_TO_DEG(rad);
-    vec_t hand = (rad * 180.0f / (vec_t)M_PI);
-    if (!equalEpsilon(conv, hand)) {
-        printf("Radian to Degree conversion failed: %f != %f\n", conv, hand);
-        FAIL();
-    } else {
-        PASS();
-    }
-}
-
-#define TESTNUMS 100
-TEST random(vec_t bound[2]) {
-    for (int i = 0; i < TESTNUMS; i++) {
-        vec_t number = helRandomNum(bound[0], bound[1]);
-        ASSERT(number >= bound[0]);
-        ASSERT(number <= bound[1]);
-    }
-    PASS();
-}
-
-SUITE(mathSuite) {
-    RUN_TEST(constants);
-    RUN_TEST(types);
-    for (unsigned int i = 0; i < (sizeof(testDegrees) / sizeof(testDegrees[0])); i++) {
-        RUN_TESTp(conversionToRad, testDegrees[i]);
-    }
-    for (unsigned int i = 0; i < (sizeof(testRads) / sizeof(testRads[0])); i++) {
-        RUN_TESTp(conversionToDeg, testRads[i]);
-    }
-    for (unsigned int i = 0; i < sizeof(testBounds) / sizeof(testBounds[0]); i++) {
-        RUN_TESTp(random, testBounds[i]);
-    }
-}
-
-GREATEST_MAIN_DEFS();
-
-int main(int argc, char *argv[]) {
-    GREATEST_MAIN_BEGIN();
-    RUN_SUITE(mathSuite);
-    GREATEST_MAIN_END();
-}
-

test/tga.cpp

@@ -1,53 +0,0 @@
-/*!
- * \file test/TGA.cpp
- * \brief The TGA reader Unit Test
- *
- * \author xythobuz
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <utils/tga.h>
-#include "greatest.h"
-
-//! \todo generate list?
-const char *testFiles[] = {
-    "../../data/particle.tga",
-    "../../data/snow.tga",
-    "../../data/snow2.tga",
-    "../../data/splash.tga",
-    "../../data/white.tga"
-};
-
-TEST checkFile(FILE *f) {
-    ASSERTm("File wasn't opened.", f != NULL);
-    ASSERT_FALSEm("File is invalid?!", tga_check(f));
-    PASS();
-}
-
-TEST loadFile(FILE *f) {
-    unsigned char *image;
-    unsigned int width, height;
-    char type;
-    ASSERTm("File wasn't opened.", f != NULL);
-    ASSERT_FALSEm("File couldn't be loaded!", tga_load(f, &image, &width, &height, &type));
-    printf("\nWidth: %u\nHeight: %u\nType: %d\n", width, height, type);
-    PASS();
-}
-
-SUITE(tgaSuite) {
-    for (unsigned int i = 0; i < (sizeof(testFiles) / sizeof(testFiles[0])); i++) {
-        FILE *f = fopen(testFiles[i], "r");
-        RUN_TESTp(checkFile, f);
-        RUN_TESTp(loadFile, f);
-        fclose(f);
-    }
-}
-
-GREATEST_MAIN_DEFS();
-
-int main(int argc, char *argv[]) {
-    GREATEST_MAIN_BEGIN();
-    RUN_SUITE(tgaSuite);
-    GREATEST_MAIN_END();
-}
-