From 768bd29d1b58d2ab015fd52df25f43359c816873 Mon Sep 17 00:00:00 2001 From: Lomtev Dmytro Date: Fri, 24 Nov 2017 13:41:09 +0200 Subject: [PATCH] CodeStyleChecker warnings fixed. --- device_core/utest/test_audit_trail_client.cpp | 223 +++++--------------------- 1 file changed, 40 insertions(+), 183 deletions(-) diff --git a/device_core/utest/test_audit_trail_client.cpp b/device_core/utest/test_audit_trail_client.cpp index 852b634..d54d138 100644 --- a/device_core/utest/test_audit_trail_client.cpp +++ b/device_core/utest/test_audit_trail_client.cpp @@ -63,8 +63,6 @@ TEST(Test_AuditTrailClient, start_auditing) OC::QueryParamsMap qp; { -// ::testing::InSequence dummy; - EXPECT_CALL(atrail, audit_trail_create(_)).WillOnce(Return(AUDIT_TRAIL_ERROR_NONE)); EXPECT_CALL(atrail, audit_trail_enable_dac(true)).WillOnce(Return(AUDIT_TRAIL_ERROR_NONE)); @@ -82,58 +80,58 @@ TEST(Test_AuditTrailClient, start_auditing) .WillOnce(DoAll(SetArgPointee<2>(DAC_CB_ID), WithArgs<0, 1>(Invoke(InvokeCallbackWithReportAdapter)), Return(AUDIT_TRAIL_ERROR_NONE))); - EXPECT_CALL(atrail, audit_trail_get_dac_time(_,_)) - .WillOnce(DoAll(SetArgPointee<0>(0),SetArgPointee<1>(0),Return(AUDIT_TRAIL_ERROR_NONE))); + EXPECT_CALL(atrail, audit_trail_get_dac_time(_, _)) + .WillOnce(DoAll(SetArgPointee<0>(0), SetArgPointee<1>(0), Return(AUDIT_TRAIL_ERROR_NONE))); EXPECT_CALL(atrail, audit_trail_get_dac_subject_name(_)) - .WillOnce(DoAll(SetArgPointee<0>(EMPTY),Return(AUDIT_TRAIL_ERROR_NONE))); - EXPECT_CALL(atrail, audit_trail_get_dac_subject_owner(_,_)) - .WillOnce(DoAll(SetArgPointee<0>(0),SetArgPointee<1>(0),Return(AUDIT_TRAIL_ERROR_NONE))); - EXPECT_CALL(atrail, audit_trail_get_dac_subject_effective_owner(_,_)) - .WillOnce(DoAll(SetArgPointee<0>(0),SetArgPointee<1>(0),Return(AUDIT_TRAIL_ERROR_NONE))); + .WillOnce(DoAll(SetArgPointee<0>(EMPTY), Return(AUDIT_TRAIL_ERROR_NONE))); + EXPECT_CALL(atrail, audit_trail_get_dac_subject_owner(_, _)) + .WillOnce(DoAll(SetArgPointee<0>(0), SetArgPointee<1>(0), Return(AUDIT_TRAIL_ERROR_NONE))); + EXPECT_CALL(atrail, audit_trail_get_dac_subject_effective_owner(_, _)) + .WillOnce(DoAll(SetArgPointee<0>(0), SetArgPointee<1>(0), Return(AUDIT_TRAIL_ERROR_NONE))); EXPECT_CALL(atrail, audit_trail_get_dac_subject_pid(_)) - .WillOnce(DoAll(SetArgPointee<0>(0),Return(AUDIT_TRAIL_ERROR_NONE))); + .WillOnce(DoAll(SetArgPointee<0>(0), Return(AUDIT_TRAIL_ERROR_NONE))); EXPECT_CALL(atrail, audit_trail_get_dac_object_name(_)) - .WillOnce(DoAll(SetArgPointee<0>(EMPTY),Return(AUDIT_TRAIL_ERROR_NONE))); - EXPECT_CALL(atrail, audit_trail_get_dac_object_owner(_,_)) - .WillOnce(DoAll(SetArgPointee<0>(0),SetArgPointee<1>(0),Return(AUDIT_TRAIL_ERROR_NONE))); + .WillOnce(DoAll(SetArgPointee<0>(EMPTY), Return(AUDIT_TRAIL_ERROR_NONE))); + EXPECT_CALL(atrail, audit_trail_get_dac_object_owner(_, _)) + .WillOnce(DoAll(SetArgPointee<0>(0), SetArgPointee<1>(0), Return(AUDIT_TRAIL_ERROR_NONE))); EXPECT_CALL(atrail, audit_trail_get_dac_object_mode(_)) - .WillOnce(DoAll(SetArgPointee<0>(0),Return(AUDIT_TRAIL_ERROR_NONE))); + .WillOnce(DoAll(SetArgPointee<0>(0) , Return(AUDIT_TRAIL_ERROR_NONE))); EXPECT_CALL(atrail, audit_trail_get_dac_action_syscall(_)) - .WillOnce(DoAll(SetArgPointee<0>(0),Return(AUDIT_TRAIL_ERROR_NONE))); + .WillOnce(DoAll(SetArgPointee<0>(0), Return(AUDIT_TRAIL_ERROR_NONE))); EXPECT_CALL(atrail, audit_trail_remove_dac_cb(Eq(DAC_CB_ID))).WillOnce(Return(AUDIT_TRAIL_ERROR_NONE)); EXPECT_CALL(atrail, audit_trail_add_mac_cb(_, _, _)) .WillOnce(DoAll(SetArgPointee<2>(MAC_CB_ID), WithArgs<0, 1>(Invoke(InvokeCallbackWithReportAdapter)), Return(AUDIT_TRAIL_ERROR_NONE))); - EXPECT_CALL(atrail, audit_trail_get_mac_time(_,_)) - .WillOnce(DoAll(SetArgPointee<0>(0),SetArgPointee<1>(0),Return(AUDIT_TRAIL_ERROR_NONE))); + EXPECT_CALL(atrail, audit_trail_get_mac_time(_, _)) + .WillOnce(DoAll(SetArgPointee<0>(0), SetArgPointee<1>(0), Return(AUDIT_TRAIL_ERROR_NONE))); EXPECT_CALL(atrail, audit_trail_get_mac_subject_name(_)) - .WillOnce(DoAll(SetArgPointee<0>(EMPTY),Return(AUDIT_TRAIL_ERROR_NONE))); + .WillOnce(DoAll(SetArgPointee<0>(EMPTY), Return(AUDIT_TRAIL_ERROR_NONE))); EXPECT_CALL(atrail, audit_trail_get_mac_subject_label(_)) - .WillOnce(DoAll(SetArgPointee<0>(EMPTY),Return(AUDIT_TRAIL_ERROR_NONE))); + .WillOnce(DoAll(SetArgPointee<0>(EMPTY), Return(AUDIT_TRAIL_ERROR_NONE))); EXPECT_CALL(atrail, audit_trail_get_mac_subject_pid(_)) - .WillOnce(DoAll(SetArgPointee<0>(0),Return(AUDIT_TRAIL_ERROR_NONE))); + .WillOnce(DoAll(SetArgPointee<0>(0), Return(AUDIT_TRAIL_ERROR_NONE))); EXPECT_CALL(atrail, audit_trail_get_mac_object_name(_)) - .WillOnce(DoAll(SetArgPointee<0>(EMPTY),Return(AUDIT_TRAIL_ERROR_NONE))); + .WillOnce(DoAll(SetArgPointee<0>(EMPTY), Return(AUDIT_TRAIL_ERROR_NONE))); EXPECT_CALL(atrail, audit_trail_get_mac_object_label(_)) - .WillOnce(DoAll(SetArgPointee<0>(EMPTY),Return(AUDIT_TRAIL_ERROR_NONE))); + .WillOnce(DoAll(SetArgPointee<0>(EMPTY), Return(AUDIT_TRAIL_ERROR_NONE))); EXPECT_CALL(atrail, audit_trail_get_mac_action_syscall(_)) - .WillOnce(DoAll(SetArgPointee<0>(0),Return(AUDIT_TRAIL_ERROR_NONE))); + .WillOnce(DoAll(SetArgPointee<0>(0), Return(AUDIT_TRAIL_ERROR_NONE))); EXPECT_CALL(atrail, audit_trail_get_mac_action_request(_)) - .WillOnce(DoAll(SetArgPointee<0>(EMPTY),Return(AUDIT_TRAIL_ERROR_NONE))); + .WillOnce(DoAll(SetArgPointee<0>(EMPTY), Return(AUDIT_TRAIL_ERROR_NONE))); EXPECT_CALL(atrail, audit_trail_remove_mac_cb(Eq(MAC_CB_ID))).WillOnce(Return(AUDIT_TRAIL_ERROR_NONE)); EXPECT_CALL(atrail, audit_trail_add_user_cb(_, _, _)) .WillOnce(DoAll(SetArgPointee<2>(USER_CB_ID), WithArgs<0, 1>(Invoke(InvokeCallbackWithReportAdapter)), Return(AUDIT_TRAIL_ERROR_NONE))); - EXPECT_CALL(atrail, audit_trail_get_user_time(_,_)) - .WillOnce(DoAll(SetArgPointee<0>(0),SetArgPointee<1>(0),Return(AUDIT_TRAIL_ERROR_NONE))); + EXPECT_CALL(atrail, audit_trail_get_user_time(_, _)) + .WillOnce(DoAll(SetArgPointee<0>(0), SetArgPointee<1>(0), Return(AUDIT_TRAIL_ERROR_NONE))); EXPECT_CALL(atrail, audit_trail_get_user_log_type(_)) - .WillOnce(DoAll(SetArgPointee<0>(0),Return(AUDIT_TRAIL_ERROR_NONE))); + .WillOnce(DoAll(SetArgPointee<0>(0), Return(AUDIT_TRAIL_ERROR_NONE))); EXPECT_CALL(atrail, audit_trail_get_user_log_text(_)) - .WillOnce(DoAll(SetArgPointee<0>(EMPTY),Return(AUDIT_TRAIL_ERROR_NONE))); + .WillOnce(DoAll(SetArgPointee<0>(EMPTY), Return(AUDIT_TRAIL_ERROR_NONE))); EXPECT_CALL(atrail, audit_trail_remove_user_cb(Eq(USER_CB_ID))).WillOnce(Return(AUDIT_TRAIL_ERROR_NONE)); EXPECT_CALL(atrail, audit_trail_destroy()).WillOnce(Return(AUDIT_TRAIL_ERROR_NONE)); @@ -173,34 +171,26 @@ TEST(Test_AuditTrailClient, syscall_auditing) OC::QueryParamsMap qp; { -// ::testing::InSequence dummy; - EXPECT_CALL(atrail, audit_trail_create(_)).WillOnce(Return(AUDIT_TRAIL_ERROR_NONE)); -// EXPECT_CALL(atrail, audit_trail_enable_syscall(true)).WillOnce(Return(AUDIT_TRAIL_ERROR_NONE)); -// EXPECT_CALL(atrail, audit_trail_is_enabled_syscall(_)) -// .WillOnce(DoAll( -// SetArgPointee<0>(true), -// Return(AUDIT_TRAIL_ERROR_NONE))); - EXPECT_CALL(atrail, audit_trail_add_syscall_cb(_, _, _)) .WillOnce(DoAll(SetArgPointee<2>(SYSCALL_CB_ID), WithArgs<0, 1>(Invoke(InvokeCallbackWithReportAdapter)), Return(AUDIT_TRAIL_ERROR_NONE))); - EXPECT_CALL(atrail, audit_trail_get_syscall_time(_,_)) - .WillOnce(DoAll(SetArgPointee<0>(0),SetArgPointee<1>(0),Return(AUDIT_TRAIL_ERROR_NONE))); + EXPECT_CALL(atrail, audit_trail_get_syscall_time(_, _)) + .WillOnce(DoAll(SetArgPointee<0>(0), SetArgPointee<1>(0), Return(AUDIT_TRAIL_ERROR_NONE))); EXPECT_CALL(atrail, audit_trail_get_syscall_subject_name(_)) - .WillOnce(DoAll(SetArgPointee<0>(EMPTY),Return(AUDIT_TRAIL_ERROR_NONE))); - EXPECT_CALL(atrail, audit_trail_get_syscall_subject_owner(_,_)) - .WillOnce(DoAll(SetArgPointee<0>(0),SetArgPointee<1>(0),Return(AUDIT_TRAIL_ERROR_NONE))); - EXPECT_CALL(atrail, audit_trail_get_syscall_subject_effective_owner(_,_)) - .WillOnce(DoAll(SetArgPointee<0>(0),SetArgPointee<1>(0),Return(AUDIT_TRAIL_ERROR_NONE))); + .WillOnce(DoAll(SetArgPointee<0>(EMPTY), Return(AUDIT_TRAIL_ERROR_NONE))); + EXPECT_CALL(atrail, audit_trail_get_syscall_subject_owner(_, _)) + .WillOnce(DoAll(SetArgPointee<0>(0), SetArgPointee<1>(0), Return(AUDIT_TRAIL_ERROR_NONE))); + EXPECT_CALL(atrail, audit_trail_get_syscall_subject_effective_owner(_, _)) + .WillOnce(DoAll(SetArgPointee<0>(0), SetArgPointee<1>(0), Return(AUDIT_TRAIL_ERROR_NONE))); EXPECT_CALL(atrail, audit_trail_get_syscall_subject_pid(_)) - .WillOnce(DoAll(SetArgPointee<0>(0),Return(AUDIT_TRAIL_ERROR_NONE))); + .WillOnce(DoAll(SetArgPointee<0>(0), Return(AUDIT_TRAIL_ERROR_NONE))); EXPECT_CALL(atrail, audit_trail_get_syscall_action_syscall(_)) - .WillOnce(DoAll(SetArgPointee<0>(0),Return(AUDIT_TRAIL_ERROR_NONE))); + .WillOnce(DoAll(SetArgPointee<0>(0), Return(AUDIT_TRAIL_ERROR_NONE))); EXPECT_CALL(atrail, audit_trail_get_syscall_action_exitcode(_)) - .WillOnce(DoAll(SetArgPointee<0>(0),Return(AUDIT_TRAIL_ERROR_NONE))); + .WillOnce(DoAll(SetArgPointee<0>(0), Return(AUDIT_TRAIL_ERROR_NONE))); EXPECT_CALL(atrail, audit_trail_remove_syscall_cb(Eq(SYSCALL_CB_ID))).WillOnce(Return(AUDIT_TRAIL_ERROR_NONE)); EXPECT_CALL(atrail, audit_trail_destroy()).WillOnce(Return(AUDIT_TRAIL_ERROR_NONE)); @@ -480,7 +470,7 @@ TEST(Test_AuditTrailClient, start_auditing_is_enabled_user_fails) WithArgs<0, 1>(Invoke(InvokeCallbackWithReportAdapter)), \ Return(AUDIT_TRAIL_ERROR_NONE))); \ \ - switch(_name) \ + switch (_name) \ { \ case 9: \ EXPECT_CALL(atrail, audit_trail_get_dac_action_syscall(_)).WillOnce(Return(_r9)); \ @@ -547,7 +537,7 @@ DAC_LOG_CALLBACK(9, 0, 0, 0, 0, 0, 0, 0, 0, 1) WithArgs<0, 1>(Invoke(InvokeCallbackWithReportAdapter)), \ Return(AUDIT_TRAIL_ERROR_NONE))); \ \ - switch(_name) \ + switch (_name) \ { \ case 8: \ EXPECT_CALL(atrail, audit_trail_get_mac_action_request(_)).WillOnce(Return(_r8)); \ @@ -611,7 +601,7 @@ MAC_LOG_CALLBACK(8, 0, 0, 0, 0, 0, 0, 0, 1) WithArgs<0, 1>(Invoke(InvokeCallbackWithReportAdapter)), \ Return(AUDIT_TRAIL_ERROR_NONE))); \ \ - switch(_name) \ + switch (_name) \ { \ case 7: \ EXPECT_CALL(atrail, audit_trail_get_syscall_action_exitcode(_)).WillOnce(Return(_r7)); \ @@ -672,7 +662,7 @@ SYSCALL_LOG_CALLBACK(7, 0, 0, 0, 0, 0, 0, 1) WithArgs<0, 1>(Invoke(InvokeCallbackWithReportAdapter)), \ Return(AUDIT_TRAIL_ERROR_NONE))); \ \ - switch(_name) \ + switch (_name) \ { \ case 3: \ EXPECT_CALL(atrail, audit_trail_get_user_log_text(_)).WillOnce(Return(_r3)); \ @@ -701,136 +691,3 @@ SYSCALL_LOG_CALLBACK(7, 0, 0, 0, 0, 0, 0, 1) USER_LOG_CALLBACK(1, 1, 0, 0) USER_LOG_CALLBACK(2, 0, 1, 0) USER_LOG_CALLBACK(3, 0, 0, 1) - - - - - - - - - - - - - - - - - - -#if 0 -/** - * @brief TEST for dac auditing when start_dac_auditing fauls - * 1. Create objects and mocks - * 2. Run start dac auditing - * 3. Check that function return false when audit trail library fails - */ -TEST(Test_AuditTrailClient, dac_auditing_fault) -{ - AuditTrailMock atrail; - audit_trail_set_implementation(&atrail); - - ProxyThread proxy_thread; - ReportHandlerMock report_handler; - - { - ::testing::InSequence dummy; - - EXPECT_CALL(atrail, audit_trail_create(_)).WillOnce(Return(AUDIT_TRAIL_ERROR_NONE)); - - EXPECT_CALL(atrail, audit_trail_enable_dac(true)) - .WillOnce(Return(AUDIT_TRAIL_ERROR_CONNECTION_REFUSED)) - .WillOnce(Return(AUDIT_TRAIL_ERROR_NONE)); - EXPECT_CALL(atrail, audit_trail_add_dac_cb(_, _, _)) - .WillOnce(Return(AUDIT_TRAIL_ERROR_CONNECTION_REFUSED)); - - EXPECT_CALL(atrail, audit_trail_destroy()).WillOnce(Return(AUDIT_TRAIL_ERROR_NONE)); - } - - AuditTrailClient aclient( - DEVICE_ID, - &proxy_thread, - std::shared_ptr(&report_handler, [](ReportHandler*){}), - WorkingMode::Standard); - - EXPECT_FALSE(aclient.start_dac_auditing()); - EXPECT_FALSE(aclient.start_dac_auditing()); -} - -/** - * @brief TEST for mac auditing when start_mac_auditing fauls - * 1. Create objects and mocks - * 2. Run start mac auditing - * 3. Check that function return false when audit trail library fails - */ -TEST(Test_AuditTrailClient, mac_auditing_fault) -{ - AuditTrailMock atrail; - audit_trail_set_implementation(&atrail); - - ProxyThread proxy_thread; - ReportHandlerMock report_handler; - - { - ::testing::InSequence dummy; - - EXPECT_CALL(atrail, audit_trail_create(_)).WillOnce(Return(AUDIT_TRAIL_ERROR_NONE)); - - EXPECT_CALL(atrail, audit_trail_enable_mac(true)) - .WillOnce(Return(AUDIT_TRAIL_ERROR_CONNECTION_REFUSED)) - .WillOnce(Return(AUDIT_TRAIL_ERROR_NONE)); - EXPECT_CALL(atrail, audit_trail_add_mac_cb(_, _, _)) - .WillOnce(Return(AUDIT_TRAIL_ERROR_CONNECTION_REFUSED)); - - EXPECT_CALL(atrail, audit_trail_destroy()).WillOnce(Return(AUDIT_TRAIL_ERROR_NONE)); - } - - AuditTrailClient aclient( - DEVICE_ID, - &proxy_thread, - std::shared_ptr(&report_handler, [](ReportHandler*){}), - WorkingMode::Standard); - - EXPECT_FALSE(aclient.start_mac_auditing()); - EXPECT_FALSE(aclient.start_mac_auditing()); -} - -/** - * @brief TEST for syscall auditing when start_syscall_auditing fauls - * 1. Create objects and mocks - * 2. Run start syscall auditing - * 3. Check that function return false when audit trail library fails - */ -TEST(Test_AuditTrailClient, syscall_auditing_fault) -{ - AuditTrailMock atrail; - audit_trail_set_implementation(&atrail); - - ProxyThread proxy_thread; - ReportHandlerMock report_handler; - - { - ::testing::InSequence dummy; - - EXPECT_CALL(atrail, audit_trail_create(_)).WillOnce(Return(AUDIT_TRAIL_ERROR_NONE)); - - EXPECT_CALL(atrail, audit_trail_enable_syscall(true)) - .WillOnce(Return(AUDIT_TRAIL_ERROR_CONNECTION_REFUSED)) - .WillOnce(Return(AUDIT_TRAIL_ERROR_NONE)); - EXPECT_CALL(atrail, audit_trail_add_syscall_cb(_, _, _)) - .WillOnce(Return(AUDIT_TRAIL_ERROR_CONNECTION_REFUSED)); - - EXPECT_CALL(atrail, audit_trail_destroy()).WillOnce(Return(AUDIT_TRAIL_ERROR_NONE)); - } - - AuditTrailClient aclient( - DEVICE_ID, - &proxy_thread, - std::shared_ptr(&report_handler, [](ReportHandler*){}), - WorkingMode::Standard); - - EXPECT_FALSE(aclient.start_syscall_auditing()); - EXPECT_FALSE(aclient.start_syscall_auditing()); -} -#endif -- 2.7.4