reusing existing API

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

diff --git a/tests/controls/slidertest.cpp b/tests/controls/slidertest.cpp
index 2712d4424a4ec7e555be2ff9bcfe85a71120b127..2c4d35ae1964c47335cadf30e03a08d11aa37902 100644 (file)
--- a/tests/controls/slidertest.cpp
+++ b/tests/controls/slidertest.cpp
@@ -33,9 +33,11 @@ public:
 
 private:
     CPPUNIT_TEST_SUITE( SliderTestCase );
+#ifndef __WXOSX__
         WXUISIM_TEST( PageUpDown );
         WXUISIM_TEST( LineUpDown );
         WXUISIM_TEST( LinePageSize );
+#endif
         CPPUNIT_TEST( Value );
         CPPUNIT_TEST( Range );
         WXUISIM_TEST( Thumb );
@@ -64,7 +66,7 @@ bool SliderTestCase::ms_inversed = false;
 // register in the unnamed registry so that these tests are run by default
 CPPUNIT_TEST_SUITE_REGISTRATION( SliderTestCase );
 
-// also include in it's own registry so that these tests can be run alone
+// also include in its own registry so that these tests can be run alone
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SliderTestCase, "SliderTestCase" );
 
 void SliderTestCase::setUp()
@@ -87,11 +89,8 @@ void SliderTestCase::tearDown()
 void SliderTestCase::PageUpDown()
 {
 #if wxUSE_UIACTIONSIMULATOR
-    wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(),
-                                          wxTestableFrame);
-
-    EventCounter count(m_slider, wxEVT_SCROLL_PAGEUP);
-    EventCounter count1(m_slider, wxEVT_SCROLL_PAGEDOWN);
+    EventCounter pageup(m_slider, wxEVT_SCROLL_PAGEUP);
+    EventCounter pagedown(m_slider, wxEVT_SCROLL_PAGEDOWN);
 
     wxUIActionSimulator sim;
 
@@ -102,19 +101,16 @@ void SliderTestCase::PageUpDown()
 
     wxYield();
 
-    CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(wxEVT_SCROLL_PAGEUP));
-    CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(wxEVT_SCROLL_PAGEDOWN));
+    CPPUNIT_ASSERT_EQUAL(1, pageup.GetCount());
+    CPPUNIT_ASSERT_EQUAL(1, pagedown.GetCount());
 #endif
 }
 
 void SliderTestCase::LineUpDown()
 {
 #if wxUSE_UIACTIONSIMULATOR
-    wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(),
-                                          wxTestableFrame);
-
-    EventCounter count(m_slider, wxEVT_SCROLL_LINEUP);
-    EventCounter count1(m_slider, wxEVT_SCROLL_LINEDOWN);
+    EventCounter lineup(m_slider, wxEVT_SCROLL_LINEUP);
+    EventCounter linedown(m_slider, wxEVT_SCROLL_LINEDOWN);
 
     wxUIActionSimulator sim;
 
@@ -125,8 +121,8 @@ void SliderTestCase::LineUpDown()
 
     wxYield();
 
-    CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(wxEVT_SCROLL_LINEUP));
-    CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(wxEVT_SCROLL_LINEDOWN));
+    CPPUNIT_ASSERT_EQUAL(1, lineup.GetCount());
+    CPPUNIT_ASSERT_EQUAL(1, linedown.GetCount());
 #endif
 }
 
@@ -193,12 +189,9 @@ void SliderTestCase::Range()
 void SliderTestCase::Thumb()
 {
 #if wxUSE_UIACTIONSIMULATOR && !defined(__WXGTK__)
-    wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(),
-                                          wxTestableFrame);
-
-    EventCounter count(m_slider, wxEVT_SCROLL_THUMBTRACK);
-    EventCounter count1(m_slider, wxEVT_SCROLL_THUMBRELEASE);
-    EventCounter count2(m_slider, wxEVT_SCROLL_CHANGED);
+    EventCounter track(m_slider, wxEVT_SCROLL_THUMBTRACK);
+    EventCounter release(m_slider, wxEVT_SCROLL_THUMBRELEASE);
+    EventCounter changed(m_slider, wxEVT_SCROLL_CHANGED);
 
     wxUIActionSimulator sim;
 
@@ -207,19 +200,13 @@ void SliderTestCase::Thumb()
     sim.MouseMove(m_slider->ClientToScreen(wxPoint(10, 10)));
     wxYield();
 
-    sim.MouseDown();
-    wxYield();
-
-    sim.MouseMove(m_slider->ClientToScreen(wxPoint(50, 10)));
-    wxYield();
-
-    sim.MouseUp();
+    sim.MouseClickAndDragTo(m_slider->ClientToScreen(wxPoint(50, 10)));
     wxYield();
 
-    CPPUNIT_ASSERT(frame->GetEventCount(wxEVT_SCROLL_THUMBTRACK) != 0);
-    CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(wxEVT_SCROLL_THUMBRELEASE));
+    CPPUNIT_ASSERT(track.GetCount() != 0);
+    CPPUNIT_ASSERT_EQUAL(1, release.GetCount());
 #ifdef __WXMSW__
-    CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(wxEVT_SCROLL_CHANGED));
+    CPPUNIT_ASSERT_EQUAL(1, changed.GetCount());
 #endif
 #endif
 }