using namespace libtest;
-static test_return_t _default_callback(void *p)
-{
- (void)p;
-
- return TEST_SUCCESS;
-}
-
-static Runner defualt_runners;
-
Framework::Framework() :
collections(NULL),
_create(NULL),
_destroy(NULL),
- collection_startup(_default_callback),
- collection_shutdown(_default_callback),
- _on_error(NULL),
_runner(NULL),
_socket(false),
_creators_ptr(NULL)
}
_servers.shutdown();
-}
-
-test_return_t Framework::Item::pre(void *arg)
-{
- if (pre_run)
- {
- return pre_run(arg);
- }
- return TEST_SUCCESS;
+ delete _runner;
}
-test_return_t Framework::Item::post(void *arg)
-{
- if (post_run)
- {
- return post_run(arg);
- }
-
- return TEST_SUCCESS;
-}
-
-test_return_t Framework::Item::flush(void* arg, test_st* run)
-{
- if (run->requires_flush and _flush)
- {
- return _flush(arg);
- }
-
- return TEST_SUCCESS;
-}
-
-test_return_t Framework::on_error(const test_return_t rc, void* arg)
-{
- if (_on_error and test_failed(_on_error(rc, arg)))
- {
- return TEST_FAILURE;
- }
-
- return TEST_SUCCESS;
-}
-
-test_return_t Framework::startup(void* arg)
-{
- if (collection_startup)
- {
- return collection_startup(arg);
- }
-
- return TEST_SUCCESS;
-}
-
-test_return_t Framework::Item::startup(void* arg)
+libtest::Runner *Framework::runner()
{
- if (_startup)
+ if (_runner == NULL)
{
- return _startup(arg);
+ _runner= new Runner;
}
+ _runner->set_servers(_servers);
- return TEST_SUCCESS;
-}
-
-libtest::Runner *Framework::runner()
-{
- return _runner ? _runner : &defualt_runners;
+ return _runner;
}
void* Framework::create(test_return_t& arg)