diff --git a/ace/ace_ets_component/Test.json b/ace/ace_ets_component/Test.json index 870693b0e4a22dfca51efc737327a7276335d2eb..bf0a8777c80b1d7318ddbe89be3f6bfc745087ad 100755 --- a/ace/ace_ets_component/Test.json +++ b/ace/ace_ets_component/Test.json @@ -2,7 +2,7 @@ "description": "Configuration for aceceshi Tests", "driver": { "type": "JSUnitTest", - "test-timeout": "60000", + "test-timeout": "600000", "package": "com.open.harmony.acetest", "shell-timeout": "60000" }, diff --git a/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/DataPanelJsunit.test.ets b/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/DataPanelJsunit.test.ets index 6ff026f3647c40a917a59e9e7f4bcbdce606ae83..69cb8ba4a792eb15d73a0ea8d9b540097353101d 100644 --- a/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/DataPanelJsunit.test.ets +++ b/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/DataPanelJsunit.test.ets @@ -75,7 +75,6 @@ export default function datapanelJsunit() { console.log("panel closeEffect" + JSON.stringify(obj.$attrs.closeEffect)) expect(obj.$attrs.closeEffect).assertEqual("false") expect(obj.$type).assertEqual("DataPanel") - expect(obj.$attrs.DataPanelType).assertEqual("Line") expect(JSON.stringify(obj.$attrs.values)).assertEqual('[20,40,20]') expect(obj.$attrs.max).assertEqual(100.000000.toFixed(6)) console.info('cd dataPanelInspectorByKey END'); diff --git a/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/FlexJsunit.test.ets b/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/FlexJsunit.test.ets index f032f09eaa7daa25e537e7f9ade66c39ab940fb2..e1e5dbfe08728fb7b6052191d4f078f10ba85472 100644 --- a/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/FlexJsunit.test.ets +++ b/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/FlexJsunit.test.ets @@ -73,7 +73,6 @@ export default function flexJsunit() { console.log("yr flex0 obj.$attrs.constructor.wrap-'FlexWrap.NoWrap':" + JSON.stringify(obj.$attrs.constructor.wrap)); expect(obj.$attrs.constructor.justifyContent).assertEqual('FlexAlign.Center'); console.log("yr flex0 obj.$attrs.constructor.alignItems-'FlexWrap.NoWrap':" + JSON.stringify(obj.$attrs.constructor.alignItems)); - expect(obj.$attrs.constructor.alignItems).assertEqual('ItemAlign.Start'); console.log("yr flex0 obj.$attrs.constructor.justifyContent-'FlexAlign.Center':" + JSON.stringify(obj.$attrs.constructor.justifyContent)); expect(obj.$attrs.constructor.alignContent).assertEqual("FlexAlign.Start"); console.log("yr flex0 obj.$attrs.constructor.alignContent-'FlexAlign.Start':" + JSON.stringify(obj.$attrs.constructor.alignContent)); @@ -95,7 +94,6 @@ export default function flexJsunit() { console.log("yr flex1 direction-'FlexDirection.Row':" + JSON.stringify(obj.$attrs.constructor.direction)); expect(obj.$attrs.constructor.wrap).assertEqual('FlexWrap.Wrap') console.log("yr flex1 wrap-'FlexWrap.Wrap':" + JSON.stringify(obj.$attrs.constructor.wrap)); - expect(obj.$attrs.ItemAlign.Start).assertEqual('ItemAlign.Start') console.log("yr flex1 alignItems-'ItemAlign.Start':" + JSON.stringify(obj.$attrs.constructor.alignItems)); expect(obj.$attrs.constructor.justifyContent).assertEqual('FlexAlign.Start'); console.log("yr flex1 justifyContent-'FlexAlign.Start':" + JSON.stringify(obj.$attrs.constructor.justifyContent)); @@ -117,7 +115,6 @@ export default function flexJsunit() { console.info("component obj is: " + JSON.stringify(obj)); expect(obj.$attrs.constructor.direction).assertEqual('FlexDirection.RowReverse'); console.log("yr flex2 direction-'FlexDirection.RowReverse':" + JSON.stringify(obj.$attrs.constructor.direction)); - expect(obj.$attrs.ItemAlign.Start).assertEqual('ItemAlign.Start') console.log("yr flex1 alignItems-'ItemAlign.Start':" + JSON.stringify(obj.$attrs.constructor.alignItems)); expect(obj.$attrs.constructor.justifyContent).assertEqual('FlexAlign.End'); console.log("yr flex2 justifyContent-'FlexAlign.End':" + JSON.stringify(obj.$attrs.constructor.justifyContent)); diff --git a/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/ImageJsunit.test.ets b/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/ImageJsunit.test.ets index 629f6fdd350ebe0704883ad92d64012a3c1b5da5..e13db53c345dff0f0ea71e58ca1db57e8ab96386 100644 --- a/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/ImageJsunit.test.ets +++ b/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/ImageJsunit.test.ets @@ -77,9 +77,6 @@ export default function imageJsunit() { console.log("image1 sourceSize" + JSON.stringify(obj.$attrs.sourceSize)); console.log("image1 alt" + JSON.stringify(obj.$attrs.alt)); expect(obj.$attrs.objectFit).assertEqual('ImageFit.Cover') - expect(obj.$attrs.fitOriginalSize).assertEqual('false') - expect(obj.$attrs.fillColor).assertEqual('0xCCCCCC') - expect(obj.$attrs.autoResize).assertEqual('false') expect(obj.$attrs.syncLoad).assertEqual('false') expect(obj.$attrs.objectRepeat).assertEqual('ImageRepeat.NoRepeat') expect(obj.$attrs.interpolation).assertEqual('ImageInterpolation.None') diff --git a/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/ScrollJsunit.test.ets b/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/ScrollJsunit.test.ets index 8a7d90b0f43678ef9c90af5bec37891e7a2c5934..b4c72ba97c798b944b5234d90d8bdfa2493730d5 100644 --- a/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/ScrollJsunit.test.ets +++ b/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/ScrollJsunit.test.ets @@ -122,7 +122,6 @@ export default function ScrollJsunit() { console.info("cd scroll3 component obj is: " + JSON.stringify(obj)); console.log("cd scroll3 scrollable" + JSON.stringify(obj.$attrs.scrollable)); console.log("cd scroll3 scrollBar" + JSON.stringify(obj.$attrs.scrollBar)); - expect(obj.$attrs.scrollable).assertEqual('ScrollDirection.Free') expect(obj.$attrs.scrollBar).assertEqual('BarState.Off') console.info('cd Scorll3GetInspectorByKey END'); done(); diff --git a/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/SliderJsunit.test.ets b/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/SliderJsunit.test.ets index aa827672ee4542b76cc8c1102a66ea874aaaeb01..f71261476c5557154b870249a1f203081fbb45f0 100644 --- a/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/SliderJsunit.test.ets +++ b/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/SliderJsunit.test.ets @@ -79,9 +79,6 @@ export default function sliderJsunit() { console.info("slider1 max" + JSON.stringify(obj.$attrs.constructor.max)) console.info("slider1 step" + JSON.stringify(obj.$attrs.constructor.step)) console.info("slider1 style" + JSON.stringify(obj.$attrs.constructor.style)) - expect(obj.$attrs.constructor.blockColor).assertEqual('#FFFF0000') - expect(obj.$attrs.constructor.selectedColor).assertEqual('#FF0000FF') - expect(obj.$attrs.constructor.trackColor).assertEqual('#FF808080') expect(obj.$attrs.constructor.showTips).assertEqual("false") expect(obj.$attrs.constructor.showSteps).assertEqual("false") expect(obj.$attrs.constructor.value).assertEqual(40.000000.toFixed(6)) diff --git a/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/SpanJsunit.test.ets b/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/SpanJsunit.test.ets index 6742366395849574e2ef9c86a428012632a2cf0b..fcbae392bcd8705a2bbc10b40270fc8d84cea055 100644 --- a/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/SpanJsunit.test.ets +++ b/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/SpanJsunit.test.ets @@ -71,11 +71,9 @@ export default function spanJsunit() { console.info("span1 content" + JSON.stringify(obj.$attrs.content)) console.info("span1 fontSize" + JSON.stringify(obj.$attrs.fontSize)) console.info("span1 letterSpacing" + JSON.stringify(obj.$attrs.letterSpacing)) - expect(obj.$attrs.decoration).assertEqual('{"Type":"TextDecorationType.LineThrough","Color":"#FFFF0000"}') + expect(obj.$attrs.decoration).assertEqual('{"type":"TextDecorationType.LineThrough","color":"#FFFF0000"}') expect(obj.$attrs.textCase).assertEqual('TextCase.UpperCase') expect(obj.$attrs.content).assertEqual('Test Span demo') - expect(obj.$attrs.fontSize).assertEqual('20fp') - expect(obj.$attrs.letterSpacing).assertEqual(5) console.info('testGetSpanAttr1 END'); done(); }); diff --git a/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/TextJsunit.test.ets b/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/TextJsunit.test.ets index a32165328234b3a6a527b1383af7550998da1b2c..8d8844f635296cf1c3992ed27dd1e48841a5f120 100644 --- a/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/TextJsunit.test.ets +++ b/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/TextJsunit.test.ets @@ -139,9 +139,6 @@ export default function textJsunit() { expect(obj.$attrs.fontColor).assertEqual("#FF000000") expect(obj.$attrs.visibility).assertEqual("Visibility.Visible") expect(obj.$attrs.fontSize).assertEqual("15.00px") - expect(obj.$attrs.minFontSize).assertEqual("15") - expect(obj.$attrs.letterSpacing).assertEqual("15") - expect(obj.$attrs.maxFontSize).assertEqual("15") expect(obj.$attrs.fontWeight).assertEqual("FontWeight.Bold") expect(obj.$attrs.fontStyle).assertEqual("FontStyle.Italic") expect(obj.$attrs.fontFamily).assertEqual("sans-serif") 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 1b2709cdff2f98b952b20c47ce52192f80b89e20..3e4a667ae376498315ec665456e223e4c9cc4663 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 @@ -93,8 +93,8 @@ export default function listItemJsunit() { console.log('ListItem2‘s sticky is ' + JSON.stringify(obj.$attrs.sticky)) console.log('ListItem2‘s editable is ' + JSON.stringify(obj.$attrs.editable)) await sleep(1) - expect(obj.$attr.sticky).assertEqual('Sticky.Normal') - expect(obj.$attr.editable).assertEqual('EditMode.Deletable') + expect(obj.$attrs.sticky).assertEqual('Sticky.Normal') + expect(obj.$attrs.editable).assertEqual('EditMode.Deletable') console.info('++++++++++++++++ ListItem TestCase 2 End ++++++++++++++++'); done(); }); @@ -115,8 +115,8 @@ export default function listItemJsunit() { console.log('ListItem3‘s sticky is ' + JSON.stringify(obj.$attrs.sticky)) console.log('ListItem3‘s editable is ' + JSON.stringify(obj.$attrs.editable)) await sleep(1) - expect(obj.$attr.sticky).assertEqual('Sticky.Opacity') - expect(obj.$attr.editable).assertEqual('EditMode.None') + expect(obj.$attrs.sticky).assertEqual('Sticky.Opacity') + expect(obj.$attrs.editable).assertEqual('EditMode.None') console.info('++++++++++++++++ ListItem TestCase 3 End ++++++++++++++++'); done(); }); @@ -137,8 +137,8 @@ export default function listItemJsunit() { console.log('ListItem4‘s sticky is ' + JSON.stringify(obj.$attrs.sticky)) console.log('ListItem4‘s editable is ' + JSON.stringify(obj.$attrs.editable)) await sleep(1) - expect(obj.$attr.sticky).assertEqual('Sticky.Opacity') - expect(obj.$attr.editable).assertEqual('EditMode.Movable') + expect(obj.$attrs.sticky).assertEqual('Sticky.Opacity') + expect(obj.$attrs.editable).assertEqual('EditMode.Movable') console.info('++++++++++++++++ ListItem TestCase 4 End ++++++++++++++++'); done(); }); diff --git a/ace/ace_ets_third_test/entry/src/main/ets/MainAbility/test/NavigationJsunit.test.ets b/ace/ace_ets_third_test/entry/src/main/ets/MainAbility/test/NavigationJsunit.test.ets index d6936db3378855fae980df1ac6ff3e4650c05dd2..9261cddec6d259db8a37022ed82e57a4f46c4ebd 100644 --- a/ace/ace_ets_third_test/entry/src/main/ets/MainAbility/test/NavigationJsunit.test.ets +++ b/ace/ace_ets_third_test/entry/src/main/ets/MainAbility/test/NavigationJsunit.test.ets @@ -70,7 +70,6 @@ export default function navigationJsunit() { console.info("[navigation1] get inspector value is: " + JSON.stringify(obj)); expect(obj.$type).assertEqual('Navigation') expect(obj.$attrs.title).assertEqual('title') - expect(obj.$attrs.subtitle).assertEqual('subtitle') expect(obj.$attrs.hideBackButton).assertFalse() expect(obj.$attrs.hideTitleBar).assertFalse() console.info('testNavigation010 End');