修改错误码

Signed-off-by: N华华小仙女 <zhurong18@h-partners.com>

graphic/windowStage/entry/src/main/ets/test/displayAndWindowRefactorInterface.test.ets

@@ -253,7 +253,7 @@ export default function displayAndWindowRefactorInterfaceTest(context, windowSta
         try {
           let ohosDataError = await ohosWindow.createWindow(windowConfig).catch(async (errSencond) => {
             console.log(msgStr + 'ohosWindow.createWindow 1 twice err: ' + JSON.stringify(errSencond));
-            expect(errSencond.code).assertEqual(1300002)
+            expect(errSencond.code).assertEqual(1300001)
             await ohosData.destroyWindow();
             done();
           })
@@ -434,7 +434,7 @@ export default function displayAndWindowRefactorInterfaceTest(context, windowSta
           if (err && err.code) {
             console.log(msgStr + 'ohosWindow.createWindow 1 twice data: ' + JSON.stringify(dataTwo));
             try {
-              expect(err.code).assertEqual(1300002)
+              expect(err.code).assertEqual(1300001)
             } catch (error) {
               console.info(`ohosWindow.createWindow catch error: ${JSON.stringify(error)}`)
             }

graphic/windowStage/entry/src/main/ets/test/windowCallback.test.ets

@@ -143,28 +143,27 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
       function ohosWindowOn() {
         ohosWindow.on('systemBarTintChange', systembartintstate => {
           console.log(msgStr + 'ohosWindow.on  systembartintstate.regionTint : ' + JSON.stringify(systembartintstate.regionTint));
-          console.log(msgStr + 'ohosWindow.on  flagStatus : ' + JSON.stringify(flagStatus));
           if (flagStatus) {
+            console.log(msgStr + 'systembartintstate.regionTint[0].type : ' + JSON.stringify(systembartintstate.regionTint[0].type));
+            console.log(msgStr + 'systembartintstate.regionTint[0].isEnable : ' + JSON.stringify(systembartintstate.regionTint[0].isEnable));
             try {
               expect(!!systembartintstate).assertTrue();
-              expect(!!systembartintstate.regionTint).assertTrue();
+              expect(systembartintstate.regionTint[0].type == 3 && systembartintstate.regionTint[0].isEnable).assertTrue();
             } catch (error) {
               console.info(msgStr + `ohosWindow.on ${JSON.stringify(error)}`)
             }
-            console.log(msgStr + 'flagStatus || flagNav' + msgStr + 'ohosWindow.on systemBarTintChange regionTint:' + JSON.stringify(systembartintstate.regionTint));
             done();
           }
         })
       }
 
       let mainWnd = null;
-      console.log(msgStr + 'mainWnd = null');
       console.log(msgStr + 'windowStage = ' + JSON.stringify(windowStage));
 
       function getMainWindow() {
         return new Promise(function (resolve, reject) {
           windowStage.getMainWindow((err, data) => {
-            console.log(msgStr + 'getMainWindow data2' + JSON.stringify(data));
+            console.log(msgStr + 'getMainWindow data:' + JSON.stringify(data));
             if (err && err.code) {
               unexpectedError(data, caseName, 'windowStage.getMainWindow', done);
             }
@@ -220,9 +219,9 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
       function setSystemBarEnableStatus() {
         return new Promise(function (resolve, reject) {
           mainWnd.setSystemBarEnable(['status'], (err, data) => {
-            console.log(msgStr + 'mainWnd.setSystemBarEnable status JSON.stringify(data)===' + JSON.stringify(data));
+            console.log(msgStr + 'mainWnd.setSystemBarEnable status data===' + JSON.stringify(data));
             if (err && err.code) {
-              console.log(msgStr + 'mainWnd.setSystemBarEnable status JSON.stringify(err)===' + JSON.stringify(err));
+              console.log(msgStr + 'mainWnd.setSystemBarEnable status err===' + JSON.stringify(err));
               unexpectedError(data, caseName, 'mainWnd.setSystemBarEnable [status]', done);
             }
             try {
@@ -277,7 +276,7 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
       function getMainWindow() {
         return new Promise(function (resolve, reject) {
           windowStage.getMainWindow((err, data) => {
-            console.log(msgStr + 'getMainWindow data2' + JSON.stringify(data));
+            console.log(msgStr + 'getMainWindow data:' + JSON.stringify(data));
             if (err && err.code) {
               unexpectedError(data, caseName, 'windowStage.getMainWindow', done);
             }
@@ -1151,6 +1150,7 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
       }
 
       let tempWnd = null
+
       function getMainWindow() {
         return new Promise(function (resolve, reject) {
           windowStage.getMainWindow((err, data) => {
@@ -1494,7 +1494,7 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
             if (err && err.code) {
               console.log(msgStr + 'ohosWindow.create 1 twice data: ' + JSON.stringify(data));
               try {
-                expect(err.code).assertEqual(1001)
+                expect(err.code).assertEqual(1300001)
               } catch (error) {
                 console.info(`tempWnd.show catch error: ${JSON.stringify(error)}`)
               }
@@ -3236,18 +3236,6 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
           return;
         }
         console.log(msgStr + 'snapshot success data:' + JSON.stringify(data));
-        mainWin.on('snapshot', (err, data) => {
-          if (err && err.code) {
-            console.log(msgStr + 'mainWin.on(snapshot)  err.code:' + JSON.stringify(err.code));
-            return;
-          }
-          mainWin.off('snapshot', (err, data) => {
-            if (err && err.code) {
-              console.log(msgStr + 'mainWin.off(snapshot) err.code:' + JSON.stringify(err.code));
-              return;
-            }
-          })
-        })
       })
       done();
     })

graphic/windowStage/entry/src/main/ets/test/windowPromise.test.ets

@@ -1083,7 +1083,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       expect(!!ohosData).assertTrue();
       let ohosDataError = await ohosWindow.create(context, windowId, 1).catch((err) => {
         console.log(msgStr + 'ohosWindow.create 1 twice err: ' + JSON.stringify(err));
-        expect(err.code).assertEqual(1001)
+        expect(err.code).assertEqual(1300001)
         done();
       })
       await ohosData.destroy();