Miroirs/rpn
1
0
Fork 0
mirror of https://github.com/louisrubet/rpn synced 2025-01-17 06:12:09 +01:00
Code Issues Projects Releases Packages Wiki Activity

Improve test procedure (error checking, exit cmd)

Browse source
This commit is contained in:
Louis RUBET 2014-09-05 14:36:50 +02:00
parent cdd51b9001
commit 5694f7669b
1 changed files with 53 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
src/rpn-general-core.h
View file

@ -1,11 +1,14 @@
void program::test()
{
const string test_filename = "test.txt";
ifstream test_file(test_filename.c_str());
if (test_file.is_open())
{
const string stack_size("-> stack size should be ");
const string stack_value("-> stack should be ");
const string cmd_error("-> error should be ");
const string cmd_exit("exit test");
ifstream test_file(test_filename.c_str());
if (test_file.is_open())
{
string test_title;
string entry;
ret_value ret;
@ -14,25 +17,44 @@ void program::test()
bool indicate_passed = false;
bool failed = false;
int count_tests = 0;
int last_err;
stringstream cerr_buffer;
streambuf* cerr_old_buffer;
// redirect cerr
cerr_old_buffer = cerr.rdbuf(cerr_buffer.rdbuf());
while (!test_file.eof())
{
getline(test_file, entry);
if (entry.substr(0,2)=="##")
{
// read a test section
if (indicate_passed)
{
if (g_verbose > 0)
cout << "\t";
cout << "passed " << count_tests << " tests"<< endl;
cout << entry << " .. ";
}
cout << entry;
if (g_verbose == 0)
cout << " .. ";
else
cout << endl;
indicate_passed = true;
count_tests = 0;
}
else if (entry.substr(0,1)=="#")
{
// read a test title
test_title = entry;
if (g_verbose > 0)
cout << "\t" << test_title << endl;
count_tests++;
}
else if (entry.find(stack_size, 0) == 0)
{
// check current stack size
istringstream isub;
int size;
@ -41,13 +63,14 @@ void program::test()
if (size != (int)stk.size())
{
cout<<endl<<endl<<test_title<<endl<<entry<<endl<<"FAIL, ";
cout<<"real stack size is "<<stk.size()<<endl;
cout<<"stack size is "<<stk.size()<<endl;
failed = true;
indicate_passed = false;
}
}
else if (entry.find(stack_value, 0) == 0)
{
// check current stack value
string stack_should_be = entry.substr(stack_value.size());
string stack_is;
string tmp;
@ -63,19 +86,41 @@ void program::test()
if (stack_is != stack_should_be)
{
cout<<endl<<endl<<test_title<<endl<<entry<<endl<<"FAIL, ";
cout<<"real stack is "<<stack_is<<endl;
cout<<"real stack is '"<<stack_is<<endl;
failed = true;
indicate_passed = false;
}
}
else if (entry.find(cmd_error, 0) == 0)
{
// check current error
istringstream isub;
int err_should_be;
isub.str(entry.substr(cmd_error.size()));
isub>>err_should_be;
if (err_should_be != last_err)
{
cout<<endl<<endl<<test_title<<endl<<entry<<endl<<"FAIL, ";
cout<<"last error is "<<last_err<<endl;
failed = true;
indicate_passed = false;
}
}
else if (entry.find(cmd_exit, 0) == 0)
{
// forced test end
break;
}
else if (entry.size() > 0)
{
// parse entry and run line
program prog;
ret = program::parse(entry, prog);
if (ret == ret_ok)
{
// run it
(void)prog.run(stk, hp);
last_err = (int)prog.get_err();
}
}
}
@ -83,6 +128,9 @@ void program::test()
cout << "passed " << count_tests << " tests"<< endl;
if (! failed)
cout << "test file '"<<test_filename<<"' has passed" << endl;
// cerr back
cerr.rdbuf(cerr_old_buffer);
}
else
cerr << "test file '"<<test_filename<<"' not found" << endl;