Remove USE_GDIPLUS setting from bakefiles.

[wxWidgets.git] / tests / controls / textentrytest.cpp

diff --git a/tests/controls/textentrytest.cpp b/tests/controls/textentrytest.cpp
index 80e6482fa90d9efabc9ee5a4c5a6edfd127d7658..fcd911cf8ce2476e659fd3ce5be99aa31f53e946 100644 (file)
--- a/tests/controls/textentrytest.cpp
+++ b/tests/controls/textentrytest.cpp
@@ -36,7 +36,7 @@ void TextEntryTestCase::SetValue()
     CPPUNIT_ASSERT_EQUAL( "bye", entry->GetValue() );
 }
 
     CPPUNIT_ASSERT_EQUAL( "bye", entry->GetValue() );
 }
 

-void TextEntryTestCase::TextChangeEvents()
+namespace

 {
     class TextTestEventHandler : public wxEvtHandler
     {
 {
     class TextTestEventHandler : public wxEvtHandler
     {


@@ -55,7 +55,12 @@ void TextEntryTestCase::TextChangeEvents()
 
     private:
         int m_events;
 
     private:
         int m_events;

-    } handler;
+    };
+}
+
+void TextEntryTestCase::TextChangeEvents()
+{
+    TextTestEventHandler handler;

 
     GetTestWindow()->Connect
                      (
 
     GetTestWindow()->Connect
                      (


@@ -96,6 +101,11 @@ void TextEntryTestCase::TextChangeEvents()
     CPPUNIT_ASSERT_EQUAL( 1, handler.GetEvents() );
 }
 
     CPPUNIT_ASSERT_EQUAL( 1, handler.GetEvents() );
 }
 

+void TextEntryTestCase::CheckStringSelection(const char *sel)
+{
+    CPPUNIT_ASSERT_EQUAL( sel, GetTestEntry()->GetStringSelection() );
+}
+

 void TextEntryTestCase::AssertSelection(int from, int to, const char *sel)
 {
     wxTextEntry * const entry = GetTestEntry();
 void TextEntryTestCase::AssertSelection(int from, int to, const char *sel)
 {
     wxTextEntry * const entry = GetTestEntry();


@@ -107,9 +117,10 @@ void TextEntryTestCase::AssertSelection(int from, int to, const char *sel)
     entry->GetSelection(&fromReal, &toReal);
     CPPUNIT_ASSERT_EQUAL( from, fromReal );
     CPPUNIT_ASSERT_EQUAL( to, toReal );
     entry->GetSelection(&fromReal, &toReal);
     CPPUNIT_ASSERT_EQUAL( from, fromReal );
     CPPUNIT_ASSERT_EQUAL( to, toReal );

-    CPPUNIT_ASSERT_EQUAL( sel, entry->GetStringSelection() );

 
     CPPUNIT_ASSERT_EQUAL( from, entry->GetInsertionPoint() );
 
     CPPUNIT_ASSERT_EQUAL( from, entry->GetInsertionPoint() );

+
+    CheckStringSelection(sel);

 }
 
 void TextEntryTestCase::Selection()
 }
 
 void TextEntryTestCase::Selection()


@@ -159,3 +170,27 @@ void TextEntryTestCase::InsertionPoint()
     CPPUNIT_ASSERT_EQUAL( 1, entry->GetInsertionPoint() );
 }
 
     CPPUNIT_ASSERT_EQUAL( 1, entry->GetInsertionPoint() );
 }
 

+void TextEntryTestCase::Replace()
+{
+    wxTextEntry * const entry = GetTestEntry();
+
+    entry->SetValue("Hello replace!"
+                    "0123456789012");
+    entry->SetInsertionPoint(0);
+
+    entry->Replace(6, 13, "changed");
+
+    CPPUNIT_ASSERT_EQUAL("Hello changed!"
+                         "0123456789012",
+                         entry->GetValue());
+    CPPUNIT_ASSERT_EQUAL(13, entry->GetInsertionPoint());
+
+    entry->Replace(13, -1, "");
+    CPPUNIT_ASSERT_EQUAL("Hello changed", entry->GetValue());
+    CPPUNIT_ASSERT_EQUAL(13, entry->GetInsertionPoint());
+
+    entry->Replace(0, 6, "Un");
+    CPPUNIT_ASSERT_EQUAL("Unchanged", entry->GetValue());
+    CPPUNIT_ASSERT_EQUAL(2, entry->GetInsertionPoint());
+}
+