Index: ui/views/controls/slider_unittest.cc |
diff --git a/ui/views/controls/slider_unittest.cc b/ui/views/controls/slider_unittest.cc |
index 390d837e0ab20a455aa7261eac9c1f44856806f8..44893c97c257d2614e399d5ded4c1171ce5d6097 100644 |
--- a/ui/views/controls/slider_unittest.cc |
+++ b/ui/views/controls/slider_unittest.cc |
@@ -19,7 +19,6 @@ |
#include "ui/events/keycodes/keyboard_codes.h" |
#include "ui/events/test/event_generator.h" |
#include "ui/views/test/slider_test_api.h" |
-#include "ui/views/test/test_slider.h" |
#include "ui/views/test/views_test_base.h" |
#include "ui/views/view.h" |
#include "ui/views/widget/widget.h" |
@@ -183,7 +182,7 @@ SliderTest::~SliderTest() { |
void SliderTest::SetUp() { |
views::ViewsTestBase::SetUp(); |
- slider_ = new TestSlider(nullptr); |
+ slider_ = new Slider(nullptr); |
View* view = slider_; |
gfx::Size size = view->GetPreferredSize(); |
view->SetSize(size); |
@@ -219,22 +218,7 @@ void SliderTest::ClickAt(int x, int y) { |
event_generator_->ClickLeftButton(); |
} |
-// Test fixture for horizontally oriented slider tests. |
-class HorizontalSliderTest : public SliderTest { |
- public: |
- HorizontalSliderTest(); |
- ~HorizontalSliderTest() override; |
- |
- private: |
- DISALLOW_COPY_AND_ASSIGN(HorizontalSliderTest); |
-}; |
- |
-HorizontalSliderTest::HorizontalSliderTest() : SliderTest() {} |
- |
-HorizontalSliderTest::~HorizontalSliderTest() { |
-} |
- |
-TEST_F(HorizontalSliderTest, UpdateFromClickHorizontal) { |
+TEST_F(SliderTest, UpdateFromClickHorizontal) { |
ClickAt(0, 0); |
EXPECT_EQ(0.0f, slider()->value()); |
@@ -242,8 +226,7 @@ TEST_F(HorizontalSliderTest, UpdateFromClickHorizontal) { |
EXPECT_EQ(1.0f, slider()->value()); |
} |
- |
-TEST_F(HorizontalSliderTest, UpdateFromClickRTLHorizontal) { |
+TEST_F(SliderTest, UpdateFromClickRTLHorizontal) { |
base::i18n::SetICUDefaultLocale("he"); |
ClickAt(0, 0); |
@@ -257,7 +240,7 @@ TEST_F(HorizontalSliderTest, UpdateFromClickRTLHorizontal) { |
#if !defined(OS_MACOSX) || defined(USE_AURA) |
// Test the slider location after a tap gesture. |
-TEST_F(HorizontalSliderTest, SliderValueForTapGesture) { |
+TEST_F(SliderTest, SliderValueForTapGesture) { |
// Tap below the minimum. |
slider()->SetValue(0.5); |
event_generator()->GestureTapAt(gfx::Point(0, 0)); |
@@ -275,7 +258,7 @@ TEST_F(HorizontalSliderTest, SliderValueForTapGesture) { |
} |
// Test the slider location after a scroll gesture. |
-TEST_F(HorizontalSliderTest, SliderValueForScrollGesture) { |
+TEST_F(SliderTest, SliderValueForScrollGesture) { |
// Scroll below the minimum. |
slider()->SetValue(0.5); |
event_generator()->GestureScrollSequence( |
@@ -303,8 +286,8 @@ TEST_F(HorizontalSliderTest, SliderValueForScrollGesture) { |
} |
// Test the slider location by adjusting it using keyboard. |
-TEST_F(HorizontalSliderTest, SliderValueForKeyboard) { |
- float value =0.5; |
+TEST_F(SliderTest, SliderValueForKeyboard) { |
+ float value = 0.5; |
slider()->SetValue(value); |
slider()->RequestFocus(); |
event_generator()->PressKey(ui::VKEY_RIGHT, 0); |
@@ -316,7 +299,7 @@ TEST_F(HorizontalSliderTest, SliderValueForKeyboard) { |
} |
// Verifies the correct SliderListener events are raised for a tap gesture. |
-TEST_F(HorizontalSliderTest, SliderListenerEventsForTapGesture) { |
+TEST_F(SliderTest, SliderListenerEventsForTapGesture) { |
test::SliderTestApi slider_test_api(slider()); |
slider_test_api.SetListener(&slider_listener()); |
@@ -328,7 +311,7 @@ TEST_F(HorizontalSliderTest, SliderListenerEventsForTapGesture) { |
} |
// Verifies the correct SliderListener events are raised for a scroll gesture. |
-TEST_F(HorizontalSliderTest, SliderListenerEventsForScrollGesture) { |
+TEST_F(SliderTest, SliderListenerEventsForScrollGesture) { |
test::SliderTestApi slider_test_api(slider()); |
slider_test_api.SetListener(&slider_listener()); |
@@ -347,7 +330,7 @@ TEST_F(HorizontalSliderTest, SliderListenerEventsForScrollGesture) { |
// Verifies the correct SliderListener events are raised for a multi |
// finger scroll gesture. |
-TEST_F(HorizontalSliderTest, SliderListenerEventsForMultiFingerScrollGesture) { |
+TEST_F(SliderTest, SliderListenerEventsForMultiFingerScrollGesture) { |
test::SliderTestApi slider_test_api(slider()); |
slider_test_api.SetListener(&slider_listener()); |