From 8c26e99a44dcc781c5a8fc3b7b38e5c4385ee6e4 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Wed, 13 Jan 2010 09:48:42 +0000
Subject: [PATCH] Moved the assertion tests to testplatform

---
 src/SDL.c           | 14 --------------
 test/testplatform.c | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/SDL.c b/src/SDL.c
index 0c52fc627..932803bad 100644
--- a/src/SDL.c
+++ b/src/SDL.c
@@ -181,20 +181,6 @@ SDL_Init(Uint32 flags)
         SDL_InstallParachute();
     }
 
-    /* brief sanity checks for the sanity checks.  :)  */
-    SDL_assert(1);
-    SDL_assert_release(1);
-    SDL_assert_paranoid(1);
-    SDL_assert(0 || 1);
-    SDL_assert_release(0 || 1);
-    SDL_assert_paranoid(0 || 1);
-
-#if 0   /* enable this to test assertion failures. */
-    SDL_assert_release(1 == 2);
-    SDL_assert_release(5 < 4);
-    SDL_assert_release(0 && "This is a test");
-#endif
-
     return (0);
 }
 
diff --git a/test/testplatform.c b/test/testplatform.c
index 89fe2c686..c334db028 100644
--- a/test/testplatform.c
+++ b/test/testplatform.c
@@ -4,6 +4,7 @@
 #include "SDL.h"
 #include "SDL_endian.h"
 #include "SDL_cpuinfo.h"
+#include "SDL_assert.h"
 
 /*
  * Watcom C flags these as Warning 201: "Unreachable code" if you just
@@ -148,6 +149,26 @@ TestCPUInfo(SDL_bool verbose)
     return (0);
 }
 
+int
+TestAssertions(SDL_bool verbose)
+{
+    SDL_assert(1);
+    SDL_assert_release(1);
+    SDL_assert_paranoid(1);
+    SDL_assert(0 || 1);
+    SDL_assert_release(0 || 1);
+    SDL_assert_paranoid(0 || 1);
+
+#if 0   /* enable this to test assertion failures. */
+    SDL_assert_release(1 == 2);
+    SDL_assert_release(5 < 4);
+    SDL_assert_release(0 && "This is a test");
+#endif
+    SDL_assert_release(0 && "This is a test");
+
+    return (0);
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -164,5 +185,7 @@ main(int argc, char *argv[])
     status += TestTypes(verbose);
     status += TestEndian(verbose);
     status += TestCPUInfo(verbose);
+    status += TestAssertions(verbose);
+
     return status;
 }