|
@@ -39,7 +39,7 @@ static Result* getResult(const char* file) {
|
|
return r;
|
|
return r;
|
|
}
|
|
}
|
|
|
|
|
|
-void Test_finalize(void) {
|
|
|
|
|
|
+void coreFinalizeTests(void) {
|
|
for(size_t i = 0; i < resultsIndex; i++) {
|
|
for(size_t i = 0; i < resultsIndex; i++) {
|
|
Result* r = results + i;
|
|
Result* r = results + i;
|
|
bool c = r->successTests == r->tests;
|
|
bool c = r->successTests == r->tests;
|
|
@@ -66,13 +66,13 @@ static bool addToResult(const char* file, bool comparison) {
|
|
}
|
|
}
|
|
|
|
|
|
#define CORE_TEST_SUCCESS(result) \
|
|
#define CORE_TEST_SUCCESS(result) \
|
|
- file = Logger_getShortFileName(file); \
|
|
|
|
|
|
+ file = coreGetShortFileName(file); \
|
|
if(addToResult(file, result)) { \
|
|
if(addToResult(file, result)) { \
|
|
return true; \
|
|
return true; \
|
|
}
|
|
}
|
|
|
|
|
|
#define CORE_TEST_NAMED_COMPARE(name, type, format) \
|
|
#define CORE_TEST_NAMED_COMPARE(name, type, format) \
|
|
- bool Test_compare_##name(CORE_TEST_ARGS, type wanted, type actual) { \
|
|
|
|
|
|
+ bool coreTest##name(CORE_TEST_ARGS, type wanted, type actual) { \
|
|
CORE_TEST_SUCCESS(wanted == actual) \
|
|
CORE_TEST_SUCCESS(wanted == actual) \
|
|
fputs(CORE_TERMINAL_RED, stdout); \
|
|
fputs(CORE_TERMINAL_RED, stdout); \
|
|
printf("%s:%d - expected '" format "' got '" format "'", file, line, \
|
|
printf("%s:%d - expected '" format "' got '" format "'", file, line, \
|
|
@@ -81,11 +81,10 @@ static bool addToResult(const char* file, bool comparison) {
|
|
return false; \
|
|
return false; \
|
|
}
|
|
}
|
|
|
|
|
|
-CORE_TEST_NAMED_COMPARE(int, int, "%d")
|
|
|
|
-CORE_TEST_NAMED_COMPARE(bool, bool, "%d")
|
|
|
|
|
|
+CORE_TEST_NAMED_COMPARE(Int, int, "%d")
|
|
|
|
+CORE_TEST_NAMED_COMPARE(Bool, bool, "%d")
|
|
|
|
|
|
-bool Test_compare_string(CORE_TEST_ARGS, const char* wanted,
|
|
|
|
- const char* actual) {
|
|
|
|
|
|
+bool coreTestString(CORE_TEST_ARGS, const char* wanted, const char* actual) {
|
|
CORE_TEST_SUCCESS(strcmp(wanted, actual) == 0);
|
|
CORE_TEST_SUCCESS(strcmp(wanted, actual) == 0);
|
|
fputs(CORE_TERMINAL_RED, stdout);
|
|
fputs(CORE_TERMINAL_RED, stdout);
|
|
printf("%s:%d - expected '%s' got '%s'", file, line, wanted, actual);
|
|
printf("%s:%d - expected '%s' got '%s'", file, line, wanted, actual);
|
|
@@ -93,8 +92,7 @@ bool Test_compare_string(CORE_TEST_ARGS, const char* wanted,
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
|
|
|
|
-bool Test_compare_float(CORE_TEST_ARGS, float wanted, float actual,
|
|
|
|
- float error) {
|
|
|
|
|
|
+bool coreTestFloat(CORE_TEST_ARGS, float wanted, float actual, float error) {
|
|
float diff = wanted - actual;
|
|
float diff = wanted - actual;
|
|
diff = diff < 0.0f ? -diff : diff;
|
|
diff = diff < 0.0f ? -diff : diff;
|
|
CORE_TEST_SUCCESS(diff <= error);
|
|
CORE_TEST_SUCCESS(diff <= error);
|
|
@@ -105,7 +103,7 @@ bool Test_compare_float(CORE_TEST_ARGS, float wanted, float actual,
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
|
|
|
|
-bool Test_isNull(CORE_TEST_ARGS, const void* actual) {
|
|
|
|
|
|
+bool coreTestNull(CORE_TEST_ARGS, const void* actual) {
|
|
CORE_TEST_SUCCESS(actual == nullptr);
|
|
CORE_TEST_SUCCESS(actual == nullptr);
|
|
fputs(CORE_TERMINAL_RED, stdout);
|
|
fputs(CORE_TERMINAL_RED, stdout);
|
|
printf("%s:%d - expected null", file, line);
|
|
printf("%s:%d - expected null", file, line);
|
|
@@ -113,7 +111,7 @@ bool Test_isNull(CORE_TEST_ARGS, const void* actual) {
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
|
|
|
|
-bool Test_isNotNull(CORE_TEST_ARGS, const void* actual) {
|
|
|
|
|
|
+bool coreTestNotNull(CORE_TEST_ARGS, const void* actual) {
|
|
CORE_TEST_SUCCESS(actual != nullptr);
|
|
CORE_TEST_SUCCESS(actual != nullptr);
|
|
fputs(CORE_TERMINAL_RED, stdout);
|
|
fputs(CORE_TERMINAL_RED, stdout);
|
|
printf("%s:%d - expected valid pointer", file, line);
|
|
printf("%s:%d - expected valid pointer", file, line);
|