X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e57034053aa0c73313f806c7b544e43c794394d..9cc4ab8522ec1978be193ae11b71e5623d78a14d:/tests/vectors/vectors.cpp

diff --git a/tests/vectors/vectors.cpp b/tests/vectors/vectors.cpp
index ad49527a94..9f7ab2bab9 100644
--- a/tests/vectors/vectors.cpp
+++ b/tests/vectors/vectors.cpp
@@ -23,9 +23,51 @@
 
 #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 its "this" pointer validity
+// ----------------------------------------------------------------------------
+
+class SelfPointingObject
+{
+public:
+    SelfPointingObject() { m_self = this; }
+    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;
+};
+
+// ----------------------------------------------------------------------------
 // test class
-// --------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 
 class VectorsTestCase : public CppUnit::TestCase
 {
@@ -38,12 +80,16 @@ private:
         CPPUNIT_TEST( Insert );
         CPPUNIT_TEST( Erase );
         CPPUNIT_TEST( Iterators );
+        CPPUNIT_TEST( Objects );
+        CPPUNIT_TEST( NonPODs );
     CPPUNIT_TEST_SUITE_END();
 
     void PushPopTest();
     void Insert();
     void Erase();
     void Iterators();
+    void Objects();
+    void NonPODs();
 
     DECLARE_NO_COPY_CLASS(VectorsTestCase)
 };
@@ -155,3 +201,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());
+    CPPUNIT_ASSERT_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();
+}