Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(299)

Side by Side Diff: device/vr/vr_service_impl_unittest.cc

Issue 2453973002: WIP WebVR mojo refactor (Closed)
Patch Set: Fixed crash. VR data doesn't seem to be polling correctly, though. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « device/vr/vr_service_impl.cc ('k') | third_party/WebKit/Source/modules/vr/VRController.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "device/vr/test/fake_vr_device.h" 9 #include "device/vr/test/fake_vr_device.h"
10 #include "device/vr/test/fake_vr_device_provider.h" 10 #include "device/vr/test/fake_vr_device_provider.h"
11 #include "device/vr/vr_device_manager.h" 11 #include "device/vr/vr_device_manager.h"
12 #include "device/vr/vr_service.mojom.h" 12 #include "device/vr/vr_service.mojom.h"
13 #include "testing/gmock/include/gmock/gmock.h" 13 #include "testing/gmock/include/gmock/gmock.h"
14 14
15 using ::testing::_; 15 using ::testing::_;
16 using ::testing::Mock; 16 using ::testing::Mock;
17 17
18 namespace device { 18 namespace device {
19 19
20 class MockVRServiceClient : public VRServiceClient { 20 class MockVRServiceClient : public mojom::VRServiceClient {
21 public: 21 public:
22 MOCK_METHOD1(OnDisplayChanged, void(const VRDisplay& display)); 22 MOCK_METHOD1(GetDisplayClient,
23 void OnDisplayChanged(VRDisplayPtr display) override { 23 void(mojom::VRDisplayClientPtr& display_client));
24 OnDisplayChanged(*display);
25 last_display_ = std::move(display);
26 }
27
28 MOCK_METHOD1(OnExitPresent, void(uint32_t index));
29
30 MOCK_METHOD1(OnDisplayConnected, void(const VRDisplay& display));
31 void OnDisplayConnected(VRDisplayPtr display) override {
32 OnDisplayConnected(*display);
33 last_display_ = std::move(display);
34 }
35 void OnDisplayDisconnected(unsigned index) override {}
36
37 const VRDisplayPtr& LastDisplay() { return last_display_; }
38
39 private:
40 VRDisplayPtr last_display_;
41 }; 24 };
42 25
43 class VRServiceTestBinding { 26 class VRServiceTestBinding {
44 public: 27 public:
45 VRServiceTestBinding() { 28 VRServiceTestBinding() {
46 auto request = mojo::GetProxy(&service_ptr_); 29 auto request = mojo::GetProxy(&service_ptr_);
47 service_impl_.reset(new VRServiceImpl()); 30 service_impl_.reset(new VRServiceImpl());
48 service_impl_->Bind(std::move(request)); 31 service_impl_->Bind(std::move(request));
49 32
50 VRServiceClientPtr client_ptr; 33 mojom::VRServiceClientPtr client_ptr;
51 client_binding_.reset(new mojo::Binding<VRServiceClient>( 34 client_binding_.reset(new mojo::Binding<mojom::VRServiceClient>(
52 &mock_client_, mojo::GetProxy(&client_ptr))); 35 mock_client_, mojo::GetProxy(&client_ptr)));
53 service_impl_->SetClient(std::move(client_ptr)); 36 service_impl_->SetClient(std::move(client_ptr));
54 } 37 }
55 38
56 void Close() { 39 void Close() {
57 service_ptr_.reset(); 40 service_ptr_.reset();
58 service_impl_.reset(); 41 service_impl_.reset();
59 } 42 }
60 43
61 MockVRServiceClient& client() { return mock_client_; } 44 MockVRServiceClient* client() { return mock_client_; }
62 VRServiceImpl* service() { return service_impl_.get(); } 45 VRServiceImpl* service() { return service_impl_.get(); }
63 46
64 private: 47 private:
65 std::unique_ptr<VRServiceImpl> service_impl_; 48 std::unique_ptr<VRServiceImpl> service_impl_;
66 mojo::InterfacePtr<VRService> service_ptr_; 49 mojo::InterfacePtr<mojom::VRService> service_ptr_;
67 50
68 MockVRServiceClient mock_client_; 51 MockVRServiceClient* mock_client_;
69 std::unique_ptr<mojo::Binding<VRServiceClient>> client_binding_; 52 std::unique_ptr<mojo::Binding<mojom::VRServiceClient>> client_binding_;
70 53
71 DISALLOW_COPY_AND_ASSIGN(VRServiceTestBinding); 54 DISALLOW_COPY_AND_ASSIGN(VRServiceTestBinding);
72 }; 55 };
73 56
74 class VRServiceImplTest : public testing::Test { 57 class VRServiceImplTest : public testing::Test {
75 public: 58 public:
76 VRServiceImplTest() {} 59 VRServiceImplTest() {}
77 ~VRServiceImplTest() override {} 60 ~VRServiceImplTest() override {}
78 61
79 protected: 62 protected:
80 void SetUp() override { 63 void SetUp() override {
81 std::unique_ptr<FakeVRDeviceProvider> provider(new FakeVRDeviceProvider()); 64 std::unique_ptr<FakeVRDeviceProvider> provider(new FakeVRDeviceProvider());
82 provider_ = provider.get(); 65 provider_ = provider.get();
83 device_manager_.reset(new VRDeviceManager(std::move(provider))); 66 device_manager_.reset(new VRDeviceManager(std::move(provider)));
84 } 67 }
85 68
86 void TearDown() override { base::RunLoop().RunUntilIdle(); } 69 void TearDown() override { base::RunLoop().RunUntilIdle(); }
87 70
88 std::unique_ptr<VRServiceTestBinding> BindService() { 71 std::unique_ptr<VRServiceTestBinding> BindService() {
89 return std::unique_ptr<VRServiceTestBinding>(new VRServiceTestBinding()); 72 return std::unique_ptr<VRServiceTestBinding>(new VRServiceTestBinding());
90 } 73 }
91 74
92 size_t ServiceCount() { return device_manager_->services_.size(); } 75 size_t ServiceCount() { return device_manager_->services_.size(); }
93 76
94 bool presenting() { return !!device_manager_->presenting_service_; }
95
96 base::MessageLoop message_loop_; 77 base::MessageLoop message_loop_;
97 FakeVRDeviceProvider* provider_; 78 FakeVRDeviceProvider* provider_;
98 std::unique_ptr<VRDeviceManager> device_manager_; 79 std::unique_ptr<VRDeviceManager> device_manager_;
99 80
100 DISALLOW_COPY_AND_ASSIGN(VRServiceImplTest); 81 DISALLOW_COPY_AND_ASSIGN(VRServiceImplTest);
101 }; 82 };
102 83
103 // Ensure that services are registered with the device manager as they are 84 // 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. 85 // created and removed from the device manager as their connections are closed.
105 TEST_F(VRServiceImplTest, DeviceManagerRegistration) { 86 TEST_F(VRServiceImplTest, DeviceManagerRegistration) {
106 EXPECT_EQ(0u, ServiceCount()); 87 EXPECT_EQ(0u, ServiceCount());
107 88
108 std::unique_ptr<VRServiceTestBinding> service_1 = BindService(); 89 std::unique_ptr<VRServiceTestBinding> service_1 = BindService();
109 90
110 EXPECT_EQ(1u, ServiceCount()); 91 EXPECT_EQ(1u, ServiceCount());
111 92
112 std::unique_ptr<VRServiceTestBinding> service_2 = BindService(); 93 std::unique_ptr<VRServiceTestBinding> service_2 = BindService();
113 94
114 EXPECT_EQ(2u, ServiceCount()); 95 EXPECT_EQ(2u, ServiceCount());
115 96
116 service_1->Close(); 97 service_1->Close();
117 98
118 EXPECT_EQ(1u, ServiceCount()); 99 EXPECT_EQ(1u, ServiceCount());
119 100
120 service_2->Close(); 101 service_2->Close();
121 102
122 EXPECT_EQ(0u, ServiceCount()); 103 EXPECT_EQ(0u, ServiceCount());
123 } 104 }
124 105
125 // Ensure that DeviceChanged calls are dispatched to all active services.
126 TEST_F(VRServiceImplTest, DeviceChangedDispatched) {
127 std::unique_ptr<VRServiceTestBinding> service_1 = BindService();
128 std::unique_ptr<VRServiceTestBinding> service_2 = BindService();
129
130 EXPECT_CALL(service_1->client(), OnDisplayChanged(_));
131 EXPECT_CALL(service_2->client(), OnDisplayChanged(_));
132
133 std::unique_ptr<FakeVRDevice> device(new FakeVRDevice(provider_));
134 device_manager_->OnDeviceChanged(device->GetVRDevice());
135
136 base::RunLoop().RunUntilIdle();
137
138 EXPECT_EQ(device->id(), service_1->client().LastDisplay()->index);
139 EXPECT_EQ(device->id(), service_2->client().LastDisplay()->index);
140 } 106 }
141
142 // Ensure that presenting devices cannot be accessed by other services
143 TEST_F(VRServiceImplTest, DevicePresentationIsolation) {
144 std::unique_ptr<VRServiceTestBinding> service_1 = BindService();
145 std::unique_ptr<VRServiceTestBinding> service_2 = BindService();
146
147 std::unique_ptr<FakeVRDevice> device(new FakeVRDevice(provider_));
148 provider_->AddDevice(device.get());
149
150 // Ensure the device manager has seen the fake device
151 device_manager_->GetVRDevices();
152
153 // When not presenting either service should be able to access the device
154 EXPECT_EQ(device.get(), VRDeviceManager::GetAllowedDevice(
155 service_1->service(), device->id()));
156 EXPECT_EQ(device.get(), VRDeviceManager::GetAllowedDevice(
157 service_2->service(), device->id()));
158
159 // Begin presenting to the fake device with service 1
160 EXPECT_TRUE(device_manager_->RequestPresent(service_1->service(),
161 device->id(), true));
162
163 EXPECT_TRUE(presenting());
164
165 // Service 2 should not be able to present to the device while service 1
166 // is still presenting.
167 EXPECT_FALSE(device_manager_->RequestPresent(service_2->service(),
168 device->id(), true));
169
170 // Only the presenting service should be able to access the device
171 EXPECT_EQ(device.get(), VRDeviceManager::GetAllowedDevice(
172 service_1->service(), device->id()));
173 EXPECT_EQ(nullptr, VRDeviceManager::GetAllowedDevice(service_2->service(),
174 device->id()));
175
176 // Service 2 should not be able to exit presentation to the device
177 device_manager_->ExitPresent(service_2->service(), device->id());
178 EXPECT_TRUE(presenting());
179
180 // Service 1 should be able to exit the presentation it initiated.
181 device_manager_->ExitPresent(service_1->service(), device->id());
182 EXPECT_FALSE(presenting());
183
184 // Once presention had ended both services should be able to access the device
185 EXPECT_EQ(device.get(), VRDeviceManager::GetAllowedDevice(
186 service_1->service(), device->id()));
187 EXPECT_EQ(device.get(), VRDeviceManager::GetAllowedDevice(
188 service_2->service(), device->id()));
189 }
190
191 // Ensure that DeviceChanged calls are dispatched to all active services.
192 TEST_F(VRServiceImplTest, DeviceConnectedDispatched) {
193 std::unique_ptr<VRServiceTestBinding> service_1 = BindService();
194 std::unique_ptr<VRServiceTestBinding> service_2 = BindService();
195
196 EXPECT_CALL(service_1->client(), OnDisplayConnected(_));
197 EXPECT_CALL(service_2->client(), OnDisplayConnected(_));
198
199 std::unique_ptr<FakeVRDevice> device(new FakeVRDevice(provider_));
200 device_manager_->OnDeviceConnectionStatusChanged(device.get(), true);
201
202 base::RunLoop().RunUntilIdle();
203
204 EXPECT_EQ(device->id(), service_1->client().LastDisplay()->index);
205 EXPECT_EQ(device->id(), service_2->client().LastDisplay()->index);
206 }
207 }
OLDNEW
« no previous file with comments | « device/vr/vr_service_impl.cc ('k') | third_party/WebKit/Source/modules/vr/VRController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698