diff --git a/docbook/img/boost.test.logo.png b/docbook/img/boost.test.logo.png deleted file mode 100644 index 89467d97..00000000 Binary files a/docbook/img/boost.test.logo.png and /dev/null differ diff --git a/docbook/img/class-hier.jpg b/docbook/img/class-hier.jpg deleted file mode 100644 index f5cccfc6..00000000 Binary files a/docbook/img/class-hier.jpg and /dev/null differ diff --git a/docbook/img/level.png b/docbook/img/level.png deleted file mode 100644 index 7c34099b..00000000 Binary files a/docbook/img/level.png and /dev/null differ diff --git a/docbook/img/post_build_event.jpg b/docbook/img/post_build_event.jpg deleted file mode 100644 index ac9cdf9a..00000000 Binary files a/docbook/img/post_build_event.jpg and /dev/null differ diff --git a/docbook/img/post_build_out.jpg b/docbook/img/post_build_out.jpg deleted file mode 100644 index beedf9f6..00000000 Binary files a/docbook/img/post_build_out.jpg and /dev/null differ diff --git a/docbook/img/run_args.jpg b/docbook/img/run_args.jpg deleted file mode 100644 index be0ab288..00000000 Binary files a/docbook/img/run_args.jpg and /dev/null differ diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index fee059b2..0dbc6436 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -11,8 +11,6 @@ import testing ; # Project project libs/test/example - : - : requirements msvc-6.5:static ; # Define aliases for the needed libs to get shorter names @@ -57,6 +55,4 @@ test-suite boost_test_examples [ run-fail logged_exp_example.cpp unit_test_framework ] [ run named_param_example.cpp ] - - [ run const_string_test.cpp ] ; diff --git a/example/cla/assign_to.cpp b/example/cla/assign_to.cpp index 78113f3d..284999c8 100644 --- a/example/cla/assign_to.cpp +++ b/example/cla/assign_to.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/basic_float.cpp b/example/cla/basic_float.cpp index a3f16e4b..4a0d96f9 100644 --- a/example/cla/basic_float.cpp +++ b/example/cla/basic_float.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/basic_int.cpp b/example/cla/basic_int.cpp index 29550d3e..f110ec16 100644 --- a/example/cla/basic_int.cpp +++ b/example/cla/basic_int.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/basic_list.cpp b/example/cla/basic_list.cpp index a64f2422..92ffa859 100644 --- a/example/cla/basic_list.cpp +++ b/example/cla/basic_list.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/basic_string.cpp b/example/cla/basic_string.cpp index 95f3716c..c1df4745 100644 --- a/example/cla/basic_string.cpp +++ b/example/cla/basic_string.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/basic_udt.cpp b/example/cla/basic_udt.cpp index e6df2d9c..fdf4c4f0 100644 --- a/example/cla/basic_udt.cpp +++ b/example/cla/basic_udt.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/char_parameter.cpp b/example/cla/char_parameter.cpp index 97f7b0c9..cdd8748b 100644 --- a/example/cla/char_parameter.cpp +++ b/example/cla/char_parameter.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/custom_handler.cpp b/example/cla/custom_handler.cpp index bb72de62..44655e0d 100644 --- a/example/cla/custom_handler.cpp +++ b/example/cla/custom_handler.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/custom_interpreter.cpp b/example/cla/custom_interpreter.cpp index 5c2ab645..998dfa34 100644 --- a/example/cla/custom_interpreter.cpp +++ b/example/cla/custom_interpreter.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/custom_parameter.cpp b/example/cla/custom_parameter.cpp index 7b0dc4c3..734bf883 100644 --- a/example/cla/custom_parameter.cpp +++ b/example/cla/custom_parameter.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/default_value.cpp b/example/cla/default_value.cpp index 44a3bbce..d4253149 100644 --- a/example/cla/default_value.cpp +++ b/example/cla/default_value.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/dual_name.cpp b/example/cla/dual_name.cpp index a7ceb5e8..06f77b6d 100644 --- a/example/cla/dual_name.cpp +++ b/example/cla/dual_name.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/global.cpp b/example/cla/global.cpp index df6bc2bd..3d67eb9f 100644 --- a/example/cla/global.cpp +++ b/example/cla/global.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/guess_name.cpp b/example/cla/guess_name.cpp index d7e36e88..8e1c880c 100644 --- a/example/cla/guess_name.cpp +++ b/example/cla/guess_name.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/help.cpp b/example/cla/help.cpp index d60b4c23..4adfc9ce 100644 --- a/example/cla/help.cpp +++ b/example/cla/help.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/ignore_mismatch.cpp b/example/cla/ignore_mismatch.cpp index 70a3b85e..30dad7b8 100644 --- a/example/cla/ignore_mismatch.cpp +++ b/example/cla/ignore_mismatch.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/input_separator.cpp b/example/cla/input_separator.cpp index c0576aeb..af638b47 100644 --- a/example/cla/input_separator.cpp +++ b/example/cla/input_separator.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/multiplicable.cpp b/example/cla/multiplicable.cpp index d31eacd7..627509db 100644 --- a/example/cla/multiplicable.cpp +++ b/example/cla/multiplicable.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/name.cpp b/example/cla/name.cpp index bdbbc2a3..4001099f 100644 --- a/example/cla/name.cpp +++ b/example/cla/name.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/optional.cpp b/example/cla/optional.cpp index be9ac797..ae4ed164 100644 --- a/example/cla/optional.cpp +++ b/example/cla/optional.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/optional_value.cpp b/example/cla/optional_value.cpp index 5d029fdd..f78d8688 100644 --- a/example/cla/optional_value.cpp +++ b/example/cla/optional_value.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/positional.cpp b/example/cla/positional.cpp index 8c8850ce..dc69eef4 100644 --- a/example/cla/positional.cpp +++ b/example/cla/positional.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/prefix.cpp b/example/cla/prefix.cpp index 0c7c9686..0ba32b0b 100644 --- a/example/cla/prefix.cpp +++ b/example/cla/prefix.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/reference.cpp b/example/cla/reference.cpp index cdc2d721..19f58d47 100644 --- a/example/cla/reference.cpp +++ b/example/cla/reference.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/remainder.cpp b/example/cla/remainder.cpp index f2d7a800..4b23b678 100644 --- a/example/cla/remainder.cpp +++ b/example/cla/remainder.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/separator.cpp b/example/cla/separator.cpp index 7c5573c8..8d03f502 100644 --- a/example/cla/separator.cpp +++ b/example/cla/separator.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/usage.cpp b/example/cla/usage.cpp index 3bec499c..d966863d 100644 --- a/example/cla/usage.cpp +++ b/example/cla/usage.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/validation/access_unknown.cpp b/example/cla/validation/access_unknown.cpp index 8b6d825a..a830c235 100644 --- a/example/cla/validation/access_unknown.cpp +++ b/example/cla/validation/access_unknown.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/validation/ambiguous_access.cpp b/example/cla/validation/ambiguous_access.cpp index 0e078dee..9bf3201b 100644 --- a/example/cla/validation/ambiguous_access.cpp +++ b/example/cla/validation/ambiguous_access.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/validation/ambiguous_input.cpp b/example/cla/validation/ambiguous_input.cpp index 10f5d720..e702ba53 100644 --- a/example/cla/validation/ambiguous_input.cpp +++ b/example/cla/validation/ambiguous_input.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/validation/definition_conflict.cpp b/example/cla/validation/definition_conflict.cpp index 178f58b6..66d0dfad 100644 --- a/example/cla/validation/definition_conflict.cpp +++ b/example/cla/validation/definition_conflict.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/validation/invalid_short_name.cpp b/example/cla/validation/invalid_short_name.cpp index e26cfbaf..25c56a08 100644 --- a/example/cla/validation/invalid_short_name.cpp +++ b/example/cla/validation/invalid_short_name.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/validation/multiple_generators.cpp b/example/cla/validation/multiple_generators.cpp index 85a2efb1..d57df067 100644 --- a/example/cla/validation/multiple_generators.cpp +++ b/example/cla/validation/multiple_generators.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/validation/multiple_value_handlers.cpp b/example/cla/validation/multiple_value_handlers.cpp index 1379df58..41d74c75 100644 --- a/example/cla/validation/multiple_value_handlers.cpp +++ b/example/cla/validation/multiple_value_handlers.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/validation/opt_with_default_value.cpp b/example/cla/validation/opt_with_default_value.cpp index 442e0bde..e331e2ad 100644 --- a/example/cla/validation/opt_with_default_value.cpp +++ b/example/cla/validation/opt_with_default_value.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/validation/optional_plus_multiplicable.cpp b/example/cla/validation/optional_plus_multiplicable.cpp index 2bef9786..b6edd658 100644 --- a/example/cla/validation/optional_plus_multiplicable.cpp +++ b/example/cla/validation/optional_plus_multiplicable.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/validation/required_missing.cpp b/example/cla/validation/required_missing.cpp index 03358d80..a31904bf 100644 --- a/example/cla/validation/required_missing.cpp +++ b/example/cla/validation/required_missing.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/validation/unexpected_input.cpp b/example/cla/validation/unexpected_input.cpp index 4cdfcd73..37e3fca7 100644 --- a/example/cla/validation/unexpected_input.cpp +++ b/example/cla/validation/unexpected_input.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/validation/unexpected_repetition.cpp b/example/cla/validation/unexpected_repetition.cpp index 7b88d426..ab0b7374 100644 --- a/example/cla/validation/unexpected_repetition.cpp +++ b/example/cla/validation/unexpected_repetition.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/cla/wide_string.cpp b/example/cla/wide_string.cpp index 9e2903dd..0fd891c6 100644 --- a/example/cla/wide_string.cpp +++ b/example/cla/wide_string.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/const_string.hpp b/example/const_string.hpp deleted file mode 100644 index 03d400bc..00000000 --- a/example/const_string.hpp +++ /dev/null @@ -1,179 +0,0 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. -// 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 : simple string class definition -// *************************************************************************** - -#ifndef CONST_STRING_HPP -#define CONST_STRING_HPP - -// STL -#include -#include -#include -using std::string; - -namespace common_layer { - -// ************************************************************************** // -// ************** const_string ************** // -// ************************************************************************** // - -class const_string { -public: - // Subtypes - typedef char const* iterator; - typedef char const* const_iterator; - typedef std::reverse_iterator reverse_iterator; - typedef reverse_iterator const_reverse_iterator; - - // Constructor - const_string() - : m_begin( "" ), m_end( m_begin ) {} - - // Copy constructor is generated by compiler - - const_string( const std::string& s ) - : m_begin( s.c_str() ), - m_end( m_begin + s.length() ) {} - - const_string( char const* s ) - : m_begin( s ? s : "" ) - , m_end( s ? m_begin + std::strlen( s ) : m_begin ) - {} - - const_string( char const* s, size_t length ) - : m_begin( s ), m_end( m_begin + length ) { if( length == 0 ) erase(); } - - const_string( char const* first, char const* last ) - : m_begin( first ), m_end( last ) {} - - // data access methods - char operator[]( size_t index ) const { return m_begin[index]; } - char at( size_t index ) const { return m_begin[index]; } - - char const* data() const { return m_begin; } - - // length operators - size_t length() const { return m_end - m_begin; } - bool is_empty() const { return m_end == m_begin; } - - void erase() { m_begin = m_end = ""; } - void resize( size_t new_len ) { if( m_begin + new_len < m_end ) m_end = m_begin + new_len; } - void rshorten( size_t shift = 1 ) { m_end -= shift; if( m_end <= m_begin ) erase(); } - void lshorten( size_t shift = 1 ) { m_begin += shift; if( m_end <= m_begin ) erase(); } - - // Assignment operators - const_string& operator=( const_string const& s ); - const_string& operator=( string const& s ) { return *this = const_string( s ); } - const_string& operator=( char const* s ) { return *this = const_string( s ); } - - const_string& assign( const_string const& s ) { return *this = s; } - const_string& assign( string const& s, size_t len ) { return *this = const_string( s.data(), len ); } - const_string& assign( string const& s ) { return *this = const_string( s ); } - const_string& assign( char const* s ) { return *this = const_string( s ); } - const_string& assign( char const* s, size_t len ) { return *this = const_string( s, len ); } - const_string& assign( char const* f, char const* l ) { return *this = const_string( f, l ); } - - void swap( const_string& s ) { - // do not want to include alogrithm - char const* tmp1 = m_begin; - char const* tmp2 = m_end; - - m_begin = s.m_begin; - m_end = s.m_end; - - s.m_begin = tmp1; - s.m_end = tmp2; - } - - // Comparison operators - friend bool operator==( const_string const& s1, const_string const& s2 ) - { - return s1.length() == s2.length() && std::strncmp( s1.data(), s2.data(), s1.length() ) == 0; - } - friend bool operator==( const_string const& s1, char const* s2 ) { return s1 == const_string( s2 ); } - friend bool operator==( const_string const& s1, const string& s2 ) { return s1 == const_string( s2 ); } - - friend bool operator!=( const_string const& s1, const_string const& s2 ) { return !(s1 == s2); } - friend bool operator!=( const_string const& s1, char const* s2 ) { return !(s1 == s2); } - friend bool operator!=( const_string const& s1, const string& s2 ) { return !(s1 == s2); } - - friend bool operator==( char const* s2, const_string const& s1 ) { return s1 == s2; } - friend bool operator==( const string& s2, const_string const& s1 ) { return s1 == s2; } - - friend bool operator!=( char const* s2, const_string const& s1 ) { return !(s1 == s2); } - friend bool operator!=( const string& s2, const_string const& s1 ) { return !(s1 == s2); } - - // Iterators - iterator begin() const { return m_begin; } - iterator end() const { return m_end; } - reverse_iterator rbegin() const { return reverse_iterator( m_end ); } - reverse_iterator rend() const { return reverse_iterator( m_begin ); } - -private: - - // Data members - char const* m_begin; - char const* m_end; -}; - -//____________________________________________________________________________// - -// first character -class first_char { -public: - char operator()( const_string source, char default_char = '\0' ) const { - return source.is_empty() ? default_char : *source.data(); - } -}; - -//____________________________________________________________________________// - -// last character -class last_char { -public: - char operator()( const_string source, char default_char = '\0' ) const { - return source.is_empty() ? default_char : *source.rbegin(); - } -}; - -//____________________________________________________________________________// - -inline const_string& -const_string::operator=( const_string const& s ) { - if( &s != this ) { - m_begin = s.m_begin; - m_end = s.m_end; - } - - return *this; -} - -//____________________________________________________________________________// - -typedef const_string const literal; - -//____________________________________________________________________________// - -inline std::ostream& -operator<<( std::ostream& os, const_string const& str ) -{ - os << std::string( str.begin(), str.length() ); - - return os; -} - -//____________________________________________________________________________// - -}; // namespace common_layer - -#endif // CONST_STRING_HPP diff --git a/example/const_string_test.cpp b/example/const_string_test.cpp deleted file mode 100644 index 7decae3e..00000000 --- a/example/const_string_test.cpp +++ /dev/null @@ -1,181 +0,0 @@ -// (C) Copyright Gennadiy Rozental 2001-2005. -// 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: const_string_test.cpp,v $ -// -// Version : $Revision$ -// -// Description : simple string class test -// *************************************************************************** - -#define BOOST_TEST_MODULE const_string test -#include - -#include "const_string.hpp" -using common_layer::const_string; - -BOOST_AUTO_TEST_CASE( constructors_test ) -{ - const_string cs0( "" ); - BOOST_CHECK_EQUAL( cs0.length(), (size_t)0 ); - BOOST_CHECK_EQUAL( cs0.begin(), "" ); - BOOST_CHECK_EQUAL( cs0.end(), "" ); - BOOST_CHECK( cs0.is_empty() ); - - const_string cs01( NULL ); - BOOST_CHECK_EQUAL( cs01.length(), (size_t)0 ); - BOOST_CHECK_EQUAL( cs01.begin(), "" ); - BOOST_CHECK_EQUAL( cs01.end(), "" ); - BOOST_CHECK( cs01.is_empty() ); - - const_string cs1( "test_string" ); - BOOST_CHECK_EQUAL( std::strcmp( cs1.data(), "test_string" ), 0 ); - BOOST_CHECK_EQUAL( cs1.length(), std::strlen("test_string") ); - - std::string s( "test_string" ); - const_string cs2( s ); - BOOST_CHECK_EQUAL( std::strcmp( cs2.data(), "test_string" ), 0 ); - - const_string cs3( cs1 ); - BOOST_CHECK_EQUAL( std::strcmp( cs1.data(), "test_string" ), 0 ); - - const_string cs4( "test_string", 4 ); - BOOST_CHECK_EQUAL( std::strncmp( cs4.data(), "test", cs4.length() ), 0 ); - - const_string cs5( s.data(), s.data() + s.length() ); - BOOST_CHECK_EQUAL( std::strncmp( cs5.data(), "test_string", cs5.length() ), 0 ); - - const_string cs_array[] = { "str1", "str2" }; - - BOOST_CHECK_EQUAL( cs_array[0], "str1" ); - BOOST_CHECK_EQUAL( cs_array[1], "str2" ); -} - -BOOST_AUTO_TEST_CASE( data_access_test ) -{ - const_string cs1( "test_string" ); - BOOST_CHECK_EQUAL( std::strcmp( cs1.data(), "test_string" ), 0 ); - - BOOST_CHECK_EQUAL( cs1[(size_t)0], 't' ); - BOOST_CHECK_EQUAL( cs1[(size_t)4], '_' ); - BOOST_CHECK_EQUAL( cs1[cs1.length()-1], 'g' ); - - BOOST_CHECK_EQUAL( cs1[(size_t)0], cs1.at( 0 ) ); - BOOST_CHECK_EQUAL( cs1[(size_t)2], cs1.at( 5 ) ); - BOOST_CHECK_EQUAL( cs1.at( cs1.length() - 1 ), 'g' ); - - BOOST_CHECK_THROW( cs1.at( cs1.length() ), std::out_of_range ); - - BOOST_CHECK_EQUAL( common_layer::first_char()( cs1 ), 't' ); - BOOST_CHECK_EQUAL( common_layer::last_char()( cs1 ) , 'g' ); -} - - -BOOST_AUTO_TEST_CASE( length_test ) -{ - const_string cs1; - - BOOST_CHECK_EQUAL( cs1.length(), (size_t)0 ); - BOOST_CHECK( cs1.is_empty() ); - - cs1 = ""; - BOOST_CHECK_EQUAL( cs1.length(), (size_t)0 ); - BOOST_CHECK( cs1.is_empty() ); - - cs1 = "test_string"; - BOOST_CHECK_EQUAL( cs1.length(), (size_t)11 ); - - cs1.erase(); - BOOST_CHECK_EQUAL( cs1.length(), (size_t)0 ); - BOOST_CHECK_EQUAL( cs1.data(), "" ); - - cs1 = const_string( "test_string", 4 ); - BOOST_CHECK_EQUAL( cs1.length(), (size_t)4 ); - - cs1.resize( 5 ); - BOOST_CHECK_EQUAL( cs1.length(), (size_t)4 ); - - cs1.resize( 3 ); - BOOST_CHECK_EQUAL( cs1.length(), (size_t)3 ); - - cs1.rshorten(); - BOOST_CHECK_EQUAL( cs1.length(), (size_t)2 ); - BOOST_CHECK_EQUAL( cs1[(size_t)0], 't' ); - - cs1.lshorten(); - BOOST_CHECK_EQUAL( cs1.length(), (size_t)1 ); - BOOST_CHECK_EQUAL( cs1[(size_t)0], 'e' ); - - cs1.lshorten(); - BOOST_CHECK( cs1.is_empty() ); - BOOST_CHECK_EQUAL( cs1.data(), "" ); - - cs1 = "test_string"; - cs1.lshorten( 11 ); - BOOST_CHECK( cs1.is_empty() ); - BOOST_CHECK_EQUAL( cs1.data(), "" ); -} - -BOOST_AUTO_TEST_CASE( asignment_test ) -{ - const_string cs1; - std::string s( "test_string" ); - - cs1 = "test"; - BOOST_CHECK_EQUAL( std::strcmp( cs1.data(), "test" ), 0 ); - - cs1 = s; - BOOST_CHECK_EQUAL( std::strcmp( cs1.data(), "test_string" ), 0 ); - - cs1.assign( "test" ); - BOOST_CHECK_EQUAL( std::strcmp( cs1.data(), "test" ), 0 ); - - const_string cs2( "test_string" ); - - cs1.swap( cs2 ); - BOOST_CHECK_EQUAL( std::strcmp( cs1.data(), "test_string" ), 0 ); - BOOST_CHECK_EQUAL( std::strcmp( cs2.data(), "test" ), 0 ); -} - -BOOST_AUTO_TEST_CASE( comparison_test ) -{ - const_string cs1( "test_string" ); - const_string cs2( "test_string" ); - std::string s( "test_string" ); - - BOOST_CHECK_EQUAL( cs1, "test_string" ); - BOOST_CHECK_EQUAL( "test_string", cs1 ); - BOOST_CHECK_EQUAL( cs1, cs2 ); - BOOST_CHECK_EQUAL( cs1, s ); - BOOST_CHECK_EQUAL( s , cs1 ); - - cs1.resize( 4 ); - - BOOST_CHECK( cs1 != "test_string" ); - BOOST_CHECK( "test_string" != cs1 ); - BOOST_CHECK( cs1 != cs2 ); - BOOST_CHECK( cs1 != s ); - BOOST_CHECK( s != cs1 ); - - BOOST_CHECK_EQUAL( cs1, "test" ); -} - -BOOST_AUTO_TEST_CASE( iterators_test ) -{ - const_string cs1( "test_string" ); - std::string s; - - std::copy( cs1.begin(), cs1.end(), std::back_inserter( s ) ); - BOOST_CHECK_EQUAL( cs1, s ); - - s.erase(); - - std::copy( cs1.rbegin(), cs1.rend(), std::back_inserter( s ) ); - BOOST_CHECK_EQUAL( const_string( s ), "gnirts_tset" ); -} - -// EOF diff --git a/example/env/custom_interpreter_env.cpp b/example/env/custom_interpreter_env.cpp index a7ecfdac..0a197c5b 100644 --- a/example/env/custom_interpreter_env.cpp +++ b/example/env/custom_interpreter_env.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/env/env_var_default_value.cpp b/example/env/env_var_default_value.cpp index bb54c686..25b725fa 100644 --- a/example/env/env_var_default_value.cpp +++ b/example/env/env_var_default_value.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/env/environment_ex.cpp b/example/env/environment_ex.cpp index d2b70b6c..2799bdcb 100644 --- a/example/env/environment_ex.cpp +++ b/example/env/environment_ex.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/env/global_id.cpp b/example/env/global_id.cpp index c72dbbf3..71f01791 100644 --- a/example/env/global_id.cpp +++ b/example/env/global_id.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/env/modifier_combination.cpp b/example/env/modifier_combination.cpp index c07ba8a1..8fa8a425 100644 --- a/example/env/modifier_combination.cpp +++ b/example/env/modifier_combination.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/env/validation/need_typed_access.cpp b/example/env/validation/need_typed_access.cpp index 614b583f..5b957902 100644 --- a/example/env/validation/need_typed_access.cpp +++ b/example/env/validation/need_typed_access.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/env/variable_ex.cpp b/example/env/variable_ex.cpp index 23154666..873d8909 100644 --- a/example/env/variable_ex.cpp +++ b/example/env/variable_ex.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/est_example1.cpp b/example/est_example1.cpp index 2e2b36f1..eee0d4b8 100644 --- a/example/est_example1.cpp +++ b/example/est_example1.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005-2006. // 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) diff --git a/example/est_example2.cpp b/example/est_example2.cpp index f57a812c..44a0a9f7 100644 --- a/example/est_example2.cpp +++ b/example/est_example2.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005-2006. // 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) diff --git a/example/exec_mon_example.cpp b/example/exec_mon_example.cpp index d3e8298d..24933581 100644 --- a/example/exec_mon_example.cpp +++ b/example/exec_mon_example.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2003-2008. +// (C) Copyright Gennadiy Rozental 2003-2006. // 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) diff --git a/example/logged_exp_example.cpp b/example/logged_exp_example.cpp index de0f6ab6..8b0e2538 100644 --- a/example/logged_exp_example.cpp +++ b/example/logged_exp_example.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005-2006. // 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) diff --git a/example/named_param_example.cpp b/example/named_param_example.cpp index 6e4d7b17..3f33dc1a 100644 --- a/example/named_param_example.cpp +++ b/example/named_param_example.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/prg_exec_example.cpp b/example/prg_exec_example.cpp index 88040c8a..2ee710d0 100644 --- a/example/prg_exec_example.cpp +++ b/example/prg_exec_example.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/unit_test_example_011.cpp b/example/unit_test_example_011.cpp deleted file mode 100644 index a2f300c0..00000000 --- a/example/unit_test_example_011.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#define BOOST_TEST_MODULE broken -#include - - -BOOST_AUTO_TEST_CASE( broken_test ) -{ - ::system("ls"); -} - diff --git a/example/unit_test_example_012.cpp b/example/unit_test_example_012.cpp deleted file mode 100644 index 5bc81d0b..00000000 --- a/example/unit_test_example_012.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#include -#include - -using boost::unit_test::test_suite; - -void Vektor3Test1() { } - -test_suite* Vektor3_test_suite() -{ - test_suite *test = BOOST_TEST_SUITE("Vektor3 test suite"); - test->add(BOOST_TEST_CASE(&Vektor3Test1)); - - return test; -} - -test_suite* init_unit_test_suite(int, char *[]) -{ - std::system("true"); - // leads to "Test setup error: child has exited; pid: 1001; uid: 30540; exit value: 0" - - test_suite *test = BOOST_TEST_SUITE("Master test suite"); - test->add(Vektor3_test_suite()); - return test; -} \ No newline at end of file diff --git a/example/unit_test_example_02.cpp b/example/unit_test_example_02.cpp index 77de0675..e196639f 100644 --- a/example/unit_test_example_02.cpp +++ b/example/unit_test_example_02.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2002-2008. +// (C) Copyright Gennadiy Rozental 2002-2006. // (C) Copyright Gennadiy Rozental & Ullrich Koethe 2001. // Distributed under the Boost Software License, Version 1.0. // (See accompanying file LICENSE_1_0.txt or copy at diff --git a/example/unit_test_example_03.cpp b/example/unit_test_example_03.cpp index 92ebb6c1..afdce4d2 100644 --- a/example/unit_test_example_03.cpp +++ b/example/unit_test_example_03.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2002-2008. +// (C) Copyright Gennadiy Rozental 2002-2006. // (C) Copyright Gennadiy Rozental & Ullrich Koethe 2001. // Distributed under the Boost Software License, Version 1.0. // (See accompanying file LICENSE_1_0.txt or copy at diff --git a/example/unit_test_example_04.cpp b/example/unit_test_example_04.cpp index 4800a0be..fb7995e3 100644 --- a/example/unit_test_example_04.cpp +++ b/example/unit_test_example_04.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005-2006. // 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) diff --git a/example/unit_test_example_05.cpp b/example/unit_test_example_05.cpp index d16c2656..9e4fb912 100644 --- a/example/unit_test_example_05.cpp +++ b/example/unit_test_example_05.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005-2006. // 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) diff --git a/example/unit_test_example_06.cpp b/example/unit_test_example_06.cpp index 6b4dc2f4..10487e78 100644 --- a/example/unit_test_example_06.cpp +++ b/example/unit_test_example_06.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005-2006. // 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) diff --git a/example/unit_test_example_07.cpp b/example/unit_test_example_07.cpp index 7ef161d7..da232402 100644 --- a/example/unit_test_example_07.cpp +++ b/example/unit_test_example_07.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005-2006. // 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) @@ -29,7 +29,7 @@ typedef boost::mpl::list test_types; // each produced test case uses struct F as a fixture BOOST_AUTO_TEST_CASE_TEMPLATE( my_test, T, test_types ) { - T t = static_cast(i); + T t = i; // usually it's a bad idea to use BOOST_CHECK_EQUAL for checking equality values of // floating point types. This check may or may not produce an error report diff --git a/example/unit_test_example_08.cpp b/example/unit_test_example_08.cpp index a3c660c8..072335fa 100644 --- a/example/unit_test_example_08.cpp +++ b/example/unit_test_example_08.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005-2006. // 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) diff --git a/example/unit_test_example_09_1.cpp b/example/unit_test_example_09_1.cpp index 969fa916..fce91b06 100644 --- a/example/unit_test_example_09_1.cpp +++ b/example/unit_test_example_09_1.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005-2006. // 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) diff --git a/example/unit_test_example_09_2.cpp b/example/unit_test_example_09_2.cpp index b73b24af..ff68a387 100644 --- a/example/unit_test_example_09_2.cpp +++ b/example/unit_test_example_09_2.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005-2006. // 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) diff --git a/example/unit_test_example_10.cpp b/example/unit_test_example_10.cpp index 7a781bf2..9725c8ad 100644 --- a/example/unit_test_example_10.cpp +++ b/example/unit_test_example_10.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // (C) Copyright Gennadiy Rozental & Ullrich Koethe 2001. // Distributed under the Boost Software License, Version 1.0. // (See accompanying file LICENSE_1_0.txt or copy at diff --git a/example/unit_test_example_11.cpp b/example/unit_test_example_11.cpp index 2b46d701..22b412fc 100644 --- a/example/unit_test_example_11.cpp +++ b/example/unit_test_example_11.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2002-2008. +// (C) Copyright Gennadiy Rozental 2002-2006. // (C) Copyright Gennadiy Rozental & Ullrich Koethe 2001. // Distributed under the Boost Software License, Version 1.0. // (See accompanying file LICENSE_1_0.txt or copy at diff --git a/example/unit_test_example_12.cpp b/example/unit_test_example_12.cpp index 12e14777..a7857569 100644 --- a/example/unit_test_example_12.cpp +++ b/example/unit_test_example_12.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2006. // 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) diff --git a/example/unit_test_example_12.input b/example/unit_test_example_12.input index 995120cc..655f4f82 100644 --- a/example/unit_test_example_12.input +++ b/example/unit_test_example_12.input @@ -1,11 +1,11 @@ -asdf -a 1 -s 1000 -d 10 -f 100 -as 1001 -fadf 211 -ffda 211 -aaaaaaaa 8 -aaaaaaaaa -1 -ab -2 +asdf +a 1 +s 1000 +d 10 +f 100 +as 1001 +fadf 211 +ffda 211 +aaaaaaaa 8 +aaaaaaaaa -1 +ab -2 diff --git a/src/compiler_log_formatter.cpp b/src/compiler_log_formatter.cpp index fa174fb2..fa6bc259 100644 --- a/src/compiler_log_formatter.cpp +++ b/src/compiler_log_formatter.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005. // 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) diff --git a/src/cpp_main.cpp b/src/cpp_main.cpp index 805a27fd..2912bc13 100644 --- a/src/cpp_main.cpp +++ b/src/cpp_main.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005. // 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) diff --git a/src/debug.cpp b/src/debug.cpp index 864d6f21..dde4b678 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2006-2008. +// (C) Copyright Gennadiy Rozental 2006. // 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) diff --git a/src/exception_safety.cpp b/src/exception_safety.cpp index 6f021963..85fcde58 100644 --- a/src/exception_safety.cpp +++ b/src/exception_safety.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005. // 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) diff --git a/src/execution_monitor.cpp b/src/execution_monitor.cpp index 9702ed97..e4cd1ddf 100644 --- a/src/execution_monitor.cpp +++ b/src/execution_monitor.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005. // 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) diff --git a/src/framework.cpp b/src/framework.cpp index 986f20b9..75d89112 100644 --- a/src/framework.cpp +++ b/src/framework.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005. // 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) diff --git a/src/interaction_based.cpp b/src/interaction_based.cpp index f3dc76ff..2baff8c5 100644 --- a/src/interaction_based.cpp +++ b/src/interaction_based.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005. // 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) diff --git a/src/logged_expectations.cpp b/src/logged_expectations.cpp index c8f690f9..55b0cd43 100644 --- a/src/logged_expectations.cpp +++ b/src/logged_expectations.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005. // 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) diff --git a/src/plain_report_formatter.cpp b/src/plain_report_formatter.cpp index 8ef03c36..224b6731 100644 --- a/src/plain_report_formatter.cpp +++ b/src/plain_report_formatter.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005. // 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) diff --git a/src/progress_monitor.cpp b/src/progress_monitor.cpp index 5ee24d5d..c5009cfc 100644 --- a/src/progress_monitor.cpp +++ b/src/progress_monitor.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005. // 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) diff --git a/src/results_collector.cpp b/src/results_collector.cpp index e6be408e..07c44aa4 100644 --- a/src/results_collector.cpp +++ b/src/results_collector.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005. // 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) diff --git a/src/results_reporter.cpp b/src/results_reporter.cpp index a1790923..d8eb8a22 100644 --- a/src/results_reporter.cpp +++ b/src/results_reporter.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005. // 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) diff --git a/src/test_main.cpp b/src/test_main.cpp index d12dee5d..990a621b 100644 --- a/src/test_main.cpp +++ b/src/test_main.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005. // 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) diff --git a/src/test_tools.cpp b/src/test_tools.cpp index 905e3514..75f39e7d 100644 --- a/src/test_tools.cpp +++ b/src/test_tools.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005. // 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) diff --git a/src/unit_test_log.cpp b/src/unit_test_log.cpp index e1da0976..cf105728 100644 --- a/src/unit_test_log.cpp +++ b/src/unit_test_log.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005. // 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) diff --git a/src/unit_test_main.cpp b/src/unit_test_main.cpp index c031c584..4329e295 100644 --- a/src/unit_test_main.cpp +++ b/src/unit_test_main.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005. // 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) diff --git a/src/unit_test_monitor.cpp b/src/unit_test_monitor.cpp index 6a94a465..b5171860 100644 --- a/src/unit_test_monitor.cpp +++ b/src/unit_test_monitor.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005. // 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) diff --git a/src/unit_test_parameters.cpp b/src/unit_test_parameters.cpp index 419527b8..8978835b 100644 --- a/src/unit_test_parameters.cpp +++ b/src/unit_test_parameters.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005. // 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) diff --git a/src/unit_test_suite.cpp b/src/unit_test_suite.cpp index 6fe2f318..e7248744 100644 --- a/src/unit_test_suite.cpp +++ b/src/unit_test_suite.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005. // 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) diff --git a/src/xml_log_formatter.cpp b/src/xml_log_formatter.cpp index e44f4588..18fc6b52 100644 --- a/src/xml_log_formatter.cpp +++ b/src/xml_log_formatter.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005. // 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) diff --git a/src/xml_report_formatter.cpp b/src/xml_report_formatter.cpp index 4f0f59bf..09189bf1 100644 --- a/src/xml_report_formatter.cpp +++ b/src/xml_report_formatter.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005. // 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) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index be0add5b..9463a40a 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -6,19 +6,14 @@ # See http://www.boost.org/libs/test for the library home page. -rule test-btl-lib ( test-rule : test-name : lib-name ? : pattern_file * : source_files * : extra-libs ? ) +rule test-btl-lib ( test-rule : test-name : lib-name ? : pattern_file * : source_files * ) { source_files ?= $(test-name).cpp ; - return [ $(test-rule) $(source_files) ../build//$(lib-name) $(extra-libs) + return [ $(test-rule) $(source_files) ../build//$(lib-name) : #args : $(pattern_file) : #on - # Activating -pedantic finds more gotchas - # Unfortunately, this warns about the use of "long long" in gcc's own stdlib - # So deactivate those warnings again - gcc:-pedantic - gcc:-Wno-long-long borland:-w-8080 msvc-6.5:static msvc-8.0:_SCL_SECURE_NO_DEPRECATE @@ -59,8 +54,6 @@ test-suite "unit_test_framework_test" [ 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 ] - [ test-btl-lib run : sync_access_test : boost_unit_test_framework/static : : : /boost/thread//boost_thread ] - ; # A target that runs all the tests diff --git a/test/algorithms_test.cpp b/test/algorithms_test.cpp index ae95fb1d..0db3a124 100644 --- a/test/algorithms_test.cpp +++ b/test/algorithms_test.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2003-2008. +// (C) Copyright Gennadiy Rozental 2003-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) diff --git a/test/basic_cstring_test.cpp b/test/basic_cstring_test.cpp index cbecb8bc..080271bd 100644 --- a/test/basic_cstring_test.cpp +++ b/test/basic_cstring_test.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-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) @@ -12,10 +12,6 @@ // Description : basic_cstring unit test // ***************************************************************************** -#ifdef _MSC_VER -#pragma warning(disable: 4996) -#endif - // Boost.Test #include #include @@ -94,19 +90,19 @@ BOOST_TEST_CASE_TEMPLATE_FUNCTION( constructors_test, CharT ) { { utf::basic_cstring bcs; - BOOST_CHECK_EQUAL( bcs.size(), (unsigned)0 ); + BOOST_CHECK_EQUAL( bcs.size(), 0 ); BOOST_CHECK( bcs.is_empty() ); } { utf::basic_cstring bcs( utf::basic_cstring::null_str() ); - BOOST_CHECK_EQUAL( bcs.size(), (unsigned)0 ); + BOOST_CHECK_EQUAL( bcs.size(), 0 ); BOOST_CHECK( bcs.is_empty() ); } { utf::basic_cstring bcs( 0 ); - BOOST_CHECK_EQUAL( bcs.size(), (unsigned)0 ); + BOOST_CHECK_EQUAL( bcs.size(), 0 ); BOOST_CHECK( bcs.is_empty() ); } @@ -199,24 +195,24 @@ BOOST_TEST_CASE_TEMPLATE_FUNCTION( size_test, CharT ) { utf::basic_cstring bcs1; - BOOST_CHECK_EQUAL( bcs1.size(), (unsigned)0 ); + BOOST_CHECK_EQUAL( bcs1.size(), 0 ); BOOST_CHECK( bcs1.is_empty() ); bcs1 = TEST_STRING; - BOOST_CHECK_EQUAL( bcs1.size(), (unsigned)11 ); + BOOST_CHECK_EQUAL( bcs1.size(), 11 ); bcs1.clear(); - BOOST_CHECK_EQUAL( bcs1.size(), (unsigned)0 ); + BOOST_CHECK_EQUAL( bcs1.size(), 0 ); BOOST_CHECK( bcs1.is_empty() ); bcs1 = utf::basic_cstring( TEST_STRING, 4 ); - BOOST_CHECK_EQUAL( bcs1.size(), (unsigned)4 ); + BOOST_CHECK_EQUAL( bcs1.size(), 4 ); bcs1.resize( 5 ); - BOOST_CHECK_EQUAL( bcs1.size(), (unsigned)4 ); + BOOST_CHECK_EQUAL( bcs1.size(), 4 ); bcs1.resize( 3 ); - BOOST_CHECK_EQUAL( bcs1.size(), (unsigned)3 ); + BOOST_CHECK_EQUAL( bcs1.size(), 3 ); } //____________________________________________________________________________// @@ -336,11 +332,11 @@ BOOST_TEST_CASE_TEMPLATE_FUNCTION( trim_test, CharT ) LOCAL_DEF( bcs0, "tes" ); bcs0.trim_right( 1 ); - BOOST_CHECK_EQUAL( bcs0.size(), (unsigned)2 ); + BOOST_CHECK_EQUAL( bcs0.size(), 2 ); BOOST_CHECK_EQUAL( bcs0[0], 't' ); bcs0.trim_left( 1 ); - BOOST_CHECK_EQUAL( bcs0.size(), (unsigned)1 ); + BOOST_CHECK_EQUAL( bcs0.size(), 1 ); BOOST_CHECK_EQUAL( bcs0[0], 'e' ); bcs0.trim_left( 1 ); @@ -404,30 +400,27 @@ BOOST_TEST_CASE_TEMPLATE_FUNCTION( io_test, CharT ) BOOST_TEST_CASE_TEMPLATE_FUNCTION( find_test, CharT ) { - typedef typename utf::basic_cstring::size_type size; utf::basic_cstring bcs1( TEST_STRING ); - size not_found = (size)utf::basic_cstring::npos; + BOOST_CHECK_EQUAL( bcs1.find( utf::basic_cstring() ), utf::basic_cstring::npos ); + BOOST_CHECK_EQUAL( bcs1.find( LITERAL( "test" ) ), 0 ); + BOOST_CHECK_EQUAL( bcs1.find( TEST_STRING ), 0 ); + BOOST_CHECK_EQUAL( bcs1.find( LITERAL( "test_string " ) ), utf::basic_cstring::npos ); + BOOST_CHECK_EQUAL( bcs1.find( LITERAL( " test_string" ) ), utf::basic_cstring::npos ); + BOOST_CHECK_EQUAL( bcs1.find( LITERAL( "est" ) ), 1 ); + BOOST_CHECK_EQUAL( bcs1.find( LITERAL( "t_st" ) ), 3 ); + BOOST_CHECK_EQUAL( bcs1.find( LITERAL( "ing" ) ), 8 ); + BOOST_CHECK_EQUAL( bcs1.find( LITERAL( "tst" ) ), utf::basic_cstring::npos ); - BOOST_CHECK_EQUAL( bcs1.find( utf::basic_cstring() ), not_found ); - BOOST_CHECK_EQUAL( bcs1.find( LITERAL( "test" ) ), (size)0 ); - BOOST_CHECK_EQUAL( bcs1.find( TEST_STRING ), (size)0 ); - BOOST_CHECK_EQUAL( bcs1.find( LITERAL( "test_string " ) ), not_found ); - BOOST_CHECK_EQUAL( bcs1.find( LITERAL( " test_string" ) ), not_found ); - BOOST_CHECK_EQUAL( bcs1.find( LITERAL( "est" ) ), (size)1 ); - BOOST_CHECK_EQUAL( bcs1.find( LITERAL( "t_st" ) ), (size)3 ); - BOOST_CHECK_EQUAL( bcs1.find( LITERAL( "ing" ) ), (size)8 ); - BOOST_CHECK_EQUAL( bcs1.find( LITERAL( "tst" ) ), not_found ); - - BOOST_CHECK_EQUAL( bcs1.rfind( utf::basic_cstring() ), not_found ); - BOOST_CHECK_EQUAL( bcs1.rfind( LITERAL( "test" ) ), (size)0 ); - BOOST_CHECK_EQUAL( bcs1.rfind( TEST_STRING ), (size)0 ); - BOOST_CHECK_EQUAL( bcs1.rfind( LITERAL( "test_string " ) ), not_found ); - BOOST_CHECK_EQUAL( bcs1.rfind( LITERAL( " test_string" ) ), not_found ); - BOOST_CHECK_EQUAL( bcs1.rfind( LITERAL( "est" ) ), (size)1 ); - BOOST_CHECK_EQUAL( bcs1.rfind( LITERAL( "t_st" ) ), (size)3 ); - BOOST_CHECK_EQUAL( bcs1.rfind( LITERAL( "ing" ) ), (size)8 ); - BOOST_CHECK_EQUAL( bcs1.rfind( LITERAL( "tst" ) ), not_found ); + BOOST_CHECK_EQUAL( bcs1.rfind( utf::basic_cstring() ), utf::basic_cstring::npos ); + BOOST_CHECK_EQUAL( bcs1.rfind( LITERAL( "test" ) ), 0 ); + BOOST_CHECK_EQUAL( bcs1.rfind( TEST_STRING ), 0 ); + BOOST_CHECK_EQUAL( bcs1.rfind( LITERAL( "test_string " ) ), utf::basic_cstring::npos ); + BOOST_CHECK_EQUAL( bcs1.rfind( LITERAL( " test_string" ) ), utf::basic_cstring::npos ); + BOOST_CHECK_EQUAL( bcs1.rfind( LITERAL( "est" ) ), 1 ); + BOOST_CHECK_EQUAL( bcs1.rfind( LITERAL( "t_st" ) ), 3 ); + BOOST_CHECK_EQUAL( bcs1.rfind( LITERAL( "ing" ) ), 8 ); + BOOST_CHECK_EQUAL( bcs1.rfind( LITERAL( "tst" ) ), utf::basic_cstring::npos ); } //____________________________________________________________________________// diff --git a/test/boost_check_equal_str.cpp b/test/boost_check_equal_str.cpp index c495b1fb..a5a55d91 100644 --- a/test/boost_check_equal_str.cpp +++ b/test/boost_check_equal_str.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-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) diff --git a/test/class_properties_test.cpp b/test/class_properties_test.cpp index cf85af5d..813bef5d 100644 --- a/test/class_properties_test.cpp +++ b/test/class_properties_test.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2003-2008. +// (C) Copyright Gennadiy Rozental 2003-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) @@ -131,6 +131,7 @@ BOOST_AUTO_TEST_CASE( test_readonly_property ) BOOST_CHECK( s == p_str ); BOOST_CHECK( p_str2 != p_str ); + BOOST_CHECK_EQUAL( p_b->foo(), 1 ); BOOST_CHECK_EQUAL( p_one ^ 3, 2 ); diff --git a/test/config_file_iterator_test.cpp b/test/config_file_iterator_test.cpp index 59c40128..641c1344 100644 --- a/test/config_file_iterator_test.cpp +++ b/test/config_file_iterator_test.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-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) diff --git a/test/config_file_test.cpp b/test/config_file_test.cpp index 9c24fdec..18bedca9 100644 --- a/test/config_file_test.cpp +++ b/test/config_file_test.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-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) diff --git a/test/custom_exception_test.cpp b/test/custom_exception_test.cpp index ec53e3c8..3e82f9fc 100644 --- a/test/custom_exception_test.cpp +++ b/test/custom_exception_test.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2003-2008. +// (C) Copyright Gennadiy Rozental 2003-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) diff --git a/test/errors_handling_test.cpp b/test/errors_handling_test.cpp index e48ca03f..3b70b198 100644 --- a/test/errors_handling_test.cpp +++ b/test/errors_handling_test.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2007. // (C) Copyright Beman Dawes 2001. // Distributed under the Boost Software License, Version 1.0. // (See accompanying file LICENSE_1_0.txt or copy at @@ -46,7 +46,7 @@ struct this_test_log_formatter : public boost::unit_test::output::compiler_log_f output << line << ": "; } - void test_unit_finish( std::ostream& output, test_unit const& tu, unsigned long ) + void test_unit_finish( std::ostream& output, test_unit const& tu, unsigned long elapsed ) { output << "Leaving test " << tu.p_type_name << " \"" << tu.p_name << "\"" << std::endl; } diff --git a/test/fixed_mapping_test.cpp b/test/fixed_mapping_test.cpp index b91b0d4f..7b22d2ca 100644 --- a/test/fixed_mapping_test.cpp +++ b/test/fixed_mapping_test.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-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) diff --git a/test/foreach_test.cpp b/test/foreach_test.cpp index 3468ab84..3268948e 100644 --- a/test/foreach_test.cpp +++ b/test/foreach_test.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-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) diff --git a/test/ifstream_line_iterator_test.cpp b/test/ifstream_line_iterator_test.cpp index 7a665ec2..dde87ba3 100644 --- a/test/ifstream_line_iterator_test.cpp +++ b/test/ifstream_line_iterator_test.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-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) diff --git a/test/minimal_test.cpp b/test/minimal_test.cpp index 350c00c3..dc431bb4 100644 --- a/test/minimal_test.cpp +++ b/test/minimal_test.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-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) diff --git a/test/online_test.cpp b/test/online_test.cpp index 89282835..3697d1e2 100644 --- a/test/online_test.cpp +++ b/test/online_test.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-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) diff --git a/test/output_test_stream_test.cpp b/test/output_test_stream_test.cpp index 82a4bb1f..4ace5690 100644 --- a/test/output_test_stream_test.cpp +++ b/test/output_test_stream_test.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-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) diff --git a/test/parameterized_test_test.cpp b/test/parameterized_test_test.cpp index 93965e42..8319fe0f 100644 --- a/test/parameterized_test_test.cpp +++ b/test/parameterized_test_test.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2002-2008. +// (C) Copyright Gennadiy Rozental 2002-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) diff --git a/test/prg_exec_fail1.cpp b/test/prg_exec_fail1.cpp index d246c74f..b8766051 100644 --- a/test/prg_exec_fail1.cpp +++ b/test/prg_exec_fail1.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2007. // (C) Copyright Beman Dawes 2001. // Distributed under the Boost Software License, Version 1.0. // (See accompanying file LICENSE_1_0.txt or copy at diff --git a/test/prg_exec_fail2.cpp b/test/prg_exec_fail2.cpp index 8663a4e4..d6befc6d 100644 --- a/test/prg_exec_fail2.cpp +++ b/test/prg_exec_fail2.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-2007. // (C) Copyright Beman Dawes 2001. // Distributed under the Boost Software License, Version 1.0. // (See accompanying file LICENSE_1_0.txt or copy at @@ -29,13 +29,8 @@ int cpp_main( int, char *[] ) // note the name { -#if defined(APPLE) && defined(ppc) - printf("The ppc doesn't throw on divice-by-zero. No check.\n"); - return 1; -#else int div = 0; return 10 / div; -#endif } //____________________________________________________________________________// diff --git a/test/prg_exec_fail3.cpp b/test/prg_exec_fail3.cpp index 76a81146..d5b5fdbc 100644 --- a/test/prg_exec_fail3.cpp +++ b/test/prg_exec_fail3.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2002-2008. +// (C) Copyright Gennadiy Rozental 2002-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) diff --git a/test/prg_exec_fail4.cpp b/test/prg_exec_fail4.cpp index 9772f520..c89498c4 100644 --- a/test/prg_exec_fail4.cpp +++ b/test/prg_exec_fail4.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2003-2008. +// (C) Copyright Gennadiy Rozental 2003-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) diff --git a/test/result_report_test.cpp b/test/result_report_test.cpp index 3a13a219..a0f8018a 100644 --- a/test/result_report_test.cpp +++ b/test/result_report_test.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-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) diff --git a/test/sync_access_test.cpp b/test/sync_access_test.cpp deleted file mode 100644 index 8422d219..00000000 --- a/test/sync_access_test.cpp +++ /dev/null @@ -1,36 +0,0 @@ -#define BOOST_TEST_MODULE sync_access_test -#include - -#include -#include -#include -#include - - -using namespace boost; -namespace ut = boost::unit_test; - -static boost::mutex m; - -/// thread execution function -static void thread_function(boost::barrier& b) -{ - b.wait(); /// wait until memory barrier allows the execution - boost::mutex::scoped_lock lock(m); /// lock mutex - BOOST_CHECK_EQUAL(1,0); /// produce the fault -} - -/// test function which creates threads -BOOST_AUTO_TEST_CASE( test_multiple_assertion_faults ) -{ - boost::thread_group tg; // thread group to manage all threads - boost::barrier b(100); // memory barrier, which should block all threads - // until all 100 threads were created - - for(size_t i=0; i<100; ++i) - tg.create_thread(boost::bind(thread_function, ref(b))); /// create a thread and pass it the barrier - - tg.join_all(); -} - -// EOF diff --git a/test/test_case_template_test.cpp b/test/test_case_template_test.cpp index 0b55600e..fa95477b 100644 --- a/test/test_case_template_test.cpp +++ b/test/test_case_template_test.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2003-2008. +// (C) Copyright Gennadiy Rozental 2003-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) diff --git a/test/test_files/cfg_file_tst1.cfg b/test/test_files/cfg_file_tst1.cfg old mode 100755 new mode 100644 index 1e97c293..c0a4332c --- a/test/test_files/cfg_file_tst1.cfg +++ b/test/test_files/cfg_file_tst1.cfg @@ -1,5 +1,5 @@ -par1 = "ABC " -NS1::par1 = 12 -NS2::NS3::par1 = OFF -NS2::NS4::par1 = ON -NS2::NS4::NS5::par1 = 1 2 3 +par1 = "ABC " +NS1::par1 = 12 +NS2::NS3::par1 = OFF +NS2::NS4::par1 = ON +NS2::NS4::NS5::par1 = 1 2 3 diff --git a/test/test_files/cfg_file_tst2.cfg b/test/test_files/cfg_file_tst2.cfg old mode 100755 new mode 100644 index 530eff22..34acac1f --- a/test/test_files/cfg_file_tst2.cfg +++ b/test/test_files/cfg_file_tst2.cfg @@ -1 +1 @@ -par1 = |"Simple text "| +par1 = |"Simple text "| diff --git a/test/test_files/cfg_file_tst3.cfg b/test/test_files/cfg_file_tst3.cfg old mode 100755 new mode 100644 index d526d26f..e04bfd4f --- a/test/test_files/cfg_file_tst3.cfg +++ b/test/test_files/cfg_file_tst3.cfg @@ -1 +1 @@ -par1 = 1 +par1 = 1 diff --git a/test/test_files/cfg_file_tst4.cfg b/test/test_files/cfg_file_tst4.cfg old mode 100755 new mode 100644 index ee182937..c23d80d2 --- a/test/test_files/cfg_file_tst4.cfg +++ b/test/test_files/cfg_file_tst4.cfg @@ -1 +1 @@ -NS::par2 = 1 2 +NS::par2 = 1 2 diff --git a/test/test_files/cfg_file_tst5.cfg b/test/test_files/cfg_file_tst5.cfg old mode 100755 new mode 100644 index 31ae1072..254431e0 --- a/test/test_files/cfg_file_tst5.cfg +++ b/test/test_files/cfg_file_tst5.cfg @@ -1 +1 @@ -NS::par2 => 2 +NS::par2 => 2 diff --git a/test/test_files/cfg_file_tst6.cfg b/test/test_files/cfg_file_tst6.cfg old mode 100755 new mode 100644 index cbfea511..0af3cabc --- a/test/test_files/cfg_file_tst6.cfg +++ b/test/test_files/cfg_file_tst6.cfg @@ -1 +1 @@ -par1 1 +par1 1 diff --git a/test/test_files/cfg_file_tst7.cfg b/test/test_files/cfg_file_tst7.cfg old mode 100755 new mode 100644 index 5d39393c..a834b08b --- a/test/test_files/cfg_file_tst7.cfg +++ b/test/test_files/cfg_file_tst7.cfg @@ -1 +1 @@ -NS1/NS2/par 1 +NS1/NS2/par 1 diff --git a/test/test_files/errors_handling_test.pattern b/test/test_files/errors_handling_test.pattern index 0b976a47..778570c2 100644 --- a/test/test_files/errors_handling_test.pattern +++ b/test/test_files/errors_handling_test.pattern @@ -1,392 +1,392 @@ - -=========================== -log level: log_successful_tests; error type: no error; - -Entering test case "error_on_demand" -99: info: check 'no error' passed -Leaving test case "error_on_demand" - -=========================== -log level: log_successful_tests; error type: user message; - -Entering test case "error_on_demand" -message -Test case error_on_demand doesn't include any assertions -Leaving test case "error_on_demand" - -=========================== -log level: log_successful_tests; error type: user warning; - -Entering test case "error_on_demand" -107: warning in "error_on_demand": warning -Test case error_on_demand doesn't include any assertions -Leaving test case "error_on_demand" - -=========================== -log level: log_successful_tests; error type: user non-fatal error; - -Entering test case "error_on_demand" -111: error in "error_on_demand": non-fatal error -Leaving test case "error_on_demand" - -=========================== -log level: log_successful_tests; error type: cpp exception; - -Entering test case "error_on_demand" -0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message -121: last checkpoint: error_on_demand() throw runtime_error -Leaving test case "error_on_demand" - -=========================== -log level: log_successful_tests; error type: system error; - -Entering test case "error_on_demand" -0: fatal error in "error_on_demand": integer divide by zero -126: last checkpoint: error_on_demand() divide by zero -Leaving test case "error_on_demand" - -=========================== -log level: log_successful_tests; error type: user fatal error; - -Entering test case "error_on_demand" -115: fatal error in "error_on_demand": fatal error -Leaving test case "error_on_demand" - -=========================== -log level: log_successful_tests; error type: system fatal error; - -Entering test case "error_on_demand" -0: fatal error in "error_on_demand": memory access violation -131: last checkpoint: write to an invalid address -Test is aborted -Leaving test case "error_on_demand" - -=========================== -log level: log_test_suites; error type: no error; - -Entering test case "error_on_demand" -Leaving test case "error_on_demand" - -=========================== -log level: log_test_suites; error type: user message; - -Entering test case "error_on_demand" -message -Test case error_on_demand doesn't include any assertions -Leaving test case "error_on_demand" - -=========================== -log level: log_test_suites; error type: user warning; - -Entering test case "error_on_demand" -107: warning in "error_on_demand": warning -Test case error_on_demand doesn't include any assertions -Leaving test case "error_on_demand" - -=========================== -log level: log_test_suites; error type: user non-fatal error; - -Entering test case "error_on_demand" -111: error in "error_on_demand": non-fatal error -Leaving test case "error_on_demand" - -=========================== -log level: log_test_suites; error type: cpp exception; - -Entering test case "error_on_demand" -0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message -121: last checkpoint: error_on_demand() throw runtime_error -Leaving test case "error_on_demand" - -=========================== -log level: log_test_suites; error type: system error; - -Entering test case "error_on_demand" -0: fatal error in "error_on_demand": integer divide by zero -126: last checkpoint: error_on_demand() divide by zero -Leaving test case "error_on_demand" - -=========================== -log level: log_test_suites; error type: user fatal error; - -Entering test case "error_on_demand" -115: fatal error in "error_on_demand": fatal error -Leaving test case "error_on_demand" - -=========================== -log level: log_test_suites; error type: system fatal error; - -Entering test case "error_on_demand" -0: fatal error in "error_on_demand": memory access violation -131: last checkpoint: write to an invalid address -Test is aborted -Leaving test case "error_on_demand" - -=========================== -log level: log_messages; error type: no error; - - -=========================== -log level: log_messages; error type: user message; - -message -Test case error_on_demand doesn't include any assertions - -=========================== -log level: log_messages; error type: user warning; - -107: warning in "error_on_demand": warning -Test case error_on_demand doesn't include any assertions - -=========================== -log level: log_messages; error type: user non-fatal error; - -111: error in "error_on_demand": non-fatal error - -=========================== -log level: log_messages; error type: cpp exception; - -0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message -121: last checkpoint: error_on_demand() throw runtime_error - -=========================== -log level: log_messages; error type: system error; - -0: fatal error in "error_on_demand": integer divide by zero -126: last checkpoint: error_on_demand() divide by zero - -=========================== -log level: log_messages; error type: user fatal error; - -115: fatal error in "error_on_demand": fatal error - -=========================== -log level: log_messages; error type: system fatal error; - -0: fatal error in "error_on_demand": memory access violation -131: last checkpoint: write to an invalid address -Test is aborted - -=========================== -log level: log_warnings; error type: no error; - - -=========================== -log level: log_warnings; error type: user message; - - -=========================== -log level: log_warnings; error type: user warning; - -107: warning in "error_on_demand": warning - -=========================== -log level: log_warnings; error type: user non-fatal error; - -111: error in "error_on_demand": non-fatal error - -=========================== -log level: log_warnings; error type: cpp exception; - -0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message -121: last checkpoint: error_on_demand() throw runtime_error - -=========================== -log level: log_warnings; error type: system error; - -0: fatal error in "error_on_demand": integer divide by zero -126: last checkpoint: error_on_demand() divide by zero - -=========================== -log level: log_warnings; error type: user fatal error; - -115: fatal error in "error_on_demand": fatal error - -=========================== -log level: log_warnings; error type: system fatal error; - -0: fatal error in "error_on_demand": memory access violation -131: last checkpoint: write to an invalid address - -=========================== -log level: log_all_errors; error type: no error; - - -=========================== -log level: log_all_errors; error type: user message; - - -=========================== -log level: log_all_errors; error type: user warning; - - -=========================== -log level: log_all_errors; error type: user non-fatal error; - -111: error in "error_on_demand": non-fatal error - -=========================== -log level: log_all_errors; error type: cpp exception; - -0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message -121: last checkpoint: error_on_demand() throw runtime_error - -=========================== -log level: log_all_errors; error type: system error; - -0: fatal error in "error_on_demand": integer divide by zero -126: last checkpoint: error_on_demand() divide by zero - -=========================== -log level: log_all_errors; error type: user fatal error; - -115: fatal error in "error_on_demand": fatal error - -=========================== -log level: log_all_errors; error type: system fatal error; - -0: fatal error in "error_on_demand": memory access violation -131: last checkpoint: write to an invalid address - -=========================== -log level: log_cpp_exception_errors; error type: no error; - - -=========================== -log level: log_cpp_exception_errors; error type: user message; - - -=========================== -log level: log_cpp_exception_errors; error type: user warning; - - -=========================== -log level: log_cpp_exception_errors; error type: user non-fatal error; - - -=========================== -log level: log_cpp_exception_errors; error type: cpp exception; - -0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message -121: last checkpoint: error_on_demand() throw runtime_error - -=========================== -log level: log_cpp_exception_errors; error type: system error; - -0: fatal error in "error_on_demand": integer divide by zero -126: last checkpoint: error_on_demand() divide by zero - -=========================== -log level: log_cpp_exception_errors; error type: user fatal error; - -115: fatal error in "error_on_demand": fatal error - -=========================== -log level: log_cpp_exception_errors; error type: system fatal error; - -0: fatal error in "error_on_demand": memory access violation -131: last checkpoint: write to an invalid address - -=========================== -log level: log_system_errors; error type: no error; - - -=========================== -log level: log_system_errors; error type: user message; - - -=========================== -log level: log_system_errors; error type: user warning; - - -=========================== -log level: log_system_errors; error type: user non-fatal error; - - -=========================== -log level: log_system_errors; error type: cpp exception; - - -=========================== -log level: log_system_errors; error type: system error; - -0: fatal error in "error_on_demand": integer divide by zero -126: last checkpoint: error_on_demand() divide by zero - -=========================== -log level: log_system_errors; error type: user fatal error; - -115: fatal error in "error_on_demand": fatal error - -=========================== -log level: log_system_errors; error type: system fatal error; - -0: fatal error in "error_on_demand": memory access violation -131: last checkpoint: write to an invalid address - -=========================== -log level: log_fatal_errors; error type: no error; - - -=========================== -log level: log_fatal_errors; error type: user message; - - -=========================== -log level: log_fatal_errors; error type: user warning; - - -=========================== -log level: log_fatal_errors; error type: user non-fatal error; - - -=========================== -log level: log_fatal_errors; error type: cpp exception; - - -=========================== -log level: log_fatal_errors; error type: system error; - - -=========================== -log level: log_fatal_errors; error type: user fatal error; - -115: fatal error in "error_on_demand": fatal error - -=========================== -log level: log_fatal_errors; error type: system fatal error; - -0: fatal error in "error_on_demand": memory access violation -131: last checkpoint: write to an invalid address - -=========================== -log level: log_nothing; error type: no error; - - -=========================== -log level: log_nothing; error type: user message; - - -=========================== -log level: log_nothing; error type: user warning; - - -=========================== -log level: log_nothing; error type: user non-fatal error; - - -=========================== -log level: log_nothing; error type: cpp exception; - - -=========================== -log level: log_nothing; error type: system error; - - -=========================== -log level: log_nothing; error type: user fatal error; - - -=========================== -log level: log_nothing; error type: system fatal error; - + +=========================== +log level: log_successful_tests; error type: no error; + +Entering test case "error_on_demand" +99: info: check 'no error' passed +Leaving test case "error_on_demand" + +=========================== +log level: log_successful_tests; error type: user message; + +Entering test case "error_on_demand" +message +Test case error_on_demand doesn't include any assertions +Leaving test case "error_on_demand" + +=========================== +log level: log_successful_tests; error type: user warning; + +Entering test case "error_on_demand" +107: warning in "error_on_demand": warning +Test case error_on_demand doesn't include any assertions +Leaving test case "error_on_demand" + +=========================== +log level: log_successful_tests; error type: user non-fatal error; + +Entering test case "error_on_demand" +111: error in "error_on_demand": non-fatal error +Leaving test case "error_on_demand" + +=========================== +log level: log_successful_tests; error type: cpp exception; + +Entering test case "error_on_demand" +0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message +121: last checkpoint: error_on_demand() throw runtime_error +Leaving test case "error_on_demand" + +=========================== +log level: log_successful_tests; error type: system error; + +Entering test case "error_on_demand" +0: fatal error in "error_on_demand": integer divide by zero +126: last checkpoint: error_on_demand() divide by zero +Leaving test case "error_on_demand" + +=========================== +log level: log_successful_tests; error type: user fatal error; + +Entering test case "error_on_demand" +115: fatal error in "error_on_demand": fatal error +Leaving test case "error_on_demand" + +=========================== +log level: log_successful_tests; error type: system fatal error; + +Entering test case "error_on_demand" +0: fatal error in "error_on_demand": memory access violation +131: last checkpoint: write to an invalid address +Test is aborted +Leaving test case "error_on_demand" + +=========================== +log level: log_test_suites; error type: no error; + +Entering test case "error_on_demand" +Leaving test case "error_on_demand" + +=========================== +log level: log_test_suites; error type: user message; + +Entering test case "error_on_demand" +message +Test case error_on_demand doesn't include any assertions +Leaving test case "error_on_demand" + +=========================== +log level: log_test_suites; error type: user warning; + +Entering test case "error_on_demand" +107: warning in "error_on_demand": warning +Test case error_on_demand doesn't include any assertions +Leaving test case "error_on_demand" + +=========================== +log level: log_test_suites; error type: user non-fatal error; + +Entering test case "error_on_demand" +111: error in "error_on_demand": non-fatal error +Leaving test case "error_on_demand" + +=========================== +log level: log_test_suites; error type: cpp exception; + +Entering test case "error_on_demand" +0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message +121: last checkpoint: error_on_demand() throw runtime_error +Leaving test case "error_on_demand" + +=========================== +log level: log_test_suites; error type: system error; + +Entering test case "error_on_demand" +0: fatal error in "error_on_demand": integer divide by zero +126: last checkpoint: error_on_demand() divide by zero +Leaving test case "error_on_demand" + +=========================== +log level: log_test_suites; error type: user fatal error; + +Entering test case "error_on_demand" +115: fatal error in "error_on_demand": fatal error +Leaving test case "error_on_demand" + +=========================== +log level: log_test_suites; error type: system fatal error; + +Entering test case "error_on_demand" +0: fatal error in "error_on_demand": memory access violation +131: last checkpoint: write to an invalid address +Test is aborted +Leaving test case "error_on_demand" + +=========================== +log level: log_messages; error type: no error; + + +=========================== +log level: log_messages; error type: user message; + +message +Test case error_on_demand doesn't include any assertions + +=========================== +log level: log_messages; error type: user warning; + +107: warning in "error_on_demand": warning +Test case error_on_demand doesn't include any assertions + +=========================== +log level: log_messages; error type: user non-fatal error; + +111: error in "error_on_demand": non-fatal error + +=========================== +log level: log_messages; error type: cpp exception; + +0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message +121: last checkpoint: error_on_demand() throw runtime_error + +=========================== +log level: log_messages; error type: system error; + +0: fatal error in "error_on_demand": integer divide by zero +126: last checkpoint: error_on_demand() divide by zero + +=========================== +log level: log_messages; error type: user fatal error; + +115: fatal error in "error_on_demand": fatal error + +=========================== +log level: log_messages; error type: system fatal error; + +0: fatal error in "error_on_demand": memory access violation +131: last checkpoint: write to an invalid address +Test is aborted + +=========================== +log level: log_warnings; error type: no error; + + +=========================== +log level: log_warnings; error type: user message; + + +=========================== +log level: log_warnings; error type: user warning; + +107: warning in "error_on_demand": warning + +=========================== +log level: log_warnings; error type: user non-fatal error; + +111: error in "error_on_demand": non-fatal error + +=========================== +log level: log_warnings; error type: cpp exception; + +0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message +121: last checkpoint: error_on_demand() throw runtime_error + +=========================== +log level: log_warnings; error type: system error; + +0: fatal error in "error_on_demand": integer divide by zero +126: last checkpoint: error_on_demand() divide by zero + +=========================== +log level: log_warnings; error type: user fatal error; + +115: fatal error in "error_on_demand": fatal error + +=========================== +log level: log_warnings; error type: system fatal error; + +0: fatal error in "error_on_demand": memory access violation +131: last checkpoint: write to an invalid address + +=========================== +log level: log_all_errors; error type: no error; + + +=========================== +log level: log_all_errors; error type: user message; + + +=========================== +log level: log_all_errors; error type: user warning; + + +=========================== +log level: log_all_errors; error type: user non-fatal error; + +111: error in "error_on_demand": non-fatal error + +=========================== +log level: log_all_errors; error type: cpp exception; + +0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message +121: last checkpoint: error_on_demand() throw runtime_error + +=========================== +log level: log_all_errors; error type: system error; + +0: fatal error in "error_on_demand": integer divide by zero +126: last checkpoint: error_on_demand() divide by zero + +=========================== +log level: log_all_errors; error type: user fatal error; + +115: fatal error in "error_on_demand": fatal error + +=========================== +log level: log_all_errors; error type: system fatal error; + +0: fatal error in "error_on_demand": memory access violation +131: last checkpoint: write to an invalid address + +=========================== +log level: log_cpp_exception_errors; error type: no error; + + +=========================== +log level: log_cpp_exception_errors; error type: user message; + + +=========================== +log level: log_cpp_exception_errors; error type: user warning; + + +=========================== +log level: log_cpp_exception_errors; error type: user non-fatal error; + + +=========================== +log level: log_cpp_exception_errors; error type: cpp exception; + +0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message +121: last checkpoint: error_on_demand() throw runtime_error + +=========================== +log level: log_cpp_exception_errors; error type: system error; + +0: fatal error in "error_on_demand": integer divide by zero +126: last checkpoint: error_on_demand() divide by zero + +=========================== +log level: log_cpp_exception_errors; error type: user fatal error; + +115: fatal error in "error_on_demand": fatal error + +=========================== +log level: log_cpp_exception_errors; error type: system fatal error; + +0: fatal error in "error_on_demand": memory access violation +131: last checkpoint: write to an invalid address + +=========================== +log level: log_system_errors; error type: no error; + + +=========================== +log level: log_system_errors; error type: user message; + + +=========================== +log level: log_system_errors; error type: user warning; + + +=========================== +log level: log_system_errors; error type: user non-fatal error; + + +=========================== +log level: log_system_errors; error type: cpp exception; + + +=========================== +log level: log_system_errors; error type: system error; + +0: fatal error in "error_on_demand": integer divide by zero +126: last checkpoint: error_on_demand() divide by zero + +=========================== +log level: log_system_errors; error type: user fatal error; + +115: fatal error in "error_on_demand": fatal error + +=========================== +log level: log_system_errors; error type: system fatal error; + +0: fatal error in "error_on_demand": memory access violation +131: last checkpoint: write to an invalid address + +=========================== +log level: log_fatal_errors; error type: no error; + + +=========================== +log level: log_fatal_errors; error type: user message; + + +=========================== +log level: log_fatal_errors; error type: user warning; + + +=========================== +log level: log_fatal_errors; error type: user non-fatal error; + + +=========================== +log level: log_fatal_errors; error type: cpp exception; + + +=========================== +log level: log_fatal_errors; error type: system error; + + +=========================== +log level: log_fatal_errors; error type: user fatal error; + +115: fatal error in "error_on_demand": fatal error + +=========================== +log level: log_fatal_errors; error type: system fatal error; + +0: fatal error in "error_on_demand": memory access violation +131: last checkpoint: write to an invalid address + +=========================== +log level: log_nothing; error type: no error; + + +=========================== +log level: log_nothing; error type: user message; + + +=========================== +log level: log_nothing; error type: user warning; + + +=========================== +log level: log_nothing; error type: user non-fatal error; + + +=========================== +log level: log_nothing; error type: cpp exception; + + +=========================== +log level: log_nothing; error type: system error; + + +=========================== +log level: log_nothing; error type: user fatal error; + + +=========================== +log level: log_nothing; error type: system fatal error; + diff --git a/test/test_files/errors_handling_test.pattern2 b/test/test_files/errors_handling_test.pattern2 index 39a77c40..de786d17 100644 --- a/test/test_files/errors_handling_test.pattern2 +++ b/test/test_files/errors_handling_test.pattern2 @@ -1,279 +1,279 @@ - -=========================== -log level: log_successful_tests; error type: no error; - -Entering test case "error_on_demand" -99: info: check 'no error' passed -Leaving test case "error_on_demand" - -=========================== -log level: log_successful_tests; error type: user message; - -Entering test case "error_on_demand" -message -Test case error_on_demand doesn't include any assertions -Leaving test case "error_on_demand" - -=========================== -log level: log_successful_tests; error type: user warning; - -Entering test case "error_on_demand" -107: warning in "error_on_demand": warning -Test case error_on_demand doesn't include any assertions -Leaving test case "error_on_demand" - -=========================== -log level: log_successful_tests; error type: user non-fatal error; - -Entering test case "error_on_demand" -111: error in "error_on_demand": non-fatal error -Leaving test case "error_on_demand" - -=========================== -log level: log_successful_tests; error type: cpp exception; - -Entering test case "error_on_demand" -0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message -121: last checkpoint: error_on_demand() throw runtime_error -Leaving test case "error_on_demand" - -=========================== -log level: log_successful_tests; error type: system error; - -Entering test case "error_on_demand" -115: fatal error in "error_on_demand": fatal error -Leaving test case "error_on_demand" - -=========================== -log level: log_test_suites; error type: no error; - -Entering test case "error_on_demand" -Leaving test case "error_on_demand" - -=========================== -log level: log_test_suites; error type: user message; - -Entering test case "error_on_demand" -message -Test case error_on_demand doesn't include any assertions -Leaving test case "error_on_demand" - -=========================== -log level: log_test_suites; error type: user warning; - -Entering test case "error_on_demand" -107: warning in "error_on_demand": warning -Test case error_on_demand doesn't include any assertions -Leaving test case "error_on_demand" - -=========================== -log level: log_test_suites; error type: user non-fatal error; - -Entering test case "error_on_demand" -111: error in "error_on_demand": non-fatal error -Leaving test case "error_on_demand" - -=========================== -log level: log_test_suites; error type: cpp exception; - -Entering test case "error_on_demand" -0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message -121: last checkpoint: error_on_demand() throw runtime_error -Leaving test case "error_on_demand" - -=========================== -log level: log_test_suites; error type: system error; - -Entering test case "error_on_demand" -115: fatal error in "error_on_demand": fatal error -Leaving test case "error_on_demand" - -=========================== -log level: log_messages; error type: no error; - - -=========================== -log level: log_messages; error type: user message; - -message -Test case error_on_demand doesn't include any assertions - -=========================== -log level: log_messages; error type: user warning; - -107: warning in "error_on_demand": warning -Test case error_on_demand doesn't include any assertions - -=========================== -log level: log_messages; error type: user non-fatal error; - -111: error in "error_on_demand": non-fatal error - -=========================== -log level: log_messages; error type: cpp exception; - -0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message -121: last checkpoint: error_on_demand() throw runtime_error - -=========================== -log level: log_messages; error type: system error; - -115: fatal error in "error_on_demand": fatal error - -=========================== -log level: log_warnings; error type: no error; - - -=========================== -log level: log_warnings; error type: user message; - - -=========================== -log level: log_warnings; error type: user warning; - -107: warning in "error_on_demand": warning - -=========================== -log level: log_warnings; error type: user non-fatal error; - -111: error in "error_on_demand": non-fatal error - -=========================== -log level: log_warnings; error type: cpp exception; - -0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message -121: last checkpoint: error_on_demand() throw runtime_error - -=========================== -log level: log_warnings; error type: system error; - -115: fatal error in "error_on_demand": fatal error - -=========================== -log level: log_all_errors; error type: no error; - - -=========================== -log level: log_all_errors; error type: user message; - - -=========================== -log level: log_all_errors; error type: user warning; - - -=========================== -log level: log_all_errors; error type: user non-fatal error; - -111: error in "error_on_demand": non-fatal error - -=========================== -log level: log_all_errors; error type: cpp exception; - -0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message -121: last checkpoint: error_on_demand() throw runtime_error - -=========================== -log level: log_all_errors; error type: system error; - -115: fatal error in "error_on_demand": fatal error - -=========================== -log level: log_cpp_exception_errors; error type: no error; - - -=========================== -log level: log_cpp_exception_errors; error type: user message; - - -=========================== -log level: log_cpp_exception_errors; error type: user warning; - - -=========================== -log level: log_cpp_exception_errors; error type: user non-fatal error; - - -=========================== -log level: log_cpp_exception_errors; error type: cpp exception; - -0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message -121: last checkpoint: error_on_demand() throw runtime_error - -=========================== -log level: log_cpp_exception_errors; error type: system error; - -115: fatal error in "error_on_demand": fatal error - -=========================== -log level: log_system_errors; error type: no error; - - -=========================== -log level: log_system_errors; error type: user message; - - -=========================== -log level: log_system_errors; error type: user warning; - - -=========================== -log level: log_system_errors; error type: user non-fatal error; - - -=========================== -log level: log_system_errors; error type: cpp exception; - - -=========================== -log level: log_system_errors; error type: system error; - -115: fatal error in "error_on_demand": fatal error - -=========================== -log level: log_fatal_errors; error type: no error; - - -=========================== -log level: log_fatal_errors; error type: user message; - - -=========================== -log level: log_fatal_errors; error type: user warning; - - -=========================== -log level: log_fatal_errors; error type: user non-fatal error; - - -=========================== -log level: log_fatal_errors; error type: cpp exception; - - -=========================== -log level: log_fatal_errors; error type: system error; - -115: fatal error in "error_on_demand": fatal error - -=========================== -log level: log_nothing; error type: no error; - - -=========================== -log level: log_nothing; error type: user message; - - -=========================== -log level: log_nothing; error type: user warning; - - -=========================== -log level: log_nothing; error type: user non-fatal error; - - -=========================== -log level: log_nothing; error type: cpp exception; - - -=========================== -log level: log_nothing; error type: system error; - + +=========================== +log level: log_successful_tests; error type: no error; + +Entering test case "error_on_demand" +99: info: check 'no error' passed +Leaving test case "error_on_demand" + +=========================== +log level: log_successful_tests; error type: user message; + +Entering test case "error_on_demand" +message +Test case error_on_demand doesn't include any assertions +Leaving test case "error_on_demand" + +=========================== +log level: log_successful_tests; error type: user warning; + +Entering test case "error_on_demand" +107: warning in "error_on_demand": warning +Test case error_on_demand doesn't include any assertions +Leaving test case "error_on_demand" + +=========================== +log level: log_successful_tests; error type: user non-fatal error; + +Entering test case "error_on_demand" +111: error in "error_on_demand": non-fatal error +Leaving test case "error_on_demand" + +=========================== +log level: log_successful_tests; error type: cpp exception; + +Entering test case "error_on_demand" +0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message +121: last checkpoint: error_on_demand() throw runtime_error +Leaving test case "error_on_demand" + +=========================== +log level: log_successful_tests; error type: system error; + +Entering test case "error_on_demand" +115: fatal error in "error_on_demand": fatal error +Leaving test case "error_on_demand" + +=========================== +log level: log_test_suites; error type: no error; + +Entering test case "error_on_demand" +Leaving test case "error_on_demand" + +=========================== +log level: log_test_suites; error type: user message; + +Entering test case "error_on_demand" +message +Test case error_on_demand doesn't include any assertions +Leaving test case "error_on_demand" + +=========================== +log level: log_test_suites; error type: user warning; + +Entering test case "error_on_demand" +107: warning in "error_on_demand": warning +Test case error_on_demand doesn't include any assertions +Leaving test case "error_on_demand" + +=========================== +log level: log_test_suites; error type: user non-fatal error; + +Entering test case "error_on_demand" +111: error in "error_on_demand": non-fatal error +Leaving test case "error_on_demand" + +=========================== +log level: log_test_suites; error type: cpp exception; + +Entering test case "error_on_demand" +0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message +121: last checkpoint: error_on_demand() throw runtime_error +Leaving test case "error_on_demand" + +=========================== +log level: log_test_suites; error type: system error; + +Entering test case "error_on_demand" +115: fatal error in "error_on_demand": fatal error +Leaving test case "error_on_demand" + +=========================== +log level: log_messages; error type: no error; + + +=========================== +log level: log_messages; error type: user message; + +message +Test case error_on_demand doesn't include any assertions + +=========================== +log level: log_messages; error type: user warning; + +107: warning in "error_on_demand": warning +Test case error_on_demand doesn't include any assertions + +=========================== +log level: log_messages; error type: user non-fatal error; + +111: error in "error_on_demand": non-fatal error + +=========================== +log level: log_messages; error type: cpp exception; + +0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message +121: last checkpoint: error_on_demand() throw runtime_error + +=========================== +log level: log_messages; error type: system error; + +115: fatal error in "error_on_demand": fatal error + +=========================== +log level: log_warnings; error type: no error; + + +=========================== +log level: log_warnings; error type: user message; + + +=========================== +log level: log_warnings; error type: user warning; + +107: warning in "error_on_demand": warning + +=========================== +log level: log_warnings; error type: user non-fatal error; + +111: error in "error_on_demand": non-fatal error + +=========================== +log level: log_warnings; error type: cpp exception; + +0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message +121: last checkpoint: error_on_demand() throw runtime_error + +=========================== +log level: log_warnings; error type: system error; + +115: fatal error in "error_on_demand": fatal error + +=========================== +log level: log_all_errors; error type: no error; + + +=========================== +log level: log_all_errors; error type: user message; + + +=========================== +log level: log_all_errors; error type: user warning; + + +=========================== +log level: log_all_errors; error type: user non-fatal error; + +111: error in "error_on_demand": non-fatal error + +=========================== +log level: log_all_errors; error type: cpp exception; + +0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message +121: last checkpoint: error_on_demand() throw runtime_error + +=========================== +log level: log_all_errors; error type: system error; + +115: fatal error in "error_on_demand": fatal error + +=========================== +log level: log_cpp_exception_errors; error type: no error; + + +=========================== +log level: log_cpp_exception_errors; error type: user message; + + +=========================== +log level: log_cpp_exception_errors; error type: user warning; + + +=========================== +log level: log_cpp_exception_errors; error type: user non-fatal error; + + +=========================== +log level: log_cpp_exception_errors; error type: cpp exception; + +0: fatal error in "error_on_demand": std::runtime_error: test std::runtime error what() message +121: last checkpoint: error_on_demand() throw runtime_error + +=========================== +log level: log_cpp_exception_errors; error type: system error; + +115: fatal error in "error_on_demand": fatal error + +=========================== +log level: log_system_errors; error type: no error; + + +=========================== +log level: log_system_errors; error type: user message; + + +=========================== +log level: log_system_errors; error type: user warning; + + +=========================== +log level: log_system_errors; error type: user non-fatal error; + + +=========================== +log level: log_system_errors; error type: cpp exception; + + +=========================== +log level: log_system_errors; error type: system error; + +115: fatal error in "error_on_demand": fatal error + +=========================== +log level: log_fatal_errors; error type: no error; + + +=========================== +log level: log_fatal_errors; error type: user message; + + +=========================== +log level: log_fatal_errors; error type: user warning; + + +=========================== +log level: log_fatal_errors; error type: user non-fatal error; + + +=========================== +log level: log_fatal_errors; error type: cpp exception; + + +=========================== +log level: log_fatal_errors; error type: system error; + +115: fatal error in "error_on_demand": fatal error + +=========================== +log level: log_nothing; error type: no error; + + +=========================== +log level: log_nothing; error type: user message; + + +=========================== +log level: log_nothing; error type: user warning; + + +=========================== +log level: log_nothing; error type: user non-fatal error; + + +=========================== +log level: log_nothing; error type: cpp exception; + + +=========================== +log level: log_nothing; error type: system error; + diff --git a/test/test_files/ifstream_line_iterator.tst1 b/test/test_files/ifstream_line_iterator.tst1 index 89910754..eb555fae 100644 --- a/test/test_files/ifstream_line_iterator.tst1 +++ b/test/test_files/ifstream_line_iterator.tst1 @@ -1,4 +1,4 @@ -acv ffg - - +acv ffg + + 1 \ No newline at end of file diff --git a/test/test_files/ifstream_line_iterator.tst2 b/test/test_files/ifstream_line_iterator.tst2 index ce33489b..b979210c 100644 --- a/test/test_files/ifstream_line_iterator.tst2 +++ b/test/test_files/ifstream_line_iterator.tst2 @@ -1,4 +1,4 @@ -{ abc d } -{ d - dsfg -} +{ abc d } +{ d + dsfg +} diff --git a/test/test_files/par_alias1.cfg b/test/test_files/par_alias1.cfg old mode 100755 new mode 100644 index 47fb489b..26ac5b81 --- a/test/test_files/par_alias1.cfg +++ b/test/test_files/par_alias1.cfg @@ -1,9 +1,9 @@ - -par2 NS1::par1 -par3 NS2::NS3::par1 - -par5 NS2::NS3::par1 - -par4 NS2::NS4::par1 - - + +par2 NS1::par1 +par3 NS2::NS3::par1 + +par5 NS2::NS3::par1 + +par4 NS2::NS4::par1 + + diff --git a/test/test_files/par_alias2.cfg b/test/test_files/par_alias2.cfg old mode 100755 new mode 100644 index abd024b9..b619680f --- a/test/test_files/par_alias2.cfg +++ b/test/test_files/par_alias2.cfg @@ -1,4 +1,4 @@ -#not exitent parameter -par1 BLA::bla - - +#not exitent parameter +par1 BLA::bla + + diff --git a/test/test_files/par_alias3.cfg b/test/test_files/par_alias3.cfg old mode 100755 new mode 100644 index bb318192..13525fc7 --- a/test/test_files/par_alias3.cfg +++ b/test/test_files/par_alias3.cfg @@ -1,4 +1,4 @@ -# unexpected token -par1 NS1::par1 par2 - - +# unexpected token +par1 NS1::par1 par2 + + diff --git a/test/test_files/result_report_test.pattern b/test/test_files/result_report_test.pattern index db3778de..d5553fed 100644 --- a/test/test_files/result_report_test.pattern +++ b/test/test_files/result_report_test.pattern @@ -1,138 +1,138 @@ - -*** No errors detected -************************************************************************* - -Test suite "1 test cases inside" passed with: - 1 test case out of 1 passed - -************************************************************************* - -Test suite "1 test cases inside" passed with: - 1 test case out of 1 passed - - Test case "good_foo" passed - -************************************************************************* -************************************************************************* -************************************************************************* -************************************************************************* - -*** No errors detected -************************************************************************* - -Test suite "1 bad test case inside" passed with: - 1 assertion out of 1 failed - 1 failure expected - 1 test case out of 1 passed - -************************************************************************* - -Test suite "1 bad test case inside" passed with: - 1 assertion out of 1 failed - 1 failure expected - 1 test case out of 1 passed - - Test case "bad_foo" passed with: - 1 assertion out of 1 failed - 1 failure expected - -************************************************************************* -************************************************************************* -************************************************************************* -************************************************************************* - -*** No errors detected -************************************************************************* - -Test suite "2 test cases inside" passed with: - 1 assertion out of 1 failed - 1 failure expected - 2 test cases out of 2 passed - -************************************************************************* - -Test suite "2 test cases inside" passed with: - 1 assertion out of 1 failed - 1 failure expected - 2 test cases out of 2 passed - - Test case "good_foo" passed - - Test case "bad_foo" passed with: - 1 assertion out of 1 failed - 1 failure expected - -************************************************************************* -************************************************************************* -************************************************************************* -************************************************************************* - -*** 2 failures detected in test suite "3 test cases inside" -************************************************************************* - -Test suite "3 test cases inside" failed with: - 2 assertions out of 2 failed - 2 test cases out of 3 failed - 1 test case out of 3 skipped - 1 test case out of 3 aborted - -************************************************************************* - -Test suite "3 test cases inside" failed with: - 2 assertions out of 2 failed - 2 test cases out of 3 failed - 1 test case out of 3 skipped - 1 test case out of 3 aborted - - Test case "bad_foo" failed with: - 1 assertion out of 1 failed - - Test case "very_bad_foo" aborted with: - 1 assertion out of 1 failed - - Test case "bad_foo" skipped due to failed dependancy -************************************************************************* -************************************************************************* -************************************************************************* -************************************************************************* - -*** No errors detected -************************************************************************* - -Test suite "Fake Test Suite Hierarchy" passed with: - 1 assertion out of 1 failed - 1 failure expected - 3 test cases out of 6 passed - 3 test cases out of 6 skipped - -************************************************************************* - -Test suite "Fake Test Suite Hierarchy" passed with: - 1 assertion out of 1 failed - 1 failure expected - 3 test cases out of 6 passed - 3 test cases out of 6 skipped - - Test suite "0 test cases inside" passed - - Test suite "1 test cases inside" passed with: - 1 test case out of 1 passed - - Test case "good_foo" passed - - Test suite "2 test cases inside" passed with: - 1 assertion out of 1 failed - 1 failure expected - 2 test cases out of 2 passed - - Test case "good_foo" passed - - Test case "bad_foo" passed with: - 1 assertion out of 1 failed - 1 failure expected - - Test suite "3 test cases inside" skipped due to failed dependancy -************************************************************************* -************************************************************************* -************************************************************************* -************************************************************************* + +*** No errors detected +************************************************************************* + +Test suite "1 test cases inside" passed with: + 1 test case out of 1 passed + +************************************************************************* + +Test suite "1 test cases inside" passed with: + 1 test case out of 1 passed + + Test case "good_foo" passed + +************************************************************************* +************************************************************************* +************************************************************************* +************************************************************************* + +*** No errors detected +************************************************************************* + +Test suite "1 bad test case inside" passed with: + 1 assertion out of 1 failed + 1 failure expected + 1 test case out of 1 passed + +************************************************************************* + +Test suite "1 bad test case inside" passed with: + 1 assertion out of 1 failed + 1 failure expected + 1 test case out of 1 passed + + Test case "bad_foo" passed with: + 1 assertion out of 1 failed + 1 failure expected + +************************************************************************* +************************************************************************* +************************************************************************* +************************************************************************* + +*** No errors detected +************************************************************************* + +Test suite "2 test cases inside" passed with: + 1 assertion out of 1 failed + 1 failure expected + 2 test cases out of 2 passed + +************************************************************************* + +Test suite "2 test cases inside" passed with: + 1 assertion out of 1 failed + 1 failure expected + 2 test cases out of 2 passed + + Test case "good_foo" passed + + Test case "bad_foo" passed with: + 1 assertion out of 1 failed + 1 failure expected + +************************************************************************* +************************************************************************* +************************************************************************* +************************************************************************* + +*** 2 failures detected in test suite "3 test cases inside" +************************************************************************* + +Test suite "3 test cases inside" failed with: + 2 assertions out of 2 failed + 2 test cases out of 3 failed + 1 test case out of 3 skipped + 1 test case out of 3 aborted + +************************************************************************* + +Test suite "3 test cases inside" failed with: + 2 assertions out of 2 failed + 2 test cases out of 3 failed + 1 test case out of 3 skipped + 1 test case out of 3 aborted + + Test case "bad_foo" failed with: + 1 assertion out of 1 failed + + Test case "very_bad_foo" aborted with: + 1 assertion out of 1 failed + + Test case "bad_foo" skipped due to failed dependancy +************************************************************************* +************************************************************************* +************************************************************************* +************************************************************************* + +*** No errors detected +************************************************************************* + +Test suite "Fake Test Suite Hierarchy" passed with: + 1 assertion out of 1 failed + 1 failure expected + 3 test cases out of 6 passed + 3 test cases out of 6 skipped + +************************************************************************* + +Test suite "Fake Test Suite Hierarchy" passed with: + 1 assertion out of 1 failed + 1 failure expected + 3 test cases out of 6 passed + 3 test cases out of 6 skipped + + Test suite "0 test cases inside" passed + + Test suite "1 test cases inside" passed with: + 1 test case out of 1 passed + + Test case "good_foo" passed + + Test suite "2 test cases inside" passed with: + 1 assertion out of 1 failed + 1 failure expected + 2 test cases out of 2 passed + + Test case "good_foo" passed + + Test case "bad_foo" passed with: + 1 assertion out of 1 failed + 1 failure expected + + Test suite "3 test cases inside" skipped due to failed dependancy +************************************************************************* +************************************************************************* +************************************************************************* +************************************************************************* diff --git a/test/test_files/test_broken_line.cfg b/test/test_files/test_broken_line.cfg old mode 100755 new mode 100644 index 16ae1eaf..15ef0bda --- a/test/test_files/test_broken_line.cfg +++ b/test/test_files/test_broken_line.cfg @@ -1,33 +1,33 @@ -qwer\ -ty - -123 \\ -11 - -# ery \ - 23 - -xcv \ dfgsd -qwe - -1 \ - - 23 - -34 \ -34 - -a \ -b \ -c \ -d \ -e \ -f - -as \ -# test -sa - -as\ - -we +qwer\ +ty + +123 \\ +11 + +# ery \ + 23 + +xcv \ dfgsd +qwe + +1 \ + + 23 + +34 \ +34 + +a \ +b \ +c \ +d \ +e \ +f + +as \ +# test +sa + +as\ + +we diff --git a/test/test_files/test_comments_and_blanks.cfg b/test/test_files/test_comments_and_blanks.cfg old mode 100755 new mode 100644 index f4caa7cb..6d2c4824 --- a/test/test_files/test_comments_and_blanks.cfg +++ b/test/test_files/test_comments_and_blanks.cfg @@ -1,29 +1,29 @@ - - - - - # 000 -1 -2 # 2 -# 1111 -# 234 -#rtyet -#erty\ -4 -3 - - - - - - - - -##################### ######################### 4444 - - - - - - - + + + + + # 000 +1 +2 # 2 +# 1111 +# 234 +#rtyet +#erty\ +4 +3 + + + + + + + + +##################### ######################### 4444 + + + + + + + diff --git a/test/test_files/test_constructor.cfg b/test/test_files/test_constructor.cfg old mode 100755 new mode 100644 index ce33489b..b979210c --- a/test/test_files/test_constructor.cfg +++ b/test/test_files/test_constructor.cfg @@ -1,4 +1,4 @@ -{ abc d } -{ d - dsfg -} +{ abc d } +{ d + dsfg +} diff --git a/test/test_files/test_define.cfg b/test/test_files/test_define.cfg old mode 100755 new mode 100644 index 5bc14654..2c5c4f97 --- a/test/test_files/test_define.cfg +++ b/test/test_files/test_define.cfg @@ -1,13 +1,13 @@ -$define AAA 123 -$define BBB $AAA$$AAA$ - -a$BBB$ -1$AAA$2 - -$define V $TEST_\ -MACRO$=11 -a $V$ - -$define AAA abc - +$define AAA 123 +$define BBB $AAA$$AAA$ + +a$BBB$ +1$AAA$2 + +$define V $TEST_\ +MACRO$=11 +a $V$ + +$define AAA abc + 1$AAA$2 \ No newline at end of file diff --git a/test/test_files/test_fp_comparisons.pattern b/test/test_files/test_fp_comparisons.pattern index 2279139d..d66124ae 100644 --- a/test/test_files/test_fp_comparisons.pattern +++ b/test/test_files/test_fp_comparisons.pattern @@ -1,30 +1,30 @@ -152: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-20} exceeds 1e-05% -153: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-30} exceeds 1e-05% -154: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{-1e-10} exceeds 0.1% -155: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{0.123457} exceeds 0.0001% -159: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{-0.123457} exceeds 0.001% -163: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.23456e-10} and fp2{1.23457e-11} exceeds 0.001% -164: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.111e-10} and fp2{1.112e-10} exceeds 0.08999% -165: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.112e-10} and fp2{1.111e-10} exceeds 0.08999% -170: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1} and fp2{1.0002} exceeds 0.011% -152: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-20} exceeds 1e-05% -153: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-30} exceeds 1e-05% -154: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{-1e-10} exceeds 0.1% -155: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{0.123457} exceeds 0.0001% -159: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{-0.123457} exceeds 0.001% -163: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.23456e-10} and fp2{1.23457e-11} exceeds 0.001% -164: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.111e-10} and fp2{1.112e-10} exceeds 0.08999% -165: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.112e-10} and fp2{1.111e-10} exceeds 0.08999% -170: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1} and fp2{1.0002} exceeds 0.011% -152: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-20} exceeds 1e-05% -153: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-30} exceeds 1e-05% -154: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{-1e-10} exceeds 0.1% -155: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{0.123457} exceeds 0.0001% -159: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{-0.123457} exceeds 0.001% -163: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.23456e-10} and fp2{1.23457e-11} exceeds 0.001% -164: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.111e-10} and fp2{1.112e-10} exceeds 0.08999% -165: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.112e-10} and fp2{1.111e-10} exceeds 0.08999% -170: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1} and fp2{1.0002} exceeds 0.011% -204: error in "test_CHECK_SMALL": absolute value of 1e-6{1e-06} exceeds 1e-07 -219: error in "test_close_at_tolerance": difference between fp1{1.00000001} and fp2{1.00000002} exceeds 1e-06% -226: error in "test_close_at_tolerance": check close_at_tolerance( epsilon )( fp1, fp2 ) failed for ( 1.23456e-10, 1.23457e-10 ) +152: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-20} exceeds 1e-05% +153: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-30} exceeds 1e-05% +154: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{-1e-10} exceeds 0.1% +155: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{0.123457} exceeds 0.0001% +159: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{-0.123457} exceeds 0.001% +163: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.23456e-10} and fp2{1.23457e-11} exceeds 0.001% +164: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.111e-10} and fp2{1.112e-10} exceeds 0.08999% +165: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.112e-10} and fp2{1.111e-10} exceeds 0.08999% +170: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1} and fp2{1.0002} exceeds 0.011% +152: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-20} exceeds 1e-05% +153: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-30} exceeds 1e-05% +154: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{-1e-10} exceeds 0.1% +155: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{0.123457} exceeds 0.0001% +159: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{-0.123457} exceeds 0.001% +163: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.23456e-10} and fp2{1.23457e-11} exceeds 0.001% +164: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.111e-10} and fp2{1.112e-10} exceeds 0.08999% +165: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.112e-10} and fp2{1.111e-10} exceeds 0.08999% +170: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1} and fp2{1.0002} exceeds 0.011% +152: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-20} exceeds 1e-05% +153: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-30} exceeds 1e-05% +154: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{-1e-10} exceeds 0.1% +155: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{0.123457} exceeds 0.0001% +159: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{-0.123457} exceeds 0.001% +163: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.23456e-10} and fp2{1.23457e-11} exceeds 0.001% +164: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.111e-10} and fp2{1.112e-10} exceeds 0.08999% +165: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.112e-10} and fp2{1.111e-10} exceeds 0.08999% +170: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1} and fp2{1.0002} exceeds 0.011% +204: error in "test_CHECK_SMALL": absolute value of 1e-6{1e-06} exceeds 1e-07 +219: error in "test_close_at_tolerance": difference between fp1{1.00000001} and fp2{1.00000002} exceeds 1e-06% +226: error in "test_close_at_tolerance": check close_at_tolerance( epsilon )( fp1, fp2 ) failed for ( 1.23456e-10, 1.23457e-10 ) diff --git a/test/test_files/test_ifdef.cfg b/test/test_files/test_ifdef.cfg old mode 100755 new mode 100644 index 0e1f520f..fe91e19c --- a/test/test_files/test_ifdef.cfg +++ b/test/test_files/test_ifdef.cfg @@ -1,37 +1,37 @@ -$define a aa -$ifdef a -1 -$else -2 -$endif - -$ifdef A -1 -$else -2 -$endif - -$ifndef A -1 -$else -2 -$endif - -$ifdef a -$define V abc -$else -$define V cba -$endif - -1$V$ - -$ifdef a -$ifdef V -a -$else -b -$endif -$else -c -$endif - +$define a aa +$ifdef a +1 +$else +2 +$endif + +$ifdef A +1 +$else +2 +$endif + +$ifndef A +1 +$else +2 +$endif + +$ifdef a +$define V abc +$else +$define V cba +$endif + +1$V$ + +$ifdef a +$ifdef V +a +$else +b +$endif +$else +c +$endif + diff --git a/test/test_files/test_ifdef2.cfg b/test/test_files/test_ifdef2.cfg old mode 100755 new mode 100644 index 699aed53..47d1d64a --- a/test/test_files/test_ifdef2.cfg +++ b/test/test_files/test_ifdef2.cfg @@ -1,2 +1,2 @@ -$ifdef -$else +$ifdef +$else diff --git a/test/test_files/test_ifdef3.cfg b/test/test_files/test_ifdef3.cfg old mode 100755 new mode 100644 index f5e780f9..fb0c9ac8 --- a/test/test_files/test_ifdef3.cfg +++ b/test/test_files/test_ifdef3.cfg @@ -1,3 +1,3 @@ -$else -$endif - +$else +$endif + diff --git a/test/test_files/test_ifdef4.cfg b/test/test_files/test_ifdef4.cfg old mode 100755 new mode 100644 index 79fe513d..93244ff4 --- a/test/test_files/test_ifdef4.cfg +++ b/test/test_files/test_ifdef4.cfg @@ -1,2 +1,2 @@ -$endif - +$endif + diff --git a/test/test_files/test_include1.cfg b/test/test_files/test_include1.cfg old mode 100755 new mode 100644 index a3a86d9e..61c1dfc4 --- a/test/test_files/test_include1.cfg +++ b/test/test_files/test_include1.cfg @@ -1,4 +1,4 @@ -a -$include test_include1_include1.cfg - +a +$include test_include1_include1.cfg + b \ No newline at end of file diff --git a/test/test_files/test_include1_include1.cfg b/test/test_files/test_include1_include1.cfg old mode 100755 new mode 100644 index f2ad6c76..764d69f6 --- a/test/test_files/test_include1_include1.cfg +++ b/test/test_files/test_include1_include1.cfg @@ -1 +1 @@ -c +c diff --git a/test/test_files/test_include2.cfg b/test/test_files/test_include2.cfg old mode 100755 new mode 100644 index f0637498..4e611e9d --- a/test/test_files/test_include2.cfg +++ b/test/test_files/test_include2.cfg @@ -1,4 +1,4 @@ -1 -$include test_include1.cfg# again - +1 +$include test_include1.cfg# again + 2 \ No newline at end of file diff --git a/test/test_files/test_include3.cfg b/test/test_files/test_include3.cfg old mode 100755 new mode 100644 index 0ff24286..50e49788 --- a/test/test_files/test_include3.cfg +++ b/test/test_files/test_include3.cfg @@ -1,3 +1,3 @@ -$include \# broken -test_include1_include1.cfg -$include test_include1_include1.cfg# again +$include \# broken +test_include1_include1.cfg +$include test_include1_include1.cfg# again diff --git a/test/test_files/test_incomplete_broken_line.cfg b/test/test_files/test_incomplete_broken_line.cfg old mode 100755 new mode 100644 index 6bc83a6c..e967bc12 --- a/test/test_files/test_incomplete_broken_line.cfg +++ b/test/test_files/test_incomplete_broken_line.cfg @@ -1 +1 @@ -a\ +a\ diff --git a/test/test_files/test_macro_def1.cfg b/test/test_files/test_macro_def1.cfg old mode 100755 new mode 100644 index 5aa9e80b..c25431e6 --- a/test/test_files/test_macro_def1.cfg +++ b/test/test_files/test_macro_def1.cfg @@ -1,9 +1,9 @@ -$define AAA 123 -$define BBB $AAA$$AAA$ - -a$BBB$ -1$AAA$2 - -$define V $TEST_\ -MACRO$=11 +$define AAA 123 +$define BBB $AAA$$AAA$ + +a$BBB$ +1$AAA$2 + +$define V $TEST_\ +MACRO$=11 a $V$ \ No newline at end of file diff --git a/test/test_files/test_macro_subst4.cfg b/test/test_files/test_macro_subst4.cfg old mode 100755 new mode 100644 index d398e566..a6116405 --- a/test/test_files/test_macro_subst4.cfg +++ b/test/test_files/test_macro_subst4.cfg @@ -1,2 +1,2 @@ -$define AA bb +$define AA bb a$AA$ \ No newline at end of file diff --git a/test/test_files/test_multipart_value1.cfg b/test/test_files/test_multipart_value1.cfg old mode 100755 new mode 100644 index 75a89923..8b963ee4 --- a/test/test_files/test_multipart_value1.cfg +++ b/test/test_files/test_multipart_value1.cfg @@ -1 +1 @@ -a " +a " diff --git a/test/test_files/test_multipart_value10.cfg b/test/test_files/test_multipart_value10.cfg old mode 100755 new mode 100644 index d3d80ec6..c2186593 --- a/test/test_files/test_multipart_value10.cfg +++ b/test/test_files/test_multipart_value10.cfg @@ -1 +1 @@ -a abc"def +a abc"def diff --git a/test/test_files/test_multipart_value11.cfg b/test/test_files/test_multipart_value11.cfg old mode 100755 new mode 100644 index 8f65a6a0..c6e03f08 --- a/test/test_files/test_multipart_value11.cfg +++ b/test/test_files/test_multipart_value11.cfg @@ -1 +1 @@ -a "abc" 123 "def" +a "abc" 123 "def" diff --git a/test/test_files/test_multipart_value12.cfg b/test/test_files/test_multipart_value12.cfg old mode 100755 new mode 100644 index bf35c17c..e5682109 --- a/test/test_files/test_multipart_value12.cfg +++ b/test/test_files/test_multipart_value12.cfg @@ -1 +1 @@ -a abc " 123 " def +a abc " 123 " def diff --git a/test/test_files/test_multipart_value13.cfg b/test/test_files/test_multipart_value13.cfg old mode 100755 new mode 100644 index b8bb66de..ab1e786c --- a/test/test_files/test_multipart_value13.cfg +++ b/test/test_files/test_multipart_value13.cfg @@ -1 +1 @@ -a \"abc\" +a \"abc\" diff --git a/test/test_files/test_multipart_value2.cfg b/test/test_files/test_multipart_value2.cfg old mode 100755 new mode 100644 index 4456e2a4..1d950870 --- a/test/test_files/test_multipart_value2.cfg +++ b/test/test_files/test_multipart_value2.cfg @@ -1 +1 @@ -a "" +a "" diff --git a/test/test_files/test_multipart_value3.cfg b/test/test_files/test_multipart_value3.cfg old mode 100755 new mode 100644 index 5ff7eebe..04b0d8d1 --- a/test/test_files/test_multipart_value3.cfg +++ b/test/test_files/test_multipart_value3.cfg @@ -1 +1 @@ -a """ +a """ diff --git a/test/test_files/test_multipart_value4.cfg b/test/test_files/test_multipart_value4.cfg old mode 100755 new mode 100644 index a80d109e..f8c7c3d6 --- a/test/test_files/test_multipart_value4.cfg +++ b/test/test_files/test_multipart_value4.cfg @@ -1 +1 @@ -a "\"" +a "\"" diff --git a/test/test_files/test_multipart_value5.cfg b/test/test_files/test_multipart_value5.cfg old mode 100755 new mode 100644 index 1b8938a1..adcf74a5 --- a/test/test_files/test_multipart_value5.cfg +++ b/test/test_files/test_multipart_value5.cfg @@ -1 +1 @@ -a abc"" +a abc"" diff --git a/test/test_files/test_multipart_value6.cfg b/test/test_files/test_multipart_value6.cfg old mode 100755 new mode 100644 index be04b55e..f4a0fe62 --- a/test/test_files/test_multipart_value6.cfg +++ b/test/test_files/test_multipart_value6.cfg @@ -1 +1 @@ -a abc" +a abc" diff --git a/test/test_files/test_multipart_value7.cfg b/test/test_files/test_multipart_value7.cfg old mode 100755 new mode 100644 index 94f1faa5..488dfef1 --- a/test/test_files/test_multipart_value7.cfg +++ b/test/test_files/test_multipart_value7.cfg @@ -1 +1 @@ -a "abc +a "abc diff --git a/test/test_files/test_multipart_value8.cfg b/test/test_files/test_multipart_value8.cfg old mode 100755 new mode 100644 index dfca7751..672e5734 --- a/test/test_files/test_multipart_value8.cfg +++ b/test/test_files/test_multipart_value8.cfg @@ -1 +1 @@ -a "abc" "def" +a "abc" "def" diff --git a/test/test_files/test_multipart_value9.cfg b/test/test_files/test_multipart_value9.cfg old mode 100755 new mode 100644 index 3d43260d..81b7226c --- a/test/test_files/test_multipart_value9.cfg +++ b/test/test_files/test_multipart_value9.cfg @@ -1,3 +1,3 @@ -a "abc" \ - "def" \ - "123" +a "abc" \ + "def" \ + "123" diff --git a/test/test_files/test_tools_test.pattern b/test/test_files/test_tools_test.pattern index 752a31d6..64394541 100644 --- a/test/test_files/test_tools_test.pattern +++ b/test/test_files/test_tools_test.pattern @@ -1,71 +1,70 @@ -131: warning in "test_BOOST_WARN": condition sizeof(int) == sizeof(short) is not satisfied -134: info: check sizeof(unsigned char) == sizeof(char) passed -156: error in "test_BOOST_CHECK": check false failed -157: error in "test_BOOST_CHECK": check 1==2 failed -158: error in "test_BOOST_CHECK": check i==1 failed -161: info: check i==2 passed -168: error in "test_BOOST_REQUIRE": not aborted -170: fatal error in "test_BOOST_REQUIRE": critical check false failed -174: fatal error in "test_BOOST_REQUIRE": critical check j > 5 failed -177: info: check j < 5 passed -177: error in "test_BOOST_REQUIRE": not aborted -191: info: check 'object size 33 is too small' passed -208: error in "test_BOOST_CHECK_MESSAGE": Well, may be that what I believe in -210: error in "test_BOOST_CHECK_MESSAGE": Checking predicate failed. Some explanation -213: info: check 'Could it fail?' passed -218: error in "test_BOOST_CHECK_MESSAGE": Comparing 1 and 2: some explanation -225: fatal error in "test_BOOST_REQUIRE_MESSAGE": Here we should stop -228: info: check 'That's OK' passed -228: error in "test_BOOST_REQUIRE_MESSAGE": not aborted -235: error in "test_BOOST_ERROR": Fail to miss an error -242: fatal error in "test_BOOST_FAIL": No! No! Show must go on. -258: error in "test_BOOST_CHECK_THROW": exception my_exception is expected -261: warning in "test_BOOST_CHECK_THROW": exception my_exception is expected -264: fatal error in "test_BOOST_CHECK_THROW": exception my_exception is expected -267: info: check 'exception my_exception is caught' passed -274: error in "test_BOOST_CHECK_EXCEPTION": incorrect exception my_exception is caught -277: info: check 'incorrect exception my_exception is caught' passed -287: error in "test_BOOST_CHECK_NO_THROW": exception thrown by throw my_exception() -333: error in "test_BOOST_CHECK_EQUAL": check i == j failed [1 != 2] -339: error in "test_BOOST_CHECK_EQUAL": check str1 == str2 failed [test1 != test12] -342: error in "test_BOOST_CHECK_EQUAL": check i+1 == j failed [4 != 2] -345: info: check str1 == str3+1 passed -354: fatal error in "test_BOOST_CHECK_EQUAL": critical check str1 == str2 failed [test != null string] -360: warning in "test_BOOST_CHECK_EQUAL": condition b1 == b2 is not satisfied [B(1) != B(2)] -366: error in "test_BOOST_CHECK_EQUAL": check c1 == c3 failed [C(0,100) != C(1,102)]. Index mismatch -367: error in "test_BOOST_CHECK_EQUAL": check c1 == c2 failed [C(0,100) != C(0,101)]. Id mismatch -371: error in "test_BOOST_CHECK_EQUAL": check ch1 == ch2 failed [0xfffffffe != 0xfffffffd] -382: error in "test_BOOST_CHECK_LOGICAL_EXPR": check ++i != j failed [2 == 2] -384: error in "test_BOOST_CHECK_LOGICAL_EXPR": check i < j failed [2 >= 2] -385: error in "test_BOOST_CHECK_LOGICAL_EXPR": check i > j failed [2 <= 2] -392: error in "test_BOOST_CHECK_LOGICAL_EXPR": check i <= j failed [3 > 2] -393: error in "test_BOOST_CHECK_LOGICAL_EXPR": check j >= i failed [2 < 3] -398: error in "test_BOOST_CHECK_LOGICAL_EXPR": check str1 != str2 failed [test1 == test1] -428: error in "test_BOOST_CHECK_PREDICATE": check is_even( i ) failed for ( 17 ) -431: error in "test_BOOST_CHECK_PREDICATE": check not_equal_to()( i, 17 ) failed for ( 17, 17 ) -437: warning in "test_BOOST_CHECK_PREDICATE": condition moo( 12, i, j ) is not satisfied for ( 12, 17, 15 ) -445: error in "test_BOOST_CHECK_PREDICATE": check compare_lists( l1, l2 ) failed for ( , ). Different sizes [2!=0] -456: error in "test_BOOST_REQUIRE_PREDICATE": not aborted -458: fatal error in "test_BOOST_REQUIRE_PREDICATE": critical check less_equal()( arg2, arg1 ) failed for ( 2, 1 ) -479: error in "test_BOOST_CHECK_EQUAL_COLLECTIONS": check { testlist.begin(), testlist.end() } == { pattern, pattern+7 } failed. -Mismatch in a position 2: 4 != 3 -Mismatch in a position 5: 7 != 6 -480: error in "test_BOOST_CHECK_EQUAL_COLLECTIONS": check { testlist.begin(), testlist.end() } == { pattern, pattern+2 } failed. -Collections size mismatch: 7 != 2 -489: error in "test_BOOST_CHECK_BITWISE_EQUAL": check (char)0x06 =.= (char)0x16 failed. -Mismatch in a position 4 -492: warning in "test_BOOST_CHECK_BITWISE_EQUAL": condition (char)0x26 =.= (char)0x04 is not satisfied. -Mismatch in a position 1 -Mismatch in a position 5 -495: fatal error in "test_BOOST_CHECK_BITWISE_EQUAL": critical check (char)0x26 =.= (int)0x26 failed. -Operands bit sizes mismatch: 8 != 32 -still testing -1+1=2 -2+2=4 -struct A -0x14 - 20 -0: fatal error in "test_BOOST_TEST_CHECKPOINT": C string: some error -530: last checkpoint: Going to do a silly things -0: fatal error in "test_BOOST_TEST_PASSPOINT": unknown type -541: last checkpoint +131: warning in "test_BOOST_WARN": condition sizeof(int) == sizeof(short) is not satisfied +134: info: check sizeof(unsigned char) == sizeof(char) passed +156: error in "test_BOOST_CHECK": check false failed +157: error in "test_BOOST_CHECK": check 1==2 failed +158: error in "test_BOOST_CHECK": check i==1 failed +161: info: check i==2 passed +168: error in "test_BOOST_REQUIRE": not aborted +170: fatal error in "test_BOOST_REQUIRE": critical check false failed +174: fatal error in "test_BOOST_REQUIRE": critical check j > 5 failed +177: info: check j < 5 passed +177: error in "test_BOOST_REQUIRE": not aborted +191: info: check 'object size 33 is too small' passed +208: error in "test_BOOST_CHECK_MESSAGE": Well, may be that what I believe in +210: error in "test_BOOST_CHECK_MESSAGE": Checking predicate failed. Some explanation +213: info: check 'Could it fail?' passed +220: fatal error in "test_BOOST_REQUIRE_MESSAGE": Here we should stop +223: info: check 'That's OK' passed +223: error in "test_BOOST_REQUIRE_MESSAGE": not aborted +230: error in "test_BOOST_ERROR": Fail to miss an error +237: fatal error in "test_BOOST_FAIL": No! No! Show must go on. +253: error in "test_BOOST_CHECK_THROW": exception my_exception is expected +256: warning in "test_BOOST_CHECK_THROW": exception my_exception is expected +259: fatal error in "test_BOOST_CHECK_THROW": exception my_exception is expected +262: info: check 'exception my_exception is caught' passed +269: error in "test_BOOST_CHECK_EXCEPTION": incorrect exception my_exception is caught +272: info: check 'incorrect exception my_exception is caught' passed +282: error in "test_BOOST_CHECK_NO_THROW": exception thrown by throw my_exception() +328: error in "test_BOOST_CHECK_EQUAL": check i == j failed [1 != 2] +334: error in "test_BOOST_CHECK_EQUAL": check str1 == str2 failed [test1 != test12] +337: error in "test_BOOST_CHECK_EQUAL": check i+1 == j failed [4 != 2] +340: info: check str1 == str3+1 passed +349: fatal error in "test_BOOST_CHECK_EQUAL": critical check str1 == str2 failed [test != null string] +355: warning in "test_BOOST_CHECK_EQUAL": condition b1 == b2 is not satisfied [B(1) != B(2)] +361: error in "test_BOOST_CHECK_EQUAL": check c1 == c3 failed [C(0,100) != C(1,102)]. Index mismatch +362: error in "test_BOOST_CHECK_EQUAL": check c1 == c2 failed [C(0,100) != C(0,101)]. Id mismatch +366: error in "test_BOOST_CHECK_EQUAL": check ch1 == ch2 failed [0xfffffffe != 0xfffffffd] +377: error in "test_BOOST_CHECK_LOGICAL_EXPR": check ++i != j failed [2 == 2] +379: error in "test_BOOST_CHECK_LOGICAL_EXPR": check i < j failed [2 >= 2] +380: error in "test_BOOST_CHECK_LOGICAL_EXPR": check i > j failed [2 <= 2] +387: error in "test_BOOST_CHECK_LOGICAL_EXPR": check i <= j failed [3 > 2] +388: error in "test_BOOST_CHECK_LOGICAL_EXPR": check j >= i failed [2 < 3] +393: error in "test_BOOST_CHECK_LOGICAL_EXPR": check str1 != str2 failed [test1 == test1] +423: error in "test_BOOST_CHECK_PREDICATE": check is_even( i ) failed for ( 17 ) +426: error in "test_BOOST_CHECK_PREDICATE": check not_equal_to()( i, 17 ) failed for ( 17, 17 ) +432: warning in "test_BOOST_CHECK_PREDICATE": condition moo( 12, i, j ) is not satisfied for ( 12, 17, 15 ) +440: error in "test_BOOST_CHECK_PREDICATE": check compare_lists( l1, l2 ) failed for ( , ). Different sizes [2!=0] +451: error in "test_BOOST_REQUIRE_PREDICATE": not aborted +453: fatal error in "test_BOOST_REQUIRE_PREDICATE": critical check less_equal()( arg2, arg1 ) failed for ( 2, 1 ) +474: error in "test_BOOST_CHECK_EQUAL_COLLECTIONS": check { testlist.begin(), testlist.end() } == { pattern, pattern+7 } failed. +Mismatch in a position 2: 4 != 3 +Mismatch in a position 5: 7 != 6 +475: error in "test_BOOST_CHECK_EQUAL_COLLECTIONS": check { testlist.begin(), testlist.end() } == { pattern, pattern+2 } failed. +Collections size mismatch: 7 != 2 +484: error in "test_BOOST_CHECK_BITWISE_EQUAL": check (char)0x06 =.= (char)0x16 failed. +Mismatch in a position 4 +487: warning in "test_BOOST_CHECK_BITWISE_EQUAL": condition (char)0x26 =.= (char)0x04 is not satisfied. +Mismatch in a position 1 +Mismatch in a position 5 +490: fatal error in "test_BOOST_CHECK_BITWISE_EQUAL": critical check (char)0x26 =.= (int)0x26 failed. +Operands bit sizes mismatch: 8 != 32 +still testing +1+1=2 +2+2=4 +struct A +0x14 + 20 +0: fatal error in "test_BOOST_TEST_CHECKPOINT": C string: some error +525: last checkpoint: Going to do a silly things +0: fatal error in "test_BOOST_TEST_PASSPOINT": unknown type +536: last checkpoint diff --git a/test/test_files/test_undef.cfg b/test/test_files/test_undef.cfg old mode 100755 new mode 100644 index 64b71a0f..618db391 --- a/test/test_files/test_undef.cfg +++ b/test/test_files/test_undef.cfg @@ -1,9 +1,9 @@ -$undef AAA - -$define AAA 123 - -1$AAA$ - -$undef AAA - +$undef AAA + +$define AAA 123 + +1$AAA$ + +$undef AAA + 1$AAA$ \ No newline at end of file diff --git a/test/test_fp_comparisons.cpp b/test/test_fp_comparisons.cpp index fb95eee8..2be99750 100644 --- a/test/test_fp_comparisons.cpp +++ b/test/test_fp_comparisons.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-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) diff --git a/test/test_tools_test.cpp b/test/test_tools_test.cpp index 33589989..4cf6846b 100644 --- a/test/test_tools_test.cpp +++ b/test/test_tools_test.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-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) @@ -211,11 +211,6 @@ TEST_CASE( test_BOOST_CHECK_MESSAGE ) unit_test_log.set_threshold_level( log_successful_tests ); BOOST_CHECK_MESSAGE( 2+2 == 4, "Could it fail?" ); - - int i = 1; - int j = 2; - std::string msg = "some explanation"; - BOOST_CHECK_MESSAGE( i > j, "Comparing " << i << " and " << j << ": " << msg ); } //____________________________________________________________________________// @@ -514,7 +509,7 @@ TEST_CASE( test_BOOST_TEST_MESSAGE ) A a = A(); BOOST_TEST_MESSAGE( a ); -#if BOOST_TEST_USE_STD_LOCALE +#if !defined(BOOST_NO_STD_LOCALE) && ( !defined(BOOST_MSVC) || BOOST_WORKAROUND(BOOST_MSVC, >= 1310)) BOOST_TEST_MESSAGE( std::hex << std::showbase << 20 ); #else BOOST_TEST_MESSAGE( "0x14" ); diff --git a/test/test_tree_management_test.cpp b/test/test_tree_management_test.cpp index 701a65b2..82eb617e 100644 --- a/test/test_tree_management_test.cpp +++ b/test/test_tree_management_test.cpp @@ -22,7 +22,7 @@ using namespace boost::unit_test; BOOST_AUTO_TEST_SUITE( S1 ) -BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( tc1, 1 ) +BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( tc1, 1 ); BOOST_AUTO_TEST_CASE( tc1 ) { BOOST_ERROR(""); } BOOST_AUTO_TEST_CASE( tc2 ) {} @@ -43,7 +43,7 @@ BOOST_AUTO_TEST_CASE( tc2 ) {} BOOST_AUTO_TEST_SUITE( S21 ) -BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( tc1, 1 ) +BOOST_AUTO_TEST_CASE_EXPECTED_FAILURES( tc1, 1 ); BOOST_AUTO_TEST_CASE( tc1 ) { BOOST_ERROR( "" ); } @@ -152,7 +152,7 @@ BOOST_AUTO_TEST_CASE( automated_test_units_registration ) { test_suite& mts = framework::master_test_suite(); - BOOST_CHECK_EQUAL( mts.size(), 8U ); + BOOST_CHECK_EQUAL( mts.size(), 7U ); BOOST_CHECK_EQUAL( mts.p_expected_failures, 2U ); BOOST_CHECK_EQUAL( framework::get( mts.get( "automated_test_units_registration" ) ).p_expected_failures, 0U ); @@ -180,79 +180,4 @@ BOOST_AUTO_TEST_CASE( automated_test_units_registration ) //____________________________________________________________________________// -struct A { - A() : i(0){} - void test_methodA1() { i++; } - void test_methodA2() { i++; } - - int i; -}; - -struct B : public A { - void test_methodB() { i--; } -}; - -struct C { - C() : i( 0 ) {} - - void virtual test_method() = 0; - - int i; -}; - -struct D : public C { - void virtual test_method() { i++; } -}; - -struct E : public C { - void virtual test_method() { i+=2; } -}; - -BOOST_AUTO_TEST_CASE( user_class_test_case ) -{ - boost::shared_ptr instA( new A ); - test_case* tc1 = BOOST_CLASS_TEST_CASE( &A::test_methodA1, instA ); - test_case* tc2 = BOOST_CLASS_TEST_CASE( &A::test_methodA2, instA ); - - BOOST_CHECK_EQUAL( tc1->p_name, const_string( "A::test_methodA1" ) ); - BOOST_CHECK_EQUAL( tc2->p_name, const_string( "A::test_methodA2" ) ); - - BOOST_CHECK_EQUAL( instA->i, 0 ); - tc1->test_func()(); - BOOST_CHECK_EQUAL( instA->i, 1 ); - tc2->test_func()(); - BOOST_CHECK_EQUAL( instA->i, 2 ); - - boost::shared_ptr instB( new B ); - test_case* tc3 = BOOST_CLASS_TEST_CASE( &A::test_methodA1, instB ); - test_case* tc4 = BOOST_CLASS_TEST_CASE( &B::test_methodB, instB ); - - BOOST_CHECK_EQUAL( tc3->p_name, const_string( "A::test_methodA1" ) ); - BOOST_CHECK_EQUAL( tc4->p_name, const_string( "B::test_methodB" ) ); - - BOOST_CHECK_EQUAL( instB->i, 0 ); - tc3->test_func()(); - BOOST_CHECK_EQUAL( instB->i, 1 ); - tc4->test_func()(); - BOOST_CHECK_EQUAL( instB->i, 0 ); - - boost::shared_ptr instC1( new D ); - test_case* tc5 = BOOST_CLASS_TEST_CASE( &C::test_method, instC1 ); - - BOOST_CHECK_EQUAL( tc5->p_name, const_string( "C::test_method" ) ); - - tc5->test_func()(); - BOOST_CHECK_EQUAL( instC1->i, 1 ); - - boost::shared_ptr instC2( new E ); - test_case* tc6 = BOOST_CLASS_TEST_CASE( &C::test_method, instC2 ); - - BOOST_CHECK_EQUAL( tc6->p_name, const_string( "C::test_method" ) ); - - tc6->test_func()(); - BOOST_CHECK_EQUAL( instC2->i, 2 ); -} - -//____________________________________________________________________________// - // EOF diff --git a/test/token_iterator_test.cpp b/test/token_iterator_test.cpp index 1116e127..b7c9536e 100644 --- a/test/token_iterator_test.cpp +++ b/test/token_iterator_test.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2001-2008. +// (C) Copyright Gennadiy Rozental 2001-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) diff --git a/tools/console_test_runner/src/console_test_runner.cpp b/tools/console_test_runner/src/console_test_runner.cpp index ebfb154f..c10d6aff 100644 --- a/tools/console_test_runner/src/console_test_runner.cpp +++ b/tools/console_test_runner/src/console_test_runner.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2007. +// (C) Copyright Gennadiy Rozental 2005. // 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) diff --git a/tools/console_test_runner/test/test_runner_test.cpp b/tools/console_test_runner/test/test_runner_test.cpp index 64cb051a..b4a9061a 100644 --- a/tools/console_test_runner/test/test_runner_test.cpp +++ b/tools/console_test_runner/test/test_runner_test.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2007. +// (C) Copyright Gennadiy Rozental 2005. // 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)