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

Side by Side Diff: device/serial/serial_service_unittest.cc

Issue 2607063002: Remove mojo::Array. (Closed)
Patch Set: rebase Created 3 years, 11 months 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <memory> 5 #include <memory>
6 #include <utility> 6 #include <utility>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "base/run_loop.h" 12 #include "base/run_loop.h"
13 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
14 #include "base/threading/thread_task_runner_handle.h" 14 #include "base/threading/thread_task_runner_handle.h"
15 #include "device/serial/serial.mojom.h" 15 #include "device/serial/serial.mojom.h"
16 #include "device/serial/serial_service_impl.h" 16 #include "device/serial/serial_service_impl.h"
17 #include "device/serial/test_serial_io_handler.h" 17 #include "device/serial/test_serial_io_handler.h"
18 #include "mojo/public/cpp/bindings/interface_ptr.h" 18 #include "mojo/public/cpp/bindings/interface_ptr.h"
19 #include "mojo/public/cpp/bindings/interface_request.h" 19 #include "mojo/public/cpp/bindings/interface_request.h"
20 #include "mojo/public/cpp/bindings/strong_binding.h" 20 #include "mojo/public/cpp/bindings/strong_binding.h"
21 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
22 22
23 namespace device { 23 namespace device {
24 namespace { 24 namespace {
25 25
26 class FakeSerialDeviceEnumerator : public SerialDeviceEnumerator { 26 class FakeSerialDeviceEnumerator : public SerialDeviceEnumerator {
27 mojo::Array<serial::DeviceInfoPtr> GetDevices() override { 27 std::vector<serial::DeviceInfoPtr> GetDevices() override {
28 mojo::Array<serial::DeviceInfoPtr> devices(1); 28 std::vector<serial::DeviceInfoPtr> devices(1);
29 devices[0] = serial::DeviceInfo::New(); 29 devices[0] = serial::DeviceInfo::New();
30 devices[0]->path = "device"; 30 devices[0]->path = "device";
31 return devices; 31 return devices;
32 } 32 }
33 }; 33 };
34 34
35 class FailToOpenIoHandler : public TestSerialIoHandler { 35 class FailToOpenIoHandler : public TestSerialIoHandler {
36 public: 36 public:
37 void Open(const std::string& port, 37 void Open(const std::string& port,
38 const serial::ConnectionOptions& options, 38 const serial::ConnectionOptions& options,
39 const OpenCompleteCallback& callback) override { 39 const OpenCompleteCallback& callback) override {
40 callback.Run(false); 40 callback.Run(false);
41 } 41 }
42 42
43 protected: 43 protected:
44 ~FailToOpenIoHandler() override {} 44 ~FailToOpenIoHandler() override {}
45 }; 45 };
46 46
47 } // namespace 47 } // namespace
48 48
49 class SerialServiceTest : public testing::Test { 49 class SerialServiceTest : public testing::Test {
50 public: 50 public:
51 SerialServiceTest() : connected_(false), expecting_error_(false) {} 51 SerialServiceTest() : connected_(false), expecting_error_(false) {}
52 52
53 void StoreDevices(mojo::Array<serial::DeviceInfoPtr> devices) { 53 void StoreDevices(std::vector<serial::DeviceInfoPtr> devices) {
54 devices_ = std::move(devices); 54 devices_ = std::move(devices);
55 StopMessageLoop(); 55 StopMessageLoop();
56 } 56 }
57 57
58 void OnConnectionError() { 58 void OnConnectionError() {
59 StopMessageLoop(); 59 StopMessageLoop();
60 EXPECT_TRUE(expecting_error_); 60 EXPECT_TRUE(expecting_error_);
61 } 61 }
62 62
63 void RunMessageLoop() { 63 void RunMessageLoop() {
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 connection->GetInfo( 103 connection->GetInfo(
104 base::Bind(&SerialServiceTest::OnGotInfo, base::Unretained(this))); 104 base::Bind(&SerialServiceTest::OnGotInfo, base::Unretained(this)));
105 RunMessageLoop(); 105 RunMessageLoop();
106 EXPECT_EQ(!expecting_success, connection.encountered_error()); 106 EXPECT_EQ(!expecting_success, connection.encountered_error());
107 EXPECT_EQ(expecting_success, connected_); 107 EXPECT_EQ(expecting_success, connected_);
108 connection.reset(); 108 connection.reset();
109 } 109 }
110 110
111 base::MessageLoop message_loop_; 111 base::MessageLoop message_loop_;
112 std::unique_ptr<base::RunLoop> run_loop_; 112 std::unique_ptr<base::RunLoop> run_loop_;
113 mojo::Array<serial::DeviceInfoPtr> devices_; 113 std::vector<serial::DeviceInfoPtr> devices_;
114 scoped_refptr<TestSerialIoHandler> io_handler_; 114 scoped_refptr<TestSerialIoHandler> io_handler_;
115 bool connected_; 115 bool connected_;
116 bool expecting_error_; 116 bool expecting_error_;
117 serial::ConnectionInfoPtr info_; 117 serial::ConnectionInfoPtr info_;
118 118
119 private: 119 private:
120 DISALLOW_COPY_AND_ASSIGN(SerialServiceTest); 120 DISALLOW_COPY_AND_ASSIGN(SerialServiceTest);
121 }; 121 };
122 122
123 TEST_F(SerialServiceTest, GetDevices) { 123 TEST_F(SerialServiceTest, GetDevices) {
124 mojo::InterfacePtr<serial::SerialService> service; 124 mojo::InterfacePtr<serial::SerialService> service;
125 SerialServiceImpl::Create(NULL, NULL, mojo::MakeRequest(&service)); 125 SerialServiceImpl::Create(NULL, NULL, mojo::MakeRequest(&service));
126 service.set_connection_error_handler(base::Bind( 126 service.set_connection_error_handler(base::Bind(
127 &SerialServiceTest::OnConnectionError, base::Unretained(this))); 127 &SerialServiceTest::OnConnectionError, base::Unretained(this)));
128 mojo::Array<serial::DeviceInfoPtr> result; 128 std::vector<serial::DeviceInfoPtr> result;
129 service->GetDevices( 129 service->GetDevices(
130 base::Bind(&SerialServiceTest::StoreDevices, base::Unretained(this))); 130 base::Bind(&SerialServiceTest::StoreDevices, base::Unretained(this)));
131 RunMessageLoop(); 131 RunMessageLoop();
132 132
133 // Because we're running on unknown hardware, only check that we received a 133 // Because we're running on unknown hardware, only check that we received a
134 // non-null result. 134 // non-null result.
135 EXPECT_TRUE(devices_); 135 EXPECT_TRUE(devices_);
136 } 136 }
137 137
138 TEST_F(SerialServiceTest, Connect) { 138 TEST_F(SerialServiceTest, Connect) {
139 RunConnectTest("device", true); 139 RunConnectTest("device", true);
140 } 140 }
141 141
142 TEST_F(SerialServiceTest, ConnectInvalidPath) { 142 TEST_F(SerialServiceTest, ConnectInvalidPath) {
143 RunConnectTest("invalid_path", false); 143 RunConnectTest("invalid_path", false);
144 } 144 }
145 145
146 TEST_F(SerialServiceTest, ConnectOpenFailed) { 146 TEST_F(SerialServiceTest, ConnectOpenFailed) {
147 io_handler_ = new FailToOpenIoHandler; 147 io_handler_ = new FailToOpenIoHandler;
148 RunConnectTest("device", false); 148 RunConnectTest("device", false);
149 } 149 }
150 150
151 } // namespace device 151 } // namespace device
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698