Subject: [Boost-commit] svn:boost r50595 - sandbox/SOC/2006/tree/trunk/libs/tree/test
From: ockham_at_[hidden]
Date: 2009-01-14 13:27:07
Author: bernhard.reiter
Date: 2009-01-14 13:27:07 EST (Wed, 14 Jan 2009)
New Revision: 50595
URL: http://svn.boost.org/trac/boost/changeset/50595
Log:
One more forest_tree -> forest rename, plus one more line in a test.
Added:
sandbox/SOC/2006/tree/trunk/libs/tree/test/forest_test.cpp
- copied, changed from r50581, /sandbox/SOC/2006/tree/trunk/libs/tree/test/forest_tree_test.cpp
Removed:
sandbox/SOC/2006/tree/trunk/libs/tree/test/forest_tree_test.cpp
Text files modified:
sandbox/SOC/2006/tree/trunk/libs/tree/test/Jamfile.v2 | 2 +-
sandbox/SOC/2006/tree/trunk/libs/tree/test/forest_test.cpp | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
Modified: sandbox/SOC/2006/tree/trunk/libs/tree/test/Jamfile.v2
==============================================================================
--- sandbox/SOC/2006/tree/trunk/libs/tree/test/Jamfile.v2 (original)
+++ sandbox/SOC/2006/tree/trunk/libs/tree/test/Jamfile.v2 2009-01-14 13:27:07 EST (Wed, 14 Jan 2009)
@@ -42,7 +42,7 @@
[ run iterator_algorithm_test.cpp ]
# [ run red_black_tree_test.cpp ]
# [ run treap_test.cpp ]
- [ run forest_tree_test.cpp ]
+ [ run forest_test.cpp ]
# [ run nary_tree_test.cpp ]
[ run multiway_tree_test.cpp ]
# [ run unbalanced_binary_tree_test.cpp ]
Copied: sandbox/SOC/2006/tree/trunk/libs/tree/test/forest_test.cpp (from r50581, /sandbox/SOC/2006/tree/trunk/libs/tree/test/forest_tree_test.cpp)
==============================================================================
--- /sandbox/SOC/2006/tree/trunk/libs/tree/test/forest_tree_test.cpp (original)
+++ sandbox/SOC/2006/tree/trunk/libs/tree/test/forest_test.cpp 2009-01-14 13:27:07 EST (Wed, 14 Jan 2009)
@@ -31,6 +31,7 @@
forest<int> ft0;
//BOOST_CHECK_EQUAL(*ft0.root(), 0);
BOOST_CHECK(ft0.empty());
+ BOOST_CHECK(ft0.begin() == ft0.end());
}
//BOOST_AUTO_TEST_CASE( insert_value_test )
Deleted: sandbox/SOC/2006/tree/trunk/libs/tree/test/forest_tree_test.cpp
==============================================================================
--- sandbox/SOC/2006/tree/trunk/libs/tree/test/forest_tree_test.cpp 2009-01-14 13:27:07 EST (Wed, 14 Jan 2009)
+++ (empty file)
@@ -1,236 +0,0 @@
-// Copyright (c) 2006-2009, Bernhard Reiter
-//
-// 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)
-
-#include <boost/tree/forest.hpp>
-#include <boost/tree/algorithm.hpp>
-
-#include <boost/lambda/bind.hpp>
-
-#include <boost/mpl/list.hpp>
-#include <boost/mpl/pair.hpp>
-
-#include <list>
-
-#define BOOST_TEST_MODULE forest test
-//#define BOOST_TEST_DYN_LINK
-#include <boost/test/included/unit_test.hpp>
-#include <boost/test/test_case_template.hpp>
-
-#include "test_tree_traversal_data.hpp"
-#include "fake_binary_tree.hpp"
-
-using namespace boost::tree;
-
-BOOST_AUTO_TEST_SUITE( basic_forest_test )
-
-BOOST_AUTO_TEST_CASE( constructors_test )
-{
- forest<int> ft0;
- //BOOST_CHECK_EQUAL(*ft0.root(), 0);
- BOOST_CHECK(ft0.empty());
-}
-
-//BOOST_AUTO_TEST_CASE( insert_value_test )
-//{
-// using namespace boost::tree;
-//
-//// forest<int> mytree;
-////
-//// forest<int>::cursor c = mytree.root();
-//// c = mytree.insert(c, 6);
-//// BOOST_CHECK_EQUAL(*c, 6);
-////
-//// c = mytree.insert(c, 5);
-//// BOOST_CHECK_EQUAL(*c, 5);
-////
-//// c = mytree.insert(c, 4);
-//// BOOST_CHECK_EQUAL(*c, 4);
-//// BOOST_CHECK(c == mytree.root().begin());
-////
-//// ++c;
-//// BOOST_CHECK_EQUAL(*c, 5);
-//// ++c;
-//// BOOST_CHECK_EQUAL(*c, 6);
-//
-// forest<int> ft0;
-//
-// forest<int>::cursor c = ft0.insert(ft0.end(), 8); //FIXME
-//
-// BOOST_CHECK_EQUAL(*c, 8);
-// BOOST_CHECK(c == ft0.begin());
-// BOOST_CHECK(++c == ft0.end());
-//// BOOST_CHECK(ft0.begin().parent() == ft0.root());
-// BOOST_CHECK(!ft0.empty());
-// BOOST_CHECK(ft0.begin().empty());
-//
-// c = ft0.insert(ft0.end(), 6);
-// BOOST_CHECK_EQUAL(*c, 6);
-// BOOST_CHECK(ft0.begin() != ft0.end());
-// BOOST_CHECK(c != ft0.end());
-//// BOOST_CHECK(c.base() == ft0.begin().end());
-//// BOOST_CHECK(c.parent() == ft0.root());
-// BOOST_CHECK(!ft0.empty());
-// BOOST_CHECK(++c == ft0.end());
-// ----c;
-// BOOST_CHECK(c == ft0.begin());
-// BOOST_CHECK_EQUAL(*c, 8);
-//
-// c = ft0.insert(ft0.end(), 7);
-// BOOST_CHECK_EQUAL(*c, 7);
-//// BOOST_CHECK(c.parent() == ft0.root());
-// BOOST_CHECK(!ft0.empty());
-// BOOST_CHECK(++c == ft0.end());
-// ----c;
-// BOOST_CHECK_EQUAL(*c, 6);
-//// BOOST_CHECK(c.parent() == ft0.root());
-// --c;
-// BOOST_CHECK(c == ft0.begin());
-//// BOOST_CHECK(c.parent() == ft0.root());
-// BOOST_CHECK_EQUAL(*c, 8);
-// c = ft0.begin().begin();
-// BOOST_CHECK(c.parent() == ft0.begin());
-//
-// c = ft0.insert(ft0.begin().begin(), 3);
-// BOOST_CHECK_EQUAL(*c, 3);
-// BOOST_CHECK(c == ft0.begin().begin());
-// BOOST_CHECK(ft0.begin().begin().parent() == ft0.begin());
-//
-// // Need more checks after this line...
-// c = ft0.insert(ft0.begin().begin().begin(), 1);
-// c = ft0.begin();
-// (++c).to_end();
-//
-// c = ft0.insert(c, 4);
-// BOOST_CHECK_EQUAL(*c, 4);
-// BOOST_CHECK(--(c.to_parent()) == ft0.begin());
-//
-// c = ft0.begin();
-// BOOST_CHECK_EQUAL(*c, 8);
-// BOOST_CHECK_EQUAL(*c.to_begin(), 3);
-// BOOST_CHECK_EQUAL(*c.to_begin(), 1);
-// BOOST_CHECK(c.empty());
-//
-// //validate_corresponding_forest(ft0);
-//}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-BOOST_FIXTURE_TEST_SUITE(forest_fixture_test, fake_binary_tree_fixture<int>)
-
-BOOST_AUTO_TEST_CASE( binary_tree_constructor_test )
-{
- forest<int, fake_binary_tree<int> > ft0(fbt1);
- forest<int, fake_binary_tree<int> >::const_cursor c = ft0.begin();
-
- //TODO: validate
- BOOST_CHECK_EQUAL(*c, 8);
- BOOST_CHECK_EQUAL(*c.to_begin(), 3);
- BOOST_CHECK_EQUAL(*++c, 6);
- BOOST_CHECK_EQUAL(*++c, 7);
- BOOST_CHECK(++c == ft0.begin().end());
-
- c = ft0.begin().begin();
- BOOST_CHECK_EQUAL(*c.to_begin(), 1);
- BOOST_CHECK(++c == ft0.begin().begin().end());
-
- c = ft0.begin().begin();
- ++c;
- forest<int, fake_binary_tree<int> >::const_cursor d = c;
- BOOST_CHECK_EQUAL(*c.to_begin(), 4);
- BOOST_CHECK(++c == d.end());
-
- c = ft0.begin();
- BOOST_CHECK_EQUAL(*++c, 10);
- BOOST_CHECK_EQUAL(*++c, 14);
- d = c;
- BOOST_CHECK(++c == ft0.end());
- c = d;
- BOOST_CHECK_EQUAL(*c.to_begin(), 13);
- BOOST_CHECK(++c == d.end());
- c = d.to_begin();
- BOOST_CHECK_EQUAL(*c.to_begin(), 11);
- BOOST_CHECK_EQUAL(*++c, 12);
- BOOST_CHECK(++c == d.end());
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-//BOOST_FIXTURE_TEST_SUITE(forest_algorithms_test, test_binary_tree_with_list_fixture<int>)
-//
-//// Test *order correspondence:
-//// forest binary
-//// pre pre
-//// post in
-//typedef boost::mpl::list< boost::mpl::pair<preorder, preorder>
-// , boost::mpl::pair<postorder, inorder> > corresponding_orders;
-//
-//BOOST_AUTO_TEST_CASE_TEMPLATE( test_natural_correspondence_for_each, Order
-// , corresponding_orders )
-//{
-// using namespace boost::tree;
-//
-// forest<int> ft(bt);
-//
-// //validate_corresponding_forest(ft);
-//
-// std::list<int> test_list;
-// typedef std::back_insert_iterator< std::list<int> > back_insert_iter_list_int;
-// typedef output_iterator_cursor<back_insert_iter_list_int> oc_bi_lst_type;
-// back_insert_iter_list_int it_test_list = std::back_inserter(test_list);
-// oc_bi_lst_type oc_test_list = oc_bi_lst_type(it_test_list);
-//
-// boost::tree::for_each(
-// typename Order::first()
-// , ft
-// , boost::lambda::bind(&std::list<int>::push_back, &test_list, boost::lambda::_1)
-// );
-// test_traversal(typename Order::second(), test_list.begin(), test_list.end());
-// BOOST_CHECK_EQUAL(test_list.size(), 11);
-//
-//}
-
-//BOOST_AUTO_TEST_CASE_TEMPLATE( test_natural_correspondence_copy, Order
-// , corresponding_orders )
-//{
-// using namespace boost::tree;
-//
-// forest<int> ft(bt);
-//
-// //validate_corresponding_forest(ft);
-//
-// std::list<int> test_list;
-// typedef std::back_insert_iterator< std::list<int> > back_insert_iter_list_int;
-// typedef output_iterator_cursor<back_insert_iter_list_int> oc_bi_lst_type;
-// back_insert_iter_list_int it_test_list = std::back_inserter(test_list);
-// oc_bi_lst_type oc_test_list = oc_bi_lst_type(it_test_list);
-//
-// boost::tree::copy(typename Order::first(), ft.root(), oc_test_list);
-// test_traversal(typename Order::second(), test_list.begin(), test_list.end());
-// BOOST_CHECK_EQUAL(test_list.size(), 11);
-// test_list.clear();
-//}
-
-//BOOST_AUTO_TEST_CASE_TEMPLATE( test_natural_correspondence_transform, Order
-// , corresponding_orders )
-//{
-// using namespace boost::tree;
-//
-// forest<int> ft(bt);
-//
-// //validate_corresponding_forest(ft);
-//
-// std::list<int> test_list;
-// typedef std::back_insert_iterator< std::list<int> > back_insert_iter_list_int;
-// typedef output_iterator_cursor<back_insert_iter_list_int> oc_bi_lst_type;
-// back_insert_iter_list_int it_test_list = std::back_inserter(test_list);
-// oc_bi_lst_type oc_test_list = oc_bi_lst_type(it_test_list);
-// boost::tree::transform(typename Order::first(), ft.root(), oc_test_list
-// , std::bind2nd(std::plus<int>(),0));
-// test_traversal(typename Order::second(), test_list.begin(), test_list.end());
-// BOOST_CHECK_EQUAL(test_list.size(), 11);
-//}
-//
-//BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file