Skip to content

X
Xts Acts

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

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

!9406 增加sim卡判断 

Merge pull request !9406 from 姜欢欢/master
上级 a47d376d 5000be22
显示空白变更内容
内联 并排
Showing with 499 addition and 517 deletion
telephony/telephonyjstest/radiostatistic/entry/src/main/ets/test/SmsMmsJsunit.test.ets
浏览文件 @ eaa01f8e
......@@ -15,6 +15,7 @@
import { describe, expect, it } from '@ohos/hypium';
import sms from '@ohos.telephony.sms';
import radio from '@ohos.telephony.radio';
import sim from '@ohos.telephony.sim';
export default function smsUiJsunit() {
describe('smsUiJsunit', function () {
......@@ -131,20 +132,18 @@ export default function smsUiJsunit() {
sms.getDefaultSmsSimId((err, data) => {
if(err){
console.info("Telephony_Sms_getDefaultSmsSimId_CallBack_0100 err = " + JSON.stringify(data));
radio.isRadioOn(0, (err, data) => {
console.info('Telephony_Sms_getDefaultSmsSimId_CallBack_0100 isRadioOn err' + JSON.stringify(err) + ' data ' + JSON.stringify(data));
if (!err) {
expect().assertFail();
}
});
expect(true).assertTrue();
done();
return;
}
console.log(`Telephony_Sms_getDefaultSmsSimId_CallBack_0100 callback: err->${JSON.stringify(err)}, data->${JSON.stringify(data)}`);
expect(true).assertTrue();
sim.hasSimCard(0, (err, data) => {
console.log(`Telephony_Sms_getDefaultSmsSimId_CallBack_0100 hasSimCard callback: err->${JSON.stringify(err)}, data->${JSON.stringify(data)}`);
expect(data).assertTrue();
done();
});
});
});
/**
* @tc.number Telephony_Sms_getDefaultSmsSimId_Promise_0100
* @tc.name Test getOpName interface
......@@ -154,16 +153,14 @@ export default function smsUiJsunit() {
let promise = sms.getDefaultSmsSimId();
promise.then(data => {
console.info("Telephony_Sms_getDefaultSmsSimId_Promise_0100 data = " + JSON.stringify(data));
expect(true).assertTrue();
sim.hasSimCard(0, (err, data) => {
console.log(`Telephony_Sms_getDefaultSmsSimId_Promise_0100 hasSimCard callback: err->${JSON.stringify(err)}, data->${JSON.stringify(data)}`);
expect(data).assertTrue();
done();
});
}).catch(err => {
console.info("Telephony_Sms_getDefaultSmsSimId_Promise_0100 err = " + JSON.stringify(err));
radio.isRadioOn(0, (err, data) => {
console.info('Telephony_Sms_getDefaultSmsSimId_Promise_0100 isRadioOn err' + JSON.stringify(err) + ' data ' + JSON.stringify(data));
if (!err) {
expect().assertFail();
}
});
expect(true).assertTrue();
done();
});
});
......
telephony/telephonyjstest/sim/sim_manager_function_test/src/main/js/test/SimManager.test.js
浏览文件 @ eaa01f8e
......@@ -19,7 +19,7 @@ import * as env from './lib/Const';
import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
export default function SimManagerTest() {
describe('SimManagerTest', function () {
describe('SimManagerTest', function () {
afterEach(async function () {
try {
class IccAccountInfo {
......@@ -506,20 +506,18 @@ describe('SimManagerTest', function () {
sim.getSimAccountInfo(0, (err, data) => {
if(err){
console.info("Telephony_Sim_getSimAccountInfo_CallBack_0100 err = " + JSON.stringify(err));
radio.isRadioOn(0, (err, data) => {
console.info('Telephony_Sim_getSimAccountInfo_CallBack_0100 isRadioOn err' + JSON.stringify(err) + ' data ' + JSON.stringify(data));
if (!err) {
expect().assertFail();
}
});
expect(true).assertTrue();
done();
return;
}
console.log(`Telephony_Sim_getSimAccountInfo_CallBack_0100 callback: err->${JSON.stringify(err)}, data->${JSON.stringify(data)}`);
expect(true).assertTrue();
sim.hasSimCard(0, (err, data) => {
console.log(`Telephony_Sim_getSimAccountInfo_CallBack_0100 hasSimCard callback: err->${JSON.stringify(err)}, data->${JSON.stringify(data)}`);
expect(data).assertTrue();
done();
});
});
});
/**
* @tc.number Telephony_Sim_getSimAccountInfo_Promise_0100
* @tc.name Test getOpName interface
......@@ -529,16 +527,14 @@ describe('SimManagerTest', function () {
let promise = sim.getSimAccountInfo(0);
promise.then(data => {
console.info("Telephony_Sim_getSimAccountInfo_Promise_0100 data = " + JSON.stringify(data));
expect(true).assertTrue();
sim.hasSimCard(0, (err, data) => {
console.log(`Telephony_Sim_getSimAccountInfo_Promise_0100 hasSimCard callback: err->${JSON.stringify(err)}, data->${JSON.stringify(data)}`);
expect(data).assertTrue();
done();
});
}).catch(err => {
console.info("Telephony_Sim_getSimAccountInfo_Promise_0100 err = " + JSON.stringify(err));
radio.isRadioOn(0, (err, data) => {
console.info('Telephony_Sim_getSimAccountInfo_Promise_0100 isRadioOn err' + JSON.stringify(err) + ' data ' + JSON.stringify(data));
if (!err) {
expect().assertFail();
}
});
expect(true).assertTrue();
done();
});
});
......@@ -551,20 +547,18 @@ describe('SimManagerTest', function () {
sim.getActiveSimAccountInfoList((err, data) => {
if(err){
console.info("Telephony_Sim_getActiveSimAccountInfoList_CallBack_0100 err = " + JSON.stringify(err));
radio.isRadioOn(0, (err, data) => {
console.info('Telephony_Sim_getActiveSimAccountInfoList_CallBack_0100 isRadioOn err' + JSON.stringify(err) + ' data ' + JSON.stringify(data));
if (!err) {
expect().assertFail();
}
});
expect(true).assertTrue();
done();
return;
}
console.log(`Telephony_Sim_getActiveSimAccountInfoList_CallBack_0100 callback: err->${JSON.stringify(err)}, data->${JSON.stringify(data)}`);
expect(true).assertTrue();
sim.hasSimCard(0, (err, data) => {
console.log(`Telephony_Sim_getActiveSimAccountInfoList_CallBack_0100 hasSimCard callback: err->${JSON.stringify(err)}, data->${JSON.stringify(data)}`);
expect(data).assertTrue();
done();
});
});
});
/**
* @tc.number Telephony_Sim_getActiveSimAccountInfoList_Promise_0100
* @tc.name Test getOpName interface
......@@ -574,16 +568,14 @@ describe('SimManagerTest', function () {
let promise = sim.getActiveSimAccountInfoList();
promise.then(data => {
console.info("Telephony_Sim_getActiveSimAccountInfoList_Promise_0100 data = " + JSON.stringify(data));
expect(true).assertTrue();
sim.hasSimCard(0, (err, data) => {
console.log(`Telephony_Sim_getActiveSimAccountInfoList_Promise_0100 hasSimCard callback: err->${JSON.stringify(err)}, data->${JSON.stringify(data)}`);
expect(data).assertTrue();
done();
});
}).catch(err => {
console.info("Telephony_Sim_getActiveSimAccountInfoList_Promise_0100 err = " + JSON.stringify(err));
radio.isRadioOn(0, (err, data) => {
console.info('Telephony_Sim_getActiveSimAccountInfoList_Promise_0100 isRadioOn err' + JSON.stringify(err) + ' data ' + JSON.stringify(data));
if (!err) {
expect().assertFail();
}
});
expect(true).assertTrue();
done();
});
});
......@@ -597,20 +589,18 @@ describe('SimManagerTest', function () {
sim.getDefaultVoiceSimId((err, data) => {
if(err){
console.info("Telephony_Sim_getDefaultVoiceSimId_CallBack_0100 err = " + JSON.stringify(err));
radio.isRadioOn(0, (err, data) => {
console.info('Telephony_Sim_getDefaultVoiceSimId_CallBack_0100 isRadioOn err' + JSON.stringify(err) + ' data ' + JSON.stringify(data));
if (!err) {
expect().assertFail();
}
});
expect(true).assertTrue();
done();
return;
}
console.log(`Telephony_Sim_getDefaultVoiceSimId_CallBack_0100 callback: err->${JSON.stringify(err)}, data->${JSON.stringify(data)}`);
expect(true).assertTrue();
sim.hasSimCard(0, (err, data) => {
console.log(`Telephony_Sim_getDefaultVoiceSimId_CallBack_0100 hasSimCard callback: err->${JSON.stringify(err)}, data->${JSON.stringify(data)}`);
expect(data).assertTrue();
done();
});
});
});
/**
* @tc.number Telephony_Sim_getDefaultVoiceSimId_Promise_0100
* @tc.name Test getOpName interface
......@@ -620,21 +610,16 @@ describe('SimManagerTest', function () {
let promise = sim.getDefaultVoiceSimId();
promise.then(data => {
console.info("Telephony_Sim_getDefaultVoiceSimId_Promise_0100 data = " + JSON.stringify(data));
expect(true).assertTrue();
sim.hasSimCard(0, (err, data) => {
console.log(`Telephony_Sim_getDefaultVoiceSimId_Promise_0100 hasSimCard callback: err->${JSON.stringify(err)}, data->${JSON.stringify(data)}`);
expect(data).assertTrue();
done();
});
}).catch(err => {
console.info("Telephony_Sim_getDefaultVoiceSimId_Promise_0100 err = " + JSON.stringify(err));
radio.isRadioOn(0, (err, data) => {
console.info('Telephony_Sim_getDefaultVoiceSimId_Promise_0100 isRadioOn err' + JSON.stringify(err) + ' data ' + JSON.stringify(data));
if (!err) {
expect().assertFail();
}
});
expect(true).assertTrue();
done();
});
});
})
})
}
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或