diff options
author | Jacob Keeler <jacob.keeler@livioradio.com> | 2017-08-16 09:11:23 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-16 09:11:23 -0400 |
commit | d187c1ea698ea20e7a0f66cf548b29e4edf1aeb6 (patch) | |
tree | f9b0294abd69daf9b0a31f85c5332d1db8e05c53 | |
parent | d0f4bc6183626f067d9fda2905301e805cd69a65 (diff) | |
parent | 63eb7c774cd77589f7bff6d36301d174a0458070 (diff) | |
download | sdl_core-d187c1ea698ea20e7a0f66cf548b29e4edf1aeb6.tar.gz |
Merge pull request #1719 from shoamano83/fix/build_break_protocol_packet_test
fix: build failure in protocol_packet_test.cc
-rw-r--r-- | src/components/protocol_handler/test/protocol_packet_test.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/components/protocol_handler/test/protocol_packet_test.cc b/src/components/protocol_handler/test/protocol_packet_test.cc index 7819c4b5b0..60a984c17f 100644 --- a/src/components/protocol_handler/test/protocol_packet_test.cc +++ b/src/components/protocol_handler/test/protocol_packet_test.cc @@ -125,7 +125,8 @@ TEST_F(ProtocolPacketTest, SerializePacketWithDiffServiceType) { for (size_t i = 0; i < serv_types.size(); ++i) { RawMessagePtr res = GetRawMessage(PROTOCOL_VERSION_3, FRAME_TYPE_CONTROL, serv_types[i]); - EXPECT_EQ(PROTOCOL_VERSION_3, res->protocol_version()); + EXPECT_EQ(static_cast<uint32_t>(PROTOCOL_VERSION_3), + res->protocol_version()); EXPECT_EQ(serv_types[i], res->service_type()); EXPECT_EQ(PROTOCOL_HEADER_V2_SIZE, res->data_size()); } @@ -146,7 +147,8 @@ TEST_F(ProtocolPacketTest, SerializePacketWithWrongServiceType) { for (size_t i = 0; i < serv_types.size(); ++i) { RawMessagePtr res = GetRawMessage(PROTOCOL_VERSION_3, FRAME_TYPE_CONTROL, serv_types[i]); - EXPECT_EQ(PROTOCOL_VERSION_3, res->protocol_version()); + EXPECT_EQ(static_cast<uint32_t>(PROTOCOL_VERSION_3), + res->protocol_version()); EXPECT_EQ(kInvalidServiceType, res->service_type()); } } @@ -156,7 +158,8 @@ TEST_F(ProtocolPacketTest, SetPacketWithDiffFrameType) { for (frame_type = FRAME_TYPE_CONTROL + 1; frame_type <= FRAME_TYPE_MAX_VALUE; ++frame_type) { RawMessagePtr res = GetRawMessage(PROTOCOL_VERSION_3, frame_type, kControl); - EXPECT_EQ(PROTOCOL_VERSION_3, res->protocol_version()); + EXPECT_EQ(static_cast<uint32_t>(PROTOCOL_VERSION_3), + res->protocol_version()); EXPECT_EQ(kControl, res->service_type()); } } |