From ed11371daa4d639ea48388391b6b8e1cd0086b55 Mon Sep 17 00:00:00 2001 From: chenxuihui Date: Sat, 28 Jan 2023 17:44:03 +0800 Subject: [PATCH] =?UTF-8?q?fixed=20b55e56f=20from=20https://gitee.com/chen?= =?UTF-8?q?xuihui/xts=5Facts/pulls/7298=20=E5=BA=94=E7=94=A8=E6=81=A2?= =?UTF-8?q?=E5=A4=8D=E6=8E=A5=E5=8F=A3=E5=8F=98=E6=9B=B4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenxuihui --- .../src/main/js/test/apprecovery_test.js | 135 +++++++----------- 1 file changed, 51 insertions(+), 84 deletions(-) diff --git a/hiviewdfx/apprecoverytest/src/main/js/test/apprecovery_test.js b/hiviewdfx/apprecoverytest/src/main/js/test/apprecovery_test.js index e09d30e86..487c16542 100755 --- a/hiviewdfx/apprecoverytest/src/main/js/test/apprecovery_test.js +++ b/hiviewdfx/apprecoverytest/src/main/js/test/apprecovery_test.js @@ -48,7 +48,7 @@ describe("ActsAppRecoveryTest", function () { /** * @tc.number: DFX_DFR_AppRecovery_Interface_0200 - * @tc.name: cppcrash故障发生时不重启应用 + * @tc.name: 当发生JS_CRASH时重启应用 * @tc.desc: appRecovery interface test. */ it("DFX_DFR_AppRecovery_Interface_0200", 0, function () { @@ -64,7 +64,7 @@ describe("ActsAppRecoveryTest", function () { /** * @tc.number: DFX_DFR_AppRecovery_Interface_0300 - * @tc.name: jscrash故障发生时不重启应用 + * @tc.name: APP_FREEZE故障发生时重启应用 * @tc.desc: appRecovery interface test. */ it("DFX_DFR_AppRecovery_Interface_0300", 0, function () { @@ -80,13 +80,13 @@ describe("ActsAppRecoveryTest", function () { /** * @tc.number: DFX_DFR_AppRecovery_Interface_0400 - * @tc.name: appfreeze故障发生时不重启应用 + * @tc.name: JS_CRASH或APP_FREEZE故障发生时重启应用 * @tc.desc: appRecovery interface test. */ it("DFX_DFR_AppRecovery_Interface_0400", 0, function () { console.info("-------------------------DFX_DFR_AppRecovery_Interface_0400 start-------------------------"); try{ - appRecovery.enableAppRecovery(4, 3, 1); + appRecovery.enableAppRecovery(3, 3, 1); }catch(error){ console.info("DFX_DFR_AppRecovery_Interface_0400 err = " + error); expect(false).assertTrue(); @@ -96,13 +96,13 @@ describe("ActsAppRecoveryTest", function () { /** * @tc.number: DFX_DFR_AppRecovery_Interface_0500 - * @tc.name: cppcrash故障或appfreeze故障发生时不重启应用 + * @tc.name: 任何情况下不重启应用 * @tc.desc: appRecovery interface test. */ it("DFX_DFR_AppRecovery_Interface_0500", 0, function () { console.info("-------------------------DFX_DFR_AppRecovery_Interface_0500 start-------------------------"); try{ - appRecovery.enableAppRecovery(5, 3, 1); + appRecovery.enableAppRecovery(4, 3, 1); }catch(error){ console.info("DFX_DFR_AppRecovery_Interface_0500 err = " + error); expect(false).assertTrue(); @@ -112,13 +112,13 @@ describe("ActsAppRecoveryTest", function () { /** * @tc.number: DFX_DFR_AppRecovery_Interface_0600 - * @tc.name: jscrash故障或appfreeze故障发生时不重启应用 + * @tc.name: 当error时保存数据 * @tc.desc: appRecovery interface test. */ it("DFX_DFR_AppRecovery_Interface_0600", 0, function () { console.info("-------------------------DFX_DFR_AppRecovery_Interface_0600 start-------------------------"); try{ - appRecovery.enableAppRecovery(6, 3, 1); + appRecovery.enableAppRecovery(0, 1, 1); }catch(error){ console.info("DFX_DFR_AppRecovery_Interface_0600 err = " + error); expect(false).assertTrue(); @@ -128,13 +128,13 @@ describe("ActsAppRecoveryTest", function () { /** * @tc.number: DFX_DFR_AppRecovery_Interface_0700 - * @tc.name: jscrash故障、cppcrash故障或appfreeze故障发生时都不重启应用 + * @tc.name: 当切换到后台时保存数据 * @tc.desc: appRecovery interface test. */ it("DFX_DFR_AppRecovery_Interface_0700", 0, function () { console.info("-------------------------DFX_DFR_AppRecovery_Interface_0700 start-------------------------"); try{ - appRecovery.enableAppRecovery(7, 3, 1); + appRecovery.enableAppRecovery(0, 2, 1); }catch(error){ console.info("DFX_DFR_AppRecovery_Interface_0700 err = " + error); expect(false).assertTrue(); @@ -144,13 +144,13 @@ describe("ActsAppRecoveryTest", function () { /** * @tc.number: DFX_DFR_AppRecovery_Interface_0800 - * @tc.name: 当error时保存数据 + * @tc.name: 以文件保存数据 * @tc.desc: appRecovery interface test. */ it("DFX_DFR_AppRecovery_Interface_0800", 0, function () { console.info("-------------------------DFX_DFR_AppRecovery_Interface_0800 start-------------------------"); try{ - appRecovery.enableAppRecovery(0, 1, 1); + appRecovery.enableAppRecovery(0, 3, 1); }catch(error){ console.info("DFX_DFR_AppRecovery_Interface_0800 err = " + error); expect(false).assertTrue(); @@ -160,13 +160,13 @@ describe("ActsAppRecoveryTest", function () { /** * @tc.number: DFX_DFR_AppRecovery_Interface_0900 - * @tc.name: 当切换到后台时保存数据 + * @tc.name: 以共享内存保存数据 * @tc.desc: appRecovery interface test. */ it("DFX_DFR_AppRecovery_Interface_0900", 0, function () { console.info("-------------------------DFX_DFR_AppRecovery_Interface_0900 start-------------------------"); try{ - appRecovery.enableAppRecovery(0, 2, 1); + appRecovery.enableAppRecovery(0, 3, 2); }catch(error){ console.info("DFX_DFR_AppRecovery_Interface_0900 err = " + error); expect(false).assertTrue(); @@ -176,13 +176,13 @@ describe("ActsAppRecoveryTest", function () { /** * @tc.number: DFX_DFR_AppRecovery_Interface_1000 - * @tc.name: 以文件保存数据 + * @tc.name: 调用restartApp接口 * @tc.desc: appRecovery interface test. */ it("DFX_DFR_AppRecovery_Interface_1000", 0, function () { console.info("-------------------------DFX_DFR_AppRecovery_Interface_1000 start-------------------------"); try{ - appRecovery.enableAppRecovery(0, 3, 1); + appRecovery.restartApp(); }catch(error){ console.info("DFX_DFR_AppRecovery_Interface_1000 err = " + error); expect(false).assertTrue(); @@ -192,13 +192,13 @@ describe("ActsAppRecoveryTest", function () { /** * @tc.number: DFX_DFR_AppRecovery_Interface_1100 - * @tc.name: 以共享内存保存数据 + * @tc.name: 调用saveAppState接口 * @tc.desc: appRecovery interface test. */ it("DFX_DFR_AppRecovery_Interface_1100", 0, function () { console.info("-------------------------DFX_DFR_AppRecovery_Interface_1100 start-------------------------"); try{ - appRecovery.enableAppRecovery(0, 3, 2); + appRecovery.saveAppState(); }catch(error){ console.info("DFX_DFR_AppRecovery_Interface_1100 err = " + error); expect(false).assertTrue(); @@ -208,13 +208,13 @@ describe("ActsAppRecoveryTest", function () { /** * @tc.number: DFX_DFR_AppRecovery_Interface_1200 - * @tc.name: 调用restartApp接口 + * @tc.name: enableAppRecovery接口不传参使用默认值 * @tc.desc: appRecovery interface test. */ it("DFX_DFR_AppRecovery_Interface_1200", 0, function () { console.info("-------------------------DFX_DFR_AppRecovery_Interface_1200 start-------------------------"); try{ - appRecovery.restartApp(); + appRecovery.enableAppRecovery(); }catch(error){ console.info("DFX_DFR_AppRecovery_Interface_1200 err = " + error); expect(false).assertTrue(); @@ -224,13 +224,13 @@ describe("ActsAppRecoveryTest", function () { /** * @tc.number: DFX_DFR_AppRecovery_Interface_1300 - * @tc.name: 调用saveAppState接口 + * @tc.name: enableAppRecovery接口传1个参数 * @tc.desc: appRecovery interface test. */ it("DFX_DFR_AppRecovery_Interface_1300", 0, function () { console.info("-------------------------DFX_DFR_AppRecovery_Interface_1300 start-------------------------"); try{ - appRecovery.saveAppState(); + appRecovery.enableAppRecovery(0); }catch(error){ console.info("DFX_DFR_AppRecovery_Interface_1300 err = " + error); expect(false).assertTrue(); @@ -240,13 +240,13 @@ describe("ActsAppRecoveryTest", function () { /** * @tc.number: DFX_DFR_AppRecovery_Interface_1400 - * @tc.name: enableAppRecovery接口不传参使用默认值 + * @tc.name: enableAppRecovery接口传2个参数 * @tc.desc: appRecovery interface test. */ it("DFX_DFR_AppRecovery_Interface_1400", 0, function () { console.info("-------------------------DFX_DFR_AppRecovery_Interface_1400 start-------------------------"); try{ - appRecovery.enableAppRecovery(); + appRecovery.enableAppRecovery(0, 3); }catch(error){ console.info("DFX_DFR_AppRecovery_Interface_1400 err = " + error); expect(false).assertTrue(); @@ -256,13 +256,13 @@ describe("ActsAppRecoveryTest", function () { /** * @tc.number: DFX_DFR_AppRecovery_Interface_1500 - * @tc.name: enableAppRecovery接口传1个参数 + * @tc.name: enableAppRecovery接口传3个参数 * @tc.desc: appRecovery interface test. */ it("DFX_DFR_AppRecovery_Interface_1500", 0, function () { console.info("-------------------------DFX_DFR_AppRecovery_Interface_1500 start-------------------------"); try{ - appRecovery.enableAppRecovery(0); + appRecovery.enableAppRecovery(0, 3, 1); }catch(error){ console.info("DFX_DFR_AppRecovery_Interface_1500 err = " + error); expect(false).assertTrue(); @@ -272,13 +272,13 @@ describe("ActsAppRecoveryTest", function () { /** * @tc.number: DFX_DFR_AppRecovery_Interface_1600 - * @tc.name: enableAppRecovery接口传2个参数 + * @tc.name: enableAppRecovery接口关键字传参 * @tc.desc: appRecovery interface test. */ it("DFX_DFR_AppRecovery_Interface_1600", 0, function () { console.info("-------------------------DFX_DFR_AppRecovery_Interface_1600 start-------------------------"); try{ - appRecovery.enableAppRecovery(0, 3); + appRecovery.enableAppRecovery(appRecovery.RestartFlag.ALWAYS_RESTART); }catch(error){ console.info("DFX_DFR_AppRecovery_Interface_1600 err = " + error); expect(false).assertTrue(); @@ -288,13 +288,14 @@ describe("ActsAppRecoveryTest", function () { /** * @tc.number: DFX_DFR_AppRecovery_Interface_1700 - * @tc.name: enableAppRecovery接口传3个参数 + * @tc.name: enableAppRecovery接口关键字传多个参数 * @tc.desc: appRecovery interface test. */ it("DFX_DFR_AppRecovery_Interface_1700", 0, function () { console.info("-------------------------DFX_DFR_AppRecovery_Interface_1700 start-------------------------"); try{ - appRecovery.enableAppRecovery(0, 3, 1); + appRecovery.enableAppRecovery(appRecovery.RestartFlag.ALWAYS_RESTART, + appRecovery.SaveOccasionFlag.SAVE_WHEN_ERROR, appRecovery.SaveModeFlag.SAVE_WITH_FILE); }catch(error){ console.info("DFX_DFR_AppRecovery_Interface_1700 err = " + error); expect(false).assertTrue(); @@ -304,13 +305,16 @@ describe("ActsAppRecoveryTest", function () { /** * @tc.number: DFX_DFR_AppRecovery_Interface_1800 - * @tc.name: enableAppRecovery接口关键字传参 + * @tc.name: enableAppRecovery接口关键字传多个组合参数 * @tc.desc: appRecovery interface test. */ it("DFX_DFR_AppRecovery_Interface_1800", 0, function () { console.info("-------------------------DFX_DFR_AppRecovery_Interface_1800 start-------------------------"); try{ - appRecovery.enableAppRecovery(appRecovery.RestartFlag.ALWAYS_RESTART); + appRecovery.enableAppRecovery( + appRecovery.RestartFlag.ALWAYS_RESTART | appRecovery.RestartFlag.RESTART_WHEN_JS_CRASH | appRecovery.RestartFlag.RESTART_WHEN_APP_FREEZE, + appRecovery.SaveOccasionFlag.SAVE_WHEN_ERROR | appRecovery.SaveOccasionFlag.SAVE_WHEN_BACKGROUND, + appRecovery.SaveModeFlag.SAVE_WITH_FILE); }catch(error){ console.info("DFX_DFR_AppRecovery_Interface_1800 err = " + error); expect(false).assertTrue(); @@ -320,47 +324,11 @@ describe("ActsAppRecoveryTest", function () { /** * @tc.number: DFX_DFR_AppRecovery_Interface_1900 - * @tc.name: enableAppRecovery接口关键字传多个参数 + * @tc.name: onSaveState接口测试 * @tc.desc: appRecovery interface test. */ it("DFX_DFR_AppRecovery_Interface_1900", 0, function () { console.info("-------------------------DFX_DFR_AppRecovery_Interface_1900 start-------------------------"); - try{ - appRecovery.enableAppRecovery(appRecovery.RestartFlag.ALWAYS_RESTART, - appRecovery.SaveOccasionFlag.SAVE_WHEN_ERROR, appRecovery.SaveModeFlag.SAVE_WITH_FILE); - }catch(error){ - console.info("DFX_DFR_AppRecovery_Interface_1900 err = " + error); - expect(false).assertTrue(); - } - console.info("DFX_DFR_AppRecovery_Interface_1900 end"); - }) - - /** - * @tc.number: DFX_DFR_AppRecovery_Interface_2000 - * @tc.name: enableAppRecovery接口关键字传多个组合参数 - * @tc.desc: appRecovery interface test. - */ - it("DFX_DFR_AppRecovery_Interface_2000", 0, function () { - console.info("-------------------------DFX_DFR_AppRecovery_Interface_2000 start-------------------------"); - try{ - appRecovery.enableAppRecovery( - appRecovery.RestartFlag.ALWAYS_RESTART | appRecovery.RestartFlag.CPP_CRASH_NO_RESTART | appRecovery.RestartFlag.JS_CRASH_NO_RESTART, - appRecovery.SaveOccasionFlag.SAVE_WHEN_ERROR | appRecovery.SaveOccasionFlag.SAVE_WHEN_BACKGROUND, - appRecovery.SaveModeFlag.SAVE_WITH_FILE); - }catch(error){ - console.info("DFX_DFR_AppRecovery_Interface_2000 err = " + error); - expect(false).assertTrue(); - } - console.info("DFX_DFR_AppRecovery_Interface_2000 end"); - }) - - /** - * @tc.number: DFX_DFR_AppRecovery_Interface_2100 - * @tc.name: onSaveState接口测试 - * @tc.desc: appRecovery interface test. - */ - it("DFX_DFR_AppRecovery_Interface_2100", 0, function () { - console.info("-------------------------DFX_DFR_AppRecovery_Interface_2100 start-------------------------"); try{ let ability_test = new AbilityTest(); let StateType = AbilityConstant.StateType.APP_RECOVERY; @@ -374,43 +342,42 @@ describe("ActsAppRecoveryTest", function () { } expect(ret).assertEqual(AbilityConstant.OnSaveResult.ALL_AGREE); }catch(error){ - console.info("DFX_DFR_AppRecovery_Interface_2100 err = " + error); + console.info("DFX_DFR_AppRecovery_Interface_1900 err = " + error); expect(false).assertTrue(); } - console.info("DFX_DFR_AppRecovery_Interface_2100 end"); + console.info("DFX_DFR_AppRecovery_Interface_1900 end"); }) /** - * @tc.number: DFX_DFR_AppRecovery_Interface_2200 + * @tc.number: DFX_DFR_AppRecovery_Interface_2000 * @tc.name: 检验appRecovery属性返回值是否符合预期 * @tc.desc: appRecovery interface test. */ - it("DFX_DFR_AppRecovery_Interface_2200", 0, function () { - console.info("-------------------------DFX_DFR_AppRecovery_Interface_2200 start-------------------------"); + it("DFX_DFR_AppRecovery_Interface_2000", 0, function () { + console.info("-------------------------DFX_DFR_AppRecovery_Interface_2000 start-------------------------"); try{ expect(appRecovery.RestartFlag.ALWAYS_RESTART).assertEqual(0); - expect(appRecovery.RestartFlag.CPP_CRASH_NO_RESTART).assertEqual(0x0001); - expect(appRecovery.RestartFlag.JS_CRASH_NO_RESTART).assertEqual(0x0002); - expect(appRecovery.RestartFlag.APP_FREEZE_NO_RESTART).assertEqual(0x0004); + expect(appRecovery.RestartFlag.RESTART_WHEN_JS_CRASH).assertEqual(0x0001); + expect(appRecovery.RestartFlag.RESTART_WHEN_APP_FREEZE).assertEqual(0x0002); expect(appRecovery.RestartFlag.NO_RESTART).assertEqual(0xFFFF); expect(appRecovery.SaveOccasionFlag.SAVE_WHEN_ERROR).assertEqual(0x0001); expect(appRecovery.SaveOccasionFlag.SAVE_WHEN_BACKGROUND).assertEqual(0x0002); expect(appRecovery.SaveModeFlag.SAVE_WITH_FILE).assertEqual(0x0001); expect(appRecovery.SaveModeFlag.SAVE_WITH_SHARED_MEMORY).assertEqual(0x0002); }catch(error){ - console.info("DFX_DFR_AppRecovery_Interface_2200 err = " + error); + console.info("DFX_DFR_AppRecovery_Interface_2000 err = " + error); expect(false).assertTrue(); } - console.info("DFX_DFR_AppRecovery_Interface_2200 end"); + console.info("DFX_DFR_AppRecovery_Interface_2000 end"); }) /** - * @tc.number: DFX_DFR_AppRecovery_Interface_2300 + * @tc.number: DFX_DFR_AppRecovery_Interface_2100 * @tc.name: 检验AbilityConstant属性返回值是否符合预期 * @tc.desc: appRecovery interface test. */ - it("DFX_DFR_AppRecovery_Interface_2300", 0, function () { - console.info("-------------------------DFX_DFR_AppRecovery_Interface_2300 start-------------------------"); + it("DFX_DFR_AppRecovery_Interface_2100", 0, function () { + console.info("-------------------------DFX_DFR_AppRecovery_Interface_2100 start-------------------------"); try{ expect(AbilityConstant.LaunchReason.APP_RECOVERY).assertEqual(4); expect(AbilityConstant.OnSaveResult.ALL_AGREE).assertEqual(0); @@ -419,10 +386,10 @@ describe("ActsAppRecoveryTest", function () { expect(AbilityConstant.OnSaveResult.RECOVERY_AGREE).assertEqual(3); expect(AbilityConstant.OnSaveResult.RECOVERY_REJECT).assertEqual(4); }catch(error){ - console.info("DFX_DFR_AppRecovery_Interface_2300 err = " + error); + console.info("DFX_DFR_AppRecovery_Interface_2100 err = " + error); expect(false).assertTrue(); } - console.info("DFX_DFR_AppRecovery_Interface_2300 end"); + console.info("DFX_DFR_AppRecovery_Interface_2100 end"); }) }) -- GitLab