!1279 L2_master 目录调整+事件总体时间调整

Merge pull request !1279 from jiyong/master

aafwk/aafwk_standard/BUILD.gn

@@ -18,13 +18,26 @@ group("aafwk_standard") {
   if (is_standard_system) {
     deps = [
       "abilitymanager:actsabilitymanagertest",
+      "amsabilitymanager/amsMissionSnapshotTest:amsMissionSnapshotTest",
+      "amsabilitymanager/amsMissionSnapshotTestSingleton:amsMissionSnapshotTestSingleton",
+      "amsabilitymanager/amsMissionSnapshotTestSingletonS:amsMissionSnapshotTestSingletonS",
+      "amsdatauriutils:amsDataUriUtils",
+      "amszipfileunzipfilest:amsZipfileUnzipfileST",
       "context:context",
       "featureability:featureability",
       "formmanager:formmanager",
+      "fwkdataaccessor:FWKDataAccessor",
+
+      #"serviceability/actsparticleabilitytest:ActsParticleAbilityTest",
+      "serviceability/sceneProject/particlestartability:ParticleStartAbility",
+      "serviceability/sceneProject/particletestserver:ParticleTestServer",
+      "serviceability/stserviceabilityclient:amsStServiceAbilityClient",
+      "serviceability/stserviceabilityserver:amsStServiceAilityServer",
+      "serviceability/stserviceabilityserversecond:amsStServiceAilityServerSecond",
       "setshowonlockscreen:setshowonlockscreen",
-      "want:want",
 
-      #"verifypermission:verifypermission"
+      #"verifypermission:verifypermission",
+      "want:want",
     ]
   }
 }

appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/test/List.test.js → aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/test/List.test.js

@@ -12,4 +12,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-require('./DataUriUtilsJsSt.test.js')
+require('./amsMissionSnapshotTest.test.js')
\ No newline at end of file

appexecfwk/ams_standard/fwkdataaccessor/entry/src/main/js/test/List.test.js → aafwk/aafwk_standard/amsdatauriutils/entry/src/main/js/test/List.test.js

@@ -12,4 +12,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-require('./DataAbilityHelperJsSt.test.js')
+require('./DataUriUtilsJsSt.test.js')
\ No newline at end of file

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

@@ -10,7 +10,7 @@
         {
             "test-file-name": [
                 "FWKDataAccessor.hap",
-               "amsStDataAbility.hap"
+                "./resource/appexecfwk/amsStDataAbility.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

appexecfwk/ams_standard/amsabilitymanager/amsMissionSnapshotTest/entry/src/main/js/test/List.test.js → aafwk/aafwk_standard/fwkdataaccessor/entry/src/main/js/test/List.test.js

@@ -12,4 +12,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-require('./amsMissionSnapshotTest.test.js')
+require('./DataAbilityHelperJsSt.test.js')
\ No newline at end of file

appexecfwk/ams_standard/amsdatauriutils/entry/src/main/js/default/app.js → aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/app.js

@@ -19,4 +19,5 @@ export default {
     onDestroy() {
         console.info('AceApplication onDestroy');
     }
+
 };

appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/test/List.test.js → aafwk/aafwk_standard/serviceability/actsparticleabilitytest/entry/src/main/js/test/List.test.js

@@ -12,4 +12,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-require('./StServiceAbilityClient.test.js')
+require('./ActsParticleAbilityTest.test.js')
\ No newline at end of file

aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/src/main/js/default/app.js

+/*
+ * 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.
+ */
+export default {
+    onCreate() {
+        console.info('AceApplication onCreate');
+    },
+    onDestroy() {
+        console.info('AceApplication onDestroy');
+    }
+};

aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/app.js

+/*
+ * 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.
+ */
+export default {
+    onCreate() {
+        console.info('AceApplication onCreate');
+    },
+    onDestroy() {
+        console.info('AceApplication onDestroy');
+    }
+};

appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/test/List.test.js → aafwk/aafwk_standard/serviceability/stserviceabilityclient/entry/src/main/js/test/List.test.js

@@ -12,4 +12,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-require('./ActsParticleAbilityTest.test.js')
+require('./StServiceAbilityClient.test.js')
\ No newline at end of file

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 = [
-      "amsabilitymanager/amsMissionSnapshotTest:amsMissionSnapshotTest",
-      "amsabilitymanager/amsMissionSnapshotTestSingleton:amsMissionSnapshotTestSingleton",
-      "amsabilitymanager/amsMissionSnapshotTestSingletonS:amsMissionSnapshotTestSingletonS",
-      "amsdatauriutils:amsDataUriUtils",
-      "amszipfileunzipfilest:amsZipfileUnzipfileST",
-      "fwkdataaccessor:FWKDataAccessor",
-
-      #"serviceability/actsparticleabilitytest:ActsParticleAbilityTest",
-      "serviceability/sceneProject/particlestartability:ParticleStartAbility",
-      "serviceability/sceneProject/particletestserver:ParticleTestServer",
-      "serviceability/stserviceabilityclient:amsStServiceAbilityClient",
-      "serviceability/stserviceabilityserver:amsStServiceAilityServer",
-      "serviceability/stserviceabilityserversecond:amsStServiceAilityServerSecond",
-    ]
-  }
-}

appexecfwk/ams_standard/serviceability/actsparticleabilitytest/entry/src/main/js/default/app.js

-/*
- * 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.
- */
-export default {
-    onCreate() {
-        console.info('AceApplication onCreate');
-    },
-    onDestroy() {
-        console.info('AceApplication onDestroy');
-    }
-
-};

appexecfwk/ams_standard/serviceability/stserviceabilityclient/entry/src/main/js/default/app.js

-/*
- * 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.
- */
-export default {
-    onCreate() {
-        console.info('AceApplication onCreate');
-    },
-    onDestroy() {
-        console.info('AceApplication onDestroy');
-    }
-};

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/actssubscriberunordersystemtest/Test.json

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

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"
     },