From 4acdc12e004c3bbba88d52bc607026a10ab4c784 Mon Sep 17 00:00:00 2001 From: limeng Date: Fri, 30 Jun 2023 16:29:36 +0800 Subject: [PATCH] =?UTF-8?q?ListItem=E9=95=BF=E8=B7=9D=E7=A6=BB=E5=B7=A6?= =?UTF-8?q?=E6=BB=91=E5=88=A0=E9=99=A4xts=E7=94=A8=E4=BE=8B=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: limeng --- .../src/main/ets/test/SR000HTP23.test.ets | 180 ++++++++---------- .../src/main/ets/test/SR000HTP2O.test.ets | 1 - 2 files changed, 76 insertions(+), 105 deletions(-) diff --git a/arkui/ace_ets_component_api/src/main/ets/test/SR000HTP23.test.ets b/arkui/ace_ets_component_api/src/main/ets/test/SR000HTP23.test.ets index 512395cf5..f6af6ea79 100644 --- a/arkui/ace_ets_component_api/src/main/ets/test/SR000HTP23.test.ets +++ b/arkui/ace_ets_component_api/src/main/ets/test/SR000HTP23.test.ets @@ -67,32 +67,25 @@ export default function SR000HTP23Test() { console.info(`${SUITE} ${CASE} START`); let baseKey = 'MyList1_ListItem0' - setTimeout(async () => { - try { - let strJson = getInspectorByKey(baseKey); - let obj = JSON.parse(strJson); - expect(obj.$attrs.startDeleteAreaDistance).assertEqual("0.00vp"); - expect(obj.$attrs.endDeleteAreaDistance).assertEqual("0.00vp"); -// expect(obj.$attrs.swipeAction.edgeEffect).assertEqual("SwipeEdgeEffect.None"); - - let rectCenter = getRectCenterVp(obj.$rect) - let driver = Driver.create() - await driver.swipe(rectCenter[0], rectCenter[1], 0, rectCenter[1]) - - let strJsonButtonDel = getInspectorByKey(baseKey + '_Button_Del'); - let objButtonDel = JSON.parse(strJsonButtonDel); - expect(objButtonDel.$attrs.visibility).assertEqual("Visibility.Visible"); - let strJsonButtonSet = getInspectorByKey(baseKey + '_Button_Set'); - let objButtonSet = JSON.parse(strJsonButtonSet); - expect(objButtonSet.$attrs.visibility).assertEqual("Visibility.Visible"); - - console.info(`${SUITE} ${CASE} END`); - } catch (err) { - expect().assertFail(); - console.info(`${SUITE} ${CASE} ERROR:` + JSON.stringify(err)); - } - done(); - }, 500) + let strJson = getInspectorByKey(baseKey); + let obj = JSON.parse(strJson); + expect(obj.$attrs.startDeleteAreaDistance).assertEqual("0.00vp"); + expect(obj.$attrs.endDeleteAreaDistance).assertEqual("0.00vp"); +// expect(obj.$attrs.swipeAction.edgeEffect).assertEqual("SwipeEdgeEffect.None"); + + let rectCenter = getRectCenterVp(obj.$rect) + let driver = Driver.create() + await driver.swipe(rectCenter[0], rectCenter[1], 0, rectCenter[1]) + + let strJsonButtonDel = getInspectorByKey(baseKey + '_Button_Del'); + let objButtonDel = JSON.parse(strJsonButtonDel); + expect(objButtonDel.$attrs.visibility).assertEqual("Visibility.Visible"); + let strJsonButtonSet = getInspectorByKey(baseKey + '_Button_Set'); + let objButtonSet = JSON.parse(strJsonButtonSet); + expect(objButtonSet.$attrs.visibility).assertEqual("Visibility.Visible"); + + console.info(`${SUITE} ${CASE} END`); + done(); }); /* @@ -105,32 +98,25 @@ export default function SR000HTP23Test() { console.info(`${SUITE} ${CASE} START`); let baseKey = 'MyList2_ListItem0' - setTimeout(async () => { - try { - let strJson = getInspectorByKey(baseKey); - let obj = JSON.parse(strJson); - expect(obj.$attrs.startDeleteAreaDistance).assertEqual("0.00vp"); - expect(obj.$attrs.endDeleteAreaDistance).assertEqual("0.00vp"); -// expect(obj.$attrs.swipeAction.edgeEffect).assertEqual("SwipeEdgeEffect.None"); - - let rectCenter = getRectCenterVp(obj.$rect) - let driver = Driver.create() - await driver.swipe(rectCenter[0], rectCenter[1], 600, rectCenter[1]) - - let strJsonButtonDel = getInspectorByKey(baseKey + '_Button_Del'); - let objButtonDel = JSON.parse(strJsonButtonDel); - expect(objButtonDel.$attrs.visibility).assertEqual("Visibility.Visible"); - let strJsonButtonSet = getInspectorByKey(baseKey + '_Button_Set'); - let objButtonSet = JSON.parse(strJsonButtonSet); - expect(objButtonSet.$attrs.visibility).assertEqual("Visibility.Visible"); - - console.info(`${SUITE} ${CASE} END`); - } catch (err) { - expect().assertFail(); - console.info(`${SUITE} ${CASE} ERROR:` + JSON.stringify(err)); - } - done(); - }, 500) + let strJson = getInspectorByKey(baseKey); + let obj = JSON.parse(strJson); + expect(obj.$attrs.startDeleteAreaDistance).assertEqual("0.00vp"); + expect(obj.$attrs.endDeleteAreaDistance).assertEqual("0.00vp"); +// expect(obj.$attrs.swipeAction.edgeEffect).assertEqual("SwipeEdgeEffect.None"); + + let rectCenter = getRectCenterVp(obj.$rect) + let driver = Driver.create() + await driver.swipe(rectCenter[0], rectCenter[1], 600, rectCenter[1]) + + let strJsonButtonDel = getInspectorByKey(baseKey + '_Button_Del'); + let objButtonDel = JSON.parse(strJsonButtonDel); + expect(objButtonDel.$attrs.visibility).assertEqual("Visibility.Visible"); + let strJsonButtonSet = getInspectorByKey(baseKey + '_Button_Set'); + let objButtonSet = JSON.parse(strJsonButtonSet); + expect(objButtonSet.$attrs.visibility).assertEqual("Visibility.Visible"); + + console.info(`${SUITE} ${CASE} END`); + done(); }); /* @@ -143,32 +129,25 @@ export default function SR000HTP23Test() { console.info(`${SUITE} ${CASE} START`); let baseKey = 'MyList3_ListItem0' - setTimeout(async () => { - try { - let strJson = getInspectorByKey(baseKey); - let obj = JSON.parse(strJson); - expect(obj.$attrs.startDeleteAreaDistance).assertEqual("0.00vp"); - expect(obj.$attrs.endDeleteAreaDistance).assertEqual("0.00vp"); - expect(obj.$attrs.swipeAction.edgeEffect).assertEqual("SwipeEdgeEffect.Spring"); - - let rectCenter = getRectCenterVp(obj.$rect) - let driver = Driver.create() - await driver.swipe(rectCenter[0], rectCenter[1], 0, rectCenter[1]) - - let strJsonButtonDel = getInspectorByKey(baseKey + '_Button_Del'); - let objButtonDel = JSON.parse(strJsonButtonDel); - expect(objButtonDel.$attrs.visibility).assertEqual("Visibility.Visible"); - let strJsonButtonSet = getInspectorByKey(baseKey + '_Button_Set'); - let objButtonSet = JSON.parse(strJsonButtonSet); - expect(objButtonSet.$attrs.visibility).assertEqual("Visibility.Visible"); - - console.info(`${SUITE} ${CASE} END`); - } catch (err) { - expect().assertFail(); - console.info(`${SUITE} ${CASE} ERROR:` + JSON.stringify(err)); - } - done(); - }, 500) + let strJson = getInspectorByKey(baseKey); + let obj = JSON.parse(strJson); + expect(obj.$attrs.startDeleteAreaDistance).assertEqual("0.00vp"); + expect(obj.$attrs.endDeleteAreaDistance).assertEqual("0.00vp"); + expect(obj.$attrs.swipeAction.edgeEffect).assertEqual("SwipeEdgeEffect.Spring"); + + let rectCenter = getRectCenterVp(obj.$rect) + let driver = Driver.create() + await driver.swipe(rectCenter[0], rectCenter[1], 0, rectCenter[1]) + + let strJsonButtonDel = getInspectorByKey(baseKey + '_Button_Del'); + let objButtonDel = JSON.parse(strJsonButtonDel); + expect(objButtonDel.$attrs.visibility).assertEqual("Visibility.Visible"); + let strJsonButtonSet = getInspectorByKey(baseKey + '_Button_Set'); + let objButtonSet = JSON.parse(strJsonButtonSet); + expect(objButtonSet.$attrs.visibility).assertEqual("Visibility.Visible"); + + console.info(`${SUITE} ${CASE} END`); + done(); }); /* @@ -181,32 +160,25 @@ export default function SR000HTP23Test() { console.info(`${SUITE} ${CASE} START`); let baseKey = 'MyList4_ListItem0' - setTimeout(async () => { - try { - let strJson = getInspectorByKey(baseKey); - let obj = JSON.parse(strJson); - expect(obj.$attrs.startDeleteAreaDistance).assertEqual("0.00vp"); - expect(obj.$attrs.endDeleteAreaDistance).assertEqual("0.00vp"); - expect(obj.$attrs.swipeAction.edgeEffect).assertEqual("SwipeEdgeEffect.Spring"); - - let rectCenter = getRectCenterVp(obj.$rect) - let driver = Driver.create() - await driver.swipe(0, rectCenter[1], rectCenter[0], rectCenter[1]) - - let strJsonButtonDel = getInspectorByKey(baseKey + '_Button_Del'); - let objButtonDel = JSON.parse(strJsonButtonDel); - expect(objButtonDel.$attrs.visibility).assertEqual("Visibility.Visible"); - let strJsonButtonSet = getInspectorByKey(baseKey + '_Button_Set'); - let objButtonSet = JSON.parse(strJsonButtonSet); - expect(objButtonSet.$attrs.visibility).assertEqual("Visibility.Visible"); - - console.info(`${SUITE} ${CASE} END`); - } catch (err) { - expect().assertFail(); - console.info(`${SUITE} ${CASE} ERROR:` + JSON.stringify(err)); - } - done(); - }, 500) + let strJson = getInspectorByKey(baseKey); + let obj = JSON.parse(strJson); + expect(obj.$attrs.startDeleteAreaDistance).assertEqual("0.00vp"); + expect(obj.$attrs.endDeleteAreaDistance).assertEqual("0.00vp"); + expect(obj.$attrs.swipeAction.edgeEffect).assertEqual("SwipeEdgeEffect.Spring"); + + let rectCenter = getRectCenterVp(obj.$rect) + let driver = Driver.create() + await driver.swipe(0, rectCenter[1], rectCenter[0], rectCenter[1]) + + let strJsonButtonDel = getInspectorByKey(baseKey + '_Button_Del'); + let objButtonDel = JSON.parse(strJsonButtonDel); + expect(objButtonDel.$attrs.visibility).assertEqual("Visibility.Visible"); + let strJsonButtonSet = getInspectorByKey(baseKey + '_Button_Set'); + let objButtonSet = JSON.parse(strJsonButtonSet); + expect(objButtonSet.$attrs.visibility).assertEqual("Visibility.Visible"); + + console.info(`${SUITE} ${CASE} END`); + done(); }); /* diff --git a/arkui/ace_ets_component_api/src/main/ets/test/SR000HTP2O.test.ets b/arkui/ace_ets_component_api/src/main/ets/test/SR000HTP2O.test.ets index 5a21df97a..b8f642efa 100644 --- a/arkui/ace_ets_component_api/src/main/ets/test/SR000HTP2O.test.ets +++ b/arkui/ace_ets_component_api/src/main/ets/test/SR000HTP2O.test.ets @@ -62,7 +62,6 @@ export default function SR000HTP2OTest() { console.info(`${SUITE} ${CASE} START`) let strJson = getInspectorByKey('SR000HTP2O_Navigation1') let obj = JSON.parse(strJson); - sleep(2) expect(obj.$type).assertEqual('Navigation') console.info(`${SUITE} ${CASE} END`) done() -- GitLab