| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "device/vr/vr_service_impl.h" | 5 #include "device/vr/vr_service_impl.h" |
| 6 | 6 |
| 7 #include "base/memory/ref_counted.h" |
| 7 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 8 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
| 9 #include "device/vr/test/fake_vr_device.h" | 10 #include "device/vr/test/fake_vr_device.h" |
| 10 #include "device/vr/test/fake_vr_device_provider.h" | 11 #include "device/vr/test/fake_vr_device_provider.h" |
| 11 #include "device/vr/vr_device_manager.h" | 12 #include "device/vr/vr_device_manager.h" |
| 12 #include "device/vr/vr_service.mojom.h" | 13 #include "device/vr/vr_service.mojom.h" |
| 13 #include "testing/gmock/include/gmock/gmock.h" | 14 #include "testing/gmock/include/gmock/gmock.h" |
| 14 | 15 |
| 15 using ::testing::_; | 16 using ::testing::_; |
| 16 using ::testing::Mock; | 17 using ::testing::Mock; |
| 17 | 18 |
| 18 namespace device { | 19 namespace device { |
| 19 | 20 |
| 20 class MockVRServiceClient : public VRServiceClient { | 21 class MockVRServiceClient : public VRServiceClient { |
| 21 public: | 22 public: |
| 22 MOCK_METHOD1(OnDisplayChanged, void(const VRDisplay& display)); | 23 MOCK_METHOD1(OnDisplayChanged, void(const VRDisplay& display)); |
| 23 void OnDisplayChanged(VRDisplayPtr display) override { | 24 void OnDisplayChanged(VRDisplayPtr display) override { |
| 24 OnDisplayChanged(*display); | 25 OnDisplayChanged(*display); |
| 25 last_display_ = std::move(display); | 26 last_display_ = std::move(display); |
| 26 } | 27 } |
| 27 | 28 |
| 28 MOCK_METHOD1(OnExitPresent, void(uint32_t index)); | 29 MOCK_METHOD1(OnExitPresent, void(uint32_t index)); |
| 29 | 30 |
| 30 MOCK_METHOD1(OnDisplayConnected, void(const VRDisplay& display)); | 31 MOCK_METHOD1(OnDisplayConnected, void(const VRDisplay& display)); |
| 31 void OnDisplayConnected(VRDisplayPtr display) override { | 32 void OnDisplayConnected(VRDisplayPtr display) override { |
| 32 OnDisplayConnected(*display); | 33 OnDisplayConnected(*display); |
| 33 last_display_ = std::move(display); | 34 last_display_ = std::move(display); |
| 34 } | 35 } |
| 35 void OnDisplayDisconnected(unsigned index) override {} | 36 void OnDisplayDisconnected(unsigned index) override {} |
| 37 void OnDisplayBlur(unsigned index) override {} |
| 38 void OnDisplayFocus(unsigned index) override {} |
| 36 | 39 |
| 37 const VRDisplayPtr& LastDisplay() { return last_display_; } | 40 const VRDisplayPtr& LastDisplay() { return last_display_; } |
| 38 | 41 |
| 39 private: | 42 private: |
| 40 VRDisplayPtr last_display_; | 43 VRDisplayPtr last_display_; |
| 41 }; | 44 }; |
| 42 | 45 |
| 43 class VRServiceTestBinding { | 46 class VRServiceTestBinding { |
| 44 public: | 47 public: |
| 45 VRServiceTestBinding() { | 48 VRServiceTestBinding() { |
| (...skipping 25 matching lines...) Expand all Loading... |
| 71 DISALLOW_COPY_AND_ASSIGN(VRServiceTestBinding); | 74 DISALLOW_COPY_AND_ASSIGN(VRServiceTestBinding); |
| 72 }; | 75 }; |
| 73 | 76 |
| 74 class VRServiceImplTest : public testing::Test { | 77 class VRServiceImplTest : public testing::Test { |
| 75 public: | 78 public: |
| 76 VRServiceImplTest() {} | 79 VRServiceImplTest() {} |
| 77 ~VRServiceImplTest() override {} | 80 ~VRServiceImplTest() override {} |
| 78 | 81 |
| 79 protected: | 82 protected: |
| 80 void SetUp() override { | 83 void SetUp() override { |
| 81 std::unique_ptr<FakeVRDeviceProvider> provider(new FakeVRDeviceProvider()); | 84 FakeVRDeviceProvider* provider = new FakeVRDeviceProvider(); |
| 82 provider_ = provider.get(); | 85 provider_ = provider; |
| 83 device_manager_.reset(new VRDeviceManager(std::move(provider))); | 86 device_manager_.reset(new VRDeviceManager(provider)); |
| 84 } | 87 } |
| 85 | 88 |
| 86 void TearDown() override { base::RunLoop().RunUntilIdle(); } | 89 void TearDown() override { base::RunLoop().RunUntilIdle(); } |
| 87 | 90 |
| 88 std::unique_ptr<VRServiceTestBinding> BindService() { | 91 std::unique_ptr<VRServiceTestBinding> BindService() { |
| 89 return std::unique_ptr<VRServiceTestBinding>(new VRServiceTestBinding()); | 92 return std::unique_ptr<VRServiceTestBinding>(new VRServiceTestBinding()); |
| 90 } | 93 } |
| 91 | 94 |
| 92 size_t ServiceCount() { return device_manager_->services_.size(); } | 95 size_t ServiceCount() { return device_manager_->services_.size(); } |
| 93 | 96 |
| 94 bool presenting() { return !!device_manager_->presenting_service_; } | 97 bool presenting() { return !!device_manager_->presenting_service_; } |
| 95 | 98 |
| 96 base::MessageLoop message_loop_; | 99 base::MessageLoop message_loop_; |
| 97 FakeVRDeviceProvider* provider_; | 100 scoped_refptr<FakeVRDeviceProvider> provider_; |
| 98 std::unique_ptr<VRDeviceManager> device_manager_; | 101 std::unique_ptr<VRDeviceManager> device_manager_; |
| 99 | 102 |
| 100 DISALLOW_COPY_AND_ASSIGN(VRServiceImplTest); | 103 DISALLOW_COPY_AND_ASSIGN(VRServiceImplTest); |
| 101 }; | 104 }; |
| 102 | 105 |
| 103 // Ensure that services are registered with the device manager as they are | 106 // Ensure that services are registered with the device manager as they are |
| 104 // created and removed from the device manager as their connections are closed. | 107 // created and removed from the device manager as their connections are closed. |
| 105 TEST_F(VRServiceImplTest, DeviceManagerRegistration) { | 108 TEST_F(VRServiceImplTest, DeviceManagerRegistration) { |
| 106 EXPECT_EQ(0u, ServiceCount()); | 109 EXPECT_EQ(0u, ServiceCount()); |
| 107 | 110 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 123 } | 126 } |
| 124 | 127 |
| 125 // Ensure that DeviceChanged calls are dispatched to all active services. | 128 // Ensure that DeviceChanged calls are dispatched to all active services. |
| 126 TEST_F(VRServiceImplTest, DeviceChangedDispatched) { | 129 TEST_F(VRServiceImplTest, DeviceChangedDispatched) { |
| 127 std::unique_ptr<VRServiceTestBinding> service_1 = BindService(); | 130 std::unique_ptr<VRServiceTestBinding> service_1 = BindService(); |
| 128 std::unique_ptr<VRServiceTestBinding> service_2 = BindService(); | 131 std::unique_ptr<VRServiceTestBinding> service_2 = BindService(); |
| 129 | 132 |
| 130 EXPECT_CALL(service_1->client(), OnDisplayChanged(_)); | 133 EXPECT_CALL(service_1->client(), OnDisplayChanged(_)); |
| 131 EXPECT_CALL(service_2->client(), OnDisplayChanged(_)); | 134 EXPECT_CALL(service_2->client(), OnDisplayChanged(_)); |
| 132 | 135 |
| 133 std::unique_ptr<FakeVRDevice> device(new FakeVRDevice(provider_)); | 136 std::unique_ptr<FakeVRDevice> device(new FakeVRDevice(provider_.get())); |
| 134 device_manager_->OnDeviceChanged(device->GetVRDevice()); | 137 device_manager_->OnDeviceChanged(device->GetVRDevice()); |
| 135 | 138 |
| 136 base::RunLoop().RunUntilIdle(); | 139 base::RunLoop().RunUntilIdle(); |
| 137 | 140 |
| 138 EXPECT_EQ(device->id(), service_1->client().LastDisplay()->index); | 141 EXPECT_EQ(device->id(), service_1->client().LastDisplay()->index); |
| 139 EXPECT_EQ(device->id(), service_2->client().LastDisplay()->index); | 142 EXPECT_EQ(device->id(), service_2->client().LastDisplay()->index); |
| 140 } | 143 } |
| 141 | 144 |
| 142 // Ensure that presenting devices cannot be accessed by other services | 145 // Ensure that presenting devices cannot be accessed by other services |
| 143 TEST_F(VRServiceImplTest, DevicePresentationIsolation) { | 146 TEST_F(VRServiceImplTest, DevicePresentationIsolation) { |
| 144 std::unique_ptr<VRServiceTestBinding> service_1 = BindService(); | 147 std::unique_ptr<VRServiceTestBinding> service_1 = BindService(); |
| 145 std::unique_ptr<VRServiceTestBinding> service_2 = BindService(); | 148 std::unique_ptr<VRServiceTestBinding> service_2 = BindService(); |
| 146 | 149 |
| 147 std::unique_ptr<FakeVRDevice> device(new FakeVRDevice(provider_)); | 150 std::unique_ptr<FakeVRDevice> device(new FakeVRDevice(provider_.get())); |
| 148 provider_->AddDevice(device.get()); | 151 provider_->AddDevice(device.get()); |
| 149 | 152 |
| 150 // Ensure the device manager has seen the fake device | 153 // Ensure the device manager has seen the fake device |
| 151 device_manager_->GetVRDevices(); | 154 device_manager_->GetVRDevices(); |
| 152 | 155 |
| 153 // When not presenting either service should be able to access the device | 156 // When not presenting either service should be able to access the device |
| 154 EXPECT_EQ(device.get(), VRDeviceManager::GetAllowedDevice( | 157 EXPECT_EQ(device.get(), VRDeviceManager::GetAllowedDevice( |
| 155 service_1->service(), device->id())); | 158 service_1->service(), device->id())); |
| 156 EXPECT_EQ(device.get(), VRDeviceManager::GetAllowedDevice( | 159 EXPECT_EQ(device.get(), VRDeviceManager::GetAllowedDevice( |
| 157 service_2->service(), device->id())); | 160 service_2->service(), device->id())); |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 } | 192 } |
| 190 | 193 |
| 191 // Ensure that DeviceChanged calls are dispatched to all active services. | 194 // Ensure that DeviceChanged calls are dispatched to all active services. |
| 192 TEST_F(VRServiceImplTest, DeviceConnectedDispatched) { | 195 TEST_F(VRServiceImplTest, DeviceConnectedDispatched) { |
| 193 std::unique_ptr<VRServiceTestBinding> service_1 = BindService(); | 196 std::unique_ptr<VRServiceTestBinding> service_1 = BindService(); |
| 194 std::unique_ptr<VRServiceTestBinding> service_2 = BindService(); | 197 std::unique_ptr<VRServiceTestBinding> service_2 = BindService(); |
| 195 | 198 |
| 196 EXPECT_CALL(service_1->client(), OnDisplayConnected(_)); | 199 EXPECT_CALL(service_1->client(), OnDisplayConnected(_)); |
| 197 EXPECT_CALL(service_2->client(), OnDisplayConnected(_)); | 200 EXPECT_CALL(service_2->client(), OnDisplayConnected(_)); |
| 198 | 201 |
| 199 std::unique_ptr<FakeVRDevice> device(new FakeVRDevice(provider_)); | 202 std::unique_ptr<FakeVRDevice> device(new FakeVRDevice(provider_.get())); |
| 200 device_manager_->OnDeviceConnectionStatusChanged(device.get(), true); | 203 device_manager_->OnDeviceConnectionStatusChanged(device.get(), true); |
| 201 | 204 |
| 202 base::RunLoop().RunUntilIdle(); | 205 base::RunLoop().RunUntilIdle(); |
| 203 | 206 |
| 204 EXPECT_EQ(device->id(), service_1->client().LastDisplay()->index); | 207 EXPECT_EQ(device->id(), service_1->client().LastDisplay()->index); |
| 205 EXPECT_EQ(device->id(), service_2->client().LastDisplay()->index); | 208 EXPECT_EQ(device->id(), service_2->client().LastDisplay()->index); |
| 206 } | 209 } |
| 207 } | 210 } |
| OLD | NEW |