Update libtest.

[m6w6/libmemcached] / libtest / formatter.cc

diff --git a/libtest/formatter.cc b/libtest/formatter.cc
index f19404d49fa9d9ff0b543cf8c04669641c1c6520..01c57609554ecc52d2f9ab036c7baf9cb6a770d0 100644 (file)
--- a/libtest/formatter.cc
+++ b/libtest/formatter.cc
@@ -34,12 +34,13 @@
  *
  */
 
-#include <config.h>
+#include "libtest/yatlcon.h"
 
 #include <libtest/common.h>
 
-#include <iostream>
+#include <algorithm>
 #include <fstream>
+#include <iostream>
   
 namespace libtest {
 
@@ -88,17 +89,17 @@ private:
   libtest::Timer _timer;
 };
 
-Formatter::Formatter(const std::string& arg) :
-  _suite_name(arg)
+Formatter::Formatter(const std::string& frame_name, const std::string& arg)
 {
+  _suite_name= frame_name;
+  _suite_name+= ".";
+  _suite_name+= arg;
 }
 
 Formatter::~Formatter()
 {
-  for (TestCases::iterator iter= _testcases.begin(); iter != _testcases.end(); ++iter)
-  {
-    delete *iter;
-  }
+  std::for_each(_testcases.begin(), _testcases.end(), DeleteFromVector());
+  _testcases.clear();
 }
 
 TestCase* Formatter::current()