Part2: fix ace unittest cases

Signed-off-by: liyujie <liyujie43@huawei.com>
Change-Id: I3c9d341965d2d7c3b6ec80dddbe591a9e651a9aa
This commit is contained in:
liyujie 2023-09-28 20:18:49 +08:00
parent 45721fd16a
commit 14c132e6ae
204 changed files with 2521 additions and 7183 deletions

View File

@ -219,7 +219,7 @@ std::string SystemProperties::releaseType_ = INVALID_PARAM;
std::string SystemProperties::paramDeviceType_ = INVALID_PARAM;
int32_t SystemProperties::mcc_ = MCC_UNDEFINED;
int32_t SystemProperties::mnc_ = MNC_UNDEFINED;
ColorMode SystemProperties::colorMode_ { ColorMode::LIGHT };
ACE_WEAK_SYM ColorMode SystemProperties::colorMode_ { ColorMode::LIGHT };
ScreenShape SystemProperties::screenShape_ { ScreenShape::NOT_ROUND };
LongScreenType SystemProperties::LongScreen_ { LongScreenType::NOT_LONG };
bool SystemProperties::unZipHap_ = true;

View File

@ -28,6 +28,7 @@ double SystemProperties::resolution_ = 0.0;
constexpr float defaultAnimationScale = 1.0f;
bool SystemProperties::extSurfaceEnabled_ = false;
uint32_t SystemProperties::dumpFrameCount_ = 0;
ColorMode SystemProperties::colorMode_ { ColorMode::LIGHT };
int32_t AceChecker::pageNodes_ = 0;
int32_t AceChecker::pageDepth_ = 0;

View File

@ -66,7 +66,7 @@ const std::string TRANSFORM_TEST = ""
" { "
" \"transform\": { "
" \"translate\": \"50\", "
" \"rotate\": \"0\" , "
" \"rotate\": \"0\", "
" \"scale\": \"1\" "
" } "
" }, "

View File

@ -369,11 +369,6 @@ template("ace_core_source_set") {
"$ace_root/frameworks/core/components/wrap:ace_core_components_wrap_$platform",
]
if (defined(config.model_component_support) &&
config.model_component_support) {
deps += [ "$ace_root/frameworks/core/components_ng/pattern:ace_core_components_pattern_model_component_ng_$platform" ]
}
deps += [
"$ace_root/frameworks/core/components_v2/common:ace_core_components_common_v2_$platform",
"$ace_root/frameworks/core/components_v2/foreach:ace_core_components_foreach_v2_$platform",
@ -404,9 +399,23 @@ template("ace_core_source_set") {
"$ace_root/frameworks/core/components_ng/svg:ace_core_components_svg_ng_$platform",
"$ace_root/frameworks/core/components_ng/syntax:ace_core_components_syntax_ng_$platform",
]
deps += [
"$ace_root/frameworks/core/components_ng/pattern/patternlock:ace_core_components_patternlock_pattern_ng_$platform",
"$ace_root/frameworks/core/components_ng/pattern/qrcode:ace_core_components_qrcode_pattern_ng_$platform",
"$ace_root/frameworks/core/components_ng/pattern/rich_editor:ace_core_components_rich_editor_pattern_ng_$platform",
"$ace_root/frameworks/core/components_ng/pattern/security_component:ace_core_components_security_component_pattern_ng_$platform",
"$ace_root/frameworks/core/components_ng/pattern/text_field:ace_core_components_text_field_pattern_ng_$platform",
]
if (defined(config.model_component_support) &&
config.model_component_support) {
deps += [ "$ace_root/frameworks/core/components_ng/pattern/model:ace_core_components_model_pattern_ng_$platform" ]
}
if (defined(config.enable_ability_component) &&
config.enable_ability_component) {
deps += [ "$ace_root/frameworks/core/components_ng/pattern:ace_core_components_pattern_ability_component_ng_$platform" ]
deps += [ "$ace_root/frameworks/core/components_ng/pattern/ability_component:ace_core_components_ability_component_pattern_ng_$platform" ]
}
if (defined(config.enable_image_compression) &&
config.enable_image_compression) {
@ -461,14 +470,6 @@ template("ace_core_source_set") {
deps += [ "$ace_root/frameworks/core/components/text_overlay:ace_core_components_text_overlay_$platform" ]
}
deps += [
"$ace_root/frameworks/core/components_ng/pattern/patternlock:ace_core_components_patternlock_pattern_ng_$platform",
"$ace_root/frameworks/core/components_ng/pattern/qrcode:ace_core_components_qrcode_pattern_ng_$platform",
"$ace_root/frameworks/core/components_ng/pattern/text_field:ace_core_components_text_field_pattern_ng_$platform",
]
deps += [ "$ace_root/frameworks/core/components_ng/pattern/security_component:ace_core_components_security_component_pattern_ng_$platform" ]
# xcomponent components supports phone, TV and wearable except PC Preview
if (defined(config.xcomponent_components_support) &&
config.xcomponent_components_support) {
@ -861,6 +862,7 @@ template("ace_core_ng_source_set") {
"$ace_root/frameworks/core/components_ng/layout:ace_core_components_layout_ng_$platform",
"$ace_root/frameworks/core/components_ng/manager:ace_core_components_manager_ng_$platform",
"$ace_root/frameworks/core/components_ng/pattern:ace_core_components_pattern_ng_$platform",
"$ace_root/frameworks/core/components_ng/pattern/rich_editor:ace_core_components_rich_editor_pattern_ng_$platform",
"$ace_root/frameworks/core/components_ng/pattern/text_field:ace_core_components_text_field_pattern_ng_$platform",
"$ace_root/frameworks/core/components_ng/property:ace_core_components_property_ng_$platform",
"$ace_root/frameworks/core/components_ng/render:ace_core_components_render_ng_$platform",
@ -882,7 +884,7 @@ template("ace_core_ng_source_set") {
if (defined(config.enable_ability_component) &&
config.enable_ability_component) {
deps += [ "$ace_root/frameworks/core/components_ng/pattern:ace_core_components_pattern_ability_component_ng_$platform" ]
deps += [ "$ace_root/frameworks/core/components_ng/pattern/ability_component:ace_core_components_ability_component_pattern_ng_$platform" ]
}
if (defined(config.web_components_support) &&
config.web_components_support) {
@ -988,7 +990,7 @@ template("ace_core_ng_source_set") {
config.model_component_support) {
deps += [
"$ace_root/frameworks/core/components/scene_viewer:ace_core_components_scene_viewer_$platform",
"$ace_root/frameworks/core/components_ng/pattern:ace_core_components_pattern_model_component_ng_$platform",
"$ace_root/frameworks/core/components_ng/pattern/model:ace_core_components_model_pattern_ng_$platform",
]
}

View File

@ -42,7 +42,7 @@ ohos_unittest("AnimationTest") {
"$ace_root/frameworks/core/animation/spring_animation.cpp",
"$ace_root/frameworks/core/animation/spring_model.cpp",
"$ace_root/frameworks/core/animation/spring_motion.cpp",
"$ace_root/test/mock/frameworks/base/log/mock_jank_frame_report.cpp",
"$ace_root/test/mock/base/mock_jank_frame_report.cpp",
# common
"$ace_root/frameworks/core/common/ace_application_info.cpp",

View File

@ -45,7 +45,7 @@ ohos_unittest("SpringChainTest") {
"$ace_root/frameworks/core/animation/spring_animation.cpp",
"$ace_root/frameworks/core/animation/spring_model.cpp",
"$ace_root/frameworks/core/animation/spring_motion.cpp",
"$ace_root/test/mock/frameworks/base/log/mock_jank_frame_report.cpp",
"$ace_root/test/mock/base/mock_jank_frame_report.cpp",
# common
"$ace_root/frameworks/core/common/ace_application_info.cpp",

View File

@ -44,7 +44,7 @@ ohos_unittest("SvgAnimateTest") {
"$ace_root/frameworks/core/animation/spring_model.cpp",
"$ace_root/frameworks/core/animation/spring_motion.cpp",
"$ace_root/frameworks/core/animation/svg_animate.cpp",
"$ace_root/test/mock/frameworks/base/log/mock_jank_frame_report.cpp",
"$ace_root/test/mock/base/mock_jank_frame_report.cpp",
# common
"$ace_root/frameworks/core/common/ace_application_info.cpp",

View File

@ -70,7 +70,7 @@ ohos_unittest("CheckableComponentTest") {
"$ace_root/frameworks/core/animation/curves.cpp",
"$ace_root/frameworks/core/animation/property_animation.cpp",
"$ace_root/frameworks/core/animation/scheduler.cpp",
"$ace_root/test/mock/frameworks/base/log/mock_jank_frame_report.cpp",
"$ace_root/test/mock/base/mock_jank_frame_report.cpp",
#base
"$ace_root/adapter/ohos/osal/log_wrapper.cpp",

View File

@ -42,7 +42,7 @@ ohos_unittest("ClockComponentTest") {
"$ace_root/frameworks/core/animation/cubic_curve.cpp",
"$ace_root/frameworks/core/animation/curves.cpp",
"$ace_root/frameworks/core/animation/scheduler.cpp",
"$ace_root/test/mock/frameworks/base/log/mock_jank_frame_report.cpp",
"$ace_root/test/mock/base/mock_jank_frame_report.cpp",
# common
"$ace_root/frameworks/core/common/ace_application_info.cpp",

View File

@ -146,7 +146,7 @@ ohos_unittest("RenderImageTest") {
"$ace_root/frameworks/core/animation/curves.cpp",
"$ace_root/frameworks/core/animation/scheduler.cpp",
"$ace_root/frameworks/core/focus/focus_node.cpp",
"$ace_root/test/mock/frameworks/base/log/mock_jank_frame_report.cpp",
"$ace_root/test/mock/base/mock_jank_frame_report.cpp",
# others
"$ace_root/frameworks/core/components/common/painter/flutter_svg_painter.cpp",

View File

@ -46,7 +46,7 @@ ohos_unittest("ImageAnimatorElementTest") {
"$ace_root/frameworks/core/animation/spring_animation.cpp",
"$ace_root/frameworks/core/animation/spring_model.cpp",
"$ace_root/frameworks/core/animation/spring_motion.cpp",
"$ace_root/test/mock/frameworks/base/log/mock_jank_frame_report.cpp",
"$ace_root/test/mock/base/mock_jank_frame_report.cpp",
# common
"$ace_root/frameworks/core/common/ace_application_info.cpp",

View File

@ -66,7 +66,7 @@ ohos_unittest("RenderMarqueeTest") {
"$ace_root/frameworks/core/animation/curves.cpp",
"$ace_root/frameworks/core/animation/property_animation.cpp",
"$ace_root/frameworks/core/animation/scheduler.cpp",
"$ace_root/test/mock/frameworks/base/log/mock_jank_frame_report.cpp",
"$ace_root/test/mock/base/mock_jank_frame_report.cpp",
# base
"$ace_root/adapter/ohos/osal/log_wrapper.cpp",

View File

@ -38,7 +38,7 @@ ohos_unittest("RenderSemiModalTest") {
"$ace_root/frameworks/core/animation/spring_animation.cpp",
"$ace_root/frameworks/core/animation/spring_model.cpp",
"$ace_root/frameworks/core/animation/spring_motion.cpp",
"$ace_root/test/mock/frameworks/base/log/mock_jank_frame_report.cpp",
"$ace_root/test/mock/base/mock_jank_frame_report.cpp",
# base
"$ace_root/adapter/ohos/osal/log_wrapper.cpp",

View File

@ -69,7 +69,7 @@ ohos_unittest("SwiperComponentTest") {
"$ace_root/frameworks/core/animation/scroll_motion.cpp",
"$ace_root/frameworks/core/animation/spring_model.cpp",
"$ace_root/frameworks/core/animation/spring_motion.cpp",
"$ace_root/test/mock/frameworks/base/log/mock_jank_frame_report.cpp",
"$ace_root/test/mock/base/mock_jank_frame_report.cpp",
# common
"$ace_root/frameworks/core/common/ace_application_info.cpp",

View File

@ -53,7 +53,7 @@ ohos_unittest("ThemeManagerTest") {
"$ace_root/frameworks/core/animation/cubic_curve.cpp",
"$ace_root/frameworks/core/animation/curves.cpp",
"$ace_root/frameworks/core/animation/scheduler.cpp",
"$ace_root/test/mock/frameworks/base/log/mock_jank_frame_report.cpp",
"$ace_root/test/mock/base/mock_jank_frame_report.cpp",
# common
"$ace_root/frameworks/core/common/ace_application_info.cpp",
@ -161,7 +161,7 @@ ohos_unittest("ThemeConstantsTest") {
"$ace_root/frameworks/core/animation/cubic_curve.cpp",
"$ace_root/frameworks/core/animation/curves.cpp",
"$ace_root/frameworks/core/animation/scheduler.cpp",
"$ace_root/test/mock/frameworks/base/log/mock_jank_frame_report.cpp",
"$ace_root/test/mock/base/mock_jank_frame_report.cpp",
# common
"$ace_root/frameworks/base/geometry/animatable_dimension.cpp",

View File

@ -37,7 +37,7 @@ common_module_files = [
"$ace_root/frameworks/core/accessibility/accessibility_node.cpp",
# animation
"$ace_root/test/mock/frameworks/base/log/mock_jank_frame_report.cpp",
"$ace_root/test/mock/base/mock_jank_frame_report.cpp",
"$ace_root/frameworks/core/animation/animatable_data.cpp",
"$ace_root/frameworks/core/animation/animatable_properties.cpp",
"$ace_root/frameworks/core/animation/animator.cpp",

View File

@ -46,7 +46,7 @@ ohos_unittest("TweenElementTest") {
"$ace_root/frameworks/core/animation/spring_animation.cpp",
"$ace_root/frameworks/core/animation/spring_model.cpp",
"$ace_root/frameworks/core/animation/spring_motion.cpp",
"$ace_root/test/mock/frameworks/base/log/mock_jank_frame_report.cpp",
"$ace_root/test/mock/base/mock_jank_frame_report.cpp",
# base
"$ace_root/adapter/ohos/osal/log_wrapper.cpp",

View File

@ -33,7 +33,6 @@ build_component_ng("base_ng") {
"event_ng",
"layout_ng",
"manager_ng",
"pattern_ability_component_ng",
"pattern_ng",
"property_ng",
"render_ng",

View File

@ -299,16 +299,6 @@ build_component_ng("pattern_ng") {
"relative_container/relative_container_layout_algorithm.cpp",
"relative_container/relative_container_view.cpp",
"rendering_context/rendering_context_model_ng.cpp",
"rich_editor/paragraph_manager.cpp",
"rich_editor/rich_editor_content_modifier.cpp",
"rich_editor/rich_editor_controller.cpp",
"rich_editor/rich_editor_event_hub.cpp",
"rich_editor/rich_editor_layout_algorithm.cpp",
"rich_editor/rich_editor_layout_property.cpp",
"rich_editor/rich_editor_model_ng.cpp",
"rich_editor/rich_editor_overlay_modifier.cpp",
"rich_editor/rich_editor_paint_method.cpp",
"rich_editor/rich_editor_pattern.cpp",
"rich_editor_drag/rich_editor_drag_overlay_modifier.cpp",
"rich_editor_drag/rich_editor_drag_pattern.cpp",
"root/root_layout_algorithm.cpp",
@ -494,11 +484,6 @@ build_component_ng("pattern_ng") {
"xcomponent/xcomponent_pattern.cpp",
]
standard_input_deps = [
"hilog:libhilog",
"imf:inputmethod_client",
"input:libmmi-client",
]
if (defined(vendor_configs.ace_engine_advanced)) {
sources += vendor_configs.ace_engine_advanced_pattern
}
@ -509,37 +494,3 @@ build_component_ng("pattern_ng") {
deps = [ "$ace_graphic/rosen/modules/render_service_client:librender_service_client_static" ]
}
}
build_component_ng("pattern_ability_component_ng") {
sources = [
"ability_component/ability_component_layout_algorithm.cpp",
"ability_component/ability_component_model_ng.cpp",
"ability_component/ability_component_pattern.cpp",
]
external_deps = [
"ability_runtime:abilitykit_native",
"input:libmmi-client",
"napi:ace_napi",
"window_manager:scene_session",
"window_manager:scene_session_manager",
]
part_name = ace_engine_part
subsystem_name = ace_engine_subsystem
}
build_component_ng("pattern_model_component_ng") {
sources = [
"model/model_adapter_wrapper.cpp",
"model/model_layout_algorithm.cpp",
"model/model_paint_method.cpp",
"model/model_pattern.cpp",
"model/model_touch_handler.cpp",
"model/model_view_ng.cpp",
]
if (is_ohos_standard_system) {
external_deps = [ "graphic_2d:librender_service_client" ]
}
}

View File

@ -0,0 +1,33 @@
# Copyright (c) 2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import("../../components.gni")
build_component_ng("ability_component_pattern_ng") {
sources = [
"ability_component_layout_algorithm.cpp",
"ability_component_model_ng.cpp",
"ability_component_pattern.cpp",
]
external_deps = [
"ability_runtime:abilitykit_native",
"input:libmmi-client",
"napi:ace_napi",
"window_manager:scene_session",
"window_manager:scene_session_manager",
]
part_name = ace_engine_part
subsystem_name = ace_engine_subsystem
}

View File

@ -0,0 +1,29 @@
# Copyright (c) 2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import("../../components.gni")
build_component_ng("model_pattern_ng") {
sources = [
"model_adapter_wrapper.cpp",
"model_layout_algorithm.cpp",
"model_paint_method.cpp",
"model_pattern.cpp",
"model_touch_handler.cpp",
"model_view_ng.cpp",
]
if (is_ohos_standard_system) {
external_deps = [ "graphic_2d:librender_service_client" ]
}
}

View File

@ -22,7 +22,6 @@
#include "base/utils/measure_util.h"
#include "base/utils/utils.h"
#include "core/common/container.h"
#include "core/components/custom_paint/rosen_render_custom_paint.h"
#include "core/components_ng/base/frame_node.h"
#include "core/components_ng/pattern/navigation/nav_bar_node.h"
#include "core/components_ng/pattern/navigation/navigation_declaration.h"
@ -36,6 +35,9 @@
#include "core/components_ng/property/layout_constraint.h"
#include "core/components_ng/property/measure_property.h"
#include "core/components_ng/property/measure_utils.h"
#ifdef ENABLE_ROSEN_BACKEND
#include "core/components/custom_paint/rosen_render_custom_paint.h"
#endif
namespace OHOS::Ace::NG {

View File

@ -0,0 +1,35 @@
# Copyright (c) 2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import("../../components.gni")
build_component_ng("rich_editor_pattern_ng") {
sources = [
"paragraph_manager.cpp",
"rich_editor_content_modifier.cpp",
"rich_editor_controller.cpp",
"rich_editor_event_hub.cpp",
"rich_editor_layout_algorithm.cpp",
"rich_editor_layout_property.cpp",
"rich_editor_model_ng.cpp",
"rich_editor_overlay_modifier.cpp",
"rich_editor_paint_method.cpp",
"rich_editor_pattern.cpp",
]
standard_input_deps = [
"hilog:libhilog",
"imf:inputmethod_client",
"input:libmmi-client",
]
}

View File

@ -29,7 +29,6 @@
#include "core/components/common/layout/constants.h"
#include "core/components/common/properties/color.h"
#include "core/components/common/properties/shadow_config.h"
#include "core/components/custom_paint/rosen_render_custom_paint.h"
#include "core/components/text_overlay/text_overlay_theme.h"
#include "core/components_ng/base/frame_node.h"
#include "core/components_ng/base/view_stack_processor.h"
@ -47,6 +46,9 @@
#include "core/gestures/gesture_info.h"
#include "core/pipeline/base/element_register.h"
#include "core/pipeline_ng/pipeline_context.h"
#ifdef ENABLE_ROSEN_BACKEND
#include "core/components/custom_paint/rosen_render_custom_paint.h"
#endif
namespace OHOS::Ace::NG {
namespace {
@ -109,12 +111,12 @@ RefPtr<FrameNode> BuildButton(const std::string& data, const std::function<void(
auto top = CalcLength(padding.Top().ConvertToPx());
auto bottom = CalcLength(padding.Bottom().ConvertToPx());
buttonLayoutProperty->UpdatePadding({ left, right, top, bottom });
#ifdef ENABLE_ROSEN_BACKEND
MeasureContext content;
content.textContent = data;
content.fontSize = textStyle.GetFontSize();
auto fontweight = StringUtils::FontWeightToString(textStyle.GetFontWeight());
content.fontWeight = fontweight;
#ifdef ENABLE_ROSEN_BACKEND
buttonWidth = static_cast<float>(RosenRenderCustomPaint::MeasureTextSizeInner(content).Width());
#else
buttonWidth = 0.0f;
@ -179,13 +181,13 @@ RefPtr<FrameNode> BuildButton(
textLayoutProperty->UpdateFontWeight(textStyle.GetFontWeight());
text->MarkModifyDone();
#ifdef ENABLE_ROSEN_BACKEND
// Calculate the width of entension option include button padding.
MeasureContext content;
content.textContent = data;
content.fontSize = textStyle.GetFontSize();
auto fontweight = StringUtils::FontWeightToString(textStyle.GetFontWeight());
content.fontWeight = fontweight;
#ifdef ENABLE_ROSEN_BACKEND
contentWidth = static_cast<float>(RosenRenderCustomPaint::MeasureTextSizeInner(content).Width());
#else
contentWidth = 0.0f;

View File

@ -19,11 +19,6 @@
#include "base/geometry/ng/rect_t.h"
#include "base/utils/utils.h"
#ifndef USE_ROSEN_DRAWING
#include "core/components_ng/render/adapter/skia_decoration_painter.h"
#else
#include "core/components_ng/render/adapter/rosen/drawing_decoration_painter.h"
#endif
namespace OHOS::Ace::NG {
bool ShapeContainerPattern::OnDirtyLayoutWrapperSwap(

View File

@ -16,6 +16,7 @@
#include "core/components_ng/pattern/stage/stage_pattern.h"
#include "core/pipeline_ng/pipeline_context.h"
namespace OHOS::Ace::NG {
void StagePattern::OnAttachToFrameNode()
{

View File

@ -15,8 +15,6 @@
#include "core/components_ng/pattern/text_field/text_field_layout_algorithm.h"
#include "unicode/uchar.h"
#include "base/geometry/axis.h"
#include "base/geometry/dimension.h"
#include "base/geometry/ng/offset_t.h"
@ -28,9 +26,8 @@
#include "core/common/font_manager.h"
#include "core/components/common/layout/constants.h"
#include "core/components/scroll/scroll_bar_theme.h"
#include "core/components/text/text_theme.h"
#include "core/components/theme/theme_manager.h"
#include "core/components_ng/base/frame_node.h"
#include "core/components_ng/pattern/text/text_layout_adapter.h"
#include "core/components_ng/pattern/text/text_layout_property.h"
#include "core/components_ng/pattern/text_field/text_field_content_modifier.h"
#include "core/components_ng/pattern/text_field/text_field_layout_property.h"
@ -69,8 +66,8 @@ void TextFieldLayoutAlgorithm::Measure(LayoutWrapper* layoutWrapper)
// If width is not set, select the maximum value of minWidth and maxWidth to layoutConstraint
if (calcLayoutConstraint && calcLayoutConstraint->maxSize.has_value() &&
calcLayoutConstraint->maxSize.value().Width().has_value()) {
frameSize.SetHeight(std::min(layoutConstraint->maxSize.Width(),
contentWidth + pattern->GetHorizontalPaddingSum()));
frameSize.SetHeight(
std::min(layoutConstraint->maxSize.Width(), contentWidth + pattern->GetHorizontalPaddingSum()));
} else if (!calcLayoutConstraint) {
// If calcLayoutConstraint has not set, use the LayoutConstraint initial value
frameSize.SetWidth(contentWidth + pattern->GetHorizontalPaddingSum());
@ -86,8 +83,8 @@ void TextFieldLayoutAlgorithm::Measure(LayoutWrapper* layoutWrapper)
// Like width
if (calcLayoutConstraint && calcLayoutConstraint->maxSize.has_value() &&
calcLayoutConstraint->maxSize.value().Height().has_value()) {
frameSize.SetHeight(std::min(layoutConstraint->maxSize.Height(),
contentHeight + pattern->GetVerticalPaddingSum()));
frameSize.SetHeight(
std::min(layoutConstraint->maxSize.Height(), contentHeight + pattern->GetVerticalPaddingSum()));
} else if (!calcLayoutConstraint || NearZero(layoutConstraint->minSize.Height())) {
// calcLayoutConstraint initialized once when setting width, set minHeight=0,
// so add "minHeight=0" to the constraint.
@ -134,8 +131,7 @@ void TextFieldLayoutAlgorithm::Measure(LayoutWrapper* layoutWrapper)
auto height = contentHeight + pattern->GetVerticalPaddingSum() < defaultHeight
? defaultHeight
: contentHeight + pattern->GetVerticalPaddingSum();
frameSize.SetHeight(
std::min(layoutConstraint->maxSize.Height(), static_cast<float>(height)));
frameSize.SetHeight(std::min(layoutConstraint->maxSize.Height(), static_cast<float>(height)));
} else {
frameSize.SetHeight(layoutConstraint->minSize.Height());
}
@ -219,8 +215,8 @@ std::optional<SizeF> TextFieldLayoutAlgorithm::MeasureContent(
textStyle.SetTextOverflow(TextOverflow::ELLIPSIS);
}
} else {
UpdatePlaceholderTextStyle(frameNode, textFieldLayoutProperty, textFieldTheme,
textStyle, pattern->IsDisabled());
UpdatePlaceholderTextStyle(
frameNode, textFieldLayoutProperty, textFieldTheme, textStyle, pattern->IsDisabled());
textContent = textFieldLayoutProperty->GetPlaceholderValue("");
showPlaceHolder = true;
}
@ -638,8 +634,8 @@ void TextFieldLayoutAlgorithm::FontRegisterCallback(
}
}
void TextFieldLayoutAlgorithm::CreateParagraph(const TextStyle& textStyle, std::string content,
bool needObscureText, int32_t nakedCharPosition, bool disableTextAlign)
void TextFieldLayoutAlgorithm::CreateParagraph(const TextStyle& textStyle, std::string content, bool needObscureText,
int32_t nakedCharPosition, bool disableTextAlign)
{
RSParagraphStyle paraStyle;
#ifndef USE_GRAPHIC_TEXT_GINE
@ -856,12 +852,12 @@ TextDirection TextFieldLayoutAlgorithm::GetTextDirection(const std::string& cont
TextDirection textDirection = TextDirection::LTR;
auto showingTextForWString = StringUtils::ToWstring(content);
for (const auto& charOfShowingText : showingTextForWString) {
if (u_charDirection(charOfShowingText) == UCharDirection::U_LEFT_TO_RIGHT) {
textDirection = TextDirection::LTR;
} else if (u_charDirection(charOfShowingText) == UCharDirection::U_RIGHT_TO_LEFT) {
textDirection = TextDirection::RTL;
} else if (u_charDirection(charOfShowingText) == UCharDirection::U_RIGHT_TO_LEFT_ARABIC) {
textDirection = TextDirection::RTL;
if (TextLayoutadapter::IsLeftToRight(charOfShowingText)) {
return TextDirection::LTR;
}
if (TextLayoutadapter::IsRightToLeft(charOfShowingText) ||
TextLayoutadapter::IsRightTOLeftArabic(charOfShowingText)) {
return TextDirection::RTL;
}
}
return textDirection;

View File

@ -84,11 +84,6 @@ using RSScalar = float;
using RSPathFillType = Testing::TestingPathFillType;
using RSParagraph = Testing::TestingTypography;
using RSTypographyProperties = Testing::TestingTypographyProperties;
#ifdef USE_GRAPHIC_TEXT_GINE
using RSTextRectHeightStyle = Testing::TestingTypographyProperties::TextRectHeightStyle;
using RSTextRectWidthStyle = Testing::TestingTypographyProperties::TextRectWidthStyle;
using RSTextRect = Testing::TestingTypographyProperties::TextRect;
#endif
using RSParagraphStyle = Testing::TestingTypographyStyle;
using RSParagraphBuilder = Testing::TestingTypographyCreate;
using RSFontCollection = Testing::TestingFontCollection;
@ -100,5 +95,10 @@ using RSFontStyle = Testing::TestingFontStyle;
using RSTextBaseline = Testing::TestingTextBaseline;
using RSColorFilter = Testing::TestingColorFilter;
using RSColorMatrix = Testing::TestingColorMatrix;
#ifdef USE_GRAPHIC_TEXT_GINE
using RSTextRectHeightStyle = Testing::TestingTypographyProperties::TextRectHeightStyle;
using RSTextRectWidthStyle = Testing::TestingTypographyProperties::TextRectWidthStyle;
using RSTextRect = Testing::TestingTypographyProperties::TextRect;
#endif
} // namespace OHOS::Ace
#endif // FOUNDATION_ACE_FRAMEWORKS_CORE_COMPONENTS_NG_RENDER_DRAWING_MOCK_H

View File

@ -25,7 +25,6 @@ group("unittest") {
"manager:manager_unittest",
"pattern:pattern_unittest",
"property:property_unittest",
"render:render_unittest",
"svg:svg_unittest",
"syntax:syntax_unittest",
]

View File

@ -14,9 +14,6 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("geometry_transition_test_ng") {
sources = [
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"geometry_transition_test_ng.cpp",
]
type = "new"
sources = [ "geometry_transition_test_ng.cpp" ]
}

View File

@ -11,84 +11,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
import(
"//foundation/arkui/ace_engine/frameworks/core/components_ng/components.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("click_event_test_ng") {
module_out_path = event_test_output_path
sources = [
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/time_util.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/modifier.cpp",
"$ace_root/frameworks/core/components_ng/base/ui_node.cpp",
"$ace_root/frameworks/core/components_ng/event/click_event.cpp",
"$ace_root/frameworks/core/components_ng/event/event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/focus_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/gesture_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/state_style_manager.cpp",
"$ace_root/frameworks/core/components_ng/event/touch_event.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/multi_fingers_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_builder.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_node.cpp",
"$ace_root/frameworks/core/components_ng/manager/safe_area/safe_area_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/property/border_property.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_ng/property/property.cpp",
"$ace_root/frameworks/core/components_ng/property/safe_area_insets.cpp",
"$ace_root/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp",
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
# mock
"$ace_root/frameworks/base/test/mock/mock_system_properties.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_scrollable_event.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/animation/mock_geometry_transition.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_view_stack_processor.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_click_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_exclusive_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_gesture_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_parallel_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_recognizer_group.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context_creator.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_element_register.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"$ace_root/test/mock/core/common/mock_container.cpp",
# self
"click_event_test_ng.cpp",
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",
"//third_party/googletest:gmock_main",
]
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
include_dirs =
[ "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include" ]
ace_unittest("click_event_test_ng") {
module_output = "events"
type = "new"
sources = [ "click_event_test_ng.cpp" ]
}

View File

@ -1,4 +1,4 @@
# Copyright (c) 2022 Huawei Device Co., Ltd.
# Copyright (c) 2022-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@ -11,75 +11,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
import(
"//foundation/arkui/ace_engine/frameworks/core/components_ng/components.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("drag_event_test_ng") {
module_out_path = event_test_output_path
sources = [
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/utils/base_id.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/modifier.cpp",
"$ace_root/frameworks/core/components_ng/base/ui_node.cpp",
"$ace_root/frameworks/core/components_ng/event/drag_event.cpp",
"$ace_root/frameworks/core/components_ng/event/event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/focus_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/gesture_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/state_style_manager.cpp",
"$ace_root/frameworks/core/components_ng/event/touch_event.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/multi_fingers_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/manager/safe_area/safe_area_manager.cpp",
"$ace_root/frameworks/core/components_ng/property/border_property.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_ng/property/property.cpp",
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
# mock
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/animation/mock_geometry_transition.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_gesture_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_long_press_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_pan_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_recognizer_group.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_sequenced_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context_creator.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_element_register.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"$ace_root/test/mock/base/mock_frame_trace_adapter.cpp",
"$ace_root/test/mock/core/common/mock_container.cpp",
# self
"drag_event_test_ng.cpp",
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",
"//third_party/googletest:gmock_main",
]
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
include_dirs =
[ "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include" ]
ace_unittest("drag_event_test_ng") {
type = "new"
module_output = "events"
sources = [ "drag_event_test_ng.cpp" ]
}

View File

@ -11,82 +11,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
import(
"//foundation/arkui/ace_engine/frameworks/core/components_ng/components.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("event_hub_test_ng") {
module_out_path = event_test_output_path
sources = [
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/time_util.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/modifier.cpp",
"$ace_root/frameworks/core/components_ng/base/ui_node.cpp",
"$ace_root/frameworks/core/components_ng/event/event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/focus_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/gesture_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/state_style_manager.cpp",
"$ace_root/frameworks/core/components_ng/event/touch_event.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_builder.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_node.cpp",
"$ace_root/frameworks/core/components_ng/manager/safe_area/safe_area_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/property/border_property.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_ng/property/property.cpp",
"$ace_root/frameworks/core/components_ng/property/safe_area_insets.cpp",
"$ace_root/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp",
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
# mock
"$ace_root/frameworks/base/test/mock/mock_system_properties.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_scrollable_event.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/animation/mock_geometry_transition.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_view_stack_processor.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_exclusive_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_gesture_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_parallel_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_recognizer_group.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_sequenced_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context_creator.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_element_register.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"$ace_root/test/mock/core/common/mock_container.cpp",
# self
"event_hub_test_ng.cpp",
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",
"//third_party/googletest:gmock_main",
]
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
include_dirs =
[ "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include" ]
ace_unittest("event_hub_test_ng") {
type = "new"
module_output = "events"
sources = [ "event_hub_test_ng.cpp" ]
}

View File

@ -1,4 +1,4 @@
# Copyright (c) 2022 Huawei Device Co., Ltd.
# Copyright (c) 2022-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@ -11,81 +11,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("focus_hub_test_ng") {
module_out_path = event_test_output_path
sources = [
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/time_util.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/modifier.cpp",
"$ace_root/frameworks/core/components_ng/base/ui_node.cpp",
"$ace_root/frameworks/core/components_ng/event/event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/focus_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/gesture_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/state_style_manager.cpp",
"$ace_root/frameworks/core/components_ng/event/touch_event.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_builder.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_node.cpp",
"$ace_root/frameworks/core/components_ng/manager/safe_area/safe_area_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/property/border_property.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_ng/property/property.cpp",
"$ace_root/frameworks/core/components_ng/property/safe_area_insets.cpp",
"$ace_root/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp",
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
# mock
"$ace_root/frameworks/base/test/mock/mock_system_properties.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_scrollable_event.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/animation/mock_geometry_transition.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_stage_manager.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_view_stack_processor.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_exclusive_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_gesture_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_parallel_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_recognizer_group.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_sequenced_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/button/mock_button_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/button/mock_button_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/flex/mock_wrap_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context_creator.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_element_register.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"$ace_root/test/mock/core/common/mock_container.cpp",
# self
"focus_hub_test_ng.cpp",
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",
"//third_party/googletest:gmock_main",
]
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
ace_unittest("focus_hub_test_ng") {
type = "new"
module_output = "events"
sources = [ "focus_hub_test_ng.cpp" ]
}

View File

@ -11,88 +11,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("gesture_event_hub_test_ng") {
module_out_path = event_test_output_path
sources = [
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/geometry/least_square_impl.cpp",
"$ace_root/frameworks/base/geometry/matrix3.cpp",
"$ace_root/frameworks/base/geometry/matrix4.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/utils/time_util.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/modifier.cpp",
"$ace_root/frameworks/core/components_ng/event/event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/focus_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/gesture_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/state_style_manager.cpp",
"$ace_root/frameworks/core/components_ng/gestures/long_press_gesture.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/multi_fingers_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/tap_gesture.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_builder.cpp",
"$ace_root/frameworks/core/components_ng/manager/drag_drop/drag_drop_manager.cpp",
"$ace_root/frameworks/core/components_ng/manager/drag_drop/drag_drop_proxy.cpp",
"$ace_root/frameworks/core/components_ng/manager/safe_area/safe_area_manager.cpp",
"$ace_root/frameworks/core/components_ng/property/border_property.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_ng/property/property.cpp",
"$ace_root/frameworks/core/components_ng/property/safe_area_insets.cpp",
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
"$ace_root/frameworks/core/gestures/velocity_tracker.cpp",
# public mock
"$ace_root/frameworks/base/test/mock/mock_drag_window.cpp",
"$ace_root/frameworks/base/test/mock/mock_pixel_map.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_clipboard.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/animation/mock_geometry_transition.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_frame_node.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_ui_node.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_click_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_exclusive_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_gesture_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_long_press_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_parallel_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_recognizer_group.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/root/mock_root_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context_creator.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_element_register.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"$ace_root/test/mock/base/mock_frame_trace_adapter.cpp",
"$ace_root/test/mock/core/common/mock_container.cpp",
# self mock
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_click_event.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_drag_event.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_long_press_event.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_pan_event.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_scrollable_event.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_touch_event.cpp",
# self
"gesture_event_hub_test_ng.cpp",
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",
"//third_party/googletest:gmock_main",
]
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
ace_unittest("gesture_event_hub_test_ng") {
type = "new"
module_output = "events"
sources = [ "gesture_event_hub_test_ng.cpp" ]
}

View File

@ -39,13 +39,6 @@
using namespace testing;
using namespace testing::ext;
namespace OHOS::Ace {
bool OHOS::Ace::SystemProperties::GetDebugEnabled()
{
return false;
}
} // namespace OHOS::Ace
namespace OHOS::Ace::NG {
namespace {
const std::string NODE_TAG("node");

View File

@ -13,72 +13,8 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("input_event_hub_test_ng") {
module_out_path = event_test_output_path
sources = [
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/time_util.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/modifier.cpp",
"$ace_root/frameworks/core/components_ng/base/ui_node.cpp",
"$ace_root/frameworks/core/components_ng/event/event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/focus_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/gesture_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/state_style_manager.cpp",
"$ace_root/frameworks/core/components_ng/event/touch_event.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_builder.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_node.cpp",
"$ace_root/frameworks/core/components_ng/manager/safe_area/safe_area_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/property/border_property.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_ng/property/property.cpp",
"$ace_root/frameworks/core/components_ng/property/safe_area_insets.cpp",
"$ace_root/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp",
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
# mock
"$ace_root/frameworks/base/test/mock/mock_system_properties.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_scrollable_event.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/animation/mock_geometry_transition.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_view_stack_processor.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_exclusive_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_gesture_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_parallel_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_recognizer_group.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context_creator.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_element_register.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"$ace_root/test/mock/core/common/mock_container.cpp",
# self
"input_event_hub_test_ng.cpp",
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",
"//third_party/googletest:gmock_main",
]
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
ace_unittest("input_event_hub_test_ng") {
type = "new"
module_output = "events"
sources = [ "input_event_hub_test_ng.cpp" ]
}

View File

@ -13,76 +13,8 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("long_press_event_test_ng") {
module_out_path = event_test_output_path
sources = [
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/time_util.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/modifier.cpp",
"$ace_root/frameworks/core/components_ng/base/ui_node.cpp",
"$ace_root/frameworks/core/components_ng/event/event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/focus_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/gesture_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/long_press_event.cpp",
"$ace_root/frameworks/core/components_ng/event/state_style_manager.cpp",
"$ace_root/frameworks/core/components_ng/event/touch_event.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/multi_fingers_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_builder.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_node.cpp",
"$ace_root/frameworks/core/components_ng/manager/safe_area/safe_area_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/property/border_property.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_ng/property/property.cpp",
"$ace_root/frameworks/core/components_ng/property/safe_area_insets.cpp",
"$ace_root/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp",
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
# mock
"$ace_root/frameworks/base/test/mock/mock_system_properties.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_scrollable_event.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/animation/mock_geometry_transition.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_view_stack_processor.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_exclusive_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_gesture_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_long_press_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_parallel_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_recognizer_group.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context_creator.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_element_register.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"$ace_root/test/mock/base/mock_frame_trace_adapter.cpp",
"$ace_root/test/mock/core/common/mock_container.cpp",
# self
"long_press_event_test_ng.cpp",
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",
"//third_party/googletest:gmock_main",
]
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
ace_unittest("long_press_event_test_ng") {
module_output = "events"
type = "new"
sources = [ "long_press_event_test_ng.cpp" ]
}

View File

@ -11,85 +11,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
import(
"//foundation/arkui/ace_engine/frameworks/core/components_ng/components.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("pan_event_test_ng") {
module_out_path = event_test_output_path
sources = [
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/utils/base_id.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/time_util.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/modifier.cpp",
"$ace_root/frameworks/core/components_ng/base/ui_node.cpp",
"$ace_root/frameworks/core/components_ng/event/event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/focus_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/gesture_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/pan_event.cpp",
"$ace_root/frameworks/core/components_ng/event/state_style_manager.cpp",
"$ace_root/frameworks/core/components_ng/event/touch_event.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/multi_fingers_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_builder.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_node.cpp",
"$ace_root/frameworks/core/components_ng/manager/safe_area/safe_area_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/property/border_property.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_ng/property/property.cpp",
"$ace_root/frameworks/core/components_ng/property/safe_area_insets.cpp",
"$ace_root/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp",
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
# mock
"$ace_root/frameworks/base/test/mock/mock_system_properties.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_scrollable_event.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/animation/mock_geometry_transition.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_view_stack_processor.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_exclusive_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_gesture_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_pan_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_parallel_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_recognizer_group.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context_creator.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_element_register.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"$ace_root/test/mock/core/common/mock_container.cpp",
# self
"pan_event_test_ng.cpp",
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",
"//third_party/googletest:gmock_main",
]
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
include_dirs =
[ "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include" ]
ace_unittest("pan_event_test_ng") {
type = "new"
module_output = "events"
sources = [ "pan_event_test_ng.cpp" ]
}

View File

@ -11,87 +11,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
import(
"//foundation/arkui/ace_engine/frameworks/core/components_ng/components.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("scrollable_event_test_ng") {
module_out_path = event_test_output_path
sources = [
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/utils/base_id.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/time_util.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/modifier.cpp",
"$ace_root/frameworks/core/components_ng/base/ui_node.cpp",
"$ace_root/frameworks/core/components_ng/event/event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/focus_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/gesture_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/scrollable_event.cpp",
"$ace_root/frameworks/core/components_ng/event/state_style_manager.cpp",
"$ace_root/frameworks/core/components_ng/event/touch_event.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/multi_fingers_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_builder.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_node.cpp",
"$ace_root/frameworks/core/components_ng/manager/safe_area/safe_area_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/property/border_property.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_ng/property/property.cpp",
"$ace_root/frameworks/core/components_ng/property/safe_area_insets.cpp",
"$ace_root/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp",
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
# mock
"$ace_root/frameworks/base/test/mock/mock_system_properties.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/animation/mock_geometry_transition.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_view_stack_processor.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_click_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_exclusive_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_gesture_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_pan_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_parallel_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_recognizer_group.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scroll/mock_scroll_bar.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context_creator.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_element_register.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"$ace_root/test/mock/core/common/mock_container.cpp",
"mock_scrollable.cpp",
# self
"scrollable_event_test_ng.cpp",
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",
"//third_party/googletest:gmock_main",
]
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
include_dirs =
[ "//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include" ]
ace_unittest("scrollable_event_test_ng") {
type = "new"
module_output = "events"
sources = [ "scrollable_event_test_ng.cpp" ]
}

View File

@ -13,58 +13,8 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("touch_event_test_ng") {
module_out_path = event_test_output_path
sources = [
# inner
"$ace_root/adapter/ohos/osal/log_wrapper.cpp",
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/modifier.cpp",
"$ace_root/frameworks/core/components_ng/base/ui_node.cpp",
"$ace_root/frameworks/core/components_ng/event/event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/focus_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/gesture_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/state_style_manager.cpp",
"$ace_root/frameworks/core/components_ng/event/touch_event.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/multi_fingers_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/property/border_property.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_ng/property/property.cpp",
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
# mock
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/animation/mock_geometry_transition.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context_creator.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_element_register.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"$ace_root/test/mock/core/common/mock_container.cpp",
# self
"touch_event_test_ng.cpp",
]
external_deps = [ "hilog:libhilog" ]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$cjson_root:cjson",
"//third_party/googletest:gmock_main",
]
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
ace_unittest("touch_event_test_ng") {
type = "new"
module_output = "events"
sources = [ "touch_event_test_ng.cpp" ]
}

View File

@ -13,84 +13,8 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("box_layout_algorithm_test_ng") {
module_out_path = layout_test_output_path
sources = [
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
"$ace_root/frameworks/base/utils/time_util.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_column_info.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_container_info.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_system_manager.cpp",
"$ace_root/frameworks/core/components/common/layout/screen_system_manager.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/event/click_event.h",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_node.cpp",
"$ace_root/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_scrollable_event.cpp",
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
"$ace_root/frameworks/core/pipeline/base/constants.cpp",
# components_ng
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/modifier.cpp",
"$ace_root/frameworks/core/components_ng/base/ui_node.cpp",
"$ace_root/frameworks/core/components_ng/base/view_stack_processor.cpp",
"$ace_root/frameworks/core/components_ng/event/event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/focus_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/gesture_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/state_style_manager.cpp",
"$ace_root/frameworks/core/components_ng/event/touch_event.cpp",
"$ace_root/frameworks/core/components_ng/gestures/gesture_referee.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/exclusive_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/gesture_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/parallel_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/recognizer_group.cpp",
"$ace_root/frameworks/core/components_ng/layout/box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_property.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_builder.cpp",
"$ace_root/frameworks/core/components_ng/manager/safe_area/safe_area_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/property/border_property.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/grid_property.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_ng/property/property.cpp",
"$ace_root/frameworks/core/components_ng/property/safe_area_insets.cpp",
"$ace_root/frameworks/core/components_ng/syntax/for_each_node.cpp",
# mock
"$ace_root/adapter/preview/osal/ace_trace.cpp",
"$ace_root/frameworks/base/log/ace_trace.cpp",
"$ace_root/frameworks/base/test/mock/mock_system_properties.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/animation/mock_geometry_transition.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_drawing_convertor.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context_creator.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_element_register.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"box_layout_algorithm_test_ng.cpp",
]
deps = [
"$ace_graphic/rosen/modules/render_service_client:librender_service_client",
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_engine_unittest_flutter_deps",
"$ace_root/test/unittest:ace_unittest_log",
"$cjson_root:cjson",
"//third_party/googletest:gmock_main",
]
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
ace_unittest("box_layout_algorithm_test_ng") {
type = "new"
module_output = "layout"
sources = [ "box_layout_algorithm_test_ng.cpp" ]
}

View File

@ -12,71 +12,9 @@
# limitations under the License.
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("layout_property_test_ng") {
module_out_path = layout_test_output_path
sources = [
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/test/mock/mock_system_properties.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/time_util.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_column_info.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_container_info.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_system_manager.cpp",
"$ace_root/frameworks/core/components/common/layout/screen_system_manager.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/ui_node.cpp",
"$ace_root/frameworks/core/components_ng/base/view_stack_processor.cpp",
"$ace_root/frameworks/core/components_ng/event/event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/focus_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/gesture_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/state_style_manager.cpp",
"$ace_root/frameworks/core/components_ng/event/touch_event.cpp",
"$ace_root/frameworks/core/components_ng/gestures/gesture_referee.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/exclusive_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/gesture_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/parallel_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/recognizer_group.cpp",
"$ace_root/frameworks/core/components_ng/layout/box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_property.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_builder.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_node.cpp",
"$ace_root/frameworks/core/components_ng/manager/safe_area/safe_area_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/property/border_property.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/grid_property.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_ng/property/property.cpp",
"$ace_root/frameworks/core/components_ng/property/safe_area_insets.cpp",
"$ace_root/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_scrollable_event.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/animation/mock_geometry_transition.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context_creator.cpp",
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_element_register.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"layout_property_test_ng.cpp",
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",
"//third_party/googletest:gmock_main",
]
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
ace_unittest("layout_property_test_ng") {
type = "new"
module_output = "layout"
sources = [ "layout_property_test_ng.cpp" ]
}

View File

@ -13,87 +13,8 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("layout_wrapper_test_ng") {
module_out_path = layout_test_output_path
sources = [
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/subwindow/subwindow_manager.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/time_util.cpp",
"$ace_root/frameworks/core/common/container_scope.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_column_info.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_container_info.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_system_manager.cpp",
"$ace_root/frameworks/core/components/common/layout/screen_system_manager.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/animation/geometry_transition.cpp",
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
"$ace_root/frameworks/core/pipeline/base/element_register.cpp",
# components_ng
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/modifier.cpp",
"$ace_root/frameworks/core/components_ng/base/ui_node.cpp",
"$ace_root/frameworks/core/components_ng/base/view_stack_processor.cpp",
"$ace_root/frameworks/core/components_ng/event/event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/focus_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/gesture_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/state_style_manager.cpp",
"$ace_root/frameworks/core/components_ng/event/touch_event.cpp",
"$ace_root/frameworks/core/components_ng/gestures/gesture_referee.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/exclusive_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/gesture_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/parallel_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/recognizer_group.cpp",
"$ace_root/frameworks/core/components_ng/layout/box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_property.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_builder.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_node.cpp",
"$ace_root/frameworks/core/components_ng/manager/safe_area/safe_area_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scrollable/scrollable_pattern.cpp",
"$ace_root/frameworks/core/components_ng/property/border_property.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/grid_property.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_ng/property/property.cpp",
"$ace_root/frameworks/core/components_ng/property/safe_area_insets.cpp",
"$ace_root/frameworks/core/components_ng/render/paint_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/syntax/for_each_node.cpp",
"$ace_root/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp",
"$ace_root/frameworks/core/components_ng/syntax/lazy_layout_wrapper_builder.cpp",
# mock
"$ace_root/frameworks/base/test/mock/mock_system_properties.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_scrollable_event.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_localization.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_animation_utils.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context_creator.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"$ace_root/test/mock/core/common/mock_container.cpp",
# self
"layout_wrapper_test_ng.cpp",
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",
"//third_party/googletest:gmock_main",
]
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
ace_unittest("layout_wrapper_test_ng") {
type = "new"
module_output = "layout"
sources = [ "layout_wrapper_test_ng.cpp" ]
}

View File

@ -13,83 +13,8 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("layout_wrapper_build_test_ng") {
module_out_path = layout_test_output_path
sources = [
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
"$ace_root/frameworks/base/utils/time_util.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_column_info.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_container_info.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_system_manager.cpp",
"$ace_root/frameworks/core/components/common/layout/screen_system_manager.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/event/click_event.h",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_node.cpp",
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
"$ace_root/frameworks/core/pipeline/base/constants.cpp",
# components_ng
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/modifier.cpp",
"$ace_root/frameworks/core/components_ng/base/ui_node.cpp",
"$ace_root/frameworks/core/components_ng/base/view_stack_processor.cpp",
"$ace_root/frameworks/core/components_ng/event/event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/focus_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/gesture_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/state_style_manager.cpp",
"$ace_root/frameworks/core/components_ng/event/touch_event.cpp",
"$ace_root/frameworks/core/components_ng/gestures/gesture_referee.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/exclusive_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/gesture_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/parallel_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/recognizer_group.cpp",
"$ace_root/frameworks/core/components_ng/layout/box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_property.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_builder.cpp",
"$ace_root/frameworks/core/components_ng/manager/safe_area/safe_area_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/property/border_property.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/grid_property.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_ng/property/property.cpp",
"$ace_root/frameworks/core/components_ng/property/safe_area_insets.cpp",
"$ace_root/frameworks/core/components_ng/render/paint_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/syntax/for_each_node.cpp",
# mock
"$ace_root/frameworks/base/test/mock/mock_system_properties.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp",
"$ace_root/frameworks/core/components_ng/syntax/lazy_layout_wrapper_builder.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_scrollable_event.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/animation/mock_geometry_transition.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_drawing_convertor.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context_creator.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_element_register.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"layout_wrapper_build_test_ng.cpp",
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",
"//third_party/googletest:gmock_main",
]
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
ace_unittest("layout_wrapper_build_test_ng") {
type = "new"
module_output = "layout"
sources = [ "layout_wrapper_build_test_ng.cpp" ]
}

View File

@ -13,85 +13,8 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("layout_wrapper_node_test_ng") {
module_out_path = layout_test_output_path
sources = [
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
"$ace_root/frameworks/base/utils/time_util.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_column_info.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_container_info.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_system_manager.cpp",
"$ace_root/frameworks/core/components/common/layout/screen_system_manager.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/event/click_event.h",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_node.cpp",
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
"$ace_root/frameworks/core/pipeline/base/constants.cpp",
# components_ng
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/modifier.cpp",
"$ace_root/frameworks/core/components_ng/base/ui_node.cpp",
"$ace_root/frameworks/core/components_ng/base/view_stack_processor.cpp",
"$ace_root/frameworks/core/components_ng/event/event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/focus_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/gesture_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/state_style_manager.cpp",
"$ace_root/frameworks/core/components_ng/event/touch_event.cpp",
"$ace_root/frameworks/core/components_ng/gestures/gesture_referee.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/exclusive_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/gesture_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/parallel_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/recognizer_group.cpp",
"$ace_root/frameworks/core/components_ng/layout/box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_property.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_builder.cpp",
"$ace_root/frameworks/core/components_ng/manager/safe_area/safe_area_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/property/border_property.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/grid_property.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_ng/property/property.cpp",
"$ace_root/frameworks/core/components_ng/property/safe_area_insets.cpp",
"$ace_root/frameworks/core/components_ng/render/paint_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/syntax/for_each_node.cpp",
# mock
"$ace_root/frameworks/base/test/mock/mock_system_properties.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp",
"$ace_root/frameworks/core/components_ng/syntax/lazy_layout_wrapper_builder.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_scrollable_event.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/animation/mock_geometry_transition.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_drawing_convertor.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context_creator.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_element_register.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
# self
"layout_wrapper_node_test_ng.cpp",
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",
"//third_party/googletest:gmock_main",
]
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
ace_unittest("layout_wrapper_node_test_ng") {
type = "new"
module_output = "layout"
sources = [ "layout_wrapper_node_test_ng.cpp" ]
}

View File

@ -11,85 +11,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("drag_drop_manager_test_ng") {
module_out_path = "$manager_test_output_path/drag_drop"
include_dirs = [
"//commonlibrary/c_utils/base/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine",
"//foundation/graphic/graphic_2d/rosen/modules/2d_engine/rosen_text",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include/draw",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter",
]
ace_unittest("drag_drop_manager_test_ng") {
type = "new"
module_output = "manager"
sources = [
# inner
"$ace_root/adapter/ohos/osal/log_wrapper.cpp",
"$ace_root/frameworks/base/geometry/least_square_impl.cpp",
"$ace_root/frameworks/base/geometry/matrix3.cpp",
"$ace_root/frameworks/base/geometry/matrix4.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/utils/time_util.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/modifier.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/manager/drag_drop/drag_drop_manager.cpp",
"$ace_root/frameworks/core/components_ng/manager/drag_drop/drag_drop_proxy.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
"$ace_root/frameworks/core/gestures/velocity_tracker.cpp",
# mock
"$ace_root/frameworks/base/test/mock/mock_drag_window.cpp",
"$ace_root/frameworks/base/test/mock/mock_pixel_map.cpp",
"$ace_root/frameworks/base/test/mock/mock_system_properties.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_clipboard.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_frame_node.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_ui_node.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/grid/mock_grid_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/grid/mock_grid_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/grid/mock_grid_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/grid/mock_grid_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/list/mock_list_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/list/mock_list_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/list/mock_list_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/list/mock_list_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/list/mock_list_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/list/mock_list_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/root/mock_root_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scrollable/mock_scrollable_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context_creator.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_element_register.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"$ace_root/test/mock/core/common/mock_container.cpp",
# self
"$ace_root/frameworks/core/components_v2/grid/grid_event.cpp",
"drag_drop_manager_test_ng.cpp",
]
external_deps = [ "hilog:libhilog" ]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_engine_unittest_flutter_deps",
"$cjson_root:cjson",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//foundation/graphic/graphic_2d/rosen/modules/render_service_client:render_service_client_src",
"//third_party/googletest:gmock_main",
]
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
}

View File

@ -11,67 +11,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
import(
"//foundation/arkui/ace_engine/frameworks/core/components_ng/components.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("drag_drop_proxy_test_ng") {
module_out_path = "$manager_test_output_path/drag_drop_proxy_test"
include_dirs = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include/draw",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter",
]
ace_unittest("drag_drop_proxy_test_ng") {
type = "new"
module_output = "manager"
sources = [
# inner
"$ace_root/adapter/ohos/osal/log_wrapper.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/modifier.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/manager/drag_drop/drag_drop_proxy.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
# mock
"$ace_root/frameworks/base/test/mock/mock_drag_window.cpp",
"$ace_root/frameworks/base/test/mock/mock_pixel_map.cpp",
"$ace_root/frameworks/base/test/mock/mock_system_properties.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_clipboard.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_frame_node.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_ui_node.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_manager.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context_creator.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_element_register.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"$ace_root/test/mock/core/common/mock_container.cpp",
# self
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"drag_drop_proxy_test_ng.cpp",
]
external_deps = [ "hilog:libhilog" ]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_engine_unittest_flutter_deps",
"$cjson_root:cjson",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//third_party/googletest:gmock_main",
]
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
}

View File

@ -1,4 +1,4 @@
# Copyright (c) 2022 Huawei Device Co., Ltd.
# Copyright (c) 2022-2023 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@ -11,52 +11,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
import(
"//foundation/arkui/ace_engine/frameworks/core/components_ng/components.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("full_screen_manager_test_ng") {
module_out_path = "$manager_test_output_path/full_screen_manager_test"
include_dirs = [ "//commonlibrary/c_utils/base:utils_config" ]
sources = [
# inner
"$ace_root/adapter/ohos/osal/log_wrapper.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/modifier.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/manager/full_screen/full_screen_manager.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
# mock
"$ace_root/frameworks/base/test/mock/mock_system_properties.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_frame_node.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_ui_node.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context_creator.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"$ace_root/test/mock/core/common/mock_container.cpp",
# self
"full_screen_manager_test_ng.cpp",
]
external_deps = [ "hilog:libhilog" ]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$cjson_root:cjson",
"//third_party/googletest:gmock_main",
]
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
ace_unittest("full_screen_manager_test_ng") {
type = "new"
module_output = "manager"
sources = [ "full_screen_manager_test_ng.cpp" ]
}

View File

@ -11,69 +11,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
import(
"//foundation/arkui/ace_engine/frameworks/core/components_ng/components.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("select_overlay_manager_test_ng") {
module_out_path = "$manager_test_output_path/select_overlay_manager_test"
include_dirs = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include/draw",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter",
]
ace_unittest("select_overlay_manager_test_ng") {
type = "new"
module_output = "manager"
sources = [
# inner
"$ace_root/adapter/ohos/osal/log_wrapper.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/modifier.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/menu/mock_menu_wrapper_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/popup/mock_popup_base_pattern.cpp",
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
# mock
"$ace_root/frameworks/base/test/mock/mock_system_properties.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_frame_node.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_ui_node.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/select_overlay/mock_select_overlay_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/select_overlay/mock_select_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/select_overlay/mock_select_overlay_node.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/select_overlay/mock_select_overlay_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_modifier_adapter.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context_creator.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"$ace_root/test/mock/core/common/mock_container.cpp",
# self
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"select_overlay_manager_test_ng.cpp",
]
external_deps = [ "hilog:libhilog" ]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_engine_unittest_flutter_deps",
"$cjson_root:cjson",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//third_party/googletest:gmock_main",
]
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
}

View File

@ -61,8 +61,7 @@ void SelectOverlayManagerTestNg::SetUpTestSuite()
{
MockPipelineBase::SetUp();
MockContainer::SetUp();
auto taskExecutor = AceType::MakeRefPtr<MockTaskExecutor>();
EXPECT_CALL(*(MockContainer::Current()), GetTaskExecutor()).WillRepeatedly(Return(taskExecutor));
MockContainer::Current()->taskExecutor_ = AceType::MakeRefPtr<MockTaskExecutor>();
}
void SelectOverlayManagerTestNg::TearDownTestSuite()

View File

@ -11,68 +11,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
import(
"//foundation/arkui/ace_engine/frameworks/core/components_ng/components.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("select_overlay_proxy_test_ng") {
module_out_path = "$manager_test_output_path/select_overlay_proxy_test"
include_dirs = [
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include/draw",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/include",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics/src/drawing/engine_adapter",
]
ace_unittest("select_overlay_proxy_test_ng") {
type = "new"
module_output = "manager"
sources = [
# inner
"$ace_root/adapter/ohos/osal/log_wrapper.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/modifier.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/menu/mock_menu_wrapper_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/popup/mock_popup_base_pattern.cpp",
# mock
"$ace_root/frameworks/base/test/mock/mock_system_properties.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_frame_node.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_ui_node.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/select_overlay/mock_select_overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/select_overlay/mock_select_overlay_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/select_overlay/mock_select_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/select_overlay/mock_select_overlay_node.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/select_overlay/mock_select_overlay_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_modifier_adapter.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context_creator.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"$ace_root/test/mock/core/common/mock_container.cpp",
# self
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"select_overlay_proxy_test_ng.cpp",
]
external_deps = [ "hilog:libhilog" ]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_engine_unittest_flutter_deps",
"$cjson_root:cjson",
"//foundation/graphic/graphic_2d/rosen/modules/2d_graphics:2d_graphics",
"//third_party/googletest:gmock_main",
]
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
}

View File

@ -11,88 +11,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
import(
"//foundation/arkui/ace_engine/frameworks/core/components_ng/components.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("shared_overlay_manager_test_ng") {
module_out_path = "$manager_test_output_path/shared_overlay_manager_test"
include_dirs = [ "//commonlibrary/c_utils/base:utils_config" ]
ace_unittest("shared_overlay_manager_test_ng") {
type = "new"
module_output = "manager"
sources = [
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/utils/base_id.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/time_util.cpp",
"$ace_root/frameworks/core/animation/animator.cpp",
"$ace_root/frameworks/core/animation/anticipate_curve.cpp",
"$ace_root/frameworks/core/animation/cubic_curve.cpp",
"$ace_root/frameworks/core/animation/curves.cpp",
"$ace_root/frameworks/core/common/container_scope.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/modifier.cpp",
"$ace_root/frameworks/core/components_ng/base/ui_node.cpp",
"$ace_root/frameworks/core/components_ng/event/event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/state_style_manager.cpp",
"$ace_root/frameworks/core/components_ng/event/touch_event.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_builder.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_node.cpp",
"$ace_root/frameworks/core/components_ng/manager/safe_area/safe_area_manager.cpp",
"$ace_root/frameworks/core/components_ng/manager/shared_overlay/shared_overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/manager/shared_overlay/shared_transition_effect.cpp",
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/property/border_property.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_ng/property/property.cpp",
"$ace_root/frameworks/core/components_ng/property/safe_area_insets.cpp",
"$ace_root/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp",
"$ace_root/test/mock/frameworks/base/log/mock_jank_frame_report.cpp",
# mock
"$ace_root/frameworks/base/test/mock/mock_system_properties.cpp",
"$ace_root/frameworks/core/animation/test/mock/mock_scheduler.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components/common/properties/test/mock/mock_motion_path_evaluator.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_scrollable_event.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/animation/mock_geometry_transition.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_view_stack_processor.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/event/mock_focus_hub.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/event/mock_gesture_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/event/mock_input_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_gesture_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/layout/mock_layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/popup/mock_popup_base_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/stage/mock_page_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_element_register.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"$ace_root/test/mock/core/common/mock_container.cpp",
# self
"shared_overlay_manager_test_ng.cpp",
]
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson",
"//third_party/googletest:gmock_main",
]
configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
}

View File

@ -58,11 +58,6 @@ RefPtr<FrameNode> CreateSharedNode(const std::string& shareId, const int32_t& du
}
} // namespace
RefPtr<RenderContext> RenderContext::Create()
{
return AceType::MakeRefPtr<MockRenderContext>();
}
class SharedOverlayManagerTestNg : public testing::Test {
public:
static void SetUpTestSuite() {};

View File

@ -16,25 +16,25 @@ group("pattern_unittest") {
deps = [
"animator:animator_test_ng",
"app_bar:app_bar_test_ng",
"blank:blank_pattern_test_ng",
"blank:blank_test_ng",
"bubble:bubble_test_ng",
"button:button_test_ng",
"calendar:calendar_pattern_test_ng",
"calendar:calendar_test_ng",
"calendar_picker:calendar_picker_test_ng",
"checkbox:checkbox_test_ng",
"checkboxgroup:checkboxgroup_test_ng",
"common_view:common_view_test_ng",
"container_modal:container_modal_test_ng",
"counter:counter_pattern_test_ng",
"counter:counter_test_ng",
"custom:custom_test_ng",
"data_panel:data_panel_test_ng",
"dialog:dialog_test_ng",
"divider:divider_pattern_test_ng",
"divider:divider_test_ng",
"flex:flex_test_ng",
"form:form_test_ng",
"gauge:gauge_test_ng",
"grid:grid_test_ng",
"grid_col:grid_col_pattern_test_ng",
"grid_col:grid_col_test_ng",
"grid_container:grid_container_test_ng",
"grid_row:grid_row_test_ng",
"hyperlink:hyperlink_test_ng",
@ -42,7 +42,7 @@ group("pattern_unittest") {
"image_animator:image_animator_test_ng",
"indexer:indexer_test_ng",
"linear_layout:linear_layout_test_ng",
"linear_split:linear_split_pattern_test_ng",
"linear_split:linear_split_test_ng",
"list:list_test_ng",
"loading_progress:loading_progress_test_ng",
"marquee:marquee_test_ng",
@ -53,13 +53,13 @@ group("pattern_unittest") {
"option:option_test_ng",
"overlay:overlay_manager_test_ng",
"panel:panel_test_ng",
"patternlock:patternlock_pattern_test_ng",
"patternlock:patternlock_test_ng",
"picker:date_picker_test_ng",
"plugin:plugin_pattern_test_ng",
"progress:progress_test_ng",
"qrcode:qrcode_pattern_test_ng",
"radio:radio_test_ng",
"rating:rating_pattern_test_ng",
"rating:rating_test_ng",
"refresh:refresh_test_ng",
"relative_container:relative_container_test_ng",
"remote_window:remote_window_test_ng",
@ -71,9 +71,9 @@ group("pattern_unittest") {
"security_component:security_component_pattern_test_ng",
"select:select_pattern_test_ng",
"select_overlay:select_overlay_test_ng",
"shape:shape_pattern_unit_test",
"shape:shape_test_ng",
"side_bar:side_bar_pattern_test_ng",
"slider:slider_pattern_test_ng",
"slider:slider_test_ng",
"stack:stack_test_ng",
"stepper:stepper_pattern_test_ng",
"swiper:swiper_test_ng",
@ -83,7 +83,7 @@ group("pattern_unittest") {
"text_drag:text_drag_test_ng",
"text_picker:text_picker_test_ng",
"textfield:textfield_test_ng",
"texttimer:text_timer_pattern_test_ng",
"texttimer:text_timer_test_ng",
"time_picker:time_picker_test_ng",
"waterflow:water_flow_test_ng",
"web:web_pattern_unit_test",

View File

@ -11,47 +11,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("app_bar_test_ng") {
type = "new"
sources = [
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/grid_container/mock_grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/stage/mock_stage_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/stage/mock_stage_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/ui_extension/mock_ui_extension_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/theme/mock_theme_constants.cpp",
"$ace_root/frameworks/core/components_ng/test/pattern/image/mock/mock_image_pattern.cpp",
"$ace_root/test/mock/adapter/mock_app_bar_helper_impl.cpp",
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"$ace_root/test/unittest/core/pipeline/mock_overlay_manager.cpp",
# text
"$ace_root/frameworks/core/components_ng/pattern/text/text_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_styles.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/text/mock_text_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/text/mock_text_pattern.cpp",
# button
"$ace_root/frameworks/core/components_ng/pattern/button/button_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/toggle_button_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/toggle_button_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/toggle_button_pattern.cpp",
# self
"$ace_root/frameworks/core/components_ng/pattern/app_bar/app_bar_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/app_bar/atomic_service_pattern.cpp",
"app_bar_test_ng.cpp",
]
}

View File

@ -11,17 +11,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("blank_pattern_test_ng") {
sources = [
"$ace_root/frameworks/core/components_ng/pattern/blank/blank_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/blank/blank_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/blank/blank_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/linear_layout/linear_layout_utils.cpp",
"blank_pattern_test_ng.cpp",
]
ace_unittest("blank_test_ng") {
type = "new"
sources = [ "blank_test_ng.cpp" ]
}

View File

@ -55,7 +55,7 @@ constexpr int32_t PLATFORM_VERSION_9 = 9;
constexpr Dimension NEGATIVE_BLANK_MIN(-10.0f);
} // namespace
class BlankPatternTestNg : public testing::Test {
class BlackTestNg : public testing::Test {
public:
static void SetUpTestCase()
{
@ -75,7 +75,7 @@ protected:
PaddingProperty CreatePadding(float left, float top, float right, float bottom);
};
std::pair<RefPtr<FrameNode>, RefPtr<LayoutWrapperNode>> BlankPatternTestNg::CreateRow()
std::pair<RefPtr<FrameNode>, RefPtr<LayoutWrapperNode>> BlackTestNg::CreateRow()
{
auto nodeId = ElementRegister::GetInstance()->MakeUniqueId();
auto rowFrameNode =
@ -105,7 +105,7 @@ std::pair<RefPtr<FrameNode>, RefPtr<LayoutWrapperNode>> BlankPatternTestNg::Crea
return { rowFrameNode, layoutWrapper };
}
std::pair<RefPtr<FrameNode>, RefPtr<LayoutWrapperNode>> BlankPatternTestNg::CreateColumn()
std::pair<RefPtr<FrameNode>, RefPtr<LayoutWrapperNode>> BlackTestNg::CreateColumn()
{
auto nodeId = ElementRegister::GetInstance()->MakeUniqueId();
auto columnFrameNode =
@ -135,7 +135,7 @@ std::pair<RefPtr<FrameNode>, RefPtr<LayoutWrapperNode>> BlankPatternTestNg::Crea
return { columnFrameNode, layoutWrapper };
}
std::pair<RefPtr<FrameNode>, RefPtr<LayoutWrapperNode>> BlankPatternTestNg::CreateFlexRow()
std::pair<RefPtr<FrameNode>, RefPtr<LayoutWrapperNode>> BlackTestNg::CreateFlexRow()
{
auto nodeId = ElementRegister::GetInstance()->MakeUniqueId();
auto rowFrameNode =
@ -168,7 +168,7 @@ std::pair<RefPtr<FrameNode>, RefPtr<LayoutWrapperNode>> BlankPatternTestNg::Crea
return { rowFrameNode, layoutWrapper };
}
std::pair<RefPtr<FrameNode>, RefPtr<LayoutWrapperNode>> BlankPatternTestNg::CreateFlexColumn()
std::pair<RefPtr<FrameNode>, RefPtr<LayoutWrapperNode>> BlackTestNg::CreateFlexColumn()
{
auto nodeId = ElementRegister::GetInstance()->MakeUniqueId();
auto columnFrameNode =
@ -201,7 +201,7 @@ std::pair<RefPtr<FrameNode>, RefPtr<LayoutWrapperNode>> BlankPatternTestNg::Crea
return { columnFrameNode, layoutWrapper };
}
PaddingProperty BlankPatternTestNg::CreatePadding(float left, float top, float right, float bottom)
PaddingProperty BlackTestNg::CreatePadding(float left, float top, float right, float bottom)
{
PaddingProperty padding;
padding.left = CalcLength(left);
@ -217,7 +217,7 @@ PaddingProperty BlankPatternTestNg::CreatePadding(float left, float top, float r
* @tc.type: FUNC
* @tc.author:
*/
HWTEST_F(BlankPatternTestNg, BlankFrameNodeCreator001, TestSize.Level1)
HWTEST_F(BlackTestNg, BlankFrameNodeCreator001, TestSize.Level1)
{
std::vector<int32_t> platformVersions = { PLATFORM_VERSION_9, PLATFORM_VERSION_10 };
for (int32_t i = 0; i < platformVersions.size(); i++) {
@ -240,7 +240,7 @@ HWTEST_F(BlankPatternTestNg, BlankFrameNodeCreator001, TestSize.Level1)
* @tc.type: FUNC
* @tc.author:
*/
HWTEST_F(BlankPatternTestNg, BlankFrameNodeCreator002, TestSize.Level1)
HWTEST_F(BlackTestNg, BlankFrameNodeCreator002, TestSize.Level1)
{
std::vector<int32_t> platformVersions = { PLATFORM_VERSION_9, PLATFORM_VERSION_10 };
for (int32_t i = 0; i < platformVersions.size(); i++) {
@ -263,7 +263,7 @@ HWTEST_F(BlankPatternTestNg, BlankFrameNodeCreator002, TestSize.Level1)
* @tc.type: FUNC
* @tc.author:
*/
HWTEST_F(BlankPatternTestNg, BlankFrameNodeCreator003, TestSize.Level1)
HWTEST_F(BlackTestNg, BlankFrameNodeCreator003, TestSize.Level1)
{
std::vector<int32_t> platformVersions = { PLATFORM_VERSION_9, PLATFORM_VERSION_10 };
for (int32_t i = 0; i < platformVersions.size(); i++) {
@ -293,7 +293,7 @@ HWTEST_F(BlankPatternTestNg, BlankFrameNodeCreator003, TestSize.Level1)
* @tc.type: FUNC
* @tc.author:
*/
HWTEST_F(BlankPatternTestNg, BlankPatternTest001, TestSize.Level1)
HWTEST_F(BlackTestNg, BlankPatternTest001, TestSize.Level1)
{
std::vector<int32_t> platformVersions = { PLATFORM_VERSION_9, PLATFORM_VERSION_10 };
for (int32_t i = 0; i < platformVersions.size(); i++) {
@ -361,7 +361,7 @@ HWTEST_F(BlankPatternTestNg, BlankPatternTest001, TestSize.Level1)
* @tc.type: FUNC
* @tc.author:
*/
HWTEST_F(BlankPatternTestNg, BlankPatternTest002, TestSize.Level1)
HWTEST_F(BlackTestNg, BlankPatternTest002, TestSize.Level1)
{
auto column = CreateColumn();
auto columnFrameNode = column.first;
@ -420,7 +420,7 @@ HWTEST_F(BlankPatternTestNg, BlankPatternTest002, TestSize.Level1)
* @tc.type: FUNC
* @tc.author:
*/
HWTEST_F(BlankPatternTestNg, BlankPatternTest003, TestSize.Level1)
HWTEST_F(BlackTestNg, BlankPatternTest003, TestSize.Level1)
{
auto flexRow = CreateFlexRow();
auto flexRowFrameNode = flexRow.first;
@ -479,7 +479,7 @@ HWTEST_F(BlankPatternTestNg, BlankPatternTest003, TestSize.Level1)
* @tc.type: FUNC
* @tc.author:
*/
HWTEST_F(BlankPatternTestNg, BlankPatternTest004, TestSize.Level1)
HWTEST_F(BlackTestNg, BlankPatternTest004, TestSize.Level1)
{
auto flexColumn = CreateFlexColumn();
auto flexColumnFrameNode = flexColumn.first;
@ -538,7 +538,7 @@ HWTEST_F(BlankPatternTestNg, BlankPatternTest004, TestSize.Level1)
* @tc.type: FUNC
* @tc.author:
*/
HWTEST_F(BlankPatternTestNg, BlankPatternTest005, TestSize.Level1)
HWTEST_F(BlackTestNg, BlankPatternTest005, TestSize.Level1)
{
BlankModelNG blank;
Dimension blankMin;
@ -606,7 +606,7 @@ HWTEST_F(BlankPatternTestNg, BlankPatternTest005, TestSize.Level1)
* @tc.type: FUNC
* @tc.author:
*/
HWTEST_F(BlankPatternTestNg, BlankPatternTest006, TestSize.Level1)
HWTEST_F(BlackTestNg, BlankPatternTest006, TestSize.Level1)
{
BlankModelNG blank;
Dimension blankMin;
@ -672,7 +672,7 @@ HWTEST_F(BlankPatternTestNg, BlankPatternTest006, TestSize.Level1)
* @tc.type: FUNC
* @tc.author:
*/
HWTEST_F(BlankPatternTestNg, BlankPatternTest007, TestSize.Level1)
HWTEST_F(BlackTestNg, BlankPatternTest007, TestSize.Level1)
{
BlankModelNG blank;
blank.Create();
@ -690,7 +690,7 @@ HWTEST_F(BlankPatternTestNg, BlankPatternTest007, TestSize.Level1)
* @tc.type: FUNC
* @tc.author:
*/
HWTEST_F(BlankPatternTestNg, ToJsonValue001, TestSize.Level1)
HWTEST_F(BlackTestNg, ToJsonValue001, TestSize.Level1)
{
BlankModelNG blank;
blank.Create();

View File

@ -14,44 +14,9 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("bubble_test_ng") {
type = "new"
sources = [
"$ace_root/frameworks/core/components/common/properties/border.cpp",
"$ace_root/frameworks/core/components/common/properties/border_edge.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
#mock
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_manager.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_proxy.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/select_overlay/mock_select_overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/select_overlay/mock_select_overlay_proxy.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/select_overlay/mock_select_overlay_property.cpp",
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"$ace_root/test/unittest/core/pipeline/mock_overlay_manager.cpp",
# text
"$ace_root/frameworks/core/components_ng/pattern/text/image_span_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/span_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/span_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_styles.cpp",
# self
"$ace_root/frameworks/core/components_ng/pattern/bubble/bubble_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/bubble/bubble_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/bubble/bubble_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/bubble/bubble_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/toggle_button_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/toggle_button_pattern.cpp",
"bubble_test_ng.cpp",
]
}

View File

@ -14,23 +14,8 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("button_test_ng") {
type = "new"
sources = [
"$ace_root/frameworks/core/components_ng/pattern/button/button_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/toggle_button_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/toggle_button_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/toggle_button_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_styles.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/text/mock_text_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/text/mock_text_pattern.cpp",
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"button_test_ng.cpp",
"toggle_button_test_ng.cpp",

View File

@ -13,65 +13,11 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("calendar_pattern_test_ng") {
ace_unittest("calendar_test_ng") {
flutter_skia = true
type = "new"
sources = [
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/toggle_button_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/calendar/calendar_controller_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/calendar/calendar_controller_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/calendar/calendar_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/calendar/calendar_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/calendar/calendar_month_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/calendar/calendar_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/calendar/calendar_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper/swiper_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper/swiper_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper/swiper_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper/swiper_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper/swiper_paint_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper/swiper_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper_indicator/digit_indicator/digit_indicator_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper_indicator/dot_indicator/dot_indicator_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper_indicator/dot_indicator/dot_indicator_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper_indicator/dot_indicator/dot_indicator_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper_indicator/indicator_common/swiper_arrow_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper_indicator/indicator_common/swiper_arrow_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper_indicator/indicator_common/swiper_indicator_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/image_span_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/span_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/span_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_styles.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_proxy.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/menu/mock_menu_wrapper_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/select_overlay/mock_select_overlay_node.cpp",
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"$ace_root/test/unittest/core/pipeline/mock_drag_drop_manager.cpp",
"calendar_pattern_test_ng.cpp",
"calendar_test_ng.cpp",
]
}

View File

@ -97,7 +97,7 @@ const Dimension LUNAR_DAY_HEIGHT = 10.0_vp;
const Dimension LUNAR_DAY_OFFSET = 2.0_vp;
} // namespace
class CalendarPatternTestNg : public testing::Test {
class CalendarTestNg : public testing::Test {
public:
static void SetUpTestCase();
static void TearDownTestCase();
@ -106,17 +106,17 @@ protected:
static RefPtr<FrameNode> CreateCalendarNode(TestProperty& testProperty);
};
void CalendarPatternTestNg::SetUpTestCase()
void CalendarTestNg::SetUpTestCase()
{
MockPipelineBase::SetUp();
}
void CalendarPatternTestNg::TearDownTestCase()
void CalendarTestNg::TearDownTestCase()
{
MockPipelineBase::TearDown();
}
RefPtr<FrameNode> CalendarPatternTestNg::CreateCalendarNode(TestProperty& testProperty)
RefPtr<FrameNode> CalendarTestNg::CreateCalendarNode(TestProperty& testProperty)
{
return nullptr;
}
@ -126,7 +126,7 @@ RefPtr<FrameNode> CalendarPatternTestNg::CreateCalendarNode(TestProperty& testPr
* @tc.desc: Create Calendar.
* @tc.type: FUNC
*/
HWTEST_F(CalendarPatternTestNg, CalendarModelNGTest001, TestSize.Level1)
HWTEST_F(CalendarTestNg, CalendarModelNGTest001, TestSize.Level1)
{
/**
* @tc.steps: step1. Create Calendar
@ -290,7 +290,7 @@ HWTEST_F(CalendarPatternTestNg, CalendarModelNGTest001, TestSize.Level1)
EXPECT_EQ(calendarPaintProperty->GetWorkStateVerticalMovingDistanceValue(1.0_px), SIZE_VALUE);
}
HWTEST_F(CalendarPatternTestNg, CalendarModelNGTest002, TestSize.Level1)
HWTEST_F(CalendarTestNg, CalendarModelNGTest002, TestSize.Level1)
{
auto* stack = ViewStackProcessor::GetInstance();
RefPtr<CalendarPattern> initPattern = AceType::MakeRefPtr<CalendarPattern>();
@ -353,7 +353,7 @@ HWTEST_F(CalendarPatternTestNg, CalendarModelNGTest002, TestSize.Level1)
EXPECT_EQ(pattern->GetCalendarDay().month.month, MONTH_VALUE);
}
HWTEST_F(CalendarPatternTestNg, CalendarModelNGTest003, TestSize.Level1)
HWTEST_F(CalendarTestNg, CalendarModelNGTest003, TestSize.Level1)
{
CalendarModelData calendarData;
CalendarModelNG calendarModelNG;
@ -386,7 +386,7 @@ HWTEST_F(CalendarPatternTestNg, CalendarModelNGTest003, TestSize.Level1)
* @tc.desc: Create calendar, and invoke its JumpTo function to calculate the date.
* @tc.type: FUNC
*/
HWTEST_F(CalendarPatternTestNg, CalendarTest004, TestSize.Level1)
HWTEST_F(CalendarTestNg, CalendarTest004, TestSize.Level1)
{
/**
* @tc.steps: step1. Create Calendar
@ -472,7 +472,7 @@ HWTEST_F(CalendarPatternTestNg, CalendarTest004, TestSize.Level1)
* @tc.desc: Create calendar, and check the 6 rows (42 days).
* @tc.type: FUNC
*/
HWTEST_F(CalendarPatternTestNg, CalendarTest005, TestSize.Level1)
HWTEST_F(CalendarTestNg, CalendarTest005, TestSize.Level1)
{
/**
* @tc.steps: step1. Create Calendar
@ -546,7 +546,7 @@ HWTEST_F(CalendarPatternTestNg, CalendarTest005, TestSize.Level1)
* @tc.desc: Create calendar, and check the 5 rows (35 days).
* @tc.type: FUNC
*/
HWTEST_F(CalendarPatternTestNg, CalendarTest006, TestSize.Level1)
HWTEST_F(CalendarTestNg, CalendarTest006, TestSize.Level1)
{
/**
* @tc.steps: step1. Create Calendar
@ -617,7 +617,7 @@ HWTEST_F(CalendarPatternTestNg, CalendarTest006, TestSize.Level1)
* @tc.desc: Create calendar, and check the todayStyle focus status.
* @tc.type: FUNC
*/
HWTEST_F(CalendarPatternTestNg, CalendarTest007, TestSize.Level1)
HWTEST_F(CalendarTestNg, CalendarTest007, TestSize.Level1)
{
/**
* @tc.steps: step1. Create Calendar
@ -735,7 +735,7 @@ HWTEST_F(CalendarPatternTestNg, CalendarTest007, TestSize.Level1)
* @tc.desc: Create calendar, and check the gregorianDayYAxisOffset.
* @tc.type: FUNC
*/
HWTEST_F(CalendarPatternTestNg, CalendarTest008, TestSize.Level1)
HWTEST_F(CalendarTestNg, CalendarTest008, TestSize.Level1)
{
/**
* @tc.steps: step1. Create Calendar
@ -800,7 +800,7 @@ HWTEST_F(CalendarPatternTestNg, CalendarTest008, TestSize.Level1)
* @tc.desc: Test CalendarPattern OnDirtyLayoutWrapperSwap
* @tc.type: FUNC
*/
HWTEST_F(CalendarPatternTestNg, CalendarPatternTest001, TestSize.Level1)
HWTEST_F(CalendarTestNg, CalendarPatternTest001, TestSize.Level1)
{
auto* stack = ViewStackProcessor::GetInstance();
auto frameNode = FrameNode::GetOrCreateFrameNode(
@ -818,7 +818,7 @@ HWTEST_F(CalendarPatternTestNg, CalendarPatternTest001, TestSize.Level1)
* @tc.desc: Test CalendarPattern OnModifyDone ChangeDoneEvent
* @tc.type: FUNC
*/
HWTEST_F(CalendarPatternTestNg, CalendarPatternTest002, TestSize.Level1)
HWTEST_F(CalendarTestNg, CalendarPatternTest002, TestSize.Level1)
{
auto* stack = ViewStackProcessor::GetInstance();
auto nodeId = stack->ClaimNodeId();
@ -884,7 +884,7 @@ HWTEST_F(CalendarPatternTestNg, CalendarPatternTest002, TestSize.Level1)
* @tc.desc: Test CalendarPattern OnModifyDone currentIndex switch
* @tc.type: FUNC
*/
HWTEST_F(CalendarPatternTestNg, CalendarPatternTest003, TestSize.Level1)
HWTEST_F(CalendarTestNg, CalendarPatternTest003, TestSize.Level1)
{
auto* stack = ViewStackProcessor::GetInstance();
auto nodeId = stack->ClaimNodeId();
@ -1007,7 +1007,7 @@ HWTEST_F(CalendarPatternTestNg, CalendarPatternTest003, TestSize.Level1)
* @tc.desc: Test CalendarPattern FlushFocus
* @tc.type: FUNC
*/
HWTEST_F(CalendarPatternTestNg, CalendarPatternTest004, TestSize.Level1)
HWTEST_F(CalendarTestNg, CalendarPatternTest004, TestSize.Level1)
{
auto* stack = ViewStackProcessor::GetInstance();
auto nodeId = stack->ClaimNodeId();
@ -1037,7 +1037,7 @@ HWTEST_F(CalendarPatternTestNg, CalendarPatternTest004, TestSize.Level1)
* @tc.desc: Test CalendarPattern ToJsonValue
* @tc.type: FUNC
*/
HWTEST_F(CalendarPatternTestNg, CalendarPatternTest005, TestSize.Level1)
HWTEST_F(CalendarTestNg, CalendarPatternTest005, TestSize.Level1)
{
auto* stack = ViewStackProcessor::GetInstance();
auto nodeId = stack->ClaimNodeId();
@ -1083,7 +1083,7 @@ HWTEST_F(CalendarPatternTestNg, CalendarPatternTest005, TestSize.Level1)
* @tc.desc: Test CalendarMonthPattern OnDirtyLayoutWrapperSwap
* @tc.type: FUNC
*/
HWTEST_F(CalendarPatternTestNg, CalendarMonthPatternTest001, TestSize.Level1)
HWTEST_F(CalendarTestNg, CalendarMonthPatternTest001, TestSize.Level1)
{
auto* stack = ViewStackProcessor::GetInstance();
auto frameNode = FrameNode::GetOrCreateFrameNode(
@ -1111,7 +1111,7 @@ HWTEST_F(CalendarPatternTestNg, CalendarMonthPatternTest001, TestSize.Level1)
* @tc.desc: Test CalendarMonthPattern ClickCallback
* @tc.type: FUNC
*/
HWTEST_F(CalendarPatternTestNg, CalendarMonthPatternTest002, TestSize.Level1)
HWTEST_F(CalendarTestNg, CalendarMonthPatternTest002, TestSize.Level1)
{
auto* stack = ViewStackProcessor::GetInstance();
auto frameNode = FrameNode::GetOrCreateFrameNode(
@ -1169,7 +1169,7 @@ HWTEST_F(CalendarPatternTestNg, CalendarMonthPatternTest002, TestSize.Level1)
* @tc.desc: Test CalendarMonthPattern JudgeArea
* @tc.type: FUNC
*/
HWTEST_F(CalendarPatternTestNg, CalendarMonthPatternTest003, TestSize.Level1)
HWTEST_F(CalendarTestNg, CalendarMonthPatternTest003, TestSize.Level1)
{
auto* stack = ViewStackProcessor::GetInstance();
auto frameNode = FrameNode::GetOrCreateFrameNode(
@ -1252,7 +1252,7 @@ HWTEST_F(CalendarPatternTestNg, CalendarMonthPatternTest003, TestSize.Level1)
* @tc.desc: Test CalendarLayoutAlgorithm MeasureContent
* @tc.type: FUNC
*/
HWTEST_F(CalendarPatternTestNg, CalendarLayoutAlgorithmTest001, TestSize.Level1)
HWTEST_F(CalendarTestNg, CalendarLayoutAlgorithmTest001, TestSize.Level1)
{
auto* stack = ViewStackProcessor::GetInstance();
auto frameNode = FrameNode::GetOrCreateFrameNode(
@ -1298,7 +1298,7 @@ HWTEST_F(CalendarPatternTestNg, CalendarLayoutAlgorithmTest001, TestSize.Level1)
* @tc.desc: Test CalendarPaintMethod GetContentDrawFunction
* @tc.type: FUNC
*/
HWTEST_F(CalendarPatternTestNg, CalendarPaintMethodTest001, TestSize.Level1)
HWTEST_F(CalendarTestNg, CalendarPaintMethodTest001, TestSize.Level1)
{
auto* stack = ViewStackProcessor::GetInstance();
auto frameNode = FrameNode::GetOrCreateFrameNode(
@ -1324,7 +1324,7 @@ HWTEST_F(CalendarPatternTestNg, CalendarPaintMethodTest001, TestSize.Level1)
* @tc.desc: Test CalendarPaintMethod PaintContent
* @tc.type: FUNC
*/
HWTEST_F(CalendarPatternTestNg, CalendarPaintMethodTest002, TestSize.Level1)
HWTEST_F(CalendarTestNg, CalendarPaintMethodTest002, TestSize.Level1)
{
auto calendarPaintProperty = AceType::MakeRefPtr<CalendarPaintProperty>();
ASSERT_NE(calendarPaintProperty, nullptr);
@ -1342,7 +1342,7 @@ HWTEST_F(CalendarPatternTestNg, CalendarPaintMethodTest002, TestSize.Level1)
* @tc.desc: Test CalendarPaintMethod DrawCalendar
* @tc.type: FUNC
*/
HWTEST_F(CalendarPatternTestNg, CalendarPaintMethodTest003, TestSize.Level1)
HWTEST_F(CalendarTestNg, CalendarPaintMethodTest003, TestSize.Level1)
{
ObtainedMonth obtainedMonth;
CalendarDay calendarDay;
@ -1393,7 +1393,7 @@ HWTEST_F(CalendarPatternTestNg, CalendarPaintMethodTest003, TestSize.Level1)
* @tc.desc: Test CalendarPaintMethod PaintDay
* @tc.type: FUNC
*/
HWTEST_F(CalendarPatternTestNg, CalendarPaintMethodTest004, TestSize.Level1)
HWTEST_F(CalendarTestNg, CalendarPaintMethodTest004, TestSize.Level1)
{
ObtainedMonth obtainedMonth;
CalendarDay calendarDay;
@ -1434,7 +1434,7 @@ HWTEST_F(CalendarPatternTestNg, CalendarPaintMethodTest004, TestSize.Level1)
* @tc.desc: Create calendar, and check today off or work status.
* @tc.type: FUNC
*/
HWTEST_F(CalendarPatternTestNg, CalendarPaintMethodTest005, TestSize.Level1)
HWTEST_F(CalendarTestNg, CalendarPaintMethodTest005, TestSize.Level1)
{
/**
* @tc.steps: step1. Create Calendar

View File

@ -14,79 +14,11 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("calendar_picker_test_ng") {
type = "new"
sources = [
"$ace_root/frameworks/base/thread/background_task_executor.cpp",
"$ace_root/frameworks/core/components/picker/picker_data.cpp",
"$ace_root/frameworks/core/components/test/unittest/mock/subwindow_mock.cpp",
"$ace_root/frameworks/core/components_ng/pattern/calendar/calendar_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/calendar/calendar_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/calendar/calendar_month_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/calendar/calendar_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/calendar/calendar_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/calendar_picker/calendar_dialog_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/calendar_picker/calendar_dialog_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/calendar_picker/calendar_picker_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/calendar_picker/calendar_picker_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/calendar_picker/calendar_picker_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/dialog/dialog_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/dialog/dialog_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/pattern/dialog/dialog_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/dialog/dialog_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/dialog/dialog_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/divider/divider_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/divider/divider_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/divider/divider_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/wrap_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/overlay/overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/relative_container/relative_container_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/proxy/scroll_bar_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/stage/stage_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper/swiper_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper/swiper_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper/swiper_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper/swiper_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper/swiper_paint_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper/swiper_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper_indicator/digit_indicator/digit_indicator_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper_indicator/dot_indicator/dot_indicator_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper_indicator/dot_indicator/dot_indicator_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper_indicator/dot_indicator/dot_indicator_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper_indicator/indicator_common/swiper_arrow_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/swiper_indicator/indicator_common/swiper_indicator_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/button/mock_button_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/button/mock_button_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/grid_container/mock_grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/list/mock_list_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/list/mock_list_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/list/mock_list_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scroll/mock_scroll_bar_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scroll/mock_scroll_bar_painter.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scrollable/moc_refresh_coordination.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scrollable/mock_scrollable_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/swiper_indicator/mock_swiper_arrow_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/text/mock_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/text/mock_text_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/text/mock_text_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/text/mock_text_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/text/mock_text_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/text/mock_text_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/text/mock_text_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/pattern/image/mock/mock_image_pattern.cpp",
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"calendar_picker_test_ng.cpp",
]
}

View File

@ -23,53 +23,51 @@
#define private public
#define protected public
#include "base/utils/utils.h"
#include "test/mock/base/mock_task_executor.h"
#include "base/geometry/axis.h"
#include "base/geometry/dimension.h"
#include "base/geometry/ng/size_t.h"
#include "base/geometry/offset.h"
#include "base/json/json_util.h"
#include "base/memory/ace_type.h"
#include "base/test/mock/mock_task_executor.h"
#include "core/components_ng/pattern/calendar_picker/calendar_picker_event_hub.h"
#include "core/components_ng/pattern/calendar_picker/calendar_picker_model_ng.h"
#include "core/components_ng/pattern/calendar_picker/calendar_dialog_view.h"
#include "core/components_ng/pattern/calendar_picker/calendar_picker_layout_algorithm.h"
#include "core/components_ng/pattern/calendar_picker/calendar_picker_layout_property.h"
#include "base/utils/utils.h"
#include "core/components/calendar/calendar_theme.h"
#include "core/components/common/properties/shadow_config.h"
#include "core/components/theme/icon_theme.h"
#include "core/components_ng/base/view_stack_processor.h"
#include "core/components_ng/event/focus_hub.h"
#include "core/components_ng/pattern/button/button_pattern.h"
#include "core/components_ng/pattern/calendar/calendar_month_pattern.h"
#include "core/components_ng/pattern/calendar/calendar_paint_property.h"
#include "core/components_ng/pattern/calendar/calendar_pattern.h"
#include "core/components_ng/pattern/calendar_picker/calendar_dialog_pattern.h"
#include "core/components_ng/pattern/calendar_picker/calendar_dialog_view.h"
#include "core/components_ng/pattern/calendar_picker/calendar_picker_event_hub.h"
#include "core/components_ng/pattern/calendar_picker/calendar_picker_layout_algorithm.h"
#include "core/components_ng/pattern/calendar_picker/calendar_picker_layout_property.h"
#include "core/components_ng/pattern/calendar_picker/calendar_picker_model_ng.h"
#include "core/components_ng/pattern/dialog/dialog_view.h"
#include "core/components_ng/pattern/divider/divider_pattern.h"
#include "core/components_ng/pattern/flex/flex_layout_pattern.h"
#include "core/components_ng/pattern/flex/flex_layout_property.h"
#include "core/components_ng/pattern/image/image_pattern.h"
#include "core/components_ng/pattern/picker/date_time_animation_controller.h"
#include "core/components_ng/pattern/picker/datepicker_pattern.h"
#include "core/components_ng/pattern/picker/datepicker_row_layout_property.h"
#include "core/components_ng/pattern/stack/stack_pattern.h"
#include "core/components_ng/pattern/swiper/swiper_pattern.h"
#include "core/components_ng/pattern/text/text_layout_property.h"
#include "core/components_ng/property/measure_property.h"
#include "core/components_v2/inspector/inspector_constants.h"
#include "core/components_ng/base/view_stack_processor.h"
#include "core/components_ng/pattern/button/button_pattern.h"
#include "core/components_ng/pattern/flex/flex_layout_pattern.h"
#include "core/components_ng/pattern/flex/flex_layout_property.h"
#include "core/components_ng/pattern/image/image_pattern.h"
#include "core/components_ng/pattern/text/text_pattern.h"
#include "core/components_ng/pattern/text_field/text_field_pattern.h"
#include "core/components_ng/property/measure_property.h"
#include "core/components_ng/test/mock/render/mock_render_context.h"
#include "core/components_ng/test/mock/theme/mock_theme_manager.h"
#include "core/components_v2/inspector/inspector_constants.h"
#include "core/gestures/gesture_info.h"
#include "core/pipeline/base/element_register.h"
#include "core/pipeline_ng/test/mock/mock_pipeline_base.h"
#include "core/pipeline_ng/ui_task_scheduler.h"
#include "core/components_ng/test/mock/theme/mock_theme_manager.h"
#include "core/components_ng/test/mock/render/mock_render_context.h"
#undef private
#undef protected
@ -128,8 +126,7 @@ void CalendarPickerTestNg::CreateCalendarPicker(RefPtr<OHOS::Ace::MockThemeManag
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>())); // SetTextStyle
PickerTextStyle textStyle;
calendarPickerModel.SetTextStyle(textStyle);
auto onChange = [](const std::string& /* info */) {
};
auto onChange = [](const std::string& /* info */) {};
calendarPickerModel.SetOnChange(onChange);
calendarPickerModel.SetChangeEvent(onChange);
}
@ -295,16 +292,16 @@ HWTEST_F(CalendarPickerTestNg, CalendarPickerModelNGTest002, TestSize.Level1)
{
auto themeManager = AceType::MakeRefPtr<MockThemeManager>();
MockPipelineBase::GetCurrent()->SetThemeManager(themeManager);
EXPECT_CALL(*themeManager, GetTheme(_))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<IconTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<IconTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()));
EXPECT_CALL(*themeManager, GetTheme(_))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<IconTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<IconTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()));
CalendarSettingData settingData;
CalendarPickerModelNG calendarPickerModel;
@ -332,16 +329,16 @@ HWTEST_F(CalendarPickerTestNg, CalendarPickerModelNGTest003, TestSize.Level1)
{
auto themeManager = AceType::MakeRefPtr<MockThemeManager>();
MockPipelineBase::GetCurrent()->SetThemeManager(themeManager);
EXPECT_CALL(*themeManager, GetTheme(_))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<IconTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<IconTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()));
EXPECT_CALL(*themeManager, GetTheme(_))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<IconTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<IconTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()));
CalendarSettingData settingData;
CalendarPickerModelNG calendarPickerModel;
@ -774,8 +771,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarPickerPatternTest012, TestSize.Level1)
EXPECT_TRUE(pickerPattern->HandleFocusEvent(keyEventOne));
KeyEvent keyEventTwo;
keyEventTwo.code = KeyCode::KEY_TAB,
pickerPattern->isFirtFocus_ = true;
keyEventTwo.code = KeyCode::KEY_TAB, pickerPattern->isFirtFocus_ = true;
pickerPattern->SetDialogShow(false);
EXPECT_TRUE(pickerPattern->HandleFocusEvent(keyEventTwo));
@ -2040,8 +2036,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarPickerPatternTest047, TestSize.Level1)
pickerPattern->selected_ = CalendarPickerSelectedType::YEAR;
KeyEvent keyEvent;
keyEvent.code = KeyCode::KEY_TAB,
pickerPattern->isFirtFocus_ = false;
keyEvent.code = KeyCode::KEY_TAB, pickerPattern->isFirtFocus_ = false;
pickerPattern->SetDialogShow(false);
EXPECT_FALSE(pickerPattern->HandleFocusEvent(keyEvent));
@ -2117,7 +2112,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogViewTest001, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
@ -2207,7 +2202,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogViewTest002, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
@ -2300,7 +2295,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogViewTest004, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
ASSERT_NE(dialogPattern, nullptr);
@ -2366,7 +2361,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogViewTest006, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
@ -2378,7 +2373,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogViewTest006, TestSize.Level1)
json->Put("day", 20);
auto info = json->ToString();
CalendarDialogView calendarDialogView;
auto changeEvent = [](const std::string& /* info */) { };
auto changeEvent = [](const std::string& /* info */) {};
CalendarSettingData settingData;
calendarDialogView.OnSelectedChangeEvent(1, info, changeEvent, settingData);
@ -2407,7 +2402,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogViewTest007, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
@ -2415,7 +2410,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogViewTest007, TestSize.Level1)
const std::string callbackInfo;
CalendarDialogView calendarDialogView;
auto changeEvent = [](const std::string& /* info */) { };
auto changeEvent = [](const std::string& /* info */) {};
CalendarSettingData settingData;
calendarDialogView.OnSelectedChangeEvent(1, callbackInfo, changeEvent, settingData);
@ -2447,9 +2442,9 @@ HWTEST_F(CalendarPickerTestNg, CalendarPickerEventHubTest001, TestSize.Level1)
calendarpickerEventHub->UpdateOnChangeEvent(info);
calendarpickerEventHub->FireLayoutChangeEvent();
auto changeEvent1 = [](const std::string& /* info */) { };
auto changeEvent2 = [](const std::string& /* info */) { };
auto changeEvent3 = [](const std::string& /* info */) { };
auto changeEvent1 = [](const std::string& /* info */) {};
auto changeEvent2 = [](const std::string& /* info */) {};
auto changeEvent3 = [](const std::string& /* info */) {};
calendarpickerEventHub->SetInputChangeEvent(std::move(changeEvent1));
calendarpickerEventHub->SetChangeEvent(std::move(changeEvent2));
calendarpickerEventHub->SetOnChangeEvent(std::move(changeEvent3));
@ -2482,7 +2477,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest001, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
@ -2548,7 +2543,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest002, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
@ -2610,7 +2605,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest003, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
@ -2640,7 +2635,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest004, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
@ -2685,7 +2680,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest005, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
@ -2717,7 +2712,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest006, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
@ -2725,7 +2720,8 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest006, TestSize.Level1)
EXPECT_CALL(*themeManager, GetTheme(_))
.WillOnce(Return(AceType::MakeRefPtr<DialogTheme>()))
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()));;
.WillOnce(Return(AceType::MakeRefPtr<CalendarTheme>()));
;
dialogPattern->HandleEntryLayoutChange();
EXPECT_FALSE(dialogPattern->isFirstAddhotZoneRect_);
@ -2755,7 +2751,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest007, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
@ -2791,7 +2787,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest008, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
@ -2880,7 +2876,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest009, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
EXPECT_CALL(*themeManager, GetTheme(_)).WillRepeatedly(Return(AceType::MakeRefPtr<DialogTheme>()));
@ -2918,14 +2914,14 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest010, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto contentNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto contentNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(contentNode, nullptr);
auto columnNode = AceType::DynamicCast<FrameNode>(contentNode->GetChildAtIndex(0));
auto columnNode = AceType::DynamicCast<FrameNode>(contentNode->GetChildAtIndex(0));
ASSERT_NE(columnNode, nullptr);
auto operationsNode = AceType::DynamicCast<FrameNode>(columnNode->GetLastChild());
auto operationsNode = AceType::DynamicCast<FrameNode>(columnNode->GetLastChild());
ASSERT_NE(operationsNode, nullptr);
auto buttonConfirmNode = AceType::DynamicCast<FrameNode>(operationsNode->GetLastChild());
auto buttonConfirmNode = AceType::DynamicCast<FrameNode>(operationsNode->GetLastChild());
ASSERT_NE(buttonConfirmNode, nullptr);
auto gesture = buttonConfirmNode->GetOrCreateGestureEventHub();
@ -2958,7 +2954,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest011, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
@ -3005,7 +3001,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest012, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
@ -3074,7 +3070,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest013, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
@ -3152,7 +3148,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest014, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
@ -3220,7 +3216,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest015, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
@ -3260,7 +3256,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest016, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
@ -3295,7 +3291,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest017, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
@ -3373,7 +3369,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest018, TestSize.Level1)
EXPECT_EQ(dialogNode->GetTag(), V2::DIALOG_ETS_TAG);
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
@ -3423,7 +3419,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest020, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
@ -3459,7 +3455,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest021, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
@ -3529,7 +3525,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest022, TestSize.Level1)
EXPECT_EQ(dialogNode->GetTag(), V2::DIALOG_ETS_TAG);
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
@ -3564,7 +3560,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest023, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
EXPECT_CALL(*themeManager, GetTheme(_)).WillRepeatedly(Return(AceType::MakeRefPtr<DialogTheme>()));
@ -3604,7 +3600,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest024, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
EXPECT_CALL(*themeManager, GetTheme(_)).WillRepeatedly(Return(AceType::MakeRefPtr<DialogTheme>()));
@ -3640,7 +3636,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest025, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
EXPECT_CALL(*themeManager, GetTheme(_)).WillRepeatedly(Return(AceType::MakeRefPtr<DialogTheme>()));
@ -3673,7 +3669,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest026, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
auto dialogPattern = calendarDialogNode->GetPattern<CalendarDialogPattern>();
@ -3710,7 +3706,7 @@ HWTEST_F(CalendarPickerTestNg, CalendarDialogPatternTest027, TestSize.Level1)
auto contentWrapper = dialogNode->GetChildAtIndex(0);
ASSERT_NE(contentWrapper, nullptr);
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
auto calendarDialogNode = AceType::DynamicCast<FrameNode>(contentWrapper->GetChildAtIndex(0));
ASSERT_NE(calendarDialogNode, nullptr);
EXPECT_CALL(*themeManager, GetTheme(_)).WillRepeatedly(Return(AceType::MakeRefPtr<DialogTheme>()));
@ -3870,40 +3866,40 @@ HWTEST_F(CalendarPickerTestNg, CalendarPickerLayoutAlgorithmTest001, TestSize.Le
auto dayNode = AceType::DynamicCast<FrameNode>(contentFrameNode->GetOrCreateChildByIndex(4));
auto dayContentLayoutProperty = dayNode->GetLayoutProperty<TextLayoutProperty>();
RefPtr<GeometryNode> dayContentFrameNodeGeometryNode = AceType::MakeRefPtr<GeometryNode>();
RefPtr<LayoutWrapperNode> dayContentNodeLayoutWrapper = AceType::MakeRefPtr<LayoutWrapperNode>(
dayNode, dayContentFrameNodeGeometryNode, dayNode->GetLayoutProperty());
RefPtr<LayoutWrapperNode> dayContentNodeLayoutWrapper =
AceType::MakeRefPtr<LayoutWrapperNode>(dayNode, dayContentFrameNodeGeometryNode, dayNode->GetLayoutProperty());
ASSERT_NE(dayContentNodeLayoutWrapper, nullptr);
contentNodeLayoutWrapper->AppendChild(dayContentNodeLayoutWrapper);
auto buttonNode1 = AceType::DynamicCast<FrameNode>(flexFrameNode->GetOrCreateChildByIndex(0));
auto button1LayoutProperty = buttonNode1->GetLayoutProperty<ButtonLayoutProperty>();
RefPtr<GeometryNode> button1NodeGeometryNode = AceType::MakeRefPtr<GeometryNode>();
RefPtr<LayoutWrapperNode> button1NodeLayoutWrapper = AceType::MakeRefPtr<LayoutWrapperNode>(
buttonNode1, button1NodeGeometryNode, buttonNode1->GetLayoutProperty());
RefPtr<LayoutWrapperNode> button1NodeLayoutWrapper =
AceType::MakeRefPtr<LayoutWrapperNode>(buttonNode1, button1NodeGeometryNode, buttonNode1->GetLayoutProperty());
ASSERT_NE(button1NodeLayoutWrapper, nullptr);
flexNodeLayoutWrapper->AppendChild(button1NodeLayoutWrapper);
auto buttonNode2 = AceType::DynamicCast<FrameNode>(flexFrameNode->GetOrCreateChildByIndex(1));
auto button2LayoutProperty = buttonNode2->GetLayoutProperty<ButtonLayoutProperty>();
RefPtr<GeometryNode> button2NodeGeometryNode = AceType::MakeRefPtr<GeometryNode>();
RefPtr<LayoutWrapperNode> button2NodeLayoutWrapper = AceType::MakeRefPtr<LayoutWrapperNode>(
buttonNode2, button2NodeGeometryNode, buttonNode2->GetLayoutProperty());
RefPtr<LayoutWrapperNode> button2NodeLayoutWrapper =
AceType::MakeRefPtr<LayoutWrapperNode>(buttonNode2, button2NodeGeometryNode, buttonNode2->GetLayoutProperty());
ASSERT_NE(button2NodeLayoutWrapper, nullptr);
flexNodeLayoutWrapper->AppendChild(button2NodeLayoutWrapper);
auto imageNode1 = AceType::DynamicCast<FrameNode>(buttonNode1->GetOrCreateChildByIndex(0));
auto image1LayoutProperty = imageNode1->GetLayoutProperty<ImageLayoutProperty>();
RefPtr<GeometryNode> image1NodeGeometryNode = AceType::MakeRefPtr<GeometryNode>();
RefPtr<LayoutWrapperNode> image1NodeLayoutWrapper = AceType::MakeRefPtr<LayoutWrapperNode>(
imageNode1, image1NodeGeometryNode, imageNode1->GetLayoutProperty());
RefPtr<LayoutWrapperNode> image1NodeLayoutWrapper =
AceType::MakeRefPtr<LayoutWrapperNode>(imageNode1, image1NodeGeometryNode, imageNode1->GetLayoutProperty());
ASSERT_NE(image1NodeLayoutWrapper, nullptr);
layoutWrapper->AppendChild(image1NodeLayoutWrapper);
auto imageNode2 = AceType::DynamicCast<FrameNode>(buttonNode2->GetOrCreateChildByIndex(0));
auto image2LayoutProperty = imageNode2->GetLayoutProperty<ImageLayoutProperty>();
RefPtr<GeometryNode> image2NodeGeometryNode = AceType::MakeRefPtr<GeometryNode>();
RefPtr<LayoutWrapperNode> image2NodeLayoutWrapper = AceType::MakeRefPtr<LayoutWrapperNode>(
imageNode2, image2NodeGeometryNode, imageNode2->GetLayoutProperty());
RefPtr<LayoutWrapperNode> image2NodeLayoutWrapper =
AceType::MakeRefPtr<LayoutWrapperNode>(imageNode2, image2NodeGeometryNode, imageNode2->GetLayoutProperty());
ASSERT_NE(image2NodeLayoutWrapper, nullptr);
layoutWrapper->AppendChild(image2NodeLayoutWrapper);
@ -4001,8 +3997,8 @@ HWTEST_F(CalendarPickerTestNg, CalendarPickerLayoutAlgorithmTest002, TestSize.Le
auto dayNode = AceType::DynamicCast<FrameNode>(contentFrameNode->GetOrCreateChildByIndex(4));
auto dayContentLayoutProperty = dayNode->GetLayoutProperty<TextLayoutProperty>();
RefPtr<GeometryNode> dayContentFrameNodeGeometryNode = AceType::MakeRefPtr<GeometryNode>();
RefPtr<LayoutWrapperNode> dayContentNodeLayoutWrapper = AceType::MakeRefPtr<LayoutWrapperNode>(
dayNode, dayContentFrameNodeGeometryNode, dayNode->GetLayoutProperty());
RefPtr<LayoutWrapperNode> dayContentNodeLayoutWrapper =
AceType::MakeRefPtr<LayoutWrapperNode>(dayNode, dayContentFrameNodeGeometryNode, dayNode->GetLayoutProperty());
ASSERT_NE(dayContentNodeLayoutWrapper, nullptr);
contentNodeLayoutWrapper->AppendChild(dayContentNodeLayoutWrapper);

View File

@ -14,24 +14,6 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("checkbox_test_ng") {
sources = [
"$ace_root/frameworks/core/components_ng/pattern/checkbox/checkbox_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/checkbox/checkbox_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/checkbox/checkbox_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/checkbox/checkbox_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/checkbox/checkbox_paint_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/checkbox/checkbox_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_paint_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/stage/page_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/stage/mock_page_pattern.cpp",
"checkbox_test_ng.cpp",
"mock_stage_manager.cpp",
]
type = "new"
sources = [ "checkbox_test_ng.cpp" ]
}

View File

@ -14,24 +14,6 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("checkboxgroup_test_ng") {
sources = [
"$ace_root/frameworks/core/components_ng/pattern/checkbox/checkbox_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/checkbox/checkbox_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/checkbox/checkbox_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/checkbox/checkbox_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/checkbox/checkbox_paint_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/checkbox/checkbox_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_paint_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/checkboxgroup/checkboxgroup_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/stage/page_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/stage/mock_page_pattern.cpp",
"checkboxgroup_test_ng.cpp",
"mock_stage_manager.cpp",
]
type = "new"
sources = [ "checkboxgroup_test_ng.cpp" ]
}

View File

@ -14,10 +14,6 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("common_view_test_ng") {
sources = [
"$ace_root/frameworks/core/components_ng/pattern/common_view/common_view_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"common_view_test_ng.cpp",
]
type = "new"
sources = [ "common_view_test_ng.cpp" ]
}

View File

@ -11,67 +11,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("container_modal_test_ng") {
type = "new"
sources = [
# text
"$ace_root/frameworks/core/components_ng/pattern/text/image_span_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/span_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/span_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_styles.cpp",
#button
"$ace_root/frameworks/core/components_ng/pattern/button/button_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/toggle_button_pattern.cpp",
# image
"$ace_root/frameworks/core/components_ng/pattern/image/image_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_pattern.cpp",
# select_overlay
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/menu/mock_menu_wrapper_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/select_overlay/mock_select_overlay_node.cpp",
# mock
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_proxy.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/theme/mock_theme_constants.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/theme/mock_theme_utils.cpp",
"$ace_root/frameworks/core/components_ng/test/pattern/test_ng.cpp",
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"$ace_root/test/unittest/core/pipeline/mock_drag_drop_manager.cpp",
# other
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/stack/stack_layout_algorithm.cpp",
# self
"$ace_root/frameworks/core/components_ng/pattern/container_modal/container_modal_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/container_modal/container_modal_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/container_modal/container_modal_view.cpp",
"container_modal_test_ng.cpp",
]
}

View File

@ -11,56 +11,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("counter_pattern_test_ng") {
ace_unittest("counter_test_ng") {
type = "new"
sources = [
# text
"$ace_root/frameworks/core/components_ng/pattern/text/image_span_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/span_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/span_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_styles.cpp",
#button
"$ace_root/frameworks/core/components_ng/pattern/button/button_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/toggle_button_pattern.cpp",
# select_overlay
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/menu/mock_menu_wrapper_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/select_overlay/mock_select_overlay_node.cpp",
# mock
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_proxy.cpp",
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"$ace_root/test/unittest/core/pipeline/mock_drag_drop_manager.cpp",
# other
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
# self
"$ace_root/frameworks/core/components_ng/pattern/counter/counter_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/counter/counter_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/counter/counter_node.cpp",
"counter_pattern_test_ng.cpp",
"counter_test_ng.cpp",
]
}

View File

@ -41,7 +41,7 @@ const Color COLOR = Color::BLUE;
constexpr double DEFAULT_BUTTON_OPACITY = 1.0;
} // namespace
class CounterPatternTestNg : public testing::Test {
class CounterTestNg : public testing::Test {
public:
static void SetUpTestCase();
static void TearDownTestCase();
@ -49,23 +49,23 @@ public:
void TearDown() override;
};
void CounterPatternTestNg::SetUpTestCase()
void CounterTestNg::SetUpTestCase()
{
MockPipelineBase::SetUp();
}
void CounterPatternTestNg::TearDownTestCase()
void CounterTestNg::TearDownTestCase()
{
MockPipelineBase::TearDown();
}
void CounterPatternTestNg::SetUp() {}
void CounterPatternTestNg::TearDown() {}
void CounterTestNg::SetUp() {}
void CounterTestNg::TearDown() {}
/**
* @tc.name: CounterPatternTest001
* @tc.desc: Test counter Create function.
* @tc.type: FUNC
*/
HWTEST_F(CounterPatternTestNg, CounterPatternTest001, TestSize.Level1)
HWTEST_F(CounterTestNg, CounterPatternTest001, TestSize.Level1)
{
// create mock theme manager
auto themeManager = AceType::MakeRefPtr<MockThemeManager>();
@ -87,7 +87,7 @@ HWTEST_F(CounterPatternTestNg, CounterPatternTest001, TestSize.Level1)
* @tc.desc: Test counter SetOnInc and SetOnDec function.
* @tc.type: FUNC
*/
HWTEST_F(CounterPatternTestNg, CounterPatternTest002, TestSize.Level1)
HWTEST_F(CounterTestNg, CounterPatternTest002, TestSize.Level1)
{
// create mock theme manager
auto themeManager = AceType::MakeRefPtr<MockThemeManager>();
@ -110,7 +110,7 @@ HWTEST_F(CounterPatternTestNg, CounterPatternTest002, TestSize.Level1)
* @tc.desc: Test counter SetHeight and SetWidth function.
* @tc.type: FUNC
*/
HWTEST_F(CounterPatternTestNg, CounterPatternTest003, TestSize.Level1)
HWTEST_F(CounterTestNg, CounterPatternTest003, TestSize.Level1)
{
// create mock theme manager
auto themeManager = AceType::MakeRefPtr<MockThemeManager>();
@ -136,7 +136,7 @@ HWTEST_F(CounterPatternTestNg, CounterPatternTest003, TestSize.Level1)
* @tc.desc: Test counter SetControlWidth, SetStateChange and SetBackgroundColor function.
* @tc.type: FUNC
*/
HWTEST_F(CounterPatternTestNg, CounterPatternTest004, TestSize.Level1)
HWTEST_F(CounterTestNg, CounterPatternTest004, TestSize.Level1)
{
// create mock theme manager
auto themeManager = AceType::MakeRefPtr<MockThemeManager>();
@ -160,7 +160,7 @@ HWTEST_F(CounterPatternTestNg, CounterPatternTest004, TestSize.Level1)
* @tc.desc: Test CounterNode AddChildToGroup function.
* @tc.type: FUNC
*/
HWTEST_F(CounterPatternTestNg, CounterPatternTest005, TestSize.Level1)
HWTEST_F(CounterTestNg, CounterPatternTest005, TestSize.Level1)
{
CounterModelNG counterModelNG;
counterModelNG.Create();
@ -180,7 +180,7 @@ HWTEST_F(CounterPatternTestNg, CounterPatternTest005, TestSize.Level1)
* @tc.desc: Test CounterNode DeleteChildFromGroup function.
* @tc.type: FUNC
*/
HWTEST_F(CounterPatternTestNg, CounterPatternTest006, TestSize.Level1)
HWTEST_F(CounterTestNg, CounterPatternTest006, TestSize.Level1)
{
CounterModelNG counterModelNG;
counterModelNG.Create();
@ -202,7 +202,7 @@ HWTEST_F(CounterPatternTestNg, CounterPatternTest006, TestSize.Level1)
* @tc.desc: Test counter SetEnableInc function.
* @tc.type: FUNC
*/
HWTEST_F(CounterPatternTestNg, CounterPatternTest007, TestSize.Level1)
HWTEST_F(CounterTestNg, CounterPatternTest007, TestSize.Level1)
{
auto themeManager = AceType::MakeRefPtr<MockThemeManager>();
MockPipelineBase::GetCurrent()->SetThemeManager(themeManager);
@ -235,7 +235,7 @@ HWTEST_F(CounterPatternTestNg, CounterPatternTest007, TestSize.Level1)
* @tc.desc: Test counter SetEnableDec function.
* @tc.type: FUNC
*/
HWTEST_F(CounterPatternTestNg, CounterPatternTest008, TestSize.Level1)
HWTEST_F(CounterTestNg, CounterPatternTest008, TestSize.Level1)
{
auto themeManager = AceType::MakeRefPtr<MockThemeManager>();
MockPipelineBase::GetCurrent()->SetThemeManager(themeManager);
@ -268,7 +268,7 @@ HWTEST_F(CounterPatternTestNg, CounterPatternTest008, TestSize.Level1)
* @tc.desc: Test counter Create function.
* @tc.type: FUNC
*/
HWTEST_F(CounterPatternTestNg, CounterPatternTest009, TestSize.Level1)
HWTEST_F(CounterTestNg, CounterPatternTest009, TestSize.Level1)
{
ViewStackProcessor::GetInstance()->StartGetAccessRecordingFor(100);
CounterModelNG counterModelNG;
@ -277,7 +277,7 @@ HWTEST_F(CounterPatternTestNg, CounterPatternTest009, TestSize.Level1)
ASSERT_NE(counterNode, nullptr);
/**
* Create again,cover all branches in function Create
*/
*/
ViewStackProcessor::GetInstance()->StartGetAccessRecordingFor(100);
counterModelNG.Create();
}
@ -287,13 +287,13 @@ HWTEST_F(CounterPatternTestNg, CounterPatternTest009, TestSize.Level1)
* @tc.desc: Test counter Create function.
* @tc.type: FUNC
*/
HWTEST_F(CounterPatternTestNg, CounterPatternTest010, TestSize.Level1)
HWTEST_F(CounterTestNg, CounterPatternTest010, TestSize.Level1)
{
auto columnNode = CounterNode::GetOrCreateCounterNode(
"Column", 100, []() { return AceType::MakeRefPtr<CounterPattern>(); });
auto columnNode =
CounterNode::GetOrCreateCounterNode("Column", 100, []() { return AceType::MakeRefPtr<CounterPattern>(); });
ASSERT_NE(columnNode, nullptr);
auto subNode = CounterNode::GetOrCreateCounterNode(
"Column", 101, []() { return AceType::MakeRefPtr<CounterPattern>(); });
auto subNode =
CounterNode::GetOrCreateCounterNode("Column", 101, []() { return AceType::MakeRefPtr<CounterPattern>(); });
ASSERT_NE(subNode, nullptr);
subNode->MountToParent(columnNode);
CounterNode::GetOrCreateCounterNode("Counter", 101, []() { return AceType::MakeRefPtr<CounterPattern>(); });

View File

@ -14,13 +14,6 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("custom_test_ng") {
sources = [
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_measure_layout_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_node_base.cpp",
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_node_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_node_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"custom_test_ng.cpp",
]
type = "new"
sources = [ "custom_test_ng.cpp" ]
}

View File

@ -29,7 +29,6 @@ ohos_unittest("custom_paint_test_ng") {
]
deps = [
"$ace_root/build:ace_ohos_unittest_base",
"$ace_root/frameworks/core/components_ng/base:ace_core_components_base_ng_ohos",
"$ace_root/test/unittest:ace_engine_unittest_flutter_deps",
"//third_party/googletest:gmock_main",

View File

@ -14,14 +14,6 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("data_panel_test_ng") {
sources = [
"$ace_root/frameworks/core/components_ng/pattern/data_panel/data_panel_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/data_panel/data_panel_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/data_panel/data_panel_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/data_panel/data_panel_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/data_panel/data_panel_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"data_panel_test_ng.cpp",
]
type = "new"
sources = [ "data_panel_test_ng.cpp" ]
}

View File

@ -16,96 +16,9 @@ import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("dialog_test_ng") {
flutter_skia = true
render = true
type = "new"
sources = [
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/toggle_button_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/dialog/alert_dialog_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/dialog/dialog_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/dialog/dialog_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/pattern/dialog/dialog_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/dialog/dialog_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/dialog/dialog_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/divider/divider_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/divider/divider_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/divider/divider_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/divider/divider_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_group_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_group_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_group_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_group_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_group_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_lanes_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_position_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/relative_container/relative_container_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/relative_container/relative_container_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_effect.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_painter.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/inner/scroll_bar_painter.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_position_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_spring_effect.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/proxy/scroll_bar_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/image_span_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/span_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/span_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_styles.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_stage_manager.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_manager.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_proxy.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/menu/mock_menu_wrapper_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/navigation/mock_menu_view.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scroll/mock_scroll_bar_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scrollable/moc_refresh_coordination.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scrollable/mock_scrollable_pattern.cpp",
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"$ace_root/test/mock/frameworks/base/log/mock_jank_frame_report.cpp",
"$ace_root/test/unittest/core/pipeline/mock_overlay_manager.cpp",
"dialog_test_ng.cpp",
]
}

View File

@ -11,20 +11,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("divider_pattern_test_ng") {
sources = [
# other
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
# self
"$ace_root/frameworks/core/components_ng/pattern/divider/divider_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/divider/divider_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/divider/divider_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/divider/divider_pattern.cpp",
"divider_pattern_test_ng.cpp",
]
ace_unittest("divider_test_ng") {
type = "new"
sources = [ "divider_test_ng.cpp" ]
}

View File

@ -25,9 +25,9 @@
#include "core/components_ng/pattern/divider/divider_model_ng.h"
#include "core/components_ng/pattern/divider/divider_pattern.h"
#include "core/components_ng/pattern/divider/divider_render_property.h"
#include "core/pipeline_ng/test/mock/mock_pipeline_base.h"
#include "core/components_ng/test/mock/rosen/mock_canvas.h"
#include "core/components_ng/test/mock/theme/mock_theme_manager.h"
#include "core/pipeline_ng/test/mock/mock_pipeline_base.h"
using namespace testing;
using namespace testing::ext;
@ -51,7 +51,7 @@ TestProperty testProperty;
DirtySwapConfig config;
} // namespace
class DividerPatternTestNg : public testing::Test {
class DividerTestNg : public testing::Test {
public:
static void SetUpTestCase();
static void TearDownTestCase();
@ -60,7 +60,7 @@ protected:
static RefPtr<FrameNode> CreateDividerNode(TestProperty& testProperty);
};
void DividerPatternTestNg::SetUpTestCase()
void DividerTestNg::SetUpTestCase()
{
MockPipelineBase::SetUp();
testProperty.vertical = VERTICAL_TRUE;
@ -69,12 +69,12 @@ void DividerPatternTestNg::SetUpTestCase()
testProperty.lineCap = LINE_CAP;
}
void DividerPatternTestNg::TearDownTestCase()
void DividerTestNg::TearDownTestCase()
{
MockPipelineBase::TearDown();
}
RefPtr<FrameNode> DividerPatternTestNg::CreateDividerNode(TestProperty& testProperty)
RefPtr<FrameNode> DividerTestNg::CreateDividerNode(TestProperty& testProperty)
{
DividerModelNG().Create();
if (testProperty.vertical.has_value()) {
@ -99,7 +99,7 @@ RefPtr<FrameNode> DividerPatternTestNg::CreateDividerNode(TestProperty& testProp
* @tc.desc: Test all the property of divider.
* @tc.type: FUNC
*/
HWTEST_F(DividerPatternTestNg, DividerPatternTest001, TestSize.Level1)
HWTEST_F(DividerTestNg, DividerPatternTest001, TestSize.Level1)
{
/**
* @tc.steps: step1. create frameNode
@ -126,7 +126,7 @@ HWTEST_F(DividerPatternTestNg, DividerPatternTest001, TestSize.Level1)
* @tc.desc: Test all the layoutAlgorithm of divider
* @tc.type: FUNC
*/
HWTEST_F(DividerPatternTestNg, DividerPatternTest002, TestSize.Level1)
HWTEST_F(DividerTestNg, DividerPatternTest002, TestSize.Level1)
{
bool vertical[2] = { VERTICAL_TRUE, VERTICAL_FALSE };
testProperty.strokeWidth = STROKE_WIDTH;
@ -161,7 +161,7 @@ HWTEST_F(DividerPatternTestNg, DividerPatternTest002, TestSize.Level1)
* @tc.desc: Test all the pattern of divider
* @tc.type: FUNC
*/
HWTEST_F(DividerPatternTestNg, DividerPatternTest003, TestSize.Level1)
HWTEST_F(DividerTestNg, DividerPatternTest003, TestSize.Level1)
{
RefPtr<DividerLayoutAlgorithm> dividerLayoutAlgorithm = AceType::MakeRefPtr<DividerLayoutAlgorithm>();
RefPtr<FrameNode> frameNode = CreateDividerNode(testProperty);
@ -173,7 +173,7 @@ HWTEST_F(DividerPatternTestNg, DividerPatternTest003, TestSize.Level1)
auto layoutWrapper = AceType::MakeRefPtr<LayoutWrapperNode>(frameNode, geometryNode, layoutProperty);
EXPECT_NE(layoutWrapper, nullptr);
bool skipMeasures[2] = { false, true };
bool isSwaps[4] = {true, false, false, false};
bool isSwaps[4] = { true, false, false, false };
/**
* @tc.steps: step1. OnDirtyLayoutWrapperSwap test
* @tc.expected: step1. adjust skipMeasure and config, OnDirtyLayoutWrapperSwap return true, false
@ -200,7 +200,7 @@ HWTEST_F(DividerPatternTestNg, DividerPatternTest003, TestSize.Level1)
* @tc.desc: Test the dynamic effect of the Divider
* @tc.type: FUNC
*/
HWTEST_F(DividerPatternTestNg, DividerModifierTest001, TestSize.Level1)
HWTEST_F(DividerTestNg, DividerModifierTest001, TestSize.Level1)
{
DividerModifier dividerModifier;
Testing::MockCanvas rsCanvas;
@ -214,7 +214,7 @@ HWTEST_F(DividerPatternTestNg, DividerModifierTest001, TestSize.Level1)
* @tc.desc: Test layoutAlgorithm of divider with testProperty.vertical = VERTICAL_TRUE
* @tc.type: FUNC
*/
HWTEST_F(DividerPatternTestNg, DivideAlgorithmTest001, TestSize.Level1)
HWTEST_F(DividerTestNg, DivideAlgorithmTest001, TestSize.Level1)
{
testProperty.strokeWidth = STROKE_WIDTH;
testProperty.vertical = VERTICAL_TRUE;
@ -225,7 +225,7 @@ HWTEST_F(DividerPatternTestNg, DivideAlgorithmTest001, TestSize.Level1)
auto themeManager = AceType::MakeRefPtr<MockThemeManager>();
MockPipelineBase::GetCurrent()->SetThemeManager(themeManager);
EXPECT_CALL(*themeManager, GetTheme(_)).WillOnce(Return(AceType::MakeRefPtr<DividerTheme>()));
RefPtr<FrameNode> frameNode = CreateDividerNode(testProperty);
EXPECT_NE(frameNode, nullptr);
RefPtr<GeometryNode> geometryNode = AceType::MakeRefPtr<GeometryNode>();
@ -244,7 +244,7 @@ HWTEST_F(DividerPatternTestNg, DivideAlgorithmTest001, TestSize.Level1)
* @tc.desc: Test layoutAlgorithm of divider with testProperty.vertical = VERTICAL_FALSE
* @tc.type: FUNC
*/
HWTEST_F(DividerPatternTestNg, DivideAlgorithmTest002, TestSize.Level1)
HWTEST_F(DividerTestNg, DivideAlgorithmTest002, TestSize.Level1)
{
testProperty.strokeWidth = STROKE_WIDTH;
testProperty.vertical = VERTICAL_FALSE;
@ -255,7 +255,7 @@ HWTEST_F(DividerPatternTestNg, DivideAlgorithmTest002, TestSize.Level1)
auto themeManager = AceType::MakeRefPtr<MockThemeManager>();
MockPipelineBase::GetCurrent()->SetThemeManager(themeManager);
EXPECT_CALL(*themeManager, GetTheme(_)).WillOnce(Return(AceType::MakeRefPtr<DividerTheme>()));
RefPtr<FrameNode> frameNode = CreateDividerNode(testProperty);
EXPECT_NE(frameNode, nullptr);
RefPtr<GeometryNode> geometryNode = AceType::MakeRefPtr<GeometryNode>();
@ -272,7 +272,7 @@ HWTEST_F(DividerPatternTestNg, DivideAlgorithmTest002, TestSize.Level1)
* @tc.desc: Test layoutAlgorithm of divider with testProperty.vertical = VERTICAL_FALSE and no selfIdealSize
* @tc.type: FUNC
*/
HWTEST_F(DividerPatternTestNg, DivideAlgorithmTest003, TestSize.Level1)
HWTEST_F(DividerTestNg, DivideAlgorithmTest003, TestSize.Level1)
{
testProperty.strokeWidth = STROKE_WIDTH;
testProperty.vertical = VERTICAL_FALSE;
@ -282,7 +282,7 @@ HWTEST_F(DividerPatternTestNg, DivideAlgorithmTest003, TestSize.Level1)
auto themeManager = AceType::MakeRefPtr<MockThemeManager>();
MockPipelineBase::GetCurrent()->SetThemeManager(themeManager);
EXPECT_CALL(*themeManager, GetTheme(_)).WillOnce(Return(AceType::MakeRefPtr<DividerTheme>()));
RefPtr<FrameNode> frameNode = CreateDividerNode(testProperty);
EXPECT_NE(frameNode, nullptr);
RefPtr<GeometryNode> geometryNode = AceType::MakeRefPtr<GeometryNode>();
@ -299,7 +299,7 @@ HWTEST_F(DividerPatternTestNg, DivideAlgorithmTest003, TestSize.Level1)
* @tc.desc: Test layoutAlgorithm of divider with testProperty.vertical = VERTICAL_TRUE and no selfIdealSize
* @tc.type: FUNC
*/
HWTEST_F(DividerPatternTestNg, DivideAlgorithmTest004, TestSize.Level1)
HWTEST_F(DividerTestNg, DivideAlgorithmTest004, TestSize.Level1)
{
testProperty.strokeWidth = STROKE_WIDTH;
testProperty.vertical = VERTICAL_TRUE;
@ -309,7 +309,7 @@ HWTEST_F(DividerPatternTestNg, DivideAlgorithmTest004, TestSize.Level1)
auto themeManager = AceType::MakeRefPtr<MockThemeManager>();
MockPipelineBase::GetCurrent()->SetThemeManager(themeManager);
EXPECT_CALL(*themeManager, GetTheme(_)).WillOnce(Return(AceType::MakeRefPtr<DividerTheme>()));
RefPtr<FrameNode> frameNode = CreateDividerNode(testProperty);
EXPECT_NE(frameNode, nullptr);
RefPtr<GeometryNode> geometryNode = AceType::MakeRefPtr<GeometryNode>();

View File

@ -11,23 +11,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("flex_test_ng") {
sources = [
#button
"$ace_root/frameworks/core/components_ng/pattern/button/button_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/toggle_button_pattern.cpp",
# other
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
# self
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/wrap_layout_algorithm.cpp",
"flex_test_ng.cpp",
]
type = "new"
sources = [ "flex_test_ng.cpp" ]
}

View File

@ -17,44 +17,17 @@ import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("form_test_ng") {
flutter_skia = true
render = true
type = "new"
sources = [
# image
"$ace_root/frameworks/core/components_ng/pattern/image/image_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_pattern.cpp",
# select_overlay
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/menu/mock_menu_wrapper_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/select_overlay/mock_select_overlay_node.cpp",
#mock
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_proxy.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/select_overlay/mock_select_overlay_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/test/pattern/form/mock/mock_form_manager_delegate.cpp",
"$ace_root/frameworks/core/components_ng/test/pattern/form/mock/mock_rosen_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/pattern/form/mock/mock_rs_surface_mode.cpp",
"$ace_root/frameworks/core/components_ng/test/pattern/form/mock/mock_sub_container.cpp",
"$ace_root/test/unittest/core/pipeline/mock_drag_drop_manager.cpp",
# other
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
#self
"$ace_root/frameworks/core/common/form_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/form/form_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/form/form_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/form/form_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/pattern/form/mock/mock_form_manager_delegate.cpp",
"$ace_root/frameworks/core/components_ng/test/pattern/form/mock/mock_rosen_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/pattern/form/mock/mock_rs_surface_mode.cpp",
"$ace_root/frameworks/core/components_ng/test/pattern/form/mock/mock_sub_container.cpp",
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"form_test_ng.cpp",
]

View File

@ -14,42 +14,10 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("gauge_test_ng") {
type = "new"
sources = [
"$ace_root/frameworks/core/common/font_loader.cpp",
"$ace_root/frameworks/core/common/font_manager.cpp",
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/gauge/gauge_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/gauge/gauge_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/gauge/gauge_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/gauge/gauge_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/gauge/gauge_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/span_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_styles.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_manager.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_proxy.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/select_overlay/mock_select_overlay_proxy.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/menu/mock_menu_wrapper_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/select_overlay/mock_select_overlay_node.cpp",
"gauge_test_ng.cpp",
]
}

View File

@ -18,67 +18,72 @@ ohos_unittest("grid_test_ng") {
module_out_path = pattern_test_output_path
sources = [
#button
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/test/mock/mock_animatable_dimension.cpp",
"$ace_root/frameworks/base/test/mock/mock_ressched_report.cpp",
"$ace_root/frameworks/base/test/mock/mock_system_properties.cpp",
"$ace_root/frameworks/base/utils/base_id.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
"$ace_root/frameworks/base/utils/time_util.cpp",
"$ace_root/frameworks/bridge/common/dom/dom_type.cpp",
"$ace_root/frameworks/bridge/common/utils/utils.cpp",
"$ace_root/frameworks/bridge/js_frontend/engine/common/js_constants.cpp",
"$ace_root/frameworks/core/animation/anticipate_curve.cpp",
"$ace_root/frameworks/core/animation/chain_animation.cpp",
"$ace_root/frameworks/core/animation/cubic_curve.cpp",
"$ace_root/frameworks/core/animation/curves.cpp",
"$ace_root/frameworks/core/animation/friction_motion.cpp",
"$ace_root/frameworks/core/animation/spring_curve.cpp",
"$ace_root/frameworks/core/animation/spring_model.cpp",
"$ace_root/frameworks/core/animation/spring_motion.cpp",
"$ace_root/frameworks/core/animation/test/mock/mock_animator.cpp",
"$ace_root/frameworks/core/animation/test/mock/mock_scheduler.cpp",
"$ace_root/frameworks/core/common/container_scope.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_column_info.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_container_info.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_system_manager.cpp",
"$ace_root/frameworks/core/components/common/layout/screen_system_manager.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components/test/unittest/mock/ace_trace_mock.cpp",
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/inspector.cpp",
"$ace_root/frameworks/core/components_ng/base/modifier.cpp",
"$ace_root/frameworks/core/components_ng/base/ui_node.cpp",
"$ace_root/frameworks/core/components_ng/base/view_abstract.cpp",
"$ace_root/frameworks/core/components_ng/base/view_stack_processor.cpp",
"$ace_root/frameworks/core/components_ng/event/event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/focus_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/gesture_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/scrollable_event.cpp",
"$ace_root/frameworks/core/components_ng/event/state_style_manager.cpp",
"$ace_root/frameworks/core/components_ng/gestures/gesture_referee.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/click_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/exclusive_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/gesture_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/multi_fingers_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/parallel_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/recognizer_group.cpp",
"$ace_root/frameworks/core/components_ng/layout/box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_property.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_builder.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_node.cpp",
"$ace_root/frameworks/core/components_ng/manager/safe_area/safe_area_manager.cpp",
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/toggle_button_pattern.cpp",
# text
"$ace_root/frameworks/core/components_ng/pattern/text/text_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_styles.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/text/mock_text_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/text/mock_text_pattern.cpp",
# select_overlay
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/menu/mock_menu_wrapper_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/popup/mock_popup_base_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/select_overlay/mock_select_overlay_node.cpp",
# Scroll
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_effect.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/inner/scroll_bar.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_spring_effect.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/proxy/scroll_bar_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scrollable/scrollable_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scrollable/scrollable_paint_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scrollable/scrollable_pattern.cpp",
# mock
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_proxy.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scroll/mock_scroll_bar_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scrollable/moc_refresh_coordination.cpp",
"$ace_root/frameworks/core/components_ng/test/pattern/test_ng.cpp",
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"$ace_root/test/mock/frameworks/base/log/mock_jank_frame_report.cpp",
"$ace_root/test/unittest/core/pipeline/mock_drag_drop_manager.cpp",
# other
"$ace_root/frameworks/core/animation/friction_motion.cpp",
"$ace_root/frameworks/core/animation/spring_curve.cpp",
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/property/templates_parser.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/nav_bar/mock_nav_bar_pattern.cpp",
# self
"$ace_root/frameworks/core/components_ng/pattern/grid/grid_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid/grid_adaptive/grid_adaptive_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid/grid_event_hub.cpp",
@ -96,64 +101,43 @@ ohos_unittest("grid_test_ng") {
"$ace_root/frameworks/core/components_ng/pattern/grid/grid_scroll/grid_scroll_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid/grid_scroll/grid_scroll_with_options_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid/grid_utils.cpp",
"$ace_root/frameworks/core/components_v2/grid/grid_event.cpp",
"grid_test_ng.cpp",
]
sources += [
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/utils/base_id.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
"$ace_root/frameworks/base/utils/time_util.cpp",
"$ace_root/frameworks/bridge/common/dom/dom_type.cpp",
"$ace_root/frameworks/bridge/common/utils/utils.cpp",
"$ace_root/frameworks/bridge/js_frontend/engine/common/js_constants.cpp",
"$ace_root/frameworks/core/animation/anticipate_curve.cpp",
"$ace_root/frameworks/core/animation/chain_animation.cpp",
"$ace_root/frameworks/core/animation/cubic_curve.cpp",
"$ace_root/frameworks/core/animation/curves.cpp",
"$ace_root/frameworks/core/animation/spring_model.cpp",
"$ace_root/frameworks/core/animation/spring_motion.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_column_info.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_container_info.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_system_manager.cpp",
"$ace_root/frameworks/core/components/common/layout/screen_system_manager.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/event/scrollable_event.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/click_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_node.cpp",
"$ace_root/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp",
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
"$ace_root/frameworks/core/pipeline/base/constants.cpp",
# components_ng_base
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/inspector.cpp",
"$ace_root/frameworks/core/components_ng/base/modifier.cpp",
"$ace_root/frameworks/core/components_ng/base/ui_node.cpp",
"$ace_root/frameworks/core/components_ng/base/view_abstract.cpp",
"$ace_root/frameworks/core/components_ng/base/view_stack_processor.cpp",
# components_ng_render
"$ace_root/frameworks/core/components_ng/render/divider_painter.cpp",
"$ace_root/frameworks/core/components_ng/render/paint_wrapper.cpp",
# components_ng_layout
"$ace_root/frameworks/core/components_ng/layout/box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_property.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_builder.cpp",
# components_ng_manager
"$ace_root/frameworks/core/components_ng/manager/safe_area/safe_area_manager.cpp",
# components_ng_property
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/linear_layout/column_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/linear_layout/linear_layout_utils.cpp",
"$ace_root/frameworks/core/components_ng/pattern/linear_layout/row_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/loading_progress/loading_progress_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/loading_progress/loading_progress_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/loading_progress/loading_progress_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/loading_progress/loading_progress_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/refresh/refresh_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/refresh/refresh_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/refresh/refresh_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/refresh/refresh_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_effect.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/inner/scroll_bar.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_spring_effect.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/proxy/scroll_bar_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scrollable/refresh_coordination.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scrollable/scrollable_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scrollable/scrollable_paint_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scrollable/scrollable_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_styles.cpp",
"$ace_root/frameworks/core/components_ng/property/accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/property/border_property.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
@ -161,34 +145,11 @@ ohos_unittest("grid_test_ng") {
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_ng/property/property.cpp",
"$ace_root/frameworks/core/components_ng/property/safe_area_insets.cpp",
# components_ng_syntax
"$ace_root/frameworks/core/components_ng/property/templates_parser.cpp",
"$ace_root/frameworks/core/components_ng/render/divider_painter.cpp",
"$ace_root/frameworks/core/components_ng/render/paint_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/syntax/for_each_node.cpp",
# components_ng_event
"$ace_root/frameworks/core/components_ng/event/event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/focus_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/gesture_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/state_style_manager.cpp",
# components_ng_gestures
"$ace_root/frameworks/core/components_ng/gestures/gesture_referee.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/exclusive_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/gesture_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/multi_fingers_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/parallel_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/recognizer_group.cpp",
# mock
"$ace_root/frameworks/base/test/mock/mock_animatable_dimension.cpp",
"$ace_root/frameworks/base/test/mock/mock_ressched_report.cpp",
"$ace_root/frameworks/base/test/mock/mock_system_properties.cpp",
"$ace_root/frameworks/core/animation/test/mock/mock_animator.cpp",
"$ace_root/frameworks/core/animation/test/mock/mock_scheduler.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components/test/unittest/mock/ace_trace_mock.cpp",
"$ace_root/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_drag_event.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_long_press_event.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_pan_event.cpp",
@ -197,21 +158,32 @@ ohos_unittest("grid_test_ng") {
"$ace_root/frameworks/core/components_ng/test/mock/animation/mock_geometry_transition.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_pan_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/image_provider/mock_image_source_info.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_proxy.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/menu/mock_menu_wrapper_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/nav_bar/mock_nav_bar_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/popup/mock_popup_base_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scroll/mock_scroll_bar_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scroll/mock_scroll_bar_painter.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scroll/mock_scroll_fade_painter.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/select_overlay/mock_select_overlay_node.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/text/mock_text_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/text/mock_text_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_animation_utils.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_drawing_convertor.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_modifier_adapter.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context_creator.cpp",
"$ace_root/frameworks/core/components_ng/test/pattern/test_ng.cpp",
"$ace_root/frameworks/core/components_v2/grid/grid_event.cpp",
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
"$ace_root/frameworks/core/pipeline/base/constants.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_element_register.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"$ace_root/test/mock/base/mock_jank_frame_report.cpp",
"$ace_root/test/mock/core/common/mock_container.cpp",
# linear_layout
"$ace_root/frameworks/core/components_ng/pattern/linear_layout/column_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/linear_layout/linear_layout_utils.cpp",
"$ace_root/frameworks/core/components_ng/pattern/linear_layout/row_model_ng.cpp",
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"$ace_root/test/unittest/core/pipeline/mock_drag_drop_manager.cpp",
"grid_test_ng.cpp",
]
deps = [

View File

@ -11,19 +11,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("grid_col_pattern_test_ng") {
sources = [
# other
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
# self
"$ace_root/frameworks/core/components_ng/pattern/grid_col/grid_col_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_col/grid_col_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_col/grid_col_model_ng.cpp",
"grid_col_pattern_test_ng.cpp",
]
ace_unittest("grid_col_test_ng") {
type = "new"
sources = [ "grid_col_test_ng.cpp" ]
}

View File

@ -29,7 +29,7 @@ using namespace testing;
using namespace testing::ext;
namespace OHOS::Ace::NG {
class GridColPatternTestNg : public testing::Test {
class GridColTestNg : public testing::Test {
public:
static void SetUpTestCase();
static void TearDownTestCase();
@ -38,12 +38,12 @@ protected:
static RefPtr<FrameNode> CreateDividerNode(TestProperty& testProperty);
};
void GridColPatternTestNg::SetUpTestCase()
void GridColTestNg::SetUpTestCase()
{
MockPipelineBase::SetUp();
}
void GridColPatternTestNg::TearDownTestCase()
void GridColTestNg::TearDownTestCase()
{
MockPipelineBase::TearDown();
}
@ -53,11 +53,11 @@ void GridColPatternTestNg::TearDownTestCase()
* @tc.desc: Test the default values of GridCol's properties.
* @tc.type: FUNC
*/
HWTEST_F(GridColPatternTestNg, GridColDefault001, TestSize.Level1)
HWTEST_F(GridColTestNg, GridColDefault001, TestSize.Level1)
{
/**
* @tc.steps: step1. Create gridCol and Set properties.
*/
*/
GridColModelNG gridColModelNG;
gridColModelNG.Create();
auto testVal = AceType::MakeRefPtr<V2::GridContainerSize>(7);
@ -68,7 +68,7 @@ HWTEST_F(GridColPatternTestNg, GridColDefault001, TestSize.Level1)
/**
* @tc.steps: step2. Get frameNode, layoutProperty.
* @tc.expected: step2. Verify properties is correct.
*/
*/
auto frameNode = AceType::DynamicCast<FrameNode>(ViewStackProcessor::GetInstance()->Finish());
ASSERT_NE(frameNode, nullptr);
auto layoutProperty = frameNode->GetLayoutProperty<GridColLayoutProperty>();
@ -90,11 +90,11 @@ HWTEST_F(GridColPatternTestNg, GridColDefault001, TestSize.Level1)
* @tc.desc: Test GetPropValue function.
* @tc.type: FUNC
*/
HWTEST_F(GridColPatternTestNg, GridColDefault002, TestSize.Level1)
HWTEST_F(GridColTestNg, GridColDefault002, TestSize.Level1)
{
/**
* @tc.steps: step1. Create gridCol and get frameNode, layoutProperty.
*/
*/
GridColModelNG gridColModelNG;
gridColModelNG.Create();
auto frameNode = AceType::DynamicCast<FrameNode>(ViewStackProcessor::GetInstance()->Finish());
@ -104,7 +104,7 @@ HWTEST_F(GridColPatternTestNg, GridColDefault002, TestSize.Level1)
/**
* @tc.steps: step2. Verify GetPropValue func.
*/
*/
int32_t propValue;
const V2::GridContainerSize prop = V2::GridContainerSize(7);
propValue = layoutProperty->GetPropValue(prop, V2::GridSizeType::XS);

View File

@ -11,40 +11,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("grid_container_test_ng") {
type = "new"
sources = [
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/span_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_styles.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_manager.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_proxy.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/menu/mock_menu_wrapper_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/select_overlay/mock_select_overlay_node.cpp",
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
# self
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_model_ng.cpp",
"grid_container_test_ng.cpp",
]
}

View File

@ -14,18 +14,8 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("grid_row_test_ng") {
type = "new"
sources = [
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
# self
"$ace_root/frameworks/core/components_ng/pattern/grid_col/grid_col_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_col/grid_col_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_col/grid_col_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_row/grid_row_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_row/grid_row_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_row/grid_row_model_ng.cpp",
"$ace_root/frameworks/core/components_v2/grid_layout/grid_container_utils.cpp",
"grid_row_test_ng.cpp",
]

View File

@ -11,50 +11,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("hyperlink_test_ng") {
type = "new"
sources = [
# text
"$ace_root/frameworks/core/components_ng/pattern/text/image_span_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/span_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/span_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_styles.cpp",
# select_overlay
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/menu/mock_menu_wrapper_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/select_overlay/mock_select_overlay_node.cpp",
# mock
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_proxy.cpp",
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"$ace_root/test/unittest/core/pipeline/mock_drag_drop_manager.cpp",
# other
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
# self
"$ace_root/frameworks/core/components_ng/pattern/hyperlink/hyperlink_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/hyperlink/hyperlink_pattern.cpp",
"hyperlink_test_ng.cpp",
]
}

View File

@ -14,25 +14,9 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("image_test_ng") {
type = "new"
sources = [
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
# self
"$ace_root/frameworks/core/components_ng/pattern/image/image_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_pattern.cpp",
# mock
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_manager.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_proxy.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/select_overlay/mock_select_overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/select_overlay/mock_select_overlay_proxy.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/grid_container/mock_grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/select_overlay/mock_select_overlay_property.cpp",
# test
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"image_test_ng.cpp",
]
}

View File

@ -14,16 +14,9 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("image_animator_test_ng") {
type = "new"
sources = [
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image_animator/image_animator_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image_animator/image_animator_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/grid_container/mock_grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/pattern/image/mock/mock_image_pattern.cpp",
"$ace_root/test/mock/frameworks/base/log/mock_jank_frame_report.cpp",
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"image_animator_test_ng.cpp",
]
}

View File

@ -16,91 +16,10 @@ import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("indexer_test_ng") {
render = true
flutter_skia = true
type = "new"
sources = [
"$ace_root/frameworks/core/components/common/properties/text_style.cpp",
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/toggle_button_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/indexer/indexer_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/indexer/indexer_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/indexer/indexer_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/indexer/indexer_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/indexer/indexer_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_group_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_group_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_group_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_group_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_group_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_item_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_lanes_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_position_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_effect.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_painter.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/inner/scroll_bar_painter.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_position_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_spring_effect.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/proxy/scroll_bar_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/image_span_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/span_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/span_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_styles.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_stage_manager.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_manager.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_proxy.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/menu/mock_menu_wrapper_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/navigation/mock_menu_view.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scroll/mock_scroll_bar_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scrollable/moc_refresh_coordination.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scrollable/mock_scrollable_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/select_overlay/mock_select_overlay_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/test/pattern/test_ng.cpp",
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"$ace_root/test/mock/frameworks/base/log/mock_jank_frame_report.cpp",
"$ace_root/test/unittest/core/pipeline/mock_overlay_manager.cpp",
"indexer_test_ng.cpp",
]
}

View File

@ -14,14 +14,6 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("linear_layout_test_ng") {
sources = [
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
# self
"$ace_root/frameworks/core/components_ng/pattern/linear_layout/column_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/linear_layout/linear_layout_utils.cpp",
"$ace_root/frameworks/core/components_ng/pattern/linear_layout/row_model_ng.cpp",
"linear_layout_test_ng.cpp",
]
type = "new"
sources = [ "linear_layout_test_ng.cpp" ]
}

View File

@ -11,23 +11,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("linear_split_pattern_test_ng") {
sources = [
#other
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
#mock
"$ace_root/frameworks/base/test/mock/mock_mouse_style.cpp",
# self
"$ace_root/frameworks/core/components_ng/pattern/linear_split/linear_split_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/linear_split/linear_split_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/linear_split/linear_split_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/linear_split/linear_split_pattern.cpp",
"linear_split_pattern_test_ng.cpp",
]
ace_unittest("linear_split_test_ng") {
type = "new"
sources = [ "linear_split_test_ng.cpp" ]
}

View File

@ -51,32 +51,27 @@ constexpr int32_t PLATFORM_VERSION_10 = 10;
constexpr int32_t PLATFORM_VERSION_9 = 9;
} // namespace
class LinearSplitPatternTestNg : public testing::Test {
class LinearSplitTestNg : public testing::Test {
public:
static void SetUpTestCase();
static void TearDownTestCase();
void SetUp() override;
void TearDown() override;
static void SetUpTestSuite();
static void TearDownTestSuite();
};
void LinearSplitPatternTestNg::SetUpTestCase()
void LinearSplitTestNg::SetUpTestSuite()
{
MockPipelineBase::SetUp();
}
void LinearSplitPatternTestNg::TearDownTestCase()
void LinearSplitTestNg::TearDownTestSuite()
{
MockPipelineBase::TearDown();
}
void LinearSplitPatternTestNg::SetUp() {}
void LinearSplitPatternTestNg::TearDown() {}
/**
* @tc.name: LinearSplitCreatorTest001
* @tc.desc: Test all the property of split
* @tc.type: FUNC
*/
HWTEST_F(LinearSplitPatternTestNg, LinearSplitCreatorTest001, TestSize.Level1)
HWTEST_F(LinearSplitTestNg, LinearSplitCreatorTest001, TestSize.Level1)
{
/**
* @tc.steps: step1. Create split and initialize related properties.
@ -106,7 +101,7 @@ HWTEST_F(LinearSplitPatternTestNg, LinearSplitCreatorTest001, TestSize.Level1)
* @tc.desc: Test linearSplit pattern OnDirtyLayoutWrapperSwap function.
* @tc.type: FUNC
*/
HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest001, TestSize.Level1)
HWTEST_F(LinearSplitTestNg, LinearSplitPatternTest001, TestSize.Level1)
{
/**
* @tc.steps: step1. Create split and initialize related properties.
@ -135,7 +130,7 @@ HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest001, TestSize.Level1)
std::vector<float> dragSplitOffset;
std::vector<float> childrenDragPos;
RefPtr<LinearSplitLayoutAlgorithm> linearLayoutAlgorithm = AceType::MakeRefPtr<LinearSplitLayoutAlgorithm>(
SplitType::COLUMN_SPLIT, dragSplitOffset, childrenDragPos, false);
SplitType::COLUMN_SPLIT, dragSplitOffset, childrenDragPos, false);
/**
* @tc.steps: step3. call linearSplitPattern OnDirtyLayoutWrapperSwap function, compare result.
@ -166,7 +161,7 @@ HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest001, TestSize.Level1)
* @tc.desc: Test linearSplit pattern OnModifyDone function.
* @tc.type: FUNC
*/
HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest002, TestSize.Level1)
HWTEST_F(LinearSplitTestNg, LinearSplitPatternTest002, TestSize.Level1)
{
/**
* @tc.steps: step1. Create split and initialize related properties.
@ -199,7 +194,7 @@ HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest002, TestSize.Level1)
* @tc.desc: Test linerSplit pattern OnDirtyLayoutWrapperSwap function.
* @tc.type: FUNC
*/
HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest003, TestSize.Level1)
HWTEST_F(LinearSplitTestNg, LinearSplitPatternTest003, TestSize.Level1)
{
/**
* @tc.steps: step1. Create split and initialize related properties.
@ -231,7 +226,7 @@ HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest003, TestSize.Level1)
* @tc.desc: Test linerSplit pattern HandlePanEvent when resizeable is false.
* @tc.type: FUNC
*/
HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest004, TestSize.Level1)
HWTEST_F(LinearSplitTestNg, LinearSplitPatternTest004, TestSize.Level1)
{
std::vector<int32_t> platformVersions = { PLATFORM_VERSION_10, PLATFORM_VERSION_9 };
for (int32_t turn = 0; turn < platformVersions.size(); turn++) {
@ -275,7 +270,7 @@ HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest004, TestSize.Level1)
* @tc.desc: Test linerSplit pattern HandlePanEvent when resizeable is true.
* @tc.type: FUNC
*/
HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest005, TestSize.Level1)
HWTEST_F(LinearSplitTestNg, LinearSplitPatternTest005, TestSize.Level1)
{
/**
* @tc.steps: step1. Create split and initialize related properties.
@ -312,7 +307,7 @@ HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest005, TestSize.Level1)
* @tc.desc: Test LinearSplit Layout.
* @tc.type: FUNC
*/
HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest006, TestSize.Level1)
HWTEST_F(LinearSplitTestNg, LinearSplitPatternTest006, TestSize.Level1)
{
std::vector<SplitType> splitType = { SplitType::COLUMN_SPLIT, SplitType::ROW_SPLIT };
for (int turn = 0; turn < splitType.size(); turn++) {
@ -365,7 +360,7 @@ HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest006, TestSize.Level1)
* @tc.desc: Test ColumnSplit Layout with children nodes.
* @tc.type: FUNC
*/
HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest007, TestSize.Level1)
HWTEST_F(LinearSplitTestNg, LinearSplitPatternTest007, TestSize.Level1)
{
/**
* @tc.steps: step1. Create columnSplit and initialize related properties.
@ -391,7 +386,7 @@ HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest007, TestSize.Level1)
std::vector<float> dragSplitOffset;
std::vector<float> childrenDragPos;
RefPtr<LinearSplitLayoutAlgorithm> linearLayoutAlgorithm = AceType::MakeRefPtr<LinearSplitLayoutAlgorithm>(
SplitType::COLUMN_SPLIT, dragSplitOffset, childrenDragPos, false);
SplitType::COLUMN_SPLIT, dragSplitOffset, childrenDragPos, false);
RefPtr<LayoutAlgorithmWrapper> layoutAlgorithmWrapper =
AceType::MakeRefPtr<LayoutAlgorithmWrapper>(linearLayoutAlgorithm, false);
layoutWrapper->SetLayoutAlgorithm(layoutAlgorithmWrapper);
@ -456,8 +451,8 @@ HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest007, TestSize.Level1)
EXPECT_EQ(layoutWrapper->GetGeometryNode()->GetFrameSize(), SizeF(RK356_WIDTH, RK356_HEIGHT));
EXPECT_EQ(layoutWrapper->GetGeometryNode()->GetFrameOffset(), OFFSET_TOP_LEFT);
auto verticalRemaining = RK356_HEIGHT - SMALL_ITEM_HEIGHT * FIVE_ITEM_SIZE
- DEFAULT_SPLIT_HEIGHT * (FIVE_ITEM_SIZE - 1);
auto verticalRemaining =
RK356_HEIGHT - SMALL_ITEM_HEIGHT * FIVE_ITEM_SIZE - DEFAULT_SPLIT_HEIGHT * (FIVE_ITEM_SIZE - 1);
for (int32_t i = 0; i < FIVE_ITEM_SIZE; i++) {
auto childWrapper = layoutWrapper->GetOrCreateChildByIndex(i);
auto childSize = childWrapper->GetGeometryNode()->GetFrameSize();
@ -559,7 +554,7 @@ HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest007, TestSize.Level1)
* @tc.desc: Test RowSplit Layout with children nodes.
* @tc.type: FUNC
*/
HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest008, TestSize.Level1)
HWTEST_F(LinearSplitTestNg, LinearSplitPatternTest008, TestSize.Level1)
{
/**
* @tc.steps: step1. Create rowSplit and initialize related properties.
@ -650,8 +645,8 @@ HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest008, TestSize.Level1)
EXPECT_EQ(layoutWrapper->GetGeometryNode()->GetFrameSize(), SizeF(RK356_WIDTH, COLUMN_HEIGHT));
EXPECT_EQ(layoutWrapper->GetGeometryNode()->GetFrameOffset(), OFFSET_TOP_LEFT);
auto horizontalRemaining = RK356_WIDTH - FIVE_ITEM_SIZE * SMALL_ITEM_WIDTH
- DEFAULT_SPLIT_HEIGHT * (FIVE_ITEM_SIZE - 1);
auto horizontalRemaining =
RK356_WIDTH - FIVE_ITEM_SIZE * SMALL_ITEM_WIDTH - DEFAULT_SPLIT_HEIGHT * (FIVE_ITEM_SIZE - 1);
for (int32_t i = 0; i < FIVE_ITEM_SIZE; i++) {
auto childWrapper = layoutWrapper->GetOrCreateChildByIndex(i);
auto childSize = childWrapper->GetGeometryNode()->GetFrameSize();
@ -742,7 +737,7 @@ HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest008, TestSize.Level1)
* @tc.desc: Test linerSplit pattern HandleMouseEvent when resizeable is true.
* @tc.type: FUNC
*/
HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest009, TestSize.Level1)
HWTEST_F(LinearSplitTestNg, LinearSplitPatternTest009, TestSize.Level1)
{
/**
* @tc.steps: step1. Create columnSplit and initialize related properties.
@ -784,7 +779,7 @@ HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest009, TestSize.Level1)
* @tc.desc: Test RowSplit Layout with children nodes with API9.
* @tc.type: FUNC
*/
HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest010, TestSize.Level1)
HWTEST_F(LinearSplitTestNg, LinearSplitPatternTest010, TestSize.Level1)
{
/**
* @tc.steps: step1. Create rowSplit and initialize related properties.
@ -964,7 +959,7 @@ HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest009, TestSize.Level1)
* @tc.desc: Test ColumnSplit Layout with children nodes with API9.
* @tc.type: FUNC
*/
HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest011, TestSize.Level1)
HWTEST_F(LinearSplitTestNg, LinearSplitPatternTest011, TestSize.Level1)
{
/**
* @tc.steps: step1. Create columnSplit and initialize related properties.
@ -990,7 +985,7 @@ HWTEST_F(LinearSplitPatternTestNg, LinearSplitPatternTest011, TestSize.Level1)
std::vector<float> dragSplitOffset;
std::vector<float> childrenDragPos;
RefPtr<LinearSplitLayoutAlgorithm> linearLayoutAlgorithm = AceType::MakeRefPtr<LinearSplitLayoutAlgorithm>(
SplitType::COLUMN_SPLIT, dragSplitOffset, childrenDragPos, false);
SplitType::COLUMN_SPLIT, dragSplitOffset, childrenDragPos, false);
RefPtr<LayoutAlgorithmWrapper> layoutAlgorithmWrapper =
AceType::MakeRefPtr<LayoutAlgorithmWrapper>(linearLayoutAlgorithm, false);
layoutWrapper->SetLayoutAlgorithm(layoutAlgorithmWrapper);

View File

@ -11,14 +11,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
common_sources = [
# inner
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/log/dump_log.cpp",
"$ace_root/frameworks/base/memory/memory_monitor.cpp",
"$ace_root/frameworks/base/test/mock/mock_animatable_dimension.cpp",
"$ace_root/frameworks/base/test/mock/mock_system_properties.cpp",
"$ace_root/frameworks/base/utils/base_id.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
@ -34,144 +35,52 @@ common_sources = [
"$ace_root/frameworks/core/animation/spring_curve.cpp",
"$ace_root/frameworks/core/animation/spring_model.cpp",
"$ace_root/frameworks/core/animation/spring_motion.cpp",
"$ace_root/frameworks/core/animation/test/mock/mock_animator.cpp",
"$ace_root/frameworks/core/animation/test/mock/mock_scheduler.cpp",
"$ace_root/frameworks/core/common/container_scope.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_column_info.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_container_info.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_system_manager.cpp",
"$ace_root/frameworks/core/components/common/layout/screen_system_manager.cpp",
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_node.cpp",
"$ace_root/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp",
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
"$ace_root/frameworks/core/pipeline/base/constants.cpp",
# components_ng_base
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/inspector.cpp",
"$ace_root/frameworks/core/components_ng/base/modifier.cpp",
"$ace_root/frameworks/core/components_ng/base/ui_node.cpp",
"$ace_root/frameworks/core/components_ng/base/view_stack_processor.cpp",
# components_ng_render
"$ace_root/frameworks/core/components_ng/render/divider_painter.cpp",
"$ace_root/frameworks/core/components_ng/render/paint_wrapper.cpp",
# components_ng_layout
"$ace_root/frameworks/core/components_ng/layout/box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_property.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_builder.cpp",
# components_ng_manager
"$ace_root/frameworks/core/components_ng/manager/safe_area/safe_area_manager.cpp",
# components_ng_property
"$ace_root/frameworks/core/components_ng/property/accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/property/border_property.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/grid_property.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_ng/property/property.cpp",
"$ace_root/frameworks/core/components_ng/property/safe_area_insets.cpp",
# components_ng_pattern
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
# components_ng_syntax
"$ace_root/frameworks/core/components_ng/syntax/for_each_node.cpp",
# components_ng_event
"$ace_root/frameworks/core/components_ng/event/event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/focus_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/gesture_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event.cpp",
"$ace_root/frameworks/core/components_ng/event/input_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/event/state_style_manager.cpp",
# components_ng_gestures
"$ace_root/frameworks/core/components_ng/gestures/gesture_referee.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/exclusive_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/gesture_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/multi_fingers_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/parallel_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/gestures/recognizers/recognizer_group.cpp",
# mock
"$ace_root/frameworks/base/test/mock/mock_animatable_dimension.cpp",
"$ace_root/frameworks/base/test/mock/mock_system_properties.cpp",
"$ace_root/frameworks/core/animation/test/mock/mock_animator.cpp",
"$ace_root/frameworks/core/animation/test/mock/mock_scheduler.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_drag_event.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_long_press_event.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_pan_event.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_scrollable_event.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_touch_event.cpp",
"$ace_root/frameworks/core/components_ng/test/event/scrollable_event/mock_scrollable.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/animation/mock_geometry_transition.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_pan_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/image_provider/mock_image_source_info.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_proxy.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/grid/mock_grid_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/grid/mock_grid_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/nav_bar/mock_nav_bar_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scroll/mock_scroll_bar_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scroll/mock_scroll_bar_painter.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scroll/mock_scroll_fade_painter.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scrollable/moc_refresh_coordination.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_animation_utils.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_drawing_convertor.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_modifier_adapter.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context_creator.cpp",
"$ace_root/frameworks/core/components_ng/test/pattern/test_ng.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_element_register.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"$ace_root/test/mock/core/common/mock_container.cpp",
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"$ace_root/test/mock/frameworks/base/log/mock_jank_frame_report.cpp",
"$ace_root/test/unittest/core/pipeline/mock_drag_drop_manager.cpp",
# text
"$ace_root/frameworks/core/components_ng/pattern/text/text_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_styles.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/text/mock_text_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/text/mock_text_pattern.cpp",
# scroll
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_effect.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/inner/scroll_bar.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_spring_effect.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/proxy/scroll_bar_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scrollable/scrollable_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scrollable/scrollable_paint_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scrollable/scrollable_pattern.cpp",
# button
"$ace_root/frameworks/core/components_ng/layout/box_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_property.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_builder.cpp",
"$ace_root/frameworks/core/components_ng/layout/layout_wrapper_node.cpp",
"$ace_root/frameworks/core/components_ng/manager/safe_area/safe_area_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/toggle_button_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/toggle_button_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/toggle_button_pattern.cpp",
# linear_layout
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/linear_layout/column_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/linear_layout/linear_layout_utils.cpp",
"$ace_root/frameworks/core/components_ng/pattern/linear_layout/row_model_ng.cpp",
# self
"$ace_root/frameworks/core/components_ng/pattern/list/list_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_event_hub.cpp",
@ -193,6 +102,75 @@ common_sources = [
"$ace_root/frameworks/core/components_ng/pattern/list/list_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_position_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/loading_progress/loading_progress_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/loading_progress/loading_progress_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/loading_progress/loading_progress_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/loading_progress/loading_progress_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/refresh/refresh_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/refresh/refresh_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/refresh/refresh_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/refresh/refresh_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_effect.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/inner/scroll_bar.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_spring_effect.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/proxy/scroll_bar_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scrollable/refresh_coordination.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scrollable/scrollable_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scrollable/scrollable_paint_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scrollable/scrollable_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_styles.cpp",
"$ace_root/frameworks/core/components_ng/property/accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/property/border_property.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/grid_property.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_ng/property/property.cpp",
"$ace_root/frameworks/core/components_ng/property/safe_area_insets.cpp",
"$ace_root/frameworks/core/components_ng/render/divider_painter.cpp",
"$ace_root/frameworks/core/components_ng/render/paint_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/syntax/for_each_node.cpp",
"$ace_root/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_drag_event.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_long_press_event.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_pan_event.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_scrollable_event.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_touch_event.cpp",
"$ace_root/frameworks/core/components_ng/test/event/scrollable_event/mock_scrollable.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/animation/mock_geometry_transition.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/gesture/recognizers/mock_pan_recognizer.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/image_provider/mock_image_source_info.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_proxy.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/grid/mock_grid_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/grid/mock_grid_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/nav_bar/mock_nav_bar_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scroll/mock_scroll_bar_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scroll/mock_scroll_bar_painter.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scroll/mock_scroll_fade_painter.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/text/mock_text_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/text/mock_text_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_animation_utils.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_drawing_convertor.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_modifier_adapter.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context_creator.cpp",
"$ace_root/frameworks/core/components_ng/test/pattern/test_ng.cpp",
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
"$ace_root/frameworks/core/pipeline/base/constants.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_element_register.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"$ace_root/test/mock/base/mock_jank_frame_report.cpp",
"$ace_root/test/mock/core/common/mock_container.cpp",
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"$ace_root/test/unittest/core/pipeline/mock_drag_drop_manager.cpp",
]
ohos_unittest("list_test_ng") {
@ -203,7 +181,6 @@ ohos_unittest("list_test_ng") {
sources = common_sources + test_sources
deps = [
"$ace_root/frameworks/base:ace_memory_monitor_ohos",
"$ace_root/test/unittest:ace_unittest_log",
"$ace_root/test/unittest:ace_unittest_trace",
"$cjson_root:cjson_static",

View File

@ -14,13 +14,6 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("loading_progress_test_ng") {
sources = [
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/loading_progress/loading_progress_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/loading_progress/loading_progress_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/loading_progress/loading_progress_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/loading_progress/loading_progress_pattern.cpp",
"loading_progress_test_ng.cpp",
]
type = "new"
sources = [ "loading_progress_test_ng.cpp" ]
}

View File

@ -14,29 +14,9 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("marquee_test_ng") {
type = "new"
flutter_skia = true
sources = [
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/marquee/marquee_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/marquee/marquee_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/marquee/marquee_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/marquee/marquee_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/span_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_styles.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_manager.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_proxy.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/select_overlay/mock_select_overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/select_overlay/mock_select_overlay_proxy.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/grid_container/mock_grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/select_overlay/mock_select_overlay_property.cpp",
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"marquee_test_ng.cpp",
]

View File

@ -14,82 +14,9 @@
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("menu_test_ng") {
type = "new"
sources = [
"$ace_root/frameworks/core/components/common/properties/shadow.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_item/menu_item_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_item/menu_item_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_item/menu_item_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_item/menu_item_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_item_group/menu_item_group_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_item_group/menu_item_group_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_item_group/menu_item_group_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_item_group/menu_item_group_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_item_group/menu_item_group_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/multi_menu_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/preview/menu_preview_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/preview/menu_preview_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/sub_menu_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/option/option_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/option/option_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/option/option_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/option/option_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/option/option_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_effect.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_painter.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/inner/scroll_bar_painter.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_position_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_spring_effect.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/proxy/scroll_bar_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/stage/page_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/pattern/stage/page_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/stage/page_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/stage/page_transition_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/stage/stage_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/image_span_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/span_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/span_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_styles.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_manager.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_proxy.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/select_overlay/mock_select_overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/select_overlay/mock_select_overlay_proxy.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scroll/mock_scroll_bar_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scrollable/moc_refresh_coordination.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scrollable/mock_scrollable_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/select_overlay/mock_select_overlay_property.cpp",
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"$ace_root/test/unittest/core/pipeline/mock_overlay_manager.cpp",
"menu_test_ng.cpp",
]
}

View File

@ -228,12 +228,12 @@ ohos_unittest("navigation_test_ng") {
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_element_register.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"$ace_root/test/mock/base/mock_frame_trace_adapter.cpp",
"$ace_root/test/mock/base/mock_jank_frame_report.cpp",
"$ace_root/test/mock/core/common/mock_ace_engine.cpp",
"$ace_root/test/mock/core/common/mock_container.cpp",
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"$ace_root/test/mock/core/render/mock_font_collection.cpp",
"$ace_root/test/mock/core/render/mock_paragraph.cpp",
"$ace_root/test/mock/frameworks/base/log/mock_jank_frame_report.cpp",
"$ace_root/test/unittest/core/pipeline/mock_overlay_manager.cpp",
"bar_item_test_ng.cpp",
"nav_bar_test_ng.cpp",

View File

@ -16,113 +16,11 @@ import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("navrouter_test_ng") {
render = true
flutter_skia = true
type = "new"
sources = [
# custom
"$ace_root/frameworks/base/test/mock/mock_mouse_style.cpp",
"$ace_root/frameworks/core/common/ime/text_input_proxy.cpp",
"$ace_root/frameworks/core/components/common/properties/border.cpp",
"$ace_root/frameworks/core/components/common/properties/border_edge.cpp",
"$ace_root/frameworks/core/components/common/properties/shadow.cpp",
"$ace_root/frameworks/core/components/test/unittest/mock/subwindow_mock.cpp",
"$ace_root/frameworks/core/components_ng/manager/drag_drop/drag_drop_manager.cpp",
"$ace_root/frameworks/core/components_ng/manager/drag_drop/drag_drop_proxy.cpp",
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/bubble/bubble_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/bubble/bubble_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/bubble/bubble_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/bubble/bubble_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/toggle_button_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_measure_layout_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_node_base.cpp",
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_node_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/custom/custom_node_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_item/menu_item_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/multi_menu_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/preview/menu_preview_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/preview/menu_preview_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/sub_menu_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/navigation/bar_item_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/navigation/bar_item_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/navigation/bar_item_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/navigation/nav_bar_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/navigation/nav_bar_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/navigation/nav_bar_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/navigation/navigation_group_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/navigation/navigation_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/navigation/navigation_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/navigation/navigation_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/navigation/navigation_stack.cpp",
"$ace_root/frameworks/core/components_ng/pattern/navigation/title_bar_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/navigation/title_bar_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/navigation/title_bar_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/navrouter/navdestination_group_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/navrouter/navdestination_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/navrouter/navdestination_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/navrouter/navdestination_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/navrouter/navrouter_group_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/navrouter/navrouter_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/navrouter/navrouter_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/option/option_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/option/option_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/option/option_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/option/option_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/option/option_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/overlay/overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_effect.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_painter.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/inner/scroll_bar_painter.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_spring_effect.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/proxy/scroll_bar_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scrollable/scrollable_paint_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scrollable/scrollable_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/search/search_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/pattern/search/search_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/stack/stack_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/stage/stage_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/span_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_styles.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text_field/text_field_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scroll/mock_scroll_bar_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scrollable/moc_refresh_coordination.cpp",
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"$ace_root/test/mock/frameworks/base/log/mock_jank_frame_report.cpp",
"navrouter_test_ng.cpp",
]
}

View File

@ -16,109 +16,8 @@ import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("option_test_ng") {
render = true
flutter_skia = true
type = "new"
sources = [
"$ace_root/frameworks/core/common/ime/text_input_proxy.cpp",
"$ace_root/frameworks/core/components/common/properties/shadow.cpp",
"$ace_root/frameworks/core/components_ng/manager/drag_drop/drag_drop_manager.cpp",
"$ace_root/frameworks/core/components_ng/manager/drag_drop/drag_drop_proxy.cpp",
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/manager/select_overlay/select_overlay_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/toggle_button_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/toggle_button_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/toggle_button_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/flex/wrap_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/grid_container/grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_item/menu_item_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_item/menu_item_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_item/menu_item_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_item/menu_item_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_item_group/menu_item_group_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_item_group/menu_item_group_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_item_group/menu_item_group_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_item_group/menu_item_group_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_item_group/menu_item_group_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/menu_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/multi_menu_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/preview/menu_preview_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/preview/menu_preview_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/sub_menu_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/menu/wrapper/menu_wrapper_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/option/option_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/option/option_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/option/option_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/option/option_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/option/option_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/overlay/overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_effect.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_painter.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/inner/scroll_bar_painter.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_position_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_spring_effect.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/proxy/scroll_bar_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scrollable/scrollable_paint_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scrollable/scrollable_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/search/search_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/pattern/search/search_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/search/search_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/search/search_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/search/search_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/stage/page_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/pattern/stage/page_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/stage/page_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/stage/page_transition_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/stage/stage_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/span_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/text_styles.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text_field/key_event_handler.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text_field/text_field_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text_field/text_field_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text_field/text_field_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text_field/text_field_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text_field/text_field_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text_field/text_field_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text_field/text_field_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text_field/text_field_paint_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text_field/text_field_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/nav_bar/mock_nav_bar_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scroll/mock_scroll_bar_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scrollable/moc_refresh_coordination.cpp",
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"option_test_ng.cpp",
]

View File

@ -11,16 +11,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ohos_unittest("overlay_manager_test_ng") {
module_out_path = pattern_test_output_path
sources = [
# other
# inner
"$ace_root/frameworks/base/subwindow/subwindow_manager.cpp",
"$ace_root/frameworks/base/test/mock/mock_animatable_dimension.cpp",
"$ace_root/frameworks/base/test/mock/mock_measure_util.cpp",
"$ace_root/frameworks/core/animation/anticipate_curve.cpp",
"$ace_root/frameworks/core/animation/chain_animation.cpp",
"$ace_root/frameworks/core/animation/cubic_curve.cpp",
@ -29,10 +28,13 @@ ohos_unittest("overlay_manager_test_ng") {
"$ace_root/frameworks/core/animation/spring_curve.cpp",
"$ace_root/frameworks/core/animation/spring_model.cpp",
"$ace_root/frameworks/core/animation/spring_motion.cpp",
"$ace_root/frameworks/core/animation/test/mock/mock_animator.cpp",
"$ace_root/frameworks/core/animation/test/mock/mock_scheduler.cpp",
"$ace_root/frameworks/core/common/ace_engine.cpp",
"$ace_root/frameworks/core/common/container.cpp",
"$ace_root/frameworks/core/common/container_scope.cpp",
"$ace_root/frameworks/core/common/frontend.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_watch_dog.cpp",
"$ace_root/frameworks/core/components/common/properties/border.cpp",
"$ace_root/frameworks/core/components/common/properties/border_edge.cpp",
"$ace_root/frameworks/core/components/common/properties/edge.cpp",
@ -87,7 +89,26 @@ ohos_unittest("overlay_manager_test_ng") {
"$ace_root/frameworks/core/components_ng/pattern/option/option_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/option/option_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/option/option_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/overlay/modal_presentation_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/overlay/overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/overlay/sheet_drag_bar_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/overlay/sheet_drag_bar_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/overlay/sheet_presentation_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/overlay/sheet_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/root/root_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_effect.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/inner/scroll_bar.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_spring_effect.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/proxy/scroll_bar_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scrollable/scrollable_paint_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scrollable/scrollable_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/stage/page_event_hub.cpp",
"$ace_root/frameworks/core/components_ng/pattern/stage/stage_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/stage/stage_manager.cpp",
@ -102,30 +123,6 @@ ohos_unittest("overlay_manager_test_ng") {
"$ace_root/frameworks/core/components_ng/pattern/toast/toast_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/toast/toast_view.cpp",
"$ace_root/frameworks/core/components_ng/syntax/lazy_for_each_node.cpp",
"$ace_root/frameworks/core/event/back_end_event_manager.cpp",
"$ace_root/test/mock/frameworks/base/log/mock_jank_frame_report.cpp",
# scroll
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/effect/scroll_fade_effect.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/inner/scroll_bar.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll/scroll_spring_effect.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/proxy/scroll_bar_proxy.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scroll_bar/scroll_bar_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scrollable/scrollable_paint_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/scrollable/scrollable_pattern.cpp",
# mock
"$ace_root/frameworks/base/test/mock/mock_animatable_dimension.cpp",
"$ace_root/frameworks/base/test/mock/mock_measure_util.cpp",
"$ace_root/frameworks/core/animation/test/mock/mock_animator.cpp",
"$ace_root/frameworks/core/animation/test/mock/mock_scheduler.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_watch_dog.cpp",
"$ace_root/frameworks/core/components_ng/test/event/mock/mock_scrollable_event.cpp",
"$ace_root/frameworks/core/components_ng/test/event/scrollable_event/mock_scrollable.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/flex/mock_flex_layout_algorithm.cpp",
@ -135,20 +132,13 @@ ohos_unittest("overlay_manager_test_ng") {
"$ace_root/frameworks/core/components_ng/test/mock/pattern/scrollable/moc_refresh_coordination.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/text/mock_text_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/text/mock_text_pattern.cpp",
"$ace_root/frameworks/core/event/back_end_event_manager.cpp",
"$ace_root/test/mock/base/mock_frame_trace_adapter.cpp",
# self
"$ace_root/frameworks/core/components_ng/pattern/overlay/modal_presentation_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/overlay/overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/pattern/overlay/sheet_drag_bar_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/overlay/sheet_drag_bar_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/overlay/sheet_presentation_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/overlay/sheet_view.cpp",
"$ace_root/test/mock/base/mock_jank_frame_report.cpp",
"overlay_manager_test_ng.cpp",
]
sources += [
# base
"$ace_root/frameworks/base/geometry/dimension.cpp",
"$ace_root/frameworks/base/geometry/least_square_impl.cpp",
"$ace_root/frameworks/base/geometry/matrix3.cpp",
@ -156,12 +146,15 @@ ohos_unittest("overlay_manager_test_ng") {
"$ace_root/frameworks/base/geometry/quaternion.cpp",
"$ace_root/frameworks/base/geometry/transform_util.cpp",
"$ace_root/frameworks/base/json/json_util.cpp",
"$ace_root/frameworks/base/test/mock/mock_ressched_report.cpp",
"$ace_root/frameworks/base/test/mock/mock_socperf_client_impl.cpp",
"$ace_root/frameworks/base/test/mock/mock_system_properties.cpp",
"$ace_root/frameworks/base/utils/base_id.cpp",
"$ace_root/frameworks/base/utils/string_expression.cpp",
"$ace_root/frameworks/base/utils/string_utils.cpp",
"$ace_root/frameworks/base/utils/time_util.cpp",
# components
"$ace_root/frameworks/core/common/clipboard/clipboard_proxy.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_column_info.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_container_info.cpp",
"$ace_root/frameworks/core/components/common/layout/grid_system_manager.cpp",
@ -169,11 +162,11 @@ ohos_unittest("overlay_manager_test_ng") {
"$ace_root/frameworks/core/components/common/properties/alignment.cpp",
"$ace_root/frameworks/core/components/common/properties/color.cpp",
"$ace_root/frameworks/core/components/common/properties/text_style.cpp",
"$ace_root/frameworks/core/components/picker/picker_animation.cpp",
"$ace_root/frameworks/core/components/picker/picker_data.cpp",
"$ace_root/frameworks/core/components/test/unittest/mock/ace_trace_mock.cpp",
"$ace_root/frameworks/core/components/theme/icon_theme.cpp",
"$ace_root/frameworks/core/components/theme/theme_attributes.cpp",
# components_ng
"$ace_root/frameworks/core/common/clipboard/clipboard_proxy.cpp",
"$ace_root/frameworks/core/components_ng/base/frame_node.cpp",
"$ace_root/frameworks/core/components_ng/base/geometry_node.cpp",
"$ace_root/frameworks/core/components_ng/base/modifier.cpp",
@ -211,58 +204,11 @@ ohos_unittest("overlay_manager_test_ng") {
"$ace_root/frameworks/core/components_ng/pattern/divider/divider_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/divider/divider_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/divider/divider_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/relative_container/relative_container_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/stack/stack_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/image_span_view.cpp",
"$ace_root/frameworks/core/components_ng/property/border_property.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/grid_property.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_ng/property/property.cpp",
"$ace_root/frameworks/core/components_ng/property/safe_area_insets.cpp",
"$ace_root/frameworks/core/components_ng/render/divider_painter.cpp",
"$ace_root/frameworks/core/components_ng/render/drawing_prop_convertor.cpp",
"$ace_root/frameworks/core/components_ng/render/paint_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/popup/mock_popup_base_pattern.cpp",
"$ace_root/frameworks/core/gestures/velocity_tracker.cpp",
# components_v2
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
# pipeline
"$ace_root/frameworks/core/pipeline/base/constants.cpp",
# picker
"$ace_root/frameworks/core/components/picker/picker_animation.cpp",
"$ace_root/frameworks/core/components/picker/picker_data.cpp",
"$ace_root/frameworks/core/components_ng/pattern/picker/date_time_animation_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/picker/datepicker_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/picker/datepicker_column_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/picker/datepicker_column_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/picker/datepicker_column_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/picker/datepicker_dialog_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/picker/datepicker_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/picker/datepicker_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/picker/datepicker_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/picker/toss_animation_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text_picker/textpicker_dialog_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/time_picker/timepicker_column_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/time_picker/timepicker_column_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/time_picker/timepicker_column_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/time_picker/timepicker_dialog_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/time_picker/timepicker_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/time_picker/timepicker_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/time_picker/timepicker_row_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/time_picker/timepicker_row_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/time_picker/toss_animation_controller.cpp",
# list
"$ace_root/frameworks/core/components_ng/pattern/image/image_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_event_hub.cpp",
@ -284,30 +230,55 @@ ohos_unittest("overlay_manager_test_ng") {
"$ace_root/frameworks/core/components_ng/pattern/list/list_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/list/list_position_controller.cpp",
# image
"$ace_root/frameworks/core/components_ng/pattern/image/image_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/picker/date_time_animation_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/picker/datepicker_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/picker/datepicker_column_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/picker/datepicker_column_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/picker/datepicker_column_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/picker/datepicker_dialog_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/picker/datepicker_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/picker/datepicker_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/picker/datepicker_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/picker/toss_animation_controller.cpp",
"$ace_root/frameworks/core/components_ng/pattern/relative_container/relative_container_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_content_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/select_overlay/select_overlay_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/stack/stack_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text/image_span_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/text_picker/textpicker_dialog_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/time_picker/timepicker_column_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/time_picker/timepicker_column_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/time_picker/timepicker_column_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/time_picker/timepicker_dialog_view.cpp",
"$ace_root/frameworks/core/components_ng/pattern/time_picker/timepicker_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/time_picker/timepicker_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/time_picker/timepicker_row_accessibility_property.cpp",
"$ace_root/frameworks/core/components_ng/pattern/time_picker/timepicker_row_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/time_picker/toss_animation_controller.cpp",
"$ace_root/frameworks/core/components_ng/property/border_property.cpp",
"$ace_root/frameworks/core/components_ng/property/calc_length.cpp",
"$ace_root/frameworks/core/components_ng/property/grid_property.cpp",
"$ace_root/frameworks/core/components_ng/property/measure_utils.cpp",
"$ace_root/frameworks/core/components_ng/property/property.cpp",
"$ace_root/frameworks/core/components_ng/property/safe_area_insets.cpp",
"$ace_root/frameworks/core/components_ng/render/divider_painter.cpp",
"$ace_root/frameworks/core/components_ng/render/drawing_prop_convertor.cpp",
"$ace_root/frameworks/core/components_ng/render/image_painter.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/image_provider/mock_image_loading_context.cpp",
# mock
"$ace_root/frameworks/base/test/mock/mock_ressched_report.cpp",
"$ace_root/frameworks/base/test/mock/mock_socperf_client_impl.cpp",
"$ace_root/frameworks/base/test/mock/mock_system_properties.cpp",
"$ace_root/frameworks/core/common/test/mock/mock_ace_application_info.cpp",
"$ace_root/frameworks/core/components/test/unittest/mock/ace_trace_mock.cpp",
"$ace_root/frameworks/core/components_ng/render/paint_wrapper.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/animation/mock_geometry_transition.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/base/mock_localization.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/image_provider/mock_image_loading_context.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/image_provider/mock_image_source_info.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_proxy.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/select_overlay/mock_select_overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/select_overlay/mock_select_overlay_proxy.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/grid_container/mock_grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/nav_bar/mock_nav_bar_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/popup/mock_popup_base_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_animation_utils.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_modifier_adapter.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/render/mock_render_context.cpp",
@ -316,6 +287,9 @@ ohos_unittest("overlay_manager_test_ng") {
"$ace_root/frameworks/core/components_ng/test/mock/syntax/mock_for_each_node.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/theme/mock_theme_constants.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/theme/mock_theme_utils.cpp",
"$ace_root/frameworks/core/components_v2/inspector/inspector_constants.cpp",
"$ace_root/frameworks/core/gestures/velocity_tracker.cpp",
"$ace_root/frameworks/core/pipeline/base/constants.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_element_register.cpp",
"$ace_root/frameworks/core/pipeline_ng/test/mock/mock_pipeline_base.cpp",
"$ace_root/test/mock/base/mock_subwindow.cpp",

View File

@ -11,40 +11,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import("//build/test.gni")
import("//foundation/arkui/ace_engine/test/unittest/ace_unittest.gni")
ace_unittest("panel_test_ng") {
flutter_skia = true
render = true
type = "new"
sources = [
"$ace_root/frameworks/core/animation/spring_animation.cpp",
"$ace_root/frameworks/core/components/panel/render_sliding_panel.cpp",
"$ace_root/frameworks/core/components/panel/sliding_events.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/button_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/button/toggle_button_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_modifier.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/image/image_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/panel/close_icon_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/panel/close_icon_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/panel/drag_bar_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/panel/drag_bar_paint_method.cpp",
"$ace_root/frameworks/core/components_ng/pattern/panel/drag_bar_pattern.cpp",
"$ace_root/frameworks/core/components_ng/pattern/panel/sliding_panel_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/pattern/panel/sliding_panel_model_ng.cpp",
"$ace_root/frameworks/core/components_ng/pattern/panel/sliding_panel_node.cpp",
"$ace_root/frameworks/core/components_ng/pattern/panel/sliding_panel_pattern.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_manager.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/drag_drop/mock_drag_drop_proxy.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/select_overlay/mock_select_overlay_manager.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/manager/select_overlay/mock_select_overlay_proxy.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/flex/mock_flex_layout_algorithm.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/grid_container/mock_grid_container_layout_property.cpp",
"$ace_root/frameworks/core/components_ng/test/mock/pattern/select_overlay/mock_select_overlay_property.cpp",
"$ace_root/test/mock/core/common/mock_font_manager_ng.cpp",
"close_icon_pattern_test_ng.cpp",
"dragBar_pattern_test_ng.cpp",
"panel_property_test_ng.cpp",

Some files were not shown because too many files have changed in this diff Show More