Merge lp:~brianaker/gearmand/formatters into lp:gearmand

[Brian Aker]

=== modified file 'libtest/collection.cc'
--- libtest/collection.cc	2013-05-03 08:41:20 +0000
+++ libtest/collection.cc	2013-07-02 18:24:29 +0000
@@ -38,9 +38,11 @@
 
 #include <libtest/common.h>
 
+#include <algorithm>
+
 // @todo possibly have this code fork off so if it fails nothing goes bad
 static test_return_t runner_code(libtest::Framework* frame,
-                                 test_st* run, 
+                                 const struct test_st* run, 
                                  libtest::Timer& _timer)
 { // Runner Code
 
@@ -84,46 +86,119 @@
 
 namespace libtest {
 
-Collection::Collection(Framework* frame_arg,
-                       collection_st* arg) :
-  _name(arg->name),
-  _pre(arg->pre),
-  _post(arg->post),
-  _tests(arg->tests),
-  _frame(frame_arg),
+Collection::Collection(Framework* frame_,
+                       collection_st* tests_) :
+  _name(tests_->name),
+  _ret(TEST_SKIPPED),
+  _pre(tests_->pre),
+  _post(tests_->post),
+  _tests(tests_->tests),
+  _frame(frame_),
   _success(0),
   _skipped(0),
   _failed(0),
-  _total(0),
-  _formatter(frame_arg->name(), _name)
-{
-  fatal_assert(arg);
+  _formatter(frame_->formatter())
+{
+  fatal_assert(tests_);
+  for (const test_st *run= _tests; run->name; run++)
+  {
+    push_testcase(run);
+  }
+
+  case_iter= _testcases.begin();
+}
+
+Collection::~Collection()
+{
+  std::for_each(_testcases.begin(), _testcases.end(), DeleteFromVector());
+  _testcases.clear();
+
+  std::for_each(_formatter.begin(), _formatter.end(), DeleteFromVector());
+  _formatter.clear();
+}
+
+void Collection::push_testcase(const test_st* test_)
+{
+  TestCase* _current_testcase= new TestCase(test_);
+  _testcases.push_back(_current_testcase);
+}
+
+void Collection::format()
+{
+  for (Formatters::iterator format_iter= _formatter.begin();
+       format_iter != _formatter.end();
+       ++format_iter)
+  {
+    (*format_iter)->report((*case_iter), std::distance(_testcases.begin(), case_iter));
+  }
+}
+
+void Collection::plan()
+{
+  for (Formatters::iterator format_iter= _formatter.begin();
+       format_iter != _formatter.end();
+       ++format_iter)
+  {
+    (*format_iter)->plan(this);
+  }
+}
+
+void Collection::complete()
+{
+  for (Formatters::iterator format_iter= _formatter.begin();
+       format_iter != _formatter.end();
+       ++format_iter)
+  {
+    (*format_iter)->complete();
+  }
+}
+
+void Collection::succeess()
+{
+  _success++;
+  (*case_iter)->success(_timer);
+  format();
+}
+
+void Collection::skip()
+{
+  _skipped++;
+  (*case_iter)->skipped();
+  format();
+}
+
+void Collection::fail()
+{
+  _failed++;
+  (*case_iter)->failed();
+  format();
 }
 
 test_return_t Collection::exec()
 {
+  // Write out any headers required by formatting.
+  plan();
+
   if (test_success(_frame->runner()->setup(_pre, _frame->creators_ptr())))
   {
-    for (test_st *run= _tests; run->name; run++)
+    for (; case_iter != _testcases.end();
+         ++case_iter)
     {
-      formatter()->push_testcase(run->name);
-      if (_frame->match(run->name))
+      if (_frame->match((*case_iter)->name()))
       {
-        formatter()->skipped();
+        skip();
         continue;
       }
-      _total++;
 
       test_return_t return_code;
       try 
       {
-        if (run->requires_flush)
+        if ((*case_iter)->requires_flush())
         {
           if (test_failed(_frame->runner()->flush(_frame->creators_ptr())))
           {
             Error << "frame->runner()->flush(creators_ptr)";
-            _skipped++;
-            formatter()->skipped();
+            skip();
             continue;
           }
         }
@@ -132,7 +207,7 @@
 
         try 
         {
-          return_code= runner_code(_frame, run, _timer);
+          return_code= runner_code(_frame, (*case_iter)->test(), _timer);
         }
         catch (...)
         {
@@ -145,26 +220,22 @@
       catch (const libtest::fatal& e)
       {
         stream::cerr(e.file(), e.line(), e.func()) << e.what();
-        _failed++;
-        formatter()->failed();
+        fail();
         throw;
       }
 
       switch (return_code)
       {
       case TEST_SUCCESS:
-        _success++;
-        formatter()->success(_timer);
+        succeess();
         break;
 
       case TEST_FAILURE:
-        _failed++;
-        formatter()->failed();
+        fail();
         break;
 
       case TEST_SKIPPED:
-        _skipped++;
-        formatter()->skipped();
+        skip();
         break;
 
       default:
@@ -180,17 +251,17 @@
 
   if (_failed == 0 and _skipped == 0 and _success)
   {
-    return TEST_SUCCESS;
+    _ret= TEST_SUCCESS;
   }
-
-  if (_failed)
+  else if (_failed)
   {
-    return TEST_FAILURE;
+    _ret= TEST_FAILURE;
   }
 
-  fatal_assert(_skipped or _success == 0);
+  // Complete any headers required by formatting.
+  complete();
 
-  return TEST_SKIPPED;
+  return _ret;
 }
 
 } // namespace libtest
 
=== modified file 'libtest/collection.h'
--- libtest/collection.h	2013-01-10 12:05:49 +0000
+++ libtest/collection.h	2013-07-02 18:24:29 +0000
@@ -58,41 +58,52 @@
 class Collection {
 public:
   Collection(libtest::Framework*, collection_st*);
+  ~Collection();
 
   test_return_t exec();
 
-  const char* name()
+  const char* name() const
   {
     return _name.c_str();
   }
 
-  uint32_t success()
+  void succeess();
+
+  void skip();
+
+  void fail();
+
+  uint32_t succeeded() const
   {
     return _success;
   }
 
-  uint32_t skipped()
+  uint32_t skipped() const
   {
     return _skipped;
   }
 
-  uint32_t failed()
+  uint32_t failed() const
   {
     return _failed;
   }
 
-  uint32_t total()
-  {
-    return _total;
-  }
-
-  libtest::Formatter* formatter()
-  {
-    return &_formatter;
-  }
+  void format();
+
+  size_t total() const
+  {
+    return _testcases.size();
+  }
+
+  void plan();
+  void complete();
+
+private:
+  void push_testcase(const test_st* test_);
 
 private:
   std::string _name;
+  test_return_t _ret;
   test_callback_fn *_pre;
   test_callback_fn *_post;
   struct test_st *_tests;
@@ -100,9 +111,10 @@
   uint32_t _success;
   uint32_t _skipped;
   uint32_t _failed;
-  uint32_t _total;
   libtest::Timer _timer;
-  libtest::Formatter _formatter;
+  libtest::Formatters& _formatter;
+  TestCases _testcases;
+  TestCases::iterator case_iter;
 
 private:
   Collection( const Collection& );
 
=== modified file 'libtest/formatter.cc'
--- libtest/formatter.cc	2013-01-04 00:19:53 +0000
+++ libtest/formatter.cc	2013-07-02 18:24:29 +0000
@@ -44,101 +44,190 @@
   
 namespace libtest {
 
-class TestCase {
-public:
-  TestCase(const std::string& arg):
-    _name(arg),
-    _result(TEST_FAILURE)
-  {
-  }
-
-  const std::string& name() const
-  {
-    return _name;
-  }
-
-  test_return_t result() const
-  {
-    return _result;
-  }
-
-  void result(test_return_t arg)
-  {
-    _result= arg;
-  }
-
-  void result(test_return_t arg, const libtest::Timer& timer_)
-  {
-    _result= arg;
-    _timer= timer_;
-  }
-
-  const libtest::Timer& timer() const
-  {
-    return _timer;
-  }
-
-  void timer(libtest::Timer& arg)
-  {
-    _timer= arg;
-  }
-
-private:
-  std::string _name;
-  test_return_t _result;
-  libtest::Timer _timer;
-};
-
-Formatter::Formatter(const std::string& frame_name, const std::string& arg)
-{
-  _suite_name= frame_name;
-  _suite_name+= ".";
-  _suite_name+= arg;
-}
-
-Formatter::~Formatter()
-{
-  std::for_each(_testcases.begin(), _testcases.end(), DeleteFromVector());
-  _testcases.clear();
-}
-
-TestCase* Formatter::current()
-{
-  return _testcases.back();
-}
-
-void Formatter::skipped()
-{
-  current()->result(TEST_SKIPPED);
-  Out << name() << "." << current()->name() <<  "\t\t\t\t\t" << "[ " << test_strerror(current()->result()) << " ]";
-
-  reset();
-}
-
-void Formatter::failed()
-{
-  assert(current());
-  current()->result(TEST_FAILURE);
-
-  Out << name() << "." << current()->name() <<  "\t\t\t\t\t" << "[ " << test_strerror(current()->result()) << " ]";
-
-  reset();
-}
-
-void Formatter::success(const libtest::Timer& timer_)
-{
-  assert(current());
-  current()->result(TEST_SUCCESS, timer_);
-
-  Out << name() << "."
-    << current()->name()
-    <<  "\t\t\t\t\t" 
-    << current()->timer() 
-    << " [ " << test_strerror(current()->result()) << " ]";
-
-  reset();
-}
-
+Formatter::Formatter(const Framework* frame_, std::ostream& output_):
+  _frame(frame_),
+  _output(output_)
+{
+}
+
+const std::string& Formatter::name() const
+{
+  return _frame->name();
+}
+
+Legacy::Legacy(const Framework* frame_, std::ostream& output_):
+  Formatter(frame_, output_),
+  _collection(NULL)
+{
+}
+
+
+Legacy::~Legacy()
+{
+  if (getenv("YATL_SUMMARY"))
+  {
+    Outn();
+    Out << "Tests\t\t\t\t\t" << _frame->total();
+    Out << "\tFailed\t\t\t\t\t" << _frame->failed();
+    Out << "\tSkipped\t\t\t\t\t" << _frame->skipped();
+    Out << "\tSucceeded\t\t\t\t" << _frame->success();
+  }
+}
+
+void Legacy::plan(const Collection* collection)
+{
+  _collection= collection;
+}
+
+void Legacy::report(const libtest::TestCase* test, size_t) const
+{
+  switch (test->result())
+  {
+    case TEST_SUCCESS:
+      Out << name() << "."
+        << _collection->name() << "."
+        << test->name()
+        <<  "\t\t\t\t\t" 
+        << test->timer() 
+        << " [ " << test_strerror(test->result()) << " ]";
+      break;
+
+    case TEST_FAILURE:
+      Out << name() << "."
+        << _collection->name() << "."
+        << test->name()
+        <<  "\t\t\t\t\t" << "[ " << test_strerror(test->result()) << " ]";
+      break;
+
+    case TEST_SKIPPED:
+      Out << name() << "."
+        << _collection->name() << "."
+        << test->name()
+        <<  "\t\t\t\t\t" << "[ " << test_strerror(test->result()) << " ]";
+      break;
+  }
+}
+
+Junit::Junit(const Framework* frame_, std::ostream& output_):
+  Formatter(frame_, output_)
+{
+  _output << "<testsuites name=\"" << name() << "\">" << std::endl;
+}
+
+Junit::~Junit()
+{
+  _output << "</testsuites>" << std::endl;
+}
+
+void Junit::report(const libtest::TestCase* test, size_t) const
+{
+  _output << "\t\t<testcase name=\"" 
+    << test->name() 
+    << "\" time=\"" 
+    << test->timer().elapsed_milliseconds() 
+    << "\">" 
+    << std::endl;
+
+  switch (test->result())
+  {
+    case TEST_SKIPPED:
+      _output << "\t\t <skipped/>" << std::endl;
+      break;
+
+    case TEST_FAILURE:
+      _output << "\t\t <failure message=\"\" type=\"\"/>"<< std::endl;
+      break;
+
+    case TEST_SUCCESS:
+      break;
+  }
+  _output << "\t\t</testcase>" << std::endl;
+}
+
+void Junit::plan(const Collection* collection)
+{
+  _output << "\t<testsuite name=\"" << collection->name() << "\"  classname=\"\" package=\"\">" << std::endl;
+}
+
+void Junit::complete()
+{
+  _output << "\t</testsuite>" << std::endl;
+}
+
+TAP::TAP(const Framework* frame_, std::ostream& output_):
+  Formatter(frame_, output_)
+{
+}
+
+TAP::~TAP()
+{
+}
+
+void TAP::report(const libtest::TestCase* test, size_t position) const
+{
+  assert(test);
+  switch (test->result())
+  {
+    case TEST_SUCCESS:
+      _output << "ok " << position << " - " << test->name() << " # ";
+      _output << test->timer().elapsed_milliseconds();
+      break;
+
+    case TEST_FAILURE:
+      _output << "not ok " << position << " - " << test->name() << " # ";
+      break;
+
+    case TEST_SKIPPED:
+      _output << "ok " << position << " - # SKIP ";
+      break;
+  }
+
+  _output << std::endl;
+}
+
+void TAP::plan(const Collection* collection)
+{
+  _output << "0.." << collection->total() << std::endl;
+}
+
+#if 0
+void Formatter::tap(libtest::Framework& framework_, std::ofstream& output)
+{
+  for (Suites::iterator framework_iter= framework_.suites().begin();
+       framework_iter != framework_.suites().end();
+       ++framework_iter)
+  {
+    output << "1.." << (*framework_iter)->formatter()->testcases().size() << " # " << (*framework_iter)->name() << std::endl;
+
+    size_t test_count= 1;
+    for (TestCases::iterator case_iter= (*framework_iter)->formatter()->testcases().begin();
+         case_iter != (*framework_iter)->formatter()->testcases().end();
+         ++case_iter)
+    {
+      switch ((*case_iter)->result())
+      {
+        case TEST_SKIPPED:
+        output << "ok " << test_count << " - # SKIP ";
+        break;
+
+        case TEST_FAILURE:
+        output << "not ok " << test_count << " - " << (*case_iter)->name() << " # ";
+        break;
+
+        case TEST_SUCCESS:
+        output << "ok " << test_count << " - " << (*case_iter)->name() << " # ";
+        break;
+      }
+
+      output 
+        << (*case_iter)->timer().elapsed_milliseconds() 
+        << std::endl;
+    }
+  }
+}
+#endif
+
+#if 0
 void Formatter::xml(libtest::Framework& framework_, std::ofstream& output)
 {
   output << "<testsuites name=\"" << framework_.name() << "\">" << std::endl;
@@ -178,15 +267,6 @@
   }
   output << "</testsuites>" << std::endl;
 }
-
-void Formatter::push_testcase(const std::string& arg)
-{
-  assert(_suite_name.empty() == false);
-  TestCase* _current_testcase= new TestCase(arg);
-  _testcases.push_back(_current_testcase);
-}
-
-void Formatter::reset()
-{
-}
+#endif
+
 } // namespace libtest
 
=== modified file 'libtest/formatter.hpp'
--- libtest/formatter.hpp	2012-12-10 09:06:07 +0000
+++ libtest/formatter.hpp	2013-07-02 18:24:29 +0000
@@ -43,43 +43,69 @@
 
 namespace libtest {
 
-class TestCase;
-typedef std::vector<libtest::TestCase*> TestCases;
+class Collection;
+
+class Formatter;
+typedef std::vector<libtest::Formatter*> Formatters;
 
 class Formatter {
 public:
-  Formatter(const std::string& frame_name, const std::string& arg);
-
-  ~Formatter();
-
-  void skipped();
-
-  void failed();
-
-  void success(const libtest::Timer&);
-
-  void push_testcase(const std::string&);
-
-  const std::string& name() const
-  {
-    return _suite_name;
-  }
-
-  TestCases& testcases()
-  {
-    return _testcases;
-  }
-
+  Formatter(const Framework* frame_, std::ostream&);
+
+  virtual ~Formatter() {}
+
+  virtual void plan(const libtest::Collection*) {}
+  virtual void report(const libtest::TestCase*, size_t) const {}
+  virtual void complete() {}
+
+protected:
+  const std::string& name() const;
+
+#if 0
   static void xml(libtest::Framework&, std::ofstream&);
-
-private:
-  void reset();
-
-  TestCase* current();
-
-private:
-  std::string _suite_name;
-  TestCases _testcases;
+  static void tap(libtest::Framework&, std::ofstream&);
+#endif
+
+protected:
+  const Framework* _frame;
+
+protected:
+  std::ostream& _output;
+};
+
+class Junit : public Formatter
+{
+public:
+  Junit(const Framework*, std::ostream&);
+  ~Junit();
+
+  void report(const libtest::TestCase*, size_t position) const;
+
+  void plan(const libtest::Collection*);
+  void complete();
+};
+
+class TAP : public Formatter
+{
+public:
+  TAP(const Framework*, std::ostream&);
+  ~TAP();
+
+  void plan(const libtest::Collection*);
+  void report(const libtest::TestCase*, size_t position) const;
+};
+
+class Legacy : public Formatter
+{
+public:
+  Legacy(const Framework*, std::ostream&);
+  ~Legacy();
+
+  void plan(const libtest::Collection*);
+  void report(const libtest::TestCase*, size_t position) const;
+
+private:
+  const libtest::Collection* _collection;
 };
 
 } // namespace libtest
 
=== modified file 'libtest/framework.cc'
--- libtest/framework.cc	2013-05-03 08:41:20 +0000
+++ libtest/framework.cc	2013-07-02 18:24:29 +0000
@@ -125,6 +125,33 @@
   _name(name_)
 {
   get_world(this);
+
+  {
+    std::string file_name;
+    if (getenv("WORKSPACE"))
+    {
+      file_name.append(getenv("WORKSPACE"));
+      file_name.append("/");
+    }
+    file_name.append(name());
+    file_name.append(".xml");
+    xml_file.open(file_name.c_str(), std::ios::trunc);
+    _formatter.push_back(new libtest::Junit(this, xml_file));
+  }
+
+  {
+    std::string file_name;
+    if (getenv("WORKSPACE"))
+    {
+      file_name.append(getenv("WORKSPACE"));
+      file_name.append("/");
+    }
+    file_name.append(name());
+    file_name.append(".tap");
+    tap_file.open(file_name.c_str(), std::ios::trunc);
+    _formatter.push_back(new libtest::TAP(this, tap_file));
+  }
+  _formatter.push_back(new libtest::Legacy(this, std::cout));
 }
 
 void Framework::collections(collection_st collections_[])
@@ -148,6 +175,9 @@
 
   std::for_each(_collection.begin(), _collection.end(), DeleteFromVector());
   _collection.clear();
+
+  std::for_each(_formatter.begin(), _formatter.end(), DeleteFromVector());
+  _formatter.clear();
 }
 
 bool Framework::match(const char* arg)
@@ -232,58 +262,6 @@
   }
 }
 
-uint32_t Framework::sum_total()
-{
-  uint32_t count= 0;
-  for (std::vector<Collection*>::iterator iter= _collection.begin();
-       iter != _collection.end();
-       ++iter)
-  {
-    count+= (*iter)->total();
-  }
-
-  return count;
-}
-
-uint32_t Framework::sum_success()
-{
-  uint32_t count= 0;
-  for (std::vector<Collection*>::iterator iter= _collection.begin();
-       iter != _collection.end();
-       ++iter)
-  {
-    count+= (*iter)->success();
-  }
-
-  return count;
-}
-
-uint32_t Framework::sum_skipped()
-{
-  uint32_t count= 0;
-  for (std::vector<Collection*>::iterator iter= _collection.begin();
-       iter != _collection.end();
-       ++iter)
-  {
-    count+= (*iter)->skipped();
-  }
-
-  return count;
-}
-
-uint32_t Framework::sum_failed()
-{
-  uint32_t count= 0;
-  for (std::vector<Collection*>::iterator iter= _collection.begin();
-       iter != _collection.end();
-       ++iter)
-  {
-    count+= (*iter)->failed();
-  }
-
-  return count;
-}
-
 libtest::Runner *Framework::runner()
 {
   if (_runner == NULL)
 
=== modified file 'libtest/framework.h'
--- libtest/framework.h	2013-05-03 06:03:28 +0000
+++ libtest/framework.h	2013-07-02 18:24:29 +0000
@@ -2,7 +2,7 @@
  *
  *  Data Differential YATL (i.e. libtest)  library
  *
- *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *  Copyright (C) 2012-2013 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
@@ -45,6 +45,7 @@
 */
 
 #include <vector>
+#include <fstream>
 
 namespace { class Collection; }
 typedef std::vector<libtest::Collection*> Suites;
@@ -126,47 +127,48 @@
     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
+  Suites& suites()
+  {
+    return _collection;
+  }
+
+  libtest::Formatters& formatter()
+  {
+    return _formatter;
+  }
+
+  size_t total() const
   {
     return _total;
   }
 
-  uint32_t success() const
+  size_t success() const
   {
     return _success;
   }
 
-  uint32_t skipped() const
+  size_t skipped() const
   {
     return _skipped;
   }
 
-  uint32_t failed() const
+  size_t failed() const
   {
     return _failed;
   }
 
-  Suites& suites()
-  {
-    return _collection;
-  }
-
 private:
-  uint32_t _total;
-  uint32_t _success;
-  uint32_t _skipped;
-  uint32_t _failed;
-  
+  // Sums
+  size_t _total;
+  size_t _success;
+  size_t _skipped;
+  size_t _failed;
+
   /* These methods are called outside of any collection call. */
   test_callback_create_fn *_create;
   test_callback_destroy_fn *_destroy;
@@ -195,6 +197,10 @@
 private:
   Framework( const Framework& );
   const Framework& operator=( const Framework& );
+  libtest::Formatters _formatter;
+  std::ofstream xml_file;
+  std::ofstream tap_file;
+
 };
 
 } // namespace libtest
 
=== modified file 'libtest/main.cc'
--- libtest/main.cc	2013-06-28 19:13:48 +0000
+++ libtest/main.cc	2013-07-02 18:24:29 +0000
@@ -60,25 +60,6 @@
 
 using namespace libtest;
 
-static void stats_print(libtest::Framework *frame)
-{
-  if (frame->failed() == 0 and frame->success() == 0)
-  {
-    return;
-  }
-
-  Outn();
-  Out << "Collections\t\t\t\t\t" << frame->total();
-  Out << "\tFailed\t\t\t\t\t" << frame->failed();
-  Out << "\tSkipped\t\t\t\t\t" << frame->skipped();
-  Out << "\tSucceeded\t\t\t\t" << frame->success();
-  Outn();
-  Out << "Tests\t\t\t\t\t" << frame->sum_total();
-  Out << "\tFailed\t\t\t\t" << frame->sum_failed();
-  Out << "\tSkipped\t\t\t\t" << frame->sum_skipped();
-  Out << "\tSucceeded\t\t\t" << frame->sum_success();
-}
-
 #include <getopt.h>
 #include <unistd.h>
 
@@ -380,19 +361,37 @@
         Out << "All tests completed successfully.";
       }
 
-      stats_print(frame.get());
+#if 0
+      {
+        std::ofstream xml_file;
+        std::string file_name;
+        if (getenv("WORKSPACE"))
+        {
+          file_name.append(getenv("WORKSPACE"));
+          file_name.append("/");
+        }
+        file_name.append(frame->name());
+        file_name.append(".xml");
+        xml_file.open(file_name.c_str(), std::ios::trunc);
+        libtest::Formatter::xml(*frame, xml_file);
+      }
+#endif
 
-      std::ofstream xml_file;
-      std::string file_name;
-      if (getenv("WORKSPACE"))
+#if 0
       {
-        file_name.append(getenv("WORKSPACE"));
-        file_name.append("/");
+        std::ofstream tap_file;
+        std::string file_name;
+        if (getenv("WORKSPACE"))
+        {
+          file_name.append(getenv("WORKSPACE"));
+          file_name.append("/");
+        }
+        file_name.append(frame->name());
+        file_name.append(".tap");
+        tap_file.open(file_name.c_str(), std::ios::trunc);
+        libtest::Formatter::tap(*frame, tap_file);
       }
-      file_name.append(frame->name());
-      file_name.append(".xml");
-      xml_file.open(file_name.c_str(), std::ios::trunc);
-      libtest::Formatter::xml(*frame, xml_file);
+#endif
 
       Outn(); // Generate a blank to break up the messages if make check/test has been run
     } while (exit_code == EXIT_SUCCESS and --opt_repeat);
 
=== modified file 'libtest/test.h'
--- libtest/test.h	2012-12-31 11:03:44 +0000
+++ libtest/test.h	2013-07-02 18:24:29 +0000
@@ -51,6 +51,86 @@
   test_callback_fn *test_fn;
 };
 
+namespace libtest {
+
+class TestCase;
+typedef std::vector<libtest::TestCase*> TestCases;
+
+class TestCase {
+public:
+  TestCase(const struct test_st* test_):
+    _result(TEST_FAILURE)
+  {
+    _test.name= test_->name;
+    _test.requires_flush= test_->requires_flush;
+    _test.test_fn= test_->test_fn;
+  }
+
+  const char* name() const
+  {
+    return _test.name;
+  }
+
+  test_return_t result() const
+  {
+    return _result;
+  }
+
+  void result(test_return_t result_)
+  {
+    _result= result_;
+  }
+
+  void result(test_return_t result_, const libtest::Timer& timer_)
+  {
+    _result= result_;
+    _timer= timer_;
+  }
+
+  const libtest::Timer& timer() const
+  {
+    return _timer;
+  }
+
+  void timer(libtest::Timer& timer_)
+  {
+    _timer= timer_;
+  }
+
+  void skipped()
+  {
+    _result= TEST_SKIPPED;
+  }
+
+  void failed()
+  {
+    _result= TEST_FAILURE;
+  }
+
+  void success(const libtest::Timer& timer_)
+  {
+    _result= TEST_SUCCESS;
+    _timer= timer_;
+  }
+
+
+  const struct test_st* test() const
+  {
+    return &_test;
+  }
+
+  bool requires_flush() const
+  {
+    return _test.requires_flush;
+  }
+
+private:
+  struct test_st _test;
+  test_return_t _result;
+  libtest::Timer _timer;
+};
+} // namespace libtest
+
 #define test_assert_errno(A) \
 do \
 { \