diff options
Diffstat (limited to 'fastos/src/tests/tests.h')
-rw-r--r-- | fastos/src/tests/tests.h | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/fastos/src/tests/tests.h b/fastos/src/tests/tests.h index fdaa719669d..09604829b3c 100644 --- a/fastos/src/tests/tests.h +++ b/fastos/src/tests/tests.h @@ -11,12 +11,14 @@ private: BaseTest &operator=(const BaseTest&); int totallen; + bool _allOkFlag; public: const char *okString; const char *failString; BaseTest () : totallen(70), + _allOkFlag(true), okString("SUCCESS"), failString("FAILURE") { @@ -24,6 +26,8 @@ public: virtual ~BaseTest() {}; + bool allWasOk() const { return _allOkFlag; } + void PrintSeparator () { for(int i=0; i<totallen; i++) printf("-"); @@ -32,7 +36,7 @@ public: virtual void PrintProgress (char *string) { - printf(string); + printf("%s", string); } #define MAX_STR_LEN 3000 bool Progress (bool result, const char *str) @@ -41,6 +45,7 @@ public: sprintf(string, "%s: %s\n", result ? okString : failString, str); PrintProgress(string); + if (! result) { _allOkFlag = false; } return result; } @@ -51,6 +56,7 @@ public: sprintf(&string[strlen(string)], str, d1); sprintf(&string[strlen(string)], "\n"); PrintProgress(string); + if (! result) { _allOkFlag = false; } return result; } @@ -61,6 +67,7 @@ public: sprintf(&string[strlen(string)], str, d1, d2); sprintf(&string[strlen(string)], "\n"); PrintProgress(string); + if (! result) { _allOkFlag = false; } return result; } @@ -71,6 +78,7 @@ public: sprintf(&string[strlen(string)], str, s1); sprintf(&string[strlen(string)], "\n"); PrintProgress(string); + if (! result) { _allOkFlag = false; } return result; } @@ -81,6 +89,7 @@ public: sprintf(&string[strlen(string)], str, s1); sprintf(&string[strlen(string)], "\n"); PrintProgress(string); + if (! result) { _allOkFlag = false; } return result; } @@ -91,6 +100,7 @@ public: sprintf(&string[strlen(string)], str, s1); sprintf(&string[strlen(string)], "\n"); PrintProgress(string); + if (! result) { _allOkFlag = false; } return result; } @@ -101,6 +111,7 @@ public: sprintf(&string[strlen(string)], str, s1, s2); sprintf(&string[strlen(string)], "\n"); PrintProgress(string); + if (! result) { _allOkFlag = false; } return result; } @@ -111,6 +122,7 @@ public: sprintf(&string[strlen(string)], str, s1, d1); sprintf(&string[strlen(string)], "\n"); PrintProgress(string); + if (! result) { _allOkFlag = false; } return result; } @@ -121,6 +133,7 @@ public: sprintf(&string[strlen(string)], str, d1, s1); sprintf(&string[strlen(string)], "\n"); PrintProgress(string); + if (! result) { _allOkFlag = false; } return result; } @@ -131,6 +144,7 @@ public: sprintf(&string[strlen(string)], str, val); sprintf(&string[strlen(string)], "\n"); PrintProgress(string); + if (! result) { _allOkFlag = false; } return result; } @@ -141,6 +155,7 @@ public: sprintf(&string[strlen(string)], str, val); sprintf(&string[strlen(string)], "\n"); PrintProgress(string); + if (! result) { _allOkFlag = false; } return result; } @@ -165,7 +180,7 @@ public: for(i=0; i<totallen; i++) printf("*"); printf("\n**"); for(i=0; i<leftspace; i++) printf(" "); //forgot printf-specifier.. - printf(string); + printf("%s", string); for(i=0; i<rightspace; i++) printf(" "); printf("**\n"); for(i=0; i<totallen; i++) printf("*"); |