!7587 【窗口子系统】优化windowstandard中用例

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

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

@@ -2307,5 +2307,92 @@ export default function windowCallbackTest(context, windowStage, abilityStorage)
         }
       })
     })
+    /**
+    * @tc.number     SUB_WINDOW_SETASPECTRATIO_JSAPI_001
+    * @tc.name       Test setAspectRatioTest1
+    * @tc.desc       Validate the scenario cancelled after setting the proportion of the content layout of the main window
+    */
+    it('setAspectRatioTest1', 0, async function (done) {
+      let caseName = 'setAspectRatioTest1';
+      let msgStr = 'jsunittest ' + caseName + ' ';
+      console.log(msgStr + 'begin');
+      let mainWnd = null;
+      await windowStage.getMainWindow().then((data) => {
+        mainWnd = data;
+        console.info(msgStr + 'Succeeded in obtaining the main window. Data: ' + JSON.stringify(data));
+      }).catch((err) => {
+        console.error(msgStr + 'Failed to obtain the main window. Cause: ' + JSON.stringify(err));
+      });
+      function setAspectRatio() {
+        return new Promise(function (resolve, reject) {
+          try {
+            let ratio = 1.0;
+            mainWnd.setAspectRatio(ratio, (err) => {
+              if (err.code) {
+                console.error(msgStr + 'Failed to set the aspect ratio of window. err.code:' + JSON.stringify(err.code));
+              }
+              expect(err.code == 0).assertTrue();
+              resolve(true)
+            });
+          } catch (exception) {
+            console.error(msgStr + 'Failed to set the aspect ratio of window. Cause : ' + JSON.stringify(exception));
+          }
+        })
+      }
+      function resetAspectRatio() {
+        return new Promise(function (resolve, reject) {
+          console.info(msgStr + 'Succeeded start');
+          try {
+            mainWnd.resetAspectRatio((err) => {
+              if (err.code) {
+                console.error(msgStr + 'Failed to reset the aspect ratio of window. err:' + JSON.stringify(err));
+                return;
+              }
+              console.info(msgStr + 'Succeeded in resetting aspect ratio of window.');
+              done();
+            });
+          } catch (exception) {
+            console.error(msgStr + 'Failed to reset the aspect ratio of window. Cause: ' + JSON.stringify(exception));
+          }
+        })
+      }
+
+      await setAspectRatio()
+      await resetAspectRatio()
+    })
+    /**
+    * @tc.number     SUB_WINDOW_SETASPECTRATIO_JSAPI_003
+    * @tc.name       Test setAspectRatioTest3
+    * @tc.desc       Validate the scenario where the content layout proportion of the main window is abnormal
+    */
+    it('setAspectRatioTest3', 0, async function (done) {
+      let caseName = 'setAspectRatioTest3';
+      let msgStr = 'jsunittest ' + caseName + ' ';
+      console.log(msgStr + 'begin');
+      let mainWnd = null;
+      await windowStage.getMainWindow().then((data) => {
+        mainWnd = data;
+        console.info(msgStr + 'Succeeded in obtaining the main window. Data: ' + JSON.stringify(data));
+      }).catch((err) => {
+        console.error(msgStr + 'Failed to obtain the main window. Cause: ' + JSON.stringify(err));
+      });
+      function setAspectRatio() {
+        return new Promise(function (resolve, reject) {
+          try {
+            let ratio = 0;
+            mainWnd.setAspectRatio(ratio, (err) => {
+              if (err.code) {
+                console.error(msgStr + 'Failed to set the aspect ratio of window. err.code:' + JSON.stringify(err.code));
+              }
+            });
+          } catch (exception) {
+            console.error(msgStr + 'Failed to set the aspect ratio of window. Cause : ' + JSON.stringify(exception));
+            expectedError(exception, caseName, 'mainWnd.setAspectRatio', done, 401);
+          }
+        })
+      }
+
+      await setAspectRatio()
+    })
   })
 }

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

@@ -94,7 +94,7 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
     function expectedError(error, caseName, apiName, done, code) {
       let msgStr = 'jsunittest ' + caseName + ' ' + apiName + ' failed, err: ';
       console.log(msgStr + JSON.stringify(error));
-      if (error.code === code) {
+      if (error.code == code) {
         expect(TRUE_FLAG).assertTrue();
       }
       done();
@@ -1698,5 +1698,34 @@ export default function windowPromiseTest(context, windowStage, abilityStorage)
       }
       done();
     })
+    /**
+    * @tc.number     SUB_WINDOW_SETASPECTRATIO_JSAPI_004
+    * @tc.name       Test setAspectRatioTest4
+    * @tc.desc       Validate the scenario where the content layout proportion of the main window is abnormal
+    */
+    it('setAspectRatioTest4', 0, async function (done) {
+      let caseName = 'setAspectRatioTest4';
+      let msgStr = 'jsunittest ' + caseName + ' ';
+      console.log(msgStr + 'begin');
+      let mainWnd = null;
+      await windowStage.getMainWindow().then((data) => {
+        mainWnd = data;
+        expect(!!mainWnd).assertTrue();
+        console.info(msgStr + 'Succeeded in obtaining the main window. Data: ' + JSON.stringify(data));
+      }).catch((err) => {
+        console.error(msgStr + 'Failed to obtain the main window. Cause: ' + JSON.stringify(err));
+      });
+      try {
+        let ratio = 0;
+        await mainWnd.setAspectRatio(ratio).then(() => {
+          console.info(msgStr + 'Succeeded in setting aspect ratio of window.');
+        }).catch((err) => {
+          console.error(msgStr + 'Failed to set the aspect ratio of window. err:' + JSON.stringify(err));
+        });
+      } catch (exception) {
+        console.error(msgStr + 'Failed to set the aspect ratio of window. exception: ' + JSON.stringify(exception));
+        expectedError(exception, caseName, 'mainWnd.setAspectRatio', done, 401);
+      }
+    })
   })
 }