diff --git a/ability/ability_runtime/want/actsgetwantalltest/src/main/js/test/ActsGetWantAllTest.js b/ability/ability_runtime/want/actsgetwantalltest/src/main/js/test/ActsGetWantAllTest.js index 63f8c55e69e273c2b58ae92c82b1625f3ca48c4d..77545c7897bcad3ed4f847f70878381104478c04 100644 --- a/ability/ability_runtime/want/actsgetwantalltest/src/main/js/test/ActsGetWantAllTest.js +++ b/ability/ability_runtime/want/actsgetwantalltest/src/main/js/test/ActsGetWantAllTest.js @@ -12,18 +12,55 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import featureAbility from '@ohos.ability.featureAbility' -import wantConstant from '@ohos.ability.wantConstant' +import featureAbility from '@ohos.ability.featureAbility'; +import wantConstant from '@ohos.ability.wantConstant'; +import rpc from '@ohos.rpc'; +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'; + +class WantRemoteObject extends rpc.RemoteObject { + constructor(descriptor) { + super(descriptor); + } +} -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' export default function ActsGetWantTest() { describe('ActsGetWantTest', function () { var TIMEOUT_NUMBER = 3000; afterEach(async (done) => { setTimeout(function () { - done(); + done(); }, 1500); - }) + }); + + it('ACTS_RemoteObject_0100', 0, async function(done) { + let wantRemoteOjbect = new WantRemoteObject("wantRemoteObject"); + + featureAbility.startAbilityForResult({ + want: { + // deviceId: "", + bundleName: "com.example.actsgetwantalltesthap", + abilityName: "com.example.actsgetwantalltesthap.MainAbility", + // action: "action1", + parameters: { + hasRemoteObject: true, + wantRemoteOjbect: { + type: "RemoteObject", + value: wantRemoteOjbect + } + } + } + }).then((data) => { + setTimeout(() => { + console.info('====> ACTS_RemoteObject_0100 start startAbilityForResult=====>' + JSON.stringify(data)); + expect(data.want.parameters.hasOwnProperty("wantRemoteOjbect")).assertEqual(false); + done(); + }, TIMEOUT_NUMBER); + }).catch((error) => { + console.log('ACTS_RemoteObject_0100 error: ' + JSON.stringify(error)); + expect.assertFail(); + done(); + }) + }) // @tc.number: ACTS_GetWant_0100 // @tc.name: getWant : get want in current ability diff --git a/ability/ability_runtime/want/sceneProject/actsgetwantalltesthap/src/main/js/default/pages/index/index.js b/ability/ability_runtime/want/sceneProject/actsgetwantalltesthap/src/main/js/default/pages/index/index.js index a877ffeac7c83a89ef6c243c5b0cb49093ed354b..cb9b7a5e341b2a332b2911552ceebd86305a18ed 100644 --- a/ability/ability_runtime/want/sceneProject/actsgetwantalltesthap/src/main/js/default/pages/index/index.js +++ b/ability/ability_runtime/want/sceneProject/actsgetwantalltesthap/src/main/js/default/pages/index/index.js @@ -27,13 +27,24 @@ export default { featureAbility.getWant( (err, data) => { data = data; - console.debug("==========data=" + JSON.stringify(data)); - if (data.parameters.mykey5[1] == 'test123'){ + console.info("==========err=" + JSON.stringify(err)); + console.info("==========data=" + JSON.stringify(data)); + if (data.parameters.hasOwnProperty("hasRemoteObject") && data.parameters.hasRemoteObject == true) { + console.info("==========parameters= hasRemoteObject is true."); + setTimeout(function(){ + featureAbility.terminateSelfWithResult( + { + resultCode: 1, + want: data + } + ); + },800); + } else if (data.parameters.mykey5[1] == 'test123'){ + console.info("==========parameters= second value of mykey5 is test123."); featureAbility.getWant().then((data) =>{ data = data setTimeout(function(){ - console.debug("==========data2 bundleName is===========" - + JSON.stringify(data.bundleName)); + console.info("==========data2 bundleName is===========" + JSON.stringify(data.bundleName)); featureAbility.terminateSelfWithResult( { resultCode: 1, @@ -41,8 +52,9 @@ export default { } ); },1000); - }) + }); }else{ + console.info("==========parameters= default branch."); setTimeout(function(){ featureAbility.terminateSelfWithResult( {