diff options
Diffstat (limited to 'test/unit/context/cdlist_black.h')
| -rw-r--r-- | test/unit/context/cdlist_black.h | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/test/unit/context/cdlist_black.h b/test/unit/context/cdlist_black.h index fcc6a7e55..ccdbb210b 100644 --- a/test/unit/context/cdlist_black.h +++ b/test/unit/context/cdlist_black.h @@ -28,7 +28,6 @@ #include "util/exception.h" #include "context/context.h" #include "context/cdlist.h" -#include "context/cdlist_context_memory.h" using namespace std; using namespace CVC4::context; @@ -58,12 +57,12 @@ public: // test at different sizes. this triggers grow() behavior differently. // grow() was completely broken in revision 256 - void testCDList10() { listTest(10); } - void testCDList15() { listTest(15); } - void testCDList20() { listTest(20); } - void testCDList35() { listTest(35); } - void testCDList50() { listTest(50); } - void testCDList99() { listTest(99); } + void testCDList_BE10() { listTest(10); } + void testCDList_BE15() { listTest(15); } + void testCDList_BE20() { listTest(20); } + void testCDList_BE35() { listTest(35); } + void testCDList_BE50() { listTest(50); } + void testCDList_BE99() { listTest(99); } void listTest(int N) { listTest(N, true); @@ -71,7 +70,7 @@ public: } void listTest(int N, bool callDestructor) { - CDList<int> list(d_context, callDestructor); + CDList_BE<int> list(d_context, callDestructor); TS_ASSERT(list.empty()); for(int i = 0; i < N; ++i) { @@ -80,7 +79,7 @@ public: TS_ASSERT(!list.empty()); TS_ASSERT_EQUALS(list.back(), i); int i2 = 0; - for(CDList<int>::const_iterator j = list.begin(); + for(CDList_BE<int>::const_iterator j = list.begin(); j != list.end(); ++j) { TS_ASSERT_EQUALS(*j, i2++); @@ -100,8 +99,8 @@ public: bool shouldAlsoRemainFalse = false; bool aThirdFalse = false; - CDList<DtorSensitiveObject> listT(d_context, true); - CDList<DtorSensitiveObject> listF(d_context, false); + CDList_BE<DtorSensitiveObject> listT(d_context, true); + CDList_BE<DtorSensitiveObject> listF(d_context, false); DtorSensitiveObject shouldRemainFalseDSO(shouldRemainFalse); DtorSensitiveObject shouldFlipToTrueDSO(shouldFlipToTrue); @@ -136,15 +135,10 @@ public: TS_ASSERT_EQUALS(aThirdFalse, false); } - void testEmptyIterators() { - CDList<int>* list1 = new(true) CDList<int>(d_context); - CDList< int, ContextMemoryAllocator<int> >* list2 = - new(d_context->getCMM()) - CDList< int, ContextMemoryAllocator<int> >(true, d_context, false, - ContextMemoryAllocator<int>(d_context->getCMM())); - TS_ASSERT_EQUALS(list1->begin(), list1->end()); - TS_ASSERT_EQUALS(list2->begin(), list2->end()); - list1->deleteSelf(); + void testEmptyIterator() { + CDList_BE<int>* list = new(true) CDList_BE<int>(d_context); + TS_ASSERT_EQUALS(list->begin(), list->end()); + list->deleteSelf(); } /* setrlimit() totally broken on Mac OS X */ @@ -155,7 +149,7 @@ public: #else /* __APPLE__ */ - CDList<unsigned> list(d_context); + CDList_BE<unsigned> list(d_context); WithLimitedMemory wlm(1); TS_ASSERT_THROWS({ |