From 1294282dfc401bb93dd4adec324d2f2bb72bb754 Mon Sep 17 00:00:00 2001 From: lanhaoyu Date: Thu, 7 Aug 2025 10:52:04 +0800 Subject: [PATCH] second_backup_hap_revert Signed-off-by: lanhaoyu --- .../bms_bundle_installer_test/BUILD.gn | 2 + .../bms_multiple_installer_test.cpp | 53 +++++++++++++ .../unittest/ohos_test/ohos_test.xml | 4 + .../unittest/test_bundle/BUILD.gn | 2 + .../fifteenth_right/AppScope/app.json5 | 28 ------- .../resources/base/element/string.json | 8 -- .../resources/base/media/app_background.png | Bin 91942 -> 0 bytes .../resources/base/media/app_foreground.png | Bin 15325 -> 0 bytes .../base/media/app_layered_image.json | 7 -- .../test_bundle/fifteenth_right/BUILD.gn | 30 +++---- .../fifteenth_right/build-profile.json5 | 44 ----------- .../fifteenth_right/entry/build-profile.json5 | 43 ----------- .../main/ets/entryability/EntryAbility.ets | 59 -------------- .../entry/src/main/ets/pages/Index.ets | 38 --------- .../entry/src/main/module.json5 | 55 ------------- .../main/resources/base/element/color.json | 8 -- .../main/resources/base/element/float.json | 8 -- .../main/resources/base/element/string.json | 24 ------ .../main/resources/base/media/background.png | Bin 91942 -> 0 bytes .../main/resources/base/media/foreground.png | Bin 8805 -> 0 bytes .../resources/base/media/layered_image.json | 7 -- .../main/resources/base/media/startIcon.png | Bin 20093 -> 0 bytes .../resources/base/profile/backup_config.json | 3 - .../resources/base/profile/main_pages.json | 5 -- .../main/resources/dark/element/color.json | 8 -- .../hvigor/hvigor-config.json5 | 37 --------- .../fifteenth_right/oh-package.json5 | 24 ------ .../fifteenth_right/src/main/config.json | 73 ++++++++++++++++++ .../src/main/js/default/app.js} | 46 ++++++----- .../src/main/js/default/i18n/en-US.json | 6 ++ .../src/main/js/default/i18n/zh-CN.json | 6 ++ .../src/main/js/default/pages/index/index.css | 24 ++++++ .../src/main/js/default/pages/index/index.hml | 20 +++++ .../src/main/js/default/pages/index/index.js} | 14 ++-- .../js/resources/base/element/string.json | 12 +++ .../src/main/js/resources/base/media/icon.png | Bin 0 -> 6320 bytes .../js/resources/base/media/icon_entry.png | Bin 0 -> 6320 bytes .../fifth_right/AppScope/app.json5 | 28 ------- .../resources/base/element/string.json | 8 -- .../resources/base/media/app_background.png | Bin 91942 -> 0 bytes .../resources/base/media/app_foreground.png | Bin 15325 -> 0 bytes .../base/media/app_layered_image.json | 7 -- .../unittest/test_bundle/fifth_right/BUILD.gn | 30 +++---- .../fifth_right/build-profile.json5 | 44 ----------- .../fifth_right/entry/build-profile.json5 | 43 ----------- .../main/ets/entryability/EntryAbility.ets | 59 -------------- .../entry/src/main/ets/pages/Index.ets | 38 --------- .../fifth_right/entry/src/main/module.json5 | 55 ------------- .../main/resources/base/element/color.json | 8 -- .../main/resources/base/element/float.json | 8 -- .../main/resources/base/element/string.json | 24 ------ .../main/resources/base/media/background.png | Bin 91942 -> 0 bytes .../main/resources/base/media/foreground.png | Bin 8805 -> 0 bytes .../resources/base/media/layered_image.json | 7 -- .../main/resources/base/media/startIcon.png | Bin 20093 -> 0 bytes .../resources/base/profile/backup_config.json | 3 - .../resources/base/profile/main_pages.json | 5 -- .../main/resources/dark/element/color.json | 8 -- .../fifth_right/hvigor/hvigor-config.json5 | 37 --------- .../test_bundle/fifth_right/oh-package.json5 | 24 ------ .../fifth_right/src/main/config.json | 73 ++++++++++++++++++ .../src/main/js/default/app.js} | 46 ++++++----- .../src/main/js/default/i18n/en-US.json | 6 ++ .../src/main/js/default/i18n/zh-CN.json | 6 ++ .../src/main/js/default/pages/index/index.css | 24 ++++++ .../src/main/js/default/pages/index/index.hml | 20 +++++ .../main/js/default/pages/index/index.js} | 14 ++-- .../js/resources/base/element/string.json | 12 +++ .../src/main/js/resources/base/media/icon.png | Bin 0 -> 6320 bytes .../first_diff_minCompCode/AppScope/app.json5 | 28 ------- .../resources/base/element/string.json | 8 -- .../resources/base/media/app_background.png | Bin 91942 -> 0 bytes .../resources/base/media/app_foreground.png | Bin 15325 -> 0 bytes .../base/media/app_layered_image.json | 7 -- .../first_diff_minCompCode/BUILD.gn | 30 +++---- .../build-profile.json5 | 44 ----------- .../feature/build-profile.json5 | 43 ----------- .../feature/hvigorfile.ts | 21 ----- .../feature/obfuscation-rules.txt | 36 --------- .../feature/oh-package.json5 | 24 ------ .../main/ets/entryability/EntryAbility.ets | 59 -------------- .../feature/src/main/ets/pages/Index.ets | 38 --------- .../feature/src/main/module.json5 | 55 ------------- .../main/resources/base/element/color.json | 8 -- .../main/resources/base/element/float.json | 8 -- .../main/resources/base/element/string.json | 24 ------ .../main/resources/base/media/background.png | Bin 91942 -> 0 bytes .../main/resources/base/media/foreground.png | Bin 8805 -> 0 bytes .../resources/base/media/layered_image.json | 7 -- .../main/resources/base/media/startIcon.png | Bin 20093 -> 0 bytes .../resources/base/profile/backup_config.json | 3 - .../resources/base/profile/main_pages.json | 5 -- .../main/resources/dark/element/color.json | 8 -- .../hvigor/hvigor-config.json5 | 37 --------- .../first_diff_minCompCode/hvigorfile.ts | 21 ----- .../first_diff_minCompCode/oh-package.json5 | 24 ------ .../src/main/config.json | 68 ++++++++++++++++ .../src/main/js/default/app.js} | 46 ++++++----- .../src/main/js/default/i18n/en-US.json | 6 ++ .../src/main/js/default/i18n/zh-CN.json | 6 ++ .../src/main/js/default/pages/index/index.css | 24 ++++++ .../src/main/js/default/pages/index/index.hml | 20 +++++ .../src/main/js/default/pages/index/index.js} | 14 ++-- .../js/resources/base/element/string.json | 16 ++++ .../src/main/js/resources/base/media/icon.png | Bin 0 -> 6320 bytes .../js/resources/base/media/icon_entry.png | Bin 0 -> 6320 bytes .../first_right/AppScope/app.json5 | 28 ------- .../resources/base/element/string.json | 8 -- .../resources/base/media/app_background.png | Bin 91942 -> 0 bytes .../resources/base/media/app_foreground.png | Bin 15325 -> 0 bytes .../base/media/app_layered_image.json | 7 -- .../unittest/test_bundle/first_right/BUILD.gn | 30 +++---- .../first_right/build-profile.json5 | 44 ----------- .../first_right/entry/build-profile.json5 | 43 ----------- .../first_right/entry/hvigorfile.ts | 21 ----- .../first_right/entry/obfuscation-rules.txt | 36 --------- .../main/ets/entryability/EntryAbility.ets | 59 -------------- .../entry/src/main/ets/pages/Index.ets | 38 --------- .../first_right/entry/src/main/module.json5 | 55 ------------- .../main/resources/base/element/color.json | 8 -- .../main/resources/base/element/float.json | 8 -- .../main/resources/base/element/string.json | 24 ------ .../main/resources/base/media/background.png | Bin 91942 -> 0 bytes .../main/resources/base/media/foreground.png | Bin 8805 -> 0 bytes .../resources/base/media/layered_image.json | 7 -- .../main/resources/base/media/startIcon.png | Bin 20093 -> 0 bytes .../resources/base/profile/backup_config.json | 3 - .../resources/base/profile/main_pages.json | 5 -- .../main/resources/dark/element/color.json | 8 -- .../first_right/hvigor/hvigor-config.json5 | 37 --------- .../test_bundle/first_right/hvigorfile.ts | 21 ----- .../test_bundle/first_right/oh-package.json5 | 24 ------ .../first_right/src/main/config.json | 73 ++++++++++++++++++ .../src/main/js/default/app.js} | 46 ++++++----- .../src/main/js/default/i18n/en-US.json | 6 ++ .../src/main/js/default/i18n/zh-CN.json | 6 ++ .../src/main/js/default/pages/index/index.css | 24 ++++++ .../src/main/js/default/pages/index/index.hml | 20 +++++ .../src/main/js/default/pages/index/index.js} | 14 ++-- .../js/resources/base/element/string.json | 12 +++ .../src/main/js/resources/base/media/icon.png | Bin 0 -> 6320 bytes .../first_right_compCode/AppScope/app.json5 | 29 ------- .../resources/base/element/string.json | 8 -- .../resources/base/media/app_background.png | Bin 91942 -> 0 bytes .../resources/base/media/app_foreground.png | Bin 15325 -> 0 bytes .../base/media/app_layered_image.json | 7 -- .../test_bundle/first_right_compCode/BUILD.gn | 30 +++---- .../first_right_compCode/build-profile.json5 | 44 ----------- .../entry/build-profile.json5 | 43 ----------- .../first_right_compCode/entry/hvigorfile.ts | 21 ----- .../entry/obfuscation-rules.txt | 36 --------- .../main/ets/entryability/EntryAbility.ets | 59 -------------- .../entry/src/main/ets/pages/Index.ets | 38 --------- .../entry/src/main/module.json5 | 55 ------------- .../main/resources/base/element/color.json | 8 -- .../main/resources/base/element/float.json | 8 -- .../main/resources/base/element/string.json | 24 ------ .../main/resources/base/media/background.png | Bin 91942 -> 0 bytes .../main/resources/base/media/foreground.png | Bin 8805 -> 0 bytes .../resources/base/media/layered_image.json | 7 -- .../main/resources/base/media/startIcon.png | Bin 20093 -> 0 bytes .../resources/base/profile/backup_config.json | 3 - .../resources/base/profile/main_pages.json | 5 -- .../main/resources/dark/element/color.json | 8 -- .../hvigor/hvigor-config.json5 | 37 --------- .../first_right_compCode/hvigorfile.ts | 21 ----- .../first_right_compCode/oh-package.json5 | 24 ------ .../first_right_compCode/src/main/config.json | 73 ++++++++++++++++++ .../src/main/js/default/app.js | 22 ++++++ .../src/main/js/default/i18n/en-US.json | 6 ++ .../src/main/js/default/i18n/zh-CN.json | 6 ++ .../src/main/js/default/pages/index/index.css | 24 ++++++ .../src/main/js/default/pages/index/index.hml | 20 +++++ .../src/main/js/default/pages/index/index.js | 25 ++++++ .../js/resources/base/element/string.json | 12 +++ .../src/main/js/resources/base/media/icon.png | Bin 0 -> 6320 bytes .../BUILD.gn} | 45 ++++++----- .../src/main/config.json | 73 ++++++++++++++++++ .../src/main/js/default/app.js | 22 ++++++ .../src/main/js/default/i18n/en-US.json | 6 ++ .../src/main/js/default/i18n/zh-CN.json | 6 ++ .../src/main/js/default/pages/index/index.css | 24 ++++++ .../src/main/js/default/pages/index/index.hml | 20 +++++ .../src/main/js/default/pages/index/index.js | 25 ++++++ .../js/resources/base/element/string.json | 12 +++ .../src/main/js/resources/base/media/icon.png | Bin 0 -> 6320 bytes .../AppScope/app.json5 | 28 ------- .../resources/base/element/string.json | 8 -- .../resources/base/media/app_background.png | Bin 91942 -> 0 bytes .../resources/base/media/app_foreground.png | Bin 15325 -> 0 bytes .../base/media/app_layered_image.json | 7 -- .../first_right_with_diff_moduleType/BUILD.gn | 30 +++---- .../build-profile.json5 | 44 ----------- .../entry/build-profile.json5 | 43 ----------- .../entry/hvigorfile.ts | 21 ----- .../entry/obfuscation-rules.txt | 36 --------- .../entry/oh-package.json5 | 24 ------ .../main/ets/entryability/EntryAbility.ets | 59 -------------- .../entry/src/main/ets/pages/Index.ets | 38 --------- .../entry/src/main/module.json5 | 55 ------------- .../main/resources/base/element/color.json | 8 -- .../main/resources/base/element/float.json | 8 -- .../main/resources/base/element/string.json | 24 ------ .../main/resources/base/media/background.png | Bin 91942 -> 0 bytes .../main/resources/base/media/foreground.png | Bin 8805 -> 0 bytes .../resources/base/media/layered_image.json | 7 -- .../main/resources/base/media/startIcon.png | Bin 20093 -> 0 bytes .../resources/base/profile/backup_config.json | 3 - .../resources/base/profile/main_pages.json | 5 -- .../main/resources/dark/element/color.json | 8 -- .../hvigor/hvigor-config.json5 | 37 --------- .../hvigorfile.ts | 21 ----- .../oh-package.json5 | 24 ------ .../src/main/config.json | 73 ++++++++++++++++++ .../src/main/js/default/app.js | 22 ++++++ .../src/main/js/default/i18n/en-US.json | 6 ++ .../src/main/js/default/i18n/zh-CN.json | 6 ++ .../src/main/js/default/pages/index/index.css | 24 ++++++ .../src/main/js/default/pages/index/index.hml | 20 +++++ .../src/main/js/default/pages/index/index.js | 25 ++++++ .../js/resources/base/element/string.json | 12 +++ .../src/main/js/resources/base/media/icon.png | Bin 0 -> 6320 bytes .../fourteenth_right/AppScope/app.json5 | 28 ------- .../resources/base/element/string.json | 8 -- .../resources/base/media/app_background.png | Bin 91942 -> 0 bytes .../resources/base/media/app_foreground.png | Bin 15325 -> 0 bytes .../base/media/app_layered_image.json | 7 -- .../test_bundle/fourteenth_right/BUILD.gn | 30 +++---- .../fourteenth_right/build-profile.json5 | 44 ----------- .../entry/build-profile.json5 | 43 ----------- .../fourteenth_right/entry/hvigorfile.ts | 21 ----- .../entry/obfuscation-rules.txt | 36 --------- .../fourteenth_right/entry/oh-package.json5 | 24 ------ .../main/ets/entryability/EntryAbility.ets | 59 -------------- .../entry/src/main/ets/pages/Index.ets | 38 --------- .../entry/src/main/module.json5 | 55 ------------- .../main/resources/base/element/color.json | 8 -- .../main/resources/base/element/float.json | 8 -- .../main/resources/base/element/string.json | 24 ------ .../main/resources/base/media/background.png | Bin 91942 -> 0 bytes .../main/resources/base/media/foreground.png | Bin 8805 -> 0 bytes .../resources/base/media/layered_image.json | 7 -- .../main/resources/base/media/startIcon.png | Bin 20093 -> 0 bytes .../resources/base/profile/backup_config.json | 3 - .../resources/base/profile/main_pages.json | 5 -- .../main/resources/dark/element/color.json | 8 -- .../hvigor/hvigor-config.json5 | 37 --------- .../fourteenth_right/hvigorfile.ts | 21 ----- .../fourteenth_right/oh-package.json5 | 24 ------ .../fourteenth_right/src/main/config.json | 73 ++++++++++++++++++ .../src/main/js/default/app.js | 22 ++++++ .../src/main/js/default/i18n/en-US.json | 6 ++ .../src/main/js/default/i18n/zh-CN.json | 6 ++ .../src/main/js/default/pages/index/index.css | 24 ++++++ .../src/main/js/default/pages/index/index.hml | 20 +++++ .../src/main/js/default/pages/index/index.js | 25 ++++++ .../js/resources/base/element/string.json | 16 ++++ .../src/main/js/resources/base/media/icon.png | Bin 0 -> 6320 bytes .../js/resources/base/media/icon_entry.png | Bin 0 -> 6320 bytes .../fourth_right/AppScope/app.json5 | 28 ------- .../resources/base/element/string.json | 8 -- .../resources/base/media/app_background.png | Bin 91942 -> 0 bytes .../resources/base/media/app_foreground.png | Bin 15325 -> 0 bytes .../base/media/app_layered_image.json | 7 -- .../test_bundle/fourth_right/BUILD.gn | 30 +++---- .../fourth_right/build-profile.json5 | 44 ----------- .../fourth_right/feature/build-profile.json5 | 43 ----------- .../fourth_right/feature/hvigorfile.ts | 21 ----- .../feature/obfuscation-rules.txt | 36 --------- .../fourth_right/feature/oh-package.json5 | 24 ------ .../main/ets/entryability/EntryAbility.ets | 59 -------------- .../feature/src/main/ets/pages/Index.ets | 38 --------- .../feature/src/main/module.json5 | 55 ------------- .../main/resources/base/element/color.json | 8 -- .../main/resources/base/element/float.json | 8 -- .../main/resources/base/element/string.json | 24 ------ .../main/resources/base/media/background.png | Bin 91942 -> 0 bytes .../main/resources/base/media/foreground.png | Bin 8805 -> 0 bytes .../resources/base/media/layered_image.json | 7 -- .../main/resources/base/media/startIcon.png | Bin 20093 -> 0 bytes .../resources/base/profile/backup_config.json | 3 - .../resources/base/profile/main_pages.json | 5 -- .../main/resources/dark/element/color.json | 8 -- .../fourth_right/hvigor/hvigor-config.json5 | 37 --------- .../test_bundle/fourth_right/hvigorfile.ts | 21 ----- .../test_bundle/fourth_right/oh-package.json5 | 24 ------ .../fourth_right/src/main/config.json | 68 ++++++++++++++++ .../fourth_right/src/main/js/default/app.js | 22 ++++++ .../src/main/js/default/i18n/en-US.json | 6 ++ .../src/main/js/default/i18n/zh-CN.json | 6 ++ .../src/main/js/default/pages/index/index.css | 24 ++++++ .../src/main/js/default/pages/index/index.hml | 20 +++++ .../src/main/js/default/pages/index/index.js | 25 ++++++ .../js/resources/base/element/string.json | 16 ++++ .../src/main/js/resources/base/media/icon.png | Bin 0 -> 6320 bytes .../js/resources/base/media/icon_entry.png | Bin 0 -> 6320 bytes .../ninth_right/AppScope/app.json5 | 28 ------- .../resources/base/element/string.json | 8 -- .../resources/base/media/app_background.png | Bin 91942 -> 0 bytes .../resources/base/media/app_foreground.png | Bin 15325 -> 0 bytes .../base/media/app_layered_image.json | 7 -- .../unittest/test_bundle/ninth_right/BUILD.gn | 30 +++---- .../ninth_right/build-profile.json5 | 44 ----------- .../ninth_right/feature/build-profile.json5 | 43 ----------- .../ninth_right/feature/hvigorfile.ts | 21 ----- .../ninth_right/feature/obfuscation-rules.txt | 36 --------- .../ninth_right/feature/oh-package.json5 | 24 ------ .../main/ets/entryability/EntryAbility.ets | 59 -------------- .../feature/src/main/ets/pages/Index.ets | 38 --------- .../ninth_right/feature/src/main/module.json5 | 55 ------------- .../main/resources/base/element/color.json | 8 -- .../main/resources/base/element/float.json | 8 -- .../main/resources/base/element/string.json | 24 ------ .../main/resources/base/media/background.png | Bin 91942 -> 0 bytes .../main/resources/base/media/foreground.png | Bin 8805 -> 0 bytes .../resources/base/media/layered_image.json | 7 -- .../main/resources/base/media/startIcon.png | Bin 20093 -> 0 bytes .../resources/base/profile/backup_config.json | 3 - .../resources/base/profile/main_pages.json | 5 -- .../main/resources/dark/element/color.json | 8 -- .../ninth_right/hvigor/hvigor-config.json5 | 37 --------- .../test_bundle/ninth_right/hvigorfile.ts | 21 ----- .../test_bundle/ninth_right/oh-package.json5 | 24 ------ .../ninth_right/src/main/config.json | 68 ++++++++++++++++ .../ninth_right/src/main/js/default/app.js | 22 ++++++ .../src/main/js/default/i18n/en-US.json | 6 ++ .../src/main/js/default/i18n/zh-CN.json | 6 ++ .../src/main/js/default/pages/index/index.css | 24 ++++++ .../src/main/js/default/pages/index/index.hml | 20 +++++ .../src/main/js/default/pages/index/index.js | 25 ++++++ .../js/resources/base/element/string.json | 16 ++++ .../src/main/js/resources/base/media/icon.png | Bin 0 -> 6320 bytes .../js/resources/base/media/icon_entry.png | Bin 0 -> 6320 bytes .../second_right/AppScope/app.json5 | 28 ------- .../resources/base/element/string.json | 8 -- .../resources/base/media/app_background.png | Bin 91942 -> 0 bytes .../resources/base/media/app_foreground.png | Bin 15325 -> 0 bytes .../base/media/app_layered_image.json | 7 -- .../test_bundle/second_right/BUILD.gn | 30 +++---- .../second_right/build-profile.json5 | 44 ----------- .../second_right/feature/build-profile.json5 | 43 ----------- .../second_right/feature/hvigorfile.ts | 21 ----- .../feature/obfuscation-rules.txt | 36 --------- .../second_right/feature/oh-package.json5 | 24 ------ .../main/ets/entryability/EntryAbility.ets | 59 -------------- .../feature/src/main/ets/pages/Index.ets | 38 --------- .../feature/src/main/module.json5 | 55 ------------- .../main/resources/base/element/color.json | 8 -- .../main/resources/base/element/float.json | 8 -- .../main/resources/base/element/string.json | 24 ------ .../main/resources/base/media/background.png | Bin 91942 -> 0 bytes .../main/resources/base/media/foreground.png | Bin 8805 -> 0 bytes .../resources/base/media/layered_image.json | 7 -- .../main/resources/base/media/startIcon.png | Bin 20093 -> 0 bytes .../resources/base/profile/backup_config.json | 3 - .../resources/base/profile/main_pages.json | 5 -- .../main/resources/dark/element/color.json | 8 -- .../second_right/hvigor/hvigor-config.json5 | 37 --------- .../test_bundle/second_right/hvigorfile.ts | 21 ----- .../test_bundle/second_right/oh-package.json5 | 24 ------ .../second_right/src/main/config.json | 68 ++++++++++++++++ .../second_right/src/main/js/default/app.js | 22 ++++++ .../src/main/js/default/i18n/en-US.json | 6 ++ .../src/main/js/default/i18n/zh-CN.json | 6 ++ .../src/main/js/default/pages/index/index.css | 24 ++++++ .../src/main/js/default/pages/index/index.hml | 20 +++++ .../src/main/js/default/pages/index/index.js | 25 ++++++ .../js/resources/base/element/string.json | 16 ++++ .../src/main/js/resources/base/media/icon.png | Bin 0 -> 6320 bytes .../js/resources/base/media/icon_entry.png | Bin 0 -> 6320 bytes .../BUILD.gn} | 45 ++++++----- .../src/main/config.json | 73 ++++++++++++++++++ .../src/main/js/default/app.js | 22 ++++++ .../src/main/js/default/i18n/en-US.json | 6 ++ .../src/main/js/default/i18n/zh-CN.json | 6 ++ .../src/main/js/default/pages/index/index.css | 24 ++++++ .../src/main/js/default/pages/index/index.hml | 20 +++++ .../src/main/js/default/pages/index/index.js | 25 ++++++ .../js/resources/base/element/string.json | 12 +++ .../src/main/js/resources/base/media/icon.png | Bin 0 -> 6320 bytes .../sixteenth_right/AppScope/app.json5 | 28 ------- .../resources/base/element/string.json | 8 -- .../resources/base/media/app_background.png | Bin 91942 -> 0 bytes .../resources/base/media/app_foreground.png | Bin 15325 -> 0 bytes .../base/media/app_layered_image.json | 7 -- .../test_bundle/sixteenth_right/BUILD.gn | 30 +++---- .../sixteenth_right/build-profile.json5 | 44 ----------- .../feature/build-profile.json5 | 43 ----------- .../sixteenth_right/feature/hvigorfile.ts | 21 ----- .../feature/obfuscation-rules.txt | 36 --------- .../sixteenth_right/feature/oh-package.json5 | 24 ------ .../main/ets/entryability/EntryAbility.ets | 59 -------------- .../feature/src/main/ets/pages/Index.ets | 38 --------- .../feature/src/main/module.json5 | 55 ------------- .../main/resources/base/element/color.json | 8 -- .../main/resources/base/element/float.json | 8 -- .../main/resources/base/element/string.json | 24 ------ .../main/resources/base/media/background.png | Bin 91942 -> 0 bytes .../main/resources/base/media/foreground.png | Bin 8805 -> 0 bytes .../resources/base/media/layered_image.json | 7 -- .../main/resources/base/media/startIcon.png | Bin 20093 -> 0 bytes .../resources/base/profile/backup_config.json | 3 - .../resources/base/profile/main_pages.json | 5 -- .../main/resources/dark/element/color.json | 8 -- .../hvigor/hvigor-config.json5 | 37 --------- .../test_bundle/sixteenth_right/hvigorfile.ts | 21 ----- .../sixteenth_right/oh-package.json5 | 24 ------ .../sixteenth_right/src/main/config.json | 68 ++++++++++++++++ .../src/main/js/default/app.js | 22 ++++++ .../src/main/js/default/i18n/en-US.json | 6 ++ .../src/main/js/default/i18n/zh-CN.json | 6 ++ .../src/main/js/default/pages/index/index.css | 24 ++++++ .../src/main/js/default/pages/index/index.hml | 20 +++++ .../src/main/js/default/pages/index/index.js | 25 ++++++ .../js/resources/base/element/string.json | 16 ++++ .../src/main/js/resources/base/media/icon.png | Bin 0 -> 6320 bytes .../js/resources/base/media/icon_entry.png | Bin 0 -> 6320 bytes .../tenth_right/AppScope/app.json5 | 29 ------- .../resources/base/element/string.json | 8 -- .../resources/base/media/app_background.png | Bin 91942 -> 0 bytes .../resources/base/media/app_foreground.png | Bin 15325 -> 0 bytes .../base/media/app_layered_image.json | 7 -- .../unittest/test_bundle/tenth_right/BUILD.gn | 30 +++---- .../tenth_right/build-profile.json5 | 44 ----------- .../tenth_right/feature/build-profile.json5 | 43 ----------- .../tenth_right/feature/hvigorfile.ts | 21 ----- .../tenth_right/feature/obfuscation-rules.txt | 36 --------- .../tenth_right/feature/oh-package.json5 | 24 ------ .../main/ets/entryability/EntryAbility.ets | 59 -------------- .../feature/src/main/ets/pages/Index.ets | 38 --------- .../tenth_right/feature/src/main/module.json5 | 55 ------------- .../main/resources/base/element/color.json | 8 -- .../main/resources/base/element/float.json | 8 -- .../main/resources/base/element/string.json | 24 ------ .../main/resources/base/media/background.png | Bin 91942 -> 0 bytes .../main/resources/base/media/foreground.png | Bin 8805 -> 0 bytes .../resources/base/media/layered_image.json | 7 -- .../main/resources/base/media/startIcon.png | Bin 20093 -> 0 bytes .../resources/base/profile/backup_config.json | 3 - .../resources/base/profile/main_pages.json | 5 -- .../main/resources/dark/element/color.json | 8 -- .../tenth_right/hvigor/hvigor-config.json5 | 37 --------- .../test_bundle/tenth_right/hvigorfile.ts | 21 ----- .../test_bundle/tenth_right/oh-package.json5 | 24 ------ .../tenth_right/src/main/config.json | 68 ++++++++++++++++ .../tenth_right/src/main/js/default/app.js | 22 ++++++ .../src/main/js/default/i18n/en-US.json | 6 ++ .../src/main/js/default/i18n/zh-CN.json | 6 ++ .../src/main/js/default/pages/index/index.css | 24 ++++++ .../src/main/js/default/pages/index/index.hml | 20 +++++ .../src/main/js/default/pages/index/index.js | 25 ++++++ .../js/resources/base/element/string.json | 16 ++++ .../src/main/js/resources/base/media/icon.png | Bin 0 -> 6320 bytes .../js/resources/base/media/icon_entry.png | Bin 0 -> 6320 bytes .../thirteenth_right/AppScope/app.json5 | 28 ------- .../resources/base/element/string.json | 8 -- .../resources/base/media/app_background.png | Bin 91942 -> 0 bytes .../resources/base/media/app_foreground.png | Bin 15325 -> 0 bytes .../base/media/app_layered_image.json | 7 -- .../test_bundle/thirteenth_right/BUILD.gn | 30 +++---- .../thirteenth_right/build-profile.json5 | 44 ----------- .../feature/build-profile.json5 | 43 ----------- .../thirteenth_right/feature/hvigorfile.ts | 21 ----- .../feature/obfuscation-rules.txt | 36 --------- .../thirteenth_right/feature/oh-package.json5 | 24 ------ .../main/ets/entryability/EntryAbility.ets | 59 -------------- .../feature/src/main/ets/pages/Index.ets | 38 --------- .../feature/src/main/module.json5 | 55 ------------- .../main/resources/base/element/color.json | 8 -- .../main/resources/base/element/float.json | 8 -- .../main/resources/base/element/string.json | 24 ------ .../main/resources/base/media/background.png | Bin 91942 -> 0 bytes .../main/resources/base/media/foreground.png | Bin 8805 -> 0 bytes .../resources/base/media/layered_image.json | 7 -- .../main/resources/base/media/startIcon.png | Bin 20093 -> 0 bytes .../resources/base/profile/backup_config.json | 3 - .../resources/base/profile/main_pages.json | 5 -- .../main/resources/dark/element/color.json | 8 -- .../hvigor/hvigor-config.json5 | 37 --------- .../thirteenth_right/hvigorfile.ts | 21 ----- .../thirteenth_right/oh-package.json5 | 24 ------ .../thirteenth_right/src/main/config.json | 68 ++++++++++++++++ .../src/main/js/default/app.js | 22 ++++++ .../src/main/js/default/i18n/en-US.json | 6 ++ .../src/main/js/default/i18n/zh-CN.json | 6 ++ .../src/main/js/default/pages/index/index.css | 24 ++++++ .../src/main/js/default/pages/index/index.hml | 20 +++++ .../src/main/js/default/pages/index/index.js | 25 ++++++ .../js/resources/base/element/string.json | 16 ++++ .../src/main/js/resources/base/media/icon.png | Bin 0 -> 6320 bytes .../js/resources/base/media/icon_entry.png | Bin 0 -> 6320 bytes .../twelfth_right/AppScope/app.json5 | 28 ------- .../resources/base/element/string.json | 8 -- .../resources/base/media/app_background.png | Bin 91942 -> 0 bytes .../resources/base/media/app_foreground.png | Bin 15325 -> 0 bytes .../base/media/app_layered_image.json | 7 -- .../test_bundle/twelfth_right/BUILD.gn | 30 +++---- .../twelfth_right/build-profile.json5 | 44 ----------- .../twelfth_right/feature/build-profile.json5 | 43 ----------- .../twelfth_right/feature/hvigorfile.ts | 21 ----- .../feature/obfuscation-rules.txt | 36 --------- .../twelfth_right/feature/oh-package.json5 | 24 ------ .../main/ets/entryability/EntryAbility.ets | 59 -------------- .../feature/src/main/ets/pages/Index.ets | 38 --------- .../feature/src/main/module.json5 | 55 ------------- .../main/resources/base/element/color.json | 8 -- .../main/resources/base/element/float.json | 8 -- .../main/resources/base/element/string.json | 24 ------ .../main/resources/base/media/background.png | Bin 91942 -> 0 bytes .../main/resources/base/media/foreground.png | Bin 8805 -> 0 bytes .../resources/base/media/layered_image.json | 7 -- .../main/resources/base/media/startIcon.png | Bin 20093 -> 0 bytes .../resources/base/profile/backup_config.json | 3 - .../resources/base/profile/main_pages.json | 5 -- .../main/resources/dark/element/color.json | 8 -- .../twelfth_right/hvigor/hvigor-config.json5 | 37 --------- .../test_bundle/twelfth_right/hvigorfile.ts | 21 ----- .../twelfth_right/oh-package.json5 | 24 ------ .../twelfth_right/src/main/config.json | 68 ++++++++++++++++ .../twelfth_right/src/main/js/default/app.js | 22 ++++++ .../src/main/js/default/i18n/en-US.json | 6 ++ .../src/main/js/default/i18n/zh-CN.json | 6 ++ .../src/main/js/default/pages/index/index.css | 24 ++++++ .../src/main/js/default/pages/index/index.hml | 20 +++++ .../src/main/js/default/pages/index/index.js | 25 ++++++ .../js/resources/base/element/string.json | 16 ++++ .../src/main/js/resources/base/media/icon.png | Bin 0 -> 6320 bytes .../js/resources/base/media/icon_entry.png | Bin 0 -> 6320 bytes 528 files changed, 3283 insertions(+), 7206 deletions(-) delete mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/AppScope/app.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/AppScope/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/AppScope/resources/base/media/app_background.png delete mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/AppScope/resources/base/media/app_foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/AppScope/resources/base/media/app_layered_image.json mode change 100755 => 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/BUILD.gn delete mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/entry/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/entry/src/main/ets/entryability/EntryAbility.ets delete mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/entry/src/main/ets/pages/Index.ets delete mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/entry/src/main/module.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/entry/src/main/resources/base/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/entry/src/main/resources/base/element/float.json delete mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/entry/src/main/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/entry/src/main/resources/base/media/background.png delete mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/entry/src/main/resources/base/media/foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/entry/src/main/resources/base/media/layered_image.json delete mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/entry/src/main/resources/base/media/startIcon.png delete mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/entry/src/main/resources/base/profile/backup_config.json delete mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/entry/src/main/resources/base/profile/main_pages.json delete mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/entry/src/main/resources/dark/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/hvigor/hvigor-config.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/oh-package.json5 create mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/src/main/config.json rename test/sceneProject/unittest/test_bundle/{first_right/entry/oh-package.json5 => fifteenth_right/src/main/js/default/app.js} (69%) create mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/src/main/js/default/i18n/en-US.json create mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/src/main/js/default/i18n/zh-CN.json create mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/src/main/js/default/pages/index/index.css create mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/src/main/js/default/pages/index/index.hml rename test/sceneProject/unittest/test_bundle/{fifth_right/hvigorfile.ts => fifteenth_right/src/main/js/default/pages/index/index.js} (67%) create mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/src/main/js/resources/base/element/string.json create mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/src/main/js/resources/base/media/icon.png create mode 100644 test/sceneProject/unittest/test_bundle/fifteenth_right/src/main/js/resources/base/media/icon_entry.png delete mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/AppScope/app.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/AppScope/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/AppScope/resources/base/media/app_background.png delete mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/AppScope/resources/base/media/app_foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/AppScope/resources/base/media/app_layered_image.json mode change 100755 => 100644 test/sceneProject/unittest/test_bundle/fifth_right/BUILD.gn delete mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/entry/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/entry/src/main/ets/entryability/EntryAbility.ets delete mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/entry/src/main/ets/pages/Index.ets delete mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/entry/src/main/module.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/entry/src/main/resources/base/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/entry/src/main/resources/base/element/float.json delete mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/entry/src/main/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/entry/src/main/resources/base/media/background.png delete mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/entry/src/main/resources/base/media/foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/entry/src/main/resources/base/media/layered_image.json delete mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/entry/src/main/resources/base/media/startIcon.png delete mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/entry/src/main/resources/base/profile/backup_config.json delete mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/entry/src/main/resources/base/profile/main_pages.json delete mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/entry/src/main/resources/dark/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/hvigor/hvigor-config.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/oh-package.json5 create mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/src/main/config.json rename test/sceneProject/unittest/test_bundle/{fifteenth_right/entry/oh-package.json5 => fifth_right/src/main/js/default/app.js} (69%) create mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/src/main/js/default/i18n/en-US.json create mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/src/main/js/default/i18n/zh-CN.json create mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/src/main/js/default/pages/index/index.css create mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/src/main/js/default/pages/index/index.hml rename test/sceneProject/unittest/test_bundle/fifth_right/{entry/hvigorfile.ts => src/main/js/default/pages/index/index.js} (67%) create mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/src/main/js/resources/base/element/string.json create mode 100644 test/sceneProject/unittest/test_bundle/fifth_right/src/main/js/resources/base/media/icon.png delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/AppScope/app.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/AppScope/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/AppScope/resources/base/media/app_background.png delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/AppScope/resources/base/media/app_foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/AppScope/resources/base/media/app_layered_image.json mode change 100755 => 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/BUILD.gn delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/feature/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/feature/hvigorfile.ts delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/feature/obfuscation-rules.txt delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/feature/oh-package.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/feature/src/main/ets/entryability/EntryAbility.ets delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/feature/src/main/ets/pages/Index.ets delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/feature/src/main/module.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/feature/src/main/resources/base/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/feature/src/main/resources/base/element/float.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/feature/src/main/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/feature/src/main/resources/base/media/background.png delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/feature/src/main/resources/base/media/foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/feature/src/main/resources/base/media/layered_image.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/feature/src/main/resources/base/media/startIcon.png delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/feature/src/main/resources/base/profile/backup_config.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/feature/src/main/resources/base/profile/main_pages.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/feature/src/main/resources/dark/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/hvigor/hvigor-config.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/hvigorfile.ts delete mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/oh-package.json5 create mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/src/main/config.json rename test/sceneProject/unittest/test_bundle/{fifth_right/entry/oh-package.json5 => first_diff_minCompCode/src/main/js/default/app.js} (69%) create mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/src/main/js/default/i18n/en-US.json create mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/src/main/js/default/i18n/zh-CN.json create mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/src/main/js/default/pages/index/index.css create mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/src/main/js/default/pages/index/index.hml rename test/sceneProject/unittest/test_bundle/{fifteenth_right/hvigorfile.ts => first_diff_minCompCode/src/main/js/default/pages/index/index.js} (67%) create mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/src/main/js/resources/base/element/string.json create mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/src/main/js/resources/base/media/icon.png create mode 100644 test/sceneProject/unittest/test_bundle/first_diff_minCompCode/src/main/js/resources/base/media/icon_entry.png delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/AppScope/app.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/AppScope/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/AppScope/resources/base/media/app_background.png delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/AppScope/resources/base/media/app_foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/AppScope/resources/base/media/app_layered_image.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/entry/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/entry/hvigorfile.ts delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/entry/obfuscation-rules.txt delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/entry/src/main/ets/entryability/EntryAbility.ets delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/entry/src/main/ets/pages/Index.ets delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/entry/src/main/module.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/entry/src/main/resources/base/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/entry/src/main/resources/base/element/float.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/entry/src/main/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/entry/src/main/resources/base/media/background.png delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/entry/src/main/resources/base/media/foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/entry/src/main/resources/base/media/layered_image.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/entry/src/main/resources/base/media/startIcon.png delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/entry/src/main/resources/base/profile/backup_config.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/entry/src/main/resources/base/profile/main_pages.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/entry/src/main/resources/dark/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/hvigor/hvigor-config.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/hvigorfile.ts delete mode 100644 test/sceneProject/unittest/test_bundle/first_right/oh-package.json5 create mode 100644 test/sceneProject/unittest/test_bundle/first_right/src/main/config.json rename test/sceneProject/unittest/test_bundle/{first_right_compCode/entry/oh-package.json5 => first_right/src/main/js/default/app.js} (69%) create mode 100644 test/sceneProject/unittest/test_bundle/first_right/src/main/js/default/i18n/en-US.json create mode 100644 test/sceneProject/unittest/test_bundle/first_right/src/main/js/default/i18n/zh-CN.json create mode 100644 test/sceneProject/unittest/test_bundle/first_right/src/main/js/default/pages/index/index.css create mode 100644 test/sceneProject/unittest/test_bundle/first_right/src/main/js/default/pages/index/index.hml rename test/sceneProject/unittest/test_bundle/{fifteenth_right/entry/hvigorfile.ts => first_right/src/main/js/default/pages/index/index.js} (67%) create mode 100644 test/sceneProject/unittest/test_bundle/first_right/src/main/js/resources/base/element/string.json create mode 100644 test/sceneProject/unittest/test_bundle/first_right/src/main/js/resources/base/media/icon.png delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/AppScope/app.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/AppScope/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/AppScope/resources/base/media/app_background.png delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/AppScope/resources/base/media/app_foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/AppScope/resources/base/media/app_layered_image.json mode change 100755 => 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/BUILD.gn delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/entry/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/entry/hvigorfile.ts delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/entry/obfuscation-rules.txt delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/entry/src/main/ets/entryability/EntryAbility.ets delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/entry/src/main/ets/pages/Index.ets delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/entry/src/main/module.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/entry/src/main/resources/base/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/entry/src/main/resources/base/element/float.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/entry/src/main/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/entry/src/main/resources/base/media/background.png delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/entry/src/main/resources/base/media/foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/entry/src/main/resources/base/media/layered_image.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/entry/src/main/resources/base/media/startIcon.png delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/entry/src/main/resources/base/profile/backup_config.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/entry/src/main/resources/base/profile/main_pages.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/entry/src/main/resources/dark/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/hvigor/hvigor-config.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/hvigorfile.ts delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/oh-package.json5 create mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/src/main/config.json create mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/src/main/js/default/app.js create mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/src/main/js/default/i18n/en-US.json create mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/src/main/js/default/i18n/zh-CN.json create mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/src/main/js/default/pages/index/index.css create mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/src/main/js/default/pages/index/index.hml create mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/src/main/js/default/pages/index/index.js create mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/src/main/js/resources/base/element/string.json create mode 100644 test/sceneProject/unittest/test_bundle/first_right_compCode/src/main/js/resources/base/media/icon.png rename test/sceneProject/unittest/test_bundle/{fifteenth_right/entry/obfuscation-rules.txt => first_right_with_diff_moduleName/BUILD.gn} (34%) create mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleName/src/main/config.json create mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleName/src/main/js/default/app.js create mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleName/src/main/js/default/i18n/en-US.json create mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleName/src/main/js/default/i18n/zh-CN.json create mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleName/src/main/js/default/pages/index/index.css create mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleName/src/main/js/default/pages/index/index.hml create mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleName/src/main/js/default/pages/index/index.js create mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleName/src/main/js/resources/base/element/string.json create mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleName/src/main/js/resources/base/media/icon.png delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/AppScope/app.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/AppScope/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/AppScope/resources/base/media/app_background.png delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/AppScope/resources/base/media/app_foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/AppScope/resources/base/media/app_layered_image.json mode change 100755 => 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/BUILD.gn delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/entry/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/entry/hvigorfile.ts delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/entry/obfuscation-rules.txt delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/entry/oh-package.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/entry/src/main/ets/entryability/EntryAbility.ets delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/entry/src/main/ets/pages/Index.ets delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/entry/src/main/module.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/entry/src/main/resources/base/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/entry/src/main/resources/base/element/float.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/entry/src/main/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/entry/src/main/resources/base/media/background.png delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/entry/src/main/resources/base/media/foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/entry/src/main/resources/base/media/layered_image.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/entry/src/main/resources/base/media/startIcon.png delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/entry/src/main/resources/base/profile/backup_config.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/entry/src/main/resources/base/profile/main_pages.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/entry/src/main/resources/dark/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/hvigor/hvigor-config.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/hvigorfile.ts delete mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/oh-package.json5 create mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/src/main/config.json create mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/src/main/js/default/app.js create mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/src/main/js/default/i18n/en-US.json create mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/src/main/js/default/i18n/zh-CN.json create mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/src/main/js/default/pages/index/index.css create mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/src/main/js/default/pages/index/index.hml create mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/src/main/js/default/pages/index/index.js create mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/src/main/js/resources/base/element/string.json create mode 100644 test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType/src/main/js/resources/base/media/icon.png delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/AppScope/app.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/AppScope/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/AppScope/resources/base/media/app_background.png delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/AppScope/resources/base/media/app_foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/AppScope/resources/base/media/app_layered_image.json mode change 100755 => 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/BUILD.gn delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/entry/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/entry/hvigorfile.ts delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/entry/obfuscation-rules.txt delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/entry/oh-package.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/entry/src/main/ets/entryability/EntryAbility.ets delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/entry/src/main/ets/pages/Index.ets delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/entry/src/main/module.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/entry/src/main/resources/base/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/entry/src/main/resources/base/element/float.json delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/entry/src/main/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/entry/src/main/resources/base/media/background.png delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/entry/src/main/resources/base/media/foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/entry/src/main/resources/base/media/layered_image.json delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/entry/src/main/resources/base/media/startIcon.png delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/entry/src/main/resources/base/profile/backup_config.json delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/entry/src/main/resources/base/profile/main_pages.json delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/entry/src/main/resources/dark/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/hvigor/hvigor-config.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/hvigorfile.ts delete mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/oh-package.json5 create mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/src/main/config.json create mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/src/main/js/default/app.js create mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/src/main/js/default/i18n/en-US.json create mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/src/main/js/default/i18n/zh-CN.json create mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/src/main/js/default/pages/index/index.css create mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/src/main/js/default/pages/index/index.hml create mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/src/main/js/default/pages/index/index.js create mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/src/main/js/resources/base/element/string.json create mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/src/main/js/resources/base/media/icon.png create mode 100644 test/sceneProject/unittest/test_bundle/fourteenth_right/src/main/js/resources/base/media/icon_entry.png delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/AppScope/app.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/AppScope/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/AppScope/resources/base/media/app_background.png delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/AppScope/resources/base/media/app_foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/AppScope/resources/base/media/app_layered_image.json mode change 100755 => 100644 test/sceneProject/unittest/test_bundle/fourth_right/BUILD.gn delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/feature/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/feature/hvigorfile.ts delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/feature/obfuscation-rules.txt delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/feature/oh-package.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/feature/src/main/ets/entryability/EntryAbility.ets delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/feature/src/main/ets/pages/Index.ets delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/feature/src/main/module.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/feature/src/main/resources/base/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/feature/src/main/resources/base/element/float.json delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/feature/src/main/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/feature/src/main/resources/base/media/background.png delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/feature/src/main/resources/base/media/foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/feature/src/main/resources/base/media/layered_image.json delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/feature/src/main/resources/base/media/startIcon.png delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/feature/src/main/resources/base/profile/backup_config.json delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/feature/src/main/resources/base/profile/main_pages.json delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/feature/src/main/resources/dark/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/hvigor/hvigor-config.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/hvigorfile.ts delete mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/oh-package.json5 create mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/src/main/config.json create mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/src/main/js/default/app.js create mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/src/main/js/default/i18n/en-US.json create mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/src/main/js/default/i18n/zh-CN.json create mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/src/main/js/default/pages/index/index.css create mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/src/main/js/default/pages/index/index.hml create mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/src/main/js/default/pages/index/index.js create mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/src/main/js/resources/base/element/string.json create mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/src/main/js/resources/base/media/icon.png create mode 100644 test/sceneProject/unittest/test_bundle/fourth_right/src/main/js/resources/base/media/icon_entry.png delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/AppScope/app.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/AppScope/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/AppScope/resources/base/media/app_background.png delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/AppScope/resources/base/media/app_foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/AppScope/resources/base/media/app_layered_image.json mode change 100755 => 100644 test/sceneProject/unittest/test_bundle/ninth_right/BUILD.gn delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/feature/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/feature/hvigorfile.ts delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/feature/obfuscation-rules.txt delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/feature/oh-package.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/feature/src/main/ets/entryability/EntryAbility.ets delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/feature/src/main/ets/pages/Index.ets delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/feature/src/main/module.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/feature/src/main/resources/base/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/feature/src/main/resources/base/element/float.json delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/feature/src/main/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/feature/src/main/resources/base/media/background.png delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/feature/src/main/resources/base/media/foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/feature/src/main/resources/base/media/layered_image.json delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/feature/src/main/resources/base/media/startIcon.png delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/feature/src/main/resources/base/profile/backup_config.json delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/feature/src/main/resources/base/profile/main_pages.json delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/feature/src/main/resources/dark/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/hvigor/hvigor-config.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/hvigorfile.ts delete mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/oh-package.json5 create mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/src/main/config.json create mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/src/main/js/default/app.js create mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/src/main/js/default/i18n/en-US.json create mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/src/main/js/default/i18n/zh-CN.json create mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/src/main/js/default/pages/index/index.css create mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/src/main/js/default/pages/index/index.hml create mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/src/main/js/default/pages/index/index.js create mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/src/main/js/resources/base/element/string.json create mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/src/main/js/resources/base/media/icon.png create mode 100644 test/sceneProject/unittest/test_bundle/ninth_right/src/main/js/resources/base/media/icon_entry.png delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/AppScope/app.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/AppScope/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/AppScope/resources/base/media/app_background.png delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/AppScope/resources/base/media/app_foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/AppScope/resources/base/media/app_layered_image.json mode change 100755 => 100644 test/sceneProject/unittest/test_bundle/second_right/BUILD.gn delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/feature/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/feature/hvigorfile.ts delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/feature/obfuscation-rules.txt delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/feature/oh-package.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/feature/src/main/ets/entryability/EntryAbility.ets delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/feature/src/main/ets/pages/Index.ets delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/feature/src/main/module.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/feature/src/main/resources/base/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/feature/src/main/resources/base/element/float.json delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/feature/src/main/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/feature/src/main/resources/base/media/background.png delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/feature/src/main/resources/base/media/foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/feature/src/main/resources/base/media/layered_image.json delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/feature/src/main/resources/base/media/startIcon.png delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/feature/src/main/resources/base/profile/backup_config.json delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/feature/src/main/resources/base/profile/main_pages.json delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/feature/src/main/resources/dark/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/hvigor/hvigor-config.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/hvigorfile.ts delete mode 100644 test/sceneProject/unittest/test_bundle/second_right/oh-package.json5 create mode 100644 test/sceneProject/unittest/test_bundle/second_right/src/main/config.json create mode 100644 test/sceneProject/unittest/test_bundle/second_right/src/main/js/default/app.js create mode 100644 test/sceneProject/unittest/test_bundle/second_right/src/main/js/default/i18n/en-US.json create mode 100644 test/sceneProject/unittest/test_bundle/second_right/src/main/js/default/i18n/zh-CN.json create mode 100644 test/sceneProject/unittest/test_bundle/second_right/src/main/js/default/pages/index/index.css create mode 100644 test/sceneProject/unittest/test_bundle/second_right/src/main/js/default/pages/index/index.hml create mode 100644 test/sceneProject/unittest/test_bundle/second_right/src/main/js/default/pages/index/index.js create mode 100644 test/sceneProject/unittest/test_bundle/second_right/src/main/js/resources/base/element/string.json create mode 100644 test/sceneProject/unittest/test_bundle/second_right/src/main/js/resources/base/media/icon.png create mode 100644 test/sceneProject/unittest/test_bundle/second_right/src/main/js/resources/base/media/icon_entry.png rename test/sceneProject/unittest/test_bundle/{fifth_right/entry/obfuscation-rules.txt => second_right_with_same_moduleName/BUILD.gn} (34%) create mode 100644 test/sceneProject/unittest/test_bundle/second_right_with_same_moduleName/src/main/config.json create mode 100644 test/sceneProject/unittest/test_bundle/second_right_with_same_moduleName/src/main/js/default/app.js create mode 100644 test/sceneProject/unittest/test_bundle/second_right_with_same_moduleName/src/main/js/default/i18n/en-US.json create mode 100644 test/sceneProject/unittest/test_bundle/second_right_with_same_moduleName/src/main/js/default/i18n/zh-CN.json create mode 100644 test/sceneProject/unittest/test_bundle/second_right_with_same_moduleName/src/main/js/default/pages/index/index.css create mode 100644 test/sceneProject/unittest/test_bundle/second_right_with_same_moduleName/src/main/js/default/pages/index/index.hml create mode 100644 test/sceneProject/unittest/test_bundle/second_right_with_same_moduleName/src/main/js/default/pages/index/index.js create mode 100644 test/sceneProject/unittest/test_bundle/second_right_with_same_moduleName/src/main/js/resources/base/element/string.json create mode 100644 test/sceneProject/unittest/test_bundle/second_right_with_same_moduleName/src/main/js/resources/base/media/icon.png delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/AppScope/app.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/AppScope/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/AppScope/resources/base/media/app_background.png delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/AppScope/resources/base/media/app_foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/AppScope/resources/base/media/app_layered_image.json mode change 100755 => 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/BUILD.gn delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/feature/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/feature/hvigorfile.ts delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/feature/obfuscation-rules.txt delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/feature/oh-package.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/feature/src/main/ets/entryability/EntryAbility.ets delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/feature/src/main/ets/pages/Index.ets delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/feature/src/main/module.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/feature/src/main/resources/base/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/feature/src/main/resources/base/element/float.json delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/feature/src/main/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/feature/src/main/resources/base/media/background.png delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/feature/src/main/resources/base/media/foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/feature/src/main/resources/base/media/layered_image.json delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/feature/src/main/resources/base/media/startIcon.png delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/feature/src/main/resources/base/profile/backup_config.json delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/feature/src/main/resources/base/profile/main_pages.json delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/feature/src/main/resources/dark/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/hvigor/hvigor-config.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/hvigorfile.ts delete mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/oh-package.json5 create mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/src/main/config.json create mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/src/main/js/default/app.js create mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/src/main/js/default/i18n/en-US.json create mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/src/main/js/default/i18n/zh-CN.json create mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/src/main/js/default/pages/index/index.css create mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/src/main/js/default/pages/index/index.hml create mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/src/main/js/default/pages/index/index.js create mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/src/main/js/resources/base/element/string.json create mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/src/main/js/resources/base/media/icon.png create mode 100644 test/sceneProject/unittest/test_bundle/sixteenth_right/src/main/js/resources/base/media/icon_entry.png delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/AppScope/app.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/AppScope/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/AppScope/resources/base/media/app_background.png delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/AppScope/resources/base/media/app_foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/AppScope/resources/base/media/app_layered_image.json mode change 100755 => 100644 test/sceneProject/unittest/test_bundle/tenth_right/BUILD.gn delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/feature/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/feature/hvigorfile.ts delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/feature/obfuscation-rules.txt delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/feature/oh-package.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/feature/src/main/ets/entryability/EntryAbility.ets delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/feature/src/main/ets/pages/Index.ets delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/feature/src/main/module.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/feature/src/main/resources/base/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/feature/src/main/resources/base/element/float.json delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/feature/src/main/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/feature/src/main/resources/base/media/background.png delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/feature/src/main/resources/base/media/foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/feature/src/main/resources/base/media/layered_image.json delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/feature/src/main/resources/base/media/startIcon.png delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/feature/src/main/resources/base/profile/backup_config.json delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/feature/src/main/resources/base/profile/main_pages.json delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/feature/src/main/resources/dark/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/hvigor/hvigor-config.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/hvigorfile.ts delete mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/oh-package.json5 create mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/src/main/config.json create mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/src/main/js/default/app.js create mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/src/main/js/default/i18n/en-US.json create mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/src/main/js/default/i18n/zh-CN.json create mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/src/main/js/default/pages/index/index.css create mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/src/main/js/default/pages/index/index.hml create mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/src/main/js/default/pages/index/index.js create mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/src/main/js/resources/base/element/string.json create mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/src/main/js/resources/base/media/icon.png create mode 100644 test/sceneProject/unittest/test_bundle/tenth_right/src/main/js/resources/base/media/icon_entry.png delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/AppScope/app.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/AppScope/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/AppScope/resources/base/media/app_background.png delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/AppScope/resources/base/media/app_foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/AppScope/resources/base/media/app_layered_image.json mode change 100755 => 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/BUILD.gn delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/feature/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/feature/hvigorfile.ts delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/feature/obfuscation-rules.txt delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/feature/oh-package.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/feature/src/main/ets/entryability/EntryAbility.ets delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/feature/src/main/ets/pages/Index.ets delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/feature/src/main/module.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/feature/src/main/resources/base/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/feature/src/main/resources/base/element/float.json delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/feature/src/main/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/feature/src/main/resources/base/media/background.png delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/feature/src/main/resources/base/media/foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/feature/src/main/resources/base/media/layered_image.json delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/feature/src/main/resources/base/media/startIcon.png delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/feature/src/main/resources/base/profile/backup_config.json delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/feature/src/main/resources/base/profile/main_pages.json delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/feature/src/main/resources/dark/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/hvigor/hvigor-config.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/hvigorfile.ts delete mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/oh-package.json5 create mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/src/main/config.json create mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/src/main/js/default/app.js create mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/src/main/js/default/i18n/en-US.json create mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/src/main/js/default/i18n/zh-CN.json create mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/src/main/js/default/pages/index/index.css create mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/src/main/js/default/pages/index/index.hml create mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/src/main/js/default/pages/index/index.js create mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/src/main/js/resources/base/element/string.json create mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/src/main/js/resources/base/media/icon.png create mode 100644 test/sceneProject/unittest/test_bundle/thirteenth_right/src/main/js/resources/base/media/icon_entry.png delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/AppScope/app.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/AppScope/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/AppScope/resources/base/media/app_background.png delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/AppScope/resources/base/media/app_foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/AppScope/resources/base/media/app_layered_image.json mode change 100755 => 100644 test/sceneProject/unittest/test_bundle/twelfth_right/BUILD.gn delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/feature/build-profile.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/feature/hvigorfile.ts delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/feature/obfuscation-rules.txt delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/feature/oh-package.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/feature/src/main/ets/entryability/EntryAbility.ets delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/feature/src/main/ets/pages/Index.ets delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/feature/src/main/module.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/feature/src/main/resources/base/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/feature/src/main/resources/base/element/float.json delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/feature/src/main/resources/base/element/string.json delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/feature/src/main/resources/base/media/background.png delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/feature/src/main/resources/base/media/foreground.png delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/feature/src/main/resources/base/media/layered_image.json delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/feature/src/main/resources/base/media/startIcon.png delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/feature/src/main/resources/base/profile/backup_config.json delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/feature/src/main/resources/base/profile/main_pages.json delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/feature/src/main/resources/dark/element/color.json delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/hvigor/hvigor-config.json5 delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/hvigorfile.ts delete mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/oh-package.json5 create mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/src/main/config.json create mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/src/main/js/default/app.js create mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/src/main/js/default/i18n/en-US.json create mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/src/main/js/default/i18n/zh-CN.json create mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/src/main/js/default/pages/index/index.css create mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/src/main/js/default/pages/index/index.hml create mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/src/main/js/default/pages/index/index.js create mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/src/main/js/resources/base/element/string.json create mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/src/main/js/resources/base/media/icon.png create mode 100644 test/sceneProject/unittest/test_bundle/twelfth_right/src/main/js/resources/base/media/icon_entry.png diff --git a/services/bundlemgr/test/unittest/bms_bundle_installer_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_installer_test/BUILD.gn index 9d251c58fa..3d6c5a0c41 100755 --- a/services/bundlemgr/test/unittest/bms_bundle_installer_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_installer_test/BUILD.gn @@ -488,6 +488,7 @@ ohos_unittest("BmsMultipleBundleInstallerTest") { "${bundle_framework_path}/test/sceneProject/unittest/test_bundle/first_right:first_right", "${bundle_framework_path}/test/sceneProject/unittest/test_bundle/first_right_compCode:first_right_compCode", "${bundle_framework_path}/test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleType:first_right_with_diff_moduleType", + "${bundle_framework_path}/test/sceneProject/unittest/test_bundle/first_right_with_diff_moduleName:first_right_with_diff_moduleName", "${bundle_framework_path}/test/sceneProject/unittest/test_bundle/fourteenth_right:fourteenth_right", "${bundle_framework_path}/test/sceneProject/unittest/test_bundle/fourth_right:fourth_right", "${bundle_framework_path}/test/sceneProject/unittest/test_bundle/ninth_right:ninth_right", @@ -496,6 +497,7 @@ ohos_unittest("BmsMultipleBundleInstallerTest") { "${bundle_framework_path}/test/sceneProject/unittest/test_bundle/second_backup_right:second_backup_right", "${bundle_framework_path}/test/sceneProject/unittest/test_bundle/second_right:second_right", "${bundle_framework_path}/test/sceneProject/unittest/test_bundle/seventh_right:seventh_right", + "${bundle_framework_path}/test/sceneProject/unittest/test_bundle/second_right_with_same_moduleName:second_right_with_same_moduleName", "${bundle_framework_path}/test/sceneProject/unittest/test_bundle/sixteenth_right:sixteenth_right", "${bundle_framework_path}/test/sceneProject/unittest/test_bundle/sixth_right:sixth_right", "${bundle_framework_path}/test/sceneProject/unittest/test_bundle/tenth_right:tenth_right", diff --git a/services/bundlemgr/test/unittest/bms_bundle_installer_test/bms_multiple_installer_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_installer_test/bms_multiple_installer_test.cpp index f10370c4f4..c3a72e4e6d 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_installer_test/bms_multiple_installer_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_installer_test/bms_multiple_installer_test.cpp @@ -79,7 +79,9 @@ const std::string WRONG_BUNDLE_NAME = "wrong_bundle_name.ha"; const std::string RIGHT_DIFFERENT_RELEASE_TYPE = "first_diff_release_type.hap"; const std::string RIGHT_COMPATIBLE_VERSION_CODE = "first_right_compCode.hap"; const std::string RIGHT_DIFFERENT_COMPATIBLE_VERSION_CODE = "first_diff_minCompCode.hap"; +const std::string RIGHT_DIFFERENT_MODULE_NAME = "first_right_with_diff_moduleName.hap"; const std::string RIGHT_DIFFERENT_MODULE_TYPE = "first_right_with_diff_moduleType.hap"; +const std::string SECOND_SAME_WITH_MODULE_NAME = "second_right_with_same_moduleName.hap"; const std::string TEST_HAP_DEMO = "testhapdemo.hap"; const std::string TEST_HAP_DEMO_2 = "testhapdemo2.hap"; const std::string TEST_HAP_DEMO_3 = "testhapdemo3.hap"; @@ -1105,6 +1107,32 @@ HWTEST_F(BmsMultipleInstallerTest, MultipleHapsInstall_5200, Function | SmallTes ClearBundleInfo(BUNDLE_NAME); } +/** + * @tc.number: MultipleHapsInstall_5300 + * @tc.name: test to install haps with same moduelName + * @tc.desc: 1.the moduleName is different in the same packageName hap + * 2.the installation result is fail + */ +HWTEST_F(BmsMultipleInstallerTest, MultipleHapsInstall_5300, Function | SmallTest | Level1) +{ + std::vector filePaths; + std::string firstBundleFile = RESOURCE_ROOT_PATH + RIGHT_BUNDLE_FIRST; + filePaths.emplace_back(firstBundleFile); + ErrCode installRes = InstallThirdPartyMultipleBundles(filePaths, true); + EXPECT_EQ(installRes, ERR_OK); + CheckFileExist(); + CheckModuleFileExist(); + + std::string secondBundleFile = RESOURCE_ROOT_PATH + RIGHT_DIFFERENT_MODULE_NAME; + filePaths.clear(); + filePaths.emplace_back(secondBundleFile); + installRes = InstallThirdPartyMultipleBundles(filePaths, true); + EXPECT_EQ(installRes, ERR_APPEXECFWK_INSTALL_INCONSISTENT_MODULE_NAME); + + ClearBundleInfo(BUNDLE_NAME); +} + + /** * @tc.number: MultipleHapsInstall_5400 * @tc.name: test to install haps with same moduelName @@ -1130,6 +1158,31 @@ HWTEST_F(BmsMultipleInstallerTest, MultipleHapsInstall_5400, Function | SmallTes ClearBundleInfo(BUNDLE_NAME); } +/** + * @tc.number: MultipleHapsInstall_5500 + * @tc.name: test to install haps with same moduelName + * @tc.desc: 1.the moduleName is same in the different packageName hap + * 2.the installation result is fail + */ +HWTEST_F(BmsMultipleInstallerTest, MultipleHapsInstall_5500, Function | SmallTest | Level1) +{ + std::vector filePaths; + std::string firstBundleFile = RESOURCE_ROOT_PATH + RIGHT_BUNDLE_FIRST; + filePaths.emplace_back(firstBundleFile); + ErrCode installRes = InstallThirdPartyMultipleBundles(filePaths, true); + EXPECT_EQ(installRes, ERR_OK); + CheckFileExist(); + CheckModuleFileExist(); + + std::string secondBundleFile = RESOURCE_ROOT_PATH + SECOND_SAME_WITH_MODULE_NAME; + filePaths.clear(); + filePaths.emplace_back(secondBundleFile); + installRes = InstallThirdPartyMultipleBundles(filePaths, true); + EXPECT_EQ(installRes, ERR_APPEXECFWK_INSTALL_NOT_UNIQUE_DISTRO_MODULE_NAME); + + ClearBundleInfo(BUNDLE_NAME); +} + /** * @tc.number: MultipleHapsUpdateData_0100 * @tc.name: test to update hap. diff --git a/test/sceneProject/unittest/ohos_test/ohos_test.xml b/test/sceneProject/unittest/ohos_test/ohos_test.xml index e164719e16..4f7f49e883 100644 --- a/test/sceneProject/unittest/ohos_test/ohos_test.xml +++ b/test/sceneProject/unittest/ohos_test/ohos_test.xml @@ -232,6 +232,10 @@