From 3852a01a1e96429f77e62b02615c3f149815533c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=A5=E5=AE=87?= Date: Thu, 28 Mar 2024 07:53:03 +0000 Subject: [PATCH 1/7] update services/test/unittest/common_event_manager_service_test.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张春宇 --- services/test/unittest/common_event_manager_service_test.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/services/test/unittest/common_event_manager_service_test.cpp b/services/test/unittest/common_event_manager_service_test.cpp index c0a5692c..9c4b7ca4 100644 --- a/services/test/unittest/common_event_manager_service_test.cpp +++ b/services/test/unittest/common_event_manager_service_test.cpp @@ -12,9 +12,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -#include "parameter.h" - #define private public #define protected public #include "common_event_manager_service.h" -- Gitee From 682b94f059a44931c62cbed2b74f4437e6266a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=A5=E5=AE=87?= Date: Thu, 28 Mar 2024 07:53:42 +0000 Subject: [PATCH 2/7] =?UTF-8?q?=E5=BA=94=E7=94=A8=E8=AE=A2=E9=98=85CES?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=B6=85=E9=99=90=E7=BB=B4=E6=B5=8B=20Signed?= =?UTF-8?q?-off-by:=20=E5=BC=A0=E6=98=A5=E5=AE=87=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/include/common_event_subscriber_manager.h | 1 + services/src/common_event_subscriber_manager.cpp | 2 -- services/test/unittest/BUILD.gn | 1 + services/test/unittest/common_event_freeze_unit_test.cpp | 1 - .../common_event_services_publish_ordered_system_test/BUILD.gn | 1 + 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/include/common_event_subscriber_manager.h b/services/include/common_event_subscriber_manager.h index a25aa3cc..7845297d 100644 --- a/services/include/common_event_subscriber_manager.h +++ b/services/include/common_event_subscriber_manager.h @@ -24,6 +24,7 @@ #include "common_event_subscribe_info.h" #include "event_log_wrapper.h" #include "iremote_object.h" +#include "parameter.h" #include "singleton.h" namespace OHOS { diff --git a/services/src/common_event_subscriber_manager.cpp b/services/src/common_event_subscriber_manager.cpp index 6050b7e9..5aa3db42 100644 --- a/services/src/common_event_subscriber_manager.cpp +++ b/services/src/common_event_subscriber_manager.cpp @@ -13,8 +13,6 @@ * limitations under the License. */ -#include "parameter.h" - #include #include #include diff --git a/services/test/unittest/BUILD.gn b/services/test/unittest/BUILD.gn index 197db327..97768bbf 100644 --- a/services/test/unittest/BUILD.gn +++ b/services/test/unittest/BUILD.gn @@ -152,6 +152,7 @@ ohos_unittest("common_event_freeze_unit_test") { "c_utils:utils", "eventhandler:libeventhandler", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } diff --git a/services/test/unittest/common_event_freeze_unit_test.cpp b/services/test/unittest/common_event_freeze_unit_test.cpp index 18eac26b..47a3bba1 100644 --- a/services/test/unittest/common_event_freeze_unit_test.cpp +++ b/services/test/unittest/common_event_freeze_unit_test.cpp @@ -13,7 +13,6 @@ * limitations under the License. */ -#include "parameter.h" #include #define private public diff --git a/test/systemtest/common/ces/common_event_services_publish_ordered_system_test/BUILD.gn b/test/systemtest/common/ces/common_event_services_publish_ordered_system_test/BUILD.gn index 3662e8eb..2d01a1ce 100644 --- a/test/systemtest/common/ces/common_event_services_publish_ordered_system_test/BUILD.gn +++ b/test/systemtest/common/ces/common_event_services_publish_ordered_system_test/BUILD.gn @@ -48,6 +48,7 @@ ohos_systemtest("CESPublishOrderedEventSystmTest") { "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", "samgr:samgr_proxy", ] -- Gitee From aaa817037f3a6a32bd50e9e211c0053e3288b0e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=A5=E5=AE=87?= Date: Thu, 28 Mar 2024 10:18:25 +0000 Subject: [PATCH 3/7] =?UTF-8?q?=E5=BA=94=E7=94=A8=E8=AE=A2=E9=98=85CES?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=B6=85=E9=99=90=E7=BB=B4=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张春宇 --- services/test/unittest/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/services/test/unittest/BUILD.gn b/services/test/unittest/BUILD.gn index 97768bbf..7d09e1c5 100644 --- a/services/test/unittest/BUILD.gn +++ b/services/test/unittest/BUILD.gn @@ -820,6 +820,7 @@ ohos_unittest("common_event_subscriber_manager_test") { "c_utils:utils", "eventhandler:libeventhandler", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } -- Gitee From a2b1904e875c1bc27a4e0f7c8c786a6a9c87c56c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=A5=E5=AE=87?= Date: Thu, 28 Mar 2024 11:10:58 +0000 Subject: [PATCH 4/7] =?UTF-8?q?=E5=BA=94=E7=94=A8=E8=AE=A2=E9=98=85CES?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=B6=85=E9=99=90=E7=BB=B4=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张春宇 --- services/test/unittest/BUILD.gn | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/services/test/unittest/BUILD.gn b/services/test/unittest/BUILD.gn index 7d09e1c5..e2688c38 100644 --- a/services/test/unittest/BUILD.gn +++ b/services/test/unittest/BUILD.gn @@ -59,6 +59,7 @@ ohos_unittest("common_event_publish_system_event_test") { "c_utils:utils", "eventhandler:libeventhandler", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } @@ -90,6 +91,7 @@ ohos_unittest("common_event_dump_test") { "c_utils:utils", "eventhandler:libeventhandler", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } @@ -121,6 +123,7 @@ ohos_unittest("common_event_freeze_test") { "c_utils:utils", "eventhandler:libeventhandler", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } @@ -184,6 +187,7 @@ ohos_unittest("ability_manager_death_recipient_unit_test") { "c_utils:utils", "ffrt:libffrt", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } @@ -212,6 +216,7 @@ ohos_unittest("bundle_manager_death_recipient_unit_test") { "bundle_framework:appexecfwk_core", "c_utils:utils", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } @@ -255,6 +260,7 @@ ohos_unittest("static_subscriber_manager_unit_test") { "hicollie:libhicollie", "hilog:libhilog", "hitrace:hitrace_meter", + "init:libbegetutil", "ipc:ipc_core", "kv_store:distributeddata_inner", ] @@ -287,6 +293,7 @@ ohos_unittest("static_subscriber_connection_unit_test") { "c_utils:utils", "ffrt:libffrt", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } @@ -318,6 +325,7 @@ ohos_unittest("common_event_sticky_test") { "c_utils:utils", "eventhandler:libeventhandler", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } @@ -352,6 +360,7 @@ ohos_unittest("common_event_subscribe_unit_test") { "c_utils:utils", "eventhandler:libeventhandler", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } @@ -383,6 +392,7 @@ ohos_unittest("common_event_unsubscribe_unit_test") { "c_utils:utils", "eventhandler:libeventhandler", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } @@ -414,6 +424,7 @@ ohos_unittest("common_event_publish_ordered_event_unit_test") { "c_utils:utils", "eventhandler:libeventhandler", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } @@ -445,6 +456,7 @@ ohos_unittest("common_event_publish_permission_event_unit_test") { "c_utils:utils", "eventhandler:libeventhandler", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } @@ -535,6 +547,7 @@ ohos_unittest("common_event_manager_service_test") { "c_utils:utils", "eventhandler:libeventhandler", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } @@ -573,6 +586,7 @@ ohos_unittest("common_event_manager_service_ability_test") { "c_utils:utils", "eventhandler:libeventhandler", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } @@ -609,6 +623,7 @@ ohos_unittest("bundle_manager_helper_other_test") { "c_utils:utils", "eventhandler:libeventhandler", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } @@ -645,6 +660,7 @@ ohos_unittest("bundle_manager_helper_test") { "c_utils:utils", "eventhandler:libeventhandler", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } @@ -681,6 +697,7 @@ ohos_unittest("common_event_manager_service_branch_test") { "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } @@ -717,6 +734,7 @@ ohos_unittest("common_event_manager_service_new_branch_test") { "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } @@ -758,6 +776,7 @@ ohos_unittest("common_event_control_manager_branch_test") { "c_utils:utils", "eventhandler:libeventhandler", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } @@ -792,6 +811,7 @@ ohos_unittest("common_event_control_manager_test") { "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } @@ -885,6 +905,7 @@ ohos_unittest("ability_manager_helper_test") { "c_utils:utils", "eventhandler:libeventhandler", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", "samgr:samgr_proxy", ] @@ -914,6 +935,7 @@ ohos_unittest("ordered_event_handler_test") { "c_utils:utils", "eventhandler:libeventhandler", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } @@ -942,6 +964,7 @@ ohos_unittest("subscriber_deach_recipient_test") { "c_utils:utils", "eventhandler:libeventhandler", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } -- Gitee From ad3d8e767067e781271827552091150025e939f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=A5=E5=AE=87?= Date: Thu, 28 Mar 2024 11:37:28 +0000 Subject: [PATCH 5/7] update test/systemtest/common/acts/actsCESCESpublishInfoTest/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张春宇 --- test/systemtest/common/acts/actsCESCESpublishInfoTest/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/test/systemtest/common/acts/actsCESCESpublishInfoTest/BUILD.gn b/test/systemtest/common/acts/actsCESCESpublishInfoTest/BUILD.gn index 6fcf06a5..efdf3c93 100644 --- a/test/systemtest/common/acts/actsCESCESpublishInfoTest/BUILD.gn +++ b/test/systemtest/common/acts/actsCESCESpublishInfoTest/BUILD.gn @@ -51,6 +51,7 @@ ohos_systemtest("ActsCESCESpublishInfoTest") { "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } -- Gitee From 14b2aef129bd66286f5226fc8b2a7643e00a5eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=A5=E5=AE=87?= Date: Thu, 28 Mar 2024 11:38:34 +0000 Subject: [PATCH 6/7] update test/systemtest/common/acts/actsCESDataTest/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张春宇 --- test/systemtest/common/acts/actsCESDataTest/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/test/systemtest/common/acts/actsCESDataTest/BUILD.gn b/test/systemtest/common/acts/actsCESDataTest/BUILD.gn index 8c2846ae..b393c370 100644 --- a/test/systemtest/common/acts/actsCESDataTest/BUILD.gn +++ b/test/systemtest/common/acts/actsCESDataTest/BUILD.gn @@ -47,6 +47,7 @@ ohos_systemtest("ActsCESDataTest") { "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", ] } -- Gitee From fdc78e104b5d1e54a2eb7b526cae6bfcaec4159f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=A5=E5=AE=87?= Date: Thu, 28 Mar 2024 11:39:07 +0000 Subject: [PATCH 7/7] update test/systemtest/common/acts/actsCESManagertest/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张春宇 --- test/systemtest/common/acts/actsCESManagertest/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/test/systemtest/common/acts/actsCESManagertest/BUILD.gn b/test/systemtest/common/acts/actsCESManagertest/BUILD.gn index 511770b2..ca6dd0e1 100644 --- a/test/systemtest/common/acts/actsCESManagertest/BUILD.gn +++ b/test/systemtest/common/acts/actsCESManagertest/BUILD.gn @@ -52,6 +52,7 @@ ohos_systemtest("ActsCESManagertest") { "eventhandler:libeventhandler", "ffrt:libffrt", "hilog:libhilog", + "init:libbegetutil", "ipc:ipc_core", "samgr:samgr_proxy", ] -- Gitee