diff options
author | Arne H Juul <arnej@yahoo-inc.com> | 2016-06-30 15:00:32 +0200 |
---|---|---|
committer | Arne H Juul <arnej@yahoo-inc.com> | 2016-06-30 15:02:19 +0200 |
commit | e3d99f8ccec0d741b1dbb93f807714f034944805 (patch) | |
tree | 52eb0ec446fe3b7f60501b76045c267beb56694c /fastos/src | |
parent | b14942524138fc7915b073550b68be60e7966ee5 (diff) |
refactor
Diffstat (limited to 'fastos/src')
-rw-r--r-- | fastos/src/tests/tests.h | 80 |
1 files changed, 20 insertions, 60 deletions
diff --git a/fastos/src/tests/tests.h b/fastos/src/tests/tests.h index 09604829b3c..c443a9fb137 100644 --- a/fastos/src/tests/tests.h +++ b/fastos/src/tests/tests.h @@ -52,111 +52,71 @@ public: bool Progress (bool result, const char *str, int d1) { char string[MAX_STR_LEN]; - sprintf(string, "%s: ", result ? okString : failString); - sprintf(&string[strlen(string)], str, d1); - sprintf(&string[strlen(string)], "\n"); - PrintProgress(string); - if (! result) { _allOkFlag = false; } - return result; + sprintf(string, str, d1); + return Progress(result, string); } bool Progress (bool result, const char *str, int d1, int d2) { char string[MAX_STR_LEN]; - sprintf(string, "%s: ", result ? okString : failString); - sprintf(&string[strlen(string)], str, d1, d2); - sprintf(&string[strlen(string)], "\n"); - PrintProgress(string); - if (! result) { _allOkFlag = false; } - return result; + sprintf(string, str, d1, d2); + return Progress(result, string); } bool Progress (bool result, const char *str, const char *s1) { char string[MAX_STR_LEN]; - sprintf(string, "%s: ", result ? okString : failString); - sprintf(&string[strlen(string)], str, s1); - sprintf(&string[strlen(string)], "\n"); - PrintProgress(string); - if (! result) { _allOkFlag = false; } - return result; + sprintf(string, str, s1); + return Progress(result, string); } bool Progress (bool result, const char *str, const FastOS_ThreadInterface *s1) { char string[MAX_STR_LEN]; - sprintf(string, "%s: ", result ? okString : failString); - sprintf(&string[strlen(string)], str, s1); - sprintf(&string[strlen(string)], "\n"); - PrintProgress(string); - if (! result) { _allOkFlag = false; } - return result; + sprintf(string, str, s1); + return Progress(result, string); } bool Progress (bool result, const char *str, const FastOS_Socket *s1) { char string[MAX_STR_LEN]; - sprintf(string, "%s: ", result ? okString : failString); - sprintf(&string[strlen(string)], str, s1); - sprintf(&string[strlen(string)], "\n"); - PrintProgress(string); - if (! result) { _allOkFlag = false; } - return result; + sprintf(string, str, s1); + return Progress(result, string); } bool Progress (bool result, const char *str, const char *s1, const char *s2) { char string[MAX_STR_LEN]; - sprintf(string, "%s: ", result ? okString : failString); - sprintf(&string[strlen(string)], str, s1, s2); - sprintf(&string[strlen(string)], "\n"); - PrintProgress(string); - if (! result) { _allOkFlag = false; } - return result; + sprintf(string, str, s1, s2); + return Progress(result, string); } bool Progress (bool result, const char *str, const char *s1, int d1) { char string[MAX_STR_LEN]; - sprintf(string, "%s: ", result ? okString : failString); - sprintf(&string[strlen(string)], str, s1, d1); - sprintf(&string[strlen(string)], "\n"); - PrintProgress(string); - if (! result) { _allOkFlag = false; } - return result; + sprintf(string, str, s1, d1); + return Progress(result, string); } bool Progress (bool result, const char *str, int d1, const char *s1) { char string[MAX_STR_LEN]; - sprintf(string, "%s: ", result ? okString : failString); - sprintf(&string[strlen(string)], str, d1, s1); - sprintf(&string[strlen(string)], "\n"); - PrintProgress(string); - if (! result) { _allOkFlag = false; } - return result; + sprintf(string, str, d1, s1); + return Progress(result, string); } bool ProgressI64 (bool result, const char *str, int64_t val) { char string[MAX_STR_LEN]; - sprintf(string, "%s: ", result ? okString : failString); - sprintf(&string[strlen(string)], str, val); - sprintf(&string[strlen(string)], "\n"); - PrintProgress(string); - if (! result) { _allOkFlag = false; } - return result; + sprintf(string, str, val); + return Progress(result, string); } bool ProgressFloat (bool result, const char *str, float val) { char string[MAX_STR_LEN]; - sprintf(string, "%s: ", result ? okString : failString); - sprintf(&string[strlen(string)], str, val); - sprintf(&string[strlen(string)], "\n"); - PrintProgress(string); - if (! result) { _allOkFlag = false; } - return result; + sprintf(string, str, val); + return Progress(result, string); } void Ok (const char *string) |