!5139 【XTS】【元能力】XTS测试套优化用例并删除release接口相关用例

Merge pull request !5139 from chengxingzhen/master

ability/ability_runtime/actsfwkdataaccessortest/actsfwkdataaccessortest/src/main/js/test/DataAbilityHelperJsSt.test.js

@@ -59,13 +59,13 @@ describe('ActsDataAbilityHelperTest', function () {
         console.log('ACTS_AcquireDataAbilityHelper_0100====<begin');
         console.debug("=ACTS_AcquireDataAbilityHelper_0100 dataAbilityUri====>" + dataAbilityUri)
         try {
-            var abilityHelper = featureAbility.acquireDataAbilityHelper(dataAbilityUri)
-            console.log('ACTS_AcquireDataAbilityHelper_0100 abilityHelper ====>: '
-                + abilityHelper + " ,JSON. " + JSON.stringify(abilityHelper))
             if(DAHelper == null){
+                var abilityHelper = featureAbility.acquireDataAbilityHelper(dataAbilityUri)
+                console.log('ACTS_AcquireDataAbilityHelper_0100 abilityHelper ====>: '
+                    + abilityHelper + " ,JSON. " + JSON.stringify(abilityHelper))
                 DAHelper = abilityHelper;
             }
-            expect(typeof (abilityHelper)).assertEqual("object");
+            expect(typeof (DAHelper)).assertEqual("object");
         } catch (err) {
             console.error('=ACTS_GetDataAbilityHelper_0100 acquireDataAbilityHelper catch(err)====>:' + err);
             expect(false).assertTrue();
@@ -8317,146 +8317,4 @@ describe('ActsDataAbilityHelperTest', function () {
             done();
         }
     })
-
-    /*
-    * @tc.number: ACTS_Release_0100
-    * @tc.name: Releases the client resource of the Data ability.
-    * @tc.desc: Check the return value of the interface (by promise)
-    */
-    it('ACTS_Release_0100', 0, async function (done) {
-        console.log('ACTS_Release_0100====<begin');
-        var rDAHelper
-        try {
-            rDAHelper = featureAbility.acquireDataAbilityHelper(dataAbilityUri);
-            console.debug('ACTS_beforeAll rDAHelper ====>: ' + rDAHelper + " ,JSON. " + JSON.stringify(rDAHelper));
-            expect(typeof (rDAHelper)).assertEqual("object");
-            rDAHelper.release().then((data) => {
-                console.debug("=ACTS_Release_0100 then data====>"
-                    + ("json data 【") + JSON.stringify(data) + (" 】") + " , " + data);
-                expect(data).assertEqual(true);
-                console.log('ACTS_Release_0100====<end');
-                done();
-            }).catch(err => {
-                console.debug("=ACTS_Release_0100 catch err ====>"
-                    + ("json err 【") + JSON.stringify(err) + (" 】 "));
-                expect(false).assertTrue();
-                console.log('ACTS_Release_0100====<end .catch');
-                done();
-            });
-        } catch (err) {
-            console.error('=ACTS_Release_0100 release promise catch(err)====>:' + err);
-            expect(false).assertTrue();
-            console.log('ACTS_Release_0100====<end catch(err)');
-            done();
-        }
-    })
-
-    /*
-    * @tc.number: ACTS_Release_0200
-    * @tc.name: Releases the client resource of the Data ability.
-    * @tc.desc: Check the return value of the interface (by AsyncCallback)
-    */
-    it('ACTS_Release_0200', 0, async function (done) {
-        console.log('ACTS_Release_0200====<begin');
-        var rDAHelper
-        try {
-            rDAHelper = featureAbility.acquireDataAbilityHelper(dataAbilityUri);
-            console.debug('ACTS_beforeAll rDAHelper ====>: ' + rDAHelper + " ,JSON. " + JSON.stringify(rDAHelper));
-            expect(typeof (rDAHelper)).assertEqual("object");
-            rDAHelper.release((err, data) => {
-                console.debug("=ACTS_Release_0200 err,data=======>"
-                    + ("json err【") + JSON.stringify(err) + (" 】json data【") + JSON.stringify(data) + (" 】;"));
-                console.log('featureAbility  getDataAbilityHelper ACTS_Release_0200  data: ' + data)
-                expect(data).assertEqual(true);
-                console.log('ACTS_Release_0200====<end');
-                done();
-            },
-            );
-        } catch (err) {
-            console.error('=ACTS_Release_0200 release AsyncCallback catch(err)====>:' + err);
-            expect(false).assertTrue();
-            console.log('ACTS_Release_0200====<end catch');
-            done();
-        }
-    })
-
-    /*
-    * @tc.number: ACTS_Release_0300
-    * @tc.name: Releases the client resource of the Data ability.
-    * @tc.desc: Check the return value of the interface (by promise)
-    */
-    it('ACTS_Release_0300', 0, async function (done) {
-        console.log('ACTS_Release_0300====<begin');
-        var rDAHelper
-        try {
-            rDAHelper = featureAbility.acquireDataAbilityHelper(dataAbilityUri);
-            console.debug('ACTS_beforeAll rDAHelper ====>: ' + rDAHelper + " ,JSON. " + JSON.stringify(rDAHelper));
-            expect(typeof (rDAHelper)).assertEqual("object");
-            rDAHelper.release().then((data) => {
-                console.debug("=ACTS_Release_0300 then data====>"
-                    + ("json data 【") + JSON.stringify(data) + (" 】") + " , " + data);
-                expect(data).assertEqual(true);
-                rDAHelper.release().then((data) => {
-                    console.debug("=ACTS_Release_0300 then data====>"
-                        + ("json data 【") + JSON.stringify(data) + (" 】") + " , " + data);
-                    expect(data).assertEqual(false);
-                    console.log('ACTS_Release_0300====<end');
-                    done();
-                }).catch(err => {
-                    console.debug("=ACTS_Release_0300 catch err ====>"
-                        + ("json err 【") + JSON.stringify(err) + (" 】 "));
-                    expect(false).assertTrue();
-                    console.log('ACTS_Release_0300====<end .catch');
-                    done();
-                });
-            }).catch(err => {
-                console.debug("=ACTS_Release_0300 catch err ====>"
-                    + ("json err 【") + JSON.stringify(err) + (" 】 "));
-                expect(false).assertTrue();
-                console.log('ACTS_Release_0300====<end .catch');
-                done();
-            });
-        } catch (err) {
-            console.error('=ACTS_Release_0300 release promise catch(err)====>:' + err);
-            expect(false).assertTrue();
-            console.log('ACTS_Release_0300====<end catch(err)');
-            done();
-        }
-    })
-
-    /*
-    * @tc.number: ACTS_Release_0400
-    * @tc.name: Releases the client resource of the Data ability.
-    * @tc.desc: Check the return value of the interface (by AsyncCallback)
-    */
-    it('ACTS_Release_0400', 0, async function (done) {
-        console.log('ACTS_Release_0400====<begin');
-        var rDAHelper
-        try {
-            rDAHelper = featureAbility.acquireDataAbilityHelper(dataAbilityUri);
-            console.debug('ACTS_beforeAll rDAHelper ====>: ' + rDAHelper + " ,JSON. " + JSON.stringify(rDAHelper));
-            expect(typeof (rDAHelper)).assertEqual("object");
-            rDAHelper.release((err, data) => {
-                console.debug("=ACTS_Release_0400 err,data=======>"
-                    + ("json err【") + JSON.stringify(err) + (" 】json data【") + JSON.stringify(data) + (" 】;"));
-                console.log('featureAbility  getDataAbilityHelper ACTS_Release_0400  data: ' + data)
-                expect(data).assertEqual(true);
-                rDAHelper.release((err, data) => {
-                    console.debug("=ACTS_Release_0400 err,data=======>"
-                        + ("json err【") + JSON.stringify(err) + (" ,") + JSON.stringify(data) + (" 】;"));
-                    console.log('featureAbility  getDataAbilityHelper ACTS_Release_0400  data: ' + data)
-                    expect(data).assertEqual(false);
-                    console.log('ACTS_Release_0400====<end');
-                    done();
-                },
-                );
-            },
-            );
-        } catch (err) {
-            console.error('=ACTS_Release_0400 release AsyncCallback catch(err)====>:' + err);
-            expect(false).assertTrue();
-            console.log('ACTS_Release_0400====<end catch');
-            done();
-        }
-    })
 })}

ability/ability_runtime/amscontextualinforquery/actsamsstaticextensioninfotest/entry/src/main/ets/test/Ability.test.ets

@@ -376,7 +376,7 @@ export default function abilityTest() {
         expect(data.labelId.length).assertLarger(0);
         expect(data.icon).assertEqual("$media:icon");
         expect(data.iconId.length).assertLarger(0);
-        expect(data.process).assertEqual("com.example.staticextensioninfo");
+        expect(data.process).assertEqual("com.example.staticextensioninfotest");
         expect(data.supportedModes).assertEqual(0);
         expect(data.moduleSourceDirs.length).assertEqual(1);
         expect(data.moduleSourceDirs[0]).assertEqual("/data/app/el1/bundle/public/" +