diff --git a/aafwk/aafwk_standard/actsdataabilityjs/entry/src/main/js/test/ActsDataAbilityJsTest.test.js b/aafwk/aafwk_standard/actsdataabilityjs/entry/src/main/js/test/ActsDataAbilityJsTest.test.js index 9f6241a458312f1d3ded4ea11294580889df8d40..de8adfb92abdfe4783971fbd7ccc828b5bc7b244 100644 --- a/aafwk/aafwk_standard/actsdataabilityjs/entry/src/main/js/test/ActsDataAbilityJsTest.test.js +++ b/aafwk/aafwk_standard/actsdataabilityjs/entry/src/main/js/test/ActsDataAbilityJsTest.test.js @@ -62,7 +62,7 @@ afterAll((done) => { done(); }, gSetTimeout); }) - + /* * @tc.number: ACTS_AfeatureAbilityEnum_0100 * @tc.name: Enum the client resource of the Data ability. @@ -74,7 +74,7 @@ it('ACTS_AfeatureAbilityEnum_0100', 0, async function (done) { expect(featureAbility.ContinuationState.LOCAL_RUNNING).assertEqual(0); expect(featureAbility.ContinuationState.REMOTE_RUNNING).assertEqual(1); expect(featureAbility.ContinuationState.REPLICA_RUNNING).assertEqual(2); - + expect(abilityManager.ProcessErrCode.NO_ERROR).assertEqual(0); expect(abilityManager.ProcessErrCode.CRASHED).assertEqual(1); expect(abilityManager.ProcessErrCode.NO_RESPONSE).assertEqual(2); @@ -750,11 +750,10 @@ it("ACTS_Call_0100", 0, async function (done) { console.log('ACTS_Call_0100 end......'); }) - /* * @tc.number: ACTS_Call_0200 * @tc.name: call : Queries data in the database. - * @tc.desc: Check the return value of the interface + * @tc.desc: Check the return value of the interface (by promise) * @tc.level 0 */ it("ACTS_Call_0200", 0, async function (done) { @@ -768,13 +767,12 @@ it("ACTS_Call_0200", 0, async function (done) { try { rDAHelper = featureAbility.acquireDataAbilityHelper(dataAbilityUri); console.debug('ACTS_AbeforeAll rDAHelper ====>: ' + rDAHelper + " ,JSON. " + JSON.stringify(rDAHelper)); - rDAHelper.call(dataAbilityUri, 'query', arg, pacMap, (err, data) => { - if (err) { - console.error('ACTS_Call_0200 error: ' + JSON.stringify(err)); - } else { - console.info('ACTS_Call_0200 succeeded: ' + JSON.stringify(data)); - } + rDAHelper.call(dataAbilityUri, 'query', arg, pacMap).then((data) => { + console.info('ACTS_Call_0200 succeeded data: ' + JSON.stringify(data)); + }).catch((error) => { + console.error('ACTS_Call_0200 error: ' + JSON.stringify(error)); }); + done(); } catch (err) { console.error('ACTS_Call_0200 catch(err)====>:' + err); console.log('ACTS_Call_0200====: ' + rDAHelper + " ,JSON. " + JSON.stringify(rDAHelper)); - rDAHelper.call(dataAbilityUri, 'update', arg, pacMap, (err, data) => { - if (err) { - console.error('ACTS_Call_0300 error: ' + JSON.stringify(err)); - } else { - console.info('ACTS_Call_0300 succeeded: ' + JSON.stringify(data)); - } + rDAHelper.call(dataAbilityUri, 'update', arg, pacMap).then((data) => { + console.info('ACTS_Call_0300 succeeded data: ' + JSON.stringify(data)); + }).catch((error) => { + console.error('ACTS_Call_0300 error: ' + JSON.stringify(error)); }); + done(); } catch (err) { console.error('ACTS_Call_0300 catch(err)====>:' + err); console.log('ACTS_Call_0300====: ' + rDAHelper + " ,JSON. " + JSON.stringify(rDAHelper)); + rDAHelper.call(dataAbilityUri, 'delete', arg, pacMap).then((data) => { + console.info('ACTS_Call_0400 succeeded data: ' + JSON.stringify(data)); + }).catch((error) => { + console.error('ACTS_Call_0400 error: ' + JSON.stringify(error)); + }); + done(); + } catch (err) { + console.error('ACTS_Call_0400 catch(err)====>:' + err); + console.log('ACTS_Call_0400====: ' + rDAHelper + " ,JSON. " + JSON.stringify(rDAHelper)); + expect(typeof (rDAHelper)).assertEqual("object"); + pacMap.groupName = 'test2'; + rDAHelper.call(dataAbilityUri, 'insert', '', pacMap, (err, data) => { + if (err) { + console.error('ACTS_Call_0500 error: ' + JSON.stringify(err)); + } else { + console.info('ACTS_Call_0500 succeeded: ' + JSON.stringify(data)); + } + }); + done(); + } catch (err) { + console.error('ACTS_Call_0500 catch(err)====>:' + err); + console.log('ACTS_Call_0500====: ' + rDAHelper + " ,JSON. " + JSON.stringify(rDAHelper)); + rDAHelper.call(dataAbilityUri, 'query', arg, pacMap, (err, data) => { + if (err) { + console.error('ACTS_Call_0600 error: ' + JSON.stringify(err)); + } else { + console.info('ACTS_Call_0600 succeeded: ' + JSON.stringify(data)); + } + }); + done(); + } catch (err) { + console.error('ACTS_Call_0600 catch(err)====>:' + err); + console.log('ACTS_Call_0600====: ' + rDAHelper + " ,JSON. " + JSON.stringify(rDAHelper)); + rDAHelper.call(dataAbilityUri, 'update', arg, pacMap, (err, data) => { + if (err) { + console.error('ACTS_Call_0700 error: ' + JSON.stringify(err)); + } else { + console.info('ACTS_Call_0700 succeeded: ' + JSON.stringify(data)); + } + }); + done(); + } catch (err) { + console.error('ACTS_Call_0700 catch(err)====>:' + err); + console.log('ACTS_Call_0700====: ' + rDAHelper + " ,JSON. " + JSON.stringify(rDAHelper)); rDAHelper.call(dataAbilityUri, 'delete', arg, pacMap, (err, data) => { if (err) { - console.error('ACTS_Call_0400 error: ' + JSON.stringify(err)); + console.error('ACTS_Call_0800 error: ' + JSON.stringify(err)); } else { - console.info('ACTS_Call_0400 succeeded: ' + JSON.stringify(data)); + console.info('ACTS_Call_0800 succeeded: ' + JSON.stringify(data)); } }); done(); } catch (err) { - console.error('ACTS_Call_0400 catch(err)====>:' + err); - console.log('ACTS_Call_0400====:' + err); + console.log('ACTS_Call_0800====