!48596 fix:datepicker tdd 优化

Merge pull request !48596 from Zhang Jinyu/date_picker_tdd
This commit is contained in:
openharmony_ci 2024-11-15 09:37:29 +00:00 committed by Gitee
commit cea8f5af05
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 10 additions and 4 deletions

View File

@ -953,6 +953,8 @@ HWTEST_F(DatePickerTestFour, DatePickerPatternTest111, TestSize.Level1)
datePickerPattern->isFiredDateChange_ = false;
datePickerPattern->showMonthDays_ = true;
datePickerPattern->OnModifyDone();
auto children = buttonConfirmNode->GetChildren();
EXPECT_EQ(children.size(), 1);
}
/**

View File

@ -1335,9 +1335,11 @@ HWTEST_F(DatePickerTestNgAdd, DatePickerDialogViewShow0049, TestSize.Level1)
MockContainer::Current()->SetApiTargetVersion(setApiVersion);
auto dialogViewNode =
DatePickerDialogView::CreateNextPrevButtonNode(timePickerSwitchEvent, dateNode, buttonInfos, columnNode);
ASSERT_NE(dialogNode, nullptr);
MockContainer::Current()->SetApiTargetVersion(rollbackApiVersion);
dialogViewNode =
DatePickerDialogView::CreateNextPrevButtonNode(timePickerSwitchEvent, dateNode, buttonInfos, columnNode);
ASSERT_NE(dialogNode, nullptr);
}
} // namespace OHOS::Ace::NG

View File

@ -588,9 +588,10 @@ HWTEST_F(DatePickerTestThree, DatePickerPaintTest001, TestSize.Level1)
ASSERT_NE(geometryNode, nullptr);
auto renderContext = frameNode->GetRenderContext();
ASSERT_NE(renderContext, nullptr);
PaintWrapper* paintWrapper = new PaintWrapper(renderContext, geometryNode, pickerPaintProperty);
std::unique_ptr<PaintWrapper> paintWrapper =
std::make_unique<PaintWrapper>(renderContext, geometryNode, pickerPaintProperty);
ASSERT_NE(paintWrapper, nullptr);
auto canvasDrawFunction = datePickerPaintMethod->GetForegroundDrawFunction(paintWrapper);
auto canvasDrawFunction = datePickerPaintMethod->GetForegroundDrawFunction(paintWrapper.get());
Testing::MockCanvas rsCanvas;
EXPECT_CALL(rsCanvas, AttachBrush(_)).WillRepeatedly(ReturnRef(rsCanvas));
EXPECT_CALL(rsCanvas, DetachBrush()).WillRepeatedly(ReturnRef(rsCanvas));
@ -622,9 +623,10 @@ HWTEST_F(DatePickerTestThree, DatePickerPaintTest002, TestSize.Level1)
ASSERT_NE(geometryNode, nullptr);
auto renderContext = frameNode->GetRenderContext();
ASSERT_NE(renderContext, nullptr);
PaintWrapper* paintWrapper = new PaintWrapper(renderContext, geometryNode, pickerPaintProperty);
std::unique_ptr<PaintWrapper> paintWrapper =
std::make_unique<PaintWrapper>(renderContext, geometryNode, pickerPaintProperty);
ASSERT_NE(paintWrapper, nullptr);
auto canvasDrawFunction = datePickerPaintMethod->GetForegroundDrawFunction(paintWrapper);
auto canvasDrawFunction = datePickerPaintMethod->GetForegroundDrawFunction(paintWrapper.get());
Testing::MockCanvas rsCanvas;
EXPECT_CALL(rsCanvas, AttachPen(_)).WillRepeatedly(ReturnRef(rsCanvas));
EXPECT_CALL(rsCanvas, AttachBrush(_)).WillRepeatedly(ReturnRef(rsCanvas));