X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Frunner.h;h=627a0a8ef50228cff23fa1e648f5f9f4749cdbbf;hb=c3472bb8e7417a272f8c76c5a1316e3370adc941;hp=71b18d9f443f529577857a071d73e7a3a23c61f8;hpb=9139975f5fe7895259645117b1e0e9a6cb9c27cc;p=awesomized%2Flibmemcached

diff --git a/libtest/runner.h b/libtest/runner.h
index 71b18d9f..627a0a8e 100644
--- a/libtest/runner.h
+++ b/libtest/runner.h
@@ -45,27 +45,29 @@ namespace libtest {
 */
 class Runner {
 public:
-  virtual test_return_t flush(void*);
-  virtual test_return_t run(test_callback_fn* func, void *object);
-  virtual test_return_t pre(test_callback_fn* func, void *object);
-  virtual test_return_t post(test_callback_fn* func, void *object);
+  test_return_t main(test_callback_fn* func, void *object);
+  test_return_t setup(test_callback_fn* func, void *object);
+  test_return_t teardown(test_callback_fn* func, void *object);
 
   Runner();
 
-  void set_servers(libtest::server_startup_st& arg)
-  {
-    _servers= &arg;
-  }
+  void set_servers(libtest::server_startup_st& arg);
 
-  bool check()
-  {
-    return _servers ? _servers->check() : true;
-  }
+  bool check();
 
   virtual ~Runner() { }
 
+  virtual test_return_t flush(void*);
+  virtual test_return_t run(test_callback_fn* func, void *object);
+  virtual test_return_t pre(test_callback_fn* func, void *object);
+  virtual test_return_t post(test_callback_fn* func, void *object);
+
 private:
   libtest::server_startup_st* _servers;
+
+private:
+  Runner( const Runner& );
+  const Runner& operator=( const Runner& );
 };
 
 } // namespace Runner