IssueNo:#I587X1

Description:Form卡片测试用例目录调整

Sig:SIG_ApplicationFramework
Feature or Bugfix:Feature
Binary Source: No

Signed-off-by: dy_study <dingyao5@huawei.com>
Change-Id: If378db4637f8ec1d636c5e46e7f7ef9d547a054f

OAT.xml

@@ -62,8 +62,6 @@ Note:If the text contains special characters, please escape them according to th
         <filefilterlist>
             <filefilter name="defaultFilter" desc="Files not to check">
                 <filteritem type="filename" name="*.hap|*.rpk" desc="valid and invalid bundle files for tests"/>
-		<filteritem type="filename" name="zidl/test/zidlgen/zidl" desc="zild binary file"/>
-		<filteritem type="filepath" name="zidl/test/zidlgen/zidl" desc="zild binary file"/>
                 <filteritem type="filepath" name="figures/.*" desc="Self-developed image"/>
             </filefilter>
         </filefilterlist>

ability_base/LICENSE

@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

ability_base/test/BUILD.gn

@@ -46,7 +46,6 @@ config("want_private_config") {
     "//sdk/appexecfwk/appexecfwk_base/include",
     "${base_inner_api_path}/uri/include",
     "${base_inner_api_path}/want/include",
-    "${appexecfwk_path}/common/log/include",
   ]
 
   defines = [
@@ -101,7 +100,6 @@ ohos_unittest("patterns_matcher_test") {
   ]
 
   deps = [
-    "${appexecfwk_path}/common:libappexecfwk_common",
     "${base_path}:base",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
@@ -124,7 +122,6 @@ ohos_unittest("skills_test") {
   ]
 
   deps = [
-    "${appexecfwk_path}/common:libappexecfwk_common",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
   ]
@@ -148,7 +145,6 @@ ohos_unittest("want_params_test") {
   ]
 
   deps = [
-    "${appexecfwk_path}/common:libappexecfwk_common",
     "${base_path}:base",
     "${base_path}:want",
     "//third_party/googletest:gtest_main",
@@ -169,7 +165,6 @@ ohos_unittest("want_params_wrapper_test") {
   configs = [ ":module_private_want_param_wrapper_config" ]
 
   deps = [
-    "${appexecfwk_path}/common:libappexecfwk_common",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
   ]
@@ -194,7 +189,6 @@ ohos_unittest("want_test") {
   ]
 
   deps = [
-    "${appexecfwk_path}/common:libappexecfwk_common",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
   ]

form_runtime/BUILD.gn

@@ -27,7 +27,6 @@ ohos_shared_library("libfms") {
   include_dirs = [
     "${services_path}/common:perm_verification",
     "${aafwk_path}/services/common/include",
-    "${appexecfwk_path}/common/log/include",
     "${kits_path}/appkit/native/ability_runtime",
   ]
   sources = [

form_runtime/LICENSE

@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

form_runtime/test/BUILD.gn

@@ -19,10 +19,7 @@ config("formmgr_test_config") {
     "mock/include",
   ]
 
-  configs = [
+  configs = [ "${form_runtime_path}:formmgr_config" ]
-    "${form_runtime_path}:formmgr_config",
-    "${appexecfwk_path}/common:appexecfwk_common_config",
-  ]
 }
 
 public_configs = [
@@ -31,7 +28,6 @@ public_configs = [
 ]
 
 public_deps = [
-  "${appexecfwk_path}/common:libappexecfwk_common",
   "//third_party/googletest:gmock_main",
   "//third_party/googletest:gtest_main",
   "//utils/native/base:utils",
@@ -64,3 +60,9 @@ group("unittest") {
     "unittest/fms_form_timer_mgr_test:unittest",
   ]
 }
+
+group("systemtest") {
+  testonly = true
+
+  deps = [ "systemtest:systemtest" ]
+}

form_runtime/test/benchmarktest/BUILD.gn

@@ -0,0 +1,27 @@
+# Copyright (c) 2022 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//foundation/aafwk/standard/aafwk.gni")
+
+group("benchmarktest") {
+  testonly = true
+
+  deps = []
+
+  if (ability_runtime_graphics) {
+    deps += [
+      # deps file
+      "form_manager_test:benchmarktest",
+    ]
+  }
+}

form_runtime/test/fuzztest/BUILD.gn

@@ -0,0 +1,24 @@
+# Copyright (c) 2022 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//foundation/aafwk/standard/aafwk.gni")
+
+group("fuzztest") {
+  testonly = true
+
+  deps = []
+
+  if (ability_runtime_graphics) {
+    deps += [ "formmanager_fuzzer:fuzztest" ]
+  }
+}

form_runtime/test/resource/formsystemtestability/fmsSystemPerformance/BUILD.gn

@@ -17,13 +17,12 @@ config("fmsSystemPerformanceConfig") {
   include_dirs = [
     "include",
     "../tool/include",
-    "${appexecfwk_path}/test/systemtest/common/fms/common/include",
+    "test/systemtest/common/fms/common/include",
     "${aafwk_path}/interfaces/innerkits/ability_manager/include",
     "${base_inner_api_path}/uri/include",
     "${base_inner_api_path}/want/include",
     "${aafwk_path}/services/abilitymgr/include",
     "${aafwk_path}/services/common/include",
-    "${appexecfwk_path}/common/log/include",
     "${appexecfwk_innerkits_path}/libeventhandler/include",
     "${aafwk_path}/frameworks/kits/appkit/native/app",
     "${appexecfwk_path}/services/bundlemgr/include",
@@ -51,7 +50,6 @@ ohos_shared_library("fmsSystemPerformance") {
     "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager",
     "${aafwk_path}/interfaces/innerkits/app_manager:app_manager",
     "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base",
-    "${appexecfwk_path}/common:libappexecfwk_common",
     "${appexecfwk_path}/services/bundlemgr:libbms",
     "//third_party/jsoncpp:jsoncpp",
     "//utils/native/base:utilsbase",

form_runtime/test/resource/formsystemtestability/fmsSystemStress/BUILD.gn

@@ -17,13 +17,12 @@ config("fmsSystemStressConfig") {
   include_dirs = [
     "include",
     "../tool/include",
-    "${appexecfwk_path}/test/systemtest/common/fms/common/include",
+    "test/systemtest/common/fms/common/include",
     "${aafwk_path}/interfaces/innerkits/ability_manager/include",
     "${base_inner_api_path}/uri/include",
     "${base_inner_api_path}/want/include",
     "${aafwk_path}/services/abilitymgr/include",
     "${aafwk_path}/services/common/include",
-    "${appexecfwk_path}/common/log/include",
     "${appexecfwk_innerkits_path}/libeventhandler/include",
     "${aafwk_path}/frameworks/kits/appkit/native/app",
     "${appexecfwk_path}/services/bundlemgr/include",
@@ -51,7 +50,6 @@ ohos_shared_library("fmsSystemStress") {
     "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager",
     "${aafwk_path}/interfaces/innerkits/app_manager:app_manager",
     "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base",
-    "${appexecfwk_path}/common:libappexecfwk_common",
     "${appexecfwk_path}/services/bundlemgr:libbms",
     "//third_party/jsoncpp:jsoncpp",
     "//utils/native/base:utilsbase",

form_runtime/test/resource/formsystemtestability/fmsSystemTestHostCommonA/BUILD.gn

@@ -17,13 +17,12 @@ config("fmsSystemTestHostCommonAConfig") {
   include_dirs = [
     "include",
     "../tool/include",
-    "${appexecfwk_path}/test/systemtest/common/fms/common/include",
+    "test/systemtest/common/fms/common/include",
     "${aafwk_path}/interfaces/innerkits/ability_manager/include",
     "${base_inner_api_path}/uri/include",
     "${base_inner_api_path}/want/include",
     "${aafwk_path}/services/abilitymgr/include",
     "${aafwk_path}/services/common/include",
-    "${appexecfwk_path}/common/log/include",
     "${appexecfwk_innerkits_path}/libeventhandler/include",
     "${aafwk_path}/frameworks/kits/appkit/native/app",
     "${appexecfwk_path}/services/bundlemgr/include",
@@ -38,10 +37,10 @@ config("fmsSystemTestHostCommonAConfig") {
 }
 ohos_shared_library("fmsSystemTestHostCommonA") {
   sources = [
-    "${appexecfwk_path}/test/systemtest/common/fms/common/src/form_event.cpp",
-    "${appexecfwk_path}/test/systemtest/common/fms/common/src/system_test_form_util.cpp",
     "../tool/src/form_test_utils.cpp",
     "src/form_ability_commona.cpp",
+    "test/systemtest/common/fms/common/src/form_event.cpp",
+    "test/systemtest/common/fms/common/src/system_test_form_util.cpp",
   ]
   cflags = []
   if (target_cpu == "arm") {
@@ -57,7 +56,6 @@ ohos_shared_library("fmsSystemTestHostCommonA") {
     "${aafwk_path}/frameworks/kits/appkit:appkit_native",
     "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager",
     "${aafwk_path}/services/abilitymgr:abilityms",
-    "${appexecfwk_path}/common:libappexecfwk_common",
     "${appexecfwk_path}/services/bundlemgr:libbms",
     "//third_party/jsoncpp:jsoncpp",
     "//utils/native/base:utilsbase",

form_runtime/test/resource/formsystemtestability/fmsSystemTestHostCommonB/BUILD.gn

@@ -17,13 +17,12 @@ config("fmsSystemTestHostCommonBConfig") {
   include_dirs = [
     "include",
     "../tool/include",
-    "${appexecfwk_path}/test/systemtest/common/fms/common/include",
+    "test/systemtest/common/fms/common/include",
     "${aafwk_path}/interfaces/innerkits/ability_manager/include",
     "${base_inner_api_path}/uri/include",
     "${base_inner_api_path}/want/include",
     "${aafwk_path}/services/abilitymgr/include",
     "${aafwk_path}/services/common/include",
-    "${appexecfwk_path}/common/log/include",
     "${appexecfwk_innerkits_path}/libeventhandler/include",
     "${aafwk_path}/frameworks/kits/appkit/native/app",
     "${appexecfwk_path}/services/bundlemgr/include",
@@ -38,10 +37,10 @@ config("fmsSystemTestHostCommonBConfig") {
 }
 ohos_shared_library("fmsSystemTestHostCommonB") {
   sources = [
-    "${appexecfwk_path}/test/systemtest/common/fms/common/src/form_event.cpp",
-    "${appexecfwk_path}/test/systemtest/common/fms/common/src/system_test_form_util.cpp",
     "../tool/src/form_test_utils.cpp",
     "src/form_ability_commonb.cpp",
+    "test/systemtest/common/fms/common/src/form_event.cpp",
+    "test/systemtest/common/fms/common/src/system_test_form_util.cpp",
   ]
   cflags = []
   if (target_cpu == "arm") {
@@ -57,7 +56,6 @@ ohos_shared_library("fmsSystemTestHostCommonB") {
     "${aafwk_path}/frameworks/kits/appkit:appkit_native",
     "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager",
     "${aafwk_path}/services/abilitymgr:abilityms",
-    "${appexecfwk_path}/common:libappexecfwk_common",
     "${appexecfwk_path}/services/bundlemgr:libbms",
     "//third_party/jsoncpp:jsoncpp",
     "//utils/native/base:utilsbase",

form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNoPerm/BUILD.gn

@@ -17,13 +17,12 @@ config("fmsSystemTestHostNoPermConfig") {
   include_dirs = [
     "include",
     "../tool/include",
-    "${appexecfwk_path}/test/systemtest/common/fms/common/include",
+    "test/systemtest/common/fms/common/include",
     "${aafwk_path}/interfaces/innerkits/ability_manager/include",
     "${base_inner_api_path}/uri/include",
     "${base_inner_api_path}/want/include",
     "${aafwk_path}/services/abilitymgr/include",
     "${aafwk_path}/services/common/include",
-    "${appexecfwk_path}/common/log/include",
     "${appexecfwk_innerkits_path}/libeventhandler/include",
     "${aafwk_path}/frameworks/kits/appkit/native/app",
     "${appexecfwk_path}/services/bundlemgr/include",
@@ -51,7 +50,6 @@ ohos_shared_library("fmsSystemTestHostNoPerm") {
     "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager",
     "${aafwk_path}/interfaces/innerkits/app_manager:app_manager",
     "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base",
-    "${appexecfwk_path}/common:libappexecfwk_common",
     "${appexecfwk_path}/services/bundlemgr:libbms",
     "//third_party/jsoncpp:jsoncpp",
     "//utils/native/base:utilsbase",

form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormal/BUILD.gn

@@ -17,13 +17,12 @@ config("fmsSystemTestHostNormalConfig") {
   include_dirs = [
     "include",
     "../tool/include",
-    "${appexecfwk_path}/test/systemtest/common/fms/common/include",
+    "test/systemtest/common/fms/common/include",
     "${aafwk_path}/interfaces/innerkits/ability_manager/include",
     "${base_inner_api_path}/uri/include",
     "${base_inner_api_path}/want/include",
     "${aafwk_path}/services/abilitymgr/include",
     "${aafwk_path}/services/common/include",
-    "${appexecfwk_path}/common/log/include",
     "${appexecfwk_innerkits_path}/libeventhandler/include",
     "${aafwk_path}/frameworks/kits/appkit/native/app",
     "${appexecfwk_path}/services/bundlemgr/include",
@@ -38,12 +37,12 @@ config("fmsSystemTestHostNormalConfig") {
 }
 ohos_shared_library("fmsSystemTestHostNormal") {
   sources = [
-    "${appexecfwk_path}/test/systemtest/common/fms/common/src/form_event.cpp",
-    "${appexecfwk_path}/test/systemtest/common/fms/common/src/system_test_form_util.cpp",
     "../tool/src/form_test_utils.cpp",
     "src/form_ability_a.cpp",
     "src/form_ability_deleteform.cpp",
     "src/form_ability_releaseform.cpp",
+    "test/systemtest/common/fms/common/src/form_event.cpp",
+    "test/systemtest/common/fms/common/src/system_test_form_util.cpp",
   ]
   cflags = []
   if (target_cpu == "arm") {
@@ -59,7 +58,6 @@ ohos_shared_library("fmsSystemTestHostNormal") {
     "${aafwk_path}/frameworks/kits/appkit:appkit_native",
     "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager",
     "${aafwk_path}/services/abilitymgr:abilityms",
-    "${appexecfwk_path}/common:libappexecfwk_common",
     "${appexecfwk_path}/services/bundlemgr:libbms",
     "//third_party/jsoncpp:jsoncpp",
     "//utils/native/base:utilsbase",

form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormalB/BUILD.gn

@@ -17,13 +17,12 @@ config("fmsSystemTestHostNormalBConfig") {
   include_dirs = [
     "include",
     "../tool/include",
-    "${appexecfwk_path}/test/systemtest/common/fms/common/include",
+    "test/systemtest/common/fms/common/include",
     "${aafwk_path}/interfaces/innerkits/ability_manager/include",
     "${base_inner_api_path}/uri/include",
     "${base_inner_api_path}/want/include",
     "${aafwk_path}/services/abilitymgr/include",
     "${aafwk_path}/services/common/include",
-    "${appexecfwk_path}/common/log/include",
     "${appexecfwk_innerkits_path}/libeventhandler/include",
     "${aafwk_path}/frameworks/kits/appkit/native/app",
     "${appexecfwk_path}/services/bundlemgr/include",
@@ -38,10 +37,10 @@ config("fmsSystemTestHostNormalBConfig") {
 }
 ohos_shared_library("fmsSystemTestHostNormalB") {
   sources = [
-    "${appexecfwk_path}/test/systemtest/common/fms/common/src/form_event.cpp",
-    "${appexecfwk_path}/test/systemtest/common/fms/common/src/system_test_form_util.cpp",
     "../tool/src/form_test_utils.cpp",
     "src/form_ability_b.cpp",
+    "test/systemtest/common/fms/common/src/form_event.cpp",
+    "test/systemtest/common/fms/common/src/system_test_form_util.cpp",
   ]
   cflags = []
   if (target_cpu == "arm") {
@@ -57,7 +56,6 @@ ohos_shared_library("fmsSystemTestHostNormalB") {
     "${aafwk_path}/frameworks/kits/appkit:appkit_native",
     "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager",
     "${aafwk_path}/services/abilitymgr:abilityms",
-    "${appexecfwk_path}/common:libappexecfwk_common",
     "${appexecfwk_path}/services/bundlemgr:libbms",
     "//third_party/jsoncpp:jsoncpp",
     "//utils/native/base:utilsbase",

form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNormalC/BUILD.gn

@@ -17,13 +17,12 @@ config("fmsSystemTestHostNormalCConfig") {
   include_dirs = [
     "include",
     "../tool/include",
-    "${appexecfwk_path}/test/systemtest/common/fms/common/include",
+    "test/systemtest/common/fms/common/include",
     "${aafwk_path}/interfaces/innerkits/ability_manager/include",
     "${base_inner_api_path}/uri/include",
     "${base_inner_api_path}/want/include",
     "${aafwk_path}/services/abilitymgr/include",
     "${aafwk_path}/services/common/include",
-    "${appexecfwk_path}/common/log/include",
     "${appexecfwk_innerkits_path}/libeventhandler/include",
     "${aafwk_path}/frameworks/kits/appkit/native/app",
     "${appexecfwk_path}/services/bundlemgr/include",
@@ -38,10 +37,10 @@ config("fmsSystemTestHostNormalCConfig") {
 }
 ohos_shared_library("fmsSystemTestHostNormalC") {
   sources = [
-    "${appexecfwk_path}/test/systemtest/common/fms/common/src/form_event.cpp",
-    "${appexecfwk_path}/test/systemtest/common/fms/common/src/system_test_form_util.cpp",
     "../tool/src/form_test_utils.cpp",
     "src/form_ability_c.cpp",
+    "test/systemtest/common/fms/common/src/form_event.cpp",
+    "test/systemtest/common/fms/common/src/system_test_form_util.cpp",
   ]
   cflags = []
   if (target_cpu == "arm") {
@@ -57,7 +56,6 @@ ohos_shared_library("fmsSystemTestHostNormalC") {
     "${aafwk_path}/frameworks/kits/appkit:appkit_native",
     "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager",
     "${aafwk_path}/services/abilitymgr:abilityms",
-    "${appexecfwk_path}/common:libappexecfwk_common",
     "${appexecfwk_path}/services/bundlemgr:libbms",
     "//third_party/jsoncpp:jsoncpp",
     "//utils/native/base:utilsbase",

form_runtime/test/resource/formsystemtestability/fmsSystemTestHostNotSys/BUILD.gn

@@ -17,13 +17,12 @@ config("fmsSystemTestHostNotSysConfig") {
   include_dirs = [
     "include",
     "../tool/include",
-    "${appexecfwk_path}/test/systemtest/common/fms/common/include",
+    "test/systemtest/common/fms/common/include",
     "${aafwk_path}/interfaces/innerkits/ability_manager/include",
     "${base_inner_api_path}/uri/include",
     "${base_inner_api_path}/want/include",
     "${aafwk_path}/services/abilitymgr/include",
     "${aafwk_path}/services/common/include",
-    "${appexecfwk_path}/common/log/include",
     "${appexecfwk_innerkits_path}/libeventhandler/include",
     "${aafwk_path}/frameworks/kits/appkit/native/app",
     "${appexecfwk_path}/services/bundlemgr/include",
@@ -51,7 +50,6 @@ ohos_shared_library("fmsSystemTestHostNotSys") {
     "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager",
     "${aafwk_path}/interfaces/innerkits/app_manager:app_manager",
     "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base",
-    "${appexecfwk_path}/common:libappexecfwk_common",
     "${appexecfwk_path}/services/bundlemgr:libbms",
     "//third_party/jsoncpp:jsoncpp",
     "//utils/native/base:utilsbase",

form_runtime/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostA/BUILD.gn

@@ -17,13 +17,12 @@ config("selfStartingTestHostAConfig") {
   include_dirs = [
     "include",
     "../../tool/include",
-    "${appexecfwk_path}/test/systemtest/common/fms/common/include",
+    "test/systemtest/common/fms/common/include",
     "${aafwk_path}/interfaces/innerkits/ability_manager/include",
     "${base_inner_api_path}/uri/include",
     "${base_inner_api_path}/want/include",
     "${aafwk_path}/services/abilitymgr/include",
     "${aafwk_path}/services/common/include",
-    "${appexecfwk_path}/common/log/include",
     "${appexecfwk_innerkits_path}/libeventhandler/include",
     "${aafwk_path}/frameworks/kits/appkit/native/app",
     "${appexecfwk_path}/services/bundlemgr/include",
@@ -51,7 +50,6 @@ ohos_shared_library("selfStartingTestHostA") {
     "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager",
     "${aafwk_path}/interfaces/innerkits/app_manager:app_manager",
     "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base",
-    "${appexecfwk_path}/common:libappexecfwk_common",
     "${appexecfwk_path}/services/bundlemgr:libbms",
     "//third_party/jsoncpp:jsoncpp",
     "//utils/native/base:utilsbase",

form_runtime/test/resource/formsystemtestability/fmsSystemTestSelfStarting/selfStartingTestHostB/BUILD.gn

@@ -17,13 +17,12 @@ config("selfStartingTestHostBConfig") {
   include_dirs = [
     "include",
     "../../tool/include",
-    "${appexecfwk_path}/test/systemtest/common/fms/common/include",
+    "test/systemtest/common/fms/common/include",
     "${aafwk_path}/interfaces/innerkits/ability_manager/include",
     "${base_inner_api_path}/uri/include",
     "${base_inner_api_path}/want/include",
     "${aafwk_path}/services/abilitymgr/include",
     "${aafwk_path}/services/common/include",
-    "${appexecfwk_path}/common/log/include",
     "${appexecfwk_innerkits_path}/libeventhandler/include",
     "${aafwk_path}/frameworks/kits/appkit/native/app",
     "${appexecfwk_path}/services/bundlemgr/include",
@@ -51,7 +50,6 @@ ohos_shared_library("selfStartingTestHostB") {
     "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager",
     "${aafwk_path}/interfaces/innerkits/app_manager:app_manager",
     "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base",
-    "${appexecfwk_path}/common:libappexecfwk_common",
     "${appexecfwk_path}/services/bundlemgr:libbms",
     "//third_party/jsoncpp:jsoncpp",
     "//utils/native/base:utilsbase",

form_runtime/test/resource/formsystemtestability/formSystemTestServiceA/BUILD.gn

@@ -12,7 +12,8 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-subdemosystem_path = "${appexecfwk_path}/test/resource/formsystemtestability/formSystemTestServiceA"
+subdemosystem_path =
+    "test/resource/formsystemtestability/formSystemTestServiceA"
 config("formSystemTestAConfig") {
   visibility = [ ":*" ]
   include_dirs = [
@@ -25,7 +26,6 @@ config("formSystemTestAConfig") {
     "${appexecfwk_path}/services/bundlemgr/include",
     "${aafwk_path}/services/abilitymgr/include",
     "${aafwk_path}/services/common/include",
-    "${appexecfwk_path}/common/log/include",
     "${even_path}/cesfwk/innerkits/include",
     "${even_path}/cesfwk/kits/native/include",
   ]
@@ -43,7 +43,6 @@ ohos_shared_library("formSystemTestServiceA") {
     "${aafwk_path}/interfaces/innerkits/app_manager:app_manager",
     "${aafwk_path}/services/abilitymgr:abilityms",
     "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base",
-    "${appexecfwk_path}/common:libappexecfwk_common",
     "${appexecfwk_path}/services/bundlemgr:libbms",
     "${base_path}:want",
     "//utils/native/base:utilsbase",

form_runtime/test/resource/formsystemtestability/formSystemTestServiceB/BUILD.gn

@@ -12,7 +12,8 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-subdemosystem_path = "${appexecfwk_path}/test/resource/formsystemtestability/formSystemTestServiceB"
+subdemosystem_path =
+    "test/resource/formsystemtestability/formSystemTestServiceB"
 config("formSystemTestBConfig") {
   visibility = [ ":*" ]
   include_dirs = [
@@ -25,7 +26,6 @@ config("formSystemTestBConfig") {
     "${appexecfwk_path}/services/bundlemgr/include",
     "${aafwk_path}/services/abilitymgr/include",
     "${aafwk_path}/services/common/include",
-    "${appexecfwk_path}/common/log/include",
     "${even_path}/cesfwk/innerkits/include",
     "${even_path}/cesfwk/kits/native/include",
   ]
@@ -43,7 +43,6 @@ ohos_shared_library("formSystemTestServiceB") {
     "${aafwk_path}/interfaces/innerkits/app_manager:app_manager",
     "${aafwk_path}/services/abilitymgr:abilityms",
     "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base",
-    "${appexecfwk_path}/common:libappexecfwk_common",
     "${appexecfwk_path}/services/bundlemgr:libbms",
     "${base_path}:want",
     "//utils/native/base:utilsbase",

form_runtime/test/resource/formsystemtestability/formSystemTestServiceC/BUILD.gn

@@ -12,7 +12,8 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-subdemosystem_path = "${appexecfwk_path}/test/resource/formsystemtestability/formSystemTestServiceC"
+subdemosystem_path =
+    "test/resource/formsystemtestability/formSystemTestServiceC"
 config("formSystemTestCConfig") {
   visibility = [ ":*" ]
   include_dirs = [
@@ -25,7 +26,6 @@ config("formSystemTestCConfig") {
     "${appexecfwk_path}/services/bundlemgr/include",
     "${aafwk_path}/services/abilitymgr/include",
     "${aafwk_path}/services/common/include",
-    "${appexecfwk_path}/common/log/include",
     "${even_path}/cesfwk/innerkits/include",
     "${even_path}/cesfwk/kits/native/include",
   ]
@@ -43,7 +43,6 @@ ohos_shared_library("formSystemTestServiceC") {
     "${aafwk_path}/interfaces/innerkits/app_manager:app_manager",
     "${aafwk_path}/services/abilitymgr:abilityms",
     "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base",
-    "${appexecfwk_path}/common:libappexecfwk_common",
     "${appexecfwk_path}/services/bundlemgr:libbms",
     "${base_path}:want",
     "//utils/native/base:utilsbase",

form_runtime/test/resource/formsystemtestability/formSystemTestServiceD/BUILD.gn

@@ -12,7 +12,8 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-subdemosystem_path = "${appexecfwk_path}/test/resource/formsystemtestability/formSystemTestServiceD"
+subdemosystem_path =
+    "test/resource/formsystemtestability/formSystemTestServiceD"
 config("formSystemTestDConfig") {
   visibility = [ ":*" ]
   include_dirs = [
@@ -25,7 +26,6 @@ config("formSystemTestDConfig") {
     "${appexecfwk_path}/services/bundlemgr/include",
     "${aafwk_path}/services/abilitymgr/include",
     "${aafwk_path}/services/common/include",
-    "${appexecfwk_path}/common/log/include",
     "${even_path}/cesfwk/innerkits/include",
     "${even_path}/cesfwk/kits/native/include",
   ]
@@ -43,7 +43,6 @@ ohos_shared_library("formSystemTestServiceD") {
     "${aafwk_path}/interfaces/innerkits/app_manager:app_manager",
     "${aafwk_path}/services/abilitymgr:abilityms",
     "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base",
-    "${appexecfwk_path}/common:libappexecfwk_common",
     "${appexecfwk_path}/services/bundlemgr:libbms",
     "${base_path}:want",
     "//utils/native/base:utilsbase",

form_runtime/test/resource/formsystemtestability/formSystemTestServiceE/BUILD.gn

@@ -12,7 +12,8 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-subdemosystem_path = "${appexecfwk_path}/test/resource/formsystemtestability/formSystemTestServiceE"
+subdemosystem_path =
+    "test/resource/formsystemtestability/formSystemTestServiceE"
 config("formSystemTestEConfig") {
   visibility = [ ":*" ]
   include_dirs = [
@@ -25,7 +26,6 @@ config("formSystemTestEConfig") {
     "${appexecfwk_path}/services/bundlemgr/include",
     "${aafwk_path}/services/abilitymgr/include",
     "${aafwk_path}/services/common/include",
-    "${appexecfwk_path}/common/log/include",
     "${even_path}/cesfwk/innerkits/include",
     "${even_path}/cesfwk/kits/native/include",
   ]
@@ -43,7 +43,6 @@ ohos_shared_library("formSystemTestServiceE") {
     "${aafwk_path}/interfaces/innerkits/app_manager:app_manager",
     "${aafwk_path}/services/abilitymgr:abilityms",
     "${appexecfwk_inner_api_path}/appexecfwk_base:appexecfwk_base",
-    "${appexecfwk_path}/common:libappexecfwk_common",
     "${appexecfwk_path}/services/bundlemgr:libbms",
     "${base_path}:want",
     "//utils/native/base:utilsbase",

form_runtime/test/systemtest/BUILD.gn

@@ -12,6 +12,7 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
+import("//foundation/aafwk/standard/aafwk.gni")
 
 config("form_manager_test_config") {
   defines = [