From cf3934897307350cd111a4ea26c29124d59d599d Mon Sep 17 00:00:00 2001
From: zhenyuWang <13641039885@163.com>
Date: Fri, 15 Nov 2024 21:51:02 +0800
Subject: [PATCH] =?UTF-8?q?test(global=20events):=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../global-events/global-events.test.js       | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pages/component/global-events/global-events.test.js b/pages/component/global-events/global-events.test.js
index c6f85551..1594db5e 100644
--- a/pages/component/global-events/global-events.test.js
+++ b/pages/component/global-events/global-events.test.js
@@ -40,8 +40,8 @@ describe('event trigger', () => {
           screenY: 101
         }, ],
       })
-      const touchStartTouchTargetIdentifier = isAndroid ? '1.0' : '1'
-      const touchStartTouchTargetValue = isAndroid ? '101.0' : '101'
+      const touchStartTouchTargetIdentifier = '1'
+      const touchStartTouchTargetValue = '101'
       const touchStartTouchIdentifier = await page.$('#touch-start-touch-identifier')
       expect(await touchStartTouchIdentifier.text()).toBe(touchStartTouchTargetIdentifier)
       const touchStartTouchPageX = await page.$('#touch-start-touch-page-x')
@@ -93,8 +93,8 @@ describe('event trigger', () => {
         }, ],
       })
 
-      const touchMoveTouchTargetIdentifier = isAndroid ? '1.0' : '1'
-      const touchMoveTouchTargetValue = isAndroid ? '102.0' : '102'
+      const touchMoveTouchTargetIdentifier = '1'
+      const touchMoveTouchTargetValue = '102'
       const touchMoveTouchIdentifier = await page.$('#touch-move-touch-identifier')
       expect(await touchMoveTouchIdentifier.text()).toBe(touchMoveTouchTargetIdentifier)
       const touchMoveTouchPageX = await page.$('#touch-move-touch-page-x')
@@ -144,8 +144,8 @@ describe('event trigger', () => {
           screenY: 103
         }, ],
       })
-      const touchEndTouchTargetIdentifier = isAndroid ? '1.0' : '1'
-      const touchEndTouchTargetValue = isAndroid ? '103.0' : '103'
+      const touchEndTouchTargetIdentifier = '1'
+      const touchEndTouchTargetValue = '103'
       const touchEndTouchIdentifier = await page.$('#touch-end-touch-identifier')
       expect(await touchEndTouchIdentifier.text()).toBe(touchEndTouchTargetIdentifier)
       const touchEndTouchPageX = await page.$('#touch-end-touch-page-x')
@@ -180,8 +180,8 @@ describe('event trigger', () => {
   it('click', async () => {
     const el = await page.$('#longpress-target')
     await el.tap()
-    const targetX = isAndroid ? '0.0' : '0'
-    const targetY = isAndroid ? '0.0' : '0'
+    const targetX = '0'
+    const targetY = '0'
     const tapEventX = await page.$('#tap-event-x')
     expect(await tapEventX.text()).toBe(targetX)
     const tapEventY = await page.$('#tap-event-y')
@@ -196,8 +196,8 @@ describe('event trigger', () => {
     if (!process.env.UNI_AUTOMATOR_APP_WEBVIEW) {
       const el = await page.$('#longpress-target')
       await el.longpress()
-      const longPressTouchTargetIdentifier = isAndroid ? '1.0' : '1'
-      const longPressTouchTargetValue = isAndroid ? '0.0' : '0'
+      const longPressTouchTargetIdentifier = '1'
+      const longPressTouchTargetValue = '0'
       const longPressTouchIdentifier = await page.$('#long-press-touch-identifier')
       expect(await longPressTouchIdentifier.text()).toBe(longPressTouchTargetIdentifier)
       const longPressTouchPageX = await page.$('#long-press-touch-page-x')
@@ -300,7 +300,9 @@ describe('event trigger', () => {
       ] = await page.callMethod('jest_getRect')
 
       expect(x > 0).toBe(true)
-      expect(y > 0).toBe(true)

      await program.tap({
+      expect(y > 0).toBe(true)
+
+      await program.tap({
         x: x,
         y: y
       })
@@ -317,4 +319,4 @@ describe('event trigger', () => {
       expect(1).toBe(1)
     }
   })
-})
\ No newline at end of file
+})
-- 
GitLab