Simplify test

This commit is contained in:
Carsten Larsen 2017-01-11 19:35:58 +01:00
parent e83f879211
commit 41ae34644d
2 changed files with 11 additions and 12 deletions

View File

@ -35,22 +35,26 @@
TestProgram::TestProgram() TestProgram::TestProgram()
: Program() : Program()
{ } {
// Ignore type of locale fraction point.
delete Input;
Input = new DecimalSystem(Preferences->GetDigits(), '.');
delete Output;
Output = new DecimalSystem(Preferences->GetDigits(), '.');
}
TestProgram::~TestProgram() TestProgram::~TestProgram()
{ } { }
void TestProgram::Run() void TestProgram::Run()
{ {
debug = true;
RunTests(); RunTests();
if (fail == 0) { if (fail == 0) {
printf("All tests passed (%i)." NEWLINE, pass); printf("All tests passed (%i)." NEWLINE, pass);
} else { } else {
printf("Something went wrong ..." NEWLINE); printf("Something went wrong ..." NEWLINE);
debug = true;
RunTests();
printf("Passed: %i, failed: %i" NEWLINE, pass, fail); printf("Passed: %i, failed: %i" NEWLINE, pass, fail);
} }
} }
@ -98,14 +102,10 @@ void TestProgram::PerformTest(const char* input, const char* result, bool show)
if (buf->Is(result)) { if (buf->Is(result)) {
pass++; pass++;
if (debug) { printf("PASS: [%s]" NEWLINE, show ? result : input);
printf("PASS: %s" NEWLINE, show ? result : input);
}
} else { } else {
fail++; fail++;
if (debug) { printf("FAIL: [%s] expected [%s] but got [%s]" NEWLINE, input, result, buf->GetString());
printf("FAIL: %s Expected |%s| Got |%s|" NEWLINE, input, result, buf->GetString());
}
} }
delete buf; delete buf;
@ -200,7 +200,7 @@ void TestProgram::RunTestset2()
TestExpression("coth(0.56)", "coth(0.56) = 1.9685913885883"); TestExpression("coth(0.56)", "coth(0.56) = 1.9685913885883");
TestExpression("sech(0.56)", "sech(0.56) = 0.86137037775075"); TestExpression("sech(0.56)", "sech(0.56) = 0.86137037775075");
TestExpression("csch(0.56)", "csch(0.56) = 1.6956863080252"); TestExpression("csch(0.56)", "csch(0.56) = 1.6956863080252");
TestExpression("arccosh(1.45)", "acosh(1.45) = 0.91629073187416"); TestExpression("arccosh(1.44)", "acosh(1.44) = 0.90670360498911");
TestExpression("arcsinh(0.45)", "asinh(0.45) = 0.43604966885174"); TestExpression("arcsinh(0.45)", "asinh(0.45) = 0.43604966885174");
TestExpression("arctanh(0.45)", "atanh(0.45) = 0.48470027859405"); TestExpression("arctanh(0.45)", "atanh(0.45) = 0.48470027859405");
TestExpression("arccoth(1.51)", "acoth(1.51) = 0.79681365320373"); TestExpression("arccoth(1.51)", "acoth(1.51) = 0.79681365320373");

View File

@ -50,7 +50,6 @@ public:
private: private:
int pass; int pass;
int fail; int fail;
bool debug;
void RunTests(); void RunTests();
void RunTestset1(); void RunTestset1();