!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')
\ No newline at end of file
+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')
\ No newline at end of file
+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')
\ No newline at end of file
+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')
\ No newline at end of file
+require('./ActsParticleAbilityTest.test.js')
\ No newline at end of file