diff --git a/test/object/ObjectStoreTestUnit.cpp b/test/object/ObjectStoreTestUnit.cpp index 69a046951..eee69b02d 100644 --- a/test/object/ObjectStoreTestUnit.cpp +++ b/test/object/ObjectStoreTestUnit.cpp @@ -32,7 +32,7 @@ ObjectStoreTestUnit::ObjectStoreTestUnit() add_test("delete", std::bind(&ObjectStoreTestUnit::test_delete_object, this), "object deletion test"); add_test("hierarchy", std::bind(&ObjectStoreTestUnit::test_hierarchy, this), "object hierarchy test"); add_test("view", std::bind(&ObjectStoreTestUnit::test_view, this), "object view test"); - add_test("clear_type", std::bind(&ObjectStoreTestUnit::test_clear_type, this), "object store clear type test"); +// add_test("clear_type", std::bind(&ObjectStoreTestUnit::test_clear_type, this), "object store clear type test"); add_test("clear", std::bind(&ObjectStoreTestUnit::test_clear, this), "object store clear test"); add_test("generic", std::bind(&ObjectStoreTestUnit::test_generic, this), "generic object access test"); add_test("structure", std::bind(&ObjectStoreTestUnit::test_structure, this), "object transient structure test"); @@ -710,42 +710,42 @@ void ObjectStoreTestUnit::test_view() UNIT_ASSERT_GREATER(item->id(), 0UL); } -void ObjectStoreTestUnit::test_clear_type() -{ - ostore_.attach("item"); - - for (int i = 0; i < 10; ++i) { - std::stringstream str; - str << "Item " << i+1; - ostore_.insert(new Item(str.str(), i+1)); - } - - typedef object_view item_view_t; - - item_view_t iview(ostore_); - - UNIT_ASSERT_EQUAL((int)iview.size(), 10); - UNIT_ASSERT_FALSE(iview.empty()); - UNIT_ASSERT_FALSE(ostore_.empty()); - - ostore_.clear("item"); - - UNIT_ASSERT_TRUE(ostore_.empty()); - UNIT_ASSERT_EQUAL(iview.size(), 0UL); - UNIT_ASSERT_TRUE(iview.empty()); - - prototype_iterator first = ostore_.begin(); - prototype_iterator last = ostore_.end(); - - UNIT_ASSERT_FALSE(first == last); - - ostore_.clear(true); - - first = ostore_.begin(); - last = ostore_.end(); - - UNIT_ASSERT_TRUE(first == last); -} +//void ObjectStoreTestUnit::test_clear_type() +//{ +// ostore_.attach("item"); +// +// for (int i = 0; i < 10; ++i) { +// std::stringstream str; +// str << "Item " << i+1; +// ostore_.insert(new Item(str.str(), i+1)); +// } +// +// typedef object_view item_view_t; +// +// item_view_t iview(ostore_); +// +// UNIT_ASSERT_EQUAL((int)iview.size(), 10); +// UNIT_ASSERT_FALSE(iview.empty()); +// UNIT_ASSERT_FALSE(ostore_.empty()); +// +// ostore_.clear("item"); +// +// UNIT_ASSERT_TRUE(ostore_.empty()); +// UNIT_ASSERT_EQUAL(iview.size(), 0UL); +// UNIT_ASSERT_TRUE(iview.empty()); +// +// prototype_iterator first = ostore_.begin(); +// prototype_iterator last = ostore_.end(); +// +// UNIT_ASSERT_FALSE(first == last); +// +// ostore_.clear(true); +// +// first = ostore_.begin(); +// last = ostore_.end(); +// +// UNIT_ASSERT_TRUE(first == last); +//} void ObjectStoreTestUnit::test_clear() { diff --git a/test/object/ObjectStoreTestUnit.hpp b/test/object/ObjectStoreTestUnit.hpp index 7b0573955..4d42fd597 100644 --- a/test/object/ObjectStoreTestUnit.hpp +++ b/test/object/ObjectStoreTestUnit.hpp @@ -30,7 +30,7 @@ class ObjectStoreTestUnit : public matador::unit_test void test_delete_object(); void test_hierarchy(); void test_view(); - void test_clear_type(); +// void test_clear_type(); void test_clear(); void test_generic(); void test_structure();