!3556 XTS-HO问题整改

Merge pull request !3556 from chengxingzhen/master

aafwk/aafwk_standard/BUILD.gn

@@ -23,6 +23,8 @@ group("aafwk_standard") {
       "actsabilitylifecyclestatenew:ActsAbilityLifecycleStateNewTest",
       "actsabilitymanageretstest:ActsAbilityManagerEtsTest",
       "actscalltest:actscalltest",
+      "actsfwkdataaccessortest:dataability",
+      "actsserviceabilityclienttest:serviceability",
       "actsstartcomponenttest:actsstartcomponenttest",
       "actsstserviceabilityclientcase:ActsStServiceAbilityClientCaseTest",
       "actsusers:actsusers",

aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import featureAbility from '@ohos.ability.featureability'
+import featureAbility from '@ohos.ability.featureAbility'
 import appManager from "@ohos.application.appManager"
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
 

aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/test/MangerAbilityJsunit.test.js

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import featureAbility from '@ohos.ability.featureability'
+import featureAbility from '@ohos.ability.featureAbility'
 import appManager from "@ohos.application.appManager"
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit'
 

aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import featureAbility from '@ohos.ability.featureability'
+import featureAbility from '@ohos.ability.featureAbility'
 import appManager from "@ohos.application.appManager"
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
 

aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/entry/src/main/js/test/MangerAbilityJsunit.test.js

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import featureAbility from '@ohos.ability.featureability'
+import featureAbility from '@ohos.ability.featureAbility'
 import appManager from "@ohos.application.appManager"
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit'
 

aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/entry/src/main/js/test/MangerAbilityJsunit.test.js

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import featureAbility from '@ohos.ability.featureability'
+import featureAbility from '@ohos.ability.featureAbility'
 import appManager from "@ohos.application.appManager"
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
 

aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import featureAbility from '@ohos.ability.featureability'
+import featureAbility from '@ohos.ability.featureAbility'
 import appManager from "@ohos.application.appManager"
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
 

aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/entry/src/main/js/test/MangerAbilityJsunit.test.js

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import featureAbility from '@ohos.ability.featureability'
+import featureAbility from '@ohos.ability.featureAbility'
 import appManager from "@ohos.application.appManager"
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
 

aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/test/MangerAbilityJsunit.test.js

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import featureAbility from '@ohos.ability.featureability'
+import featureAbility from '@ohos.ability.featureAbility'
 import appManager from "@ohos.application.appManager"
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
 

aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/entry/src/main/js/test/MangerAbilityJsunit.test.js

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import featureAbility from '@ohos.ability.featureability'
+import featureAbility from '@ohos.ability.featureAbility'
 import appManager from "@ohos.application.appManager"
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
 

aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/entry/src/main/js/test/MangerAbilityJsunit.test.js

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import featureAbility from '@ohos.ability.featureability'
+import featureAbility from '@ohos.ability.featureAbility'
 import appManager from "@ohos.application.appManager"
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
 

aafwk/aafwk_standard/abilitymultiinstance/amsabilitymultiinstanceappe/src/main/js/default/pages/index/index.js

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import featureAbility from '@ohos.ability.featureability'
+import featureAbility from '@ohos.ability.featureAbility'
 import commonEvent from '@ohos.commonEvent'
 
 const injectRef = Object.getPrototypeOf(global) || global

aafwk/aafwk_standard/actsfwkdataaccessortest/actsfwkdataaccessortest/entry/src/main/js/test/DataAbilityHelperJsSt.test.js

@@ -14,7 +14,6 @@
  */
 import featureAbility from '@ohos.ability.featureAbility'
 import ohosDataAbility from '@ohos.data.dataability'
-
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
 
 describe('ActsDataAbilityHelperTest', function () {

aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/test/DataUriUtilsJsSt.test.js

@@ -18,350 +18,350 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '
 describe('ActsDataUriUtilsTest', function () {
 
 /*
-* @tc.number: ACTS_GetIdSync_0100
-* @tc.name: GetIdSync : Obtains the ID attached to the end of the path component of the given URI.
+* @tc.number: ACTS_getId_0100
+* @tc.name: getId : Obtains the ID attached to the end of the path component of the given URI.
 * @tc.desc: Check the return value of the interface
 */
-    it('ACTS_GetIdSync_0100', 0, function (done) {
-        console.log('dataUriUtils getIdSync start1');
+    it('ACTS_getId_0100', 0, function (done) {
+        console.log('dataUriUtils getId start1');
         var result = dataUriUtils.getId("com.ix.dataUriUtils/1221");
-        console.log('dataUriUtils getIdSync URI : ' + result);
+        console.log('dataUriUtils getId URI : ' + result);
 
         expect(typeof(result)).assertEqual("number");
         expect(result).assertEqual(1221);
-        console.log('dataUriUtils getIdSync_test start1 successful');
+        console.log('dataUriUtils getId_test start1 successful');
         done();
     })
 
 /*
-* @tc.number: ACTS_GetIdSync_0200
-* @tc.name: GetIdSync : Obtains the ID attached to the end of the path component of the given URI.
+* @tc.number: ACTS_getId_0200
+* @tc.name: getId : Obtains the ID attached to the end of the path component of the given URI.
 * @tc.desc: Check the return value of the interface
 */
-    it('ACTS_GetIdSync_0200', 0, function (done) {
-        console.log('dataUriUtils getIdSync start2 ');
+    it('ACTS_getId_0200', 0, function (done) {
+        console.log('dataUriUtils getId start2 ');
         var result = dataUriUtils.getId("com.ix.dataUriUtils1221");
-        console.log('dataUriUtils getIdSync URI : ' + result);
+        console.log('dataUriUtils getId URI : ' + result);
 
         expect(typeof(result)).assertEqual("number");
         expect(result).assertEqual(-1);
-        console.log('dataUriUtils getIdSync_test start2 successful ');
+        console.log('dataUriUtils getId_test start2 successful ');
 
         done();
     })
 
 /*
-* @tc.number: ACTS_GetIdSync_0300
-* @tc.name: GetIdSync : Obtains the ID attached to the end of the path component of the given URI.
+* @tc.number: ACTS_getId_0300
+* @tc.name: getId : Obtains the ID attached to the end of the path component of the given URI.
 * @tc.desc: Check the return value of the interface
 */
-    it('ACTS_GetIdSync_0300', 0, function (done) {
-        console.log('dataUriUtils getIdSync start3 ');
+    it('ACTS_getId_0300', 0, function (done) {
+        console.log('dataUriUtils getId start3 ');
         var result = dataUriUtils.getId("com.ix.dataUriUtils/11234567890");
-        console.log('dataUriUtils getIdSync URI : ' + result);
+        console.log('dataUriUtils getId URI : ' + result);
 
         expect(typeof(result)).assertEqual("number");
         expect(result).assertEqual(11234567890);
-        console.log('dataUriUtils getIdSync_test start3 successful ');
+        console.log('dataUriUtils getId_test start3 successful ');
 
         done();
     })
 
 /*
-* @tc.number: ACTS_GetIdSync_0400
-* @tc.name: GetIdSync : Obtains the ID attached to the end of the path component of the given URI.
+* @tc.number: ACTS_getId_0400
+* @tc.name: getId : Obtains the ID attached to the end of the path component of the given URI.
 * @tc.desc: Check the return value of the interface
 */
-    it('ACTS_GetIdSync_0400', 0, function (done) {
-        console.log('dataUriUtils getIdSync start4 ');
+    it('ACTS_getId_0400', 0, function (done) {
+        console.log('dataUriUtils getId start4 ');
         var result = dataUriUtils.getId("com.ix.dataUriUtils");
-        console.log('dataUriUtils getIdSync URI : ' + result);
+        console.log('dataUriUtils getId URI : ' + result);
 
         expect(typeof(result)).assertEqual("number");
         expect(result).assertEqual(-1);
-        console.log('dataUriUtils getIdSync_test start4 successful ');
+        console.log('dataUriUtils getId_test start4 successful ');
 
         done();
     })
 
 /*
-* @tc.number: ACTS_GetIdSync_0500
-* @tc.name: GetIdSync : Obtains the ID attached to the end of the path component of the given URI.
+* @tc.number: ACTS_getId_0500
+* @tc.name: getId : Obtains the ID attached to the end of the path component of the given URI.
 * @tc.desc: Check the return value of the interface
 */
-    it('ACTS_GetIdSync_0500', 0, function (done) {
-        console.log('dataUriUtils getIdSync start5 ');
+    it('ACTS_getId_0500', 0, function (done) {
+        console.log('dataUriUtils getId start5 ');
         var result = dataUriUtils.getId("com.ix.dataUriUtils/-777");
-        console.log('dataUriUtils getIdSync URI : ' + result);//-777
+        console.log('dataUriUtils getId URI : ' + result);//-777
 
         expect(typeof(result)).assertEqual("number");
         expect(result).assertEqual(-777);
-        console.log('dataUriUtils getIdSync_test start5 successful ');
+        console.log('dataUriUtils getId_test start5 successful ');
 
         done();
     })
 
 /*
-* @tc.number: ACTS_AttachIdSync_0100
+* @tc.number: ACTS_attachId_0100
 * @tc.name: Attaches the given ID to the end of the path component of the given URI.
 * @tc.desc: Check the return value of the interface
 */
-    it('ACTS_AttachIdSync_0100',0, function (done) {
-        console.log('dataUriUtils attachIdSync start1 ');
+    it('ACTS_attachId_0100',0, function (done) {
+        console.log('dataUriUtils attachId start1 ');
         var idint = 1122;
         var result = dataUriUtils.attachId("com.ix.dataUriUtils",idint);
-        console.log('dataUriUtils attachIdSync URI :' + result)
+        console.log('dataUriUtils attachId URI :' + result)
 
         expect(typeof(result)).assertEqual("string");
         expect(result).assertEqual("com.ix.dataUriUtils/1122");
-        console.log('dataUriUtils attachIdSync_test start1 successful ');
+        console.log('dataUriUtils attachId_test start1 successful ');
 
         done();
     })
 
 /*
-* @tc.number: ACTS_AttachIdSync_0200
+* @tc.number: ACTS_attachId_0200
 * @tc.name: Attaches the given ID to the end of the path component of the given URI.
 * @tc.desc: Check the return value of the interface
 */
-    it('ACTS_AttachIdSync_0200',0, function (done) {
-        console.log('dataUriUtils attachIdSync start2 ');
+    it('ACTS_attachId_0200',0, function (done) {
+        console.log('dataUriUtils attachId start2 ');
         var idint = 0;
         var result = dataUriUtils.attachId("com.ix.dataUriUtils/777",idint);
-        console.log('dataUriUtils attachIdSync URI :' + result)
+        console.log('dataUriUtils attachId URI :' + result)
 
         expect(typeof(result)).assertEqual("string");
         expect(result).assertEqual("com.ix.dataUriUtils/777/0");
-        console.log('dataUriUtils attachIdSync_test start2 successful ');
+        console.log('dataUriUtils attachId_test start2 successful ');
 
         done();
     })
 
 /*
-* @tc.number: ACTS_AttachIdSync_0300
+* @tc.number: ACTS_attachId_0300
 * @tc.name: Attaches the given ID to the end of the path component of the given URI.
 * @tc.desc: Check the return value of the interface
 */
-    it('ACTS_AttachIdSync_0300',0, function (done) {
-        console.log('dataUriUtils attachIdSync start3 ');
+    it('ACTS_attachId_0300',0, function (done) {
+        console.log('dataUriUtils attachId start3 ');
         var idint = 456789;
         var result = dataUriUtils.attachId("com.ix.dataUriUtils/123",idint);
-        console.log('dataUriUtils attachIdSync URI :' + result)
+        console.log('dataUriUtils attachId URI :' + result)
 
         expect(typeof(result)).assertEqual("string");
         expect(result).assertEqual("com.ix.dataUriUtils/123/456789");
-        console.log('dataUriUtils attachIdSync_test start3 successful ');
+        console.log('dataUriUtils attachId_test start3 successful ');
 
         done();
     })
 
 /*
-* @tc.number: ACTS_AttachIdSync_0400
+* @tc.number: ACTS_attachId_0400
 * @tc.name: Attaches the given ID to the end of the path component of the given URI.
 * @tc.desc: Check the return value of the interface
 */
-    it('ACTS_AttachIdSync_0400',0, function (done) {
-        console.log('dataUriUtils attachIdSync start4 ');
+    it('ACTS_attachId_0400',0, function (done) {
+        console.log('dataUriUtils attachId start4 ');
         var idint = 123456789011;
         var result = dataUriUtils.attachId("com.ix.dataUriUtils",idint);
-        console.log('dataUriUtils attachIdSync URI :' + result)
+        console.log('dataUriUtils attachId URI :' + result)
 
         expect(typeof(result)).assertEqual("string");
         expect(result).assertEqual("com.ix.dataUriUtils/123456789011");
-        console.log('dataUriUtils attachIdSync_test start4 successful ');
+        console.log('dataUriUtils attachId_test start4 successful ');
 
         done();
     })
 
 /*
-* @tc.number: ACTS_AttachIdSync_0500
+* @tc.number: ACTS_attachId_0500
 * @tc.name: Attaches the given ID to the end of the path component of the given URI.
 * @tc.desc: Check the return value of the interface
 */
-    it('ACTS_AttachIdSync_0500',0, function (done) {
-        console.log('dataUriUtils attachIdSync start5 ');
+    it('ACTS_attachId_0500',0, function (done) {
+        console.log('dataUriUtils attachId start5 ');
         var idint = -1;
         var result = dataUriUtils.attachId("com.ix.dataUriUtils",idint);
-        console.log('dataUriUtils attachIdSync URI :' + result)
+        console.log('dataUriUtils attachId URI :' + result)
 
         expect(typeof(result)).assertEqual("string");
         expect(result).assertEqual("com.ix.dataUriUtils/-1");
-        console.log('dataUriUtils attachIdSync_test start5 successful ');
+        console.log('dataUriUtils attachId_test start5 successful ');
 
         done();
     })
 
 /*
-* @tc.number: ACTS_DeleteIdSync_0100
+* @tc.number: ACTS_deleteId_0100
 * @tc.name: Deletes the ID from the end of the path component of the given URI.
 * @tc.desc: Check the return value of the interface
 */
-    it('ACTS_DeleteIdSync_0100',0, function (done) {
-        console.log('dataUriUtils deleteIdSync start1 ');
+    it('ACTS_deleteId_0100',0, function (done) {
+        console.log('dataUriUtils deleteId start1 ');
         var result = dataUriUtils.deleteId("com.ix.dataUriUtils");
-        console.log('dataUriUtils deleteIdSync URI : ' + result);
+        console.log('dataUriUtils deleteId URI : ' + result);
 
         expect(typeof(result)).assertEqual("string");
         expect(result).assertEqual("com.ix.dataUriUtils");
-        console.log('dataUriUtils deleteIdSync_test start1 successful ');
+        console.log('dataUriUtils deleteId_test start1 successful ');
 
         done();
     })
 
 /*
-* @tc.number: ACTS_DeleteIdSync_0200
+* @tc.number: ACTS_deleteId_0200
 * @tc.name: Deletes the ID from the end of the path component of the given URI.
 * @tc.desc: Check the return value of the interface
 */
-    it('ACTS_DeleteIdSync_0200',0, function (done) {
-        console.log('dataUriUtils deleteIdSync start2 ');
+    it('ACTS_deleteId_0200',0, function (done) {
+        console.log('dataUriUtils deleteId start2 ');
         var result = dataUriUtils.deleteId("com.ix.dataUriUtils/1122");
-        console.log('dataUriUtils deleteIdSync URI : ' + result);
+        console.log('dataUriUtils deleteId URI : ' + result);
 
         expect(typeof(result)).assertEqual("string");
         expect(result).assertEqual("com.ix.dataUriUtils");
-        console.log('dataUriUtils deleteIdSync_test start2 successful ');
+        console.log('dataUriUtils deleteId_test start2 successful ');
 
         done();
     })
 
 /*
-* @tc.number: ACTS_DeleteIdSync_0300
+* @tc.number: ACTS_deleteId_0300
 * @tc.name: Deletes the ID from the end of the path component of the given URI.
 * @tc.desc: Check the return value of the interface
 */
-    it('ACTS_DeleteIdSync_0300',0, function (done) {
-        console.log('dataUriUtils deleteIdSync start3 ');
+    it('ACTS_deleteId_0300',0, function (done) {
+        console.log('dataUriUtils deleteId start3 ');
         var result = dataUriUtils.deleteId("com.ix.dataUriUtils1122");
-        console.log('dataUriUtils deleteIdSync URI : ' + result);
+        console.log('dataUriUtils deleteId URI : ' + result);
 
         expect(typeof(result)).assertEqual("string");
         expect(result).assertEqual("com.ix.dataUriUtils1122");
-        console.log('dataUriUtils deleteIdSync_test start3 successful ');
+        console.log('dataUriUtils deleteId_test start3 successful ');
 
         done();
     })
 
 /*
-* @tc.number: ACTS_DeleteIdSync_0400
+* @tc.number: ACTS_deleteId_0400
 * @tc.name: Deletes the ID from the end of the path component of the given URI.
 * @tc.desc: Check the return value of the interface
 */
-    it('ACTS_DeleteIdSync_0400',0, function (done) {
-        console.log('dataUriUtils deleteIdSync start4 ');
+    it('ACTS_deleteId_0400',0, function (done) {
+        console.log('dataUriUtils deleteId start4 ');
         var result = dataUriUtils.deleteId("com.ix.dataUriUtils/-1");
-        console.log('dataUriUtils deleteIdSync URI : ' + result);
+        console.log('dataUriUtils deleteId URI : ' + result);
 
         expect(typeof(result)).assertEqual("string");
         expect(result).assertEqual("com.ix.dataUriUtils");
-        console.log('dataUriUtils deleteIdSync_test start4 successful ');
+        console.log('dataUriUtils deleteId_test start4 successful ');
 
         done();
     })
 
 /*
-* @tc.number: ACTS_DeleteIdSync_0500
+* @tc.number: ACTS_deleteId_0500
 * @tc.name: Deletes the ID from the end of the path component of the given URI.
 * @tc.desc: Check the return value of the interface
 */
-    it('ACTS_DeleteIdSync_0500',0, function (done) {
-        console.log('dataUriUtils deleteIdSync start5 ');
+    it('ACTS_deleteId_0500',0, function (done) {
+        console.log('dataUriUtils deleteId start5 ');
         var result = dataUriUtils.deleteId("com.ix.dataUriUtils/1122/2211");
-        console.log('dataUriUtils deleteIdSync URI : ' + result);
+        console.log('dataUriUtils deleteId URI : ' + result);
 
         expect(typeof(result)).assertEqual("string");
         expect(result).assertEqual("com.ix.dataUriUtils/1122");
-        console.log('dataUriUtils deleteIdSync_test start5 successful ');
+        console.log('dataUriUtils deleteId_test start5 successful ');
 
         done();
     })
 
 /*
-* @tc.number: ACTS_UpdateIdSync_0100
+* @tc.number: ACTS_updateId_0100
 * @tc.name: Updates the ID in the specified dataUri.
 * @tc.desc: Check the return value of the interface
 */
-    it('ACTS_UpdateIdSync_0100',0, function (done) {
-        console.log('dataUriUtils updateIdSync start1 ');
+    it('ACTS_updateId_0100',0, function (done) {
+        console.log('dataUriUtils updateId start1 ');
         var idint = 1122;
         var result = dataUriUtils.updateId("com.ix.dataUriUtils",idint);
-        console.log('updateIdSync updateIdSync URI : ' + result);
+        console.log('updateId updateId URI : ' + result);
 
         expect(typeof(result)).assertEqual("string");
         expect(result).assertEqual("com.ix.dataUriUtils");
-        console.log('dataUriUtils updateIdSync_test start1 successful ');
+        console.log('dataUriUtils updateId_test start1 successful ');
 
         done();
     })
 
 /*
-* @tc.number: ACTS_UpdateIdSync_0200
+* @tc.number: ACTS_updateId_0200
 * @tc.name: Updates the ID in the specified dataUri.
 * @tc.desc: Check the return value of the interface
 */
-    it('ACTS_UpdateIdSync_0200',0, function (done) {
-        console.log('dataUriUtils updateIdSync start2 ');
+    it('ACTS_updateId_0200',0, function (done) {
+        console.log('dataUriUtils updateId start2 ');
         var idint = 1122;
         var result = dataUriUtils.updateId("com.ix.dataUriUtils/",idint)
-        console.log('updateIdSync updateIdSync URI : ' + result);
+        console.log('updateId updateId URI : ' + result);
 
         expect(typeof(result)).assertEqual("string");
         expect(result).assertEqual("com.ix.dataUriUtils/");
-        console.log('dataUriUtils updateIdSync_test start2 successful ');
+        console.log('dataUriUtils updateId_test start2 successful ');
 
         done();
     })
 
 /*
-* @tc.number: ACTS_UpdateIdSync_0300
+* @tc.number: ACTS_updateId_0300
 * @tc.name: Updates the ID in the specified dataUri.
 * @tc.desc: Check the return value of the interface
 */
-    it('ACTS_UpdateIdSync_0300',0, function (done) {
-        console.log('dataUriUtils updateIdSync start3 ');
+    it('ACTS_updateId_0300',0, function (done) {
+        console.log('dataUriUtils updateId start3 ');
         var idint = 3344;
         var result = dataUriUtils.updateId("com.ix.dataUriUtils/-1",idint)
-        console.log('updateIdSync updateIdSync URI : ' + result);
+        console.log('updateId updateId URI : ' + result);
 
         expect(typeof(result)).assertEqual("string");
         expect(result).assertEqual("com.ix.dataUriUtils/3344");
-        console.log('dataUriUtils updateIdSync_test start3 successful ');
+        console.log('dataUriUtils updateId_test start3 successful ');
 
         done();
     })
 
 /*
-* @tc.number: ACTS_UpdateIdSync_0400
+* @tc.number: ACTS_updateId_0400
 * @tc.name: Updates the ID in the specified dataUri.
 * @tc.desc: Check the return value of the interface
 */
-    it('ACTS_UpdateIdSync_0400',0, function (done) {
-        console.log('dataUriUtils updateIdSync start4 ');
+    it('ACTS_updateId_0400',0, function (done) {
+        console.log('dataUriUtils updateId start4 ');
         var idint = 5566;
         var result = dataUriUtils.updateId("com.ix.dataUriUtils/123456789011",idint)
-        console.log('updateIdSync updateIdSync URI : ' + result);
+        console.log('updateId updateId URI : ' + result);
 
         expect(typeof(result)).assertEqual("string");
         expect(result).assertEqual("com.ix.dataUriUtils/5566");
-        console.log('dataUriUtils updateIdSync_test start4 successful ');
+        console.log('dataUriUtils updateId_test start4 successful ');
 
         done();
     })
 
 /*
-* @tc.number: ACTS_UpdateIdSync_0500
+* @tc.number: ACTS_updateId_0500
 * @tc.name: Updates the ID in the specified dataUri.
 * @tc.desc: Check the return value of the interface
 */
-    it('ACTS_UpdateIdSync_0500',0, function (done) {
-        console.log('dataUriUtils updateIdSync start5 ');
+    it('ACTS_updateId_0500',0, function (done) {
+        console.log('dataUriUtils updateId start5 ');
 
         var idint = 0;
         expect(typeof(idint)).assertEqual("number");
-        console.log('dataUriUtils updateIdSync start666 ');
+        console.log('dataUriUtils updateId start666 ');
 
         var result = dataUriUtils.updateId("com.ix.dataUriUtils/1122",idint)
-        console.log('updateIdSync updateIdSync URI : ' + result);
+        console.log('updateId updateId URI : ' + result);
         expect(typeof(result)).assertEqual("string");
         expect(result).assertEqual("com.ix.dataUriUtils/0");
         done();

aafwk/aafwk_standard/fa/faapplicationinfo/entry/src/main/js/test/ApplicationInfoJsunit.test.js

@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
-import commonEvent from '@ohos.commonevent'
-import featureAbility from '@ohos.ability.featureability'
+import commonEvent from '@ohos.commonEvent'
+import featureAbility from '@ohos.ability.featureAbility'
 import formBindingData from '@ohos.application.formBindingData'
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
 

aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/ets/MainAbility/test/FmsStress.test.ets

@@ -637,7 +637,7 @@ export default function test() {
             console.info(`${tcNumber} before filter size: ${JSON.stringify(allFormsInfo.length)}`);
             allFormsInfo = allFormsInfo.filter((formsInfo) => providerBundleNameList.includes(formsInfo.bundleName));
             console.info(`${tcNumber} after filter size: ${JSON.stringify(allFormsInfo.length)}`);
-            expect(allFormsInfo.length).assertEqual(2);
+            expect(allFormsInfo.length).assertEqual(3);
 
             allFormsInfo.forEach(async (formsInfo, index) => {
                 const providerFormsInfo1 = await formHost.getFormsInfo(formsInfo.bundleName);

aafwk/aafwk_standard/newwant/actsnewwantapi7relyhap/entry/src/main/js/default/pages/index/index.js

@@ -17,7 +17,7 @@ import app from '@system.app'
 import device from '@system.device'
 import router from '@system.router'
 import { Core, ExpectExtend } from 'deccjsunit/index'
-import featureAbility from '@ohos.ability.featureability'
+import featureAbility from '@ohos.ability.featureAbility'
 
 const injectRef = Object.getPrototypeOf(global) || global
 injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')

aafwk/aafwk_standard/want/actsgetwantalltest/entry/src/main/js/test/ActsGetWantAllTest.js

@@ -183,67 +183,6 @@ describe('ActsGetWantTest', function () {
         console.info('====> ACTS_GetWant_0300 before done=====>')
     }
 
-    //  @tc.number: ACTS_GetWant_0400
-    //  @tc.name: getWant : get want in current ability
-    //  @tc.desc:Start the ability through startabilityforresult,
-    //           and then use terminateselfwithresult to return the data (by callback)
-    it('ACTS_GetWant_0400', 0, async function (done) {
-        featureAbility.startAbilityForResult({
-            want:
-            {
-                deviceId: "",
-                bundleName: "com.example.actsgetwantalltesthap",
-                abilityName: "com.example.actsgetwantalltesthap.MainAbility",
-                action: "action2",
-                entities: ["entity1", "entity2"],
-                type: "MIMETYPE",
-                uri: "key={true,true,false}",
-                flags: wantConstant.Flags.FLAG_ABILITY_FORWARD_RESULT,
-                parameters:
-                {
-                    mykey0: 0.1,
-                    mykey1: [0.1, 0.2, 0.3],
-                    mykey2: "[1, 2, 3]",
-                    mykey3: "str",
-                    mykey4: [false, true, false],
-                    mykey5: ["str", "!@#$%", "helloopenharmony"],
-                },
-            },
-        },
-            (err, data) => {
-                checkOnAbilityResult0400(data);
-                setTimeout(()=>{
-                    done();
-                }, TIMEOUT_NUMBER);
-            })
-    })
-
-    function checkOnAbilityResult0400(data) {
-        console.info('====> ACTS_GetWant_0400 start ability=====>' + JSON.stringify(data))
-        expect(data.want.deviceId).assertEqual("");
-        expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap");
-        expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility");
-        expect(data.want.action).assertEqual("action2");
-        expect(data.want.entities[0]).assertEqual("entity1");
-        expect(data.want.entities[1]).assertEqual("entity2");
-        expect(data.want.type).assertEqual("MIMETYPE");
-        expect(data.want.uri).assertEqual("key={true,true,false}");
-        expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_ABILITY_FORWARD_RESULT);
-        expect(data.want.parameters.mykey0).assertEqual(0.1);
-        expect(data.want.parameters.mykey1[0]).assertEqual(0.1);
-        expect(data.want.parameters.mykey1[1]).assertEqual(0.2);
-        expect(data.want.parameters.mykey1[2]).assertEqual(0.3);
-        expect(data.want.parameters.mykey2).assertEqual("[1, 2, 3]");
-        expect(data.want.parameters.mykey3).assertEqual("str");
-        expect(data.want.parameters.mykey4[0]).assertEqual(false);
-        expect(data.want.parameters.mykey4[1]).assertEqual(true);
-        expect(data.want.parameters.mykey4[2]).assertEqual(false);
-        expect(data.want.parameters.mykey5[0]).assertEqual("str");
-        expect(data.want.parameters.mykey5[1]).assertEqual("!@#$%");
-        expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmony");
-        console.info('====> ACTS_GetWant_0400 before done=====>')
-    }
-
     //  @tc.number: ACTS_GetWant_0500
     //  @tc.name: getWant : get want in current ability
     //  @tc.desc:Start the ability through startabilityforresult,
@@ -1009,62 +948,6 @@ describe('ActsGetWantTest', function () {
             })
         })
 
-    //  @tc.number: ACTS_GetWant_1800
-    //  @tc.name: getWant : get want in current ability
-    //  @tc.desc:Start the ability through startabilityforresult,
-    //           and then use terminateselfwithresult to return the data (by callback)
-    it('ACTS_GetWant_1800', 0, async function (done) {
-        featureAbility.startAbilityForResult({
-            want:
-            {
-                deviceId: "",
-                bundleName: "com.example.actsgetwantalltesthap",
-                abilityName: "com.example.actsgetwantalltesthap.MainAbility",
-                action: "action1",
-                entities: ["entity1"],
-                type: "MIMETYPE",
-                uri: "key={true,true,false}",
-                flags: wantConstant.Flags.FLAG_START_FOREGROUND_ABILITY,
-                parameters:
-                {
-                    mykey0: 0.1,
-                    mykey1: [0.1, 0.2, 0.0000000003],
-                    mykey2: "[a, b, c]",
-                    mykey3: "str",
-                    mykey4: [false, true, false],
-                    mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"],
-                },
-            },
-        },
-            (err, data) => {
-                console.info('====> ACTS_GetWant_1800 start ability=====>' + JSON.stringify(data))
-                expect(data.want.deviceId).assertEqual("");
-                expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap");
-                expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility");
-                expect(data.want.action).assertEqual("action1");
-                expect(data.want.entities[0]).assertEqual("entity1");
-                expect(data.want.type).assertEqual("MIMETYPE");
-                expect(data.want.uri).assertEqual("key={true,true,false}");
-                expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_START_FOREGROUND_ABILITY );
-                expect(data.want.parameters.mykey0).assertEqual(0.1);
-                expect(data.want.parameters.mykey1[0]).assertEqual(0.1);
-                expect(data.want.parameters.mykey1[1]).assertEqual(0.2);
-                expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003);
-                expect(data.want.parameters.mykey2).assertEqual("[a, b, c]");
-                expect(data.want.parameters.mykey3).assertEqual("str");
-                expect(data.want.parameters.mykey4[0]).assertEqual(false);
-                expect(data.want.parameters.mykey4[1]).assertEqual(true);
-                expect(data.want.parameters.mykey4[2]).assertEqual(false);
-                expect(data.want.parameters.mykey5[0]).assertEqual("str");
-                expect(data.want.parameters.mykey5[1]).assertEqual("STR");
-                expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony");
-                console.info('====> ACTS_GetWant_1800 setTimeout before done.=====>')
-                setTimeout(()=>{
-                    done();
-                }, TIMEOUT_NUMBER);
-            })
-    })
-
     //  @tc.number: ACTS_GetWant_1900
     //  @tc.name: getWant : get want in current ability
     //  @tc.desc:Start the ability through startabilityforresult,
@@ -1128,66 +1011,6 @@ describe('ActsGetWantTest', function () {
         console.info('====> ACTS_GetWant_1900 setTimeout before done.=====>')
     }
 
-    //  @tc.number: ACTS_GetWant_2000
-    //  @tc.name: getWant : get want in current ability
-    //  @tc.desc:Start the ability through startabilityforresult,
-    //           and then use terminateselfwithresult to return the data (by callback)
-    it('ACTS_GetWant_2000', 0, async function (done) {
-        featureAbility.startAbilityForResult({
-            want:
-            {
-                deviceId: "",
-                bundleName: "com.example.actsgetwantalltesthap",
-                abilityName: "com.example.actsgetwantalltesthap.MainAbility",
-                action: "action1",
-                entities: ["entity1"],
-                type: "MIMETYPE",
-                uri: "key={true,true,false}",
-                flags: wantConstant.Flags.FLAG_INSTALL_WITH_BACKGROUND_MODE,
-                parameters:
-                {
-                    mykey0: 0.1,
-                    mykey1: [0.1, 0.2, 0.0000000003],
-                    mykey2: "[a, b, c]",
-                    mykey3: "str",
-                    mykey4: [false, true, false],
-                    mykey5: ["str", "STR", "helloopenharmonyhelloopenharmonyhelloopenharmony"],
-                },
-            },
-        },
-            (err, data) => {
-                checkOnAbilityResult2000(data);
-                setTimeout(()=>{
-                    done();
-                }, TIMEOUT_NUMBER);
-            })
-    })
-
-    function checkOnAbilityResult2000(data) {
-        console.info('====> ACTS_GetWant_2000 start ability=====>' + JSON.stringify(data))
-        expect(data.want.deviceId).assertEqual("");
-        expect(data.want.bundleName).assertEqual("com.example.actsgetwantalltesthap");
-        expect(data.want.abilityName).assertEqual("com.example.actsgetwantalltesthap.MainAbility");
-        expect(data.want.action).assertEqual("action1");
-        expect(data.want.entities[0]).assertEqual("entity1");
-        expect(data.want.type).assertEqual("MIMETYPE");
-        expect(data.want.uri).assertEqual("key={true,true,false}");
-        expect(data.want.flags).assertEqual(wantConstant.Flags.FLAG_INSTALL_WITH_BACKGROUND_MODE);
-        expect(data.want.parameters.mykey0).assertEqual(0.1);
-        expect(data.want.parameters.mykey1[0]).assertEqual(0.1);
-        expect(data.want.parameters.mykey1[1]).assertEqual(0.2);
-        expect(data.want.parameters.mykey1[2]).assertEqual(0.0000000003);
-        expect(data.want.parameters.mykey2).assertEqual("[a, b, c]");
-        expect(data.want.parameters.mykey3).assertEqual("str");
-        expect(data.want.parameters.mykey4[0]).assertEqual(false);
-        expect(data.want.parameters.mykey4[1]).assertEqual(true);
-        expect(data.want.parameters.mykey4[2]).assertEqual(false);
-        expect(data.want.parameters.mykey5[0]).assertEqual("str");
-        expect(data.want.parameters.mykey5[1]).assertEqual("STR");
-        expect(data.want.parameters.mykey5[2]).assertEqual("helloopenharmonyhelloopenharmonyhelloopenharmony");
-        console.info('====> ACTS_GetWant_2000 setTimeout before done.=====>')
-    }
-
     //  @tc.number: ACTS_GetWant_2100
     //  @tc.name: getWant : get want in current ability
     //  @tc.desc:Start the ability through startabilityforresult,