Simplifying
authorMarkus Kauppila <markus.kauppila@gmail.com>
Tue, 24 May 2011 10:25:25 +0300
changeset 5663 91f77d89e689
parent 5662 57fc58008d76
child 5664 753b4e38a964
Simplifying
test/test-automation/.hgignore
test/test-automation/asserts.c
test/test-automation/asserts.h
test/test-automation/test.c
test/test-automation/test.h
--- a/test/test-automation/.hgignore	Mon May 23 17:49:06 2011 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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
--- a/test/test-automation/asserts.c	Mon May 23 17:49:06 2011 +0300
+++ b/test/test-automation/asserts.c	Tue May 24 10:25:25 2011 +0300
@@ -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");
 	}
 }
 
--- a/test/test-automation/asserts.h	Mon May 23 17:49:06 2011 +0300
+++ b/test/test-automation/asserts.h	Tue May 24 10:25:25 2011 +0300
@@ -23,6 +23,6 @@
 
 #include <SDL/SDL.h>
 
-void assertEquals(Uint32 expected, Uint32 actual);
+void assertEquals(char *message, Uint32 expected, Uint32 actual);
 
 #endif
--- a/test/test-automation/test.c	Mon May 23 17:49:06 2011 +0300
+++ b/test/test-automation/test.c	Tue May 24 10:25:25 2011 +0300
@@ -37,7 +37,7 @@
 	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 hello3(void *arg) {
 	printf("hello\n");
 
-	assertEquals(3, 3);
+	assertEquals("passes", 3, 3);
 }
 
 #endif
--- a/test/test-automation/test.h	Mon May 23 17:49:06 2011 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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