Update libtest.

[m6w6/libmemcached] / libtest / framework.h

diff --git a/libtest/framework.h b/libtest/framework.h
index 1c9a1c1d5ff2e2dc1eabdb26fbcc8c0c129f51d2..45cd6533c1f78fb413617aab8c62cbf69221b655 100644 (file)
--- 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,125 +34,137 @@
  *
  */
 
-
 #pragma once
 
+#include <libtest/signal.h>
+
 /**
   Framework is the structure which is passed to the test implementation to be filled.
   This must be implemented in order for the test framework to load the tests. We call
   get_world() in order to fill this structure.
 */
 
-struct Framework {
+#include <vector>
+
+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:
+  test_return_t create();
 
-  /* 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;
+  void exec();
+
+  libtest::Collection& collection();
 
-  Framework();
+  Framework(libtest::SignalThread&, const std::string&);
 
   virtual ~Framework();
 
-  Framework(const Framework&);
+  Framework(libtest::SignalThread&,
+            const std::string&,
+            const std::string&);
+
+  bool match(const char* arg);
+
+  void *creators_ptr()
+  {
+    return _creators_ptr;
+  }
+
+  libtest::SignalThread& signal()
+  {
+    return _signal;
+  }
+
+  uint32_t sum_total();
+  uint32_t sum_success();
+  uint32_t sum_skipped();
+  uint32_t sum_failed();
+
+  size_t size() 
+  {
+    return _collection.size();
+  }
+
+  uint32_t total() const
+  {
+    return _total;
+  }
+
+  uint32_t success() const
+  {
+    return _success;
+  }
+
+  uint32_t skipped() const
+  {
+    return _skipped;
+  }
+
+  uint32_t failed() const
+  {
+    return _failed;
+  }
 
 private:
   Framework& operator=(const Framework&);
+
+  uint32_t _total;
+  uint32_t _success;
+  uint32_t _skipped;
+  uint32_t _failed;
+
+  libtest::server_startup_st _servers;
+  bool _socket;
   void *_creators_ptr;
+  unsigned long int _servers_to_run;
+  std::vector<libtest::Collection*> _collection;
+  libtest::SignalThread& _signal;
+  std::string _only_run;
+  std::string _wildcard;
 };