!5158 3.2.6.3新增xts用例

Merge pull request !5158 from 华华小仙女/master

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

@@ -1418,12 +1418,12 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
       })
     })
     /**
-    * @tc.number     SUB_WINDOW_SETPREFERREDORIENTATION_JSAPI_001
-    * @tc.name       Test setPreferredOrientation
+    * @tc.number     SUB_WINDOW_SETPREFERREDORIENTATION_JSAPI_002
+    * @tc.name       Test setPreferredOrientationTest2
     * @tc.desc       Sets the display direction property of the window
     */
-    it('setPreferredOrientation', 0, async function (done) {
-      let caseName = 'setPreferredOrientation';
+    it('setPreferredOrientationTest2', 0, async function (done) {
+      let caseName = 'setPreferredOrientationTest2';
       let msgStr = 'jsunittest ' + caseName + ' ';
       console.log(msgStr + 'begin');
       let mainWin = await windowStage.getMainWindow().catch(err => {
@@ -1446,12 +1446,12 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
       done();
     })
     /**
-    * @tc.number     SUB_WINDOW_SETFORBIDSPLITMOVE_JSAPI_001
-    * @tc.name       Test setForbidSplitMove
+    * @tc.number     SUB_WINDOW_SETFORBIDSPLITMOVE_JSAPI_002
+    * @tc.name       Test setForbidSplitMoveTest2
     * @tc.desc       Sets whether Windows are forbidden to move in split screen mode
     */
-    it('setForbidSplitMove', 0, async function (done) {
-      let caseName = 'setForbidSplitMove';
+    it('setForbidSplitMoveTest2', 0, async function (done) {
+      let caseName = 'setForbidSplitMoveTest2';
       let msgStr = 'jsunittest ' + caseName + ' ';
       console.log(msgStr + 'begin');
       let mainWin = await windowStage.getMainWindow().catch(err => {
@@ -1477,10 +1477,10 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
       done();
     })
     /**
-* @tc.number     SUB_WINDOW_SNAPSHOT_JSAPI_002
-* @tc.name       Test snapshotTest2
-* @tc.desc       Scenario of screenshot of verification window
-*/
+    * @tc.number     SUB_WINDOW_SNAPSHOT_JSAPI_002
+    * @tc.name       Test snapshotTest2
+    * @tc.desc       Scenario of screenshot of verification window
+    */
     it('snapshotTest2', 0, async function (done) {
       let caseName = 'snapshotTest2';
       let msgStr = 'jsunittest ' + caseName + ' ';
@@ -1558,12 +1558,12 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
           controller.animationForShown = (context: ohosWindow.TransitionContext) => {
             let toWindow = context.toWindow
             animateTo({
-              duration: 1000, // 动画时长
-              tempo: 0.5, // 播放速率
-              curve: Curve.EaseInOut, // 动画曲线
-              delay: 0, // 动画延迟
-              iterations: 1, // 播放次数
-              playMode: PlayMode.Normal, // 动画模式
+              duration: 1000,
+              tempo: 0.5,
+              curve: Curve.EaseInOut,
+              delay: 0,
+              iterations: 1,
+              playMode: PlayMode.Normal,
             }, () => {
               var obj: ohosWindow.TranslateOptions;
               obj.x = 100.0;
@@ -1581,5 +1581,86 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
       });
 
     })
+    /**
+    * @tc.number     SUB_WINDOW_GETCUTOUTINFO_JSAPI_002
+    * @tc.name       Test getCutoutInfoTest2
+    * @tc.desc       Obtain information about unavailable screen areas such as the hole screen, fringe screen, and waterfall screen
+    */
+    it('getCutoutInfoTest2', 0, async function (done) {
+      let caseName = 'getCutoutInfoTest2';
+      let msgStr = 'jsunittest ' + caseName + ' ';
+      console.log(msgStr + 'begin context==' + JSON.stringify(context));
+      let dpClass = display.getDefaultDisplaySync();
+      expect(!!dpClass).assertTrue();
+      dpClass.getCutoutInfo((err, data) => {
+        if (err && err.code) {
+          unexpectedError(err, caseName, 'displayClass.getCutoutInfo', done);
+        }else{
+          console.info(msgStr+'Succeeded in getting cutoutInfo. Data: ' + JSON.stringify(data));
+          done();
+        }
+      })
+    })
+    /**
+    * @tc.number     SUB_WINDOW_SHOWWITHANIMATION_JSAPI_002
+    * @tc.name       Test showWithAnimationTest2
+    * @tc.desc       Displays the current window, playing an animation in the process
+    */
+    it('showWithAnimationTest2', 0, async function (done) {
+      let caseName = 'showWithAnimationTest2';
+      let msgStr = 'jsunittest ' + caseName + ' ';
+      console.log(msgStr + 'begin context==' + JSON.stringify(context));
+      let wndId = 'showWithAnimationTest2';
+      let baseType = ohosWindow.WindowType.TYPE_FLOAT;
+      ohosWindow.create(context, wndId, baseType, (err, data) => {
+        if (err && err.code) {
+          unexpectedError(err, caseName, 'ohosWindow.create ' + baseType, done);
+        } else {
+          let tempWnd=data;
+          console.log(msgStr + 'ohosWindow.create ' + baseType + ', tempWnd: ' + JSON.stringify(tempWnd));
+          expect(!!tempWnd).assertTrue();
+          tempWnd.showWithAnimation((error, animationData) => {
+            if (error && error.code) {
+              unexpectedError(error, caseName, 'Failed to show the window with animation', done);
+            }else {
+              console.info('Succeeded in showing the window with animation. Data: ' + JSON.stringify(animationData));
+              done();
+            }
+          })
+        }
+      })
+    })
+    /**
+    * @tc.number     SUB_WINDOW_HIDEWITHANIMATION_JSAPI_002
+    * @tc.name       Test hideWithAnimationTest2
+    * @tc.desc       Hide the current window and play an animation in the process
+    */
+    it('hideWithAnimationTest2', 0, async function (done) {
+      let caseName = 'hideWithAnimationTest2';
+      let msgStr = 'jsunittest ' + caseName + ' ';
+      console.log(msgStr + 'begin context==' + JSON.stringify(context));
+      let wndId = 'hideWithAnimationTest2';
+      let baseType = ohosWindow.WindowType.TYPE_FLOAT;
+      ohosWindow.create(context, wndId, baseType, (creare_err, tempWnd) => {
+        if (creare_err && creare_err.code) {
+          unexpectedError(creare_err, caseName, 'ohosWindow.create ' + baseType, done);
+        }
+        expect(!!tempWnd).assertTrue();
+        ohosWindow.find(wndId, (findErr, findWnd) => {
+          if (findErr && findErr.code) {
+            unexpectedError(findErr, caseName, 'Failed to hide the window with animation', done);
+          }else {
+            findWnd.hideWithAnimation((err, data) => {
+              if (err && err.code) {
+                unexpectedError(err, caseName, 'Failed to hide the window with animation', done);
+              }else {
+                console.info('Succeeded in hiding the window with animation. Data: ' + JSON.stringify(data));
+                done();
+              }
+            })
+          }
+        })
+      })
+    })
   })
 }

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

@@ -1353,11 +1353,11 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
     })
     /**
     * @tc.number     SUB_WINDOW_SETPREFERREDORIENTATION_JSAPI_001
-    * @tc.name       Test setPreferredOrientation
+    * @tc.name       Test setPreferredOrientationTest1
     * @tc.desc       Sets the display direction property of the window
     */
-    it('setPreferredOrientation', 0, async function (done) {
-      let caseName = 'setPreferredOrientation';
+    it('setPreferredOrientationTest1', 0, async function (done) {
+      let caseName = 'setPreferredOrientationTest1';
       let msgStr = 'jsunittest ' + caseName + ' ';
       console.log(msgStr + 'begin');
       let mainWin = await windowStage.getMainWindow().catch(err => {
@@ -1380,11 +1380,11 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
     })
     /**
     * @tc.number     SUB_WINDOW_SETFORBIDSPLITMOVE_JSAPI_001
-    * @tc.name       Test setForbidSplitMove
+    * @tc.name       Test setForbidSplitMoveTest1
     * @tc.desc       Sets whether Windows are forbidden to move in split screen mode
     */
-    it('setForbidSplitMove', 0, async function (done) {
-      let caseName = 'setForbidSplitMove';
+    it('setForbidSplitMoveTest1', 0, async function (done) {
+      let caseName = 'setForbidSplitMoveTest1';
       let msgStr = 'jsunittest ' + caseName + ' ';
       console.log(msgStr + 'begin');
       let mainWin = await windowStage.getMainWindow().catch(err => {
@@ -1464,12 +1464,12 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       controller.animationForShown = (context: ohosWindow.TransitionContext) => {
         let toWindow = context.toWindow
         animateTo({
-          duration: 1000, // 动画时长
-          tempo: 0.5, // 播放速率
-          curve: Curve.EaseInOut, // 动画曲线
-          delay: 0, // 动画延迟
-          iterations: 1, // 播放次数
-          playMode: PlayMode.Normal, // 动画模式
+          duration: 1000,
+          tempo: 0.5,
+          curve: Curve.EaseInOut,
+          delay: 0,
+          iterations: 1,
+          playMode: PlayMode.Normal,
         }, () => {
           var obj: ohosWindow.TranslateOptions;
           obj.x = 100.0;
@@ -1484,5 +1484,78 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       }
       done();
     })
+    /**
+    * @tc.number     SUB_WINDOW_GETCUTOUTINFO_JSAPI_001
+    * @tc.name       Test getCutoutInfoTest1
+    * @tc.desc       Obtain information about unavailable screen areas such as the hole screen, fringe screen, and waterfall screen
+    */
+    it('getCutoutInfoTest1', 0, async function (done) {
+      let caseName = 'getCutoutInfoTest1';
+      let msgStr = 'jsunittest ' + caseName + ' ';
+      console.log(msgStr + 'begin context==' + JSON.stringify(context));
+      let dpClass = display.getDefaultDisplaySync();
+      expect(!!dpClass).assertTrue();
+      dpClass.getCutoutInfo().then((data) => {
+        console.info('Succeeded in getting cutoutInfo. Data: ' + JSON.stringify(data));
+        done();
+      }).catch(err=>{
+        unexpectedError(err, caseName, 'displayClass.getCutoutInfo', done);
+      });
+    })
+    /**
+    * @tc.number     SUB_WINDOW_SHOWWITHANIMATION_JSAPI_001
+    * @tc.name       Test showWithAnimationTest1
+    * @tc.desc       Displays the current window, playing an animation in the process
+    */
+    it('showWithAnimationTest1', 0, async function (done) {
+      let caseName = 'showWithAnimationTest1';
+      let msgStr = 'jsunittest ' + caseName + ' ';
+      console.log(msgStr + 'begin context==' + JSON.stringify(context));
+      let wndId = 'showWithAnimationTest1';
+      let baseType = ohosWindow.WindowType.TYPE_FLOAT;
+      let tempWnd = await ohosWindow.create(context,wndId, baseType).catch((err) => {
+        unexpectedError(err, caseName, 'ohosWindow.create ' + baseType, done);
+      });
+      console.log(msgStr + 'ohosWindow.create ' + baseType + ', tempWnd: ' + JSON.stringify(tempWnd));
+      expect(!!tempWnd).assertTrue();
+      console.info('showWithAnimationTest1 ****' + Reflect.has(tempWnd,'showWithAnimation'))
+      await tempWnd.showWithAnimation().then((data)=> {
+        console.info('Succeeded in showing the window with animation. Data: ' + JSON.stringify(data));
+        done();
+      }).catch((err)=>{
+        unexpectedError(err, caseName, 'Failed to show the window with animation', done);
+      })
+    })
+    /**
+    * @tc.number     SUB_WINDOW_HIDEWITHANIMATION_JSAPI_001
+    * @tc.name       Test hideWithAnimationTest1
+    * @tc.desc       Hide the current window and play an animation in the process
+    */
+    it('hideWithAnimationTest1', 0, async function (done) {
+      let caseName = 'hideWithAnimationTest1';
+      let msgStr = 'jsunittest ' + caseName + ' ';
+      console.log(msgStr + 'begin context==' + JSON.stringify(context));
+      let wndId = 'hideWithAnimationTest1';
+      let baseType = ohosWindow.WindowType.TYPE_FLOAT;
+      let tempWnd = await ohosWindow.create(context,wndId, baseType).catch((err) => {
+        unexpectedError(err, caseName, 'ohosWindow.create ' + baseType, done);
+      });
+      console.log(msgStr + 'ohosWindow.create ' + baseType + ', tempWnd: ' + JSON.stringify(tempWnd));
+      expect(!!tempWnd).assertTrue();
+      let findWnd = await ohosWindow.find(wndId).catch((err) => {
+        expectedError(err, caseName, 'ohosWindow.find', done);
+      });
+      console.log(msgStr + 'find findWnd: ' + JSON.stringify(findWnd));
+      expect(!!findWnd).assertTrue();
+      console.info('hideWithAnimationTest1 ****' + Reflect.has(findWnd,'hideWithAnimation'))
+      console.info('hideWithAnimationTest1 ****' + Reflect.has(findWnd,'destroy'))
+      let promise = findWnd.hideWithAnimation();
+      promise.then((data)=> {
+        console.info('Succeeded in hiding the window with animation. Data: ' + JSON.stringify(data));
+        done();
+      }).catch((err)=>{
+        console.error('Failed to hide the window with animation. Cause: ' + JSON.stringify(err));
+      })
+    })
   })
 }