Better fix

[wxWidgets.git] / tests / geometry / rect.cpp

diff --git a/tests/geometry/rect.cpp b/tests/geometry/rect.cpp
index c7d73971f699bd8278f9b1c8d116d3c827aba461..505088b4dab0fbe5472572e3cb474ab115b03e41 100644 (file)
--- a/tests/geometry/rect.cpp
+++ b/tests/geometry/rect.cpp
@@ -21,6 +21,21 @@
     #include "wx/gdicmn.h"
 #endif // WX_PRECOMP
 
+#include "wx/iosfwrap.h"
+
+// ----------------------------------------------------------------------------
+// helper functions
+// ----------------------------------------------------------------------------
+
+// this operator is needed to use CPPUNIT_ASSERT_EQUAL with wxRects
+std::ostream& operator<<(std::ostream& os, const wxRect& r)
+{
+    os << "{"
+        << r.x << ", " << r.y << ", " << r.width << ", " << r.height
+       << "}";
+    return os;
+}
+
 // ----------------------------------------------------------------------------
 // test class
 // ----------------------------------------------------------------------------
@@ -32,11 +47,13 @@ public:
 
 private:
     CPPUNIT_TEST_SUITE( RectTestCase );
+        CPPUNIT_TEST( CentreIn );
         CPPUNIT_TEST( InflateDeflate );
         CPPUNIT_TEST( Operators );
         CPPUNIT_TEST( Union );
     CPPUNIT_TEST_SUITE_END();
 
+    void CentreIn();
     void InflateDeflate();
     void Operators();
     void Union();
@@ -50,6 +67,17 @@ CPPUNIT_TEST_SUITE_REGISTRATION( RectTestCase );
 // also include in it's own registry so that these tests can be run alone
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( RectTestCase, "RectTestCase" );
 
+void RectTestCase::CentreIn()
+{
+    typedef wxRect R;
+
+    CPPUNIT_ASSERT_EQUAL( R(45, 45, 10, 10),
+                          R(0, 0, 10, 10).CentreIn(R(0, 0, 100, 100)));
+
+    CPPUNIT_ASSERT_EQUAL( R(-5, -5, 20, 20),
+                          R(0, 0, 20, 20).CentreIn(R(0, 0, 10, 10)));
+}
+
 void RectTestCase::InflateDeflate()
 {
     // This is the rectangle from the example in the documentation of wxRect::Inflate().
@@ -101,6 +129,14 @@ void RectTestCase::Operators()
             ( data.GetSecond() + data.GetFirst() ) == data.GetResult()
         );
     }
+
+    // test operator*() which returns the intersection of two rectangles
+    wxRect r1 = wxRect(0, 2, 3, 4);
+    wxRect r2 = wxRect(1, 2, 7, 8);
+    r1 *= r2;
+    CPPUNIT_ASSERT(wxRect(1, 2, 2, 4) == r1);
+
+    CPPUNIT_ASSERT( (r1 * wxRect()).IsEmpty() );
 }
 
 void RectTestCase::Union()