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

diff --git a/libtest/framework.h b/libtest/framework.h
index 087268cc..00959c18 100644
--- a/libtest/framework.h
+++ b/libtest/framework.h
@@ -1,8 +1,8 @@
 /*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  uTest, libtest
  *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  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
@@ -34,7 +34,6 @@
  *
  */
 
-
 #pragma once
 
 /**
@@ -51,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.
   */
@@ -157,6 +69,16 @@ public:
   {
     _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
@@ -183,4 +105,5 @@ private:
   libtest::server_startup_st _servers;
   bool _socket;
   void *_creators_ptr;
+  unsigned long int _servers_to_run;
 };