diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/entry/src/main/js/test/FormFuzzTest.test.js b/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/entry/src/main/js/test/FormFuzzTest.test.js index 421edc06dd46d89e33411ae21d981d15ec76ec90..b6d1b992de90777ba539603afc68b78eec9d2f71 100755 --- a/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/entry/src/main/js/test/FormFuzzTest.test.js +++ b/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/entry/src/main/js/test/FormFuzzTest.test.js @@ -16,7 +16,7 @@ import formManager from '@ohos.ability.formManager' import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' import {parameterValue, stringTest, numberTest, booleanTest, - nullTest, undefinedTest, objectTest, arrayTest, functionTest} from './getParam.js' +nullTest, undefinedTest, objectTest, arrayTest, functionTest} from './getParam.js' const TIMEOUT = 2000; describe('formFuzzTest', function () { @@ -140,7 +140,7 @@ describe('formFuzzTest', function () { var retResult; try{ // formId: number>0 ok, isReleaseCache: boolean - retResult = await Promise.all(await formManager.releaseForm(formId, isReleaseCache)); + retResult = await Promise.all(await formManager.releaseForm(formId, isReleaseCache)); console.log("FMS_fuzzTest_0300_param_01_promise async::sucess retResult:" + retResult); expect(retResult).assertEqual(1); done(); @@ -165,8 +165,8 @@ describe('formFuzzTest', function () { console.log("FMS_fuzzTest_0300_param_02_callback releaseForm begin"); var formId = stringTest(); - console.log("FMS_fuzzTest_0300_param_02_callback releaseForm formId typeof:"+ typeof(formId) - + ",formId:" + formId); + console.log("FMS_fuzzTest_0300_param_02_callback releaseForm formId typeof:"+ + typeof(formId) + ",formId:" + formId); var isReleaseCache = parameterValue(); console.log("FMS_fuzzTest_0300_param_02_callback releaseForm isReleaseCache typeof:"+ typeof(isReleaseCache)); @@ -205,8 +205,8 @@ describe('formFuzzTest', function () { console.log("FMS_fuzzTest_0300_param_02_promise releaseForm begin"); var formId = stringTest(); - console.log("FMS_fuzzTest_0300_param_02_promise releaseForm formId typeof:"+ typeof(formId) - + ",formId:" + formId); + console.log("FMS_fuzzTest_0300_param_02_promise releaseForm formId typeof:"+ + typeof(formId) + ",formId:" + formId); var isReleaseCache = parameterValue(); console.log("FMS_fuzzTest_0300_param_02_promise releaseForm isReleaseCache typeof:"+ typeof(isReleaseCache)); @@ -230,6 +230,135 @@ describe('formFuzzTest', function () { }, TIMEOUT) }) + /** + * @tc.name fuzzTest + * @tc.number FMS_fuzzTest_0300 + * @tc.desc Check whether the releaseForm interface can pass the fuzzy test (by AsyncCallback) + */ + it('FMS_fuzzTest_0300_param_03_callback', 0, async function (done) { + console.log("FMS_fuzzTest_0300_param_03_callback releaseForm begin"); + + var formId = stringTest(); + console.log("FMS_fuzzTest_0300_param_03_callback releaseForm formId typeof:"+ + typeof(formId) + ",formId:" + formId); + + try{ + formManager.releaseForm( + formId, // formId: number>0 ok + (err,data) => { + console.log("FMS_fuzzTest_0300_param_03_callback async::callbak return!!!") + console.log("FMS_fuzzTest_0300_param_03_callback async::sucess data:" + data); + console.log("FMS_fuzzTest_0300_param_03_callback async::error err:" + err); + expect(err).assertEqual(1); + done(); + } + + ); + } catch (e) { + console.log("FMS_fuzzTest_0300_param_03_callback Exception caught:" + e); + expect(0).assertEqual(0); + } + + console.log("FMS_fuzzTest_0300_param_03_callback releaseForm end"); + done(); + setTimeout(function () { + console.info('=====================FMS_fuzzTest_0300_param_03_callback==================end'); + }, TIMEOUT) + }) + + /** + * @tc.name fuzzTest + * @tc.number FMS_fuzzTest_0300 + * @tc.desc Check whether the releaseForm interface can pass the fuzzy test (by Promise) + */ + it('FMS_fuzzTest_0300_param_03_promise', 0, async function (done) { + console.log("FMS_fuzzTest_0300_param_03_promise releaseForm begin"); + + var formId = stringTest(); + console.log("FMS_fuzzTest_0300_param_03_promise releaseForm formId typeof:"+ + typeof(formId) + ",formId:" + formId); + + var retResult; + try{ + retResult = await Promise.all(await formManager.releaseForm(formId)); // formId: number>0 ok + console.log("FMS_fuzzTest_0300_param_03_promise async::sucess retResult:" + retResult); + expect(retResult).assertEqual(1); + done(); + } catch (e) { + console.log("FMS_fuzzTest_0300_param_03_promise Exception caught:" + e); + expect(0).assertEqual(0); + } + + console.log("FMS_fuzzTest_0300_param_03_promise releaseForm end"); + done(); + setTimeout(function () { + console.info('=====================FMS_fuzzTest_0300_param_03_promise==================end'); + }, TIMEOUT) + }) + + /** + * @tc.name fuzzTest + * @tc.number FMS_fuzzTest_0300 + * @tc.desc Check whether the releaseForm interface can pass the fuzzy test (by AsyncCallback) + */ + it('FMS_fuzzTest_0300_param_04_callback', 0, async function (done) { + console.log("FMS_fuzzTest_0300_param_04_callback releaseForm begin"); + + var formId = parameterValue(); + console.log("FMS_fuzzTest_0300_param_04_callback releaseForm formId typeof:"+ typeof(formId)); + + try{ + formManager.releaseForm( + formId, // formId: number>0 ok + (err,data) => { + console.log("FMS_fuzzTest_0300_param_04_callback async::callbak return!!!") + console.log("FMS_fuzzTest_0300_param_04_callback async::sucess data:" + data); + console.log("FMS_fuzzTest_0300_param_04_callback async::error err:" + err); + expect(err).assertEqual(1); + done(); + } + ); + } catch (e) { + console.log("FMS_fuzzTest_0300_param_04_callback Exception caught:" + e); + expect(0).assertEqual(0); + } + + console.log("FMS_fuzzTest_0300_param_04_callback releaseForm end"); + done(); + setTimeout(function () { + console.info('=====================FMS_fuzzTest_0300_param_04_callback==================end'); + }, TIMEOUT) +}) + + /** + * @tc.name fuzzTest + * @tc.number FMS_fuzzTest_0300 + * @tc.desc Check whether the releaseForm interface can pass the fuzzy test (by Promise) + */ +it('FMS_fuzzTest_0300_param_04_promise', 0, async function (done) { + console.log("FMS_fuzzTest_0300_param_04_promise releaseForm begin"); + + var formId = parameterValue(); + console.log("FMS_fuzzTest_0300_param_04_promise releaseForm formId typeof:"+ typeof(formId)); + + var retResult; + try{ + retResult = await Promise.all(await formManager.releaseForm(formId)); // formId: number>0 ok + console.log("FMS_fuzzTest_0300_param_04_promise async::sucess retResult:" + retResult); + expect(retResult).assertEqual(1); + done(); + } catch (e) { + console.log("FMS_fuzzTest_0300_param_04_promise Exception caught:" + e); + expect(0).assertEqual(0); + } + + console.log("FMS_fuzzTest_0300_param_04_promise releaseForm end"); + done(); + setTimeout(function () { + console.info('=====================FMS_fuzzTest_0300_param_04_promise==================end'); + }, TIMEOUT) +}) + /** * @tc.name fuzzTest * @tc.number FMS_fuzzTest_1200 @@ -502,4 +631,4 @@ describe('formFuzzTest', function () { }, TIMEOUT) }) -}) \ No newline at end of file +}) diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo/entry/src/main/js/test/GetAllFormsInfoJsunit.test.js b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo/entry/src/main/js/test/GetAllFormsInfoJsunit.test.js index ad10ab052bb6dc56fc4cdff37d98af8549d97b78..671823092360db1791209951872fa904742966e8 100644 --- a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo/entry/src/main/js/test/GetAllFormsInfoJsunit.test.js +++ b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo/entry/src/main/js/test/GetAllFormsInfoJsunit.test.js @@ -43,8 +43,7 @@ describe('getAllFormsInfoTest', function () { expect(data[i].colorMode).assertEqual(-1); expect(data[i].isDefault).assertEqual(1); expect(data[i].updateEnabled).assertEqual(1); - expect(data[i].scheduledUpdateTime).assertEqual("0:0"); - expect(data[i].formVisibleNotify).assertEqual(0); + expect(data[i].formVisibleNotify).assertEqual(1); expect(data[i].defaultDimension).assertEqual(1); expect(data[i].supportDimensions[0]).assertEqual(1); expect(data[i].supportDimensions[1]).assertEqual(2); @@ -52,6 +51,7 @@ describe('getAllFormsInfoTest', function () { expect(data[i].metaData.customizeData[0].value).assertEqual("myTest"); } + expect(data[0].scheduledUpdateTime).assertEqual("10:30"); expect(data[0].name).assertEqual("Form_Js001"); expect(data[1].name).assertEqual("Form_Js002"); expect(data[0].updateDuration).assertEqual(0); @@ -86,8 +86,7 @@ describe('getAllFormsInfoTest', function () { expect(data[i].colorMode).assertEqual(-1); expect(data[i].isDefault).assertEqual(1); expect(data[i].updateEnabled).assertEqual(1); - expect(data[i].scheduledUpdateTime).assertEqual("0:0"); - expect(data[i].formVisibleNotify).assertEqual(0); + expect(data[i].formVisibleNotify).assertEqual(1); expect(data[i].defaultDimension).assertEqual(1); expect(data[i].supportDimensions[0]).assertEqual(1); expect(data[i].supportDimensions[1]).assertEqual(2); @@ -95,6 +94,7 @@ describe('getAllFormsInfoTest', function () { expect(data[i].metaData.customizeData[0].value).assertEqual("myTest"); } + expect(data[0].scheduledUpdateTime).assertEqual("10:30"); expect(data[0].name).assertEqual("Form_Js001"); expect(data[1].name).assertEqual("Form_Js002"); expect(data[0].updateDuration).assertEqual(0); @@ -234,8 +234,7 @@ describe('getAllFormsInfoTest', function () { expect(data[i].colorMode).assertEqual(-1); expect(data[i].isDefault).assertEqual(1); expect(data[i].updateEnabled).assertEqual(1); - expect(data[i].scheduledUpdateTime).assertEqual("0:0"); - expect(data[i].formVisibleNotify).assertEqual(0); + expect(data[i].formVisibleNotify).assertEqual(1); expect(data[i].defaultDimension).assertEqual(1); expect(data[i].supportDimensions[0]).assertEqual(1); expect(data[i].supportDimensions[1]).assertEqual(2); @@ -243,6 +242,7 @@ describe('getAllFormsInfoTest', function () { expect(data[i].metaData.customizeData[0].value).assertEqual("myTest"); } + expect(data[0].scheduledUpdateTime).assertEqual("10:30"); expect(data[0].name).assertEqual("Form_Js001"); expect(data[1].name).assertEqual("Form_Js002"); expect(data[0].updateDuration).assertEqual(0); @@ -280,8 +280,7 @@ describe('getAllFormsInfoTest', function () { expect(data[i].colorMode).assertEqual(-1); expect(data[i].isDefault).assertEqual(1); expect(data[i].updateEnabled).assertEqual(1); - expect(data[i].scheduledUpdateTime).assertEqual("0:0"); - expect(data[i].formVisibleNotify).assertEqual(0); + expect(data[i].formVisibleNotify).assertEqual(1); expect(data[i].defaultDimension).assertEqual(1); expect(data[i].supportDimensions[0]).assertEqual(1); expect(data[i].supportDimensions[1]).assertEqual(2); @@ -289,6 +288,7 @@ describe('getAllFormsInfoTest', function () { expect(data[i].metaData.customizeData[0].value).assertEqual("myTest"); } + expect(data[0].scheduledUpdateTime).assertEqual("10:30"); expect(data[0].name).assertEqual("Form_Js001"); expect(data[1].name).assertEqual("Form_Js002"); expect(data[0].updateDuration).assertEqual(0); @@ -543,8 +543,7 @@ describe('getAllFormsInfoTest', function () { expect(data[i].colorMode).assertEqual(-1); expect(data[i].isDefault).assertEqual(1); expect(data[i].updateEnabled).assertEqual(1); - expect(data[i].scheduledUpdateTime).assertEqual("0:0"); - expect(data[i].formVisibleNotify).assertEqual(0); + expect(data[i].formVisibleNotify).assertEqual(1); expect(data[i].defaultDimension).assertEqual(1); expect(data[i].supportDimensions[0]).assertEqual(1); expect(data[i].supportDimensions[1]).assertEqual(2); @@ -552,6 +551,7 @@ describe('getAllFormsInfoTest', function () { expect(data[i].metaData.customizeData[0].value).assertEqual("myTest"); } + expect(data[0].scheduledUpdateTime).assertEqual("10:30"); expect(data[0].name).assertEqual("Form_Js001"); expect(data[1].name).assertEqual("Form_Js002"); expect(data[0].updateDuration).assertEqual(0); @@ -590,8 +590,7 @@ describe('getAllFormsInfoTest', function () { expect(data[i].colorMode).assertEqual(-1); expect(data[i].isDefault).assertEqual(1); expect(data[i].updateEnabled).assertEqual(1); - expect(data[i].scheduledUpdateTime).assertEqual("0:0"); - expect(data[i].formVisibleNotify).assertEqual(0); + expect(data[i].formVisibleNotify).assertEqual(1); expect(data[i].defaultDimension).assertEqual(1); expect(data[i].supportDimensions[0]).assertEqual(1); expect(data[i].supportDimensions[1]).assertEqual(2); @@ -599,6 +598,7 @@ describe('getAllFormsInfoTest', function () { expect(data[i].metaData.customizeData[0].value).assertEqual("myTest"); } + expect(data[0].scheduledUpdateTime).assertEqual("10:30"); expect(data[0].name).assertEqual("Form_Js001"); expect(data[1].name).assertEqual("Form_Js002"); expect(data[0].updateDuration).assertEqual(0); diff --git a/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicea/src/main/config.json b/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicea/src/main/config.json index 2f1fcebedcd7e14b5c22cfca929fdf3318ac8ecf..0c2cfd3dc817eee4372531ef95b5218fceb5deeb 100755 --- a/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicea/src/main/config.json +++ b/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicea/src/main/config.json @@ -57,7 +57,7 @@ "updateEnabled": true, "scheduledUpdateTime": "10:30", "jsComponentName": "card", - "formVisibleNotify" : false, + "formVisibleNotify" : true, "metaData": { "customizeData": [ { @@ -78,7 +78,7 @@ "updateEnabled": true, "updateDuration": 1, "jsComponentName": "card", - "formVisibleNotify" : false, + "formVisibleNotify" : true, "metaData": { "customizeData": [ {