Fix deleting and clearing wxTreeListCtrl columns.

[wxWidgets.git] / tests / arrays / arrays.cpp

diff --git a/tests/arrays/arrays.cpp b/tests/arrays/arrays.cpp
index ed74c948351ee84def33142f56ed2ba549f06fa4..fdaa5057f142e19505b7f44ef8701933713c551a 100644 (file)
--- a/tests/arrays/arrays.cpp
+++ b/tests/arrays/arrays.cpp
@@ -160,6 +160,7 @@ public:
 private:
     CPPUNIT_TEST_SUITE( ArraysTestCase );
         CPPUNIT_TEST( wxStringArrayTest );
 private:
     CPPUNIT_TEST_SUITE( ArraysTestCase );
         CPPUNIT_TEST( wxStringArrayTest );

+        CPPUNIT_TEST( SortedArray );

         CPPUNIT_TEST( wxStringArraySplitTest );
         CPPUNIT_TEST( wxStringArrayJoinTest );
         CPPUNIT_TEST( wxStringArraySplitJoinTest );
         CPPUNIT_TEST( wxStringArraySplitTest );
         CPPUNIT_TEST( wxStringArrayJoinTest );
         CPPUNIT_TEST( wxStringArraySplitJoinTest );


@@ -175,6 +176,7 @@ private:
     CPPUNIT_TEST_SUITE_END();
 
     void wxStringArrayTest();
     CPPUNIT_TEST_SUITE_END();
 
     void wxStringArrayTest();

+    void SortedArray();

     void wxStringArraySplitTest();
     void wxStringArrayJoinTest();
     void wxStringArraySplitJoinTest();
     void wxStringArraySplitTest();
     void wxStringArrayJoinTest();
     void wxStringArraySplitJoinTest();


@@ -193,7 +195,7 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( ArraysTestCase );
 
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( ArraysTestCase );
 

-// also include in it's own registry so that these tests can be run alone
+// also include in its own registry so that these tests can be run alone

 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ArraysTestCase, "ArraysTestCase" );
 
 void ArraysTestCase::wxStringArrayTest()
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ArraysTestCase, "ArraysTestCase" );
 
 void ArraysTestCase::wxStringArrayTest()


@@ -327,6 +329,29 @@ void ArraysTestCase::wxStringArrayTest()
     CPPUNIT_ASSERT_EQUAL( WXSIZEOF(months), a5.size() );
     CPPUNIT_ASSERT( COMPARE_3_VALUES(a5, "Jan", "Feb", "Mar") );
 #endif // wxHAS_VECTOR_TEMPLATE_ASSIGN
     CPPUNIT_ASSERT_EQUAL( WXSIZEOF(months), a5.size() );
     CPPUNIT_ASSERT( COMPARE_3_VALUES(a5, "Jan", "Feb", "Mar") );
 #endif // wxHAS_VECTOR_TEMPLATE_ASSIGN

+
+    a5.clear();
+    CPPUNIT_ASSERT_EQUAL( 0, a5.size() );
+
+    a5.resize(7, "Foo");
+    CPPUNIT_ASSERT_EQUAL( 7, a5.size() );
+    CPPUNIT_ASSERT_EQUAL( "Foo", a5[3] );
+
+    a5.resize(3);
+    CPPUNIT_ASSERT_EQUAL( 3, a5.size() );
+    CPPUNIT_ASSERT_EQUAL( "Foo", a5[2] );
+}
+
+void ArraysTestCase::SortedArray()
+{
+    wxSortedArrayString a;
+    a.Add("d");
+    a.Add("c");
+    CPPUNIT_ASSERT_EQUAL( 0, a.Index("c") );
+
+    a.push_back("b");
+    a.push_back("a");
+    CPPUNIT_ASSERT_EQUAL( 0, a.Index("a") );

 }
 
 void ArraysTestCase::wxStringArraySplitTest()
 }
 
 void ArraysTestCase::wxStringArraySplitTest()