X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6712283cf1b562897bfc36c54da5e03c05f402ed..2febffbac706bd984d1c8e96bbc8f27b2343f07d:/tests/vectors/vectors.cpp?ds=sidebyside

diff --git a/tests/vectors/vectors.cpp b/tests/vectors/vectors.cpp
index 7f0128c80d..4803068aab 100644
--- a/tests/vectors/vectors.cpp
+++ b/tests/vectors/vectors.cpp
@@ -47,7 +47,7 @@ private:
 int CountedObject::ms_count = 0;
 
 // ----------------------------------------------------------------------------
-// simple class capable of checking it's this pointer validity
+// simple class capable of checking its "this" pointer validity
 // ----------------------------------------------------------------------------
 
 class SelfPointingObject
@@ -57,6 +57,10 @@ public:
     SelfPointingObject(const SelfPointingObject&) { m_self = this; }
     ~SelfPointingObject() { CPPUNIT_ASSERT( this == m_self ); }
 
+    // the assignment operator should not modify our "this" pointer so
+    // implement it just to prevent the default version from doing it
+    SelfPointingObject& operator=(const SelfPointingObject&) { return *this; }
+
 private:
     SelfPointingObject *m_self;
 };
@@ -78,6 +82,8 @@ private:
         CPPUNIT_TEST( Iterators );
         CPPUNIT_TEST( Objects );
         CPPUNIT_TEST( NonPODs );
+        CPPUNIT_TEST( Resize );
+        CPPUNIT_TEST( Swap );
     CPPUNIT_TEST_SUITE_END();
 
     void PushPopTest();
@@ -86,6 +92,8 @@ private:
     void Iterators();
     void Objects();
     void NonPODs();
+    void Resize();
+    void Swap();
 
     DECLARE_NO_COPY_CLASS(VectorsTestCase)
 };
@@ -206,7 +214,7 @@ void VectorsTestCase::Objects()
     v.push_back(CountedObject(3));
 
     v.erase(v.begin());
-    WX_ASSERT_SIZET_EQUAL( 2, v.size() );
+    CPPUNIT_ASSERT_EQUAL( 2, v.size() );
     CPPUNIT_ASSERT_EQUAL( 2, CountedObject::GetCount() );
 
     v.clear();
@@ -235,3 +243,49 @@ void VectorsTestCase::NonPODs()
     vs.erase(vs.begin());
     vs.clear();
 }
+
+void VectorsTestCase::Resize()
+{
+    wxVector<CountedObject> v;
+    v.resize(3);
+
+    CPPUNIT_ASSERT_EQUAL( 3, v.size() );
+    CPPUNIT_ASSERT_EQUAL( 3, CountedObject::GetCount() );
+    CPPUNIT_ASSERT_EQUAL( 0, v[0].GetValue() );
+    CPPUNIT_ASSERT_EQUAL( 0, v[1].GetValue() );
+    CPPUNIT_ASSERT_EQUAL( 0, v[2].GetValue() );
+
+    v.resize(1);
+    CPPUNIT_ASSERT_EQUAL( 1, v.size() );
+    CPPUNIT_ASSERT_EQUAL( 1, CountedObject::GetCount() );
+
+    v.resize(4, CountedObject(17));
+    CPPUNIT_ASSERT_EQUAL( 4, v.size() );
+    CPPUNIT_ASSERT_EQUAL( 4, CountedObject::GetCount() );
+    CPPUNIT_ASSERT_EQUAL( 0, v[0].GetValue() );
+    CPPUNIT_ASSERT_EQUAL( 17, v[1].GetValue() );
+    CPPUNIT_ASSERT_EQUAL( 17, v[2].GetValue() );
+    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() );
+}
+