X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e068310a5a5fc97c6bd5149f140fbbea134d296d..736692f3a4a35b24b80f94784183e0d46fba22d9:/tests/vectors/vectors.cpp

diff --git a/tests/vectors/vectors.cpp b/tests/vectors/vectors.cpp
index f93afddf7e..d00e78bc52 100644
--- a/tests/vectors/vectors.cpp
+++ b/tests/vectors/vectors.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxVector<T> unit test
 // Author:      Vaclav Slavik
 // Created:     2007-07-07
-// RCS-ID:      $Id$
 // Copyright:   (c) 2007 Vaclav Slavik
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -83,6 +82,8 @@ private:
         CPPUNIT_TEST( Objects );
         CPPUNIT_TEST( NonPODs );
         CPPUNIT_TEST( Resize );
+        CPPUNIT_TEST( Swap );
+        CPPUNIT_TEST( Sort );
     CPPUNIT_TEST_SUITE_END();
 
     void PushPopTest();
@@ -92,6 +93,8 @@ private:
     void Objects();
     void NonPODs();
     void Resize();
+    void Swap();
+    void Sort();
 
     DECLARE_NO_COPY_CLASS(VectorsTestCase)
 };
@@ -99,7 +102,7 @@ private:
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( VectorsTestCase );
 
-// 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( VectorsTestCase, "VectorsTestCase" );
 
 void VectorsTestCase::PushPopTest()
@@ -266,3 +269,48 @@ void VectorsTestCase::Resize()
     CPPUNIT_ASSERT_EQUAL( 17, v[3].GetValue() );
 }
 
+void VectorsTestCase::Swap()
+{
+    wxVector<int> v1, v2;
+    v1.push_back(17);
+    v1.swap(v2);
+    CPPUNIT_ASSERT( v1.empty() );
+    CPPUNIT_ASSERT_EQUAL( 1, v2.size() );
+    CPPUNIT_ASSERT_EQUAL( 17, v2[0] );
+
+    v1.push_back(9);
+    v2.swap(v1);
+    CPPUNIT_ASSERT_EQUAL( 1, v1.size() );
+    CPPUNIT_ASSERT_EQUAL( 17, v1[0] );
+    CPPUNIT_ASSERT_EQUAL( 1, v2.size() );
+    CPPUNIT_ASSERT_EQUAL( 9, v2[0] );
+
+    v2.clear();
+    v1.swap(v2);
+    CPPUNIT_ASSERT( v1.empty() );
+}
+
+
+void VectorsTestCase::Sort()
+{
+    size_t  idx;
+    wxVector<int> v;
+
+    v.push_back(5);
+    v.push_back(7);
+    v.push_back(2);
+    v.push_back(9);
+    v.push_back(4);
+    v.push_back(1);
+    v.push_back(3);
+    v.push_back(8);
+    v.push_back(0);
+    v.push_back(6);
+
+    wxVectorSort(v);
+
+    for (idx=1; idx<v.size(); idx++)
+    {
+        CPPUNIT_ASSERT( v[idx-1] <= v[idx] );
+    }
+}