#include <libtest/collection.h>
#include <libtest/signal.h>
+#include <fnmatch.h>
#include <iostream>
using namespace libtest;
Framework::Framework(libtest::SignalThread& signal,
const std::string& only_run_arg,
const std::string& wildcard_arg) :
- collections(NULL),
+ _collections(NULL),
_total(0),
_success(0),
_skipped(0),
_failed(0),
_create(NULL),
_destroy(NULL),
+ _on_error(NULL),
_runner(NULL),
_socket(false),
_creators_ptr(NULL),
{
get_world(this);
- for (collection_st *next= collections; next and next->name; next++)
+ for (collection_st *next= _collections; next and next->name; next++)
{
_collection.push_back(new Collection(this, next));
}
for (std::vector<Collection*>::iterator iter= _collection.begin();
iter != _collection.end();
- iter++)
+ ++iter)
{
delete *iter;
}
{
for (std::vector<Collection*>::iterator iter= _collection.begin();
iter != _collection.end() and (_signal.is_shutdown() == false);
- iter++)
+ ++iter)
{
if (_only_run.empty() == false and
fnmatch(_only_run.c_str(), (*iter)->name(), 0))
}
catch (libtest::fatal& e)
{
+ _failed++;
stream::cerr(e.file(), e.line(), e.func()) << e.mesg();
}
catch (libtest::disconnected& e)
{
+ _failed++;
Error << "Unhandled disconnection occurred:" << e.what();
throw;
}
+ catch (...)
+ {
+ _failed++;
+ throw;
+ }
Outn();
}
uint32_t count= 0;
for (std::vector<Collection*>::iterator iter= _collection.begin();
iter != _collection.end();
- iter++)
+ ++iter)
{
count+= (*iter)->total();
}
uint32_t count= 0;
for (std::vector<Collection*>::iterator iter= _collection.begin();
iter != _collection.end();
- iter++)
+ ++iter)
{
count+= (*iter)->success();
}
uint32_t count= 0;
for (std::vector<Collection*>::iterator iter= _collection.begin();
iter != _collection.end();
- iter++)
+ ++iter)
{
count+= (*iter)->skipped();
}
uint32_t count= 0;
for (std::vector<Collection*>::iterator iter= _collection.begin();
iter != _collection.end();
- iter++)
+ ++iter)
{
count+= (*iter)->failed();
}