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

diff --git a/libtest/framework.cc b/libtest/framework.cc
index fab8a80a..deb9045d 100644
--- a/libtest/framework.cc
+++ b/libtest/framework.cc
@@ -1,27 +1,44 @@
-/* uTest Copyright (C) 2011 Data Differential, http://datadifferential.com/
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  uTest, libtest
+ *
+ *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *  copyright notice, this list of conditions and the following disclaimer
+ *  in the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * Use and distribution licensed under the BSD license.  See
- * the COPYING file in the parent directory for full text.
  */
 
+
 #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
-};
+using namespace libtest;
 
 static test_return_t _default_callback(void *p)
 {
@@ -30,6 +47,8 @@ static test_return_t _default_callback(void *p)
   return TEST_SUCCESS;
 }
 
+static Runner defualt_runners;
+
 Framework::Framework() :
   collections(NULL),
   _create(NULL),
@@ -37,20 +56,40 @@ Framework::Framework() :
   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 (_destroy and _destroy(_creators_ptr))
   {
-    if (test_failed(_destroy(_creators_ptr)))
-    {
-      std::cerr << "Failure in _destroy(), some resources may not have been cleaned up." << std::endl;
-    }
+    Error << "Failure in _destroy(), some resources may not have been cleaned up.";
   }
+
+  _servers.shutdown();
+}
+
+test_return_t Framework::Item::pre(void *arg)
+{
+  if (pre_run)
+  {
+    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;
 }
 
 test_return_t Framework::Item::flush(void* arg, test_st* run)
@@ -93,12 +132,17 @@ test_return_t Framework::Item::startup(void* arg)
   return TEST_SUCCESS;
 }
 
+libtest::Runner *Framework::runner()
+{
+  return _runner ? _runner : &defualt_runners;
+}
+
 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;