X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fframework.cc;h=b9d817b5ab457e9d01178312941a5f56b036046f;hb=687c311bc11a24b61c15eb9f5c081a97e8501df0;hp=fab8a80aea1795086d5863e9d45b02a3bdbb8b14;hpb=46ce3491f10a4cdd069e17c2b1cf598ba367a9f0;p=m6w6%2Flibmemcached

diff --git a/libtest/framework.cc b/libtest/framework.cc
index fab8a80a..b9d817b5 100644
--- a/libtest/framework.cc
+++ b/libtest/framework.cc
@@ -1,96 +1,62 @@
-/* uTest Copyright (C) 2011 Data Differential, http://datadifferential.com/
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  libtest
  *
- * Use and distribution licensed under the BSD license.  See
- * the COPYING file in the parent directory for full text.
+ *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 3 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+
+#include <config.h>
 #include <libtest/common.h>
 #include <iostream>
 
-static test_return_t _runner_default(test_callback_fn func, void *p)
-{
-  if (func)
-  {
-    return func(p);
-  }
-
-  return TEST_SUCCESS;
-}
-
-static Runner defualt_runners= {
-  _runner_default,
-  _runner_default,
-  _runner_default
-};
-
-static test_return_t _default_callback(void *p)
-{
-  (void)p;
-
-  return TEST_SUCCESS;
-}
+using namespace libtest;
 
 Framework::Framework() :
   collections(NULL),
   _create(NULL),
   _destroy(NULL),
-  collection_startup(_default_callback),
-  collection_shutdown(_default_callback),
-  _on_error(NULL),
-  runner(&defualt_runners),
+  _runner(NULL),
+  _socket(false),
   _creators_ptr(NULL)
 {
 }
 
 Framework::~Framework()
 {
-  if (_destroy)
-  {
-    if (test_failed(_destroy(_creators_ptr)))
-    {
-      std::cerr << "Failure in _destroy(), some resources may not have been cleaned up." << std::endl;
-    }
-  }
-}
-
-test_return_t Framework::Item::flush(void* arg, test_st* run)
-{
-  if (run->requires_flush and _flush)
+  if (_destroy and _destroy(_creators_ptr))
   {
-    return _flush(arg);
+    Error << "Failure in _destroy(), some resources may not have been cleaned up.";
   }
 
-  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);
-  }
+  _servers.shutdown();
 
-  return TEST_SUCCESS;
+  delete _runner;
 }
 
-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;
+  return _runner;
 }
 
 void* Framework::create(test_return_t& arg)
@@ -98,7 +64,7 @@ void* Framework::create(test_return_t& arg)
   arg= TEST_SUCCESS;
   if (_create)
   {
-    return _creators_ptr= _create(&arg);
+    return _creators_ptr= _create(_servers, arg);
   }
 
   return NULL;