X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Ffailed.cc;h=88b84664219bf7fc03736f35d0d23c4bcb73d27a;hb=5fb9e63a9f6af5fca174939f7c5fffa360ad75d0;hp=5ed8020a221066c4c6672730e3d464d89367ba09;hpb=9cd57ce737375540f6c3b5e2e3684160e5c4bfce;p=m6w6%2Flibmemcached

diff --git a/libtest/failed.cc b/libtest/failed.cc
index 5ed8020a..88b84664 100644
--- a/libtest/failed.cc
+++ b/libtest/failed.cc
@@ -1,40 +1,26 @@
 /*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
  * 
- *  uTest Framework
+ *  libtest
  *
  *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
- *  All rights reserved.
  *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are
- *  met:
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 3 of the License, or (at your option) any later version.
  *
- *      * Redistributions of source code must retain the above copyright
- *  notice, this list of conditions and the following disclaimer.
- *
- *      * Redistributions in binary form must reproduce the above
- *  copyright notice, this list of conditions and the following disclaimer
- *  in the documentation and/or other materials provided with the
- *  distribution.
- *
- *      * The names of its contributors may not be used to endorse or
- *  promote products derived from this software without specific prior
- *  written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
  *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+
+#include <config.h>
 #include <libtest/common.h>
 
 #include <libtest/failed.h>
@@ -43,32 +29,38 @@
 #include <string>
 #include <vector>
 
-struct failed_test_names_st
-{
-  failed_test_names_st(const char *collection_arg, const char *test_arg) :
+namespace libtest {
+
+struct failed_st {
+  failed_st(const std::string collection_arg, const std::string test_arg) :
     collection(collection_arg),
     test(test_arg)
-  {
-  }
+  { }
 
   std::string collection;
   std::string test;
 };
 
-typedef std::vector<failed_test_names_st> Failures;
-
-static Failures failures;
+typedef std::vector<failed_st> Failures;
 
-void push_failed_test(const char *collection, const char *test)
+class Failed
 {
-  failures.push_back(failed_test_names_st(collection, test));
-}
+private:
+  Failures failures;
 
-void print_failed_test(void)
-{
-  for (Failures::iterator iter= failures.begin(); iter != failures.end(); iter++)
+public:
+  void push(const char *collection, const char *test)
   {
-    Error << "\t" << (*iter).collection << " " << (*iter).test;
+    failures.push_back(failed_st(collection, test));
   }
-}
 
+  void print_failed_test(void)
+  {
+    for (Failures::iterator iter= failures.begin(); iter != failures.end(); iter++)
+    {
+      Error << "\t" << (*iter).collection << " " << (*iter).test;
+    }
+  }
+};
+
+} // namespace libtest