[Boost-commit] svn:boost r56390 - in trunk/boost/test: . impl utils/runtime/cla

Subject: [Boost-commit] svn:boost r56390 - in trunk/boost/test: . impl utils/runtime/cla
From: gennadiy.rozental_at_[hidden]
Date: 2009-09-26 18:38:18

Author: rogeeff
Date: 2009-09-26 18:38:17 EDT (Sat, 26 Sep 2009)
New Revision: 56390
URL: http://svn.boost.org/trac/boost/changeset/56390

Log:
BOOST_FIXTURE_TEST_CASE_TEMPLATE introduced
Text files modified: 
   trunk/boost/test/impl/results_collector.ipp           |     6 +++---                                  
   trunk/boost/test/unit_test_suite.hpp                  |    13 ++++++++++---                           
   trunk/boost/test/utils/runtime/cla/argv_traverser.hpp |     2 +-                                      
   3 files changed, 14 insertions(+), 7 deletions(-)

Modified: trunk/boost/test/impl/results_collector.ipp
==============================================================================
--- trunk/boost/test/impl/results_collector.ipp	(original)
+++ trunk/boost/test/impl/results_collector.ipp	2009-09-26 18:38:17 EDT (Sat, 26 Sep 2009)
@@ -215,9 +215,9 @@
         if( !num_failures_match )
             BOOST_TEST_MESSAGE( "Test case " << tu.p_name << " has fewer failures than expected" );
 
-        bool run_any_assertions = tr.p_aborted || (tr.p_assertions_failed != 0) || (tr.p_assertions_passed != 0);
-        if( !run_any_assertions )
-            BOOST_TEST_MESSAGE( "Test case " << tu.p_name << " did not run any assertions" );
+        bool check_any_assertions = tr.p_aborted || (tr.p_assertions_failed != 0) || (tr.p_assertions_passed != 0);
+        if( !check_any_assertions )
+            BOOST_TEST_MESSAGE( "Test case " << tu.p_name << " did not check any assertions" );
     }
 }
 

Modified: trunk/boost/test/unit_test_suite.hpp
==============================================================================
--- trunk/boost/test/unit_test_suite.hpp	(original)
+++ trunk/boost/test/unit_test_suite.hpp	2009-09-26 18:38:17 EDT (Sat, 26 Sep 2009)
@@ -116,12 +116,12 @@
 /**/
 
 // ************************************************************************** //
-// **************        BOOST_AUTO_TEST_CASE_TEMPLATE         ************** //
+// **************       BOOST_FIXTURE_TEST_CASE_TEMPLATE       ************** //
 // ************************************************************************** //
 
-#define BOOST_AUTO_TEST_CASE_TEMPLATE( test_name, type_name, TL )       \
+#define BOOST_FIXTURE_TEST_CASE_TEMPLATE( test_name, type_name, TL, F ) \
 template<typename type_name>                                            \
-struct test_name : public BOOST_AUTO_TEST_CASE_FIXTURE                  \
+struct test_name : public F                                             \
 { void test_method(); };                                                \
                                                                         \
 struct BOOST_AUTO_TC_INVOKER( test_name ) {                             \
@@ -143,6 +143,13 @@
 /**/
 
 // ************************************************************************** //
+// **************        BOOST_AUTO_TEST_CASE_TEMPLATE         ************** //
+// ************************************************************************** //
+
+#define BOOST_AUTO_TEST_CASE_TEMPLATE( test_name, type_name, TL )       \
+BOOST_FIXTURE_TEST_CASE_TEMPLATE( test_name, type_name, TL, BOOST_AUTO_TEST_CASE_FIXTURE )
+
+// ************************************************************************** //
 // **************           BOOST_TEST_CASE_TEMPLATE           ************** //
 // ************************************************************************** //
 

Modified: trunk/boost/test/utils/runtime/cla/argv_traverser.hpp
==============================================================================
--- trunk/boost/test/utils/runtime/cla/argv_traverser.hpp	(original)
+++ trunk/boost/test/utils/runtime/cla/argv_traverser.hpp	2009-09-26 18:38:17 EDT (Sat, 26 Sep 2009)
@@ -72,7 +72,7 @@
 
 private:
     // Data members
-    dstring              m_buffer;
+    dstring                 m_buffer;
     cstring                 m_work_buffer;
 
     cstring                 m_token;