!38457 输入内容未发生变化,不再重复拉起AutoFill

Merge pull request !38457 from kangshihui/text_dev
This commit is contained in:
openharmony_ci 2024-07-23 09:00:59 +00:00 committed by Gitee
commit a45e308bc9
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
15 changed files with 93 additions and 90 deletions

View File

@ -1555,7 +1555,7 @@ bool AceContainer::RequestAutoSave(const RefPtr<NG::FrameNode>& node, const std:
auto uiContentImpl = reinterpret_cast<UIContentImpl*>(uiContent);
CHECK_NULL_RETURN(uiContentImpl, false);
auto viewDataWrap = ViewDataWrap::CreateViewDataWrap();
uiContentImpl->DumpViewData(node, viewDataWrap);
uiContentImpl->DumpViewData(node, viewDataWrap, false, true);
auto pipelineContext = AceType::DynamicCast<NG::PipelineContext>(pipelineContext_);
CHECK_NULL_RETURN(pipelineContext, false);

View File

@ -2874,7 +2874,7 @@ bool UIContentImpl::DumpViewData(AbilityBase::ViewData& viewData, AbilityBase::A
}
bool UIContentImpl::DumpViewData(const RefPtr<NG::FrameNode>& node, RefPtr<ViewDataWrap> viewDataWrap,
bool skipSubAutoFillContainer)
bool skipSubAutoFillContainer, bool needsRecordData)
{
CHECK_NULL_RETURN(viewDataWrap, false);
auto context = context_.lock();
@ -2902,7 +2902,7 @@ bool UIContentImpl::DumpViewData(const RefPtr<NG::FrameNode>& node, RefPtr<ViewD
CHECK_NULL_RETURN(container, false);
auto pipelineContext = AceType::DynamicCast<NG::PipelineContext>(container->GetPipelineContext());
CHECK_NULL_RETURN(pipelineContext, false);
return pipelineContext->DumpPageViewData(node, viewDataWrap, skipSubAutoFillContainer);
return pipelineContext->DumpPageViewData(node, viewDataWrap, skipSubAutoFillContainer, needsRecordData);
}
void UIContentImpl::SearchElementInfoByAccessibilityId(

View File

@ -228,7 +228,7 @@ public:
bool DumpViewData(AbilityBase::ViewData& viewData, AbilityBase::AutoFillType& type) override;
bool CheckNeedAutoSave() override;
bool DumpViewData(const RefPtr<NG::FrameNode>& node, RefPtr<ViewDataWrap> viewDataWrap,
bool skipSubAutoFillContainer = false);
bool skipSubAutoFillContainer = false, bool needsRecordData = false);
void SearchElementInfoByAccessibilityId(
int64_t elementId, int32_t mode,

View File

@ -883,10 +883,10 @@ void FrameNode::DumpAdvanceInfo()
}
}
void FrameNode::DumpViewDataPageNode(RefPtr<ViewDataWrap> viewDataWrap)
void FrameNode::DumpViewDataPageNode(RefPtr<ViewDataWrap> viewDataWrap, bool needsRecordData)
{
if (pattern_) {
pattern_->DumpViewDataPageNode(viewDataWrap);
pattern_->DumpViewDataPageNode(viewDataWrap, needsRecordData);
}
}

View File

@ -1039,7 +1039,7 @@ private:
void DumpAlignRulesInfo();
void DumpExtensionHandlerInfo();
void DumpAdvanceInfo() override;
void DumpViewDataPageNode(RefPtr<ViewDataWrap> viewDataWrap) override;
void DumpViewDataPageNode(RefPtr<ViewDataWrap> viewDataWrap, bool needsRecordData = false) override;
void DumpOnSizeChangeInfo();
bool CheckAutoSave() override;
void MouseToJsonValue(std::unique_ptr<JsonValue>& json, const InspectorFilter& filter) const;

View File

@ -674,13 +674,14 @@ bool UINode::IsAutoFillContainerNode()
return tag_ == V2::PAGE_ETS_TAG || tag_ == V2::NAVDESTINATION_VIEW_ETS_TAG;
}
void UINode::DumpViewDataPageNodes(RefPtr<ViewDataWrap> viewDataWrap, bool skipSubAutoFillContainer)
void UINode::DumpViewDataPageNodes(
RefPtr<ViewDataWrap> viewDataWrap, bool skipSubAutoFillContainer, bool needsRecordData)
{
auto frameNode = AceType::DynamicCast<FrameNode>(this);
if (frameNode && !frameNode->IsVisible()) {
return;
}
DumpViewDataPageNode(viewDataWrap);
DumpViewDataPageNode(viewDataWrap, needsRecordData);
for (const auto& item : GetChildren()) {
if (!item) {
continue;
@ -688,7 +689,7 @@ void UINode::DumpViewDataPageNodes(RefPtr<ViewDataWrap> viewDataWrap, bool skipS
if (skipSubAutoFillContainer && item->IsAutoFillContainerNode()) {
continue;
}
item->DumpViewDataPageNodes(viewDataWrap, skipSubAutoFillContainer);
item->DumpViewDataPageNodes(viewDataWrap, skipSubAutoFillContainer, needsRecordData);
}
}

View File

@ -189,7 +189,8 @@ public:
virtual void AdjustLayoutWrapperTree(const RefPtr<LayoutWrapperNode>& parent, bool forceMeasure, bool forceLayout);
bool IsAutoFillContainerNode();
void DumpViewDataPageNodes(RefPtr<ViewDataWrap> viewDataWrap, bool skipSubAutoFillContainer = false);
void DumpViewDataPageNodes(
RefPtr<ViewDataWrap> viewDataWrap, bool skipSubAutoFillContainer = false, bool needsRecordData = false);
bool NeedRequestAutoSave();
// DFX info.
void DumpTree(int32_t depth);
@ -771,7 +772,7 @@ protected:
// dump self info.
virtual void DumpInfo() {}
virtual void DumpAdvanceInfo() {}
virtual void DumpViewDataPageNode(RefPtr<ViewDataWrap> viewDataWrap) {}
virtual void DumpViewDataPageNode(RefPtr<ViewDataWrap> viewDataWrap, bool needsRecordData = false) {}
virtual bool CheckAutoSave()
{
return false;

View File

@ -379,7 +379,7 @@ public:
virtual void DumpInfo() {}
virtual void DumpAdvanceInfo() {}
virtual void DumpViewDataPageNode(RefPtr<ViewDataWrap> viewDataWrap) {}
virtual void DumpViewDataPageNode(RefPtr<ViewDataWrap> viewDataWrap, bool needsRecordData = false) {}
virtual void NotifyFillRequestSuccess(RefPtr<ViewDataWrap> viewDataWrap,
RefPtr<PageNodeInfoWrap> nodeWrap, AceAutoFillType autoFillType) {}
virtual void NotifyFillRequestFailed(int32_t errCode, const std::string& fillContent = "", bool isPopup = false) {}

View File

@ -6536,7 +6536,7 @@ void TextFieldPattern::DumpAdvanceInfo()
DumpLog::GetInstance().AddDesc(std::string("fontWeightScale: ").append(std::to_string(fontWeightScale)));
}
void TextFieldPattern::DumpViewDataPageNode(RefPtr<ViewDataWrap> viewDataWrap)
void TextFieldPattern::DumpViewDataPageNode(RefPtr<ViewDataWrap> viewDataWrap, bool needsRecordData)
{
CHECK_NULL_VOID(viewDataWrap);
auto host = GetHost();
@ -6557,6 +6557,9 @@ void TextFieldPattern::DumpViewDataPageNode(RefPtr<ViewDataWrap> viewDataWrap)
} else {
info->SetValue(contentController_->GetTextValue());
}
if (needsRecordData) {
lastAutoFillTextValue_ = contentController_->GetTextValue();
}
info->SetPlaceholder(GetPlaceHolder());
info->SetPasswordRules(layoutProperty->GetPasswordRulesValue(""));
info->SetEnableAutoFill(layoutProperty->GetEnableAutoFillValue(true));
@ -6589,6 +6592,13 @@ void TextFieldPattern::NotifyFillRequestSuccess(RefPtr<ViewDataWrap> viewDataWra
focusHub->RequestFocusImmediately();
DoProcessAutoFill();
}
auto type = GetAutoFillType();
bool formOtherAccount = (viewDataWrap->GetOtherAccount() && IsAutoFillPasswordType(type));
if (!(type == AceAutoFillType::ACE_NEW_PASSWORD && type == autoFillType) && !formOtherAccount) {
TAG_LOGI(AceLogTag::ACE_AUTO_FILL, "Set last auto fill text value.");
lastAutoFillTextValue_ = nodeWrap->GetValue();
}
if (!contentController_ || contentController_->GetTextValue() == nodeWrap->GetValue()) {
return;
}
@ -6596,14 +6606,6 @@ void TextFieldPattern::NotifyFillRequestSuccess(RefPtr<ViewDataWrap> viewDataWra
auto textLength = static_cast<int32_t>(contentController_->GetWideText().length());
selectController_->UpdateCaretIndex(textLength);
host->MarkDirtyNode(PROPERTY_UPDATE_MEASURE);
auto layoutProperty = host->GetLayoutProperty<TextFieldLayoutProperty>();
CHECK_NULL_VOID(layoutProperty);
auto type = GetAutoFillType();
bool formOtherAccount = (viewDataWrap->GetOtherAccount() && IsAutoFillPasswordType(type));
if (!(type == AceAutoFillType::ACE_NEW_PASSWORD && type == autoFillType) && !formOtherAccount) {
TAG_LOGI(AceLogTag::ACE_AUTO_FILL, "Set last auto fill text value.");
lastAutoFillPasswordTextValue_ = nodeWrap->GetValue();
}
}
bool TextFieldPattern::ParseFillContentJsonValue(const std::unique_ptr<JsonValue>& jsonObject,
@ -6671,14 +6673,13 @@ bool TextFieldPattern::CheckAutoSave()
}
auto autoFillType = GetAutoFillType();
if (autoFillType == AceAutoFillType::ACE_USER_NAME) {
if (!lastAutoFillPasswordTextValue_.empty() &&
contentController_->GetTextValue() != lastAutoFillPasswordTextValue_) {
if (!lastAutoFillTextValue_.empty() && contentController_->GetTextValue() != lastAutoFillTextValue_) {
return true;
}
}
if (AceAutoFillType::ACE_UNSPECIFIED < autoFillType && autoFillType <= AceAutoFillType::ACE_FORMAT_ADDRESS &&
autoFillType != AceAutoFillType::ACE_USER_NAME) {
if (contentController_->GetTextValue() != lastAutoFillPasswordTextValue_) {
if (contentController_->GetTextValue() != lastAutoFillTextValue_) {
return true;
}
}

View File

@ -1094,7 +1094,7 @@ public:
void DumpInfo() override;
void DumpAdvanceInfo() override;
void DumpViewDataPageNode(RefPtr<ViewDataWrap> viewDataWrap) override;
void DumpViewDataPageNode(RefPtr<ViewDataWrap> viewDataWrap, bool needsRecordData = false) override;
void NotifyFillRequestSuccess(RefPtr<ViewDataWrap> viewDataWrap,
RefPtr<PageNodeInfoWrap> nodeWrap, AceAutoFillType autoFillType) override;
void NotifyFillRequestFailed(int32_t errCode, const std::string& fillContent = "", bool isPopup = false) override;
@ -1748,7 +1748,7 @@ private:
RefPtr<NG::UINode> unitNode_;
RefPtr<TextInputResponseArea> responseArea_;
RefPtr<TextInputResponseArea> cleanNodeResponseArea_;
std::string lastAutoFillPasswordTextValue_;
std::string lastAutoFillTextValue_;
bool isSupportCameraInput_ = false;
std::function<void()> processOverlayDelayTask_;
std::function<void(bool)> isFocusActiveUpdateEvent_;

View File

@ -3340,7 +3340,7 @@ void WebPattern::OnQuickMenuDismissed()
CloseSelectOverlay();
}
void WebPattern::DumpViewDataPageNode(RefPtr<ViewDataWrap> viewDataWrap)
void WebPattern::DumpViewDataPageNode(RefPtr<ViewDataWrap> viewDataWrap, bool needsRecordData)
{
TAG_LOGI(AceLogTag::ACE_WEB, "called");
CHECK_NULL_VOID(viewDataWrap);

View File

@ -190,7 +190,7 @@ public:
void OnModifyDone() override;
void DumpViewDataPageNode(RefPtr<ViewDataWrap> viewDataWrap) override;
void DumpViewDataPageNode(RefPtr<ViewDataWrap> viewDataWrap, bool needsRecordData = false) override;
void NotifyFillRequestSuccess(RefPtr<ViewDataWrap> viewDataWrap,
RefPtr<PageNodeInfoWrap> nodeWrap, AceAutoFillType autoFillType) override;

View File

@ -2255,7 +2255,7 @@ void PipelineContext::RegisterDumpInfoListener(const std::function<void(const st
}
bool PipelineContext::DumpPageViewData(const RefPtr<FrameNode>& node, RefPtr<ViewDataWrap> viewDataWrap,
bool skipSubAutoFillContainer)
bool skipSubAutoFillContainer, bool needsRecordData)
{
CHECK_NULL_RETURN(viewDataWrap, false);
RefPtr<FrameNode> pageNode = nullptr;
@ -2271,7 +2271,7 @@ bool PipelineContext::DumpPageViewData(const RefPtr<FrameNode>& node, RefPtr<Vie
}
CHECK_NULL_RETURN(pageNode, false);
CHECK_NULL_RETURN(dumpNode, false);
dumpNode->DumpViewDataPageNodes(viewDataWrap, skipSubAutoFillContainer);
dumpNode->DumpViewDataPageNodes(viewDataWrap, skipSubAutoFillContainer, needsRecordData);
auto pagePattern = pageNode->GetPattern<NG::PagePattern>();
CHECK_NULL_RETURN(pagePattern, false);
auto pageInfo = pagePattern->GetPageInfo();

View File

@ -577,7 +577,7 @@ public:
void DumpJsInfo(const std::vector<std::string>& params) const;
bool DumpPageViewData(const RefPtr<FrameNode>& node, RefPtr<ViewDataWrap> viewDataWrap,
bool skipSubAutoFillContainer = false);
bool skipSubAutoFillContainer = false, bool needsRecordData = false);
bool CheckNeedAutoSave();
bool CheckOverlayFocus();
void NotifyFillRequestSuccess(AceAutoFillType autoFillType, RefPtr<ViewDataWrap> viewDataWrap);

View File

@ -118,7 +118,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave004, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -127,7 +127,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave004, TestSize.Level1)
* @tc.steps: step4. set PasswordTextValue ne textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -151,7 +151,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave005, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -160,7 +160,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave005, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -184,7 +184,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave006, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -193,7 +193,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave006, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -217,7 +217,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave007, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -226,7 +226,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave007, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -250,7 +250,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave008, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -259,7 +259,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave008, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -283,7 +283,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave009, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -292,7 +292,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave009, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -316,7 +316,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0010, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -325,7 +325,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0010, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -349,7 +349,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0011, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -358,7 +358,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0011, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -382,7 +382,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0012, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -391,7 +391,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0012, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -415,7 +415,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0013, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -424,7 +424,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0013, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -448,7 +448,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0014, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -457,7 +457,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0014, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -481,7 +481,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0015, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -490,7 +490,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0015, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -514,7 +514,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0016, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -523,7 +523,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0016, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -547,7 +547,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0017, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -556,7 +556,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0017, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -580,7 +580,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0018, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -589,7 +589,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0018, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -613,7 +613,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0019, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -622,7 +622,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0019, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -646,7 +646,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0020, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -655,7 +655,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0020, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -679,7 +679,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0021, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -688,7 +688,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0021, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -712,7 +712,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0022, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -721,7 +721,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0022, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -745,7 +745,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0023, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -754,7 +754,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0023, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -778,7 +778,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0024, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -787,7 +787,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0024, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -811,7 +811,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0025, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -820,7 +820,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0025, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -844,7 +844,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0026, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -853,7 +853,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0026, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -877,7 +877,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0027, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -886,7 +886,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0027, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -910,7 +910,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0028, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -919,7 +919,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0028, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -943,7 +943,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0029, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -952,7 +952,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0029, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -976,7 +976,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0030, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -985,7 +985,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0030, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -1009,7 +1009,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0031, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -1018,7 +1018,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0031, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}
@ -1042,7 +1042,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0032, TestSize.Level1)
* @tc.steps: step2. call CheckAutoSave.
* @tc.expected: return true
*/
pattern_->lastAutoFillPasswordTextValue_ = "a";
pattern_->lastAutoFillTextValue_ = "a";
EXPECT_TRUE(pattern_->CheckAutoSave());
FlushLayoutTask(frameNode_);
GetFocus();
@ -1051,7 +1051,7 @@ HWTEST_F(TextInputCheckTest, CheckAutoSave0032, TestSize.Level1)
* @tc.steps: step3. set PasswordTextValue eq textValue and call CheckAutoSave.
* @tc.expected: return false
*/
pattern_->lastAutoFillPasswordTextValue_ = "abcdefghijklmnopqrstuvwxyz";
pattern_->lastAutoFillTextValue_ = "abcdefghijklmnopqrstuvwxyz";
EXPECT_FALSE(pattern_->CheckAutoSave());
}