!1690 ACE问题单修改

Merge pull request !1690 from coooooool01/master

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

@@ -74,9 +74,13 @@ export default function badgeJsunit() {
       console.log("yr badge0 position-BadgePosition.Right" + JSON.stringify(obj.$attrs.position))
       expect(obj.$attrs.maxCount).assertEqual('99');
       console.log("yr badge0 maxCount-'99'" + JSON.stringify(obj.$attrs.maxCount))
-      expect(obj.$attrs.style.color).assertEqual('0xFFFFFF');
-      expect(obj.$attrs.style.fontSize).assertEqual('16');
-      expect(obj.$attrs.style.badgeSize).assertEqual('20');
+      let style = JSON.parse(obj.$attrs.style)
+      console.log(style.color)
+      console.log(style.fontSize)
+      console.log(style.badgeSize)
+      expect(style.color).assertEqual('#FFFFFFFF');
+      expect(style.fontSize).assertEqual('16.000000fp');
+      expect(style.badgeSize).assertEqual('20.000000fp');
       console.log("badge0 style : " + JSON.stringify(obj.$attrs.style))
       console.info('testGetInspectorByKey END');
       done();

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

@@ -64,26 +64,29 @@ export default function sliderJsunit() {
       let strJson = getInspectorByKey('slider1');
       let obj = JSON.parse(strJson);
       console.info("component obj is  Slider: " + JSON.stringify(obj));
-      console.info("slider1 blockColor" + JSON.stringify(obj.$attrs.blockColor))
-      console.info("slider1 selectedColor" + JSON.stringify(obj.$attrs.selectedColor))
-      console.info("slider1 trackColor" + JSON.stringify(obj.$attrs.trackColor))
-      console.info("slider1 showTips" + JSON.stringify(obj.$attrs.showTips))
-      console.info("slider1 showSteps" + JSON.stringify(obj.$attrs.showSteps))
-      console.info("slider1 value" + JSON.stringify(obj.$attrs.value))
-      console.info("slider1 min" + JSON.stringify(obj.$attrs.min))
-      console.info("slider1 max" + JSON.stringify(obj.$attrs.max))
-      console.info("slider1 step" + JSON.stringify(obj.$attrs.step))
-      console.info("slider1 style" + JSON.stringify(obj.$attrs.style))
-      expect(obj.$attrs.blockColor).assertEqual('#FFFF0000')
-      expect(obj.$attrs.selectedColor).assertEqual('#FF0000FF')
-      expect(obj.$attrs.trackColor).assertEqual('#FF808080')
-      expect(obj.$attrs.showTips).assertEqual("false")
-      expect(obj.$attrs.showSteps).assertEqual("false")
-      expect(obj.$attrs.value).assertEqual(40.000000.toFixed(6))
-      expect(obj.$attrs.min).assertEqual(0.000000.toFixed(6))
-      expect(obj.$attrs.max).assertEqual(100.000000.toFixed(6))
-      expect(obj.$attrs.step).assertEqual(1.000000.toFixed(6))
-      expect(obj.$attrs.style).assertEqual("SliderStyle.Outset")
+
+      console.info("component obj is  Slider: " + JSON.stringify(obj.$attrs.constructor));
+
+      console.info("slider1 blockColor " + JSON.stringify(obj.$attrs.constructor.blockColor))
+      console.info("slider1 selectedColor " + JSON.stringify(obj.$attrs.constructor.selectedColor))
+      console.info("slider1 trackColor " + JSON.stringify(obj.$attrs.constructor.trackColor))
+      console.info("slider1 showTips " + JSON.stringify(obj.$attrs.constructor.showTips))
+      console.info("slider1 showSteps " + JSON.stringify(obj.$attrs.constructor.showSteps))
+      console.info("slider1 value " + JSON.stringify(obj.$attrs.constructor.value))
+      console.info("slider1 min " + JSON.stringify(obj.$attrs.constructor.min))
+      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))
+      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")
       console.info('testGetSliderAttr1 END');
       done();
     });
@@ -98,12 +101,12 @@ export default function sliderJsunit() {
       let strJson = getInspectorByKey('slider2');
       let obj = JSON.parse(strJson);
       console.info("component obj is  Slider: " + JSON.stringify(obj));
-      console.info("slider2 showTips" + JSON.stringify(obj.$attrs.showTips))
-      console.info("slider2 showSteps" + JSON.stringify(obj.$attrs.showSteps))
-      console.info("slider1 style" + JSON.stringify(obj.$attrs.style))
-      expect(obj.$attrs.showTips).assertEqual("true")
-      expect(obj.$attrs.showSteps).assertEqual("true")
-      expect(obj.$attrs.style).assertEqual("SliderStyle.Inset")
+      console.info("slider2 showTips " + JSON.stringify(obj.$attrs.constructor.showTips))
+      console.info("slider2 showSteps " + JSON.stringify(obj.$attrs.constructor.showSteps))
+      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")
       console.info('testGetSliderAttr2 END');
       done();
     });

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

@@ -135,7 +135,7 @@ export default function textJsunit() {
       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")
+      expect(obj.$attrs.fontSize).assertEqual("15.000000fp")
       expect(obj.$attrs.fontWeight).assertEqual("FontWeight.Bold")
       expect(obj.$attrs.fontStyle).assertEqual("FontStyle.Italic")
       expect(obj.$attrs.fontFamily).assertEqual("sans-serif")

ace/ace_ets_test/entry/src/main/config.json

@@ -63,7 +63,6 @@
           "pages/AlphabetIndexer",
           "pages/Grid",
           "pages/GridItem",
-          "pages/HyperLink",
           "pages/List",
           "pages/ListItem",
           "pages/Navigator",

ace/ace_ets_test/entry/src/main/ets/MainAbility/pages/HyperLink.ets

-/*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- 
-@Entry
-@Component
-struct hyperLink_testcase {
-  @State active: boolean = false
-
-  build() {
-    Column() {
-      Column() {
-        Hyperlink('https://developer.harmonyos.com/', 'Go to the developer website') {
-          Text("click to link to developer page")
-            .fontSize(30)
-        }.color("#008000")
-        .key('hyperlink1')
-      }.width('100%').margin({ top: 5 })
-    }
-    .width(300)
-    .height(300)
-    .borderColor(Color.Pink)
-    .borderWidth(2)
-  }
-}

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

-/*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// @ts-nocheck
-import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "deccjsunit/index.ets"
-import router from '@system.router';
-
-export default function hyperlinkJsunit() {
-
-  function sleep(time) {
-    return new Promise((resolve, reject) => {
-      setTimeout(() => {
-        resolve()
-      }, time * 1000)
-    }).then(() => {
-      console.info(`sleep ${time} over...`)
-    })
-  }
-
-  describe('hyperLinkTest', function () {
-    beforeEach(async function (done) {
-      let options = {
-        uri: 'pages/HyperLink',
-      }
-      try {
-        router.clear();
-        let pages = router.getState();
-        console.info("get HyperLink state success " + JSON.stringify(pages));
-        if (!("HyperLink" == pages.name)) {
-          console.info("get HyperLink state success " + JSON.stringify(pages.name));
-          let result = await router.push(options)
-          console.info("push HyperLink page success " + JSON.stringify(result));
-        }
-      } catch (err) {
-        console.error("push HyperLink page error " + JSON.stringify(result));
-      }
-      await sleep(2)
-      done()
-    });
-
-    afterEach(async function () {
-      await sleep(1)
-      console.info("HyperLink after each called");
-    });
-
-    /**
-     * @tc.number    SUB_ACE_BASIC_ETS_API_0360
-     * @tc.name      hyperLinkTest001
-     * @tc.desc      aceEtsTest
-     */
-    it('hyperLinkTest001', 0, async function (done) {
-      console.info('++++++++++++++++ Hyperlink TestCase 1 START ++++++++++++++++');
-      await sleep(1)
-      let strJson = getInspectorByKey('hyperlink1');
-      let obj = JSON.parse(strJson);
-      expect(obj.$type).assertEqual('Hyperlink')
-      console.info("属性值集合: " + JSON.stringify(obj));
-      console.log('Hyperlink‘s address is ' + JSON.stringify(obj.$attrs.address))
-      console.log('Hyperlink‘s content is ' + JSON.stringify(obj.$attrs.content))
-      expect(obj.$attrs.address).assertEqual('https://developer.harmonyos.com/')
-      expect(obj.$attrs.content).assertEqual('Go to the developer website')
-      console.info('++++++++++++++++ Hyperlink TestCase 1 End ++++++++++++++++');
-      done();
-    });
-  })
-}

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

@@ -24,13 +24,11 @@ import panelJsunit from './PanelJsunit.test.ets';
 import navigatorJsunit from './NavigatorJsunit.test.ets';
 import rowJsunit from './RowJsunit.test.ets';
 import listItemJsunit from './ListItemJsunit.test.ets';
-import hyperlinkJsunit from './HyperLinkJsunit.test.ets';
 import gridItemJsunit from './GridItem.test.ets';
 import gridJsunit from './GridJsnuit.test.ets';
 import videoJsunit from './VideoJsunit.test.ets';
 export default function testsuite() {
   alphabetIndexerJsunit()
-  hyperlinkJsunit()
   rowJsunit()
   gridJsunit()
   gridItemJsunit()

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

@@ -92,8 +92,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.Opacity')
-      expect(obj.$attr.editable).assertEqual('true')
+      expect(obj.$attrs.sticky).assertEqual('Sticky.Opacity')
+      expect(obj.$attrs.editable).assertEqual('true')
       console.info('++++++++++++++++ ListItem TestCase 3 End ++++++++++++++++');
       done();
     });

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

@@ -69,10 +69,10 @@ export default function navigationJsunit() {
       let obj = JSON.parse(strJson);
       console.info("[navigation1] get inspector value is: " + JSON.stringify(obj));
       expect(obj.$type).assertEqual('Navigation')
-      expect(obj.$attrs.navigationTitle).assertEqual('title')
-      expect(obj.$attrs.navigationSubTitle).assertEqual('subtitle')
-      expect(obj.$attrs.hideNavigationBackButton).assertFalse()
-      expect(obj.$attrs.hideNavigationBar).assertFalse()
+      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');
       done();
     });
@@ -89,8 +89,8 @@ export default function navigationJsunit() {
       let obj = JSON.parse(strJson);
       console.info("[navigation2] get inspector value is: " + JSON.stringify(obj));
       expect(obj.$type).assertEqual('Navigation')
-      expect(obj.$attrs.hideNavigationBar).assertTrue()
-      expect(obj.$attrs.hideNavigationBackButton).assertTrue()
+      expect(obj.$attrs.hideTitleBar).assertTrue()
+      expect(obj.$attrs.hideBackButton).assertTrue()
       console.info('testNavigation020 End');
       done();
     });

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

@@ -68,7 +68,7 @@ export default function textAreaJsunit() {
       let strJson = getInspectorByKey('textArea1');
       let obj = JSON.parse(strJson);
       console.info("[textArea1] get inspector value is: " + JSON.stringify(obj));
-      expect(obj.$type).assertEqual('Textarea')
+      expect(obj.$type).assertEqual('TextArea')
       expect(obj.$attrs.placeholderColor).assertEqual('#FFC0C0C0')
       expect(obj.$attrs.textAlign).assertEqual('TextAlign.Start')
       expect(obj.$attrs.caretColor).assertEqual('#FF000000')
@@ -91,7 +91,7 @@ export default function textAreaJsunit() {
       let strJson = getInspectorByKey('textArea2');
       let obj = JSON.parse(strJson);
       console.info("[textArea2] get inspector value is: " + JSON.stringify(obj));
-      expect(obj.$type).assertEqual('Textarea')
+      expect(obj.$type).assertEqual('TextArea')
       expect(obj.$attrs.textAlign).assertEqual('TextAlign.Center')
       console.info('testTextArea020 End');
       done();
@@ -107,7 +107,7 @@ export default function textAreaJsunit() {
       let strJson = getInspectorByKey('textArea3');
       let obj = JSON.parse(strJson);
       console.info("[textArea3] get inspector value is: " + JSON.stringify(obj));
-      expect(obj.$type).assertEqual('Textarea')
+      expect(obj.$type).assertEqual('TextArea')
       expect(obj.$attrs.textAlign).assertEqual('TextAlign.End')
       console.info('testTextArea030 End');
       done();

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

@@ -88,7 +88,7 @@ export default function textInputJsunit() {
       expect(obj.$attrs.fontStyle).assertEqual('FontStyle.Italic')
       expect(obj.$attrs.fontSize).assertEqual('40.000000fp')
       expect(obj.$attrs.height).assertEqual('60.000000vp')
-      expect(obj.$attrs.height).assertContain('FontStyle.Normal')
+      expect(obj.$attrs.placeholderFont).assertContain('FontStyle.Normal')
       console.info('testTextInput010 End');
       done();
     });