jiyong@huawei.com

Signed-off-by: Njiyong <jiyong@huawei.com>
Change-Id: I1c620d4514c7dbb514cac2ab815893ae398b4def

aafwk/aafwk_standard/BUILD.gn

@@ -18,9 +18,9 @@ group("aafwk_standard") {
   if (is_standard_system) {
     deps = [
       "abilitymanager:actsabilitymanagertest",
-      #"context:context",
-      #"featureability:featureability",
-      #"want:want",
+      "context:context",
+      "featureability:featureability",
+      "want:want",
     ]
   }
 }

aafwk/aafwk_standard/context/BUILD.gn

@@ -16,6 +16,9 @@ import("//test/xts/tools/build/suite.gni")
 group("context") {
   testonly = true
   if (is_standard_system) {
-    deps = [ "actscontexttest:ActsContextTest" ]
+    deps = [
+      "actscontexttest:ActsContextTest",
+      "scene/defpermission:Defpermission",
+    ]
   }
 }

aafwk/aafwk_standard/context/actscontexttest/BUILD.gn

@@ -14,6 +14,18 @@
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("ActsContextTest") {
-  test_hap_name = "ActsContextTest"
-  hap_source_path = "hap/ActsContextTest.hap"
+  hap_profile = "./entry/src/main/config.json"
+  deps = [
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
+  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "ActsContextTest"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./entry/src/main/js/default"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./entry/src/main/js/resources" ]
+  hap_profile = "./entry/src/main/config.json"
 }

aafwk/aafwk_standard/context/actscontexttest/Test.json

@@ -9,7 +9,8 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsContextTest.hap"
+                "ActsContextTest.hap",
+                "DefPermission.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

aafwk/aafwk_standard/context/scene/defpermission/BUILD.gn

+# Copyright (C) 2021 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("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("Defpermission") {
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
+  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "Defpermission"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./src/main/js/default"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./src/main/js/resources" ]
+  hap_profile = "./src/main/config.json"
+}

aafwk/aafwk_standard/context/scene/defpermission/Test.json

+{
+    "description": "Configuration for hjunit demo Tests",
+}

aafwk/aafwk_standard/featureability/BUILD.gn

@@ -16,6 +16,15 @@ import("//test/xts/tools/build/suite.gni")
 group("featureability") {
   testonly = true
   if (is_standard_system) {
-    deps = [ "actsfeatureabilitytest:ActsFeatureAbilityTest" ]
+    deps = [
+      "actsfeatureabilitytest:ActsFeatureAbilityTest",
+      "sceneproject/finishwithresultemptytest:FinishWithResultEmptyTest",
+      "sceneproject/finishwithresultpromiseparameterstest:FinishWithResultPromiseParametersTest",
+      "sceneproject/finishwithresulttest:FinishWithResultTest",
+      "sceneproject/getcallingbundletest:GetCallingBundlePromiseTest",
+      "sceneproject/startability:StartAbility",
+      "sceneproject/startabilityforresult:StartAbilityForResult",
+      "sceneproject/terminateabilitytest:TerminateAbilityTest",
+    ]
   }
 }

aafwk/aafwk_standard/featureability/actsfeatureabilitytest/BUILD.gn

@@ -14,6 +14,18 @@
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("ActsFeatureAbilityTest") {
-  test_hap_name = "ActsFeatureAbilityTest"
-  hap_source_path = "hap/ActsFeatureAbilityTest.hap"
+  hap_profile = "./entry/src/main/config.json"
+  deps = [
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
+  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "ActsFeatureAbilityTest"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./entry/src/main/js/default"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./entry/src/main/js/resources" ]
+  hap_profile = "./entry/src/main/config.json"
 }

aafwk/aafwk_standard/featureability/actsfeatureabilitytest/Test.json

@@ -3,7 +3,7 @@
     "driver": {
         "type": "JSUnitTest",
         "test-timeout": "21600000",
-        "package": "com.example.actsfeatureabilitytest",
+        "package": "com.example.actsamscallbackfifthscene",
         "shell-timeout": "21600000"
     },
     "kits": [
@@ -13,6 +13,19 @@
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true
+        },
+        {
+            "type": "PushKit",
+            "push": [
+                "FinishWithResultEmptyTest.hap->/data/FinishWithResultEmptyTest.hap",
+                "FinishWithResultPromiseParametersTest.hap->/data/FinishWithResultPromiseParametersTest.hap",
+                "FinishWithResultTest.hap->/data/FinishWithResultTest.hap",
+                "GetCallingBundlePromiseTest.hap->/data/GetCallingBundlePromiseTest.hap",
+                "StartAbility.hap->/data/StartAbility.hap",
+                "StartAbilityForResult.hap->/data/StartAbilityForResult.hap",
+                "TerminateAbilityTest.hap->/data/TerminateAbilityTest.hap"
+            ]
+            
         }        
     ]
 }

aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/BUILD.gn

+# Copyright (C) 2021 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("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("FinishWithResultEmptyTest") {
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
+  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "FinishWithResultEmptyTest"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./src/main/js/default"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./src/main/js/resources" ]
+  hap_profile = "./src/main/config.json"
+}

aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/Test.json

+{
+    "description": "Configuration for hjunit demo Tests",
+}

aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/BUILD.gn

+# Copyright (C) 2021 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("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("FinishWithResultPromiseParametersTest") {
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
+  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "FinishWithResultPromiseParametersTest"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./src/main/js/default"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./src/main/js/resources" ]
+  hap_profile = "./src/main/config.json"
+}

aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/Test.json

+{
+    "description": "Configuration for hjunit demo Tests",
+}

aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/BUILD.gn

+# Copyright (C) 2021 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("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("FinishWithResultTest") {
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
+  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "FinishWithResultTest"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./src/main/js/default"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./src/main/js/resources" ]
+  hap_profile = "./src/main/config.json"
+}

aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/Test.json

+{
+    "description": "Configuration for hjunit demo Tests",
+}

aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/BUILD.gn

+# Copyright (C) 2021 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("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("GetCallingBundlePromiseTest") {
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
+  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "GetCallingBundlePromiseTest"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./src/main/js/default"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./src/main/js/resources" ]
+  hap_profile = "./src/main/config.json"
+}

aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/Test.json

+{
+    "description": "Configuration for hjunit demo Tests",
+}

aafwk/aafwk_standard/featureability/sceneproject/startability/BUILD.gn

+# Copyright (C) 2021 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("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("StartAbility") {
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
+  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "StartAbility"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./src/main/js/default"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./src/main/js/resources" ]
+  hap_profile = "./src/main/config.json"
+}

aafwk/aafwk_standard/featureability/sceneproject/startability/Test.json

+{
+    "description": "Configuration for hjunit demo Tests",
+}

aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/BUILD.gn

+# Copyright (C) 2021 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("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("StartAbilityForResult") {
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
+  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "StartAbilityForResult"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./src/main/js/default"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./src/main/js/resources" ]
+  hap_profile = "./src/main/config.json"
+}

aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/Test.json

+{
+    "description": "Configuration for hjunit demo Tests",
+}

aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/BUILD.gn

+# Copyright (C) 2021 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("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("TerminateAbilityTest") {
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
+  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "TerminateAbilityTest"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./src/main/js/default"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./src/main/js/resources" ]
+  hap_profile = "./src/main/config.json"
+}

aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/Test.json

+{
+    "description": "Configuration for hjunit demo Tests",
+}