X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6757b667fdda54df2b9d62168df5a1574fa5e332..478c80536375745735c3f42f4051ab407b93ab28:/tests/vectors/vectors.cpp

diff --git a/tests/vectors/vectors.cpp b/tests/vectors/vectors.cpp
index 8d17541c55..7f0128c80d 100644
--- a/tests/vectors/vectors.cpp
+++ b/tests/vectors/vectors.cpp
@@ -23,9 +23,47 @@
 
 #include "wx/vector.h"
 
-// --------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// simple class capable of detecting leaks of its objects
+// ----------------------------------------------------------------------------
+
+class CountedObject
+{
+public:
+    CountedObject(int n = 0) : m_n(n) { ms_count++; }
+    CountedObject(const CountedObject& co) : m_n(co.m_n) { ms_count++; }
+    ~CountedObject() { ms_count--; }
+
+    int GetValue() const { return m_n; }
+
+    static int GetCount() { return ms_count; }
+
+private:
+    static int ms_count;
+
+    int m_n;
+};
+
+int CountedObject::ms_count = 0;
+
+// ----------------------------------------------------------------------------
+// simple class capable of checking it's this pointer validity
+// ----------------------------------------------------------------------------
+
+class SelfPointingObject
+{
+public:
+    SelfPointingObject() { m_self = this; }
+    SelfPointingObject(const SelfPointingObject&) { m_self = this; }
+    ~SelfPointingObject() { CPPUNIT_ASSERT( this == m_self ); }
+
+private:
+    SelfPointingObject *m_self;
+};
+
+// ----------------------------------------------------------------------------
 // test class
-// --------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 
 class VectorsTestCase : public CppUnit::TestCase
 {
@@ -34,12 +72,20 @@ public:
 
 private:
     CPPUNIT_TEST_SUITE( VectorsTestCase );
-        CPPUNIT_TEST( PushTest );
+        CPPUNIT_TEST( PushPopTest );
+        CPPUNIT_TEST( Insert );
+        CPPUNIT_TEST( Erase );
         CPPUNIT_TEST( Iterators );
+        CPPUNIT_TEST( Objects );
+        CPPUNIT_TEST( NonPODs );
     CPPUNIT_TEST_SUITE_END();
 
-    void PushTest();
+    void PushPopTest();
+    void Insert();
+    void Erase();
     void Iterators();
+    void Objects();
+    void NonPODs();
 
     DECLARE_NO_COPY_CLASS(VectorsTestCase)
 };
@@ -50,7 +96,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION( VectorsTestCase );
 // also include in it's own registry so that these tests can be run alone
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( VectorsTestCase, "VectorsTestCase" );
 
-void VectorsTestCase::PushTest()
+void VectorsTestCase::PushPopTest()
 {
     wxVector<int> v;
 
@@ -65,6 +111,76 @@ void VectorsTestCase::PushTest()
     CPPUNIT_ASSERT( v[0] == 1 );
     CPPUNIT_ASSERT( v[1] == 2 );
     CPPUNIT_ASSERT( v[2] == 42 );
+
+    v.pop_back();
+    CPPUNIT_ASSERT( v.size() == 2 );
+    CPPUNIT_ASSERT( v[0] == 1 );
+    CPPUNIT_ASSERT( v[1] == 2 );
+
+    v.pop_back();
+    CPPUNIT_ASSERT( v.size() == 1 );
+    CPPUNIT_ASSERT( v[0] == 1 );
+
+    v.pop_back();
+    CPPUNIT_ASSERT( v.size() == 0 );
+    CPPUNIT_ASSERT( v.empty() );
+
+    wxVector<char> vEmpty;
+}
+
+void VectorsTestCase::Insert()
+{
+    wxVector<char> v;
+
+    v.insert(v.end(), 'a');
+    CPPUNIT_ASSERT( v.size() == 1 );
+    CPPUNIT_ASSERT( v[0] == 'a' );
+
+    v.insert(v.end(), 'b');
+    CPPUNIT_ASSERT( v.size() == 2 );
+    CPPUNIT_ASSERT( v[0] == 'a' );
+    CPPUNIT_ASSERT( v[1] == 'b' );
+
+    v.insert(v.begin(), '0');
+    CPPUNIT_ASSERT( v.size() == 3 );
+    CPPUNIT_ASSERT( v[0] == '0' );
+    CPPUNIT_ASSERT( v[1] == 'a' );
+    CPPUNIT_ASSERT( v[2] == 'b' );
+
+    v.insert(v.begin() + 2, 'X');
+    CPPUNIT_ASSERT( v.size() == 4 );
+    CPPUNIT_ASSERT( v[0] == '0' );
+    CPPUNIT_ASSERT( v[1] == 'a' );
+    CPPUNIT_ASSERT( v[2] == 'X' );
+    CPPUNIT_ASSERT( v[3] == 'b' );
+}
+
+void VectorsTestCase::Erase()
+{
+    wxVector<int> v;
+
+    v.push_back(1);
+    v.push_back(2);
+    v.push_back(3);
+    v.push_back(4);
+    CPPUNIT_ASSERT( v.size() == 4 );
+
+    v.erase(v.begin(), v.end()-1);
+    CPPUNIT_ASSERT( v.size() == 1 );
+    CPPUNIT_ASSERT( v[0] == 4 );
+
+    v.clear();
+    v.push_back(1);
+    v.push_back(2);
+    v.push_back(3);
+    v.push_back(4);
+    CPPUNIT_ASSERT( v.size() == 4 );
+
+    v.erase(v.begin());
+    CPPUNIT_ASSERT( v.size() == 3 );
+    CPPUNIT_ASSERT( v[0] == 2 );
+    CPPUNIT_ASSERT( v[1] == 3 );
+    CPPUNIT_ASSERT( v[2] == 4 );
 }
 
 void VectorsTestCase::Iterators()
@@ -81,3 +197,41 @@ void VectorsTestCase::Iterators()
         CPPUNIT_ASSERT_EQUAL( value, *i );
     }
 }
+
+void VectorsTestCase::Objects()
+{
+    wxVector<CountedObject> v;
+    v.push_back(CountedObject(1));
+    v.push_back(CountedObject(2));
+    v.push_back(CountedObject(3));
+
+    v.erase(v.begin());
+    WX_ASSERT_SIZET_EQUAL( 2, v.size() );
+    CPPUNIT_ASSERT_EQUAL( 2, CountedObject::GetCount() );
+
+    v.clear();
+    CPPUNIT_ASSERT_EQUAL( 0, CountedObject::GetCount() );
+}
+
+void VectorsTestCase::NonPODs()
+{
+    wxVector<SelfPointingObject> v;
+    v.push_back(SelfPointingObject());
+    v.push_back(SelfPointingObject());
+    v.push_back(SelfPointingObject());
+
+    v.erase(v.begin());
+    v.clear();
+
+    // try the same with wxString, which is not POD, but is implemented in
+    // a movable way (this won't assert, but would crash or show some memory
+    // problems under Valgrind if wxString couldn't be safely moved with
+    // memmove()):
+    wxVector<wxString> vs;
+    vs.push_back("one");
+    vs.push_back("two");
+    vs.push_back("three");
+
+    vs.erase(vs.begin());
+    vs.clear();
+}