@@ -13,94 +13,142 @@
  * file.
  */
 
 #include "config.h"
 
-#import "TestsAppDelegate.h"
-
-static OFString *const module = @"OFMatrix4x4Tests";
-
-@implementation TestsAppDelegate (OFMatrix4x4Tests)
-- (void)matrix4x4Tests
-{
-	void *pool = objc_autoreleasePoolPush();
-	OFMatrix4x4 *matrix, *matrix2;
-	OFVector4D point;
-	OFVector4D points[2] = {{ 1, 2, 3, 1 }, { 7, 8, 9, 2 }};
-
-	TEST(@"+[identityMatrix]",
-	    memcmp([[OFMatrix4x4 identityMatrix] values], (const float [4][4]){
-		{ 1, 0, 0, 0 },
-		{ 0, 1, 0, 0 },
-		{ 0, 0, 1, 0 },
-		{ 0, 0, 0, 1 }
-	    }, 16 * sizeof(float)) == 0)
-
-	TEST(@"+[matrixWithValues:]",
-	    (matrix = [OFMatrix4x4 matrixWithValues: (const float [4][4]){
+#import "ObjFW.h"
+#import "ObjFWTest.h"
+
+@interface OFMatrix4x4Tests: OTTestCase
+{
+	OFMatrix4x4 *_matrix;
+}
+@end
+
+@implementation OFMatrix4x4Tests
+- (void)setUp
+{
+	_matrix = [[OFMatrix4x4 alloc] initWithValues: (const float [4][4]){
 		{  1,  2,  3,  4 },
 		{  5,  6,  7,  8 },
 		{  9, 10, 11, 12 },
 		{ 13, 14, 15, 16 }
-	    }]))
-
-	TEST(@"-[description]",
-	    [matrix.description isEqual: @"<OFMatrix4x4: {\n"
-					 @"\t1 2 3 4\n"
-					 @"\t5 6 7 8\n"
-					 @"\t9 10 11 12\n"
-					 @"\t13 14 15 16\n"
-					 @"}>"])
-
-	TEST(@"-[isEqual:]", [[OFMatrix4x4 identityMatrix] isEqual:
-	    [OFMatrix4x4 matrixWithValues: (const float [4][4]){
+	}];
+}
+
+- (void)dealloc
+{
+	[_matrix release];
+
+	[super dealloc];
+}
+
+- (void)testIdentityMatrix
+{
+	OTAssertEqual(memcmp([[OFMatrix4x4 identityMatrix] values],
+	    (const float [4][4]){
+		{ 1, 0, 0, 0 },
+		{ 0, 1, 0, 0 },
+		{ 0, 0, 1, 0 },
+		{ 0, 0, 0, 1 }
+	    }, 16 * sizeof(float)),
+	    0);
+}
+
+- (void)testDescription
+{
+	OTAssertEqualObjects(_matrix.description,
+	    @"<OFMatrix4x4: {\n"
+	    @"\t1 2 3 4\n"
+	    @"\t5 6 7 8\n"
+	    @"\t9 10 11 12\n"
+	    @"\t13 14 15 16\n"
+	    @"}>");
+}
+
+- (void)testIsEqual
+{
+	OTAssertEqualObjects([OFMatrix4x4 identityMatrix],
+	    ([OFMatrix4x4 matrixWithValues: (const float [4][4]){
 		{ 1, 0, 0, 0 },
 		{ 0, 1, 0, 0 },
 		{ 0, 0, 1, 0 },
 		{ 0, 0, 0, 1 }
-	    }]])
-
-	TEST(@"-[copy]", (matrix2 = [[matrix copy] autorelease]) &&
-	    [matrix2 isEqual: matrix])
-
-	TEST(@"-[multiplyWithMatrix:] #1",
-	    R([matrix2 multiplyWithMatrix: [OFMatrix4x4 identityMatrix]]) &&
-	    [matrix2 isEqual: matrix])
-
-	matrix2 = [OFMatrix4x4 matrixWithValues: (const float [4][4]){
+	    }]));
+}
+
+/* TODO: testHash */
+
+- (void)testCopy
+{
+	OTAssertEqualObjects(_matrix, [[_matrix copy] autorelease]);
+}
+
+- (void)testMultiplyWithMatrix
+{
+	OFMatrix4x4 *matrix;
+
+	matrix = [[_matrix copy] autorelease];
+	[matrix multiplyWithMatrix: [OFMatrix4x4 identityMatrix]];
+	OTAssertEqualObjects(matrix, _matrix);
+
+	matrix = [OFMatrix4x4 matrixWithValues: (const float [4][4]){
 		{  100,  200,  300,  400 },
 		{  500,  600,  700,  800 },
 		{  900, 1000, 1100, 1200 },
 		{ 1300, 1400, 1500, 1600 }
 	}];
-	TEST(@"-[multiplyWithMatrix:] #2",
-	    R([matrix2 multiplyWithMatrix: matrix]) &&
-	    [matrix2 isEqual:
-	    [OFMatrix4x4 matrixWithValues: (const float [4][4]){
+	[matrix multiplyWithMatrix: _matrix];
+	OTAssertEqualObjects(matrix,
+	    ([OFMatrix4x4 matrixWithValues: (const float [4][4]){
 		{  9000, 10000, 11000, 12000 },
 		{ 20200, 22800, 25400, 28000 },
 		{ 31400, 35600, 39800, 44000 },
 		{ 42600, 48400, 54200, 60000 }
-	    }]])
-
-	TEST(@"-[translateWithVector:]",
-	    (matrix2 = [OFMatrix4x4 identityMatrix]) &&
-	    R([matrix2 translateWithVector: OFMakeVector3D(1, 2, 3)]) &&
-	    R(point =
-	    [matrix2 transformedVector: OFMakeVector4D(2, 3, 4, 1)]) &&
-	    point.x == 3 && point.y == 5 && point.z == 7 && point.w == 1)
-
-	TEST(@"-[scaleWithVector:]",
-	    R([matrix2 scaleWithVector: OFMakeVector3D(-1, 0.5f, 2)]) &&
-	    R(point =
-	    [matrix2 transformedVector: OFMakeVector4D(2, 3, 4, 1)]) &&
-	    point.x == -3 && point.y == 2.5 && point.z == 14 && point.w == 1)
-
-	TEST(@"-[transformVectors:count:]",
-	    R([matrix transformVectors: points count: 2]) &&
-	    points[0].x == 18 && points[0].y == 46 && points[0].z == 74 &&
-	    points[0].w == 102 && points[1].x == 58 && points[1].y == 162 &&
-	    points[1].z == 266 && points[1].w == 370)
-
-	objc_autoreleasePoolPop(pool);
+	    }]));
+}
+
+- (void)testTranslateWithVector
+{
+	OFMatrix4x4 *matrix = [OFMatrix4x4 identityMatrix];
+	OFVector4D point;
+
+	[matrix translateWithVector: OFMakeVector3D(1, 2, 3)];
+
+	point = [matrix transformedVector: OFMakeVector4D(2, 3, 4, 1)];
+	OTAssertEqual(point.x, 3);
+	OTAssertEqual(point.y, 5);
+	OTAssertEqual(point.z, 7);
+	OTAssertEqual(point.w, 1);
+}
+
+- (void)testScaleWithVector
+{
+	OFMatrix4x4 *matrix = [OFMatrix4x4 identityMatrix];
+	OFVector4D point;
+
+	[matrix translateWithVector: OFMakeVector3D(1, 2, 3)];
+	[matrix scaleWithVector: OFMakeVector3D(-1, 0.5f, 2)];
+
+	point = [matrix transformedVector: OFMakeVector4D(2, 3, 4, 1)];
+	OTAssertEqual(point.x, -3);
+	OTAssertEqual(point.y, 2.5);
+	OTAssertEqual(point.z, 14);
+	OTAssertEqual(point.w, 1);
+}
+
+- (void)testTransformVectorsCount
+{
+	OFVector4D points[2] = {{ 1, 2, 3, 1 }, { 7, 8, 9, 2 }};
+
+	[_matrix transformVectors: points count: 2];
+
+	OTAssertEqual(points[0].x, 18);
+	OTAssertEqual(points[0].y, 46);
+	OTAssertEqual(points[0].z, 74);
+	OTAssertEqual(points[0].w, 102);
+	OTAssertEqual(points[1].x, 58);
+	OTAssertEqual(points[1].y, 162);
+	OTAssertEqual(points[1].z, 266);
+	OTAssertEqual(points[1].w, 370);
 }
 @end