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

diff --git a/libtest/framework.h b/libtest/framework.h
index d3b82640..00959c18 100644
--- a/libtest/framework.h
+++ b/libtest/framework.h
@@ -1,7 +1,37 @@
-/* uTest Copyright (C) 2011 Data Differential, http://datadifferential.com/
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ *  Data Differential YATL (i.e. libtest)  library
+ *
+ *  Copyright (C) 2012 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.
  */
 
 #pragma once
@@ -12,108 +42,57 @@
   get_world() in order to fill this structure.
 */
 
-struct Framework {
+class Framework {
+public:
   collection_st *collections;
 
   /* These methods are called outside of any collection call. */
   test_callback_create_fn *_create;
-  test_callback_fn *_destroy;
+  test_callback_destroy_fn *_destroy;
 
-  void* create(test_return_t* arg);
+public:
+  void* create(test_return_t& arg);
 
-  /* This is called a the beginning of any collection run. */
-  test_callback_fn *collection_startup;
+  /**
+    If an error occurs during the test, this is called.
+  */
+  test_callback_error_fn *_on_error;
 
-  test_return_t startup(void*);
+  void set_on_error(test_callback_error_fn *arg)
+  {
+    _on_error= arg;
+  }
 
-  /* This is called a the end of any collection run. */
-  test_callback_fn *collection_shutdown;
+  test_return_t on_error(const enum test_return_t, void *);
 
-  test_return_t shutdown(void* arg)
+  void set_socket()
   {
-    if (collection_shutdown)
-    {
-      return collection_shutdown(arg);
-    }
+    _servers.set_socket();
+  }
 
-    return TEST_SUCCESS;
+  void set_sasl(const std::string& username_arg, const std::string& password_arg)
+  {
+    _servers.set_sasl(username_arg, password_arg);
   }
 
+  libtest::server_startup_st& servers()
+  {
+    return _servers;
+  }
+  
   /**
-    These are run before/after the test. If implemented. Their execution is not controlled
-    by the test.
+    Runner represents the callers for the tests. If not implemented we will use
+    a set of default implementations.
   */
-  struct Item {
-    /* 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;
-
-    /*
-       Run before and after the runnner is executed.
-    */
-    test_callback_fn *pre_run;
-    test_callback_fn *post_run;
-
-    Item() :
-      _startup(NULL),
-      _flush(NULL),
-      pre_run(NULL),
-      post_run(NULL)
-    { }
-
-    test_return_t flush(void* arg, test_st* run);
-
-    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)
-    {
-      if (pre_run)
-      {
-        return pre_run(arg);
-      }
-
-      return TEST_SUCCESS;
-    }
-
-    test_return_t post(void *arg)
-    {
-      if (post_run)
-      {
-        return post_run(arg);
-      }
-
-      return TEST_SUCCESS;
-    }
-
-  } item;
+  libtest::Runner *_runner;
 
-  /**
-    If an error occurs during the test, this is called.
-  */
-  test_callback_error_fn *_on_error;
+  void set_runner(libtest::Runner *arg)
+  {
+    _runner= arg;
+  }
 
-  test_return_t on_error(const enum test_return_t, void *);
+  libtest::Runner *runner();
 
-  /**
-    Runner represents the callers for the tests. If not implemented we will use
-    a set of default implementations.
-  */
-  Runner *runner;
 
   Framework();
 
@@ -123,5 +102,8 @@ struct Framework {
 
 private:
   Framework& operator=(const Framework&);
+  libtest::server_startup_st _servers;
+  bool _socket;
   void *_creators_ptr;
+  unsigned long int _servers_to_run;
 };