From 86a65b062a90c860fd5de9375e9f11e9cc6911fa Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Wed, 26 Nov 2008 21:07:14 +0000 Subject: [PATCH] testfrmwk.hpp moved to the tests directory. It was not a part of the library public interface and should not be seen by users. [SVN r49946] --- test/Jamfile.v2 | 2 +- test/gregorian/testdate.cpp | 2 +- test/gregorian/testdate_duration.cpp | 2 +- test/gregorian/testdate_facet_new.cpp | 2 +- test/gregorian/testdate_input_facet.cpp | 2 +- test/gregorian/testdate_iterator.cpp | 2 +- test/gregorian/testfacet.cpp | 2 +- test/gregorian/testformat_date_parser.cpp | 2 +- test/gregorian/testformatters.cpp | 2 +- test/gregorian/testgenerators.cpp | 2 +- test/gregorian/testgreg_cal.cpp | 2 +- test/gregorian/testgreg_day.cpp | 2 +- test/gregorian/testgreg_durations.cpp | 2 +- test/gregorian/testgreg_month.cpp | 2 +- test/gregorian/testgreg_serialize.cpp | 2 +- test/gregorian/testgreg_wstream.cpp | 2 +- test/gregorian/testgreg_year.cpp | 2 +- test/gregorian/testparse_date.cpp | 2 +- test/gregorian/testperiod.cpp | 2 +- test/local_time/testcustom_time_zone.cpp | 2 +- .../testdst_transition_day_rule.cpp | 2 +- test/local_time/testlocal_time.cpp | 2 +- test/local_time/testlocal_time_facet.cpp | 2 +- .../local_time/testlocal_time_input_facet.cpp | 2 +- test/local_time/testlocal_time_iterator.cpp | 2 +- test/local_time/testlocal_time_period.cpp | 2 +- test/local_time/testposix_time_zone.cpp | 2 +- test/local_time/testtz_database.cpp | 2 +- test/local_time/testwcustom_time_zone.cpp | 2 +- test/local_time/testwposix_time_zone.cpp | 2 +- test/posix_time/testc_local_adjustor.cpp | 2 +- test/posix_time/testdst_rules.cpp | 2 +- test/posix_time/testduration.cpp | 2 +- test/posix_time/testfiletime_functions.cpp | 13 +---------- test/posix_time/testformatters.cpp | 2 +- .../testgreg_duration_operators.cpp | 2 +- test/posix_time/testiterator.cpp | 2 +- test/posix_time/testlocal_adjustor.cpp | 2 +- test/posix_time/testmicrosec_time_clock.cpp | 2 +- test/posix_time/testparse_time.cpp | 2 +- test/posix_time/testperiod.cpp | 2 +- test/posix_time/teststreams.cpp | 2 +- test/posix_time/testtime.cpp | 2 +- test/posix_time/testtime_facet.cpp | 4 ++-- test/posix_time/testtime_formatters.cpp | 2 +- test/posix_time/testtime_input_facet.cpp | 2 +- test/posix_time/testtime_period.cpp | 2 +- test/posix_time/testtime_serialize.cpp | 2 +- test/posix_time/testtime_wstream.cpp | 2 +- test/testconstrained_value.cpp | 2 +- .../boost/date_time => test}/testfrmwk.hpp | 22 +++++++++++++++++++ test/testgeneric_period.cpp | 2 +- test/testgregorian_calendar.cpp | 2 +- test/testint_adapter.cpp | 2 +- test/testtime_resolution_traits.cpp | 2 +- test/testwrapping_int.cpp | 2 +- xmldoc/Jamfile.v2 | 20 +++++++++-------- xmldoc/changes.xml | 14 ++++-------- 58 files changed, 93 insertions(+), 86 deletions(-) rename {include/boost/date_time => test}/testfrmwk.hpp (72%) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index f97e50d..16317b2 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -1,7 +1,7 @@ local DATE_TIME_DYNAMIC_PROPERTIES = BOOST_ALL_DYN_LINK shared BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG BOOST_ALL_NO_LIB ; -local DATE_TIME_PROPERTIES = BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG BOOST_DATE_TIME_STATIC_LINK +local DATE_TIME_PROPERTIES = BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG BOOST_DATE_TIME_STATIC_LINK # FIXME #std::locale-support BOOST_ALL_NO_LIB ; diff --git a/test/gregorian/testdate.cpp b/test/gregorian/testdate.cpp index b478de9..4984a63 100644 --- a/test/gregorian/testdate.cpp +++ b/test/gregorian/testdate.cpp @@ -7,7 +7,7 @@ #include #include "boost/date_time/gregorian/gregorian.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" int main() diff --git a/test/gregorian/testdate_duration.cpp b/test/gregorian/testdate_duration.cpp index 6816ae2..12bee2d 100644 --- a/test/gregorian/testdate_duration.cpp +++ b/test/gregorian/testdate_duration.cpp @@ -6,7 +6,7 @@ */ #include "boost/date_time/gregorian/gregorian.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #include diff --git a/test/gregorian/testdate_facet_new.cpp b/test/gregorian/testdate_facet_new.cpp index 8e92afe..c5569c4 100644 --- a/test/gregorian/testdate_facet_new.cpp +++ b/test/gregorian/testdate_facet_new.cpp @@ -10,7 +10,7 @@ #include "boost/date_time/gregorian/gregorian.hpp" #include "boost/date_time/date_facet.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #include #include diff --git a/test/gregorian/testdate_input_facet.cpp b/test/gregorian/testdate_input_facet.cpp index 52dfa4e..06db7ae 100644 --- a/test/gregorian/testdate_input_facet.cpp +++ b/test/gregorian/testdate_input_facet.cpp @@ -7,7 +7,7 @@ */ #include "boost/date_time/gregorian/gregorian.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #include #include #include diff --git a/test/gregorian/testdate_iterator.cpp b/test/gregorian/testdate_iterator.cpp index 01fcf6c..f82e3d2 100644 --- a/test/gregorian/testdate_iterator.cpp +++ b/test/gregorian/testdate_iterator.cpp @@ -6,7 +6,7 @@ */ #include "boost/date_time/gregorian/gregorian.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #include diff --git a/test/gregorian/testfacet.cpp b/test/gregorian/testfacet.cpp index f48f3c8..7139a98 100644 --- a/test/gregorian/testfacet.cpp +++ b/test/gregorian/testfacet.cpp @@ -13,7 +13,7 @@ #include "boost/date_time/gregorian/greg_facet.hpp" #include "boost/date_time/date_format_simple.hpp" #include "boost/date_time/gregorian/gregorian.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #ifndef BOOST_DATE_TIME_NO_LOCALE diff --git a/test/gregorian/testformat_date_parser.cpp b/test/gregorian/testformat_date_parser.cpp index 7558913..aacb001 100644 --- a/test/gregorian/testformat_date_parser.cpp +++ b/test/gregorian/testformat_date_parser.cpp @@ -8,7 +8,7 @@ #include "boost/date_time/gregorian/gregorian.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #include "boost/date_time/format_date_parser.hpp" #include #include diff --git a/test/gregorian/testformatters.cpp b/test/gregorian/testformatters.cpp index ba1aa38..80d778c 100644 --- a/test/gregorian/testformatters.cpp +++ b/test/gregorian/testformatters.cpp @@ -6,7 +6,7 @@ */ #include "boost/date_time/gregorian/gregorian.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" int main() diff --git a/test/gregorian/testgenerators.cpp b/test/gregorian/testgenerators.cpp index beabdbf..8b19924 100644 --- a/test/gregorian/testgenerators.cpp +++ b/test/gregorian/testgenerators.cpp @@ -6,7 +6,7 @@ */ #include "boost/date_time/gregorian/gregorian.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #include #include #include diff --git a/test/gregorian/testgreg_cal.cpp b/test/gregorian/testgreg_cal.cpp index fb5ecb4..43558a2 100644 --- a/test/gregorian/testgreg_cal.cpp +++ b/test/gregorian/testgreg_cal.cpp @@ -6,7 +6,7 @@ */ #include "boost/date_time/gregorian/greg_calendar.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #include diff --git a/test/gregorian/testgreg_day.cpp b/test/gregorian/testgreg_day.cpp index 1430671..1cb5c44 100644 --- a/test/gregorian/testgreg_day.cpp +++ b/test/gregorian/testgreg_day.cpp @@ -8,7 +8,7 @@ #include "boost/date_time/gregorian/greg_day.hpp" #include "boost/date_time/gregorian/greg_weekday.hpp" #include "boost/date_time/gregorian/greg_day_of_year.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #include diff --git a/test/gregorian/testgreg_durations.cpp b/test/gregorian/testgreg_durations.cpp index ca6addf..67bf99d 100644 --- a/test/gregorian/testgreg_durations.cpp +++ b/test/gregorian/testgreg_durations.cpp @@ -6,7 +6,7 @@ */ #include "boost/date_time/gregorian/gregorian.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" int main(){ diff --git a/test/gregorian/testgreg_month.cpp b/test/gregorian/testgreg_month.cpp index db61171..3e5db8f 100644 --- a/test/gregorian/testgreg_month.cpp +++ b/test/gregorian/testgreg_month.cpp @@ -6,7 +6,7 @@ */ #include "boost/date_time/gregorian/greg_month.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #include diff --git a/test/gregorian/testgreg_serialize.cpp b/test/gregorian/testgreg_serialize.cpp index bfd719a..6fc15e1 100644 --- a/test/gregorian/testgreg_serialize.cpp +++ b/test/gregorian/testgreg_serialize.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include "../testfrmwk.hpp" #include using namespace boost; diff --git a/test/gregorian/testgreg_wstream.cpp b/test/gregorian/testgreg_wstream.cpp index 86521f2..79b02e1 100644 --- a/test/gregorian/testgreg_wstream.cpp +++ b/test/gregorian/testgreg_wstream.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include "../testfrmwk.hpp" using namespace boost::gregorian; diff --git a/test/gregorian/testgreg_year.cpp b/test/gregorian/testgreg_year.cpp index d258215..1ae0709 100644 --- a/test/gregorian/testgreg_year.cpp +++ b/test/gregorian/testgreg_year.cpp @@ -6,7 +6,7 @@ */ #include "boost/date_time/gregorian/greg_year.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #include diff --git a/test/gregorian/testparse_date.cpp b/test/gregorian/testparse_date.cpp index 17d3e27..3612280 100644 --- a/test/gregorian/testparse_date.cpp +++ b/test/gregorian/testparse_date.cpp @@ -6,7 +6,7 @@ */ #include "boost/date_time/gregorian/gregorian.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #include "boost/lexical_cast.hpp" #include #include diff --git a/test/gregorian/testperiod.cpp b/test/gregorian/testperiod.cpp index a283975..969dcec 100644 --- a/test/gregorian/testperiod.cpp +++ b/test/gregorian/testperiod.cpp @@ -6,7 +6,7 @@ */ #include "boost/date_time/gregorian/gregorian.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #include int main() diff --git a/test/local_time/testcustom_time_zone.cpp b/test/local_time/testcustom_time_zone.cpp index 61f2168..c45965e 100644 --- a/test/local_time/testcustom_time_zone.cpp +++ b/test/local_time/testcustom_time_zone.cpp @@ -6,7 +6,7 @@ */ #include "boost/date_time/local_time/local_time.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #include int diff --git a/test/local_time/testdst_transition_day_rule.cpp b/test/local_time/testdst_transition_day_rule.cpp index 1eaf343..d3ca19a 100644 --- a/test/local_time/testdst_transition_day_rule.cpp +++ b/test/local_time/testdst_transition_day_rule.cpp @@ -8,7 +8,7 @@ #include "boost/date_time/gregorian/gregorian.hpp" #include "boost/date_time/local_time/dst_transition_day_rules.hpp" #include "boost/shared_ptr.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" diff --git a/test/local_time/testlocal_time.cpp b/test/local_time/testlocal_time.cpp index bd62582..b6077dd 100644 --- a/test/local_time/testlocal_time.cpp +++ b/test/local_time/testlocal_time.cpp @@ -10,7 +10,7 @@ #include "boost/date_time/posix_time/posix_time.hpp" #include "boost/date_time/local_time/local_time.hpp" // #include "boost/date_time/local_time/posix_time_zone.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" //#include "boost/date_time/c_time.hpp" #include diff --git a/test/local_time/testlocal_time_facet.cpp b/test/local_time/testlocal_time_facet.cpp index e93fd21..06f788a 100644 --- a/test/local_time/testlocal_time_facet.cpp +++ b/test/local_time/testlocal_time_facet.cpp @@ -11,7 +11,7 @@ #include #include #include "boost/date_time/local_time/local_time.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" template diff --git a/test/local_time/testlocal_time_input_facet.cpp b/test/local_time/testlocal_time_input_facet.cpp index da62a6b..207e26f 100644 --- a/test/local_time/testlocal_time_input_facet.cpp +++ b/test/local_time/testlocal_time_input_facet.cpp @@ -6,7 +6,7 @@ */ #include "boost/date_time/local_time/local_time.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #include #include #include diff --git a/test/local_time/testlocal_time_iterator.cpp b/test/local_time/testlocal_time_iterator.cpp index df39d2d..670b572 100644 --- a/test/local_time/testlocal_time_iterator.cpp +++ b/test/local_time/testlocal_time_iterator.cpp @@ -8,7 +8,7 @@ #include #include "boost/date_time/local_time/local_time.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" // #if defined(BOOST_DATE_TIME_INCLUDE_LIMITED_HEADERS) // #include "boost/date_time/gregorian/formatters_limited.hpp" // #else diff --git a/test/local_time/testlocal_time_period.cpp b/test/local_time/testlocal_time_period.cpp index 197ee8b..64c8f75 100644 --- a/test/local_time/testlocal_time_period.cpp +++ b/test/local_time/testlocal_time_period.cpp @@ -6,7 +6,7 @@ */ #include "boost/date_time/local_time/local_time.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" int main() { diff --git a/test/local_time/testposix_time_zone.cpp b/test/local_time/testposix_time_zone.cpp index dfaf7d8..8f1dbf3 100644 --- a/test/local_time/testposix_time_zone.cpp +++ b/test/local_time/testposix_time_zone.cpp @@ -8,7 +8,7 @@ #include "boost/date_time/gregorian/gregorian.hpp" //#include "boost/date_time/local_time/time_zone.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #include "boost/date_time/local_time/posix_time_zone.hpp" diff --git a/test/local_time/testtz_database.cpp b/test/local_time/testtz_database.cpp index f494048..c8b8ec3 100644 --- a/test/local_time/testtz_database.cpp +++ b/test/local_time/testtz_database.cpp @@ -6,7 +6,7 @@ */ -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #include "boost/date_time/gregorian/gregorian.hpp" #include "boost/date_time/posix_time/posix_time.hpp" #include "boost/date_time/local_time/custom_time_zone.hpp" diff --git a/test/local_time/testwcustom_time_zone.cpp b/test/local_time/testwcustom_time_zone.cpp index ea57f46..ad25ac3 100644 --- a/test/local_time/testwcustom_time_zone.cpp +++ b/test/local_time/testwcustom_time_zone.cpp @@ -6,7 +6,7 @@ */ #include "boost/date_time/local_time/local_time.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #include int diff --git a/test/local_time/testwposix_time_zone.cpp b/test/local_time/testwposix_time_zone.cpp index ed85396..9986db5 100644 --- a/test/local_time/testwposix_time_zone.cpp +++ b/test/local_time/testwposix_time_zone.cpp @@ -8,7 +8,7 @@ #include "boost/date_time/gregorian/gregorian.hpp" //#include "boost/date_time/local_time/time_zone.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #include "boost/date_time/local_time/posix_time_zone.hpp" diff --git a/test/posix_time/testc_local_adjustor.cpp b/test/posix_time/testc_local_adjustor.cpp index 298b8fa..76d6c0c 100644 --- a/test/posix_time/testc_local_adjustor.cpp +++ b/test/posix_time/testc_local_adjustor.cpp @@ -7,7 +7,7 @@ #include "boost/date_time/posix_time/posix_time.hpp" #include "boost/date_time/c_local_time_adjustor.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" int main() diff --git a/test/posix_time/testdst_rules.cpp b/test/posix_time/testdst_rules.cpp index 238edc6..a0b069d 100644 --- a/test/posix_time/testdst_rules.cpp +++ b/test/posix_time/testdst_rules.cpp @@ -7,7 +7,7 @@ #include "boost/date_time/posix_time/posix_time.hpp" #include "boost/date_time/local_timezone_defs.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" // Define dst rule for Paraguay which is transitions forward on Oct 1 and // back Mar 1 diff --git a/test/posix_time/testduration.cpp b/test/posix_time/testduration.cpp index 3a6ac7f..791d7ef 100644 --- a/test/posix_time/testduration.cpp +++ b/test/posix_time/testduration.cpp @@ -13,7 +13,7 @@ #else #include "boost/date_time/posix_time/time_formatters.hpp" #endif -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" int diff --git a/test/posix_time/testfiletime_functions.cpp b/test/posix_time/testfiletime_functions.cpp index 5264f44..2929800 100644 --- a/test/posix_time/testfiletime_functions.cpp +++ b/test/posix_time/testfiletime_functions.cpp @@ -6,7 +6,7 @@ */ #include "boost/date_time/posix_time/posix_time.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #include "boost/date_time/filetime_functions.hpp" #include @@ -14,17 +14,6 @@ #include #endif -template< typename T, typename U > -inline bool check_equal(const std::string& testname, T const& left, U const& right) -{ - bool res = check(testname, left == right); - if (!res) - { - std::cout << " left = " << left << ", right = " << right << std::endl; - } - return res; -} - int main() { #if defined(BOOST_HAS_FTIME) // skip tests if no FILETIME diff --git a/test/posix_time/testformatters.cpp b/test/posix_time/testformatters.cpp index b4090e4..74dae88 100644 --- a/test/posix_time/testformatters.cpp +++ b/test/posix_time/testformatters.cpp @@ -6,7 +6,7 @@ */ #include "boost/date_time/posix_time/posix_time.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" int main() diff --git a/test/posix_time/testgreg_duration_operators.cpp b/test/posix_time/testgreg_duration_operators.cpp index 3e75173..005a617 100644 --- a/test/posix_time/testgreg_duration_operators.cpp +++ b/test/posix_time/testgreg_duration_operators.cpp @@ -7,7 +7,7 @@ #include "boost/date_time/gregorian/gregorian.hpp" #include "boost/date_time/posix_time/posix_time.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" int main(){ diff --git a/test/posix_time/testiterator.cpp b/test/posix_time/testiterator.cpp index 6e7eed0..dbdcfeb 100644 --- a/test/posix_time/testiterator.cpp +++ b/test/posix_time/testiterator.cpp @@ -8,7 +8,7 @@ #include #include "boost/date_time/posix_time/posix_time.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #if defined(BOOST_DATE_TIME_INCLUDE_LIMITED_HEADERS) #include "boost/date_time/gregorian/formatters_limited.hpp" #else diff --git a/test/posix_time/testlocal_adjustor.cpp b/test/posix_time/testlocal_adjustor.cpp index dd91d05..c84c6ba 100644 --- a/test/posix_time/testlocal_adjustor.cpp +++ b/test/posix_time/testlocal_adjustor.cpp @@ -8,7 +8,7 @@ #include "boost/date_time/posix_time/posix_time.hpp" #include "boost/date_time/local_time_adjustor.hpp" #include "boost/date_time/local_timezone_defs.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" int main() diff --git a/test/posix_time/testmicrosec_time_clock.cpp b/test/posix_time/testmicrosec_time_clock.cpp index 9a251bf..e3fa020 100644 --- a/test/posix_time/testmicrosec_time_clock.cpp +++ b/test/posix_time/testmicrosec_time_clock.cpp @@ -7,7 +7,7 @@ #include "boost/date_time/posix_time/posix_time.hpp" #include "boost/date_time/microsec_time_clock.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #if defined(BOOST_HAS_FTIME) #include #endif diff --git a/test/posix_time/testparse_time.cpp b/test/posix_time/testparse_time.cpp index ec52419..d56ed6a 100644 --- a/test/posix_time/testparse_time.cpp +++ b/test/posix_time/testparse_time.cpp @@ -6,7 +6,7 @@ */ #include "boost/date_time/posix_time/posix_time.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" int diff --git a/test/posix_time/testperiod.cpp b/test/posix_time/testperiod.cpp index a671b5c..211412e 100644 --- a/test/posix_time/testperiod.cpp +++ b/test/posix_time/testperiod.cpp @@ -8,7 +8,7 @@ #include #include "boost/date_time/posix_time/posix_time.hpp" #include "boost/date_time/posix_time/time_period.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" int main() { diff --git a/test/posix_time/teststreams.cpp b/test/posix_time/teststreams.cpp index 0daa6f7..d30692a 100644 --- a/test/posix_time/teststreams.cpp +++ b/test/posix_time/teststreams.cpp @@ -6,7 +6,7 @@ */ #include "boost/date_time/posix_time/posix_time.hpp" #include "boost/date_time/gregorian/gregorian.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #ifndef BOOST_DATE_TIME_NO_LOCALE diff --git a/test/posix_time/testtime.cpp b/test/posix_time/testtime.cpp index 0bc7d50..e73808c 100644 --- a/test/posix_time/testtime.cpp +++ b/test/posix_time/testtime.cpp @@ -8,7 +8,7 @@ #include #include "boost/date_time/gregorian/gregorian.hpp" #include "boost/date_time/posix_time/posix_time.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" void special_values_tests() { diff --git a/test/posix_time/testtime_facet.cpp b/test/posix_time/testtime_facet.cpp index 44a205e..37c2144 100644 --- a/test/posix_time/testtime_facet.cpp +++ b/test/posix_time/testtime_facet.cpp @@ -8,7 +8,7 @@ */ #include "boost/date_time/posix_time/posix_time.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #include #include #include @@ -24,7 +24,7 @@ teststreaming(std::string testname, std::basic_stringstream ss; ss.imbue(locale); ss << value; - check(testname, ss.str() == expected_result); + check_equal(testname, ss.str(), expected_result); } diff --git a/test/posix_time/testtime_formatters.cpp b/test/posix_time/testtime_formatters.cpp index a6658c7..bafeda9 100644 --- a/test/posix_time/testtime_formatters.cpp +++ b/test/posix_time/testtime_formatters.cpp @@ -6,7 +6,7 @@ */ #include "boost/date_time/posix_time/posix_time.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" int main() diff --git a/test/posix_time/testtime_input_facet.cpp b/test/posix_time/testtime_input_facet.cpp index 39d7a2d..8e704e1 100644 --- a/test/posix_time/testtime_input_facet.cpp +++ b/test/posix_time/testtime_input_facet.cpp @@ -8,7 +8,7 @@ #include "boost/date_time/gregorian/gregorian.hpp" #include "boost/date_time/posix_time/posix_time.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" #include #include #include diff --git a/test/posix_time/testtime_period.cpp b/test/posix_time/testtime_period.cpp index 7d9850c..67dc453 100644 --- a/test/posix_time/testtime_period.cpp +++ b/test/posix_time/testtime_period.cpp @@ -8,7 +8,7 @@ #include #include "boost/date_time/posix_time/posix_time.hpp" #include "boost/date_time/posix_time/time_period.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "../testfrmwk.hpp" int main() { diff --git a/test/posix_time/testtime_serialize.cpp b/test/posix_time/testtime_serialize.cpp index 5c91931..f5daaaa 100644 --- a/test/posix_time/testtime_serialize.cpp +++ b/test/posix_time/testtime_serialize.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include "../testfrmwk.hpp" #include using namespace boost; diff --git a/test/posix_time/testtime_wstream.cpp b/test/posix_time/testtime_wstream.cpp index 2fe4a4f..f2b0c45 100644 --- a/test/posix_time/testtime_wstream.cpp +++ b/test/posix_time/testtime_wstream.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include "../testfrmwk.hpp" #include using namespace boost::gregorian; diff --git a/test/testconstrained_value.cpp b/test/testconstrained_value.cpp index 55e9f2b..7db8d10 100644 --- a/test/testconstrained_value.cpp +++ b/test/testconstrained_value.cpp @@ -7,7 +7,7 @@ #include "boost/config.hpp" #include "boost/date_time/constrained_value.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "testfrmwk.hpp" #include class bad_day {}; //exception type diff --git a/include/boost/date_time/testfrmwk.hpp b/test/testfrmwk.hpp similarity index 72% rename from include/boost/date_time/testfrmwk.hpp rename to test/testfrmwk.hpp index 6900092..23ff944 100644 --- a/include/boost/date_time/testfrmwk.hpp +++ b/test/testfrmwk.hpp @@ -55,6 +55,28 @@ bool check(const std::string& testname, bool testcond) } } +template< typename T, typename U > +inline bool check_equal(const std::string& testname, T const& left, U const& right) +{ + bool res = check(testname, left == right); + if (!res) + { + std::cout << " left = " << left << ", right = " << right << std::endl; + } + return res; +} + +#ifndef BOOST_NO_STD_WSTRING +inline bool check_equal(const std::string& testname, std::wstring const& left, std::wstring const& right) +{ + bool res = check(testname, left == right); + if (!res) + { + std::wcout << L" left = " << left << L", right = " << right << std::endl; + } + return res; +} +#endif int printTestStats() { diff --git a/test/testgeneric_period.cpp b/test/testgeneric_period.cpp index 7077015..230c25c 100644 --- a/test/testgeneric_period.cpp +++ b/test/testgeneric_period.cpp @@ -7,7 +7,7 @@ #include #include "boost/date_time/period.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "testfrmwk.hpp" /*! duration_rep parameter for period requires a func unit() that * returns the smallest unit of measure for this type. This minimal diff --git a/test/testgregorian_calendar.cpp b/test/testgregorian_calendar.cpp index d3eedbd..c0fedac 100644 --- a/test/testgregorian_calendar.cpp +++ b/test/testgregorian_calendar.cpp @@ -7,7 +7,7 @@ #include "boost/date_time/gregorian_calendar.hpp" #include "boost/date_time/year_month_day.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "testfrmwk.hpp" #include int diff --git a/test/testint_adapter.cpp b/test/testint_adapter.cpp index 66cc12a..8abba21 100644 --- a/test/testint_adapter.cpp +++ b/test/testint_adapter.cpp @@ -6,7 +6,7 @@ */ #include "boost/date_time/int_adapter.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "testfrmwk.hpp" #include "boost/cstdint.hpp" #include #include diff --git a/test/testtime_resolution_traits.cpp b/test/testtime_resolution_traits.cpp index 6886fd5..20d0ae3 100644 --- a/test/testtime_resolution_traits.cpp +++ b/test/testtime_resolution_traits.cpp @@ -6,7 +6,7 @@ */ #include "boost/date_time/time_resolution_traits.hpp" -#include "boost/date_time/testfrmwk.hpp" +#include "testfrmwk.hpp" int diff --git a/test/testwrapping_int.cpp b/test/testwrapping_int.cpp index 25c7b1b..67f9bf7 100644 --- a/test/testwrapping_int.cpp +++ b/test/testwrapping_int.cpp @@ -8,7 +8,7 @@ #include "boost/date_time/wrapping_int.hpp" //#define BOOST_INCLUDE_MAIN //#include -#include "boost/date_time/testfrmwk.hpp" +#include "testfrmwk.hpp" #include "boost/cstdint.hpp" #include diff --git a/xmldoc/Jamfile.v2 b/xmldoc/Jamfile.v2 index ac9bb75..444a05e 100644 --- a/xmldoc/Jamfile.v2 +++ b/xmldoc/Jamfile.v2 @@ -15,15 +15,17 @@ boostbook date_time : date_time.xml ; # file lists take the form of [ set.difference [ glob include/these ] : [ glob but/not/these ] ] -local date_time_files = [ set.difference - [ glob ../../../boost/date_time/*.hpp ] : - [ glob ../../../boost/date_time/testfrmwk.hpp - # ../../../boost/date_time/time_zone_base.hpp - # ../../../boost/date_time/time_zone_names.hpp - # ../../../boost/date_time/tz_db_base.hpp - # ../../../boost/date_time/dst_transition_generators.hpp - ] - ] ; +local date_time_files = [ glob ../../../boost/date_time/*.hpp ] ; + +# local date_time_files = [ set.difference +# [ glob ../../../boost/date_time/*.hpp ] : +# [ glob ../../../boost/date_time/testfrmwk.hpp +# # ../../../boost/date_time/time_zone_base.hpp +# # ../../../boost/date_time/time_zone_names.hpp +# # ../../../boost/date_time/tz_db_base.hpp +# # ../../../boost/date_time/dst_transition_generators.hpp +# ] +# ] ; local gregorian_files = [ set.difference [ glob ../../../boost/date_time/gregorian/*.hpp ] : diff --git a/xmldoc/changes.xml b/xmldoc/changes.xml index 17c40a6..4fe0983 100644 --- a/xmldoc/changes.xml +++ b/xmldoc/changes.xml @@ -9,7 +9,7 @@
Change History - + Changes from Boost 1.34 to 1.38 (date_time 1.05 to 1.06) @@ -111,8 +111,10 @@ - Bug Fix + Bug fix + Removed the testfrmwk.hpp file from the public include directory. This file + was internal for the library tests and was not documented. @@ -166,7 +168,6 @@ Bug Fix Fix DST traits for Austrialia (sf# 1672139) to set end of DST at 3:00 am instead of 2:00 am. - @@ -213,13 +214,6 @@ - - - Bug Fix - - - -