diff --git a/frameworks/src/bundle_state_common.cpp b/frameworks/src/bundle_state_common.cpp index 26ba1cbfaed579e7df18f18afa70b35c9a940296..ef198cfb9d06ea638551b6b36ba1df78ce402274 100644 --- a/frameworks/src/bundle_state_common.cpp +++ b/frameworks/src/bundle_state_common.cpp @@ -150,6 +150,9 @@ void BundleStateCommon::SetPromiseInfo(const napi_env &env, const napi_deferred napi_value BundleStateCommon::GetErrorValue(napi_env env, int errCode) { + if (errCode == ERR_OK) { + return NapiGetNull(env); + } napi_value result = nullptr; napi_value eCode = nullptr; NAPI_CALL(env, napi_create_int32(env, errCode, &eCode)); diff --git a/interfaces/test/unittest/device_usage_statistics_jsunittest/device_usage_statistics_jsunit.test.js b/interfaces/test/unittest/device_usage_statistics_jsunittest/device_usage_statistics_jsunit.test.js index daf50ba50b7cb6de748050e4a7e1ad545130bbb8..e66a0fa0549e0d591df869494841ca0a133fb022 100644 --- a/interfaces/test/unittest/device_usage_statistics_jsunittest/device_usage_statistics_jsunit.test.js +++ b/interfaces/test/unittest/device_usage_statistics_jsunittest/device_usage_statistics_jsunit.test.js @@ -59,8 +59,8 @@ describe("DeviceUsageStatisticsJsTest", function () { console.info('BUNDLE_ACTIVE isIdleState promise success.'); expect(true).assertEqual(true); }).catch((err) => { - expect(false).assertEqual(true); console.info('BUNDLE_ACTIVE isIdleState promise failure.'); + expect(false).assertEqual(true); }); setTimeout(()=>{ @@ -78,12 +78,12 @@ describe("DeviceUsageStatisticsJsTest", function () { console.info('----------------------DeviceUsageStatisticsJsTest002---------------------------'); let bundleName = 'com.example.deviceUsageStatistics'; bundleState.isIdleState(bundleName, (err, res) => { - if(err.code === 0) { + if (err) { + console.info('BUNDLE_ACTIVE isIdleState callback failure.'); + expect(false).assertEqual(true); + } else { console.info('BUNDLE_ACTIVE isIdleState callback success.'); expect(true).assertEqual(true); - } else { - expect(false).assertEqual(true); - console.info('BUNDLE_ACTIVE isIdleState callback failure.'); } }); @@ -102,10 +102,10 @@ describe("DeviceUsageStatisticsJsTest", function () { console.info('----------------------DeviceUsageStatisticsJsTest003---------------------------'); bundleState.queryAppUsagePriorityGroup().then( res => { console.info('BUNDLE_ACTIVE queryAppUsagePriorityGroup promise success.'); - expect(true).assertEqual(true) + expect(true).assertEqual(true); }).catch( err => { - expect(false).assertEqual(true) console.info('BUNDLE_ACTIVE queryAppUsagePriorityGroup promise failure.'); + expect(false).assertEqual(true); }); setTimeout(()=>{ @@ -122,12 +122,12 @@ describe("DeviceUsageStatisticsJsTest", function () { it("DeviceUsageStatisticsJsTest004", 0, async function (done) { console.info('----------------------DeviceUsageStatisticsJsTest004---------------------------'); bundleState.queryAppUsagePriorityGroup((err, res) => { - if(err.code === 0) { - console.info('BUNDLE_ACTIVE queryAppUsagePriorityGroup callback success.'); - expect(true).assertEqual(true) - } else { - expect(false).assertEqual(true) + if (err) { console.info('BUNDLE_ACTIVE queryAppUsagePriorityGroup callback failure.'); + expect(false).assertEqual(true); + } else { + console.info('BUNDLE_ACTIVE queryAppUsagePriorityGroup callback success.'); + expect(true).assertEqual(true); } }); @@ -150,8 +150,8 @@ describe("DeviceUsageStatisticsJsTest", function () { console.info('BUNDLE_ACTIVE queryBundleActiveStates promise success.'); expect(true).assertEqual(true); }).catch((err) => { - expect(false).assertEqual(true); console.info('BUNDLE_ACTIVE queryBundleActiveStates promise failure.'); + expect(false).assertEqual(true); }); setTimeout(()=>{ @@ -170,12 +170,12 @@ describe("DeviceUsageStatisticsJsTest", function () { let beginTime = 0; let endTime = 20000000000000; bundleState.queryBundleActiveStates(beginTime, endTime, (err, res) => { - if(err.code === 0) { + if (err) { + console.info('BUNDLE_ACTIVE queryBundleActiveStates callback failure.'); + expect(false).assertEqual(true); + } else { console.info('BUNDLE_ACTIVE queryBundleActiveStates callback success.'); expect(true).assertEqual(true); - } else { - expect(false).assertEqual(true); - console.info('BUNDLE_ACTIVE queryBundleActiveStates callback failure.'); } }); @@ -198,8 +198,8 @@ describe("DeviceUsageStatisticsJsTest", function () { console.info('BUNDLE_ACTIVE queryBundleStateInfos promise success.'); expect(true).assertEqual(true); }).catch((err) => { - expect(false).assertEqual(true); console.info('BUNDLE_ACTIVE queryBundleStateInfos promise failure.'); + expect(false).assertEqual(true); }); setTimeout(()=>{ @@ -218,12 +218,12 @@ describe("DeviceUsageStatisticsJsTest", function () { let beginTime = 0; let endTime = 20000000000000; bundleState.queryBundleStateInfos(beginTime, endTime, (err, res) => { - if(err.code === 0) { + if (err) { + console.info('BUNDLE_ACTIVE queryBundleStateInfos callback failure.'); + expect(false).assertEqual(true); + } else { console.info('BUNDLE_ACTIVE queryBundleStateInfos callback success.'); expect(true).assertEqual(true); - } else { - expect(false).assertEqual(true); - console.info('BUNDLE_ACTIVE queryBundleStateInfos callback failure.'); } }); @@ -246,8 +246,8 @@ describe("DeviceUsageStatisticsJsTest", function () { console.info('BUNDLE_ACTIVE queryCurrentBundleActiveStates promise success.'); expect(true).assertEqual(true); }).catch((err) => { - expect(false).assertEqual(true); console.info('BUNDLE_ACTIVE queryCurrentBundleActiveStates promise failure.'); + expect(false).assertEqual(true); }); setTimeout(()=>{ @@ -266,12 +266,12 @@ describe("DeviceUsageStatisticsJsTest", function () { let beginTime = 0; let endTime = 20000000000000; bundleState.queryCurrentBundleActiveStates(beginTime, endTime, (err, res) => { - if(err.code === 0) { + if (err) { + console.info('BUNDLE_ACTIVE queryCurrentBundleActiveStates callback failure.'); + expect(false).assertEqual(true); + } else { console.info('BUNDLE_ACTIVE queryCurrentBundleActiveStates callback success.'); expect(true).assertEqual(true); - } else { - expect(false).assertEqual(true); - console.info('BUNDLE_ACTIVE queryCurrentBundleActiveStates callback failure.'); } }); @@ -295,8 +295,8 @@ describe("DeviceUsageStatisticsJsTest", function () { console.info('BUNDLE_ACTIVE queryBundleStateInfoByInterval promise success.'); expect(true).assertEqual(true); }).catch((err) => { - expect(false).assertEqual(true); console.info('BUNDLE_ACTIVE queryBundleStateInfoByInterval promise failure.'); + expect(false).assertEqual(true); }); setTimeout(()=>{ @@ -316,12 +316,12 @@ describe("DeviceUsageStatisticsJsTest", function () { let beginTime = 0; let endTime = 20000000000000; bundleState.queryBundleStateInfoByInterval(intervalType, beginTime, endTime, (err, res) => { - if(err.code === 0) { + if (err) { + console.info('BUNDLE_ACTIVE queryBundleStateInfoByInterval callback failure.'); + expect(false).assertEqual(true); + } else { console.info('BUNDLE_ACTIVE queryBundleStateInfoByInterval callback success.'); expect(true).assertEqual(true); - } else { - expect(false).assertEqual(true); - console.info('BUNDLE_ACTIVE queryBundleStateInfoByInterval callback failure.'); } });