diff options
Diffstat (limited to 'src/components/policy/policy_regular/test')
4 files changed, 58 insertions, 38 deletions
diff --git a/src/components/policy/policy_regular/test/generated_code_test.cc b/src/components/policy/policy_regular/test/generated_code_test.cc index 671103bf51..2b79ef67fe 100644 --- a/src/components/policy/policy_regular/test/generated_code_test.cc +++ b/src/components/policy/policy_regular/test/generated_code_test.cc @@ -49,8 +49,9 @@ TEST(PolicyGeneratedCodeTest, TestValidPTPreloadJsonIsValid) { std::ifstream json_file("sdl_preloaded_pt.json"); ASSERT_TRUE(json_file.is_open()); Json::Value valid_table; - Json::Reader reader; - ASSERT_TRUE(reader.parse(json_file, valid_table)); + Json::CharReaderBuilder reader_builder; + ASSERT_TRUE( + Json::parseFromStream(reader_builder, json_file, &valid_table, nullptr)); Table table(&valid_table); table.SetPolicyTableType(rpc::policy_table_interface_base::PT_PRELOADED); ASSERT_RPCTYPE_VALID(table); @@ -60,8 +61,9 @@ TEST(PolicyGeneratedCodeTest, TestValidPTUpdateJsonIsValid) { std::ifstream json_file("valid_sdl_pt_update.json"); ASSERT_TRUE(json_file.is_open()); Json::Value valid_table; - Json::Reader reader; - ASSERT_TRUE(reader.parse(json_file, valid_table)); + Json::CharReaderBuilder reader_builder; + ASSERT_TRUE( + Json::parseFromStream(reader_builder, json_file, &valid_table, nullptr)); Table table(&valid_table); table.SetPolicyTableType(rpc::policy_table_interface_base::PT_UPDATE); ASSERT_RPCTYPE_VALID(table); diff --git a/src/components/policy/policy_regular/test/policy_manager_impl_test.cc b/src/components/policy/policy_regular/test/policy_manager_impl_test.cc index e1f916e72f..abb5901690 100644 --- a/src/components/policy/policy_regular/test/policy_manager_impl_test.cc +++ b/src/components/policy/policy_regular/test/policy_manager_impl_test.cc @@ -36,8 +36,8 @@ #include <vector> #include "gtest/gtest.h" -#include "json/reader.h" #include "json/writer.h" +#include "utils/jsoncpp_reader_wrapper.h" #include "config_profile/profile.h" #include "connection_handler/connection_handler.h" @@ -305,10 +305,11 @@ class PolicyManagerImplTest2 : public ::testing::Test { const Json::Value GetPTU(std::string file_name) { // Get PTU std::ifstream ifile(file_name); - Json::Reader reader; + Json::CharReaderBuilder reader_builder; std::string json; Json::Value root(Json::objectValue); - if (ifile.is_open() && reader.parse(ifile, root, true)) { + if (ifile.is_open() && + Json::parseFromStream(reader_builder, ifile, &root, nullptr)) { json = root.toStyledString(); } ifile.close(); @@ -331,9 +332,10 @@ class PolicyManagerImplTest2 : public ::testing::Test { Json::Value AddWidgetSupportToPt(const std::string& section_name, const uint32_t group_number) { std::ifstream ifile("sdl_preloaded_pt.json"); - Json::Reader reader; + Json::CharReaderBuilder reader_builder; Json::Value root(Json::objectValue); - if (ifile.is_open() && reader.parse(ifile, root, true)) { + if (ifile.is_open() && + Json::parseFromStream(reader_builder, ifile, &root, nullptr)) { auto& groups = root["policy_table"]["app_policies"][section_name]["groups"]; if (groups.empty()) { @@ -585,8 +587,9 @@ Json::Value CreatePTforLoad() { "}" "}"); Json::Value table(Json::objectValue); - Json::Reader reader; - EXPECT_TRUE(reader.parse(load_table, table)); + utils::JsonReader reader; + + EXPECT_TRUE(reader.parse(load_table, &table)); return table; } @@ -646,10 +649,11 @@ TEST_F(PolicyManagerImplTest2, IsAppRevoked_SetRevokedAppID_ExpectAppRevoked) { CreateLocalPT("sdl_preloaded_pt.json"); // Arrange std::ifstream ifile("sdl_preloaded_pt.json"); - Json::Reader reader; + Json::CharReaderBuilder reader_builder; std::string json; Json::Value root(Json::objectValue); - if (ifile.is_open() && reader.parse(ifile, root, true)) { + if (ifile.is_open() && + Json::parseFromStream(reader_builder, ifile, &root, nullptr)) { root["policy_table"]["app_policies"][app_id1] = Json::nullValue; json = root.toStyledString(); } @@ -703,10 +707,11 @@ TEST_F(PolicyManagerImplTest2, ASSERT_TRUE(output.list_of_allowed_params.empty()); // Act std::ifstream ifile("sdl_preloaded_pt.json"); - Json::Reader reader; + Json::CharReaderBuilder reader_builder; std::string json; Json::Value root(Json::objectValue); - if (ifile.is_open() && reader.parse(ifile, root, true)) { + if (ifile.is_open() && + Json::parseFromStream(reader_builder, ifile, &root, nullptr)) { root["policy_table"]["app_policies"][app_id1] = Json::nullValue; json = root.toStyledString(); } @@ -870,10 +875,11 @@ TEST_F(PolicyManagerImplTest2, manager->AddApplication(dev_id1, "1234", HmiTypes(policy_table::AHT_MEDIA)); // Emulate PTU with new policies for app added above std::ifstream ifile("sdl_preloaded_pt.json"); - Json::Reader reader; + Json::CharReaderBuilder reader_builder; std::string json; Json::Value root(Json::objectValue); - if (ifile.is_open() && reader.parse(ifile, root, true)) { + if (ifile.is_open() && + Json::parseFromStream(reader_builder, ifile, &root, nullptr)) { // Add AppID with policies root["policy_table"]["app_policies"]["1234"] = Json::Value(Json::objectValue); @@ -1416,9 +1422,10 @@ TEST_F(PolicyManagerImplTest2, ResetRetrySequence) { TEST_F(PolicyManagerImplTest2, NextRetryTimeout_ExpectTimeoutsFromPT) { // Arrange std::ifstream ifile("sdl_preloaded_pt.json"); - Json::Reader reader; + Json::CharReaderBuilder reader_builder; Json::Value root(Json::objectValue); - if (ifile.is_open() && reader.parse(ifile, root, true)) { + if (ifile.is_open() && + Json::parseFromStream(reader_builder, ifile, &root, nullptr)) { Json::Value seconds_between_retries = Json::Value(Json::arrayValue); seconds_between_retries = root["policy_table"]["module_config"]["seconds_between_retries"]; @@ -1464,10 +1471,11 @@ TEST_F(PolicyManagerImplTest2, UpdatedPreloadedPT_ExpectLPT_IsUpdated) { CreateLocalPT("sdl_preloaded_pt.json"); // Update preloadedPT std::ifstream ifile("sdl_preloaded_pt.json"); - Json::Reader reader; + Json::CharReaderBuilder reader_builder; Json::Value root(Json::objectValue); - if (ifile.is_open() && reader.parse(ifile, root, true)) { + if (ifile.is_open() && + Json::parseFromStream(reader_builder, ifile, &root, nullptr)) { root["policy_table"]["module_config"]["preloaded_date"] = new_data.new_date_; Json::Value val(Json::objectValue); @@ -1481,9 +1489,8 @@ TEST_F(PolicyManagerImplTest2, UpdatedPreloadedPT_ExpectLPT_IsUpdated) { } ifile.close(); - Json::StyledStreamWriter writer; std::ofstream ofile("sdl_preloaded_pt.json"); - writer.write(ofile, root); + ofile << root; ofile.flush(); ofile.close(); @@ -1533,9 +1540,10 @@ TEST_F(PolicyManagerImplTest2, RetrySequenceDelaysSeconds_Expect_CorrectValues) { // Arrange std::ifstream ifile("sdl_preloaded_pt.json"); - Json::Reader reader; + Json::CharReaderBuilder reader_builder; Json::Value root(Json::objectValue); - if (ifile.is_open() && reader.parse(ifile, root, true)) { + if (ifile.is_open() && + Json::parseFromStream(reader_builder, ifile, &root, nullptr)) { Json::Value seconds_between_retries = Json::Value(Json::arrayValue); seconds_between_retries = root["policy_table"]["module_config"]["seconds_between_retries"]; diff --git a/src/components/policy/policy_regular/test/sql_pt_representation_test.cc b/src/components/policy/policy_regular/test/sql_pt_representation_test.cc index 8bb0fb22c6..30536bbaa4 100644 --- a/src/components/policy/policy_regular/test/sql_pt_representation_test.cc +++ b/src/components/policy/policy_regular/test/sql_pt_representation_test.cc @@ -1705,10 +1705,10 @@ TEST_F(SQLPTRepresentationTest, table["policy_table"]["device_data"] = Json::Value(Json::objectValue); table["policy_table"]["module_meta"] = Json::Value(Json::objectValue); policy_table::Table expected(&table); - Json::StyledWriter writer; + Json::StreamWriterBuilder writer_builder; // Checks - EXPECT_EQ(writer.write(expected.ToJsonValue()), - writer.write(snapshot->ToJsonValue())); + EXPECT_EQ(Json::writeString(writer_builder, expected.ToJsonValue()), + Json::writeString(writer_builder, snapshot->ToJsonValue())); EXPECT_EQ(expected.ToJsonValue().toStyledString(), snapshot->ToJsonValue().toStyledString()); } diff --git a/src/components/policy/policy_regular/test/vehicle_data_item_type_test.cc b/src/components/policy/policy_regular/test/vehicle_data_item_type_test.cc index a2f7757936..02818887a5 100644 --- a/src/components/policy/policy_regular/test/vehicle_data_item_type_test.cc +++ b/src/components/policy/policy_regular/test/vehicle_data_item_type_test.cc @@ -30,8 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "gtest/gtest.h" -#include "json/reader.h" #include "policy/policy_table/types.h" +#include "utils/jsoncpp_reader_wrapper.h" #include <type_traits> @@ -139,11 +139,12 @@ class VehicleDataItemTypeTest : public ::testing::Test { } Json::Value json_; - Json::Reader reader_; + utils::JsonReader reader_; }; TEST_F(VehicleDataItemTypeTest, Initialize_Success) { - reader_.parse(GetFullJsonString(), json_); + const std::string str = GetFullJsonString(); + reader_.parse(str, &json_); VehicleDataItem vdi(&json_); EXPECT_TRUE(vdi.is_initialized()); @@ -156,7 +157,8 @@ TEST_F(VehicleDataItemTypeTest, Initialize_Failed) { } TEST_F(VehicleDataItemTypeTest, CheckConvertFromJsonToVehicleDataItem_Success) { - reader_.parse(GetFullJsonString(), json_); + const std::string str = GetFullJsonString(); + reader_.parse(str, &json_); VehicleDataItem vdi(&json_); EXPECT_TRUE((std::string)vdi.name == "VehicleDataItem"); @@ -178,7 +180,8 @@ TEST_F(VehicleDataItemTypeTest, CheckConvertFromJsonToVehicleDataItem_Success) { } TEST_F(VehicleDataItemTypeTest, CheckConvertFromVehicleDataItemToJson_Success) { - reader_.parse(GetFullJsonString(), json_); + const std::string str = GetFullJsonString(); + reader_.parse(str, &json_); VehicleDataItem vdi(&json_); auto jsonFrom = vdi.ToJsonValue(); @@ -193,7 +196,8 @@ TEST_F(VehicleDataItemTypeTest, CheckIsValid_Failed) { } TEST_F(VehicleDataItemTypeTest, CheckIsValid_Struct_Success) { - reader_.parse(GetFullJsonString(GetFullJsonString()), json_); + std::string str = GetFullJsonString(GetFullJsonString()); + reader_.parse(str, &json_); VehicleDataItem vdi(&json_); vdi.type = "Struct"; @@ -201,7 +205,9 @@ TEST_F(VehicleDataItemTypeTest, CheckIsValid_Struct_Success) { } TEST_F(VehicleDataItemTypeTest, CheckIsValid_Struct_EmptyParams_Failed) { - reader_.parse(GetFullJsonString(), json_); + const std::string str = GetFullJsonString(); + reader_.parse(str, &json_); + VehicleDataItem vdi(&json_); vdi.type = "Struct"; @@ -209,7 +215,9 @@ TEST_F(VehicleDataItemTypeTest, CheckIsValid_Struct_EmptyParams_Failed) { } TEST_F(VehicleDataItemTypeTest, CheckIsValid_PODTypes_Success) { - reader_.parse(GetFullJsonString(), json_); + const std::string str = GetFullJsonString(); + reader_.parse(str, &json_); + VehicleDataItem vdi(&json_); vdi.type = "Integer"; @@ -231,14 +239,16 @@ TEST_F(VehicleDataItemTypeTest, CheckEmptiness_True) { } TEST_F(VehicleDataItemTypeTest, CheckEmptiness_False) { - reader_.parse(GetFullJsonString(), json_); + const std::string str = GetFullJsonString(); + reader_.parse(str, &json_); VehicleDataItem vdi(&json_); EXPECT_TRUE(vdi.struct_not_empty()); } TEST_F(VehicleDataItemTypeTest, CheckCopyConstructor) { - reader_.parse(GetFullJsonString(), json_); + const std::string str = GetFullJsonString(); + reader_.parse(str, &json_); VehicleDataItem vdi1(&json_); VehicleDataItem vdi2(vdi1); |