X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fframework.cc;h=969186642cbdaac4b07a5a1956c16307e59e0e14;hb=0302d893ad986b16a186b8b145c08e8599e3804a;hp=eedbd5800f0fda3ce3e0d2f2b88789365e9475df;hpb=7abcaebdc4c3dd11b779eaef58a7371fb82ae888;p=m6w6%2Flibmemcached

diff --git a/libtest/framework.cc b/libtest/framework.cc
index eedbd580..96918664 100644
--- a/libtest/framework.cc
+++ b/libtest/framework.cc
@@ -1,16 +1,78 @@
-/* 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>
+
+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)
+{
+}
+
+Framework::~Framework()
+{
+  if (_destroy and _destroy(_creators_ptr))
+  {
+    Error << "Failure in _destroy(), some resources may not have been cleaned up.";
+  }
+
+  _servers.shutdown();
+}
 
-test_return_t Framework::destroy(void* arg)
+test_return_t Framework::Item::pre(void *arg)
 {
-  if (_destroy)
+  if (pre_run)
   {
-    return _destroy(arg);
+    return pre_run(arg);
+  }
+
+  return TEST_SUCCESS;
+}
+
+test_return_t Framework::Item::post(void *arg)
+{
+  if (post_run)
+  {
+    return post_run(arg);
   }
 
   return TEST_SUCCESS;
@@ -56,13 +118,24 @@ test_return_t Framework::Item::startup(void* arg)
   return TEST_SUCCESS;
 }
 
-void* Framework::create(test_return_t* arg)
+libtest::Runner *Framework::runner()
+{
+  if (_runner == NULL)
+  {
+    _runner= &defualt_runners;
+  }
+  _runner->set_servers(_servers);
+
+  return _runner;
+}
+
+void* Framework::create(test_return_t& arg)
 {
+  arg= TEST_SUCCESS;
   if (_create)
   {
-    return _create(arg);
+    return _creators_ptr= _create(_servers, arg);
   }
 
   return NULL;
 }
-