diff options
| author | agaliuzov <agaliuzov@luxoft.com> | 2016-05-15 08:44:27 -0700 |
|---|---|---|
| committer | agaliuzov <agaliuzov@luxoft.com> | 2016-05-15 08:44:27 -0700 |
| commit | 081b9be9f3ccd5fa2c43931e7c9fb758f10e0994 (patch) | |
| tree | 1ca50bf5a4cf8ece5e1cfde4c8e787eccbc72b2e | |
| parent | 6e5006d3900c8b40629b4648ddcc29ed3e65cc6d (diff) | |
| download | smartdevicelink-081b9be9f3ccd5fa2c43931e7c9fb758f10e0994.tar.gz | |
Remove the problems which has been appeared after merging master to develop
| -rw-r--r-- | src/components/formatters/test/formatter_json_rpc_test.cc | 16 | ||||
| -rw-r--r-- | src/components/security_manager/test/crypto_manager_impl_test.cc | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/components/formatters/test/formatter_json_rpc_test.cc b/src/components/formatters/test/formatter_json_rpc_test.cc index 5592676ff..3650fb14d 100644 --- a/src/components/formatters/test/formatter_json_rpc_test.cc +++ b/src/components/formatters/test/formatter_json_rpc_test.cc @@ -145,7 +145,7 @@ TEST(FormatterJsonRPCTest, UpperBoundValuesInSystemRequest_ToString_Success) { // Attach Schema hmi_apis::HMI_API factory; - EXPECT_TRUE(factory.attachSchema(obj)); + EXPECT_TRUE(factory.attachSchema(obj, false)); EXPECT_EQ(Errors::OK, obj.validate()); std::string result; // Convert SmartObject to Json string @@ -170,7 +170,7 @@ TEST(FormatterJsonRPCTest, CorrectRPCv1Notification_ToString_Success) { obj[S_MSG_PARAMS] = SmartObject(SmartType::SmartType_Map); // Attach Schema hmi_apis::HMI_API factory; - EXPECT_TRUE(factory.attachSchema(obj)); + EXPECT_TRUE(factory.attachSchema(obj, false)); // Convert SmartObject to Json string EXPECT_TRUE(FormatterJsonRpc::ToString(obj, result)); CompactJson(result); @@ -190,7 +190,7 @@ TEST(FormatterJsonRPCTest, CorrectResponseToString_Success) { obj[S_MSG_PARAMS] = SmartObject(SmartType::SmartType_Map); // Attach Schema hmi_apis::HMI_API factory; - EXPECT_TRUE(factory.attachSchema(obj)); + EXPECT_TRUE(factory.attachSchema(obj, false)); std::string result; // Convert SmartObject to Json string @@ -213,7 +213,7 @@ TEST(FormatterJsonRPCTest, ErrorResponse_ToString_Success) { obj[S_MSG_PARAMS] = SmartObject(SmartType::SmartType_Map); // Attach Schema hmi_apis::HMI_API factory; - EXPECT_TRUE(factory.attachSchema(obj)); + EXPECT_TRUE(factory.attachSchema(obj, false)); std::string result; // Convert SmartObject to Json string @@ -237,7 +237,7 @@ TEST(FormatterJsonRPCTest, ResponseWithoutCorID_ToString_Fail) { obj[S_MSG_PARAMS] = SmartObject(SmartType::SmartType_Map); // Attach Schema hmi_apis::HMI_API factory; - EXPECT_TRUE(factory.attachSchema(obj)); + EXPECT_TRUE(factory.attachSchema(obj, false)); std::string result; // Convert SmartObject to Json string will finish wrong @@ -252,7 +252,7 @@ TEST(FormatterJsonRPCTest, RequestWithoutMSGParams_ToString_Success) { obj[S_PARAMS][S_CORRELATION_ID] = 4444; // Attach Schema mobile_apis::MOBILE_API factory; - EXPECT_TRUE(factory.attachSchema(obj)); + EXPECT_TRUE(factory.attachSchema(obj, false)); std::string result; // Convert SmartObject to Json string @@ -271,7 +271,7 @@ TEST(FormatterJsonRPCTest, RequestWithoutCorID_ToString_Fail) { obj[S_MSG_PARAMS] = SmartObject(SmartType::SmartType_Map); // Attach Schema mobile_apis::MOBILE_API factory; - EXPECT_TRUE(factory.attachSchema(obj)); + EXPECT_TRUE(factory.attachSchema(obj, false)); std::string result; // Converting SmartObject to Json string is failed @@ -289,7 +289,7 @@ TEST(FormatterJsonRPCTest, RequestWithoutType_ToString_Fail) { obj[S_MSG_PARAMS] = SmartObject(SmartType::SmartType_Map); // Attach Schema is impossible mobile_apis::MOBILE_API factory; - EXPECT_FALSE(factory.attachSchema(obj)); + EXPECT_FALSE(factory.attachSchema(obj, false)); std::string result; // Converting SmartObject to Json string is failed diff --git a/src/components/security_manager/test/crypto_manager_impl_test.cc b/src/components/security_manager/test/crypto_manager_impl_test.cc index 0b05a7fa6..46ba6336c 100644 --- a/src/components/security_manager/test/crypto_manager_impl_test.cc +++ b/src/components/security_manager/test/crypto_manager_impl_test.cc @@ -33,7 +33,7 @@ #ifdef __QNXNTO__ #include <openssl/ssl3.h> #else -#include <openssl/tls1.h> +#include <openssl/ssl.h> #endif #include <fstream> |