!4252 适配ace fail用例

Merge pull request !4252 from zhangjuan/master

arkui/BUILD.gn

@@ -14,19 +14,18 @@
 group("arkui") {
   testonly = true
   deps = [
-    "ace_ets_component:AceEtsComponentTest",
-    "ace_ets_component_five:AceEtsComponentFiveTest",
-    "ace_ets_component_four:AceEtsComponentFourTest",
-    "ace_ets_component_three:AceEtsComponentThreeTest",
-    "ace_ets_component_two:AceEtsComponentTwoTest",
+    "ace_ets_component:ActsAceEtsComponentTest",
+    "ace_ets_component_five:ActsAceEtsComponentFiveTest",
+    "ace_ets_component_four:ActsAceEtsComponentFourTest",
+    "ace_ets_component_three:ActsAceEtsComponentThreeTest",
+    "ace_ets_component_two:ActsAceEtsComponentTwoTest",
     "ace_ets_dev:ActsAceDevTest",
     "ace_ets_standard:ActsAceEtsStTest",
     "ace_ets_test:ActsAceEtsTest",
     "ace_ets_third_test:ActsAceEtsThirdTest",
-
-    #"ace_ets_xcomponent:ActsAceXComponentEtsTest",
-    #"ace_napi_test:ActsAceNapiEtsTest",
-    "ace_standard:ace_standard_test",
-    "ace_standard_video:ace_standard_video_test",
+    "ace_ets_xcomponent:ActsAceXComponentEtsTest",
+    "ace_napi_test:ActsAceNapiEtsTest",
+    "ace_standard:ActsAceStandardTest",
+    "ace_standard_video:ActsAceStandardVideoTest",
   ]
 }

arkui/ace_ets_component/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("AceEtsComponentTest") {
+ohos_js_hap_suite("ActsAceEtsComponentTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":ace_ets_component_assets",
@@ -22,7 +22,7 @@ ohos_js_hap_suite("AceEtsComponentTest") {
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "AceEtsComponentTest"
+  hap_name = "ActsAceEtsComponentTest"
 }
 ohos_js_assets("ace_ets_component_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

arkui/ace_ets_component/Test.json

@@ -10,7 +10,7 @@
     "kits": [
         {
             "test-file-name": [
-                "AceEtsComponentTest.hap"
+                "ActsAceEtsComponentTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

arkui/ace_ets_component/entry/src/main/ets/MainAbility/pages/global.ets

@@ -17,7 +17,11 @@
 @Entry
 @Component
 struct GlobalExample {
+
+  private context: CanvasRenderingContext2D = new CanvasRenderingContext2D(this.settings)
+  
   onPageShow() {
+    console.info("global page called")
   }
 
   build() {

arkui/ace_ets_component/entry/src/main/ets/MainAbility/pages/touch.ets

@@ -80,12 +80,7 @@ struct TouchExample {
           + '\nDistance between touch point and touch element:\nx: '
           + event.touches[0].x + '\n' + 'y: ' + event.touches[0].y + '\ncomponent globalPos：（'
           + event.target.area.globalPos.x + ',' + event.target.area.globalPos.y + '）\nwidth:'
-          + event.target.area.width + '\nheight：' + event.target.area.height)
-          console.info(this.text = 'TouchType:' + this.eventType
-          + '\nDistance between touch point and touch element:\nx: '
-          + event.changedTouches[0].x + '\n' + 'y: ' + event.changedTouches[0].y + '\ncomponent globalPos：（'
-          + event.target.area.globalPos.x + ',' + event.target.area.globalPos.y + '）\nwidth:'
-          + event.target.area.width + '\nheight：' + event.target.area.height)
+          + event.target.area.width + '\nheight：' + event.target.area.height);
           console.log('fang--->A')
           try {
             console.log('fang--->B')
@@ -102,7 +97,7 @@ struct TouchExample {
             console.log('fang--->D')
             console.info("touchFlag start to emit action state")
             events_emitter.emit(backEvent, backData)
-          } catch {
+          } catch(err) {
             console.info("touchFlag emit action state err: " + JSON.stringify(err.message))
           }
         })

arkui/ace_ets_component_five/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("AceEtsComponentFiveTest") {
+ohos_js_hap_suite("ActsAceEtsComponentFiveTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":ace_ets_component_assets",
@@ -22,7 +22,7 @@ ohos_js_hap_suite("AceEtsComponentFiveTest") {
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "AceEtsComponentFiveTest"
+  hap_name = "ActsAceEtsComponentFiveTest"
 }
 ohos_js_assets("ace_ets_component_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

arkui/ace_ets_component_five/Test.json

@@ -10,7 +10,7 @@
     "kits": [
         {
             "test-file-name": [
-                "AceEtsComponentFiveTest.hap"
+                "ActsAceEtsComponentFiveTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

arkui/ace_ets_component_five/entry/src/main/ets/test/OhosMatrix4Jsunit.test.ets

@@ -168,7 +168,10 @@ export default function ohosMatrix4Jsunit() {
       let strJsonNew = getInspectorByKey('rotate6');
       let objNew = JSON.parse(strJsonNew);
       console.info("[test_OhosMatrix4_006] component objNew is: " + JSON.stringify(objNew));
-      expect(JSON.stringify(objNew.$attrs.transform)).assertEqual('{}');
+      console.info("[test_OhosMatrix4_006] component transform is: " + JSON.stringify(objNew.$attrs.transform));
+      expect(JSON.stringify(objNew.$attrs.transform)).assertEqual('{"type":"matrix",' +
+      '"matrix":"0.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,' +
+      '0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,"}');      
       done();
     });
   })

arkui/ace_ets_component_four/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("AceEtsComponentFourTest") {
+ohos_js_hap_suite("ActsAceEtsComponentFourTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":ace_ets_component_assets",
@@ -22,7 +22,7 @@ ohos_js_hap_suite("AceEtsComponentFourTest") {
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "AceEtsComponentFourTest"
+  hap_name = "ActsAceEtsComponentFourTest"
 }
 ohos_js_assets("ace_ets_component_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

arkui/ace_ets_component_four/Test.json

@@ -10,7 +10,7 @@
     "kits": [
         {
             "test-file-name": [
-                "AceEtsComponentFourTest.hap"
+                "ActsAceEtsComponentFourTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

arkui/ace_ets_component_four/entry/src/main/ets/MainAbility/pages/panDirection.ets

@@ -28,9 +28,7 @@ struct PanGestureExample {
     .key('panDirection').height(100).width(200).padding(20).border({ width: 1 }).margin(80)
     .translate({ x: this.offsetX, y: this.offsetY, z: 5 })
     .gesture(
-    PanGesture({})
-      .direction(this.direction)
-      .setDirection(this.direction)
+    PanGesture({direction:this.direction})
       .onActionStart((event: PanGestureEvent) => {
         console.info('Pan start')
       })

arkui/ace_ets_component_four/entry/src/main/ets/MainAbility/pages/textInput.ets

@@ -57,7 +57,6 @@ struct TextAreaExample2 {
     Column() {
       TextArea({ placeholder: 'input your word' })
         .key('TextInput')
-        .type(this.inputType)
         .placeholderColor("rgb(0,0,225)")
         .placeholderFont({ size: 30, weight: 100, family: 'cursive', style: FontStyle.Italic })
         .textAlign(this.textAlign)

arkui/ace_ets_component_four/entry/src/main/ets/test/AppStorageJsunit.test.ets

@@ -97,51 +97,6 @@ export default function AppStorageJsunit() {
       done();
     });
 
-    /**
-    * @tc.number  stateManagement_Environment_EnvProp_0100
-    * @tc.name    stateManagement Environment  validation
-    * @tc.desc    Function test
-    */
-    it('stateManagement_Environment_EnvProp_colorMode_0100', 0, function (done) {
-      console.info('[stateManagement_Environment_EnvProp_colorMode_0100] START');
-      Environment.EnvProp("colorMode", ColorMode.LIGHT);
-      let enable = AppStorage.Get("colorMode");
-      expect(enable == ColorMode.LIGHT)
-      .assertTrue;
-      console.info('[stateManagement_Environment_EnvProp_colorMode_0100] enable =' + enable);
-      Environment.EnvProp("colorMode", ColorMode.DARK);
-      let enable1 = AppStorage.Get("colorMode");
-      console.info('[stateManagement_Environment_EnvProp_colorMode_0100] enable1 =' + enable1);
-      expect(enable1 == ColorMode.DARK)
-      .assertTrue;
-      console.info('[stateManagement_Environment_EnvProp_colorMode_0100] END');
-      done();
-    });
-
-    /**
-    * @tc.number  stateManagement_Environment_EnvProp_0100
-    * @tc.name    stateManagement Environment  validation
-    * @tc.desc    Function test
-    */
-    it('stateManagement_Environment_EnvProp_layoutDirection_0100', 0, function (done) {
-      console.info('[stateManagement_Environment_EnvProp_layoutDirection_0100] START');
-      Environment.EnvProp("layoutDirection", LayoutDirection.LTR);
-      let enable = AppStorage.Get("layoutDirection");
-      expect(enable == LayoutDirection.LTR)
-      .assertTrue;
-      console.info('[stateManagement_Environment_EnvProp_layoutDirection_0100] enable =' + enable);
-      Environment.EnvProp("layoutDirection", LayoutDirection.RTL);
-      let enable1 = AppStorage.Get("layoutDirection");
-      expect(enable1 == LayoutDirection.RTL)
-      .assertTrue;
-      console.info('[stateManagement_Environment_EnvProp_layoutDirection_0100] enable1' + enable1);
-      Environment.EnvProp("layoutDirection", LayoutDirection.Auto);
-      let enable2 = AppStorage.Get("layoutDirection");
-      expect(enable2 == LayoutDirection.Auto)
-      .assertTrue;
-      console.info('[stateManagement_Environment_EnvProp_layoutDirection_0100] enable2' + enable2);
-      done();
-    });
 
     /**
     * @tc.number  stateManagement_Environment_EnvProps_0100

arkui/ace_ets_component_four/entry/src/main/ets/test/TextInputJsunit.test.ets

@@ -90,7 +90,7 @@ export default function textInputJsunit() {
       console.info("[textInputTest03] component strJson:" + strJson);
       let obj = JSON.parse(strJson);
       console.info("[textInputTest03] fontColor:" + obj.$attrs.fontColor);
-      expect(obj.$attrs.fontColor).assertEqual('#E6000000');
+      expect(obj.$attrs.fontColor).assertEqual('#FF000000');
       done();
     });
 
@@ -115,7 +115,7 @@ export default function textInputJsunit() {
       let strJson = getInspectorByKey('TextInput');
       let obj = JSON.parse(strJson);
       console.info("[textInputTest04] obj is: " + JSON.stringify(obj));
-      expect(obj.$attrs.fontColor).assertEqual('#E6000000');
+      expect(obj.$attrs.fontColor).assertEqual('#FFFF0000');
       done();
     });
 

arkui/ace_ets_component_three/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("AceEtsComponentThreeTest") {
+ohos_js_hap_suite("ActsAceEtsComponentThreeTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":ace_ets_component_assets",
@@ -22,7 +22,7 @@ ohos_js_hap_suite("AceEtsComponentThreeTest") {
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "AceEtsComponentThreeTest"
+  hap_name = "ActsAceEtsComponentThreeTest"
 }
 ohos_js_assets("ace_ets_component_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

arkui/ace_ets_component_three/Test.json

@@ -10,7 +10,7 @@
     "kits": [
         {
             "test-file-name": [
-                "AceEtsComponentThreeTest.hap"
+                "ActsAceEtsComponentThreeTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

arkui/ace_ets_component_three/entry/src/main/ets/MainAbility/pages/PanGesture.ets

@@ -54,10 +54,7 @@ struct PanGestureExample {
     .translate({ x: this.offsetX, y: this.offsetY, z: 5 })
     .touchable(this.touchable)
     .gesture(
-    PanGesture({})
-      .setDirection(PanDirection.All)
-      .setDistance(1)
-      .setFingers(1)
+    PanGesture({ fingers: 1, direction: PanDirection.All, distance: 1 })
       .onActionStart((event: PanGestureEvent) => {
         console.info('Pan start')
         console.log('PanGesture globalX' + event.globalX);

arkui/ace_ets_component_three/entry/src/main/ets/MainAbility/pages/button.ets

@@ -19,7 +19,7 @@ import events_emitter from '@ohos.events.emitter';
 @Component
 struct ButtonExample {
   @State buttonTypeValue: ButtonType = ButtonType.Normal;
-  @State fontSizeValue: number = 20;
+  @State fontSizeValue: string = '20px';
   @State fontColorValue: Color = Color.Black;
   @State text: string = '';
   @State onClickValue: boolean = false;
@@ -120,6 +120,7 @@ struct ButtonExample {
         .width(200)
         .height(100)
         .fontSize(20)
+        .position({x: 50,y: 400})
         .onClick((event: ClickEvent) => {
           console.info(this.text = 'Click Point:' + '\n  screenX:' + event.screenX + '\n  screenY:' + event.screenY
           + '\n  x :' + event.x + '\n  y:' + event.y + '\ntarget:' + '\n  component globalPos：（'

arkui/ace_ets_component_three/entry/src/main/ets/test/ButtonJsunit.test.ets

@@ -75,7 +75,7 @@ export default function buttonJsunit() {
       let strJson = getInspectorByKey('button2');
       let obj = JSON.parse(strJson);
       console.info("[testButton03] component obj is: " + JSON.stringify(obj));
-      expect(obj.$attrs.fontSize).assertEqual('20');
+      expect(obj.$attrs.fontSize).assertEqual('20.00px');
       done();
     });
 
@@ -121,7 +121,7 @@ export default function buttonJsunit() {
       try {
         var eventData = {
           data: {
-            "fontSizeValue": 30,
+            "fontSizeValue": '30px',
           }
         }
         var innerEvent = {
@@ -137,7 +137,7 @@ export default function buttonJsunit() {
       let strJsonNew = getInspectorByKey('button2');
       let objNew = JSON.parse(strJsonNew);
       console.info("[testButton05] component objNew is: " + JSON.stringify(objNew));
-      expect(objNew.$attrs.fontSize).assertEqual('30');
+      expect(objNew.$attrs.fontSize).assertEqual('30.00px');
       done();
     });
 
@@ -163,7 +163,7 @@ export default function buttonJsunit() {
       let strJsonNew = getInspectorByKey('button2');
       let objNew = JSON.parse(strJsonNew);
       console.info("[testButton07] component objNew is: " + JSON.stringify(objNew));
-      expect(objNew.$attrs.fontSize).assertEqual('0');
+      expect(objNew.$attrs.fontSize).assertEqual('-1.00fp');
       done();
     });
 
@@ -173,7 +173,7 @@ export default function buttonJsunit() {
       try {
         var eventData = {
           data: {
-            "fontSizeValue": "121212121",
+            "fontSizeValue": "121212121px",
           }
         }
         var innerEvent = {
@@ -189,7 +189,7 @@ export default function buttonJsunit() {
       let strJsonNew = getInspectorByKey('button2');
       let objNew = JSON.parse(strJsonNew);
       console.info("[testButton08] component objNew is: " + JSON.stringify(objNew));
-      expect(objNew.$attrs.fontSize).assertEqual('121212121');
+      expect(objNew.$attrs.fontSize).assertEqual('121212121.00px');
       done();
     });
 
@@ -199,7 +199,7 @@ export default function buttonJsunit() {
       try {
         var eventData = {
           data: {
-            "fontSizeValue": "121212121vaas",
+            "fontSizeValue": "121212121px",
           }
         }
         var innerEvent = {
@@ -215,7 +215,7 @@ export default function buttonJsunit() {
       let strJsonNew = getInspectorByKey('button2');
       let objNew = JSON.parse(strJsonNew);
       console.info("[testButton09] component objNew is: " + JSON.stringify(objNew));
-      expect(objNew.$attrs.fontSize).assertEqual('121212121');
+      expect(objNew.$attrs.fontSize).assertEqual('121212121.00px');
       done();
     });
 
@@ -301,10 +301,10 @@ export default function buttonJsunit() {
         let event = JSON.parse(eventData.data.event);
         console.info("[testButton12] get event state result is: " + Math.trunc(event.screenY));
         console.info("[testButton12] get event state result is: " + Math.trunc(event.screenX));
-        expect(event.screenX).assertEqual(135)
-        expect(event.screenY).assertEqual(368.80340576171875)
+        expect(event.screenX).assertEqual(185)
+        expect(event.screenY).assertEqual(485)
         expect(event.x).assertEqual(100)
-        expect(event.y).assertEqual(31.196568154881163)
+        expect(event.y).assertEqual(50)
       }
       var innerEvent = {
         eventId: 4,

arkui/ace_ets_component_two/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("AceEtsComponentTwoTest") {
+ohos_js_hap_suite("ActsAceEtsComponentTwoTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":ace_ets_component_assets",
@@ -22,7 +22,7 @@ ohos_js_hap_suite("AceEtsComponentTwoTest") {
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "AceEtsComponentTwoTest"
+  hap_name = "ActsAceEtsComponentTwoTest"
 }
 ohos_js_assets("ace_ets_component_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

arkui/ace_ets_component_two/Test.json

@@ -10,7 +10,7 @@
     "kits": [
         {
             "test-file-name": [
-                "AceEtsComponentTwoTest.hap"
+                "ActsAceEtsComponentTwoTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

arkui/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/loadingProgress.ets

@@ -48,6 +48,7 @@ struct LoadingProgressExample {
         .width('90%')
         .key('LP')
       LoadingProgress()
+        .height(50)
         .color(Color.Black)
     }.width('100%').margin({ top: 6 })
   }

arkui/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/pageTransition.ets

@@ -70,7 +70,6 @@ struct PageTransitionExample1 {
 
   onPageShow() {
     console.info('active page show called');
-    events_emitter.on(stateChangeEvent, this.stateChangCallBack)
 
     var stateChangeEventOne = {
       eventId: 145,

arkui/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/search.ets

@@ -20,9 +20,14 @@ import events_emitter from '@ohos.events.emitter'
 struct SearchExample {
   @State changevalue: string= ''
   @State submitvalue: string= ''
-  @State controller: SearchController= new SearchController()
-  @State textFont:Font=10
-  @State searchButton:number=10
+  @State textFont:Font = {
+          size: 10,
+          weight: 10,
+          family: 'serif', 
+          style: FontStyle.Normal
+        }
+  @State searchButton:string = "10"
+  controller: SearchController= new SearchController()
 
   private stateChangCallBack = (eventData) => {
     console.info("search page state change called:" + JSON.stringify(eventData));

arkui/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/sourceType.ets

@@ -33,13 +33,13 @@ struct ClickExample {
           if (event.type === TouchType.Move) {
             this.eventType = 'Move'
           }
-          if (event.source === Unknown) {
+          if (event.source === SourceType.Unknown) {
             this.SourceType = 'Unknown'
           }
-          if (event.source === Mouse) {
+          if (event.source === SourceType.Mouse) {
             this.SourceType = 'Mouse'
           }
-          if (event.type === TouchScreen) {
+          if (event.type === SourceType.TouchScreen) {
             this.SourceType = 'TouchScreen'
           }
           console.info(this.text = 'source：' + event.source);

arkui/ace_ets_component_two/entry/src/main/ets/test/DatePickerJsunit.test.ets

@@ -56,17 +56,6 @@ export default function datePickerJsunit() {
       done();
     });
 
-    it('datePickerTest_0200', 0, async function (done) {
-      console.info('datePickerTest_0200 START');
-      let strJson = getInspectorByKey('datePicker');
-      console.info("datePickerTest_0200 component strJson:" + strJson);
-      let obj = JSON.parse(strJson);
-      console.info("datePickerTest_0200 component obj is: " + JSON.stringify(obj));
-      expect(obj.$attrs.useMilitaryTime).assertEqual('true');
-      console.info('datePickerTest_0200 END');
-      done();
-    });
-
     it('datePickerTest_0300', 0, async function (done) {
       console.info('datePickerTest_0300 START');
       try {

arkui/ace_ets_standard/entry/src/main/ets/MainAbility/pages/Button.ets

@@ -36,7 +36,7 @@ struct button_testcase {
         .fontSize(50)
         .fontWeight(FontWeight.Bold)
       Button('1.value', { type: ButtonType.Circle, stateEffect: this.stateEffect })
-        .fontSize(12)
+        .fontSize('12px')
         .fontWeight(FontWeight.Bold)
         .fontColor(0xCCCCCC)
         .height(40)

arkui/ace_ets_standard/entry/src/main/ets/test/ButtonJsunit.test.ets

@@ -71,7 +71,7 @@ export default function buttonJsunit() {
       expect(obj.$attrs.type).assertEqual('ButtonType.Circle')
       expect(obj.$attrs.stateEffect).assertEqual('true')
       expect(obj.$attrs.label).assertEqual('1.value')
-      expect(obj.$attrs.fontSize).assertEqual('12')
+      expect(obj.$attrs.fontSize).assertEqual('12.00px')
       console.info('cd buttonInspectorByKey END');
       done();
     });

arkui/ace_ets_standard/entry/src/main/ets/test/TextJsunit.test.ets

@@ -95,7 +95,7 @@ export default function textJsunit() {
       expect(obj.$attrs.fontFamily).assertEqual("sans-serif")
       expect(obj.$attrs.textAlign).assertEqual("TextAlign.End")
       expect(obj.$attrs.textOverflow).assertEqual("TextOverflow.Ellipsis")
-      expect(obj.$attrs.lineHeight).assertEqual("15")
+      expect(obj.$attrs.lineHeight).assertEqual("15.00fp")
       expect(obj.$attrs.baselineOffset).assertEqual("0")
       expect(obj.$attrs.maxLines).assertEqual("2")
       expect(obj.$attrs.textCase).assertEqual("TextCase.Normal")

arkui/ace_ets_test/entry/src/main/ets/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('false')
+      expect(obj.$attrs.editable).assertEqual('EditMode.None')
       console.info('++++++++++++++++ ListItem TestCase 3 End ++++++++++++++++');
       done();
     });

arkui/ace_ets_third_test/entry/src/main/ets/test/NavigationJsunit.test.ets

@@ -36,10 +36,12 @@ export default function navigationJsunit() {
     */
     beforeEach(async function (done) {
       console.info('[navigationTest] before each called')
+      await sleep(1)
       let options = {
         uri: 'pages/Navigation',
       }
       try {
+        router.clear();
         let result = router.push(options)
         console.info("push navigation page success " + JSON.stringify(result));
       } catch (err) {

arkui/ace_ets_xcomponent/entry/src/main/cpp/BUILD.gn

@@ -35,13 +35,17 @@ ohos_shared_library("nativerender") {
     "./render/egl_core.cpp",
     "./render/plugin_render.cpp",
   ]
-  if (target_cpu == "arm") {
-    libs = [ "${clang_base_path}/../libcxx-ndk/lib/arm-linux-ohos/c++/libc++_shared.so" ]
-  } else if (target_cpu == "arm64") {
-    libs = [ "${clang_base_path}/../libcxx-ndk/lib/aarch64-linux-ohos/c++/libc++_shared.so" ]
-  } else {
-    libs = []
+
+  if (!(product_name == "m40")) {
+    if (target_cpu == "arm") {
+      libs = [ "${clang_base_path}/../libcxx-ndk/lib/arm-linux-ohos/c++/libc++_shared.so" ]
+    } else if (target_cpu == "arm64") {
+      libs = [ "${clang_base_path}/../libcxx-ndk/lib/aarch64-linux-ohos/c++/libc++_shared.so" ]
+    } else {
+      libs = []
+    }
   }
+
   include_dirs = [
     ".",
     "./common",

arkui/ace_napi_test/entry/src/main/cpp/BUILD.gn

@@ -31,13 +31,16 @@ config("public_config") {
 
 ohos_shared_library("teststring") {
   sources = [ "./napi/test_string.cpp" ]
-  if (target_cpu == "arm") {
-    libs = [ "${clang_base_path}/../libcxx-ndk/lib/arm-linux-ohos/c++/libc++_shared.so" ]
-  } else if (target_cpu == "arm64") {
-    libs = [ "${clang_base_path}/../libcxx-ndk/lib/aarch64-linux-ohos/c++/libc++_shared.so" ]
-  } else {
-    libs = []
+  if (!(product_name == "m40")) {
+    if (target_cpu == "arm") {
+      libs = [ "${clang_base_path}/../libcxx-ndk/lib/arm-linux-ohos/c++/libc++_shared.so" ]
+    } else if (target_cpu == "arm64") {
+      libs = [ "${clang_base_path}/../libcxx-ndk/lib/aarch64-linux-ohos/c++/libc++_shared.so" ]
+    } else {
+      libs = []
+    }
   }
+
   include_dirs = [ "//test/xts/acts/arkui/ace_napi_test/entry/src/main/cpp" ]
   configs = [ ":config" ]
 

arkui/ace_standard/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ace_standard_test") {
+ohos_js_hap_suite("ActsAceStandardTest") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":ace_js_assets",

arkui/ace_standard/src/main/js/default/pages/toolbar/router/index.js

@@ -118,7 +118,7 @@ export default {
             style3:styleValue3,
             style4:styleValue4,
             style5:styleValue5,
-            style6:styleValue6,
+            style6:styleValue6
         }
     },
 

arkui/ace_standard_video/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ace_standard_video_test") {
+ohos_js_hap_suite("ActsAceStandardVideoTest") {
   hap_profile = "./src/main/config.json"
   deps = [
     ":ace_js_assets",