#include <algorithm>
#include <fstream>
#include <iostream>
-
+#include <ostream>
+
namespace libtest {
std::string& escape4XML(std::string const& arg, std::string& escaped_string)
void Formatter::skipped()
{
+ assert(current());
current()->result(TEST_SKIPPED);
- Out << name() << "."
- << current()->name()
- << "\t\t\t\t\t"
- << "[ " << test_strerror(current()->result()) << " ]";
+
+ Out
+ << "[ " << test_strerror(current()->result()) << " ]"
+ << "\t\t"
+ << name() << "." << current()->name()
+ ;
reset();
}
assert(current());
current()->result(TEST_FAILURE);
- Out << name()
- << "." << current()->name() << "\t\t\t\t\t"
- << "[ " << test_strerror(current()->result()) << " ]";
+ Out
+ << "[ " << test_strerror(current()->result()) << " ]"
+ << "\t\t"
+ << name() << "." << current()->name()
+ ;
reset();
}
{
assert(current());
current()->result(TEST_SUCCESS, timer_);
- std::string escaped_string;
- Out << name() << "."
- << current()->name()
- << "\t\t\t\t\t"
- << current()->timer()
- << " [ " << test_strerror(current()->result()) << " ]";
+ Out
+ << "[ " << test_strerror(current()->result()) << " ]"
+ << "\t"
+ << current()->timer()
+ << "\t"
+ << name() << "." << current()->name()
+ ;
reset();
}
assert(_suite_name.empty() == false);
TestCase* _current_testcase= new TestCase(arg);
_testcases.push_back(_current_testcase);
+
+ assert(current());
+
+ Echo
+ << "\t\t\t"
+ << name() << "." << current()->name()
+ << "... \r"
+ ;
}
void Formatter::reset()