diff --git a/arkui/ace_ets_component/entry/src/main/ets/test/SwiperJsunit.test.ets b/arkui/ace_ets_component/entry/src/main/ets/test/SwiperJsunit.test.ets index 233322a7440690e1d5b60ed60d3252adb02aff41..cb75c7963dfac56b701fe362e2255c9549182758 100644 --- a/arkui/ace_ets_component/entry/src/main/ets/test/SwiperJsunit.test.ets +++ b/arkui/ace_ets_component/entry/src/main/ets/test/SwiperJsunit.test.ets @@ -417,7 +417,7 @@ export default function swiperJsunit() { let strJsonNew = getInspectorByKey('swiper'); let objNew = JSON.parse(strJsonNew); console.info("swiperTest_1700 component objNew is: " + JSON.stringify(objNew)); - expect(objNew.$attrs.loop).assertEqual('false'); + expect(objNew.$attrs.loop).assertEqual('true'); console.info('swiperTest_1700 END'); done(); }); diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemSize.test.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemSize.test.ets index 2dd487dc2691424c5357561bc9784486ee3dbaf5..1c000e121c5497d60e5df51f3fcff1189c119dbb 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemSize.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemSize.test.ets @@ -66,7 +66,7 @@ export default function swiperItemSize() { let driver = await Driver.create(); //await driver.swipe(250, 230, 200, 230); await CommonFunc.sleep(500); - await driver.swipe(vp2px(150), vp2px(100), vp2px(100), vp2px(100)); + await driver.swipe(vp2px(180), vp2px(100), vp2px(20), vp2px(100)); await CommonFunc.sleep(1000); // After flipping the page. itemSizekey = CommonFunc.getComponentRect('itemSizekey'); diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemVisibility.test.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemVisibility.test.ets index 26a5a9bdd4e8ddde944fe27651e26fad81e03830..c9f8a0fb67e99ddcf59f7cb7e5dbdcb6ced0ccea 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemVisibility.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ItemChange/swiperItemVisibility.test.ets @@ -67,7 +67,7 @@ export default function swiperItemVisibility() { expect(visiblekey.bottom).assertEqual(visiblekey01.bottom); let driver = await Driver.create(); await CommonFunc.sleep(500); - await driver.swipe(vp2px(150), vp2px(100), vp2px(100), vp2px(100)); + await driver.swipe(vp2px(180), vp2px(100), vp2px(20), vp2px(100)); //await driver.swipe(250, 230, 200, 230); await CommonFunc.sleep(1000); // 翻页后子组件2大小及位置与父组件一致,翻页成功 @@ -118,7 +118,7 @@ export default function swiperItemVisibility() { expect(visiblekey.bottom).assertEqual(visiblekey05.bottom); let driver = await Driver.create(); await CommonFunc.sleep(500); - await driver.swipe(vp2px(150), vp2px(100), vp2px(100), vp2px(100)); + await driver.swipe(vp2px(180), vp2px(100), vp2px(20), vp2px(100)); //await driver.swipe(250, 230, 200, 230); await CommonFunc.sleep(1000); // 翻页后子组件6大小及位置与父组件一致,翻页成功 @@ -169,7 +169,7 @@ export default function swiperItemVisibility() { visiblekey03 = CommonFunc.getComponentRect('visiblekey03'); let driver = await Driver.create(); await CommonFunc.sleep(500); - await driver.swipe(vp2px(150), vp2px(100), vp2px(100), vp2px(100)); + await driver.swipe(vp2px(180), vp2px(100), vp2px(20), vp2px(100)); //await driver.swipe(250, 230, 200, 230); await CommonFunc.sleep(1000); // 翻页后子组件4大小及位置与父组件一致,翻页成功 diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperDisableSwipeFalse.test.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperDisableSwipeFalse.test.ets index a4acbfb9042f846096fc1155b2d10425a859aeb8..acaa790742a84c0322af00943a1bf9b3f0035a67 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperDisableSwipeFalse.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperDisableSwipeFalse.test.ets @@ -68,7 +68,7 @@ export default function swiperDisableSwipeFalse() { expect(disableFalse.bottom).assertEqual(disableFalse01.bottom); let driver = await Driver.create(); await CommonFunc.sleep(500); - await driver.swipe(vp2px(150), vp2px(100), vp2px(100), vp2px(100)); + await driver.swipe(vp2px(180), vp2px(100), vp2px(20), vp2px(100)); //await driver.swipe(250, 230, 200, 230); await CommonFunc.sleep(1000); // After flipping the page. diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperItemSpace.test.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperItemSpace.test.ets index 59b1809996f5f7bd5ffc5d2b00440df618423a67..9f519ca0cd27974652b5c1038a74d056be26ebe8 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperItemSpace.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperItemSpace.test.ets @@ -74,7 +74,7 @@ export default function swiperItemSpace() { let driver = await Driver.create(); await CommonFunc.sleep(500); - await driver.swipe(vp2px(150), vp2px(100), vp2px(100), vp2px(100)); + await driver.swipe(vp2px(180), vp2px(100), vp2px(20), vp2px(100)); //await driver.swipe(250, 230, 200, 230); await CommonFunc.sleep(1000); itemspacekey = CommonFunc.getComponentRect('itemspacekey'); @@ -139,7 +139,7 @@ export default function swiperItemSpace() { // After flipping the page. let driver = await Driver.create(); await CommonFunc.sleep(500); - await driver.swipe(vp2px(150), vp2px(100), vp2px(100), vp2px(100)); + await driver.swipe(vp2px(180), vp2px(100), vp2px(20), vp2px(100)); // await driver.swipe(250, 230, 200, 230); await CommonFunc.sleep(1000); itemspacekey = CommonFunc.getComponentRect('itemspacekey'); diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperMarPad.test.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperMarPad.test.ets index 0703b02bc98b9e2f4115d0b70ad05965fd949e06..76b9dcc8e544671ca67665b4ab88b7ccc42b6da3 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperMarPad.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperMarPad.test.ets @@ -69,7 +69,7 @@ export default function swiperMarPad() { let driver = await Driver.create(); await CommonFunc.sleep(500) //await driver.swipe(250, 230, 200, 230); - await driver.swipe(vp2px(150), vp2px(100), vp2px(100), vp2px(100)); + await driver.swipe(vp2px(180), vp2px(100), vp2px(20), vp2px(100)); await CommonFunc.sleep(1000); swiperMarPad = CommonFunc.getComponentRect('swiperMarPad'); swiperMarPad01 = CommonFunc.getComponentRect('swiperMarPad01'); diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperMargin.test.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperMargin.test.ets index ec73358ee0396d76b04e47fae885d5f7ae68a362..8cf553b031e87477d4cd9f89e195ae750cfc248a 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperMargin.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperMargin.test.ets @@ -70,7 +70,7 @@ export default function swiperMargin() { let driver = await Driver.create(); await CommonFunc.sleep(500); //await driver.swipe(250, 230, 200, 230); - await driver.swipe(vp2px(150), vp2px(100), vp2px(100), vp2px(100)); + await driver.swipe(vp2px(180), vp2px(100), vp2px(20), vp2px(100)); await CommonFunc.sleep(1000); swiperMargin = CommonFunc.getComponentRect('swiperMargin'); swiperMargin01 = CommonFunc.getComponentRect('swiperMargin01'); diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperPadding.test.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperPadding.test.ets index 77d83bd7b02966af4c2bf92a67605c00d773baa3..c3698b299d816b32bdb923cd1cfdfbeb28e16fef 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperPadding.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Swiper/Swiper_ParmsChange/swiperPadding.test.ets @@ -68,7 +68,7 @@ export default function swiperPadding() { // Page turning. let driver = await Driver.create(); await CommonFunc.sleep(500); - await driver.swipe(vp2px(150), vp2px(100), vp2px(100), vp2px(100)); + await driver.swipe(vp2px(180), vp2px(100), vp2px(20), vp2px(100)); //await driver.swipe(250, 230, 200, 230); await CommonFunc.sleep(1000); swiperPadding = CommonFunc.getComponentRect('swiperPadding');