openharmony/security_security_component_manager
1
0
Fork 0
mirror of https://github.com/openharmony/security_security_component_manager.git synced 2026-08-24 22:51:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Description:modify code check

Browse Source 
Match-id-559428f79e96611d3b2102d4f818b4922c6e89e3
This commit is contained in:
xxx
2023-02-14 10:23:49 +08:00
committed by xxx
parent 751255c4b1
commit e247fa8086
5 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/security_component/src/location_button.cpp
+1 -1
View File
@@ -56,7 +56,7 @@ void LocationButton::FromJson(const nlohmann::json& jsonSrc)
}
if (jsonSrc.find(JSON_FONT_SIZE) != jsonSrc.end() && jsonSrc.at(JSON_FONT_SIZE).is_number()) {
fontSize_ = jsonSrc.at(JSON_FONT_SIZE).get<int32_t>();
fontSize_ = jsonSrc.at(JSON_FONT_SIZE).get<uint32_t>();
}
if (jsonSrc.find(JSON_FONT_COLOR) != jsonSrc.end() && jsonSrc.at(JSON_FONT_COLOR).is_number()) {
services/security_component_service/sa/sa_main/sec_comp_entity.h
+1 -1
View File
@@ -65,7 +65,7 @@ public:
private:
std::shared_ptr<SecCompBase> componentInfo_;
bool isGrant_;
bool isGrant_ = false;
AccessToken::AccessTokenID tokenId_;
int32_t scId_;
};
services/security_component_service/sa/test/mock/include/iservice_registry.h
+3
View File
@@ -24,6 +24,9 @@ public:
SystemAbilityManagerClient() = default;
~SystemAbilityManagerClient() = default;
static SystemAbilityManagerClient* clientInstance;
static SystemAbilityManagerClient defaultInstance;
static std::mutex instanceMtx;
MOCK_METHOD0(GetSystemAbilityManager, sptr<ISystemAbilityManager>());
};
} // namespace OHOS
services/security_component_service/sa/test/mock/src/mock_iservice_registry.cpp
+12 -2
View File
@@ -16,9 +16,19 @@
#include "iservice_registry.h"
namespace OHOS {
SystemAbilityManagerClient* SystemAbilityManagerClient::clientInstance = nullptr;
SystemAbilityManagerClient SystemAbilityManagerClient::defaultInstance;
std::mutex SystemAbilityManagerClient::instanceMtx;
SystemAbilityManagerClient& SystemAbilityManagerClient::GetInstance()
{
static auto instance = new SystemAbilityManagerClient();
return *instance;
std::lock_guard<std::mutex> lock(instanceMtx);
if (clientInstance == nullptr) {
clientInstance = new (std::nothrow)SystemAbilityManagerClient();
if (clientInstance == nullptr) {
return defaultInstance;
}
}
return *clientInstance;
}
} // namespace OHOS
services/security_component_service/sa/test/unittest/src/sec_comp_service_test.cpp
+9 -6
View File
@@ -122,19 +122,21 @@ HWTEST_F(SecCompServiceTest, RegisterAppStateObserver001, TestSize.Level1)
{
// GetSystemAbilityManager get failed
secCompService_->appStateObserver_ = nullptr;
SystemAbilityManagerClient& saClient = SystemAbilityManagerClient::GetInstance();
EXPECT_CALL(saClient, GetSystemAbilityManager()).WillOnce(testing::Return(nullptr));
std::shared_ptr<SystemAbilityManagerClient> saClient = std::make_shared<SystemAbilityManagerClient>();
ASSERT_NE(saClient, nullptr);
SystemAbilityManagerClient::clientInstance = saClient.get();
EXPECT_CALL(*saClient, GetSystemAbilityManager()).WillOnce(testing::Return(nullptr));
EXPECT_FALSE(secCompService_->RegisterAppStateObserver());
// GetSystemAbility get app mgr failed
secCompService_->appStateObserver_ = nullptr;
SystemAbilityManagerProxy proxy(nullptr);
EXPECT_CALL(saClient, GetSystemAbilityManager()).WillOnce(testing::Return(&proxy));
EXPECT_CALL(*saClient, GetSystemAbilityManager()).WillOnce(testing::Return(&proxy));
EXPECT_FALSE(secCompService_->RegisterAppStateObserver());
// RegisterApplicationStateObserver failed
secCompService_->appStateObserver_ = nullptr;
EXPECT_CALL(saClient, GetSystemAbilityManager()).WillOnce(testing::Return(&proxy));
EXPECT_CALL(*saClient, GetSystemAbilityManager()).WillOnce(testing::Return(&proxy));
MockIRemoteObject object;
EXPECT_CALL(proxy, GetSystemAbility(testing::_)).WillOnce(testing::Return(&object));
sptr<MockAppMgrProxy> appProxy = new (std::nothrow) MockAppMgrProxy(nullptr);
@@ -145,7 +147,7 @@ HWTEST_F(SecCompServiceTest, RegisterAppStateObserver001, TestSize.Level1)
// GetForegroundApplications failed
secCompService_->appStateObserver_ = nullptr;
EXPECT_CALL(saClient, GetSystemAbilityManager()).WillOnce(testing::Return(&proxy));
EXPECT_CALL(*saClient, GetSystemAbilityManager()).WillOnce(testing::Return(&proxy));
EXPECT_CALL(proxy, GetSystemAbility(testing::_)).WillOnce(testing::Return(&object));
EXPECT_CALL(*MockAppMgrProxy::g_MockAppMgrProxy,
RegisterApplicationStateObserver(testing::_, testing::_)).WillOnce(testing::Return(0));
@@ -156,7 +158,7 @@ HWTEST_F(SecCompServiceTest, RegisterAppStateObserver001, TestSize.Level1)
// get one foreground app
secCompService_->appStateObserver_ = nullptr;
EXPECT_CALL(saClient, GetSystemAbilityManager()).WillOnce(testing::Return(&proxy));
EXPECT_CALL(*saClient, GetSystemAbilityManager()).WillOnce(testing::Return(&proxy));
EXPECT_CALL(proxy, GetSystemAbility(testing::_)).WillOnce(testing::Return(&object));
EXPECT_CALL(*MockAppMgrProxy::g_MockAppMgrProxy,
RegisterApplicationStateObserver(testing::_, testing::_)).WillOnce(testing::Return(0));
@@ -170,6 +172,7 @@ HWTEST_F(SecCompServiceTest, RegisterAppStateObserver001, TestSize.Level1)
EXPECT_TRUE(secCompService_->RegisterAppStateObserver());
EXPECT_EQ(secCompService_->appStateObserver_->foregrandProcList_.size(), static_cast<const size_t>(1));
secCompService_->UnregisterAppStateObserver();
SystemAbilityManagerClient::clientInstance = nullptr;
}
/**