X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fframework.h;h=c7341a725848e3ad98a0c9da86f527a11e65276c;hb=1878fe9b40ecc0dee1962eeedd9e8696cb25e9a2;hp=7a58cbeeb94cef276c424af3f94a304772ee651c;hpb=ecc7382f48857cb22e74ffa9496f9a31e956bde3;p=m6w6%2Flibmemcached

diff --git a/libtest/framework.h b/libtest/framework.h
index 7a58cbee..c7341a72 100644
--- a/libtest/framework.h
+++ b/libtest/framework.h
@@ -1,9 +1,26 @@
-/* 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
  */
 
+
+
 #pragma once
 
 /**
@@ -12,33 +29,30 @@
   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;
-
-  void* create(test_return_t* arg)
-  {
-    if (_create)
-    {
-      return _create(arg);
-    }
-
-    return NULL;
-  }
-
-  test_return_t destroy(void*);
+  test_callback_destroy_fn *_destroy;
 
   /* This is called a the beginning of any collection run. */
   test_callback_fn *collection_startup;
 
-  test_return_t startup(void*);
-
   /* 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)
@@ -53,7 +67,8 @@ struct Framework {
     These are run before/after the test. If implemented. Their execution is not controlled
     by the test.
   */
-  struct Item {
+  class Item {
+  public:
     /* This is called a the beginning of any run. */
     test_callback_fn *_startup;
 
@@ -65,12 +80,15 @@ struct Framework {
     */
     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),
@@ -78,38 +96,35 @@ struct Framework {
       post_run(NULL)
     { }
 
-    test_return_t flush(void* arg, test_st* run);
-
-    void set_pre(test_callback_fn *arg)
+    void set_startup(test_callback_fn *arg)
     {
-      pre_run= arg;
+      _startup= arg;
     }
 
-    void set_post(test_callback_fn *arg)
+    void set_collection(test_callback_fn *arg)
     {
-      pre_run= arg;
+      _flush= arg;
     }
 
-    test_return_t pre(void *arg)
+    void set_flush(test_callback_fn *arg)
     {
-      if (pre_run)
-      {
-        return pre_run(arg);
-      }
-
-      return TEST_SUCCESS;
+      _flush= arg;
     }
 
-    test_return_t post(void *arg)
+    void set_pre(test_callback_fn *arg)
     {
-      if (post_run)
-      {
-        return post_run(arg);
-      }
+      pre_run= arg;
+    }
 
-      return TEST_SUCCESS;
+    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;
 
   /**
@@ -117,21 +132,52 @@ struct Framework {
   */
   test_callback_error_fn *_on_error;
 
+  void set_on_error(test_callback_error_fn *arg)
+  {
+    _on_error= arg;
+  }
+
   test_return_t on_error(const enum test_return_t, void *);
 
+  void set_socket()
+  {
+    _servers.set_socket();
+  }
+
+  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;
+  }
+  
   /**
     Runner represents the callers for the tests. If not implemented we will use
     a set of default implementations.
   */
-  Runner *runner;
+  libtest::Runner *_runner;
+
+  void set_runner(libtest::Runner *arg)
+  {
+    _runner= arg;
+  }
+
+  libtest::Runner *runner();
+
 
   Framework();
 
-  virtual ~Framework()
-  { }
+  virtual ~Framework();
 
   Framework(const Framework&);
 
 private:
   Framework& operator=(const Framework&);
+  libtest::server_startup_st _servers;
+  bool _socket;
+  void *_creators_ptr;
+  unsigned long int _servers_to_run;
 };