Skip to content

X
Xts Acts

OpenHarmony / Xts Acts
大约 1 年 前同步成功

通知 9
Star 22
Fork 0
X
Xts Acts

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 42dd3436 编写于 作者: O openharmony_ci 提交者： Gitee
浏览文件
操作

!4658 XTSform和startAbility失败用例适配 

Merge pull request !4658 from chengxingzhen/master
上级 26586991 7b3e12fc
隐藏空白更改
内联 并排
Showing with 280 addition and 119 deletion
ability/ability_runtime/actsfwkdataaccessortest/actsfwkdataaccessortest/src/main/js/test/DataAbilityHelperJsSt.test.js
浏览文件 @ 42dd3436
......@@ -5247,7 +5247,8 @@ describe('ActsDataAbilityHelperTest', function () {
function onAsyncCallback0401(err) {
expect(err.code).assertEqual(0);
flagCallback01++;
waitDone("onAsyncCallback0401");
expect(false).assertTrue();
done()
}
function onAsyncCallback0402(err) {
flagCallback02++;
......@@ -5261,28 +5262,14 @@ describe('ActsDataAbilityHelperTest', function () {
function onAsyncCallback0403(err) {
expect(err.code).assertEqual(0);
flagCallback03++;
waitDone("onAsyncCallback0403");
expect(false).assertTrue();
done()
}
function waitDone(caller) {
console.debug("=ACTS_OnOff_0400 caller ====>" + caller);
if (flagCallback01 == 1 && flagCallback02 == 0 && flagCallback03 == 1) {
clearTimeout(currentAlertTimeout);
function mySetTimeout() {
DAHelper.off("dataChange", dataAbilityUri, onAsyncCallback0401);
DAHelper.off("dataChange", dataAbilityUri, onAsyncCallback0403);
console.log('ACTS_OnOff_0400====<end');
done();
}
setTimeout(mySetTimeout, gSetTimeout);
} else if (caller == "notifyChange") {
currentAlertTimeout = setTimeout(() => {
console.debug('ACTS_OnOff_0400====<setTimeout false done()');
expect(false).assertTrue();
done();
}, gSetTimeout);
} else {
console.debug("=ACTS_OnOff_0400 flagCallback010203 ====>"
+ flagCallback01 + flagCallback02 + flagCallback03);
if (flagCallback01 == 0 && flagCallback02 == 0 && flagCallback03 == 0) {
expect("notifyChange").assertEqual(caller);
done()
}
}
try {
......
ability/ability_runtime/apicover/apicoverhaptest/entry/src/main/ets/test/ApiCoverAbility.test.ets
浏览文件 @ 42dd3436
......@@ -395,7 +395,7 @@ function checkFormInfoModule1(formInfo){
expect(formInfo.isDefault).assertTrue()
expect(formInfo.updateEnabled).assertTrue()
expect(formInfo.formVisibleNotify).assertFalse()
expect(undefined).assertEqual(formInfo.relatedBundleName)
expect('').assertEqual(formInfo.relatedBundleName)
expect("ability://xxxxx").assertEqual(formInfo.formConfigAbility)
expect(1).assertEqual(formInfo.updateDuration)
expect(2).assertEqual(formInfo.defaultDimension)
......@@ -413,7 +413,7 @@ function checkFormInfo(formInfo){
expect(formInfo.isDefault).assertTrue()
expect(formInfo.updateEnabled).assertTrue()
expect(formInfo.formVisibleNotify).assertFalse()
expect(undefined).assertEqual(formInfo.relatedBundleName)
expect('').assertEqual(formInfo.relatedBundleName)
expect("ability://xxxxx").assertEqual(formInfo.formConfigAbility)
expect(1).assertEqual(formInfo.updateDuration)
expect(2).assertEqual(formInfo.defaultDimension)
......
ability/ability_runtime/featureability/actsfeatureabilitytest/entry/src/main/js/test/StartAbilityJsunit.test.js
浏览文件 @ 42dd3436
......@@ -19,6 +19,7 @@ let resultCode = 123;
let bundleName = 'ohso.act.aafwk';
let mainAbilityName = 'ohos.acts.aafwk.jsap';
const errCode = 1;
const errCode1 = 202;
describe('ConnectAbilityTest', function () {
......@@ -64,12 +65,10 @@ describe('ConnectAbilityTest', function () {
* @tc.desc: StartAbility fail with error parameter.(by promise)
*/
it("SUB_AA_JsApi_StartAbility_0300", 0, async function (done) {
let parameter = {
'StartAbilityParameter': {
'want': {}
}
let startAbilityParameter = {
'want': {}
}
await featureAbility.startAbility(parameter).then((data) => {
await featureAbility.startAbility(startAbilityParameter).then((data) => {
console.log('testAbility0300 data: ' + JSON.stringify(data))
expect().assertFail()
}).catch((error) => {
......@@ -85,12 +84,10 @@ describe('ConnectAbilityTest', function () {
* @tc.desc: StartAbility fail with error parameter.(by callback)
*/
it("SUB_AA_JsApi_StartAbility_0400", 0, async function (done) {
let parameter = {
'StartAbilityParameter': {
'want': {}
}
let startAbilityParameter = {
'want': {}
}
featureAbility.startAbility((parameter), (error, data) => {
featureAbility.startAbility((startAbilityParameter), (error, data) => {
console.log('testAbility0400 data: ' + JSON.stringify(data))
console.log('testAbility0400 error: ' + JSON.stringify(error))
expect(errCode).assertEqual(error.code)
......@@ -192,16 +189,13 @@ describe('ConnectAbilityTest', function () {
* @tc.desc: startAbility-want configure action+entities- entities is configurd as a string.(by promise)
*/
it("SUB_AA_JsApi_Ability_0900", 0, async function (done) {
let parameter = {
'startAbilityParameter': {
'want': {
'bundleName': bundleName,
'abilityName': mainAbilityName
}
let startAbilityParameter = {
'want': {
'bundleName': bundleName,
'abilityName': mainAbilityName
}
}
await featureAbility.startAbility(parameter).then((data) => {
await featureAbility.startAbility(startAbilityParameter).then((data) => {
console.log('testAblity0900 data: ' + JSON.stringify(data))
expect().assertFail()
}).catch((error) => {
......@@ -217,16 +211,13 @@ describe('ConnectAbilityTest', function () {
* @tc.desc: startAbility-want configure action+entities- entities is configurd as a string.(by callback)
*/
it("SUB_AA_JsApi_Ability_1000", 0, async function (done) {
let parameter = {
'startAbilityParameter': {
'want': {
'bundleName': bundleName,
'abilityName': mainAbilityName
}
let startAbilityParameter = {
'want': {
'bundleName': bundleName,
'abilityName': mainAbilityName
}
}
featureAbility.startAbility((parameter), (error, data) => {
featureAbility.startAbility((startAbilityParameter), (error, data) => {
console.log('testAblity1000 data: ' + JSON.stringify(data))
console.log('testAblity1000 error: ' + JSON.stringify(error))
expect(errCode).assertEqual(error.code)
......@@ -246,7 +237,7 @@ describe('ConnectAbilityTest', function () {
expect().assertFail()
}).catch((error) => {
console.log('testAblity1100 error: ' + JSON.stringify(error))
expect(errCode).assertEqual(error.code)
expect(errCode1).assertEqual(error.code)
})
done()
})
......@@ -261,7 +252,7 @@ describe('ConnectAbilityTest', function () {
featureAbility.startAbility(parameter, (error, data) => {
console.log('testAblity1200 data: ' + JSON.stringify(data))
console.log('testAblity1200 error: ' + JSON.stringify(error))
expect(errCode).assertEqual(error.code)
expect(errCode1).assertEqual(error.code)
done();
})
})
......@@ -277,7 +268,7 @@ describe('ConnectAbilityTest', function () {
expect().assertFail()
}).catch((error) => {
console.log('testAblity1300 error: ' + JSON.stringify(error))
expect(errCode).assertEqual(error.code)
expect(errCode1).assertEqual(error.code)
})
done()
})
......@@ -291,7 +282,7 @@ describe('ConnectAbilityTest', function () {
featureAbility.startAbility(undefined, (error, data) => {
console.log('testAblity1400 data: ' + JSON.stringify(data))
console.log('testAblity1400 error: ' + JSON.stringify(error))
expect(errCode).assertEqual(error.code)
expect(errCode1).assertEqual(error.code)
done();
})
})
......@@ -308,7 +299,7 @@ describe('ConnectAbilityTest', function () {
expect.assertFail()
}).catch((error) => {
console.log('testAblity1500' + JSON.stringify(error));
expect(errCode).assertEqual(error.code)
expect(errCode1).assertEqual(error.code)
})
done()
})
......@@ -323,7 +314,7 @@ describe('ConnectAbilityTest', function () {
featureAbility.startAbilityForResult(parameter, (error, data) => {
console.log('testAblity1600 data: ' + JSON.stringify(data))
console.log('testAblity1600 error: ' + JSON.stringify(error))
expect(errCode).assertEqual(error.code)
expect(errCode1).assertEqual(error.code)
console.log('testAblity1600-1 error: ' + JSON.stringify(error))
done();
})
......@@ -340,7 +331,7 @@ describe('ConnectAbilityTest', function () {
expect.assertFail()
}).catch((error) => {
console.log('testAblity1700' + JSON.stringify(error));
expect(errCode).assertEqual(error.code)
expect(errCode1).assertEqual(error.code)
})
done()
})
......@@ -353,7 +344,7 @@ describe('ConnectAbilityTest', function () {
it("SUB_AA_JsApi_Ability_1800", 0, async function (done) {
featureAbility.startAbilityForResult(undefined, (error) => {
console.log('testAblity1800' + JSON.stringify(error));
expect(errCode).assertEqual(error.code)
expect(errCode1).assertEqual(error.code)
done()
})
})
......@@ -364,19 +355,17 @@ describe('ConnectAbilityTest', function () {
* @tc.desc: startAbilityForResult-wrong input parameter format want a layer outside.(by promise)
*/
it("SUB_AA_JsApi_Ability_1900", 0, async function (done) {
let parameter = {
'StartAbilityParameter': {
'want': {
'bundleName': bundleName,
'abilityName': mainAbilityName,
'parameters': {
'key': resultCode,
'terminate': true
}
let startAbilityParameter = {
'want': {
'bundleName': bundleName,
'abilityName': mainAbilityName,
'parameters': {
'key': resultCode,
'terminate': true
}
}
}
await featureAbility.startAbilityForResult(parameter).then((data) => {
await featureAbility.startAbilityForResult(startAbilityParameter).then((data) => {
console.log('testAblity1900 data: ' + JSON.stringify(data))
expect.assertFail()
}).catch((error) => {
......@@ -392,19 +381,17 @@ describe('ConnectAbilityTest', function () {
* @tc.desc: startAbilityForResult-wrong input parameter format want a layer outside.(by callback)
*/
it("SUB_AA_JsApi_Ability_2000", 0, async function (done) {
let parameter = {
'StartAbilityParameter': {
'want': {
'bundleName': bundleName,
'abilityName': mainAbilityName,
'parameters': {
'key': resultCode,
'terminate': true
}
let startAbilityParameter = {
'want': {
'bundleName': bundleName,
'abilityName': mainAbilityName,
'parameters': {
'key': resultCode,
'terminate': true
}
}
}
featureAbility.startAbilityForResult(parameter, (error, data) => {
featureAbility.startAbilityForResult(startAbilityParameter, (error, data) => {
console.log('testAblity2000' + JSON.stringify(error));
expect(errCode).assertEqual(error.code)
done()
......
ability/ability_runtime/formmanager/fa/formhostst_ets/formsystemhoste/entry/src/main/ets/MainAbility/pages/index.ets
浏览文件 @ 42dd3436
......@@ -191,7 +191,7 @@ struct Index {
commonEvent.publish(this.formOnDynamicRefreshEvent, commonEventPublishData, this.formOnDynamicRefreshCallBack);
})
.catch((error) => {
console.info('formsystemhost refreshForm error:' + error);
console.info('formsystemhost refreshForm error:' + JSON.stringify(error));
let commonEventPublishData = {
data: error.code.toString(),
parameters: {
......
ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/ets/MainAbility/test/FmsAcquireForm.test.ets
浏览文件 @ 42dd3436
......@@ -15,7 +15,7 @@
import featureAbility from "@ohos.ability.featureAbility";
import commonEvent from '@ohos.commonEvent';
import { beforeEach, describe, expect, it } from "deccjsunit/index";
import { beforeEach, afterEach, describe, expect, it } from "deccjsunit/index";
var onErrorForm_Event = {
events: ["FMS_FormOnError_commonEvent"],
......@@ -30,6 +30,10 @@ var onSupplyEvent = {
events: ["FMS_FormSupply_commonEvent"],
};
const unsubscribeCallback = (tcNumber) => {
console.info(`====>${tcNumber} unsubscribeCallback====>`);
}
var deleteForm_Event = "FMS_FormDelete_commonEvent";
var subscriberOnError;
......@@ -48,6 +52,14 @@ export default function test() {
await sleep(1000);
})
afterEach(async() => {
commonEvent.unsubscribe(subscriberOnError, () => unsubscribeCallback("afterEach unsubscribe subscriberOnError"));
commonEvent.unsubscribe(subscriberOnAcquired, () => unsubscribeCallback("afterEach unsubscribe subscriberOnAcquired"));
commonEvent.unsubscribe(subscriberCast, () => unsubscribeCallback("afterEach unsubscribe subscriberCast"));
commonEvent.unsubscribe(subscriberSupply, () => unsubscribeCallback("afterEach unsubscribe subscriberSupply"));
await sleep(1000);
})
/**
* @tc.number: FMS_acquireForm_0200
* @tc.name: The form host does not have permission to use the form
......
ability/ability_runtime/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/ets/MainAbility/test/FmsAcquireForm2.test.ets
浏览文件 @ 42dd3436
......@@ -15,7 +15,7 @@
import featureAbility from "@ohos.ability.featureAbility";
import commonEvent from '@ohos.commonEvent';
import { beforeEach, describe, expect, it } from "deccjsunit/index";
import { beforeEach, afterEach, describe, expect, it } from "deccjsunit/index";
var onErrorForm_Event = {
events: ["FMS_FormOnError_commonEvent"],
......@@ -30,6 +30,10 @@ var onSupplyEvent = {
events: ["FMS_FormSupply_commonEvent"],
};
const unsubscribeCallback = (tcNumber) => {
console.info(`====>${tcNumber} unsubscribeCallback====>`);
}
var deleteForm_Event = "FMS_FormDelete_commonEvent";
var subscriberOnError;
......@@ -37,6 +41,10 @@ var subscriberOnAcquired;
var subscriberCast;
var subscriberSupply;
function sleep(time) {
return new Promise((resolve)=>setTimeout(resolve,time));
}
export default function test() {
describe(`FmsAcquiredFormTest2`, () => {
......@@ -47,6 +55,14 @@ export default function test() {
subscriberSupply = await commonEvent.createSubscriber(onSupplyEvent);
})
afterEach(async() => {
commonEvent.unsubscribe(subscriberOnError, () => unsubscribeCallback("afterEach unsubscribe subscriberOnError"));
commonEvent.unsubscribe(subscriberOnAcquired, () => unsubscribeCallback("afterEach unsubscribe subscriberOnAcquired"));
commonEvent.unsubscribe(subscriberCast, () => unsubscribeCallback("afterEach unsubscribe subscriberCast"));
commonEvent.unsubscribe(subscriberSupply, () => unsubscribeCallback("afterEach unsubscribe subscriberSupply"));
await sleep(1000);
})
/**
* @tc.number: FMS_acquireForm_3800
* @tc.name: Failed to add form when parameter ability is wrong.
......
ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdeletetest/Test.json
浏览文件 @ 42dd3436
......@@ -18,6 +18,13 @@
],
"type": "AppInstallKit",
"cleanup-apps": true
},
{
"type": "ShellKit",
"run-command": [
"power-shell wakeup",
"power-shell setmode 602"
]
}
]
}
ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdeletetest/entry/src/main/ets/MainAbility/test/FmsDeleteForm.test.ets
浏览文件 @ 42dd3436
......@@ -16,7 +16,7 @@
import featureAbility from '@ohos.ability.featureAbility';
import commonEvent from '@ohos.commonEvent';
import systemTime from '@ohos.systemTime';
import { beforeEach, describe, expect, it } from 'deccjsunit/index';
import { beforeEach, afterEach, describe, expect, it } from 'deccjsunit/index';
const onAcquiredForm_Event = {
events: ["FMS_FormOnAcquired_commonEvent"],
......@@ -31,6 +31,10 @@ const onSupplyEvent = {
events: ["FMS_FormSupply_commonEvent"],
};
const unsubscribeCallback = (tcNumber) => {
console.info(`====>${tcNumber} unsubscribeCallback====>`);
}
const deleteForm_Event = "FMS_FormDelete_commonEvent";
let subscriberOnAcquired;
......@@ -49,6 +53,14 @@ export default function test() {
await sleep(1000);
});
afterEach(async() => {
commonEvent.unsubscribe(subscriberOnAcquired, () => unsubscribeCallback("afterEach unsubscribe subscriberOnAcquired"));
commonEvent.unsubscribe(subscriberOnReleased, () => unsubscribeCallback("afterEach unsubscribe subscriberOnReleased"));
commonEvent.unsubscribe(subscriberOnDeleted, () => unsubscribeCallback("afterEach unsubscribe subscriberOnDeleted"));
commonEvent.unsubscribe(subscriberSupply, () => unsubscribeCallback("afterEach unsubscribe subscriberSupply"));
await sleep(1000);
})
/**
* @tc.number: FMS_deleteForm_0200
* @tc.name: host does not have permission
......
ability/ability_runtime/formmanager/fa/formsystemtest_ets/formdynamicrefreshtest/entry/src/main/ets/MainAbility/test/FmsDynamicRefreshForm.test.ets
浏览文件 @ 42dd3436
......@@ -15,7 +15,7 @@
import featureAbility from '@ohos.ability.featureAbility';
import commonEvent from '@ohos.commonEvent';
import { beforeEach, describe, expect, it } from 'deccjsunit/index';
import { beforeEach, afterEach, describe, expect, it } from 'deccjsunit/index';
const onAcquiredForm_Event = {
events: ["FMS_FormOnAcquired_commonEvent"],
......@@ -33,6 +33,10 @@ const onSupplyEvent = {
events: ["FMS_FormSupply_commonEvent"],
};
const unsubscribeCallback = (tcNumber) => {
console.info(`====>${tcNumber} unsubscribeCallback====>`);
}
const deleteForm_Event = "FMS_FormDelete_commonEvent";
let subscriberOnAcquired;
......@@ -51,6 +55,14 @@ export default function test() {
await sleep(1000);
});
afterEach(async() => {
commonEvent.unsubscribe(subscriberOnAcquired, () => unsubscribeCallback("afterEach unsubscribe subscriberOnAcquired"));
commonEvent.unsubscribe(subscriberOnDeleted, () => unsubscribeCallback("afterEach unsubscribe subscriberOnDeleted"));
commonEvent.unsubscribe(subscriberOnRefresh, () => unsubscribeCallback("afterEach unsubscribe subscriberOnRefresh"));
commonEvent.unsubscribe(subscriberSupply, () => unsubscribeCallback("afterEach unsubscribe subscriberSupply"));
await sleep(1000);
})
/**
* @tc.number: FMS_timedRefresh_0100
* @tc.name: formID id is error(formID < 0)
......
ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets
浏览文件 @ 42dd3436
......@@ -62,12 +62,12 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => {
tempDataC = dataC[0];
expect(error.code).assertEqual(ERR_OK_CODE);
expect(error.message).assertEqual(ERR_OK);
console.log(`==========${callbackName} ${describeName} end==========`);
});
await sleep(2000)
checkDataB(tempDataB)
checkDataC(tempDataC)
done();
console.log(`==========${callbackName} ${describeName} end==========`);
} catch (error) {
console.log(`${callbackName} exception caught: ${JSON.stringify(error)})`);
console.log(`${callbackName} should not reach here`);
......@@ -104,7 +104,8 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => {
expect(dataC.length).assertEqual(1);
tempDataB = dataB[0];
tempDataC = dataC[0];
checkDataB(tempDataB)
checkDataC(tempDataC)
done();
console.log(`==========${promiseName} ${describeName} end==========`);
} catch (error) {
......@@ -126,15 +127,14 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => {
expect(formInfo.isDefault).assertTrue()
expect(formInfo.updateEnabled).assertTrue()
expect(formInfo.formVisibleNotify).assertTrue()
expect(undefined).assertEqual(formInfo.relatedBundleName)
expect('').assertEqual(formInfo.relatedBundleName)
expect("abilityb").assertEqual(formInfo.formConfigAbility)
expect(3).assertEqual(formInfo.updateDuration)
expect(2).assertEqual(formInfo.defaultDimension)
expect('10:30').assertEqual(formInfo.scheduledUpdateTime)
expect(1).assertEqual(formInfo.supportDimensions[0])
expect(2).assertEqual(formInfo.supportDimensions[1])
expect('originWidgetNameB').assertEqual(formInfo.customizeData[0].name)
expect('valueB').assertEqual(formInfo.customizeData[0].value)
expect('valueB').assertEqual(formInfo.customizeData.originWidgetNameB)
}
function checkDataC(formInfo){
expect("com.ohos.st.formsystemproviderc").assertEqual(formInfo.bundleName)
......@@ -148,15 +148,14 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => {
expect(formInfo.isDefault).assertTrue()
expect(formInfo.updateEnabled).assertTrue()
expect(formInfo.formVisibleNotify).assertTrue()
expect(undefined).assertEqual(formInfo.relatedBundleName)
expect('').assertEqual(formInfo.relatedBundleName)
expect("abilityc").assertEqual(formInfo.formConfigAbility)
expect(4).assertEqual(formInfo.updateDuration)
expect('15:30').assertEqual(formInfo.scheduledUpdateTime)
expect(3).assertEqual(formInfo.defaultDimension)
expect(3).assertEqual(formInfo.supportDimensions[0])
expect(4).assertEqual(formInfo.supportDimensions[1])
expect('originWidgetNameC').assertEqual(formInfo.customizeData[0].name)
expect('valueC').assertEqual(formInfo.customizeData[0].value)
expect('valueC').assertEqual(formInfo.customizeData.originWidgetNameC)
}
});
};
ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/GetFormsInfo.test.ets
浏览文件 @ 42dd3436
......@@ -236,15 +236,14 @@ export const getFormsInfoTest = (describeName, filterParameter) => {
expect(formInfo.isDefault).assertTrue()
expect(formInfo.updateEnabled).assertTrue()
expect(formInfo.formVisibleNotify).assertTrue()
expect(undefined).assertEqual(formInfo.relatedBundleName)
expect('').assertEqual(formInfo.relatedBundleName)
expect("abilityb").assertEqual(formInfo.formConfigAbility)
expect(3).assertEqual(formInfo.updateDuration)
expect(2).assertEqual(formInfo.defaultDimension)
expect('10:30').assertEqual(formInfo.scheduledUpdateTime)
expect(1).assertEqual(formInfo.supportDimensions[0])
expect(2).assertEqual(formInfo.supportDimensions[1])
expect('originWidgetNameB').assertEqual(formInfo.customizeData[0].name)
expect('valueB').assertEqual(formInfo.customizeData[0].value)
expect('valueB').assertEqual(formInfo.customizeData.originWidgetNameB)
}
/**
......@@ -517,14 +516,13 @@ export const getFormsInfoTest = (describeName, filterParameter) => {
expect(formInfo.isDefault).assertTrue()
expect(formInfo.updateEnabled).assertTrue()
expect(formInfo.formVisibleNotify).assertTrue()
expect(undefined).assertEqual(formInfo.relatedBundleName)
expect('').assertEqual(formInfo.relatedBundleName)
expect("abilityc").assertEqual(formInfo.formConfigAbility)
expect(4).assertEqual(formInfo.updateDuration)
expect(3).assertEqual(formInfo.defaultDimension)
expect(3).assertEqual(formInfo.supportDimensions[0])
expect(4).assertEqual(formInfo.supportDimensions[1])
expect('originWidgetNameC').assertEqual(formInfo.customizeData[0].name)
expect('valueC').assertEqual(formInfo.customizeData[0].value)
expect('valueC').assertEqual(formInfo.customizeData.originWidgetNameC)
}
});
};
ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets
浏览文件 @ 42dd3436
......@@ -132,15 +132,14 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => {
expect(formInfo.isDefault).assertTrue()
expect(formInfo.updateEnabled).assertTrue()
expect(formInfo.formVisibleNotify).assertTrue()
expect(undefined).assertEqual(formInfo.relatedBundleName)
expect('').assertEqual(formInfo.relatedBundleName)
expect("abilityb").assertEqual(formInfo.formConfigAbility)
expect(3).assertEqual(formInfo.updateDuration)
expect(2).assertEqual(formInfo.defaultDimension)
expect('10:30').assertEqual(formInfo.scheduledUpdateTime)
expect(1).assertEqual(formInfo.supportDimensions[0])
expect(2).assertEqual(formInfo.supportDimensions[1])
expect('originWidgetNameB').assertEqual(formInfo.customizeData[0].name)
expect('valueB').assertEqual(formInfo.customizeData[0].value)
expect('valueB').assertEqual(formInfo.customizeData.originWidgetNameB)
}
function checkDataA1(formInfo){
......@@ -155,15 +154,14 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => {
expect(formInfo.isDefault).assertTrue()
expect(formInfo.updateEnabled).assertTrue()
expect(formInfo.formVisibleNotify).assertTrue()
expect(undefined).assertEqual(formInfo.relatedBundleName)
expect('').assertEqual(formInfo.relatedBundleName)
expect("abilitya01").assertEqual(formInfo.formConfigAbility)
expect(1).assertEqual(formInfo.updateDuration)
expect(1).assertEqual(formInfo.defaultDimension)
expect('5:30').assertEqual(formInfo.scheduledUpdateTime)
expect(1).assertEqual(formInfo.supportDimensions[0])
expect(3).assertEqual(formInfo.supportDimensions[1])
expect('originWidgetNameA01').assertEqual(formInfo.customizeData[0].name)
expect('valueA01').assertEqual(formInfo.customizeData[0].value)
expect('valueA01').assertEqual(formInfo.customizeData.originWidgetNameA01)
}
function checkDataA2(formInfo){
......@@ -178,7 +176,7 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => {
expect(formInfo.isDefault).assertFalse()
expect(formInfo.updateEnabled).assertFalse()
expect(formInfo.formVisibleNotify).assertFalse()
expect(undefined).assertEqual(formInfo.relatedBundleName)
expect('').assertEqual(formInfo.relatedBundleName)
expect("abilitya02").assertEqual(formInfo.formConfigAbility)
expect(2).assertEqual(formInfo.updateDuration)
expect(4).assertEqual(formInfo.defaultDimension)
......@@ -187,8 +185,7 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => {
expect(2).assertEqual(formInfo.supportDimensions[1])
expect(3).assertEqual(formInfo.supportDimensions[2])
expect(4).assertEqual(formInfo.supportDimensions[3])
expect('originWidgetNameA02').assertEqual(formInfo.customizeData[0].name)
expect('valueA02').assertEqual(formInfo.customizeData[0].value)
expect('valueA02').assertEqual(formInfo.customizeData.originWidgetNameA02)
}
});
};
ability/ability_runtime/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets
浏览文件 @ 42dd3436
......@@ -122,15 +122,14 @@ export const getAllFormsInfoTest = (describeName, filterParameter) => {
expect(formInfo.isDefault).assertTrue()
expect(formInfo.updateEnabled).assertTrue()
expect(formInfo.formVisibleNotify).assertTrue()
expect(undefined).assertEqual(formInfo.relatedBundleName)
expect('').assertEqual(formInfo.relatedBundleName)
expect("abilityb").assertEqual(formInfo.formConfigAbility)
expect(3).assertEqual(formInfo.updateDuration)
expect(2).assertEqual(formInfo.defaultDimension)
expect('10:30').assertEqual(formInfo.scheduledUpdateTime)
expect(1).assertEqual(formInfo.supportDimensions[0])
expect(2).assertEqual(formInfo.supportDimensions[1])
expect('originWidgetNameB').assertEqual(formInfo.customizeData[0].name)
expect('valueB').assertEqual(formInfo.customizeData[0].value)
expect('valueB').assertEqual(formInfo.customizeData.originWidgetNameB)
}
});
};
ability/ability_runtime/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/ets/MainAbility/test/FmsHostDeathRecipient.test.ets
浏览文件 @ 42dd3436
......@@ -15,7 +15,7 @@
import featureAbility from '@ohos.ability.featureAbility';
import commonEvent from '@ohos.commonEvent';
import { beforeEach, describe, expect, it } from 'deccjsunit/index';
import { beforeEach, afterEach, describe, expect, it } from 'deccjsunit/index';
const onAcquiredEvent = {
events: [`FMS_FormOnAcquired_commonEvent`],
......@@ -28,6 +28,11 @@ const onRequestEvent = {
};
const formOnTerminateEvent = `FMS_FormTerminate_commonEvent`;
const unsubscribeCallback = (tcNumber) => {
console.info(`====>${tcNumber} unsubscribeCallback====>`);
}
let tcNumber;
let hostCounter;
let providerCounter;
......@@ -47,6 +52,13 @@ export default function test() {
onRequestEventSubscriber = await commonEvent.createSubscriber(onRequestEvent);
});
afterEach(async() => {
commonEvent.unsubscribe(onAcquiredEventSubscriber, () => unsubscribeCallback("afterEach unsubscribe onAcquiredEventSubscriber"));
commonEvent.unsubscribe(onSupplyEventSubscriber, () => unsubscribeCallback("afterEach unsubscribe onSupplyEventSubscriber"));
commonEvent.unsubscribe(onRequestEventSubscriber, () => unsubscribeCallback("afterEach unsubscribe onRequestEventSubscriber"));
await sleep(1000);
})
/**
* @tc.number: FMS_hostDeathRecipient_0200
* @tc.name: Reset host ability and requestForm.
......
ability/ability_runtime/formmanager/fa/formsystemtest_ets/formperformancetest/Test.json
浏览文件 @ 42dd3436
......@@ -15,6 +15,13 @@
],
"type": "AppInstallKit",
"cleanup-apps": true
},
{
"type": "ShellKit",
"run-command": [
"power-shell wakeup",
"power-shell setmode 602"
]
}
]
}
\ No newline at end of file
ability/ability_runtime/formmanager/fa/formsystemtest_ets/formperformancetest/entry/src/main/ets/MainAbility/test/FmsPerformanceTest.test.ets
浏览文件 @ 42dd3436
......@@ -17,7 +17,7 @@ import featureAbility from '@ohos.ability.featureAbility';
import formHost from '@ohos.application.formHost';
import commonEvent from '@ohos.commonEvent';
import systemTime from '@ohos.systemTime';
import { beforeEach, describe, expect, it } from 'deccjsunit/index';
import { beforeEach, afterEach, describe, expect, it } from 'deccjsunit/index';
const onAcquiredEvent = {
events: [`FMS_FormOnAcquired_commonEvent`],
......@@ -38,9 +38,17 @@ const publishOnDeleteCallback = (tcNumber, done) => {
done();
}
const unsubscribeCallback = (tcNumber) => {
console.info(`====>${tcNumber} unsubscribeCallback====>`);
}
let onAcquiredEventSubscriber;
let onSupplyEventSubscriber;
function sleep(time) {
return new Promise((resolve)=>setTimeout(resolve,time));
}
export default function test() {
describe(`FmsPerformanceTest`, () => {
......@@ -49,6 +57,12 @@ export default function test() {
onSupplyEventSubscriber = await commonEvent.createSubscriber(onSupplyEvent);
});
afterEach(async() => {
commonEvent.unsubscribe(onAcquiredEventSubscriber, () => unsubscribeCallback("afterEach unsubscribe onAcquiredEventSubscriber"));
commonEvent.unsubscribe(onSupplyEventSubscriber, () => unsubscribeCallback("afterEach unsubscribe onSupplyEventSubscriber"));
await sleep(1000);
})
/**
* @tc.number: FMS_performanceTest_0100
* @tc.name: Performance test.
......
ability/ability_runtime/formmanager/fa/formsystemtest_ets/formreleasetest/entry/src/main/ets/MainAbility/test/FmsReleaseForm.test.ets
浏览文件 @ 42dd3436
......@@ -15,7 +15,7 @@
import featureAbility from "@ohos.ability.featureAbility";
import commonEvent from '@ohos.commonEvent';
import { beforeAll, beforeEach, describe, expect, it } from "deccjsunit/index";
import { beforeAll, beforeEach, afterEach, describe, expect, it } from "deccjsunit/index";
var onAcquiredForm_Event = {
events: ["FMS_FormOnAcquired_commonEvent"],
......@@ -28,6 +28,10 @@ var onReleasedFormEvent = {
};
var deleteForm_Event = "FMS_FormDelete_commonEvent";
const unsubscribeCallback = (tcNumber) => {
console.info(`====>${tcNumber} unsubscribeCallback====>`);
}
var subscriberOnAcquired;
var subscriberOnDeleted;
var subscriberOnReleased;
......@@ -45,6 +49,14 @@ export default function test() {
subscriberOnAcquired = await commonEvent.createSubscriber(onAcquiredForm_Event);
subscriberOnDeleted = await commonEvent.createSubscriber(onDeletedFormEvent);
subscriberOnReleased = await commonEvent.createSubscriber(onReleasedFormEvent);
await sleep(1000);
})
afterEach(async() => {
commonEvent.unsubscribe(subscriberOnAcquired, () => unsubscribeCallback("afterEach unsubscribe subscriberOnAcquired"));
commonEvent.unsubscribe(subscriberOnDeleted, () => unsubscribeCallback("afterEach unsubscribe subscriberOnDeleted"));
commonEvent.unsubscribe(subscriberOnReleased, () => unsubscribeCallback("afterEach unsubscribe subscriberOnReleased"));
await sleep(1000);
})
/**
......
ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/ets/MainAbility/test/FmsFormStateDisable.test.ets
浏览文件 @ 42dd3436
......@@ -15,7 +15,7 @@
import featureAbility from "@ohos.ability.featureAbility";
import commonEvent from '@ohos.commonEvent';
import { beforeAll, beforeEach, describe, expect, it } from "deccjsunit/index";
import { beforeAll, beforeEach, afterEach, describe, expect, it } from "deccjsunit/index";
var onAcquiredForm_Event = {
events: ["FMS_FormOnAcquired_commonEvent"],
......@@ -33,6 +33,10 @@ var onSupplyEvent = {
events: ["FMS_FormSupply_commonEvent"],
};
const unsubscribeCallback = (tcNumber) => {
console.info(`====>${tcNumber} unsubscribeCallback====>`);
}
var deleteForm_Event = "FMS_FormDelete_commonEvent";
var subscriberOnAcquired;
......@@ -55,6 +59,14 @@ export default function test() {
await sleep(1000);
})
afterEach(async() => {
commonEvent.unsubscribe(subscriberOnAcquired, () => unsubscribeCallback("afterEach unsubscribe subscriberOnAcquired"));
commonEvent.unsubscribe(subscriberDel, () => unsubscribeCallback("afterEach unsubscribe subscriberDel"));
commonEvent.unsubscribe(subscriberOnState, () => unsubscribeCallback("afterEach unsubscribe subscriberOnState"));
commonEvent.unsubscribe(subscriberSupply, () => unsubscribeCallback("afterEach unsubscribe subscriberSupply"));
await sleep(1000);
})
/**
* @tc.number: FMS_disableFormsUpdate_0200
* @tc.name: The form user does not have permission.
......
ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_enable/Test.json
浏览文件 @ 42dd3436
......@@ -20,6 +20,13 @@
],
"type": "AppInstallKit",
"cleanup-apps": true
},
{
"type": "ShellKit",
"run-command": [
"power-shell wakeup",
"power-shell setmode 602"
]
}
]
}
ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/ets/MainAbility/test/FmsFormStateEnable.test.ets
浏览文件 @ 42dd3436
......@@ -15,7 +15,7 @@
import featureAbility from "@ohos.ability.featureAbility";
import commonEvent from '@ohos.commonEvent';
import { beforeAll, beforeEach, describe, expect, it } from "deccjsunit/index";
import { beforeAll, beforeEach, afterEach, describe, expect, it } from "deccjsunit/index";
var onAcquiredForm_Event = {
events: ["FMS_FormOnAcquired_commonEvent"],
......@@ -33,6 +33,10 @@ var onSupplyEvent = {
events: ["FMS_FormSupply_commonEvent"],
};
const unsubscribeCallback = (tcNumber) => {
console.info(`====>${tcNumber} unsubscribeCallback====>`);
}
var deleteForm_Event = "FMS_FormDelete_commonEvent";
var subscriberOnAcquired;
......@@ -55,6 +59,13 @@ export default function test() {
await sleep(1000);
})
afterEach(async() => {
commonEvent.unsubscribe(subscriberOnAcquired, () => unsubscribeCallback("afterEach unsubscribe subscriberOnAcquired"));
commonEvent.unsubscribe(subscriberDel, () => unsubscribeCallback("afterEach unsubscribe subscriberDel"));
commonEvent.unsubscribe(subscriberOnState, () => unsubscribeCallback("afterEach unsubscribe subscriberOnState"));
commonEvent.unsubscribe(subscriberSupply, () => unsubscribeCallback("afterEach unsubscribe subscriberSupply"));
await sleep(1000);
})
/**
* @tc.number: FMS_enableFormsUpdate_0200
* @tc.name: The form user does not have permission.
......
ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/ets/MainAbility/test/FmsFormStateNotifyInvisible.test.ets
浏览文件 @ 42dd3436
......@@ -15,7 +15,7 @@
import featureAbility from "@ohos.ability.featureAbility";
import commonEvent from '@ohos.commonEvent';
import { describe, beforeEach, expect, it } from "deccjsunit/index";
import { describe, afterEach, beforeEach, expect, it } from "deccjsunit/index";
var onAcquiredForm_Event = {
events: ["FMS_FormOnAcquired_commonEvent"],
......@@ -33,6 +33,10 @@ var onSupplyEvent = {
events: ["FMS_FormSupply_commonEvent"],
};
const unsubscribeCallback = (tcNumber) => {
console.info(`====>${tcNumber} unsubscribeCallback====>`);
}
var deleteForm_Event = "FMS_FormDelete_commonEvent";
var subscriberOnAcquired;
......@@ -51,6 +55,13 @@ export default function test() {
await sleep(1000);
})
afterEach(async() => {
commonEvent.unsubscribe(subscriberOnAcquired, () => unsubscribeCallback("afterEach unsubscribe subscriberOnAcquired"));
commonEvent.unsubscribe(subscriberDel, () => unsubscribeCallback("afterEach unsubscribe subscriberDel"));
commonEvent.unsubscribe(subscriberOnState, () => unsubscribeCallback("afterEach unsubscribe subscriberOnState"));
commonEvent.unsubscribe(subscriberSupply, () => unsubscribeCallback("afterEach unsubscribe subscriberSupply"));
await sleep(1000);
})
/**
* @tc.number: FMS_notifyInvisibleForms_0200
* @tc.name: The form user does not have permission.
......
ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/ets/MainAbility/test/FmsFormStateNotifyInvisible2.test.ets
浏览文件 @ 42dd3436
......@@ -15,7 +15,7 @@
import featureAbility from "@ohos.ability.featureAbility";
import commonEvent from '@ohos.commonEvent';
import { beforeEach, describe, expect, it } from "deccjsunit/index";
import { beforeEach, afterEach, describe, expect, it } from "deccjsunit/index";
var onAcquiredForm_Event = {
events: ["FMS_FormOnAcquired_commonEvent"],
......@@ -29,6 +29,10 @@ var onSupplyEvent = {
events: ["FMS_FormSupply_commonEvent"],
};
const unsubscribeCallback = (tcNumber) => {
console.info(`====>${tcNumber} unsubscribeCallback====>`);
}
var deleteForm_Event = "FMS_FormDelete_commonEvent";
var subscriberOnAcquired;
......@@ -46,6 +50,12 @@ export default function test() {
await sleep(1000);
})
afterEach(async() => {
commonEvent.unsubscribe(subscriberOnAcquired, () => unsubscribeCallback("afterEach unsubscribe subscriberOnAcquired"));
commonEvent.unsubscribe(subscriberOnState, () => unsubscribeCallback("afterEach unsubscribe subscriberOnState"));
commonEvent.unsubscribe(subscriberSupply, () => unsubscribeCallback("afterEach unsubscribe subscriberSupply"));
await sleep(1000);
})
/**
* @tc.number: FMS_notifyInvisibleForms_0900
* @tc.name: There are correct and wrong formId in the form ID parameter list
......
ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/ets/MainAbility/test/FmsFormStateNotifyVisible.test.ets
浏览文件 @ 42dd3436
......@@ -15,7 +15,7 @@
import featureAbility from "@ohos.ability.featureAbility";
import commonEvent from '@ohos.commonEvent';
import { beforeAll, beforeEach, describe, expect, it } from "deccjsunit/index";
import { beforeAll, beforeEach, afterEach, describe, expect, it } from "deccjsunit/index";
var onAcquiredForm_Event = {
events: ["FMS_FormOnAcquired_commonEvent"],
......@@ -29,6 +29,10 @@ var onSupplyEvent = {
events: ["FMS_FormSupply_commonEvent"],
};
const unsubscribeCallback = (tcNumber) => {
console.info(`====>${tcNumber} unsubscribeCallback====>`);
}
var deleteForm_Event = "FMS_FormDelete_commonEvent";
var subscriberOnAcquired;
......@@ -49,7 +53,12 @@ export default function test() {
await sleep(1000);
})
afterEach(async() => {
commonEvent.unsubscribe(subscriberOnAcquired, () => unsubscribeCallback("afterEach unsubscribe subscriberOnAcquired"));
commonEvent.unsubscribe(subscriberOnState, () => unsubscribeCallback("afterEach unsubscribe subscriberOnState"));
commonEvent.unsubscribe(subscriberSupply, () => unsubscribeCallback("afterEach unsubscribe subscriberSupply"));
await sleep(1000);
})
/**
* @tc.number: FMS_notifyVisibleForms_0200
* @tc.name: The form user does not have permission.
......
ability/ability_runtime/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/ets/MainAbility/test/FmsStress.test.ets
浏览文件 @ 42dd3436
......@@ -16,7 +16,7 @@
import featureAbility from '@ohos.ability.featureAbility';
import formHost from '@ohos.application.formHost';
import commonEvent from '@ohos.commonEvent';
import { beforeEach, describe, expect, it } from 'deccjsunit/index';
import { beforeEach, afterEach, describe, expect, it } from 'deccjsunit/index';
const onDeletedEvent = {
events: [`FMS_FormOnDeleted_commonEvent`]
......@@ -29,6 +29,10 @@ const onSupplyEvent = {
};
const formOnDeleteEvent = `FMS_FormDelete_commonEvent`;
const unsubscribeCallback = (tcNumber) => {
console.info(`====>${tcNumber} unsubscribeCallback====>`);
}
const unsubscribeOnDeletedCallback = (tcNumber, done) => {
console.info(`${tcNumber} unsubscribeOnDeleted Callback`);
done();
......@@ -47,6 +51,10 @@ let onDeletedEventSubscriber;
let onAcquiredEventSubscriber;
let onSupplyEventSubscriber;
function sleep(time) {
return new Promise((resolve)=>setTimeout(resolve,time));
}
export default function test() {
describe(`FmsStressTest`, () => {
......@@ -56,6 +64,13 @@ export default function test() {
onSupplyEventSubscriber = await commonEvent.createSubscriber(onSupplyEvent);
});
afterEach(async() => {
commonEvent.unsubscribe(onDeletedEventSubscriber, () => unsubscribeCallback("afterEach unsubscribe onDeletedEventSubscriber"));
commonEvent.unsubscribe(onAcquiredEventSubscriber, () => unsubscribeCallback("afterEach unsubscribe onAcquiredEventSubscriber"));
commonEvent.unsubscribe(onSupplyEventSubscriber, () => unsubscribeCallback("afterEach unsubscribe onSupplyEventSubscriber"));
await sleep(1000);
})
const subscribeDeletedEvent = (tcNumber, expectedDeletedFormAmount, done) => {
commonEvent.subscribe(onDeletedEventSubscriber, async (err, data) => {
const formIds = data.parameters.formIds;
......@@ -594,7 +609,7 @@ export default function test() {
const systemstatus = await formHost.isSystemReady();
console.info(`${tcNumber} systemstatus: ${JSON.stringify(systemstatus)}`);
expect(systemstatus).assertEqual(0);
expect(systemstatus).assertEqual(undefined);
done();
});
});
......
ability/ability_runtime/formmanager/fa/formsystemtest_ets/formupdatefreshtest/entry/src/main/ets/MainAbility/test/FmsUpdateRefreshForm.test.ets
浏览文件 @ 42dd3436
......@@ -15,7 +15,7 @@
import featureAbility from "@ohos.ability.featureAbility";
import commonEvent from '@ohos.commonEvent';
import { beforeAll, beforeEach, describe, expect, it } from "deccjsunit/index";
import { beforeAll, beforeEach, afterEach, describe, expect, it } from "deccjsunit/index";
var onAcquiredForm_Event = {
events: ["FMS_FormOnAcquired_commonEvent"],
......@@ -30,6 +30,10 @@ var onRequestFormEvent = {
events: ["FMS_FormOnRequest_commonEvent"],
};
const unsubscribeCallback = (tcNumber) => {
console.info(`====>${tcNumber} unsubscribeCallback====>`);
}
var deleteForm_Event = "FMS_FormDelete_commonEvent";
......@@ -38,6 +42,10 @@ var subscriberOnDeleted;
var subscriberOnRefresh;
var subscriberOnRequest;
function sleep(time) {
return new Promise((resolve)=>setTimeout(resolve,time));
}
export default function test() {
describe(`FmsUpdateRefreshFormTest`, () => {
......@@ -52,6 +60,13 @@ export default function test() {
subscriberOnRequest = await commonEvent.createSubscriber(onRequestFormEvent);
})
afterEach(async() => {
commonEvent.unsubscribe(subscriberOnAcquired, () => unsubscribeCallback("afterEach unsubscribe subscriberOnAcquired"));
commonEvent.unsubscribe(subscriberOnDeleted, () => unsubscribeCallback("afterEach unsubscribe subscriberOnDeleted"));
commonEvent.unsubscribe(subscriberOnRefresh, () => unsubscribeCallback("afterEach unsubscribe subscriberOnRefresh"));
commonEvent.unsubscribe(subscriberOnRequest, () => unsubscribeCallback("afterEach unsubscribe subscriberOnRequest"));
await sleep(1000);
})
/**
* @tc.number: FMS_updateForm_0100
* @tc.name: formID id is error(formID < 0)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或