Merge pull request #198 from LuxoftSDL/DeleteCommand_WARNING

Fix WARNING result interpretation in Mobile.DeleteCommandRequest

3 files changed, 9 insertions, 9 deletions

diff --git a/src/components/protocol_handler/src/protocol_handler_impl.cc b/src/components/protocol_handler/src/protocol_handler_impl.cc
index 3e31e928b2..9ae8128f66 100644
--- a/src/components/protocol_handler/src/protocol_handler_impl.cc
+++ b/src/components/protocol_handler/src/protocol_handler_impl.cc
@@ -361,7 +361,7 @@ void ProtocolHandlerImpl::SendMessageToMobileApp(const RawMessagePtr message,
 
   const uint32_t header_size = (PROTOCOL_VERSION_1 == message->protocol_version())
       ? PROTOCOL_HEADER_V1_SIZE : PROTOCOL_HEADER_V2_SIZE;
-  uint32_t max_frame_size = MAXIMUM_FRAME_DATA_SIZE - header_size;
+  uint32_t max_frame_size = MAXIMUM_FRAME_DATA_V2_SIZE - header_size;
 #ifdef ENABLE_SECURITY
   const security_manager::SSLContext *ssl_context = session_observer_->
       GetSSLContext(message->connection_key(), message->service_type());
@@ -377,7 +377,7 @@ void ProtocolHandlerImpl::SendMessageToMobileApp(const RawMessagePtr message,
   }
   LOG4CXX_DEBUG(logger_, "Optimal packet size is " << max_frame_size);
 #endif  // ENABLE_SECURITY
-  DCHECK(MAXIMUM_FRAME_DATA_SIZE > max_frame_size);
+  DCHECK(MAXIMUM_FRAME_DATA_V2_SIZE > max_frame_size);
 
 
   if (message->data_size() <= max_frame_size) {
diff --git a/src/components/protocol_handler/test/incoming_data_handler_test.cc b/src/components/protocol_handler/test/incoming_data_handler_test.cc
index feb81300f8..d000ea68e6 100644
--- a/src/components/protocol_handler/test/incoming_data_handler_test.cc
+++ b/src/components/protocol_handler/test/incoming_data_handler_test.cc
@@ -59,7 +59,7 @@ class IncomingDataHandlerTest : public ::testing::Test {
     protov1_message_id = 0x0;
     some_message_id = 0xABCDEF0;
     some_session_id = 0xFEDCBA0;
-    payload_bigger_mtu.resize(MAXIMUM_FRAME_DATA_SIZE + 1);
+    payload_bigger_mtu.resize(MAXIMUM_FRAME_DATA_V2_SIZE + 1);
   }
   void TearDown() OVERRIDE {
     delete[] some_data;
diff --git a/src/components/protocol_handler/test/protocol_header_validator_test.cc b/src/components/protocol_handler/test/protocol_header_validator_test.cc
index 0ae7910145..45c65e5b0f 100644
--- a/src/components/protocol_handler/test/protocol_header_validator_test.cc
+++ b/src/components/protocol_handler/test/protocol_header_validator_test.cc
@@ -57,7 +57,7 @@ class ProtocolHeaderValidatorTest : public ::testing::Test {
 TEST_F(ProtocolHeaderValidatorTest, MaxPayloadSizeSetGet) {
   EXPECT_EQ(std::numeric_limits<size_t>::max(),
             header_validator.max_payload_size());
-  for (size_t value = 0; value < MAXIMUM_FRAME_DATA_SIZE * 2; ++value) {
+  for (size_t value = 0; value < MAXIMUM_FRAME_DATA_V2_SIZE * 2; ++value) {
     header_validator.set_max_payload_size(value);
     EXPECT_EQ(value, header_validator.max_payload_size());
   }
@@ -180,9 +180,9 @@ TEST_F(ProtocolHeaderValidatorTest, Malformed_ControlFrame_EmptyPayload) {
         PROTOCOL_VERSION_3, PROTECTION_ON, FRAME_TYPE_CONSECUTIVE, kControl,
         FRAME_DATA_LAST_CONSECUTIVE, some_session_id, payload_size, some_message_id);
 
-  for (uint32_t max_payload_size = 0; max_payload_size < MAXIMUM_FRAME_DATA_SIZE * 2;
+  for (uint32_t max_payload_size = 0; max_payload_size < MAXIMUM_FRAME_DATA_V2_SIZE * 2;
        ++max_payload_size) {
-    header_validator.set_max_payload_size(MAXIMUM_FRAME_DATA_SIZE + max_payload_size);
+    header_validator.set_max_payload_size(MAXIMUM_FRAME_DATA_V2_SIZE + max_payload_size);
 
     // For Control frames Data Size value could be zero
     EXPECT_EQ(RESULT_OK, header_validator.validate(control_message_header));
@@ -194,7 +194,7 @@ TEST_F(ProtocolHeaderValidatorTest, Malformed_ControlFrame_EmptyPayload) {
 
 // For Control frames Data Size value shall be less than MTU header
 TEST_F(ProtocolHeaderValidatorTest, Malformed_Payload) {
-  const size_t payload_size = MAXIMUM_FRAME_DATA_SIZE;
+  const size_t payload_size = MAXIMUM_FRAME_DATA_V2_SIZE;
   const ProtocolPacket::ProtocolHeader control_message_header(
         PROTOCOL_VERSION_3, PROTECTION_ON, FRAME_TYPE_CONTROL, kControl,
         FRAME_DATA_HEART_BEAT, some_session_id, payload_size, some_message_id);
@@ -205,7 +205,7 @@ TEST_F(ProtocolHeaderValidatorTest, Malformed_Payload) {
         PROTOCOL_VERSION_3, PROTECTION_ON, FRAME_TYPE_CONSECUTIVE, kControl,
         FRAME_DATA_LAST_CONSECUTIVE, some_session_id, payload_size, some_message_id);
 
-  for (uint32_t max_payload_size = 0; max_payload_size < MAXIMUM_FRAME_DATA_SIZE;
+  for (uint32_t max_payload_size = 0; max_payload_size < MAXIMUM_FRAME_DATA_V2_SIZE;
        ++max_payload_size) {
     header_validator.set_max_payload_size(max_payload_size);
     EXPECT_EQ(RESULT_FAIL, header_validator.validate(control_message_header));
@@ -213,7 +213,7 @@ TEST_F(ProtocolHeaderValidatorTest, Malformed_Payload) {
     EXPECT_EQ(RESULT_FAIL, header_validator.validate(consecutive_message_header));
   }
 
-  for (uint32_t max_payload_size = MAXIMUM_FRAME_DATA_SIZE + 1; max_payload_size < MAXIMUM_FRAME_DATA_SIZE * 2;
+  for (uint32_t max_payload_size = MAXIMUM_FRAME_DATA_V2_SIZE + 1; max_payload_size < MAXIMUM_FRAME_DATA_V2_SIZE * 2;
        ++max_payload_size) {
     header_validator.set_max_payload_size(max_payload_size);
     EXPECT_EQ(RESULT_OK, header_validator.validate(control_message_header));