From 513583830d9b40faa723c9879eca3cebe324b93e Mon Sep 17 00:00:00 2001 From: niushuo Date: Mon, 25 Aug 2025 10:24:10 +0800 Subject: [PATCH] =?UTF-8?q?menu=E7=9A=84TDD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: niushuo --- .../unittest/core/pattern/menu/menu_origin_test_ng.cpp | 8 ++++---- .../pattern/menu/menuitem_pattern_basic_test_ng.cpp | 10 +++++----- test/unittest/core/pattern/menu/menuitem_test_ng.cpp | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/unittest/core/pattern/menu/menu_origin_test_ng.cpp b/test/unittest/core/pattern/menu/menu_origin_test_ng.cpp index e6e6a67d517..1621658ddab 100644 --- a/test/unittest/core/pattern/menu/menu_origin_test_ng.cpp +++ b/test/unittest/core/pattern/menu/menu_origin_test_ng.cpp @@ -335,7 +335,7 @@ HWTEST_F(MenuTestNg, PerformActionTest001, TestSize.Level1) ASSERT_NE(frameNode, nullptr); auto menuItemPattern = frameNode->GetPattern(); ASSERT_NE(menuItemPattern, nullptr); - auto menuItemEventHub = frameNode->GetEventHub(); + auto menuItemEventHub = frameNode->GetOrCreateEventHub(); ASSERT_NE(menuItemEventHub, nullptr); auto menuItemAccessibilityProperty = frameNode->GetAccessibilityProperty(); ASSERT_NE(menuItemAccessibilityProperty, nullptr); @@ -405,7 +405,7 @@ HWTEST_F(MenuTestNg, MenuAccessibilityEventTestNg001, TestSize.Level1) */ int testIndex = SELECTED_INDEX; auto selectFunc = [optionPattern, testIndex](int index) { optionPattern->index_ = testIndex; }; - auto optionEventHub = frameNode->GetEventHub(); + auto optionEventHub = frameNode->GetOrCreateEventHub(); optionEventHub->SetOnSelect(selectFunc); optionPattern->RegisterOnClick(); @@ -1798,7 +1798,7 @@ HWTEST_F(MenuTestNg, MenuViewTestNg007, TestSize.Level1) ASSERT_NE(previewNode, nullptr); menuNode->MountToParent(menuWrapperNode); previewNode->MountToParent(menuWrapperNode); - auto previewEventHub = previewNode->GetEventHub(); + auto previewEventHub = previewNode->GetOrCreateEventHub(); ASSERT_NE(previewEventHub, nullptr); auto previewGestureEventHub = previewEventHub->GetOrCreateGestureEventHub(); ASSERT_NE(previewGestureEventHub, nullptr); @@ -1809,7 +1809,7 @@ HWTEST_F(MenuTestNg, MenuViewTestNg007, TestSize.Level1) */ auto menuPreviewPattern = previewNode->GetPattern(); ASSERT_NE(menuPreviewPattern, nullptr); - auto hub = previewNode->GetEventHub(); + auto hub = previewNode->GetOrCreateEventHub(); ASSERT_NE(hub, nullptr); auto gestureHub = hub->GetOrCreateGestureEventHub(); menuPreviewPattern->InitPanEvent(gestureHub); diff --git a/test/unittest/core/pattern/menu/menuitem_pattern_basic_test_ng.cpp b/test/unittest/core/pattern/menu/menuitem_pattern_basic_test_ng.cpp index 2c1f9a845c6..632d9c93075 100644 --- a/test/unittest/core/pattern/menu/menuitem_pattern_basic_test_ng.cpp +++ b/test/unittest/core/pattern/menu/menuitem_pattern_basic_test_ng.cpp @@ -681,7 +681,7 @@ HWTEST_F(MenuItemPatternBasicTestNg, UpdateText003, TestSize.Level1) ASSERT_NE(itemNode, nullptr); auto itemPattern = itemNode->GetPattern(); ASSERT_NE(itemPattern, nullptr); - auto itemEventHub = itemNode->GetEventHub(); + auto itemEventHub = itemNode->GetOrCreateEventHub(); ASSERT_NE(itemEventHub, nullptr); itemEventHub->SetEnabled(false); // update item @@ -762,7 +762,7 @@ HWTEST_F(MenuItemPatternBasicTestNg, UpdateText005, TestSize.Level1) ASSERT_NE(itemNode, nullptr); auto itemPattern = itemNode->GetPattern(); ASSERT_NE(itemPattern, nullptr); - auto itemEventHub = itemNode->GetEventHub(); + auto itemEventHub = itemNode->GetOrCreateEventHub(); ASSERT_NE(itemEventHub, nullptr); itemEventHub->SetEnabled(false); // update item @@ -1085,7 +1085,7 @@ HWTEST_F(MenuItemPatternBasicTestNg, MenuItemPatternBasicTestNg019, TestSize.Lev ASSERT_NE(frameNode, nullptr); auto menuItemPattern = frameNode->GetPattern(); ASSERT_NE(menuItemPattern, nullptr); - auto menuItemEventHub = frameNode->GetEventHub(); + auto menuItemEventHub = frameNode->GetOrCreateEventHub(); ASSERT_NE(menuItemEventHub, nullptr); bool isSelected = true; @@ -1132,7 +1132,7 @@ HWTEST_F(MenuItemPatternBasicTestNg, MenuItemPatternBasicTestNg022, TestSize.Lev ASSERT_NE(frameNode, nullptr); auto menuItemPattern = frameNode->GetPattern(); ASSERT_NE(menuItemPattern, nullptr); - auto menuItemEventHub = frameNode->GetEventHub(); + auto menuItemEventHub = frameNode->GetOrCreateEventHub(); ASSERT_NE(menuItemEventHub, nullptr); menuItemPattern->onClickAIMenuItem_ = []() { @@ -1199,7 +1199,7 @@ HWTEST_F(MenuItemPatternBasicTestNg, MenuItemPatternBasicTestNg029, TestSize.Lev ASSERT_NE(frameNode, nullptr); auto menuItemPattern = frameNode->GetPattern(); ASSERT_NE(menuItemPattern, nullptr); - auto menuItemEventHub = frameNode->GetEventHub(); + auto menuItemEventHub = frameNode->GetOrCreateEventHub(); ASSERT_NE(menuItemEventHub, nullptr); menuItemPattern->OnClick(); ASSERT_TRUE(menuItemPattern->IsSelected()); diff --git a/test/unittest/core/pattern/menu/menuitem_test_ng.cpp b/test/unittest/core/pattern/menu/menuitem_test_ng.cpp index ea1ecebbc8a..d331b010d87 100644 --- a/test/unittest/core/pattern/menu/menuitem_test_ng.cpp +++ b/test/unittest/core/pattern/menu/menuitem_test_ng.cpp @@ -992,7 +992,7 @@ HWTEST_F(MenuItemTestNg, MenuItemEventTest001, TestSize.Level1) menuitem.Create(itemOption); auto frameNode = ViewStackProcessor::GetInstance()->GetMainFrameNode(); ASSERT_NE(frameNode, nullptr); - auto eventHub = frameNode->GetEventHub(); + auto eventHub = frameNode->GetOrCreateEventHub(); ASSERT_NE(eventHub, nullptr); menuitem.SetOnChange(frameNode, [](bool onChange) {}); EXPECT_NE(eventHub->onChange_, nullptr); -- Gitee