提交 74b7cdd3 编写于 作者: W wangzhen

fixed 240e941b from https://gitee.com/zivzhen/xts_acts/pulls/7558

[I6EGAA] api9 调整caller/callee相关接口参数后,修改用例参数名称

Change-Id: Ib3d82c16a30992cb9a91fe6c8a11e07235054272
Signed-off-by: Nwangzhen <wangzhen346@huawei.com>
上级 9d343100
......@@ -61,7 +61,7 @@ var test2200ReleaseFlag = '';
function testCall(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>SystemAppCalleeA MainAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
var result = recvSequence.str + 'processed';
var commonEventData = {
code: 0,
......@@ -82,7 +82,7 @@ function testCall(data) {
function testCallWithResult(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>SystemAppCalleeA MainAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
let result = recvSequence.str + 'processed';
recvSequence.setMySequence(recvSequence.num, recvSequence.str, result);
......@@ -94,7 +94,7 @@ export default class MainAbility extends Ability {
test2200(data) {
console.log("SystemAppCalleeA MainAbility test2200");
let recvData = new MySequenceable(0, '', '');
data.readSequenceable(recvData);
data.readParcelable(recvData);
let want = {
bundleName: "com.example.systemappcalleea",
......@@ -106,7 +106,7 @@ export default class MainAbility extends Ability {
let param = new MySequenceable(recvData.num + 1, recvData.str + "SystemAppCalleeA", '');
caller.onRelease(test2200ReleaseCallback);
caller.callWithResult('test2200', param).then((data2) => {
data2.readSequenceable(resultData);
data2.readParcelable(resultData);
caller.release();
for (let start=Date.now(); Date.now() - start <= 200;);
resultData.result = test2200ReleaseFlag;
......
......@@ -50,7 +50,7 @@ class MySequenceable {
function testCall(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>SystemAppCalleeA MainAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
var result = recvSequence.str + 'processed';
var commonEventData = {
code: 0,
......@@ -71,7 +71,7 @@ function testCall(data) {
function testCallWithResult(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>SystemAppCalleeA MainAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
let result = recvSequence.str + 'processed';
recvSequence.setMySequence(recvSequence.num, recvSequence.str, result);
......@@ -82,7 +82,7 @@ export default class SecondAbility extends Ability {
test2200(data) {
console.log("SystemAppCalleeA SecondAbility test2200");
let recvData = new MySequenceable(0, '', '');
data.readSequenceable(recvData);
data.readParcelable(recvData);
let result = new MySequenceable(recvData.num + 1, recvData.str + "SystemAppCalleeA", '');
return result;
}
......
......@@ -50,7 +50,7 @@ class MySequenceable {
function testCall(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>SystemAppCallerA MainAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
var result = recvSequence.str + 'processed';
var commonEventData = {
code: 0,
......@@ -71,7 +71,7 @@ function testCall(data) {
function testCallWithResult(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>SystemAppCallerA MainAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
let result = recvSequence.str + 'processed';
recvSequence.setMySequence(recvSequence.num, recvSequence.str, result);
......
......@@ -114,7 +114,7 @@ function startNext(context) {
function testCall(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>SystemAppCallerA MainAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
var result = recvSequence.str + 'processed';
var commonEventData = {
code: 0,
......@@ -134,7 +134,7 @@ function testCall(data) {
function testCallWithResult(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>SystemAppCallerA MainAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
let result = recvSequence.str + 'processed';
recvSequence.setMySequence(recvSequence.num, recvSequence.str, result);
......
......@@ -50,7 +50,7 @@ class MySequenceable {
function testCall(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>SystemAppCallerA SecondAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
var result = recvSequence.str + 'processed';
var commonEventData = {
code: 0,
......@@ -70,7 +70,7 @@ function testCall(data) {
function testCallWithResult(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>SystemAppCallerA SecondAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
let result = recvSequence.str + 'processed';
recvSequence.setMySequence(recvSequence.num, recvSequence.str, result);
......
......@@ -50,7 +50,7 @@ class MySequenceable {
function testCall(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>SystemAppCallerA ThirdAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
var result = recvSequence.str + 'processed';
var commonEventData = {
code: 0,
......@@ -70,7 +70,7 @@ function testCall(data) {
function testCallWithResult(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>SystemAppCallerA ThirdAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
let result = recvSequence.str + 'processed';
recvSequence.setMySequence(recvSequence.num, recvSequence.str, result);
......
......@@ -50,7 +50,7 @@ export default class MainAbility extends Ability {
test2100(data) {
console.log("SystemCallTest MainAbility test2100 begin");
let recvData = new MySequenceable(0, '', '');
data.readSequenceable(recvData);
data.readParcelable(recvData);
return new MySequenceable(recvData.num + 1, recvData.str + "Main", recvData.result);
}
......
......@@ -74,7 +74,7 @@ class MySequenceable {
function testCall(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>SystemCallTest SecondAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
var result = recvSequence.str + 'processed';
var commonEventData = {
code: 0,
......@@ -94,7 +94,7 @@ function testCall(data) {
function testCall2(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>SystemCallTest SecondAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
var result = recvSequence.str + 'processed2';
var commonEventData = {
code: 0,
......@@ -114,7 +114,7 @@ function testCall2(data) {
function testCallWithResult(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>SystemCallTest SecondAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
let result = recvSequence.str + 'processed';
recvSequence.setMySequence(recvSequence.num, recvSequence.str, result);
......@@ -132,7 +132,7 @@ export default class SecondAbility extends Ability {
test2100(data) {
let recvData = new MySequenceable(0, '', '');
data.readSequenceable(recvData);
data.readParcelable(recvData);
let want = {
bundleName: "com.example.systemcalltest",
abilityName: "com.example.systemcalltest.MainAbility",
......@@ -144,7 +144,7 @@ export default class SecondAbility extends Ability {
caller.onRelease(test2100ReleaseCallback);
for (let start=Date.now(); Date.now() - start <= 200;);
caller.callWithResult('test2100', param).then((data2) => {
data2.readSequenceable(resultData);
data2.readParcelable(resultData);
caller.release();
for (let start=Date.now(); Date.now() - start <= 200;);
resultData.result = test2100ReleaseFlag;
......@@ -166,13 +166,13 @@ export default class SecondAbility extends Ability {
testOff(data) {
let recvSequence = new MySequenceable(0, '', '');
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
return recvSequence;
}
stressMethod(data) {
let recvData = new MySequenceable(0, '', '');
data.readSequenceable(recvData);
data.readParcelable(recvData);
console.log('SystemCallTest SecondAbility stressMethod caller ' + recvData.str);
if (recvData.str == callerA) {
callSeqA.push(recvData.num);
......@@ -206,7 +206,7 @@ export default class SecondAbility extends Ability {
loopMethod(data) {
let recvData = new MySequenceable(0, '', '');
data.readSequenceable(recvData);
data.readParcelable(recvData);
return new MySequenceable(recvData.num + 1, recvData.str, '');
}
......
......@@ -183,7 +183,7 @@ export default function abilityTest() {
caller.callWithResult('testCallWithResult', param).then((data) => {
console.log('ACTS_CommonComponent_Call_0400 call success');
var result = new MySequenceable(0, '', '');
data.readSequenceable(result);
data.readParcelable(result);
expect(result.num).assertEqual(400);
expect(result.str).assertEqual('ACTS_CommonComponent_Call_0400');
expect(result.result).assertEqual('ACTS_CommonComponent_Call_0400processed');
......@@ -282,7 +282,7 @@ export default function abilityTest() {
caller2.callWithResult('testCallWithResult', param).then((data) => {
console.log('ACTS_CommonComponent_Call_0600 call success');
var result = new MySequenceable(0, '', '');
data.readSequenceable(result);
data.readParcelable(result);
expect(result.num).assertEqual(600);
expect(result.str).assertEqual('ACTS_CommonComponent_Call_0600');
expect(result.result).assertEqual('ACTS_CommonComponent_Call_0600processed');
......@@ -392,7 +392,7 @@ export default function abilityTest() {
caller.callWithResult('testCallWithResult', param).then((data) => {
console.log('ACTS_CommonComponent_Call_0800 call success');
var result = new MySequenceable(0, '', '');
data.readSequenceable(result);
data.readParcelable(result);
expect(result.num).assertEqual(800);
expect(result.str).assertEqual('ACTS_CommonComponent_Call_0800');
expect(result.result).assertEqual('ACTS_CommonComponent_Call_0800processed');
......@@ -492,7 +492,7 @@ export default function abilityTest() {
caller.callWithResult('testCallWithResult', param).then((data) => {
console.log('ACTS_CommonComponent_Call_1000 call success');
var result = new MySequenceable(0, '', '');
data.readSequenceable(result);
data.readParcelable(result);
expect(result.num).assertEqual(1000);
expect(result.str).assertEqual('ACTS_CommonComponent_Call_1000');
expect(result.result).assertEqual('ACTS_CommonComponent_Call_1000processed');
......
......@@ -50,7 +50,7 @@ let callSeq = "";
export default class MainAbility extends Ability {
test2300(data) {
let recvData = new MySequenceable(0, '', '');
data.readSequenceable(recvData);
data.readParcelable(recvData);
let sendData = new MySequenceable(0, '', '');
if (recvData.num == 2300 && recvData.str == 'case2300') {
sendData.num = 0;
......@@ -63,7 +63,7 @@ export default class MainAbility extends Ability {
test4600(data) {
let recvData = new MySequenceable(0, '', '');
data.readSequenceable(recvData);
data.readParcelable(recvData);
let sendData = new MySequenceable(0, '', '');
if (recvData.num == 4600 && recvData.str == 'case4600') {
sendData.num = 0;
......
......@@ -51,7 +51,7 @@ class MySequenceable {
function testCall(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>ThirdAppA MainAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
var result = recvSequence.str + 'processed';
var commonEventData = {
code: 0,
......@@ -71,7 +71,7 @@ function testCall(data) {
function testCallWithResult(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>ThirdAppA MainAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
let result = recvSequence.str + 'processed';
recvSequence.setMySequence(recvSequence.num, recvSequence.str, result);
......
......@@ -50,7 +50,7 @@ class MySequenceable {
function testCall(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>SystemCallTest FifthAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
var result = recvSequence.str + 'processed';
var commonEventData = {
code: 0,
......@@ -70,7 +70,7 @@ function testCall(data) {
function testCallWithResult(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>SystemCallTest FifthAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
let result = recvSequence.str + 'processed';
recvSequence.setMySequence(recvSequence.num, recvSequence.str, result);
......
......@@ -50,7 +50,7 @@ class MySequenceable {
function testCall(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>SystemCallTest ForthAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
var result = recvSequence.str + 'processed';
var commonEventData = {
code: 0,
......@@ -70,7 +70,7 @@ function testCall(data) {
function testCallWithResult(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>SystemCallTest ForthAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
let result = recvSequence.str + 'processed';
recvSequence.setMySequence(recvSequence.num, recvSequence.str, result);
......
......@@ -50,7 +50,7 @@ class MySequenceable {
function testCall(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>SystemCallTest SecondAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
var result = recvSequence.str + 'processed';
var commonEventData = {
code: 0,
......@@ -70,7 +70,7 @@ function testCall(data) {
function testCallWithResult(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>SystemCallTest SecondAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
let result = recvSequence.str + 'processed';
recvSequence.setMySequence(recvSequence.num, recvSequence.str, result);
......
......@@ -50,7 +50,7 @@ class MySequenceable {
function testCall(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>SystemCallTest ThirdAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
var result = recvSequence.str + 'processed';
var commonEventData = {
code: 0,
......@@ -70,7 +70,7 @@ function testCall(data) {
function testCallWithResult(data) {
let recvSequence = new MySequenceable(0, '', '');
console.log('======>SystemCallTest ThirdAbility on testCall <======')
data.readSequenceable(recvSequence);
data.readParcelable(recvSequence);
let result = recvSequence.str + 'processed';
recvSequence.setMySequence(recvSequence.num, recvSequence.str, result);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册