update

Signed-off-by: Nyaocui <yaocui2@h-partners.com>

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

@@ -17,6 +17,7 @@ import windowCallbackTest from './windowCallback.test'
 import windowRefactorInterfaceTest from './windowRefactorInterface.test'
 import displayAndWindowRefactorInterfaceTest from './displayAndWindowRefactorInterface.test'
 import parameterVerificationIsOptional from './parameterVerificationIsOptional.test'
+import windowRichScene from './windowRichScene.test'
 
 export default function testsuite() {
   windowCallbackTest(globalThis.abilityContext,globalThis.windowStage,globalThis.abilityStorage)
@@ -24,4 +25,5 @@ export default function testsuite() {
   windowRefactorInterfaceTest(globalThis.abilityContext,globalThis.windowStage,globalThis.abilityStorage)
   displayAndWindowRefactorInterfaceTest(globalThis.abilityContext,globalThis.windowStage,globalThis.abilityStorage)
   parameterVerificationIsOptional(globalThis.abilityContext,globalThis.windowStage,globalThis.abilityStorage)
+  windowRichScene(globalThis.abilityContext,globalThis.windowStage,globalThis.abilityStorage)
 }
\ No newline at end of file

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

@@ -117,6 +117,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       let caseName = 'window_off_windowSizeChange_Test_001';
       let msgStr = 'jsunittest ' + caseName + ' ';
       console.log(msgStr + 'begin');
+      let num = 0
       let firstListenFlag = false
       let secondListenFlag = false
       let baseWndType = 1;
@@ -132,10 +133,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       expect(!!tempWnd).assertTrue();
       tempWnd.on('windowSizeChange', () => {
         console.info(msgStr + "first listener trigger");
+        num++
         firstListenFlag = true
       });
       tempWnd.on('windowSizeChange', (data) => {
         console.info(msgStr + "second listener trigger");
+        num++
         secondListenFlag = true
       });
       await tempWnd.show().catch((err) => {
@@ -161,8 +164,9 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
         await tempWnd.destroyWindow();
         done();
       })
+      console.error(msgStr + 'num : ' + num);
       await sleep(500);
-      if (firstListenFlag === false && secondListenFlag === false) {
+      if (num >= 2 && firstListenFlag === false && secondListenFlag === false) {
         await tempWnd.destroyWindow();
         done();
       }
@@ -245,6 +249,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       let caseName = 'window_off_avoidAreaChange_Test_001';
       let msgStr = 'jsunittest ' + caseName + ' ';
       console.log(msgStr + 'begin');
+      let num = 0
       let firstListenFlag = false
       let secondListenFlag = false
       let tempWnd = null
@@ -257,15 +262,20 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       });
       tempWnd.on('avoidAreaChange', () => {
         console.info(msgStr + "first listener trigger");
+        num++
         firstListenFlag = true
       });
       tempWnd.on('avoidAreaChange', (data) => {
         console.info(msgStr + 'second listener trigger');
+        num++
         secondListenFlag = true
       });
       await tempWnd.setFullScreen(true).catch((err) => {
         unexpectedError(err, caseName, 'tempWnd.setFullScreen(true)', done);
       });
+      await tempWnd.setSystemBarEnable(['status']).catch((err) => {
+        unexpectedError(err, caseName, 'tempWnd.setSystemBarEnable([status])', done);
+      });
       await sleep(1000);
       tempWnd.off('avoidAreaChange');
       firstListenFlag = false
@@ -277,7 +287,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       await tempWnd.setSystemBarEnable(['status', 'navigation']).catch((err) => {
         unexpectedError(err, caseName, 'tempWnd.setSystemBarEnable([status])', done);
       });
-      if (firstListenFlag === false && secondListenFlag === false) {
+      if (num >= 2 && firstListenFlag === false && secondListenFlag === false) {
         done();
       }
     })
@@ -346,6 +356,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       let caseName = 'window_off_screenshot_Test_001';
       let msgStr = 'jsunittest ' + caseName + ' ';
       console.log(msgStr + 'begin');
+      let num = 0
       let firstListenFlag = false
       let secondListenFlag = false
       let windowId = 'window_off_screenshot_Test_001';
@@ -368,10 +379,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       });
       tempWnd.on('screenshot', (data) => {
         console.info(msgStr + "first listener trigger");
+        num++
         firstListenFlag = true
       });
       tempWnd.on('screenshot', (data) => {
         console.info(msgStr + "second listener trigger");
+        num++
         secondListenFlag = true
       });
       // 截屏代码
@@ -397,7 +410,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
         done();
       });
       await sleep(1000);
-      if (firstListenFlag === false && secondListenFlag === false) {
+      if (num >= 2 && firstListenFlag === false && secondListenFlag === false) {
         await tempWnd.destroyWindow();
         done();
       } else {
@@ -490,6 +503,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       let caseName = 'window_off_dialogTargetTouch_Test_001';
       let msgStr = 'jsunittest ' + caseName + ' ';
       console.log(msgStr + 'begin');
+      let num = 0
       let firstListenFlag = false
       let secondListenFlag = false
       let windowId = 'window_off_dialogTargetTouch_Test_001';
@@ -512,10 +526,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       });
       tempWnd.on('dialogTargetTouch', (data) => {
         console.info(msgStr + "first listener trigger");
+        num++
         firstListenFlag = true
       });
       tempWnd.on('dialogTargetTouch', (data) => {
         console.info(msgStr + "second listener trigger");
+        num++
         secondListenFlag = true
       });
       // 点击模态窗口
@@ -536,7 +552,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
         done();
       })
       await sleep(1000);
-      if (firstListenFlag === false && secondListenFlag === false) {
+      if (num >= 2 && firstListenFlag === false && secondListenFlag === false) {
         await tempWnd.destroyWindow();
         done();
       }
@@ -618,6 +634,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       let caseName = 'window_off_keyboardHeightChange_Test_001';
       let msgStr = 'jsunittest ' + caseName + ' ';
       console.log(msgStr + 'begin');
+      let num = 0
       let firstListenFlag = false
       let secondListenFlag = false
       let windowId = 'window_off_keyboardHeightChange_Test_001';
@@ -643,10 +660,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       });
       tempWnd.on('keyboardHeightChange', (data) => {
         console.info(msgStr + "first listener trigger");
+        num++
         firstListenFlag = true
       });
       tempWnd.on('keyboardHeightChange', (data) => {
         console.info(msgStr + "second listener trigger");
+        num++
         secondListenFlag = true
       });
       await inputClick('pageTwoinput', msgStr).catch(async err => {
@@ -666,7 +685,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
         done();
       })
       await sleep(2000);
-      if (firstListenFlag === false && secondListenFlag === false) {
+      if (num >= 2 && firstListenFlag === false && secondListenFlag === false) {
         await tempWnd.destroyWindow();
         done();
       }
@@ -754,16 +773,18 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       let caseName = 'windowStage_off_windowStageEvent_Test_001';
       let msgStr = 'jsunittest ' + caseName + ' ';
       console.log(msgStr + 'begin');
+      let num = 0
       let firstListenFlag = false
       let secondListenFlag = false
-
       function firstCall() {
         console.log(msgStr + "first listener trigger")
+        num++
         firstListenFlag = true
       }
 
       function secondCall() {
         console.log(msgStr + "second listener trigger")
+        num++
         secondListenFlag = true
       }
 
@@ -783,7 +804,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
         unexpectedError(err, caseName, 'tempWnd.show', done);
       });
       await sleep(1000);
-      if (firstListenFlag === false && secondListenFlag === false) {
+      if (num >= 2 && firstListenFlag === false && secondListenFlag === false) {
         done();
       }
     })
@@ -828,7 +849,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       windowStage.off("windowStageEvent");
       if (!firstListenFlag && secondListenFlag) {
         done();
-      }else{
+      } else {
         expect(TRUE_FLAG).assertFail();
         done();
       }
@@ -843,6 +864,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       let caseName = 'display_off_add_Test_001';
       let msgStr = 'jsunittest ' + caseName + ' ';
       console.log(msgStr + 'begin');
+      let num = 0
       let firstListenFlag = false
       let secondListenFlag = false
       let screenClass = null;
@@ -850,11 +872,13 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
 
       function firstCall() {
         console.log(msgStr + "first listener trigger")
+        num++
         firstListenFlag = true
       }
 
       function secondCall() {
         console.log(msgStr + "second listener trigger")
+        num++
         secondListenFlag = true
       }
 
@@ -900,7 +924,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
         unexpectedError(err, caseName, 'screen.makeExpand', done);
       });
       await sleep(1000);
-      if (firstListenFlag === false && secondListenFlag === false) {
+      if (num >= 2 && firstListenFlag === false && secondListenFlag === false) {
         await screen.destroyVirtualScreen(screenClass_two.id)
         done();
       }
@@ -975,7 +999,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       display.off("add")
       if (!firstListenFlag && secondListenFlag) {
         done();
-      }else{
+      } else {
         expect(TRUE_FLAG).assertFail();
         done();
       }
@@ -989,6 +1013,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       let caseName = 'display_off_remove_Test_001';
       let msgStr = 'jsunittest ' + caseName + ' ';
       console.log(msgStr + 'begin');
+      let num = 0
       let firstListenFlag = false
       let secondListenFlag = false
       let screenClass = null;
@@ -996,11 +1021,13 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
 
       function firstCall() {
         console.log(msgStr + "first listener trigger")
+        num++
         firstListenFlag = true
       }
 
       function secondCall() {
         console.log(msgStr + "second listener trigger")
+        num++
         secondListenFlag = true
       }
 
@@ -1047,7 +1074,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       });
       await screen.destroyVirtualScreen(screenClass_two.id)
       await sleep(1000);
-      if (firstListenFlag === false && secondListenFlag === false) {
+      if (num >= 2 && firstListenFlag === false && secondListenFlag === false) {
         done();
       }
     })
@@ -1121,7 +1148,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       display.off('remove')
       if (!firstListenFlag && secondListenFlag) {
         done();
-      }else{
+      } else {
         expect(TRUE_FLAG).assertFail();
         done();
       }
@@ -1135,17 +1162,20 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       let caseName = 'display_off_change_Test_001';
       let msgStr = 'jsunittest ' + caseName + ' ';
       console.log(msgStr + 'begin');
+      let num = 0
       let firstListenFlag = false
       let secondListenFlag = false
       let screenClass = null;
 
       function firstCall() {
         console.log(msgStr + "first listener trigger")
+        num++
         firstListenFlag = true
       }
 
       function secondCall() {
         console.log(msgStr + "second listener trigger")
+        num++
         secondListenFlag = true
       }
 
@@ -1179,7 +1209,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
         unexpectedError(err, caseName, 'screenClass.setOrientation', done);
       });
       await sleep(1000);
-      if (firstListenFlag === false && secondListenFlag === false) {
+      if (num >= 2 && firstListenFlag === false && secondListenFlag === false) {
         await screen.destroyVirtualScreen(screenClass.id)
         done();
       }
@@ -1241,7 +1271,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       display.off('change')
       if (!firstListenFlag && secondListenFlag) {
         done();
-      }else{
+      } else {
         expect(TRUE_FLAG).assertFail();
         done();
       }
@@ -1254,7 +1284,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
     it('getUIContext_Test_001', 0, async function (done) {
       let caseName = 'getUIContext_Test_001';
       let msgStr = 'jsunittest ' + caseName + ' ';
-      let uiContext=null;
+      let uiContext = null;
       console.log(msgStr + 'begin');
       let mainWindow = null
       mainWindow = await windowStage.getMainWindow().catch((err) => {
@@ -1264,7 +1294,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       // 获取UIContext实例。
       uiContext = mainWindow.getUIContext();
       expect(!!uiContext).assertTrue();
-      console.log(msgStr + 'after uiContext: '+JSON.stringify(uiContext));
+      console.log(msgStr + 'after uiContext: ' + JSON.stringify(uiContext));
       done();
     })
 

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

@@ -131,28 +131,7 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
     it('setSystemBarEnableTest6', 0, async function (done) {
       let caseName = 'setSystemBarEnableTest6';
       let msgStr = 'jsunittest ' + caseName + ' ';
-      let [flagStatus, flagNav] = [false, false];
       console.log(msgStr + 'begin');
-      listenerData.on = true;
-      listenerData.typeStr = 'systemBarTintChange';
-      ohosWindow.on('systemBarTintChange', systembartintstate => {
-        console.log(msgStr + 'ohosWindow.on  systembartintstate.regionTint : ' + JSON.stringify(systembartintstate.regionTint));
-        console.log(msgStr + 'ohosWindow.on  flagNav : ' + JSON.stringify(flagNav));
-        console.log(msgStr + 'ohosWindow.on  flagStatus : ' + JSON.stringify(flagStatus));
-        console.log(msgStr + 'ohosWindow.on  flagStatus && flagNav : ' + (flagStatus && flagNav));
-        if (flagStatus || flagNav) {
-          try {
-            expect(!!systembartintstate).assertTrue();
-            expect(!!systembartintstate.regionTint).assertTrue();
-          } catch (error) {
-            console.info(`ohosWindow.on ${JSON.stringify(error)}`)
-          }
-          console.log(msgStr + 'flagStatus || flagNav' + msgStr + 'ohosWindow.on systemBarTintChange regionTint:' + JSON.stringify(systembartintstate.regionTint));
-          ohosWindow.off('systemBarTintChange')
-          done();
-        }
-      })
-
       function getMainWindow() {
         return new Promise(function (resolve, reject) {
           windowStage.getMainWindow((err, data) => {
@@ -191,7 +170,6 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
               reject(null)
             } else {
               console.log(msgStr + 'mainWnd.setFullScreen success');
-              flagNav = true;
               resolve(true)
             }
           })
@@ -207,7 +185,6 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
               reject(null)
             } else {
               console.log(msgStr + 'mainWnd.setSystemBarEnable success');
-              flagStatus = true;
               resolve(true)
             }
           })
@@ -257,6 +234,7 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
         done();
       });
       console.log(msgStr + 'finished!!');
+      done();
     });
     /**
      * @tc.number SUB_WINDOW_SETSYSTEMBARENABLE_JSAPI_007
@@ -266,24 +244,7 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
     it('setSystemBarEnableTest7', 0, async function (done) {
       let caseName = 'setSystemBarEnableTest7';
       let msgStr = 'jsunittest ' + caseName + ' ';
-      let [flagStatus, flagNav] = [false, false];
       console.log(msgStr + 'begin');
-
-      ohosWindow.on('systemBarTintChange', systembartintstate => {
-        console.log(msgStr + 'ohosWindow.on systembartintstate ：' + JSON.stringify(systembartintstate));
-        console.log(msgStr + 'ohosWindow.on systembartintstate.regionTint : ' + JSON.stringify(systembartintstate.regionTint));
-        if (flagStatus || flagNav) {
-          console.log(msgStr + 'ohosWindow.on flagStatus || flagNav：');
-          try {
-            expect(!!systembartintstate).assertTrue();
-          } catch (error) {
-            console.info(`ohosWindow.on catch err: ${JSON.stringify(error)}`)
-          }
-          ohosWindow.off('systemBarTintChange')
-          done();
-        }
-      })
-
       function getMainWindow() {
         return new Promise(function (resolve, reject) {
           windowStage.getMainWindow((err, data) => {
@@ -333,7 +294,6 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
             if (err && err.code) {
               reject(null)
             } else {
-              flagStatus = true;
               resolve(true)
             }
           })
@@ -347,7 +307,6 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
             if (err && err.code) {
               reject(null)
             } else {
-              flagNav = true;
               resolve(true)
             }
           })
@@ -381,6 +340,7 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
         expect().assertFail();
         done();
       });
+      done();
     });
     /**
      * @tc.number SUB_WINDOW_SETSYSTEMBARENABLE_JSAPI_008
@@ -390,30 +350,8 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
     it('setSystemBarEnableTest8', 0, async function (done) {
       let caseName = 'setSystemBarEnableTest8';
       let msgStr = 'jsunittest ' + caseName + ' ';
-      let [flagStatus, flagNav] = [false, false];
       console.log(msgStr + 'begin');
 
-      ohosWindow.on('systemBarTintChange', systembartintstate => {
-        if (flagStatus && flagNav) {
-          console.log(msgStr + 'ohosWindow.on systembartintstate.regionTint : ' + JSON.stringify(systembartintstate.regionTint));
-          let enable = systembartintstate.regionTint[0].isEnable
-          let numType = systembartintstate.regionTint[0].type
-          console.log(msgStr + 'ohosWindow.on isEnable : ' + JSON.stringify(enable));
-          console.log(msgStr + 'ohosWindow.on numType : ' + JSON.stringify(numType));
-          try {
-            expect(numType === ohosWindow.WindowType.TYPE_STATUS_BAR || numType === ohosWindow.WindowType.TYPE_NAVIGATION_BAR && enable)
-              .assertTrue();
-          } catch (error) {
-            console.info(`ohosWindow.on catch err: ${JSON.stringify(error)}`)
-          }
-          ohosWindow.off('systemBarTintChange')
-          done();
-        } else {
-          console.log(msgStr + 'flagStatus :' + flagStatus + '  ,regionTint:' + JSON.stringify(systembartintstate.regionTint));
-          console.log(msgStr + 'flagNav :' + flagNav + '  ,regionTint:' + JSON.stringify(systembartintstate.regionTint));
-        }
-      })
-
       function getMainWindow() {
         return new Promise(function (resolve, reject) {
           windowStage.getMainWindow((err, data) => {
@@ -460,8 +398,6 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
             if (err && err.code) {
               reject(null)
             } else {
-              flagStatus = true;
-              flagNav = true;
               resolve(true)
               console.log(msgStr + 'mainWnd.setSystemBarEnable [status, navigation] data==' + JSON.stringify(data));
             }
@@ -492,6 +428,7 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
         expect().assertFail();
         done();
       });
+      done();
     });
     /**
      * @tc.number SUB_WINDOW_SETSYSTEMBARENABLE_JSAPI_009
@@ -501,22 +438,7 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
     it('setSystemBarEnableTest9', 0, async function (done) {
       let caseName = 'setSystemBarEnableTest9';
       let msgStr = 'jsunittest ' + caseName + ' ';
-      let [flagStatus, flagNav] = [false, false];
       console.log(msgStr + 'begin');
-      ohosWindow.on('systemBarTintChange', (systembartintstate) => {
-        console.log(msgStr + 'ohosWindow.on systemBarTintChange ：' + JSON.stringify(systembartintstate));
-        console.log(msgStr + 'ohosWindow.on systemBarTintChange systembartintstate.regionTint : ' + JSON.stringify(systembartintstate.regionTint));
-        if (flagStatus || flagNav) {
-          try {
-            expect(!!systembartintstate).assertTrue();
-          } catch (error) {
-            console.info(`ohosWindow.on catch err: ${JSON.stringify(error)}`)
-          }
-          ohosWindow.off('systemBarTintChange')
-          done();
-        }
-      })
-
       function getMainWindow() {
         return new Promise(function (resolve, reject) {
           windowStage.getMainWindow((err, data) => {
@@ -576,8 +498,6 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
             if (err && err.code) {
               reject(null)
             } else {
-              flagStatus = true;
-              flagNav = true;
               resolve(true)
             }
           })
@@ -612,6 +532,7 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
         expect().assertFail();
         done();
       });
+      done();
     });
     /**
      * @tc.number SUB_WINDOW_SETSYSTEMBARENABLE_JSAPI_010
@@ -786,88 +707,6 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
       let endNum = 0;
       let listenerFlag = false;
       console.log(msgStr + 'begin');
-      listenerData.on = true;
-      listenerData.typeStr = 'systemBarTintChange';
-      ohosWindow.on('systemBarTintChange', (systemBarData) => {
-        console.log(msgStr + 'tempWnd.on systemBarTintChange, systemBatData : ' + JSON.stringify(systemBarData));
-        if (listenerFlag) {
-          try {
-            expect(!!systemBarData).assertTrue();
-            expect(!!systemBarData.regionTint).assertTrue();
-          } catch (error) {
-            console.info(`ohosWindow.on catch error: ${JSON.stringify(error)}`)
-          }
-          let arrLength = systemBarData.regionTint.length;
-          for (let i = 0; i < arrLength; i++) {
-            console.log(msgStr + 'for arrLenght compareCount: ' + compareCount + ' ,i:' + i + '  ,arrLength:' + arrLength);
-            let tempData = systemBarData.regionTint[i];
-            if (tempData.type === ohosWindow.WindowType.TYPE_STATUS_BAR) {
-              console.log(msgStr + 'systemBarTintChange compare start! arrLength= ' + arrLength);
-              compareCount++;
-              let backgroundIndex = cloneColorArr.SBC.indexOf(tempData.backgroundColor);
-              let contentColorIndex = cloneColorArr.SCC.indexOf(tempData.contentColor);
-              if (backgroundIndex >= 0) {
-                cloneColorArr.SBC.splice(backgroundIndex, 1);
-              } else {
-                console.log(msgStr + 'SBC tempData.backgroundColor:' + JSON.stringify(tempData.backgroundColor));
-              }
-              if (contentColorIndex >= 0) {
-                cloneColorArr.SCC.splice(contentColorIndex, 1);
-              } else {
-                console.log(msgStr + 'SCC tempData.contentColor:' + JSON.stringify(tempData.contentColor));
-              }
-              let ca = cloneColorArr;
-              let flag = ca.NCC.length || ca.NBC.length || ca.SBC.length || ca.SCC.length
-              if (compareCount === 18 && !flag) {
-                console.log(msgStr + 'if compareCount: ' + compareCount + ' ,true flag:' + flag);
-                try {
-                  expect(true).assertTrue();
-                } catch (error) {
-                  console.info(`ohosWindow.on catch error: ${JSON.stringify(error)}`)
-                }
-              } else {
-                console.log(msgStr + 'compareCount: ' + compareCount + ' ,flag:' + flag);
-              }
-              console.log(msgStr + 'compareCount: ' + compareCount + ' ,length: ' + JSON.stringify(cloneColorArr.SCC.length) + '   ,cloneColorArr.SBC:' + JSON.stringify(cloneColorArr.SBC));
-              console.log(msgStr + 'compareCount: ' + compareCount + ' ,length: ' + JSON.stringify(cloneColorArr.SCC.length) + '    ,cloneColorArr.SCC' + JSON.stringify(cloneColorArr.SCC));
-              done();
-            } else if (tempData.type === ohosWindow.WindowType.TYPE_NAVIGATION_BAR) {
-              console.log(msgStr + 'systemBarTintChange compare start!');
-              compareCount++;
-              let backgroundIndex = cloneColorArr.NBC.indexOf(tempData.backgroundColor);
-              let contentColorIndex = cloneColorArr.NCC.indexOf(tempData.contentColor);
-              if (backgroundIndex >= 0) {
-                cloneColorArr.NBC.splice(backgroundIndex, 1);
-              } else {
-                console.log(msgStr + 'NBC tempData.backgroundColor:' + JSON.stringify(tempData.backgroundColor));
-              }
-              if (contentColorIndex >= 0) {
-                cloneColorArr.NCC.splice(contentColorIndex, 1);
-              } else {
-                console.log(msgStr + 'NCC tempData.contentColor:' + JSON.stringify(tempData.contentColor));
-              }
-              let ca = cloneColorArr;
-              let flag = ca.NCC.length || ca.NBC.length || ca.SBC.length || ca.SCC.length
-              if (compareCount === 18 && !flag) {
-                console.log(msgStr + 'else compareCount: ' + compareCount + ' ,true flag:' + flag);
-                try {
-                  expect(true).assertTrue();
-                } catch (error) {
-                  console.info(`ohosWindow.on catch error: ${JSON.stringify(error)}`)
-                }
-              } else {
-                console.log(msgStr + 'compareCount: ' + compareCount + ' ,flag:' + flag);
-              }
-              console.log(msgStr + 'compareCount: ' + endNum + ' ,compareCount: ' + compareCount + ' ,length: ' + JSON.stringify(cloneColorArr.NBC.length) + '   ,cloneColorArr.SBC:' + JSON.stringify(cloneColorArr.NBC));
-              console.log(msgStr + 'compareCount: ' + endNum + ' ,compareCount: ' + compareCount + ' ,length: ' + JSON.stringify(cloneColorArr.NCC.length) + '    ,cloneColorArr.SCC' + JSON.stringify(cloneColorArr.NCC));
-              endNum = compareCount
-              done();
-            }
-          }
-        }
-        console.log(msgStr + 'tempWnd.on systemBarTintChange finished');
-      })
-
       let tempWnd;
       tempWnd = await windowStage.getMainWindow().catch((err) => {
         console.error(msgStr + 'Failed to obtain the main window. Cause: ' + JSON.stringify(err));
@@ -891,7 +730,6 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
         done();
       });
       await sleep(1000);
-      listenerFlag = true
       let loopCount = commonNUMBERColorArr.length
       for (let i = 0; i < loopCount; i++) {
         console.log(msgStr + 'tempWnd.setSystemBarEnable i:' + i);
@@ -906,7 +744,6 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
         };
         tempWnd.setSystemBarProperties(systemBarProperties, (err, data) => {
           console.log(msgStr + 'tempWnd.setSystemBarProperties err' + JSON.stringify(err));
-          console.log(msgStr + 'tempWnd.setSystemBarProperties data' + JSON.stringify(data));
           if (err && err.code) {
             try {
               expect(TRUE_FLAG).assertFail();
@@ -933,38 +770,7 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
       let msgStr = 'jsunittest ' + caseName + ' ';
       let cloneColorArr = JSON.parse(JSON.stringify(commonKEYColorArr));
       let compareCount = 0;
-      let listenerFlag = false;
       console.log(msgStr + 'begin');
-      listenerData.on = true;
-      listenerData.typeStr = 'systemBarTintChange';
-      ohosWindow.on('systemBarTintChange', (systemBarData) => {
-        console.log(msgStr + 'tempWnd.on systemBarTintChange, systemBatData : ' + JSON.stringify(systemBarData));
-        if (listenerFlag) {
-          try {
-            expect(!!systemBarData).assertTrue();
-            expect(!!systemBarData.regionTint).assertTrue();
-          } catch (error) {
-            console.info(`ohosWindow.on catch error: ${JSON.stringify(error)}`)
-          }
-          let arrLength = systemBarData.regionTint.length;
-          for (let i = 0; i < arrLength; i++) {
-            let tempData = systemBarData.regionTint[i];
-            if (tempData.type === ohosWindow.WindowType.TYPE_STATUS_BAR || tempData.type === ohosWindow.WindowType.TYPE_NAVIGATION_BAR) {
-              console.log(msgStr + 'systemBarTintChange compare start!');
-              compareCount++;
-              let backgroundIndex = cloneColorArr.indexOf(tempData.backgroundColor);
-              let contentColorIndex = cloneColorArr.indexOf(tempData.contentColor);
-              try {
-                expect(backgroundIndex === -1).assertTrue();
-                expect(contentColorIndex === -1).assertTrue();
-              } catch (error) {
-                console.info(`ohosWindow.on catch error: ${JSON.stringify(error)}`)
-              }
-            }
-          }
-        }
-        console.log(msgStr + 'tempWnd.on systemBarTintChange finished');
-      })
       let tempWnd;
       tempWnd = await windowStage.getMainWindow().catch((err) => {
         console.error(msgStr + 'Failed to obtain the main window. Cause: ' + JSON.stringify(err));
@@ -988,7 +794,6 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
         done();
       });
       await sleep(1000);
-      listenerFlag = true
       let loopCount = commonRGBColorArr.length
       for (let i = 0; i < loopCount; i++) {
         let tempColor = commonKEYColorArr[i];
@@ -1001,7 +806,6 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
           navigationBarContentColor: tempColor,
         };
         tempWnd.setSystemBarProperties(systemBarProperties, (err, data) => {
-          console.log(msgStr + 'tempWnd.setSystemBarProperties err' + JSON.stringify(err));
           console.log(msgStr + 'tempWnd.setSystemBarProperties data' + JSON.stringify(data));
           if (err && err.code) {
             try {

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

@@ -92,42 +92,6 @@ export default function windowRefactorInterfaceTest(context, windowStage, abilit
       let listenerFlag = listenerStatus.ready;
       let caseName = 'setWindowSystemBarPropertiesTest1';
       let msgStr = 'jsunittest ' + caseName + ' ';
-      console.info('setWindowSystemBarPropertiesTest1');
-      listenerData.on = true;
-      listenerData.typeStr = 'systemBarTintChange';
-      ohosWindow.on('systemBarTintChange', (systemBarData) => {
-        console.info('setWindowSystemBarPropertiesTest1 systemBatData : ' + JSON.stringify(systemBarData));
-        if (listenerFlag === listenerStatus.pending) {
-          try {
-            expect(!!systemBarData).assertTrue();
-            expect(!!systemBarData.regionTint).assertTrue();
-          } catch (error) {
-            console.info(`ohosWindow.on catch error: ${JSON.stringify(error)}`)
-          }
-          let arrLength = systemBarData.regionTint.length;
-          console.log('setWindowSystemBarPropertiesTest1 arrLength is: '+systemBarData.regionTint.length)
-          for(let i=0;i<arrLength;i++){
-            console.info('setWindowSystemBarPropertiesTest1  start step:'+i);
-            // 单个导航栏或者系统状态信息
-            let SystemBarRegionTint = systemBarData.regionTint[i];
-            if (SystemBarRegionTint.type === ohosWindow.WindowType.TYPE_STATUS_BAR || SystemBarRegionTint.type === ohosWindow.WindowType.TYPE_NAVIGATION_BAR) {
-              console.info('setWindowSystemBarPropertiesTest1 assert1 start!');
-              let backgroundIndex = cloneColorArr.indexOf(SystemBarRegionTint.backgroundColor);
-              let contentColorIndex = cloneColorArr.indexOf(SystemBarRegionTint.contentColor);
-              try {
-                expect(backgroundIndex === -1).assertTrue();
-                expect(contentColorIndex === -1).assertTrue();
-              } catch (error) {
-                console.info(`ohosWindow.on catch error: ${JSON.stringify(error)}`)
-              }
-              if(i==arrLength-1){
-                console.info('setWindowSystemBarPropertiesTest1  finished step:'+i);
-              }
-            }
-          }
-        }
-      })
-      console.info('setWindowSystemBarPropertiesTest1 on systemBarTintChange finished');
       let mainWsync = windowStage.getMainWindowSync();
       expect(mainWsync != null).assertTrue();
       await mainWsync.showWindow().catch(err => {
@@ -141,7 +105,6 @@ export default function windowRefactorInterfaceTest(context, windowStage, abilit
         done();
       });
       await sleep(1000);
-      listenerFlag = listenerStatus.pending;
       for(let i=0;i<commonRGBColorArr.length;i++){
         console.info('setWindowSystemBarPropertiesTest1 begin step:'+i);
         let tempColor = commonRGBColorArr[i];
@@ -184,63 +147,8 @@ export default function windowRefactorInterfaceTest(context, windowStage, abilit
         NBC: JSON.parse(JSON.stringify(commonNUMBERColorArr)),
         NCC: JSON.parse(JSON.stringify(commonNUMBERColorArr))
       };
-      let listenerFlag = listenerStatus.ready;
-      listenerData.on = true;
-      listenerData.typeStr = 'systemBarTintChange';
       let caseName = 'setWindowSystemBarPropertiesTest2';
       let msgStr = 'jsunittest ' + caseName + ' ';
-      console.info('setWindowSystemBarPropertiesTest2');
-      ohosWindow.on('systemBarTintChange', (systemBarData) => {
-        console.info('setWindowSystemBarPropertiesTest2 systemBatData : ' + JSON.stringify(systemBarData));
-        if (listenerFlag === listenerStatus.pending) {
-          // 单个导航栏或者系统状态信息
-          try {
-            expect(!!systemBarData).assertTrue();
-            expect(!!systemBarData.regionTint).assertTrue();
-          } catch (error) {
-            console.info(`ohosWindow.on catch error: ${JSON.stringify(error)}`)
-          }
-          let arrLength = systemBarData.regionTint.length;
-          for (let i = 0; i < arrLength; i++) {
-            let systemBarRegionTint = systemBarData.regionTint[i];
-            if (systemBarRegionTint.type === ohosWindow.WindowType.TYPE_STATUS_BAR) {
-              console.info('setWindowSystemBarPropertiesTest2 assert2 start!');
-              let backgroundIndex = cloneColorArr.SBC.indexOf(systemBarRegionTint.backgroundColor);
-              let contentColorIndex = cloneColorArr.SCC.indexOf(systemBarRegionTint.contentColor);
-              if (backgroundIndex >= 0) {
-                cloneColorArr.SBC.splice(backgroundIndex, 1);
-              }
-              if (contentColorIndex >= 0) {
-                cloneColorArr.SCC.splice(contentColorIndex, 1);
-              }
-              try {
-                expect(backgroundIndex !== -1).assertTrue();
-                expect(contentColorIndex !== -1).assertTrue();
-              } catch (error) {
-                console.info(`ohosWindow.on catch error: ${JSON.stringify(error)}`)
-              }
-              done();
-            } else if (systemBarRegionTint.type === ohosWindow.WindowType.TYPE_NAVIGATION_BAR) {
-              let backgroundIndex = cloneColorArr.NBC.indexOf(systemBarRegionTint.backgroundColor);
-              let contentColorIndex = cloneColorArr.NCC.indexOf(systemBarRegionTint.contentColor);
-              if (backgroundIndex >= 0) {
-                cloneColorArr.NBC.splice(backgroundIndex, 1);
-              }
-              if (contentColorIndex >= 0) {
-                cloneColorArr.NCC.splice(contentColorIndex, 1);
-              }
-              try {
-                expect(backgroundIndex !== -1).assertTrue();
-                expect(contentColorIndex !== -1).assertTrue();
-              } catch (error) {
-                console.info(`ohosWindow.on catch error: ${JSON.stringify(error)}`)
-              }
-              done();
-            }
-          }
-        }
-      })
-      console.info('setWindowSystemBarPropertiesTest2 on systemBarTintChange finished');
       let mainWsync = windowStage.getMainWindowSync();
       expect(mainWsync != null).assertTrue();
       await mainWsync.showWindow().catch((err) => {
@@ -255,7 +163,6 @@ export default function windowRefactorInterfaceTest(context, windowStage, abilit
         done();
       });
       await sleep(1000);
-      listenerFlag = listenerStatus.pending;
       for(let i =0;i<commonNUMBERColorArr.length;i++){
         console.info('setWindowSystemBarPropertiesTest2 begin step:'+i);
         let tempColor = commonNUMBERColorArr[i];
@@ -293,39 +200,8 @@ export default function windowRefactorInterfaceTest(context, windowStage, abilit
 	   */
     it('setWindowSystemBarPropertiesTest3', 0, async function (done) {
       let cloneColorArr = JSON.parse(JSON.stringify(commonKEYColorArr));
-      let listenerFlag = listenerStatus.ready;
       let caseName = 'setWindowSystemBarPropertiesTest3';
       let msgStr = 'jsunittest ' + caseName + ' ';
-      console.info('setWindowSystemBarPropertiesTest3 start');
-      listenerData.on = true;
-      listenerData.typeStr = 'systemBarTintChange';
-      ohosWindow.on('systemBarTintChange', (systemBarData) => {
-        console.info('setWindowSystemBarPropertiesTest3 systemBatData : ' + JSON.stringify(systemBarData));
-        if (listenerFlag === listenerStatus.pending) {
-          try {
-            expect(!!systemBarData).assertTrue();
-            expect(!!systemBarData.regionTint).assertTrue();
-          } catch (error) {
-            console.info(`ohosWindow.on catch error: ${JSON.stringify(error)}`)
-          }
-          let arrLength = systemBarData.regionTint.length;
-          // 单个导航栏或者系统状态信息
-          for (let i = 0; i < arrLength; i++) {
-            let tempData = systemBarData.regionTint[i];
-            if (tempData.type === ohosWindow.WindowType.TYPE_STATUS_BAR || tempData.type === ohosWindow.WindowType.TYPE_NAVIGATION_BAR) {
-              let backgroundIndex = cloneColorArr.indexOf(tempData.backgroundColor);
-              let contentColorIndex = cloneColorArr.indexOf(tempData.contentColor);
-              try {
-                expect(backgroundIndex === -1).assertTrue();
-                expect(contentColorIndex === -1).assertTrue();
-              } catch (error) {
-                console.info(`ohosWindow.on catch error: ${JSON.stringify(error)}`)
-              }
-              done();
-            }
-          }
-        }
-      })
       let tempWnd = windowStage.getMainWindowSync();
       expect(tempWnd != null).assertTrue();
       await tempWnd.showWindow().catch((err) => {
@@ -339,7 +215,6 @@ export default function windowRefactorInterfaceTest(context, windowStage, abilit
         done();
       });
       await sleep(1000);
-      listenerFlag = listenerStatus.pending;
       for(let i=0;i<commonKEYColorArr.length;i++){
         console.info('setWindowSystemBarPropertiesTest3 begin step:'+i);
         let tempColor = commonKEYColorArr[i];