From b46b87d004108bb85063b1de57ed1318f0743e42 Mon Sep 17 00:00:00 2001 From: hunili Date: Tue, 9 Jul 2024 14:38:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=8E=E7=BA=A7=E7=BC=96=E7=A0=81(=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=89=93=E5=8D=B0)=20issue:=20https://gitee.com/openh?= =?UTF-8?q?armony/filemanagement=5Fapp=5Ffile=5Fservice/issues/IABNCM=20Si?= =?UTF-8?q?gned-off-by:=20hunili=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/ets/entryability/EntryAbility.ts | 1 - .../src/main/ets/entryability/EntryAbility.ts | 1 - .../src/sandbox_mock.cpp | 21 +++++ tests/mock/module_ipc/message_parcel_mock.cpp | 80 +++++++++++++++++++ 4 files changed, 101 insertions(+), 2 deletions(-) diff --git a/test/unittest/resource/bundle_dependencies/fileShareA/entry/src/main/ets/entryability/EntryAbility.ts b/test/unittest/resource/bundle_dependencies/fileShareA/entry/src/main/ets/entryability/EntryAbility.ts index 9b5b72a37..9dd0adbea 100644 --- a/test/unittest/resource/bundle_dependencies/fileShareA/entry/src/main/ets/entryability/EntryAbility.ts +++ b/test/unittest/resource/bundle_dependencies/fileShareA/entry/src/main/ets/entryability/EntryAbility.ts @@ -21,7 +21,6 @@ export default class EntryAbility extends UIAbility { onCreate(want, launchParam) { hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onCreate'); - hilog.info(0x0000, 'testTag', '%{public}s', 'want param:' + JSON.stringify(want) ?? ''); hilog.info(0x0000, 'testTag', '%{public}s', 'launchParam:' + JSON.stringify(launchParam) ?? ''); } diff --git a/test/unittest/resource/bundle_dependencies/fileShareB/entry/src/main/ets/entryability/EntryAbility.ts b/test/unittest/resource/bundle_dependencies/fileShareB/entry/src/main/ets/entryability/EntryAbility.ts index 9b5b72a37..9dd0adbea 100644 --- a/test/unittest/resource/bundle_dependencies/fileShareB/entry/src/main/ets/entryability/EntryAbility.ts +++ b/test/unittest/resource/bundle_dependencies/fileShareB/entry/src/main/ets/entryability/EntryAbility.ts @@ -21,7 +21,6 @@ export default class EntryAbility extends UIAbility { onCreate(want, launchParam) { hilog.isLoggable(0x0000, 'testTag', hilog.LogLevel.INFO); hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onCreate'); - hilog.info(0x0000, 'testTag', '%{public}s', 'want param:' + JSON.stringify(want) ?? ''); hilog.info(0x0000, 'testTag', '%{public}s', 'launchParam:' + JSON.stringify(launchParam) ?? ''); } diff --git a/tests/mock/file_permission_native/src/sandbox_mock.cpp b/tests/mock/file_permission_native/src/sandbox_mock.cpp index d9ed2bf54..0feb52f6d 100644 --- a/tests/mock/file_permission_native/src/sandbox_mock.cpp +++ b/tests/mock/file_permission_native/src/sandbox_mock.cpp @@ -16,27 +16,48 @@ #include "sandbox_mock.h" using namespace OHOS::AccessControl::SandboxManager; +const int32_t DEFAULT_VALUE = -1; int32_t CheckPersistPolicy(uint64_t tokenId, const std::vector &policy, std::vector &result) { + if (SandboxManagerKit::sandboxManagerKit == nullptr) { + GTEST_LOG_(INFO) << "CheckPersistPolicy sandboxManagerKit == nulpptr"; + return DEFAULT_VALUE; + } return SandboxManagerKit::sandboxManagerKit->CheckPersistPolicy(tokenId, policy, result); } int32_t PersistPolicy(const std::vector &policy, std::vector &result) { + if (SandboxManagerKit::sandboxManagerKit == nullptr) { + GTEST_LOG_(INFO) << "PersistPolicy sandboxManagerKit == nulpptr"; + return DEFAULT_VALUE; + } return SandboxManagerKit::sandboxManagerKit->PersistPolicy(policy, result); } int32_t UnPersistPolicy(const std::vector &policy, std::vector &result) { + if (SandboxManagerKit::sandboxManagerKit == nullptr) { + GTEST_LOG_(INFO) << "UnPersistPolicy sandboxManagerKit == nulpptr"; + return DEFAULT_VALUE; + } return SandboxManagerKit::sandboxManagerKit->UnPersistPolicy(policy, result); } int32_t StartAccessingPolicy(const std::vector &policy, std::vector &result) { + if (SandboxManagerKit::sandboxManagerKit == nullptr) { + GTEST_LOG_(INFO) << "StartAccessingPolicy sandboxManagerKit == nulpptr"; + return DEFAULT_VALUE; + } return SandboxManagerKit::sandboxManagerKit->StartAccessingPolicy(policy, result); } int32_t StopAccessingPolicy(const std::vector &policy, std::vector &result) { + if (SandboxManagerKit::sandboxManagerKit == nullptr) { + GTEST_LOG_(INFO) << "StopAccessingPolicy sandboxManagerKit == nulpptr"; + return DEFAULT_VALUE; + } return SandboxManagerKit::sandboxManagerKit->StopAccessingPolicy(policy, result); } \ No newline at end of file diff --git a/tests/mock/module_ipc/message_parcel_mock.cpp b/tests/mock/module_ipc/message_parcel_mock.cpp index bba15b0dc..01cb16649 100644 --- a/tests/mock/module_ipc/message_parcel_mock.cpp +++ b/tests/mock/module_ipc/message_parcel_mock.cpp @@ -1,6 +1,8 @@ /* * Copyright (C) 2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); + } + return ; * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * @@ -17,8 +19,14 @@ namespace OHOS { using namespace OHOS::FileManagement::Backup; +const int DEFAULT_INT_VALUE = -1; +const int32_t DEFAULT_INT32_T_VALUE = -1; sptr BrokerRegistration::NewInstance(const std::u16string &descriptor, const sptr &object) { + if (BackupIfaceCast::cast == nullptr) { + GTEST_LOG_(INFO) << "cast == nullptr"; + return nullptr; + } return BackupIfaceCast::cast->iface_cast(object); } @@ -33,91 +41,163 @@ Parcelable::Parcelable(bool asRemote) bool MessageParcel::WriteInterfaceToken(std::u16string name) { + if (BackupMessageParcel::messageParcel == nullptr) { + GTEST_LOG_(INFO) << "messageParcel == nullptr"; + return false; + } return BackupMessageParcel::messageParcel->WriteInterfaceToken(name); } std::u16string MessageParcel::ReadInterfaceToken() { + if (BackupMessageParcel::messageParcel == nullptr) { + GTEST_LOG_(INFO) << "messageParcel == nullptr"; + return std::u16string(u""); + } return BackupMessageParcel::messageParcel->ReadInterfaceToken(); } bool Parcel::WriteParcelable(const Parcelable *object) { + if (BackupMessageParcel::messageParcel == nullptr) { + GTEST_LOG_(INFO) << "messageParcel == nullptr"; + return false; + } return BackupMessageParcel::messageParcel->WriteParcelable(object); } bool Parcel::WriteInt32(int32_t value) { + if (BackupMessageParcel::messageParcel == nullptr) { + GTEST_LOG_(INFO) << "messageParcel == nullptr"; + return false; + } return BackupMessageParcel::messageParcel->WriteInt32(value); } int32_t Parcel::ReadInt32() { + if (BackupMessageParcel::messageParcel == nullptr) { + GTEST_LOG_(INFO) << "messageParcel == nullptr"; + return DEFAULT_INT32_T_VALUE; + } return BackupMessageParcel::messageParcel->ReadInt32(); } bool Parcel::ReadInt32(int32_t &value) { + if (BackupMessageParcel::messageParcel == nullptr) { + GTEST_LOG_(INFO) << "messageParcel == nullptr"; + return false; + } return BackupMessageParcel::messageParcel->ReadInt32(value); } bool Parcel::WriteRemoteObject(const Parcelable *object) { + if (BackupMessageParcel::messageParcel == nullptr) { + GTEST_LOG_(INFO) << "messageParcel == nullptr"; + return false; + } return BackupMessageParcel::messageParcel->WriteRemoteObject(object); } bool MessageParcel::WriteRemoteObject(const sptr &object) { + if (BackupMessageParcel::messageParcel == nullptr) { + GTEST_LOG_(INFO) << "messageParcel == nullptr"; + return false; + } return BackupMessageParcel::messageParcel->WriteRemoteObject(object); } sptr MessageParcel::ReadRemoteObject() { + if (BackupMessageParcel::messageParcel == nullptr) { + GTEST_LOG_(INFO) << "messageParcel == nullptr"; + return nullptr; + } return BackupMessageParcel::messageParcel->ReadRemoteObject(); } bool Parcel::ReadBool() { + if (BackupMessageParcel::messageParcel == nullptr) { + GTEST_LOG_(INFO) << "messageParcel == nullptr"; + return false; + } return BackupMessageParcel::messageParcel->ReadBool(); } bool Parcel::ReadBool(bool &value) { + if (BackupMessageParcel::messageParcel == nullptr) { + GTEST_LOG_(INFO) << "messageParcel == nullptr"; + return false; + } return BackupMessageParcel::messageParcel->ReadBool(value); } bool Parcel::WriteBool(bool value) { + if (BackupMessageParcel::messageParcel == nullptr) { + GTEST_LOG_(INFO) << "messageParcel == nullptr"; + return false; + } return BackupMessageParcel::messageParcel->WriteBool(value); } bool Parcel::WriteString(const std::string &value) { + if (BackupMessageParcel::messageParcel == nullptr) { + GTEST_LOG_(INFO) << "messageParcel == nullptr"; + return false; + } return BackupMessageParcel::messageParcel->WriteString(value); } bool Parcel::ReadString(std::string &value) { + if (BackupMessageParcel::messageParcel == nullptr) { + GTEST_LOG_(INFO) << "messageParcel == nullptr"; + return false; + } return BackupMessageParcel::messageParcel->ReadString(value); } bool Parcel::ReadStringVector(std::vector *value) { + if (BackupMessageParcel::messageParcel == nullptr) { + GTEST_LOG_(INFO) << "messageParcel == nullptr"; + return false; + } return BackupMessageParcel::messageParcel->ReadStringVector(value); } bool MessageParcel::WriteFileDescriptor(int fd) { + if (BackupMessageParcel::messageParcel == nullptr) { + GTEST_LOG_(INFO) << "messageParcel == nullptr"; + return false; + } return BackupMessageParcel::messageParcel->WriteFileDescriptor(fd); } int MessageParcel::ReadFileDescriptor() { + if (BackupMessageParcel::messageParcel == nullptr) { + GTEST_LOG_(INFO) << "messageParcel == nullptr"; + return DEFAULT_INT_VALUE; + } return BackupMessageParcel::messageParcel->ReadFileDescriptor(); } bool Parcel::ReadUint32(uint32_t &value) { + if (BackupMessageParcel::messageParcel == nullptr) { + GTEST_LOG_(INFO) << "messageParcel == nullptr"; + return false; + } return BackupMessageParcel::messageParcel->ReadUint32(value); } } // namespace OHOS \ No newline at end of file -- Gitee