[v3] Refined test instrument for container tests
Stephen M. Webb
stephen.webb@bregmasoft.com
Mon Jan 7 12:13:00 GMT 2002
I moved my countable class out of list_modifiers.cc and into its own
header so I can reuse it in additional testsuite entries. In the
process, I needed to make it a model of Assignable, so this fixes some
complaints from those who run with concept checks enabled (I must
consider my sins).
I figured the countable class, renamed from "T" to "CountingObject,"
deserved its own header rather than adding it to testsuite_hooks.h
since it's use is limited to only a very few test cases. This may be
open to debate, but it looks like a static library for testsuite
support may be in the offing anyways.
I also needed to add additional counts (assignment operator, etc) for
additional complexity checks, such as deque erase tests. I anticipate
further functional additions as I come up with more tests, particulary
with respect to exception handling.
Anyhow, I had to modify list_modifiers.cc pretty heavily to accommodate
the changes. Without further ado, here's the changelog, the diffs, and
the new file. Bootstrapped and tested on i686-pc-linux-gnu.
2002-01-07 Stephen M. Webb <stephen.webb@bregmasoft.com>
* testsuite/23_containers/list_modifiers.cc: Moved class T into
its own header and renamed class and member functions.
* testsuite/counting_object.h: New file.
Index: testsuite/23_containers/list_modifiers.cc
===================================================================
RCS file:
/cvs/gcc/gcc/libstdc++-v3/testsuite/23_containers/list_modifiers.cc,v
retrieving revision 1.1
diff -c -3 -p -r1.1 list_modifiers.cc
*** list_modifiers.cc 2001/11/22 19:19:23 1.1
--- list_modifiers.cc 2002/01/07 19:50:09
***************
*** 20,81 ****
#include <list>
#include <testsuite_hooks.h>
bool test = true;
- // Here's a class with nontrivial ctor/dtor that provides
- // the ability to track the number of copy ctors and dtors
- // and will throw on demand during copy.
- class T
- {
- public:
- // default constructor
- T(int anId, bool throwOnDemand = false)
- : itsId(anId), willThrow(throwOnDemand)
- { }
-
- // copy constructor
- T(const T& rhs)
- : itsId(rhs.id()), willThrow(rhs.willThrow)
- {
- ++itsCopyCount;
- if (willThrow)
- throw "exception";
- }
-
- ~T()
- { ++itsDtorCount; }
-
- int
- id() const
- { return itsId; }
-
- private:
- const int itsId;
- const bool willThrow;
-
- public:
- static void
- reset()
- { itsCopyCount = 0; itsDtorCount = 0; }
-
- static int
- copyCount()
- { return itsCopyCount; }
-
- static int
- dtorCount()
- { return itsDtorCount; }
-
- private:
- static int itsCopyCount;
- static int itsDtorCount;
- };
-
- int T::itsCopyCount = 0;
- int T::itsDtorCount = 0;
-
-
// This test verifies the following.
//
// 23.2.2.3 void push_front(const T& x)
--- 20,29 ----
#include <list>
#include <testsuite_hooks.h>
+ #include <counting_object.h>
bool test = true;
// This test verifies the following.
//
// 23.2.2.3 void push_front(const T& x)
*************** int T::itsDtorCount = 0;
*** 100,230 ****
void
test01()
{
! std::list<T> list0101;
! std::list<T>::const_iterator i;
! std::list<T>::const_reverse_iterator j;
! std::list<T>::iterator k;
! T::reset();
! list0101.push_back(T(1)); // list should be [1]
VERIFY(list0101.size() == 1);
! VERIFY(T::copyCount() == 1);
k = list0101.end();
--k;
! VERIFY(k->id() == 1);
! VERIFY(k->id() == list0101.front().id());
! VERIFY(k->id() == list0101.back().id());
! list0101.push_front(T(2)); // list should be [2 1]
VERIFY(list0101.size() == 2);
! VERIFY(T::copyCount() == 2);
! VERIFY(k->id() == 1);
! list0101.push_back(T(3)); // list should be [2 1 3]
VERIFY(list0101.size() == 3);
! VERIFY(T::copyCount() == 3);
! VERIFY(k->id() == 1);
try
{
! list0101.push_back(T(4, true));
VERIFY(("no exception thrown", false));
}
catch (...)
{
VERIFY(list0101.size() == 3);
! VERIFY(T::copyCount() == 4);
}
i = list0101.begin();
! VERIFY(i->id() == 2);
! VERIFY(i->id() == list0101.front().id());
j = list0101.rbegin();
! VERIFY(j->id() == 3);
! VERIFY(j->id() == list0101.back().id());
++i;
! VERIFY(i->id() == 1);
++j;
! VERIFY(j->id() == 1);
! T::reset();
list0101.pop_back(); // list should be [2 1]
VERIFY(list0101.size() == 2);
! VERIFY(T::dtorCount() == 1);
! VERIFY(i->id() == 1);
! VERIFY(j->id() == 1);
! VERIFY(k->id() == 1);
list0101.pop_front(); // list should be [1]
VERIFY(list0101.size() == 1);
! VERIFY(T::dtorCount() == 2);
! VERIFY(i->id() == 1);
! VERIFY(j->id() == 1);
! VERIFY(k->id() == 1);
}
// general single insert/erase + swap
void
test02()
{
! std::list<T> list0201;
! T::reset();
! list0201.insert(list0201.begin(), T(1)); // list should be [1]
VERIFY(list0201.size() == 1);
! VERIFY(T::copyCount() == 1);
! list0201.insert(list0201.end(), T(2)); // list should be [1 2]
VERIFY(list0201.size() == 2);
! VERIFY(T::copyCount() == 2);
! std::list<T>::iterator i = list0201.begin();
! std::list<T>::const_iterator j = i;
! VERIFY(i->id() == 1); ++i;
! VERIFY(i->id() == 2);
! list0201.insert(i, T(3)); // list should be [1 3 2]
VERIFY(list0201.size() == 3);
! VERIFY(T::copyCount() == 3);
! std::list<T>::const_iterator k = i;
! VERIFY(i->id() == 2); --i;
! VERIFY(i->id() == 3); --i;
! VERIFY(i->id() == 1);
! VERIFY(j->id() == 1);
++i; // will point to '3'
! T::reset();
list0201.erase(i); // should be [1 2]
VERIFY(list0201.size() == 2);
! VERIFY(T::dtorCount() == 1);
! VERIFY(k->id() == 2);
! VERIFY(j->id() == 1);
! std::list<T> list0202;
! T::reset();
VERIFY(list0202.size() == 0);
! VERIFY(T::copyCount() == 0);
! VERIFY(T::dtorCount() == 0);
// member swap
list0202.swap(list0201);
VERIFY(list0201.size() == 0);
VERIFY(list0202.size() == 2);
! VERIFY(T::copyCount() == 0);
! VERIFY(T::dtorCount() == 0);
// specialized swap
swap(list0201, list0202);
VERIFY(list0201.size() == 2);
VERIFY(list0202.size() == 0);
! VERIFY(T::copyCount() == 0);
! VERIFY(T::dtorCount() == 0);
}
// range and fill insert/erase + clear
--- 48,178 ----
void
test01()
{
! std::list<CountingObject> list0101;
! std::list<CountingObject>::const_iterator i;
! std::list<CountingObject>::const_reverse_iterator j;
! std::list<CountingObject>::iterator k;
! CountingObject::reset();
! list0101.push_back(CountingObject(1)); // list should be [1]
VERIFY(list0101.size() == 1);
! VERIFY(CountingObject::copyCtorCount() == 1);
k = list0101.end();
--k;
! VERIFY(k->value() == 1);
! VERIFY(k->value() == list0101.front().value());
! VERIFY(k->value() == list0101.back().value());
! list0101.push_front(CountingObject(2)); // list should be [2 1]
VERIFY(list0101.size() == 2);
! VERIFY(CountingObject::copyCtorCount() == 2);
! VERIFY(k->value() == 1);
! list0101.push_back(CountingObject(3)); // list should be [2 1 3]
VERIFY(list0101.size() == 3);
! VERIFY(CountingObject::copyCtorCount() == 3);
! VERIFY(k->value() == 1);
try
{
! list0101.push_back(CountingObject(4, true));
VERIFY(("no exception thrown", false));
}
catch (...)
{
VERIFY(list0101.size() == 3);
! VERIFY(CountingObject::copyCtorCount() == 4);
}
i = list0101.begin();
! VERIFY(i->value() == 2);
! VERIFY(i->value() == list0101.front().value());
j = list0101.rbegin();
! VERIFY(j->value() == 3);
! VERIFY(j->value() == list0101.back().value());
++i;
! VERIFY(i->value() == 1);
++j;
! VERIFY(j->value() == 1);
! CountingObject::reset();
list0101.pop_back(); // list should be [2 1]
VERIFY(list0101.size() == 2);
! VERIFY(CountingObject::dtorCount() == 1);
! VERIFY(i->value() == 1);
! VERIFY(j->value() == 1);
! VERIFY(k->value() == 1);
list0101.pop_front(); // list should be [1]
VERIFY(list0101.size() == 1);
! VERIFY(CountingObject::dtorCount() == 2);
! VERIFY(i->value() == 1);
! VERIFY(j->value() == 1);
! VERIFY(k->value() == 1);
}
// general single insert/erase + swap
void
test02()
{
! std::list<CountingObject> list0201;
! CountingObject::reset();
! list0201.insert(list0201.begin(), CountingObject(1)); // list
should be [1]
VERIFY(list0201.size() == 1);
! VERIFY(CountingObject::copyCtorCount() == 1);
! list0201.insert(list0201.end(), CountingObject(2)); // list
should be [1 2]
VERIFY(list0201.size() == 2);
! VERIFY(CountingObject::copyCtorCount() == 2);
! std::list<CountingObject>::iterator i = list0201.begin();
! std::list<CountingObject>::const_iterator j = i;
! VERIFY(i->value() == 1); ++i;
! VERIFY(i->value() == 2);
! list0201.insert(i, CountingObject(3)); // list should be [1 3 2]
VERIFY(list0201.size() == 3);
! VERIFY(CountingObject::copyCtorCount() == 3);
! std::list<CountingObject>::const_iterator k = i;
! VERIFY(i->value() == 2); --i;
! VERIFY(i->value() == 3); --i;
! VERIFY(i->value() == 1);
! VERIFY(j->value() == 1);
++i; // will point to '3'
! CountingObject::reset();
list0201.erase(i); // should be [1 2]
VERIFY(list0201.size() == 2);
! VERIFY(CountingObject::dtorCount() == 1);
! VERIFY(k->value() == 2);
! VERIFY(j->value() == 1);
! std::list<CountingObject> list0202;
! CountingObject::reset();
VERIFY(list0202.size() == 0);
! VERIFY(CountingObject::copyCtorCount() == 0);
! VERIFY(CountingObject::dtorCount() == 0);
// member swap
list0202.swap(list0201);
VERIFY(list0201.size() == 0);
VERIFY(list0202.size() == 2);
! VERIFY(CountingObject::copyCtorCount() == 0);
! VERIFY(CountingObject::dtorCount() == 0);
// specialized swap
swap(list0201, list0202);
VERIFY(list0201.size() == 2);
VERIFY(list0202.size() == 0);
! VERIFY(CountingObject::copyCtorCount() == 0);
! VERIFY(CountingObject::dtorCount() == 0);
}
// range and fill insert/erase + clear
*************** test02()
*** 233,316 ****
void
test03()
{
! std::list<T> list0301;
! T::reset();
// fill insert at beginning of list / empty list
! list0301.insert(list0301.begin(), 3, T(11)); // should be [11 11 11]
VERIFY(list0301.size() == 3);
! VERIFY(T::copyCount() == 3);
// save iterators to verify post-insert validity
! std::list<T>::iterator b = list0301.begin();
! std::list<T>::iterator m = list0301.end(); --m;
! std::list<T>::iterator e = list0301.end();
// fill insert at end of list
! T::reset();
! list0301.insert(list0301.end(), 3, T(13)); // should be [11 11 11
13 13 13]
VERIFY(list0301.size() == 6);
! VERIFY(T::copyCount() == 3);
! VERIFY(b == list0301.begin() && b->id() == 11);
VERIFY(e == list0301.end());
! VERIFY(m->id() == 11);
// fill insert in the middle of list
++m;
! T::reset();
! list0301.insert(m, 3, T(12)); // should be [11 11 11 12 12 12 13 13
13]
VERIFY(list0301.size() == 9);
! VERIFY(T::copyCount() == 3);
! VERIFY(b == list0301.begin() && b->id() == 11);
VERIFY(e == list0301.end());
! VERIFY(m->id() == 13);
// single erase
! T::reset();
m = list0301.erase(m); // should be [11 11 11 12 12 12 13 13]
VERIFY(list0301.size() == 8);
! VERIFY(T::dtorCount() == 1);
! VERIFY(b == list0301.begin() && b->id() == 11);
VERIFY(e == list0301.end());
! VERIFY(m->id() == 13);
// range erase
! T::reset();
m = list0301.erase(list0301.begin(), m); // should be [13 13]
VERIFY(list0301.size() == 2);
! VERIFY(T::dtorCount() == 6);
! VERIFY(m->id() == 13);
// range fill at beginning
const int A[] = {321, 322, 333};
const int N = sizeof(A) / sizeof(int);
! T::reset();
b = list0301.begin();
list0301.insert(b, A, A + N); // should be [321 322 333 13 13]
VERIFY(list0301.size() == 5);
! VERIFY(T::copyCount() == 3);
! VERIFY(m->id() == 13);
// range fill at end
! T::reset();
list0301.insert(e, A, A + N); // should be [321 322 333 13 13 321
322 333]
VERIFY(list0301.size() == 8);
! VERIFY(T::copyCount() == 3);
VERIFY(e == list0301.end());
! VERIFY(m->id() == 13);
// range fill in middle
! T::reset();
list0301.insert(m, A, A + N);
VERIFY(list0301.size() == 11);
! VERIFY(T::copyCount() == 3);
VERIFY(e == list0301.end());
! VERIFY(m->id() == 13);
! T::reset();
list0301.clear();
VERIFY(list0301.size() == 0);
! VERIFY(T::dtorCount() == 11);
VERIFY(e == list0301.end());
}
--- 181,264 ----
void
test03()
{
! std::list<CountingObject> list0301;
! CountingObject::reset();
// fill insert at beginning of list / empty list
! list0301.insert(list0301.begin(), 3, CountingObject(11)); // should
be [11 11 11]
VERIFY(list0301.size() == 3);
! VERIFY(CountingObject::copyCtorCount() == 3);
// save iterators to verify post-insert validity
! std::list<CountingObject>::iterator b = list0301.begin();
! std::list<CountingObject>::iterator m = list0301.end(); --m;
! std::list<CountingObject>::iterator e = list0301.end();
// fill insert at end of list
! CountingObject::reset();
! list0301.insert(list0301.end(), 3, CountingObject(13)); // should
be [11 11 11 13 13 13]
VERIFY(list0301.size() == 6);
! VERIFY(CountingObject::copyCtorCount() == 3);
! VERIFY(b == list0301.begin() && b->value() == 11);
VERIFY(e == list0301.end());
! VERIFY(m->value() == 11);
// fill insert in the middle of list
++m;
! CountingObject::reset();
! list0301.insert(m, 3, CountingObject(12)); // should be [11 11 11
12 12 12 13 13 13]
VERIFY(list0301.size() == 9);
! VERIFY(CountingObject::copyCtorCount() == 3);
! VERIFY(b == list0301.begin() && b->value() == 11);
VERIFY(e == list0301.end());
! VERIFY(m->value() == 13);
// single erase
! CountingObject::reset();
m = list0301.erase(m); // should be [11 11 11 12 12 12 13 13]
VERIFY(list0301.size() == 8);
! VERIFY(CountingObject::dtorCount() == 1);
! VERIFY(b == list0301.begin() && b->value() == 11);
VERIFY(e == list0301.end());
! VERIFY(m->value() == 13);
// range erase
! CountingObject::reset();
m = list0301.erase(list0301.begin(), m); // should be [13 13]
VERIFY(list0301.size() == 2);
! VERIFY(CountingObject::dtorCount() == 6);
! VERIFY(m->value() == 13);
// range fill at beginning
const int A[] = {321, 322, 333};
const int N = sizeof(A) / sizeof(int);
! CountingObject::reset();
b = list0301.begin();
list0301.insert(b, A, A + N); // should be [321 322 333 13 13]
VERIFY(list0301.size() == 5);
! VERIFY(CountingObject::copyCtorCount() == 3);
! VERIFY(m->value() == 13);
// range fill at end
! CountingObject::reset();
list0301.insert(e, A, A + N); // should be [321 322 333 13 13 321
322 333]
VERIFY(list0301.size() == 8);
! VERIFY(CountingObject::copyCtorCount() == 3);
VERIFY(e == list0301.end());
! VERIFY(m->value() == 13);
// range fill in middle
! CountingObject::reset();
list0301.insert(m, A, A + N);
VERIFY(list0301.size() == 11);
! VERIFY(CountingObject::copyCtorCount() == 3);
VERIFY(e == list0301.end());
! VERIFY(m->value() == 13);
! CountingObject::reset();
list0301.clear();
VERIFY(list0301.size() == 0);
! VERIFY(CountingObject::dtorCount() == 11);
VERIFY(e == list0301.end());
}
__
Stephen M. Webb
-------------- next part --------------
A non-text attachment was scrubbed...
Name: counting_object.h
Type: text/x-c++
Size: 2746 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/libstdc++/attachments/20020107/bc647359/attachment.bin>
More information about the Libstdc++
mailing list