From 74579fbadf0f89154cba5d9157a57f59fcda8f70 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Mon, 26 Aug 2019 21:38:34 +0200 Subject: Improved testing framework. (#4376) --- tests/FastRandom/FastRandomTest.cpp | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) (limited to 'tests/FastRandom/FastRandomTest.cpp') diff --git a/tests/FastRandom/FastRandomTest.cpp b/tests/FastRandom/FastRandomTest.cpp index 2bfa7ced6..bb55d3349 100644 --- a/tests/FastRandom/FastRandomTest.cpp +++ b/tests/FastRandom/FastRandomTest.cpp @@ -4,6 +4,7 @@ // Tests the randomness of cFastRandom #include "Globals.h" +#include "../TestHelpers.h" #include "FastRandom.h" @@ -20,8 +21,8 @@ static void TestInts(void) for (int i = 0; i < ITER; i++) { int v = rnd.RandInt(1000); - assert_test(v >= 0); - assert_test(v <= 1000); + TEST_GREATER_THAN_OR_EQUAL(v, 0); + TEST_LESS_THAN_OR_EQUAL(v, 1000); Counts[v % BUCKETS]++; sum += v; } @@ -47,8 +48,8 @@ static void TestFloats(void) for (int i = 0; i < ITER; i++) { float v = rnd.RandReal(1000.0f); - assert_test(v >= 0); - assert_test(v <= 1000); + TEST_GREATER_THAN_OR_EQUAL(v, 0); + TEST_LESS_THAN_OR_EQUAL(v, 1000); Counts[static_cast(v) % BUCKETS]++; sum += v; } @@ -100,18 +101,8 @@ static void TestReCreation(void) -int main(void) -{ - LOG("FastRandom Test started"); - - LOG("Testing ints"); +IMPLEMENT_TEST_MAIN("FastRandom", TestInts(); - - LOG("Testing floats"); TestFloats(); - - LOG("Testing re-creation"); TestReCreation(); - - LOG("FastRandom test finished"); -} +) -- cgit v1.2.3