From aba8321e091e4f549e61e7a857a089746301dc63 Mon Sep 17 00:00:00 2001 From: 18795846185 Date: Tue, 17 Jun 2025 13:56:20 +0800 Subject: [PATCH] render_state_observer with idl Signed-off-by: 18795846185 Change-Id: If8ba68211b0ecf7e7b144be047ec96f94e8a6083 --- interfaces/inner_api/app_manager/BUILD.gn | 3 +- .../IRenderStateObserver.idl} | 31 ++------ .../appmgr/render_state_observer_proxy.h | 42 ---------- .../appmgr/render_state_observer_stub.h | 42 ---------- .../appmgr/render_state_observer_proxy.cpp | 79 ------------------- .../src/appmgr/render_state_observer_stub.cpp | 58 -------------- ...esappmgrrenderstateobserverstub_fuzzer.cpp | 4 +- .../renderstateobserverproxy_fuzzer.cpp | 3 - .../app_mgr_proxy_test/app_mgr_proxy_test.cpp | 4 +- .../app_mgr_service_inner_eighth_test.cpp | 2 +- .../app_mgr_service_inner_fifth_test.cpp | 4 +- .../app_mgr_service_inner_fourth_test.cpp | 4 +- .../app_mgr_service_inner_test.cpp | 4 +- .../app_mgr_stub_test/app_mgr_stub_test.cpp | 4 +- .../render_state_observer_manager_test.cpp | 3 +- .../render_state_observer_proxy_test/BUILD.gn | 3 +- .../mock_render_state_observer_stub.h | 2 +- .../render_state_observer_proxy_test.cpp | 11 --- .../render_state_observer_stub_test/BUILD.gn | 3 +- .../mock_render_state_observer_stub.h | 2 +- .../render_state_observer_stub_test.cpp | 19 ----- 21 files changed, 27 insertions(+), 300 deletions(-) rename interfaces/inner_api/app_manager/{include/appmgr/irender_state_observer.h => idl/IRenderStateObserver.idl} (42%) delete mode 100644 interfaces/inner_api/app_manager/include/appmgr/render_state_observer_proxy.h delete mode 100644 interfaces/inner_api/app_manager/include/appmgr/render_state_observer_stub.h delete mode 100644 interfaces/inner_api/app_manager/src/appmgr/render_state_observer_proxy.cpp delete mode 100644 interfaces/inner_api/app_manager/src/appmgr/render_state_observer_stub.cpp diff --git a/interfaces/inner_api/app_manager/BUILD.gn b/interfaces/inner_api/app_manager/BUILD.gn index 59318b86d69..d7c56892fd9 100644 --- a/interfaces/inner_api/app_manager/BUILD.gn +++ b/interfaces/inner_api/app_manager/BUILD.gn @@ -45,6 +45,7 @@ idl_gen_interface("appmgr_innerkits") { sources = [ "idl/IAbilityDebugResponse.idl", "idl/IAppDebugListener.idl", + "idl/IRenderStateObserver.idl", "idl/IStartSpecifiedAbilityResponse.idl", ] log_domainid = "0xD001311" @@ -220,8 +221,6 @@ ohos_shared_library("app_manager") { "src/appmgr/render_scheduler_host.cpp", "src/appmgr/render_scheduler_proxy.cpp", "src/appmgr/render_state_data.cpp", - "src/appmgr/render_state_observer_proxy.cpp", - "src/appmgr/render_state_observer_stub.cpp", "src/appmgr/running_multi_info.cpp", "src/appmgr/running_process_info.cpp", "src/appmgr/system_memory_attr.cpp", diff --git a/interfaces/inner_api/app_manager/include/appmgr/irender_state_observer.h b/interfaces/inner_api/app_manager/idl/IRenderStateObserver.idl similarity index 42% rename from interfaces/inner_api/app_manager/include/appmgr/irender_state_observer.h rename to interfaces/inner_api/app_manager/idl/IRenderStateObserver.idl index e1c64c8d34c..0dd423dcf6b 100644 --- a/interfaces/inner_api/app_manager/include/appmgr/irender_state_observer.h +++ b/interfaces/inner_api/app_manager/idl/IRenderStateObserver.idl @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,29 +13,8 @@ * limitations under the License. */ -#ifndef OHOS_ABILITY_RUNTIME_IRENDER_STATE_OBSERVER_H -#define OHOS_ABILITY_RUNTIME_IRENDER_STATE_OBSERVER_H +sequenceable render_state_data..RenderStateData; -#include "iremote_broker.h" -#include "render_state_data.h" - -namespace OHOS { -namespace AppExecFwk { -class IRenderStateObserver : public IRemoteBroker { -public: - DECLARE_INTERFACE_DESCRIPTOR(u"ohos.appexecfwk.IRenderStateObserver"); - - /** - * Called when one render process's state changes. - * - * @param renderStateData retrieved state data. - */ - virtual void OnRenderStateChanged(const RenderStateData &renderStateData) = 0; - - enum { - ON_RENDER_STATE_CHANGED = 0, - }; -}; -} // namespace AppExecFwk -} // namespace OHOS -#endif // OHOS_ABILITY_RUNTIME_IRENDER_STATE_OBSERVER_H +interface OHOS.AppExecFwk.IRenderStateObserver { + [oneway] void OnRenderStateChanged([in] RenderStateData renderStateData); +} \ No newline at end of file diff --git a/interfaces/inner_api/app_manager/include/appmgr/render_state_observer_proxy.h b/interfaces/inner_api/app_manager/include/appmgr/render_state_observer_proxy.h deleted file mode 100644 index 024f7082226..00000000000 --- a/interfaces/inner_api/app_manager/include/appmgr/render_state_observer_proxy.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_ABILITY_RUNTIME_RENDER_STATE_OBSERVER_PROXY_H -#define OHOS_ABILITY_RUNTIME_RENDER_STATE_OBSERVER_PROXY_H - -#include "iremote_proxy.h" -#include "irender_state_observer.h" - -namespace OHOS { -namespace AppExecFwk { -class RenderStateObserverProxy : public IRemoteProxy { -public: - explicit RenderStateObserverProxy(const sptr &impl); - virtual ~RenderStateObserverProxy() = default; - - /** - * Called when one render process's state changes. - * - * @param renderStateData retrieved state data. - */ - virtual void OnRenderStateChanged(const RenderStateData &renderStateData) override; -private: - bool WriteInterfaceToken(MessageParcel &data); - static inline BrokerDelegator delegator_; - int32_t SendTransactCmd(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option); -}; -} // namespace AppExecFwk -} // namespace OHOS -#endif // OHOS_ABILITY_RUNTIME_RENDER_STATE_OBSERVER_PROXY_H \ No newline at end of file diff --git a/interfaces/inner_api/app_manager/include/appmgr/render_state_observer_stub.h b/interfaces/inner_api/app_manager/include/appmgr/render_state_observer_stub.h deleted file mode 100644 index 1416251d5c5..00000000000 --- a/interfaces/inner_api/app_manager/include/appmgr/render_state_observer_stub.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_ABILITY_RUNTIME_RENDER_STATE_OBSERVER_STUB_H -#define OHOS_ABILITY_RUNTIME_RENDER_STATE_OBSERVER_STUB_H - -#include - -#include "iremote_stub.h" -#include "irender_state_observer.h" -#include "nocopyable.h" - -namespace OHOS { -namespace AppExecFwk { -class RenderStateObserverStub : public IRemoteStub { -public: - RenderStateObserverStub(); - virtual ~RenderStateObserverStub(); - - virtual int OnRemoteRequest( - uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override; - -private: - DISALLOW_COPY_AND_MOVE(RenderStateObserverStub); - int32_t OnRenderStateChangedInner(MessageParcel &data, MessageParcel &reply); -}; -} // namespace AppExecFwk -} // namespace OHOS - -#endif // OHOS_ABILITY_RUNTIME_RENDER_STATE_OBSERVER_STUB_H \ No newline at end of file diff --git a/interfaces/inner_api/app_manager/src/appmgr/render_state_observer_proxy.cpp b/interfaces/inner_api/app_manager/src/appmgr/render_state_observer_proxy.cpp deleted file mode 100644 index 9c478fa52dc..00000000000 --- a/interfaces/inner_api/app_manager/src/appmgr/render_state_observer_proxy.cpp +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (c) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "render_state_observer_proxy.h" - -#include "hilog_tag_wrapper.h" -#include "ipc_types.h" - -namespace OHOS { -namespace AppExecFwk { -namespace { -const int32_t ERR_INVALID_STUB = 32; -} -RenderStateObserverProxy::RenderStateObserverProxy( - const sptr &impl) : IRemoteProxy(impl) -{} - -bool RenderStateObserverProxy::WriteInterfaceToken(MessageParcel &data) -{ - if (!data.WriteInterfaceToken(RenderStateObserverProxy::GetDescriptor())) { - TAG_LOGE(AAFwkTag::APPMGR, "write interface token failed."); - return false; - } - return true; -} - -void RenderStateObserverProxy::OnRenderStateChanged(const RenderStateData &renderStateData) -{ - MessageParcel data; - MessageParcel reply; - MessageOption option(MessageOption::TF_ASYNC); - if (!WriteInterfaceToken(data)) { - return; - } - - if (!data.WriteParcelable(&renderStateData)) { - TAG_LOGE(AAFwkTag::APPMGR, "Failed to write renderStateData"); - return; - } - - sptr remote = Remote(); - if (remote == nullptr) { - TAG_LOGE(AAFwkTag::APPMGR, "Remote() is NULL"); - return; - } - int32_t ret = SendTransactCmd( - static_cast(IRenderStateObserver::ON_RENDER_STATE_CHANGED), - data, reply, option); - if (ret != NO_ERROR || ret != ERR_INVALID_STUB) { - TAG_LOGW(AAFwkTag::APPMGR, "SendRequest is failed, error code: %{public}d", ret); - return; - } -} - -int32_t RenderStateObserverProxy::SendTransactCmd(uint32_t code, MessageParcel &data, - MessageParcel &reply, MessageOption &option) -{ - sptr remote = Remote(); - if (remote == nullptr) { - TAG_LOGE(AAFwkTag::APPMGR, "Remote is nullptr."); - return ERR_NULL_OBJECT; - } - - return remote->SendRequest(code, data, reply, option); -} -} // namespace AppExecFwk -} // namespace OHOS \ No newline at end of file diff --git a/interfaces/inner_api/app_manager/src/appmgr/render_state_observer_stub.cpp b/interfaces/inner_api/app_manager/src/appmgr/render_state_observer_stub.cpp deleted file mode 100644 index 8d28fa4007b..00000000000 --- a/interfaces/inner_api/app_manager/src/appmgr/render_state_observer_stub.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "render_state_observer_stub.h" - -#include "appexecfwk_errors.h" -#include "hilog_tag_wrapper.h" -#include "ipc_types.h" -#include "iremote_object.h" - -namespace OHOS { -namespace AppExecFwk { -RenderStateObserverStub::RenderStateObserverStub() {} - -RenderStateObserverStub::~RenderStateObserverStub() {} - -int32_t RenderStateObserverStub::OnRenderStateChangedInner(MessageParcel &data, MessageParcel &reply) -{ - std::unique_ptr renderStateData(data.ReadParcelable()); - if (renderStateData == nullptr) { - TAG_LOGE(AAFwkTag::APPMGR, "renderStateData is null"); - return ERR_APPEXECFWK_PARCEL_ERROR; - } - - OnRenderStateChanged(*renderStateData); - return NO_ERROR; -} - -int RenderStateObserverStub::OnRemoteRequest( - uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) -{ - std::u16string descriptor = RenderStateObserverStub::GetDescriptor(); - std::u16string remoteDescriptor = data.ReadInterfaceToken(); - if (descriptor != remoteDescriptor) { - TAG_LOGE(AAFwkTag::APPMGR, "Local descriptor is not equal to remote"); - return ERR_INVALID_STATE; - } - - if (code == IRenderStateObserver::ON_RENDER_STATE_CHANGED) { - return OnRenderStateChangedInner(data, reply); - } - - return IPCObjectStub::OnRemoteRequest(code, data, reply, option); -} -} // namespace AppExecFwk -} // namespace OHOS \ No newline at end of file diff --git a/test/fuzztest/abilityinterfacesappmgrrenderstateobserverstub_fuzzer/abilityinterfacesappmgrrenderstateobserverstub_fuzzer.cpp b/test/fuzztest/abilityinterfacesappmgrrenderstateobserverstub_fuzzer/abilityinterfacesappmgrrenderstateobserverstub_fuzzer.cpp index 07d3000d8e3..c4a5490022d 100644 --- a/test/fuzztest/abilityinterfacesappmgrrenderstateobserverstub_fuzzer/abilityinterfacesappmgrrenderstateobserverstub_fuzzer.cpp +++ b/test/fuzztest/abilityinterfacesappmgrrenderstateobserverstub_fuzzer/abilityinterfacesappmgrrenderstateobserverstub_fuzzer.cpp @@ -54,7 +54,7 @@ public: virtual ~ RenderStateObserverStubFUZZ() {}; int OnRemoteRequest( uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override{ return 0; }; - void OnRenderStateChanged(const RenderStateData &renderStateData) override{}; + ErrCode OnRenderStateChanged(const RenderStateData &renderStateData) override{ return ERR_OK; }; }; sptr GetFuzzAbilityToken() @@ -73,7 +73,7 @@ sptr GetFuzzAbilityToken() bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) { - uint32_t code = static_cast(IRenderStateObserver::ON_RENDER_STATE_CHANGED); + uint32_t code = static_cast(IRenderStateObserverIpcCode::COMMAND_ON_RENDER_STATE_CHANGED); MessageParcel parcel; parcel.WriteInterfaceToken(IR_ENDER_STATE_OBSERVER_TOKEN); parcel.WriteBuffer(data, size); diff --git a/test/fuzztest/renderstateobserverproxy_fuzzer/renderstateobserverproxy_fuzzer.cpp b/test/fuzztest/renderstateobserverproxy_fuzzer/renderstateobserverproxy_fuzzer.cpp index 19380b91e05..563fb742bb2 100644 --- a/test/fuzztest/renderstateobserverproxy_fuzzer/renderstateobserverproxy_fuzzer.cpp +++ b/test/fuzztest/renderstateobserverproxy_fuzzer/renderstateobserverproxy_fuzzer.cpp @@ -64,9 +64,6 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) MessageParcel reply; MessageOption option; renderStateObserverProxy->OnRenderStateChanged(renderStateData); - renderStateObserverProxy->WriteInterfaceToken(dataParcel); - uint32_t code = static_cast(GetU32Data(data)); - renderStateObserverProxy->SendTransactCmd(code, dataParcel, reply, option); return true; } diff --git a/test/unittest/app_mgr_proxy_test/app_mgr_proxy_test.cpp b/test/unittest/app_mgr_proxy_test/app_mgr_proxy_test.cpp index dcc5295348f..be8efb521ac 100644 --- a/test/unittest/app_mgr_proxy_test/app_mgr_proxy_test.cpp +++ b/test/unittest/app_mgr_proxy_test/app_mgr_proxy_test.cpp @@ -47,8 +47,8 @@ class RenderStateObserverMock : public RenderStateObserverStub { public: RenderStateObserverMock() = default; virtual ~RenderStateObserverMock() = default; - void OnRenderStateChanged(const RenderStateData &renderStateData) override - {} + ErrCode OnRenderStateChanged(const RenderStateData &renderStateData) override + { return ERR_OK; } }; class QuickFixCallbackImpl : public AppExecFwk::QuickFixCallbackStub { diff --git a/test/unittest/app_mgr_service_inner_eighth_test/app_mgr_service_inner_eighth_test.cpp b/test/unittest/app_mgr_service_inner_eighth_test/app_mgr_service_inner_eighth_test.cpp index d6b2b7fe7bf..5ccbc628db8 100644 --- a/test/unittest/app_mgr_service_inner_eighth_test/app_mgr_service_inner_eighth_test.cpp +++ b/test/unittest/app_mgr_service_inner_eighth_test/app_mgr_service_inner_eighth_test.cpp @@ -66,7 +66,7 @@ public: }; class MyRenderStateObserver : public IRenderStateObserver { public: - void OnRenderStateChanged(const RenderStateData &renderStateData) override {} + ErrCode OnRenderStateChanged(const RenderStateData &renderStateData) override { return ERR_OK; } sptr AsObject() override { return nullptr; diff --git a/test/unittest/app_mgr_service_inner_fifth_test/app_mgr_service_inner_fifth_test.cpp b/test/unittest/app_mgr_service_inner_fifth_test/app_mgr_service_inner_fifth_test.cpp index d606d82a0ca..70b7b6eced0 100644 --- a/test/unittest/app_mgr_service_inner_fifth_test/app_mgr_service_inner_fifth_test.cpp +++ b/test/unittest/app_mgr_service_inner_fifth_test/app_mgr_service_inner_fifth_test.cpp @@ -114,8 +114,8 @@ class RenderStateObserverMock : public RenderStateObserverStub { public: RenderStateObserverMock() = default; virtual ~RenderStateObserverMock() = default; - void OnRenderStateChanged(const RenderStateData &renderStateData) override - {} + ErrCode OnRenderStateChanged(const RenderStateData &renderStateData) override + { return ERR_OK; } }; void AppMgrServiceInnerTest::InitAppInfo(const std::string& deviceName, diff --git a/test/unittest/app_mgr_service_inner_fourth_test/app_mgr_service_inner_fourth_test.cpp b/test/unittest/app_mgr_service_inner_fourth_test/app_mgr_service_inner_fourth_test.cpp index f637909ed4e..0479c954ac1 100644 --- a/test/unittest/app_mgr_service_inner_fourth_test/app_mgr_service_inner_fourth_test.cpp +++ b/test/unittest/app_mgr_service_inner_fourth_test/app_mgr_service_inner_fourth_test.cpp @@ -68,8 +68,8 @@ class RenderStateObserverMock : public RenderStateObserverStub { public: RenderStateObserverMock() = default; virtual ~RenderStateObserverMock() = default; - void OnRenderStateChanged(const RenderStateData &renderStateData) override - {} + ErrCode OnRenderStateChanged(const RenderStateData &renderStateData) override + { return ERR_OK; } }; void AppMgrServiceInnerFourthTest::InitAppInfo(const std::string& deviceName, diff --git a/test/unittest/app_mgr_service_inner_test/app_mgr_service_inner_test.cpp b/test/unittest/app_mgr_service_inner_test/app_mgr_service_inner_test.cpp index 8c790ffe6e4..9f8dc3d5fab 100644 --- a/test/unittest/app_mgr_service_inner_test/app_mgr_service_inner_test.cpp +++ b/test/unittest/app_mgr_service_inner_test/app_mgr_service_inner_test.cpp @@ -88,8 +88,8 @@ class RenderStateObserverMock : public RenderStateObserverStub { public: RenderStateObserverMock() = default; virtual ~RenderStateObserverMock() = default; - void OnRenderStateChanged(const RenderStateData &renderStateData) override - {} + ErrCode OnRenderStateChanged(const RenderStateData &renderStateData) override + { return ERR_OK; } }; void AppMgrServiceInnerTest::InitAppInfo(const std::string& deviceName, diff --git a/test/unittest/app_mgr_stub_test/app_mgr_stub_test.cpp b/test/unittest/app_mgr_stub_test/app_mgr_stub_test.cpp index 7cdbab6100c..2647731a59d 100644 --- a/test/unittest/app_mgr_stub_test/app_mgr_stub_test.cpp +++ b/test/unittest/app_mgr_stub_test/app_mgr_stub_test.cpp @@ -49,8 +49,8 @@ class RenderStateObserverMock : public RenderStateObserverStub { public: RenderStateObserverMock() = default; virtual ~RenderStateObserverMock() = default; - void OnRenderStateChanged(const RenderStateData &renderStateData) override - {} + ErrCode OnRenderStateChanged(const RenderStateData &renderStateData) override + { return ERR_OK; } }; class NativeChildCallbackMock : public NativeChildNotifyStub { diff --git a/test/unittest/render_state_observer_manager_test/render_state_observer_manager_test.cpp b/test/unittest/render_state_observer_manager_test/render_state_observer_manager_test.cpp index c4427ecec78..8fc409a5538 100644 --- a/test/unittest/render_state_observer_manager_test/render_state_observer_manager_test.cpp +++ b/test/unittest/render_state_observer_manager_test/render_state_observer_manager_test.cpp @@ -32,9 +32,10 @@ class MockRenderStateObserver : public RenderStateObserverStub { public: MockRenderStateObserver() = default; virtual ~MockRenderStateObserver() = default; - void OnRenderStateChanged(const RenderStateData &renderStateData) override + ErrCode OnRenderStateChanged(const RenderStateData &renderStateData) override { onRenderStateChangedResult = 1; + return ERR_OK; } }; diff --git a/test/unittest/render_state_observer_proxy_test/BUILD.gn b/test/unittest/render_state_observer_proxy_test/BUILD.gn index bfd04ec43da..8a3a905da9a 100644 --- a/test/unittest/render_state_observer_proxy_test/BUILD.gn +++ b/test/unittest/render_state_observer_proxy_test/BUILD.gn @@ -25,8 +25,9 @@ ohos_unittest("render_state_observer_proxy_test") { "${ability_runtime_services_path}/common/include", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] + sources = [ - "${ability_runtime_innerkits_path}/app_manager/src/appmgr/render_state_observer_proxy.cpp", "render_state_observer_proxy_test.cpp", ] diff --git a/test/unittest/render_state_observer_proxy_test/mock_render_state_observer_stub.h b/test/unittest/render_state_observer_proxy_test/mock_render_state_observer_stub.h index bdb1c2de982..b2362fb2e0a 100644 --- a/test/unittest/render_state_observer_proxy_test/mock_render_state_observer_stub.h +++ b/test/unittest/render_state_observer_proxy_test/mock_render_state_observer_stub.h @@ -27,7 +27,7 @@ public: MockRenderStateObserverStub() = default; virtual ~MockRenderStateObserverStub() = default; - MOCK_METHOD1(OnRenderStateChanged, void(const RenderStateData &renderStateData)); + MOCK_METHOD1(OnRenderStateChanged, ErrCode(const RenderStateData &renderStateData)); }; } // namespace AppExecFwk } // namespace OHOS diff --git a/test/unittest/render_state_observer_proxy_test/render_state_observer_proxy_test.cpp b/test/unittest/render_state_observer_proxy_test/render_state_observer_proxy_test.cpp index e1a3674d0e8..4398cd1e0c3 100644 --- a/test/unittest/render_state_observer_proxy_test/render_state_observer_proxy_test.cpp +++ b/test/unittest/render_state_observer_proxy_test/render_state_observer_proxy_test.cpp @@ -48,17 +48,6 @@ void RenderStateObserverProxyTest::SetUp() void RenderStateObserverProxyTest::TearDown() {} -/** - * @tc.name: WriteInterfaceToken_0100 - * @tc.desc: Write token into parcel data. - * @tc.type: FUNC - */ -HWTEST_F(RenderStateObserverProxyTest, WriteInterfaceToken_0100, TestSize.Level1) -{ - MessageParcel data; - EXPECT_TRUE(observerProxy_->WriteInterfaceToken(data)); -} - /** * @tc.name: OnRenderStateChanged_0100 * @tc.desc: Test when the return of WriteInterfaceToken and diff --git a/test/unittest/render_state_observer_stub_test/BUILD.gn b/test/unittest/render_state_observer_stub_test/BUILD.gn index 3fe64881c8a..31974b0d78a 100644 --- a/test/unittest/render_state_observer_stub_test/BUILD.gn +++ b/test/unittest/render_state_observer_stub_test/BUILD.gn @@ -25,8 +25,9 @@ ohos_unittest("render_state_observer_stub_test") { "${ability_runtime_services_path}/common/include", ] + configs = [ "${ability_runtime_innerkits_path}/app_manager:appmgr_innerkits_config" ] + sources = [ - "${ability_runtime_innerkits_path}/app_manager/src/appmgr/render_state_observer_stub.cpp", "render_state_observer_stub_test.cpp", ] diff --git a/test/unittest/render_state_observer_stub_test/mock_render_state_observer_stub.h b/test/unittest/render_state_observer_stub_test/mock_render_state_observer_stub.h index bdb1c2de982..b2362fb2e0a 100644 --- a/test/unittest/render_state_observer_stub_test/mock_render_state_observer_stub.h +++ b/test/unittest/render_state_observer_stub_test/mock_render_state_observer_stub.h @@ -27,7 +27,7 @@ public: MockRenderStateObserverStub() = default; virtual ~MockRenderStateObserverStub() = default; - MOCK_METHOD1(OnRenderStateChanged, void(const RenderStateData &renderStateData)); + MOCK_METHOD1(OnRenderStateChanged, ErrCode(const RenderStateData &renderStateData)); }; } // namespace AppExecFwk } // namespace OHOS diff --git a/test/unittest/render_state_observer_stub_test/render_state_observer_stub_test.cpp b/test/unittest/render_state_observer_stub_test/render_state_observer_stub_test.cpp index 399f18469db..ff47044aafa 100644 --- a/test/unittest/render_state_observer_stub_test/render_state_observer_stub_test.cpp +++ b/test/unittest/render_state_observer_stub_test/render_state_observer_stub_test.cpp @@ -48,24 +48,5 @@ void RenderStateObserverStubTest::SetUp() void RenderStateObserverStubTest::TearDown() {} -/** - * @tc.number: OnRenderStateChangedInner_0100 - * @tc.desc: Test when params is not nullptr. - * @tc.type: FUNC - */ -HWTEST_F(RenderStateObserverStubTest, OnRenderStateChangedInner_0100, TestSize.Level1) -{ - auto stub = new (std::nothrow) MockRenderStateObserverStub(); - EXPECT_TRUE(stub); - EXPECT_CALL(*stub, OnRenderStateChanged(_)).Times(1); - MessageParcel data; - RenderStateData renderStateData; - data.WriteParcelable(&renderStateData); - MessageParcel reply; - auto result = stub->OnRenderStateChangedInner(data, reply); - EXPECT_EQ(NO_ERROR, result); - testing::Mock::AllowLeak(stub); -} - } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file -- Gitee