From 84481d4095a982d23939e6002633287798fa96b3 Mon Sep 17 00:00:00 2001 From: wyuanchao Date: Fri, 25 Mar 2022 20:35:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E4=B8=8D=E5=88=9B=E5=BB=BAerr=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wyuanchao --- frameworks/src/bundle_state_common.cpp | 4 ++ .../device_usage_statistics_jsunit.test.js | 64 +++++++++---------- 2 files changed, 36 insertions(+), 32 deletions(-) diff --git a/frameworks/src/bundle_state_common.cpp b/frameworks/src/bundle_state_common.cpp index 26ba1cb..6e7cb08 100644 --- a/frameworks/src/bundle_state_common.cpp +++ b/frameworks/src/bundle_state_common.cpp @@ -41,6 +41,7 @@ void BundleStateCommon::GetCallbackPromiseResult(const napi_env &env, void BundleStateCommon::SetCallbackInfo( const napi_env &env, const napi_ref &callbackIn, const int &errorCode, const napi_value &result) { + napi_value undefined = nullptr; napi_get_undefined(env, &undefined); @@ -150,6 +151,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 daf50ba..e66a0fa 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.'); } }); -- Gitee From 913c1513df7069b98474cb0023734bc3faca7406 Mon Sep 17 00:00:00 2001 From: wyuanchao Date: Fri, 25 Mar 2022 20:40:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E4=B8=8D=E5=88=9B=E5=BB=BAerr=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wyuanchao --- frameworks/src/bundle_state_common.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/frameworks/src/bundle_state_common.cpp b/frameworks/src/bundle_state_common.cpp index 6e7cb08..ef198cf 100644 --- a/frameworks/src/bundle_state_common.cpp +++ b/frameworks/src/bundle_state_common.cpp @@ -41,7 +41,6 @@ void BundleStateCommon::GetCallbackPromiseResult(const napi_env &env, void BundleStateCommon::SetCallbackInfo( const napi_env &env, const napi_ref &callbackIn, const int &errorCode, const napi_value &result) { - napi_value undefined = nullptr; napi_get_undefined(env, &undefined); -- Gitee