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 0913b8ab8e299338166d482457a02a1c46a9da06..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,127 +195,127 @@ 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()
 {
     wxArrayString a1;
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ArraysTestCase, "ArraysTestCase" );
 
 void ArraysTestCase::wxStringArrayTest()
 {
     wxArrayString a1;

-    a1.Add(_T("thermit"));
-    a1.Add(_T("condor"));
-    a1.Add(_T("lion"), 3);
-    a1.Add(_T("dog"));
-    a1.Add(_T("human"));
-    a1.Add(_T("alligator"));
-
-    CPPUNIT_ASSERT( COMPARE_8_VALUES( a1 , _T("thermit") ,
-                                           _T("condor") ,
-                                           _T("lion") ,
-                                           _T("lion") ,
-                                           _T("lion") ,
-                                           _T("dog") ,
-                                           _T("human") ,
-                                           _T("alligator") ) );
+    a1.Add(wxT("thermit"));
+    a1.Add(wxT("condor"));
+    a1.Add(wxT("lion"), 3);
+    a1.Add(wxT("dog"));
+    a1.Add(wxT("human"));
+    a1.Add(wxT("alligator"));
+
+    CPPUNIT_ASSERT( COMPARE_8_VALUES( a1 , wxT("thermit") ,
+                                           wxT("condor") ,
+                                           wxT("lion") ,
+                                           wxT("lion") ,
+                                           wxT("lion") ,
+                                           wxT("dog") ,
+                                           wxT("human") ,
+                                           wxT("alligator") ) );

     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 8 ) );
 
     wxArrayString a2(a1);
 
     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 8 ) );
 
     wxArrayString a2(a1);
 

-    CPPUNIT_ASSERT( COMPARE_8_VALUES( a2 , _T("thermit") ,
-                                           _T("condor") ,
-                                           _T("lion") ,
-                                           _T("lion") ,
-                                           _T("lion") ,
-                                           _T("dog") ,
-                                           _T("human") ,
-                                           _T("alligator") ) );
+    CPPUNIT_ASSERT( COMPARE_8_VALUES( a2 , wxT("thermit") ,
+                                           wxT("condor") ,
+                                           wxT("lion") ,
+                                           wxT("lion") ,
+                                           wxT("lion") ,
+                                           wxT("dog") ,
+                                           wxT("human") ,
+                                           wxT("alligator") ) );

     CPPUNIT_ASSERT( COMPARE_COUNT( a2 , 8 ) );
 
     wxSortedArrayString a3(a1);
 
     CPPUNIT_ASSERT( COMPARE_COUNT( a2 , 8 ) );
 
     wxSortedArrayString a3(a1);
 

-    CPPUNIT_ASSERT( COMPARE_8_VALUES( a3 , _T("alligator") ,
-                                           _T("condor") ,
-                                           _T("dog") ,
-                                           _T("human") ,
-                                           _T("lion") ,
-                                           _T("lion") ,
-                                           _T("lion") ,
-                                           _T("thermit") ) );
+    CPPUNIT_ASSERT( COMPARE_8_VALUES( a3 , wxT("alligator") ,
+                                           wxT("condor") ,
+                                           wxT("dog") ,
+                                           wxT("human") ,
+                                           wxT("lion") ,
+                                           wxT("lion") ,
+                                           wxT("lion") ,
+                                           wxT("thermit") ) );

     CPPUNIT_ASSERT( COMPARE_COUNT( a3 , 8 ) );
 
     wxSortedArrayString a4;
     for (wxArrayString::iterator it = a1.begin(), en = a1.end(); it != en; ++it)
         a4.Add(*it);
 
     CPPUNIT_ASSERT( COMPARE_COUNT( a3 , 8 ) );
 
     wxSortedArrayString a4;
     for (wxArrayString::iterator it = a1.begin(), en = a1.end(); it != en; ++it)
         a4.Add(*it);
 

-    CPPUNIT_ASSERT( COMPARE_8_VALUES( a4 , _T("alligator") ,
-                                           _T("condor") ,
-                                           _T("dog") ,
-                                           _T("human") ,
-                                           _T("lion") ,
-                                           _T("lion") ,
-                                           _T("lion") ,
-                                           _T("thermit") ) );
+    CPPUNIT_ASSERT( COMPARE_8_VALUES( a4 , wxT("alligator") ,
+                                           wxT("condor") ,
+                                           wxT("dog") ,
+                                           wxT("human") ,
+                                           wxT("lion") ,
+                                           wxT("lion") ,
+                                           wxT("lion") ,
+                                           wxT("thermit") ) );

     CPPUNIT_ASSERT( COMPARE_COUNT( a4 , 8 ) );
 
     a1.RemoveAt(2,3);
 
     CPPUNIT_ASSERT( COMPARE_COUNT( a4 , 8 ) );
 
     a1.RemoveAt(2,3);
 

-    CPPUNIT_ASSERT( COMPARE_5_VALUES( a1 , _T("thermit") ,
-                                           _T("condor") ,
-                                           _T("dog") ,
-                                           _T("human") ,
-                                           _T("alligator") ) );
+    CPPUNIT_ASSERT( COMPARE_5_VALUES( a1 , wxT("thermit") ,
+                                           wxT("condor") ,
+                                           wxT("dog") ,
+                                           wxT("human") ,
+                                           wxT("alligator") ) );

     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 5 ) );
 
     a2 = a1;
 
     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 5 ) );
 
     a2 = a1;
 

-    CPPUNIT_ASSERT( COMPARE_5_VALUES( a2 , _T("thermit") ,
-                                           _T("condor") ,
-                                           _T("dog") ,
-                                           _T("human") ,
-                                           _T("alligator") ) );
+    CPPUNIT_ASSERT( COMPARE_5_VALUES( a2 , wxT("thermit") ,
+                                           wxT("condor") ,
+                                           wxT("dog") ,
+                                           wxT("human") ,
+                                           wxT("alligator") ) );

     CPPUNIT_ASSERT( COMPARE_COUNT( a2 , 5 ) );
 
     a1.Sort(false);
 
     CPPUNIT_ASSERT( COMPARE_COUNT( a2 , 5 ) );
 
     a1.Sort(false);
 

-    CPPUNIT_ASSERT( COMPARE_5_VALUES( a1 , _T("alligator") ,
-                                           _T("condor") ,
-                                           _T("dog") ,
-                                           _T("human") ,
-                                           _T("thermit") ) );
+    CPPUNIT_ASSERT( COMPARE_5_VALUES( a1 , wxT("alligator") ,
+                                           wxT("condor") ,
+                                           wxT("dog") ,
+                                           wxT("human") ,
+                                           wxT("thermit") ) );

     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 5 ) );
 
     a1.Sort(true);
 
     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 5 ) );
 
     a1.Sort(true);
 

-    CPPUNIT_ASSERT( COMPARE_5_VALUES( a1 , _T("thermit") ,
-                                           _T("human") ,
-                                           _T("dog") ,
-                                           _T("condor") ,
-                                           _T("alligator") ) );
+    CPPUNIT_ASSERT( COMPARE_5_VALUES( a1 , wxT("thermit") ,
+                                           wxT("human") ,
+                                           wxT("dog") ,
+                                           wxT("condor") ,
+                                           wxT("alligator") ) );

     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 5 ) );
 
     a1.Sort(&StringLenCompare);
 
     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 5 ) );
 
     a1.Sort(&StringLenCompare);
 

-    CPPUNIT_ASSERT( COMPARE_5_VALUES( a1 , _T("dog") ,
-                                           _T("human") ,
-                                           _T("condor") ,
-                                           _T("thermit") ,
-                                           _T("alligator") ) );
+    CPPUNIT_ASSERT( COMPARE_5_VALUES( a1 , wxT("dog") ,
+                                           wxT("human") ,
+                                           wxT("condor") ,
+                                           wxT("thermit") ,
+                                           wxT("alligator") ) );

     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 5 ) );
     CPPUNIT_ASSERT( COMPARE_COUNT( a1 , 5 ) );

-    CPPUNIT_ASSERT( a1.Index( _T("dog") ) == 0 );
-    CPPUNIT_ASSERT( a1.Index( _T("human") ) == 1 );
-    CPPUNIT_ASSERT( a1.Index( _T("humann") ) == wxNOT_FOUND );
-    CPPUNIT_ASSERT( a1.Index( _T("condor") ) == 2 );
-    CPPUNIT_ASSERT( a1.Index( _T("thermit") ) == 3 );
-    CPPUNIT_ASSERT( a1.Index( _T("alligator") ) == 4 );
+    CPPUNIT_ASSERT( a1.Index( wxT("dog") ) == 0 );
+    CPPUNIT_ASSERT( a1.Index( wxT("human") ) == 1 );
+    CPPUNIT_ASSERT( a1.Index( wxT("humann") ) == wxNOT_FOUND );
+    CPPUNIT_ASSERT( a1.Index( wxT("condor") ) == 2 );
+    CPPUNIT_ASSERT( a1.Index( wxT("thermit") ) == 3 );
+    CPPUNIT_ASSERT( a1.Index( wxT("alligator") ) == 4 );

 
     wxArrayString a5;
 
 
     wxArrayString a5;
 

-    CPPUNIT_ASSERT( a5.Add( _T("x"), 1 ) == 0 );
-    CPPUNIT_ASSERT( a5.Add( _T("a"), 3 ) == 1 );
+    CPPUNIT_ASSERT( a5.Add( wxT("x"), 1 ) == 0 );
+    CPPUNIT_ASSERT( a5.Add( wxT("a"), 3 ) == 1 );

 
 

-    CPPUNIT_ASSERT( COMPARE_4_VALUES( a5, _T("x") ,
-                                          _T("a") ,
-                                          _T("a") ,
-                                          _T("a") ) );
+    CPPUNIT_ASSERT( COMPARE_4_VALUES( a5, wxT("x") ,
+                                          wxT("a") ,
+                                          wxT("a") ,
+                                          wxT("a") ) );

 
     a5.assign(a1.end(), a1.end());
     CPPUNIT_ASSERT( a5.empty() );
 
     a5.assign(a1.end(), a1.end());
     CPPUNIT_ASSERT( a5.empty() );


@@ -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()


@@ -475,24 +500,24 @@ void ArraysTestCase::wxStringArraySplitJoinTest()
     }
 
     wxArrayString emptyArray;
     }
 
     wxArrayString emptyArray;

-    wxString string = wxJoin(emptyArray, _T(';'));
+    wxString string = wxJoin(emptyArray, wxT(';'));

     CPPUNIT_ASSERT( string.empty() );
 
     CPPUNIT_ASSERT( string.empty() );
 

-    CPPUNIT_ASSERT( wxSplit(string, _T(';')).empty() );
+    CPPUNIT_ASSERT( wxSplit(string, wxT(';')).empty() );

 
 

-    CPPUNIT_ASSERT_EQUAL( 2, wxSplit(_T(";"), _T(';')).size() );
+    CPPUNIT_ASSERT_EQUAL( 2, wxSplit(wxT(";"), wxT(';')).size() );

 }
 
 void ArraysTestCase::wxObjArrayTest()
 {
     {
         ArrayBars bars;
 }
 
 void ArraysTestCase::wxObjArrayTest()
 {
     {
         ArrayBars bars;

-        Bar bar(_T("first bar in general, second bar in array (two copies!)"));
+        Bar bar(wxT("first bar in general, second bar in array (two copies!)"));

 
         CPPUNIT_ASSERT_EQUAL( 0, bars.GetCount() );
         CPPUNIT_ASSERT_EQUAL( 1, Bar::GetNumber() );
 
 
         CPPUNIT_ASSERT_EQUAL( 0, bars.GetCount() );
         CPPUNIT_ASSERT_EQUAL( 1, Bar::GetNumber() );
 

-        bars.Add(new Bar(_T("first bar in array")));
+        bars.Add(new Bar(wxT("first bar in array")));

         bars.Add(bar, 2);
 
         CPPUNIT_ASSERT_EQUAL( 3, bars.GetCount() );
         bars.Add(bar, 2);
 
         CPPUNIT_ASSERT_EQUAL( 3, bars.GetCount() );