From 6a2c27c6eb5202eef3629b47ba702fd37c366e85 Mon Sep 17 00:00:00 2001
From: Markus Kauppila <markus.kauppila@gmail.com>
Date: Tue, 24 May 2011 10:25:25 +0300
Subject: [PATCH] Simplifying

---
 test/test-automation/.hgignore | 24 ------------------------
 test/test-automation/asserts.c |  7 +++++--
 test/test-automation/asserts.h |  2 +-
 test/test-automation/test.c    |  4 ++--
 test/test-automation/test.h    | 30 ------------------------------
 5 files changed, 8 insertions(+), 59 deletions(-)
 delete mode 100644 test/test-automation/.hgignore
 delete mode 100644 test/test-automation/test.h

diff --git a/test/test-automation/.hgignore b/test/test-automation/.hgignore
deleted file mode 100644
index 95327e9ba..000000000
--- a/test/test-automation/.hgignore
+++ /dev/null
@@ -1,24 +0,0 @@
-syntax: glob
-
-.DS_Store
-
-autom4te*
-configure
-config.h
-config.cache
-config.log
-config.status
-Makefile
-runner
-*.o
-*.so
-
-*.dSYM
-
-# for vim
-*.swp
-
-# for Eclipse
-.project
-.cproject
-.settings
diff --git a/test/test-automation/asserts.c b/test/test-automation/asserts.c
index 3eb734022..2e31911a5 100644
--- a/test/test-automation/asserts.c
+++ b/test/test-automation/asserts.c
@@ -26,10 +26,13 @@
 #include <stdlib.h>
 
 void
-assertEquals(Uint32 expected, Uint32 actual)
+assertEquals(char *message, Uint32 expected, Uint32 actual)
 {
 	if(expected != actual) {
-		exit(1);
+		printf("===============================\n");
+		printf("Assert failed: %s\n", message);
+		printf("Expected %d, got %d\n", expected, actual);
+		printf("===============================\n");
 	}
 }
 
diff --git a/test/test-automation/asserts.h b/test/test-automation/asserts.h
index 1d47ed545..8b4f2cf5c 100644
--- a/test/test-automation/asserts.h
+++ b/test/test-automation/asserts.h
@@ -23,6 +23,6 @@
 
 #include <SDL/SDL.h>
 
-void assertEquals(Uint32 expected, Uint32 actual);
+void assertEquals(char *message, Uint32 expected, Uint32 actual);
 
 #endif
diff --git a/test/test-automation/test.c b/test/test-automation/test.c
index 5d9dcf509..941dccf03 100644
--- a/test/test-automation/test.c
+++ b/test/test-automation/test.c
@@ -37,7 +37,7 @@ void hello(void *arg){
 	const char *revision = SDL_GetRevision();
 
 	printf("Revision is %s\n", revision);
-	assertEquals(3, 5);
+	assertEquals("will fail", 3, 5);
 }
 
 void hello2(void *arg) {
@@ -48,7 +48,7 @@ void hello2(void *arg) {
 void hello3(void *arg) {
 	printf("hello\n");
 
-	assertEquals(3, 3);
+	assertEquals("passes", 3, 3);
 }
 
 #endif
diff --git a/test/test-automation/test.h b/test/test-automation/test.h
deleted file mode 100644
index 0b52d0208..000000000
--- a/test/test-automation/test.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-  Copyright (C) 2011 Markus Kauppila <markus.kauppila@gmail.com>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef _TEST_H
-#define _TEST_H
-
-char **suite();
-
-void hello(void *arg);
-void hello2(void *arg);
-void hello3(void *arg);
-
-#endif