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

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

Issue 2494733002: Reland of mojo VR interface simpified. (Closed)
Patch Set: Fix Werror 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 // TODO(shaobo.yan@intel.com) : Update the whole unittest.
21 public: 21 class MockVRServiceClient : public mojom::VRServiceClient {};
22 MOCK_METHOD1(OnDisplayChanged, void(const VRDisplay& display));
23 void OnDisplayChanged(VRDisplayPtr display) override {
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 };
42 22
43 class VRServiceTestBinding { 23 class VRServiceTestBinding {
44 public: 24 public:
45 VRServiceTestBinding() { 25 VRServiceTestBinding() {
46 auto request = mojo::GetProxy(&service_ptr_); 26 auto request = mojo::GetProxy(&service_ptr_);
47 service_impl_.reset(new VRServiceImpl()); 27 service_impl_.reset(new VRServiceImpl());
48 service_impl_->Bind(std::move(request)); 28 service_impl_->Bind(std::move(request));
49 29
50 VRServiceClientPtr client_ptr; 30 client_binding_.reset(new mojo::Binding<mojom::VRServiceClient>(
51 client_binding_.reset(new mojo::Binding<VRServiceClient>( 31 mock_client_, mojo::GetProxy(&client_ptr_)));
52 &mock_client_, mojo::GetProxy(&client_ptr))); 32 }
53 service_impl_->SetClient(std::move(client_ptr)); 33
34 void SetClient() {
35 service_impl_->SetClient(
36 std::move(client_ptr_),
37 base::Bind(&device::VRServiceTestBinding::SetNumberOfDevices,
38 base::Unretained(this)));
39 }
40
41 void SetNumberOfDevices(unsigned int number_of_devices) {
42 number_of_devices_ = number_of_devices;
54 } 43 }
55 44
56 void Close() { 45 void Close() {
57 service_ptr_.reset(); 46 service_ptr_.reset();
58 service_impl_.reset(); 47 service_impl_.reset();
59 } 48 }
60 49
61 MockVRServiceClient& client() { return mock_client_; } 50 MockVRServiceClient* client() { return mock_client_; }
62 VRServiceImpl* service() { return service_impl_.get(); } 51 VRServiceImpl* service() { return service_impl_.get(); }
63 52
64 private: 53 private:
54 mojom::VRServiceClientPtr client_ptr_;
65 std::unique_ptr<VRServiceImpl> service_impl_; 55 std::unique_ptr<VRServiceImpl> service_impl_;
66 mojo::InterfacePtr<VRService> service_ptr_; 56 mojo::InterfacePtr<mojom::VRService> service_ptr_;
67 57
68 MockVRServiceClient mock_client_; 58 MockVRServiceClient* mock_client_;
69 std::unique_ptr<mojo::Binding<VRServiceClient>> client_binding_; 59 std::unique_ptr<mojo::Binding<mojom::VRServiceClient>> client_binding_;
60 unsigned int number_of_devices_;
70 61
71 DISALLOW_COPY_AND_ASSIGN(VRServiceTestBinding); 62 DISALLOW_COPY_AND_ASSIGN(VRServiceTestBinding);
72 }; 63 };
73 64
74 class VRServiceImplTest : public testing::Test { 65 class VRServiceImplTest : public testing::Test {
75 public: 66 public:
76 VRServiceImplTest() {} 67 VRServiceImplTest() {}
77 ~VRServiceImplTest() override {} 68 ~VRServiceImplTest() override {}
78 69
79 protected: 70 protected:
80 void SetUp() override { 71 void SetUp() override {
81 std::unique_ptr<FakeVRDeviceProvider> provider(new FakeVRDeviceProvider()); 72 std::unique_ptr<FakeVRDeviceProvider> provider(new FakeVRDeviceProvider());
82 provider_ = provider.get(); 73 provider_ = provider.get();
83 device_manager_.reset(new VRDeviceManager(std::move(provider))); 74 device_manager_.reset(new VRDeviceManager(std::move(provider)));
84 } 75 }
85 76
86 void TearDown() override { base::RunLoop().RunUntilIdle(); } 77 void TearDown() override { base::RunLoop().RunUntilIdle(); }
87 78
88 std::unique_ptr<VRServiceTestBinding> BindService() { 79 std::unique_ptr<VRServiceTestBinding> BindService() {
89 return std::unique_ptr<VRServiceTestBinding>(new VRServiceTestBinding()); 80 auto test_binding = base::WrapUnique(new VRServiceTestBinding());
81 test_binding->SetClient();
82 return test_binding;
90 } 83 }
91 84
92 size_t ServiceCount() { return device_manager_->services_.size(); } 85 size_t ServiceCount() { return device_manager_->services_.size(); }
93 86
94 bool presenting() { return !!device_manager_->presenting_service_; }
95
96 base::MessageLoop message_loop_; 87 base::MessageLoop message_loop_;
97 FakeVRDeviceProvider* provider_; 88 FakeVRDeviceProvider* provider_;
98 std::unique_ptr<VRDeviceManager> device_manager_; 89 std::unique_ptr<VRDeviceManager> device_manager_;
99 90
100 DISALLOW_COPY_AND_ASSIGN(VRServiceImplTest); 91 DISALLOW_COPY_AND_ASSIGN(VRServiceImplTest);
101 }; 92 };
102 93
103 // Ensure that services are registered with the device manager as they are 94 // 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. 95 // created and removed from the device manager as their connections are closed.
105 TEST_F(VRServiceImplTest, DeviceManagerRegistration) { 96 TEST_F(VRServiceImplTest, DeviceManagerRegistration) {
106 EXPECT_EQ(0u, ServiceCount()); 97 EXPECT_EQ(0u, ServiceCount());
107 98
108 std::unique_ptr<VRServiceTestBinding> service_1 = BindService(); 99 std::unique_ptr<VRServiceTestBinding> service_1 = BindService();
109 100
110 EXPECT_EQ(1u, ServiceCount()); 101 EXPECT_EQ(1u, ServiceCount());
111 102
112 std::unique_ptr<VRServiceTestBinding> service_2 = BindService(); 103 std::unique_ptr<VRServiceTestBinding> service_2 = BindService();
113 104
114 EXPECT_EQ(2u, ServiceCount()); 105 EXPECT_EQ(2u, ServiceCount());
115 106
116 service_1->Close(); 107 service_1->Close();
117 108
118 EXPECT_EQ(1u, ServiceCount()); 109 EXPECT_EQ(1u, ServiceCount());
119 110
120 service_2->Close(); 111 service_2->Close();
121 112
122 EXPECT_EQ(0u, ServiceCount()); 113 EXPECT_EQ(0u, ServiceCount());
123 } 114 }
124 115
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 } 116 }
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