Rewrote Matrix Test

ChangeLog

@@ -6,7 +6,9 @@
  OpenRaider (0.1.2) xythobuz <xythobuz@xythobuz.de>
 
 	[ 20140111 ]
-	* Documented MatMath, fixed bug in helRandomNum()
+	* Rewrote Matrix Unit Test now using greatest
+	* Documented MatMath, fixed bug in helRandomNum(),
+	  added better Unit Test
 	* Only one way of conversion between Deg and Rad in MatMath
 	* Use the same style of include guards in all headers
 	* Added memory test to SkeletalModel. Adding to OpenGLMesh causes

src/Matrix.cpp

@@ -442,7 +442,62 @@ void Matrix::copy(matrix_t source, matrix_t dest)
 
 void Matrix::multiply(const matrix_t a, const matrix_t b, matrix_t result)
 {
-	/* Generated code for matrix mult */
+	/* Generated code for matrix mult
+     * Code used:
+
+    // char order is argument
+	int i, j, k;
+	if (order == 'r')
+	{
+		printf("// Row order\n");
+	}
+	else
+	{
+		printf("// Column order\n");
+	}
+	for (i = 0; i < 4; ++i)
+	{
+		for (j = 0; j < 4; ++j)
+		{
+			if (order == 'r')
+			{
+				printf("result[%2i] = ", j+i*4);
+			}
+			else
+			{
+				printf("result[%2i] = ", j+i*4);
+			}
+			for (k = 0; k < 4; ++k)
+			{
+				if (order == 'r')
+				{
+					printf("a[%2i] * b[%2i]%s",
+							  k+i*4, j+k*4, (k == 3) ? ";\n" : " + ");
+				}
+				else
+				{
+					printf("a[%2i] * b[%2i]%s",
+							 i+k*4, k+j*4, (k == 3) ? ";\n" : " + ");
+				}
+				//sum+=(elements[i+k*4]*m.elements[k+j*4]);
+			}
+			//result.elements[i+j*4]=sum;
+		}
+		printf("\n");
+	}
+	printf("\n");
+	printf("// Transpose\n");
+	for(i = 0; i < 4; ++i)
+	{
+		for (j = 0; j < 4; ++j)
+		{
+			printf("a[%2i] = b[%2i]%s",
+					 j+i*4, i+j*4, (j == 3) ? ";\n" : "; ");
+		}
+	}
+
+     * was in test/Matrix.cpp
+     */
 #ifdef COLUMN_ORDER
 	/* Column order */
 	result[ 0] = a[ 0] * b[ 0] + a[ 4] * b[ 1] + a[ 8] * b[ 2] + a[12] * b[ 3];

test/Matrix.cpp

@@ -1,220 +1,101 @@
-/* -*- Mode: C++; tab-width: 3; indent-tabs-mode: t; c-basic-offset: 3 -*- */
-/*================================================================
+/*!
+ * \file test/Matrix.cpp
+ * \brief Matrix Unit Test
  *
- * Project : Freyja
- * Author  : Terry 'Mongoose' Hendrix II
- * Website : http://www.westga.edu/~stu7440/
- * Email   : stu7440@westga.edu
- * Object  : Matrix
- * License : No use w/o permission (C) 2002 Mongoose
- * Comments: 3d Matrix class
- *
- *
- *           This file was generated using Mongoose's C++
- *           template generator script.  <stu7440@westga.edu>
- *
- *-- History -------------------------------------------------
- *
- * 2002.05.11:
- * Mongoose - Created
- =================================================================*/
-
+ * \author Mongoose
+ * \author xythobuz
+ */
 #include <stdio.h>
 #include <math.h>
 #include <strings.h>
-
 #include <Matrix.h>
-
-
-/* <Order> is (r)ow or (c)ol */
-void generateMatrixSourceTest(char order)
-{
-	int i, j, k;
-
-
-	if (order == 'r')
-	{
-		printf("/* Row order */\n");
-	}
-	else
-	{
-		printf("/* Column order */\n");
-	}
-
-	for (i = 0; i < 4; ++i)
-	{
-		for (j = 0; j < 4; ++j)
-		{
-			if (order == 'r')
-			{
-				printf("result[%2i] = ", j+i*4);
-			}
-			else
-			{
-				printf("result[%2i] = ", j+i*4);
-			}
-
-			for (k = 0; k < 4; ++k)
-			{
-				if (order == 'r')
-				{
-					printf("a[%2i] * b[%2i]%s",
-							  k+i*4, j+k*4, (k == 3) ? ";\n" : " + ");
-				}
-				else
-				{
-					printf("a[%2i] * b[%2i]%s",
-							 i+k*4, k+j*4, (k == 3) ? ";\n" : " + ");
-				}
-
-				//sum+=(elements[i+k*4]*m.elements[k+j*4]);
-			}
-
-			//result.elements[i+j*4]=sum;
-		}
-
-		printf("\n");
-	}
-
-	printf("\n");
-
-	printf("/* Transpose */\n");
-	for(i = 0; i < 4; ++i)
-	{
-		for (j = 0; j < 4; ++j)
-		{
-			printf("a[%2i] = b[%2i]%s",
-					 j+i*4, i+j*4, (j == 3) ? ";\n" : "; ");
-		}
-	}
-}
-
-
-int runMatrixUnitTest()
-{
-	unsigned int i, errs;
-	Matrix a, b, c;
-	matrix_t m;
-
-
-	// Test 3 cases of identity use
-	for (errs = 0, i = 0; i < 3; ++i)
-	{
-		// Fill A matrix with garbage
-		m[ 0] = m[ 1] = m[ 2] = m[ 3] = 45.0f;
-		m[ 4] = m[ 5] = m[ 6] = m[ 7] = 90.0f;
-		m[ 8] = m[ 9] = m[10] = m[11] = 180.0f;
-		m[12] = m[13] = m[14] = m[15] = 270.0f;
-		a.setMatrix(m);
-
-		switch (i)
-		{
-		case 0:
-			printf("Set to Identity");
-			a.setIdentity();
-			break;
-		case 1:
-			printf("Identity * Identity");
-			c.setIdentity();
-			b.setIdentity();
-			a = c * b;
-			break;
-		case 2:
-			printf("Identity *= Identity");
-			a.setIdentity();
-			b.setIdentity();
-			a = a * b;
-			break;
-		}
-
-		if (a.isIdentity())
-		{
-			printf(" \t[ Passed ]\n");
-		}
-		else
-		{
-			++errs;
-			printf(" \t[ Failed ]\a\n"); // beep
-			a.print();
-		}
-
-		printf("\n");
-	}
-
-	/* 2003.06.18, Mongoose - These tests are weak and
-		only spot check some of the matrix */
-
-
-	/* Cheap translation test */
-	a.setIdentity();
-	printf("I -> Translate (10, 20, 30)\n");
-	a.translate(10, 20, 30);
+#include "greatest.h"
 
 #ifdef COLUMN_ORDER
-	unsigned char i0  = 0, i1  = 4, i2  =  8, i3  = 12;
-	unsigned char i4  = 1, i5  = 5, i6  =  9, i7  = 13;
-	unsigned char i8  = 2, i9  = 6, i10 = 10, i11 = 14;
-	unsigned char i12 = 3, i13 = 7, i14 = 11, i15 = 15;
+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;
+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
 
-	if (a.mMatrix[i12] != 10 ||
-		 a.mMatrix[i13] != 20 ||
-		 a.mMatrix[i14] != 30)
-	{
-			++errs;
-			printf(" \t[ Failed ]\a\n"); // beep
-			a.print();
-	}
-
-	/* Cheap X rotation test */
-	a.setIdentity();
-	printf("I -> Rotate (90 degrees, 0, 0)\n");
-	a.rotate(90*0.01745329251994329f, 0, 0);
-
-	if (a.mMatrix[i0] != 1 || a.mMatrix[i15] != 1 ||
-		 a.mMatrix[i9] != -1 || a.mMatrix[i6] != 1)
-	{
-			++errs;
-			printf(" \t[ Failed ]\a\n"); // beep
-			a.print();
-	}
-
-	/* Cheap Y rotation test */
-	a.setIdentity();
-	printf("I -> Rotate (0, 90 degrees, 0)\n");
-	a.rotate(0, 90*0.01745329251994329f, 0);
-
-	if (a.mMatrix[i8] != 1 || a.mMatrix[i2] != -1 ||
-		 a.mMatrix[i15] != 1)
-	{
-			++errs;
-			printf(" \t[ Failed ]\a\n"); // beep
-			a.print();
-	}
-
-	/* Cheap Z rotation test */
-	a.setIdentity();
-	printf("I -> Rotate (0, 0, 90 degrees)\n");
-	a.rotate(0, 0, 90*0.01745329251994329f);
+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();
+}
 
-	if (a.mMatrix[i4] != -1 || a.mMatrix[i15] != 1 ||
-		 a.mMatrix[i1] != 1 || a.mMatrix[i10] != 1)
-	{
-			++errs;
-			printf(" \t[ Failed ]\a\n"); // beep
-			a.print();
-	}
+TEST translation() {
+    Matrix a;
+    a.setIdentity();
+    a.translate(10, 20, 30);
+    ASSERT(a.mMatrix[i12] == 10);
+    ASSERT(a.mMatrix[i13] == 20);
+    ASSERT(a.mMatrix[i14] == 30);
+    PASS();
+}
 
-	printf("\n%i errors\n", errs);
-	printf("\n");
+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(a.mMatrix[i0] == 1);
+        ASSERT(a.mMatrix[i15] == 1);
+        ASSERT(a.mMatrix[i9] == -1);
+        ASSERT(a.mMatrix[i6] == 1);
+    } else if (axis == 1) {
+        ASSERT(a.mMatrix[i8] == 1);
+        ASSERT(a.mMatrix[i2] == -1);
+        ASSERT(a.mMatrix[i15] == 1);
+    } else if (axis == 2) {
+        ASSERT(a.mMatrix[i4] == -1);
+        ASSERT(a.mMatrix[i15] == 1);
+        ASSERT(a.mMatrix[i1] == 1);
+        ASSERT(a.mMatrix[i10] == 1);
+    } else {
+        FAIL();
+    }
+    PASS();
+}
 
+TEST precision() {
+    Matrix a;
 	printf("Prescision test...\n");
-	printf("I ->\n");
 	a.setIdentity();
 	printf(" -> Rotate (0, 0, 90 degrees)\n");
 	a.rotate(0, 0, 90*0.01745329251994329f);
@@ -223,37 +104,37 @@ int runMatrixUnitTest()
 	printf(" -> scale (10, 10, 10)\n");
 	a.scale(10, 10, 10);
 	a.print();
-
-	printf("\n");
-
-	printf(" -> scale (0.1, 0.1, 0.1)\n");
+	printf("\n -> scale (0.1, 0.1, 0.1)\n");
 	a.scale(0.1, 0.1, 0.1);
 	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();
-
-	printf("\n%i errors\n", errs);
-
-	return errs;
+    PASS();
 }
 
+SUITE(matrixSuite) {
+    for (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);
 
-int main(int argc, char *argv[])
-{
-	if (argc > 2)
-	{
-		if (strcmp(argv[1], "-src") == 0)
-		{
-			generateMatrixSourceTest(argv[2][0]);
-			return 0;
-		}
-	}
+    RUN_TEST(precision);
+}
 
-	printf("[Matrix class test]\n");
-	runMatrixUnitTest();
+GREATEST_MAIN_DEFS();
 
-	return 0;
+int main(int argc, char *argv[]) {
+    GREATEST_MAIN_BEGIN();
+    RUN_SUITE(matrixSuite);
+    GREATEST_MAIN_END();
 }