[Boost-commit] svn:boost r40274 - trunk/libs/test/test

From: gennadiy.rozental_at_[hidden]
Date: 2007-10-22 00:09:02

Author: rogeeff
Date: 2007-10-22 00:09:01 EDT (Mon, 22 Oct 2007)
New Revision: 40274
URL: http://svn.boost.org/trac/boost/changeset/40274

Log:
new unit test: test_tree_management_test.cpp
Added:
   trunk/libs/test/test/test_tree_management_test.cpp   (contents, props changed)
Text files modified: 
   trunk/libs/test/test/Jamfile.v2                |     1 +                                       
   trunk/libs/test/test/algorithms_test.cpp       |    24 ------------------------                
   trunk/libs/test/test/boost_check_equal_str.cpp |     2 ++                                      
   trunk/libs/test/test/class_properties_test.cpp |    37 -------------------------------------   
   4 files changed, 3 insertions(+), 61 deletions(-)

Modified: trunk/libs/test/test/Jamfile.v2
==============================================================================
--- trunk/libs/test/test/Jamfile.v2	(original)
+++ trunk/libs/test/test/Jamfile.v2	2007-10-22 00:09:01 EDT (Mon, 22 Oct 2007)
@@ -55,6 +55,7 @@
           [ test-btl-lib run : algorithms_test : boost_unit_test_framework/<link>static ]
           [ test-btl-lib run : token_iterator_test : boost_unit_test_framework ]
           [ test-btl-lib run : boost_check_equal_str    : boost_unit_test_framework ]
+          [ test-btl-lib run : test_tree_management_test : boost_unit_test_framework ]
             ;
 
  

Modified: trunk/libs/test/test/algorithms_test.cpp
==============================================================================
--- trunk/libs/test/test/algorithms_test.cpp	(original)
+++ trunk/libs/test/test/algorithms_test.cpp	2007-10-22 00:09:01 EDT (Mon, 22 Oct 2007)
@@ -127,28 +127,4 @@
 
 //____________________________________________________________________________//
 
-// *****************************************************************************
-// History :
-//
-// $Log$
-// Revision 1.6  2006/03/19 11:49:03  rogeeff
-// *** empty log message ***
-//
-// Revision 1.5  2005/05/11 05:07:56  rogeeff
-// licence update
-//
-// Revision 1.4  2005/02/20 08:28:34  rogeeff
-// This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-// Revision 1.3  2005/01/30 03:35:55  rogeeff
-// no message
-//
-// Revision 1.2  2005/06/29 04:32:50  rogeeff
-// no message
-//
-// Revision 1.1  2005/05/23 09:49:39  rogeeff
-// algorithms test added
-//
-// *****************************************************************************
-
 // EOF

Modified: trunk/libs/test/test/boost_check_equal_str.cpp
==============================================================================
--- trunk/libs/test/test/boost_check_equal_str.cpp	(original)
+++ trunk/libs/test/test/boost_check_equal_str.cpp	2007-10-22 00:09:01 EDT (Mon, 22 Oct 2007)
@@ -54,4 +54,6 @@
     BOOST_CHECK_EQUAL(buf_str, buf_str);
 }
 
+//____________________________________________________________________________//
+
 // EOF

Modified: trunk/libs/test/test/class_properties_test.cpp
==============================================================================
--- trunk/libs/test/test/class_properties_test.cpp	(original)
+++ trunk/libs/test/test/class_properties_test.cpp	2007-10-22 00:09:01 EDT (Mon, 22 Oct 2007)
@@ -193,41 +193,4 @@
 
 //____________________________________________________________________________//
 
-// ***************************************************************************
-//  Revision History :
-//  
-//  $Log$
-//  Revision 1.8  2006/03/19 11:49:04  rogeeff
-//  *** empty log message ***
-//
-//  Revision 1.7  2005/06/11 19:20:58  rogeeff
-//  *** empty log message ***
-//
-//  Revision 1.6  2005/05/11 05:07:56  rogeeff
-//  licence update
-//
-//  Revision 1.5  2005/01/30 03:35:55  rogeeff
-//  no message
-//
-//  Revision 1.3  2005/01/18 08:30:08  rogeeff
-//  unit_test_log rework:
-//     eliminated need for ::instance()
-//     eliminated need for << end and ...END macro
-//     straitend interface between log and formatters
-//     change compiler like formatter name
-//     minimized unit_test_log interface and reworked to use explicit calls
-//
-//  Revision 1.2  2005/05/21 06:26:10  rogeeff
-//  licence update
-//
-//  Revision 1.1  2005/05/11 11:05:46  rogeeff
-//  basic_cstring introduced and used everywhere
-//  class properties reworked
-//  namespace names shortened
-//
-//  Revision 1.3  2003/12/01 00:42:37  rogeeff
-//  prerelease cleaning
-//
-// ***************************************************************************
-
 // EOF

Added: trunk/libs/test/test/test_tree_management_test.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/test/test/test_tree_management_test.cpp	2007-10-22 00:09:01 EDT (Mon, 22 Oct 2007)
@@ -0,0 +1,178 @@
+//  (C) Copyright Gennadiy Rozental 2007.
+//  Distributed under the Boost Software License, Version 1.0.
+//  (See accompanying file LICENSE_1_0.txt or copy at 
+//  http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org/libs/test for the library home page.
+//
+//  File        : $RCSfile$
+//
+//  Version     : $Revision$
+//
+//  Description : test tree management unit test
+// ***************************************************************************
+
+// Boost.Test
+#define BOOST_TEST_MODULE test tree management test
+#include <boost/test/unit_test.hpp>
+using namespace boost::unit_test;
+//____________________________________________________________________________//
+
+// some empty test suites/cases
+
+BOOST_AUTO_TEST_SUITE( S1 )
+
+BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( tc1, 1 );
+
+BOOST_AUTO_TEST_CASE( tc1 ) { BOOST_ERROR(""); }
+BOOST_AUTO_TEST_CASE( tc2 ) {}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE( S1 )
+
+BOOST_AUTO_TEST_CASE( tc3 ) {}
+BOOST_AUTO_TEST_CASE( tc4 ) {}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE( S2 )
+
+BOOST_AUTO_TEST_CASE( tc1 ) {}
+BOOST_AUTO_TEST_CASE( tc2 ) {}
+
+BOOST_AUTO_TEST_SUITE( S21 )
+
+BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( tc1, 1 );
+
+BOOST_AUTO_TEST_CASE( tc1 ) { BOOST_ERROR( "" ); }
+
+BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE_END()
+
+BOOST_AUTO_TEST_SUITE( S3 )
+BOOST_AUTO_TEST_SUITE_END()
+
+//____________________________________________________________________________//
+
+void empty() {}
+
+BOOST_AUTO_TEST_CASE( manual_test_case_creation_test )
+{
+    test_case* tc1 = BOOST_TEST_CASE( &empty );
+
+    BOOST_CHECK_EQUAL( tc1->p_type, tut_case );
+    BOOST_CHECK_EQUAL( tc1->p_type_name, const_string( "case" ) );
+    BOOST_CHECK_EQUAL( tc1->p_parent_id, 0U );
+    BOOST_CHECK_NE( tc1->p_id, INV_TEST_UNIT_ID );
+
+    BOOST_CHECK_EQUAL( tc1->p_expected_failures, 0U );
+    BOOST_CHECK_EQUAL( tc1->p_timeout, 0U );
+    BOOST_CHECK_EQUAL( tc1->p_name, const_string( "empty" ) );
+    BOOST_CHECK( tc1->test_func() );
+    BOOST_CHECK( tc1->p_enabled );
+
+    BOOST_CHECK_EQUAL( &framework::get<test_case>( tc1->p_id ), tc1 );
+    BOOST_CHECK_EQUAL( &framework::get( tc1->p_id, tut_case ), tc1 );
+
+    BOOST_CHECK_THROW( &framework::get( tc1->p_id, tut_suite ), framework::internal_error );
+
+    test_case* tc2 = make_test_case( &empty, "my test case" );
+    BOOST_CHECK_EQUAL( tc2->p_name, const_string( "my test case" ) );
+}
+
+//____________________________________________________________________________//
+
+BOOST_AUTO_TEST_CASE( manual_test_suite_creation )
+{
+    test_suite* ts1 = BOOST_TEST_SUITE( "TestSuite" );
+
+    BOOST_CHECK_EQUAL( ts1->p_type, tut_suite );
+    BOOST_CHECK_EQUAL( ts1->p_type_name, const_string( "suite" ) );
+    BOOST_CHECK_EQUAL( ts1->p_parent_id, 0U );
+    BOOST_CHECK_NE( ts1->p_id, INV_TEST_UNIT_ID );
+
+    BOOST_CHECK_EQUAL( ts1->p_expected_failures, 0U );
+    BOOST_CHECK_EQUAL( ts1->p_timeout, 0U );
+    BOOST_CHECK_EQUAL( ts1->p_name, const_string( "TestSuite" ) );
+    BOOST_CHECK( ts1->p_enabled );
+    BOOST_CHECK_EQUAL( ts1->size(), 0U );
+
+    BOOST_CHECK_EQUAL( &framework::get<test_suite>( ts1->p_id ), ts1 );
+    BOOST_CHECK_EQUAL( &framework::get( ts1->p_id, tut_suite ), ts1 );
+}
+
+//____________________________________________________________________________//
+
+BOOST_AUTO_TEST_CASE( manual_test_unit_registration )
+{
+    test_suite* ts1 = BOOST_TEST_SUITE( "TestSuite" );
+
+    test_case* tc1 = make_test_case( &empty, "empty1" );
+
+    ts1->add( tc1, 1, 10U );
+    BOOST_CHECK_EQUAL( ts1->size(), 1U );
+
+    BOOST_CHECK_EQUAL( tc1->p_expected_failures, 1U );
+    BOOST_CHECK_EQUAL( tc1->p_timeout, 10U );
+    BOOST_CHECK_EQUAL( ts1->p_expected_failures, 1U );
+
+    test_case* tc2 = make_test_case( &empty, "empty2" );
+
+    ts1->add( tc2, 2U );
+    BOOST_CHECK_EQUAL( ts1->size(), 2U );
+
+    BOOST_CHECK_EQUAL( tc2->p_expected_failures, 2U );
+    BOOST_CHECK_EQUAL( tc2->p_timeout, 0U );
+    BOOST_CHECK_EQUAL( ts1->p_expected_failures, 3U );
+
+    test_suite* ts2 = BOOST_TEST_SUITE( "TestSuite2" );
+
+    ts1->add( ts2 );
+    BOOST_CHECK_EQUAL( ts1->size(), 3U );
+
+    BOOST_CHECK_EQUAL( ts2->p_expected_failures, 0U );
+    BOOST_CHECK_EQUAL( ts1->p_expected_failures, 3U );
+
+    BOOST_CHECK_EQUAL( ts1->get( "empty1" ), tc1->p_id );
+    BOOST_CHECK_EQUAL( ts1->get( "empty2" ), tc2->p_id );
+    BOOST_CHECK_EQUAL( ts1->get( "TestSuite2" ), ts2->p_id );
+    BOOST_CHECK_EQUAL( ts1->get( "another name" ), INV_TEST_UNIT_ID );
+}
+
+//____________________________________________________________________________//
+
+BOOST_AUTO_TEST_CASE( automated_test_units_registration )
+{
+    test_suite& mts = framework::master_test_suite();
+
+    BOOST_CHECK_EQUAL( mts.size(), 7U );
+    BOOST_CHECK_EQUAL( mts.p_expected_failures, 2U );
+
+    BOOST_CHECK_EQUAL( framework::get<test_case>( mts.get( "automated_test_units_registration" ) ).p_expected_failures, 0U );
+
+    test_suite& S1 = framework::get<test_suite>( mts.get( "S1" ) );
+
+    BOOST_CHECK_EQUAL( S1.size(), 4U );
+    BOOST_CHECK_EQUAL( S1.p_expected_failures, 1U );
+
+    test_suite& S2 = framework::get<test_suite>( mts.get( "S2" ) );
+
+    BOOST_CHECK_EQUAL( S2.size(), 3U );
+    BOOST_CHECK_EQUAL( S2.p_expected_failures, 1U );
+
+    test_suite& S3 = framework::get<test_suite>( mts.get( "S3" ) );
+
+    BOOST_CHECK_EQUAL( S3.size(), 0U );
+    BOOST_CHECK_EQUAL( S3.p_expected_failures, 0U );
+
+    test_suite& S21 = framework::get<test_suite>( S2.get( "S21" ) );
+
+    BOOST_CHECK_EQUAL( S21.size(), 1U );
+    BOOST_CHECK_EQUAL( S1.p_expected_failures, 1U );
+}
+
+//____________________________________________________________________________//
+
+// EOF