name change to correctly reflect the autorelease nature of the methods, removing...

[wxWidgets.git] / tests / controls / listctrltest.cpp

diff --git a/tests/controls/listctrltest.cpp b/tests/controls/listctrltest.cpp
index 8ad9e972a3e7fffb0171cad59f45578490ada1f1..6f591e0ef090b797ee13f15edf29aa07624c6aad 100644 (file)
--- a/tests/controls/listctrltest.cpp
+++ b/tests/controls/listctrltest.cpp
@@ -41,12 +41,14 @@ private:
         CPPUNIT_TEST( ColumnsOrder );
 #endif // wxHAS_LISTCTRL_COLUMN_ORDER
         CPPUNIT_TEST( ItemRect );
         CPPUNIT_TEST( ColumnsOrder );
 #endif // wxHAS_LISTCTRL_COLUMN_ORDER
         CPPUNIT_TEST( ItemRect );

+        CPPUNIT_TEST( ChangeMode );

     CPPUNIT_TEST_SUITE_END();
 
 #ifdef wxHAS_LISTCTRL_COLUMN_ORDER
     void ColumnsOrder();
 #endif // wxHAS_LISTCTRL_COLUMN_ORDER
     void ItemRect();
     CPPUNIT_TEST_SUITE_END();
 
 #ifdef wxHAS_LISTCTRL_COLUMN_ORDER
     void ColumnsOrder();
 #endif // wxHAS_LISTCTRL_COLUMN_ORDER
     void ItemRect();

+    void ChangeMode();

 
     wxListCtrl *m_list;
 
 
     wxListCtrl *m_list;
 


@@ -83,12 +85,13 @@ void ListCtrlTestCase::tearDown()
 
 void ListCtrlTestCase::ColumnsOrder()
 {
 
 void ListCtrlTestCase::ColumnsOrder()
 {

-    static const int NUM_COLS;

     int n;
     wxListItem li;
     li.SetMask(wxLIST_MASK_TEXT);
 
     // first set up some columns
     int n;
     wxListItem li;
     li.SetMask(wxLIST_MASK_TEXT);
 
     // first set up some columns

+    static const int NUM_COLS = 3;
+

     m_list->InsertColumn(0, "Column 0");
     m_list->InsertColumn(1, "Column 1");
     m_list->InsertColumn(2, "Column 2");
     m_list->InsertColumn(0, "Column 0");
     m_list->InsertColumn(1, "Column 1");
     m_list->InsertColumn(2, "Column 2");


@@ -144,6 +147,8 @@ void ListCtrlTestCase::ColumnsOrder()
     CPPUNIT_ASSERT_EQUAL( "second in second", li.GetText() );
 }
 
     CPPUNIT_ASSERT_EQUAL( "second in second", li.GetText() );
 }
 

+#endif // wxHAS_LISTCTRL_COLUMN_ORDER
+

 void ListCtrlTestCase::ItemRect()
 {
     // set up for the test
 void ListCtrlTestCase::ItemRect()
 {
     // set up for the test


@@ -157,7 +162,7 @@ void ListCtrlTestCase::ItemRect()
 
     // do test
     wxRect r;
 
     // do test
     wxRect r;

-    CPPUNIT_ASSERT( !m_list->GetItemRect(1, r) );
+    WX_ASSERT_FAILS_WITH_ASSERT( m_list->GetItemRect(1, r) );

     CPPUNIT_ASSERT( m_list->GetItemRect(0, r) );
     CPPUNIT_ASSERT_EQUAL( 150, r.GetWidth() );
 
     CPPUNIT_ASSERT( m_list->GetItemRect(0, r) );
     CPPUNIT_ASSERT_EQUAL( 150, r.GetWidth() );
 


@@ -173,4 +178,21 @@ void ListCtrlTestCase::ItemRect()
     WX_ASSERT_FAILS_WITH_ASSERT( m_list->GetSubItemRect(0, 3, r) );
 }
 
     WX_ASSERT_FAILS_WITH_ASSERT( m_list->GetSubItemRect(0, 3, r) );
 }
 

-#endif // wxHAS_LISTCTRL_COLUMN_ORDER
+void ListCtrlTestCase::ChangeMode()
+{
+    m_list->InsertColumn(0, "Header");
+    m_list->InsertItem(0, "First");
+    m_list->InsertItem(1, "Second");
+    CPPUNIT_ASSERT_EQUAL( 2, m_list->GetItemCount() );
+
+    // check that switching the mode preserves the items
+    m_list->SetWindowStyle(wxLC_ICON);
+    CPPUNIT_ASSERT_EQUAL( 2, m_list->GetItemCount() );
+    CPPUNIT_ASSERT_EQUAL( "First", m_list->GetItemText(0) );
+
+    // and so does switching back
+    m_list->SetWindowStyle(wxLC_REPORT);
+    CPPUNIT_ASSERT_EQUAL( 2, m_list->GetItemCount() );
+    CPPUNIT_ASSERT_EQUAL( "First", m_list->GetItemText(0) );
+}
+