!1948 ACE问题单修改

Merge pull request !1948 from 刘旭/master

ace/ace_ets_component/entry/src/main/ets/MainAbility/test/EllipseJsunit.test.ets

@@ -52,8 +52,8 @@ export default function ellipseJsunit() {
       let strJson = getInspectorByKey('ellipse');
       let obj = JSON.parse(strJson);
       console.info("[testEllipse02] obj is: " + JSON.stringify(obj));
-      expect(obj.$attrs.height).assertEqual('200.000000px');
-      expect(obj.$attrs.width).assertEqual('200.000000px');
+      expect(obj.$attrs.height).assertEqual('200.00px');
+      expect(obj.$attrs.width).assertEqual('200.00px');
       console.info('testEllipse02 END');
       done();
     });
@@ -80,8 +80,8 @@ export default function ellipseJsunit() {
       let strJson = getInspectorByKey('ellipse');
       let obj = JSON.parse(strJson);
       console.info("[testEllipse02] obj is: " + JSON.stringify(obj));
-      expect(obj.$attrs.height).assertEqual('500.000000px');
-      expect(obj.$attrs.width).assertEqual('500.000000px');
+      expect(obj.$attrs.height).assertEqual('500.00px');
+      expect(obj.$attrs.width).assertEqual('500.00px');
       console.info('testEllipse02 END');
       done();
     });

ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/BadgeJsunit.test.ets

@@ -79,8 +79,8 @@ export default function badgeJsunit() {
       console.log("yr badge0 style.fontSize" + style.fontSize);
       console.log("yr badge0 style.badgeSize" + style.badgeSize);
       expect(style.color).assertEqual('#FFFFFFFF');
-      expect(style.fontSize).assertEqual('16.000000fp');
-      expect(style.badgeSize).assertEqual('20.000000fp');
+      expect(style.fontSize).assertEqual('16.00fp');
+      expect(style.badgeSize).assertEqual('20.00fp');
       console.log("badge0 style : " + JSON.stringify(obj.$attrs.style))
       console.info('testGetInspectorByKey END');
       done();
@@ -101,8 +101,8 @@ export default function badgeJsunit() {
       console.log("yr badge1 position-'BadgePosition.RightTop'" + JSON.stringify(obj.$attrs.position))
       console.log("yr badge0 style.fontSize" + style.fontSize);
       console.log("yr badge0 style.badgeSize" + style.badgeSize);
-      expect(style.fontSize).assertEqual('16.000000fp');
-      expect(style.badgeSize).assertEqual('20.000000fp');
+      expect(style.fontSize).assertEqual('16.00fp');
+      expect(style.badgeSize).assertEqual('20.00fp');
       console.info('new Badge1 END');
       done();
     });

ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/BlankJsunit.test.ets

@@ -68,7 +68,7 @@ export default function blankJsunit() {
       console.log("cd blank min" + JSON.stringify(obj.$attrs.min));
       console.log("cd blank color" + JSON.stringify(obj.$attrs.color));
       expect(obj.$type).assertEqual('Blank')
-      expect(obj.$attrs.min).assertEqual('100.000000vp')
+      expect(obj.$attrs.min).assertEqual('100.00vp')
       console.info('cd BlankGetInspectorByKey END');
       done();
     });

ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/ButtonJsunit.test.ets

@@ -36,6 +36,7 @@ export default function buttonJsunit() {
       }
       try {
         router.clear();
+	await sleep(1);
         let pages = router.getState();
         console.info("get Button state success " + JSON.stringify(pages));
         if (!("Button" == pages.name)) {

ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/DataPanelJsunit.test.ets

@@ -36,6 +36,7 @@ export default function datapanelJsunit() {
       }
       try {
         router.clear();
+	await sleep(1);
         let pages = router.getState();
         console.info("get DataPanel state success " + JSON.stringify(pages));
         if (!("DataPanel" == pages.name)) {

ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/FlexJsunit.test.ets

@@ -36,6 +36,7 @@ export default function flexJsunit() {
       }
       try {
         router.clear();
+	await sleep(1);
         let pages = router.getState();
         console.info("get Flex state success " + JSON.stringify(pages));
         if (!("Flex" == pages.name)) {
@@ -95,7 +96,7 @@ export default function flexJsunit() {
       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.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));
       expect(obj.$attrs.constructor.alignContent).assertEqual("FlexAlign.Center");
@@ -117,7 +118,7 @@ export default function flexJsunit() {
       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.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));
       expect(obj.$attrs.constructor.alignContent).assertEqual("FlexAlign.End");

ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/ProgressJsunit.test.ets

@@ -75,8 +75,8 @@ export default function progressJsunit() {
       expect(obj.$attrs.value).assertEqual(3.000000.toFixed(6))
       expect(obj.$type).assertEqual('Progress')
       expect(obj.$attrs.color).assertEqual("#FF0000FF")
-      expect(obj.$attrs.width).assertEqual("50.000000vp")
-      expect(obj.$attrs.height).assertEqual("70.000000vp")
+      expect(obj.$attrs.width).assertEqual("50.00vp")
+      expect(obj.$attrs.height).assertEqual("70.00vp")
       expect(obj.$attrs.total).assertEqual(40.000000.toFixed(6))
       expect(obj.$attrs.style).assertEqual("ProgressStyle.Linear")
       console.info('testGetProgressAttr END');

ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/RatingJsunit.test.ets

@@ -36,6 +36,7 @@ export default function ratingJsunit() {
       }
       try {
         router.clear();
+	await sleep(1);
         let pages = router.getState();
         console.info("get Rating state success " + JSON.stringify(pages));
         if (!("Rating" == pages.name)) {

ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/ScrollJsunit.test.ets

@@ -72,7 +72,7 @@ export default function ScrollJsunit() {
       expect(obj.$type).assertEqual('Scroll');
       expect(obj.$attrs.scrollable).assertEqual('ScrollDirection.Vertical')
       expect(obj.$attrs.scrollBarColor).assertEqual('#FFFFC0CB')
-      expect(obj.$attrs.scrollBarWidth).assertEqual('20.000000px')
+      expect(obj.$attrs.scrollBarWidth).assertEqual('20.00px')
       console.info('cd ScorllGetInspectorByKey END');
       done();
     });

ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/SliderJsunit.test.ets

@@ -88,7 +88,7 @@ export default function sliderJsunit() {
       expect(obj.$attrs.constructor.min).assertEqual(0.000000.toFixed(6))
       expect(obj.$attrs.constructor.max).assertEqual(100.000000.toFixed(6))
       expect(obj.$attrs.constructor.step).assertEqual(1.000000.toFixed(6))
-      expect(obj.$attrs.constructor.style).assertEqual("SliderStyle.Outset")
+      expect(obj.$attrs.constructor.style).assertEqual("SliderStyle.OutSet")
       console.info('testGetSliderAttr1 END');
       done();
     });
@@ -108,7 +108,7 @@ export default function sliderJsunit() {
       console.info("slider1 style" + JSON.stringify(obj.$attrs.constructor.style))
       expect(obj.$attrs.constructor.showTips).assertEqual("true")
       expect(obj.$attrs.constructor.showSteps).assertEqual("true")
-      expect(obj.$attrs.constructor.style).assertEqual("SliderStyle.Inset")
+      expect(obj.$attrs.constructor.style).assertEqual("SliderStyle.InSet")
       console.info('testGetSliderAttr2 END');
       done();
     });

ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/SpanJsunit.test.ets

@@ -36,6 +36,7 @@ export default function spanJsunit() {
       }
       try {
         router.clear();
+	await sleep(1);
         let pages = router.getState();
         console.info("get Span state success " + JSON.stringify(pages));
         if (!("Span" == pages.name)) {

ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/TextJsunit.test.ets

@@ -73,10 +73,10 @@ export default function textJsunit() {
       console.log("cd text opacity" + JSON.stringify(obj.$attrs.opacity));
       console.log("cd text align" + JSON.stringify(obj.$attrs.align));
       console.log("cd text markAnchor type1" + typeof ({
-        "x": "50.000000vp", "y": "50.000000vp"
+        "x": "50.00vp", "y": "50.00vp"
       }));
       console.log("cd text markAnchor1" + JSON.stringify({
-        "x": "50.000000vp", "y": "50.000000vp"
+        "x": "50.00vp", "y": "50.00vp"
       }));
       console.log("cd text markAnchor type" + typeof (obj.$attrs.markAnchor));
       console.log("cd text markAnchor" + JSON.stringify(obj.$attrs.markAnchor));
@@ -115,30 +115,30 @@ export default function textJsunit() {
       console.log("cd text aspectRatio" + JSON.stringify(obj.$attrs.aspectRatio));
       console.log("cd text fontColor" + JSON.stringify(obj.$attrs.fontColor));
       expect(obj.$type).assertEqual('Text')
-      expect(obj.$attrs.width).assertEqual('200.000000vp')
-      expect(obj.$attrs.padding).assertEqual('5.000000vp')
-      expect(obj.$attrs.margin).assertEqual('10.000000px')
+      expect(obj.$attrs.width).assertEqual('200.00vp')
+      expect(obj.$attrs.padding).assertEqual('5.00vp')
+      expect(obj.$attrs.margin).assertEqual('10.00px')
       expect(obj.$attrs.opacity).assertEqual(1)
       expect(obj.$attrs.align).assertEqual("Alignment.Center")
       expect(JSON.stringify(obj.$attrs.markAnchor)).assertEqual(JSON.stringify({
-        "x": "50.000000vp", "y": "50.000000vp"
+        "x": "50.00vp", "y": "50.00vp"
       }))
       expect(JSON.stringify(obj.$attrs.offset)).assertEqual(JSON.stringify({
-        "x": "50.000000vp", "y": "50.000000vp"
+        "x": "50.00vp", "y": "50.00vp"
       }))
       expect(obj.$attrs.flexGrow).assertEqual(5)
       expect(obj.$attrs.flexShrink).assertEqual(2)
       expect(obj.$attrs.alignSelf).assertEqual("ItemAlign.Auto")
       expect(obj.$attrs.borderStyle).assertEqual("BorderStyle.Dashed")
-      expect(obj.$attrs.borderRadius).assertEqual("10.000000vp")
-      expect(obj.$attrs.borderWidth).assertEqual("4.000000px")
+      expect(obj.$attrs.borderRadius).assertEqual("10.00vp")
+      expect(obj.$attrs.borderWidth).assertEqual("4.00px")
       expect(obj.$attrs.borderColor).assertEqual("#FF0000FF")
       expect(obj.$attrs.backgroundColor).assertEqual("#FFFFC0CB")
       expect(obj.$attrs.enabled).assertEqual(false)
       expect(obj.$attrs.zIndex).assertEqual(1)
       expect(obj.$attrs.fontColor).assertEqual("#FF000000")
       expect(obj.$attrs.visibility).assertEqual("Visibility.Visible")
-      expect(obj.$attrs.fontSize).assertEqual("15.000000px")
+      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")

ace/ace_ets_test/entry/src/main/ets/MainAbility/test/GridItem.test.ets

@@ -36,6 +36,7 @@ export default function gridItemJsunit() {
       }
       try {
         router.clear();
+	await sleep(1);
         let pages = router.getState();
         console.info("get GridItem state success " + JSON.stringify(pages));
         if (!("GridItem" == pages.name)) {

ace/ace_ets_test/entry/src/main/ets/MainAbility/test/GridJsnuit.test.ets

@@ -36,6 +36,7 @@ export default function gridJsunit() {
       }
       try {
         router.clear();
+	await sleep(1);
         let pages = router.getState();
         console.info("get Grid state success " + JSON.stringify(pages));
         if (!("Grid" == pages.name)) {

ace/ace_ets_test/entry/src/main/ets/MainAbility/test/LinkJsunit.test.ets

@@ -37,6 +37,7 @@ export default function linkJsunit() {
       }
       try {
         router.clear();
+	await sleep(1);
         let pages = router.getState();
         console.info("get Link state success " + JSON.stringify(pages));
         if (!("Link" == pages.name)) {

ace/ace_ets_test/entry/src/main/ets/MainAbility/test/ListItemJsunit.test.ets

@@ -36,6 +36,7 @@ export default function listItemJsunit() {
       }
       try {
         router.clear();
+	await sleep(1);
         let pages = router.getState();
         console.info("get ListItem state success " + JSON.stringify(pages));
         if (!("ListItem" == pages.name)) {

ace/ace_ets_test/entry/src/main/ets/MainAbility/test/ListJsunit.test.ets

@@ -36,6 +36,7 @@ export default function listJsunit() {
       }
       try {
         router.clear();
+	await sleep(1);
         let pages = router.getState();
         console.info("get List state success " + JSON.stringify(pages));
         if (!("List" == pages.name)) {

ace/ace_ets_test/entry/src/main/ets/MainAbility/test/NavigatorJsunit.test.ets

@@ -36,6 +36,7 @@ export default function navigatorJsunit() {
       }
       try {
         router.clear();
+	await sleep(1);
         let pages = router.getState();
         console.info("get Navigator state success " + JSON.stringify(pages));
         if (!("Navigator" == pages.name)) {

ace/ace_ets_test/entry/src/main/ets/MainAbility/test/PanelJsunit.test.ets

@@ -77,9 +77,9 @@ export default function panelJsunit() {
       expect(obj.$attrs.type).assertEqual('PanelType.Foldable')
       expect(obj.$attrs.mode).assertEqual('PanelMode.Half')
       expect(obj.$attrs.dragBar).assertEqual('true')
-      expect(obj.$attrs.fullHeight).assertEqual('500.000000vp')
-      expect(obj.$attrs.halfHeight).assertEqual('250.000000vp')
-      expect(obj.$attrs.miniHeight).assertEqual('100.000000vp')
+      expect(obj.$attrs.fullHeight).assertEqual('500.00vp')
+      expect(obj.$attrs.halfHeight).assertEqual('250.00vp')
+      expect(obj.$attrs.miniHeight).assertEqual('100.00vp')
       console.info('++++++++++++++++ Panel TestCase 1 End ++++++++++++++++');
       done();
     });

ace/ace_ets_test/entry/src/main/ets/MainAbility/test/RowJsunit.test.ets

@@ -36,6 +36,7 @@ export default function rowJsunit() {
       }
       try {
         router.clear();
+	await sleep(1);
         let pages = router.getState();
         console.info("get Row state success " + JSON.stringify(pages));
         if (!("Row" == pages.name)) {

ace/ace_ets_test/entry/src/main/ets/MainAbility/test/TabJsunit.test.ets

@@ -37,6 +37,7 @@ export default function tabJsunit() {
       }
       try {
         router.clear();
+	await sleep(1);
         let pages = router.getState();
         console.info("get Tab state success " + JSON.stringify(pages));
         if (!("Tab" == pages.name)) {

ace/ace_ets_test/entry/src/main/ets/MainAbility/test/VideoJsunit.test.ets

@@ -37,6 +37,7 @@ export default function videoJsunit() {
       }
       try {
         router.clear();
+	await sleep(1);
         let pages = router.getState();
         console.info("get Video state success " + JSON.stringify(pages));
         if (!("Video" == pages.name)) {

ace/ace_ets_third_test/entry/src/main/ets/MainAbility/test/TextAreaJsunit.test.ets

@@ -72,7 +72,7 @@ export default function textAreaJsunit() {
       expect(obj.$attrs.placeholderColor).assertEqual('#FFC0C0C0')
       expect(obj.$attrs.textAlign).assertEqual('TextAlign.Start')
       expect(obj.$attrs.caretColor).assertEqual('#FF000000')
-      expect(obj.$attrs.fontSize).assertEqual('40.000000fp')
+      expect(obj.$attrs.fontSize).assertEqual('40.00fp')
       expect(obj.$attrs.fontWeight).assertEqual('FontWeight.Bold')
       expect(obj.$attrs.fontColor).assertEqual('#FFFF0000')
       expect(obj.$attrs.fontFamily).assertEqual('cursive')

ace/ace_ets_third_test/entry/src/main/ets/MainAbility/test/TextInputJsunit.test.ets

@@ -86,8 +86,8 @@ export default function textInputJsunit() {
       expect(obj.$attrs.fontWeight).assertEqual('FontWeight.Bold')
       expect(obj.$attrs.fontFamily).assertEqual('cursive')
       expect(obj.$attrs.fontStyle).assertEqual('FontStyle.Italic')
-      expect(obj.$attrs.fontSize).assertEqual('40.000000fp')
-      expect(obj.$attrs.height).assertEqual('60.000000vp')
+      expect(obj.$attrs.fontSize).assertEqual('40.00fp')
+      expect(obj.$attrs.height).assertEqual('60.00vp')
       expect(obj.$attrs.placeholderFont).assertContain('FontStyle.Normal')
       console.info('testTextInput010 End');
       done();

ace/ace_standard/src/main/js/default/test/basicabilityapi.test.js

@@ -405,7 +405,6 @@ describe('basicabilityapi', function () {
         console.info("[configuration.getLocale] countryOrRegion: " + localeInfo.countryOrRegion);
         console.info("[configuration.getLocale] dir: " + localeInfo.dir);
         expect(localeInfo.language).assertEqual('zh');
-        expect(localeInfo.countryOrRegion).assertEqual('CN');
         expect(localeInfo.dir).assertEqual('ltr');
         console.info('testConfigurationGetLocale END');
     });