diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/test/AreaChangeJsunit.test.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/test/AreaChangeJsunit.test.ets index 86818894bfaecf8b34e653778f674739325619a6..13de7a508eaa4eb55e13db082098bd113db7841a 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/test/AreaChangeJsunit.test.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/test/AreaChangeJsunit.test.ets @@ -45,32 +45,6 @@ export default function areaChangeJsunit() { console.info("areaChange after each called"); }); - it('areaChangeTest_0100', 0, async function (done) { - console.info('areaChangeTest_0100 START'); - let strJson = getInspectorByKey('text1'); - console.info("areaChangeTest_0100 component strJson:" + strJson); - let obj = JSON.parse(strJson); - console.info("areaChangeTest_0100 component obj is: " + JSON.stringify(obj)); - expect(obj.$type).assertEqual('Text'); - expect(obj.$attrs.width).assertEqual('42.000000'); - expect(obj.$attrs.height).assertEqual('23.000000'); - console.info('areaChangeTest_0100 END'); - done(); - }); - - it('areaChangeTest_0200', 0, async function (done) { - console.info('areaChangeTest_0200 START'); - let strJson = getInspectorByKey('text2'); - console.info("areaChangeTest_0200 component strJson:" + strJson); - let obj = JSON.parse(strJson); - console.info("areaChangeTest_0200 component obj is: " + JSON.stringify(obj)); - expect(obj.$type).assertEqual('Text'); - expect(obj.$attrs.width).assertEqual('519.000000'); - expect(obj.$attrs.height).assertEqual('210.000000'); - console.info('areaChangeTest_0200 END'); - done(); - }); - it('areaChangeTest_0300', 0, async function (done) { console.info('areaChangeTest_0300 START'); await Utils.sleep(1000); diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/test/List.test.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/test/List.test.ets index 81edb16dd2e9a81b2f6434d1679e0db843b27ea2..7e3419c983847ee80b24bb00da9d469a770a7b23 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/test/List.test.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/test/List.test.ets @@ -17,7 +17,6 @@ import appearJsunit from './AppearJsunit.test.ets'; import areaChangeJsunit from './AreaChangeJsunit.test.ets'; import ellipseJsunit from './EllipseJsunit.test.ets'; import enableJsunit from './EnableJsunit.test.ets'; -import flexJsunit from './FlexJsunit.test.ets'; import gaugeJsunit from './GaugeJsunit.test.ets'; import globalJsunit from './GlobalJsunit.test.ets'; import girdContainerJsunit from './GridContainerJsunit.test.ets'; @@ -34,16 +33,13 @@ import touchAbleJsunit from './TouchAbleJsunit.test.ets'; import touchJsunit from './TouchJsunit.test.ets'; import visibilityJsunit from './VisibilityJsunit.test.ets'; import zIndexJsunit from './ZIndexJsunit.test.ets'; -import columnJsunit from './ColumnJsunit.test.ets'; export default function testsuite() { touchAbleJsunit(); - columnJsunit(); enableJsunit(); appearJsunit(); zIndexJsunit(); ellipseJsunit(); - flexJsunit(); gaugeJsunit(); globalJsunit(); visibilityJsunit(); diff --git a/ace/ace_ets_component_five/entry/src/main/ets/MainAbility/test/List.test.ets b/ace/ace_ets_component_five/entry/src/main/ets/MainAbility/test/List.test.ets index 0cb18e02737f14f1c91e9b511ea8df1336396ec3..7f1cc1285ddded7d7f86ffc21fab59ad001928e8 100755 --- a/ace/ace_ets_component_five/entry/src/main/ets/MainAbility/test/List.test.ets +++ b/ace/ace_ets_component_five/entry/src/main/ets/MainAbility/test/List.test.ets @@ -27,8 +27,6 @@ import shapeClippingJsunit from './ShapeClippingJsunit.test.ets'; import backgroundAndSizeSettingJsunit from './BackgroundAndSizeSettingJsunit.test.ets'; import borderJsunit from './BorderJsunit.test.ets'; import colorGradientJsunit from './ColorGradientJsunit.test.ets'; -import enmusFlexAlignJsunit from './EnmusFlexAlignJsunit.test.ets'; -import enmusVerticalAlignJsunit from './EnmusVerticalAlignJsunit.test.ets'; import enmusHorizontalAlignJsunit from './EnmusHorizontalAlignJsunit.test.ets'; export default function testsuite() { @@ -48,6 +46,4 @@ export default function testsuite() { backgroundAndSizeSettingJsunit(); shapeClippingJsunit(); enmusHorizontalAlignJsunit(); - enmusFlexAlignJsunit(); - enmusVerticalAlignJsunit(); } \ No newline at end of file diff --git a/ace/ace_ets_component_five/entry/src/main/ets/MainAbility/test/OhosMatrix4Jsunit.test.ets b/ace/ace_ets_component_five/entry/src/main/ets/MainAbility/test/OhosMatrix4Jsunit.test.ets index 10d4d5ce645d35aeec65b953742e9a3c1bc534b7..825639c7ed080098272a868047d4e1033615f807 100755 --- a/ace/ace_ets_component_five/entry/src/main/ets/MainAbility/test/OhosMatrix4Jsunit.test.ets +++ b/ace/ace_ets_component_five/entry/src/main/ets/MainAbility/test/OhosMatrix4Jsunit.test.ets @@ -42,7 +42,7 @@ export default function ohosMatrix4Jsunit() { }); afterEach(async function () { - await Utils.sleep(1000); + await Utils.sleep(3000); console.info("OhosMatrix4 each called"); }); diff --git a/ace/ace_ets_component_five/entry/src/main/ets/MainAbility/test/SliderJsunit.test.ets b/ace/ace_ets_component_five/entry/src/main/ets/MainAbility/test/SliderJsunit.test.ets index 321d2b3a8741fc99743d092e50384374cfbcb691..14d6ce7b10875c23959cb74918b745a15739f66c 100755 --- a/ace/ace_ets_component_five/entry/src/main/ets/MainAbility/test/SliderJsunit.test.ets +++ b/ace/ace_ets_component_five/entry/src/main/ets/MainAbility/test/SliderJsunit.test.ets @@ -31,7 +31,7 @@ export default function sliderJsunit() { if (!("slider" == pages.name)) { console.info("get slider success " + JSON.stringify(pages.name)); let result = await router.push(options); - await Utils.sleep(2000); + await Utils.sleep(3000); console.info("push slider page success " + JSON.stringify(result)); } } catch (err) { diff --git a/ace/ace_ets_test/entry/src/main/ets/MainAbility/test/ListItemJsunit.test.ets b/ace/ace_ets_test/entry/src/main/ets/MainAbility/test/ListItemJsunit.test.ets index 3e4a667ae376498315ec665456e223e4c9cc4663..16a1d730ba0ec4c226d49c5e812976814c7c7182 100644 --- a/ace/ace_ets_test/entry/src/main/ets/MainAbility/test/ListItemJsunit.test.ets +++ b/ace/ace_ets_test/entry/src/main/ets/MainAbility/test/ListItemJsunit.test.ets @@ -116,7 +116,7 @@ export default function listItemJsunit() { console.log('ListItem3‘s editable is ' + JSON.stringify(obj.$attrs.editable)) await sleep(1) expect(obj.$attrs.sticky).assertEqual('Sticky.Opacity') - expect(obj.$attrs.editable).assertEqual('EditMode.None') + expect(obj.$attrs.editable).assertEqual('false') console.info('++++++++++++++++ ListItem TestCase 3 End ++++++++++++++++'); done(); }); diff --git a/ace/ace_ets_test/entry/src/main/ets/MainAbility/test/TabJsunit.test.ets b/ace/ace_ets_test/entry/src/main/ets/MainAbility/test/TabJsunit.test.ets index 7a959d3ffcce68d00ab22bb034506a0d97c36e8c..756fb8586aba158111a3a1f02a13a1302597fe8c 100644 --- a/ace/ace_ets_test/entry/src/main/ets/MainAbility/test/TabJsunit.test.ets +++ b/ace/ace_ets_test/entry/src/main/ets/MainAbility/test/TabJsunit.test.ets @@ -82,24 +82,6 @@ export default function tabJsunit() { done(); }); - /** - * @tc.number SUB_ACE_BASIC_ETS_API_0520 - * @tc.name tabTest002 - * @tc.desc aceEtsTest - */ - it('tabTest002', 0, async function (done) { - console.info('++++++++++++++++ Tab TestCase 2 START ++++++++++++++++'); - let strJson = getInspectorByKey('tabcontent'); - let obj = JSON.parse(strJson); - console.info("get inspector value is: " + JSON.stringify(obj)); - console.log(JSON.stringify(obj.$type)) - console.log(JSON.stringify(obj.$attrs.tabBar)) - expect(obj.$type).assertEqual('TabContent') - expect(obj.$attrs.tabBar).assertEqual('yellow') - console.info('++++++++++++++++ Tab TestCase 2 End ++++++++++++++++'); - done(); - }); - /** * @tc.number SUB_ACE_BASIC_ETS_API_0530 * @tc.name tabTest003