!2797 XTS测试套名字整改

Merge pull request !2797 from chengxingzhen/master

aafwk/aafwk_standard/BUILD.gn

@@ -17,15 +17,14 @@ group("aafwk_standard") {
   testonly = true
   if (is_standard_system) {
     deps = [
-      "ActsAbilityDelegatorCaseTest:ActsAbilityDelegatorCaseTest",
-      "ActsAbilityLifecycleStateNewTest:ActsAbilityLifecycleStateNewTest",
-      "ActsDataAbilityJsTest:ActsDataAbilityJsTest",
-      "ActsKillProcessWithAccountApi7:ActsKillProcessWithAccountApi7",
-      "ActsStServiceAbilityClientCaseTest:ActsStServiceAbilityClientCaseTest",
       "abilitymanager:actsabilitymanagertest",
+      "actsabilitydelegatorcase:ActsAbilityDelegatorCaseTest",
       "actsabilitydistributetest:ActsAbilityDistributeTest",
-      "actsabilitydistributetest:ActsAbilityDistributeTest",
+      "actsabilitylifecyclestatenew:ActsAbilityLifecycleStateNewTest",
       "actsabilitymanageretstest:ActsAbilityManagerEtsTest",
+      "actsdataabilityjs:ActsDataAbilityJsTest",
+      "actskillprocesswithaccount:ActsKillProcessWithAccountApi7Test",
+      "actsstserviceabilityclientcase:ActsStServiceAbilityClientCaseTest",
       "amsabilitymanager/amsMissionSnapshotTest:ActsAmsMissionSnapshotTest",
       "amsabilitymanager/amsMissionSnapshotTestSingleton:ActsAmsMissionSnapshotTestSingleton",
       "amsabilitymanager/amsMissionSnapshotTestSingletonS:ActsAmsMissionSnapshotTestSingletonS",
@@ -54,10 +53,6 @@ group("aafwk_standard") {
       "featureability:featureability",
       "formmanager:formmanager",
       "lanuageConfigapi7:lanuageConfigapi7",
-      "serviceability/sceneProject/particlestartability:ParticleStartAbility",
-      "serviceability/sceneProject/particletestserver:ParticleTestServer",
-      "serviceability/stserviceabilityserver:amsStServiceAilityServer",
-      "serviceability/stserviceabilityserversecond:ActsAmsStServiceAilityServerSecondTest",
       "setshowonlockscreen:setshowonlockscreen",
       "want:want",
     ]

aafwk/aafwk_standard/ActsDataAbilityJsTest/entry/src/main/js/test/ActsDataAbilityJsTest.test.js → aafwk/aafwk_standard/actsdataabilityjs/entry/src/main/js/test/ActsDataAbilityJsTest.test.js

@@ -727,7 +727,7 @@ it('ACTS_ARelease_0100', 0, async function (done) {
 it("ACTS_Call_0100", 0, async function (done) {
     console.log('ACTS_Call_0100  start......');
     var pacMap = {
-        'group_name': 'test1',
+        'groupName': 'test1',
         'ringtone_modify_time': 28
     };
     var rDAHelper
@@ -735,7 +735,7 @@ it("ACTS_Call_0100", 0, async function (done) {
         rDAHelper = featureAbility.acquireDataAbilityHelper(dataAbilityUri);
         console.debug('ACTS_AbeforeAll rDAHelper ====>: ' + rDAHelper + " ,JSON. " + JSON.stringify(rDAHelper));
         expect(typeof (rDAHelper)).assertEqual("object");
-        pacMap.group_name = 'test2';
+        pacMap.groupName = 'test2';
         rDAHelper.call(dataAbilityUri, 'insert', '', pacMap).then((data) => {
             console.info('ACTS_Call_0100 succeeded   data: ' + JSON.stringify(data));
         }).catch((error) => {
@@ -759,10 +759,10 @@ it("ACTS_Call_0100", 0, async function (done) {
  */
 it("ACTS_Call_0200", 0, async function (done) {
     console.log('ACTS_Call_0200 start......');
-    var arg = "{\"equalTo\": \"group_name\"}";
+    var arg = "{\"equalTo\": \"groupName\"}";
     var pacMap = {
-        "group_name": "test1",
-        "columns": "group_name,ringtone_modify_time"
+        "groupName": "test1",
+        "columns": "groupName,ringtone_modify_time"
     };
     var rDAHelper
     try {
@@ -794,7 +794,7 @@ it("ACTS_Call_0300", 0, async function (done) {
     var arg = "{\"equalTo\": \"ringtone_modify_time\"}";
     var pacMap = {
         'ringtone_modify_time': 28,
-        'group_name': 'testupdata1'
+        'groupName': 'testupdata1'
     };
     var rDAHelper
     try {

aafwk/aafwk_standard/ActsKillProcessWithAccountApi7/BUILD.gn → aafwk/aafwk_standard/actskillprocesswithaccount/BUILD.gn

@@ -13,12 +13,12 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-group("ActsKillProcessWithAccountApi7") {
+group("ActsKillProcessWithAccountApi7Test") {
   testonly = true
   if (is_standard_system) {
     deps = [
-      "ActsKillProcessWithAccountApi7Test:ActsKillProcessWithAccountApi7Test",
-      "ActsKillProcessWithAccountCloseApi7:ActsKillProcessWithAccountCloseApi7",
+      "actskillprocesswithaccountapi7:ActsKillProcessWithAccountApi7Test",
+      "actskillprocesswithaccountclose:ActsKillProcessWithAccountCloseApi7",
     ]
   }
 }

aafwk/aafwk_standard/amsprocessmanageapi7/BUILD.gn

@@ -17,7 +17,7 @@ group("amsprocessmanageapi7") {
   testonly = true
   if (is_standard_system) {
     deps = [
-      "actsprocessmanagejstest:ActsAmsProcessManageJsTestApi7",
+      "actsprocessmanagejstest:ActsAmsProcessManageJsApi7Test",
       "pmsystemappa:ActsAmsProcessManageSystemAppAApi7",
       "pmsystemappamulti:ActsAmsProcessManageSystemAppAMultiApi7",
       "pmsystemappb:ActsAmsProcessManageSystemAppBApi7",

aafwk/aafwk_standard/amsprocessmanageapi7/actsprocessmanagejstest/BUILD.gn

@@ -13,8 +13,8 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAmsProcessManageJsTestApi7") {
-  hap_name = "ActsAmsProcessManageJsTestApi7"
+ohos_js_hap_suite("ActsAmsProcessManageJsApi7Test") {
+  hap_name = "ActsAmsProcessManageJsApi7Test"
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",

aafwk/aafwk_standard/amsprocessmanageapi7/actsprocessmanagejstest/Test.json

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

aafwk/aafwk_standard/amsprocessmanageapi7/actsprocessmanagejstest/entry/src/main/js/test/ActsProcessManageJsTest.test.js

@@ -59,7 +59,7 @@ var uriSystemA = 'internal://cache/../../com.acts.pmsystemappaapi7/';
 var uriSystemB = 'internal://cache/../../com.acts.pmsystemappbapi7/';
 var uriVendorA = 'internal://cache/../../com.acts.pmvendorappaapi7/';
 
-describe('ActsAmsProcessManageJsTestApi7', function () {
+describe('ActsAmsProcessManageJsApi7Test', function () {
 
     beforeEach(async (done) => {
         await clearMissionId();

aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/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_hap("ParticleStartAbility") {
-  hap_profile = "./src/main/config.json"
-  hap_name = "ParticleStartAbility"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
-  testonly = true
-  deps = [
-    ":hjs_demo_js_assets",
-    ":hjs_demo_resources",
-  ]
-  certificate_profile = "./signature/openharmony_sx.p7b"
-}
-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/serviceability/sceneProject/particlestartability/Test.json

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

aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/config.json

-{
-  "app": {
-    "bundleName": "com.example.particlestartability",
-    "vendor": "example",
-    "version": {
-      "code": 1,
-      "name": "1.0"
-    },
-    "apiVersion": {
-      "compatible": 4,
-      "target": 5,
-      "releaseType": "Beta1"
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "package": "com.example.particlestartability",
-    "name": ".MyApplication",
-    "deviceType": [
-      "phone"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "entry",
-      "moduleType": "entry"
-    },
-    "abilities": [
-      {
-        "skills": [
-          {
-            "entities": [
-              "entity.system.home"
-            ],
-            "actions": [
-              "action.system.home"
-            ]
-          }
-        ],
-        "name": "com.example.particlestartability.MainAbility",
-        "visible": true,
-        "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "label": "$string:app_name",
-        "type": "page",
-        "launchType": "standard"
-      }
-    ],
-    "reqPermissions": [
-      {
-        "name": "ohos.permission.INSTALL_BUNDLE",
-        "reason": "need use ohos.permission.INSTALL_BUNDLE"
-      },
-      {
-        "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED",
-        "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"
-      },
-      {
-        "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE",
-        "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE"
-      },
-      {
-        "name":"ohos.permission.REMOVE_CACHE_FILES",
-        "reason":"need use ohos.permission.REMOVE_CACHE_FILES"
-      },
-      {
-        "name":"ohos.permission.LISTEN_BUNDLE_CHANGE",
-        "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE"
-      }
-    ],
-    "js": [
-      {
-        "pages": [
-          "pages/index/index"
-        ],
-        "name": "default",
-        "window": {
-          "designWidth": 720,
-          "autoDesignWidth": false
-        }
-      }
-    ]
-  }
-}
\ No newline at end of file

aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/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/sceneProject/particlestartability/src/main/js/default/i18n/en-US.json

-{
-  "strings": {
-    "hello": "Hello",
-    "world": "World"
-  }
-}
\ No newline at end of file

aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/js/default/i18n/zh-CN.json

-{
-  "strings": {
-    "hello": "您好",
-    "world": "世界"
-  }
-}
\ No newline at end of file

aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/js/default/pages/index/index.css

-.container {
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-}
-
-.title {
-    font-size: 100px;
-}

aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/js/default/pages/index/index.hml

-<div class="container">
-    <text class="title">
-        {{ $t('strings.hello') }} {{ title }}
-    </text>
-</div>

aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/js/default/pages/index/index.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.
- */
-import commonEvent from '@ohos.commonEvent'
-
-const injectRef = Object.getPrototypeOf(global) || global
-injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')
-
-function publishCallBackOne() {
-    console.debug("====>Publish CallBack ACTS_Particle_StartAbility_0100_CommonEvent====>");
-}
-function publishCallBackTwo() {
-    console.debug("====>Publish CallBack ACTS_Particle_StartAbility_0200_CommonEvent====>");
-}
-
-
-export default {
-    data: {
-        title: "ParticleStartAbility"
-    },
-    onInit() {
-        this.title = "ParticleStartAbility";
-    },
-    onShow() {
-        commonEvent.publish("ACTS_Particle_StartAbility_0100_CommonEvent", publishCallBackOne);
-        commonEvent.publish("ACTS_Particle_StartAbility_0200_CommonEvent", publishCallBackTwo);
-        
-       
-    },
-    onReady() {
-    },
-}

aafwk/aafwk_standard/serviceability/sceneProject/particlestartability/src/main/js/resources/base/element/string.json

-{
-  "string": [
-    {
-      "name": "app_name",
-      "value": "particlestartability"
-    },
-    {
-      "name": "mainability_description",
-      "value": "JS_Phone_Empty Feature Ability"
-    }
-  ]
-}
\ No newline at end of file

aafwk/aafwk_standard/serviceability/sceneProject/particletestserver/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_hap("ParticleTestServer") {
-  hap_profile = "./src/main/config.json"
-  hap_name = "ParticleTestServer"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
-  testonly = true
-  deps = [
-    ":hjs_demo_js_assets",
-    ":hjs_demo_resources",
-  ]
-  certificate_profile = "./signature/openharmony_sx.p7b"
-}
-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"
-}