XTS失败用例适配

Signed-off-by: Nchengxingzhen <chengxingzhen@huawei.com>

ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhoste/entry/src/main/ets/MainAbility/pages/index.ets

@@ -191,7 +191,7 @@ struct Index {
               commonEvent.publish(this.formOnDynamicRefreshEvent, commonEventPublishData, this.formOnDynamicRefreshCallBack);
             })
             .catch((error) => {
-              console.info('formsystemhost refreshForm error:' + error);
+              console.info('formsystemhost refreshForm error:' + JSON.stringify(error));
               let commonEventPublishData = {
                 data: error.code.toString(),
                 parameters: {

ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/ets/MainAbility/test/FmsAcquireForm.test.ets

@@ -15,7 +15,7 @@
 
 import featureAbility from "@ohos.ability.featureAbility";
 import commonEvent from '@ohos.commonEvent';
-import { beforeEach, describe, expect, it } from "deccjsunit/index";
+import { beforeEach, afterEach, describe, expect, it } from "deccjsunit/index";
 
 var onErrorForm_Event = {
     events: ["FMS_FormOnError_commonEvent"],
@@ -30,6 +30,10 @@ var onSupplyEvent = {
     events: ["FMS_FormSupply_commonEvent"],
 };
 
+const unsubscribeCallback = (tcNumber) => {
+    console.info(`====>${tcNumber} unsubscribeCallback====>`);
+}
+
 var deleteForm_Event = "FMS_FormDelete_commonEvent";
 
 var subscriberOnError;
@@ -48,6 +52,14 @@ export default function test() {
             await sleep(1000);
         })
 
+        afterEach(async() => {
+            commonEvent.unsubscribe(subscriberOnError, () => unsubscribeCallback("afterEach unsubscribe subscriberOnError"));
+            commonEvent.unsubscribe(subscriberOnAcquired, () => unsubscribeCallback("afterEach unsubscribe subscriberOnAcquired"));
+            commonEvent.unsubscribe(subscriberCast, () => unsubscribeCallback("afterEach unsubscribe subscriberCast"));
+            commonEvent.unsubscribe(subscriberSupply, () => unsubscribeCallback("afterEach unsubscribe subscriberSupply"));
+            await sleep(1000);
+        })
+
         /**
          * @tc.number: FMS_acquireForm_0200
          * @tc.name: The form host does not have permission to use the form

ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/ets/MainAbility/test/FmsAcquireForm2.test.ets

@@ -15,7 +15,7 @@
 
 import featureAbility from "@ohos.ability.featureAbility";
 import commonEvent from '@ohos.commonEvent';
-import { beforeEach, describe, expect, it } from "deccjsunit/index";
+import { beforeEach, afterEach, describe, expect, it } from "deccjsunit/index";
 
 var onErrorForm_Event = {
     events: ["FMS_FormOnError_commonEvent"],
@@ -30,6 +30,10 @@ var onSupplyEvent = {
     events: ["FMS_FormSupply_commonEvent"],
 };
 
+const unsubscribeCallback = (tcNumber) => {
+    console.info(`====>${tcNumber} unsubscribeCallback====>`);
+}
+
 var deleteForm_Event = "FMS_FormDelete_commonEvent";
 
 var subscriberOnError;
@@ -37,6 +41,10 @@ var subscriberOnAcquired;
 var subscriberCast;
 var subscriberSupply;
 
+function sleep(time) {
+    return new Promise((resolve)=>setTimeout(resolve,time));
+  }
+
 export default function test() {
     describe(`FmsAcquiredFormTest2`, () => {
 
@@ -47,6 +55,14 @@ export default function test() {
             subscriberSupply = await commonEvent.createSubscriber(onSupplyEvent);
         })
 
+        afterEach(async() => {
+            commonEvent.unsubscribe(subscriberOnError, () => unsubscribeCallback("afterEach unsubscribe subscriberOnError"));
+            commonEvent.unsubscribe(subscriberOnAcquired, () => unsubscribeCallback("afterEach unsubscribe subscriberOnAcquired"));
+            commonEvent.unsubscribe(subscriberCast, () => unsubscribeCallback("afterEach unsubscribe subscriberCast"));
+            commonEvent.unsubscribe(subscriberSupply, () => unsubscribeCallback("afterEach unsubscribe subscriberSupply"));
+            await sleep(1000);
+        })
+
         /**
          * @tc.number: FMS_acquireForm_3800
          * @tc.name: Failed to add form when parameter ability is wrong.

ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdeletetest/entry/src/main/ets/MainAbility/test/FmsDeleteForm.test.ets

@@ -16,7 +16,7 @@
 import featureAbility from '@ohos.ability.featureAbility';
 import commonEvent from '@ohos.commonEvent';
 import systemTime from '@ohos.systemTime';
-import { beforeEach, describe, expect, it } from 'deccjsunit/index';
+import { beforeEach, afterEach, describe, expect, it } from 'deccjsunit/index';
 
 const onAcquiredForm_Event = {
     events: ["FMS_FormOnAcquired_commonEvent"],
@@ -31,6 +31,10 @@ const onSupplyEvent = {
     events: ["FMS_FormSupply_commonEvent"],
 };
 
+const unsubscribeCallback = (tcNumber) => {
+    console.info(`====>${tcNumber} unsubscribeCallback====>`);
+}
+
 const deleteForm_Event = "FMS_FormDelete_commonEvent";
 
 let subscriberOnAcquired;
@@ -49,6 +53,14 @@ export default function test() {
             await sleep(1000);
         });
 
+        afterEach(async() => {
+            commonEvent.unsubscribe(subscriberOnAcquired, () => unsubscribeCallback("afterEach unsubscribe subscriberOnAcquired"));
+            commonEvent.unsubscribe(subscriberOnReleased, () => unsubscribeCallback("afterEach unsubscribe subscriberOnReleased"));
+            commonEvent.unsubscribe(subscriberOnDeleted, () => unsubscribeCallback("afterEach unsubscribe subscriberOnDeleted"));
+            commonEvent.unsubscribe(subscriberSupply, () => unsubscribeCallback("afterEach unsubscribe subscriberSupply"));
+            await sleep(1000);
+        })
+
         /**
          * @tc.number: FMS_deleteForm_0200
          * @tc.name: host does not have permission

ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdynamicrefreshtest/entry/src/main/ets/MainAbility/test/FmsDynamicRefreshForm.test.ets

@@ -15,7 +15,7 @@
 
 import featureAbility from '@ohos.ability.featureAbility';
 import commonEvent from '@ohos.commonEvent';
-import { beforeEach, describe, expect, it } from 'deccjsunit/index';
+import { beforeEach, afterEach, describe, expect, it } from 'deccjsunit/index';
 
 const onAcquiredForm_Event = {
     events: ["FMS_FormOnAcquired_commonEvent"],
@@ -33,6 +33,10 @@ const onSupplyEvent = {
     events: ["FMS_FormSupply_commonEvent"],
 };
 
+const unsubscribeCallback = (tcNumber) => {
+    console.info(`====>${tcNumber} unsubscribeCallback====>`);
+}
+
 const deleteForm_Event = "FMS_FormDelete_commonEvent";
 
 let subscriberOnAcquired;
@@ -51,6 +55,14 @@ export default function test() {
             await sleep(1000);
         });
 
+        afterEach(async() => {
+            commonEvent.unsubscribe(subscriberOnAcquired, () => unsubscribeCallback("afterEach unsubscribe subscriberOnAcquired"));
+            commonEvent.unsubscribe(subscriberOnDeleted, () => unsubscribeCallback("afterEach unsubscribe subscriberOnDeleted"));
+            commonEvent.unsubscribe(subscriberOnRefresh, () => unsubscribeCallback("afterEach unsubscribe subscriberOnRefresh"));
+            commonEvent.unsubscribe(subscriberSupply, () => unsubscribeCallback("afterEach unsubscribe subscriberSupply"));
+            await sleep(1000);
+        })
+
         /**
          * @tc.number: FMS_timedRefresh_0100
          * @tc.name: formID id is error(formID < 0)

ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets

@@ -62,12 +62,12 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => {
           tempDataC = dataC[0];
           expect(error.code).assertEqual(ERR_OK_CODE);
           expect(error.message).assertEqual(ERR_OK);
-          console.log(`==========${callbackName} ${describeName} end==========`);
         });
         await sleep(2000)
         checkDataB(tempDataB)
         checkDataC(tempDataC)
         done();
+        console.log(`==========${callbackName} ${describeName} end==========`);
       } catch (error) {
         console.log(`${callbackName} exception caught: ${JSON.stringify(error)})`);
         console.log(`${callbackName} should not reach here`);
@@ -104,7 +104,8 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => {
         expect(dataC.length).assertEqual(1);
         tempDataB = dataB[0];
         tempDataC = dataC[0];
-
+        checkDataB(tempDataB)
+        checkDataC(tempDataC)
         done();
         console.log(`==========${promiseName} ${describeName} end==========`);
       } catch (error) {
@@ -126,15 +127,14 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => {
          expect(formInfo.isDefault).assertTrue()
          expect(formInfo.updateEnabled).assertTrue()
          expect(formInfo.formVisibleNotify).assertTrue()
-         expect(undefined).assertEqual(formInfo.relatedBundleName)
+         expect('').assertEqual(formInfo.relatedBundleName)
          expect("abilityb").assertEqual(formInfo.formConfigAbility)
          expect(3).assertEqual(formInfo.updateDuration)
          expect(2).assertEqual(formInfo.defaultDimension)
          expect('10:30').assertEqual(formInfo.scheduledUpdateTime)
          expect(1).assertEqual(formInfo.supportDimensions[0])
          expect(2).assertEqual(formInfo.supportDimensions[1])
-         expect('originWidgetNameB').assertEqual(formInfo.customizeData[0].name)
-         expect('valueB').assertEqual(formInfo.customizeData[0].value)
+         expect('valueB').assertEqual(formInfo.customizeData.originWidgetNameB)
       }
     function checkDataC(formInfo){
          expect("com.ohos.st.formsystemproviderc").assertEqual(formInfo.bundleName)
@@ -148,15 +148,14 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => {
          expect(formInfo.isDefault).assertTrue()
          expect(formInfo.updateEnabled).assertTrue()
          expect(formInfo.formVisibleNotify).assertTrue()
-         expect(undefined).assertEqual(formInfo.relatedBundleName)
+         expect('').assertEqual(formInfo.relatedBundleName)
          expect("abilityc").assertEqual(formInfo.formConfigAbility)
          expect(4).assertEqual(formInfo.updateDuration)
          expect('15:30').assertEqual(formInfo.scheduledUpdateTime)
          expect(3).assertEqual(formInfo.defaultDimension)
          expect(3).assertEqual(formInfo.supportDimensions[0])
          expect(4).assertEqual(formInfo.supportDimensions[1])
-         expect('originWidgetNameC').assertEqual(formInfo.customizeData[0].name)
-         expect('valueC').assertEqual(formInfo.customizeData[0].value)
+         expect('valueC').assertEqual(formInfo.customizeData.originWidgetNameC)
       }
   });
 };

ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/GetFormsInfo.test.ets

@@ -236,15 +236,14 @@ export const getFormsInfoTest = (describeName, filterParameter) => {
          expect(formInfo.isDefault).assertTrue()
          expect(formInfo.updateEnabled).assertTrue()
          expect(formInfo.formVisibleNotify).assertTrue()
-         expect(undefined).assertEqual(formInfo.relatedBundleName)
+         expect('').assertEqual(formInfo.relatedBundleName)
          expect("abilityb").assertEqual(formInfo.formConfigAbility)
          expect(3).assertEqual(formInfo.updateDuration)
          expect(2).assertEqual(formInfo.defaultDimension)
          expect('10:30').assertEqual(formInfo.scheduledUpdateTime)
          expect(1).assertEqual(formInfo.supportDimensions[0])
          expect(2).assertEqual(formInfo.supportDimensions[1])
-         expect('originWidgetNameB').assertEqual(formInfo.customizeData[0].name)
-         expect('valueB').assertEqual(formInfo.customizeData[0].value)
+         expect('valueB').assertEqual(formInfo.customizeData.originWidgetNameB)
       }
 
     /**
@@ -517,14 +516,13 @@ export const getFormsInfoTest = (describeName, filterParameter) => {
          expect(formInfo.isDefault).assertTrue()
          expect(formInfo.updateEnabled).assertTrue()
          expect(formInfo.formVisibleNotify).assertTrue()
-         expect(undefined).assertEqual(formInfo.relatedBundleName)
+         expect('').assertEqual(formInfo.relatedBundleName)
          expect("abilityc").assertEqual(formInfo.formConfigAbility)
          expect(4).assertEqual(formInfo.updateDuration)
          expect(3).assertEqual(formInfo.defaultDimension)
          expect(3).assertEqual(formInfo.supportDimensions[0])
          expect(4).assertEqual(formInfo.supportDimensions[1])
-         expect('originWidgetNameC').assertEqual(formInfo.customizeData[0].name)
-         expect('valueC').assertEqual(formInfo.customizeData[0].value)
+         expect('valueC').assertEqual(formInfo.customizeData.originWidgetNameC)
       }
   });
 };

ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets

@@ -132,15 +132,14 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => {
          expect(formInfo.isDefault).assertTrue()
          expect(formInfo.updateEnabled).assertTrue()
          expect(formInfo.formVisibleNotify).assertTrue()
-         expect(undefined).assertEqual(formInfo.relatedBundleName)
+         expect('').assertEqual(formInfo.relatedBundleName)
          expect("abilityb").assertEqual(formInfo.formConfigAbility)
          expect(3).assertEqual(formInfo.updateDuration)
          expect(2).assertEqual(formInfo.defaultDimension)
          expect('10:30').assertEqual(formInfo.scheduledUpdateTime)
          expect(1).assertEqual(formInfo.supportDimensions[0])
          expect(2).assertEqual(formInfo.supportDimensions[1])
-         expect('originWidgetNameB').assertEqual(formInfo.customizeData[0].name)
-         expect('valueB').assertEqual(formInfo.customizeData[0].value)
+         expect('valueB').assertEqual(formInfo.customizeData.originWidgetNameB)
       }
 
       function checkDataA1(formInfo){
@@ -155,15 +154,14 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => {
          expect(formInfo.isDefault).assertTrue()
          expect(formInfo.updateEnabled).assertTrue()
          expect(formInfo.formVisibleNotify).assertTrue()
-         expect(undefined).assertEqual(formInfo.relatedBundleName)
+         expect('').assertEqual(formInfo.relatedBundleName)
          expect("abilitya01").assertEqual(formInfo.formConfigAbility)
          expect(1).assertEqual(formInfo.updateDuration)
          expect(1).assertEqual(formInfo.defaultDimension)
          expect('5:30').assertEqual(formInfo.scheduledUpdateTime)
          expect(1).assertEqual(formInfo.supportDimensions[0])
          expect(3).assertEqual(formInfo.supportDimensions[1])
-         expect('originWidgetNameA01').assertEqual(formInfo.customizeData[0].name)
-         expect('valueA01').assertEqual(formInfo.customizeData[0].value)
+         expect('valueA01').assertEqual(formInfo.customizeData.originWidgetNameA01)
       }
 
       function checkDataA2(formInfo){
@@ -178,7 +176,7 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => {
          expect(formInfo.isDefault).assertFalse()
          expect(formInfo.updateEnabled).assertFalse()
          expect(formInfo.formVisibleNotify).assertFalse()
-         expect(undefined).assertEqual(formInfo.relatedBundleName)
+         expect('').assertEqual(formInfo.relatedBundleName)
          expect("abilitya02").assertEqual(formInfo.formConfigAbility)
          expect(2).assertEqual(formInfo.updateDuration)
          expect(4).assertEqual(formInfo.defaultDimension)
@@ -187,8 +185,7 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => {
          expect(2).assertEqual(formInfo.supportDimensions[1])
          expect(3).assertEqual(formInfo.supportDimensions[2])
          expect(4).assertEqual(formInfo.supportDimensions[3])
-         expect('originWidgetNameA02').assertEqual(formInfo.customizeData[0].name)
-         expect('valueA02').assertEqual(formInfo.customizeData[0].value)
+         expect('valueA02').assertEqual(formInfo.customizeData.originWidgetNameA02)
       }
   });
 };

ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets

@@ -122,15 +122,14 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => {
          expect(formInfo.isDefault).assertTrue()
          expect(formInfo.updateEnabled).assertTrue()
          expect(formInfo.formVisibleNotify).assertTrue()
-         expect(undefined).assertEqual(formInfo.relatedBundleName)
+         expect('').assertEqual(formInfo.relatedBundleName)
          expect("abilityb").assertEqual(formInfo.formConfigAbility)
          expect(3).assertEqual(formInfo.updateDuration)
          expect(2).assertEqual(formInfo.defaultDimension)
          expect('10:30').assertEqual(formInfo.scheduledUpdateTime)
          expect(1).assertEqual(formInfo.supportDimensions[0])
          expect(2).assertEqual(formInfo.supportDimensions[1])
-         expect('originWidgetNameB').assertEqual(formInfo.customizeData[0].name)
-         expect('valueB').assertEqual(formInfo.customizeData[0].value)
+         expect('valueB').assertEqual(formInfo.customizeData.originWidgetNameB)
       }
   });
 };

ability/ability_runtime/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/ets/MainAbility/test/FmsHostDeathRecipient.test.ets

@@ -15,7 +15,7 @@
 
 import featureAbility from '@ohos.ability.featureAbility';
 import commonEvent from '@ohos.commonEvent';
-import { beforeEach, describe, expect, it } from 'deccjsunit/index';
+import { beforeEach, afterEach, describe, expect, it } from 'deccjsunit/index';
 
 const onAcquiredEvent = {
     events: [`FMS_FormOnAcquired_commonEvent`],
@@ -28,6 +28,11 @@ const onRequestEvent = {
 };
 const formOnTerminateEvent = `FMS_FormTerminate_commonEvent`;
 
+const unsubscribeCallback = (tcNumber) => {
+    console.info(`====>${tcNumber} unsubscribeCallback====>`);
+}
+
+
 let tcNumber;
 let hostCounter;
 let providerCounter;
@@ -47,6 +52,13 @@ export default function test() {
             onRequestEventSubscriber = await commonEvent.createSubscriber(onRequestEvent);
         });
 
+        afterEach(async() => {
+            commonEvent.unsubscribe(onAcquiredEventSubscriber, () => unsubscribeCallback("afterEach unsubscribe onAcquiredEventSubscriber"));
+            commonEvent.unsubscribe(onSupplyEventSubscriber, () => unsubscribeCallback("afterEach unsubscribe onSupplyEventSubscriber"));
+            commonEvent.unsubscribe(onRequestEventSubscriber, () => unsubscribeCallback("afterEach unsubscribe onRequestEventSubscriber"));
+            await sleep(1000);
+        })
+
         /**
          * @tc.number: FMS_hostDeathRecipient_0200
          * @tc.name: Reset host ability and requestForm.

ability/ability_runtime/formmanager/fa/formsystemtest_ets/formperformancetest/entry/src/main/ets/MainAbility/test/FmsPerformanceTest.test.ets

@@ -17,7 +17,7 @@ import featureAbility from '@ohos.ability.featureAbility';
 import formHost from '@ohos.application.formHost';
 import commonEvent from '@ohos.commonEvent';
 import systemTime from '@ohos.systemTime';
-import { beforeEach, describe, expect, it } from 'deccjsunit/index';
+import { beforeEach, afterEach, describe, expect, it } from 'deccjsunit/index';
 
 const onAcquiredEvent = {
     events: [`FMS_FormOnAcquired_commonEvent`],
@@ -38,9 +38,17 @@ const publishOnDeleteCallback = (tcNumber, done) => {
     done();
 }
 
+const unsubscribeCallback = (tcNumber) => {
+    console.info(`====>${tcNumber} unsubscribeCallback====>`);
+}
+
 let onAcquiredEventSubscriber;
 let onSupplyEventSubscriber;
 
+function sleep(time) {
+    return new Promise((resolve)=>setTimeout(resolve,time));
+  }
+
 export default function test() {
     describe(`FmsPerformanceTest`, () => {
 
@@ -49,6 +57,12 @@ export default function test() {
             onSupplyEventSubscriber = await commonEvent.createSubscriber(onSupplyEvent);
         });
 
+        afterEach(async() => {
+            commonEvent.unsubscribe(onAcquiredEventSubscriber, () => unsubscribeCallback("afterEach unsubscribe onAcquiredEventSubscriber"));
+            commonEvent.unsubscribe(onSupplyEventSubscriber, () => unsubscribeCallback("afterEach unsubscribe onSupplyEventSubscriber"));
+            await sleep(1000);
+        })
+
         /**
          * @tc.number: FMS_performanceTest_0100
          * @tc.name: Performance test.

ability/ability_runtime/formmanager/fa/formsystemtest_ets/formreleasetest/entry/src/main/ets/MainAbility/test/FmsReleaseForm.test.ets

@@ -15,7 +15,7 @@
 
 import featureAbility from "@ohos.ability.featureAbility";
 import commonEvent from '@ohos.commonEvent';
-import { beforeAll, beforeEach, describe, expect, it } from "deccjsunit/index";
+import { beforeAll, beforeEach, afterEach, describe, expect, it } from "deccjsunit/index";
 
 var onAcquiredForm_Event = {
     events: ["FMS_FormOnAcquired_commonEvent"],
@@ -28,6 +28,10 @@ var onReleasedFormEvent = {
 };
 var deleteForm_Event = "FMS_FormDelete_commonEvent";
 
+const unsubscribeCallback = (tcNumber) => {
+    console.info(`====>${tcNumber} unsubscribeCallback====>`);
+}
+
 var subscriberOnAcquired;
 var subscriberOnDeleted;
 var subscriberOnReleased;
@@ -45,6 +49,14 @@ export default function test() {
             subscriberOnAcquired = await commonEvent.createSubscriber(onAcquiredForm_Event);
             subscriberOnDeleted = await commonEvent.createSubscriber(onDeletedFormEvent);
             subscriberOnReleased = await commonEvent.createSubscriber(onReleasedFormEvent);
+            await sleep(1000);
+        })
+
+        afterEach(async() => {
+            commonEvent.unsubscribe(subscriberOnAcquired, () => unsubscribeCallback("afterEach unsubscribe subscriberOnAcquired"));
+            commonEvent.unsubscribe(subscriberOnDeleted, () => unsubscribeCallback("afterEach unsubscribe subscriberOnDeleted"));
+            commonEvent.unsubscribe(subscriberOnReleased, () => unsubscribeCallback("afterEach unsubscribe subscriberOnReleased"));
+            await sleep(1000);
         })
 
         /**

ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/ets/MainAbility/test/FmsFormStateDisable.test.ets

@@ -15,7 +15,7 @@
 
 import featureAbility from "@ohos.ability.featureAbility";
 import commonEvent from '@ohos.commonEvent';
-import { beforeAll, beforeEach, describe, expect, it } from "deccjsunit/index";
+import { beforeAll, beforeEach, afterEach, describe, expect, it } from "deccjsunit/index";
 
 var onAcquiredForm_Event = {
     events: ["FMS_FormOnAcquired_commonEvent"],
@@ -33,6 +33,10 @@ var onSupplyEvent = {
     events: ["FMS_FormSupply_commonEvent"],
 };
 
+const unsubscribeCallback = (tcNumber) => {
+    console.info(`====>${tcNumber} unsubscribeCallback====>`);
+}
+
 var deleteForm_Event = "FMS_FormDelete_commonEvent";
 
 var subscriberOnAcquired;
@@ -55,6 +59,14 @@ export default function test() {
             await sleep(1000);
         })
 
+        afterEach(async() => {
+            commonEvent.unsubscribe(subscriberOnAcquired, () => unsubscribeCallback("afterEach unsubscribe subscriberOnAcquired"));
+            commonEvent.unsubscribe(subscriberDel, () => unsubscribeCallback("afterEach unsubscribe subscriberDel"));
+            commonEvent.unsubscribe(subscriberOnState, () => unsubscribeCallback("afterEach unsubscribe subscriberOnState"));
+            commonEvent.unsubscribe(subscriberSupply, () => unsubscribeCallback("afterEach unsubscribe subscriberSupply"));
+            await sleep(1000);
+        })
+
         /**
          * @tc.number: FMS_disableFormsUpdate_0200
          * @tc.name: The form user does not have permission.

ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/ets/MainAbility/test/FmsFormStateEnable.test.ets

@@ -15,7 +15,7 @@
 
 import featureAbility from "@ohos.ability.featureAbility";
 import commonEvent from '@ohos.commonEvent';
-import { beforeAll, beforeEach, describe, expect, it } from "deccjsunit/index";
+import { beforeAll, beforeEach, afterEach, describe, expect, it } from "deccjsunit/index";
 
 var onAcquiredForm_Event = {
     events: ["FMS_FormOnAcquired_commonEvent"],
@@ -33,6 +33,10 @@ var onSupplyEvent = {
     events: ["FMS_FormSupply_commonEvent"],
 };
 
+const unsubscribeCallback = (tcNumber) => {
+    console.info(`====>${tcNumber} unsubscribeCallback====>`);
+}
+
 var deleteForm_Event = "FMS_FormDelete_commonEvent";
 
 var subscriberOnAcquired;
@@ -55,6 +59,13 @@ export default function test() {
             await sleep(1000);
         })
 
+        afterEach(async() => {
+            commonEvent.unsubscribe(subscriberOnAcquired, () => unsubscribeCallback("afterEach unsubscribe subscriberOnAcquired"));
+            commonEvent.unsubscribe(subscriberDel, () => unsubscribeCallback("afterEach unsubscribe subscriberDel"));
+            commonEvent.unsubscribe(subscriberOnState, () => unsubscribeCallback("afterEach unsubscribe subscriberOnState"));
+            commonEvent.unsubscribe(subscriberSupply, () => unsubscribeCallback("afterEach unsubscribe subscriberSupply"));
+            await sleep(1000);
+        })
         /**
          * @tc.number: FMS_enableFormsUpdate_0200
          * @tc.name: The form user does not have permission.

ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/ets/MainAbility/test/FmsFormStateNotifyInvisible.test.ets

@@ -15,7 +15,7 @@
 
 import featureAbility from "@ohos.ability.featureAbility";
 import commonEvent from '@ohos.commonEvent';
-import { describe, beforeEach, expect, it } from "deccjsunit/index";
+import { describe, afterEach, beforeEach, expect, it } from "deccjsunit/index";
 
 var onAcquiredForm_Event = {
     events: ["FMS_FormOnAcquired_commonEvent"],
@@ -33,6 +33,10 @@ var onSupplyEvent = {
     events: ["FMS_FormSupply_commonEvent"],
 };
 
+const unsubscribeCallback = (tcNumber) => {
+    console.info(`====>${tcNumber} unsubscribeCallback====>`);
+}
+
 var deleteForm_Event = "FMS_FormDelete_commonEvent";
 
 var subscriberOnAcquired;
@@ -51,6 +55,13 @@ export default function test() {
             await sleep(1000);
         })
 
+        afterEach(async() => {
+            commonEvent.unsubscribe(subscriberOnAcquired, () => unsubscribeCallback("afterEach unsubscribe subscriberOnAcquired"));
+            commonEvent.unsubscribe(subscriberDel, () => unsubscribeCallback("afterEach unsubscribe subscriberDel"));
+            commonEvent.unsubscribe(subscriberOnState, () => unsubscribeCallback("afterEach unsubscribe subscriberOnState"));
+            commonEvent.unsubscribe(subscriberSupply, () => unsubscribeCallback("afterEach unsubscribe subscriberSupply"));
+            await sleep(1000);
+        })
         /**
          * @tc.number: FMS_notifyInvisibleForms_0200
          * @tc.name: The form user does not have permission.

ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/ets/MainAbility/test/FmsFormStateNotifyInvisible2.test.ets

@@ -15,7 +15,7 @@
 
 import featureAbility from "@ohos.ability.featureAbility";
 import commonEvent from '@ohos.commonEvent';
-import { beforeEach, describe, expect, it } from "deccjsunit/index";
+import { beforeEach, afterEach, describe, expect, it } from "deccjsunit/index";
 
 var onAcquiredForm_Event = {
     events: ["FMS_FormOnAcquired_commonEvent"],
@@ -29,6 +29,10 @@ var onSupplyEvent = {
     events: ["FMS_FormSupply_commonEvent"],
 };
 
+const unsubscribeCallback = (tcNumber) => {
+    console.info(`====>${tcNumber} unsubscribeCallback====>`);
+}
+
 var deleteForm_Event = "FMS_FormDelete_commonEvent";
 
 var subscriberOnAcquired;
@@ -46,6 +50,12 @@ export default function test() {
             await sleep(1000);
         })
 
+        afterEach(async() => {
+            commonEvent.unsubscribe(subscriberOnAcquired, () => unsubscribeCallback("afterEach unsubscribe subscriberOnAcquired"));
+            commonEvent.unsubscribe(subscriberOnState, () => unsubscribeCallback("afterEach unsubscribe subscriberOnState"));
+            commonEvent.unsubscribe(subscriberSupply, () => unsubscribeCallback("afterEach unsubscribe subscriberSupply"));
+            await sleep(1000);
+        })
         /**
          * @tc.number: FMS_notifyInvisibleForms_0900
          * @tc.name: There are correct and wrong formId in the form ID parameter list

ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/ets/MainAbility/test/FmsFormStateNotifyVisible.test.ets

@@ -15,7 +15,7 @@
 
 import featureAbility from "@ohos.ability.featureAbility";
 import commonEvent from '@ohos.commonEvent';
-import { beforeAll, beforeEach, describe, expect, it } from "deccjsunit/index";
+import { beforeAll, beforeEach, afterEach, describe, expect, it } from "deccjsunit/index";
 
 var onAcquiredForm_Event = {
     events: ["FMS_FormOnAcquired_commonEvent"],
@@ -29,6 +29,10 @@ var onSupplyEvent = {
     events: ["FMS_FormSupply_commonEvent"],
 };
 
+const unsubscribeCallback = (tcNumber) => {
+    console.info(`====>${tcNumber} unsubscribeCallback====>`);
+}
+
 var deleteForm_Event = "FMS_FormDelete_commonEvent";
 
 var subscriberOnAcquired;
@@ -49,7 +53,12 @@ export default function test() {
             await sleep(1000);
         })
 
-
+        afterEach(async() => {
+            commonEvent.unsubscribe(subscriberOnAcquired, () => unsubscribeCallback("afterEach unsubscribe subscriberOnAcquired"));
+            commonEvent.unsubscribe(subscriberOnState, () => unsubscribeCallback("afterEach unsubscribe subscriberOnState"));
+            commonEvent.unsubscribe(subscriberSupply, () => unsubscribeCallback("afterEach unsubscribe subscriberSupply"));
+            await sleep(1000);
+        })
         /**
          * @tc.number: FMS_notifyVisibleForms_0200
          * @tc.name: The form user does not have permission.

ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/ets/MainAbility/test/FmsStress.test.ets

@@ -16,7 +16,7 @@
 import featureAbility from '@ohos.ability.featureAbility';
 import formHost from '@ohos.application.formHost';
 import commonEvent from '@ohos.commonEvent';
-import { beforeEach, describe, expect, it } from 'deccjsunit/index';
+import { beforeEach, afterEach, describe, expect, it } from 'deccjsunit/index';
 
 const onDeletedEvent = {
     events: [`FMS_FormOnDeleted_commonEvent`]
@@ -29,6 +29,10 @@ const onSupplyEvent = {
 };
 const formOnDeleteEvent = `FMS_FormDelete_commonEvent`;
 
+const unsubscribeCallback = (tcNumber) => {
+    console.info(`====>${tcNumber} unsubscribeCallback====>`);
+}
+
 const unsubscribeOnDeletedCallback = (tcNumber, done) => {
     console.info(`${tcNumber} unsubscribeOnDeleted Callback`);
     done();
@@ -47,6 +51,10 @@ let onDeletedEventSubscriber;
 let onAcquiredEventSubscriber;
 let onSupplyEventSubscriber;
 
+function sleep(time) {
+    return new Promise((resolve)=>setTimeout(resolve,time));
+  }
+
 export default function test() {
     describe(`FmsStressTest`, () => {
 
@@ -56,6 +64,13 @@ export default function test() {
             onSupplyEventSubscriber = await commonEvent.createSubscriber(onSupplyEvent);
         });
 
+        afterEach(async() => {
+            commonEvent.unsubscribe(onDeletedEventSubscriber, () => unsubscribeCallback("afterEach unsubscribe onDeletedEventSubscriber"));
+            commonEvent.unsubscribe(onAcquiredEventSubscriber, () => unsubscribeCallback("afterEach unsubscribe onAcquiredEventSubscriber"));
+            commonEvent.unsubscribe(onSupplyEventSubscriber, () => unsubscribeCallback("afterEach unsubscribe onSupplyEventSubscriber"));
+            await sleep(1000);
+        })
+
         const subscribeDeletedEvent = (tcNumber, expectedDeletedFormAmount, done) => {
             commonEvent.subscribe(onDeletedEventSubscriber, async (err, data) => {
                 const formIds = data.parameters.formIds;

ability/ability_runtime/formmanager/fa/formsystemtest_ets/formupdatefreshtest/entry/src/main/ets/MainAbility/test/FmsUpdateRefreshForm.test.ets

@@ -15,7 +15,7 @@
 
 import featureAbility from "@ohos.ability.featureAbility";
 import commonEvent from '@ohos.commonEvent';
-import { beforeAll, beforeEach, describe, expect, it } from "deccjsunit/index";
+import { beforeAll, beforeEach, afterEach, describe, expect, it } from "deccjsunit/index";
 
 var onAcquiredForm_Event = {
     events: ["FMS_FormOnAcquired_commonEvent"],
@@ -30,6 +30,10 @@ var onRequestFormEvent = {
     events: ["FMS_FormOnRequest_commonEvent"],
 };
 
+const unsubscribeCallback = (tcNumber) => {
+    console.info(`====>${tcNumber} unsubscribeCallback====>`);
+}
+
 var deleteForm_Event = "FMS_FormDelete_commonEvent";
 
 
@@ -38,6 +42,10 @@ var subscriberOnDeleted;
 var subscriberOnRefresh;
 var subscriberOnRequest;
 
+function sleep(time) {
+    return new Promise((resolve)=>setTimeout(resolve,time));
+  }
+
 export default function test() {
     describe(`FmsUpdateRefreshFormTest`, () => {
 
@@ -52,6 +60,13 @@ export default function test() {
             subscriberOnRequest = await commonEvent.createSubscriber(onRequestFormEvent);
         })
 
+        afterEach(async() => {
+            commonEvent.unsubscribe(subscriberOnAcquired, () => unsubscribeCallback("afterEach unsubscribe subscriberOnAcquired"));
+            commonEvent.unsubscribe(subscriberOnDeleted, () => unsubscribeCallback("afterEach unsubscribe subscriberOnDeleted"));
+            commonEvent.unsubscribe(subscriberOnRefresh, () => unsubscribeCallback("afterEach unsubscribe subscriberOnRefresh"));
+            commonEvent.unsubscribe(subscriberOnRequest, () => unsubscribeCallback("afterEach unsubscribe subscriberOnRequest"));
+            await sleep(1000);
+        })
         /**
          * @tc.number: FMS_updateForm_0100
          * @tc.name: formID id is error(formID < 0)