jiyong@huawei.com

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

aafwk/aafwk_standard/BUILD.gn

@@ -18,8 +18,16 @@ group("aafwk_standard") {
   if (is_standard_system) {
     deps = [
       #"abilitymanager:actsabilitymanagertest",
+      "amsdatauriutils:amsDataUriUtils",
+      "amszipfileunzipfilest:amsZipfileUnzipfileST",
       "context:context",
       "featureability:featureability",
+      "fwkdataaccessor:FWKDataAccessor",
+      #"serviceability/actsparticleabilitytest:ActsParticleAbilityTest",
+      #"serviceability/sceneProject/particlestartability:ParticleStartAbility",
+      #"serviceability/sceneProject/particletestserver:ParticleTestServer",
+      "serviceability/stserviceabilityclient:amsStServiceAbilityClient",
+      "serviceability/stserviceabilityserver:amsStServiceAilityServer",
       "want:want",
     ]
   }

appexecfwk/ams_standard/fwkdataaccessor/Test.json → aafwk/aafwk_standard/fwkdataaccessor/Test.json

-{
-    "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "180000",
-        "package": "com.amsst.fwkdataaccessor",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "FWKDataAccessor.hap",
-               "amsStDataAbility.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-	]
-}
+{
+    "description": "Configuration for hjunit demo Tests",
+    "driver": {
+        "type": "JSUnitTest",
+        "test-timeout": "180000",
+        "package": "com.amsst.fwkdataaccessor",
+        "shell-timeout": "60000"
+    },
+    "kits": [
+        {
+            "test-file-name": [
+                "FWKDataAccessor.hap",
+               "amsStDataAbility.hap"
+            ],
+            "type": "AppInstallKit",
+            "cleanup-apps": true
+        }
+	]
+}

appexecfwk/BUILD.gn

@@ -16,9 +16,6 @@ import("//build/ohos_var.gni")
 group("appexecfwk") {
   testonly = true
   if (is_standard_system) {
-    deps = [
-      "ams_standard:ams_standard",
-      "bundle_standard:bundle_standard",
-    ]
+    deps = [ "bundle_standard:bundle_standard" ]
   }
 }

appexecfwk/ams_standard/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("//build/ohos_var.gni")
-
-group("ams_standard") {
-  testonly = true
-  if (is_standard_system) {
-    deps = [
-      "amsdatauriutils:amsDataUriUtils",
-      "amszipfileunzipfilest:amsZipfileUnzipfileST",
-      "fwkdataaccessor:FWKDataAccessor",
-      #"serviceability/actsparticleabilitytest:ActsParticleAbilityTest",
-      #"serviceability/sceneProject/particlestartability:ParticleStartAbility",
-      #"serviceability/sceneProject/particletestserver:ParticleTestServer",
-      "serviceability/stserviceabilityclient:amsStServiceAbilityClient",
-      "serviceability/stserviceabilityserver:amsStServiceAilityServer",
-    ]
-  }
-}

notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/Test.json

@@ -2,7 +2,7 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "500000",
+        "test-timeout": "60000",
         "package": "com.example.actssubscribertestorder",
         "shell-timeout": "60000"
     },

notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/entry/src/main/js/test/ActsSubscriber_test_ordered.js

@@ -150,9 +150,6 @@ describe('ActsSubscriberTestOrder', function () {
                 Subscriber.publish("publish_event0100", commonEventPublishData, publishCallback);
             });
         })
-        setTimeout(function (){
-            console.debug("===================ActsSubscriberTestOrder_0100 end==================");
-        }, 200000);
     })
 
     /*
@@ -259,9 +256,6 @@ describe('ActsSubscriberTestOrder', function () {
 
             });
         })
-        setTimeout(function (){
-            console.debug("===================ActsSubscriberTestOrder_0200 end==================");
-        }, 200000);
     })
 
     /*
@@ -369,10 +363,6 @@ describe('ActsSubscriberTestOrder', function () {
                 }
             });
         })
-
-        setTimeout(function (){
-            console.debug("===================ActsSubscriberTestOrder_0300 end==================");
-        }, 200000);
     })
 
     /*
@@ -456,10 +446,6 @@ describe('ActsSubscriberTestOrder', function () {
                 Subscriber.publish("publish_event0400", commonEventPublishData, publishCallback);
             })
         })
-
-        setTimeout(function (){
-            console.debug("===================ActsSubscriberTestOrder_0400 end==================");
-        }, 200000);
     })
 
     /*
@@ -539,9 +525,5 @@ describe('ActsSubscriberTestOrder', function () {
                 Subscriber.publish("publish_event0500", commonEventPublishData, publishCallback);
             })
         })
-
-        setTimeout(function (){
-            console.debug("===================ActsSubscriberTestOrder_0500 end==================");
-        }, 200000);
     })
 })

notification/ces_standard/subscribeandpublish/actssubscriberunordersystemtest/Test.json

@@ -2,7 +2,7 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "500000",
+        "test-timeout": "180000",
         "package": "com.example.actssubscribertestunordersystem",
         "shell-timeout": "60000"
     },

notification/ces_standard/subscribeandpublish/actssubscriberunordersystemtest/entry/src/main/js/test/ActsSubscriber_test_unorder.js

@@ -217,9 +217,6 @@ describe('ActsSubscriberTestUnorderSystem', async function (done) {
                 Subscriber.publish(commonEventSubscribeInfo.events[i], publishCallback);
             }
         })
-        setTimeout(function (){
-            console.debug("===================>ActsSubscriberTestUnorderSystem_0100 end==================");
-        }, 30000);
     })
 
     /*
@@ -295,9 +292,6 @@ describe('ActsSubscriberTestUnorderSystem', async function (done) {
                 Subscriber.publish(commonEventSubscribeInfo.events[i], publishCallback);
             }
         })
-        setTimeout(function (){
-            console.debug("===================>ActsSubscriberTestUnorderSystem_0200 end==================");
-        }, 30000);
     })
 })
 

notification/ces_standard/subscribeandpublish/actssubscriberunordertest/Test.json

@@ -2,7 +2,7 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "500000",
+        "test-timeout": "60000",
         "package": "com.example.actssubscribertestunorder",
         "shell-timeout": "60000"
     },

notification/ces_standard/subscribeandpublish/actssubscriberunordertest/entry/src/main/js/test/ActsSubscriber_test_unorder.js

@@ -82,10 +82,6 @@ describe('ActsSubscriberTestUnorder', async function (done) {
                 }, 1000);
             });
         })
-
-        setTimeout(function (){
-            console.debug("===================ActsSubscriberTestUnorder_0100 end==================");
-        }, 30000);
     })
 
     /*
@@ -124,10 +120,6 @@ describe('ActsSubscriberTestUnorder', async function (done) {
                 }, 1000);
             });
         })
-
-        setTimeout(function (){
-            console.debug("===================ActsSubscriberTestUnorder_0200 end==================");
-        }, 30000);
     })
 
     /*
@@ -180,9 +172,6 @@ describe('ActsSubscriberTestUnorder', async function (done) {
                 }, 1000);
             });
         })
-        setTimeout(function (){
-            console.debug("===================ActsSubscriberTestUnorder_0300 end==================");
-        }, 30000);
     })
 
     /*
@@ -230,10 +219,6 @@ describe('ActsSubscriberTestUnorder', async function (done) {
                 }, 1000);
             });
         })
-
-        setTimeout(function (){
-            console.debug("===================ActsSubscriberTestUnorder_0400 end==================");
-        }, 30000);
     })
 
     /*
@@ -288,10 +273,6 @@ describe('ActsSubscriberTestUnorder', async function (done) {
                 }, 1000);
             });
         })
-
-        setTimeout(function (){
-            console.debug("===================ActsSubscriberTestUnorder_0500 end==================");
-        }, 30000);
     })
 
     /*
@@ -342,10 +323,6 @@ describe('ActsSubscriberTestUnorder', async function (done) {
                 }, 1000);
             });
         })
-
-        setTimeout(function (){
-            console.debug("===================ActsSubscriberTestUnorder_0600 end==================");
-        }, 30000);
     })
 
     /*
@@ -389,10 +366,6 @@ describe('ActsSubscriberTestUnorder', async function (done) {
                 }, 1000);
             });
         });
-
-        setTimeout(function (){
-            console.debug("===================ActsSubscriberTestUnorder_0700 end==================");
-        }, 30000);
     })
 
     /*
@@ -502,11 +475,6 @@ describe('ActsSubscriberTestUnorder', async function (done) {
                 }, 1000);
             });
         });
-
-        setTimeout(function (){
-            console.debug("===================ActsSubscriberTestUnorder_0900 end==================");
-        }, 30000);
-
     })
 
     /*
@@ -601,10 +569,6 @@ describe('ActsSubscriberTestUnorder', async function (done) {
                 }, 1000);
             });
         });
-
-        setTimeout(function (){
-            console.debug("===================ActsSubscriberTestUnorder_1000 end==================");
-        }, 30000);
     })
 
     /*
@@ -644,10 +608,6 @@ describe('ActsSubscriberTestUnorder', async function (done) {
         }
 
         Subscriber.createSubscriber(commonEventSubscribeInfo, createSubscriber1100CallBack);
-
-        setTimeout(function (){
-            console.debug("===================ActsSubscriberTestUnorder_1100 end==================");
-        }, 30000);
     })
 
     /*
@@ -702,10 +662,6 @@ describe('ActsSubscriberTestUnorder', async function (done) {
        }
 
        Subscriber.createSubscriber(commonEventSubscribeInfo, createSubscriber1200CallBack);
-
-       setTimeout(function (){
-           console.debug("===================ActsSubscriberTestUnorder_1200 end==================");
-       }, 30000);
    })
 })