X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fframework.h;h=00959c1829e457fb3518648b2c5c4c6c28c1e1a1;hb=47f45992107361ad58c170bdf78fdc92523fab06;hp=c5ca7a1bf7da945f2ccfcc634de785e309c958c0;hpb=f0ec3e2ffaf483bbd1329e8c6aba37f729e6df4f;p=m6w6%2Flibmemcached

diff --git a/libtest/framework.h b/libtest/framework.h
index c5ca7a1b..00959c18 100644
--- a/libtest/framework.h
+++ b/libtest/framework.h
@@ -1,26 +1,39 @@
 /*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  libtest
  *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  Data Differential YATL (i.e. libtest)  library
  *
- *  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.
+ *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
  *
- *  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.
+ *  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.
  *
- *  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
  */
 
-
-
 #pragma once
 
 /**
@@ -37,96 +50,9 @@ public:
   test_callback_create_fn *_create;
   test_callback_destroy_fn *_destroy;
 
-  /* This is called a the beginning of any collection run. */
-  test_callback_fn *collection_startup;
-
-  /* This is called a the end of any collection run. */
-  test_callback_fn *collection_shutdown;
-
-  void set_collection_shutdown(test_callback_error_fn *arg)
-  {
-    _on_error= arg;
-  }
-
 public:
   void* create(test_return_t& arg);
 
-  test_return_t startup(void*);
-
-  test_return_t shutdown(void* arg)
-  {
-    if (collection_shutdown)
-    {
-      return collection_shutdown(arg);
-    }
-
-    return TEST_SUCCESS;
-  }
-
-  /**
-    These are run before/after the test. If implemented. Their execution is not controlled
-    by the test.
-  */
-  class Item {
-  public:
-    /* This is called a the beginning of any run. */
-    test_callback_fn *_startup;
-
-    test_return_t startup(void*);
-
-    /* 
-      This called on a test if the test requires a flush call (the bool is
-      from test_st) 
-    */
-    test_callback_fn *_flush;
-
-  private:
-    /*
-       Run before and after the runnner is executed.
-    */
-    test_callback_fn *pre_run;
-    test_callback_fn *post_run;
-
-  public:
-
-    Item() :
-      _startup(NULL),
-      _flush(NULL),
-      pre_run(NULL),
-      post_run(NULL)
-    { }
-
-    void set_startup(test_callback_fn *arg)
-    {
-      _startup= arg;
-    }
-
-    void set_collection(test_callback_fn *arg)
-    {
-      _flush= arg;
-    }
-
-    void set_flush(test_callback_fn *arg)
-    {
-      _flush= arg;
-    }
-
-    void set_pre(test_callback_fn *arg)
-    {
-      pre_run= arg;
-    }
-
-    void set_post(test_callback_fn *arg)
-    {
-      pre_run= arg;
-    }
-
-    test_return_t pre(void *arg);
-    test_return_t flush(void* arg, test_st* run);
-    test_return_t post(void *arg);
-
-  } item;
-
   /**
     If an error occurs during the test, this is called.
   */
@@ -179,4 +105,5 @@ private:
   libtest::server_startup_st _servers;
   bool _socket;
   void *_creators_ptr;
+  unsigned long int _servers_to_run;
 };