openharmony/inputmethod_imf
1
0
Fork 0
mirror of https://gitee.com/openharmony/inputmethod_imf synced 2025-02-17 05:38:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

modify code

Browse Source 
Signed-off-by: zhaolinglan <zhaolinglan@huawei.com>
This commit is contained in:
zhaolinglan 2023-10-15 10:50:46 +08:00
parent 65ac003f1c
commit 7a46442fd0
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/unittest/cpp_test/src/identity_checker_test.cpp
View File

@ -42,7 +42,7 @@ public:
virtual ~IdentityCheckerMock() = default;
MOCK_METHOD3(IsFocused, bool(int64_t callingPid, uint32_t callingTokenId, int64_t focusedPid));
MOCK_METHOD1(IsSystemApp, bool(uint64_t fullTokenID));
MOCK_METHOD2(IsCurrentIme, bool(uint32_t tokenID, const std::string &currentBundleName));
MOCK_METHOD2(IsBundleNameValid, bool(uint32_t tokenID, const std::string &validBundleName));
MOCK_METHOD2(HasPermission, bool(uint32_t tokenID, const std::string &permission));
MOCK_METHOD1(IsBroker, bool(uint32_t tokenID));
MOCK_METHOD1(IsNativeSa, bool(uint32_t tokenID));
@ -384,7 +384,7 @@ HWTEST_F(IdentityCheckerTest, testSetCoreAndAgent_001, TestSize.Level0)
HWTEST_F(IdentityCheckerTest, testSetCoreAndAgent_002, TestSize.Level0)
{
IMSA_HILOGI("IdentityCheckerTest testSetCoreAndAgent_002 start");
EXPECT_CALL(*IdentityCheckerTest::identityCheckerMock_, IsCurrentIme(_, _)).Times(1).WillRepeatedly(Return(true));
EXPECT_CALL(*IdentityCheckerTest::identityCheckerMock_, IsBundleNameValid(_, _)).Times(1).WillRepeatedly(Return(true));
int32_t ret = IdentityCheckerTest::service_->SetCoreAndAgent(nullptr, nullptr);
EXPECT_EQ(ret, ErrorCode::ERROR_NULL_POINTER);
}
@ -399,7 +399,7 @@ HWTEST_F(IdentityCheckerTest, testSetCoreAndAgent_002, TestSize.Level0)
HWTEST_F(IdentityCheckerTest, testSetCoreAndAgent_003, TestSize.Level0)
{
IMSA_HILOGI("IdentityCheckerTest testSetCoreAndAgent_003 start");
EXPECT_CALL(*IdentityCheckerTest::identityCheckerMock_, IsCurrentIme(_, _)).Times(1).WillRepeatedly(Return(false));
EXPECT_CALL(*IdentityCheckerTest::identityCheckerMock_, IsBundleNameValid(_, _)).Times(1).WillRepeatedly(Return(false));
EXPECT_CALL(*IdentityCheckerTest::identityCheckerMock_, IsNativeSa(_)).Times(1).WillRepeatedly(Return(true));
int32_t ret = IdentityCheckerTest::service_->SetCoreAndAgent(nullptr, nullptr);
EXPECT_EQ(ret, ErrorCode::ERROR_NULL_POINTER);
@ -460,7 +460,7 @@ HWTEST_F(IdentityCheckerTest, testIsCurrentIme_001, TestSize.Level0)
HWTEST_F(IdentityCheckerTest, testIsCurrentIme_002, TestSize.Level0)
{
IMSA_HILOGI("IdentityCheckerTest testIsCurrentIme_002 start");
EXPECT_CALL(*IdentityCheckerTest::identityCheckerMock_, IsCurrentIme(_, _)).Times(1).WillRepeatedly(Return(true));
EXPECT_CALL(*IdentityCheckerTest::identityCheckerMock_, IsBundleNameValid(_, _)).Times(1).WillRepeatedly(Return(true));
bool ret = IdentityCheckerTest::service_->IsCurrentIme();
EXPECT_TRUE(ret);
}
@ -622,7 +622,7 @@ HWTEST_F(IdentityCheckerTest, testPanelStatusChange_001, TestSize.Level0)
HWTEST_F(IdentityCheckerTest, testPanelStatusChange_002, TestSize.Level0)
{
IMSA_HILOGI("IdentityCheckerTest testPanelStatusChange_002 start");
EXPECT_CALL(*IdentityCheckerTest::identityCheckerMock_, IsCurrentIme(_, _)).Times(1).WillRepeatedly(Return(true));
EXPECT_CALL(*IdentityCheckerTest::identityCheckerMock_, IsBundleNameValid(_, _)).Times(1).WillRepeatedly(Return(true));
InputWindowStatus status = InputWindowStatus::SHOW;
InputWindowInfo windowInfo{};
int32_t ret = IdentityCheckerTest::service_->PanelStatusChange(status, windowInfo);
@ -720,7 +720,7 @@ HWTEST_F(IdentityCheckerTest, testSwitchInputMethod_002, TestSize.Level0)
{
IMSA_HILOGI("IdentityCheckerTest testSwitchInputMethod_001 start");
EXPECT_CALL(*IdentityCheckerTest::identityCheckerMock_, HasPermission(_, _)).Times(1).WillRepeatedly(Return(false));
EXPECT_CALL(*IdentityCheckerTest::identityCheckerMock_, IsCurrentIme(_, _)).Times(1).WillRepeatedly(Return(true));
EXPECT_CALL(*IdentityCheckerTest::identityCheckerMock_, IsBundleNameValid(_, _)).Times(1).WillRepeatedly(Return(true));
int32_t ret = IdentityCheckerTest::service_->SwitchInputMethod(CURRENT_BUNDLENAME, CURRENT_SUBNAME);
EXPECT_EQ(ret, ErrorCode::NO_ERROR);
}
@ -736,7 +736,7 @@ HWTEST_F(IdentityCheckerTest, testSwitchInputMethod_003, TestSize.Level0)
{
IMSA_HILOGI("IdentityCheckerTest testSwitchInputMethod_003 start");
EXPECT_CALL(*IdentityCheckerTest::identityCheckerMock_, HasPermission(_, _)).Times(1).WillRepeatedly(Return(true));
EXPECT_CALL(*IdentityCheckerTest::identityCheckerMock_, IsCurrentIme(_, _)).WillRepeatedly(Return(false));
EXPECT_CALL(*IdentityCheckerTest::identityCheckerMock_, IsBundleNameValid(_, _)).WillRepeatedly(Return(false));
int32_t ret = IdentityCheckerTest::service_->SwitchInputMethod(CURRENT_BUNDLENAME, CURRENT_SUBNAME);
EXPECT_EQ(ret, ErrorCode::NO_ERROR);
}

16
test/unittest/cpp_test/src/input_method_private_member_test.cpp
View File

@ -263,7 +263,7 @@ HWTEST_F(InputMethodPrivateMemberTest, PerUserSessionCoreOrAgentNullptr, TestSiz
ret = userSession->InitInputControlChannel();
EXPECT_EQ(ret, ErrorCode::ERROR_IME_NOT_STARTED);
userSession->StopInputService();
ret = userSession->OnSwitchIme({}, {}, true);
ret = userSession->SwitchSubtype({});
EXPECT_EQ(ret, ErrorCode::ERROR_IME_NOT_STARTED);
}
@ -732,19 +732,19 @@ HWTEST_F(InputMethodPrivateMemberTest, III_TestParseSubProp_008, TestSize.Level0
* @tc.require:
* @tc.author: chenyu
*/
HWTEST_F(InputMethodPrivateMemberTest, III_TestGetCurrentInputMethodSubtype_001, TestSize.Level0)
HWTEST_F(InputMethodPrivateMemberTest, III_TestGetCurrentSubtype_001, TestSize.Level0)
{
IMSA_HILOGI("InputMethodPrivateMemberTest III_TestGetCurrentInputMethodSubtype_001 TEST START");
// currentIme is empty
auto currentUserId = TddUtil::GetCurrentUserId();
auto subProp = ImeInfoInquirer::GetInstance().GetCurrentInputMethodSubtype(currentUserId);
auto subProp = ImeInfoInquirer::GetInstance().GetCurrentSubtype(currentUserId);
EXPECT_TRUE(subProp == nullptr);
// subName is not find
auto currentProp = InputMethodController::GetInstance()->GetCurrentInputMethod();
ImeCfgManager::GetInstance().imeConfigs_.push_back(
{ currentUserId, currentProp->name + "/" + currentProp->id, "tt" });
subProp = ImeInfoInquirer::GetInstance().GetCurrentInputMethodSubtype(currentUserId);
subProp = ImeInfoInquirer::GetInstance().GetCurrentSubtype(currentUserId);
EXPECT_TRUE(subProp != nullptr);
EXPECT_TRUE(subProp->name == currentProp->name);
@ -752,7 +752,7 @@ HWTEST_F(InputMethodPrivateMemberTest, III_TestGetCurrentInputMethodSubtype_001,
auto currentSubProp = InputMethodController::GetInstance()->GetCurrentInputMethodSubtype();
ImeCfgManager::GetInstance().imeConfigs_.push_back(
{ currentUserId, currentProp->name + "/" + currentProp->id, currentSubProp->id });
subProp = ImeInfoInquirer::GetInstance().GetCurrentInputMethodSubtype(currentUserId);
subProp = ImeInfoInquirer::GetInstance().GetCurrentSubtype(currentUserId);
ASSERT_TRUE(subProp != nullptr);
EXPECT_TRUE(subProp->id == currentSubProp->id);
}
@ -764,19 +764,19 @@ HWTEST_F(InputMethodPrivateMemberTest, III_TestGetCurrentInputMethodSubtype_001,
* @tc.require:
* @tc.author: chenyu
*/
HWTEST_F(InputMethodPrivateMemberTest, III_TestGetCurrentInputMethod_001, TestSize.Level0)
HWTEST_F(InputMethodPrivateMemberTest, III_TestGetCurrentIme_001, TestSize.Level0)
{
IMSA_HILOGI("InputMethodPrivateMemberTest III_TestGetCurrentInputMethod_001 TEST START");
// currentIme is empty
auto currentUserId = TddUtil::GetCurrentUserId();
auto prop = ImeInfoInquirer::GetInstance().GetCurrentInputMethod(currentUserId);
auto prop = ImeInfoInquirer::GetInstance().GetCurrentIme(currentUserId);
EXPECT_TRUE(prop == nullptr);
// get correct prop
auto currentProp = InputMethodController::GetInstance()->GetCurrentInputMethod();
ImeCfgManager::GetInstance().imeConfigs_.push_back(
{ currentUserId, currentProp->name + "/" + currentProp->id, "test" });
prop = ImeInfoInquirer::GetInstance().GetCurrentInputMethod(currentUserId);
prop = ImeInfoInquirer::GetInstance().GetCurrentIme(currentUserId);
ASSERT_TRUE(prop != nullptr);
EXPECT_TRUE(prop->id == currentProp->id);
}