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 <sstream> | 5 #include <sstream> |
6 #include <string> | 6 #include <string> |
7 | 7 |
8 #include "base/at_exit.h" | 8 #include "base/at_exit.h" |
9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "blimp/common/create_blimp_message.h" |
10 #include "blimp/common/logging.h" | 11 #include "blimp/common/logging.h" |
11 #include "blimp/common/proto/blimp_message.pb.h" | 12 #include "blimp/common/proto/blimp_message.pb.h" |
| 13 #include "blimp/common/proto/blob_channel.pb.h" |
12 #include "blimp/net/test_common.h" | 14 #include "blimp/net/test_common.h" |
13 #include "testing/gmock/include/gmock/gmock.h" | 15 #include "testing/gmock/include/gmock/gmock.h" |
14 #include "testing/gtest/include/gtest/gtest.h" | 16 #include "testing/gtest/include/gtest/gtest.h" |
15 | 17 |
16 using testing::Return; | 18 using testing::Return; |
17 | 19 |
18 namespace blimp { | 20 namespace blimp { |
19 namespace { | 21 namespace { |
20 | 22 |
21 const int kTargetTab = 123; | 23 const int kTargetTab = 123; |
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
221 RenderWidgetMessage::CREATED); | 223 RenderWidgetMessage::CREATED); |
222 VerifyLogOutput("type=RENDER_WIDGET subtype=CREATED render_widget_id=123", | 224 VerifyLogOutput("type=RENDER_WIDGET subtype=CREATED render_widget_id=123", |
223 created_msg); | 225 created_msg); |
224 | 226 |
225 BlimpMessage deleted_msg = base_msg; | 227 BlimpMessage deleted_msg = base_msg; |
226 deleted_msg.mutable_render_widget()->set_type(RenderWidgetMessage::DELETED); | 228 deleted_msg.mutable_render_widget()->set_type(RenderWidgetMessage::DELETED); |
227 VerifyLogOutput("type=RENDER_WIDGET subtype=DELETED render_widget_id=123", | 229 VerifyLogOutput("type=RENDER_WIDGET subtype=DELETED render_widget_id=123", |
228 deleted_msg); | 230 deleted_msg); |
229 } | 231 } |
230 | 232 |
| 233 TEST_F(LoggingTest, BlobChannel) { |
| 234 std::unique_ptr<BlobChannelMessage> blob_message(new BlobChannelMessage); |
| 235 blob_message->set_type(BlobChannelMessage::TRANSFER_BLOB); |
| 236 blob_message->set_blob_id("AAA"); |
| 237 blob_message->set_payload("123"); |
| 238 |
| 239 std::unique_ptr<BlimpMessage> blimp_message = |
| 240 CreateBlimpMessage(std::move(blob_message)); |
| 241 |
| 242 VerifyLogOutput("type=BLOB_CHANNEL subtype=TRANSFER_BLOB id=\"414141\"", |
| 243 *blimp_message); |
| 244 } |
| 245 |
231 TEST_F(LoggingTest, Settings) { | 246 TEST_F(LoggingTest, Settings) { |
232 BlimpMessage message; | 247 BlimpMessage message; |
233 message.set_type(BlimpMessage::SETTINGS); | 248 message.set_type(BlimpMessage::SETTINGS); |
234 message.mutable_settings() | 249 message.mutable_settings() |
235 ->mutable_engine_settings() | 250 ->mutable_engine_settings() |
236 ->set_record_whole_document(true); | 251 ->set_record_whole_document(true); |
237 message.mutable_settings()->mutable_engine_settings()->set_client_os_info( | 252 message.mutable_settings()->mutable_engine_settings()->set_client_os_info( |
238 "wibble"); | 253 "wibble"); |
239 VerifyLogOutput( | 254 VerifyLogOutput( |
240 "type=SETTINGS subtype=ENGINE_SETTINGS record_whole_document=true " | 255 "type=SETTINGS subtype=ENGINE_SETTINGS record_whole_document=true " |
241 "client_os_info=\"wibble\"", | 256 "client_os_info=\"wibble\"", |
242 message); | 257 message); |
243 } | 258 } |
244 | 259 |
245 } // namespace | 260 } // namespace |
246 } // namespace blimp | 261 } // namespace blimp |
OLD | NEW |