From 43e25c84697a5f71034061922552bb775a4c7d69 Mon Sep 17 00:00:00 2001 From: yxn Date: Mon, 18 Nov 2024 12:32:50 +0800 Subject: [PATCH 1/2] correct the comment format Signed-off-by: yxn --- .../src/main/ets/MainAbility/pages/index.ets | 1 + dm/src/display.cpp | 1 + dm/src/screen_manager.cpp | 1 + dm/src/zidl/display_manager_agent_stub.cpp | 1 + .../display_manager_agent_proxy_test.cpp | 3 +- dm/test/unittest/display_manager_test.cpp | 3 +- dm/test/unittest/display_test.cpp | 1 + dm/test/unittest/screen_group_test.cpp | 1 + dm/test/unittest/screen_manager_test.cpp | 3 + dm_lite/src/display_lite.cpp | 1 + dm_lite/src/screen_manager_lite.cpp | 1 + dmserver/include/sensor_plugin.h | 1 + dmserver/src/display_manager_config.cpp | 1 + dmserver/src/sensor_plugin.cpp | 1 + .../test/unittest/abstract_display_test.cpp | 11 ++ .../abstract_screen_controller_test.cpp | 51 ++++++ .../test/unittest/abstract_screen_test.cpp | 6 +- .../display_cutout_controller_test.cpp | 2 - .../display_manager_agent_controller_test.cpp | 6 + .../unittest/display_manager_proxy_test.cpp | 9 + .../screen_rotation_controller_test.cpp | 2 +- .../extension/window_extension_connection.h | 12 ++ interfaces/innerkits/wm/window.h | 173 +++++++++++++++++- .../wm/window_accessibility_controller.h | 2 + interfaces/innerkits/wm/window_manager.h | 32 +++- interfaces/innerkits/wm/window_manager_lite.h | 14 +- interfaces/innerkits/wm/window_option.h | 1 + .../kits/cj/window_runtime/window_ffi.cpp | 1 + .../kits/cj/window_runtime/window_ffi.h | 1 + .../kits/cj/window_runtime/window_impl.cpp | 1 + .../kits/cj/window_runtime/window_impl.h | 1 + .../cj/window_runtime/window_manager_impl.cpp | 1 + .../cj/window_runtime/window_manager_impl.h | 1 + interfaces/kits/dmndk/dm/oh_display_info.h | 3 + .../js_extension_window_register_manager.cpp | 1 + .../screenshot/native_screenshot_module.cpp | 1 + .../window_manager_napi/js_window_manager.cpp | 1 + .../js_extension_window_config.cpp | 1 + .../window_runtime/window_napi/js_window.h | 4 +- .../js_window_register_manager.cpp | 1 + .../window_napi/js_window_register_manager.h | 1 + .../window_napi/js_window_utils.cpp | 1 + interfaces/kits/ndk/wm/oh_window_comm.h | 3 + .../kits/ndk/wm/oh_window_event_filter.h | 1 + previewer/include/window.h | 2 + previewer/mock/js_window_register_manager.cpp | 1 + previewer/mock/js_window_register_manager.h | 1 + .../window_manager_napi/js_window_manager.cpp | 1 + snapshot/src/snapshot_utils.cpp | 1 + .../test/unittest/snapshot_utils_test.cpp | 2 +- test/common/mock/mock_IWindow.h | 1 - .../mock/mock_RSIWindowAnimationController.h | 1 + test/common/utils/src/common_test_utils.cpp | 1 + test/systemtest/dms/display_manager_test.cpp | 1 + .../wms/window_dialogwindow_test.cpp | 1 + .../wms/window_layout_integration_test.cpp | 1 + test/systemtest/wms/window_rotation_test.cpp | 1 - .../wms/window_systemsubwindow_test.cpp | 1 + utils/include/agent_death_recipient.h | 1 + utils/include/atomic_map.h | 1 + utils/include/display_change_info.h | 1 + utils/include/focus_change_info.h | 3 + utils/include/window_drawing_content_info.h | 3 + utils/include/window_visibility_info.h | 2 + utils/include/wm_occlusion_region.h | 1 + utils/src/surface_reader_handler_impl.cpp | 1 + utils/src/wm_math.cpp | 1 + utils/src/wm_occlusion_region.cpp | 1 + utils/test/unittest/permission_test.cpp | 3 + utils/test/unittest/surface_draw_test.cpp | 4 + utils/test/unittest/surface_reader_test.cpp | 3 + utils/test/unittest/utils_all_test.cpp | 6 + .../unittest/window_frame_trace_impl_test.cpp | 1 + .../unittest/window_transition_info_test.cpp | 1 + utils/test/unittest/wm_math_test.cpp | 1 + .../unittest/wm_occlusion_region_test.cpp | 7 + .../src/intention_event_manager.cpp | 1 + window_scene/interfaces/include/ws_common.h | 19 ++ .../dual_display_fold_policy.h | 1 + .../fold_screen_controller.h | 1 + .../fold_screen_policy.h | 1 + .../single_display_fold_policy.h | 1 + .../single_display_pocket_fold_policy.h | 1 + .../include/screen_sensor_plugin.h | 1 + .../include/screen_setting_helper.h | 1 + .../src/screen_scene_config.cpp | 1 + .../src/screen_sensor_plugin.cpp | 1 + .../src/screen_session_dumper.cpp | 1 + .../src/screen_setting_helper.cpp | 1 + .../session/host/include/scene_session.h | 20 +- window_scene/session/host/include/session.h | 14 +- .../host/include/zidl/session_interface.h | 1 + .../session/host/include/zidl/session_proxy.h | 2 +- .../host/src/pc_fold_screen_controller.cpp | 12 +- .../session/host/src/scene_session.cpp | 2 +- .../include/extension_session_manager.h | 4 + .../include/scene_session_manager.h | 72 ++++---- .../src/zidl/scene_session_manager_proxy.cpp | 1 + .../multi_screen_manager_test.cpp | 3 - .../dms_unittest/screen_property_test.cpp | 1 + .../screen_rotation_property_test.cpp | 1 + .../dms_unittest/screen_scene_config_test.cpp | 1 - .../screen_session_dumper_test.cpp | 2 - .../screen_session_manager_proxy_test.cpp | 4 - .../screen_session_manager_stub_test.cpp | 1 - .../screen_session_manager_test.cpp | 5 +- .../test/dms_unittest/screen_session_test.cpp | 2 + .../session_display_power_controller_test.cpp | 1 + .../test/mock/mock_message_parcel.cpp | 1 + window_scene/test/mock/mock_message_parcel.h | 1 + .../test/mock/mock_resource_manager.h | 1 + .../test/mock/mock_root_scene_context.h | 1 + .../test/unittest/extension_session_test.cpp | 1 - .../unittest/main_session_lifecycle_test.cpp | 1 + .../test/unittest/main_session_test.cpp | 5 +- .../unittest/move_drag_controller_test.cpp | 1 - .../unittest/multi_instance_manager_test.cpp | 1 - .../scene_session_dirty_manager_test.cpp | 1 + .../scene_session_dirty_manager_test2.cpp | 1 + .../scene_session_manager_lifecycle_test.cpp | 4 + .../scene_session_manager_proxy_test.cpp | 2 +- .../unittest/scene_session_manager_test12.cpp | 1 + .../unittest/scene_session_manager_test2.cpp | 2 +- .../unittest/scene_session_manager_test5.cpp | 11 +- .../unittest/scene_session_manager_test6.cpp | 1 - .../unittest/scene_session_manager_test8.cpp | 2 +- .../test/unittest/scene_session_test.cpp | 2 +- .../test/unittest/scene_session_test2.cpp | 3 +- .../test/unittest/scene_session_test3.cpp | 2 +- .../test/unittest/scene_session_test4.cpp | 1 + .../test/unittest/scene_session_test5.cpp | 2 +- .../test/unittest/session_lifecycle_test.cpp | 1 - .../unittest/session_proxy_lifecycle_test.cpp | 1 + .../test/unittest/session_proxy_mock_test.cpp | 1 + .../test/unittest/session_proxy_test.cpp | 1 + .../session_stage_proxy_lifecycle_test.cpp | 1 + .../test/unittest/session_stub_mock_test.cpp | 1 + window_scene/test/unittest/session_test.cpp | 2 +- .../unittest/sub_session_lifecycle_test.cpp | 3 + .../unittest/window_session_property_test.cpp | 3 + wm/include/window_input_channel.h | 1 + wm/include/window_scene_session_impl.h | 10 +- wm/include/window_session_impl.h | 28 +-- wm/src/oh_window_event_filter.cpp | 1 + wm/test/mock/mock_window.h | 1 + wm/test/unittest/screen_scene_test.cpp | 1 - .../window_extension_session_impl_test.cpp | 1 - wm/test/unittest/window_impl_test.cpp | 3 - wm/test/unittest/window_impl_test3.cpp | 2 +- wm/test/unittest/window_manager_lite_test.cpp | 1 + wm/test/unittest/window_option_test.cpp | 1 + wm/test/unittest/window_proxy_test.cpp | 2 - .../window_scene_session_impl_test2.cpp | 2 +- .../window_scene_session_impl_test3.cpp | 1 + wm/test/unittest/window_scene_test.cpp | 2 +- wm/test/unittest/window_session_impl_test.cpp | 2 +- .../unittest/window_session_impl_test2.cpp | 1 - .../unittest/window_session_impl_test4.cpp | 3 +- wm/test/unittest/window_stub_test.cpp | 2 - wmserver/include/animation_config.h | 1 + wmserver/include/window_pair.h | 2 + wmserver/include/window_root.h | 1 + wmserver/src/display_group_controller.cpp | 1 + wmserver/src/display_zoom_controller.cpp | 1 + wmserver/src/drag_controller.cpp | 1 + wmserver/src/memory_guard.cpp | 1 + .../unittest/avoid_area_controller_test.cpp | 1 + .../display_group_controller_test.cpp | 3 +- .../unittest/input_window_monitor_test.cpp | 2 + wmserver/test/unittest/minimize_app_test.cpp | 9 + .../test/unittest/window_controller_test.cpp | 1 - wmserver/test/unittest/window_dumper_test.cpp | 1 + .../unittest/window_inner_manager_test.cpp | 1 + .../unittest/window_layout_policy_test.cpp | 3 + .../unittest/window_manager_service_test.cpp | 19 +- .../unittest/window_node_container_test.cpp | 8 + wmserver/test/unittest/window_node_test.cpp | 29 +++ wmserver/test/unittest/window_pair_test.cpp | 4 +- wmserver/test/unittest/window_root_test.cpp | 1 - 179 files changed, 668 insertions(+), 151 deletions(-) diff --git a/AppDemo/window/immersive/entry/src/main/ets/MainAbility/pages/index.ets b/AppDemo/window/immersive/entry/src/main/ets/MainAbility/pages/index.ets index ab68299964..2578009c67 100644 --- a/AppDemo/window/immersive/entry/src/main/ets/MainAbility/pages/index.ets +++ b/AppDemo/window/immersive/entry/src/main/ets/MainAbility/pages/index.ets @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + import router from '@system.router'; import window from '@ohos.window' @Entry diff --git a/dm/src/display.cpp b/dm/src/display.cpp index 1aac823a3c..42978f5d89 100644 --- a/dm/src/display.cpp +++ b/dm/src/display.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "display.h" #include diff --git a/dm/src/screen_manager.cpp b/dm/src/screen_manager.cpp index 66fe5475c0..98e3959435 100644 --- a/dm/src/screen_manager.cpp +++ b/dm/src/screen_manager.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "screen_manager.h" #include diff --git a/dm/src/zidl/display_manager_agent_stub.cpp b/dm/src/zidl/display_manager_agent_stub.cpp index 51c94c9242..713b0ebe1a 100644 --- a/dm/src/zidl/display_manager_agent_stub.cpp +++ b/dm/src/zidl/display_manager_agent_stub.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "zidl/display_manager_agent_stub.h" #include diff --git a/dm/test/unittest/display_manager_agent_proxy_test.cpp b/dm/test/unittest/display_manager_agent_proxy_test.cpp index f7b821127f..1ec7200a30 100644 --- a/dm/test/unittest/display_manager_agent_proxy_test.cpp +++ b/dm/test/unittest/display_manager_agent_proxy_test.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "display_manager_proxy.h" #include "display_manager_adapter.h" #include "display_manager.h" @@ -318,7 +319,6 @@ HWTEST_F(DisplayManagerAgentProxyTest, OnScreenConnect01, Function | SmallTest | ASSERT_EQ(resultValue, 1); } - /** * @tc.name: OnScreenDisconnect * @tc.desc: OnScreenDisconnect @@ -523,7 +523,6 @@ HWTEST_F(DisplayManagerAgentProxyTest, OnDisplayChange01, Function | SmallTest | ASSERT_EQ(resultValue, 1); } - /** * @tc.name: OnScreenshot * @tc.desc: OnScreenshot diff --git a/dm/test/unittest/display_manager_test.cpp b/dm/test/unittest/display_manager_test.cpp index 10e232d6f5..4ec08552c3 100644 --- a/dm/test/unittest/display_manager_test.cpp +++ b/dm/test/unittest/display_manager_test.cpp @@ -949,7 +949,6 @@ HWTEST_F(DisplayManagerTest, UnregisterCaptureStatusListener03, Function | Small listener.clear(); } - /** * @tc.name: RegisterDisplayUpdateListener01 * @tc.desc: RegisterDisplayUpdateListener01 fun @@ -1240,6 +1239,7 @@ HWTEST_F(DisplayManagerTest, NotifyCaptureStatusChanged01, Function | SmallTest DisplayManager::GetInstance().pImpl_->NotifyCaptureStatusChanged(isCapture); ASSERT_EQ(DisplayManager::GetInstance().pImpl_->powerEventListenerAgent_, nullptr); } + /** * @tc.name: RegisterFoldAngleListener03 * @tc.desc: RegisterFoldAngleListener03 fun @@ -1398,7 +1398,6 @@ HWTEST_F(DisplayManagerTest, UnregisterCaptureStatusListener06, Function | Small listener.clear(); } - /** * @tc.name: RegisterDisplayUpdateListener02 * @tc.desc: RegisterDisplayUpdateListener02 fun diff --git a/dm/test/unittest/display_test.cpp b/dm/test/unittest/display_test.cpp index 7ff125c35e..6252583b1f 100644 --- a/dm/test/unittest/display_test.cpp +++ b/dm/test/unittest/display_test.cpp @@ -154,6 +154,7 @@ HWTEST_F(DisplayTest, SetWaterfallCompression02, Function | SmallTest | Level1) DisplayCutoutController::SetIsWaterfallDisplay(isWaterfallDisplayOrigin); ASSERT_EQ(isWaterfallDisplayOrigin, DisplayCutoutController::IsWaterfallDisplay()); } + /** * @tc.name: GetName01 * @tc.desc: GetName function cover diff --git a/dm/test/unittest/screen_group_test.cpp b/dm/test/unittest/screen_group_test.cpp index e9ca0ac7b2..54bd84d08b 100644 --- a/dm/test/unittest/screen_group_test.cpp +++ b/dm/test/unittest/screen_group_test.cpp @@ -101,6 +101,7 @@ HWTEST_F(ScreenGroupTest, UpdateScreenGroupInfo03, Function | SmallTest | Level2 std::vector pos = screenGroup->GetChildPositions(); ASSERT_EQ(position.size(), pos.size()); } + /** * @tc.name: GetChildIds * @tc.desc: for interface coverage & check GetChildIds diff --git a/dm/test/unittest/screen_manager_test.cpp b/dm/test/unittest/screen_manager_test.cpp index c9098d4256..751c08567e 100644 --- a/dm/test/unittest/screen_manager_test.cpp +++ b/dm/test/unittest/screen_manager_test.cpp @@ -328,6 +328,7 @@ HWTEST_F(ScreenManagerTest, OnScreenGroupChange01, Function | SmallTest | Level1 screenManagerListener->OnScreenGroupChange(trigger, screenInfos, groupEvent); ScreenManager::GetInstance().pImpl_->screenManagerListener_ = nullptr; } + /** * @tc.name: RemoveVirtualScreenFromGroup * @tc.desc: for interface coverage & check func RemoveVirtualScreenFromGroup @@ -349,6 +350,7 @@ HWTEST_F(ScreenManagerTest, RemoveVirtualScreenFromGroup, Function | SmallTest | result = ScreenManager::GetInstance().RemoveVirtualScreenFromGroup(testScreens); ASSERT_EQ(DMError::DM_OK, result); } + /** * @tc.name: SetScreenRotationLocked * @tc.desc: for interface coverage & check SetScreenRotationLocked @@ -419,6 +421,7 @@ HWTEST_F(ScreenManagerTest, RegisterScreenGroupListener, Function | SmallTest | ASSERT_EQ(DMError::DM_OK, result); } } + /** * @tc.name: RegisterVirtualScreenGroupListener * @tc.desc: for interface coverage and diff --git a/dm_lite/src/display_lite.cpp b/dm_lite/src/display_lite.cpp index e9ca31328b..28b0bf7c99 100644 --- a/dm_lite/src/display_lite.cpp +++ b/dm_lite/src/display_lite.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "display_lite.h" #include diff --git a/dm_lite/src/screen_manager_lite.cpp b/dm_lite/src/screen_manager_lite.cpp index a32e2926d1..f6acaf0350 100644 --- a/dm_lite/src/screen_manager_lite.cpp +++ b/dm_lite/src/screen_manager_lite.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "screen_manager_lite.h" #include #include "display_manager_adapter_lite.h" diff --git a/dmserver/include/sensor_plugin.h b/dmserver/include/sensor_plugin.h index 2cf8293c73..3269dc3af6 100644 --- a/dmserver/include/sensor_plugin.h +++ b/dmserver/include/sensor_plugin.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef SENSOR_PLUGIN_H #define SENSOR_PLUGIN_H diff --git a/dmserver/src/display_manager_config.cpp b/dmserver/src/display_manager_config.cpp index 8a8e7379ed..abceefa918 100644 --- a/dmserver/src/display_manager_config.cpp +++ b/dmserver/src/display_manager_config.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "display_manager_config.h" #include diff --git a/dmserver/src/sensor_plugin.cpp b/dmserver/src/sensor_plugin.cpp index 68ba20eafb..a3e2026ba5 100644 --- a/dmserver/src/sensor_plugin.cpp +++ b/dmserver/src/sensor_plugin.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "sensor_plugin.h" namespace OHOS { diff --git a/dmserver/test/unittest/abstract_display_test.cpp b/dmserver/test/unittest/abstract_display_test.cpp index ebc305a170..259b76e9bf 100644 --- a/dmserver/test/unittest/abstract_display_test.cpp +++ b/dmserver/test/unittest/abstract_display_test.cpp @@ -85,6 +85,7 @@ HWTEST_F(AbstractDisplayTest, BindAbstractScreen01, Function | SmallTest | Level sptr abstractScreen = nullptr; ASSERT_EQ(false, absDisplay->BindAbstractScreen(abstractScreen)); } + /** * @tc.name: BindAbstractScreen * @tc.desc: BindAbstractScreen test @@ -96,6 +97,7 @@ HWTEST_F(AbstractDisplayTest, BindAbstractScreen02, Function | SmallTest | Level abstractScreen->activeIdx_ = -1; ASSERT_EQ(false, absDisplay->BindAbstractScreen(abstractScreen)); } + /** * @tc.name: CalculateXYDpi * @tc.desc: CalculateXYDpi test @@ -114,6 +116,7 @@ HWTEST_F(AbstractDisplayTest, CalculateXYDpi, Function | SmallTest | Level3) absDisplay->CalculateXYDpi(phyWidth, phyHeight); ASSERT_EQ(1, absDisplay->phyHeight_); } + /** * @tc.name: GetRefreshRate * @tc.desc: GetRefreshRate test @@ -126,6 +129,7 @@ HWTEST_F(AbstractDisplayTest, GetRefreshRate, Function | SmallTest | Level3) absDisplay->GetRefreshRate(); ASSERT_EQ(1, absDisplay->refreshRate_); } + /** * @tc.name: GetOffsetX * @tc.desc: GetOffsetX test @@ -137,6 +141,7 @@ HWTEST_F(AbstractDisplayTest, GetOffsetX, Function | SmallTest | Level3) absDisplay->SetOffsetX(offsetX); ASSERT_EQ(1, absDisplay->GetOffsetX()); } + /** * @tc.name: GetOffsetY * @tc.desc: GetOffsetX test @@ -148,6 +153,7 @@ HWTEST_F(AbstractDisplayTest, GetOffsetY, Function | SmallTest | Level3) absDisplay->SetOffsetY(offsetY); ASSERT_EQ(1, absDisplay->GetOffsetY()); } + /** * @tc.name: UpdateXDpi * @tc.desc: UpdateXDpi test @@ -161,6 +167,7 @@ HWTEST_F(AbstractDisplayTest, UpdateXDpi, Function | SmallTest | Level3) absDisplay->UpdateXDpi(); ASSERT_EQ(UINT32_MAX, absDisplay->phyWidth_); } + /** * @tc.name: UpdateYDpi * @tc.desc: UpdateYDpi test @@ -174,6 +181,7 @@ HWTEST_F(AbstractDisplayTest, UpdateYDpi, Function | SmallTest | Level3) absDisplay->UpdateYDpi(); ASSERT_EQ(UINT32_MAX, absDisplay->phyHeight_); } + /** * @tc.name: SetId * @tc.desc: SetId test @@ -185,6 +193,7 @@ HWTEST_F(AbstractDisplayTest, SetId, Function | SmallTest | Level3) absDisplay->SetId(id); ASSERT_EQ(1, absDisplay->GetId()); } + /** * @tc.name: SetDisplayOrientation * @tc.desc: SetDisplayOrientation test @@ -196,6 +205,7 @@ HWTEST_F(AbstractDisplayTest, SetDisplayOrientation, Function | SmallTest | Leve absDisplay->SetDisplayOrientation(displayOrientation); ASSERT_EQ(DisplayOrientation::PORTRAIT, absDisplay->GetDisplayOrientation()); } + /** * @tc.name: GetRotationAndGetOrientation * @tc.desc: GetRotationAndGetOrientation test @@ -209,6 +219,7 @@ HWTEST_F(AbstractDisplayTest, GetRotationAndGetOrientation, Function | SmallTest absDisplay->GetOrientation(); ASSERT_EQ(1, absDisplay->GetId()); } + /** * @tc.name: SetFreezeFlag * @tc.desc: SetFreezeFlag test diff --git a/dmserver/test/unittest/abstract_screen_controller_test.cpp b/dmserver/test/unittest/abstract_screen_controller_test.cpp index 71b372b4df..2f08999a80 100644 --- a/dmserver/test/unittest/abstract_screen_controller_test.cpp +++ b/dmserver/test/unittest/abstract_screen_controller_test.cpp @@ -89,6 +89,7 @@ HWTEST_F(AbstractScreenControllerTest, ProcessScreenDisconnected01, Function | S absController_->ProcessScreenDisconnected(rsId); ASSERT_EQ(false, absController_->screenIdManager_.ConvertToDmsScreenId(rsId, dmsId)); } + /** * @tc.name: ProcessScreenDisconnected * @tc.desc: ProcessScreenDisconnected test @@ -104,6 +105,7 @@ HWTEST_F(AbstractScreenControllerTest, ProcessScreenDisconnected02, Function | S ASSERT_EQ(false, absController_->screenIdManager_.ConvertToDmsScreenId(rsId, dmsId)); ASSERT_EQ(absController_->dmsScreenMap_.end(), absController_->dmsScreenMap_.find(dmsId)); } + /** * @tc.name: ProcessScreenDisconnected * @tc.desc: ProcessScreenDisconnected test @@ -118,6 +120,7 @@ HWTEST_F(AbstractScreenControllerTest, ProcessScreenDisconnected03, Function | S ASSERT_EQ(false, absController_->screenIdManager_.ConvertToDmsScreenId(rsId, dmsId)); ASSERT_NE(absController_->dmsScreenMap_.end(), absController_->dmsScreenMap_.find(dmsId)); } + /** * @tc.name: SetScreenRotateAnimation * @tc.desc: SetScreenRotateAnimation test @@ -132,6 +135,7 @@ HWTEST_F(AbstractScreenControllerTest, SetScreenRotateAnimation01, Function | Sm absController_->SetScreenRotateAnimation(screen, 1, Rotation::ROTATION_0, true); ASSERT_EQ(Rotation::ROTATION_270, screen->rotation_); } + /** * @tc.name: SetScreenRotateAnimation * @tc.desc: SetScreenRotateAnimation test @@ -146,6 +150,7 @@ HWTEST_F(AbstractScreenControllerTest, SetScreenRotateAnimation02, Function | Sm absController_->SetScreenRotateAnimation(screen, 1, Rotation::ROTATION_270, true); ASSERT_EQ(Rotation::ROTATION_0, screen->rotation_); } + /** * @tc.name: SetScreenRotateAnimation * @tc.desc: SetScreenRotateAnimation test @@ -160,6 +165,7 @@ HWTEST_F(AbstractScreenControllerTest, SetScreenRotateAnimation03, Function | Sm absController_->SetScreenRotateAnimation(screen, 1, Rotation::ROTATION_270, false); ASSERT_EQ(Rotation::ROTATION_0, screen->rotation_); } + /** * @tc.name: MakeMirror * @tc.desc: MakeMirror test @@ -171,6 +177,7 @@ HWTEST_F(AbstractScreenControllerTest, MakeMirror01, Function | SmallTest | Leve ASSERT_TRUE(DMError::DM_OK != absController_->MakeMirror(5, screens)); ASSERT_EQ(DMError::DM_OK, absController_->StopScreens(screens, ScreenCombination::SCREEN_MIRROR)); } + /** * @tc.name: MakeMirror * @tc.desc: MakeMirror test @@ -183,6 +190,7 @@ HWTEST_F(AbstractScreenControllerTest, MakeMirror02, Function | SmallTest | Leve ASSERT_TRUE(DMError::DM_OK != absController_->MakeMirror(2, screens)); ASSERT_EQ(DMError::DM_OK, absController_->StopScreens(screens, ScreenCombination::SCREEN_MIRROR)); } + /** * @tc.name: MakeMirror * @tc.desc: MakeMirror test @@ -197,6 +205,7 @@ HWTEST_F(AbstractScreenControllerTest, MakeMirror03, Function | SmallTest | Leve ASSERT_TRUE(DMError::DM_OK != absController_->MakeMirror(2, screens)); ASSERT_EQ(DMError::DM_OK, absController_->StopScreens(screens, ScreenCombination::SCREEN_MIRROR)); } + /** * @tc.name: MakeMirror * @tc.desc: MakeMirror test @@ -211,6 +220,7 @@ HWTEST_F(AbstractScreenControllerTest, MakeMirror04, Function | SmallTest | Leve ASSERT_TRUE(DMError::DM_OK != absController_->MakeMirror(2, screens)); ASSERT_EQ(DMError::DM_OK, absController_->StopScreens(screens, ScreenCombination::SCREEN_MIRROR)); } + /** * @tc.name: MakeMirror * @tc.desc: MakeMirror test @@ -225,6 +235,7 @@ HWTEST_F(AbstractScreenControllerTest, MakeMirror05, Function | SmallTest | Leve ASSERT_TRUE(DMError::DM_OK == absController_->MakeMirror(2, screens)); ASSERT_EQ(DMError::DM_OK, absController_->StopScreens(screens, ScreenCombination::SCREEN_MIRROR)); } + /** * @tc.name: ProcessScreenConnected * @tc.desc: ProcessScreenConnected test @@ -236,6 +247,7 @@ HWTEST_F(AbstractScreenControllerTest, ProcessScreenConnected01, Function | Smal absController_->ProcessScreenConnected(id); ASSERT_EQ(true, absController_->screenIdManager_.HasRsScreenId(id)); } + /** * @tc.name: OnRsScreenConnectionChange * @tc.desc: OnRsScreenConnectionChange test @@ -248,6 +260,7 @@ HWTEST_F(AbstractScreenControllerTest, OnRsScreenConnectionChange01, Function | absController_->OnRsScreenConnectionChange(rsScreenId, event); ASSERT_EQ(6, absController_->dmsScreenMap_.size()); } + /** * @tc.name: OnRsScreenConnectionChange * @tc.desc: OnRsScreenConnectionChange test @@ -260,6 +273,7 @@ HWTEST_F(AbstractScreenControllerTest, OnRsScreenConnectionChange02, Function | absController_->OnRsScreenConnectionChange(rsScreenId, event); ASSERT_EQ(6, absController_->dmsScreenMap_.size()); } + /** * @tc.name: OnRsScreenConnectionChange * @tc.desc: OnRsScreenConnectionChange test @@ -272,6 +286,7 @@ HWTEST_F(AbstractScreenControllerTest, OnRsScreenConnectionChange03, Function | absController_->OnRsScreenConnectionChange(rsScreenId, event); ASSERT_EQ(6, absController_->dmsScreenMap_.size()); } + /** * @tc.name: OnRsScreenConnectionChange * @tc.desc: OnRsScreenConnectionChange test @@ -284,6 +299,7 @@ HWTEST_F(AbstractScreenControllerTest, OnRsScreenConnectionChange04, Function | absController_->OnRsScreenConnectionChange(rsScreenId, event); ASSERT_EQ(6, absController_->dmsScreenMap_.size()); } + /** * @tc.name: GetAllValidScreenIds * @tc.desc: GetAllValidScreenIds test @@ -295,6 +311,7 @@ HWTEST_F(AbstractScreenControllerTest, GetAllValidScreenIds, Function | SmallTes std::vector valid {0, 1, 2, 3}; ASSERT_EQ(valid, absController_->GetAllValidScreenIds(screenIds)); } + /** * @tc.name: GetRSDisplayNodeByScreenId * @tc.desc: GetRSDisplayNodeByScreenId test @@ -306,6 +323,7 @@ HWTEST_F(AbstractScreenControllerTest, GetRSDisplayNodeByScreenId, Function | Sm std::shared_ptr node = nullptr; ASSERT_EQ(node, absController_->GetRSDisplayNodeByScreenId(id)); } + /** * @tc.name: UpdateRSTree * @tc.desc: UpdateRSTree test @@ -318,6 +336,7 @@ HWTEST_F(AbstractScreenControllerTest, UpdateRSTree01, Function | SmallTest | Le absController_->UpdateRSTree(id, id, node, true, true); ASSERT_EQ(nullptr, absController_->GetAbstractScreen(id)); } + /** * @tc.name: UpdateRSTree * @tc.desc: UpdateRSTree test @@ -332,6 +351,7 @@ HWTEST_F(AbstractScreenControllerTest, UpdateRSTree02, Function | SmallTest | Le ASSERT_NE(nullptr, absController_->GetAbstractScreen(id)); ASSERT_EQ(nullptr, absController_->GetAbstractScreen(parentId)); } + /** * @tc.name: UpdateRSTree * @tc.desc: UpdateRSTree test @@ -348,6 +368,7 @@ HWTEST_F(AbstractScreenControllerTest, UpdateRSTree03, Function | SmallTest | Le parentScreen->rsDisplayNode_ = nullptr; absController_->UpdateRSTree(id, parentId, node, true, true); } + /** * @tc.name: UpdateRSTree * @tc.desc: UpdateRSTree test @@ -365,6 +386,7 @@ HWTEST_F(AbstractScreenControllerTest, UpdateRSTree04, Function | SmallTest | Le parentScreen->rsDisplayNode_ = std::make_shared(config);; absController_->UpdateRSTree(id, parentId, node, true, true); } + /** * @tc.name: UpdateRSTree * @tc.desc: UpdateRSTree test @@ -382,6 +404,7 @@ HWTEST_F(AbstractScreenControllerTest, UpdateRSTree05, Function | SmallTest | Le parentScreen->rsDisplayNode_ = std::make_shared(config);; absController_->UpdateRSTree(id, parentId, node, true, false); } + /** * @tc.name: RegisterAbstractScreenCallback * @tc.desc: RegisterAbstractScreenCallback test @@ -393,6 +416,7 @@ HWTEST_F(AbstractScreenControllerTest, RegisterAbstractScreenCallback, Function absController_->RegisterAbstractScreenCallback(cb); ASSERT_EQ(6, absController_->dmsScreenMap_.size()); } + /** * @tc.name: AddToGroupLocked * @tc.desc: AddToGroupLocked test @@ -403,6 +427,7 @@ HWTEST_F(AbstractScreenControllerTest, AddToGroupLocked, Function | SmallTest | ASSERT_EQ(false, absController_->dmsScreenGroupMap_.empty()); ASSERT_EQ(nullptr, absController_->AddToGroupLocked(screenVec[0])); } + /** * @tc.name: RemoveFromGroupLocked * @tc.desc: RemoveFromGroupLocked test @@ -414,6 +439,7 @@ HWTEST_F(AbstractScreenControllerTest, RemoveFromGroupLocked01, Function | Small screen->groupDmsId_ = 0; ASSERT_EQ(nullptr, absController_->RemoveFromGroupLocked(screen)); } + /** * @tc.name: RemoveChildFromGroup * @tc.desc: RemoveChildFromGroup test @@ -427,6 +453,7 @@ HWTEST_F(AbstractScreenControllerTest, RemoveChildFromGroup01, Function | SmallT screenGroup->screenMap_.insert(std::make_pair(dmsId, screen)); ASSERT_EQ(true, absController_->RemoveChildFromGroup(screen, screenGroup)); } + /** * @tc.name: AddAsSuccedentScreenLocked * @tc.desc: AddAsSuccedentScreenLocked test @@ -438,6 +465,7 @@ HWTEST_F(AbstractScreenControllerTest, AddAsSuccedentScreenLocked01, Function | absController_->dmsScreenMap_.erase(absController_->GetDefaultAbstractScreenId()); ASSERT_EQ(nullptr, absController_->AddAsSuccedentScreenLocked(screen)); } + /** * @tc.name: AddAsSuccedentScreenLocked * @tc.desc: AddAsSuccedentScreenLocked test @@ -448,6 +476,7 @@ HWTEST_F(AbstractScreenControllerTest, AddAsSuccedentScreenLocked02, Function | sptr screen = screenVec[0]; ASSERT_EQ(nullptr, absController_->AddAsSuccedentScreenLocked(screen)); } + /** * @tc.name: CreateVirtualScreen * @tc.desc: CreateVirtualScreen test @@ -509,6 +538,7 @@ HWTEST_F(AbstractScreenControllerTest, DestroyVirtualScreen01, Function | SmallT ScreenId id = 5; ASSERT_EQ(DMError::DM_ERROR_INVALID_PARAM, absController_->DestroyVirtualScreen(id)); } + /** * @tc.name: DestroyVirtualScreen * @tc.desc: DestroyVirtualScreen test @@ -519,6 +549,7 @@ HWTEST_F(AbstractScreenControllerTest, DestroyVirtualScreen02, Function | SmallT ScreenId id = 1; ASSERT_EQ(DMError::DM_OK, absController_->DestroyVirtualScreen(id)); } + /** * @tc.name: SetVirtualScreenSurface * @tc.desc: SetVirtualScreenSurface test @@ -530,6 +561,7 @@ HWTEST_F(AbstractScreenControllerTest, SetVirtualScreenSurface01, Function | Sma sptr surface = nullptr; ASSERT_EQ(DMError::DM_ERROR_RENDER_SERVICE_FAILED, absController_->SetVirtualScreenSurface(id, surface)); } + /** * @tc.name: SetBuildInDefaultOrientation * @tc.desc: SetBuildInDefaultOrientation test @@ -541,6 +573,7 @@ HWTEST_F(AbstractScreenControllerTest, SetBuildInDefaultOrientation, Function | absController_->SetBuildInDefaultOrientation(orientation); ASSERT_EQ(orientation, absController_->buildInDefaultOrientation_); } + /** * @tc.name: SetOrientation * @tc.desc: SetOrientation test @@ -552,6 +585,7 @@ HWTEST_F(AbstractScreenControllerTest, SetOrientation01, Function | SmallTest | Orientation orientation = Orientation::BEGIN; ASSERT_EQ(DMError::DM_ERROR_NULLPTR, absController_->SetOrientation(1, orientation, true)); } + /** * @tc.name: SetOrientation * @tc.desc: SetOrientation test @@ -577,6 +611,7 @@ HWTEST_F(AbstractScreenControllerTest, SetOrientation02, Function | SmallTest | ret = absController_->SetOrientation(1, orientation, isFromWindow, false); ASSERT_EQ(DMError::DM_OK, ret); } + /** * @tc.name: SetRotation * @tc.desc: SetRotation test @@ -591,6 +626,7 @@ HWTEST_F(AbstractScreenControllerTest, SetRotation01, Function | SmallTest | Lev ASSERT_EQ(false, absController_->SetRotation(1, Rotation::ROTATION_0, false)); ASSERT_EQ(false, absController_->SetRotation(1, Rotation::ROTATION_0, true)); } + /** * @tc.name: SetScreenActiveMode * @tc.desc: SetScreenActiveMode test @@ -600,6 +636,7 @@ HWTEST_F(AbstractScreenControllerTest, SetScreenActiveMode01, Function | SmallTe { ASSERT_TRUE(DMError::DM_OK != absController_->SetScreenActiveMode(5, 0)); } + /** * @tc.name: SetScreenActiveMode * @tc.desc: SetScreenActiveMode test @@ -610,6 +647,7 @@ HWTEST_F(AbstractScreenControllerTest, SetScreenActiveMode02, Function | SmallTe absController_->screenIdManager_.dms2RsScreenIdMap_.erase(1); ASSERT_TRUE(DMError::DM_OK != absController_->SetScreenActiveMode(1, 0)); } + /** * @tc.name: ProcessScreenModeChanged * @tc.desc: ProcessScreenModeChanged test @@ -620,6 +658,7 @@ HWTEST_F(AbstractScreenControllerTest, ProcessScreenModeChanged01, Function | Sm absController_->ProcessScreenModeChanged(7); ASSERT_EQ(6, absController_->dmsScreenMap_.size()); } + /** * @tc.name: ProcessScreenModeChanged * @tc.desc: ProcessScreenModeChanged test @@ -630,6 +669,7 @@ HWTEST_F(AbstractScreenControllerTest, ProcessScreenModeChanged02, Function | Sm absController_->ProcessScreenModeChanged(5); ASSERT_EQ(nullptr, absController_->dmsScreenMap_[5]); } + /** * @tc.name: ProcessScreenModeChanged * @tc.desc: ProcessScreenModeChanged test @@ -640,6 +680,7 @@ HWTEST_F(AbstractScreenControllerTest, ProcessScreenModeChanged03, Function | Sm absController_->ProcessScreenModeChanged(2); ASSERT_NE(nullptr, absController_->dmsScreenMap_[2]); } + /** * @tc.name: ProcessScreenModeChanged * @tc.desc: ProcessScreenModeChanged test @@ -653,6 +694,7 @@ HWTEST_F(AbstractScreenControllerTest, ProcessScreenModeChanged04, Function | Sm absController_->ProcessScreenModeChanged(2); ASSERT_NE(nullptr, absController_->dmsScreenMap_[2]); } + /** * @tc.name: ProcessScreenModeChanged * @tc.desc: ProcessScreenModeChanged test @@ -666,6 +708,7 @@ HWTEST_F(AbstractScreenControllerTest, ProcessScreenModeChanged05, Function | Sm absController_->ProcessScreenModeChanged(2); ASSERT_NE(nullptr, absController_->dmsScreenMap_[2]); } + /** * @tc.name: ChangeScreenGroup * @tc.desc: ChangeScreenGroup test @@ -689,6 +732,7 @@ HWTEST_F(AbstractScreenControllerTest, ChangeScreenGroup01, Function | SmallTest absController_->ChangeScreenGroup(group, screens, startPoints, true, ScreenCombination::SCREEN_ALONE); ASSERT_EQ(6, absController_->dmsScreenMap_.size()); } + /** * @tc.name: ChangeScreenGroup * @tc.desc: ChangeScreenGroup test @@ -713,6 +757,7 @@ HWTEST_F(AbstractScreenControllerTest, ChangeScreenGroup02, Function | SmallTest absController_->ChangeScreenGroup(group, screens, startPoints, true, ScreenCombination::SCREEN_ALONE); ASSERT_EQ(6, absController_->dmsScreenMap_.size()); } + /** * @tc.name: ChangeScreenGroup * @tc.desc: ChangeScreenGroup test @@ -896,6 +941,7 @@ HWTEST_F(AbstractScreenControllerTest, SetScreenPowerForAll, Function | SmallTes ASSERT_EQ(false, absController_->SetScreenPowerForAll(ScreenPowerState::POWER_OFF, PowerStateChangeReason::POWER_BUTTON)); } + /** * @tc.name: SetVirtualPixelRatio * @tc.desc: SetVirtualPixelRatio test @@ -909,6 +955,7 @@ HWTEST_F(AbstractScreenControllerTest, SetVirtualPixelRatio01, Function | SmallT screen->isScreenGroup_ = true; ASSERT_EQ(DMError::DM_ERROR_NULLPTR, absController_->SetVirtualPixelRatio(id, ratio)); } + /** * @tc.name: SetVirtualPixelRatio * @tc.desc: SetVirtualPixelRatio test @@ -921,6 +968,7 @@ HWTEST_F(AbstractScreenControllerTest, SetVirtualPixelRatio02, Function | SmallT absController_->abstractScreenCallback_ = nullptr; ASSERT_EQ(DMError::DM_OK, absController_->SetVirtualPixelRatio(id, ratio)); } + /** * @tc.name: RegisterRsScreenConnectionChangeListener * @tc.desc: RegisterRsScreenConnectionChangeListener test @@ -933,6 +981,7 @@ HWTEST_F(AbstractScreenControllerTest, RegisterRsScreenConnectionChangeListener, ASSERT_EQ(true, absController_->OnRemoteDied(agent)); agent.clear(); } + /** * @tc.name: RemoveSurfaceNodeFromScreen * @tc.desc: RemoveSurfaceNodeFromScreen test @@ -945,6 +994,7 @@ HWTEST_F(AbstractScreenControllerTest, RemoveSurfaceNodeFromScreen, Function | S ASSERT_EQ(DMError::DM_ERROR_NULLPTR, absController_->RemoveSurfaceNodeFromScreen(dmsScreenId, surfaceNode)); ASSERT_EQ(nullptr, absController_->GetAbstractScreen(dmsScreenId)); } + /** * @tc.name: ProcessDefaultScreenReconnected * @tc.desc: ProcessDefaultScreenReconnected test @@ -961,6 +1011,7 @@ HWTEST_F(AbstractScreenControllerTest, ProcessDefaultScreenReconnected01, Functi absController_->ProcessDefaultScreenReconnected(rsScreenId); ASSERT_EQ(nullptr, absController_->GetAbstractScreen(rsScreenId)); } + /** * @tc.name: ProcessDefaultScreenReconnected * @tc.desc: ProcessDefaultScreenReconnected test diff --git a/dmserver/test/unittest/abstract_screen_test.cpp b/dmserver/test/unittest/abstract_screen_test.cpp index bdb711caaf..5ead56fe6e 100644 --- a/dmserver/test/unittest/abstract_screen_test.cpp +++ b/dmserver/test/unittest/abstract_screen_test.cpp @@ -88,6 +88,7 @@ HWTEST_F(AbstractScreenTest, GetScreenMode, Function | SmallTest | Level3) ASSERT_EQ(mode0, (absScreen_->GetAbstractScreenModes())[0]); ASSERT_EQ(mode1, (absScreen_->GetAbstractScreenModes())[1]); } + /** * @tc.name: ConvertToScreenInfo * @tc.desc: Convert to screen info @@ -97,6 +98,7 @@ HWTEST_F(AbstractScreenTest, ConvertToScreenInfo, Function | SmallTest | Level3) { ASSERT_NE(nullptr, absScreen_->ConvertToScreenInfo()); } + /** * @tc.name: RSTree * @tc.desc: RS tree @@ -135,7 +137,6 @@ HWTEST_F(AbstractScreenTest, RSTree, Function | SmallTest | Level3) absScreen_->rsDisplayNode_ = nullptr; } - /** * @tc.name: InitRSDisplayNode * @tc.desc: InitRSDisplayNode @@ -204,6 +205,7 @@ HWTEST_F(AbstractScreenTest, ColorGamut, Function | SmallTest | Level3) gamutMap = ScreenGamutMap::GAMUT_MAP_HDR_EXTENSION; ASSERT_EQ(DMError::DM_ERROR_RENDER_SERVICE_FAILED, absScreen0->GetScreenGamutMap(gamutMap)); } + /** * @tc.name: FillScreenInfo * @tc.desc: Fill screen info @@ -223,6 +225,7 @@ HWTEST_F(AbstractScreenTest, FillScreenInfo, Function | SmallTest | Level3) absScreen_->FillScreenInfo(info); ASSERT_EQ(2.f, info->virtualPixelRatio_); } + /** * @tc.name: CalcRotation * @tc.desc: Calc rotation @@ -415,7 +418,6 @@ HWTEST_F(AbstractScreenTest, GetChildPosition, Function | SmallTest | Level3) ASSERT_EQ(screenId, 1); } - /** * @tc.name: AddChild01 * @tc.desc: Add child diff --git a/dmserver/test/unittest/display_cutout_controller_test.cpp b/dmserver/test/unittest/display_cutout_controller_test.cpp index 50646db8a0..d7780e57b3 100644 --- a/dmserver/test/unittest/display_cutout_controller_test.cpp +++ b/dmserver/test/unittest/display_cutout_controller_test.cpp @@ -95,7 +95,6 @@ HWTEST_F(DisplayCutoutControllerTest, GetCutoutInfo, Function | SmallTest | Leve ASSERT_NE(cutoutInfo, nullptr); } - /** * @tc.name: CalcBuiltInDisplayWaterfallRects * @tc.desc: CalcBuiltInDisplayWaterfallRects @@ -118,7 +117,6 @@ HWTEST_F(DisplayCutoutControllerTest, CalcBuiltInDisplayWaterfallRects, Function ASSERT_TRUE(controller->waterfallDisplayAreaRects_.isUninitialized()); } - /** * @tc.name: CalcBuiltInDisplayWaterfallRectsByRotation * @tc.desc: CalcBuiltInDisplayWaterfallRectsByRotation diff --git a/dmserver/test/unittest/display_manager_agent_controller_test.cpp b/dmserver/test/unittest/display_manager_agent_controller_test.cpp index 1155d6be4c..586d43bcc4 100644 --- a/dmserver/test/unittest/display_manager_agent_controller_test.cpp +++ b/dmserver/test/unittest/display_manager_agent_controller_test.cpp @@ -96,6 +96,7 @@ HWTEST_F(DisplayManagerAgentControllerTest, OnScreenConnect, Function | SmallTes GetAgentsByType(DisplayManagerAgentType::SCREEN_EVENT_LISTENER).size(); ASSERT_EQ(result, 1); } + /** * @tc.name: OnScreenChange * @tc.desc: OnScreenChange test @@ -122,6 +123,7 @@ HWTEST_F(DisplayManagerAgentControllerTest, OnScreenChange, Function | SmallTest GetAgentsByType(DisplayManagerAgentType::SCREEN_EVENT_LISTENER).size(); ASSERT_EQ(result, 1); } + /** * @tc.name: OnScreenGroupChange * @tc.desc: OnScreenChange test @@ -152,6 +154,7 @@ HWTEST_F(DisplayManagerAgentControllerTest, OnScreenGroupChange, Function | Smal GetAgentsByType(DisplayManagerAgentType::SCREEN_EVENT_LISTENER).size(); ASSERT_EQ(result, 1); } + /** * @tc.name: OnDisplayCreate * @tc.desc: OnDisplayCreate test @@ -176,6 +179,7 @@ HWTEST_F(DisplayManagerAgentControllerTest, OnDisplayCreate, Function | SmallTes GetAgentsByType(DisplayManagerAgentType::SCREEN_EVENT_LISTENER).size(); ASSERT_EQ(result, 0); } + /** * @tc.name: OnDisplayDestroy * @tc.desc: OnDisplayDestroy test @@ -199,6 +203,7 @@ HWTEST_F(DisplayManagerAgentControllerTest, OnDisplayDestroy, Function | SmallTe GetAgentsByType(DisplayManagerAgentType::SCREEN_EVENT_LISTENER).size(); ASSERT_EQ(result, 0); } + /** * @tc.name: OnDisplayChange * @tc.desc: OnDisplayChange test @@ -227,6 +232,7 @@ HWTEST_F(DisplayManagerAgentControllerTest, OnDisplayChange, Function | SmallTes GetAgentsByType(DisplayManagerAgentType::SCREEN_EVENT_LISTENER).size(); ASSERT_EQ(result, 0); } + /** * @tc.name: OnScreenshot * @tc.desc: OnScreenshot test diff --git a/dmserver/test/unittest/display_manager_proxy_test.cpp b/dmserver/test/unittest/display_manager_proxy_test.cpp index df79139af4..bf9884676f 100644 --- a/dmserver/test/unittest/display_manager_proxy_test.cpp +++ b/dmserver/test/unittest/display_manager_proxy_test.cpp @@ -77,6 +77,7 @@ HWTEST_F(DisplayManagerProxyTest, GetDefaultDisplayInfo01, Function | SmallTest auto displayInfo3 = proxy2.GetDefaultDisplayInfo(); ASSERT_EQ(nullptr, displayInfo3); } + /** * @tc.name: GetDisplayInfoById01 * @tc.desc: test DisplayManagerProxy::GetDisplayInfoById @@ -100,6 +101,7 @@ HWTEST_F(DisplayManagerProxyTest, GetDisplayInfoById01, Function | SmallTest | L auto displayInfo3 = proxy2.GetDisplayInfoById(0); ASSERT_EQ(nullptr, displayInfo3); } + /** * @tc.name: GetDisplayInfoByScreen01 * @tc.desc: test DisplayManagerProxy::GetDisplayInfoByScreen @@ -123,6 +125,7 @@ HWTEST_F(DisplayManagerProxyTest, GetDisplayInfoByScreen01, Function | SmallTest auto displayInfo3 = proxy2.GetDisplayInfoByScreen(0); ASSERT_EQ(nullptr, displayInfo3); } + /** * @tc.name: CreateVirtualScreen01 * @tc.desc: test DisplayManagerProxy::CreateVirtualScreen @@ -152,6 +155,7 @@ HWTEST_F(DisplayManagerProxyTest, CreateVirtualScreen01, Function | SmallTest | auto screenId3 = proxy2.CreateVirtualScreen(virtualOption2, displayManagerAgent2); ASSERT_EQ(SCREEN_ID_INVALID, screenId3); } + /** * @tc.name: DestroyVirtualScreen01 * @tc.desc: test DisplayManagerProxy::DestroyVirtualScreen @@ -175,6 +179,7 @@ HWTEST_F(DisplayManagerProxyTest, DestroyVirtualScreen01, Function | SmallTest | auto result3 = proxy2.DestroyVirtualScreen(0); ASSERT_EQ(DMError::DM_ERROR_IPC_FAILED, result3); } + /** * @tc.name: SetVirtualScreenSurface01 * @tc.desc: test DisplayManagerProxy::SetVirtualScreenSurface @@ -201,6 +206,7 @@ HWTEST_F(DisplayManagerProxyTest, SetVirtualScreenSurface01, Function | SmallTes auto result4 = proxy2.SetVirtualScreenSurface(0, surface->GetProducer()); ASSERT_EQ(DMError::DM_ERROR_IPC_FAILED, result4); } + /** * @tc.name: SetOrientation01 * @tc.desc: test DisplayManagerProxy::SetOrientation @@ -224,6 +230,7 @@ HWTEST_F(DisplayManagerProxyTest, SetOrientation01, Function | SmallTest | Level auto result3 = proxy2.SetOrientation(0, Orientation::VERTICAL); ASSERT_EQ(DMError::DM_ERROR_IPC_FAILED, result3); } + /** * @tc.name: GetDisplaySnapshot01 * @tc.desc: test DisplayManagerProxy::GetDisplaySnapshot @@ -246,6 +253,7 @@ HWTEST_F(DisplayManagerProxyTest, GetDisplaySnapshot01, Function | SmallTest | L auto result3 = proxy2.GetDisplaySnapshot(0); ASSERT_EQ(nullptr, result3); } + /** * @tc.name: GetScreenSupportedColorGamuts01 * @tc.desc: test DisplayManagerProxy::GetScreenSupportedColorGamuts @@ -269,6 +277,7 @@ HWTEST_F(DisplayManagerProxyTest, GetScreenSupportedColorGamuts01, Function | Sm auto result3 = proxy2.GetScreenSupportedColorGamuts(0, gamutVector); ASSERT_EQ(DMError::DM_ERROR_IPC_FAILED, result3); } + /** * @tc.name: GetScreenColorGamut01 * @tc.desc: test DisplayManagerProxy::GetScreenColorGamut diff --git a/dmserver/test/unittest/screen_rotation_controller_test.cpp b/dmserver/test/unittest/screen_rotation_controller_test.cpp index 859d04e053..6540e812e5 100644 --- a/dmserver/test/unittest/screen_rotation_controller_test.cpp +++ b/dmserver/test/unittest/screen_rotation_controller_test.cpp @@ -118,7 +118,6 @@ HWTEST_F(ScreenRotationControllerTest, DefaultDeviceRotationOffset, Function | S ASSERT_EQ(180, ScreenRotationController::defaultDeviceRotationOffset_); } - /** * @tc.name: CalcTargetDisplayRotation * @tc.desc: Calc target display rotation @@ -606,6 +605,7 @@ HWTEST_F(ScreenRotationControllerTest, CalcRotationDegree, Function | SmallTest GravityData data2 = {1.f, 1.f, 1.f}; ASSERT_EQ(315, GravitySensorSubscriber::CalcRotationDegree(&data2)); } + /** * @tc.name: CalcSensorRotation * @tc.desc: Calc sensor rotation diff --git a/interfaces/innerkits/extension/window_extension_connection.h b/interfaces/innerkits/extension/window_extension_connection.h index a29fd782b3..32affe58b5 100644 --- a/interfaces/innerkits/extension/window_extension_connection.h +++ b/interfaces/innerkits/extension/window_extension_connection.h @@ -51,22 +51,26 @@ public: * @param rsSurfaceNode Surface node from RS. */ virtual void OnWindowReady(const std::shared_ptr& rsSurfaceNode) = 0; + /** * @brief Callback when window extension disconnected. */ virtual void OnExtensionDisconnected() = 0; + /** * @brief Callback when receive key event. * * @param event Keyboard event. */ virtual void OnKeyEvent(const std::shared_ptr& event) = 0; + /** * @brief Callback when receive pointer event. * * @param event Pointer event. */ virtual void OnPointerEvent(const std::shared_ptr& event) = 0; + /** * @brief Callback when press back button. */ @@ -84,10 +88,12 @@ public: * @brief Constructor for WindowExtensionConnection. */ WindowExtensionConnection(); + /** * @brief Deconstructor for WindowExtensionConnection. */ ~WindowExtensionConnection(); + /** * @brief Deconstructor for WindowExtensionConnection. * @@ -100,6 +106,7 @@ public: */ int ConnectExtension(const AppExecFwk::ElementName& element, const Rect& rect, uint32_t uid, uint32_t windowId, const sptr& callback) const; + /** * @brief Deconstructor for WindowExtensionConnection. * @@ -114,22 +121,27 @@ public: int ConnectExtension(const AppExecFwk::ElementName& element, const Rect& rect, uint32_t uid, uint32_t windowId, const sptr& callback, const sptr& extensionSession) const; + /** * @brief Disconnect window extension. */ void DisconnectExtension() const; + /** * @brief Show window extension. */ void Show() const; + /** * @brief Hide window extension. */ void Hide() const; + /** * @brief Request focus of window extension. */ void RequestFocus() const; + /** * @brief Set bounds of window extension. * diff --git a/interfaces/innerkits/wm/window.h b/interfaces/innerkits/wm/window.h index 411938243b..06503d2ffc 100644 --- a/interfaces/innerkits/wm/window.h +++ b/interfaces/innerkits/wm/window.h @@ -79,46 +79,56 @@ public: * @brief Notify caller that window is on the forground. */ virtual void AfterForeground() {} + /** * @brief Notify caller that window is on the background. */ virtual void AfterBackground() {} + /** * @brief Notify caller that window is focused. */ virtual void AfterFocused() {} + /** * @brief Notify caller that window is unfocused. */ virtual void AfterUnfocused() {} + /** * @brief Notify caller the error code when window go forground failed. * * @param ret Error code when window go forground failed. */ virtual void ForegroundFailed(int32_t ret) {} + /** * @brief Notify caller the error code when window go background failed. * * @param ret Error code when window go background failed. */ virtual void BackgroundFailed(int32_t ret) {} + /** * @brief Notify caller that window is active. */ virtual void AfterActive() {} + /** * @brief Notify caller that window is inactive. */ virtual void AfterInactive() {} + /** * @brief Notify caller that window is resumed. */ virtual void AfterResumed() {} + /** * @brief Notify caller that window is paused. */ virtual void AfterPaused() {} + /** * @brief Notify caller that window is destroyed. */ @@ -141,6 +151,7 @@ public: */ virtual void OnSizeChange(Rect rect, WindowSizeChangeReason reason, const std::shared_ptr& rsTransaction = nullptr) {} + /** * @brief Notify caller when window mode changed. * @@ -227,6 +238,7 @@ public: * @param inputEvent Means PointerEvent. */ virtual void OnDispatchPointerEvent(std::shared_ptr& inputEvent) {} + /** * @brief Dispatch KeyEvent. * @@ -265,6 +277,7 @@ public: * @param color Color of Background. */ virtual void SetBackgroundColor(uint32_t color) {} + /** * @brief Get BackgroundColor. * @@ -284,22 +297,26 @@ public: * @brief Default construct func of IInputEventConsumer. */ IInputEventConsumer() = default; + /** * @brief Default Destructor func of IInputEventConsumer. */ virtual ~IInputEventConsumer() = default; + /** * @brief Observe KeyEvent of Multi-Model Input. * * @param keyEvent KeyEvent of Multi-Model Input. */ virtual bool OnInputEvent(const std::shared_ptr& keyEvent) const { return false; } + /** * @brief Observe PointerEvent of Multi-Model Input. * * @param pointerEvent PointerEvent of Multi-Model Input. */ virtual bool OnInputEvent(const std::shared_ptr& pointerEvent) const { return false; } + /** * @brief Observe axisEvent of Multi-Model Input. * @@ -332,6 +349,7 @@ public: * @brief Observe the event when animation show. */ virtual void AnimationForShown() {} + /** * @brief Observe the event when animation hide. */ @@ -570,6 +588,7 @@ public: * @return sptr */ static sptr GetTopWindowWithContext(const std::shared_ptr& context = nullptr); + /** * @brief Get the final show window by id. Its implemented in api8 * @@ -577,6 +596,7 @@ public: * @return sptr */ static sptr GetTopWindowWithId(uint32_t mainWinId); + /** * @brief Get the main window by context. * @@ -584,6 +604,7 @@ public: * @return sptr */ static sptr GetMainWindowWithContext(const std::shared_ptr& context = nullptr); + /** * @brief Get the all sub windows by parent * @@ -598,48 +619,56 @@ public: * @param configuration configuration for app */ static void UpdateConfigurationForAll(const std::shared_ptr& configuration); + /** * @brief Get surface node from RS * * @return Surface node from RS */ virtual std::shared_ptr GetSurfaceNode() const { return nullptr; } + /** * @brief Get ability context * * @return Ability context from AbilityRuntime */ virtual const std::shared_ptr GetContext() const { return nullptr; } + /** * @brief Get the window show rect * * @return Rect of window */ virtual Rect GetRect() const { return {}; } + /** * @brief Get window default rect from window property. * * @return Rect of window. */ virtual Rect GetRequestRect() const { return {}; } + /** * @brief Get the window type * * @return Type of window */ virtual WindowType GetType() const { return WindowType::WINDOW_TYPE_APP_MAIN_WINDOW; } + /** * @brief Get the window mode. * * @return Mode of window. */ virtual WindowMode GetMode() const { return WindowMode::WINDOW_MODE_UNDEFINED; } + /** * @brief Get alpha of window. * * @return Alpha of window. */ virtual float GetAlpha() const { return 0.0f; } + /** * @brief Get the name of window. * @@ -650,30 +679,35 @@ public: static const std::string name; return name; } + /** * @brief Get id of window. * * @return ID of window. */ virtual uint32_t GetWindowId() const { return INVALID_WINDOW_ID; } + /** * @brief Get displayId of window. * * @return displayId of window. */ virtual uint64_t GetDisplayId() const { return DISPLAY_ID_INVALID; } + /** * @brief Get flag of window. * * @return Flag of window. */ virtual uint32_t GetWindowFlags() const { return 0; } + /** * @brief Get state of window. * * @return Current state of window. */ virtual WindowState GetWindowState() const { return WindowState::STATE_INITIAL; } + /** * @brief Set focusable property of window. * @@ -681,12 +715,14 @@ public: * @return Errorcode of window. */ virtual WMError SetFocusable(bool isFocusable) { return WMError::WM_OK; } + /** * @brief Get focusable property of window. * * @return True means window can be focused, false means window cannot be focused. */ virtual bool GetFocusable() const { return false; } + /** * @brief Set touchable property of window. * @@ -694,12 +730,14 @@ public: * @return Errorcode of window. */ virtual WMError SetTouchable(bool isTouchable) { return WMError::WM_OK; } + /** * @brief Get touchable property of window. * * @return True means window can be touched, false means window cannot be touched. */ virtual bool GetTouchable() const { return false; } + /** * @brief Get SystemBarProperty By WindowType. * @@ -707,6 +745,7 @@ public: * @return Property of system bar. */ virtual SystemBarProperty GetSystemBarPropertyByType(WindowType type) const { return {}; } + /** * @brief judge this window is full screen. * @@ -714,6 +753,7 @@ public: * @return false default return false */ virtual bool IsFullScreen() const { return false; } + /** * @brief judge window layout is full screen * @@ -721,6 +761,7 @@ public: * @return false this window layout is not full screen */ virtual bool IsLayoutFullScreen() const { return false; } + /** * @brief Set the Window Type * @@ -728,6 +769,7 @@ public: * @return WMError */ virtual WMError SetWindowType(WindowType type) { return WMError::WM_OK; } + /** * @brief Set the Window Mode * @@ -735,6 +777,7 @@ public: * @return WMError */ virtual WMError SetWindowMode(WindowMode mode) { return WMError::WM_OK; } + /** * @brief Set whether the window is topmost * @@ -742,12 +785,14 @@ public: * @return WMError */ virtual WMError SetTopmost(bool topmost) { return WMError::WM_OK; } + /** * @brief Get whether window is topmost * * @return True means window is topmost */ virtual bool IsTopmost() const { return false; } + /** * @brief Set whether the main window is topmost * @@ -755,12 +800,14 @@ public: * @return WMError */ virtual WMError SetMainWindowTopmost(bool isTopmost) { return WMError::WM_ERROR_DEVICE_NOT_SUPPORT; } + /** * @brief Get whether main window is topmost * * @return True means main window is topmost */ virtual bool IsMainWindowTopmost() const { return false; } + /** * @brief Set alpha of window. * @@ -768,6 +815,7 @@ public: * @return WM_OK means success, others means set failed. */ virtual WMError SetAlpha(float alpha) { return WMError::WM_OK; } + /** * @brief Set transform of window property. * @@ -775,6 +823,7 @@ public: * @return WMError */ virtual WMError SetTransform(const Transform& trans) { return WMError::WM_OK; } + /** * @brief Get transform of window property. * @@ -785,6 +834,7 @@ public: static const Transform trans; return trans; } + /** * @brief Add window flag. * @@ -792,6 +842,7 @@ public: * @return WM_OK means add success, others means failed. */ virtual WMError AddWindowFlag(WindowFlag flag) { return WMError::WM_OK; } + /** * @brief Remove window flag. * @@ -799,6 +850,7 @@ public: * @return WM_OK means remove success, others means failed. */ virtual WMError RemoveWindowFlag(WindowFlag flag) { return WMError::WM_OK; } + /** * @brief Set window flag. * @@ -806,6 +858,7 @@ public: * @return WM_OK means set success, others means failed. */ virtual WMError SetWindowFlags(uint32_t flags) { return WMError::WM_OK; } + /** * @brief Set the System Bar(include status bar and nav bar) Property * @@ -814,6 +867,7 @@ public: * @return WMError */ virtual WMError SetSystemBarProperty(WindowType type, const SystemBarProperty& property) { return WMError::WM_OK; } + /** * @brief Get the Avoid Area By Type object * @@ -822,6 +876,7 @@ public: * @return WMError */ virtual WMError GetAvoidAreaByType(AvoidAreaType type, AvoidArea& avoidArea) { return WMError::WM_OK; } + /** * @brief Set this window layout full screen, with hide status bar and nav bar above on this window * @@ -829,6 +884,7 @@ public: * @return WMError */ virtual WMError SetLayoutFullScreen(bool status) { return WMError::WM_OK; } + /** * @brief Set whether the title bar and dock bar will show, when the mouse hovers over hot area. * @@ -841,6 +897,7 @@ public: { return WMError::WM_ERROR_DEVICE_NOT_SUPPORT; } + /** * @brief Set this window full screen, with hide status bar and nav bar * @@ -848,12 +905,14 @@ public: * @return WMError */ virtual WMError SetFullScreen(bool status) { return WMError::WM_OK; } + /** * @brief destroy window * * @return WMError */ virtual WMError Destroy() { return WMError::WM_OK; } + /** * @brief Show window * @@ -864,6 +923,7 @@ public: */ virtual WMError Show(uint32_t reason = 0, bool withAnimation = false, bool withFocus = true) { return WMError::WM_OK; } + /** * @brief Hide window * @@ -876,18 +936,21 @@ public: { return WMError::WM_OK; } + /** * @brief notify window first frame drawing completed. * * @return WMError */ virtual WMError NotifyDrawingCompleted() { return WMError::WM_OK; } + /** * @brief notify window remove starting window. * * @return WMError */ virtual WMError NotifyRemoveStartingWindow() { return WMError::WM_ERROR_DEVICE_NOT_SUPPORT; } + /** * @brief move the window to (x, y) * @@ -896,6 +959,7 @@ public: * @return WMError */ virtual WMError MoveTo(int32_t x, int32_t y, bool isMoveToGlobal = false) { return WMError::WM_OK; } + /** * @brief move the window to (x, y) * @@ -904,6 +968,7 @@ public: * @return WMError */ virtual WMError MoveToAsync(int32_t x, int32_t y) { return WMError::WM_ERROR_DEVICE_NOT_SUPPORT; } + /** * @brief move the window to global (x, y) * @@ -912,6 +977,7 @@ public: * @return WMError */ virtual WMError MoveWindowToGlobal(int32_t x, int32_t y) { return WMError::WM_ERROR_DEVICE_NOT_SUPPORT; } + /** * @brief Get window global scaled rect. * @@ -919,6 +985,7 @@ public: * @return WMError */ virtual WMError GetGlobalScaledRect(Rect& globalScaledRect) { return WMError::WM_ERROR_DEVICE_NOT_SUPPORT; } + /** * @brief resize the window instance (w,h) * @@ -927,6 +994,7 @@ public: * @return WMError */ virtual WMError Resize(uint32_t width, uint32_t height) { return WMError::WM_OK; } + /** * @brief resize the window instance (w,h) * @@ -935,6 +1003,7 @@ public: * @return WMError */ virtual WMError ResizeAsync(uint32_t width, uint32_t height) { return WMError::WM_ERROR_DEVICE_NOT_SUPPORT; } + /** * @brief set the window gravity * @@ -943,6 +1012,7 @@ public: * @return WMError */ virtual WMError SetWindowGravity(WindowGravity gravity, uint32_t percent) { return WMError::WM_OK; } + /** * @brief Set the screen always on * @@ -950,12 +1020,14 @@ public: * @return WMError */ virtual WMError SetKeepScreenOn(bool keepScreenOn) { return WMError::WM_OK; } + /** * @brief Get the screen is always on or not. * * @return True means screen is always on, false means the opposite. */ virtual bool IsKeepScreenOn() const { return false; } + /** * @brief Set the screen on * @@ -963,12 +1035,14 @@ public: * @return WM_OK means set success, others means set failed. */ virtual WMError SetTurnScreenOn(bool turnScreenOn) { return WMError::WM_OK; } + /** * @brief Get the screen is on or not. * * @return True means screen is on, false means screen is off. */ virtual bool IsTurnScreenOn() const { return false; } + /** * @brief Set Background color. * @@ -976,6 +1050,7 @@ public: * @return WM_OK means set success, others means set failed. */ virtual WMError SetBackgroundColor(const std::string& color) { return WMError::WM_OK; } + /** * @brief Set transparent status. * @@ -983,12 +1058,14 @@ public: * @return WM_OK means set success, others means set failed. */ virtual WMError SetTransparent(bool isTransparent) { return WMError::WM_OK; } + /** * @brief Get transparent status. * * @return True means window is transparent, false means the opposite. */ virtual bool IsTransparent() const { return false; } + /** * @brief Set brightness value of window. * @@ -996,12 +1073,14 @@ public: * @return WM_OK means set success, others means set failed. */ virtual WMError SetBrightness(float brightness) { return WMError::WM_OK; } + /** * @brief Get brightness value of window. * * @return Brightness value of window. */ virtual float GetBrightness() const { return 0.0f; } + /** * @brief Set calling window. * @@ -1009,6 +1088,7 @@ public: * @return WM_OK means set success, others means set failed. */ virtual WMError SetCallingWindow(uint32_t windowId) { return WMError::WM_OK; } + /** * @brief Set privacy mode of window. * @@ -1016,18 +1096,21 @@ public: * @return WM_OK means set success, others means set failed. */ virtual WMError SetPrivacyMode(bool isPrivacyMode) { return WMError::WM_OK; } + /** * @brief Get privacy property of window. * * @return True means window is private and cannot be screenshot or recorded. */ virtual bool IsPrivacyMode() const { return false; } + /** * @brief Set privacy mode by system. * * @param isSystemPrivacyMode True means set window private, false means not set window private. */ virtual void SetSystemPrivacyMode(bool isSystemPrivacyMode) {} + /** * @brief Bind Dialog window to target token. * @@ -1035,6 +1118,7 @@ public: * @return WM_OK means set success, others means set failed. */ virtual WMError BindDialogTarget(sptr targetToken) { return WMError::WM_OK; } + /** * @brief Set whether the dialog window responds to back gesture. * @@ -1045,12 +1129,14 @@ public: { return WMError::WM_ERROR_DEVICE_NOT_SUPPORT; } + /** * @brief Raise zorder of window to the top of APP Mainwindow. * * @return WM_OK means raise success, others means raise failed. */ virtual WMError RaiseToAppTop() { return WMError::WM_OK; } + /** * @brief Set skip flag of snapshot. * @@ -1067,6 +1153,7 @@ public: * @return WM_OK means set success, others means set failed. */ virtual WMError SetCornerRadius(float cornerRadius) { return WMError::WM_OK; } + /** * @brief Set shadow radius of window. * @@ -1074,6 +1161,7 @@ public: * @return WM_OK means set success, others means set failed. */ virtual WMError SetShadowRadius(float radius) { return WMError::WM_OK; } + /** * @brief Set shadow color of window. * @@ -1081,6 +1169,7 @@ public: * @return WM_OK means set success, others means set failed. */ virtual WMError SetShadowColor(std::string color) { return WMError::WM_OK; } + /** * @brief Set shadow X offset. * @@ -1088,6 +1177,7 @@ public: * @return WM_OK means set success, others means set failed. */ virtual WMError SetShadowOffsetX(float offsetX) { return WMError::WM_OK; } + /** * @brief Set shadow Y offset. * @@ -1095,6 +1185,7 @@ public: * @return WM_OK means set success, others means set failed. */ virtual WMError SetShadowOffsetY(float offsetY) { return WMError::WM_OK; } + /** * @brief Set blur property. * @@ -1102,6 +1193,7 @@ public: * @return WM_OK means set success, others means set failed. */ virtual WMError SetBlur(float radius) { return WMError::WM_OK; } + /** * @brief Set Backdrop blur property. * @@ -1109,6 +1201,7 @@ public: * @return WM_OK means set success, others means set failed. */ virtual WMError SetBackdropBlur(float radius) { return WMError::WM_OK; } + /** * @brief Set Backdrop blur style. * @@ -1123,18 +1216,21 @@ public: * @return WM_OK means request success, others means request failed. */ virtual WMError RequestFocus() const { return WMError::WM_OK; } + /** * @brief Request to get focus or lose focus. * * @return WM_OK means request success, others means request failed. */ virtual WMError RequestFocusByClient(bool isFocused) const { return WMError::WM_ERROR_DEVICE_NOT_SUPPORT; } + /** * @brief Check current focus status. * * @return True means window is focused, false means window is unfocused. */ virtual bool IsFocused() const { return false; } + /** * @brief Update surfaceNode after customAnimation. * @@ -1142,6 +1238,7 @@ public: * @return WM_OK means update success, others means update failed. */ virtual WMError UpdateSurfaceNodeAfterCustomAnimation(bool isAdd) { return WMError::WM_OK; } + /** * @brief Set InputEvent Consumer. * @@ -1149,36 +1246,42 @@ public: * @return WM_OK means set success, others means set failed. */ virtual void SetInputEventConsumer(const std::shared_ptr& inputEventConsumer) {} + /** * @brief Consume KeyEvent from MMI. * * @param inputEvent Keyboard input event. */ virtual void ConsumeKeyEvent(std::shared_ptr& inputEvent) {} + /** * @brief Notify KeyEvent to arkui. * * @param inputEvent Keyboard input event */ virtual bool PreNotifyKeyEvent(const std::shared_ptr& keyEvent) {return false;} + /** * @brief Consume PointerEvent from MMI. * * @param inputEvent Pointer input event */ virtual void ConsumePointerEvent(const std::shared_ptr& inputEvent) {} + /** * @brief Request Vsync. * * @param vsyncCallback Callback of vsync. */ virtual void RequestVsync(const std::shared_ptr& vsyncCallback) {} + /** * @brief get vsync period. * * @return vsync period. */ virtual int64_t GetVSyncPeriod() { return 0; } + /** * @brief flush frame rate of linker. * @@ -1187,12 +1290,14 @@ public: * @param rateType frame rate type. */ virtual void FlushFrameRate(uint32_t rate, int32_t animatorExpectedFrameRate, uint32_t rateType) {} + /** * @brief Update Configuration. * * @param configuration Window configuration. */ virtual void UpdateConfiguration(const std::shared_ptr& configuration) {} + /** * @brief Register window lifecycle listener. * @@ -1200,6 +1305,7 @@ public: * @return WM_OK means register success, others means register failed. */ virtual WMError RegisterLifeCycleListener(const sptr& listener) { return WMError::WM_OK; } + /** * @brief Unregister window lifecycle listener. * @@ -1207,6 +1313,7 @@ public: * @return WM_OK means unregister success, others means unregister failed. */ virtual WMError UnregisterLifeCycleListener(const sptr& listener) { return WMError::WM_OK; } + /** * @brief Register window change listener. * @@ -1217,6 +1324,7 @@ public: { return WMError::WM_OK; } + /** * @brief Unregister window change listener. * @@ -1227,6 +1335,7 @@ public: { return WMError::WM_OK; } + /** * @brief Register avoid area change listener. * @@ -1237,6 +1346,7 @@ public: { return WMError::WM_OK; } + /** * @brief Unregister avoid area change listener. * @@ -1247,6 +1357,7 @@ public: { return WMError::WM_OK; } + /** * @brief Register window drag listener. * @@ -1254,6 +1365,7 @@ public: * @return WM_OK means register success, others means register failed. */ virtual WMError RegisterDragListener(const sptr& listener) { return WMError::WM_OK; } + /** * @brief Unregister window drag listener. * @@ -1261,6 +1373,7 @@ public: * @return WM_OK means unregister success, others means unregister failed. */ virtual WMError UnregisterDragListener(const sptr& listener) { return WMError::WM_OK; } + /** * @brief Register display move listener. * @@ -1268,6 +1381,7 @@ public: * @return WM_OK means register success, others means register failed. */ virtual WMError RegisterDisplayMoveListener(sptr& listener) { return WMError::WM_OK; } + /** * @brief Unregister display move listener. * @@ -1275,17 +1389,20 @@ public: * @return WM_OK means unregister success, others means unregister failed. */ virtual WMError UnregisterDisplayMoveListener(sptr& listener) { return WMError::WM_OK; } + /** * @brief Register window destroyed listener. * * @param func Function to notify window destroyed. */ virtual void RegisterWindowDestroyedListener(const NotifyNativeWinDestroyFunc& func) {} + /** * @brief Unregister window destroyed listener. * */ virtual void UnregisterWindowDestroyedListener() {} + /** * @brief Register Occupied Area Change listener. * @@ -1296,6 +1413,7 @@ public: { return WMError::WM_OK; } + /** * @brief Unregister occupied area change listener. * @@ -1306,6 +1424,7 @@ public: { return WMError::WM_OK; } + /** * @brief Register touch outside listener. * @@ -1313,6 +1432,7 @@ public: * @return WM_OK means register success, others means register failed. */ virtual WMError RegisterTouchOutsideListener(const sptr& listener) { return WMError::WM_OK; } + /** * @brief Unregister touch outside listener. * @@ -1323,6 +1443,7 @@ public: { return WMError::WM_OK; } + /** * @brief Register Animation Transition Controller listener. * @@ -1333,6 +1454,7 @@ public: { return WMError::WM_OK; } + /** * @brief Register screen shot listener. * @@ -1340,6 +1462,7 @@ public: * @return WM_OK means register success, others means register failed. */ virtual WMError RegisterScreenshotListener(const sptr& listener) { return WMError::WM_OK; } + /** * @brief Unregister screen shot listener. * @@ -1347,6 +1470,7 @@ public: * @return WM_OK means unregister success, others means unregister failed. */ virtual WMError UnregisterScreenshotListener(const sptr& listener) { return WMError::WM_OK; } + /** * @brief Register dialog target touch listener. * @@ -1357,6 +1481,7 @@ public: { return WMError::WM_OK; } + /** * @brief Unregister dialog target touch listener. * @@ -1367,28 +1492,33 @@ public: { return WMError::WM_OK; } + /** * @brief Register dialog death Recipient listener. * * @param listener IDialogDeathRecipientListener. */ virtual void RegisterDialogDeathRecipientListener(const sptr& listener) {} + /** * @brief Unregister window death recipient listener. * * @param listener IDialogDeathRecipientListener. */ virtual void UnregisterDialogDeathRecipientListener(const sptr& listener) {} + /** * @brief Notify touch dialog target. */ virtual void NotifyTouchDialogTarget(int32_t posX = 0, int32_t posY = 0) {} + /** * @brief Set ace ability handler. * * @param handler Ace ability handler. */ virtual void SetAceAbilityHandler(const sptr& handler) {} + /** * @brief set window ui content * @@ -1405,6 +1535,7 @@ public: { return WMError::WM_OK; } + /** * @brief set window ui content * @@ -1420,6 +1551,7 @@ public: { return WMError::WM_OK; } + /** * @brief set window ui content by abc * @@ -1434,6 +1566,7 @@ public: { return WMError::WM_OK; } + /** * @brief Get ui content info. * @@ -1443,6 +1576,7 @@ public: { return {}; } + /** * @brief Set uiability restored router stack. * @@ -1452,12 +1586,14 @@ public: { return WMError::WM_OK; } + /** * @brief Get ui content object. * * @return UIContent object of ACE. */ virtual Ace::UIContent* GetUIContent() const { return nullptr; } + /** * @brief Get ui content object. * @@ -1465,36 +1601,42 @@ public: * @return UIContent object of ACE. */ virtual Ace::UIContent* GetUIContentWithId(uint32_t winId) const { return nullptr; } + /** * @brief Window handle new want. * * @param want Want object of AAFwk. */ virtual void OnNewWant(const AAFwk::Want& want) {} + /** * @brief Set requested orientation. * * @param Orientation Screen orientation. */ virtual void SetRequestedOrientation(Orientation) {} + /** * @brief Get requested orientation. * * @return Orientation screen orientation. */ virtual Orientation GetRequestedOrientation() { return Orientation::UNSPECIFIED; } + /** * @brief Set requested mode support info. * * @param modeSupportInfo Mode of window supported. */ virtual void SetRequestModeSupportInfo(uint32_t modeSupportInfo) {} + /** * @brief Get requested mode support info. * * @return Enumeration values under WindowModeSupport. */ virtual uint32_t GetRequestModeSupportInfo() const { return 0; } + /** * @brief Set touch hot areas. * @@ -1502,18 +1644,21 @@ public: * @return WM_OK means set success, others means set failed. */ virtual WMError SetTouchHotAreas(const std::vector& rects) { return WMError::WM_OK; } + /** * @brief Get requested touch hot areas. * * @param rects Hot areas of touching. */ virtual void GetRequestedTouchHotAreas(std::vector& rects) const {} + /** * @brief Main handler available or not. * * @return True means main handler is available, false means the opposite. */ virtual bool IsMainHandlerAvailable() const { return false; } + /** * @brief Set window label name. * @@ -1521,6 +1666,7 @@ public: * @return WM_OK means set success, others means set failed. */ virtual WMError SetAPPWindowLabel(const std::string& label) { return WMError::WM_OK; } + /** * @brief Set window icon. * @@ -1534,12 +1680,14 @@ public: * */ virtual WMError DisableAppWindowDecor() { return WMError::WM_OK; } + /** * @brief return window decoration is enabled. It is called by ACE * * @return true means window decoration is enabled. Otherwise disabled */ virtual bool IsDecorEnable() const { return false; } + /** * @brief maximize the main window. It is called by ACE when maximize button is clicked. * @@ -1564,12 +1712,14 @@ public: * @return WMError */ virtual WMError MaximizeFloating() {return WMError::WM_OK;} + /** * @brief minimize the main window. It is called by ACE when minimize button is clicked. * * @return WMError */ virtual WMError Minimize() { return WMError::WM_ERROR_DEVICE_NOT_SUPPORT; } + /** * @brief recovery the main window. It is called by ACE when recovery button is clicked. * @@ -1591,11 +1741,13 @@ public: * @return WMError */ virtual WMError Close() { return WMError::WM_OK; } + /** * @brief start move main window. It is called by ACE when title is moved. * */ virtual void StartMove() {} + /** * @brief get start move flag. * @@ -1603,17 +1755,20 @@ public: * */ virtual bool GetStartMoveFlag() { return false; } + /** * @brief start move system window. It is called by application. * */ virtual WmErrorCode StartMoveWindow() { return WmErrorCode::WM_ERROR_DEVICE_NOT_SUPPORT; } + /** * @brief Set flag that need remove window input channel. * * @param needRemoveWindowInputChannel True means remove input channel, false means not remove. */ virtual void SetNeedRemoveWindowInputChannel(bool needRemoveWindowInputChannel) {} + /** * @brief set global window maximize mode. It is called by ACE when maximize mode changed. * @@ -1622,6 +1777,7 @@ public: * @return WMError */ virtual WMError SetGlobalMaximizeMode(MaximizeMode mode) {return WMError::WM_OK;} + /** * @brief get global window maximize mode. * @@ -1636,12 +1792,14 @@ public: * @return True means support wide gamut, false means not support. */ virtual bool IsSupportWideGamut() { return false; } + /** * @brief Set color space. * * @param colorSpace ColorSpace object. */ virtual void SetColorSpace(ColorSpace colorSpace) {} + /** * @brief Get color space object. * @@ -1650,6 +1808,7 @@ public: virtual ColorSpace GetColorSpace() { return ColorSpace::COLOR_SPACE_DEFAULT; } virtual void DumpInfo(const std::vector& params, std::vector& info) {} + /** * @brief window snapshot * @@ -1679,48 +1838,57 @@ public: * @return WMError */ virtual WMError SetAspectRatio(float ratio) { return WMError::WM_OK; } + /** * @brief Unset aspect ratio * @return WMError */ virtual WMError ResetAspectRatio() { return WMError::WM_OK; } + /** * @brief Get keyboard animation config * @return KeyboardAnimationConfig */ virtual KeyboardAnimationConfig GetKeyboardAnimationConfig() { return {}; } + /** * @brief Set need default animation for window show and hide. * * @param needDefaultAnimation True means need default animation, false means not need. */ virtual void SetNeedDefaultAnimation(bool needDefaultAnimation) {} + /** * @brief Transfer Ability Result. * @return WMError */ virtual WMError TransferAbilityResult(uint32_t resultCode, const AAFwk::Want& want) { return WMError::WM_OK; } + /** * @brief Transfer UIExtension data to Extension Component. * @return WMError */ virtual WMError TransferExtensionData(const AAFwk::WantParams& wantParams) { return WMError::WM_OK; } + /** * @brief Register transfer component data callback. * * @param func Function to notify transfer component data. */ virtual void RegisterTransferComponentDataListener(const NotifyTransferComponentDataFunc& func) {} + /** * @brief Trigger BindUIExtensionModal callback. * It needs to be called when the UIExtension frame node is set to asynchronously bind to the modal window. */ virtual void TriggerBindModalUIExtension() {} + /** * @brief Perform back event. * */ virtual void PerformBack() {} + /** * @brief Set the drag enabled flag of a window. * @@ -1728,6 +1896,7 @@ public: * @return Errorcode of window. */ virtual WMError SetResizeByDragEnabled(bool dragEnabled) { return WMError::WM_ERROR_DEVICE_NOT_SUPPORT; } + /** * @brief Set the raise enabled flag of a window. * @@ -1735,6 +1904,7 @@ public: * @return Errorcode of window. */ virtual WMError SetRaiseByClickEnabled(bool raiseEnabled) { return WMError::WM_ERROR_DEVICE_NOT_SUPPORT; } + /** * @brief Raise one app sub window above another. * @@ -1906,6 +2076,7 @@ public: { return WMError::WM_ERROR_DEVICE_NOT_SUPPORT; } + /** * @brief Unregister window status change listener. * @@ -2357,7 +2528,7 @@ public: */ virtual WMError AdjustKeyboardLayout(const KeyboardLayoutParams& params) { return WMError::WM_OK; } - /* + /** * @brief Set the Dvsync Switch * * @param dvsyncSwitch bool. diff --git a/interfaces/innerkits/wm/window_accessibility_controller.h b/interfaces/innerkits/wm/window_accessibility_controller.h index 44b18fc5f7..9cd56f5c9c 100644 --- a/interfaces/innerkits/wm/window_accessibility_controller.h +++ b/interfaces/innerkits/wm/window_accessibility_controller.h @@ -36,6 +36,7 @@ public: * @param scale Parameter of zooming. */ void SetAnchorAndScale(int32_t x, int32_t y, float scale); + /** * @brief Set anchor offset, only take effect for the main display. * @@ -43,6 +44,7 @@ public: * @param deltaY Y coordinate offset of anchor. */ void SetAnchorOffset(int32_t deltaX, int32_t deltaY); + /** * @brief Turn off the func of window zoom. */ diff --git a/interfaces/innerkits/wm/window_manager.h b/interfaces/innerkits/wm/window_manager.h index affd8e9356..725c3cb1aa 100644 --- a/interfaces/innerkits/wm/window_manager.h +++ b/interfaces/innerkits/wm/window_manager.h @@ -68,6 +68,7 @@ public: * @param screenId ID of the screen that is connected to the WMS, screenId is currently always 0. */ virtual void OnConnected(int32_t userId, int32_t screenId) = 0; + /** * @brief Notify caller when WMS disconnected * @@ -91,6 +92,7 @@ public: * @param focusChangeInfo Window info while its focus status changed. */ virtual void OnFocused(const sptr& focusChangeInfo) = 0; + /** * @brief Notify caller when window lose focus * @@ -114,7 +116,6 @@ public: virtual void OnWindowModeUpdate(WindowModeType mode) = 0; }; - /** * @class ISystemBarChangedListener * @@ -218,6 +219,7 @@ public: * @brief Default construct of AccessibilityWindowInfo. */ AccessibilityWindowInfo() = default; + /** * @brief Default deconstruct of AccessibilityWindowInfo. */ @@ -230,6 +232,7 @@ public: * @return True means marshall success, false means marshall failed. */ virtual bool Marshalling(Parcel& parcel) const override; + /** * @brief Unmarshalling AccessibilityWindowInfo. * @@ -266,6 +269,7 @@ public: * @brief Default construct of UnreliableWindowInfo. */ UnreliableWindowInfo() = default; + /** * @brief Default deconstruct of UnreliableWindowInfo. */ @@ -278,6 +282,7 @@ public: * @return True means marshall success, false means marshall failed. */ virtual bool Marshalling(Parcel& parcel) const override; + /** * @brief Unmarshalling UnreliableWindowInfo. * @@ -428,6 +433,7 @@ public: * @return WM_OK means register success, others means register failed. */ WMError RegisterWMSConnectionChangedListener(const sptr& listener); + /** * @brief Unregister WMS connection status changed listener. * @attention Callable only by u0 system user. @@ -435,6 +441,7 @@ public: * @return WM_OK means unregister success, others means unregister failed. */ WMError UnregisterWMSConnectionChangedListener(); + /** * @brief Register focus changed listener. * @@ -442,6 +449,7 @@ public: * @return WM_OK means register success, others means register failed. */ WMError RegisterFocusChangedListener(const sptr& listener); + /** * @brief Unregister focus changed listener. * @@ -449,6 +457,7 @@ public: * @return WM_OK means unregister success, others means unregister failed. */ WMError UnregisterFocusChangedListener(const sptr& listener); + /** * @brief Register window mode listener. * @@ -456,6 +465,7 @@ public: * @return WM_OK means register success, others means register failed. */ WMError RegisterWindowModeChangedListener(const sptr& listener); + /** * @brief Unregister window mode listener. * @@ -463,6 +473,7 @@ public: * @return WM_OK means unregister success, others means unregister failed. */ WMError UnregisterWindowModeChangedListener(const sptr& listener); + /** * @brief Get window mode type. * @@ -470,6 +481,7 @@ public: * @return WM_OK means get success, others means get failed. */ WMError GetWindowModeType(WindowModeType& windowModeType) const; + /** * @brief Register system bar changed listener. * @@ -477,6 +489,7 @@ public: * @return WM_OK means register success, others means register failed. */ WMError RegisterSystemBarChangedListener(const sptr& listener); + /** * @brief Unregister system bar changed listener. * @@ -484,6 +497,7 @@ public: * @return WM_OK means unregister success, others means unregister failed. */ WMError UnregisterSystemBarChangedListener(const sptr& listener); + /** * @brief Register window updated listener. * @@ -491,6 +505,7 @@ public: * @return WM_OK means register success, others means register failed. */ WMError RegisterWindowUpdateListener(const sptr& listener); + /** * @brief Unregister window updated listener. * @@ -498,6 +513,7 @@ public: * @return WM_OK means unregister success, others means unregister failed. */ WMError UnregisterWindowUpdateListener(const sptr& listener); + /** * @brief Register visibility changed listener. * @@ -505,6 +521,7 @@ public: * @return WM_OK means register success, others means register failed. */ WMError RegisterVisibilityChangedListener(const sptr& listener); + /** * @brief Unregister visibility changed listener. * @@ -512,6 +529,7 @@ public: * @return WM_OK means unregister success, others means unregister failed. */ WMError UnregisterVisibilityChangedListener(const sptr& listener); + /** * @brief Register drawingcontent changed listener. * @@ -535,6 +553,7 @@ public: * @return WM_OK means register success, others means register failed. */ WMError RegisterCameraFloatWindowChangedListener(const sptr& listener); + /** * @brief Unregister camera float window changed listener. * @@ -542,6 +561,7 @@ public: * @return WM_OK means unregister success, others means unregister failed. */ WMError UnregisterCameraFloatWindowChangedListener(const sptr& listener); + /** * @brief Register water mark flag changed listener. * @@ -549,6 +569,7 @@ public: * @return WM_OK means register success, others means register failed. */ WMError RegisterWaterMarkFlagChangedListener(const sptr& listener); + /** * @brief Unregister water mark flag changed listener. * @@ -556,6 +577,7 @@ public: * @return WM_OK means unregister success, others means unregister failed. */ WMError UnregisterWaterMarkFlagChangedListener(const sptr& listener); + /** * @brief Register gesture navigation enabled changed listener. * @@ -564,6 +586,7 @@ public: */ WMError RegisterGestureNavigationEnabledChangedListener( const sptr& listener); + /** * @brief Unregister gesture navigation enabled changed listener. * @@ -632,12 +655,14 @@ public: * @return WM_OK means minimize success, others means minimize failed. */ WMError MinimizeAllAppWindows(DisplayId displayId); + /** * @brief Toggle all app windows to the foreground. * * @return WM_OK means toggle success, others means toggle failed. */ WMError ToggleShownStateForAllAppWindows(); + /** * @brief Set window layout mode. * @@ -645,6 +670,7 @@ public: * @return WM_OK means set success, others means set failed. */ WMError SetWindowLayoutMode(WindowLayoutMode mode); + /** * @brief Get accessibility window info. * @@ -652,6 +678,7 @@ public: * @return WM_OK means get success, others means get failed. */ WMError GetAccessibilityWindowInfo(std::vector>& infos) const; + /** * @brief Get unreliable window info. * @@ -660,6 +687,7 @@ public: */ WMError GetUnreliableWindowInfo(int32_t windowId, std::vector>& infos) const; + /** * @brief Get visibility window info. * @@ -667,6 +695,7 @@ public: * @return WM_OK means get success, others means get failed. */ WMError GetVisibilityWindowInfo(std::vector>& infos) const; + /** * @brief Set gesture navigation enabled. * @@ -751,6 +780,7 @@ public: * @return WM_OK means register success, others means register failed. */ WMError RegisterVisibleWindowNumChangedListener(const sptr& listener); + /** * @brief Unregister visible main window num changed listener. * diff --git a/interfaces/innerkits/wm/window_manager_lite.h b/interfaces/innerkits/wm/window_manager_lite.h index a03e89e72a..9f47ad185e 100644 --- a/interfaces/innerkits/wm/window_manager_lite.h +++ b/interfaces/innerkits/wm/window_manager_lite.h @@ -48,6 +48,7 @@ public: * @return WM_OK means register success, others means register failed. */ WMError RegisterFocusChangedListener(const sptr& listener); + /** * @brief Unregister focus changed listener. * @@ -55,6 +56,7 @@ public: * @return WM_OK means unregister success, others means unregister failed. */ WMError UnregisterFocusChangedListener(const sptr& listener); + /** * @brief Register visibility changed listener. * @@ -62,6 +64,7 @@ public: * @return WM_OK means register success, others means register failed. */ WMError RegisterVisibilityChangedListener(const sptr& listener); + /** * @brief Unregister visibility changed listener. * @@ -69,6 +72,7 @@ public: * @return WM_OK means unregister success, others means unregister failed. */ WMError UnregisterVisibilityChangedListener(const sptr& listener); + /** * @brief Get visibility window info. * @@ -76,6 +80,7 @@ public: * @return WM_OK means get success, others means get failed. */ WMError GetVisibilityWindowInfo(std::vector>& infos) const; + /** * @brief Get focus window. * @@ -83,6 +88,7 @@ public: * @return FocusChangeInfo object about focus window. */ void GetFocusWindowInfo(FocusChangeInfo& focusInfo); + /** * @brief Register drawingcontent changed listener. * @@ -98,6 +104,7 @@ public: * @return WM_OK means unregister success, others means unregister failed. */ WMError UnregisterDrawingContentChangedListener(const sptr& listener); + /** * @brief Register window mode listener. * @@ -105,6 +112,7 @@ public: * @return WM_OK means register success, others means register failed. */ WMError RegisterWindowModeChangedListener(const sptr& listener); + /** * @brief Unregister window mode listener. * @@ -178,7 +186,7 @@ public: * @return WM_OK if raise success */ WMError RaiseWindowToTop(int32_t persistentId); - + /** * @brief Register WMS connection status changed listener. * @attention Callable only by u0 system user. A process only supports successful registration once. @@ -205,6 +213,7 @@ public: * @return WM_OK means register success, others means unregister failed. */ WMError RegisterWindowStyleChangedListener(const sptr& listener); + /** * @brief Unregister WindowStyle changed listener. * @@ -212,6 +221,7 @@ public: * @return WM_OK means unregister success, others means unregister failed. */ WMError UnregisterWindowStyleChangedListener(const sptr& listener); + /** * @brief Get window style type. * @@ -283,7 +293,7 @@ public: * @return WM_OK means register success, others means register failed. */ WMError RegisterWindowUpdateListener(const sptr& listener); - + /** * @brief Unregister window updated listener. * diff --git a/interfaces/innerkits/wm/window_option.h b/interfaces/innerkits/wm/window_option.h index 4cda3d7599..f3df3c5a68 100644 --- a/interfaces/innerkits/wm/window_option.h +++ b/interfaces/innerkits/wm/window_option.h @@ -139,6 +139,7 @@ public: * @param y The position y of hit offset. */ void SetHitOffset(int32_t x, int32_t y); + /** * @brief Set window tag. * diff --git a/interfaces/kits/cj/window_runtime/window_ffi.cpp b/interfaces/kits/cj/window_runtime/window_ffi.cpp index e6253137e6..2bf7bc0224 100644 --- a/interfaces/kits/cj/window_runtime/window_ffi.cpp +++ b/interfaces/kits/cj/window_runtime/window_ffi.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "window_ffi.h" #include #include "pixel_map_impl.h" diff --git a/interfaces/kits/cj/window_runtime/window_ffi.h b/interfaces/kits/cj/window_runtime/window_ffi.h index 7318eb4673..e09a9fdb41 100644 --- a/interfaces/kits/cj/window_runtime/window_ffi.h +++ b/interfaces/kits/cj/window_runtime/window_ffi.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef WINDOW_FFI_H #define WINDOW_FFI_H diff --git a/interfaces/kits/cj/window_runtime/window_impl.cpp b/interfaces/kits/cj/window_runtime/window_impl.cpp index b75be63587..7a663e17a7 100644 --- a/interfaces/kits/cj/window_runtime/window_impl.cpp +++ b/interfaces/kits/cj/window_runtime/window_impl.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "window_impl.h" #include #include diff --git a/interfaces/kits/cj/window_runtime/window_impl.h b/interfaces/kits/cj/window_runtime/window_impl.h index 90c6367a9e..184e45217a 100644 --- a/interfaces/kits/cj/window_runtime/window_impl.h +++ b/interfaces/kits/cj/window_runtime/window_impl.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef WINDOW_IMPL_H #define WINDOW_IMPL_H diff --git a/interfaces/kits/cj/window_runtime/window_manager_impl.cpp b/interfaces/kits/cj/window_runtime/window_manager_impl.cpp index 8c842f93ba..0eedaca903 100644 --- a/interfaces/kits/cj/window_runtime/window_manager_impl.cpp +++ b/interfaces/kits/cj/window_runtime/window_manager_impl.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "window_manager_impl.h" #include "ability.h" #include "ability_context.h" diff --git a/interfaces/kits/cj/window_runtime/window_manager_impl.h b/interfaces/kits/cj/window_runtime/window_manager_impl.h index efdb654922..7f4f8b5738 100644 --- a/interfaces/kits/cj/window_runtime/window_manager_impl.h +++ b/interfaces/kits/cj/window_runtime/window_manager_impl.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef WINDOW_MANAGER_IMPL_H #define WINDOW_MANAGER_IMPL_H diff --git a/interfaces/kits/dmndk/dm/oh_display_info.h b/interfaces/kits/dmndk/dm/oh_display_info.h index 364d064d09..6ac731cac0 100644 --- a/interfaces/kits/dmndk/dm/oh_display_info.h +++ b/interfaces/kits/dmndk/dm/oh_display_info.h @@ -158,10 +158,13 @@ typedef enum { typedef struct { /** rect left */ int32_t left; + /** rect top */ int32_t top; + /** rect width */ uint32_t width; + /** rect height */ uint32_t height; } NativeDisplayManager_Rect; diff --git a/interfaces/kits/napi/extension_window/js_extension_window_register_manager.cpp b/interfaces/kits/napi/extension_window/js_extension_window_register_manager.cpp index 397836f2df..e621542ca4 100644 --- a/interfaces/kits/napi/extension_window/js_extension_window_register_manager.cpp +++ b/interfaces/kits/napi/extension_window/js_extension_window_register_manager.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "js_extension_window_register_manager.h" #include "singleton_container.h" #include "window_manager.h" diff --git a/interfaces/kits/napi/screenshot/native_screenshot_module.cpp b/interfaces/kits/napi/screenshot/native_screenshot_module.cpp index 4ceb2f40f5..727c5ea645 100644 --- a/interfaces/kits/napi/screenshot/native_screenshot_module.cpp +++ b/interfaces/kits/napi/screenshot/native_screenshot_module.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "native_screenshot_module.h" #include diff --git a/interfaces/kits/napi/window_runtime/window_manager_napi/js_window_manager.cpp b/interfaces/kits/napi/window_runtime/window_manager_napi/js_window_manager.cpp index 54e4ea64c3..dd62d4253d 100644 --- a/interfaces/kits/napi/window_runtime/window_manager_napi/js_window_manager.cpp +++ b/interfaces/kits/napi/window_runtime/window_manager_napi/js_window_manager.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "js_err_utils.h" #include "js_window_manager.h" #include diff --git a/interfaces/kits/napi/window_runtime/window_napi/js_extension_window_config.cpp b/interfaces/kits/napi/window_runtime/window_napi/js_extension_window_config.cpp index d0353701ff..f4754217e5 100644 --- a/interfaces/kits/napi/window_runtime/window_napi/js_extension_window_config.cpp +++ b/interfaces/kits/napi/window_runtime/window_napi/js_extension_window_config.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "js_extension_window_config.h" #include #include "js_window_utils.h" diff --git a/interfaces/kits/napi/window_runtime/window_napi/js_window.h b/interfaces/kits/napi/window_runtime/window_napi/js_window.h index 0a668e51a3..4ac0550d59 100644 --- a/interfaces/kits/napi/window_runtime/window_napi/js_window.h +++ b/interfaces/kits/napi/window_runtime/window_napi/js_window.h @@ -178,7 +178,7 @@ public: */ static napi_value CreateSubWindowWithOptions(napi_env env, napi_callback_info info); - /* + /** * Gesture Back */ static napi_value SetGestureBackEnabled(napi_env env, napi_callback_info info); @@ -327,7 +327,7 @@ private: */ napi_value OnCreateSubWindowWithOptions(napi_env env, napi_callback_info info); - /* + /** * Gesture Back */ napi_value OnSetGestureBackEnabled(napi_env env, napi_callback_info info); diff --git a/interfaces/kits/napi/window_runtime/window_napi/js_window_register_manager.cpp b/interfaces/kits/napi/window_runtime/window_napi/js_window_register_manager.cpp index a2c49660d9..7f88fa50cd 100644 --- a/interfaces/kits/napi/window_runtime/window_napi/js_window_register_manager.cpp +++ b/interfaces/kits/napi/window_runtime/window_napi/js_window_register_manager.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "js_window_register_manager.h" #include "singleton_container.h" #include "window_manager.h" diff --git a/interfaces/kits/napi/window_runtime/window_napi/js_window_register_manager.h b/interfaces/kits/napi/window_runtime/window_napi/js_window_register_manager.h index 34fd8bf15e..46f186bdb8 100644 --- a/interfaces/kits/napi/window_runtime/window_napi/js_window_register_manager.h +++ b/interfaces/kits/napi/window_runtime/window_napi/js_window_register_manager.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_JS_WINDOW_REGISTER_MANAGER_H #define OHOS_JS_WINDOW_REGISTER_MANAGER_H #include diff --git a/interfaces/kits/napi/window_runtime/window_napi/js_window_utils.cpp b/interfaces/kits/napi/window_runtime/window_napi/js_window_utils.cpp index a6e97da841..e1bf00aa14 100644 --- a/interfaces/kits/napi/window_runtime/window_napi/js_window_utils.cpp +++ b/interfaces/kits/napi/window_runtime/window_napi/js_window_utils.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "js_window_utils.h" #include #include diff --git a/interfaces/kits/ndk/wm/oh_window_comm.h b/interfaces/kits/ndk/wm/oh_window_comm.h index 9fdd2a0de2..0c954a946d 100644 --- a/interfaces/kits/ndk/wm/oh_window_comm.h +++ b/interfaces/kits/ndk/wm/oh_window_comm.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OH_WINDOW_COMM_H #define OH_WINDOW_COMM_H @@ -29,8 +30,10 @@ extern "C" { typedef enum { /** succ. */ OK = 0, + /** window id is invaild. */ INVAILD_WINDOW_ID = 1000, + /** failed. */ SERVICE_ERROR = 2000, } WindowManager_ErrorCode; diff --git a/interfaces/kits/ndk/wm/oh_window_event_filter.h b/interfaces/kits/ndk/wm/oh_window_event_filter.h index 7b3f53a67d..3fa4664c85 100644 --- a/interfaces/kits/ndk/wm/oh_window_event_filter.h +++ b/interfaces/kits/ndk/wm/oh_window_event_filter.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OH_WINDOW_EVENT_FILTER_H #define OH_WINDOW_EVENT_FILTER_H diff --git a/previewer/include/window.h b/previewer/include/window.h index 9f33a0ad9a..564a2992ff 100644 --- a/previewer/include/window.h +++ b/previewer/include/window.h @@ -356,6 +356,7 @@ public: { return WMError::WM_ERROR_DEVICE_NOT_SUPPORT; } + /** * @brief Set the application modality of main window. * @@ -366,6 +367,7 @@ public: { return WMError::WM_ERROR_DEVICE_NOT_SUPPORT; } + /** * @brief Set the modality of sub window. * diff --git a/previewer/mock/js_window_register_manager.cpp b/previewer/mock/js_window_register_manager.cpp index 4267147ca0..95b8468469 100644 --- a/previewer/mock/js_window_register_manager.cpp +++ b/previewer/mock/js_window_register_manager.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "js_window_register_manager.h" #include "window_manager_hilog.h" diff --git a/previewer/mock/js_window_register_manager.h b/previewer/mock/js_window_register_manager.h index a5a25d4f2a..ef67d0eeb6 100644 --- a/previewer/mock/js_window_register_manager.h +++ b/previewer/mock/js_window_register_manager.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_JS_WINDOW_REGISTER_MANAGER_H #define OHOS_JS_WINDOW_REGISTER_MANAGER_H #include diff --git a/previewer/mock/window_manager_napi/js_window_manager.cpp b/previewer/mock/window_manager_napi/js_window_manager.cpp index cee2dbfbd5..31bce3007d 100644 --- a/previewer/mock/window_manager_napi/js_window_manager.cpp +++ b/previewer/mock/window_manager_napi/js_window_manager.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "js_err_utils.h" #include "js_window_manager.h" #include "js_window.h" diff --git a/snapshot/src/snapshot_utils.cpp b/snapshot/src/snapshot_utils.cpp index e4c27b38f5..848f80557f 100644 --- a/snapshot/src/snapshot_utils.cpp +++ b/snapshot/src/snapshot_utils.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "snapshot_utils.h" #include diff --git a/snapshot/test/unittest/snapshot_utils_test.cpp b/snapshot/test/unittest/snapshot_utils_test.cpp index b966833922..002d24f0c3 100644 --- a/snapshot/test/unittest/snapshot_utils_test.cpp +++ b/snapshot/test/unittest/snapshot_utils_test.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include #include #include "display.h" @@ -336,7 +337,6 @@ HWTEST_F(SnapshotUtilsTest, Write10, Function | MediumTest | Level3) ASSERT_FALSE(SnapShotUtils::WriteToJpeg(1, param)); } - /** * @tc.name: CheckWHValid * @tc.desc: Check width and height whether valid diff --git a/test/common/mock/mock_IWindow.h b/test/common/mock/mock_IWindow.h index 6ca5f432d9..52808d6e74 100644 --- a/test/common/mock/mock_IWindow.h +++ b/test/common/mock/mock_IWindow.h @@ -13,7 +13,6 @@ * limitations under the License. */ - #include "iremote_broker.h" #include "window.h" #include "zidl/window_interface.h" diff --git a/test/common/mock/mock_RSIWindowAnimationController.h b/test/common/mock/mock_RSIWindowAnimationController.h index 8ae19bf006..f6a3a7fbc6 100644 --- a/test/common/mock/mock_RSIWindowAnimationController.h +++ b/test/common/mock/mock_RSIWindowAnimationController.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef FRAMEWORKS_WM_TEST_UT_MOCK_RSIWINDOWANIMATIONCONTROLLER_H #define FRAMEWORKS_WM_TEST_UT_MOCK_RSIWINDOWANIMATIONCONTROLLER_H diff --git a/test/common/utils/src/common_test_utils.cpp b/test/common/utils/src/common_test_utils.cpp index 9c62bab6db..1def21a7cd 100644 --- a/test/common/utils/src/common_test_utils.cpp +++ b/test/common/utils/src/common_test_utils.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include #include "common_test_utils.h" diff --git a/test/systemtest/dms/display_manager_test.cpp b/test/systemtest/dms/display_manager_test.cpp index 4f57592c87..dcb2a26159 100644 --- a/test/systemtest/dms/display_manager_test.cpp +++ b/test/systemtest/dms/display_manager_test.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include #include #include diff --git a/test/systemtest/wms/window_dialogwindow_test.cpp b/test/systemtest/wms/window_dialogwindow_test.cpp index 42b71e216d..622620a75d 100644 --- a/test/systemtest/wms/window_dialogwindow_test.cpp +++ b/test/systemtest/wms/window_dialogwindow_test.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include #include "ability_context_impl.h" #include "window.h" diff --git a/test/systemtest/wms/window_layout_integration_test.cpp b/test/systemtest/wms/window_layout_integration_test.cpp index 0452cb6aa8..ef9c91eff0 100644 --- a/test/systemtest/wms/window_layout_integration_test.cpp +++ b/test/systemtest/wms/window_layout_integration_test.cpp @@ -581,6 +581,7 @@ HWTEST_F(WindowLayoutTest, resize08, Function | MediumTest | Level3) ret = window->Resize(windowLimits.maxWidth_ + 100, windowLimits.maxHeight_ + 100); EXPECT_EQ(WMError::WM_ERROR_INVALID_OPERATION, ret); } + /** * @tc.name: SetWindowLimitsDataRoute * @tc.desc: test data route for SetWindowLimits diff --git a/test/systemtest/wms/window_rotation_test.cpp b/test/systemtest/wms/window_rotation_test.cpp index 145a6094ce..261a2df8cc 100644 --- a/test/systemtest/wms/window_rotation_test.cpp +++ b/test/systemtest/wms/window_rotation_test.cpp @@ -238,7 +238,6 @@ HWTEST_F(WindowRotationTest, WindowRotationTest3, Function | MediumTest | Level3 sleep(SPLIT_TEST_SLEEP_S); } - /** * @tc.name: WindowRotationTest4 * @tc.desc: create window with orientation after setting screen default orientation. diff --git a/test/systemtest/wms/window_systemsubwindow_test.cpp b/test/systemtest/wms/window_systemsubwindow_test.cpp index 9f57c75fea..53312d6c38 100644 --- a/test/systemtest/wms/window_systemsubwindow_test.cpp +++ b/test/systemtest/wms/window_systemsubwindow_test.cpp @@ -343,6 +343,7 @@ HWTEST_F(WindowSystemSubWindowTest, SystemSubWindow06, Function | MediumTest | L ASSERT_EQ(WMError::WM_OK, subWindow->Destroy()); ASSERT_EQ(WMError::WM_OK, baseWindow->Destroy()); } + /** * @tc.name: SystemSubWindow07 * @tc.desc: create sub windows with dialog diff --git a/utils/include/agent_death_recipient.h b/utils/include/agent_death_recipient.h index e74525b08a..f1a0a1372c 100644 --- a/utils/include/agent_death_recipient.h +++ b/utils/include/agent_death_recipient.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_ROSEN_AGENT_DEATH_RECIPIENT_H #define OHOS_ROSEN_AGENT_DEATH_RECIPIENT_H diff --git a/utils/include/atomic_map.h b/utils/include/atomic_map.h index f2f56c0f73..b830a9b3f4 100644 --- a/utils/include/atomic_map.h +++ b/utils/include/atomic_map.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef ATOMIC_MAP_H #define ATOMIC_MAP_H diff --git a/utils/include/display_change_info.h b/utils/include/display_change_info.h index f8cd1ebc5c..6a71342e0f 100644 --- a/utils/include/display_change_info.h +++ b/utils/include/display_change_info.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_ROSEN_DISPLAY_CHANGFE_INFO_H #define OHOS_ROSEN_DISPLAY_CHANGFE_INFO_H diff --git a/utils/include/focus_change_info.h b/utils/include/focus_change_info.h index d2aa5fd046..4133089abc 100644 --- a/utils/include/focus_change_info.h +++ b/utils/include/focus_change_info.h @@ -29,16 +29,19 @@ public: * @brief Default construct of FocusChangeInfo */ FocusChangeInfo() = default; + /** * @brief Construct of FocusChangeInfo */ FocusChangeInfo(uint32_t winId, DisplayId displayId, int32_t pid, int32_t uid, WindowType type, const sptr& abilityToken): windowId_(winId), displayId_(displayId), pid_(pid), uid_(uid), windowType_(type), abilityToken_(abilityToken) {}; + /** * @brief Deconstruct of FocusChangeInfo */ ~FocusChangeInfo() = default; + /** * @brief Marshalling FocusChangeInfo. * diff --git a/utils/include/window_drawing_content_info.h b/utils/include/window_drawing_content_info.h index fee6aaee79..da166880f3 100644 --- a/utils/include/window_drawing_content_info.h +++ b/utils/include/window_drawing_content_info.h @@ -41,6 +41,7 @@ public: * @brief Default construct of WindowDrawingContentInfo. */ WindowDrawingContentInfo() = default; + /** * @brief Construct of WindowDrawingContentInfo. * @@ -53,6 +54,7 @@ public: WindowDrawingContentInfo(uint32_t winId, int32_t pid, int32_t uid, bool drawingContentState, WindowType winType) : windowId_(winId), pid_(pid), uid_(uid), drawingContentState_(drawingContentState), windowType_(winType) {}; + /** * @brief Deconstruct of WindowDrawingContentInfo. */ @@ -65,6 +67,7 @@ public: * @return True means marshall success, false means marshall failed. */ virtual bool Marshalling(Parcel& parcel) const override; + /** * @brief Unmarshalling WindowDrawingContentInfo. * diff --git a/utils/include/window_visibility_info.h b/utils/include/window_visibility_info.h index 72f4a6b3a9..8154b7f928 100644 --- a/utils/include/window_visibility_info.h +++ b/utils/include/window_visibility_info.h @@ -56,6 +56,7 @@ public: * @brief Default construct of WindowVisibilityInfo. */ WindowVisibilityInfo() = default; + /** * @brief Construct of WindowVisibilityInfo. * @@ -87,6 +88,7 @@ public: * @return True means marshall success, false means marshall failed. */ virtual bool Marshalling(Parcel& parcel) const override; + /** * @brief Unmarshalling WindowVisibilityInfo. * diff --git a/utils/include/wm_occlusion_region.h b/utils/include/wm_occlusion_region.h index cb7640adc0..959e213176 100644 --- a/utils/include/wm_occlusion_region.h +++ b/utils/include/wm_occlusion_region.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_ROSEN_WM_OCCLUSION_REGION_H #define OHOS_ROSEN_WM_OCCLUSION_REGION_H diff --git a/utils/src/surface_reader_handler_impl.cpp b/utils/src/surface_reader_handler_impl.cpp index 634f56ce3f..f51b6a567e 100644 --- a/utils/src/surface_reader_handler_impl.cpp +++ b/utils/src/surface_reader_handler_impl.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "surface_reader_handler_impl.h" #include "window_manager_hilog.h" diff --git a/utils/src/wm_math.cpp b/utils/src/wm_math.cpp index 1d2f6626c5..bcb190f720 100644 --- a/utils/src/wm_math.cpp +++ b/utils/src/wm_math.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "wm_math.h" #include diff --git a/utils/src/wm_occlusion_region.cpp b/utils/src/wm_occlusion_region.cpp index 5613680279..3864f84d3f 100644 --- a/utils/src/wm_occlusion_region.cpp +++ b/utils/src/wm_occlusion_region.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "wm_occlusion_region.h" #include diff --git a/utils/test/unittest/permission_test.cpp b/utils/test/unittest/permission_test.cpp index 970512d83d..0612346b76 100644 --- a/utils/test/unittest/permission_test.cpp +++ b/utils/test/unittest/permission_test.cpp @@ -68,6 +68,7 @@ HWTEST_F(PermissionTest, IsSystemServiceCalling, Function | SmallTest | Level2) bool result = Permission::IsSystemServiceCalling(true, true); ASSERT_EQ(true, result); } + /** * @tc.name: IsSystemCallingOrStartByHdcd * @tc.desc: test fuction : IsSystemCallingOrStartByHdcd @@ -80,6 +81,7 @@ HWTEST_F(PermissionTest, IsSystemCallingOrStartByHdcd, Function | SmallTest | Le bool result2 = Permission::IsSystemCallingOrStartByHdcd(true); ASSERT_EQ(true, result2); } + /** * @tc.name: IsStartByInputMethod * @tc.desc: test fuction : IsStartByInputMethod @@ -90,6 +92,7 @@ HWTEST_F(PermissionTest, IsStartByInputMethod, Function | SmallTest | Level2) bool result = Permission::IsStartByInputMethod(); ASSERT_EQ(false, result); } + /** * @tc.name: CheckIsCallingBundleName * @tc.desc: test fuction : CheckIsCallingBundleName diff --git a/utils/test/unittest/surface_draw_test.cpp b/utils/test/unittest/surface_draw_test.cpp index 25b1251092..4d6626df44 100644 --- a/utils/test/unittest/surface_draw_test.cpp +++ b/utils/test/unittest/surface_draw_test.cpp @@ -135,6 +135,7 @@ HWTEST_F(SurfaceDrawTest, DrawImage01, Function | SmallTest | Level1) ASSERT_FALSE(SurfaceDraw::DrawImage(surfaceNode, -1, -1, IMAGE_PLACE_HOLDER_PNG_PATH)); window->Destroy(); } + /** * @tc.name: DecodeImageToPixelMap * @tc.desc: SurfaceDraw::DecodeImageToPixelMap test @@ -145,6 +146,7 @@ HWTEST_F(SurfaceDrawTest, DecodeImageToPixelMap01, Function | SmallTest | Level1 ASSERT_EQ(SurfaceDraw::DecodeImageToPixelMap(""), nullptr); ASSERT_NE(SurfaceDraw::DecodeImageToPixelMap(IMAGE_PLACE_HOLDER_PNG_PATH), nullptr); } + /** * @tc.name: DrawMasking * @tc.desc: SurfaceDraw::DrawMasking test @@ -175,6 +177,7 @@ HWTEST_F(SurfaceDrawTest, DrawMasking01, Function | SmallTest | Level1) SurfaceDraw::DrawMasking(surfaceNode, screenRect, transRect); window->Destroy(); } + /** * @tc.name: DoDrawImageRect * @tc.desc: SurfaceDraw::DoDrawImageRect test @@ -210,6 +213,7 @@ HWTEST_F(SurfaceDrawTest, DoDrawImageRect01, Function | SmallTest | Level1) ASSERT_TRUE(SurfaceDraw::DoDrawImageRect(buffer, rect, pixelMap, color, false)); window->Destroy(); } + /** * @tc.name: GetSurfaceSnapshot * @tc.desc: SurfaceDraw::GetSurfaceSnapshot test diff --git a/utils/test/unittest/surface_reader_test.cpp b/utils/test/unittest/surface_reader_test.cpp index 91be3c0e78..4b78246b3c 100644 --- a/utils/test/unittest/surface_reader_test.cpp +++ b/utils/test/unittest/surface_reader_test.cpp @@ -42,6 +42,7 @@ HWTEST_F(SurfaceReaderTest, Init, Function | SmallTest | Level2) delete reader; GTEST_LOG_(INFO) << "SurfaceReaderTest: Init end"; } + /** * @tc.name: OnVsync * @tc.desc: normal function @@ -55,6 +56,7 @@ HWTEST_F(SurfaceReaderTest, OnVsync, Function | SmallTest | Level2) delete reader; ASSERT_EQ(res, true); } + /** * @tc.name: GetSurface * @tc.desc: normal function @@ -68,6 +70,7 @@ HWTEST_F(SurfaceReaderTest, GetSurface, Function | SmallTest | Level2) ASSERT_NE(surface, nullptr); delete reader; } + /** * @tc.name: SetHandler * @tc.desc: normal function diff --git a/utils/test/unittest/utils_all_test.cpp b/utils/test/unittest/utils_all_test.cpp index 059f28513a..4e229dad30 100644 --- a/utils/test/unittest/utils_all_test.cpp +++ b/utils/test/unittest/utils_all_test.cpp @@ -85,6 +85,7 @@ HWTEST_F(UtilsAllTest, ADROnRemoteDied01, Function | SmallTest | Level2) deathRecipient->OnRemoteDied(remoteObj); ASSERT_EQ(1, remoteObj->count_); } + /** * @tc.name: PRCount01 * @tc.desc: test PerformReporter::count @@ -100,6 +101,7 @@ HWTEST_F(UtilsAllTest, PRCount01, Function | SmallTest | Level2) reporter.timeSplitCount_.clear(); ASSERT_EQ(1, reporter.totalCount_); } + /** * @tc.name: SCAddSingleton01 * @tc.desc: test SingletonContainer::AddSingleton @@ -151,6 +153,7 @@ HWTEST_F(UtilsAllTest, SCSetSingleton01, Function | SmallTest | Level2) singletonContainer.stringMap.erase("test"); delete testObj; } + /** * @tc.name: SCDependOn01 * @tc.desc: test SingletonContainer::DependOn @@ -177,6 +180,7 @@ HWTEST_F(UtilsAllTest, SCDependOn01, Function | SmallTest | Level2) singletonContainer.stringMap.erase("test"); id = singletonContainer.dependencySetMap.erase(id); } + /** * @tc.name: SRHOnImageAvailable01 * @tc.desc: test SurfaceReaderHandlerImpl::OnImageAvailable @@ -192,6 +196,7 @@ HWTEST_F(UtilsAllTest, SRHOnImageAvailable, Function | SmallTest | Level2) surfaceReaderHandlerImpl->OnImageAvailable(nullptr); ASSERT_EQ(true, surfaceReaderHandlerImpl->flag_); } + /** * @tc.name: SRHGetPixelMap01 * @tc.desc: test SurfaceReaderHandlerImpl::GetPixelMap @@ -206,6 +211,7 @@ HWTEST_F(UtilsAllTest, SRHGetPixelMap, Function | SmallTest | Level2) surfaceReaderHandlerImpl->flag_ = true; surfaceReaderHandlerImpl->GetPixelMap(); } + /** * @tc.name: SysCapUtilGetClientName * @tc.desc: test SysCapUtil::GetClientName diff --git a/utils/test/unittest/window_frame_trace_impl_test.cpp b/utils/test/unittest/window_frame_trace_impl_test.cpp index d117593d39..27fc67b5e2 100644 --- a/utils/test/unittest/window_frame_trace_impl_test.cpp +++ b/utils/test/unittest/window_frame_trace_impl_test.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "window_frame_trace.h" #include #include diff --git a/utils/test/unittest/window_transition_info_test.cpp b/utils/test/unittest/window_transition_info_test.cpp index 8fe2174170..3e3fc1134b 100644 --- a/utils/test/unittest/window_transition_info_test.cpp +++ b/utils/test/unittest/window_transition_info_test.cpp @@ -88,6 +88,7 @@ HWTEST_F(WindowTransitionInfoTest, WindowTransitionInfo01, Function | SmallTest ASSERT_EQ(1, winTransitionInfo2->supportWindowModes_.size()); ASSERT_EQ(AppExecFwk::SupportWindowMode::SPLIT, winTransitionInfo2->supportWindowModes_[0]); } + /** * @tc.name: Marshalling * @tc.desc: WindowTransitionInfo::Marshalling test diff --git a/utils/test/unittest/wm_math_test.cpp b/utils/test/unittest/wm_math_test.cpp index a871e75dc4..4bb757b114 100644 --- a/utils/test/unittest/wm_math_test.cpp +++ b/utils/test/unittest/wm_math_test.cpp @@ -97,6 +97,7 @@ HWTEST_F(WmMathTest, TransformMatrix, Function | SmallTest | Level2) ASSERT_EQ(true, MathHelper::NearZero((scale - scaleComp).Length())); ASSERT_EQ(true, MathHelper::NearZero((translation - translationComp).Length())); } + /** * @tc.name: TransformWithPerspDiv * @tc.desc: Create transform matrix diff --git a/utils/test/unittest/wm_occlusion_region_test.cpp b/utils/test/unittest/wm_occlusion_region_test.cpp index c3e78f6f20..3978404987 100644 --- a/utils/test/unittest/wm_occlusion_region_test.cpp +++ b/utils/test/unittest/wm_occlusion_region_test.cpp @@ -127,6 +127,7 @@ HWTEST_F(WmOcclusionRegionTest, Update01, Function | SmallTest | Level2) delete rootNode; } + /** * @tc.name: Node::GetAndRange01 * @tc.desc: test WmOcclusionRegion WmOcclusion::Node::GetAndRange @@ -171,6 +172,7 @@ HWTEST_F(WmOcclusionRegionTest, GetAndRange01, Function | SmallTest | Level2) delete rootNode; } + /** * @tc.name: Node::GetOrRange01 * @tc.desc: test WmOcclusionRegion WmOcclusion::Node::GetOrRange @@ -225,6 +227,7 @@ HWTEST_F(WmOcclusionRegionTest, GetOrRange01, Function | SmallTest | Level2) delete rootNode; } + /** * @tc.name: Node::GetXOrRange01 * @tc.desc: test WmOcclusionRegion WmOcclusion::Node::GetXOrRange @@ -277,6 +280,7 @@ HWTEST_F(WmOcclusionRegionTest, GetXOrRange01, Function | SmallTest | Level2) delete rootNode; } + /** * @tc.name: Node::GetSubRange01 * @tc.desc: test WmOcclusionRegion WmOcclusion::Node::GetSubRange @@ -326,6 +330,7 @@ HWTEST_F(WmOcclusionRegionTest, GetSubRange01, Function | SmallTest | Level2) delete rootNode; } + /** * @tc.name: Region::UpdateRects01 * @tc.desc: test WmOcclusionRegion WmOcclusion::Region::UpdateRects @@ -365,6 +370,7 @@ HWTEST_F(WmOcclusionRegionTest, UpdateRects01, Function | SmallTest | Level2) } delete region; } + /** * @tc.name: Region::MakeBound01 * @tc.desc: test WmOcclusionRegion WmOcclusion::Region::MakeBound @@ -396,6 +402,7 @@ HWTEST_F(WmOcclusionRegionTest, MakeBound01, Function | SmallTest | Level2) delete region; } + /** * @tc.name: Region::RegionOpLocal01 * @tc.desc: test WmOcclusionRegion WmOcclusion::Region::RegionOpLocal diff --git a/window_scene/intention_event/src/intention_event_manager.cpp b/window_scene/intention_event/src/intention_event_manager.cpp index 0f1e2012f8..028f49f2f0 100644 --- a/window_scene/intention_event/src/intention_event_manager.cpp +++ b/window_scene/intention_event/src/intention_event_manager.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "intention_event_manager.h" #ifdef IMF_ENABLE diff --git a/window_scene/interfaces/include/ws_common.h b/window_scene/interfaces/include/ws_common.h index e43413850b..a2afd8d50d 100644 --- a/window_scene/interfaces/include/ws_common.h +++ b/window_scene/interfaces/include/ws_common.h @@ -196,78 +196,97 @@ enum class FocusChangeReason { * default focus change reason */ DEFAULT = 0, + /** * focus change for move up */ MOVE_UP, + /** * focus change for click */ CLICK, + /** * focus change for foreground */ FOREGROUND, + /** * focus change for background */ BACKGROUND, + /** * focus change for split screen.5 */ SPLIT_SCREEN, + /** * focus change for full screen */ FULL_SCREEN, + /** * focus change for global search */ SCB_SESSION_REQUEST, + /** * focus change for floating scene */ FLOATING_SCENE, + /** * focus change for losing focus */ SCB_SESSION_REQUEST_UNFOCUS, + /** * focus change for client requerst.10 */ CLIENT_REQUEST, + /** * focus change for wind */ WIND, + /** * focus change for app foreground */ APP_FOREGROUND, + /** * focus change for app background */ APP_BACKGROUND, + /** * focus change for recent,Multitasking */ RECENT, + /** * focus change for inner app. */ SCB_START_APP, + /** * focus for setting focuable. */ FOCUSABLE, + /** * select last focused app when requestSessionUnFocus. */ LAST_FOCUSED_APP, + /** * focus for zOrder pass through VOICE_INTERACTION. */ VOICE_INTERACTION, + /** * focus change max. */ diff --git a/window_scene/screen_session_manager/include/fold_screen_controller/dual_display_fold_policy.h b/window_scene/screen_session_manager/include/fold_screen_controller/dual_display_fold_policy.h index 9285b0bddc..5449545264 100644 --- a/window_scene/screen_session_manager/include/fold_screen_controller/dual_display_fold_policy.h +++ b/window_scene/screen_session_manager/include/fold_screen_controller/dual_display_fold_policy.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_ROSEN_WINDOW_SCENE_DUAL_DISPLAY_FOLD_POLICY_H #define OHOS_ROSEN_WINDOW_SCENE_DUAL_DISPLAY_FOLD_POLICY_H diff --git a/window_scene/screen_session_manager/include/fold_screen_controller/fold_screen_controller.h b/window_scene/screen_session_manager/include/fold_screen_controller/fold_screen_controller.h index ad157019c8..a5a1a14360 100644 --- a/window_scene/screen_session_manager/include/fold_screen_controller/fold_screen_controller.h +++ b/window_scene/screen_session_manager/include/fold_screen_controller/fold_screen_controller.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_ROSEN_WINDOW_SCENE_FOLD_SCREEN_CONTROLLER_H #define OHOS_ROSEN_WINDOW_SCENE_FOLD_SCREEN_CONTROLLER_H diff --git a/window_scene/screen_session_manager/include/fold_screen_controller/fold_screen_policy.h b/window_scene/screen_session_manager/include/fold_screen_controller/fold_screen_policy.h index 49fb89f1c3..82e52ee147 100644 --- a/window_scene/screen_session_manager/include/fold_screen_controller/fold_screen_policy.h +++ b/window_scene/screen_session_manager/include/fold_screen_controller/fold_screen_policy.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_ROSEN_WINDOW_SCENE_FOLD_SCREEN_POLICY_H #define OHOS_ROSEN_WINDOW_SCENE_FOLD_SCREEN_POLICY_H diff --git a/window_scene/screen_session_manager/include/fold_screen_controller/single_display_fold_policy.h b/window_scene/screen_session_manager/include/fold_screen_controller/single_display_fold_policy.h index 6d792b82f4..91ebe214e9 100644 --- a/window_scene/screen_session_manager/include/fold_screen_controller/single_display_fold_policy.h +++ b/window_scene/screen_session_manager/include/fold_screen_controller/single_display_fold_policy.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_ROSEN_WINDOW_SCENE_SINGLE_DISPLAY_FOLD_POLICY_H #define OHOS_ROSEN_WINDOW_SCENE_SINGLE_DISPLAY_FOLD_POLICY_H diff --git a/window_scene/screen_session_manager/include/fold_screen_controller/single_display_pocket_fold_policy.h b/window_scene/screen_session_manager/include/fold_screen_controller/single_display_pocket_fold_policy.h index 2f65041d48..51425fd094 100644 --- a/window_scene/screen_session_manager/include/fold_screen_controller/single_display_pocket_fold_policy.h +++ b/window_scene/screen_session_manager/include/fold_screen_controller/single_display_pocket_fold_policy.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_ROSEN_WINDOW_SCENE_SINGLE_DISPLAY_POCKET_FOLD_POLICY_H #define OHOS_ROSEN_WINDOW_SCENE_SINGLE_DISPLAY_POCKET_FOLD_POLICY_H diff --git a/window_scene/screen_session_manager/include/screen_sensor_plugin.h b/window_scene/screen_session_manager/include/screen_sensor_plugin.h index 2ead6b47d2..3fabb1caf8 100644 --- a/window_scene/screen_session_manager/include/screen_sensor_plugin.h +++ b/window_scene/screen_session_manager/include/screen_sensor_plugin.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef SCREEN_SENSOR_PLUGIN_H #define SCREEN_SENSOR_PLUGIN_H diff --git a/window_scene/screen_session_manager/include/screen_setting_helper.h b/window_scene/screen_session_manager/include/screen_setting_helper.h index 74764551cf..4e1a216135 100644 --- a/window_scene/screen_session_manager/include/screen_setting_helper.h +++ b/window_scene/screen_session_manager/include/screen_setting_helper.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_ROSEN_WINDOW_SCENE_SCREEN_SETTING_HELPER_H #define OHOS_ROSEN_WINDOW_SCENE_SCREEN_SETTING_HELPER_H diff --git a/window_scene/screen_session_manager/src/screen_scene_config.cpp b/window_scene/screen_session_manager/src/screen_scene_config.cpp index 03614ff247..db26572752 100644 --- a/window_scene/screen_session_manager/src/screen_scene_config.cpp +++ b/window_scene/screen_session_manager/src/screen_scene_config.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "screen_scene_config.h" #include diff --git a/window_scene/screen_session_manager/src/screen_sensor_plugin.cpp b/window_scene/screen_session_manager/src/screen_sensor_plugin.cpp index 11d6e17ef3..2a5d33b0c9 100644 --- a/window_scene/screen_session_manager/src/screen_sensor_plugin.cpp +++ b/window_scene/screen_session_manager/src/screen_sensor_plugin.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "screen_sensor_plugin.h" namespace OHOS { diff --git a/window_scene/screen_session_manager/src/screen_session_dumper.cpp b/window_scene/screen_session_manager/src/screen_session_dumper.cpp index 735532838a..85cc379473 100644 --- a/window_scene/screen_session_manager/src/screen_session_dumper.cpp +++ b/window_scene/screen_session_manager/src/screen_session_dumper.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "screen_session_dumper.h" #include diff --git a/window_scene/screen_session_manager/src/screen_setting_helper.cpp b/window_scene/screen_session_manager/src/screen_setting_helper.cpp index 53faa0e039..22a3886f86 100644 --- a/window_scene/screen_session_manager/src/screen_setting_helper.cpp +++ b/window_scene/screen_session_manager/src/screen_setting_helper.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "screen_setting_helper.h" #include "window_manager_hilog.h" diff --git a/window_scene/session/host/include/scene_session.h b/window_scene/session/host/include/scene_session.h index 57dd9c8a04..771cccb80b 100644 --- a/window_scene/session/host/include/scene_session.h +++ b/window_scene/session/host/include/scene_session.h @@ -181,7 +181,7 @@ public: WSError OnDefaultDensityEnabled(bool isDefaultDensityEnabled) override; WSError RaiseToAppTop() override; - /* + /** * Window Layout */ WSError UpdateSizeChangeReason(SizeChangeReason reason) override; @@ -383,14 +383,14 @@ public: void RegisterDefaultDensityEnabledCallback(NotifyDefaultDensityEnabledFunc&& callback); void RegisterForceSplitListener(const NotifyForceSplitFunc& func); - /* + /** * Dialog Window */ void RegisterBindDialogSessionCallback(NotifyBindDialogSessionFunc&& callback); void SetUpdatePrivateStateAndNotifyFunc(const UpdatePrivateStateAndNotifyFunc& func); - /* + /** * Window Input Event */ void RegisterTouchOutsideCallback(NotifyTouchOutsideFunc&& callback); @@ -575,7 +575,7 @@ protected: sptr specificCallback_ = nullptr; sptr sessionChangeCallback_ = nullptr; - /* + /** * Dialog window */ NotifyBindDialogSessionFunc onBindDialogTarget_; @@ -592,19 +592,19 @@ protected: NotifyMainSessionModalTypeChangeFunc onMainSessionModalTypeChange_; NotifySessionModalTypeChangeFunc onSessionModalTypeChange_; - /* + /** * PiP Window */ NotifyPrepareClosePiPSessionFunc onPrepareClosePiPSession_; - /* + /** * Window Lifecycle */ NotifyShowWhenLockedFunc onShowWhenLockedFunc_; NotifyForceHideChangeFunc onForceHideChangeFunc_; ClearCallbackMapFunc clearCallbackMapFunc_; - /* + /** * PC Fold Screen */ sptr pcFoldScreenController_ = nullptr; @@ -616,7 +616,7 @@ protected: NotifyRestoreMainWindowFunc onRestoreMainWindowFunc_; NotifySetWindowRectAutoSaveFunc onSetWindowRectAutoSaveFunc_; - /* + /** * Window Layout */ NotifyDefaultDensityEnabledFunc onDefaultDensityEnabledFunc_; @@ -827,12 +827,12 @@ private: */ NotifyVisibleChangeFunc notifyVisibleChangeFunc_; - /* + /** * Window Input Event */ NotifyTouchOutsideFunc onTouchOutside_; - /* + /** * Window Rotation */ NotifyReqOrientationChangeFunc onRequestedOrientationChange_; diff --git a/window_scene/session/host/include/session.h b/window_scene/session/host/include/session.h index 0e2fbeba45..36ddb3e81b 100644 --- a/window_scene/session/host/include/session.h +++ b/window_scene/session/host/include/session.h @@ -479,7 +479,7 @@ public: bool GetForegroundInteractiveStatus() const; virtual void SetForegroundInteractiveStatus(bool interactive); - /* + /** * Window Lifecycle */ bool GetIsPendingToBackgroundState() const; @@ -520,7 +520,7 @@ public: void SetAppInstanceKey(const std::string& appInstanceKey); std::string GetAppInstanceKey() const; - /* + /** * Starting Window */ WSError RemoveStartingWindow() override; @@ -531,7 +531,7 @@ public: void SetUseStartingWindowAboveLocked(bool useStartingWindowAboveLocked); bool UseStartingWindowAboveLocked() const; - /* + /** * Window Hierarchy */ void ProcessClickModalWindowOutside(int32_t posX, int32_t posY); @@ -695,12 +695,12 @@ protected: mutable std::shared_mutex keyEventMutex_; bool rectChangeListenerRegistered_ = false; - /* + /** * Window Hierarchy */ NotifyClickModalWindowOutsideFunc clickModalWindowOutsideFunc_; - /* + /** * Window Pipeline */ uint32_t dirtyFlags_ = 0; // only accessed on SSM thread @@ -795,7 +795,7 @@ private: std::atomic rectChangeBySystem_ { false }; std::atomic_bool foregroundInteractiveStatus_ { true }; - /* + /** * Window Lifecycle */ std::atomic isAttach_ { false }; @@ -808,7 +808,7 @@ private: DetectTaskInfo detectTaskInfo_; mutable std::shared_mutex detectTaskInfoMutex_; - /* + /** * Starting Window */ bool enableRemoveStartingWindow_ { false }; diff --git a/window_scene/session/host/include/zidl/session_interface.h b/window_scene/session/host/include/zidl/session_interface.h index f274a68845..529010c4a7 100644 --- a/window_scene/session/host/include/zidl/session_interface.h +++ b/window_scene/session/host/include/zidl/session_interface.h @@ -283,6 +283,7 @@ public: virtual WSError RequestFocus(bool isFocused) { return WSError::WS_OK; } virtual void NotifyExtensionEventAsync(uint32_t notifyEvent) {}; + /** * @brief Callback for session modal type changes. * diff --git a/window_scene/session/host/include/zidl/session_proxy.h b/window_scene/session/host/include/zidl/session_proxy.h index b0fa246ff3..054c26e4af 100644 --- a/window_scene/session/host/include/zidl/session_proxy.h +++ b/window_scene/session/host/include/zidl/session_proxy.h @@ -112,7 +112,7 @@ public: */ WMError SetGestureBackEnabled(bool isEnabled) override; - /* + /** * Starting Window */ WSError RemoveStartingWindow() override; diff --git a/window_scene/session/host/src/pc_fold_screen_controller.cpp b/window_scene/session/host/src/pc_fold_screen_controller.cpp index d6cc439268..66c08cffb9 100755 --- a/window_scene/session/host/src/pc_fold_screen_controller.cpp +++ b/window_scene/session/host/src/pc_fold_screen_controller.cpp @@ -203,7 +203,7 @@ bool PcFoldScreenManager::NeedDoThrowSlip(ScreenSide startSide, const WSRectF& v return false; } -/* +/** * move rect to other side * @param rect: current side, moved to other side * @param titleHeight: used in arrange rule to avoid title bar @@ -305,7 +305,7 @@ void PcFoldScreenManager::MappingRectInScreenSideWithArrangeRule(ScreenSide side } } -/* +/** * init rule: move rect to center of display * @param titleHeight: in vp */ @@ -318,7 +318,7 @@ void PcFoldScreenManager::ApplyInitArrangeRule(WSRect& rect, WSRect& lastArrange lastArrangedRect = { rect.posX_, rect.posY_, RULE_TRANS_X * vpr, titleHeight * vpr }; } -/* +/** * init rule: move rect to bottom-right of last arranged position * @param titleHeight: in vp */ @@ -378,7 +378,7 @@ void PcFoldScreenController::RecordMoveRects(const WSRect& rect) TimeHelper::GetDuration(movingRectRecords_[0].first, movingRectRecords_[movingRectRecords_.size() - 1].first)); } -/* +/** * if move fast, window can be throwed to other side * @param rect: current rect. if throwed, move it to other side * @param topAvoidHeight: avoid status bar @@ -411,7 +411,7 @@ bool PcFoldScreenController::ThrowSlip(DisplayId displayId, WSRect& rect, return true; } -/* +/** * resize to fullscreen in one side considering avoid area * @param rect: resize in its side */ @@ -449,7 +449,7 @@ int32_t PcFoldScreenController::GetPersistentId() const return sceneSession->GetPersistentId(); } -/* +/** * get height of title bar * @return: vp */ diff --git a/window_scene/session/host/src/scene_session.cpp b/window_scene/session/host/src/scene_session.cpp index 4f38765606..0111866cf2 100644 --- a/window_scene/session/host/src/scene_session.cpp +++ b/window_scene/session/host/src/scene_session.cpp @@ -2585,7 +2585,7 @@ void SceneSession::HandleMoveDragEnd(WSRect& rect, SizeChangeReason reason) OnSessionEvent(SessionEvent::EVENT_END_MOVE); } -/* +/** * move with init velocity * @return true: rect change notified when move */ diff --git a/window_scene/session_manager/include/extension_session_manager.h b/window_scene/session_manager/include/extension_session_manager.h index 03babf0e73..399cc6b52f 100644 --- a/window_scene/session_manager/include/extension_session_manager.h +++ b/window_scene/session_manager/include/extension_session_manager.h @@ -36,6 +36,7 @@ public: * @return sptr return session if create extension session success;Otherwise, return nullptr */ sptr RequestExtensionSession(const SessionInfo& sessionInfo); + /** * @brief active extension session * @@ -44,6 +45,7 @@ public: */ WSError RequestExtensionSessionActivation(const sptr& extensionSession, uint32_t hostWindowId, const std::function&& resultCallback); + /** * @brief background extension session * @@ -52,6 +54,7 @@ public: */ WSError RequestExtensionSessionBackground( const sptr& extensionSession, const std::function&& resultCallback); + /** * @brief destroy extension session * @@ -60,6 +63,7 @@ public: */ WSError RequestExtensionSessionDestruction( const sptr& extensionSession, const std::function&& resultCallback); + /** * @brief destroy extension session done * diff --git a/window_scene/session_manager/include/scene_session_manager.h b/window_scene/session_manager/include/scene_session_manager.h index 1806d07dd6..4c33a8a5d6 100644 --- a/window_scene/session_manager/include/scene_session_manager.h +++ b/window_scene/session_manager/include/scene_session_manager.h @@ -142,7 +142,7 @@ public: void OnGetSurfaceNodeIdsFromMissionIds(std::vector& missionIds, std::vector& surfaceNodeIds, bool isBlackList = false) override; - /* + /** * Fold Screen Status Change Report */ void OnScreenFoldStatusChanged(const std::vector& screenFoldInfo) override; @@ -208,7 +208,7 @@ public: void SetDumpUITreeFunc(const DumpUITreeFunc& func); const AppWindowSceneConfig& GetWindowSceneConfig() const; - /* + /** * Window Rotate Animation */ void UpdateRotateAnimationConfig(const RotateAnimationConfig& config); @@ -222,7 +222,7 @@ public: WMError UnregisterWindowManagerAgent(WindowManagerAgentType type, const sptr& windowManagerAgent) override; - /* + /** * Dump */ WSError GetAllSessionDumpInfo(std::string& info); @@ -234,7 +234,7 @@ public: WSError DumpSessionAll(std::vector& infos) override; WSError DumpSessionWithId(int32_t persistentId, std::vector& infos) override; - /* + /** * Window Focus */ WSError SetFocusedSessionId(int32_t persistentId); @@ -308,7 +308,7 @@ public: WMError GetTopWindowId(uint32_t mainWinId, uint32_t& topWinId) override; WMError GetParentMainWindowId(int32_t windowId, int32_t& mainWindowId) override; - /* + /** * PC Window */ WMError IsPcOrPadFreeMultiWindowMode(bool& isPcOrPadFreeMultiWindowMode) override; @@ -338,7 +338,7 @@ public: void SetRootSceneProcessBackEventFunc(const RootSceneProcessBackEventFunc& processBackEventFunc); void RegisterWindowChanged(const WindowChangedFunc& func); - /* + /** * Collaborator */ void SetAbilityManagerCollaboratorRegisteredFunc(const AbilityManagerCollaboratorRegisteredFunc& func); @@ -371,7 +371,7 @@ public: void RegisterCreateSubSessionListener(int32_t persistentId, const NotifyCreateSubSessionFunc& func); void UnregisterCreateSubSessionListener(int32_t persistentId); - /* + /** * Window Immersive */ WSError GetIsLayoutFullScreen(bool& isLayoutFullScreen); @@ -430,7 +430,7 @@ public: int32_t GetCustomDecorHeight(int32_t persistentId); - /* + /** * Free Multi Window */ WSError SwitchFreeMultiWindow(bool enable); @@ -447,13 +447,13 @@ public: void ProcessDisplayScale(sptr& displayInfo); WMError GetRootMainWindowId(int32_t persistentId, int32_t& hostWindowId); - /* + /** * Multi Window */ void SetCloseTargetFloatWindowFunc(const ProcessCloseTargetFloatWindowFunc& func); WMError CloseTargetFloatWindow(const std::string& bundleName); - /* + /** * Fold Screen Status Change Report */ WMError ReportScreenFoldStatusChange(const std::vector& screenFoldInfo); @@ -466,24 +466,24 @@ public: WMError GetProcessSurfaceNodeIdByPersistentId(const int32_t pid, const std::vector& persistentIds, std::vector& surfaceNodeIds) override; - /* + /** * Window ZOrder: PC */ void RefreshPcZOrderList(uint32_t startZOrder, std::vector&& persistentIds); - /* + /** * Window Watermark */ WMError SetProcessWatermark(int32_t pid, const std::string& watermarkName, bool isEnabled) override; - /* + /** * Window Snapshot */ WMError SkipSnapshotForAppProcess(int32_t pid, bool skip) override; WMError SkipSnapshotByUserIdAndBundleNames(int32_t userId, const std::vector& bundleNameList) override; - /* + /** * Multi instance */ int32_t GetMaxInstanceCount(const std::string& bundleName); @@ -491,19 +491,19 @@ public: std::string GetLastInstanceKey(const std::string& bundleName); void RefreshAppInfo(const std::string& bundleName); - /* + /** * Window Property */ WMError ReleaseForegroundSessionScreenLock() override; - /* + /** * PiP Window */ WMError CloseTargetPiPWindow(const std::string& bundleName); WMError GetCurrentPiPWindowInfo(std::string& bundleName); void SetStartPiPFailedListener(NotifyStartPiPFailedFunc&& func); - /* + /** * Screen Manager */ WMError GetDisplayIdByWindowId(const std::vector& windowIds, @@ -567,14 +567,14 @@ private: bool GetSessionRSVisible(const sptr& session, const std::vector>& currVisibleData); - /* + /** * Window Pipeline */ void ProcessFocusZOrderChange(uint32_t dirty); void PostProcessFocus(); void PostProcessProperty(uint32_t dirty); - /* + /** * Window Focus */ std::vector>> GetSceneSessionVector(CmpFunc cmp); @@ -686,7 +686,7 @@ private: void RegisterSessionSnapshotFunc(const sptr& sceneSession); void ResetWantInfo(const sptr& sceneSession); - /* + /** * Window Rotate Animation */ void RegisterAcquireRotateAnimationConfigFunc(const sptr& sceneSession); @@ -718,21 +718,21 @@ private: void RegisterSecSurfaceInfoListener(); void UpdatePiPWindowStateChanged(const std::string& bundleName, bool isForeground); - /* + /** * UIExtension */ void DestroyUIServiceExtensionSubWindow(const sptr& sceneSession); WSError CheckSubSessionStartedByExtensionAndSetDisplayId(const sptr& token, const sptr& property, const sptr& sessionStage); - /* + /** * Multi User */ bool IsPcSceneSessionLifecycle(const sptr& sceneSession); bool IsNeedChangeLifeCycleOnUserSwitch(const sptr& sceneSession, int32_t pid); WSError StartOrMinimizeUIAbilityBySCB(const sptr& sceneSession, bool isUserActive); - /* + /** * Gesture Back */ void UpdateGestureBackEnabled(int32_t persistentId); @@ -780,12 +780,12 @@ private: AppWindowSceneConfig appWindowSceneConfig_; - /* + /** * Window Rotate Animation */ RotateAnimationConfig rotateAnimationConfig_; - /* + /** * PiP Window */ NotifyStartPiPFailedFunc startPiPFailedFunc_; @@ -803,7 +803,7 @@ private: bool needBlockNotifyUnfocusStatus_ {false}; bool isPrepareTerminateEnable_ {false}; - /* + /** * DFX */ bool openDebugTrace_ {false}; @@ -876,7 +876,7 @@ private: AAFwk::MissionSnapshot& sessionSnapshot); sptr GetCollaboratorByType(int32_t collaboratorType); - /* + /** * Collaborator */ AbilityManagerCollaboratorRegisteredFunc abilityManagerCollaboratorRegisteredFunc_; @@ -932,7 +932,7 @@ private: void HideNonSecureSubWindows(const sptr& sceneSession); WSError HandleSecureSessionShouldHide(const sptr& sceneSession); - /* + /** * Window Snapshot */ void SetSessionSnapshotSkipForAppProcess(const sptr& sceneSession) REQUIRES(SCENE_GUARD); @@ -954,12 +954,12 @@ private: bool JudgeNeedNotifyPrivacyInfo(DisplayId displayId, const std::unordered_set& privacyBundles); WSError CheckSessionPropertyOnRecovery(const sptr& property, bool isSpecificSession); - /* + /** * Window Visibility */ bool NotifyVisibleChange(int32_t persistentId); - /* + /** * Fold Screen Status Change Report */ WMError MakeScreenFoldData(const std::vector& screenFoldInfo, ScreenFoldData& screenFoldData); @@ -967,13 +967,13 @@ private: WMError ReportScreenFoldStatus(const ScreenFoldData& data); void RecoveryVisibilityPidCount(int32_t pid); - /* + /** * Window Watermark */ bool SetSessionWatermarkForAppProcess(const sptr& sceneSession); void RemoveProcessWatermarkPid(int32_t pid); - /* + /** * Window Snapshot */ std::unordered_set snapshotSkipPidSet_ GUARDED_BY(SCENE_GUARD); // ONLY Accessed on OS_sceneSession thread @@ -984,12 +984,12 @@ private: std::mutex nextFlushCompletedMutex_; RootSceneProcessBackEventFunc rootSceneProcessBackEventFunc_ = nullptr; - /* + /** * Window Watermark */ std::unordered_map processWatermarkPidMap_; // ONLY Accessed on OS_sceneSession thread - /* + /** * Dump */ std::shared_ptr scbDumpSubscriber_; @@ -999,12 +999,12 @@ private: const std::vector& params, std::string& dumpInfo); void DumpAllSessionFocusableInfo(int32_t persistentId); - /* + /** * Screen Manager */ bool IsInDefaultScreen(const sptr& sceneSession); - /* + /** * Window Mode Type */ bool IsNeedSkipWindowModeTypeCheck(const sptr& sceneSession, bool isSmallFold); diff --git a/window_scene/session_manager/src/zidl/scene_session_manager_proxy.cpp b/window_scene/session_manager/src/zidl/scene_session_manager_proxy.cpp index cbcba19b3c..a6b52fac84 100644 --- a/window_scene/session_manager/src/zidl/scene_session_manager_proxy.cpp +++ b/window_scene/session_manager/src/zidl/scene_session_manager_proxy.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef SUPPORT_SCREEN #define SUPPORT_SCREEN #endif diff --git a/window_scene/test/dms_unittest/multi_screen_manager_test.cpp b/window_scene/test/dms_unittest/multi_screen_manager_test.cpp index aa8359d131..72bf78ba9d 100644 --- a/window_scene/test/dms_unittest/multi_screen_manager_test.cpp +++ b/window_scene/test/dms_unittest/multi_screen_manager_test.cpp @@ -259,7 +259,6 @@ HWTEST_F(MultiScreenManagerTest, PhysicalScreenMirrorSwitch04, Function | SmallT EXPECT_EQ(ret, DMError::DM_OK); } - /** * @tc.name: PhysicalScreenMirrorSwitch05 * @tc.desc: defaultSession != nullptr @@ -905,7 +904,6 @@ HWTEST_F(MultiScreenManagerTest, DoFirstMirrorChange02, Function | SmallTest | L ScreenSessionManager::GetInstance().DestroyVirtualScreen(screenId1); } - /** * @tc.name: DoFirstMirrorChange * @tc.desc: DoFirstMirrorChangeExtend @@ -964,7 +962,6 @@ HWTEST_F(MultiScreenManagerTest, DoFirstMirrorChange04, Function | SmallTest | L ScreenSessionManager::GetInstance().DestroyVirtualScreen(screenId1); } - /** * @tc.name: DoFirstExtendChange * @tc.desc: param error diff --git a/window_scene/test/dms_unittest/screen_property_test.cpp b/window_scene/test/dms_unittest/screen_property_test.cpp index e218ce935c..74411efc18 100644 --- a/window_scene/test/dms_unittest/screen_property_test.cpp +++ b/window_scene/test/dms_unittest/screen_property_test.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "screen_property.h" #include diff --git a/window_scene/test/dms_unittest/screen_rotation_property_test.cpp b/window_scene/test/dms_unittest/screen_rotation_property_test.cpp index 48980da578..f2c12d939b 100644 --- a/window_scene/test/dms_unittest/screen_rotation_property_test.cpp +++ b/window_scene/test/dms_unittest/screen_rotation_property_test.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include #include diff --git a/window_scene/test/dms_unittest/screen_scene_config_test.cpp b/window_scene/test/dms_unittest/screen_scene_config_test.cpp index 9b2ce7f2ca..7a22bf87b6 100644 --- a/window_scene/test/dms_unittest/screen_scene_config_test.cpp +++ b/window_scene/test/dms_unittest/screen_scene_config_test.cpp @@ -193,7 +193,6 @@ HWTEST_F(ScreenSceneConfigTest, ReadIntNumbersConfigInfo, Function | SmallTest | xmlFreeDoc(docPtr); } - /** * @tc.name: ReadEnableConfigInfo * @tc.desc: test function : ReadEnableConfigInfo diff --git a/window_scene/test/dms_unittest/screen_session_dumper_test.cpp b/window_scene/test/dms_unittest/screen_session_dumper_test.cpp index e4251e8643..24c226a7e5 100644 --- a/window_scene/test/dms_unittest/screen_session_dumper_test.cpp +++ b/window_scene/test/dms_unittest/screen_session_dumper_test.cpp @@ -537,7 +537,6 @@ HWTEST_F(ScreenSessionDumperTest, SetMotionSensorvalue02, Function | SmallTest | ASSERT_EQ(true, true); } - /** * @tc.name: SetRotationLockedvalue * @tc.desc: test function : SetRotationLockedvalue @@ -594,7 +593,6 @@ HWTEST_F(ScreenSessionDumperTest, MockSendCastPublishEvent02, Function | SmallTe ASSERT_EQ(true, true); } - /** * @tc.name: MockSendCastPublishEvent * @tc.desc: test function : MockSendCastPublishEvent diff --git a/window_scene/test/dms_unittest/screen_session_manager_proxy_test.cpp b/window_scene/test/dms_unittest/screen_session_manager_proxy_test.cpp index 37c2d43504..ecc61a29d2 100644 --- a/window_scene/test/dms_unittest/screen_session_manager_proxy_test.cpp +++ b/window_scene/test/dms_unittest/screen_session_manager_proxy_test.cpp @@ -129,7 +129,6 @@ HWTEST_F(ScreenSessionManagerProxyTest, SetVirtualScreenBlackList, Function | Sm ASSERT_EQ(resultValue, 1); } - /** * @tc.name: ProxyForFreeze * @tc.desc: ProxyForFreeze @@ -1037,7 +1036,6 @@ HWTEST_F(ScreenSessionManagerProxyTest, DestroyVirtualScreen, Function | SmallTe } } - /** * @tc.name: MakeMirror * @tc.desc: MakeMirror @@ -1719,7 +1717,6 @@ HWTEST_F(ScreenSessionManagerProxyTest, SetFoldDisplayModeFromJs, Function | Sma } } - /** * @tc.name: SetFoldStatusLocked * @tc.desc: SetFoldStatusLocked @@ -1959,7 +1956,6 @@ HWTEST_F(ScreenSessionManagerProxyTest, GetDisplayNode, Function | SmallTest | L EXPECT_EQ(resultValue, 1); } - /** * @tc.name: GetCurvedCompressionArea * @tc.desc: GetCurvedCompressionArea diff --git a/window_scene/test/dms_unittest/screen_session_manager_stub_test.cpp b/window_scene/test/dms_unittest/screen_session_manager_stub_test.cpp index 702740268a..beb883f23b 100644 --- a/window_scene/test/dms_unittest/screen_session_manager_stub_test.cpp +++ b/window_scene/test/dms_unittest/screen_session_manager_stub_test.cpp @@ -1447,7 +1447,6 @@ HWTEST_F(ScreenSessionManagerStubTest, OnRemoteRequest65, Function | SmallTest | EXPECT_EQ(res, 0); } - /** * @tc.name: OnRemoteRequest66 * @tc.desc: normal function, TRANS_ID_SWITCH_USER test diff --git a/window_scene/test/dms_unittest/screen_session_manager_test.cpp b/window_scene/test/dms_unittest/screen_session_manager_test.cpp index 5f4ea20cd5..c73582935d 100644 --- a/window_scene/test/dms_unittest/screen_session_manager_test.cpp +++ b/window_scene/test/dms_unittest/screen_session_manager_test.cpp @@ -400,7 +400,6 @@ HWTEST_F(ScreenSessionManagerTest, WakeUpBegin10, Function | SmallTest | Level3) EXPECT_EQ(DMError::DM_OK, ssm_->UnregisterDisplayManagerAgent(displayManagerAgent, type)); } - /** * @tc.name: SuspendBegin * @tc.desc: SuspendBegin test @@ -1059,7 +1058,6 @@ HWTEST_F(ScreenSessionManagerTest, GetScreenSession, Function | SmallTest | Leve ssm_->DestroyVirtualScreen(screenId); } - /** * @tc.name: GetDefaultScreenSession * @tc.desc: GetDefaultScreenSession virtual screen @@ -1238,7 +1236,6 @@ HWTEST_F(ScreenSessionManagerTest, NotifyDisplayEvent, Function | SmallTest | Le ASSERT_EQ(ssm_->gotScreenlockFingerprint_, true); } - /** * @tc.name: GetScreenInfoByDisplayId * @tc.desc: GetScreenInfoByDisplayId virtual screen @@ -1922,7 +1919,6 @@ HWTEST_F(ScreenSessionManagerTest, ConvertScreenIdToRsScreenId, Function | Small ASSERT_EQ(false, ssm_->ConvertScreenIdToRsScreenId(screenId, tmpRsScreenId)); } - /** * @tc.name: DisableMirror * @tc.desc: DisableMirror test @@ -3109,6 +3105,7 @@ HWTEST_F(ScreenSessionManagerTest, OnTentModeChanged, Function | SmallTest | Lev ssm_->OnTentModeChanged(isTentMode); ASSERT_EQ(ssm_->GetTentMode(), false); } + /** * @tc.name: GetScreenCapture * @tc.desc: GetScreenCapture diff --git a/window_scene/test/dms_unittest/screen_session_test.cpp b/window_scene/test/dms_unittest/screen_session_test.cpp index 01fe5f958b..ed09d28949 100644 --- a/window_scene/test/dms_unittest/screen_session_test.cpp +++ b/window_scene/test/dms_unittest/screen_session_test.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "screen_session.h" #include #include "screen_session_manager/include/screen_session_manager.h" @@ -1643,6 +1644,7 @@ HWTEST_F(ScreenSessionTest, SetUpdateToInputManagerCallback, Function | SmallTes GTEST_LOG_(INFO) << "ScreenSessionTest: SetUpdateToInputManagerCallbackend"; } + /** * @tc.name: SetScreenRotationLocked * @tc.desc: normal function diff --git a/window_scene/test/dms_unittest/session_display_power_controller_test.cpp b/window_scene/test/dms_unittest/session_display_power_controller_test.cpp index d57c2cc139..5f91dfab3c 100644 --- a/window_scene/test/dms_unittest/session_display_power_controller_test.cpp +++ b/window_scene/test/dms_unittest/session_display_power_controller_test.cpp @@ -86,6 +86,7 @@ HWTEST_F(SessionDisplayPowerControllerTest, NotifyDisplayEvent_Unlock, Function }); controller.NotifyDisplayEvent(event); } + /** * @tc.name: SetDisplayState * @tc.desc: SetDisplayState func diff --git a/window_scene/test/mock/mock_message_parcel.cpp b/window_scene/test/mock/mock_message_parcel.cpp index bb44b89e72..7326b0bbc6 100644 --- a/window_scene/test/mock/mock_message_parcel.cpp +++ b/window_scene/test/mock/mock_message_parcel.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "mock_message_parcel.h" #include "iremote_object.h" #include "message_parcel.h" diff --git a/window_scene/test/mock/mock_message_parcel.h b/window_scene/test/mock/mock_message_parcel.h index ec10e22d04..e76713926f 100644 --- a/window_scene/test/mock/mock_message_parcel.h +++ b/window_scene/test/mock/mock_message_parcel.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef MOCK_MESSAGE_PARCEL_H #define MOCK_MESSAGE_PARCEL_H namespace OHOS { diff --git a/window_scene/test/mock/mock_resource_manager.h b/window_scene/test/mock/mock_resource_manager.h index 38cfc065d6..f74d78c337 100644 --- a/window_scene/test/mock/mock_resource_manager.h +++ b/window_scene/test/mock/mock_resource_manager.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef MOCK_RESOURCE_MANAGER_H #define MOCK_RESOURCE_MANAGER_H diff --git a/window_scene/test/mock/mock_root_scene_context.h b/window_scene/test/mock/mock_root_scene_context.h index 7b758de7c1..ae60d3973c 100644 --- a/window_scene/test/mock/mock_root_scene_context.h +++ b/window_scene/test/mock/mock_root_scene_context.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef MOCK_ROOT_SCENE_CONTEXT_H #define MOCK_ROOT_SCENE_CONTEXT_H diff --git a/window_scene/test/unittest/extension_session_test.cpp b/window_scene/test/unittest/extension_session_test.cpp index 71893b2d84..dacc34ea36 100644 --- a/window_scene/test/unittest/extension_session_test.cpp +++ b/window_scene/test/unittest/extension_session_test.cpp @@ -308,7 +308,6 @@ HWTEST_F(ExtensionSessionTest, NotifyDensityFollowHost03, Function | SmallTest | ASSERT_EQ(WSError::WS_ERROR_NULLPTR, res); } - /** * @tc.name: UpdateSessionViewportConfig1 * @tc.desc: normal test diff --git a/window_scene/test/unittest/main_session_lifecycle_test.cpp b/window_scene/test/unittest/main_session_lifecycle_test.cpp index 85a9e06891..96b41ec6cd 100644 --- a/window_scene/test/unittest/main_session_lifecycle_test.cpp +++ b/window_scene/test/unittest/main_session_lifecycle_test.cpp @@ -130,6 +130,7 @@ HWTEST_F(MainSessionLifecycleTest, NotifyForegroundInteractiveStatus01, Function mainSession_->NotifyForegroundInteractiveStatus(false); ASSERT_EQ(WSError::WS_OK, mainSession_->SetFocusable(false)); } + /** * @tc.name: NotifyForegroundInteractiveStatus02 * @tc.desc: check func NotifyForegroundInteractiveStatus diff --git a/window_scene/test/unittest/main_session_test.cpp b/window_scene/test/unittest/main_session_test.cpp index bf498e3faa..a2e5204e0d 100644 --- a/window_scene/test/unittest/main_session_test.cpp +++ b/window_scene/test/unittest/main_session_test.cpp @@ -159,7 +159,6 @@ HWTEST_F(MainSessionTest, TransferKeyEvent03, Function | SmallTest | Level1) ASSERT_EQ(WSError::WS_ERROR_INVALID_PERMISSION, mainSession_->TransferKeyEvent(keyEvent)); } - /** * @tc.name: ProcessPointDownSession01 * @tc.desc: check func ProcessPointDownSession @@ -171,6 +170,7 @@ HWTEST_F(MainSessionTest, ProcessPointDownSession01, Function | SmallTest | Leve mainSession_->ClearDialogVector(); EXPECT_EQ(WSError::WS_OK, mainSession_->ProcessPointDownSession(10, 20)); } + /** * @tc.name: ProcessPointDownSession02 * @tc.desc: check func ProcessPointDownSession @@ -192,6 +192,7 @@ HWTEST_F(MainSessionTest, SetTopmost01, Function | SmallTest | Level1) EXPECT_EQ(WSError::WS_OK, mainSession_->SetTopmost(true)); EXPECT_EQ(WSError::WS_OK, mainSession_->SetTopmost(false)); } + /** * @tc.name: SetTopmost02 * @tc.desc: check func SetTopmost @@ -322,6 +323,7 @@ HWTEST_F(MainSessionTest, IsExitSplitOnBackground02, Function | SmallTest | Leve bool ret = mainSession_->IsExitSplitOnBackground(); ASSERT_EQ(false, ret); } + /** * @tc.name: NotifyClientToUpdateInteractive01 * @tc.desc: check func NotifyClientToUpdateInteractive @@ -332,6 +334,7 @@ HWTEST_F(MainSessionTest, NotifyClientToUpdateInteractive01, Function | SmallTes mainSession_->NotifyClientToUpdateInteractive(true); ASSERT_TRUE(true); // exec success } + /** * @tc.name: NotifyClientToUpdateInteractive02 * @tc.desc: check func NotifyClientToUpdateInteractive diff --git a/window_scene/test/unittest/move_drag_controller_test.cpp b/window_scene/test/unittest/move_drag_controller_test.cpp index a587f73371..1b57f2e34d 100644 --- a/window_scene/test/unittest/move_drag_controller_test.cpp +++ b/window_scene/test/unittest/move_drag_controller_test.cpp @@ -634,7 +634,6 @@ HWTEST_F(MoveDragControllerTest, ConsumeMoveEvent, Function | SmallTest | Level1 moveDragController->isStartDrag_ = preStratDragFlag; } - /** * @tc.name: ProcessWindowDragHotAreaFunc * @tc.desc: test function : ProcessWindowDragHotAreaFunc diff --git a/window_scene/test/unittest/multi_instance_manager_test.cpp b/window_scene/test/unittest/multi_instance_manager_test.cpp index 32e7163227..fc1815aeeb 100644 --- a/window_scene/test/unittest/multi_instance_manager_test.cpp +++ b/window_scene/test/unittest/multi_instance_manager_test.cpp @@ -292,7 +292,6 @@ HWTEST_F(MultiInstanceManagerTest, GetInstanceCount, Function | SmallTest | Leve ASSERT_EQ(MultiInstanceManager::GetInstance().GetInstanceCount(BUNDLE_NAME), 0); } - /** * @tc.name: GetLastInstanceKey * @tc.desc: test function : GetLastInstanceKey diff --git a/window_scene/test/unittest/scene_session_dirty_manager_test.cpp b/window_scene/test/unittest/scene_session_dirty_manager_test.cpp index fa52a7b47a..9da62493d9 100644 --- a/window_scene/test/unittest/scene_session_dirty_manager_test.cpp +++ b/window_scene/test/unittest/scene_session_dirty_manager_test.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "transaction/rs_uiextension_data.h" #include "input_manager.h" #include "session_manager/include/scene_session_dirty_manager.h" diff --git a/window_scene/test/unittest/scene_session_dirty_manager_test2.cpp b/window_scene/test/unittest/scene_session_dirty_manager_test2.cpp index 8a8da1a417..aee4b40268 100644 --- a/window_scene/test/unittest/scene_session_dirty_manager_test2.cpp +++ b/window_scene/test/unittest/scene_session_dirty_manager_test2.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "common/include/window_session_property.h" #include #include "input_manager.h" diff --git a/window_scene/test/unittest/scene_session_manager_lifecycle_test.cpp b/window_scene/test/unittest/scene_session_manager_lifecycle_test.cpp index e90a380b24..97215ce1d4 100644 --- a/window_scene/test/unittest/scene_session_manager_lifecycle_test.cpp +++ b/window_scene/test/unittest/scene_session_manager_lifecycle_test.cpp @@ -547,6 +547,7 @@ HWTEST_F(SceneSessionManagerLifecycleTest, UpdateRecoveredSessionInfo02, Functio constexpr uint32_t WAIT_SYNC_IN_NS = 50000; usleep(WAIT_SYNC_IN_NS); } + /** * @tc.name: RequestSceneSession01 * @tc.desc: SceneSesionManager test RequestSceneSession @@ -587,6 +588,7 @@ HWTEST_F(SceneSessionManagerLifecycleTest, RequestSceneSession02, Function | Sma sptr getSceneSession = ssm_->RequestSceneSession(info2, windowSessionProperty); ASSERT_NE(getSceneSession->GetSessionInfo().bundleName_, info2.bundleName_); } + /** * @tc.name: RequestSceneSession03 * @tc.desc: SceneSesionManager test RequestSceneSession @@ -726,6 +728,7 @@ HWTEST_F(SceneSessionManagerLifecycleTest, RequestSceneSessionDestruction01, Fun ASSERT_EQ(ssm_->RequestSceneSessionDestruction( sceneSession, needRemoveSession), WSError::WS_OK); } + /** * @tc.name: RequestSceneSessionDestruction02 * @tc.desc: SceneSesionManager test RequestSceneSessionDestruction @@ -813,6 +816,7 @@ HWTEST_F(SceneSessionManagerLifecycleTest, RequestSceneSessionByCall01, Function ssm_->sceneSessionMap_.insert({1, sceneSession}); ASSERT_EQ(ssm_->RequestSceneSessionByCall(sceneSession), WSError::WS_OK); } + /** * @tc.name: RequestSceneSessionByCall02 * @tc.desc: SceneSesionManager test RequestSceneSessionByCall diff --git a/window_scene/test/unittest/scene_session_manager_proxy_test.cpp b/window_scene/test/unittest/scene_session_manager_proxy_test.cpp index 4d2a7f6d62..842c3a12c7 100644 --- a/window_scene/test/unittest/scene_session_manager_proxy_test.cpp +++ b/window_scene/test/unittest/scene_session_manager_proxy_test.cpp @@ -851,7 +851,7 @@ HWTEST_F(sceneSessionManagerProxyTest, GetSessionSnapshotById, Function | SmallT ASSERT_EQ(WMError::WM_OK, ret); } -/* +/** * @tc.name: TerminateSessionNew * @tc.desc: normal function * @tc.type: FUNC diff --git a/window_scene/test/unittest/scene_session_manager_test12.cpp b/window_scene/test/unittest/scene_session_manager_test12.cpp index 3de75ca554..0802cbf94e 100644 --- a/window_scene/test/unittest/scene_session_manager_test12.cpp +++ b/window_scene/test/unittest/scene_session_manager_test12.cpp @@ -189,6 +189,7 @@ HWTEST_F(SceneSessionManagerTest12, GetStartupPageFromResource03, Function | Sma bool result = mockSceneSessionManager_->GetStartupPageFromResource(abilityInfo, path, bgColor); EXPECT_EQ(result, false); } + /** * @tc.name: GetStartupPageFromResource04 * @tc.desc: GetStartupPageFromResource diff --git a/window_scene/test/unittest/scene_session_manager_test2.cpp b/window_scene/test/unittest/scene_session_manager_test2.cpp index f42d59cc07..a871bd021d 100644 --- a/window_scene/test/unittest/scene_session_manager_test2.cpp +++ b/window_scene/test/unittest/scene_session_manager_test2.cpp @@ -629,6 +629,7 @@ HWTEST_F(SceneSessionManagerTest2, ConfigWindowSceneXml01, Function | SmallTest ASSERT_EQ(ssm_->systemConfig_.defaultWindowMode_, static_cast(static_cast(102))); } + /** * @tc.name: ConfigWindowSceneXml02 * @tc.desc: call defaultWindowMode @@ -2156,7 +2157,6 @@ HWTEST_F(SceneSessionManagerTest2, CacheSubSessionForRecovering, Function | Smal ASSERT_EQ(ssm_->recoverSubSessionCacheMap_[parentPersistentId].size(), 0); } - /** * @tc.name: SetAlivePersistentIds * @tc.desc: SetAlivePersistentIds diff --git a/window_scene/test/unittest/scene_session_manager_test5.cpp b/window_scene/test/unittest/scene_session_manager_test5.cpp index 763f763770..3efb67bc3c 100644 --- a/window_scene/test/unittest/scene_session_manager_test5.cpp +++ b/window_scene/test/unittest/scene_session_manager_test5.cpp @@ -146,7 +146,6 @@ HWTEST_F(SceneSessionManagerTest5, DestroyAndDisconnectSpecificSessionInner, Fun ssm_->DestroyAndDisconnectSpecificSessionInner(1); } - /** * @tc.name: DestroyAndDisconnectSpecificSessionWithDetachCallback * @tc.desc: SceneSesionManager destroy and disconnect specific session with detach callback @@ -203,11 +202,13 @@ HWTEST_F(SceneSessionManagerTest5, GetStartupPage01, Function | SmallTest | Leve info.bundleName_ = "test2"; std::string path; uint32_t bgColor = 0x00000000; + /** * @tc.steps: step2. Set bundleMgr_ to nullptr. */ sptr tempBundleMgr = ssm_->bundleMgr_; ssm_->bundleMgr_ = nullptr; + /** * @tc.steps: step3. Test and check result. */ @@ -234,6 +235,7 @@ HWTEST_F(SceneSessionManagerTest5, GetStartupPage02, Function | SmallTest | Leve sessionInfo.bundleName_ = "bundleName"; uint32_t bgColor = 0x00000000; std::string path; + /** * @tc.steps: step2. Cache info. */ @@ -248,6 +250,7 @@ HWTEST_F(SceneSessionManagerTest5, GetStartupPage02, Function | SmallTest | Leve }; std::map startingWindowInfoMap{{ key, startingWindowInfo }}; ssm_->startingWindowMap_.insert({sessionInfo.bundleName_, startingWindowInfoMap}); + /** * @tc.steps: step3. Test and check result. */ @@ -276,6 +279,7 @@ HWTEST_F(SceneSessionManagerTest5, CacheStartingWindowInfo01, Function | SmallTe abilityInfo.startWindowIconId = 2; std::string path = "cachedPath"; uint32_t bgColor = 0xff000000; + /** * @tc.steps: step2. Cache info and check result. */ @@ -311,6 +315,7 @@ HWTEST_F(SceneSessionManagerTest5, CacheStartingWindowInfo02, Function | SmallTe abilityInfo.startWindowIconId = 2; std::string path = "cachedPath"; uint32_t bgColor = 0xff000000; + /** * @tc.steps: step2. Insert one item. */ @@ -323,6 +328,7 @@ HWTEST_F(SceneSessionManagerTest5, CacheStartingWindowInfo02, Function | SmallTe }; std::map startingWindowInfoMap{{ key, startingWindowInfo }}; ssm_->startingWindowMap_.insert({abilityInfo.bundleName, startingWindowInfoMap}); + /** * @tc.steps: step3. Execute and check result. */ @@ -366,6 +372,7 @@ HWTEST_F(SceneSessionManagerTest5, OnBundleUpdated, Function | SmallTest | Level std::map startingWindowInfoMap{{ key, startingWindowInfo }}; ssm_->startingWindowMap_.insert({sessionInfo.bundleName_, startingWindowInfoMap}); ASSERT_NE(ssm_->startingWindowMap_.size(), 0); + /** * @tc.steps: step2. On bundle updated and check map. */ @@ -402,6 +409,7 @@ HWTEST_F(SceneSessionManagerTest5, OnConfigurationUpdated, Function | SmallTest std::map startingWindowInfoMap{{ key, startingWindowInfo }}; ssm_->startingWindowMap_.insert({sessionInfo.bundleName_, startingWindowInfoMap}); ASSERT_NE(ssm_->startingWindowMap_.size(), 0); + /** * @tc.steps: step2. On configuration updated and check map. */ @@ -1010,7 +1018,6 @@ HWTEST_F(SceneSessionManagerTest5, CheckFocusIsDownThroughBlockingType, Function ASSERT_EQ(ret, false); } - /** * @tc.name: CheckFocusIsDownThroughBlockingType * @tc.desc: CheckFocusIsDownThroughBlockingType diff --git a/window_scene/test/unittest/scene_session_manager_test6.cpp b/window_scene/test/unittest/scene_session_manager_test6.cpp index 2c701137f9..643bad6b35 100644 --- a/window_scene/test/unittest/scene_session_manager_test6.cpp +++ b/window_scene/test/unittest/scene_session_manager_test6.cpp @@ -1657,7 +1657,6 @@ HWTEST_F(SceneSessionManagerTest6, SetRootSceneProcessBackEventFunc, Function | ssm_->ProcessBackEvent(); } - /** * @tc.name: RequestInputMethodCloseKeyboard * @tc.desc: RequestInputMethodCloseKeyboard diff --git a/window_scene/test/unittest/scene_session_manager_test8.cpp b/window_scene/test/unittest/scene_session_manager_test8.cpp index d2d3570f03..a029cf3045 100644 --- a/window_scene/test/unittest/scene_session_manager_test8.cpp +++ b/window_scene/test/unittest/scene_session_manager_test8.cpp @@ -80,7 +80,6 @@ HWTEST_F(SceneSessionManagerTest8, GetTotalUITreeInfo, Function | SmallTest | Le EXPECT_EQ(WSError::WS_OK, ssm_->GetTotalUITreeInfo(strId, dumpInfo)); } - /** * @tc.name: GetRemoteSessionSnapshotInfo * @tc.desc: GetRemoteSessionSnapshotInfo set gesture navigation enabled @@ -524,6 +523,7 @@ HWTEST_F(SceneSessionManagerTest8, HandleTurnScreenOn, Function | SmallTest | Le constexpr uint32_t NOT_WAIT_SYNC_IN_NS = 500000; usleep(NOT_WAIT_SYNC_IN_NS); } + /** * @tc.name: HandleKeepScreenOn * @tc.desc: test function : HandleKeepScreenOn diff --git a/window_scene/test/unittest/scene_session_test.cpp b/window_scene/test/unittest/scene_session_test.cpp index 11f8575489..2cb826a5f7 100644 --- a/window_scene/test/unittest/scene_session_test.cpp +++ b/window_scene/test/unittest/scene_session_test.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "window_helper.h" #include "display_manager.h" #include "pointer_event.h" @@ -360,7 +361,6 @@ HWTEST_F(SceneSessionTest, SetDefaultRequestedOrientation, Function | SmallTest ASSERT_EQ(orientation, ret); } - /** * @tc.name: IsKeepScreenOn * @tc.desc: IsKeepScreenOn diff --git a/window_scene/test/unittest/scene_session_test2.cpp b/window_scene/test/unittest/scene_session_test2.cpp index c3f5c4f5e2..a2415eb254 100644 --- a/window_scene/test/unittest/scene_session_test2.cpp +++ b/window_scene/test/unittest/scene_session_test2.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "window_helper.h" #include "display_manager.h" #include "pointer_event.h" @@ -1337,7 +1338,7 @@ HWTEST_F(SceneSessionTest2, SetPipActionEvent, Function | SmallTest | Level2) ASSERT_EQ(res, WSError::WS_OK); } -/* +/** * @tc.name: SetPiPControlEvent * @tc.desc: SetPiPControlEvent * @tc.type: FUNC diff --git a/window_scene/test/unittest/scene_session_test3.cpp b/window_scene/test/unittest/scene_session_test3.cpp index fe0fd445e3..bab227a393 100644 --- a/window_scene/test/unittest/scene_session_test3.cpp +++ b/window_scene/test/unittest/scene_session_test3.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include #include "display_manager.h" @@ -77,7 +78,6 @@ HWTEST_F(SceneSessionTest3, SetAspectRatio11, Function | SmallTest | Level2) ASSERT_EQ(result, WSError::WS_ERROR_NULLPTR); } - /** * @tc.name: SetAspectRatio12 * @tc.desc: normal function diff --git a/window_scene/test/unittest/scene_session_test4.cpp b/window_scene/test/unittest/scene_session_test4.cpp index 0bccc770ac..555dec323c 100644 --- a/window_scene/test/unittest/scene_session_test4.cpp +++ b/window_scene/test/unittest/scene_session_test4.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include #include "display_manager.h" diff --git a/window_scene/test/unittest/scene_session_test5.cpp b/window_scene/test/unittest/scene_session_test5.cpp index b481556853..327bddea8c 100644 --- a/window_scene/test/unittest/scene_session_test5.cpp +++ b/window_scene/test/unittest/scene_session_test5.cpp @@ -362,7 +362,6 @@ HWTEST_F(SceneSessionTest5, TransferPointerEvent01, Function | SmallTest | Level session->ClearDialogVector(); } - /** * @tc.name: SetSurfaceBounds01 * @tc.desc: SetSurfaceBounds function @@ -1656,6 +1655,7 @@ HWTEST_F(SceneSessionTest5, SetNotifyVisibleChangeFunc, Function | SmallTest | L session->SetNotifyVisibleChangeFunc([](int32_t persistentId) {}); EXPECT_NE(session->notifyVisibleChangeFunc_, nullptr); } + /** * @tc.name: SetRequestNextVsyncFunc * @tc.desc: SetRequestNextVsyncFunc01 Test diff --git a/window_scene/test/unittest/session_lifecycle_test.cpp b/window_scene/test/unittest/session_lifecycle_test.cpp index 2f94437742..a2cdc22d8f 100644 --- a/window_scene/test/unittest/session_lifecycle_test.cpp +++ b/window_scene/test/unittest/session_lifecycle_test.cpp @@ -268,7 +268,6 @@ HWTEST_F(WindowSessionLifecycleTest, Foreground03, Function | SmallTest | Level2 ASSERT_EQ(result, WSError::WS_OK); } - /** * @tc.name: Background01 * @tc.desc: check func Background diff --git a/window_scene/test/unittest/session_proxy_lifecycle_test.cpp b/window_scene/test/unittest/session_proxy_lifecycle_test.cpp index a1448c2582..979cb96c46 100644 --- a/window_scene/test/unittest/session_proxy_lifecycle_test.cpp +++ b/window_scene/test/unittest/session_proxy_lifecycle_test.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "session_proxy.h" #include "iremote_object_mocker.h" #include diff --git a/window_scene/test/unittest/session_proxy_mock_test.cpp b/window_scene/test/unittest/session_proxy_mock_test.cpp index e6831dfd92..6893f079fb 100644 --- a/window_scene/test/unittest/session_proxy_mock_test.cpp +++ b/window_scene/test/unittest/session_proxy_mock_test.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "session_proxy.h" #include diff --git a/window_scene/test/unittest/session_proxy_test.cpp b/window_scene/test/unittest/session_proxy_test.cpp index 1a28d39a16..ef44bbf8d9 100644 --- a/window_scene/test/unittest/session_proxy_test.cpp +++ b/window_scene/test/unittest/session_proxy_test.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "session_proxy.h" #include "iremote_object_mocker.h" #include diff --git a/window_scene/test/unittest/session_stage_proxy_lifecycle_test.cpp b/window_scene/test/unittest/session_stage_proxy_lifecycle_test.cpp index efbd6f6bb6..cf5dd24436 100644 --- a/window_scene/test/unittest/session_stage_proxy_lifecycle_test.cpp +++ b/window_scene/test/unittest/session_stage_proxy_lifecycle_test.cpp @@ -109,6 +109,7 @@ HWTEST_F(SessionStageProxyLifecycleTest, NotifySessionForeground, Function | Sma ASSERT_TRUE((sessionStage_ != nullptr)); sessionStage_->NotifySessionForeground(reason, withAnimation); } + /** * @tc.name: NotifySessionBackground * @tc.desc: test function : NotifySessionBackground diff --git a/window_scene/test/unittest/session_stub_mock_test.cpp b/window_scene/test/unittest/session_stub_mock_test.cpp index 3f4816cd5f..3666ea1293 100644 --- a/window_scene/test/unittest/session_stub_mock_test.cpp +++ b/window_scene/test/unittest/session_stub_mock_test.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include #include "iremote_object_mocker.h" #include "mock/mock_session_stub.h" diff --git a/window_scene/test/unittest/session_test.cpp b/window_scene/test/unittest/session_test.cpp index 35d5a6d171..e946b40a68 100644 --- a/window_scene/test/unittest/session_test.cpp +++ b/window_scene/test/unittest/session_test.cpp @@ -442,7 +442,6 @@ HWTEST_F(WindowSessionTest, GetGlobalScaledRect, Function | SmallTest | Level2) ASSERT_EQ(20, globalScaledRect.height_); } - /** * @tc.name: RaiseToAppTop01 * @tc.desc: RaiseToAppTop @@ -1335,6 +1334,7 @@ HWTEST_F(WindowSessionTest, TransferFocusStateEvent02, Function | SmallTest | Le ASSERT_EQ(WSError::WS_OK, session_->TransferFocusStateEvent(false)); } + /** * @tc.name: CreateDetectStateTask001 * @tc.desc: Create detection task when there are no pre_existing tasks. diff --git a/window_scene/test/unittest/sub_session_lifecycle_test.cpp b/window_scene/test/unittest/sub_session_lifecycle_test.cpp index eb525c8836..0172576c66 100644 --- a/window_scene/test/unittest/sub_session_lifecycle_test.cpp +++ b/window_scene/test/unittest/sub_session_lifecycle_test.cpp @@ -276,6 +276,7 @@ HWTEST_F(SessionStubLifecycleTest, Show03, Function | SmallTest | Level1) auto result = subSession_->Show(property); ASSERT_EQ(result, WSError::WS_OK); } + /** * @tc.name: Show04 * @tc.desc: check func Show @@ -294,6 +295,7 @@ HWTEST_F(SessionStubLifecycleTest, Show04, Function | SmallTest | Level1) subSession_->SetSessionProperty(property); ASSERT_EQ(subSession_->Show(property), WSError::WS_OK); } + /** * @tc.name: ProcessPointDownSession01 * @tc.desc: check func ProcessPointDownSession @@ -310,6 +312,7 @@ HWTEST_F(SessionStubLifecycleTest, ProcessPointDownSession01, Function | SmallTe subSession_->RectCheck(50, 100); ASSERT_EQ(subSession_->ProcessPointDownSession(50, 100), WSError::WS_OK); } + /** * @tc.name: ProcessPointDownSession02 * @tc.desc: check func ProcessPointDownSession diff --git a/window_scene/test/unittest/window_session_property_test.cpp b/window_scene/test/unittest/window_session_property_test.cpp index f3fcb69d38..3fd617e448 100755 --- a/window_scene/test/unittest/window_session_property_test.cpp +++ b/window_scene/test/unittest/window_session_property_test.cpp @@ -87,6 +87,7 @@ HWTEST_F(WindowSessionPropertyTest, SetSessionInfo, Function | SmallTest | Level property->SetRaiseEnabled(true); ASSERT_EQ(property->GetRaiseEnabled(), true); } + /** * @tc.name: SetRequestedOrientation * @tc.desc: SetRequestedOrientation test @@ -418,6 +419,7 @@ HWTEST_F(WindowSessionPropertyTest, SetModeSupportInfo, Function | SmallTest | L WindowSessionProperty *property = new WindowSessionProperty(); ASSERT_NE(property->GetModeSupportInfo(), 0); } + /** * @tc.name: IsFloatingWindowAppType * @tc.desc: IsFloatingWindowAppType test @@ -764,6 +766,7 @@ HWTEST_F(WindowSessionPropertyTest, Write, Function | SmallTest | Level2) property->Write(parcel, WSPropertyChangeAction::ACTION_UPDATE_MODE_SUPPORT_INFO); ASSERT_EQ(property->GetPersistentId(), INVALID_SESSION_ID); } + /** * @tc.name: GetWindowName * @tc.desc: GetWindowName diff --git a/wm/include/window_input_channel.h b/wm/include/window_input_channel.h index d47100050d..7e790b9b7a 100644 --- a/wm/include/window_input_channel.h +++ b/wm/include/window_input_channel.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_WINDOW_INPUT_CHANNEL_H #define OHOS_WINDOW_INPUT_CHANNEL_H diff --git a/wm/include/window_scene_session_impl.h b/wm/include/window_scene_session_impl.h index 06a3ecfcdc..5d5ba88904 100644 --- a/wm/include/window_scene_session_impl.h +++ b/wm/include/window_scene_session_impl.h @@ -149,7 +149,7 @@ public: WSError UpdateDisplayId(uint64_t displayId) override; WMError AdjustKeyboardLayout(const KeyboardLayoutParams& params) override; - /* + /** * PC Window */ bool IsPcOrPadCapabilityEnabled() const override; @@ -160,7 +160,7 @@ public: WMError SetWindowRectAutoSave(bool enabled) override; WMError IsWindowRectAutoSave(bool& enabled) override; - /* + /** * Free Multi Window */ WSError SwitchFreeMultiWindow(bool enable) override; @@ -175,7 +175,7 @@ public: bool GetIsUIExtFirstSubWindow() const override; bool GetIsUIExtAnySubWindow() const override; - /* + /** * Gesture Back */ WMError SetGestureBackEnabled(bool enable) override; @@ -259,12 +259,12 @@ private: bool dockHoverShowEnabled_ = true; void PreLayoutOnShow(WindowType type, const sptr& info = nullptr); - /* + /** * Gesture Back */ bool gestureBackEnabled_ = true; - /* + /** * Window Property. */ void InitSystemSessionDragEnable(); diff --git a/wm/include/window_session_impl.h b/wm/include/window_session_impl.h index d71f0fb186..f90faf70d0 100644 --- a/wm/include/window_session_impl.h +++ b/wm/include/window_session_impl.h @@ -45,7 +45,7 @@ namespace { template using EnableIfSame = typename std::enable_if, Ret>::type; -/* +/** * DFX */ const std::string SET_UICONTENT_TIMEOUT_LISTENER_TASK_NAME = "SetUIContentTimeoutListener"; @@ -71,7 +71,7 @@ public: const sptr& iSession, const std::string& identityToken = "") { return WMError::WM_OK; } - /* + /** * inherits from window */ WMError Show(uint32_t reason = 0, bool withAnimation = false, bool withFocus = true) override; @@ -94,7 +94,7 @@ public: WMError SetFocusable(bool isFocusable) override; WMError SetTouchable(bool isTouchable) override; - /* + /** * Window Hierarchy */ WMError SetTopmost(bool topmost) override; @@ -110,7 +110,7 @@ public: WMError SetSingleFrameComposerEnabled(bool enable) override; bool IsFloatingWindowAppType() const override; - /* + /** * PC Window */ bool IsPcOrPadCapabilityEnabled() const override; @@ -140,7 +140,7 @@ public: void ConsumeKeyEvent(std::shared_ptr& inputEvent) override; bool PreNotifyKeyEvent(const std::shared_ptr& keyEvent) override; - /* + /** * inherits from session stage */ WSError SetActive(bool active) override; @@ -241,7 +241,7 @@ public: WSError NotifyDialogStateChange(bool isForeground) override; bool IsMainHandlerAvailable() const override; - /* + /** * PiP Window */ WSError NotifyCloseExistPipWindow() override; @@ -280,7 +280,7 @@ public: virtual WMError EnableDrag(bool enableDrag) override; WMError SetContinueState(int32_t continueState) override; - /* + /** * Multi Window */ WSError SetSplitButtonVisible(bool isVisible) override; @@ -290,7 +290,7 @@ public: */ WSError SetEnableDragBySystem(bool enableDrag) override; - /* + /** * Free Multi Window */ WMError RegisterSwitchFreeMultiWindowListener(const sptr& listener) override; @@ -311,7 +311,7 @@ protected: void NotifyAfterDestroy(); void ClearListenersById(int32_t persistentId); - /* + /** * Free Multi Window */ void ClearSwitchFreeMultiWindowListenersById(int32_t persistentId); @@ -401,7 +401,7 @@ protected: return windowSystemConfig_.IsFreeMultiWindowMode(); } - /* + /** * DFX */ void SetUIContentComplete(); @@ -412,13 +412,13 @@ protected: SET_UICONTENT_TIMEOUT = 1000 }; - /* + /** * Window Lifecycle */ bool hasFirstNotifyInteractive_ = false; bool interactive_ = true; - /* + /** * Window Layout */ void FlushLayoutSize(int32_t width, int32_t height) override; @@ -554,7 +554,7 @@ private: std::string restoredRouterStack_; // It was set and get in same thread, which is js thread. - /* + /** * Window Layout */ WSRect layoutRect_; @@ -563,7 +563,7 @@ private: bool postTaskDone_ = false; int16_t rotationAnimationCount_ { 0 }; - /* + /** * Multi Window */ bool isSplitButtonVisible_ = true; diff --git a/wm/src/oh_window_event_filter.cpp b/wm/src/oh_window_event_filter.cpp index 99cae14a29..65ac7367c2 100644 --- a/wm/src/oh_window_event_filter.cpp +++ b/wm/src/oh_window_event_filter.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "cstdint" #include "functional" #include "oh_window_comm.h" diff --git a/wm/test/mock/mock_window.h b/wm/test/mock/mock_window.h index 51042729e2..a2c45bf2c7 100644 --- a/wm/test/mock/mock_window.h +++ b/wm/test/mock/mock_window.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef MOCK_WINDOW_H #define MOCK_WINDOW_H diff --git a/wm/test/unittest/screen_scene_test.cpp b/wm/test/unittest/screen_scene_test.cpp index 6a8a799230..57d2ee77ff 100644 --- a/wm/test/unittest/screen_scene_test.cpp +++ b/wm/test/unittest/screen_scene_test.cpp @@ -80,7 +80,6 @@ HWTEST_F(ScreenSceneTest, Destroy01, Function | SmallTest | Level3) ASSERT_EQ(1, screenScene.GetWindowId()); } - /** * @tc.name: UpdateViewportConfig01 * @tc.desc: UpdateViewportConfig Test diff --git a/wm/test/unittest/ui_extension/window_extension_session_impl_test.cpp b/wm/test/unittest/ui_extension/window_extension_session_impl_test.cpp index 7b5aa5f31f..efdf97d5eb 100644 --- a/wm/test/unittest/ui_extension/window_extension_session_impl_test.cpp +++ b/wm/test/unittest/ui_extension/window_extension_session_impl_test.cpp @@ -1360,7 +1360,6 @@ HWTEST_F(WindowExtensionSessionImplTest, UnregisterOccupiedAreaChangeListener, F ASSERT_EQ(WMError::WM_OK, window_->UnregisterOccupiedAreaChangeListener(nullptr)); } - /** * @tc.name: GetAvoidAreaByType01 * @tc.desc: NotifyExecuteAction Test diff --git a/wm/test/unittest/window_impl_test.cpp b/wm/test/unittest/window_impl_test.cpp index 352d242c7d..ec19ddc32d 100644 --- a/wm/test/unittest/window_impl_test.cpp +++ b/wm/test/unittest/window_impl_test.cpp @@ -308,7 +308,6 @@ HWTEST_F(WindowImplTest, FindWindow05, Function | SmallTest | Level2) ASSERT_EQ(nullptr, WindowImpl::Find("FindWindow05")); } - /** * @tc.name: RequestVsyncSucc * @tc.desc: RequestVsync Test Succ @@ -327,7 +326,6 @@ HWTEST_F(WindowImplTest, RequestVsyncSucc, Function | SmallTest | Level2) ASSERT_EQ(WMError::WM_OK, window->Destroy()); } - /** * @tc.name: RequestVsyncErr * @tc.desc: RequestVsync Test Err @@ -1153,7 +1151,6 @@ HWTEST_F(WindowImplTest, SetTurnScreenOn01, Function | SmallTest | Level3) ASSERT_EQ(WMError::WM_OK, window->Destroy()); } - /** * @tc.name: SetTurnScreenOn02 * @tc.desc: create window with show, test SetTurnScreenOn diff --git a/wm/test/unittest/window_impl_test3.cpp b/wm/test/unittest/window_impl_test3.cpp index 11057bb1f9..722b9c851e 100644 --- a/wm/test/unittest/window_impl_test3.cpp +++ b/wm/test/unittest/window_impl_test3.cpp @@ -887,7 +887,7 @@ HWTEST_F(WindowImplTest3, UpdateConfigurationForAll01, Function | SmallTest | Le ASSERT_EQ(WMError::WM_OK, window->Destroy()); } -/* +/** * @tc.name: GetSurfaceNode01 * @tc.desc: GetSurfaceNode01 Test * @tc.type: FUNC diff --git a/wm/test/unittest/window_manager_lite_test.cpp b/wm/test/unittest/window_manager_lite_test.cpp index 16f1d5fee2..59084e09bf 100644 --- a/wm/test/unittest/window_manager_lite_test.cpp +++ b/wm/test/unittest/window_manager_lite_test.cpp @@ -765,6 +765,7 @@ HWTEST_F(WindowManagerLiteTest, NotifyWMSConnected03, Function | SmallTest | Lev WindowManagerLite::GetInstance().pImpl_->NotifyWMSDisconnected(0, 0); EXPECT_NE(WindowManagerLite::GetInstance().pImpl_->wmsConnectionChangedListener_, nullptr); } + /** * @tc.name: RegisterWindowStyleChangedListener * @tc.desc: check RegisterWindowStyleChangedListener diff --git a/wm/test/unittest/window_option_test.cpp b/wm/test/unittest/window_option_test.cpp index 10c5d6f5e8..30c9fcaa4e 100644 --- a/wm/test/unittest/window_option_test.cpp +++ b/wm/test/unittest/window_option_test.cpp @@ -159,6 +159,7 @@ HWTEST_F(WindowOptionTest, WindowMode06, Function | SmallTest | Level2) option->SetWindowMode(WindowMode::WINDOW_MODE_PIP); ASSERT_EQ(WindowMode::WINDOW_MODE_PIP, option->GetWindowMode()); } + /** * @tc.name: Focusable01 * @tc.desc: SetFocusable/GetFocusable diff --git a/wm/test/unittest/window_proxy_test.cpp b/wm/test/unittest/window_proxy_test.cpp index 2f32ede037..d264d93cf6 100644 --- a/wm/test/unittest/window_proxy_test.cpp +++ b/wm/test/unittest/window_proxy_test.cpp @@ -203,7 +203,6 @@ HWTEST_F(WindowProxyTest, NotifyDestroy01, Function | SmallTest | Level2) ASSERT_EQ(err, WMError::WM_OK); } - /** * @tc.name: NotifyForeground01 * @tc.desc: normal function @@ -215,7 +214,6 @@ HWTEST_F(WindowProxyTest, NotifyForeground01, Function | SmallTest | Level2) ASSERT_EQ(err, WMError::WM_OK); } - /** * @tc.name: NotifyBackground01 * @tc.desc: normal function diff --git a/wm/test/unittest/window_scene_session_impl_test2.cpp b/wm/test/unittest/window_scene_session_impl_test2.cpp index f4dca2e59a..37c6770a37 100644 --- a/wm/test/unittest/window_scene_session_impl_test2.cpp +++ b/wm/test/unittest/window_scene_session_impl_test2.cpp @@ -477,7 +477,6 @@ HWTEST_F(WindowSceneSessionImplTest2, UpdateConfiguration01, Function | SmallTes ASSERT_EQ(ret, 0); } - /** * @tc.name: UpdateConfigurationForAll01 * @tc.desc: UpdateConfigurationForAll @@ -1316,6 +1315,7 @@ HWTEST_F(WindowSceneSessionImplTest2, AdjustKeyboardLayout01, Function | SmallTe params.PortraitPanelRect_ = {1, 2, 3, 4}; ASSERT_EQ(WMError::WM_OK, window->AdjustKeyboardLayout(params)); } + /** * @tc.name: HideNonSecureWindows01 * @tc.desc: HideNonSecureWindows diff --git a/wm/test/unittest/window_scene_session_impl_test3.cpp b/wm/test/unittest/window_scene_session_impl_test3.cpp index c5ba1d8709..d387d1ed7f 100644 --- a/wm/test/unittest/window_scene_session_impl_test3.cpp +++ b/wm/test/unittest/window_scene_session_impl_test3.cpp @@ -999,6 +999,7 @@ HWTEST_F(WindowSceneSessionImplTest3, Resize, Function | SmallTest | Level2) ret = windowSceneSessionImpl->Resize(100, 100); EXPECT_EQ(WMError::WM_OK, ret); } + /** * @tc.name: Resize01 * @tc.desc: Resize diff --git a/wm/test/unittest/window_scene_test.cpp b/wm/test/unittest/window_scene_test.cpp index a1ce4016d9..ed44082d42 100644 --- a/wm/test/unittest/window_scene_test.cpp +++ b/wm/test/unittest/window_scene_test.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include #include "window_scene.h" #include "ability_context_impl.h" @@ -165,7 +166,6 @@ HWTEST_F(WindowSceneTest, Init06, Function | SmallTest | Level2) scene->Init(displayId, abilityContext, listener, optionTest, iSession, identityToken)); } - /** * @tc.name: Create01 * @tc.desc: CreateWindow without windowName diff --git a/wm/test/unittest/window_session_impl_test.cpp b/wm/test/unittest/window_session_impl_test.cpp index 190f70f334..dc15c356ca 100644 --- a/wm/test/unittest/window_session_impl_test.cpp +++ b/wm/test/unittest/window_session_impl_test.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include #include #include @@ -810,7 +811,6 @@ HWTEST_F(WindowSessionImplTest, RequestVsyncSucc, Function | SmallTest | Level2) window->RequestVsync(vsyncCallback); } - /** * @tc.name: RequestVsyncErr * @tc.desc: RequestVsync Test Err diff --git a/wm/test/unittest/window_session_impl_test2.cpp b/wm/test/unittest/window_session_impl_test2.cpp index 989664ea0a..9a651dcdb7 100644 --- a/wm/test/unittest/window_session_impl_test2.cpp +++ b/wm/test/unittest/window_session_impl_test2.cpp @@ -1836,7 +1836,6 @@ HWTEST_F(WindowSessionImplTest2, GetKeyboardAnimationConfig, Function | SmallTes GTEST_LOG_(INFO) << "WindowSessionImplTest2: GetKeyboardAnimationConfig end"; } - /** * @tc.name: GetSubWindow * @tc.desc: GetSubWindow diff --git a/wm/test/unittest/window_session_impl_test4.cpp b/wm/test/unittest/window_session_impl_test4.cpp index f328a1b0fc..11be0d1ceb 100644 --- a/wm/test/unittest/window_session_impl_test4.cpp +++ b/wm/test/unittest/window_session_impl_test4.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include #include #include @@ -102,7 +103,6 @@ HWTEST_F(WindowSessionImplTest4, GetFocusable, Function | SmallTest | Level2) GTEST_LOG_(INFO) << "WindowSessionImplTest4: GetFocusabletest01 end"; } - /** * @tc.name: TransferAccessibilityEvent * @tc.desc: TransferAccessibilityEvent @@ -708,7 +708,6 @@ HWTEST_F(WindowSessionImplTest4, GetCallingWindowRect, Function | SmallTest | Le window->GetCallingWindowRect(rect); } - /** * @tc.name: EnableDrag * @tc.desc: EnableDrag Test diff --git a/wm/test/unittest/window_stub_test.cpp b/wm/test/unittest/window_stub_test.cpp index 401cbe85c5..3867972dbc 100644 --- a/wm/test/unittest/window_stub_test.cpp +++ b/wm/test/unittest/window_stub_test.cpp @@ -195,7 +195,6 @@ HWTEST_F(WindowStubTest, OnRemoteRequest06, Function | SmallTest | Level2) EXPECT_EQ(res, 0); } - /** * @tc.name: OnRemoteRequest07 * @tc.desc: test TRANS_ID_NOTIFY_CLIENT_POINT_UP success @@ -354,7 +353,6 @@ HWTEST_F(WindowStubTest, OnRemoteRequest12, Function | SmallTest | Level2) EXPECT_NE(res, 10); } - /** * @tc.name: OnRemoteRequest13 * @tc.desc: test TRANS_ID_UPDATE_WINDOW_RECT success diff --git a/wmserver/include/animation_config.h b/wmserver/include/animation_config.h index f971e8abd4..849d01e84a 100644 --- a/wmserver/include/animation_config.h +++ b/wmserver/include/animation_config.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_ROSEN_ANIMATION_CONFIG_H #define OHOS_ROSEN_ANIMATION_CONFIG_H diff --git a/wmserver/include/window_pair.h b/wmserver/include/window_pair.h index 42ace2922b..5a820f8f33 100644 --- a/wmserver/include/window_pair.h +++ b/wmserver/include/window_pair.h @@ -38,6 +38,7 @@ enum class WindowPairStatus : uint32_t { SECONDARY_AND_DIVIDER, PAIRED_DONE }; + /** * @brief Enumerates the message of split event. */ @@ -101,6 +102,7 @@ public: * @param node trigger window node */ bool StatusSupprtedWhenRecentUpdate(sptr& node); + /** * @brief Handle changes in the state of the window pair * diff --git a/wmserver/include/window_root.h b/wmserver/include/window_root.h index 3e24a8bed4..e0651896cd 100644 --- a/wmserver/include/window_root.h +++ b/wmserver/include/window_root.h @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef OHOS_ROSEN_WINDOW_ROOT_H #define OHOS_ROSEN_WINDOW_ROOT_H diff --git a/wmserver/src/display_group_controller.cpp b/wmserver/src/display_group_controller.cpp index c118f7cdd3..0ccd262e1e 100644 --- a/wmserver/src/display_group_controller.cpp +++ b/wmserver/src/display_group_controller.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "display_group_controller.h" #include "window_helper.h" diff --git a/wmserver/src/display_zoom_controller.cpp b/wmserver/src/display_zoom_controller.cpp index 6a2b78fb0c..8632761cd6 100644 --- a/wmserver/src/display_zoom_controller.cpp +++ b/wmserver/src/display_zoom_controller.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "display_zoom_controller.h" #include "display_group_info.h" #include "window_helper.h" diff --git a/wmserver/src/drag_controller.cpp b/wmserver/src/drag_controller.cpp index b2fa9d1a07..2467d1c66f 100644 --- a/wmserver/src/drag_controller.cpp +++ b/wmserver/src/drag_controller.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "drag_controller.h" #include diff --git a/wmserver/src/memory_guard.cpp b/wmserver/src/memory_guard.cpp index 738fbb8998..b9ea755c19 100644 --- a/wmserver/src/memory_guard.cpp +++ b/wmserver/src/memory_guard.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "memory_guard.h" #include "window_manager_hilog.h" diff --git a/wmserver/test/unittest/avoid_area_controller_test.cpp b/wmserver/test/unittest/avoid_area_controller_test.cpp index c1ec10cd89..38010fcb13 100644 --- a/wmserver/test/unittest/avoid_area_controller_test.cpp +++ b/wmserver/test/unittest/avoid_area_controller_test.cpp @@ -525,6 +525,7 @@ HWTEST_F(AvoidAreaControllerTest, KeyboardAvoidArea02, Function | SmallTest | Le } avoidAreaController->ProcessWindowChange(appWindow, AvoidControlType::AVOID_NODE_REMOVE, nullptr); } + /** * @tc.name: KeyboardAvoidArea02 * @tc.desc: Get avoid areas with listener, TYPE_KEYBOARD. diff --git a/wmserver/test/unittest/display_group_controller_test.cpp b/wmserver/test/unittest/display_group_controller_test.cpp index 207d075398..aa3eb237ed 100644 --- a/wmserver/test/unittest/display_group_controller_test.cpp +++ b/wmserver/test/unittest/display_group_controller_test.cpp @@ -158,7 +158,6 @@ HWTEST_F(DisplayGroupControllerTest, UpdateDisplayGroupWindowTree01, Function | displayGroupController_->UpdateDisplayGroupWindowTree(); } - /** * @tc.name: ProcessCrossNodes02 * @tc.desc: IsShowingOnMultiDisplays_ is true with different DisplayStateChangeType @@ -495,7 +494,6 @@ HWTEST_F(DisplayGroupControllerTest, PreProcessWindowNode03, Function | SmallTes ASSERT_EQ(expectRect, actualRect); } - /** * @tc.name: PostProcessWindowNode01 * @tc.desc: PostProcessWindowNode with multi display is true @@ -763,6 +761,7 @@ HWTEST_F(DisplayGroupControllerTest, ProcessWindowPairWhenDisplayChange, Functio layoutPolicy = nullptr; ASSERT_EQ(nullptr, layoutPolicy); } + /** * @tc.name: ProcessNotCrossNodesOnDestroyedDisplay08 * @tc.desc: DisplayId not equals to defaultDisplayId, and no node on groupWindowTree diff --git a/wmserver/test/unittest/input_window_monitor_test.cpp b/wmserver/test/unittest/input_window_monitor_test.cpp index 4483469d1a..5e733ff1d7 100644 --- a/wmserver/test/unittest/input_window_monitor_test.cpp +++ b/wmserver/test/unittest/input_window_monitor_test.cpp @@ -69,6 +69,7 @@ HWTEST_F(InputWindowMonitorTest, UpdateInputWindow01, Function | SmallTest | Lev input_monitor_->UpdateInputWindow(0); ASSERT_EQ(nullptr, input_monitor_->windowRoot_->windowNodeMap_[0]); } + /** * @tc.name: GetDisplayDirectionForMmi * @tc.desc: get display direction @@ -79,6 +80,7 @@ HWTEST_F(InputWindowMonitorTest, GetDisplayDirectionForMmi01, Function | SmallTe Rotation rotate = Rotation::ROTATION_0; ASSERT_EQ(MMI::DIRECTION0, input_monitor_->GetDisplayDirectionForMmi(rotate)); } + /** * @tc.name: UpdateDisplayInfo * @tc.desc: update displayinfo diff --git a/wmserver/test/unittest/minimize_app_test.cpp b/wmserver/test/unittest/minimize_app_test.cpp index 3b2659bce7..276d5688c5 100644 --- a/wmserver/test/unittest/minimize_app_test.cpp +++ b/wmserver/test/unittest/minimize_app_test.cpp @@ -103,6 +103,7 @@ HWTEST_F(MinimizeAppTest, MinimizeAppTest01, Function | SmallTest | Level2) MinimizeApp::ExecuteMinimizeTargetReasons(MinimizeReason::SPLIT_REPLACE); MinimizeApp::ExecuteMinimizeAll(); } + /** * @tc.name: MinimizeAppTest02 * @tc.desc: add, find and clear @@ -119,6 +120,7 @@ HWTEST_F(MinimizeAppTest, MinimizeAppTest02, Function | SmallTest | Level2) MinimizeApp::ClearNodesWithReason(MinimizeReason::MINIMIZE_ALL); } + /** * @tc.name: MinimizeAppTest03 * @tc.desc: add and find @@ -135,6 +137,7 @@ HWTEST_F(MinimizeAppTest, MinimizeAppTest03, Function | SmallTest | Level2) MinimizeApp::ClearNodesWithReason(MinimizeReason::OTHER_WINDOW); } + /** * @tc.name: MinimizeAppTest04 * @tc.desc: add and recover @@ -150,6 +153,7 @@ HWTEST_F(MinimizeAppTest, MinimizeAppTest04, Function | SmallTest | Level2) MinimizeApp::ClearNodesWithReason(MinimizeReason::LAYOUT_TILE); } + /** * @tc.name: MinimizeAppTest05 * @tc.desc: insert nullptr to needMinimizeAppNodes_ @@ -168,6 +172,7 @@ HWTEST_F(MinimizeAppTest, MinimizeAppTest05, Function | SmallTest | Level2) MinimizeApp::ClearNodesWithReason(MinimizeReason::MINIMIZE_ALL); } + /** * @tc.name: IsNodeNeedMinimizeWithReason * @tc.desc: check node need minimize or not @@ -189,6 +194,7 @@ HWTEST_F(MinimizeAppTest, IsNodeNeedMinimizeWithReason01, Function | SmallTest | MinimizeApp::ClearNodesWithReason(MinimizeReason::MINIMIZE_ALL); MinimizeApp::ClearNodesWithReason(MinimizeReason::MINIMIZE_BUTTON); } + /** * @tc.name: ClearNodesWithReason * @tc.desc: clear node with reason @@ -206,6 +212,7 @@ HWTEST_F(MinimizeAppTest, ClearNodesWithReason01, Function | SmallTest | Level2) MinimizeApp::ClearNodesWithReason(MinimizeReason::GESTURE_ANIMATION); ASSERT_EQ(1, MinimizeApp::GetNeedMinimizeAppNodesWithReason(MinimizeReason::MINIMIZE_BUTTON).size()); } + /** * @tc.name: GetRecoverdNodeFromMinimizeList * @tc.desc: Get recoverd node from list @@ -219,6 +226,7 @@ HWTEST_F(MinimizeAppTest, GetRecoverdNodeFromMinimizeList01, Function | SmallTes ASSERT_EQ(nullptr, MinimizeApp::GetRecoverdNodeFromMinimizeList()); MinimizeApp::ClearNodesWithReason(MinimizeReason::MINIMIZE_BUTTON); } + /** * @tc.name: IsNodeNeedMinimize * @tc.desc: check node need minize or not @@ -228,6 +236,7 @@ HWTEST_F(MinimizeAppTest, IsNodeNeedMinimize01, Function | SmallTest | Level2) { ASSERT_EQ(false, MinimizeApp::IsNodeNeedMinimize(nullptr)); } + /** * @tc.name: ExecuteMinimizeTargetReasons * @tc.desc: Execute Minimize With TargetReason diff --git a/wmserver/test/unittest/window_controller_test.cpp b/wmserver/test/unittest/window_controller_test.cpp index 9359ed6f78..319fd64da6 100644 --- a/wmserver/test/unittest/window_controller_test.cpp +++ b/wmserver/test/unittest/window_controller_test.cpp @@ -2040,7 +2040,6 @@ HWTEST_F(WindowControllerTest, UpdateProperty12, Function | SmallTest | Level3) ASSERT_EQ(WMError::WM_OK, res); } - /** * @tc.name: UpdateProperty * @tc.desc: Window controller UpdateProperty ACTION_UPDATE_SET_BRIGHTNESS diff --git a/wmserver/test/unittest/window_dumper_test.cpp b/wmserver/test/unittest/window_dumper_test.cpp index 8011135504..2701a3b172 100644 --- a/wmserver/test/unittest/window_dumper_test.cpp +++ b/wmserver/test/unittest/window_dumper_test.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include #include diff --git a/wmserver/test/unittest/window_inner_manager_test.cpp b/wmserver/test/unittest/window_inner_manager_test.cpp index eb9e83e535..aac70bbe37 100644 --- a/wmserver/test/unittest/window_inner_manager_test.cpp +++ b/wmserver/test/unittest/window_inner_manager_test.cpp @@ -127,6 +127,7 @@ HWTEST_F(WindowInnerManagerTest, NotifyWindowEndUpMovingOrDragging, Function | S windowInnerManager.NotifyWindowEndUpMovingOrDragging(windowId); ASSERT_EQ(windowInnerManager.moveDragController_->activeWindowId_, INVALID_WINDOW_ID); } + /** * @tc.name: NotifyWindowRemovedOrDestroyed * @tc.desc: test WindowInnerManager NotifyWindowRemovedOrDestroyed diff --git a/wmserver/test/unittest/window_layout_policy_test.cpp b/wmserver/test/unittest/window_layout_policy_test.cpp index 1a3d968d7d..f89b89e6d2 100644 --- a/wmserver/test/unittest/window_layout_policy_test.cpp +++ b/wmserver/test/unittest/window_layout_policy_test.cpp @@ -1372,6 +1372,7 @@ HWTEST_F(WindowLayoutPolicyTest, GetDividerRect, Function | SmallTest | Level2) Rect rect{0, 0, 0, 0}; ASSERT_NE(result, rect); } + /** * @tc.name: AdjustFixedOrientationRSSurfaceNode * @tc.desc: test AdjustFixedOrientationRSSurfaceNode @@ -1438,6 +1439,7 @@ HWTEST_F(WindowLayoutPolicyTest, GetStoragedAspectRatio, Function | SmallTest | auto result = PersistentStorage::HasKey(keyName, PersistentStorageType::ASPECT_RATIO); ASSERT_EQ(false, result); } + /** * @tc.name: FixWindowRectWithinDisplay * @tc.desc: test FixWindowRectWithinDisplay @@ -1451,6 +1453,7 @@ HWTEST_F(WindowLayoutPolicyTest, FixWindowRectWithinDisplay, Function | SmallTes auto displayInfo = display->GetDisplayInfo(); EXPECT_EQ(displayInfo->GetWaterfallDisplayCompressionStatus(), false); } + /** * @tc.name: IsNeedAnimationSync * @tc.desc: test IsNeedAnimationSync diff --git a/wmserver/test/unittest/window_manager_service_test.cpp b/wmserver/test/unittest/window_manager_service_test.cpp index 8632a9d805..f300320ce2 100644 --- a/wmserver/test/unittest/window_manager_service_test.cpp +++ b/wmserver/test/unittest/window_manager_service_test.cpp @@ -101,6 +101,7 @@ HWTEST_F(WindowManagerServiceTest, OnAddSystemAbility01, Function | SmallTest | wms->OnAddSystemAbility(0, str); ASSERT_EQ(nullptr, wms->windowCommonEvent_->subscriber_); } + /** * @tc.name: WindowVisibilityChangeCallback * @tc.desc: WindowVisibilityChangeCallback test @@ -115,6 +116,7 @@ HWTEST_F(WindowManagerServiceTest, WindowVisibilityChangeCallback01, Function | std::chrono::milliseconds dura(time); std::this_thread::sleep_for(dura); } + /** * @tc.name: InitWithAbilityManagerServiceAdded * @tc.desc: Init with ability manager service added. @@ -127,6 +129,7 @@ HWTEST_F(WindowManagerServiceTest, InitWithAbilityManagerServiceAdded01, Functio wms->InitWithAbilityManagerServiceAdded(); ASSERT_NE(nullptr, wms->wmsHandler_); } + /** * @tc.name: Dump * @tc.desc: Dump info @@ -150,6 +153,7 @@ HWTEST_F(WindowManagerServiceTest, Dump01, Function | SmallTest | Level2) close(fd); unlink(dumpFile.c_str()); } + /** * @tc.name: NotifyWindowTransition * @tc.desc: NotifyWindowTransition test @@ -166,6 +170,7 @@ HWTEST_F(WindowManagerServiceTest, NotifyWindowTransition01, Function | SmallTes ASSERT_NE(WMError::WM_ERROR_NO_REMOTE_ANIMATION, wms->NotifyWindowTransition(fromInfo, toInfo, true)); } } + /** * @tc.name: StartingWindow * @tc.desc: StartingWindow test @@ -194,7 +199,6 @@ HWTEST_F(WindowManagerServiceTest, MoveMissionsToForeground01, Function | SmallT ASSERT_EQ(WMError::WM_OK, rs); } - /** * @tc.name: MoveMissionsToBackground * @tc.desc: MoveMissionsToBackground test @@ -222,6 +226,7 @@ HWTEST_F(WindowManagerServiceTest, CreateWindow01, Function | SmallTest | Level2 ASSERT_EQ(WMError::WM_ERROR_NULLPTR, wms->CreateWindow(window, property, RS_node, id, nullptr)); wms->DestroyWindow(id, true); } + /** * @tc.name: AddWindow * @tc.desc: AddWindow test @@ -232,6 +237,7 @@ HWTEST_F(WindowManagerServiceTest, AddWindow01, Function | SmallTest | Level2) sptr property = nullptr; ASSERT_EQ(WMError::WM_ERROR_NULLPTR, wms->AddWindow(property)); } + /** * @tc.name: RegisterWindowManagerAgent * @tc.desc: RegisterWindowManagerAgent test @@ -244,6 +250,7 @@ HWTEST_F(WindowManagerServiceTest, RegisterWindowManagerAgent01, Function | Smal ASSERT_EQ(WMError::WM_ERROR_NULLPTR, wms->RegisterWindowManagerAgent(type, windowManagerAgent)); ASSERT_EQ(WMError::WM_ERROR_NULLPTR, wms->UnregisterWindowManagerAgent(type, windowManagerAgent)); } + /** * @tc.name: SetWindowAnimationController * @tc.desc: SetWindowAnimationController test @@ -256,6 +263,7 @@ HWTEST_F(WindowManagerServiceTest, SetWindowAnimationController01, Function | Sm controller = new RSIWindowAnimationControllerMocker; ASSERT_EQ(WMError::WM_OK, wms->SetWindowAnimationController(controller)); } + /** * @tc.name: OnWindowEvent * @tc.desc: OnWindowEvent test @@ -268,6 +276,7 @@ HWTEST_F(WindowManagerServiceTest, OnWindowEvent01, Function | SmallTest | Level wms->OnWindowEvent(Event::REMOTE_DIED, remoteObject); ASSERT_EQ(INVALID_WINDOW_ID, wms->windowRoot_->GetWindowIdByObject(remoteObject)); } + /** * @tc.name: UpdateProperty * @tc.desc: UpdateProperty test @@ -279,6 +288,7 @@ HWTEST_F(WindowManagerServiceTest, UpdateProperty01, Function | SmallTest | Leve ASSERT_EQ(WMError::WM_ERROR_NULLPTR, wms->UpdateProperty(windowProperty, PropertyChangeAction::ACTION_UPDATE_ANIMATION_FLAG, true)); } + /** * @tc.name: GetModeChangeHotZones * @tc.desc: GetModeChangeHotZones test @@ -295,6 +305,7 @@ HWTEST_F(WindowManagerServiceTest, GetModeChangeHotZones01, Function | SmallTest wms->hotZonesConfig_ = config; ASSERT_EQ(WMError::WM_ERROR_NULLPTR, wms->GetModeChangeHotZones(displayId, hotZone)); } + /** * @tc.name: UpdateAvoidAreaListener * @tc.desc: UpdateAvoidAreaListener test @@ -311,6 +322,7 @@ HWTEST_F(WindowManagerServiceTest, UpdateAvoidAreaListener01, Function | SmallTe ASSERT_NE(WMError::WM_DO_NOTHING, wms->UpdateAvoidAreaListener(0, true)); } } + /** * @tc.name: BindDialogTarget * @tc.desc: BindDialogTarget test @@ -326,6 +338,7 @@ HWTEST_F(WindowManagerServiceTest, BindDialogTarget01, Function | SmallTest | Le ASSERT_NE(WMError::WM_ERROR_NULLPTR, wms->BindDialogTarget(id, targetToken)); } } + /** * @tc.name: DispatchKeyEvent01 * @tc.desc: Dispatch KeyEvent for app window bellow the component window. @@ -360,6 +373,7 @@ HWTEST_F(WindowManagerServiceTest, DispatchKeyEvent01, Function | SmallTest | Le wms->DispatchKeyEvent(compNode->GetWindowId(), event); testing::Mock::AllowLeak(token); } + /** * @tc.name: DispatchKeyEvent02 * @tc.desc: Dispatch KeyEvent for app window bellow the app window. @@ -391,6 +405,7 @@ HWTEST_F(WindowManagerServiceTest, DispatchKeyEvent02, Function | SmallTest | Le ASSERT_TRUE(windowNodes[1] == appNode2); wms->DispatchKeyEvent(appNode1->GetWindowId(), event); } + /** * @tc.name: DispatchKeyEvent03 * @tc.desc: Dispatch KeyEvent for app window bellow two component window. @@ -432,6 +447,7 @@ HWTEST_F(WindowManagerServiceTest, DispatchKeyEvent03, Function | SmallTest | Le wms->DispatchKeyEvent(compNode2->GetWindowId(), event); testing::Mock::AllowLeak(token); } + /** * @tc.name: SetWindowGravity * @tc.desc: SetWindowGravity test @@ -446,6 +462,7 @@ HWTEST_F(WindowManagerServiceTest, SetWindowGravity01, Function | SmallTest | Le ASSERT_NE(WMError::WM_ERROR_NULLPTR, wms->SetWindowGravity(id, WindowGravity::WINDOW_GRAVITY_BOTTOM, 0)); } } + /** * @tc.name: GetWindowAnimationTargets01 * @tc.desc: get window animation targets diff --git a/wmserver/test/unittest/window_node_container_test.cpp b/wmserver/test/unittest/window_node_container_test.cpp index a78fc6d368..ecbf3ce531 100644 --- a/wmserver/test/unittest/window_node_container_test.cpp +++ b/wmserver/test/unittest/window_node_container_test.cpp @@ -147,6 +147,7 @@ HWTEST_F(WindowNodeContainerTest, AddWindowNodeOnWindowTree03, Function | SmallT subNode->SetWindowProperty(subProperty); ASSERT_EQ(WMError::WM_ERROR_NULLPTR, container_->AddWindowNodeOnWindowTree(subNode, nullptr)); } + /** * @tc.name: MinimizeAppNodeExceptOptions * @tc.desc: minimize app node @@ -172,6 +173,7 @@ HWTEST_F(WindowNodeContainerTest, MinimizeAppNodeExceptOptions, Function | Small ASSERT_EQ(WMError::WM_OK, container_->MinimizeAppNodeExceptOptions(MinimizeReason::OTHER_WINDOW, exceptionalIds, exceptionalModes)); } + /** * @tc.name: DropShowWhenLockedWindowIfNeeded * @tc.desc: drop show when locken window @@ -186,6 +188,7 @@ HWTEST_F(WindowNodeContainerTest, DropShowWhenLockedWindowIfNeeded, Function | S node->SetWindowProperty(property); container_->DropShowWhenLockedWindowIfNeeded(node); } + /** * @tc.name: GetModeChangeHotZones * @tc.desc: get mode change hot zones @@ -200,6 +203,7 @@ HWTEST_F(WindowNodeContainerTest, GetModeChangeHotZones, Function | SmallTest | ASSERT_EQ(hotZones.primary_.width_, 20); ASSERT_EQ(hotZones.secondary_.width_, 30); } + /** * @tc.name: UpdateCameraFloatWindowStatus * @tc.desc: update camera float window status @@ -214,6 +218,7 @@ HWTEST_F(WindowNodeContainerTest, UpdateCameraFloatWindowStatus, Function | Smal node->SetWindowProperty(property); container_->UpdateCameraFloatWindowStatus(node, true); } + /** * @tc.name: UpdateWindowNode * @tc.desc: preprocess node and update RSTree @@ -833,6 +838,7 @@ HWTEST_F(WindowNodeContainerTest, TakeWindowPairSnapshot, Function | SmallTest | ASSERT_TRUE(!container->TakeWindowPairSnapshot(defaultDisplay_->GetId())); container->ClearWindowPairSnapshot(defaultDisplay_->GetId()); } + /** * @tc.name: Destroy * @tc.desc: clear vector cache completely, swap with empty vector @@ -842,6 +848,7 @@ HWTEST_F(WindowNodeContainerTest, Destroy, Function | SmallTest | Level2) { ASSERT_EQ(0, container_->Destroy().size()); } + /** * @tc.name: UpdatePrivateStateAndNotify * @tc.desc: update private window count @@ -867,6 +874,7 @@ HWTEST_F(WindowNodeContainerTest, UpdatePrivateStateAndNotify, Function | SmallT container_->UpdatePrivateStateAndNotify(); ASSERT_EQ(0, container_->privateWindowCount_); } + /** * @tc.name: MinimizeOldestMainFloatingWindow * @tc.desc: check function MinimizeOldestMainFloatingWindow diff --git a/wmserver/test/unittest/window_node_test.cpp b/wmserver/test/unittest/window_node_test.cpp index ad21a9ac47..556247c5c6 100644 --- a/wmserver/test/unittest/window_node_test.cpp +++ b/wmserver/test/unittest/window_node_test.cpp @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include #include "display_manager.h" @@ -179,6 +180,7 @@ HWTEST_F(WindowNodeTest, NewWindowNode01, Function | SmallTest | Level3) ASSERT_NE(nullptr, windowNode2); ASSERT_EQ(windowName, windowNode2->GetWindowName()); } + /** * @tc.name: NewWindowNode02 * @tc.desc: new window node with WindowProperty, RSSurfaceNode, IWindow @@ -201,6 +203,7 @@ HWTEST_F(WindowNodeTest, NewWindowNode02, Function | SmallTest | Level1) windowNode->SetWindowProperty(property); ASSERT_EQ(windowName, windowNode->GetWindowName()); } + /** * @tc.name: NewWindowNode03 * @tc.desc: new window node with WindowProperty, RSSurfaceNode, IWindow, pid , uid @@ -274,6 +277,7 @@ HWTEST_F(WindowNodeTest, SetEntireWindowTouchHotArea01, Function | SmallTest | L ASSERT_EQ(testValue.width_, windowNode->GetEntireWindowTouchHotArea().width_); ASSERT_EQ(testValue.height_, windowNode->GetEntireWindowTouchHotArea().height_); } + /** * @tc.name: SetEntireWindowPointerHotArea01 * @tc.desc: SetEntireWindowPointerHotArea & GetEntireWindowPointerHotArea @@ -303,6 +307,7 @@ HWTEST_F(WindowNodeTest, SetEntireWindowPointerHotArea01, Function | SmallTest | ASSERT_EQ(255, windowNode->GetEntireWindowPointerHotArea().width_); ASSERT_EQ(255, windowNode->GetEntireWindowPointerHotArea().height_); } + /** * @tc.name: SetWindowRect01 * @tc.desc: SetWindowRect & GetWindowRect @@ -332,6 +337,7 @@ HWTEST_F(WindowNodeTest, SetWindowRect01, Function | SmallTest | Level1) ASSERT_EQ(255, windowNode->GetWindowRect().width_); ASSERT_EQ(255, windowNode->GetWindowRect().height_); } + /** * @tc.name: SetDecoStatus01 * @tc.desc: SetDecoStatus & GetDecoStatus @@ -356,6 +362,7 @@ HWTEST_F(WindowNodeTest, SetDecoStatus01, Function | SmallTest | Level1) windowNode->SetDecorEnable(false); ASSERT_EQ(false, windowNode->GetWindowProperty()->GetDecorEnable()); } + /** * @tc.name: SetRequestRect01 * @tc.desc: SetRequestRect & GetRequestRect @@ -384,6 +391,7 @@ HWTEST_F(WindowNodeTest, SetRequestRect01, Function | SmallTest | Level1) ASSERT_EQ(255, windowNode->GetRequestRect().width_); ASSERT_EQ(255, windowNode->GetRequestRect().height_); } + /** * @tc.name: SetWindowProperty01 * @tc.desc: SetWindowProperty & GetWindowProperty @@ -404,6 +412,7 @@ HWTEST_F(WindowNodeTest, SetWindowProperty01, Function | SmallTest | Level1) windowNode->SetWindowProperty(property2); ASSERT_EQ(property2, windowNode->GetWindowProperty()); } + /** * @tc.name: SetSystemBarProperty01 * @tc.desc: SetSystemBarProperty & GetSystemBarProperty @@ -430,6 +439,7 @@ HWTEST_F(WindowNodeTest, SetSystemBarProperty01, Function | SmallTest | Level1) ASSERT_EQ(systemBarProperty2, systemBarProperties.find(WindowType::WINDOW_TYPE_NAVIGATION_BAR)->second); ASSERT_EQ(systemBarProperties.end(), systemBarProperties.find(WindowType::WINDOW_TYPE_APP_MAIN_WINDOW)); } + /** * @tc.name: SetWindowMode01 * @tc.desc: SetWindowMode & GetWindowMode @@ -449,6 +459,7 @@ HWTEST_F(WindowNodeTest, SetWindowMode01, Function | SmallTest | Level1) windowNode->SetWindowMode(WindowMode::WINDOW_MODE_FULLSCREEN); ASSERT_EQ(WindowMode::WINDOW_MODE_FULLSCREEN, windowNode->GetWindowMode()); } + /** * @tc.name: SetBrightness01 * @tc.desc: SetBrightness & GetBrightness @@ -470,6 +481,7 @@ HWTEST_F(WindowNodeTest, SetBrightness01, Function | SmallTest | Level1) windowNode->SetBrightness(1.1f); ASSERT_EQ(1.1f, windowNode->GetBrightness()); } + /** * @tc.name: SetTurnScreenOn01 * @tc.desc: SetTurnScreenOn & IsTurnScreenOn @@ -487,6 +499,7 @@ HWTEST_F(WindowNodeTest, SetTurnScreenOn01, Function | SmallTest | Level1) windowNode->SetTurnScreenOn(true); ASSERT_EQ(true, windowNode->IsTurnScreenOn()); } + /** * @tc.name: SetKeepScreenOn01 * @tc.desc: SetKeepScreenOn & IsKeepScreenOn @@ -504,6 +517,7 @@ HWTEST_F(WindowNodeTest, SetKeepScreenOn01, Function | SmallTest | Level1) windowNode->SetKeepScreenOn(true); ASSERT_EQ(true, windowNode->IsKeepScreenOn()); } + /** * @tc.name: SetCallingWindow01 * @tc.desc: SetCallingWindow & GetCallingWindow @@ -521,6 +535,7 @@ HWTEST_F(WindowNodeTest, SetCallingWindow01, Function | SmallTest | Level1) windowNode->SetCallingWindow(100); ASSERT_EQ(100, windowNode->GetCallingWindow()); } + /** * @tc.name: SetCallingPid01 * @tc.desc: SetCallingPid & GetCallingPid, SetInputEventCallingPid & GetInputEventCallingPid @@ -545,6 +560,7 @@ HWTEST_F(WindowNodeTest, SetCallingPid01, Function | SmallTest | Level1) ASSERT_EQ(1, windowNode->GetCallingPid()); ASSERT_EQ(2, windowNode->GetInputEventCallingPid()); } + /** * @tc.name: SetCallingUid01 * @tc.desc: SetCallingUid & GetCallingUid @@ -564,6 +580,7 @@ HWTEST_F(WindowNodeTest, SetCallingUid01, Function | SmallTest | Level1) windowNode->SetCallingUid(1); ASSERT_EQ(1, windowNode->GetCallingUid()); } + /** * @tc.name: SetWindowSizeChangeReason01 * @tc.desc: SetWindowSizeChangeReason & GetWindowSizeChangeReason & ResetWindowSizeChangeReason @@ -584,6 +601,7 @@ HWTEST_F(WindowNodeTest, SetWindowSizeChangeReason01, Function | SmallTest | Lev windowNode->ResetWindowSizeChangeReason(); ASSERT_EQ(WindowSizeChangeReason::UNDEFINED, windowNode->GetWindowSizeChangeReason()); } + /** * @tc.name: SetRequestedOrientation01 * @tc.desc: SetRequestedOrientation & GetRequestedOrientation @@ -601,6 +619,7 @@ HWTEST_F(WindowNodeTest, SetRequestedOrientation01, Function | SmallTest | Level windowNode->SetRequestedOrientation(Orientation::REVERSE_VERTICAL); ASSERT_EQ(Orientation::REVERSE_VERTICAL, windowNode->GetRequestedOrientation()); } + /** * @tc.name: SetShowingDisplays01 * @tc.desc: SetShowingDisplays & GetShowingDisplays @@ -626,6 +645,7 @@ HWTEST_F(WindowNodeTest, SetShowingDisplays01, Function | SmallTest | Level1) windowNode->SetShowingDisplays(displays); ASSERT_EQ(1, windowNode->GetShowingDisplays().size()); } + /** * @tc.name: SetModeSupportInfo01 * @tc.desc: SetModeSupportInfo & GetModeSupportInfo @@ -643,6 +663,7 @@ HWTEST_F(WindowNodeTest, SetModeSupportInfo01, Function | SmallTest | Level1) windowNode->SetModeSupportInfo(WindowModeSupport::WINDOW_MODE_SUPPORT_FULLSCREEN); ASSERT_EQ(WindowModeSupport::WINDOW_MODE_SUPPORT_FULLSCREEN, windowNode->GetModeSupportInfo()); } + /** * @tc.name: SetDragType01 * @tc.desc: SetDragType & GetDragType @@ -660,6 +681,7 @@ HWTEST_F(WindowNodeTest, SetDragType01, Function | SmallTest | Level1) windowNode->SetDragType(DragType::DRAG_BOTTOM_OR_TOP); ASSERT_EQ(DragType::DRAG_BOTTOM_OR_TOP, windowNode->GetDragType()); } + /** * @tc.name: SetOriginRect01 * @tc.desc: SetOriginRect & GetOriginRect @@ -684,6 +706,7 @@ HWTEST_F(WindowNodeTest, SetOriginRect01, Function | SmallTest | Level1) auto resultRect = windowNode->GetOriginRect(); ASSERT_EQ(testRect, resultRect); } + /** * @tc.name: SetTouchHotAreas01 * @tc.desc: SetTouchHotAreas & GetTouchHotAreas @@ -710,6 +733,7 @@ HWTEST_F(WindowNodeTest, SetTouchHotAreas01, Function | SmallTest | Level1) ASSERT_EQ(1, resultRect.size()); ASSERT_EQ(rect1, resultRect[0]); } + /** * @tc.name: SetPointerHotAreas01 * @tc.desc: SetPointerHotAreas & GetPointerHotAreas @@ -736,6 +760,7 @@ HWTEST_F(WindowNodeTest, SetPointerHotAreas01, Function | SmallTest | Level1) ASSERT_EQ(1, resultRect.size()); ASSERT_EQ(rect1, resultRect[0]); } + /** * @tc.name: SetPointerHotAreas01 * @tc.desc: SetWindowSizeLimits & GetWindowSizeLimits @@ -768,6 +793,7 @@ HWTEST_F(WindowNodeTest, SetWindowSizeLimits01, Function | SmallTest | Level1) ASSERT_EQ(testValue.maxHeight_, resultValue.maxHeight_); ASSERT_EQ(testValue.maxRatio_, resultValue.maxRatio_); } + /** * @tc.name: SetWindowUpdatedSizeLimits01 * @tc.desc: SetWindowUpdatedSizeLimits & GetWindowUpdatedSizeLimits @@ -800,6 +826,7 @@ HWTEST_F(WindowNodeTest, SetWindowUpdatedSizeLimits01, Function | SmallTest | Le ASSERT_EQ(testValue.maxHeight_, resultValue.maxHeight_); ASSERT_EQ(testValue.maxRatio_, resultValue.maxRatio_); } + /** * @tc.name: SetSnapshot01 * @tc.desc: SetSnapshot & GetSnapshot @@ -829,6 +856,7 @@ HWTEST_F(WindowNodeTest, SetSnapshot01, Function | SmallTest | Level1) auto resultValue = windowNode->GetSnapshot(); ASSERT_EQ(3, resultValue.use_count()); } + /** * @tc.name: UpdateZoomTransform01 * @tc.desc: UpdateZoomTransform & GetZoomTransform @@ -854,6 +882,7 @@ HWTEST_F(WindowNodeTest, UpdateZoomTransform01, Function | SmallTest | Level1) ASSERT_EQ(1.0f, resultValue.pivotX_); ASSERT_EQ(1.0f, resultValue.pivotY_); } + /** * @tc.name: SetTransform01 * @tc.desc: SetTransform & ComputeTransform diff --git a/wmserver/test/unittest/window_pair_test.cpp b/wmserver/test/unittest/window_pair_test.cpp index 4cee23c863..e475cc7af5 100644 --- a/wmserver/test/unittest/window_pair_test.cpp +++ b/wmserver/test/unittest/window_pair_test.cpp @@ -1087,6 +1087,7 @@ HWTEST_F(WindowPairTest, ClearPairSnapshot01, Function | SmallTest | Level2) windowPair->status_ = WindowPairStatus::PRIMARY_AND_SECONDARY; ASSERT_EQ(false, windowPair->TakePairSnapshot()); } + /** * @tc.name: ExitSplitMode * @tc.desc: Exit Split Mode @@ -1108,6 +1109,7 @@ HWTEST_F(WindowPairTest, ExitSplitMode01, Function | SmallTest | Level2) windowPair->ExitSplitMode(); ASSERT_EQ(nullptr, windowPair->divider_); } + /** * @tc.name: ExitSplitMode * @tc.desc: Exit Split Mode @@ -1148,6 +1150,7 @@ HWTEST_F(WindowPairTest, ExitSplitMode02, Function | SmallTest | Level2) ASSERT_EQ(0, vec2.size()); windowPair->Clear(); } + /** * @tc.name: ExitSplitMode * @tc.desc: Exit Split Mode @@ -1188,7 +1191,6 @@ HWTEST_F(WindowPairTest, ExitSplitMode03, Function | SmallTest | Level2) windowPair->Clear(); } - /** * @tc.name: IsDuringSplit * @tc.desc: check function IsDuringSplit diff --git a/wmserver/test/unittest/window_root_test.cpp b/wmserver/test/unittest/window_root_test.cpp index 9e95a04209..04b3e84e55 100644 --- a/wmserver/test/unittest/window_root_test.cpp +++ b/wmserver/test/unittest/window_root_test.cpp @@ -1779,7 +1779,6 @@ HWTEST_F(WindowRootTest, CheckMultiDialogWindows, Function | SmallTest | Level2) ASSERT_EQ(false, res); } - /** * @tc.name: GetSplitScreenWindowNodes * @tc.desc: test WindowRoot GetSplitScreenWindowNodes From 33ba7c15b897137c96b019e77b3da10c7dbda3ed Mon Sep 17 00:00:00 2001 From: yxn22 Date: Tue, 19 Nov 2024 02:25:49 +0000 Subject: [PATCH 2/2] update window_scene/session_manager/include/scene_session_manager.h. Signed-off-by: yxn22 --- window_scene/session_manager/include/scene_session_manager.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/window_scene/session_manager/include/scene_session_manager.h b/window_scene/session_manager/include/scene_session_manager.h index d0a81af76d..f8f55d58e1 100644 --- a/window_scene/session_manager/include/scene_session_manager.h +++ b/window_scene/session_manager/include/scene_session_manager.h @@ -707,7 +707,7 @@ private: void UpdateWindowDrawingData(uint64_t surfaceId, int32_t pid, int32_t uid); bool GetSpecifiedDrawingData(uint64_t surfaceId, int32_t& pid, int32_t& uid); void RemoveSpecifiedDrawingData(uint64_t surfaceId); - + /** * Window Rotate Animation */