atria-soft/etk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] correct etest framework

Browse Source
This commit is contained in:
Edouard DUPIN 2018-09-05 21:15:13 +02:00
parent 8f02b5ccd4
commit 0bad189b50
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
etest/etest.hpp
View File

@ -177,14 +177,16 @@ namespace etest {
try { \ try { \
etest::g_currentTest->addCheck(); \ etest::g_currentTest->addCheck(); \
ETEST_DEBUG(" [ SUB-RUN ] EXPECT_EQ(" << #element << ", " << #result << ");"); \ ETEST_DEBUG(" [ SUB-RUN ] EXPECT_EQ(" << #element << ", " << #result << ");"); \
bool ETEST_VARIABLE_TMP_res = ((element) == (result)); \ auto ETEST_VARIABLE_TMP_element = (element); \
auto ETEST_VARIABLE_TMP_result = (result); \
bool ETEST_VARIABLE_TMP_res = (ETEST_VARIABLE_TMP_element == ETEST_VARIABLE_TMP_result); \
if (etest::g_currentTest == null) { \ if (etest::g_currentTest == null) { \
ETEST_CRITICAL("Not in a test"); \ ETEST_CRITICAL("Not in a test"); \
} else { \ } else { \
etest::g_currentTest->testResult(ETEST_VARIABLE_TMP_res, \ etest::g_currentTest->testResult(ETEST_VARIABLE_TMP_res, \
etest::exportResultToString(element), \ etest::exportResultToString(ETEST_VARIABLE_TMP_element), \
#element, \ #element, \
etest::exportResultToString(result), \ etest::exportResultToString(ETEST_VARIABLE_TMP_result), \
#result, \ #result, \
__LINE__); \ __LINE__); \
} \ } \
@ -201,14 +203,16 @@ namespace etest {
try { \ try { \
etest::g_currentTest->addCheck(); \ etest::g_currentTest->addCheck(); \
ETEST_DEBUG(" [ SUB-RUN ] EXPECT_NE(" << #element << ", " << #result << ");"); \ ETEST_DEBUG(" [ SUB-RUN ] EXPECT_NE(" << #element << ", " << #result << ");"); \
bool ETEST_VARIABLE_TMP_res = ((element) != (result)); \ auto ETEST_VARIABLE_TMP_element = (element); \
auto ETEST_VARIABLE_TMP_result = (result); \
bool ETEST_VARIABLE_TMP_res = (ETEST_VARIABLE_TMP_element != ETEST_VARIABLE_TMP_result); \
if (etest::g_currentTest == null) { \ if (etest::g_currentTest == null) { \
ETEST_CRITICAL("Not in a test"); \ ETEST_CRITICAL("Not in a test"); \
} else { \ } else { \
etest::g_currentTest->testResult(ETEST_VARIABLE_TMP_res, \ etest::g_currentTest->testResult(ETEST_VARIABLE_TMP_res, \
etest::exportResultToString(element), \ etest::exportResultToString(ETEST_VARIABLE_TMP_element), \
#element, \ #element, \
etest::exportResultToString(result), \ etest::exportResultToString(ETEST_VARIABLE_TMP_result), \
#result, \ #result, \
__LINE__); \ __LINE__); \
} \ } \
@ -225,14 +229,16 @@ namespace etest {
try { \ try { \
etest::g_currentTest->addCheck(); \ etest::g_currentTest->addCheck(); \
ETEST_DEBUG(" [ SUB-RUN ] ASSERT_NE(" << #element << ", " << #result << ");"); \ ETEST_DEBUG(" [ SUB-RUN ] ASSERT_NE(" << #element << ", " << #result << ");"); \
bool ETEST_VARIABLE_TMP_res = ((element) != (result)); \ auto ETEST_VARIABLE_TMP_element = (element); \
auto ETEST_VARIABLE_TMP_result = (result); \
bool ETEST_VARIABLE_TMP_res = (ETEST_VARIABLE_TMP_element != ETEST_VARIABLE_TMP_result); \
if (etest::g_currentTest == null) { \ if (etest::g_currentTest == null) { \
ETEST_CRITICAL("Not in a test"); \ ETEST_CRITICAL("Not in a test"); \
} else { \ } else { \
etest::g_currentTest->testResult(ETEST_VARIABLE_TMP_res, \ etest::g_currentTest->testResult(ETEST_VARIABLE_TMP_res, \
etest::exportResultToString(element), \ etest::exportResultToString(ETEST_VARIABLE_TMP_element), \
#element, \ #element, \
etest::exportResultToString(result), \ etest::exportResultToString(ETEST_VARIABLE_TMP_result), \
#result, \ #result, \
__LINE__); \ __LINE__); \
} \ } \
@ -252,7 +258,9 @@ namespace etest {
try { \ try { \
etest::g_currentTest->addCheck(); \ etest::g_currentTest->addCheck(); \
ETEST_DEBUG(" [ SUB-RUN ] EXPECT_FLOAT_EQ(" << #element << ", " << #result << ");"); \ ETEST_DEBUG(" [ SUB-RUN ] EXPECT_FLOAT_EQ(" << #element << ", " << #result << ");"); \
float ETEST_VARIABLE_TMP_res2 = (element) - (result); \ auto ETEST_VARIABLE_TMP_element = (element); \
auto ETEST_VARIABLE_TMP_result = (result); \
float ETEST_VARIABLE_TMP_res2 = (ETEST_VARIABLE_TMP_element - ETEST_VARIABLE_TMP_result); \
bool ETEST_VARIABLE_TMP_res = false; \ bool ETEST_VARIABLE_TMP_res = false; \
if (ETEST_VARIABLE_TMP_res2 < delta && ETEST_VARIABLE_TMP_res2 > -delta) { \ if (ETEST_VARIABLE_TMP_res2 < delta && ETEST_VARIABLE_TMP_res2 > -delta) { \
ETEST_VARIABLE_TMP_res = true; \ ETEST_VARIABLE_TMP_res = true; \
@ -261,9 +269,9 @@ namespace etest {
ETEST_CRITICAL("Not in a test"); \ ETEST_CRITICAL("Not in a test"); \
} else { \ } else { \
etest::g_currentTest->testResult(ETEST_VARIABLE_TMP_res, \ etest::g_currentTest->testResult(ETEST_VARIABLE_TMP_res, \
etest::exportResultToString(element), \ etest::exportResultToString(ETEST_VARIABLE_TMP_element), \
#element, \ #element, \
etest::exportResultToString(result), \ etest::exportResultToString(ETEST_VARIABLE_TMP_result), \
#result, \ #result, \
__LINE__); \ __LINE__); \
} \ } \