diff --git a/frameworks/src/bundle_state_common.cpp b/frameworks/src/bundle_state_common.cpp
index 67e69c0d189026591a24d1d640d3924b5ed230d9..473e53095188c15aa3eb70a70da3706d569030b6 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 2b3c15cab8a7a6c856b85c3b61fa728697430139..ac0c4d5d757b4f0911dcc1de14859bf498cf471d 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
@@ -58,14 +58,12 @@ describe("DeviceUsageStatisticsJsTest", function () {
         bundleState.isIdleState(bundleName).then((res) => {
             console.info('BUNDLE_ACTIVE isIdleState promise success.');
             expect(true).assertEqual(true);
+            done();
         }).catch((err) => {
-            expect(false).assertEqual(true);
             console.info('BUNDLE_ACTIVE isIdleState promise failure.');
-        });
-
-        setTimeout(()=>{
+            expect(false).assertEqual(true);
             done();
-        }, 500);
+        });
     })
 
     /*
@@ -78,18 +76,16 @@ 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);
+                done();
+            } else {
                 console.info('BUNDLE_ACTIVE isIdleState callback success.');
                 expect(true).assertEqual(true);
-            } else {
-                expect(false).assertEqual(true);
-                console.info('BUNDLE_ACTIVE isIdleState callback failure.');
+                done();
             }
         });
-
-        setTimeout(()=>{
-            done();
-        }, 500);
     })
 
     /*
@@ -102,15 +98,13 @@ 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);
+            done();
         }).catch( err => {
-            expect(false).assertEqual(true)
             console.info('BUNDLE_ACTIVE queryAppUsagePriorityGroup promise failure.');
-        });
-
-        setTimeout(()=>{
+            expect(false).assertEqual(true);
             done();
-        }, 500);
+        });
     })
 
     /*
@@ -122,18 +116,16 @@ 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);
+                done();
+            } else {
+                console.info('BUNDLE_ACTIVE queryAppUsagePriorityGroup callback success.');
+                expect(true).assertEqual(true);
+                done();
             }
         });
-
-        setTimeout(()=>{
-            done();
-        }, 500);
     })
 
     /*
@@ -149,14 +141,12 @@ describe("DeviceUsageStatisticsJsTest", function () {
         bundleState.queryBundleActiveStates(beginTime, endTime).then((res) => {
             console.info('BUNDLE_ACTIVE queryBundleActiveStates promise success.');
             expect(true).assertEqual(true);
+            done();
         }).catch((err) => {
-            expect(false).assertEqual(true);
             console.info('BUNDLE_ACTIVE queryBundleActiveStates promise failure.');
-        });
-
-        setTimeout(()=>{
+            expect(false).assertEqual(true);
             done();
-        }, 500);
+        });
     })
 
     /*
@@ -170,18 +160,16 @@ 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);
+                done();
+            } else {
                 console.info('BUNDLE_ACTIVE queryBundleActiveStates callback success.');
                 expect(true).assertEqual(true);
-            } else {
-                expect(false).assertEqual(true);
-                console.info('BUNDLE_ACTIVE queryBundleActiveStates callback failure.');
+                done();
             }
         });
-
-        setTimeout(()=>{
-            done();
-        }, 500);
     })
 
     /*
@@ -197,14 +185,12 @@ describe("DeviceUsageStatisticsJsTest", function () {
         bundleState.queryBundleStateInfos(beginTime, endTime).then((res) => {
             console.info('BUNDLE_ACTIVE queryBundleStateInfos promise success.');
             expect(true).assertEqual(true);
+            done();
         }).catch((err) => {
-            expect(false).assertEqual(true);
             console.info('BUNDLE_ACTIVE queryBundleStateInfos promise failure.');
-        });
-
-        setTimeout(()=>{
+            expect(false).assertEqual(true);
             done();
-        }, 500);
+        });
     })
 
     /*
@@ -218,18 +204,16 @@ 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);
+                done();
+            } else {
                 console.info('BUNDLE_ACTIVE queryBundleStateInfos callback success.');
                 expect(true).assertEqual(true);
-            } else {
-                expect(false).assertEqual(true);
-                console.info('BUNDLE_ACTIVE queryBundleStateInfos callback failure.');
+                done();
             }
         });
-
-        setTimeout(()=>{
-            done();
-        }, 500);
     })
 
     /*
@@ -245,14 +229,12 @@ describe("DeviceUsageStatisticsJsTest", function () {
         bundleState.queryCurrentBundleActiveStates(beginTime, endTime).then((res) => {
             console.info('BUNDLE_ACTIVE queryCurrentBundleActiveStates promise success.');
             expect(true).assertEqual(true);
+            done();
         }).catch((err) => {
-            expect(false).assertEqual(true);
             console.info('BUNDLE_ACTIVE queryCurrentBundleActiveStates promise failure.');
-        });
-
-        setTimeout(()=>{
+            expect(false).assertEqual(true);
             done();
-        }, 500);
+        });
     })
 
     /*
@@ -266,18 +248,16 @@ 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);
+                done();
+            } else {
                 console.info('BUNDLE_ACTIVE queryCurrentBundleActiveStates callback success.');
                 expect(true).assertEqual(true);
-            } else {
-                expect(false).assertEqual(true);
-                console.info('BUNDLE_ACTIVE queryCurrentBundleActiveStates callback failure.');
+                done();
             }
         });
-
-        setTimeout(()=>{
-            done();
-        }, 500);
     })
 
     /*
@@ -294,14 +274,12 @@ describe("DeviceUsageStatisticsJsTest", function () {
         bundleState.queryBundleStateInfoByInterval(intervalType, beginTime, endTime).then((res) => {
             console.info('BUNDLE_ACTIVE queryBundleStateInfoByInterval promise success.');
             expect(true).assertEqual(true);
+            done();
         }).catch((err) => {
-            expect(false).assertEqual(true);
             console.info('BUNDLE_ACTIVE queryBundleStateInfoByInterval promise failure.');
-        });
-
-        setTimeout(()=>{
+            expect(false).assertEqual(true);
             done();
-        }, 500);
+        });
     })
 
     /*
@@ -316,17 +294,15 @@ 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);
+                done();
+            } else {
                 console.info('BUNDLE_ACTIVE queryBundleStateInfoByInterval callback success.');
                 expect(true).assertEqual(true);
-            } else {
-                expect(false).assertEqual(true);
-                console.info('BUNDLE_ACTIVE queryBundleStateInfoByInterval callback failure.');
+                done();
             }
         });
-
-        setTimeout(()=>{
-            done();
-        }, 500);
     })
 })
\ No newline at end of file