Skip to content

X
Xts Acts

OpenHarmony / Xts Acts
1 年多 前同步成功

通知 9
Star 22
Fork 0
X
Xts Acts
未验证 提交 7b6f2a57 编写于 作者: O openharmony_ci 提交者： Gitee
浏览文件
操作

!5570 ActsServiceAbilityClientTest测试套用例优化 

Merge pull request !5570 from chengxingzhen/cherry-pick-1663732072
上级 e76fc901 8708422a
展开全部 隐藏空白更改
内联 并排
Showing with 789 addition and 825 deletion
ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/ServiceAbility/service.ts
浏览文件 @ 7b6f2a57
...@@ -48,7 +48,6 @@ class StubTest extends rpc.RemoteObject { ...@@ -48,7 +48,6 @@ class StubTest extends rpc.RemoteObject {
console.log('ACTS_SerivceAbilityServer ====< method called.') console.log('ACTS_SerivceAbilityServer ====< method called.')
} }
} }
export default { export default {
onStart(want) { onStart(want) {
console.debug('ACTS_SerivceAbilityServer 0425 ====>onStart .ts 0851 =' console.debug('ACTS_SerivceAbilityServer 0425 ====>onStart .ts 0851 ='
...@@ -60,9 +59,9 @@ export default { ...@@ -60,9 +59,9 @@ export default {
commonEvent.publish("ACTS_SerivceAbilityServer_onStop", (err) => { }); commonEvent.publish("ACTS_SerivceAbilityServer_onStop", (err) => { });
particleAbility.terminateSelf().then((data) => { particleAbility.terminateSelf().then((data) => {
console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data)); console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data));
}).catch((error) => { }).catch((error) => {
console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error)); console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error));
}); });
}, },
onCommand(want, restart, startId) { onCommand(want, restart, startId) {
console.debug('ACTS_SerivceAbilityServer ====>onCommand=' console.debug('ACTS_SerivceAbilityServer ====>onCommand='
...@@ -81,9 +80,9 @@ export default { ...@@ -81,9 +80,9 @@ export default {
); );
particleAbility.terminateSelf().then((data) => { particleAbility.terminateSelf().then((data) => {
console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data)); console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data));
}).catch((error) => { }).catch((error) => {
console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error)); console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error));
}); });
} else if (want.action == 'ServiceStartService_1000') { } else if (want.action == 'ServiceStartService_1000') {
particleAbility.startAbility( particleAbility.startAbility(
{ {
...@@ -96,11 +95,11 @@ export default { ...@@ -96,11 +95,11 @@ export default {
}, (err, data) => { }, (err, data) => {
console.debug('ACTS_SerivceAbilityServer start Ability 1000 callback=====' console.debug('ACTS_SerivceAbilityServer start Ability 1000 callback====='
+ err + ', data= ' + data + " , JSON." + JSON.stringify(data)); + err + ', data= ' + data + " , JSON." + JSON.stringify(data));
particleAbility.terminateSelf().then((data) => { particleAbility.terminateSelf().then((data) => {
console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data)); console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data));
}).catch((error) => { }).catch((error) => {
console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error)); console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error));
}); });
} }
); );
} else { } else {
...@@ -110,11 +109,11 @@ export default { ...@@ -110,11 +109,11 @@ export default {
|| want.action == 'PageStartService_0301' || want.action == 'PageStartService_0401') { || want.action == 'PageStartService_0301' || want.action == 'PageStartService_0401') {
console.debug('ACTS_SerivceAbilityServer_onCommand 100 200 301 401.terminateSelf()=====>' console.debug('ACTS_SerivceAbilityServer_onCommand 100 200 301 401.terminateSelf()=====>'
+ want.action); + want.action);
particleAbility.terminateSelf().then((data) => { particleAbility.terminateSelf().then((data) => {
console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data)); console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data));
}).catch((error) => { }).catch((error) => {
console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error)); console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error));
}); });
} }
} else { } else {
console.debug('ACTS_SerivceAbilityServer_onCommand publish err=====>' + err); console.debug('ACTS_SerivceAbilityServer_onCommand publish err=====>' + err);
...@@ -127,6 +126,7 @@ export default { ...@@ -127,6 +126,7 @@ export default {
try { try {
console.debug('ACTS_SerivceAbilityServer ====>onConnect=' console.debug('ACTS_SerivceAbilityServer ====>onConnect='
+ want + " , JSON." + JSON.stringify(want)); + want + " , JSON." + JSON.stringify(want));
commonEvent.publish("ACTS_SerivceAbilityServer_onConnect" + "_" + want.action, (err) => { });
function onConnectCallback(element, remote) { function onConnectCallback(element, remote) {
console.debug('ACTS_SerivceAbilityServer_onConnectCallback ====> mConnIdJs=' console.debug('ACTS_SerivceAbilityServer_onConnectCallback ====> mConnIdJs='
+ JSON.stringify(mConnIdJs) + " , " + mConnIdJs); + JSON.stringify(mConnIdJs) + " , " + mConnIdJs);
...@@ -157,8 +157,6 @@ export default { ...@@ -157,8 +157,6 @@ export default {
onFailed: onFailedCallback, onFailed: onFailedCallback,
}, },
) )
} else {
commonEvent.publish("ACTS_SerivceAbilityServer_onConnect" + "_" + want.action, (err) => { });
} }
} catch (err) { } catch (err) {
console.log("ACTS_SerivceAbilityServer ====< error:" + err) console.log("ACTS_SerivceAbilityServer ====< error:" + err)
...@@ -169,27 +167,22 @@ export default { ...@@ -169,27 +167,22 @@ export default {
onDisconnect(want) { onDisconnect(want) {
console.debug('ACTS_SerivceAbilityServer ====>onDisConnect=' console.debug('ACTS_SerivceAbilityServer ====>onDisConnect='
+ want + " , JSON." + JSON.stringify(want)); + want + " , JSON." + JSON.stringify(want));
commonEvent.publish("ACTS_SerivceAbilityServer_onDisConnect", (err) => { commonEvent.publish("ACTS_SerivceAbilityServer_onDisConnect_" + want.action, (err) => {
if (err.code) { console.debug('ACTS_SerivceAbilityServer_onDisConnect ===' + want.action);
console.debug('ACTS_SerivceAbilityServer_onDisConnect publish err=====>' + err); });
} else { if (want.action == 'ServiceConnectService_1300' || want.action == 'ServiceConnectService_1400'
console.debug('ACTS_SerivceAbilityServer_onDisConnect featureAbility.terminateSelf()=====<' || want.action == 'ServiceConnectService_1500' || want.action == 'ServiceConnectService_1501'
+ want.action); || want.action == 'ServiceConnectService_1600' || want.action == 'ServiceConnectService_1601'
if (want.action == 'ServiceConnectService_1300' || want.action == 'ServiceConnectService_1400' ) {
|| want.action == 'ServiceConnectService_1500' || want.action == 'ServiceConnectService_1501' particleAbility.disconnectAbility(mConnIdJs, (err) => {
|| want.action == 'ServiceConnectService_1600' || want.action == 'ServiceConnectService_1601' console.debug("=ACTS_SerivceAbilityServer_onDisConnect 13 14 15 16 err====>"
) { + ("json err=") + JSON.stringify(err) + " , " + want.action);
particleAbility.disconnectAbility(mConnIdJs, (err) => { })
console.debug("=ACTS_SerivceAbilityServer_onDisConnect 13 14 15 16 err====>" }
+ ("json err=") + JSON.stringify(err) + " , " + want.action); particleAbility.terminateSelf().then((data) => {
}) console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data));
} }).catch((error) => {
particleAbility.terminateSelf().then((data) => { console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error));
console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data));
}).catch((error) => {
console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error));
});
}
}); });
}, },
onReady() { onReady() {
......
ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/ServiceAbility/service.ts
浏览文件 @ 7b6f2a57
...@@ -49,6 +49,9 @@ class StubTest extends rpc.RemoteObject { ...@@ -49,6 +49,9 @@ class StubTest extends rpc.RemoteObject {
} }
} }
function sleep(ms) {
return new Promise(resolve => setTimeout(resolve, ms));
}
export default { export default {
onStart(want) { onStart(want) {
console.debug('ACTS_SerivceAbilityServerSecond ====>onStart=' console.debug('ACTS_SerivceAbilityServerSecond ====>onStart='
...@@ -60,20 +63,24 @@ export default { ...@@ -60,20 +63,24 @@ export default {
commonEvent.publish("ACTS_SerivceAbilityServerSecond_onStop", (err) => { }); commonEvent.publish("ACTS_SerivceAbilityServerSecond_onStop", (err) => { });
particleAbility.terminateSelf().then((data) => { particleAbility.terminateSelf().then((data) => {
console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data)); console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data));
}).catch((error) => { }).catch((error) => {
console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error)); console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error));
}); });
}, },
onCommand(want, restart, startId) { onCommand(want, restart, startId) {
console.debug('ACTS_SerivceAbilityServerSecond ====>onCommand=' console.debug('ACTS_SerivceAbilityServerSecond ====>onCommand='
+ "JSON(want)=" + JSON.stringify(want) + "JSON(want)=" + JSON.stringify(want)
+ " ,restart=" + restart + " ,startId=" + startId); + " ,restart=" + restart + " ,startId=" + startId);
commonEvent.publish("ACTS_SerivceAbilityServerSecond_onCommand" + "_" + want.action, (err) => { }); commonEvent.publish("ACTS_SerivceAbilityServerSecond_onCommand" + "_" + want.action, (err) => {
console.debug("ACTS_SerivceAbilityServerSecond_onCommand" + "_" + want.action +
"err: " + JSON.stringify(err))
});
sleep(500)
particleAbility.terminateSelf().then((data) => { particleAbility.terminateSelf().then((data) => {
console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data)); console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data));
}).catch((error) => { }).catch((error) => {
console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error)); console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error));
}); });
}, },
onConnect(want) { onConnect(want) {
console.info('ACTS_SerivceAbilityServerSecond ====< onConnect'); console.info('ACTS_SerivceAbilityServerSecond ====< onConnect');
...@@ -154,7 +161,7 @@ export default { ...@@ -154,7 +161,7 @@ export default {
onDisconnect(want) { onDisconnect(want) {
console.debug('ACTS_SerivceAbilityServerSecond ====>onDisConnect=' console.debug('ACTS_SerivceAbilityServerSecond ====>onDisConnect='
+ want + " , JSON." + JSON.stringify(want)); + want + " , JSON." + JSON.stringify(want));
commonEvent.publish("ACTS_SerivceAbilityServerSecond_onDisConnect", (err) => { commonEvent.publish("ACTS_SerivceAbilityServerSecond_onDisConnect_" + want.action, (err) => {
if (err.code) { if (err.code) {
console.debug('ACTS_SerivceAbilityServerSecond_onDisConnect publish err=====>' + err); console.debug('ACTS_SerivceAbilityServerSecond_onDisConnect publish err=====>' + err);
} else { } else {
...@@ -170,9 +177,9 @@ export default { ...@@ -170,9 +177,9 @@ export default {
} }
particleAbility.terminateSelf().then((data) => { particleAbility.terminateSelf().then((data) => {
console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data)); console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data));
}).catch((error) => { }).catch((error) => {
console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error)); console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error));
}); });
} }
}); });
}, },
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或