Subject: [Boost-commit] svn:boost r49932 - in trunk: boost/date_time libs/date_time/test libs/date_time/test/gregorian libs/date_time/test/local_time libs/date_time/test/posix_time
From: andrey.semashev_at_[hidden]
Date: 2008-11-25 15:36:57
Author: andysem
Date: 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
New Revision: 49932
URL: http://svn.boost.org/trac/boost/changeset/49932
Log:
testfrmwk.hpp moved to the tests directory. It was not a part of the library public interface and should not be seen by users.
Added:
trunk/libs/date_time/test/testfrmwk.hpp (contents, props changed)
- copied, changed from r49875, /trunk/boost/date_time/testfrmwk.hpp
Removed:
trunk/boost/date_time/testfrmwk.hpp
Text files modified:
trunk/libs/date_time/test/Jamfile.v2 | 2 +-
trunk/libs/date_time/test/gregorian/testdate.cpp | 2 +-
trunk/libs/date_time/test/gregorian/testdate_duration.cpp | 2 +-
trunk/libs/date_time/test/gregorian/testdate_facet_new.cpp | 2 +-
trunk/libs/date_time/test/gregorian/testdate_input_facet.cpp | 2 +-
trunk/libs/date_time/test/gregorian/testdate_iterator.cpp | 2 +-
trunk/libs/date_time/test/gregorian/testfacet.cpp | 2 +-
trunk/libs/date_time/test/gregorian/testformat_date_parser.cpp | 2 +-
trunk/libs/date_time/test/gregorian/testformatters.cpp | 2 +-
trunk/libs/date_time/test/gregorian/testgenerators.cpp | 2 +-
trunk/libs/date_time/test/gregorian/testgreg_cal.cpp | 2 +-
trunk/libs/date_time/test/gregorian/testgreg_day.cpp | 2 +-
trunk/libs/date_time/test/gregorian/testgreg_durations.cpp | 2 +-
trunk/libs/date_time/test/gregorian/testgreg_month.cpp | 2 +-
trunk/libs/date_time/test/gregorian/testgreg_serialize.cpp | 2 +-
trunk/libs/date_time/test/gregorian/testgreg_wstream.cpp | 2 +-
trunk/libs/date_time/test/gregorian/testgreg_year.cpp | 2 +-
trunk/libs/date_time/test/gregorian/testparse_date.cpp | 2 +-
trunk/libs/date_time/test/gregorian/testperiod.cpp | 2 +-
trunk/libs/date_time/test/local_time/testcustom_time_zone.cpp | 2 +-
trunk/libs/date_time/test/local_time/testdst_transition_day_rule.cpp | 2 +-
trunk/libs/date_time/test/local_time/testlocal_time.cpp | 2 +-
trunk/libs/date_time/test/local_time/testlocal_time_facet.cpp | 2 +-
trunk/libs/date_time/test/local_time/testlocal_time_input_facet.cpp | 2 +-
trunk/libs/date_time/test/local_time/testlocal_time_iterator.cpp | 2 +-
trunk/libs/date_time/test/local_time/testlocal_time_period.cpp | 2 +-
trunk/libs/date_time/test/local_time/testposix_time_zone.cpp | 2 +-
trunk/libs/date_time/test/local_time/testtz_database.cpp | 2 +-
trunk/libs/date_time/test/local_time/testwcustom_time_zone.cpp | 2 +-
trunk/libs/date_time/test/local_time/testwposix_time_zone.cpp | 2 +-
trunk/libs/date_time/test/posix_time/testc_local_adjustor.cpp | 2 +-
trunk/libs/date_time/test/posix_time/testdst_rules.cpp | 2 +-
trunk/libs/date_time/test/posix_time/testduration.cpp | 2 +-
trunk/libs/date_time/test/posix_time/testfiletime_functions.cpp | 13 +------------
trunk/libs/date_time/test/posix_time/testformatters.cpp | 2 +-
trunk/libs/date_time/test/posix_time/testgreg_duration_operators.cpp | 2 +-
trunk/libs/date_time/test/posix_time/testiterator.cpp | 2 +-
trunk/libs/date_time/test/posix_time/testlocal_adjustor.cpp | 2 +-
trunk/libs/date_time/test/posix_time/testmicrosec_time_clock.cpp | 2 +-
trunk/libs/date_time/test/posix_time/testparse_time.cpp | 2 +-
trunk/libs/date_time/test/posix_time/testperiod.cpp | 2 +-
trunk/libs/date_time/test/posix_time/teststreams.cpp | 2 +-
trunk/libs/date_time/test/posix_time/testtime.cpp | 2 +-
trunk/libs/date_time/test/posix_time/testtime_facet.cpp | 4 ++--
trunk/libs/date_time/test/posix_time/testtime_formatters.cpp | 2 +-
trunk/libs/date_time/test/posix_time/testtime_input_facet.cpp | 2 +-
trunk/libs/date_time/test/posix_time/testtime_period.cpp | 2 +-
trunk/libs/date_time/test/posix_time/testtime_serialize.cpp | 2 +-
trunk/libs/date_time/test/posix_time/testtime_wstream.cpp | 2 +-
trunk/libs/date_time/test/testconstrained_value.cpp | 2 +-
trunk/libs/date_time/test/testfrmwk.hpp | 22 ++++++++++++++++++++++
trunk/libs/date_time/test/testgeneric_period.cpp | 2 +-
trunk/libs/date_time/test/testgregorian_calendar.cpp | 2 +-
trunk/libs/date_time/test/testint_adapter.cpp | 2 +-
trunk/libs/date_time/test/testtime_resolution_traits.cpp | 2 +-
trunk/libs/date_time/test/testwrapping_int.cpp | 2 +-
56 files changed, 78 insertions(+), 67 deletions(-)
Deleted: trunk/boost/date_time/testfrmwk.hpp
==============================================================================
--- trunk/boost/date_time/testfrmwk.hpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
+++ (empty file)
@@ -1,66 +0,0 @@
-
-#ifndef TEST_FRMWK_HPP___
-#define TEST_FRMWK_HPP___
-
-/* Copyright (c) 2002,2003 CrystalClear Software, Inc.
- * Use, modification and distribution is subject to the
- * Boost Software License, Version 1.0. (See accompanying
- * file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
- * $Date$
- */
-
-
-#include <iostream>
-#include <string>
-
-//! Really simple test framework for counting and printing
-class TestStats
-{
-public:
- static TestStats& instance() {static TestStats ts; return ts;}
- void addPassingTest() {testcount_++; passcount_++;}
- void addFailingTest() {testcount_++;}
- unsigned int testcount() const {return testcount_;}
- unsigned int passcount() const {return passcount_;}
- void print(std::ostream& out = std::cout) const
- {
- out << testcount_ << " Tests Executed: " ;
- if (passcount() != testcount()) {
- out << (testcount() - passcount()) << " FAILURES";
- }
- else {
- out << "All Succeeded" << std::endl;
- }
- out << std::endl;
- }
-private:
- TestStats() : testcount_(0), passcount_(0) {}
- unsigned int testcount_;
- unsigned int passcount_;
-};
-
-
-bool check(const std::string& testname, bool testcond)
-{
- TestStats& stat = TestStats::instance();
- if (testcond) {
- std::cout << "Pass :: " << testname << " " << std::endl;
- stat.addPassingTest();
- return true;
- }
- else {
- stat.addFailingTest();
- std::cout << "FAIL :: " << testname << " " << std::endl;
- return false;
- }
-}
-
-
-int printTestStats()
-{
- TestStats& stat = TestStats::instance();
- stat.print();
- return stat.testcount() - stat.passcount();
-}
-
-#endif
Modified: trunk/libs/date_time/test/Jamfile.v2
==============================================================================
--- trunk/libs/date_time/test/Jamfile.v2 (original)
+++ trunk/libs/date_time/test/Jamfile.v2 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -1,7 +1,7 @@
local DATE_TIME_DYNAMIC_PROPERTIES = <define>BOOST_ALL_DYN_LINK <runtime-link>shared <define>BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG <define>BOOST_ALL_NO_LIB ;
-local DATE_TIME_PROPERTIES = <define>BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG <define>BOOST_DATE_TIME_STATIC_LINK
+local DATE_TIME_PROPERTIES = <define>BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG <define>BOOST_DATE_TIME_STATIC_LINK
# FIXME
#std::locale-support
<define>BOOST_ALL_NO_LIB ;
Modified: trunk/libs/date_time/test/gregorian/testdate.cpp
==============================================================================
--- trunk/libs/date_time/test/gregorian/testdate.cpp (original)
+++ trunk/libs/date_time/test/gregorian/testdate.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -7,7 +7,7 @@
#include <iostream>
#include "boost/date_time/gregorian/gregorian.hpp"
-#include "boost/date_time/testfrmwk.hpp"
+#include "../testfrmwk.hpp"
int
main()
Modified: trunk/libs/date_time/test/gregorian/testdate_duration.cpp
==============================================================================
--- trunk/libs/date_time/test/gregorian/testdate_duration.cpp (original)
+++ trunk/libs/date_time/test/gregorian/testdate_duration.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -6,7 +6,7 @@
*/
#include "boost/date_time/gregorian/gregorian.hpp"
-#include "boost/date_time/testfrmwk.hpp"
+#include "../testfrmwk.hpp"
#include <iostream>
Modified: trunk/libs/date_time/test/gregorian/testdate_facet_new.cpp
==============================================================================
--- trunk/libs/date_time/test/gregorian/testdate_facet_new.cpp (original)
+++ trunk/libs/date_time/test/gregorian/testdate_facet_new.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -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 <iostream>
#include <sstream>
Modified: trunk/libs/date_time/test/gregorian/testdate_input_facet.cpp
==============================================================================
--- trunk/libs/date_time/test/gregorian/testdate_input_facet.cpp (original)
+++ trunk/libs/date_time/test/gregorian/testdate_input_facet.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -7,7 +7,7 @@
*/
#include "boost/date_time/gregorian/gregorian.hpp"
-#include "boost/date_time/testfrmwk.hpp"
+#include "../testfrmwk.hpp"
#include <iostream>
#include <sstream>
#include <string>
Modified: trunk/libs/date_time/test/gregorian/testdate_iterator.cpp
==============================================================================
--- trunk/libs/date_time/test/gregorian/testdate_iterator.cpp (original)
+++ trunk/libs/date_time/test/gregorian/testdate_iterator.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -6,7 +6,7 @@
*/
#include "boost/date_time/gregorian/gregorian.hpp"
-#include "boost/date_time/testfrmwk.hpp"
+#include "../testfrmwk.hpp"
#include <iostream>
Modified: trunk/libs/date_time/test/gregorian/testfacet.cpp
==============================================================================
--- trunk/libs/date_time/test/gregorian/testfacet.cpp (original)
+++ trunk/libs/date_time/test/gregorian/testfacet.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -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
Modified: trunk/libs/date_time/test/gregorian/testformat_date_parser.cpp
==============================================================================
--- trunk/libs/date_time/test/gregorian/testformat_date_parser.cpp (original)
+++ trunk/libs/date_time/test/gregorian/testformat_date_parser.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -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 <sstream>
#include <algorithm>
Modified: trunk/libs/date_time/test/gregorian/testformatters.cpp
==============================================================================
--- trunk/libs/date_time/test/gregorian/testformatters.cpp (original)
+++ trunk/libs/date_time/test/gregorian/testformatters.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -6,7 +6,7 @@
*/
#include "boost/date_time/gregorian/gregorian.hpp"
-#include "boost/date_time/testfrmwk.hpp"
+#include "../testfrmwk.hpp"
int
main()
Modified: trunk/libs/date_time/test/gregorian/testgenerators.cpp
==============================================================================
--- trunk/libs/date_time/test/gregorian/testgenerators.cpp (original)
+++ trunk/libs/date_time/test/gregorian/testgenerators.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -6,7 +6,7 @@
*/
#include "boost/date_time/gregorian/gregorian.hpp"
-#include "boost/date_time/testfrmwk.hpp"
+#include "../testfrmwk.hpp"
#include <iostream>
#include <string>
#include <sstream>
Modified: trunk/libs/date_time/test/gregorian/testgreg_cal.cpp
==============================================================================
--- trunk/libs/date_time/test/gregorian/testgreg_cal.cpp (original)
+++ trunk/libs/date_time/test/gregorian/testgreg_cal.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -6,7 +6,7 @@
*/
#include "boost/date_time/gregorian/greg_calendar.hpp"
-#include "boost/date_time/testfrmwk.hpp"
+#include "../testfrmwk.hpp"
#include <iostream>
Modified: trunk/libs/date_time/test/gregorian/testgreg_day.cpp
==============================================================================
--- trunk/libs/date_time/test/gregorian/testgreg_day.cpp (original)
+++ trunk/libs/date_time/test/gregorian/testgreg_day.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -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 <iostream>
Modified: trunk/libs/date_time/test/gregorian/testgreg_durations.cpp
==============================================================================
--- trunk/libs/date_time/test/gregorian/testgreg_durations.cpp (original)
+++ trunk/libs/date_time/test/gregorian/testgreg_durations.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -6,7 +6,7 @@
*/
#include "boost/date_time/gregorian/gregorian.hpp"
-#include "boost/date_time/testfrmwk.hpp"
+#include "../testfrmwk.hpp"
int main(){
Modified: trunk/libs/date_time/test/gregorian/testgreg_month.cpp
==============================================================================
--- trunk/libs/date_time/test/gregorian/testgreg_month.cpp (original)
+++ trunk/libs/date_time/test/gregorian/testgreg_month.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -6,7 +6,7 @@
*/
#include "boost/date_time/gregorian/greg_month.hpp"
-#include "boost/date_time/testfrmwk.hpp"
+#include "../testfrmwk.hpp"
#include <iostream>
Modified: trunk/libs/date_time/test/gregorian/testgreg_serialize.cpp
==============================================================================
--- trunk/libs/date_time/test/gregorian/testgreg_serialize.cpp (original)
+++ trunk/libs/date_time/test/gregorian/testgreg_serialize.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -12,7 +12,7 @@
#include <boost/date_time/gregorian/gregorian.hpp>
#include <boost/date_time/gregorian/greg_serialize.hpp>
-#include <boost/date_time/testfrmwk.hpp>
+#include "../testfrmwk.hpp"
#include <sstream>
using namespace boost;
Modified: trunk/libs/date_time/test/gregorian/testgreg_wstream.cpp
==============================================================================
--- trunk/libs/date_time/test/gregorian/testgreg_wstream.cpp (original)
+++ trunk/libs/date_time/test/gregorian/testgreg_wstream.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -8,7 +8,7 @@
#include <iostream>
#include <sstream>
#include <boost/date_time/gregorian/gregorian.hpp>
-#include <boost/date_time/testfrmwk.hpp>
+#include "../testfrmwk.hpp"
using namespace boost::gregorian;
Modified: trunk/libs/date_time/test/gregorian/testgreg_year.cpp
==============================================================================
--- trunk/libs/date_time/test/gregorian/testgreg_year.cpp (original)
+++ trunk/libs/date_time/test/gregorian/testgreg_year.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -6,7 +6,7 @@
*/
#include "boost/date_time/gregorian/greg_year.hpp"
-#include "boost/date_time/testfrmwk.hpp"
+#include "../testfrmwk.hpp"
#include <iostream>
Modified: trunk/libs/date_time/test/gregorian/testparse_date.cpp
==============================================================================
--- trunk/libs/date_time/test/gregorian/testparse_date.cpp (original)
+++ trunk/libs/date_time/test/gregorian/testparse_date.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -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 <iostream>
#include <string>
Modified: trunk/libs/date_time/test/gregorian/testperiod.cpp
==============================================================================
--- trunk/libs/date_time/test/gregorian/testperiod.cpp (original)
+++ trunk/libs/date_time/test/gregorian/testperiod.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -6,7 +6,7 @@
*/
#include "boost/date_time/gregorian/gregorian.hpp"
-#include "boost/date_time/testfrmwk.hpp"
+#include "../testfrmwk.hpp"
#include <iostream>
int main()
Modified: trunk/libs/date_time/test/local_time/testcustom_time_zone.cpp
==============================================================================
--- trunk/libs/date_time/test/local_time/testcustom_time_zone.cpp (original)
+++ trunk/libs/date_time/test/local_time/testcustom_time_zone.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -6,7 +6,7 @@
*/
#include "boost/date_time/local_time/local_time.hpp"
-#include "boost/date_time/testfrmwk.hpp"
+#include "../testfrmwk.hpp"
#include <iostream>
int
Modified: trunk/libs/date_time/test/local_time/testdst_transition_day_rule.cpp
==============================================================================
--- trunk/libs/date_time/test/local_time/testdst_transition_day_rule.cpp (original)
+++ trunk/libs/date_time/test/local_time/testdst_transition_day_rule.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -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"
Modified: trunk/libs/date_time/test/local_time/testlocal_time.cpp
==============================================================================
--- trunk/libs/date_time/test/local_time/testlocal_time.cpp (original)
+++ trunk/libs/date_time/test/local_time/testlocal_time.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -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 <iostream>
Modified: trunk/libs/date_time/test/local_time/testlocal_time_facet.cpp
==============================================================================
--- trunk/libs/date_time/test/local_time/testlocal_time_facet.cpp (original)
+++ trunk/libs/date_time/test/local_time/testlocal_time_facet.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -11,7 +11,7 @@
#include <sstream>
#include <boost/shared_ptr.hpp>
#include "boost/date_time/local_time/local_time.hpp"
-#include "boost/date_time/testfrmwk.hpp"
+#include "../testfrmwk.hpp"
template<class temporal_type, typename charT>
Modified: trunk/libs/date_time/test/local_time/testlocal_time_input_facet.cpp
==============================================================================
--- trunk/libs/date_time/test/local_time/testlocal_time_input_facet.cpp (original)
+++ trunk/libs/date_time/test/local_time/testlocal_time_input_facet.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -6,7 +6,7 @@
*/
#include "boost/date_time/local_time/local_time.hpp"
-#include "boost/date_time/testfrmwk.hpp"
+#include "../testfrmwk.hpp"
#include <iostream>
#include <sstream>
#include <string>
Modified: trunk/libs/date_time/test/local_time/testlocal_time_iterator.cpp
==============================================================================
--- trunk/libs/date_time/test/local_time/testlocal_time_iterator.cpp (original)
+++ trunk/libs/date_time/test/local_time/testlocal_time_iterator.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -8,7 +8,7 @@
#include <iostream>
#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
Modified: trunk/libs/date_time/test/local_time/testlocal_time_period.cpp
==============================================================================
--- trunk/libs/date_time/test/local_time/testlocal_time_period.cpp (original)
+++ trunk/libs/date_time/test/local_time/testlocal_time_period.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -6,7 +6,7 @@
*/
#include "boost/date_time/local_time/local_time.hpp"
-#include "boost/date_time/testfrmwk.hpp"
+#include "../testfrmwk.hpp"
int main()
{
Modified: trunk/libs/date_time/test/local_time/testposix_time_zone.cpp
==============================================================================
--- trunk/libs/date_time/test/local_time/testposix_time_zone.cpp (original)
+++ trunk/libs/date_time/test/local_time/testposix_time_zone.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -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"
Modified: trunk/libs/date_time/test/local_time/testtz_database.cpp
==============================================================================
--- trunk/libs/date_time/test/local_time/testtz_database.cpp (original)
+++ trunk/libs/date_time/test/local_time/testtz_database.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -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"
Modified: trunk/libs/date_time/test/local_time/testwcustom_time_zone.cpp
==============================================================================
--- trunk/libs/date_time/test/local_time/testwcustom_time_zone.cpp (original)
+++ trunk/libs/date_time/test/local_time/testwcustom_time_zone.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -6,7 +6,7 @@
*/
#include "boost/date_time/local_time/local_time.hpp"
-#include "boost/date_time/testfrmwk.hpp"
+#include "../testfrmwk.hpp"
#include <iostream>
int
Modified: trunk/libs/date_time/test/local_time/testwposix_time_zone.cpp
==============================================================================
--- trunk/libs/date_time/test/local_time/testwposix_time_zone.cpp (original)
+++ trunk/libs/date_time/test/local_time/testwposix_time_zone.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -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"
Modified: trunk/libs/date_time/test/posix_time/testc_local_adjustor.cpp
==============================================================================
--- trunk/libs/date_time/test/posix_time/testc_local_adjustor.cpp (original)
+++ trunk/libs/date_time/test/posix_time/testc_local_adjustor.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -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()
Modified: trunk/libs/date_time/test/posix_time/testdst_rules.cpp
==============================================================================
--- trunk/libs/date_time/test/posix_time/testdst_rules.cpp (original)
+++ trunk/libs/date_time/test/posix_time/testdst_rules.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -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
Modified: trunk/libs/date_time/test/posix_time/testduration.cpp
==============================================================================
--- trunk/libs/date_time/test/posix_time/testduration.cpp (original)
+++ trunk/libs/date_time/test/posix_time/testduration.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -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
Modified: trunk/libs/date_time/test/posix_time/testfiletime_functions.cpp
==============================================================================
--- trunk/libs/date_time/test/posix_time/testfiletime_functions.cpp (original)
+++ trunk/libs/date_time/test/posix_time/testfiletime_functions.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -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 <cmath>
@@ -14,17 +14,6 @@
#include <windows.h>
#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
Modified: trunk/libs/date_time/test/posix_time/testformatters.cpp
==============================================================================
--- trunk/libs/date_time/test/posix_time/testformatters.cpp (original)
+++ trunk/libs/date_time/test/posix_time/testformatters.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -6,7 +6,7 @@
*/
#include "boost/date_time/posix_time/posix_time.hpp"
-#include "boost/date_time/testfrmwk.hpp"
+#include "../testfrmwk.hpp"
int
main()
Modified: trunk/libs/date_time/test/posix_time/testgreg_duration_operators.cpp
==============================================================================
--- trunk/libs/date_time/test/posix_time/testgreg_duration_operators.cpp (original)
+++ trunk/libs/date_time/test/posix_time/testgreg_duration_operators.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -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(){
Modified: trunk/libs/date_time/test/posix_time/testiterator.cpp
==============================================================================
--- trunk/libs/date_time/test/posix_time/testiterator.cpp (original)
+++ trunk/libs/date_time/test/posix_time/testiterator.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -8,7 +8,7 @@
#include <iostream>
#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
Modified: trunk/libs/date_time/test/posix_time/testlocal_adjustor.cpp
==============================================================================
--- trunk/libs/date_time/test/posix_time/testlocal_adjustor.cpp (original)
+++ trunk/libs/date_time/test/posix_time/testlocal_adjustor.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -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()
Modified: trunk/libs/date_time/test/posix_time/testmicrosec_time_clock.cpp
==============================================================================
--- trunk/libs/date_time/test/posix_time/testmicrosec_time_clock.cpp (original)
+++ trunk/libs/date_time/test/posix_time/testmicrosec_time_clock.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -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 <windows.h>
#endif
Modified: trunk/libs/date_time/test/posix_time/testparse_time.cpp
==============================================================================
--- trunk/libs/date_time/test/posix_time/testparse_time.cpp (original)
+++ trunk/libs/date_time/test/posix_time/testparse_time.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -6,7 +6,7 @@
*/
#include "boost/date_time/posix_time/posix_time.hpp"
-#include "boost/date_time/testfrmwk.hpp"
+#include "../testfrmwk.hpp"
int
Modified: trunk/libs/date_time/test/posix_time/testperiod.cpp
==============================================================================
--- trunk/libs/date_time/test/posix_time/testperiod.cpp (original)
+++ trunk/libs/date_time/test/posix_time/testperiod.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -8,7 +8,7 @@
#include <iostream>
#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()
{
Modified: trunk/libs/date_time/test/posix_time/teststreams.cpp
==============================================================================
--- trunk/libs/date_time/test/posix_time/teststreams.cpp (original)
+++ trunk/libs/date_time/test/posix_time/teststreams.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -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
Modified: trunk/libs/date_time/test/posix_time/testtime.cpp
==============================================================================
--- trunk/libs/date_time/test/posix_time/testtime.cpp (original)
+++ trunk/libs/date_time/test/posix_time/testtime.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -8,7 +8,7 @@
#include <iostream>
#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()
{
Modified: trunk/libs/date_time/test/posix_time/testtime_facet.cpp
==============================================================================
--- trunk/libs/date_time/test/posix_time/testtime_facet.cpp (original)
+++ trunk/libs/date_time/test/posix_time/testtime_facet.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -8,7 +8,7 @@
*/
#include "boost/date_time/posix_time/posix_time.hpp"
-#include "boost/date_time/testfrmwk.hpp"
+#include "../testfrmwk.hpp"
#include <fstream>
#include <iostream>
#include <sstream>
@@ -24,7 +24,7 @@
std::basic_stringstream<charT> ss;
ss.imbue(locale);
ss << value;
- check(testname, ss.str() == expected_result);
+ check_equal(testname, ss.str(), expected_result);
}
Modified: trunk/libs/date_time/test/posix_time/testtime_formatters.cpp
==============================================================================
--- trunk/libs/date_time/test/posix_time/testtime_formatters.cpp (original)
+++ trunk/libs/date_time/test/posix_time/testtime_formatters.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -6,7 +6,7 @@
*/
#include "boost/date_time/posix_time/posix_time.hpp"
-#include "boost/date_time/testfrmwk.hpp"
+#include "../testfrmwk.hpp"
int
main()
Modified: trunk/libs/date_time/test/posix_time/testtime_input_facet.cpp
==============================================================================
--- trunk/libs/date_time/test/posix_time/testtime_input_facet.cpp (original)
+++ trunk/libs/date_time/test/posix_time/testtime_input_facet.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -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 <iostream>
#include <sstream>
#include <string>
Modified: trunk/libs/date_time/test/posix_time/testtime_period.cpp
==============================================================================
--- trunk/libs/date_time/test/posix_time/testtime_period.cpp (original)
+++ trunk/libs/date_time/test/posix_time/testtime_period.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -8,7 +8,7 @@
#include <iostream>
#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()
{
Modified: trunk/libs/date_time/test/posix_time/testtime_serialize.cpp
==============================================================================
--- trunk/libs/date_time/test/posix_time/testtime_serialize.cpp (original)
+++ trunk/libs/date_time/test/posix_time/testtime_serialize.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -11,7 +11,7 @@
#include <boost/archive/xml_iarchive.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/date_time/posix_time/time_serialize.hpp>
-#include <boost/date_time/testfrmwk.hpp>
+#include "../testfrmwk.hpp"
#include <sstream>
using namespace boost;
Modified: trunk/libs/date_time/test/posix_time/testtime_wstream.cpp
==============================================================================
--- trunk/libs/date_time/test/posix_time/testtime_wstream.cpp (original)
+++ trunk/libs/date_time/test/posix_time/testtime_wstream.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -9,7 +9,7 @@
#include <sstream>
#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 <boost/lexical_cast.hpp>
using namespace boost::gregorian;
Modified: trunk/libs/date_time/test/testconstrained_value.cpp
==============================================================================
--- trunk/libs/date_time/test/testconstrained_value.cpp (original)
+++ trunk/libs/date_time/test/testconstrained_value.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -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 <iostream>
class bad_day {}; //exception type
Copied: trunk/libs/date_time/test/testfrmwk.hpp (from r49875, /trunk/boost/date_time/testfrmwk.hpp)
==============================================================================
--- /trunk/boost/date_time/testfrmwk.hpp (original)
+++ trunk/libs/date_time/test/testfrmwk.hpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -55,6 +55,28 @@
}
}
+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()
{
Modified: trunk/libs/date_time/test/testgeneric_period.cpp
==============================================================================
--- trunk/libs/date_time/test/testgeneric_period.cpp (original)
+++ trunk/libs/date_time/test/testgeneric_period.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -7,7 +7,7 @@
#include <iostream>
#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
Modified: trunk/libs/date_time/test/testgregorian_calendar.cpp
==============================================================================
--- trunk/libs/date_time/test/testgregorian_calendar.cpp (original)
+++ trunk/libs/date_time/test/testgregorian_calendar.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -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 <iostream>
int
Modified: trunk/libs/date_time/test/testint_adapter.cpp
==============================================================================
--- trunk/libs/date_time/test/testint_adapter.cpp (original)
+++ trunk/libs/date_time/test/testint_adapter.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -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 <iostream>
#include <sstream>
Modified: trunk/libs/date_time/test/testtime_resolution_traits.cpp
==============================================================================
--- trunk/libs/date_time/test/testtime_resolution_traits.cpp (original)
+++ trunk/libs/date_time/test/testtime_resolution_traits.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -6,7 +6,7 @@
*/
#include "boost/date_time/time_resolution_traits.hpp"
-#include "boost/date_time/testfrmwk.hpp"
+#include "testfrmwk.hpp"
int
Modified: trunk/libs/date_time/test/testwrapping_int.cpp
==============================================================================
--- trunk/libs/date_time/test/testwrapping_int.cpp (original)
+++ trunk/libs/date_time/test/testwrapping_int.cpp 2008-11-25 15:36:52 EST (Tue, 25 Nov 2008)
@@ -8,7 +8,7 @@
#include "boost/date_time/wrapping_int.hpp"
//#define BOOST_INCLUDE_MAIN
//#include <boost/test/test_tools.hpp>
-#include "boost/date_time/testfrmwk.hpp"
+#include "testfrmwk.hpp"
#include "boost/cstdint.hpp"
#include <iostream>