*
*/
-#include <config.h>
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
#include <libtest/collection.h>
#include <libtest/signal.h>
+#include <algorithm>
#include <fnmatch.h>
#include <iostream>
namespace libtest {
-Framework::Framework(libtest::SignalThread& signal,
+Framework::Framework(libtest::SignalThread& signal_,
const std::string& name_,
const std::string& only_run_arg,
const std::string& wildcard_arg) :
_runner(NULL),
_socket(false),
_creators_ptr(NULL),
- _signal(signal),
+ _signal(signal_),
_only_run(only_run_arg),
_wildcard(wildcard_arg),
_name(name_)
get_world(this);
}
-void Framework::collections(collection_st* collections_)
+void Framework::collections(collection_st collections_[])
{
for (collection_st *next= collections_; next and next->name; next++)
{
delete _runner;
- for (std::vector<Collection*>::iterator iter= _collection.begin();
- iter != _collection.end();
- ++iter)
- {
- delete *iter;
- }
+ std::for_each(_collection.begin(), _collection.end(), DeleteFromVector());
+ _collection.clear();
}
bool Framework::match(const char* arg)
_total++;
- try
- {
+ try {
switch ((*iter)->exec())
{
case TEST_FAILURE:
break;
}
}
- catch (libtest::fatal& e)
+ catch (const libtest::fatal& e)
{
_failed++;
- stream::cerr(e.file(), e.line(), e.func()) << e.mesg();
+ stream::cerr(e.file(), e.line(), e.func()) << e.what();
}
- catch (libtest::disconnected& e)
+ catch (const libtest::disconnected& e)
{
_failed++;
- stream::cerr(e.file(), e.line(), e.func()) << "Unhandled disconnection occurred: " << e.mesg();
+ Error << "Unhandled disconnection occurred:" << e.what();
throw;
}
catch (...)