diff options
Diffstat (limited to 'remoting/protocol/mouse_input_filter_unittest.cc')
| -rw-r--r-- | remoting/protocol/mouse_input_filter_unittest.cc | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/remoting/protocol/mouse_input_filter_unittest.cc b/remoting/protocol/mouse_input_filter_unittest.cc index 376decd..6c98930 100644 --- a/remoting/protocol/mouse_input_filter_unittest.cc +++ b/remoting/protocol/mouse_input_filter_unittest.cc @@ -8,7 +8,7 @@ #include "remoting/protocol/protocol_mock_objects.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/skia/include/core/SkPoint.h" +#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" using ::testing::_; using ::testing::InSequence; @@ -28,16 +28,22 @@ static MouseEvent MouseMoveEvent(int x, int y) { } static void InjectTestSequence(InputStub* input_stub) { - static const SkIPoint input_sequence[] = { + struct Point { + int x; + int y; + }; + static const Point input_sequence[] = { {-5, 10}, {0, 10}, {-1, 10}, {15, 40}, {15, 45}, {15, 39}, {15, 25} }; - for (unsigned int i=0; i<arraysize(input_sequence); ++i) { - const SkIPoint& point = input_sequence[i]; - input_stub->InjectMouseEvent(MouseMoveEvent(point.x(), point.y())); + // arraysize() cannot be used here, becase Point is declared inside of a + // function. + for (unsigned int i = 0; i < ARRAYSIZE_UNSAFE(input_sequence); ++i) { + const Point& point = input_sequence[i]; + input_stub->InjectMouseEvent(MouseMoveEvent(point.x, point.y)); } - for (unsigned int i=0; i<arraysize(input_sequence); ++i) { - const SkIPoint& point = input_sequence[i]; - input_stub->InjectMouseEvent(MouseMoveEvent(point.y(), point.x())); + for (unsigned int i = 0; i < ARRAYSIZE_UNSAFE(input_sequence); ++i) { + const Point& point = input_sequence[i]; + input_stub->InjectMouseEvent(MouseMoveEvent(point.y, point.x)); } } @@ -56,7 +62,7 @@ TEST(MouseInputFilterTest, BothDimensionsZero) { TEST(MouseInputFilterTest, InputDimensionsZero) { MockInputStub mock_stub; MouseInputFilter mouse_filter(&mock_stub); - mouse_filter.set_output_size(SkISize::Make(50,50)); + mouse_filter.set_output_size(webrtc::DesktopSize(50, 50)); EXPECT_CALL(mock_stub, InjectMouseEvent(_)) .Times(0); @@ -68,7 +74,7 @@ TEST(MouseInputFilterTest, InputDimensionsZero) { TEST(MouseInputFilterTest, OutputDimensionsZero) { MockInputStub mock_stub; MouseInputFilter mouse_filter(&mock_stub); - mouse_filter.set_input_size(SkISize::Make(50,50)); + mouse_filter.set_input_size(webrtc::DesktopSize(50, 50)); EXPECT_CALL(mock_stub, InjectMouseEvent(_)) .Times(0); @@ -80,8 +86,8 @@ TEST(MouseInputFilterTest, OutputDimensionsZero) { TEST(MouseInputFilterTest, NoScalingOrClipping) { MockInputStub mock_stub; MouseInputFilter mouse_filter(&mock_stub); - mouse_filter.set_output_size(SkISize::Make(40,40)); - mouse_filter.set_input_size(SkISize::Make(40,40)); + mouse_filter.set_output_size(webrtc::DesktopSize(40,40)); + mouse_filter.set_input_size(webrtc::DesktopSize(40,40)); { InSequence s; @@ -108,8 +114,8 @@ TEST(MouseInputFilterTest, NoScalingOrClipping) { TEST(MouseInputFilterTest, UpScalingAndClamping) { MockInputStub mock_stub; MouseInputFilter mouse_filter(&mock_stub); - mouse_filter.set_output_size(SkISize::Make(80,80)); - mouse_filter.set_input_size(SkISize::Make(40,40)); + mouse_filter.set_output_size(webrtc::DesktopSize(80, 80)); + mouse_filter.set_input_size(webrtc::DesktopSize(40, 40)); { InSequence s; @@ -136,8 +142,8 @@ TEST(MouseInputFilterTest, UpScalingAndClamping) { TEST(MouseInputFilterTest, DownScalingAndClamping) { MockInputStub mock_stub; MouseInputFilter mouse_filter(&mock_stub); - mouse_filter.set_output_size(SkISize::Make(30,30)); - mouse_filter.set_input_size(SkISize::Make(40,40)); + mouse_filter.set_output_size(webrtc::DesktopSize(30, 30)); + mouse_filter.set_input_size(webrtc::DesktopSize(40, 40)); { InSequence s; |