X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fframework.cc;h=6cca8450abcbcffbc4a7672518acb96a668c0f0f;hb=f154f10002fe127f9defcf5f70f9654c2816b965;hp=daea4f4ebfa339edd0d88f3847fe30e5dfbcc999;hpb=25efe3485198149616820ab4e52d2f18f0abe5a7;p=awesomized%2Flibmemcached

diff --git a/libtest/framework.cc b/libtest/framework.cc
index daea4f4e..6cca8450 100644
--- a/libtest/framework.cc
+++ b/libtest/framework.cc
@@ -43,12 +43,12 @@
 #include <fnmatch.h>
 #include <iostream>
 
-using namespace libtest;
+namespace libtest {
 
-Framework::Framework(libtest::SignalThread& signal,
+Framework::Framework(libtest::SignalThread& signal_,
+                     const std::string& name_,
                      const std::string& only_run_arg,
                      const std::string& wildcard_arg) :
-  _collections(NULL),
   _total(0),
   _success(0),
   _skipped(0),
@@ -59,13 +59,17 @@ Framework::Framework(libtest::SignalThread& signal,
   _runner(NULL),
   _socket(false),
   _creators_ptr(NULL),
-  _signal(signal),
+  _signal(signal_),
   _only_run(only_run_arg),
-  _wildcard(wildcard_arg)
+  _wildcard(wildcard_arg),
+  _name(name_)
 {
   get_world(this);
+}
 
-  for (collection_st *next= _collections; next and next->name; next++)
+void Framework::collections(collection_st* collections_)
+{
+  for (collection_st *next= collections_; next and next->name; next++)
   {
     _collection.push_back(new Collection(this, next));
   }
@@ -114,7 +118,8 @@ void Framework::exec()
 
     _total++;
 
-    try {
+    try
+    {
       switch ((*iter)->exec())
       {
       case TEST_FAILURE:
@@ -140,7 +145,7 @@ void Framework::exec()
     catch (libtest::disconnected& e)
     {
       _failed++;
-      Error << "Unhandled disconnection occurred:" << e.what();
+      stream::cerr(e.file(), e.line(), e.func()) << "Unhandled disconnection occurred: " << e.mesg();
       throw;
     }
     catch (...)
@@ -148,9 +153,9 @@ void Framework::exec()
       _failed++;
       throw;
     }
-
-    Outn();
   }
+
+  void xml(const std::string& testsuites_name, std::ostream& output);
 }
 
 uint32_t Framework::sum_total()
@@ -226,3 +231,5 @@ test_return_t Framework::create()
 
   return rc;
 }
+
+} // namespace libtest