X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/232fdc630c42eb165f7659981043e794be03b3b7..1ec4e9c2b72a01a7ba7da569e0f8d04a81aaba10:/tests/controls/textentrytest.cpp?ds=inline diff --git a/tests/controls/textentrytest.cpp b/tests/controls/textentrytest.cpp index e28fc4809f..2bf31ed555 100644 --- a/tests/controls/textentrytest.cpp +++ b/tests/controls/textentrytest.cpp @@ -41,40 +41,45 @@ void TextEntryTestCase::SetValue() void TextEntryTestCase::TextChangeEvents() { - wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(), - wxTestableFrame); - - EventCounter count(GetTestWindow(), wxEVT_COMMAND_TEXT_UPDATED); + EventCounter updated(GetTestWindow(), wxEVT_COMMAND_TEXT_UPDATED); wxTextEntry * const entry = GetTestEntry(); // notice that SetValue() generates an event even if the text didn't change entry->SetValue(""); - CPPUNIT_ASSERT_EQUAL( 1, frame->GetEventCount() ); + CPPUNIT_ASSERT_EQUAL( 1, updated.GetCount() ); + updated.Clear(); entry->SetValue("foo"); - CPPUNIT_ASSERT_EQUAL( 1, frame->GetEventCount() ); + CPPUNIT_ASSERT_EQUAL( 1, updated.GetCount() ); + updated.Clear(); entry->SetValue("foo"); - CPPUNIT_ASSERT_EQUAL( 1, frame->GetEventCount() ); + CPPUNIT_ASSERT_EQUAL( 1, updated.GetCount() ); + updated.Clear(); entry->ChangeValue("bar"); - CPPUNIT_ASSERT_EQUAL( 0, frame->GetEventCount() ); + CPPUNIT_ASSERT_EQUAL( 0, updated.GetCount() ); entry->AppendText("bar"); - CPPUNIT_ASSERT_EQUAL( 1, frame->GetEventCount() ); + CPPUNIT_ASSERT_EQUAL( 1, updated.GetCount() ); + updated.Clear(); entry->Replace(3, 6, "baz"); - CPPUNIT_ASSERT_EQUAL( 1, frame->GetEventCount() ); + CPPUNIT_ASSERT_EQUAL( 1, updated.GetCount() ); + updated.Clear(); entry->Remove(0, 3); - CPPUNIT_ASSERT_EQUAL( 1, frame->GetEventCount() ); + CPPUNIT_ASSERT_EQUAL( 1, updated.GetCount() ); + updated.Clear(); entry->WriteText("foo"); - CPPUNIT_ASSERT_EQUAL( 1, frame->GetEventCount() ); + CPPUNIT_ASSERT_EQUAL( 1, updated.GetCount() ); + updated.Clear(); entry->Clear(); - CPPUNIT_ASSERT_EQUAL( 1, frame->GetEventCount() ); + CPPUNIT_ASSERT_EQUAL( 1, updated.GetCount() ); + updated.Clear(); } void TextEntryTestCase::CheckStringSelection(const char *sel) @@ -144,6 +149,9 @@ void TextEntryTestCase::InsertionPoint() entry->WriteText("-"); // should move it after the written text CPPUNIT_ASSERT_EQUAL( 4, entry->GetLastPosition() ); CPPUNIT_ASSERT_EQUAL( 1, entry->GetInsertionPoint() ); + + entry->SetValue("something different"); // should still reset the caret + CPPUNIT_ASSERT_EQUAL( 0, entry->GetInsertionPoint() ); } void TextEntryTestCase::Replace() @@ -173,13 +181,10 @@ void TextEntryTestCase::Replace() void TextEntryTestCase::Editable() { #if wxUSE_UIACTIONSIMULATOR - wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(), - wxTestableFrame); - wxTextEntry * const entry = GetTestEntry(); wxWindow * const window = GetTestWindow(); - EventCounter count(window, wxEVT_COMMAND_TEXT_UPDATED); + EventCounter updated(window, wxEVT_COMMAND_TEXT_UPDATED); window->SetFocus(); wxYield(); @@ -189,14 +194,16 @@ void TextEntryTestCase::Editable() wxYield(); CPPUNIT_ASSERT_EQUAL("abcdef", entry->GetValue()); - CPPUNIT_ASSERT_EQUAL(6, frame->GetEventCount()); + CPPUNIT_ASSERT_EQUAL(6, updated.GetCount()); + + updated.Clear(); entry->SetEditable(false); sim.Text("gh"); wxYield(); CPPUNIT_ASSERT_EQUAL("abcdef", entry->GetValue()); - CPPUNIT_ASSERT_EQUAL(0, frame->GetEventCount()); + CPPUNIT_ASSERT_EQUAL(0, updated.GetCount()); #endif }