From ea1dccded1642bda2c48b2a491c4409d91ca0f22 Mon Sep 17 00:00:00 2001 From: Andrey Oleynik Date: Tue, 7 Jun 2016 15:49:58 +0300 Subject: Enables some policy tests disabled during porting Related-issues: APPLINK-22713, APPLINK-22716 --- src/components/policy/src/sql_pt_queries.cc | 14 +++-- src/components/policy/src/sql_pt_representation.cc | 18 +++--- .../policy/test/policy_manager_impl_test.cc | 9 +-- .../policy/test/sql_pt_representation_test.cc | 72 ++++++++++------------ 4 files changed, 53 insertions(+), 60 deletions(-) diff --git a/src/components/policy/src/sql_pt_queries.cc b/src/components/policy/src/sql_pt_queries.cc index ff4386c3c2..422ee81b09 100644 --- a/src/components/policy/src/sql_pt_queries.cc +++ b/src/components/policy/src/sql_pt_queries.cc @@ -68,10 +68,11 @@ const std::string kCreateSchema = " `exchange_after_x_kilometers` INTEGER NOT NULL, " " `exchange_after_x_days` INTEGER NOT NULL, " " `timeout_after_x_seconds` INTEGER NOT NULL, " - " `certificate` TEXT, " " `vehicle_make` VARCHAR(45), " " `vehicle_model` VARCHAR(45), " - " `vehicle_year` VARCHAR(4) " + " `vehicle_year` VARCHAR(4), " + " `preloaded_date` VARCHAR (10), " + " `certificate` VARCHAR (45) " "); " "CREATE TABLE IF NOT EXISTS `functional_group`( " " `id` INTEGER PRIMARY KEY NOT NULL, " @@ -521,8 +522,9 @@ const std::string kUpdateModuleConfig = "UPDATE `module_config` SET `preloaded_pt` = ?, " " `exchange_after_x_ignition_cycles` = ?," " `exchange_after_x_kilometers` = ?, `exchange_after_x_days` = ?, " - " `timeout_after_x_seconds` = ?, `certificate` = ?, `vehicle_make` = ?, " - " `vehicle_model` = ?, `vehicle_year` = ?"; + " `timeout_after_x_seconds` = ?, `vehicle_make` = ?, " + " `vehicle_model` = ?, `vehicle_year` = ?, `preloaded_date` = ?, " + "`certificate` = ?"; const std::string kInsertEndpoint = "INSERT INTO `endpoint` (`service`, `url`, `application_id`) " @@ -569,8 +571,8 @@ const std::string kDeleteAppGroup = "DELETE FROM `app_group`"; const std::string kSelectModuleConfig = "SELECT `preloaded_pt`, `exchange_after_x_ignition_cycles`, " " `exchange_after_x_kilometers`, `exchange_after_x_days`, " - " `timeout_after_x_seconds`, `certificate`, `vehicle_make`," - " `vehicle_model`, `vehicle_year` " + " `timeout_after_x_seconds`, `vehicle_make`," + " `vehicle_model`, `vehicle_year`, `preloaded_date`, `certificate` " " FROM `module_config`"; const std::string kSelectEndpoints = diff --git a/src/components/policy/src/sql_pt_representation.cc b/src/components/policy/src/sql_pt_representation.cc index 7193007d4c..4e47b209e6 100644 --- a/src/components/policy/src/sql_pt_representation.cc +++ b/src/components/policy/src/sql_pt_representation.cc @@ -1093,13 +1093,17 @@ bool SQLPTRepresentation::SaveModuleConfig( query.Bind(2, config.exchange_after_x_kilometers); query.Bind(3, config.exchange_after_x_days); query.Bind(4, config.timeout_after_x_seconds); - query.Bind(5, (*config.certificate)); - config.vehicle_make.is_initialized() ? query.Bind(6, *(config.vehicle_make)) - : query.Bind(6); - config.vehicle_model.is_initialized() ? query.Bind(7, *(config.vehicle_model)) - : query.Bind(7); - config.vehicle_year.is_initialized() ? query.Bind(8, *(config.vehicle_year)) - : query.Bind(8); + config.vehicle_make.is_initialized() ? query.Bind(5, *(config.vehicle_make)) + : query.Bind(5); + config.vehicle_model.is_initialized() ? query.Bind(6, *(config.vehicle_model)) + : query.Bind(6); + config.vehicle_year.is_initialized() ? query.Bind(7, *(config.vehicle_year)) + : query.Bind(7); + config.preloaded_date.is_initialized() + ? query.Bind(8, *(config.preloaded_date)) + : query.Bind(8); + config.certificate.is_initialized() ? query.Bind(9, *(config.certificate)) + : query.Bind(9); if (!query.Exec()) { LOGGER_WARN(logger_, "Incorrect update module config"); diff --git a/src/components/policy/test/policy_manager_impl_test.cc b/src/components/policy/test/policy_manager_impl_test.cc index 548f89b18b..b5fbdba7bc 100644 --- a/src/components/policy/test/policy_manager_impl_test.cc +++ b/src/components/policy/test/policy_manager_impl_test.cc @@ -427,7 +427,7 @@ TEST_F(PolicyManagerImplTest, GetNotificationsNumber) { EXPECT_EQ(notif_number, manager->GetNotificationsNumber(priority)); } -TEST_F(PolicyManagerImplTest2, DISABLED_GetNotificationsNumberAfterPTUpdate) { +TEST_F(PolicyManagerImplTest2, GetNotificationsNumberAfterPTUpdate) { // Arrange utils::json::JsonValue table = CreatePTforLoad(); @@ -439,7 +439,8 @@ TEST_F(PolicyManagerImplTest2, DISABLED_GetNotificationsNumberAfterPTUpdate) { EXPECT_CALL(listener, OnUpdateStatusChanged(_)); EXPECT_TRUE(manager->LoadPT("file_pt_update.json", msg)); - std::string priority = "EMERGENCY"; + // priority is case sensistive to values in DB + std::string priority = "emergency"; uint32_t notif_number = manager->GetNotificationsNumber(priority); EXPECT_EQ(1u, notif_number); @@ -447,10 +448,6 @@ TEST_F(PolicyManagerImplTest2, DISABLED_GetNotificationsNumberAfterPTUpdate) { notif_number = manager->GetNotificationsNumber(priority); EXPECT_EQ(2u, notif_number); - priority = "emergency"; - notif_number = manager->GetNotificationsNumber(priority); - EXPECT_EQ(1u, notif_number); - priority = "VOICECOMM"; notif_number = manager->GetNotificationsNumber(priority); EXPECT_EQ(3u, notif_number); diff --git a/src/components/policy/test/sql_pt_representation_test.cc b/src/components/policy/test/sql_pt_representation_test.cc index 4f2442c973..0e6dd7c70f 100644 --- a/src/components/policy/test/sql_pt_representation_test.cc +++ b/src/components/policy/test/sql_pt_representation_test.cc @@ -224,20 +224,17 @@ class SQLPTRepresentationTest : public SQLPTRepresentation, utils::json::JsonValueRef module_config = policy_table["module_config"]; module_config["preloaded_pt"] = utils::json::JsonValue(true); module_config["preloaded_date"] = utils::json::JsonValue(""); - module_config["exchange_after_x_ignition_cycles"] = - JsonValue(static_cast(10)); - module_config["exchange_after_x_kilometers"] = - JsonValue(static_cast(100)); - module_config["exchange_after_x_days"] = JsonValue(static_cast(5)); - module_config["timeout_after_x_seconds"] = - JsonValue(static_cast(500)); + module_config["exchange_after_x_ignition_cycles"] = JsonValue::Int(10); + module_config["exchange_after_x_kilometers"] = JsonValue::Int(100); + module_config["exchange_after_x_days"] = JsonValue::Int(5); + module_config["timeout_after_x_seconds"] = JsonValue::Int(500); module_config["seconds_between_retries"] = utils::json::ValueType::ARRAY_VALUE; utils::json::JsonValueRef seconds_between_retries = module_config["seconds_between_retries"]; - seconds_between_retries[uint32_t(0)] = JsonValue(static_cast(10)); - seconds_between_retries[1] = JsonValue(static_cast(20)); - seconds_between_retries[2] = JsonValue(static_cast(30)); + seconds_between_retries[uint32_t(0)] = JsonValue::Int(10); + seconds_between_retries[1] = JsonValue::Int(20); + seconds_between_retries[2] = JsonValue::Int(30); module_config["endpoints"] = utils::json::ValueType::OBJECT_VALUE; utils::json::JsonValueRef endpoins = module_config["endpoints"]; endpoins["0x00"] = utils::json::ValueType::OBJECT_VALUE; @@ -247,21 +244,20 @@ class SQLPTRepresentationTest : public SQLPTRepresentation, module_config["notifications_per_minute_by_priority"] = utils::json::ValueType::OBJECT_VALUE; module_config["notifications_per_minute_by_priority"]["emergency"] = - JsonValue(static_cast(1)); + JsonValue::Int(1); module_config["notifications_per_minute_by_priority"]["navigation"] = - JsonValue(static_cast(2)); - ; + JsonValue::Int(2); module_config["notifications_per_minute_by_priority"]["VOICECOMM"] = - JsonValue(static_cast(3)); + JsonValue::Int(3); module_config["notifications_per_minute_by_priority"]["communication"] = - JsonValue(static_cast(4)); + JsonValue::Int(4); module_config["notifications_per_minute_by_priority"]["normal"] = - JsonValue(static_cast(5)); + JsonValue::Int(5); module_config["notifications_per_minute_by_priority"]["none"] = - JsonValue(static_cast(6)); - module_config["vehicle_make"] = JsonValue(""); - module_config["vehicle_model"] = JsonValue(""); - module_config["vehicle_year"] = JsonValue(""); + JsonValue::Int(6); + module_config["vehicle_make"] = JsonValue("Ford"); + module_config["vehicle_model"] = JsonValue("Mustang"); + module_config["vehicle_year"] = JsonValue("2016"); module_config["certificate"] = JsonValue(""); utils::json::JsonValueRef functional_groupings = @@ -299,9 +295,8 @@ class SQLPTRepresentationTest : public SQLPTRepresentation, utils::json::JsonValueRef app_policies = policy_table["app_policies"]; app_policies["default"] = utils::json::ValueType::OBJECT_VALUE; app_policies["default"]["priority"] = JsonValue("EMERGENCY"); - app_policies["default"]["memory_kb"] = JsonValue(static_cast(50)); - app_policies["default"]["heart_beat_timeout_ms"] = - JsonValue(static_cast(100)); + app_policies["default"]["memory_kb"] = JsonValue::Int(50); + app_policies["default"]["heart_beat_timeout_ms"] = JsonValue::Int(100); app_policies["default"]["groups"] = utils::json::ValueType::ARRAY_VALUE; app_policies["default"]["groups"][uint32_t(0)] = JsonValue("default"); app_policies["default"]["priority"] = JsonValue("EMERGENCY"); @@ -311,10 +306,9 @@ class SQLPTRepresentationTest : public SQLPTRepresentation, app_policies["default"]["steal_focus"] = utils::json::JsonValue(true); app_policies["pre_DataConsent"] = utils::json::ValueType::OBJECT_VALUE; - app_policies["pre_DataConsent"]["memory_kb"] = - JsonValue(static_cast(40)); + app_policies["pre_DataConsent"]["memory_kb"] = JsonValue::Int(40); app_policies["pre_DataConsent"]["heart_beat_timeout_ms"] = - JsonValue(static_cast(90)); + JsonValue::Int(90); app_policies["pre_DataConsent"]["groups"] = utils::json::ValueType::ARRAY_VALUE; app_policies["pre_DataConsent"]["groups"][uint32_t(0)] = @@ -329,9 +323,8 @@ class SQLPTRepresentationTest : public SQLPTRepresentation, app_policies["pre_DataConsent"]["steal_focus"] = utils::json::JsonValue(true); app_policies["1234"] = utils::json::ValueType::OBJECT_VALUE; - app_policies["1234"]["memory_kb"] = JsonValue(static_cast(150)); - app_policies["1234"]["heart_beat_timeout_ms"] = - JsonValue(static_cast(200)); + app_policies["1234"]["memory_kb"] = JsonValue::Int(150); + app_policies["1234"]["heart_beat_timeout_ms"] = JsonValue::Int(200); app_policies["1234"]["groups"] = utils::json::ValueType::ARRAY_VALUE; app_policies["1234"]["groups"][uint32_t(0)] = JsonValue("default"); app_policies["1234"]["priority"] = JsonValue("EMERGENCY"); @@ -1024,22 +1017,20 @@ TEST(SQLPTRepresentationTest3, Init_InitNewDataBase_ExpectResultSuccess) { delete reps; } -// TODO(OHerasym) : no set_path method in SQLdatabase TEST(SQLPTRepresentationTest3, - DISABLED_Init_TryInitNotExistingDataBase_ExpectResultFail) { + Init_TryInitNotExistingDataBase_ExpectResultFail) { // Arrange NiceMock policy_settings_; ON_CALL(policy_settings_, app_storage_folder()) .WillByDefault(ReturnRef(kAppStorageFolder)); SQLPTRepresentation reps( - kStorageFolder, kAttemptsToOpenPolicyDb, kOpenAttemptTimeoutMs); - // (reps.db())->set_path("/home/"); + "/wrong_path", kAttemptsToOpenPolicyDb, kOpenAttemptTimeoutMs); // Check EXPECT_EQ(::policy::FAIL, reps.Init(&policy_settings_)); } TEST(SQLPTRepresentationTest3, - DISABLED_Close_InitNewDataBaseThenClose_ExpectResultSuccess) { + Close_InitNewDataBaseThenClose_ExpectResultSuccess) { // Arrange NiceMock policy_settings_; ON_CALL(policy_settings_, app_storage_folder()) @@ -1520,8 +1511,7 @@ TEST_F(SQLPTRepresentationTest, snapshot->ToJsonValue().ToJson(true)); } -TEST_F(SQLPTRepresentationTest, - DISABLED_Save_SetPolicyTableThenSave_ExpectSavedToPT) { +TEST_F(SQLPTRepresentationTest, Save_SetPolicyTableThenSave_ExpectSavedToPT) { // Arrange utils::json::JsonValue table(utils::json::ValueType::OBJECT_VALUE); PolicyTableUpdatePrepare(table); @@ -1566,7 +1556,7 @@ TEST_F(SQLPTRepresentationTest, policy_table::UsageAndErrorCounts counts; GatherUsageAndErrorCounts(&counts); EXPECT_EQ(0u, counts.app_level->size()); - // ASSERT_TRUE(IsValid(update)); + ASSERT_TRUE(IsValid(update)); // Act ASSERT_TRUE(reps->Save(update)); @@ -1636,12 +1626,12 @@ TEST_F(SQLPTRepresentationTest, GatherModuleConfig(&config); // Check Module Config section - ASSERT_FALSE(*config.preloaded_pt); + ASSERT_TRUE(*config.preloaded_pt); ASSERT_EQ("", static_cast(*config.certificate)); ASSERT_EQ("", static_cast(*config.preloaded_date)); - ASSERT_EQ("", static_cast(*config.vehicle_year)); - ASSERT_EQ("", static_cast(*config.vehicle_model)); - ASSERT_EQ("", static_cast(*config.vehicle_make)); + ASSERT_EQ("2016", static_cast(*config.vehicle_year)); + ASSERT_EQ("Mustang", static_cast(*config.vehicle_model)); + ASSERT_EQ("Ford", static_cast(*config.vehicle_make)); ASSERT_EQ(10, config.exchange_after_x_ignition_cycles); ASSERT_EQ(100, config.exchange_after_x_kilometers); ASSERT_EQ(5, config.exchange_after_x_days); -- cgit v1.2.1 From 47546cc229f2d3fd3ac3db49f5959d7c4ffb93c6 Mon Sep 17 00:00:00 2001 From: Andrey Oleynik Date: Wed, 8 Jun 2016 14:49:20 +0300 Subject: Enables TM unit tests Related-issues: APPLINK-22713, APPLINK-22716 --- .../include/transport_manager/tcp/tcp_device.h | 2 +- .../test/tcp_transport_adapter_test.cc | 11 +++++------ .../test/transport_manager_default_test.cc | 3 +-- .../test/transport_manager_impl_test.cc | 19 ++++++++----------- 4 files changed, 15 insertions(+), 20 deletions(-) diff --git a/src/components/transport_manager/include/transport_manager/tcp/tcp_device.h b/src/components/transport_manager/include/transport_manager/tcp/tcp_device.h index 5b9644ec01..149a8b2c3f 100644 --- a/src/components/transport_manager/include/transport_manager/tcp/tcp_device.h +++ b/src/components/transport_manager/include/transport_manager/tcp/tcp_device.h @@ -101,7 +101,7 @@ class TcpDevice : public Device { * * @return Application's port No. Or -1 if application is not found. */ - int GetApplicationPort(const ApplicationHandle app_handle) const; + virtual int GetApplicationPort(const ApplicationHandle app_handle) const; /** * @brief Return address. diff --git a/src/components/transport_manager/test/tcp_transport_adapter_test.cc b/src/components/transport_manager/test/tcp_transport_adapter_test.cc index 0a47e6aa03..183d6c7ad7 100644 --- a/src/components/transport_manager/test/tcp_transport_adapter_test.cc +++ b/src/components/transport_manager/test/tcp_transport_adapter_test.cc @@ -71,7 +71,7 @@ class TcpAdapterTest : public ::testing::Test { const utils::HostAddress host_address; }; -TEST_F(TcpAdapterTest, DISABLED_StoreDataWithOneDeviceAndOneApplication) { +TEST_F(TcpAdapterTest, StoreDataWithOneDeviceAndOneApplication) { // Prepare MockTCPTransportAdapter transport_adapter( port, last_state_, transport_manager_settings); @@ -113,7 +113,7 @@ TEST_F(TcpAdapterTest, DISABLED_StoreDataWithOneDeviceAndOneApplication) { EXPECT_EQ(uniq_id, tcp_dict["devices"][index]["name"].AsString()); } -TEST_F(TcpAdapterTest, DISABLED_StoreDataWithSeveralDevicesAndOneApplication) { +TEST_F(TcpAdapterTest, StoreDataWithSeveralDevicesAndOneApplication) { // Prepare MockTCPTransportAdapter transport_adapter( port, last_state_, transport_manager_settings); @@ -167,8 +167,7 @@ TEST_F(TcpAdapterTest, DISABLED_StoreDataWithSeveralDevicesAndOneApplication) { } } -TEST_F(TcpAdapterTest, - DISABLED_StoreDataWithSeveralDevicesAndSeveralApplications) { +TEST_F(TcpAdapterTest, StoreDataWithSeveralDevicesAndSeveralApplications) { // Prepare MockTCPTransportAdapter transport_adapter( port, last_state_, transport_manager_settings); @@ -269,7 +268,7 @@ TEST_F(TcpAdapterTest, RestoreData_DataNotStored) { EXPECT_TRUE(transport_adapter.CallRestore()); } -TEST_F(TcpAdapterTest, DISABLED_StoreDataWithOneDevice_RestoreData) { +TEST_F(TcpAdapterTest, StoreDataWithOneDevice_RestoreData) { MockTCPTransportAdapter transport_adapter( port, last_state_, transport_manager_settings); std::string uniq_id = "unique_device_name"; @@ -304,7 +303,7 @@ TEST_F(TcpAdapterTest, DISABLED_StoreDataWithOneDevice_RestoreData) { EXPECT_EQ(uniq_id, devList[0]); } -TEST_F(TcpAdapterTest, DISABLED_StoreDataWithSeveralDevices_RestoreData) { +TEST_F(TcpAdapterTest, StoreDataWithSeveralDevices_RestoreData) { MockTCPTransportAdapter transport_adapter( port, last_state_, transport_manager_settings); const uint32_t count_dev = 10; diff --git a/src/components/transport_manager/test/transport_manager_default_test.cc b/src/components/transport_manager/test/transport_manager_default_test.cc index 901f7168bf..672e48e8ce 100644 --- a/src/components/transport_manager/test/transport_manager_default_test.cc +++ b/src/components/transport_manager/test/transport_manager_default_test.cc @@ -41,8 +41,7 @@ namespace components { namespace transport_manager_test { using ::testing::Return; -// TODO(OHerasym) : Sometimes deadlock -TEST(TestTransportManagerDefault, DISABLED_Init_LastStateNotUsed) { +TEST(TestTransportManagerDefault, Init_LastStateNotUsed) { MockTransportManagerSettings transport_manager_settings; transport_manager::TransportManagerDefault transport_manager( transport_manager_settings); diff --git a/src/components/transport_manager/test/transport_manager_impl_test.cc b/src/components/transport_manager/test/transport_manager_impl_test.cc index 4608575260..270688bf79 100644 --- a/src/components/transport_manager/test/transport_manager_impl_test.cc +++ b/src/components/transport_manager/test/transport_manager_impl_test.cc @@ -86,6 +86,8 @@ class TransportManagerImplTest : public ::testing::Test { EXPECT_CALL(*mock_adapter_, AddListener(_)); EXPECT_CALL(*mock_adapter_, IsInitialised()).WillOnce(Return(true)); EXPECT_EQ(E_SUCCESS, tm_.AddTransportAdapter(mock_adapter_)); + EXPECT_CALL(*mock_adapter_, GetDeviceType()) + .WillRepeatedly(Return(transport_adapter::DeviceType::BLUETOOTH)); connection_key_ = 1; error_ = MakeShared(); @@ -469,8 +471,7 @@ TEST_F(TransportManagerImplTest, SearchDevices_DeviceConnected) { HandleSearchDone(); } -// TODO(OHerasym): exception in SearchDevices method -TEST_F(TransportManagerImplTest, DISABLED_SearchDevices_DeviceNotFound) { +TEST_F(TransportManagerImplTest, SearchDevices_DeviceNotFound) { HandleDeviceListUpdated(); EXPECT_CALL(*mock_adapter_, SearchDevices()) @@ -478,8 +479,7 @@ TEST_F(TransportManagerImplTest, DISABLED_SearchDevices_DeviceNotFound) { EXPECT_EQ(E_ADAPTERS_FAIL, tm_.SearchDevices()); } -// TODO(OHerasym): exception in SearchDevices method -TEST_F(TransportManagerImplTest, DISABLED_SearchDevices_AdapterNotSupported) { +TEST_F(TransportManagerImplTest, SearchDevices_AdapterNotSupported) { HandleDeviceListUpdated(); EXPECT_CALL(*mock_adapter_, SearchDevices()) @@ -487,8 +487,7 @@ TEST_F(TransportManagerImplTest, DISABLED_SearchDevices_AdapterNotSupported) { EXPECT_EQ(E_ADAPTERS_FAIL, tm_.SearchDevices()); } -// TODO(OHerasym): exception in SearchDevices method -TEST_F(TransportManagerImplTest, DISABLED_SearchDevices_AdapterWithBadState) { +TEST_F(TransportManagerImplTest, SearchDevices_AdapterWithBadState) { HandleDeviceListUpdated(); EXPECT_CALL(*mock_adapter_, SearchDevices()) @@ -496,8 +495,7 @@ TEST_F(TransportManagerImplTest, DISABLED_SearchDevices_AdapterWithBadState) { EXPECT_EQ(E_ADAPTERS_FAIL, tm_.SearchDevices()); } -// TODO(OHerasym): exception in SendMessageToDevice method -TEST_F(TransportManagerImplTest, DISABLED_SendMessageToDevice) { +TEST_F(TransportManagerImplTest, SendMessageToDevice) { // Arrange HandleConnection(); @@ -901,15 +899,14 @@ TEST_F(TransportManagerImplTest, SearchDevices_TMIsNotInitialized) { EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, tm_.SearchDevices()); } -TEST_F(TransportManagerImplTest, - DISABLED_SetVisibilityOn_TransportAdapterNotSupported) { +TEST_F(TransportManagerImplTest, SetVisibilityOn_TransportAdapterNotSupported) { EXPECT_CALL(*mock_adapter_, StartClientListening()) .WillOnce(Return(TransportAdapter::NOT_SUPPORTED)); EXPECT_EQ(E_SUCCESS, tm_.Visibility(true)); } TEST_F(TransportManagerImplTest, - DISABLED_SetVisibilityOff_TransportAdapterNotSupported) { + SetVisibilityOff_TransportAdapterNotSupported) { EXPECT_CALL(*mock_adapter_, StopClientListening()) .WillOnce(Return(TransportAdapter::NOT_SUPPORTED)); EXPECT_EQ(E_SUCCESS, tm_.Visibility(false)); -- cgit v1.2.1