memory test using greatest

ChangeLog

@@ -5,6 +5,9 @@
 
  OpenRaider (0.1.2) xythobuz <xythobuz@xythobuz.de>
 
+	[ 20140201 ]
+	* Rewrote Memory Unit Test using greatest
+
 	[ 20140131 ]
 	* All unit tests buildable again and no more warnings
 

src/Render.cpp

@@ -259,7 +259,7 @@ void Render::initTextures(char *textureDir, unsigned int *numLoaded,
                     ++numTextures;
                 }
 
-    // Werid that it isn't linear, must be some storage deal in Texture
+    // Weird that it isn't linear, must be some storage deal in Texture
     // I forgot about Id allocation
     *nextId = font_id;
 

src/Texture.cpp

@@ -262,7 +262,7 @@ int Texture::loadFontTTF(const char *filename,
     if (texture)
     {
 #ifdef DUMP_TTF_TGA
-        FILE *f = fopen("font.tga", "wb");
+        FILE *f = fopen("ttf_font.tga", "wb");
         if (f)
         {
             tga_save(f, texture->texture, 256, 256, 4);

src/memory_test.cpp

@@ -12,6 +12,8 @@
 #define UNIT_TEST_MEMORY
 #include <memory_test.h>
 
+#define DEBUG_MEMORY_ERROR_OFF
+
 bool tree_check(rbtree_t *tree, const char *file, int line)
 {
     bool ret = true;
@@ -838,30 +840,30 @@ void display_memory_usage()
     printf("Memory usage summary:\n");
 
     printf(" Tracked program memory    : %lu bytes \t(%.2f MB)\n",
-            MEMORY_USED, (double)MEMORY_USED / 1024000.0);
+            MEMORY_USED, (double)MEMORY_USED / 1048576.0);
     printf(" Untracked overhead memory : %lu bytes \t(%.2f MB)\n",
-            MEMORYA_USED, (double)MEMORYA_USED / 1024000.0);
+            MEMORYA_USED, (double)MEMORYA_USED / 1048576.0);
     printf(" Untracked m-string memory : %lu bytes\n",
             MEMORYC_USED);
 
     printf("\n Total accounted memory    : %lu bytes \t(%.2f MB)\n",
             MEMORY_USED + MEMORYA_USED + MEMORYC_USED,
-            (double)(MEMORY_USED + MEMORYA_USED + MEMORYC_USED) / 1024000.0);
+            (double)(MEMORY_USED + MEMORYA_USED + MEMORYC_USED) / 1048576.0);
 
     printf("------------------------------------------------------------\n");
 
     printf("Memory max usage summary:\n");
 
     printf(" Tracked program memory    : %lu bytes \t(%.2f MB)\n",
-            MAX_MEMORY_USED, (double)MAX_MEMORY_USED / 1024000.0);
+            MAX_MEMORY_USED, (double)MAX_MEMORY_USED / 1048576.0);
     printf(" Untracked overhead memory : %lu bytes \t(%.2f MB)\n",
-            MAX_MEMORYA_USED, (double)MAX_MEMORYA_USED / 1024000.0);
+            MAX_MEMORYA_USED, (double)MAX_MEMORYA_USED / 1048576.0);
     printf(" Untracked m-string memory : %lu bytes\n",
             MAX_MEMORYC_USED);
 
     printf("\n Total accounted memory    : %lu bytes \t(%.2f MB)\n",
             MAX_MEMORY_USED + MAX_MEMORYA_USED + MAX_MEMORYC_USED,
-            (double)(MAX_MEMORY_USED + MAX_MEMORYA_USED + MAX_MEMORYC_USED) / 1024000.0);
+            (double)(MAX_MEMORY_USED + MAX_MEMORYA_USED + MAX_MEMORYC_USED) / 1048576.0);
 
     printf("============================================================\n");
 }
@@ -869,16 +871,14 @@ void display_memory_usage()
 
 void dump_memory_report()
 {
-    int i;
-
-
     printf("\n============================================================\n");
     printf(" Memory status report\n");
     printf("============================================================\n");
     printf("Memory tracking table:\n");
-    i = tree_print(MEMORY_INFO, (void (*)(void *))&__print_meminfo);
-    printf("%i records, %lu bytes each : %lu bytes\n",
-            i, sizeof(meminfo_t), i * sizeof(meminfo_t));
+    int i = tree_print(MEMORY_INFO, (void (*)(void *))&__print_meminfo);
+    if (i != 0) {
+        printf("%i records, %lu bytes each : %lu bytes\n", i, sizeof(meminfo_t), i * sizeof(meminfo_t));
+    }
     display_memory_usage();
     printf("============================================================\n\n");
 }

test/memory_test.cpp

@@ -3,12 +3,13 @@
  * Memory testing Toolkit Unit test
  *
  * \author Mongoose
+ * \author xythobuz
  */
 
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-
+#include "greatest.h"
 #include <memory_test.h>
 
 extern rbtree_t *MEMORY_INFO;
@@ -19,47 +20,38 @@ extern long MEMORYC_USED;
 extern long MAX_MEMORY_USED;
 extern long MAX_MEMORYA_USED;
 extern long MAX_MEMORYC_USED;
-
 void tree_valid_report(rbtree_t *root);
 
-#define PRINT_TEST_BREAK_LINE   printf("\n############################################################\n\n");
-
-int memory_test_unit_test() {
-    int *i, *j, *k, *l, *m, *n, *o;
-
-    PRINT_TEST_BREAK_LINE
-        printf("Memory test\n");
-    PRINT_TEST_BREAK_LINE
-
-    i = new int;
-    printf(">\ti = new int; (%p)  %s:%i\n", i, __FILE__, __LINE__);
+TEST singleInteger() {
+    int *i = new int;
+    printf("\n>\ti = new int; (%p)  %s:%i\n", i, __FILE__, __LINE__);
     dump_memory_report();
     tree_valid_report(MEMORY_INFO);
-
     delete i;
     printf(">\tdelete i; (%p)  %s:%i\n", i, __FILE__, __LINE__);
     dump_memory_report();
     tree_valid_report(MEMORY_INFO);
+    PASS();
+}
 
-    PRINT_TEST_BREAK_LINE
-
-    i = new int[3];
-    printf(">\ti = new int[3]; (%p)  %s:%i\n", i, __FILE__, __LINE__);
+TEST arrayInteger() {
+    int *i = new int[3];
+    printf("\n>\ti = new int[3]; (%p)  %s:%i\n", i, __FILE__, __LINE__);
     dump_memory_report();
     tree_valid_report(MEMORY_INFO);
-
     delete [] i;
     printf(">\tdelete [] i; (%p)  %s:%i\n", i, __FILE__, __LINE__);
     dump_memory_report();
     tree_valid_report(MEMORY_INFO);
+    PASS();
+}
 
-    PRINT_TEST_BREAK_LINE
-
-    i = new int[3];
-    printf(">\ti = new int[3]; (%p)  %s:%i\n", i, __FILE__, __LINE__);
-    j = new int;
+TEST arrayCombinedInteger() {
+    int *i = new int[3];
+    printf("\n>\ti = new int[3]; (%p)  %s:%i\n", i, __FILE__, __LINE__);
+    int *j = new int;
     printf(">\tj = new int; (%p)  %s:%i\n", j, __FILE__, __LINE__);
-    k = new int[3];
+    int *k = new int[3];
     printf(">\tk = new int[3]; (%p)  %s:%i\n", k, __FILE__, __LINE__);
     dump_memory_report();
     tree_valid_report(MEMORY_INFO);
@@ -71,91 +63,20 @@ int memory_test_unit_test() {
     printf(">\tdelete [] k; (%p)  %s:%i\n", k, __FILE__, __LINE__);
     dump_memory_report();
     tree_valid_report(MEMORY_INFO);
+    PASS();
+}
 
-    PRINT_TEST_BREAK_LINE
-
-    i = new int[3];
-    printf(">\ti = new int[3]; (%p)  %s:%i\n", i, __FILE__, __LINE__);
-    j = new int;
-    printf(">\tj = new int; (%p)  %s:%i\n", j, __FILE__, __LINE__);
-    k = new int[3];
-    printf(">\tk = new int[3]; (%p)  %s:%i\n", k, __FILE__, __LINE__);
-    dump_memory_report();
-    tree_valid_report(MEMORY_INFO);
-    delete j;
-    printf(">\tdelete j; (%p)  %s:%i\n", j, __FILE__, __LINE__);
-    dump_memory_report();
-    tree_valid_report(MEMORY_INFO);
-    j = new int[3];
-    printf(">\tj = new int[3]; (%p)  %s:%i\n", j, __FILE__, __LINE__);
-    dump_memory_report();
-    tree_valid_report(MEMORY_INFO);
-    l = new int[3];
-    printf(">\tl = new int[3]; (%p)  %s:%i\n", l, __FILE__, __LINE__);
-    dump_memory_report();
-    tree_valid_report(MEMORY_INFO);
-    m = new int[3];
-    printf(">\tm = new int[3]; (%p)  %s:%i\n", m, __FILE__, __LINE__);
-    dump_memory_report();
-    tree_valid_report(MEMORY_INFO);
-
-    n = new int[3];
-    printf(">\tn = new int[3]; (%p)  %s:%i\n", n, __FILE__, __LINE__);
-    dump_memory_report();
-    tree_valid_report(MEMORY_INFO);
-
-    o = new int[3];
-    printf(">\to = new int[3]; (%p)  %s:%i\n", o, __FILE__, __LINE__);
-    dump_memory_report();
-    tree_valid_report(MEMORY_INFO);
-
-    delete [] k;
-    printf(">\tdelete [] k; (%p)  %s:%i\n", k, __FILE__, __LINE__);
-    dump_memory_report();
-    tree_valid_report(MEMORY_INFO);
-
-    delete [] j;
-    printf(">\tdelete [] j; (%p)  %s:%i\n", j, __FILE__, __LINE__);
-    dump_memory_report();
-    tree_valid_report(MEMORY_INFO);
-
-    delete [] l;
-    printf(">\tdelete [] l; (%p)  %s:%i\n", l, __FILE__, __LINE__);
-    dump_memory_report();
-    tree_valid_report(MEMORY_INFO);
-
-    delete [] m;
-    printf(">\tdelete [] m; (%p)  %s:%i\n", m, __FILE__, __LINE__);
-    dump_memory_report();
-    tree_valid_report(MEMORY_INFO);
-
-    delete [] n;
-    printf(">\tdelete [] n; (%p)  %s:%i\n", n, __FILE__, __LINE__);
-    dump_memory_report();
-    tree_valid_report(MEMORY_INFO);
-
-    delete [] o;
-    printf(">\tdelete [] o; (%p)  %s:%i\n", o, __FILE__, __LINE__);
-    dump_memory_report();
-    tree_valid_report(MEMORY_INFO);
-
-    delete [] i;
-    printf(">\tdelete [] i; (%p)  %s:%i\n", i, __FILE__, __LINE__);
-    dump_memory_report();
-    tree_valid_report(MEMORY_INFO);
-
-    PRINT_TEST_BREAK_LINE
-
-    return 0;
+SUITE(integerSuite) {
+    RUN_TEST(singleInteger);
+    RUN_TEST(arrayInteger);
+    RUN_TEST(arrayCombinedInteger);
 }
 
+GREATEST_MAIN_DEFS();
+
 int main(int argc, char *argv[]) {
-    if (argc != 1) {
-        printf("Usage:\n\t%s\n", argv[0]);
-        return 1;
-    } else {
-        printf("[memory_test test]\n");
-        return memory_test_unit_test();
-    }
+    GREATEST_MAIN_BEGIN();
+    RUN_SUITE(integerSuite);
+    GREATEST_MAIN_END();
 }