X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6124b134075d337cc8333a2ff45d477c2af2055a..3c3ead1d1513a5eb79091a604f4e42b45d1bdf5d:/tests/lists/lists.cpp diff --git a/tests/lists/lists.cpp b/tests/lists/lists.cpp index f634eb5231..fb37655b8d 100644 --- a/tests/lists/lists.cpp +++ b/tests/lists/lists.cpp @@ -156,14 +156,30 @@ void ListsTestCase::wxStdListTest() list1.insert(list1.end(), (int *)2); CPPUNIT_ASSERT_EQUAL( (int *)1, list1.front() ); CPPUNIT_ASSERT_EQUAL( (int *)2, list1.back() ); + + it = list1.begin(); + it = list1.erase(++it, list1.end()); + CPPUNIT_ASSERT_EQUAL( 1, list1.size() ); + CPPUNIT_ASSERT( it == list1.end() ); + + wxListInt list2; + list2.push_back((int *)3); + list2.push_back((int *)4); + list1.insert(list1.begin(), list2.begin(), list2.end()); + CPPUNIT_ASSERT_EQUAL( 3, list1.size() ); + CPPUNIT_ASSERT_EQUAL( (int *)3, list1.front() ); + + list1.insert(list1.end(), list2.begin(), list2.end()); + CPPUNIT_ASSERT_EQUAL( 5, list1.size() ); + CPPUNIT_ASSERT_EQUAL( (int *)4, list1.back() ); } void ListsTestCase::wxListCtorTest() { { wxListBazs list1; - list1.Append(new Baz(_T("first"))); - list1.Append(new Baz(_T("second"))); + list1.Append(new Baz(wxT("first"))); + list1.Append(new Baz(wxT("second"))); CPPUNIT_ASSERT( list1.GetCount() == 2 ); CPPUNIT_ASSERT( Baz::GetNumber() == 2 );