From 4e987b6d19c2b7964b97124d74f7ae53235c4ae4 Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Wed, 17 May 2023 06:14:26 +0000 Subject: [PATCH 1/6] added test cases Signed-off-by: mayunteng_1 Change-Id: I8444b78449bbf8906a6356dfb1fb760fbf847665 --- .../unittest/src/interaction_manager_test.cpp | 78 ++++++++++++++++++- .../coordination/src/coordination_sm.cpp | 6 +- .../src/devicestatus_service_test.cpp | 24 ++++++ 3 files changed, 103 insertions(+), 5 deletions(-) diff --git a/frameworks/native/interaction/test/unittest/src/interaction_manager_test.cpp b/frameworks/native/interaction/test/unittest/src/interaction_manager_test.cpp index 0251e34d1..3c5e3d866 100644 --- a/frameworks/native/interaction/test/unittest/src/interaction_manager_test.cpp +++ b/frameworks/native/interaction/test/unittest/src/interaction_manager_test.cpp @@ -377,7 +377,7 @@ HWTEST_F(InteractionManagerTest, InteractionManagerTest_PrepareCoordination, Tes std::promise promiseFlag; std::future futureFlag = promiseFlag.get_future(); auto fun = [&promiseFlag](std::string listener, CoordinationMessage coordinationMessages) { - FI_HILOGD("Prepare coordination success"); + FI_HILOGD("Prepare coordination success, listener:%{public}s", listener.c_str()); promiseFlag.set_value(true); }; int32_t ret = InteractionManager::GetInstance()->PrepareCoordination(fun); @@ -389,6 +389,30 @@ HWTEST_F(InteractionManagerTest, InteractionManagerTest_PrepareCoordination, Tes #endif // OHOS_BUILD_ENABLE_COORDINATION } +/** + * @tc.name: InteractionManagerTest_UnprepareCoordination + * @tc.desc: Prepare coordination + * @tc.type: FUNC + * @tc.require: + */ +HWTEST_F(InteractionManagerTest, InteractionManagerTest_UnprepareCoordination, TestSize.Level1) +{ + CALL_TEST_DEBUG; + std::promise promiseFlag; + std::future futureFlag = promiseFlag.get_future(); + auto fun = [&promiseFlag](std::string listener, CoordinationMessage coordinationMessages) { + FI_HILOGD("Prepare coordination success, listener:%{public}s", listener.c_str()); + promiseFlag.set_value(true); + }; + int32_t ret = InteractionManager::GetInstance()->UnprepareCoordination(fun); +#ifdef OHOS_BUILD_ENABLE_COORDINATION + ASSERT_EQ(ret, RET_OK); + ASSERT_TRUE(futureFlag.get()); +#else + ASSERT_EQ(ret, ERROR_UNSUPPORT); +#endif // OHOS_BUILD_ENABLE_COORDINATION +} + /** * @tc.name: InteractionManagerTest_ActivateCoordination * @tc.desc: Activate coordination @@ -480,12 +504,12 @@ HWTEST_F(InteractionManagerTest, InteractionManagerTest_GetCoordinationState_Nor } /** - * @tc.name: InteractionManagerTest_Draglistener + * @tc.name: InteractionManagerTest_Draglistener_Mouse * @tc.desc: Drag listener * @tc.type: FUNC * @tc.require: */ -HWTEST_F(InteractionManagerTest, InteractionManagerTest_Draglistener, TestSize.Level1) +HWTEST_F(InteractionManagerTest, InteractionManagerTest_Draglistener_Mouse, TestSize.Level1) { CALL_TEST_DEBUG; if (g_deviceMouseId < 0) { @@ -525,6 +549,54 @@ HWTEST_F(InteractionManagerTest, InteractionManagerTest_Draglistener, TestSize.L } } +/** + * @tc.name: InteractionManagerTest_Draglistener_Touch + * @tc.desc: Drag listener + * @tc.type: FUNC + * @tc.require: + */ +HWTEST_F(InteractionManagerTest, InteractionManagerTest_Draglistener_Touch, TestSize.Level1) +{ + CALL_TEST_DEBUG; + if (g_deviceTouchId < 0) { + ASSERT_TRUE(g_deviceTouchId < 0); + } else { + class DragListenerTest : public IDragListener { + public: + DragListenerTest() : IDragListener() {} + void OnDragMessage(DragState state) override + { + FI_HILOGD("DragListenerTest state:%{public}d", state); + }; + }; + std::shared_ptr listener = std::make_shared(); + int32_t ret = InteractionManager::GetInstance()->AddDraglistener(listener); + ASSERT_EQ(ret, RET_OK); + std::promise promiseFlag; + std::future futureFlag = promiseFlag.get_future(); + auto callback = [&promiseFlag](const DragNotifyMsg& notifyMessage) { + FI_HILOGD("displayX:%{public}d, displayY:%{public}d, result:%{public}d, target:%{public}d", + notifyMessage.displayX, notifyMessage.displayY, notifyMessage.result, notifyMessage.targetPid); + promiseFlag.set_value(true); + }; + SimulateDownEvent({ DRAG_SRC_X, DRAG_SRC_Y }, MMI::PointerEvent::SOURCE_TYPE_TOUCHSCREEN, TOUCH_POINTER_ID); + std::optional dragData = CreateDragData({ MAX_PIXEL_MAP_WIDTH, MAX_PIXEL_MAP_HEIGHT }, + MMI::PointerEvent::SOURCE_TYPE_TOUCHSCREEN, TOUCH_POINTER_ID, DISPLAY_ID, { DRAG_SRC_X, DRAG_SRC_Y }); + ASSERT_TRUE(dragData); + ret = InteractionManager::GetInstance()->StartDrag(dragData.value(), callback); + ASSERT_EQ(ret, RET_OK); + ret = InteractionManager::GetInstance()->UpdateDragStyle(DragCursorStyle::DEFAULT); + ASSERT_EQ(ret, RET_OK); + SimulateMoveEvent({ DRAG_SRC_X, DRAG_SRC_Y }, { DRAG_DST_X, DRAG_DST_Y }, + MMI::PointerEvent::SOURCE_TYPE_TOUCHSCREEN, TOUCH_POINTER_ID, true); + SimulateUpEvent({ DRAG_DST_X, DRAG_DST_Y }, MMI::PointerEvent::SOURCE_TYPE_TOUCHSCREEN, TOUCH_POINTER_ID); + InteractionManager::GetInstance()->StopDrag(DragResult::DRAG_SUCCESS, HAS_CUSTOM_ANIMATION); + ASSERT_TRUE(futureFlag.get()); + ret = InteractionManager::GetInstance()->RemoveDraglistener(listener); + ASSERT_EQ(ret, RET_OK); + } +} + /** * @tc.name: InteractionManagerTest_StartDrag_Mouse * @tc.desc: Start Drag diff --git a/services/interaction/coordination/src/coordination_sm.cpp b/services/interaction/coordination/src/coordination_sm.cpp index 233b82de9..7ed917e53 100644 --- a/services/interaction/coordination/src/coordination_sm.cpp +++ b/services/interaction/coordination/src/coordination_sm.cpp @@ -764,8 +764,10 @@ void CoordinationSM::InterceptorConsumer::OnInputEvent(std::shared_ptrGetKeyCode(); if (keyCode == MMI::KeyEvent::KEYCODE_BACK || keyCode == MMI::KeyEvent::KEYCODE_VOLUME_UP || keyCode == MMI::KeyEvent::KEYCODE_VOLUME_DOWN || keyCode == MMI::KeyEvent::KEYCODE_POWER) { - keyEvent->AddFlag(MMI::AxisEvent::EVENT_FLAG_NO_INTERCEPT); - MMI::InputManager::GetInstance()->SimulateInputEvent(keyEvent); + if ((state == CoordinationState::STATE_OUT) || (!COOR_DEV_MGR->IsRemote(deviceId))) { + keyEvent->AddFlag(MMI::AxisEvent::EVENT_FLAG_NO_INTERCEPT); + MMI::InputManager::GetInstance()->SimulateInputEvent(keyEvent); + } return; } CoordinationState state = COOR_SM->GetCurrentCoordinationState(); diff --git a/services/native/test/unittest/src/devicestatus_service_test.cpp b/services/native/test/unittest/src/devicestatus_service_test.cpp index 91c92068b..19fafb8ba 100644 --- a/services/native/test/unittest/src/devicestatus_service_test.cpp +++ b/services/native/test/unittest/src/devicestatus_service_test.cpp @@ -352,3 +352,27 @@ HWTEST_F (DeviceStatusServiceTest, GetDeviceStatusDataTest018, TestSize.Level0) g_client->UnsubscribeCallback(g_type, ActivityEvent::ENTER_EXIT, devCallback_); DEV_HILOGI(SERVICE, "GetDeviceStatusDataTest018 end"); } + +/** + * @tc.name: GetDeviceStatusDataTest + * @tc.desc: test get devicestatus data in proxy + * @tc.type: FUNC + */ +HWTEST_F (DeviceStatusServiceTest, GetDeviceStatusDataTest019, TestSize.Level0) +{ + DEV_HILOGI(SERVICE, "GetDeviceStatusDataTest019 Enter"); + g_type = Type::TYPE_VERTICAL_POSITION; + Data data = g_client->GetDeviceStatusData(g_type); + GTEST_LOG_(INFO) << "type: " << data.type; + GTEST_LOG_(INFO) << "value: " << data.value; + EXPECT_TRUE(data.type == Type::TYPE_VERTICAL_POSITION && + (data.value >= OnChangedValue::VALUE_INVALID && data.value <= OnChangedValue::VALUE_EXIT)) + << "GetDeviceStatusData failed"; + Data InvalidData; + InvalidData.type = Type::TYPE_INVALID; + InvalidData.value = OnChangedValue::VALUE_INVALID; + InvalidData.status = Status::STATUS_INVALID; + InvalidData.movement = 0.0f; + EXPECT_TRUE(data != InvalidData); + DEV_HILOGI(SERVICE, "GetDeviceStatusDataTest019 end"); +} -- Gitee From 569e56ccb264010b04bd9d65a519bf77d89e832c Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Wed, 17 May 2023 06:23:24 +0000 Subject: [PATCH 2/6] added test cases Signed-off-by: mayunteng_1 Change-Id: I101f2cef87f338b8aa6d94f0685acdc861c95adc --- .../test/unittest/src/devicestatus_service_test.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/services/native/test/unittest/src/devicestatus_service_test.cpp b/services/native/test/unittest/src/devicestatus_service_test.cpp index 19fafb8ba..29b6a9a88 100644 --- a/services/native/test/unittest/src/devicestatus_service_test.cpp +++ b/services/native/test/unittest/src/devicestatus_service_test.cpp @@ -368,11 +368,11 @@ HWTEST_F (DeviceStatusServiceTest, GetDeviceStatusDataTest019, TestSize.Level0) EXPECT_TRUE(data.type == Type::TYPE_VERTICAL_POSITION && (data.value >= OnChangedValue::VALUE_INVALID && data.value <= OnChangedValue::VALUE_EXIT)) << "GetDeviceStatusData failed"; - Data InvalidData; - InvalidData.type = Type::TYPE_INVALID; - InvalidData.value = OnChangedValue::VALUE_INVALID; - InvalidData.status = Status::STATUS_INVALID; - InvalidData.movement = 0.0f; - EXPECT_TRUE(data != InvalidData); + Data invalidData; + invalidData.type = Type::TYPE_INVALID; + invalidData.value = OnChangedValue::VALUE_INVALID; + invalidData.status = Status::STATUS_INVALID; + invalidData.movement = 0.0f; + EXPECT_TRUE(data != invalidData); DEV_HILOGI(SERVICE, "GetDeviceStatusDataTest019 end"); } -- Gitee From 5c4769c2ef3c97f5bb5aafec16318b0ff35f5437 Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Wed, 17 May 2023 07:15:12 +0000 Subject: [PATCH 3/6] added test cases Signed-off-by: mayunteng_1 Change-Id: I6d07e56007b54dbd58cc51d28cc999609baeebd8 --- services/interaction/coordination/src/coordination_sm.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/interaction/coordination/src/coordination_sm.cpp b/services/interaction/coordination/src/coordination_sm.cpp index 7ed917e53..f2aba7504 100644 --- a/services/interaction/coordination/src/coordination_sm.cpp +++ b/services/interaction/coordination/src/coordination_sm.cpp @@ -721,13 +721,13 @@ void CoordinationSM::DeviceInitCallBack::OnRemoteDied() void CoordinationSM::DmDeviceStateCallback::OnDeviceOnline(const DistributedHardware::DmDeviceInfo &deviceInfo) { CALL_DEBUG_ENTER; - COOR_SM->OnDeviceOnline(deviceInfo.deviceId); + COOR_SM->OnDeviceOnline(deviceInfo.networkId); } void CoordinationSM::DmDeviceStateCallback::OnDeviceOffline(const DistributedHardware::DmDeviceInfo &deviceInfo) { CALL_INFO_TRACE; - COOR_SM->OnDeviceOffline(deviceInfo.deviceId); + COOR_SM->OnDeviceOffline(deviceInfo.networkId); } void CoordinationSM::DmDeviceStateCallback::OnDeviceChanged(const DistributedHardware::DmDeviceInfo &deviceInfo) -- Gitee From 519aa74191f546de2d56a2df2634ac032e93149f Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Thu, 18 May 2023 07:11:42 +0000 Subject: [PATCH 4/6] add test cases Signed-off-by: mayunteng_1 Change-Id: Id4426fb8f7c3ba5a2701c209a48eb957a9cf3bb0 --- services/device_manager/src/device_manager.cpp | 7 +++---- services/interaction/coordination/src/coordination_sm.cpp | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/device_manager/src/device_manager.cpp b/services/device_manager/src/device_manager.cpp index 0aa5ed80e..d0eca434e 100755 --- a/services/device_manager/src/device_manager.cpp +++ b/services/device_manager/src/device_manager.cpp @@ -281,10 +281,9 @@ int32_t DeviceManager::EpollAdd(IEpollEventSource *source) { CALL_DEBUG_ENTER; CHKPR(source, RET_ERR); - struct epoll_event ev { - .events = EPOLLIN | EPOLLHUP | EPOLLERR, - .data.ptr = source, - }; + struct epoll_event ev {}; + ev.events = EPOLLIN | EPOLLHUP | EPOLLERR; + ev.data.ptr = source; int32_t ret = epoll_ctl(epollFd_, EPOLL_CTL_ADD, source->GetFd(), &ev); if (ret != 0) { FI_HILOGE("epoll_ctl failed: %{public}s", strerror(errno)); diff --git a/services/interaction/coordination/src/coordination_sm.cpp b/services/interaction/coordination/src/coordination_sm.cpp index f2aba7504..df44374a9 100644 --- a/services/interaction/coordination/src/coordination_sm.cpp +++ b/services/interaction/coordination/src/coordination_sm.cpp @@ -565,7 +565,8 @@ void CoordinationSM::OnPointerOffline(const std::string &dhid, const std::vector } } -void CoordinationSM::OnKeyboardOffline(const std::string &dhid) { +void CoordinationSM::OnKeyboardOffline(const std::string &dhid) +{ CALL_INFO_TRACE; if (coordinationState_ == CoordinationState::STATE_OUT) { std::string remoteNetworkId = remoteNetworkId_; -- Gitee From 2b9e18f5828b9e2422dbede26b5c1017a5bc821a Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Thu, 18 May 2023 07:25:32 +0000 Subject: [PATCH 5/6] add test cases Signed-off-by: mayunteng_1 Change-Id: I399b08dc51fb822de71a3b208f3cbca55d1aefbe --- .../cooperate/include/js_event_cooperate_target.h | 12 ++++++++---- .../cooperate/src/js_cooperate_context.cpp | 12 ++++++------ .../cooperate/src/js_event_cooperate_target.cpp | 12 ++++++++---- .../coordination/src/js_coordination_context.cpp | 12 ++++++------ 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/frameworks/js/napi/interaction/cooperate/include/js_event_cooperate_target.h b/frameworks/js/napi/interaction/cooperate/include/js_event_cooperate_target.h index 11aaa267e..cd2cd4a53 100644 --- a/frameworks/js/napi/interaction/cooperate/include/js_event_cooperate_target.h +++ b/frameworks/js/napi/interaction/cooperate/include/js_event_cooperate_target.h @@ -32,15 +32,19 @@ namespace OHOS { namespace Msdp { namespace DeviceStatus { -class JsEventCooperateTarget : public ICoordinationListener, public std::enable_shared_from_this { +class JsEventCooperateTarget : public ICoordinationListener, + public std::enable_shared_from_this { public: JsEventCooperateTarget(); virtual ~JsEventCooperateTarget() = default; DISALLOW_COPY_AND_MOVE(JsEventCooperateTarget); - static void EmitJsEnable(sptr cb, const std::string& deviceId, CoordinationMessage msg); - static void EmitJsStart(sptr cb, const std::string& deviceId, CoordinationMessage msg); - static void EmitJsStop(sptr cb, const std::string& deviceId, CoordinationMessage msg); + static void EmitJsEnable(sptr cb, + const std::string& deviceId, CoordinationMessage msg); + static void EmitJsStart(sptr cb, + const std::string& deviceId, CoordinationMessage msg); + static void EmitJsStop(sptr cb, + const std::string& deviceId, CoordinationMessage msg); static void EmitJsGetState(sptr cb, bool state); void AddListener(napi_env env, const std::string &type, napi_value handle); diff --git a/frameworks/js/napi/interaction/cooperate/src/js_cooperate_context.cpp b/frameworks/js/napi/interaction/cooperate/src/js_cooperate_context.cpp index 6859f2499..ba502a7d6 100644 --- a/frameworks/js/napi/interaction/cooperate/src/js_cooperate_context.cpp +++ b/frameworks/js/napi/interaction/cooperate/src/js_cooperate_context.cpp @@ -24,8 +24,8 @@ namespace Msdp { namespace DeviceStatus { namespace { constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MSDP_DOMAIN_ID, "JsCooperateContext" }; -const char* COORDINATION_CLASS = "Coordination_class"; -const char* COORDINATION = "Coordination"; +const char* g_coordinationClass = "Coordination_class"; +const char* g_coordination = "Coordination"; constexpr int32_t ZERO_PARAM = 0; constexpr int32_t ONE_PARAM = 1; constexpr int32_t TWO_PARAM = 2; @@ -273,12 +273,12 @@ napi_value JsCooperateContext::CreateInstance(napi_env env) JsCooperateContext::JsConstructor, nullptr, sizeof(desc) / sizeof(desc[ZERO_PARAM]), nullptr, &jsClass); CHKRP(status, DEFINE_CLASS); - status = napi_set_named_property(env, global, COORDINATION_CLASS, jsClass); + status = napi_set_named_property(env, global, g_coordinationClass, jsClass); CHKRP(status, SET_NAMED_PROPERTY); napi_value jsInstance = nullptr; CHKRP(napi_new_instance(env, jsClass, ZERO_PARAM, nullptr, &jsInstance), NEW_INSTANCE); - CHKRP(napi_set_named_property(env, global, COORDINATION, jsInstance), + CHKRP(napi_set_named_property(env, global, g_coordination, jsInstance), SET_NAMED_PROPERTY); JsCooperateContext *jsContext = nullptr; @@ -327,7 +327,7 @@ JsCooperateContext *JsCooperateContext::GetInstance(napi_env env) CHKRP(napi_get_global(env, &global), GET_GLOBAL); bool result = false; - CHKRP(napi_has_named_property(env, global, COORDINATION, &result), HAS_NAMED_PROPERTY); + CHKRP(napi_has_named_property(env, global, g_coordination, &result), HAS_NAMED_PROPERTY); if (!result) { FI_HILOGE("Coordination was not found"); return nullptr; @@ -340,7 +340,7 @@ JsCooperateContext *JsCooperateContext::GetInstance(napi_env env) return nullptr; } napi_value object = nullptr; - CHKRP_SCOPE(env, napi_get_named_property(env, global, COORDINATION, &object), GET_NAMED_PROPERTY, scope); + CHKRP_SCOPE(env, napi_get_named_property(env, global, g_coordination, &object), GET_NAMED_PROPERTY, scope); if (object == nullptr) { napi_close_handle_scope(env, scope); FI_HILOGE("object is nullptr"); diff --git a/frameworks/js/napi/interaction/cooperate/src/js_event_cooperate_target.cpp b/frameworks/js/napi/interaction/cooperate/src/js_event_cooperate_target.cpp index 4cc273dca..110a97642 100644 --- a/frameworks/js/napi/interaction/cooperate/src/js_event_cooperate_target.cpp +++ b/frameworks/js/napi/interaction/cooperate/src/js_event_cooperate_target.cpp @@ -44,7 +44,8 @@ JsEventCooperateTarget::JsEventCooperateTarget() } } -void JsEventCooperateTarget::EmitJsEnable(sptr cb, const std::string& deviceId, CoordinationMessage msg) +void JsEventCooperateTarget::EmitJsEnable(sptr cb, + const std::string& deviceId, CoordinationMessage msg) { CALL_INFO_TRACE; CHKPV(cb); @@ -71,7 +72,8 @@ void JsEventCooperateTarget::EmitJsEnable(sptr cb } } -void JsEventCooperateTarget::EmitJsStart(sptr cb, const std::string& deviceId, CoordinationMessage msg) +void JsEventCooperateTarget::EmitJsStart(sptr cb, + const std::string& deviceId, CoordinationMessage msg) { CALL_INFO_TRACE; CHKPV(cb); @@ -98,7 +100,8 @@ void JsEventCooperateTarget::EmitJsStart(sptr cb, } } -void JsEventCooperateTarget::EmitJsStop(sptr cb, const std::string& deviceId, CoordinationMessage msg) +void JsEventCooperateTarget::EmitJsStop(sptr cb, + const std::string& deviceId, CoordinationMessage msg) { CALL_INFO_TRACE; CHKPV(cb); @@ -208,7 +211,8 @@ monitorLabel: } } -napi_value JsEventCooperateTarget::CreateCallbackInfo(napi_env env, napi_value handle, sptr cb) +napi_value JsEventCooperateTarget::CreateCallbackInfo(napi_env env, + napi_value handle, sptr cb) { CALL_INFO_TRACE; CHKPP(cb); diff --git a/frameworks/js/napi/interaction/coordination/src/js_coordination_context.cpp b/frameworks/js/napi/interaction/coordination/src/js_coordination_context.cpp index 0b07f48c7..38515191d 100755 --- a/frameworks/js/napi/interaction/coordination/src/js_coordination_context.cpp +++ b/frameworks/js/napi/interaction/coordination/src/js_coordination_context.cpp @@ -24,8 +24,8 @@ namespace Msdp { namespace DeviceStatus { namespace { constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { LOG_CORE, MSDP_DOMAIN_ID, "JsCoordinationContext" }; -const char* COORDINATION_CLASS = "Coordination_class"; -const char* COORDINATION = "Coordination"; +const char* g_coordinationClass = "Coordination_class"; +const char* g_coordination = "Coordination"; constexpr int32_t ZERO_PARAM = 0; constexpr int32_t ONE_PARAM = 1; constexpr int32_t TWO_PARAM = 2; @@ -300,12 +300,12 @@ napi_value JsCoordinationContext::CreateInstance(napi_env env) JsCoordinationContext::JsConstructor, nullptr, sizeof(desc) / sizeof(desc[0]), nullptr, &jsClass); CHKRP(status, DEFINE_CLASS); - status = napi_set_named_property(env, global, COORDINATION_CLASS, jsClass); + status = napi_set_named_property(env, global, g_coordinationClass, jsClass); CHKRP(status, SET_NAMED_PROPERTY); napi_value jsInstance = nullptr; CHKRP(napi_new_instance(env, jsClass, 0, nullptr, &jsInstance), NEW_INSTANCE); - CHKRP(napi_set_named_property(env, global, COORDINATION, jsInstance), + CHKRP(napi_set_named_property(env, global, g_coordination, jsInstance), SET_NAMED_PROPERTY); JsCoordinationContext *jsContext = nullptr; @@ -354,7 +354,7 @@ JsCoordinationContext *JsCoordinationContext::GetInstance(napi_env env) CHKRP(napi_get_global(env, &global), GET_GLOBAL); bool result = false; - CHKRP(napi_has_named_property(env, global, COORDINATION, &result), HAS_NAMED_PROPERTY); + CHKRP(napi_has_named_property(env, global, g_coordination, &result), HAS_NAMED_PROPERTY); if (!result) { FI_HILOGE("Coordination was not found"); return nullptr; @@ -367,7 +367,7 @@ JsCoordinationContext *JsCoordinationContext::GetInstance(napi_env env) return nullptr; } napi_value object = nullptr; - CHKRP_SCOPE(env, napi_get_named_property(env, global, COORDINATION, &object), GET_NAMED_PROPERTY, scope); + CHKRP_SCOPE(env, napi_get_named_property(env, global, g_coordination, &object), GET_NAMED_PROPERTY, scope); if (object == nullptr) { napi_close_handle_scope(env, scope); FI_HILOGE("object is nullptr"); -- Gitee From 730f286c128b8fde7636f3117af907dad6159399 Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Fri, 19 May 2023 03:12:22 +0000 Subject: [PATCH 6/6] add test cases Signed-off-by: mayunteng_1 Change-Id: Ie5a3d9ac08216f78abe7aec76a74e33b12c63204 --- .../unittest/src/interaction_manager_test.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/frameworks/native/interaction/test/unittest/src/interaction_manager_test.cpp b/frameworks/native/interaction/test/unittest/src/interaction_manager_test.cpp index a914c0615..9f714b5ae 100644 --- a/frameworks/native/interaction/test/unittest/src/interaction_manager_test.cpp +++ b/frameworks/native/interaction/test/unittest/src/interaction_manager_test.cpp @@ -762,13 +762,15 @@ HWTEST_F(InteractionManagerTest, GetDragTargetPid_Mouse, TestSize.Level1) [&promiseEventFlag]{promiseEventFlag.set_value(true);}); int32_t monitorId = TestAddMonitor(callbackPtr); SimulateUpEvent({ DRAG_DST_X, DRAG_DST_Y }, MMI::PointerEvent::SOURCE_TYPE_MOUSE, MOUSE_POINTER_ID); - ASSERT_TRUE(futureEventFlag.wait_for(std::chrono::milliseconds(PROMISE_WAIT_SPAN)) != std::future_status::timeout); + ASSERT_TRUE(futureEventFlag.wait_for(std::chrono::milliseconds(PROMISE_WAIT_SPAN)) != + std::future_status::timeout); TestRemoveMonitor(monitorId); int32_t pid = InteractionManager::GetInstance()->GetDragTargetPid(); FI_HILOGI("Target pid:%{public}d", pid); ASSERT_TRUE(pid > 0); InteractionManager::GetInstance()->StopDrag(DragResult::DRAG_SUCCESS, HAS_CUSTOM_ANIMATION); - ASSERT_TRUE(futureStopFlag.wait_for(std::chrono::milliseconds(PROMISE_WAIT_SPAN)) != std::future_status::timeout); + ASSERT_TRUE(futureStopFlag.wait_for(std::chrono::milliseconds(PROMISE_WAIT_SPAN)) != + std::future_status::timeout); } } @@ -806,13 +808,15 @@ HWTEST_F(InteractionManagerTest, GetDragTargetPid_Touch, TestSize.Level1) [&promiseEventFlag]{promiseEventFlag.set_value(true);}); int32_t monitorId = TestAddMonitor(callbackPtr); SimulateUpEvent({ DRAG_DST_X, DRAG_DST_Y }, MMI::PointerEvent::SOURCE_TYPE_TOUCHSCREEN, TOUCH_POINTER_ID); - ASSERT_TRUE(futureEventFlag.wait_for(std::chrono::milliseconds(PROMISE_WAIT_SPAN)) != std::future_status::timeout); + ASSERT_TRUE(futureEventFlag.wait_for(std::chrono::milliseconds(PROMISE_WAIT_SPAN)) != + std::future_status::timeout); TestRemoveMonitor(monitorId); int32_t pid = InteractionManager::GetInstance()->GetDragTargetPid(); FI_HILOGI("Target pid:%{public}d", pid); ASSERT_TRUE(pid > 0); InteractionManager::GetInstance()->StopDrag(DragResult::DRAG_SUCCESS, HAS_CUSTOM_ANIMATION); - ASSERT_TRUE(futureStopFlag.wait_for(std::chrono::milliseconds(PROMISE_WAIT_SPAN)) != std::future_status::timeout); + ASSERT_TRUE(futureStopFlag.wait_for(std::chrono::milliseconds(PROMISE_WAIT_SPAN)) != + std::future_status::timeout); } } @@ -846,7 +850,8 @@ HWTEST_F(InteractionManagerTest, TouchEventDispatch, TestSize.Level1) int32_t monitorId = TestAddMonitor(callbackPtr); SimulateMoveEvent({ DRAG_SRC_X, DRAG_SRC_Y }, { DRAG_SRC_X, DRAG_SRC_Y }, MMI::PointerEvent::SOURCE_TYPE_TOUCHSCREEN, TOUCH_POINTER_ID, true); - ASSERT_TRUE(futureEventFlag.wait_for(std::chrono::milliseconds(PROMISE_WAIT_SPAN)) != std::future_status::timeout); + ASSERT_TRUE(futureEventFlag.wait_for(std::chrono::milliseconds(PROMISE_WAIT_SPAN)) != + std::future_status::timeout); TestRemoveMonitor(monitorId); ret = InteractionManager::GetInstance()->StopDrag(DragResult::DRAG_SUCCESS, HAS_CUSTOM_ANIMATION); ASSERT_EQ(ret, RET_OK); @@ -882,7 +887,8 @@ HWTEST_F(InteractionManagerTest, MouseEventDispatch, TestSize.Level1) int32_t monitorId = TestAddMonitor(callbackPtr); SimulateMoveEvent({ DRAG_SRC_X, DRAG_SRC_Y }, { DRAG_SRC_X, DRAG_SRC_Y }, MMI::PointerEvent::SOURCE_TYPE_MOUSE, TOUCH_POINTER_ID, true); - ASSERT_TRUE(futureEventFlag.wait_for(std::chrono::milliseconds(PROMISE_WAIT_SPAN)) != std::future_status::timeout); + ASSERT_TRUE(futureEventFlag.wait_for(std::chrono::milliseconds(PROMISE_WAIT_SPAN)) != + std::future_status::timeout); TestRemoveMonitor(monitorId); ret = InteractionManager::GetInstance()->StopDrag(DragResult::DRAG_SUCCESS, HAS_CUSTOM_ANIMATION); ASSERT_EQ(ret, RET_OK); -- Gitee