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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,7 +30,7 @@ export default function badgeJsunit() {
   }
 
   describe('badgeTest', function () {
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Badge',
       }
@@ -38,7 +38,7 @@ export default function badgeJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get Badge state success " + JSON.stringify(pages));
-        if(!("Badge" == pages.name)){
+        if (!("Badge" == pages.name)) {
           console.info("get Badge state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Badge page success " + JSON.stringify(result));
@@ -47,11 +47,12 @@ export default function badgeJsunit() {
         console.error("push Badge page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Badge after each called");
     });
 
     /**
@@ -112,5 +113,7 @@ export default function badgeJsunit() {
       console.info('testGetInspectorByKey END');
       done();
     });
-  })
+  }
+
+  )
 }

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,7 +30,7 @@ export default function blankJsunit() {
   }
 
   describe('BlankTest', function () {
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Blank',
       }
@@ -38,7 +38,7 @@ export default function blankJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get Blank state success " + JSON.stringify(pages));
-        if(!("Blank" == pages.name)){
+        if (!("Blank" == pages.name)) {
           console.info("get Blank state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Blank page success " + JSON.stringify(result));
@@ -47,11 +47,12 @@ export default function blankJsunit() {
         console.error("push Blank page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Blank after each called");
     });
 
     /**

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,7 +30,7 @@ export default function buttonJsunit() {
   }
 
   describe('buttonTest', function () {
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Button',
       }
@@ -38,7 +38,7 @@ export default function buttonJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get Button state success " + JSON.stringify(pages));
-        if(!("Button" == pages.name)){
+        if (!("Button" == pages.name)) {
           console.info("get Button state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Button page success " + JSON.stringify(result));
@@ -47,11 +47,12 @@ export default function buttonJsunit() {
         console.error("push Button page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Button after each called");
     });
 
     /**

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,7 +30,7 @@ export default function columnJsunit() {
   }
 
   describe('columnTest', function () {
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Column',
       }
@@ -38,7 +38,7 @@ export default function columnJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get Column state success " + JSON.stringify(pages));
-        if(!("Column" == pages.name)){
+        if (!("Column" == pages.name)) {
           console.info("get Column state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Column page success " + JSON.stringify(result));
@@ -47,11 +47,12 @@ export default function columnJsunit() {
         console.error("push Column page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Column after each called");
     });
 
     /**

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,7 +30,7 @@ export default function columnSplitJsunit() {
   }
 
   describe('columnSplitTest', function () {
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/ColumnSplit',
       }
@@ -38,7 +38,7 @@ export default function columnSplitJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get ColumnSplit state success " + JSON.stringify(pages));
-        if(!("ColumnSplit" == pages.name)){
+        if (!("ColumnSplit" == pages.name)) {
           console.info("get ColumnSplit state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push ColumnSplit page success " + JSON.stringify(result));
@@ -47,11 +47,12 @@ export default function columnSplitJsunit() {
         console.error("push ColumnSplit page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("ColumnSplit after each called");
     });
 
     /**

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,7 +30,7 @@ export default function counterJsunit() {
   }
 
   describe('counterTest', function () {
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Counter',
       }
@@ -38,7 +38,7 @@ export default function counterJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get Counter state success " + JSON.stringify(pages));
-        if(!("Counter" == pages.name)){
+        if (!("Counter" == pages.name)) {
           console.info("get Counter state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Counter page success " + JSON.stringify(result));
@@ -47,11 +47,12 @@ export default function counterJsunit() {
         console.error("push Counter page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Counter after each called");
     });
 
     /**

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,15 +30,15 @@ export default function datapanelJsunit() {
   }
 
   describe('dataPanelTest', function () {
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/DataPanel',
       }
-            try {
+      try {
         router.clear();
         let pages = router.getState();
         console.info("get DataPanel state success " + JSON.stringify(pages));
-        if(!("DataPanel" == pages.name)){
+        if (!("DataPanel" == pages.name)) {
           console.info("get DataPanel state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push DataPanel page success " + JSON.stringify(result));
@@ -47,11 +47,12 @@ export default function datapanelJsunit() {
         console.error("push DataPanel page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("DataPanel after each called");
     });
 
     /**

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,7 +30,7 @@ export default function dividerJsunit() {
   }
 
   describe('dividerTest', function () {
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Divider',
       }
@@ -38,19 +38,21 @@ export default function dividerJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get divider state success " + JSON.stringify(pages));
-        if(!("Divider" == pages.name)){
+        if (!("Divider" == pages.name)) {
           console.info("get divider state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
-          console.info("push divider page success " + JSON.stringify(result));}
+          console.info("push divider page success " + JSON.stringify(result));
+        }
       } catch (err) {
         console.error("push divider page error " + JSON.stringify(result));
       }
       await sleep(1)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Divider after each called");
     });
     /**
      * @tc.number    SUB_ACE_BASIC_ETS_API_0750

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,7 +30,7 @@ export default function flexJsunit() {
   }
 
   describe('flexTest', function () {
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Flex',
       }
@@ -38,7 +38,7 @@ export default function flexJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get Flex state success " + JSON.stringify(pages));
-        if(!("Flex" == pages.name)){
+        if (!("Flex" == pages.name)) {
           console.info("get Flex state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Flex page success " + JSON.stringify(result));
@@ -47,11 +47,12 @@ export default function flexJsunit() {
         console.error("push Flex page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Flex after each called");
     });
     /**
      * @tc.number    SUB_ACE_BASIC_ETS_API_0770

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,7 +30,7 @@ export default function gridContainerJsunit() {
   }
 
   describe('gridContainerTest', function () {
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/GridContainer',
       }
@@ -38,7 +38,7 @@ export default function gridContainerJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get GridContainer state success " + JSON.stringify(pages));
-        if(!("GridContainer" == pages.name)){
+        if (!("GridContainer" == pages.name)) {
           console.info("get GridContainer state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push GridContainer page success " + JSON.stringify(result));
@@ -47,11 +47,12 @@ export default function gridContainerJsunit() {
         console.error("push GridContainer page error " + JSON.stringify(result));
       }
       await sleep(1)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("GridContainer after each called");
     });
     /**
      * @tc.number    SUB_ACE_BASIC_ETS_API_0830

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,7 +30,7 @@ export default function imageJsunit() {
   }
 
   describe('imageTest', function () {
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Image',
       }
@@ -38,7 +38,7 @@ export default function imageJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get Image state success " + JSON.stringify(pages));
-        if(!("Image" == pages.name)){
+        if (!("Image" == pages.name)) {
           console.info("get Image state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Image page success " + JSON.stringify(result));
@@ -47,11 +47,12 @@ export default function imageJsunit() {
         console.error("push image page error " + JSON.stringify(result));
       }
       await sleep(1)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Image after each called");
     });
 
     /**

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,7 +30,7 @@ export default function panelJsunit() {
   }
 
   describe('panelTest', function () {
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Panel',
       }
@@ -38,20 +38,21 @@ export default function panelJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get Panel state success " + JSON.stringify(pages));
-        if(!("Panel" == pages.name)){
+        if (!("Panel" == pages.name)) {
           console.info("get Panel state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Panel page success " + JSON.stringify(result));
         }
       } catch (err) {
         console.error(JSON.stringify(result));
-      }  
+      }
       await sleep(1)
+      done()
     });
-    
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Panel after each called");
     });
     /**
      * @tc.number    SUB_ACE_BASIC_ETS_API_0930

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,15 +30,15 @@ export default function progressJsunit() {
   }
 
   describe('progressTest', function () {
-    beforeEach(async function{
-       let options = {
+    beforeEach(async function (done) {
+      let options = {
         uri: 'pages/Progress',
       }
       try {
         router.clear();
         let pages = router.getState();
         console.info("get Progress state success " + JSON.stringify(pages));
-        if(!("Progress" == pages.name)){
+        if (!("Progress" == pages.name)) {
           console.info("get Progress state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Progress page success " + JSON.stringify(result));
@@ -47,11 +47,12 @@ export default function progressJsunit() {
         console.error("push Progress page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Progress after each called");
     });
 
     /**

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,7 +30,7 @@ export default function qrcodeJsunit() {
   }
 
   describe('QrcodeTest', function () {
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Qrcode',
       }
@@ -38,7 +38,7 @@ export default function qrcodeJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get Qrcode state success " + JSON.stringify(pages));
-        if(!("Qrcode" == pages.name)){
+        if (!("Qrcode" == pages.name)) {
           console.info("get Qrcode state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Qrcode page success " + JSON.stringify(result));
@@ -47,11 +47,12 @@ export default function qrcodeJsunit() {
         console.error("push Qrcode page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Qrcode after each called");
     });
 
     /**

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,7 +30,7 @@ export default function ratingJsunit() {
   }
 
   describe('ratingTest', function () {
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Rating',
       }
@@ -38,7 +38,7 @@ export default function ratingJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get Rating state success " + JSON.stringify(pages));
-        if(!("Rating" == pages.name)){
+        if (!("Rating" == pages.name)) {
           console.info("get Rating state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Rating page success " + JSON.stringify(result));
@@ -47,11 +47,12 @@ export default function ratingJsunit() {
         console.error("push Rating page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Rating after each called");
     });
 
     /**

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,7 +30,7 @@ export default function rowSplitJsunit() {
   }
 
   describe('RowSplitTest', function () {
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/RowSplit',
       }
@@ -38,7 +38,7 @@ export default function rowSplitJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get RowSplit state success " + JSON.stringify(pages));
-        if(!("RowSplit" == pages.name)){
+        if (!("RowSplit" == pages.name)) {
           console.info("get RowSplit state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push RowSplit page success " + JSON.stringify(result));
@@ -47,11 +47,12 @@ export default function rowSplitJsunit() {
         console.error("push RowSplit page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("RowSplit after each called");
     });
 
     /**

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,7 +30,7 @@ export default function ScrollJsunit() {
   }
 
   describe('scrollTest', function () {
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Scroll',
       }
@@ -38,7 +38,7 @@ export default function ScrollJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get Scroll state success " + JSON.stringify(pages));
-        if(!("Scroll" == pages.name)){
+        if (!("Scroll" == pages.name)) {
           console.info("get Scroll state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Scroll page success " + JSON.stringify(result));
@@ -47,11 +47,12 @@ export default function ScrollJsunit() {
         console.error("push Scroll page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Scroll after each called");
     });
     /**
      * @tc.number    SUB_ACE_BASIC_ETS_API_1020

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,7 +30,7 @@ export default function sliderJsunit() {
   }
 
   describe('SliderTest', function () {
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Slider',
       }
@@ -38,7 +38,7 @@ export default function sliderJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get Slider state success " + JSON.stringify(pages));
-        if(!("Slider" == pages.name)){
+        if (!("Slider" == pages.name)) {
           console.info("get Slider state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Slider page success " + JSON.stringify(result));
@@ -47,11 +47,12 @@ export default function sliderJsunit() {
         console.error("push Slider page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Slider after each called");
     });
     /**
      * @tc.number    SUB_ACE_BASIC_ETS_API_1060

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,7 +30,7 @@ export default function spanJsunit() {
   }
 
   describe('SpanTest', function () {
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Span',
       }
@@ -38,7 +38,7 @@ export default function spanJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get Span state success " + JSON.stringify(pages));
-        if(!("Span" == pages.name)){
+        if (!("Span" == pages.name)) {
           console.info("get Span state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Span page success " + JSON.stringify(result));
@@ -47,11 +47,12 @@ export default function spanJsunit() {
         console.error("push Span page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Span after each called");
     });
     /**
      * @tc.number    SUB_ACE_BASIC_ETS_API_1080

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,7 +30,7 @@ export default function StackJsunit() {
   }
 
   describe('StackTest', function () {
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Stack',
       }
@@ -38,7 +38,7 @@ export default function StackJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get Stack state success " + JSON.stringify(pages));
-        if(!("Stack" == pages.name)){
+        if (!("Stack" == pages.name)) {
           console.info("get Stack state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Stack page success " + JSON.stringify(result));
@@ -47,11 +47,12 @@ export default function StackJsunit() {
         console.error("push Stack page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Stack after each called");
     });
     /**
      * @tc.number    SUB_ACE_BASIC_ETS_API_1110

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,7 +30,7 @@ export default function textJsunit() {
   }
 
   describe('textTest', function () {
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Text',
       }
@@ -38,7 +38,7 @@ export default function textJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get Text state success " + JSON.stringify(pages));
-        if(!("Text" == pages.name)){
+        if (!("Text" == pages.name)) {
           console.info("get Text state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Text page success " + JSON.stringify(result));
@@ -47,11 +47,12 @@ export default function textJsunit() {
         console.error("push Text page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Text after each called");
     });
     /**
      * @tc.number    SUB_ACE_BASIC_ETS_API_1200

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+
 import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "deccjsunit/index.ets"
 import router from '@system.router';
 
@@ -30,16 +30,15 @@ export default function alphabetIndexerJsunit() {
   }
 
   describe('alphabetIndexerTest', function () {
-
-    beforeEach(async function{
-     let options = {
+    beforeEach(async function (done) {
+      let options = {
         uri: 'pages/AlphabetIndexer',
       }
       try {
         router.clear();
         let pages = router.getState();
         console.info("get AlphabetIndexer state success " + JSON.stringify(pages));
-        if(!("AlphabetIndexer" == pages.name)){
+        if (!("AlphabetIndexer" == pages.name)) {
           console.info("get AlphabetIndexer state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push AlphabetIndexer page success " + JSON.stringify(result));
@@ -48,11 +47,12 @@ export default function alphabetIndexerJsunit() {
         console.error("push AlphabetIndexer page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("AlphabetIndexer after each called");
     });
 
     /**

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,8 +30,7 @@ export default function appStorageJsunit() {
   }
 
   describe('appStorageTest', function () {
-
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/AppStorage',
       }
@@ -39,7 +38,7 @@ export default function appStorageJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get AppStorage state success " + JSON.stringify(pages));
-        if(!("AppStorage" == pages.name)){
+        if (!("AppStorage" == pages.name)) {
           console.info("get AppStorage state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push AppStorage page success " + JSON.stringify(result));
@@ -48,11 +47,12 @@ export default function appStorageJsunit() {
         console.error("push AppStorage page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("AppStorage after each called");
     });
 
 

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,8 +30,7 @@ export default function gridItemJsunit() {
   }
 
   describe('gridItemTest', function () {
-
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/GridItem',
       }
@@ -39,7 +38,7 @@ export default function gridItemJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get GridItem state success " + JSON.stringify(pages));
-        if(!("GridItem" == pages.name)){
+        if (!("GridItem" == pages.name)) {
           console.info("get GridItem state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push GridItem page success " + JSON.stringify(result));
@@ -48,11 +47,12 @@ export default function gridItemJsunit() {
         console.error("push GridItem page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("GridItem after each called");
     });
 
     /**
@@ -68,11 +68,11 @@ export default function gridItemJsunit() {
       console.info("属性值集合: " + JSON.stringify(obj));
       console.log(JSON.stringify(obj.$type))
       expect(obj.$type).assertEqual('GridItem')
-      console.log('GridItem1‘s rowStart is '+JSON.stringify(obj.$attrs.rowStart))
-      console.log('GridItem1‘s rowEnd is '+JSON.stringify(obj.$attrs.rowEnd))
-      console.log('GridItem1‘s columnStart is '+JSON.stringify(obj.$attrs.columnStart))
-      console.log('GridItem1‘s columnEnd is '+JSON.stringify(obj.$attrs.columnEnd))
-      console.log('GridItem1‘s forceRebuild is '+JSON.stringify(obj.$attrs.forceRebuild))
+      console.log('GridItem1‘s rowStart is ' + JSON.stringify(obj.$attrs.rowStart))
+      console.log('GridItem1‘s rowEnd is ' + JSON.stringify(obj.$attrs.rowEnd))
+      console.log('GridItem1‘s columnStart is ' + JSON.stringify(obj.$attrs.columnStart))
+      console.log('GridItem1‘s columnEnd is ' + JSON.stringify(obj.$attrs.columnEnd))
+      console.log('GridItem1‘s forceRebuild is ' + JSON.stringify(obj.$attrs.forceRebuild))
       await sleep(1)
       expect(obj.$attrs.rowStart).assertEqual('1')
       expect(obj.$attrs.rowEnd).assertEqual('4')

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,16 +30,15 @@ export default function gridJsunit() {
   }
 
   describe('gridTest', function () {
-
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Grid',
       }
-     try {
+      try {
         router.clear();
         let pages = router.getState();
         console.info("get Grid state success " + JSON.stringify(pages));
-        if(!("Grid" == pages.name)){
+        if (!("Grid" == pages.name)) {
           console.info("get Grid state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Grid page success " + JSON.stringify(result));
@@ -48,11 +47,12 @@ export default function gridJsunit() {
         console.error("push Grid page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Grid after each called");
     });
 
     /**
@@ -79,5 +79,7 @@ export default function gridJsunit() {
       console.info('gridTest001 END');
       done();
     });
-  })
+  }
+
+  )
 }

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,8 +30,7 @@ export default function hyperlinkJsunit() {
   }
 
   describe('hyperLinkTest', function () {
-
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/HyperLink',
       }
@@ -39,7 +38,7 @@ export default function hyperlinkJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get HyperLink state success " + JSON.stringify(pages));
-        if(!("HyperLink" == pages.name)){
+        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));
@@ -48,11 +47,12 @@ export default function hyperlinkJsunit() {
         console.error("push HyperLink page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("HyperLink after each called");
     });
 
     /**
@@ -67,8 +67,8 @@ export default function hyperlinkJsunit() {
       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))
+      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 ++++++++++++++++');

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

@@ -12,7 +12,7 @@
  * 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';
@@ -31,8 +31,7 @@ export default function linkJsunit() {
 
 
   describe('linkTest', function () {
-
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Link',
       }
@@ -40,7 +39,7 @@ export default function linkJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get Link state success " + JSON.stringify(pages));
-        if(!("Link" == pages.name)){
+        if (!("Link" == pages.name)) {
           console.info("get Link state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Link page success " + JSON.stringify(result));
@@ -49,11 +48,12 @@ export default function linkJsunit() {
         console.error("push Link page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Link after each called");
     });
 
     /**
@@ -71,7 +71,7 @@ export default function linkJsunit() {
       console.info("yr link0 type: " + JSON.stringify(obj.$type));
       console.info("component obj is: " + JSON.stringify(obj));
       expect(obj.$attrs.stateEffect).assertEqual('false');
-      console.log("yr link0 stateEffect-'false'"+JSON.stringify(obj.$attrs.stateEffect))
+      console.log("yr link0 stateEffect-'false'" + JSON.stringify(obj.$attrs.stateEffect))
       console.info('linkTest001 END');
       done();
     });
@@ -87,7 +87,7 @@ export default function linkJsunit() {
       let obj = JSON.parse(strJson);
       console.info("component obj is: " + JSON.stringify(obj));
       expect(obj.$attrs.stateEffect).assertEqual('false');
-      console.log("yr link1 stateEffect-'false'"+JSON.stringify(obj.$attrs.stateEffect))
+      console.log("yr link1 stateEffect-'false'" + JSON.stringify(obj.$attrs.stateEffect))
       console.info('linkTest002 END');
       done();
     });

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,16 +30,15 @@ export default function listItemJsunit() {
   }
 
   describe('listItemTest', function () {
-
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/ListItem',
       }
-     try {
+      try {
         router.clear();
         let pages = router.getState();
         console.info("get ListItem state success " + JSON.stringify(pages));
-        if(!("ListItem" == pages.name)){
+        if (!("ListItem" == pages.name)) {
           console.info("get ListItem state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push ListItem page success " + JSON.stringify(result));
@@ -48,11 +47,12 @@ export default function listItemJsunit() {
         console.error("push ListItem page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("ListItem after each called");
     });
 
     /**

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,8 +30,7 @@ export default function listJsunit() {
   }
 
   describe('listTest', function () {
-
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/List',
       }
@@ -39,7 +38,7 @@ export default function listJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get List state success " + JSON.stringify(pages));
-        if(!("List" == pages.name)){
+        if (!("List" == pages.name)) {
           console.info("get List state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push List page success " + JSON.stringify(result));
@@ -48,11 +47,12 @@ export default function listJsunit() {
         console.error("push List page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("List after each called");
     });
 
     /**

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

@@ -12,7 +12,7 @@
  * 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';
@@ -30,8 +30,7 @@ export default function navigatorJsunit() {
   }
 
   describe('navigatorTest', function () {
-
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Navigator',
       }
@@ -39,7 +38,7 @@ export default function navigatorJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get Navigator state success " + JSON.stringify(pages));
-        if(!("Navigator" == pages.name)){
+        if (!("Navigator" == pages.name)) {
           console.info("get Navigator state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Navigator page success " + JSON.stringify(result));
@@ -48,11 +47,12 @@ export default function navigatorJsunit() {
         console.error("push Navigator page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Navigator after each called");
     });
 
     /**
@@ -68,14 +68,16 @@ export default function navigatorJsunit() {
       console.info("get inspector value is: " + JSON.stringify(obj));
       console.log(JSON.stringify(obj.$type))
       expect(obj.$type).assertEqual('Navigator')
-      console.log('Navigator‘s target is '+JSON.stringify(obj.$attrs.target))
-      console.log('Navigator‘s type is '+JSON.stringify(obj.$attrs.type))
-      console.log('Navigator‘s active is '+JSON.stringify(obj.$attrs.active))
-      console.log('Navigator‘s params is '+JSON.stringify(obj.$attrs.params))
+      console.log('Navigator‘s target is ' + JSON.stringify(obj.$attrs.target))
+      console.log('Navigator‘s type is ' + JSON.stringify(obj.$attrs.type))
+      console.log('Navigator‘s active is ' + JSON.stringify(obj.$attrs.active))
+      console.log('Navigator‘s params is ' + JSON.stringify(obj.$attrs.params))
       expect(obj.$attrs.target).assertEqual('pages/index')
       expect(obj.$attrs.type).assertEqual('NavigationType.Back')
       expect(obj.$attrs.active).assertEqual('false')
-      expect(obj.$attrs.params).assertEqual(JSON.stringify({"data":24}))
+      expect(obj.$attrs.params).assertEqual(JSON.stringify({
+        "data": 24
+      }))
       console.info('++++++++++++++++ Navigator TestCase 1 End ++++++++++++++++');
       done();
     });
@@ -93,7 +95,7 @@ export default function navigatorJsunit() {
       console.info("get inspector value is: " + JSON.stringify(obj));
       console.log(JSON.stringify(obj.$type))
       expect(obj.$type).assertEqual('Navigator')
-      console.log('Navigator‘s type is '+JSON.stringify(obj.$attrs.type))
+      console.log('Navigator‘s type is ' + JSON.stringify(obj.$attrs.type))
       expect(obj.$attrs.type).assertEqual('NavigationType.Push')
       console.info('++++++++++++++++ Navigator TestCase 2 End ++++++++++++++++');
       done();
@@ -112,7 +114,7 @@ export default function navigatorJsunit() {
       console.info("get inspector value is: " + JSON.stringify(obj));
       console.log(JSON.stringify(obj.$type))
       expect(obj.$type).assertEqual('Navigator')
-      console.log('Navigator‘s type is '+JSON.stringify(obj.$attrs.type))
+      console.log('Navigator‘s type is ' + JSON.stringify(obj.$attrs.type))
       expect(obj.$attrs.type).assertEqual('NavigationType.Replace')
       console.info('++++++++++++++++ Navigator TestCase 3 End ++++++++++++++++');
       done();

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

@@ -12,7 +12,7 @@
  * 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';
@@ -31,7 +31,7 @@ export default function panelJsunit() {
 
   describe('panelTest', function () {
 
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Panel',
       }
@@ -39,7 +39,7 @@ export default function panelJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get Panel state success " + JSON.stringify(pages));
-        if(!("Panel" == pages.name)){
+        if (!("Panel" == pages.name)) {
           console.info("get Panel state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Panel page success " + JSON.stringify(result));
@@ -48,11 +48,12 @@ export default function panelJsunit() {
         console.error("push Panel page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Panel after each called");
     });
     /**
      * @tc.number    SUB_ACE_BASIC_ETS_API_0440
@@ -67,12 +68,12 @@ export default function panelJsunit() {
       console.info("get inspector value is: " + JSON.stringify(obj));
       console.log(JSON.stringify(obj.$type))
       expect(obj.$type).assertEqual('Panel')
-      console.log('Panel‘s type is '+JSON.stringify(obj.$attrs.type))
-      console.log('Panel‘s mode is '+JSON.stringify(obj.$attrs.mode))
-      console.log('Panel‘s dragBar is '+JSON.stringify(obj.$attrs.dragBar))
-      console.log('Panel‘s fullHeight is '+JSON.stringify(obj.$attrs.fullHeight))
-      console.log('Panel‘s halfHeight is '+JSON.stringify(obj.$attrs.halfHeight))
-      console.log('Panel‘s miniHeight is '+JSON.stringify(obj.$attrs.miniHeight))
+      console.log('Panel‘s type is ' + JSON.stringify(obj.$attrs.type))
+      console.log('Panel‘s mode is ' + JSON.stringify(obj.$attrs.mode))
+      console.log('Panel‘s dragBar is ' + JSON.stringify(obj.$attrs.dragBar))
+      console.log('Panel‘s fullHeight is ' + JSON.stringify(obj.$attrs.fullHeight))
+      console.log('Panel‘s halfHeight is ' + JSON.stringify(obj.$attrs.halfHeight))
+      console.log('Panel‘s miniHeight is ' + JSON.stringify(obj.$attrs.miniHeight))
       expect(obj.$attrs.type).assertEqual('PanelType.Foldable')
       expect(obj.$attrs.mode).assertEqual('PanelMode.Half')
       expect(obj.$attrs.dragBar).assertEqual('true')
@@ -96,9 +97,9 @@ export default function panelJsunit() {
       console.info("get inspector value is: " + JSON.stringify(obj));
       console.log(JSON.stringify(obj.$type))
       expect(obj.$type).assertEqual('Panel')
-      console.log('Panel‘s type is '+JSON.stringify(obj.$attrs.type))
-      console.log('Panel‘s mode is '+JSON.stringify(obj.$attrs.mode))
-      console.log('Panel‘s show is '+JSON.stringify(obj.$attrs.show))
+      console.log('Panel‘s type is ' + JSON.stringify(obj.$attrs.type))
+      console.log('Panel‘s mode is ' + JSON.stringify(obj.$attrs.mode))
+      console.log('Panel‘s show is ' + JSON.stringify(obj.$attrs.show))
       expect(obj.$attrs.type).assertEqual('PanelType.Minibar')
       expect(obj.$attrs.mode).assertEqual('PanelMode.Mini')
       expect(obj.$attrs.show).assertEqual('true')
@@ -119,9 +120,9 @@ export default function panelJsunit() {
       console.info("get inspector value is: " + JSON.stringify(obj));
       console.log(JSON.stringify(obj.$type))
       expect(obj.$type).assertEqual('Panel')
-      console.log('Panel‘s type is '+JSON.stringify(obj.$attrs.type))
-      console.log('Panel‘s mode is '+JSON.stringify(obj.$attrs.mode))
-      console.log('Panel‘s show is '+JSON.stringify(obj.$attrs.show))
+      console.log('Panel‘s type is ' + JSON.stringify(obj.$attrs.type))
+      console.log('Panel‘s mode is ' + JSON.stringify(obj.$attrs.mode))
+      console.log('Panel‘s show is ' + JSON.stringify(obj.$attrs.show))
       expect(obj.$attrs.type).assertEqual('PanelType.Temporary')
       expect(obj.$attrs.mode).assertEqual('PanelMode.Full')
       expect(obj.$attrs.show).assertEqual('false')

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

@@ -12,7 +12,7 @@
  * 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';
@@ -31,7 +31,7 @@ export default function propJsunit() {
 
   describe('propTest', function () {
 
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Prop',
       }
@@ -39,7 +39,7 @@ export default function propJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get Prop state success " + JSON.stringify(pages));
-        if(!("Prop" == pages.name)){
+        if (!("Prop" == pages.name)) {
           console.info("get Prop state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Prop page success " + JSON.stringify(result));
@@ -48,11 +48,12 @@ export default function propJsunit() {
         console.error("push Prop page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Prop after each called");
     });
 
     /**
@@ -67,8 +68,8 @@ export default function propJsunit() {
       let obj = JSON.parse(strJson);
       expect(obj.$type).assertEqual('Text');
       console.log(JSON.stringify(obj.$type))
-      console.log("cd attrs.conten type1"+typeof("10"))
-      console.log("yr prop0 content-'10'"+obj.$attrs.content)
+      console.log("cd attrs.conten type1" + typeof ("10"))
+      console.log("yr prop0 content-'10'" + obj.$attrs.content)
       expect(obj.$attrs.content).assertEqual("10");
       console.info('propTest001 END');
       done();
@@ -84,10 +85,10 @@ export default function propJsunit() {
       let strJson = getInspectorByKey('Text002');
       let obj = JSON.parse(strJson);
       console.info("component obj is: " + JSON.stringify(obj));
-      console.log("cd attrs.conten type"+typeof(obj.$attrs.content))
-      console.log("cd attrs.conten type1 "+typeof("10"))
+      console.log("cd attrs.conten type" + typeof (obj.$attrs.content))
+      console.log("cd attrs.conten type1 " + typeof ("10"))
       expect(obj.$attrs.content).assertEqual("10");
-      console.log("cd prop0 content-'10'"+JSON.stringify(obj.$attrs.content))
+      console.log("cd prop0 content-'10'" + JSON.stringify(obj.$attrs.content))
       console.info('propTest002 END');
       done();
     });

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

@@ -12,7 +12,7 @@
  * 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';
@@ -28,17 +28,17 @@ export default function rowJsunit() {
       console.info(`sleep ${time} over...`)
     })
   }
-  describe('rowTest', function () {
 
-    beforeEach(async function{
+  describe('rowTest', function () {
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Row',
       }
-       try {
+      try {
         router.clear();
         let pages = router.getState();
         console.info("get Row state success " + JSON.stringify(pages));
-        if(!("Row" == pages.name)){
+        if (!("Row" == pages.name)) {
           console.info("get Row state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Row page success " + JSON.stringify(result));
@@ -47,11 +47,12 @@ export default function rowJsunit() {
         console.error("push Row page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Row after each called");
     });
 
     /**
@@ -67,9 +68,9 @@ export default function rowJsunit() {
       console.info("get inspector value is: " + JSON.stringify(obj));
       console.log(JSON.stringify(obj.$type))
       expect(obj.$type).assertEqual('Row')
-      console.log('Row‘s useAlign is '+JSON.stringify(obj.$attrs.useAlign))
-      console.log('Row‘s space is '+JSON.stringify(obj.$attrs.space))
-      console.log('Row‘s alignItems is '+JSON.stringify(obj.$attrs.alignItems))
+      console.log('Row‘s useAlign is ' + JSON.stringify(obj.$attrs.useAlign))
+      console.log('Row‘s space is ' + JSON.stringify(obj.$attrs.space))
+      console.log('Row‘s alignItems is ' + JSON.stringify(obj.$attrs.alignItems))
       expect(obj.$attrs.alignItems).assertEqual('VerticalAlign.Top')
       console.info('++++++++++++++++ Row TestCase 1 End ++++++++++++++++');
       done();

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

@@ -12,7 +12,7 @@
  * 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';
@@ -54,7 +54,7 @@ export default function swiperJsunit() {
 
   describe('swiperTest', function () {
 
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Swiper',
       }
@@ -62,7 +62,7 @@ export default function swiperJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get Swiper state success " + JSON.stringify(pages));
-        if(!("Swiper" == pages.name)){
+        if (!("Swiper" == pages.name)) {
           console.info("get Swiper state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Swiper page success " + JSON.stringify(result));
@@ -71,11 +71,12 @@ export default function swiperJsunit() {
         console.error("push Swiper page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Swiper after each called");
     });
 
     /**
@@ -91,14 +92,14 @@ export default function swiperJsunit() {
       console.info("get inspector value is: " + JSON.stringify(obj));
       console.log(JSON.stringify(obj.$type))
       expect(obj.$type).assertEqual('Swiper')
-      console.log('Swiper‘s index is '+JSON.stringify(obj.$attrs.index))
-      console.log('Swiper‘s autoPlay is '+JSON.stringify(obj.$attrs.autoPlay))
-      console.log('Swiper‘s interval is '+JSON.stringify(obj.$attrs.interval))
-      console.log('Swiper‘s indicator is '+JSON.stringify(obj.$attrs.indicator))
-      console.log('Swiper‘s loop is '+JSON.stringify(obj.$attrs.loop))
-      console.log('Swiper‘s duration is '+JSON.stringify(obj.$attrs.duration))
-      console.log('Swiper‘s vertical is '+JSON.stringify(obj.$attrs.vertical))
-      console.log('Swiper‘s itemSpace is '+JSON.stringify(obj.$attrs.itemSpace))
+      console.log('Swiper‘s index is ' + JSON.stringify(obj.$attrs.index))
+      console.log('Swiper‘s autoPlay is ' + JSON.stringify(obj.$attrs.autoPlay))
+      console.log('Swiper‘s interval is ' + JSON.stringify(obj.$attrs.interval))
+      console.log('Swiper‘s indicator is ' + JSON.stringify(obj.$attrs.indicator))
+      console.log('Swiper‘s loop is ' + JSON.stringify(obj.$attrs.loop))
+      console.log('Swiper‘s duration is ' + JSON.stringify(obj.$attrs.duration))
+      console.log('Swiper‘s vertical is ' + JSON.stringify(obj.$attrs.vertical))
+      console.log('Swiper‘s itemSpace is ' + JSON.stringify(obj.$attrs.itemSpace))
       expect(obj.$attrs.index).assertEqual('1')
       expect(obj.$attrs.autoPlay).assertEqual('true')
       expect(obj.$attrs.interval).assertEqual('4000')

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

@@ -12,7 +12,7 @@
  * 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';
@@ -31,7 +31,7 @@ export default function tabJsunit() {
 
   describe('tabTest', function () {
 
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Tab',
       }
@@ -39,7 +39,7 @@ export default function tabJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get Tab state success " + JSON.stringify(pages));
-        if(!("Tab" == pages.name)){
+        if (!("Tab" == pages.name)) {
           console.info("get Tab state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Tab page success " + JSON.stringify(result));
@@ -48,11 +48,12 @@ export default function tabJsunit() {
         console.error("push Tab page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      await sleep(1)
+      console.info("Tab after each called");
     });
 
     /**

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

@@ -12,7 +12,7 @@
  * 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';
@@ -31,7 +31,7 @@ export default function textJsunit() {
 
   describe('textTest', function () {
 
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Text',
       }
@@ -39,7 +39,7 @@ export default function textJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get Text state success " + JSON.stringify(pages));
-        if(!("Text" == pages.name)){
+        if (!("Text" == pages.name)) {
           console.info("get Text state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Text page success " + JSON.stringify(result));
@@ -48,11 +48,12 @@ export default function textJsunit() {
         console.error("push Text page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      console.info("Text after each called")
+      await sleep(1)
     });
 
     /**

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

@@ -12,7 +12,7 @@
  * 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';
@@ -28,9 +28,10 @@ export default function videoJsunit() {
       console.info(`sleep ${time} over...`)
     })
   }
+
   describe('VideoAppInfoTest', function () {
 
-    beforeEach(async function{
+    beforeEach(async function (done) {
       let options = {
         uri: 'pages/Video',
       }
@@ -38,7 +39,7 @@ export default function videoJsunit() {
         router.clear();
         let pages = router.getState();
         console.info("get Video state success " + JSON.stringify(pages));
-        if(!("Video" == pages.name)){
+        if (!("Video" == pages.name)) {
           console.info("get Video state success " + JSON.stringify(pages.name));
           let result = await router.push(options)
           console.info("push Video page success " + JSON.stringify(result));
@@ -47,11 +48,12 @@ export default function videoJsunit() {
         console.error("push Video page error " + JSON.stringify(result));
       }
       await sleep(2)
+      done()
     });
 
-    afterEach(async function{
-      await sleep(3)
-      console.info("await 3s ");
+    afterEach(async function () {
+      console.info("Video after each called");
+      await sleep(1)
     });
 
     /**
@@ -65,12 +67,12 @@ export default function videoJsunit() {
       let strJson = getInspectorByKey('video');
       let obj = JSON.parse(strJson);
       console.info("cd video component obj is: " + JSON.stringify(obj));
-      console.log("cd video type" +JSON.stringify(obj.$type));
-      console.log("cd video autoPlay" +JSON.stringify(obj.$attrs.autoPlay));
-      console.log("cd video muted" +JSON.stringify(obj.$attrs.muted));
-      console.log("cd video controls" +JSON.stringify(obj.$attrs.controls));
-      console.log("cd video loop" +JSON.stringify(obj.$attrs.loop));
-      console.log("cd video objectFit" +JSON.stringify(obj.$attrs.objectFit));
+      console.log("cd video type" + JSON.stringify(obj.$type));
+      console.log("cd video autoPlay" + JSON.stringify(obj.$attrs.autoPlay));
+      console.log("cd video muted" + JSON.stringify(obj.$attrs.muted));
+      console.log("cd video controls" + JSON.stringify(obj.$attrs.controls));
+      console.log("cd video loop" + JSON.stringify(obj.$attrs.loop));
+      console.log("cd video objectFit" + JSON.stringify(obj.$attrs.objectFit));
       console.info('videoAppInfoTest001 END');
       done();
     });

distributeddatamgr/distributeddatamgrjstest/hap/src/main/js/default/test/FieldNodeJsunit.test.js

 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 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
@@ -20,7 +20,11 @@ function sleep(ms) {
 }
 describe('FieldNodeTest', function() {
 
-    // appendChild(child: FieldNode): boolean 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_FIELDNODE_APPENDCHILD_0100
+     * @tc.name [JS-API8]FieldNode.AppendChild().
+     * @tc.desc Test Js Api FieldNode.AppendChild() testcase 001
+     */
     it('testAppendChild001', 0, async function(done) {
         try {
             let node = new ddm.FieldNode("root");
@@ -42,6 +46,11 @@ describe('FieldNodeTest', function() {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_FIELDNODE_APPENDCHILD_0200
+     * @tc.name [JS-API8]FieldNode.AppendChild().
+     * @tc.desc Test Js Api FieldNode.AppendChild() testcase 002
+     */
     it('testAppendChild002', 0, async function(done) {
         try {
             let node = new ddm.FieldNode("root");
@@ -56,6 +65,11 @@ describe('FieldNodeTest', function() {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_FIELDNODE_APPENDCHILD_0300
+     * @tc.name [JS-API8]FieldNode.AppendChild().
+     * @tc.desc Test Js Api FieldNode.AppendChild() testcase 003
+     */
     it('testAppendChild003', 0, async function(done) {
         try {
             let node = new ddm.FieldNode("root");
@@ -69,7 +83,11 @@ describe('FieldNodeTest', function() {
         done();
     })
 
-    // toJson(): string
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_FIELDNODE_TOJSON_0100
+     * @tc.name [JS-API8]FieldNode.ToJson().
+     * @tc.desc Test Js Api FieldNode.ToJson() testcase 001
+     */
     it('testToJson001', 0, async function(done) {
         try {
             let node = new ddm.FieldNode("root");
@@ -82,6 +100,11 @@ describe('FieldNodeTest', function() {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_FIELDNODE_TOJSON_0200
+     * @tc.name [JS-API8]FieldNode.ToJson().
+     * @tc.desc Test Js Api FieldNode.ToJson() testcase 002
+     */
     it('testToJson002', 0, async function(done) {
         try {
             let node = new ddm.FieldNode("root");
@@ -94,6 +117,11 @@ describe('FieldNodeTest', function() {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_FIELDNODE_TOJSON_0300
+     * @tc.name [JS-API8]FieldNode.ToJson().
+     * @tc.desc Test Js Api FieldNode.ToJson() testcase 003
+     */
     it('testToJson003', 0, async function(done) {
         try {
             let node = new ddm.FieldNode();

distributeddatamgr/distributeddatamgrjstest/hap/src/main/js/default/test/KvManagerCallbackJsunit.test.js

 /*
-* Copyright (c) 2021 Huawei Device Co., Ltd.
+* Copyright (c) 2022 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
@@ -69,6 +69,11 @@ describe('KVManagerCallbackTest', function () {
         });
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1100
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 101
+     */
     it('testKVManagerGetKVStore101', 0, async function (done) {
         console.log('testKVManagerGetKVStore101');
         try {
@@ -84,6 +89,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1200
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 102
+     */
     it('testKVManagerGetKVStore102', 0, async function (done) {
         console.log('testKVManagerGetKVStore102');
         try {
@@ -102,6 +112,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1300
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 103
+     */
     it('testKVManagerGetKVStore103', 0, async function (done) {
         console.log('testKVManagerGetKVStore103');
         const optionsInfo = {
@@ -128,10 +143,15 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1400
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 104
+     */
     it('testKVManagerGetKVStore104', 0, async function (done) {
         console.log('testKVManagerGetKVStore104');
         const optionsInfo = {
-            createIfMissing : false, // when false getkvstore error
+            createIfMissing : false,
             encrypt : false,
             backup : false,
             autoSync : true,
@@ -155,6 +175,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1500
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 105
+     */
     it('testKVManagerGetKVStore105', 0, async function (done) {
         console.log('testKVManagerGetKVStore105');
         const optionsInfo = {
@@ -180,6 +205,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1600
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 106
+     */
     it('testKVManagerGetKVStore106', 0, async function (done) {
         console.log('testKVManagerGetKVStore106');
         const optionsInfo = {
@@ -205,6 +235,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1700
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 107
+     */
     it('testKVManagerGetKVStore107', 0, async function (done) {
         console.log('testKVManagerGetKVStore107');
         const optionsInfo = {
@@ -230,6 +265,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1800
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 108
+     */
     it('testKVManagerGetKVStore108', 0, async function (done) {
         console.log('testKVManagerGetKVStore108');
         const optionsInfo = {
@@ -255,6 +295,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1900
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 109
+     */
     it('testKVManagerGetKVStore109', 0, async function (done) {
         console.log('testKVManagerGetKVStore109');
         const optionsInfo = {
@@ -280,6 +325,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1100
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 110
+     */
     it('testKVManagerGetKVStore110', 0, async function (done) {
         console.log('testKVManagerGetKVStore110');
         const optionsInfo = {
@@ -305,6 +355,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1110
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 111
+     */
     it('testKVManagerGetKVStore111', 0, async function (done) {
         console.log('testKVManagerGetKVStore111');
         const optionsInfo = {
@@ -330,6 +385,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1120
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 112
+     */
     it('testKVManagerGetKVStore112', 0, async function (done) {
         console.log('testKVManagerGetKVStore112');
         const optionsInfo = {
@@ -355,6 +415,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1130
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 113
+     */
     it('testKVManagerGetKVStore113', 0, async function (done) {
         console.log('testKVManagerGetKVStore113');
         const optionsInfo = {
@@ -382,6 +447,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1140
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 114
+     */
     it('testKVManagerGetKVStore114', 0, async function (done) {
         console.log('testKVManagerGetKVStore114');
         const optionsInfo = {
@@ -407,6 +477,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1150
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 115
+     */
     it('testKVManagerGetKVStore115', 0, async function (done) {
         console.log('testKVManagerGetKVStore115');
         const optionsInfo = {
@@ -432,6 +507,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1160
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 116
+     */
     it('testKVManagerGetKVStore116', 0, async function (done) {
         console.log('testKVManagerGetKVStore116');
         const optionsInfo = {
@@ -457,6 +537,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1170
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 117
+     */
     it('testKVManagerGetKVStore117', 0, async function (done) {
         console.log('testKVManagerGetKVStore117');
         const optionsInfo = {
@@ -482,6 +567,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1180
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 118
+     */
     it('testKVManagerGetKVStore118', 0, async function (done) {
         console.log('testKVManagerGetKVStore118');
         const optionsInfo = {
@@ -507,6 +597,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1190
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 119
+     */
     it('testKVManagerGetKVStore119', 0, async function (done) {
         console.log('testKVManagerGetKVStore119');
         const optionsInfo = {
@@ -532,6 +627,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_CLOSEKVSTORE_1100
+     * @tc.name [JS-API8]KVManager.CloseKVStore.
+     * @tc.desc Test Js Api KVManager.CloseKVStore testcase 101
+     */
     it('testKVManagerCloseKVStore101', 0, async function (done) {
         console.log('testKVManagerCloseKVStore101');
         try {
@@ -551,6 +651,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_CLOSEKVSTORE_1200
+     * @tc.name [JS-API8]KVManager.CloseKVStore.
+     * @tc.desc Test Js Api KVManager.CloseKVStore testcase 102
+     */
     it('testKVManagerCloseKVStore102', 0, async function (done) {
         console.log('testKVManagerCloseKVStore102');
         try {
@@ -579,6 +684,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_CLOSEKVSTORE_1300
+     * @tc.name [JS-API8]KVManager.CloseKVStore.
+     * @tc.desc Test Js Api KVManager.CloseKVStore testcase 103
+     */
     it('testKVManagerCloseKVStore103', 0, async function (done) {
         console.log('testKVManagerCloseKVStore103');
         try {
@@ -607,6 +717,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_CLOSEKVSTORE_1400
+     * @tc.name [JS-API8]KVManager.CloseKVStore.
+     * @tc.desc Test Js Api KVManager.CloseKVStore testcase 104
+     */
     it('testKVManagerCloseKVStore104', 0, async function (done) {
         console.log('testKVManagerCloseKVStore104');
         try {
@@ -622,6 +737,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_DELETEKVSTORE_1100
+     * @tc.name [JS-API8]KVManager.DeleteKVStore.
+     * @tc.desc Test Js Api KVManager.DeleteKVStore testcase 101
+     */
     it('testKVManagerDeleteKVStore101', 0, async function (done) {
         console.log('testKVManagerDeleteKVStore101');
         try {
@@ -641,6 +761,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_DELETEKVSTORE_1200
+     * @tc.name [JS-API8]KVManager.DeleteKVStore.
+     * @tc.desc Test Js Api KVManager.DeleteKVStore testcase 102
+     */
     it('testKVManagerDeleteKVStore102', 0, async function (done) {
         console.log('testKVManagerDeleteKVStore102');
         try {
@@ -669,6 +794,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_DELETEKVSTORE_1300
+     * @tc.name [JS-API8]KVManager.DeleteKVStore.
+     * @tc.desc Test Js Api KVManager.DeleteKVStore testcase 103
+     */
     it('testKVManagerDeleteKVStore103', 0, async function (done) {
         console.log('testKVManagerDeleteKVStore103');
         try {
@@ -687,6 +817,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETALLKVSTOREID_1100
+     * @tc.name [JS-API8]KVManager.GetAllKVStoreId.
+     * @tc.desc Test Js Api KVManager.GetAllKVStoreId testcase 101
+     */
     it('testKVManagerGetAllKVStoreId101', 0, async function (done) {
         console.log('testKVManagerGetAllKVStoreId101');
         try {
@@ -703,6 +838,11 @@ describe('KVManagerCallbackTest', function () {
         }
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETALLKVSTOREID_1200
+     * @tc.name [JS-API8]KVManager.GetAllKVStoreId.
+     * @tc.desc Test Js Api KVManager.GetAllKVStoreId testcase 102
+     */
     it('testKVManagerGetAllKVStoreId102', 0, async function (done) {
         console.log('testKVManagerGetAllKVStoreId102');
         try {

distributeddatamgr/distributeddatamgrjstest/hap/src/main/js/default/test/KvManagerPromiseJsunit.test.js

 /*
-* Copyright (c) 2021 Huawei Device Co., Ltd.
+* Copyright (c) 2022 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
@@ -76,6 +76,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1000
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 001
+     */
     it('testKVManagerGetKVStore001', 0, async function (done) {
         console.log('testKVManagerGetKVStore001');
         try {
@@ -91,6 +96,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_2000
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 002
+     */
     it('testKVManagerGetKVStore002', 0, async function (done) {
         console.log('testKVManagerGetKVStore002');
         try {
@@ -106,6 +116,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_0300
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 003
+     */
     it('testKVManagerGetKVStore003', 0, async function (done) {
         console.log('testKVManagerGetKVStore003');
         const optionsInfo = {
@@ -128,10 +143,15 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_0400
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 004
+     */
     it('testKVManagerGetKVStore004', 0, async function (done) {
         console.log('testKVManagerGetKVStore004');
         const optionsInfo = {
-            createIfMissing : false, // when false getkvstore error
+            createIfMissing : false,
             encrypt : false,
             backup : false,
             autoSync : true,
@@ -148,6 +168,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_0500
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 005
+     */
     it('testKVManagerGetKVStore005', 0, async function (done) {
         console.log('testKVManagerGetKVStore005');
         const optionsInfo = {
@@ -170,6 +195,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_0600
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 006
+     */
     it('testKVManagerGetKVStore006', 0, async function (done) {
         console.log('testKVManagerGetKVStore006');
         const optionsInfo = {
@@ -192,6 +222,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_0700
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 007
+     */
     it('testKVManagerGetKVStore007', 0, async function (done) {
         console.log('testKVManagerGetKVStore006');
         const optionsInfo = {
@@ -214,6 +249,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_0800
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 008
+     */
     it('testKVManagerGetKVStore008', 0, async function (done) {
         console.log('testKVManagerGetKVStore008');
         const optionsInfo = {
@@ -236,6 +276,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_0900
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 009
+     */
     it('testKVManagerGetKVStore009', 0, async function (done) {
         console.log('testKVManagerGetKVStore009');
         const optionsInfo = {
@@ -258,6 +303,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1000
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 010
+     */
     it('testKVManagerGetKVStore010', 0, async function (done) {
         console.log('testKVManagerGetKVStore010');
         const optionsInfo = {
@@ -280,6 +330,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1100
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 011
+     */
     it('testKVManagerGetKVStore011', 0, async function (done) {
         console.log('testKVManagerGetKVStore011');
         const optionsInfo = {
@@ -302,6 +357,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1200
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 012
+     */
     it('testKVManagerGetKVStore012', 0, async function (done) {
         console.log('testKVManagerGetKVStore012');
         const optionsInfo = {
@@ -324,6 +384,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1300
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 013
+     */
     it('testKVManagerGetKVStore013', 0, async function (done) {
         console.log('testKVManagerGetKVStore013');
         const optionsInfo = {
@@ -331,7 +396,7 @@ describe('KVManagerPromiseTest', function () {
             encrypt : false,
             backup : false,
             autoSync : true,
-            kvStoreType : factory.KVStoreType.MULTI_VERSION, // unsupport MULTI_VERSION
+            kvStoreType : factory.KVStoreType.MULTI_VERSION,
             schema : '',
             securityLevel : factory.SecurityLevel.S2,
         }
@@ -348,6 +413,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1400
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 014
+     */
     it('testKVManagerGetKVStore014', 0, async function (done) {
         console.log('testKVManagerGetKVStore014');
         const optionsInfo = {
@@ -370,6 +440,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1500
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 015
+     */
     it('testKVManagerGetKVStore015', 0, async function (done) {
         console.log('testKVManagerGetKVStore015');
         const optionsInfo = {
@@ -392,6 +467,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1600
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 016
+     */
     it('testKVManagerGetKVStore016', 0, async function (done) {
         console.log('testKVManagerGetKVStore016');
         const optionsInfo = {
@@ -414,6 +494,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1700
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 017
+     */
     it('testKVManagerGetKVStore017', 0, async function (done) {
         console.log('testKVManagerGetKVStore017');
         const optionsInfo = {
@@ -436,6 +521,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1800
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 018
+     */
     it('testKVManagerGetKVStore018', 0, async function (done) {
         console.log('testKVManagerGetKVStore018');
         const optionsInfo = {
@@ -458,6 +548,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETKVSTORE_1900
+     * @tc.name [JS-API8]KVManager.GetKVStore.
+     * @tc.desc Test Js Api KVManager.GetKVStore testcase 019
+     */
     it('testKVManagerGetKVStore019', 0, async function (done) {
         console.log('testKVManagerGetKVStore019');
         const optionsInfo = {
@@ -480,6 +575,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_CLOSEKVSTORE_0100
+     * @tc.name [JS-API8]KVManager.CloseKVStore.
+     * @tc.desc Test Js Api KVManager.CloseKVStore testcase 001
+     */
     it('testKVManagerCloseKVStore001', 0, async function (done) {
         console.log('testKVManagerCloseKVStore001');
         await kvManager.getKVStore(TEST_STORE_ID, options).then(async (store) => {
@@ -498,6 +598,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_CLOSEKVSTORE_0200
+     * @tc.name [JS-API8]KVManager.CloseKVStore.
+     * @tc.desc Test Js Api KVManager.CloseKVStore testcase 002
+     */
     it('testKVManagerCloseKVStore002', 0, async function (done) {
         console.log('testKVManagerCloseKVStore002');
         await kvManager.getKVStore(TEST_STORE_ID, options).then(async (store) => {
@@ -520,6 +625,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_CLOSEKVSTORE_0300
+     * @tc.name [JS-API8]KVManager.CloseKVStore.
+     * @tc.desc Test Js Api KVManager.CloseKVStore testcase 003
+     */
     it('testKVManagerCloseKVStore003', 0, async function (done) {
         console.log('testKVManagerCloseKVStore003');
         await kvManager.getKVStore(TEST_STORE_ID, options).then(async (store) => {
@@ -542,6 +652,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_CLOSEKVSTORE_0400
+     * @tc.name [JS-API8]KVManager.CloseKVStore.
+     * @tc.desc Test Js Api KVManager.CloseKVStore testcase 004
+     */
     it('testKVManagerCloseKVStore004', 0, async function (done) {
         console.log('testKVManagerCloseKVStore004');
         await kvManager.closeKVStore(TEST_BUNDLE_NAME, TEST_STORE_ID, kvStore).then(() => {
@@ -553,6 +668,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_DELETEKVSTORE_0100
+     * @tc.name [JS-API8]KVManager.DeleteKVStore.
+     * @tc.desc Test Js Api KVManager.DeleteKVStore testcase 001
+     */
     it('testKVManagerDeleteKVStore001', 0, async function (done) {
         console.log('testKVManagerDeleteKVStore001');
         await kvManager.getKVStore(TEST_STORE_ID, options).then(async (store) => {
@@ -571,6 +691,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_DELETEKVSTORE_0200
+     * @tc.name [JS-API8]KVManager.DeleteKVStore.
+     * @tc.desc Test Js Api KVManager.DeleteKVStore testcase 002
+     */
     it('testKVManagerDeleteKVStore002', 0, async function (done) {
         console.log('testKVManagerDeleteKVStore002');
         await kvManager.getKVStore(TEST_STORE_ID, options).then(async (store) => {
@@ -593,6 +718,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_DELETEKVSTORE_0300
+     * @tc.name [JS-API8]KVManager.DeleteKVStore.
+     * @tc.desc Test Js Api KVManager.DeleteKVStore testcase 003
+     */
     it('testKVManagerDeleteKVStore003', 0, async function (done) {
         console.log('testKVManagerDeleteKVStore003');
         await kvManager.deleteKVStore(TEST_BUNDLE_NAME, TEST_STORE_ID).then(() => {
@@ -604,6 +734,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETALLKVSTOREID_0100
+     * @tc.name [JS-API8]KVManager.GetAllKVStoreId.
+     * @tc.desc Test Js Api KVManager.GetAllKVStoreId testcase 001
+     */
     it('testKVManagerGetAllKVStoreId001', 0, async function (done) {
         console.log('testKVManagerGetAllKVStoreId001');
         await kvManager.getAllKVStoreId(TEST_BUNDLE_NAME).then((data) => {
@@ -617,6 +752,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_GETALLKVSTOREID_0200
+     * @tc.name [JS-API8]KVManager.GetAllKVStoreId.
+     * @tc.desc Test Js Api KVManager.GetAllKVStoreId testcase 002
+     */
     it('testKVManagerGetAllKVStoreId002', 0, async function (done) {
         console.log('testKVManagerGetAllKVStoreId002');
         await kvManager.getKVStore(TEST_STORE_ID, options).then(async (store) => {
@@ -639,6 +779,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_ON_0100
+     * @tc.name [JS-API8]KVManager.On.
+     * @tc.desc Test Js Api KVManager.On testcase 001
+     */
     it('testKVManagerOn001', 0, function (done) {
         console.log('testKVManagerOn001');
         var deathCallback = function () {
@@ -649,6 +794,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_ON_0200
+     * @tc.name [JS-API8]KVManager.On.
+     * @tc.desc Test Js Api KVManager.On testcase 002
+     */
     it('testKVManagerOn002', 0, function (done) {
         console.log('testKVManagerOn002');
         var deathCallback1 = function () {
@@ -664,6 +814,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_ON_0300
+     * @tc.name [JS-API8]KVManager.On.
+     * @tc.desc Test Js Api KVManager.On testcase 003
+     */
     it('testKVManagerOn003', 0, function (done) {
         console.log('testKVManagerOn003');
         var deathCallback = function () {
@@ -675,6 +830,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_OFF_0100
+     * @tc.name [JS-API8]KVManager.Off.
+     * @tc.desc Test Js Api KVManager.Off testcase 001
+     */
     it('testKVManagerOff001', 0, function (done) {
         console.log('testKVManagerOff001');
         var deathCallback = function () {
@@ -684,6 +844,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_OFF_0200
+     * @tc.name [JS-API8]KVManager.Off.
+     * @tc.desc Test Js Api KVManager.Off testcase 002
+     */
     it('testKVManagerOff002', 0, function (done) {
         console.log('testKVManagerOff002');
         var deathCallback = function () {
@@ -694,6 +859,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_OFF_0300
+     * @tc.name [JS-API8]KVManager.Off.
+     * @tc.desc Test Js Api KVManager.Off testcase 003
+     */
     it('testKVManagerOff003', 0, function (done) {
         console.log('testKVManagerOff003');
         var deathCallback1 = function () {
@@ -708,6 +878,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_OFF_0400
+     * @tc.name [JS-API8]KVManager.Off.
+     * @tc.desc Test Js Api KVManager.Off testcase 004
+     */
     it('testKVManagerOff004', 0, function (done) {
         console.log('testKVManagerOff004');
         var deathCallback = function () {
@@ -719,6 +894,11 @@ describe('KVManagerPromiseTest', function () {
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_KVMANAGER_OFF_0500
+     * @tc.name [JS-API8]KVManager.Off.
+     * @tc.desc Test Js Api KVManager.Off testcase 005
+     */
     it('testKVManagerOff005', 0, function (done) {
         console.log('testKVManagerOff001');
         var deathCallback = function () {

distributeddatamgr/distributeddatamgrjstest/hap/src/main/js/default/test/List.test.js

 /*
-* Copyright (c) 2021 Huawei Device Co., Ltd.
+* Copyright (c) 2022 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

distributeddatamgr/distributeddatamgrjstest/hap/src/main/js/default/test/SchemaJsunit.test.js

 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 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
@@ -15,39 +15,249 @@
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
 import ddm from '@ohos.data.distributedData';
 
+const TEST_BUNDLE_NAME = 'ohos.acts.distributeddatamgr';
+const TEST_STORE_ID = 'storeId';
+
+var kvManager = null;
+var kvStore = null;
+
+function putBatchString(len, prefix) {
+    let entries = [];
+    for (var i = 0; i < len; i++) {
+        entries.push({
+            key : prefix + i,
+            value : {
+                type : ddm.ValueType.STRING,
+                value : '{"english":{"first":"leda' + i + '", "second":"yang"}}'
+            }
+        });
+    }
+    return entries;
+}
+
+async function testPutAndGet(kvManager, options) {
+    try {
+        await kvManager.getKVStore(TEST_STORE_ID, options).then(async (store) => {
+            console.log('testPutAndGet getKVStore success' + JSON.stringify(options));
+            kvStore = store;
+            expect(store != null).assertTrue();
+        }).catch((err) => {
+            console.log('testPutAndGet getKVStore fail ' + err);
+            expect(null).assertFail();
+        });
+        var canGet = new Promise((resolve, reject) => {
+            kvStore.on('dataChange', 0, function (data) {
+                console.log('testPutAndGet resolve on data change: ' + JSON.stringify(data));
+                resolve(data.deviceId);
+            });
+            let entries = putBatchString(10, 'test_key_');
+            kvStore.putBatch(entries).then((data) => {
+                console.log('testPutAndGet put success');
+                expect(data == undefined).assertTrue();
+            });
+            setTimeout(() => {
+                reject(new Error('not resolved in 2 second, reject it.'))
+            }, 2000);
+        });
+        await canGet.then(async function(deviceId) {
+            var query = new ddm.Query();
+            query.prefixKey('test_key_');
+            query.like('$.english.first', 'led%');
+            if (options.kvStoreType == ddm.KVStoreType.DEVICE_COLLABORATION) {
+                console.log('testPutAndGet deviceId = ' + deviceId);
+                query.deviceId(deviceId);
+            }
+            await kvStore.getEntries(query).then((entries) => {
+                console.log('testPutAndGet get success : ' + JSON.stringify(entries));
+                expect(entries.length == 10).assertTrue();
+            }).catch((err) => {
+                console.log('testPutAndGet get fail ' + err);
+                expect(null).assertFail();
+            });
+        }).catch((error) => {
+            console.log('testPutAndGet canGet fail: ' + error);
+            expect(null).assertFail();
+        });
+    } catch (e) {
+        console.log('testPutAndGet get exception: ' + e);
+    }
+}
+
 describe('SchemaTest', function() {
+    const config = {
+        bundleName : TEST_BUNDLE_NAME,
+        userInfo : {
+            userId : '0',
+            userType : ddm.UserType.SAME_USER_ID
+        }
+    }
+
+    var options = {
+        createIfMissing : true,
+        encrypt : false,
+        backup : false,
+        autoSync : true,
+        kvStoreType : ddm.KVStoreType.SINGLE_VERSION,
+        schema : '',
+        securityLevel : ddm.SecurityLevel.NO_LEVEL,
+    }
+
+    beforeAll(async function (done) {
+        try {
+            console.log("beforeAll: createKVManager (single) with " + JSON.stringify(options));
+            await ddm.createKVManager(config).then((manager) => {
+                kvManager = manager;
+                console.log('beforeAll createKVManager success');
+            }).catch((err) => {
+                console.log('beforeAll createKVManager err ' + err);
+            });
+        } catch (e) {
+            console.log("fail on exception: " + e);
+            expect(null).assertFail();
+        }
+        done();
+    })
+
+    afterAll(async function (done) {
+        console.log('afterAll');
+        kvManager = null;
+        kvStore = null;
+        done();
+    })
+
+    beforeEach(async function (done) {
+        console.log('beforeEach testcase will update options:' + JSON.stringify(options));
+        done();
+    })
+
+    afterEach(async function (done) {
+        console.log('afterEach');
+        await kvManager.closeKVStore(TEST_BUNDLE_NAME, TEST_STORE_ID, kvStore).then(async () => {
+            console.log('afterEach closeKVStore success');
+            await kvManager.deleteKVStore(TEST_BUNDLE_NAME, TEST_STORE_ID).then(() => {
+                console.log('afterEach deleteKVStore success');
+                kvStore = null;
+            }).catch((err) => {
+                console.log('afterEach deleteKVStore err ' + err);
+            });
+        }).catch((err) => {
+            console.log('afterEach closeKVStore err ' + err);
+        });
+        done();
+    })
 
-    // toJsonString():string
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_SCHEMA_TOJSONSTRING_0100
+     * @tc.name [JS-API8]Schema.ToJsonString()
+     * @tc.desc Test Js Api Schema.ToJsonString() testcase 001
+     */
     it('testToJsonString001', 0, async function(done) {
         try {
+            let first = new ddm.FieldNode('first');
+            first.type = ddm.ValueType.STRING;
+            first.nullable = false;
+            first.default = 'first name';
+
+            let second = new ddm.FieldNode('second');
+            second.type = ddm.ValueType.STRING;
+            second.nullable = false;
+            second.default = 'second name';
+
+            let english = new ddm.FieldNode('english');
+            english.type = ddm.ValueType.STRING;
+            english.appendChild(first);
+            english.appendChild(second);
+
             let schema = new ddm.Schema();
-            var str = schema.toJsonString();
-            console.log("schema: " + str);
+            schema.root.appendChild(english);
+            schema.indexes = ['$.english.first', '$.english.second'];
+            console.log("schema: " + schema.toJsonString());
         } catch (e) {
+            console.log("schema fail on exception: " + e);
             expect(null).assertFail();
         }
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_SCHEMA_TOJSONSTRING_0200
+     * @tc.name [JS-API8]Schema.ToJsonString()
+     * @tc.desc Test Js Api Schema.ToJsonString() testcase 002
+     */
     it('testToJsonString002', 0, async function(done) {
         try {
+            let first = new ddm.FieldNode('first');
+            first.type = ddm.ValueType.STRING;
+            first.nullable = false;
+            first.default = 'first name';
+
+            let second = new ddm.FieldNode('second');
+            second.type = ddm.ValueType.STRING;
+            second.nullable = false;
+            second.default = 'second name';
+
+            let english = new ddm.FieldNode('english');
+            english.type = ddm.ValueType.STRING;
+            english.appendChild(first);
+            english.appendChild(second);
+
             let schema = new ddm.Schema();
-            var str = schema.toJsonString();
-            schema.root = new ddm.FieldNode();
-            var node = schema.root;
-            console.log("schema: " + str);
+            schema.root.appendChild(english);
+            schema.indexes = ['$.english.first', '$.english.second'];
+            console.log("schema: " + schema.toJsonString());
+
+            options.kvStoreType = ddm.KVStoreType.DEVICE_COLLABORATION;
+            options.schema = schema.toJsonString();
+            await testPutAndGet(kvManager, options);
+            console.log("schematestPutAndGet done");
         } catch (e) {
+            console.log("schema fail on exception: " + e);
             expect(null).assertFail();
         }
         done();
     })
 
+    /**
+     * @tc.number SUB_DISTRIBUTEDDATAMGR_SCHEMA_TOJSONSTRING_0300
+     * @tc.name [JS-API8]Schema.ToJsonString()
+     * @tc.desc Test Js Api Schema.ToJsonString() testcase 003
+     */
     it('testToJsonString003', 0, async function(done) {
         try {
+            let name = new ddm.FieldNode('name');
+            name.type = ddm.ValueType.INTEGER;
+            name.nullable = false;
+            name.default = 0;
+
             let schema = new ddm.Schema();
-            var str = schema.toJsonString();
-            console.log("schema: " + str);
+            schema.root.appendChild(name);
+            schema.indexes = ['$.name'];
+            schema.mode = 1; // STRICT
+            console.log("schema: " + schema.toJsonString());
+            options.kvStoreType = ddm.KVStoreType.SINGLE_VERSION;
+            options.schema = schema.toJsonString();
+            await kvManager.getKVStore(TEST_STORE_ID, options).then(async (store) => {
+                console.log('testToJsonString003 getKVStore success' + JSON.stringify(options));
+                kvStore = store;
+                expect(store != null).assertTrue();
+                await kvStore.put("test_key_1", '{"name":1}');
+                await kvStore.put("test_key_2", '{"name":2}');
+                await kvStore.put("test_key_3", '{"name":3}');
+                console.log('testToJsonString003 Put success');
+            });
+            console.log('testToJsonString003 start Query ...');
+            var query = new ddm.Query();
+            query.prefixKey('test_key_');
+            query.notEqualTo("$.name", 3);
+            await kvStore.getEntries(query).then((entries) => {
+                console.log('testToJsonString003 get success : ' + JSON.stringify(entries));
+                expect(entries.length == 2).assertTrue();
+            }).catch((err) => {
+                console.log('testToJsonString003 get fail ' + err);
+                expect(null).assertFail();
+            });
         } catch (e) {
+            console.log("testToJsonString003 fail on exception: " + e);
             expect(null).assertFail();
         }
         done();

notification/ans_standard/publish_test/activebtn/activebutton/entry/src/main/js/test/ActsAnsPublishInput.js

@@ -37,8 +37,8 @@ describe('ActsAnsPublishInput', function () {
         console.info("=========Ans_PublishInput_0100 onConsume editType================>"+editType);
         expect(inputKey).assertEqual("inputKey_0100");
         expect(tag).assertEqual("tag_0100");
-        expect(options).assertEqual("options_0100");
-        expect(permitMimeTypes).assertEqual("permitMimeTypes_0100");
+        expect(JSON.stringify(options)).assertEqual(JSON.stringify(["options_0100"]));
+        expect(JSON.stringify(permitMimeTypes)).assertEqual(JSON.stringify(["permitMimeTypes_0100"]));
         expect(editType).assertEqual(1);
         expect(additionalData.key0100).assertEqual("0100");
         console.info("=========Ans_PublishInput_0100 onConsume end================>");

notification/ans_standard/publish_test/activebtn/testa/BUILD.gn

@@ -13,14 +13,18 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("testA") {
+ohos_hap("testA") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "testA"
+  subsystem_name = XTS_SUITENAME
+  final_hap_path =
+      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "testA"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/publish_test/activebtn/testa/Test.json

-{
-    "description": "Configuration for hjunit demo Tests",
-}

notification/ans_standard/publish_test/activebtn/testb/BUILD.gn

@@ -13,14 +13,18 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("testB") {
+ohos_hap("testB") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "testB"
+  subsystem_name = XTS_SUITENAME
+  final_hap_path =
+      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "testB"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/publish_test/activebtn/testb/Test.json

-{
-    "description": "Configuration for hjunit demo Tests",
-}

notification/ans_standard/publish_test/activebtn/testc/BUILD.gn

@@ -13,14 +13,18 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("testC") {
+ohos_hap("testC") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "testC"
+  subsystem_name = XTS_SUITENAME
+  final_hap_path =
+      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "testC"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/publish_test/activebtn/testc/Test.json

-{
-    "description": "Configuration for hjunit demo Tests",
-}

notification/ans_standard/publish_test/badgedisplayed/localcandisplay/BUILD.gn

@@ -13,14 +13,18 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("localcandisplay") {
+ohos_hap("localcandisplay") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "localcandisplay"
+  subsystem_name = XTS_SUITENAME
+  final_hap_path =
+      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "localcandisplay"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/publish_test/badgedisplayed/localcandisplay/Test.json

-{
-    "description": "Configuration for hjunit demo Tests",
-}

notification/ans_standard/publish_test/enablenotification/localnotificationenable/BUILD.gn

@@ -13,14 +13,18 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsLocalNotificationTest") {
+ohos_hap("ActsAnsLocalNotificationTest") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "ActsAnsLocalNotificationTest"
+  subsystem_name = XTS_SUITENAME
+  final_hap_path =
+      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAnsLocalNotificationTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/publish_test/enablenotification/localnotificationenable/Test.json

-{
-  "description": "Configuration for hjunit demo Tests",
-}

notification/ans_standard/publish_test/getactive/getactiveotherapp/BUILD.gn

@@ -13,14 +13,18 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsGetActiveOtherApp") {
+ohos_hap("ActsAnsGetActiveOtherApp") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "ActsAnsGetActiveOtherApp"
+  subsystem_name = XTS_SUITENAME
+  final_hap_path =
+      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAnsGetActiveOtherApp"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/publish_test/getactive/getactiveotherapp/Test.json

-{
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "180000",
-        "package": "com.example.actsansgetactiveotherapp",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "ActsAnsGetActiveOtherApp.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
-}

notification/ans_standard/publish_test/publishcontentype/sub/BUILD.gn

@@ -12,14 +12,18 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsCommonEventTest") {
+ohos_hap("ActsAnsCommonEventTest") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "ActsAnsCommonEventTest"
+  subsystem_name = XTS_SUITENAME
+  final_hap_path =
+      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAnsCommonEventTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/publish_test/publishcontentype/sub/Test.json

-{
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "60000",
-        "package": "com.example.actsanscommoneventtest",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "ActsAnsCommonEventTest"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
-}

notification/ans_standard/publish_test/subscribe/publish/Test.json

-{
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "60000",
-        "package": "com.example.actsanspublishtest",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "ActsAnsPublishTest.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
-}

notification/ans_standard/publish_test/wantagent/sub/BUILD.gn

@@ -13,14 +13,18 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsCommonSubscriberTest") {
+ohos_hap("ActsAnsCommonSubscriberTest") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "ActsAnsCommonSubscriberTest"
+  subsystem_name = XTS_SUITENAME
+  final_hap_path =
+      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAnsCommonSubscriberTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/publish_test/wantagent/test1/Test.json

-{
-    "description": "Configuration for hjunit demo Tests",
-}