Commit 9eb09d23929f03f329a67631c0bbb0676f0458a0
2022-05-06T13:39:44
Test: Refactored and formatted math test suite.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264
diff --git a/test/testautomation_math.c b/test/testautomation_math.c
index 79ceb00..1843ef0 100644
--- a/test/testautomation_math.c
+++ b/test/testautomation_math.c
@@ -7,6 +7,26 @@
#include "SDL.h"
#include "SDL_test.h"
+/* ================= Test Structs ================== */
+
+/**
+ * Stores a single input and the expected result
+ */
+typedef struct
+{
+ double input;
+ double expected;
+} d_to_d;
+
+/**
+ * Stores a pair of inputs and the expected result
+ */
+typedef struct
+{
+ double x_input, y_input;
+ double expected;
+} dd_to_d;
+
/* ================= Test Case Implementation ================== */
/* SDL_floor tests functions */
@@ -14,96 +34,121 @@
/**
* \brief Checks edge cases (0 and infinity) for themselves.
*/
-static int floor_edgeCases(void* args) {
- double result;
-
- result = SDL_floor(INFINITY);
- SDLTest_AssertCheck(INFINITY == result, "Floor(%f), expected %f, got %f",
- INFINITY, INFINITY, result);
- result = SDL_floor(-INFINITY);
- SDLTest_AssertCheck(-INFINITY == result, "Floor(%f), expected %f, got %f",
- -INFINITY, -INFINITY, result);
-
- result = SDL_floor(0.0);
- SDLTest_AssertCheck(0.0 == result, "Floor(%.1f), expected %.1f, got %.1f",
- 0.0, 0.0, result);
- result = SDL_floor(-0.0);
- SDLTest_AssertCheck(-0.0 == result, "Floor(%.1f), expected %.1f, got %.1f",
- -0.0, -0.0, result);
-
- return TEST_COMPLETED;
+static int
+floor_edgeCases(void *args)
+{
+ double result;
+
+ result = SDL_floor(INFINITY);
+ SDLTest_AssertCheck(INFINITY == result, "Floor(%f), expected %f, got %f",
+ INFINITY, INFINITY, result);
+ result = SDL_floor(-INFINITY);
+ SDLTest_AssertCheck(-INFINITY == result, "Floor(%f), expected %f, got %f",
+ -INFINITY, -INFINITY, result);
+
+ result = SDL_floor(0.0);
+ SDLTest_AssertCheck(0.0 == result, "Floor(%.1f), expected %.1f, got %.1f",
+ 0.0, 0.0, result);
+ result = SDL_floor(-0.0);
+ SDLTest_AssertCheck(-0.0 == result, "Floor(%.1f), expected %.1f, got %.1f",
+ -0.0, -0.0, result);
+
+ return TEST_COMPLETED;
}
/**
* \brief Checks the NaN case.
*/
-static int floor_nanCase(void* args) {
- SDLTest_AssertCheck(isnan(SDL_floor(NAN)), "Floor(nan), expected nan");
- return TEST_COMPLETED;
+static int
+floor_nanCase(void *args)
+{
+ SDLTest_AssertCheck(isnan(SDL_floor(NAN)), "Floor(nan), expected nan");
+ return TEST_COMPLETED;
}
/**
* \brief Checks round values (x.0) for themselves
*/
-static int floor_roundNumbersCases(void* args) {
- Uint32 i;
- const double round_cases[] = {1.0, -1.0, 15.0, -15.0,
- 125.0, -125.0, 1024.0, -1024.0};
- for (i = 0; i < SDL_arraysize(round_cases); i++) {
- const double result = SDL_floor(round_cases[i]);
- SDLTest_AssertCheck(result == round_cases[i],
- "Floor(%.1f), expected %.1f, got %.1f", round_cases[i],
- round_cases[i], result);
- }
- return TEST_COMPLETED;
+static int
+floor_roundNumbersCases(void *args)
+{
+ Uint32 i;
+ const double round_cases[] = {
+ 1.0,
+ -1.0,
+ 15.0,
+ -15.0,
+ 125.0,
+ -125.0,
+ 1024.0,
+ -1024.0
+ };
+ for (i = 0; i < SDL_arraysize(round_cases); i++) {
+ const double result = SDL_floor(round_cases[i]);
+ SDLTest_AssertCheck(result == round_cases[i],
+ "Floor(%.1f), expected %.1f, got %.1f", round_cases[i],
+ round_cases[i], result);
+ }
+ return TEST_COMPLETED;
}
/**
* \brief Checks a set of fractions
*/
-static int floor_fractionCases(void* args) {
- Uint32 i;
- const struct {
- double input, expected;
- } frac_cases[] = {{1.0 / 2.0, 0.0}, {-1.0 / 2.0, -1.0},
- {4.0 / 3.0, 1.0}, {-4.0 / 3.0, -2.0},
- {76.0 / 7.0, 10.0}, {-76.0 / 7.0, -11.0},
- {535.0 / 8.0, 66.0}, {-535.0 / 8.0, -67.0},
- {19357.0 / 53.0, 365.0}, {-19357.0 / 53.0, -366.0}};
- for (i = 0; i < SDL_arraysize(frac_cases); i++) {
- const double result = SDL_floor(frac_cases[i].input);
- SDLTest_AssertCheck(result == frac_cases[i].expected,
- "Floor(%f), expected %.1f, got %f", frac_cases[i].input,
- frac_cases[i].expected, result);
- }
- return TEST_COMPLETED;
+static int
+floor_fractionCases(void *args)
+{
+ Uint32 i;
+ const d_to_d frac_cases[] = {
+ { 1.0 / 2.0, 0.0 },
+ { -1.0 / 2.0, -1.0 },
+ { 4.0 / 3.0, 1.0 },
+ { -4.0 / 3.0, -2.0 },
+ { 76.0 / 7.0, 10.0 },
+ { -76.0 / 7.0, -11.0 },
+ { 535.0 / 8.0, 66.0 },
+ { -535.0 / 8.0, -67.0 },
+ { 19357.0 / 53.0, 365.0 },
+ { -19357.0 / 53.0, -366.0 }
+ };
+ for (i = 0; i < SDL_arraysize(frac_cases); i++) {
+ const double result = SDL_floor(frac_cases[i].input);
+ SDLTest_AssertCheck(result == frac_cases[i].expected,
+ "Floor(%f), expected %.1f, got %f", frac_cases[i].input,
+ frac_cases[i].expected, result);
+ }
+ return TEST_COMPLETED;
}
/**
* \brief Checks a range of values between 0 and UINT32_MAX
*/
-static int floor_rangeTest(void* args) {
- const Uint32 ITERATIONS = 10000000;
- const Uint32 STEP = SDL_MAX_UINT32 / ITERATIONS;
- Uint32 i;
- double test_value = 0.0;
- SDLTest_AssertPass("Floor: Testing a range of %u values with %u steps",
- ITERATIONS, STEP);
- for (i = 0; i < ITERATIONS; i++, test_value += STEP) {
- double result;
- /* These are tested elsewhere */
- if (isnan(test_value) || isinf(test_value)) {
- continue;
- }
-
- result = SDL_floor(test_value);
- if (result != test_value) { /* Only log failures to save performances */
- SDLTest_AssertPass("Floor(%.1f), expected %.1f, got %.1f", test_value,
- test_value, result);
- return TEST_ABORTED;
+static int
+floor_rangeTest(void *args)
+{
+ const Uint32 ITERATIONS = 10000000;
+ const Uint32 STEP = SDL_MAX_UINT32 / ITERATIONS;
+ Uint32 i;
+ double test_value = 0.0;
+
+ SDLTest_AssertPass("Floor: Testing a range of %u values with %u steps",
+ ITERATIONS, STEP);
+
+ for (i = 0; i < ITERATIONS; i++, test_value += STEP) {
+ double result;
+ /* These are tested elsewhere */
+ if (isnan(test_value) || isinf(test_value)) {
+ continue;
+ }
+
+ result = SDL_floor(test_value);
+ if (result != test_value) { /* Only log failures to save performances */
+ SDLTest_AssertPass("Floor(%.1f), expected %.1f, got %.1f", test_value,
+ test_value, result);
+ return TEST_ABORTED;
+ }
}
- }
- return TEST_COMPLETED;
+ return TEST_COMPLETED;
}
/* ================= Test References ================== */
@@ -111,22 +156,28 @@ static int floor_rangeTest(void* args) {
/* SDL_floor test cases */
static const SDLTest_TestCaseReference floorTest1 = {
- (SDLTest_TestCaseFp)floor_edgeCases, "floor_edgeCases",
- "Check positive and negative infinity and 0", TEST_ENABLED};
+ (SDLTest_TestCaseFp) floor_edgeCases, "floor_edgeCases",
+ "Check positive and negative infinity and 0", TEST_ENABLED
+};
static const SDLTest_TestCaseReference floorTest2 = {
- (SDLTest_TestCaseFp)floor_nanCase, "floor_nanCase",
- "Check the NaN special case", TEST_ENABLED};
+ (SDLTest_TestCaseFp) floor_nanCase, "floor_nanCase",
+ "Check the NaN special case", TEST_ENABLED
+};
static const SDLTest_TestCaseReference floorTest3 = {
- (SDLTest_TestCaseFp)floor_roundNumbersCases, "floor_roundNumberCases",
- "Check a set of round numbers", TEST_ENABLED};
+ (SDLTest_TestCaseFp) floor_roundNumbersCases, "floor_roundNumberCases",
+ "Check a set of round numbers", TEST_ENABLED
+};
static const SDLTest_TestCaseReference floorTest4 = {
- (SDLTest_TestCaseFp)floor_fractionCases, "floor_fractionCases",
- "Check a set of fractions", TEST_ENABLED};
+ (SDLTest_TestCaseFp) floor_fractionCases, "floor_fractionCases",
+ "Check a set of fractions", TEST_ENABLED
+};
static const SDLTest_TestCaseReference floorTest5 = {
- (SDLTest_TestCaseFp)floor_rangeTest, "floor_rangeTest",
- "Check a range of positive integer", TEST_ENABLED};
+ (SDLTest_TestCaseFp) floor_rangeTest, "floor_rangeTest",
+ "Check a range of positive integer", TEST_ENABLED
+};
-static const SDLTest_TestCaseReference* mathTests[] = {
- &floorTest1, &floorTest2, &floorTest3, &floorTest4, &floorTest5, NULL};
+static const SDLTest_TestCaseReference *mathTests[] = {
+ &floorTest1, &floorTest2, &floorTest3, &floorTest4, &floorTest5, NULL
+};
-SDLTest_TestSuiteReference mathTestSuite = {"Math", NULL, mathTests, NULL};
+SDLTest_TestSuiteReference mathTestSuite = { "Math", NULL, mathTests, NULL };