X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fframework.cc;h=b9d817b5ab457e9d01178312941a5f56b036046f;hb=5deca7af238185cfb53be80909b45ed807282b26;hp=baff4b8a22922c5300a89732e0963c2c0720a8ce;hpb=28602fd2f5f1c758b50cd82d4545da8e6c55f5c7;p=m6w6%2Flibmemcached

diff --git a/libtest/framework.cc b/libtest/framework.cc
index baff4b8a..b9d817b5 100644
--- a/libtest/framework.cc
+++ b/libtest/framework.cc
@@ -1,62 +1,37 @@
 /*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
  * 
- *  uTest, libtest
+ *  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:
+ *  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.
  *
- *      * 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.
+ *  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)
 {
 }
@@ -69,71 +44,19 @@ Framework::~Framework()
   }
 
   _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)
-{
-  if (run->requires_flush and _flush)
-  {
-    return _flush(arg);
-  }
-
-  return TEST_SUCCESS;
+  delete _runner;
 }
 
-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)