X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/325641898272f1d9380ffe877bc27569fcf758bf..9e1da4827a0ec18f9766d664b9af12c25e3f71fb:/tests/controls/itemcontainertest.cpp diff --git a/tests/controls/itemcontainertest.cpp b/tests/controls/itemcontainertest.cpp index ab8b9807fb..48944ad0a8 100644 --- a/tests/controls/itemcontainertest.cpp +++ b/tests/controls/itemcontainertest.cpp @@ -170,6 +170,9 @@ void ItemContainerTestCase::ClientData() CPPUNIT_ASSERT_EQUAL(static_cast<wxClientData*>(item2data), container->GetClientObject(2)); + + WX_ASSERT_FAILS_WITH_ASSERT( container->SetClientObject((unsigned)-1, item0data) ); + WX_ASSERT_FAILS_WITH_ASSERT( container->SetClientObject(12345, item0data) ); } void ItemContainerTestCase::VoidData() @@ -195,6 +198,9 @@ void ItemContainerTestCase::VoidData() container->Insert("item 2", 2, item2); CPPUNIT_ASSERT_EQUAL(item2, container->GetClientData(2)); + + WX_ASSERT_FAILS_WITH_ASSERT( container->SetClientData((unsigned)-1, NULL) ); + WX_ASSERT_FAILS_WITH_ASSERT( container->SetClientData(12345, NULL) ); } void ItemContainerTestCase::Set() @@ -238,13 +244,16 @@ void ItemContainerTestCase::SetString() container->Append(testitems); + container->SetSelection(0); container->SetString(0, "new item 0"); -#ifndef __WXOSX__ - container->SetString(2, ""); -#endif - CPPUNIT_ASSERT_EQUAL("new item 0", container->GetString(0)); + + // Modifying the item shouldn't deselect it. + CPPUNIT_ASSERT_EQUAL(0, container->GetSelection()); + + // wxOSX doesn't support having empty items in some containers. #ifndef __WXOSX__ + container->SetString(2, ""); CPPUNIT_ASSERT_EQUAL("", container->GetString(2)); #endif }