| Index: blimp/common/create_blimp_message_unittest.cc
|
| diff --git a/blimp/common/create_blimp_message_unittest.cc b/blimp/common/create_blimp_message_unittest.cc
|
| index 2546b784903fb16fb91f4ce852665776551ef0d2..74dd885ae427f35316583e72bbe1dd2e36631f1c 100644
|
| --- a/blimp/common/create_blimp_message_unittest.cc
|
| +++ b/blimp/common/create_blimp_message_unittest.cc
|
| @@ -21,7 +21,6 @@ TEST(CreateBlimpMessageTest, CompositorMessage) {
|
| CompositorMessage* details = nullptr;
|
| std::unique_ptr<BlimpMessage> message = CreateBlimpMessage(&details, kTabId);
|
| EXPECT_NE(nullptr, details);
|
| - EXPECT_NE(nullptr, message);
|
| EXPECT_EQ(details, message->mutable_compositor());
|
| EXPECT_EQ(kTabId, message->target_tab_id());
|
| }
|
| @@ -30,7 +29,6 @@ TEST(CreateBlimpMessageTest, TabControlMessage) {
|
| TabControlMessage* details = nullptr;
|
| std::unique_ptr<BlimpMessage> message = CreateBlimpMessage(&details);
|
| EXPECT_NE(nullptr, details);
|
| - EXPECT_NE(nullptr, message);
|
| EXPECT_EQ(details, message->mutable_tab_control());
|
| }
|
|
|
| @@ -38,7 +36,6 @@ TEST(CreateBlimpMessageTest, InputMessage) {
|
| InputMessage* details = nullptr;
|
| std::unique_ptr<BlimpMessage> message = CreateBlimpMessage(&details);
|
| EXPECT_NE(nullptr, details);
|
| - EXPECT_NE(nullptr, message);
|
| EXPECT_EQ(details, message->mutable_input());
|
| }
|
|
|
| @@ -46,7 +43,6 @@ TEST(CreateBlimpMessageTest, NavigationMessage) {
|
| NavigationMessage* details = nullptr;
|
| std::unique_ptr<BlimpMessage> message = CreateBlimpMessage(&details, kTabId);
|
| EXPECT_NE(nullptr, details);
|
| - EXPECT_NE(nullptr, message);
|
| EXPECT_EQ(details, message->mutable_navigation());
|
| EXPECT_EQ(kTabId, message->target_tab_id());
|
| }
|
| @@ -55,7 +51,6 @@ TEST(CreateBlimpMessageTest, RenderWidgetMessage) {
|
| RenderWidgetMessage* details = nullptr;
|
| std::unique_ptr<BlimpMessage> message = CreateBlimpMessage(&details, kTabId);
|
| EXPECT_NE(nullptr, details);
|
| - EXPECT_NE(nullptr, message);
|
| EXPECT_EQ(details, message->mutable_render_widget());
|
| EXPECT_EQ(kTabId, message->target_tab_id());
|
| }
|
| @@ -64,7 +59,6 @@ TEST(CreateBlimpMessageTest, SizeMessage) {
|
| SizeMessage* details = nullptr;
|
| std::unique_ptr<BlimpMessage> message = CreateBlimpMessage(&details);
|
| EXPECT_NE(nullptr, details);
|
| - EXPECT_NE(nullptr, message);
|
| EXPECT_EQ(TabControlMessage::kSize,
|
| message->mutable_tab_control()->tab_control_case());
|
| EXPECT_EQ(details, message->mutable_tab_control()->mutable_size());
|
| @@ -74,7 +68,6 @@ TEST(CreateBlimpMessageTest, EngineSettingsMessage) {
|
| EngineSettingsMessage* details;
|
| std::unique_ptr<BlimpMessage> message = CreateBlimpMessage(&details);
|
| EXPECT_NE(nullptr, details);
|
| - EXPECT_NE(nullptr, message);
|
| EXPECT_EQ(details, message->mutable_settings()->mutable_engine_settings());
|
| }
|
|
|
| @@ -83,7 +76,6 @@ TEST(CreateBlimpMessageTest, StartConnectionMessage) {
|
| const int protocol_version = 1;
|
| std::unique_ptr<BlimpMessage> message =
|
| CreateStartConnectionMessage(client_token, protocol_version);
|
| - EXPECT_NE(nullptr, message);
|
| EXPECT_EQ(BlimpMessage::kProtocolControl, message->feature_case());
|
| EXPECT_EQ(ProtocolControlMessage::kStartConnection,
|
| message->protocol_control().connection_message_case());
|
| @@ -93,6 +85,28 @@ TEST(CreateBlimpMessageTest, StartConnectionMessage) {
|
| message->protocol_control().start_connection().protocol_version());
|
| }
|
|
|
| +TEST(CreateBlimpMessageTest, EndConnectionMessage) {
|
| + std::unique_ptr<BlimpMessage> message =
|
| + CreateEndConnectionMessage(EndConnectionMessage::PROTOCOL_MISMATCH);
|
| + EXPECT_EQ(BlimpMessage::kProtocolControl, message->feature_case());
|
| + EXPECT_EQ(ProtocolControlMessage::kEndConnection,
|
| + message->protocol_control().connection_message_case());
|
| + EXPECT_EQ(EndConnectionMessage::PROTOCOL_MISMATCH,
|
| + message->protocol_control().end_connection().reason());
|
| +}
|
| +
|
| +TEST(CreateBlimpMessageTest, CheckpointAckMessage) {
|
| + const int64_t kTestCheckpointId = 1;
|
| +
|
| + std::unique_ptr<BlimpMessage> message =
|
| + CreateCheckpointAckMessage(kTestCheckpointId);
|
| + EXPECT_EQ(BlimpMessage::kProtocolControl, message->feature_case());
|
| + EXPECT_EQ(ProtocolControlMessage::kCheckpointAck,
|
| + message->protocol_control().connection_message_case());
|
| + EXPECT_EQ(kTestCheckpointId,
|
| + message->protocol_control().checkpoint_ack().checkpoint_id());
|
| +}
|
| +
|
| TEST(CreateBlimpMessageTest, BlobChannelMessage) {
|
| BlobChannelMessage* details;
|
| std::unique_ptr<BlimpMessage> message = CreateBlimpMessage(&details);
|
|
|