X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fframework.cc;h=55881b189b7d99bbe665d01a8e2fb355a68b11f3;hb=a75ccc958c9407f482708d1a491e4bf6054d6998;hp=baff4b8a22922c5300a89732e0963c2c0720a8ce;hpb=c87f1a554cce74ac1ba3d4e7e9c2a1d2904e4766;p=m6w6%2Flibmemcached

diff --git a/libtest/framework.cc b/libtest/framework.cc
index baff4b8a..55881b18 100644
--- a/libtest/framework.cc
+++ b/libtest/framework.cc
@@ -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,31 +34,40 @@
  *
  */
 
+#include <config.h>
 
 #include <libtest/common.h>
+#include <libtest/collection.h>
+#include <libtest/signal.h>
+
+#include <fnmatch.h>
 #include <iostream>
 
 using namespace libtest;
 
-static test_return_t _default_callback(void *p)
-{
-  (void)p;
-
-  return TEST_SUCCESS;
-}
-
-static Runner defualt_runners;
-
-Framework::Framework() :
+Framework::Framework(libtest::SignalThread& signal,
+                     const std::string& only_run_arg,
+                     const std::string& wildcard_arg) :
   collections(NULL),
+  _total(0),
+  _success(0),
+  _skipped(0),
+  _failed(0),
   _create(NULL),
   _destroy(NULL),
-  collection_startup(_default_callback),
-  collection_shutdown(_default_callback),
-  _on_error(NULL),
   _runner(NULL),
-  _creators_ptr(NULL)
+  _socket(false),
+  _creators_ptr(NULL),
+  _signal(signal),
+  _only_run(only_run_arg),
+  _wildcard(wildcard_arg)
 {
+  get_world(this);
+
+  for (collection_st *next= collections; next and next->name; next++)
+  {
+    _collection.push_back(new Collection(this, next));
+  }
 }
 
 Framework::~Framework()
@@ -69,80 +78,143 @@ Framework::~Framework()
   }
 
   _servers.shutdown();
+
+  delete _runner;
+
+  for (std::vector<Collection*>::iterator iter= _collection.begin();
+       iter != _collection.end();
+       iter++)
+  {
+    delete *iter;
+  }
 }
 
-test_return_t Framework::Item::pre(void *arg)
+bool Framework::match(const char* arg)
 {
-  if (pre_run)
+  if (_wildcard.empty() == false and fnmatch(_wildcard.c_str(), arg, 0))
   {
-    return pre_run(arg);
+    return true;
   }
 
-  return TEST_SUCCESS;
+  return false;
 }
 
-test_return_t Framework::Item::post(void *arg)
+void Framework::exec()
 {
-  if (post_run)
+  for (std::vector<Collection*>::iterator iter= _collection.begin();
+       iter != _collection.end() and (_signal.is_shutdown() == false);
+       iter++)
   {
-    return post_run(arg);
+    if (_only_run.empty() == false and
+        fnmatch(_only_run.c_str(), (*iter)->name(), 0))
+    {
+      continue;
+    }
+
+    _total++;
+
+    try {
+      switch ((*iter)->exec())
+      {
+      case TEST_FAILURE:
+        _failed++;
+        break;
+
+      case TEST_SKIPPED:
+        _skipped++;
+        break;
+
+        // exec() can return SUCCESS, but that doesn't mean that some tests did
+        // not fail or get skipped.
+      case TEST_SUCCESS:
+        _success++;
+        break;
+      }
+    }
+    catch (libtest::fatal& e)
+    {
+      stream::cerr(e.file(), e.line(), e.func()) << e.mesg();
+    }
+    catch (libtest::disconnected& e)
+    {
+      Error << "Unhandled disconnection occurred:" << e.what();
+      throw;
+    }
+
+    Outn();
   }
-
-  return TEST_SUCCESS;
 }
 
-test_return_t Framework::Item::flush(void* arg, test_st* run)
+uint32_t Framework::sum_total()
 {
-  if (run->requires_flush and _flush)
+  uint32_t count= 0;
+  for (std::vector<Collection*>::iterator iter= _collection.begin();
+       iter != _collection.end();
+       iter++)
   {
-    return _flush(arg);
+    count+= (*iter)->total();
   }
 
-  return TEST_SUCCESS;
+  return count;
 }
 
-test_return_t Framework::on_error(const test_return_t rc, void* arg)
+uint32_t Framework::sum_success()
 {
-  if (_on_error and test_failed(_on_error(rc, arg)))
+  uint32_t count= 0;
+  for (std::vector<Collection*>::iterator iter= _collection.begin();
+       iter != _collection.end();
+       iter++)
   {
-    return TEST_FAILURE;
+    count+= (*iter)->success();
   }
 
-  return TEST_SUCCESS;
+  return count;
 }
 
-test_return_t Framework::startup(void* arg)
+uint32_t Framework::sum_skipped()
 {
-  if (collection_startup)
+  uint32_t count= 0;
+  for (std::vector<Collection*>::iterator iter= _collection.begin();
+       iter != _collection.end();
+       iter++)
   {
-    return collection_startup(arg);
+    count+= (*iter)->skipped();
   }
 
-  return TEST_SUCCESS;
+  return count;
 }
 
-test_return_t Framework::Item::startup(void* arg)
+uint32_t Framework::sum_failed()
 {
-  if (_startup)
+  uint32_t count= 0;
+  for (std::vector<Collection*>::iterator iter= _collection.begin();
+       iter != _collection.end();
+       iter++)
   {
-    return _startup(arg);
+    count+= (*iter)->failed();
   }
 
-  return TEST_SUCCESS;
+  return count;
 }
 
 libtest::Runner *Framework::runner()
 {
-  return _runner ? _runner : &defualt_runners;
+  if (_runner == NULL)
+  {
+    _runner= new Runner;
+  }
+  _runner->set_servers(_servers);
+
+  return _runner;
 }
 
-void* Framework::create(test_return_t& arg)
+test_return_t Framework::create()
 {
-  arg= TEST_SUCCESS;
+  test_return_t rc= TEST_SUCCESS;
   if (_create)
   {
-    return _creators_ptr= _create(_servers, arg);
+    _creators_ptr= _create(_servers, rc);
   }
 
-  return NULL;
+  return rc;
 }