|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r50865 - sandbox/SOC/2006/tree/trunk/libs/tree/test
From: ockham_at_[hidden]
Date: 2009-01-29 03:55:59
Author: bernhard.reiter
Date: 2009-01-29 03:55:57 EST (Thu, 29 Jan 2009)
New Revision: 50865
URL: http://svn.boost.org/trac/boost/changeset/50865
Log:
More test helpers cleanup.
Text files modified:
sandbox/SOC/2006/tree/trunk/libs/tree/test/binary_tree_test.cpp | 2
sandbox/SOC/2006/tree/trunk/libs/tree/test/graph_test.cpp | 2
sandbox/SOC/2006/tree/trunk/libs/tree/test/test_tree_traversal_data.hpp | 184 ----------------------------------------
3 files changed, 2 insertions(+), 186 deletions(-)
Modified: sandbox/SOC/2006/tree/trunk/libs/tree/test/binary_tree_test.cpp
==============================================================================
--- sandbox/SOC/2006/tree/trunk/libs/tree/test/binary_tree_test.cpp (original)
+++ sandbox/SOC/2006/tree/trunk/libs/tree/test/binary_tree_test.cpp 2009-01-29 03:55:57 EST (Thu, 29 Jan 2009)
@@ -87,7 +87,7 @@
BOOST_AUTO_TEST_SUITE_END()
-BOOST_FIXTURE_TEST_SUITE( binary_tree_test, test_binary_tree_with_list_fixture<int> )
+BOOST_FIXTURE_TEST_SUITE( binary_tree_test, test_binary_tree_fixture<int> )
using namespace boost::tree;
Modified: sandbox/SOC/2006/tree/trunk/libs/tree/test/graph_test.cpp
==============================================================================
--- sandbox/SOC/2006/tree/trunk/libs/tree/test/graph_test.cpp (original)
+++ sandbox/SOC/2006/tree/trunk/libs/tree/test/graph_test.cpp 2009-01-29 03:55:57 EST (Thu, 29 Jan 2009)
@@ -23,7 +23,7 @@
typedef boost::tree::augmented_type< int, boost::default_color_type > data_type;
-BOOST_FIXTURE_TEST_SUITE(graph_algorithms_test, test_binary_tree_with_list_fixture<data_type>)
+BOOST_FIXTURE_TEST_SUITE(graph_algorithms_test, test_binary_tree_fixture<data_type>)
BOOST_AUTO_TEST_CASE( graph_test )
{
Modified: sandbox/SOC/2006/tree/trunk/libs/tree/test/test_tree_traversal_data.hpp
==============================================================================
--- sandbox/SOC/2006/tree/trunk/libs/tree/test/test_tree_traversal_data.hpp (original)
+++ sandbox/SOC/2006/tree/trunk/libs/tree/test/test_tree_traversal_data.hpp 2009-01-29 03:55:57 EST (Thu, 29 Jan 2009)
@@ -105,17 +105,6 @@
boost::tree::binary_tree<T> bt, bt2;
};
-template <class T = int>
-struct test_binary_tree_with_list_fixture
-: public test_binary_tree_fixture<T>
-//, public test_with_list_fixture
-{
- test_binary_tree_with_list_fixture()
- : test_binary_tree_fixture<T>()
- //, test_with_list_fixture()
- {}
-};
-
template <class Tree>
void validate_corresponding_forest(Tree const& t)
{
@@ -194,179 +183,6 @@
data[10] = make_pair(0, 8);
}
-//template <class Iterator>
-//void test_traversal(boost::tree::preorder, Iterator a, Iterator b)
-//{
-// BOOST_CHECK_EQUAL(*a++, 8);
-// BOOST_CHECK_EQUAL(*a++, 3);
-// BOOST_CHECK_EQUAL(*a++, 1);
-// BOOST_CHECK_EQUAL(*a++, 6);
-// BOOST_CHECK_EQUAL(*a++, 4);
-// BOOST_CHECK_EQUAL(*a++, 7);
-// BOOST_CHECK_EQUAL(*a++, 10);
-// BOOST_CHECK_EQUAL(*a++, 14);
-// BOOST_CHECK_EQUAL(*a++, 13);
-// BOOST_CHECK_EQUAL(*a++, 11);
-// BOOST_CHECK_EQUAL(*a++, 12);
-// BOOST_CHECK(a == b);
-//}
-//
-//template <class Iterator>
-//void test_reverse_traversal(boost::tree::preorder, Iterator a, Iterator b)
-//{
-// BOOST_CHECK_EQUAL(*--a, 12);
-// BOOST_CHECK_EQUAL(*--a, 11);
-// BOOST_CHECK_EQUAL(*--a, 13);
-// BOOST_CHECK_EQUAL(*--a, 14);
-// BOOST_CHECK_EQUAL(*--a, 10);
-// BOOST_CHECK_EQUAL(*--a, 7);
-// BOOST_CHECK_EQUAL(*--a, 4);
-// BOOST_CHECK_EQUAL(*--a, 6);
-// BOOST_CHECK_EQUAL(*--a, 1);
-// BOOST_CHECK_EQUAL(*--a, 3);
-// BOOST_CHECK_EQUAL(*--a, 8);
-// BOOST_CHECK(a == b);
-//}
-//
-//template <class Iterator>
-//void test_subtree_traversal(boost::tree::preorder, Iterator a, Iterator b
-// , std::vector<int>::difference_type x = 0)
-//{
-// std::vector<int> preorder(11);
-// preorder[0] = 8;
-// preorder[1] = 3;
-// preorder[2] = 1;
-// preorder[3] = 6;
-// preorder[4] = 4;
-// preorder[5] = 7;
-// preorder[6] = 10;
-// preorder[7] = 14;
-// preorder[8] = 13;
-// preorder[9] = 11;
-// preorder[10] = 12;
-//
-// BOOST_CHECK(std::equal(a, b, preorder.begin() + x));
-//}
-//
-////template <class Iterator>
-////void test_subtree_traversal(boost::tree::preorder, Iterator a, Iterator b)
-////{
-//// BOOST_CHECK_EQUAL(*a++, 3);
-//// BOOST_CHECK_EQUAL(*a++, 1);
-//// BOOST_CHECK_EQUAL(*a++, 6);
-//// BOOST_CHECK_EQUAL(*a++, 4);
-//// BOOST_CHECK_EQUAL(*a++, 7);
-//// BOOST_CHECK(a == b);
-////}
-//
-//template <class Iterator>
-//void test_traversal(boost::tree::inorder, Iterator a, Iterator b)
-//{
-// BOOST_CHECK_EQUAL(*a++, 1);
-// BOOST_CHECK_EQUAL(*a++, 3);
-// BOOST_CHECK_EQUAL(*a++, 4);
-// BOOST_CHECK_EQUAL(*a++, 6);
-// BOOST_CHECK_EQUAL(*a++, 7);
-// BOOST_CHECK_EQUAL(*a++, 8);
-// BOOST_CHECK_EQUAL(*a++, 10);
-// BOOST_CHECK_EQUAL(*a++, 11);
-// BOOST_CHECK_EQUAL(*a++, 12);
-// BOOST_CHECK_EQUAL(*a++, 13);
-// BOOST_CHECK_EQUAL(*a++, 14);
-// BOOST_CHECK(a == b);
-//}
-//
-//template <class Iterator>
-//void test_reverse_traversal(boost::tree::inorder, Iterator a, Iterator b)
-//{
-// BOOST_CHECK_EQUAL(*--a, 14);
-// BOOST_CHECK_EQUAL(*--a, 13);
-// BOOST_CHECK_EQUAL(*--a, 12);
-// BOOST_CHECK_EQUAL(*--a, 11);
-// BOOST_CHECK_EQUAL(*--a, 10);
-// BOOST_CHECK_EQUAL(*--a, 8);
-// BOOST_CHECK_EQUAL(*--a, 7);
-// BOOST_CHECK_EQUAL(*--a, 6);
-// BOOST_CHECK_EQUAL(*--a, 4);
-// BOOST_CHECK_EQUAL(*--a, 3);
-// BOOST_CHECK_EQUAL(*--a, 1);
-// BOOST_CHECK(a == b);
-//}
-//
-//template <class Iterator>
-//void test_subtree_traversal(boost::tree::inorder, Iterator a, Iterator b
-// , std::vector<int>::difference_type x = 0)
-//{
-// std::vector<int> inorder(11);
-// inorder[0] = 1;
-// inorder[1] = 3;
-// inorder[2] = 4;
-// inorder[3] = 6;
-// inorder[4] = 7;
-// inorder[5] = 8;
-// inorder[6] = 10;
-// inorder[7] = 11;
-// inorder[8] = 12;
-// inorder[9] = 13;
-// inorder[10] = 14;
-//
-// BOOST_CHECK(std::equal(a, b, inorder.begin() + x));
-//}
-//
-//template <class Iterator>
-//void test_traversal(boost::tree::postorder, Iterator a, Iterator b)
-//{
-// BOOST_CHECK_EQUAL(*a++, 1);
-// BOOST_CHECK_EQUAL(*a++, 4);
-// BOOST_CHECK_EQUAL(*a++, 7);
-// BOOST_CHECK_EQUAL(*a++, 6);
-// BOOST_CHECK_EQUAL(*a++, 3);
-// BOOST_CHECK_EQUAL(*a++, 12);
-// BOOST_CHECK_EQUAL(*a++, 11);
-// BOOST_CHECK_EQUAL(*a++, 13);
-// BOOST_CHECK_EQUAL(*a++, 14);
-// BOOST_CHECK_EQUAL(*a++, 10);
-// BOOST_CHECK_EQUAL(*a++, 8);
-// BOOST_CHECK(a == b);
-//}
-//
-//template <class Iterator>
-//void test_reverse_traversal(boost::tree::postorder, Iterator a, Iterator b)
-//{
-// BOOST_CHECK_EQUAL(*--a, 8);
-// BOOST_CHECK_EQUAL(*--a, 10);
-// BOOST_CHECK_EQUAL(*--a, 14);
-// BOOST_CHECK_EQUAL(*--a, 13);
-// BOOST_CHECK_EQUAL(*--a, 11);
-// BOOST_CHECK_EQUAL(*--a, 12);
-// BOOST_CHECK_EQUAL(*--a, 3);
-// BOOST_CHECK_EQUAL(*--a, 6);
-// BOOST_CHECK_EQUAL(*--a, 7);
-// BOOST_CHECK_EQUAL(*--a, 4);
-// BOOST_CHECK_EQUAL(*--a, 1);
-// BOOST_CHECK(a == b);
-//}
-//
-//template <class Iterator>
-//void test_subtree_traversal(boost::tree::postorder, Iterator a, Iterator b
-// , std::vector<int>::difference_type x = 0)
-//{
-// std::vector<int> postorder(11);
-// postorder[0] = 1;
-// postorder[1] = 4;
-// postorder[2] = 7;
-// postorder[3] = 6;
-// postorder[4] = 3;
-// postorder[5] = 12;
-// postorder[6] = 11;
-// postorder[7] = 13;
-// postorder[8] = 14;
-// postorder[9] = 10;
-// postorder[10] = 8;
-//
-// BOOST_CHECK(std::equal(a, b, postorder.begin() + x));
-//}
-
template <class Iterator>
void test_traversal_from_leaf4(Iterator a, Iterator b)
{
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk