diff --git a/interfaces/innerkits/appexecfwk_base/BUILD.gn b/interfaces/innerkits/appexecfwk_base/BUILD.gn index ad19ce8303f0605e3175b5f56bd519311e6c156d..1c61dd0eb2cc5dadac420cff1570a51073eafeb0 100644 --- a/interfaces/innerkits/appexecfwk_base/BUILD.gn +++ b/interfaces/innerkits/appexecfwk_base/BUILD.gn @@ -33,6 +33,7 @@ ohos_shared_library("appexecfwk_base") { "src/module_info.cpp", "src/permission_def.cpp", "src/running_process_info.cpp", + "src/shortcut_info.cpp", ] public_configs = [ diff --git a/interfaces/innerkits/appexecfwk_base/include/ability_info.h b/interfaces/innerkits/appexecfwk_base/include/ability_info.h index 237480b1f240c099fe7f9f621f93aa068a58b50f..d6e0d5e4edb64f9d24a0a8ffd9b4f01805781a29 100644 --- a/interfaces/innerkits/appexecfwk_base/include/ability_info.h +++ b/interfaces/innerkits/appexecfwk_base/include/ability_info.h @@ -44,12 +44,28 @@ enum class LaunchMode { SINGLETOP, }; -struct Form { - std::vector formEntity; - int32_t minHeight = 0; - int32_t defaultHeight = 0; - int32_t minWidth = 0; - int32_t defaultWidth = 0; +struct Parameters { + std::string description; + std::string name; + std::string type; +}; + +struct Results { + std::string description; + std::string name; + std::string type; +}; + +struct CustomizeData { + std::string name; + std::string value; + std::string extra; +}; + +struct MetaData { + std::vector parameters; + std::vector results; + std::vector customizeData; }; // configuration information about an ability @@ -77,7 +93,12 @@ struct AbilityInfo : public Parcelable { bool enabled = false; std::string readPermission; std::string writePermission; - Form form; + std::vector formEntity; + int32_t minFormHeight = 0; + int32_t defaultFormHeight = 0; + int32_t minFormWidth = 0; + int32_t defaultFormWidth = 0; + MetaData metaData; // set when install std::string package; // the "module.package" in config.json diff --git a/interfaces/innerkits/appexecfwk_base/include/form_info.h b/interfaces/innerkits/appexecfwk_base/include/form_info.h index 7e2e0e8d5a016f0f06c526cdd4bd01e58e9478b1..3b28190c973c738895925a1275ea296b91e4cffd 100644 --- a/interfaces/innerkits/appexecfwk_base/include/form_info.h +++ b/interfaces/innerkits/appexecfwk_base/include/form_info.h @@ -33,7 +33,7 @@ enum class FormType { JS = 1, }; -struct CustomizeData { +struct FormCustomizeData { std::string name; std::string value; }; @@ -62,7 +62,7 @@ struct FormInfo : public Parcelable { FormsColorMode colorMode = FormsColorMode::AUTO_MODE; std::vector landscapeLayouts; std::vector portraitLayouts; - std::vector customizeDatas; + std::vector customizeDatas; bool ReadFromParcel(Parcel &parcel); virtual bool Marshalling(Parcel &parcel) const override; diff --git a/interfaces/innerkits/appexecfwk_base/include/json_serializer.h b/interfaces/innerkits/appexecfwk_base/include/json_serializer.h index 2129c0f274c0527a2a00ebfded75d76003a8613b..0edc008bf3a297eded80ea7f2cef5e1e1fd6c0b7 100644 --- a/interfaces/innerkits/appexecfwk_base/include/json_serializer.h +++ b/interfaces/innerkits/appexecfwk_base/include/json_serializer.h @@ -19,6 +19,7 @@ #include "nlohmann/json.hpp" #include "bundle_info.h" #include "form_info.h" +#include "shortcut_info.h" namespace OHOS { namespace AppExecFwk { @@ -27,20 +28,26 @@ namespace AppExecFwk { * form_json and to_json is global static overload method, which need callback by json library, * and can not rename this function, so don't named according UpperCamelCase style */ +void to_json(nlohmann::json &jsonObject, const Parameters ¶meters); +void from_json(const nlohmann::json &jsonObject, Parameters ¶meters); +void to_json(nlohmann::json &jsonObject, const Results &results); +void from_json(const nlohmann::json &jsonObject, Results &results); +void to_json(nlohmann::json &jsonObject, const CustomizeData &customizeData); +void from_json(const nlohmann::json &jsonObject, CustomizeData &customizeData); +void to_json(nlohmann::json &jsonObject, const MetaData &metaData); +void from_json(const nlohmann::json &jsonObject, MetaData &metaData); void to_json(nlohmann::json &jsonObject, const AbilityInfo &abilityInfo); void from_json(const nlohmann::json &jsonObject, AbilityInfo &abilityInfo); -void to_json(nlohmann::json &jsonObject, const Form &form); -void from_json(const nlohmann::json &jsonObject, Form &form); void to_json(nlohmann::json &jsonObject, const ApplicationInfo &applicationInfo); void from_json(const nlohmann::json &jsonObject, ApplicationInfo &applicationInfo); void to_json(nlohmann::json &jsonObject, const BundleInfo &bundleInfo); void from_json(const nlohmann::json &jsonObject, BundleInfo &bundleInfo); void to_json(nlohmann::json &jsonObject, const ModuleInfo &moduleInfo); void from_json(const nlohmann::json &jsonObject, ModuleInfo &moduleInfo); -void to_json(nlohmann::json &jsonObject, const CustomizeData &customizeDatas); -void from_json(const nlohmann::json &jsonObject, CustomizeData &customizeDatas); void to_json(nlohmann::json &jsonObject, const FormInfo &formInfo); void from_json(const nlohmann::json &jsonObject, FormInfo &formInfo); +void to_json(nlohmann::json &jsonObject, const ShortcutInfo &shortcutInfo); +void from_json(const nlohmann::json &jsonObject, ShortcutInfo &shortcutInfo); } // namespace AppExecFwk } // namespace OHOS diff --git a/interfaces/innerkits/appexecfwk_base/include/shortcut_info.h b/interfaces/innerkits/appexecfwk_base/include/shortcut_info.h new file mode 100644 index 0000000000000000000000000000000000000000..e1895cbc01a436f27cb04b02dcf25a4c7a7d17da --- /dev/null +++ b/interfaces/innerkits/appexecfwk_base/include/shortcut_info.h @@ -0,0 +1,49 @@ +/* + * 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. + */ + +#ifndef FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_BASE_INCLUDE_SHORTCUT_INFO_H +#define FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_BASE_INCLUDE_SHORTCUT_INFO_H + +#include +#include "parcel.h" + +namespace OHOS { +namespace AppExecFwk { + +struct ShortcutIntent { + std::string targetBundle; + std::string targetClass; +}; + +struct ShortcutInfo : public Parcelable { + std::string id; + std::string bundleName; + std::string hostAbility; + std::string icon; + std::string label; + std::string disableMessage; + std::vector intents; + bool isStatic = false; + bool isHomeShortcut = false; + bool isEnables = false; + + bool ReadFromParcel(Parcel &parcel); + virtual bool Marshalling(Parcel &parcel) const override; + static ShortcutInfo *Unmarshalling(Parcel &parcel); +}; + +} // namespace AppExecFwk +} // namespace OHOS +#endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_BASE_INCLUDE_SHORTCUT_INFO_H \ No newline at end of file diff --git a/interfaces/innerkits/appexecfwk_base/src/ability_info.cpp b/interfaces/innerkits/appexecfwk_base/src/ability_info.cpp index 86f880fd5e5ea773fa4a560bd5fdac2495b58f59..af6ac77a971962286a2c91f33a3c2afc4448f34b 100644 --- a/interfaces/innerkits/appexecfwk_base/src/ability_info.cpp +++ b/interfaces/innerkits/appexecfwk_base/src/ability_info.cpp @@ -63,10 +63,16 @@ const std::string JSON_KEY_READ_PERMISSION = "readPermission"; const std::string JSON_KEY_WRITE_PERMISSION = "writePermission"; const std::string JSON_KEY_FORM = "form"; const std::string JSON_KEY_FORM_ENTITY = "formEntity"; -const std::string JSON_KEY_FORM_MIN_HEIGHT = "minHeight"; -const std::string JSON_KEY_FORM_DEFAULT_HEIGHT = "defaultHeight"; -const std::string JSON_KEY_FORM_MIN_WIDTH = "minWidth"; -const std::string JSON_KEY_FORM_DEFAULT_WIDTH = "defaultWidth"; +const std::string JSON_KEY_MIN_FORM_HEIGHT = "minFormHeight"; +const std::string JSON_KEY_DEFAULT_FORM_HEIGHT = "defaultFormHeight"; +const std::string JSON_KEY_MIN_FORM_WIDTH = "minFormWidth"; +const std::string JSON_KEY_DEFAULT_FORM_WIDTH = "defaultFormWidth"; +const std::string JSON_KEY_PARAMETERS = "parameters"; +const std::string JSON_KEY_RESULTS = "results"; +const std::string JSON_KEY_CUSTOMIZE_DATA = "customizeData"; +const std::string JSON_KEY_META_DATA = "metaData"; +const std::string JSON_KEY_META_VALUE = "value"; +const std::string JSON_KEY_META_EXTRA = "extra"; } // namespace @@ -99,12 +105,12 @@ bool AbilityInfo::ReadFromParcel(Parcel &parcel) int32_t formEntitySize; READ_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, formEntitySize); for (int32_t i = 0; i < formEntitySize; i++) { - form.formEntity.emplace_back(Str16ToStr8(parcel.ReadString16())); + formEntity.emplace_back(Str16ToStr8(parcel.ReadString16())); } - form.minHeight = parcel.ReadInt32(); - form.defaultHeight = parcel.ReadInt32(); - form.minWidth = parcel.ReadInt32(); - form.defaultWidth = parcel.ReadInt32(); + minFormHeight = parcel.ReadInt32(); + defaultFormHeight = parcel.ReadInt32(); + minFormWidth = parcel.ReadInt32(); + defaultFormWidth = parcel.ReadInt32(); int32_t typeData; READ_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, typeData); @@ -136,6 +142,45 @@ bool AbilityInfo::ReadFromParcel(Parcel &parcel) deviceCapabilities.emplace_back(Str16ToStr8(parcel.ReadString16())); } + int32_t customizeDataSize; + READ_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, customizeDataSize); + for (auto i = 0; i < customizeDataSize; i++) { + CustomizeData customizeData; + std::string customizeName = Str16ToStr8(parcel.ReadString16()); + std::string customizeValue = Str16ToStr8(parcel.ReadString16()); + std::string customizeExtra = Str16ToStr8(parcel.ReadString16()); + customizeData.name = customizeName; + customizeData.value = customizeValue; + customizeData.extra = customizeExtra; + metaData.customizeData.emplace_back(customizeData); + } + + int32_t parametersSize; + READ_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, parametersSize); + for (auto i = 0; i < parametersSize; i++) { + Parameters parameters; + std::string parametersDescription = Str16ToStr8(parcel.ReadString16()); + std::string parametersName = Str16ToStr8(parcel.ReadString16()); + std::string parametersType = Str16ToStr8(parcel.ReadString16()); + parameters.description = parametersDescription; + parameters.name = parametersName; + parameters.type = parametersType; + metaData.parameters.emplace_back(parameters); + } + + int32_t ResultsSize; + READ_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, ResultsSize); + for (auto i = 0; i < ResultsSize; i++) { + Results results; + std::string resultsDescription = Str16ToStr8(parcel.ReadString16()); + std::string resultsName = Str16ToStr8(parcel.ReadString16()); + std::string resultsType = Str16ToStr8(parcel.ReadString16()); + results.description = resultsDescription; + results.name = resultsName; + results.type = resultsType; + metaData.results.emplace_back(results); + } + std::unique_ptr appInfo(parcel.ReadParcelable()); if (!appInfo) { APP_LOGE("ReadParcelable failed"); @@ -181,14 +226,14 @@ bool AbilityInfo::Marshalling(Parcel &parcel) const WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(Bool, parcel, isLauncherAbility); WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(Bool, parcel, isNativeAbility); WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(Bool, parcel, enabled); - WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, form.formEntity.size()); - for (auto &item : form.formEntity) { + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, formEntity.size()); + for (auto &item : formEntity) { WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(String16, parcel, Str8ToStr16(item)); } - WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, form.minHeight); - WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, form.defaultHeight); - WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, form.minWidth); - WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, form.defaultWidth); + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, minFormHeight); + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, defaultFormHeight); + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, minFormWidth); + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, defaultFormWidth); WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, static_cast(type)); WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, static_cast(orientation)); WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, static_cast(launchMode)); @@ -208,6 +253,30 @@ bool AbilityInfo::Marshalling(Parcel &parcel) const WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(String16, parcel, Str8ToStr16(deviceCapability)); } + const auto customizeDataSize = static_cast(metaData.customizeData.size()); + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, customizeDataSize); + for (auto i = 0; i < customizeDataSize; i++) { + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(String16, parcel, Str8ToStr16(metaData.customizeData[i].name)); + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(String16, parcel, Str8ToStr16(metaData.customizeData[i].value)); + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(String16, parcel, Str8ToStr16(metaData.customizeData[i].extra)); + } + + const auto parametersSize = static_cast(metaData.parameters.size()); + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, parametersSize); + for (auto i = 0; i < parametersSize; i++) { + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(String16, parcel, Str8ToStr16(metaData.parameters[i].description)); + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(String16, parcel, Str8ToStr16(metaData.parameters[i].name)); + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(String16, parcel, Str8ToStr16(metaData.parameters[i].type)); + } + + const auto resultsSize = static_cast(metaData.results.size()); + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, resultsSize); + for (auto i = 0; i < resultsSize; i++) { + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(String16, parcel, Str8ToStr16(metaData.results[i].description)); + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(String16, parcel, Str8ToStr16(metaData.results[i].name)); + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(String16, parcel, Str8ToStr16(metaData.results[i].type)); + } + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(Parcelable, parcel, &applicationInfo); return true; } @@ -238,14 +307,42 @@ void AbilityInfo::Dump(std::string prefix, int fd) return; } -void to_json(nlohmann::json &jsonObject, const Form &form) +void to_json(nlohmann::json &jsonObject, const Parameters ¶meters) +{ + jsonObject = nlohmann::json{ + {JSON_KEY_DESCRIPTION, parameters.description}, + {JSON_KEY_NAME, parameters.name}, + {JSON_KEY_TYPE, parameters.type} + }; +} + +void to_json(nlohmann::json &jsonObject, const Results &results) +{ + jsonObject = nlohmann::json{ + {JSON_KEY_DESCRIPTION, results.description}, + {JSON_KEY_NAME, results.name}, + {JSON_KEY_TYPE, results.type} + }; +} + +void to_json(nlohmann::json &jsonObject, const CustomizeData &customizeData) +{ + jsonObject = nlohmann::json{ + {JSON_KEY_NAME, customizeData.name}, + {JSON_KEY_META_VALUE, customizeData.value}, + {JSON_KEY_META_EXTRA, customizeData.extra} + }; +} + +void to_json(nlohmann::json &jsonObject, const MetaData &metaData) { - jsonObject = nlohmann::json{{JSON_KEY_FORM_ENTITY, form.formEntity}, - {JSON_KEY_FORM_MIN_HEIGHT, form.minHeight}, - {JSON_KEY_FORM_DEFAULT_HEIGHT, form.defaultHeight}, - {JSON_KEY_FORM_MIN_WIDTH, form.minWidth}, - {JSON_KEY_FORM_DEFAULT_WIDTH, form.defaultWidth}}; + jsonObject = nlohmann::json{ + {JSON_KEY_PARAMETERS, metaData.parameters}, + {JSON_KEY_RESULTS, metaData.results}, + {JSON_KEY_CUSTOMIZE_DATA, metaData.customizeData} + }; } + void to_json(nlohmann::json &jsonObject, const AbilityInfo &abilityInfo) { jsonObject = nlohmann::json{{JSON_KEY_NAME, abilityInfo.name}, @@ -259,7 +356,11 @@ void to_json(nlohmann::json &jsonObject, const AbilityInfo &abilityInfo) {JSON_KEY_ENABLED, abilityInfo.enabled}, {JSON_KEY_READ_PERMISSION, abilityInfo.readPermission}, {JSON_KEY_WRITE_PERMISSION, abilityInfo.writePermission}, - {JSON_KEY_FORM, abilityInfo.form}, + {JSON_KEY_FORM_ENTITY, abilityInfo.formEntity}, + {JSON_KEY_MIN_FORM_HEIGHT, abilityInfo.minFormHeight}, + {JSON_KEY_DEFAULT_FORM_HEIGHT, abilityInfo.defaultFormHeight}, + {JSON_KEY_MIN_FORM_WIDTH, abilityInfo.minFormWidth}, + {JSON_KEY_DEFAULT_FORM_WIDTH, abilityInfo.defaultFormWidth}, {JSON_KEY_KIND, abilityInfo.kind}, {JSON_KEY_TYPE, abilityInfo.type}, {JSON_KEY_ORIENTATION, abilityInfo.orientation}, @@ -277,17 +378,39 @@ void to_json(nlohmann::json &jsonObject, const AbilityInfo &abilityInfo) {JSON_KEY_DEVICE_ID, abilityInfo.deviceId}, {JSON_KEY_CODE_PATH, abilityInfo.codePath}, {JSON_KEY_RESOURCE_PATH, abilityInfo.resourcePath}, - {JSON_KEY_LIB_PATH, abilityInfo.libPath}}; + {JSON_KEY_LIB_PATH, abilityInfo.libPath}, + {JSON_KEY_META_DATA, abilityInfo.metaData} + }; +} + +void from_json(const nlohmann::json &jsonObject, Parameters ¶meters) +{ + parameters.description = jsonObject.at(JSON_KEY_DESCRIPTION).get(); + parameters.name = jsonObject.at(JSON_KEY_NAME).get(); + parameters.type = jsonObject.at(JSON_KEY_TYPE).get(); +} + +void from_json(const nlohmann::json &jsonObject, Results &results) +{ + results.description = jsonObject.at(JSON_KEY_DESCRIPTION).get(); + results.name = jsonObject.at(JSON_KEY_NAME).get(); + results.type = jsonObject.at(JSON_KEY_TYPE).get(); } -void from_json(const nlohmann::json &jsonObject, Form &form) +void from_json(const nlohmann::json &jsonObject, CustomizeData &customizeData) { - form.formEntity = jsonObject.at(JSON_KEY_FORM_ENTITY).get>(); - form.minHeight = jsonObject.at(JSON_KEY_FORM_MIN_HEIGHT).get(); - form.defaultHeight = jsonObject.at(JSON_KEY_FORM_DEFAULT_HEIGHT).get(); - form.minWidth = jsonObject.at(JSON_KEY_FORM_MIN_WIDTH).get(); - form.defaultWidth = jsonObject.at(JSON_KEY_FORM_DEFAULT_WIDTH).get(); + customizeData.name = jsonObject.at(JSON_KEY_NAME).get(); + customizeData.value = jsonObject.at(JSON_KEY_META_VALUE).get(); + customizeData.extra = jsonObject.at(JSON_KEY_META_EXTRA).get(); } + +void from_json(const nlohmann::json &jsonObject, MetaData &metaData) +{ + metaData.parameters = jsonObject.at(JSON_KEY_PARAMETERS).get>(); + metaData.results = jsonObject.at(JSON_KEY_RESULTS).get>(); + metaData.customizeData = jsonObject.at(JSON_KEY_CUSTOMIZE_DATA).get>(); +} + void from_json(const nlohmann::json &jsonObject, AbilityInfo &abilityInfo) { abilityInfo.name = jsonObject.at(JSON_KEY_NAME).get(); @@ -301,7 +424,11 @@ void from_json(const nlohmann::json &jsonObject, AbilityInfo &abilityInfo) abilityInfo.enabled = jsonObject.at(JSON_KEY_ENABLED).get(); abilityInfo.readPermission = jsonObject.at(JSON_KEY_READ_PERMISSION).get(); abilityInfo.writePermission = jsonObject.at(JSON_KEY_WRITE_PERMISSION).get(); - abilityInfo.form = jsonObject.at(JSON_KEY_FORM).get
(); + abilityInfo.formEntity = jsonObject.at(JSON_KEY_FORM_ENTITY).get>(); + abilityInfo.minFormHeight = jsonObject.at(JSON_KEY_MIN_FORM_HEIGHT).get(); + abilityInfo.defaultFormHeight = jsonObject.at(JSON_KEY_DEFAULT_FORM_HEIGHT).get(); + abilityInfo.minFormWidth = jsonObject.at(JSON_KEY_MIN_FORM_WIDTH).get(); + abilityInfo.defaultFormWidth = jsonObject.at(JSON_KEY_DEFAULT_FORM_WIDTH).get(); abilityInfo.kind = jsonObject.at(JSON_KEY_KIND).get(); abilityInfo.type = jsonObject.at(JSON_KEY_TYPE).get(); abilityInfo.orientation = jsonObject.at(JSON_KEY_ORIENTATION).get(); @@ -320,6 +447,7 @@ void from_json(const nlohmann::json &jsonObject, AbilityInfo &abilityInfo) abilityInfo.codePath = jsonObject.at(JSON_KEY_CODE_PATH).get(); abilityInfo.resourcePath = jsonObject.at(JSON_KEY_RESOURCE_PATH).get(); abilityInfo.libPath = jsonObject.at(JSON_KEY_LIB_PATH).get(); + abilityInfo.metaData = jsonObject.at(JSON_KEY_META_DATA).get(); } } // namespace AppExecFwk diff --git a/interfaces/innerkits/appexecfwk_base/src/form_info.cpp b/interfaces/innerkits/appexecfwk_base/src/form_info.cpp index 4de69804475bf5a4d14993a5845c40e73e31bd62..7f9f1d2e23f69f72ba35bea6f63113f9640b9d23 100644 --- a/interfaces/innerkits/appexecfwk_base/src/form_info.cpp +++ b/interfaces/innerkits/appexecfwk_base/src/form_info.cpp @@ -111,7 +111,7 @@ bool FormInfo::ReadFromParcel(Parcel &parcel) int32_t customizeDataSize; READ_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, customizeDataSize); for (auto i = 0; i < customizeDataSize; i++) { - CustomizeData customizeData; + FormCustomizeData customizeData; std::string customizeName = Str16ToStr8(parcel.ReadString16()); std::string customizeValue = Str16ToStr8(parcel.ReadString16()); customizeData.name = customizeName; @@ -182,7 +182,7 @@ bool FormInfo::Marshalling(Parcel &parcel) const return true; } -void to_json(nlohmann::json &jsonObject, const CustomizeData &customizeDatas) +void to_json(nlohmann::json &jsonObject, const FormCustomizeData &customizeDatas) { jsonObject = nlohmann::json{{JSON_KEY_NAME, customizeDatas.name}, {JSON_KEY_VALUE, customizeDatas.value}}; } @@ -215,7 +215,7 @@ void to_json(nlohmann::json &jsonObject, const FormInfo &formInfo) {JSON_KEY_PORTRAIT_LAYOUTS, formInfo.portraitLayouts}}; } -void from_json(const nlohmann::json &jsonObject, CustomizeData &customizeDatas) +void from_json(const nlohmann::json &jsonObject, FormCustomizeData &customizeDatas) { customizeDatas.name = jsonObject.at(JSON_KEY_NAME).get(); customizeDatas.value = jsonObject.at(JSON_KEY_VALUE).get(); @@ -244,7 +244,7 @@ void from_json(const nlohmann::json &jsonObject, FormInfo &formInfo) formInfo.type = jsonObject.at(JSON_KEY_TYPE).get(); formInfo.colorMode = jsonObject.at(JSON_KEY_COLOR_MODE).get(); formInfo.supportDimensions = jsonObject.at(JSON_KEY_SUPPORT_DIMENSIONS).get>(); - formInfo.customizeDatas = jsonObject.at(JSON_KEY_CUSTOMIZE_DATA).get>(); + formInfo.customizeDatas = jsonObject.at(JSON_KEY_CUSTOMIZE_DATA).get>(); formInfo.landscapeLayouts = jsonObject.at(JSON_KEY_LANDSCAPE_LAYOUTS).get>(); formInfo.portraitLayouts = jsonObject.at(JSON_KEY_PORTRAIT_LAYOUTS).get>(); } diff --git a/interfaces/innerkits/appexecfwk_base/src/shortcut_info.cpp b/interfaces/innerkits/appexecfwk_base/src/shortcut_info.cpp new file mode 100644 index 0000000000000000000000000000000000000000..533fcb542ce06eab67bcda8704d7055acb610474 --- /dev/null +++ b/interfaces/innerkits/appexecfwk_base/src/shortcut_info.cpp @@ -0,0 +1,146 @@ +/* + * 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. + */ +#include "shortcut_info.h" + +#include +#include +#include +#include + +#include "json_serializer.h" +#include "nlohmann/json.hpp" +#include "string_ex.h" +#include "parcel_macro.h" +#include "app_log_wrapper.h" +#include "bundle_constants.h" + +namespace OHOS { +namespace AppExecFwk { + +namespace { + +const std::string JSON_KEY_BUNDLE_ID = "id"; +const std::string JSON_KEY_BUNDLE_NAME = "bundleName"; +const std::string JSON_KEY_BUNDLE_HOST_ABILITY = "hostAbility"; +const std::string JSON_KEY_BUNDLE_ICON = "icon"; +const std::string JSON_KEY_BUNDLE_LABEL = "label"; +const std::string JSON_KEY_BUNDLE_DISABLE_MESSAGE = "disableMessage"; +const std::string JSON_KEY_BUNDLE_IS_STATIC = "isStatic"; +const std::string JSON_KEY_BUNDLE_IS_HOME_SHORTCUT = "isHomeShortcut"; +const std::string JSON_KEY_BUNDLE_IS_ENABLES = "isEnables"; +const std::string JSON_KEY_BUNDLE_INTENTS = "intents"; +const std::string JSON_KEY_BUNDLE_TARGET_BUNDLE = "targetBundle"; +const std::string JSON_KEY_BUNDLE_TARGET_CLASS = "targetClass"; + +} // namespace + +bool ShortcutInfo::ReadFromParcel(Parcel &parcel) +{ + id = Str16ToStr8(parcel.ReadString16()); + bundleName = Str16ToStr8(parcel.ReadString16()); + hostAbility = Str16ToStr8(parcel.ReadString16()); + icon = Str16ToStr8(parcel.ReadString16()); + label = Str16ToStr8(parcel.ReadString16()); + disableMessage = Str16ToStr8(parcel.ReadString16()); + isStatic = parcel.ReadBool(); + isHomeShortcut = parcel.ReadBool(); + isEnables = parcel.ReadBool(); + int32_t intentsSize; + READ_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, intentsSize); + for (auto i = 0; i < intentsSize; i++) { + ShortcutIntent shortcutIntent; + std::string targetBundleName = Str16ToStr8(parcel.ReadString16()); + std::string targetClassName = Str16ToStr8(parcel.ReadString16()); + shortcutIntent.targetBundle = targetBundleName; + shortcutIntent.targetClass = targetClassName; + intents.emplace_back(shortcutIntent); + } + return true; +} + +ShortcutInfo *ShortcutInfo::Unmarshalling(Parcel &parcel) +{ + ShortcutInfo *info = new ShortcutInfo(); + if (!info->ReadFromParcel(parcel)) { + APP_LOGW("read from parcel failed"); + delete info; + info = nullptr; + } + return info; +} + +bool ShortcutInfo::Marshalling(Parcel &parcel) const +{ + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(String16, parcel, Str8ToStr16(id)); + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(String16, parcel, Str8ToStr16(bundleName)); + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(String16, parcel, Str8ToStr16(hostAbility)); + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(String16, parcel, Str8ToStr16(icon)); + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(String16, parcel, Str8ToStr16(label)); + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(String16, parcel, Str8ToStr16(disableMessage)); + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(Bool, parcel, isStatic); + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(Bool, parcel, isHomeShortcut); + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(Bool, parcel, isEnables); + + const auto intentsSize = static_cast(intents.size()); + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(Int32, parcel, intentsSize); + for (auto i = 0; i < intentsSize; i++) { + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(String16, parcel, Str8ToStr16(intents[i].targetBundle)); + WRITE_PARCEL_AND_RETURN_FALSE_IF_FAIL(String16, parcel, Str8ToStr16(intents[i].targetClass)); + } + return true; +} + +void to_json(nlohmann::json &jsonObject, const ShortcutIntent &shortcutIntent) +{ + jsonObject = nlohmann::json{{JSON_KEY_BUNDLE_TARGET_BUNDLE, shortcutIntent.targetBundle}, + {JSON_KEY_BUNDLE_TARGET_CLASS, shortcutIntent.targetClass}}; +} + +void to_json(nlohmann::json &jsonObject, const ShortcutInfo &shortcutInfo) +{ + jsonObject = nlohmann::json{{JSON_KEY_BUNDLE_ID, shortcutInfo.id}, + {JSON_KEY_BUNDLE_NAME, shortcutInfo.bundleName}, + {JSON_KEY_BUNDLE_HOST_ABILITY, shortcutInfo.hostAbility}, + {JSON_KEY_BUNDLE_ICON, shortcutInfo.icon}, + {JSON_KEY_BUNDLE_LABEL, shortcutInfo.label}, + {JSON_KEY_BUNDLE_DISABLE_MESSAGE, shortcutInfo.disableMessage}, + {JSON_KEY_BUNDLE_IS_STATIC, shortcutInfo.isStatic}, + {JSON_KEY_BUNDLE_IS_HOME_SHORTCUT, shortcutInfo.isHomeShortcut}, + {JSON_KEY_BUNDLE_IS_ENABLES, shortcutInfo.isEnables}, + {JSON_KEY_BUNDLE_INTENTS, shortcutInfo.intents}}; +} + +void from_json(const nlohmann::json &jsonObject, ShortcutIntent &shortcutIntent) +{ + shortcutIntent.targetBundle = jsonObject.at(JSON_KEY_BUNDLE_TARGET_BUNDLE).get(); + shortcutIntent.targetClass = jsonObject.at(JSON_KEY_BUNDLE_TARGET_CLASS).get(); +} + +void from_json(const nlohmann::json &jsonObject, ShortcutInfo &shortcutInfo) +{ + shortcutInfo.id = jsonObject.at(JSON_KEY_BUNDLE_ID).get(); + shortcutInfo.bundleName = jsonObject.at(JSON_KEY_BUNDLE_NAME).get(); + shortcutInfo.hostAbility = jsonObject.at(JSON_KEY_BUNDLE_HOST_ABILITY).get(); + shortcutInfo.icon = jsonObject.at(JSON_KEY_BUNDLE_ICON).get(); + shortcutInfo.label = jsonObject.at(JSON_KEY_BUNDLE_LABEL).get(); + shortcutInfo.disableMessage = jsonObject.at(JSON_KEY_BUNDLE_DISABLE_MESSAGE).get(); + shortcutInfo.isStatic = jsonObject.at(JSON_KEY_BUNDLE_IS_STATIC).get(); + shortcutInfo.isHomeShortcut = jsonObject.at(JSON_KEY_BUNDLE_IS_HOME_SHORTCUT).get(); + shortcutInfo.isEnables = jsonObject.at(JSON_KEY_BUNDLE_IS_ENABLES).get(); + shortcutInfo.intents = jsonObject.at(JSON_KEY_BUNDLE_INTENTS).get>(); +} + +} // namespace AppExecFwk +} // namespace OHOS diff --git a/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_host.h b/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_host.h index 7cadb9211d70cbe88c97b1bc210701e1d1d692c5..cae86ca55d2dc4572da77a3b845a94ed56e393c5 100644 --- a/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_host.h +++ b/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_host.h @@ -363,6 +363,13 @@ private: * @return Returns ERR_OK if called successfully; returns error code otherwise. */ ErrCode HandleGetFormsInfoByModule(Parcel &data, Parcel &reply); + /** + * @brief Handles the HandleGetShortcutInfo function called from a IBundleMgr proxy object. + * @param data Indicates the data to be read. + * @param reply Indicates the reply to be sent; + * @return Returns ERR_OK if called successfully; returns error code otherwise. + */ + ErrCode HandleGetShortcutInfos(Parcel &data, Parcel &reply); private: /** diff --git a/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_interface.h b/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_interface.h index fab6a620c6b17e1ad64879278efeabe15e886cea..ce84212199c336b6dd7cf9f84d8aa9d81727d113 100644 --- a/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_interface.h +++ b/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_interface.h @@ -18,6 +18,7 @@ #include "ability_info.h" #include "form_info.h" +#include "shortcut_info.h" #include "application_info.h" #include "bundle_info.h" #include "hap_module_info.h" @@ -383,6 +384,13 @@ public: */ virtual bool GetFormsInfoByModule( const std::string &bundleName, const std::string &moduleName, std::vector &formInfos) = 0; + /** + * @brief Obtains the ShortcutInfo objects provided by a specified application on the device. + * @param bundleName Indicates the bundle name of the application. + * @param shortcutInfos List of ShortcutInfo objects if obtained. + * @return Returns true if this function is successfully called; returns false otherwise. + */ + virtual bool GetShortcutInfos(const std::string &bundleName, std::vector &shortcutInfos) = 0; /** * @brief Obtains the interface used to install and uninstall bundles. * @return Returns a pointer to IBundleInstaller class if exist; returns nullptr otherwise. @@ -437,6 +445,7 @@ public: GET_ALL_FORMS_INFO, GET_FORMS_INFO_BY_APP, GET_FORMS_INFO_BY_MODULE, + GET_SHORTCUT_INFO, GET_BUNDLE_INSTALLER, }; }; diff --git a/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_proxy.h b/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_proxy.h index ebda423f46a76b3809095a8943c564a353b86be6..82d74f9831b8008bb670d5fd9effaf9e0a7aeadb 100644 --- a/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_proxy.h +++ b/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_proxy.h @@ -380,7 +380,13 @@ public: */ virtual bool GetFormsInfoByModule( const std::string &bundleName, const std::string &moduleName, std::vector &formInfos) override; - + /** + * @brief Obtains the ShortcutInfo objects provided by a specified application on the device. + * @param bundleName Indicates the bundle name of the application. + * @param shortcutInfos List of ShortcutInfo objects if obtained. + * @return Returns true if this function is successfully called; returns false otherwise. + */ + virtual bool GetShortcutInfos(const std::string &bundleName, std::vector &shortcutInfos) override; private: /** * @brief Send a command message from the proxy object. diff --git a/interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_host.cpp b/interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_host.cpp index a8f0caadc0a789344827acaa6fae6a906bb8817a..ed9d76cc74c50f82c53bfc24dde2de5a8fec9ed5 100755 --- a/interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_host.cpp +++ b/interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_host.cpp @@ -191,6 +191,9 @@ int BundleMgrHost::OnRemoteRequest(uint32_t code, MessageParcel &data, MessagePa case static_cast(IBundleMgr::Message::GET_FORMS_INFO_BY_MODULE): errCode = HandleGetFormsInfoByModule(data, reply); break; + case static_cast(IBundleMgr::Message::GET_SHORTCUT_INFO): + errCode = HandleGetShortcutInfos(data, reply); + break; default: return IPCObjectStub::OnRemoteRequest(code, data, reply, option); } @@ -982,6 +985,25 @@ ErrCode BundleMgrHost::HandleGetFormsInfoByModule(Parcel &data, Parcel &reply) return ERR_OK; } +ErrCode BundleMgrHost::HandleGetShortcutInfos(Parcel &data, Parcel &reply) +{ + std::string bundlename = data.ReadString(); + std::vector infos; + bool ret = GetShortcutInfos(bundlename, infos); + if (!reply.WriteBool(ret)) { + APP_LOGE("write failed"); + return ERR_APPEXECFWK_PARCEL_ERROR; + } + + if (ret) { + if (!WriteParcelableVector(infos, reply)) { + APP_LOGE("write failed"); + return ERR_APPEXECFWK_PARCEL_ERROR; + } + } + return ERR_OK; +} + template bool BundleMgrHost::WriteParcelableVector(std::vector &parcelableVector, Parcel &reply) { diff --git a/interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_proxy.cpp b/interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_proxy.cpp index 19793cd9ba0e2cc61a8451c0611b978a5810c418..f259ac27db07c8c757978ff100f9006b337fb50e 100644 --- a/interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_proxy.cpp +++ b/interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_proxy.cpp @@ -1263,6 +1263,31 @@ bool BundleMgrProxy::GetFormsInfoByModule( return true; } +bool BundleMgrProxy::GetShortcutInfos(const std::string &bundleName, std::vector &shortcutInfos) +{ + if (bundleName.empty()) { + APP_LOGE("fail to GetShortcutInfos due to params empty"); + return false; + } + + MessageParcel data; + if (!data.WriteInterfaceToken(GetDescriptor())) { + APP_LOGE("fail to GetShortcutInfos due to write MessageParcel fail"); + return false; + } + + if (!data.WriteString(bundleName)) { + APP_LOGE("fail to GetShortcutInfos due to write bundleName fail"); + return false; + } + + if (!GetParcelableInfos(IBundleMgr::Message::GET_SHORTCUT_INFO, data, shortcutInfos)) { + APP_LOGE("fail to GetShortcutInfos from server"); + return false; + } + return true; +} + template bool BundleMgrProxy::GetParcelableInfo(IBundleMgr::Message code, MessageParcel &data, T &parcelableInfo) { diff --git a/kits/appkit/napi/bundlemgr/bundle_mgr.cpp b/kits/appkit/napi/bundlemgr/bundle_mgr.cpp index 932c88759f99942c1ddcf8aa96472cfe877eee4a..5ba71fc15d7536fcfd31a6cedd9802535ff3f85d 100644 --- a/kits/appkit/napi/bundlemgr/bundle_mgr.cpp +++ b/kits/appkit/napi/bundlemgr/bundle_mgr.cpp @@ -169,38 +169,88 @@ static void ConvertApplicationInfo(napi_env env, napi_value objAppInfo, const Ap HILOG_INFO("ConvertApplicationInfo entryDir=%{public}s.", appInfo.entryDir.c_str()); } -static void ConvertForm(napi_env env, napi_value objForm, const Form &form) +static void ConvertCustomizeData(napi_env env, napi_value objCustomizeData, const CustomizeData &customizeData) { - napi_value nFormEntities; - NAPI_CALL_RETURN_VOID(env, napi_create_array(env, &nFormEntities)); - for (size_t idx = 0; idx < form.formEntity.size(); idx++) { - napi_value nFormEntity; - NAPI_CALL_RETURN_VOID( - env, napi_create_string_utf8(env, form.formEntity[idx].c_str(), NAPI_AUTO_LENGTH, &nFormEntity)); - NAPI_CALL_RETURN_VOID(env, napi_set_element(env, nFormEntities, idx, nFormEntity)); - } - NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objForm, "formEntity", nFormEntities)); + napi_value nName; + NAPI_CALL_RETURN_VOID(env, napi_create_string_utf8(env, customizeData.name.c_str(), NAPI_AUTO_LENGTH, &nName)); + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objCustomizeData, "name", nName)); + HILOG_INFO("ConvertCustomizeData name=%{public}s.", customizeData.name.c_str()); + napi_value nValue; + NAPI_CALL_RETURN_VOID(env, napi_create_string_utf8(env, customizeData.value.c_str(), NAPI_AUTO_LENGTH, &nValue)); + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objCustomizeData, "value", nValue)); + HILOG_INFO("ConvertCustomizeData value=%{public}s.", customizeData.value.c_str()); + napi_value nExtra; + NAPI_CALL_RETURN_VOID(env, napi_create_string_utf8(env, customizeData.extra.c_str(), NAPI_AUTO_LENGTH, &nExtra)); + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objCustomizeData, "value", nExtra)); + HILOG_INFO("ConvertCustomizeData extra=%{public}s.", customizeData.extra.c_str()); +} - napi_value nMinHeight; - NAPI_CALL_RETURN_VOID(env, napi_create_int32(env, DEFAULT_INT32, &nMinHeight)); - NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objForm, "minFormHeight", nMinHeight)); - HILOG_INFO("form.nMinHeight=%{public}d.", form.minHeight); +static void ConvertParameters(napi_env env, napi_value objParameters, const Parameters ¶meters) +{ + napi_value nDescription; + NAPI_CALL_RETURN_VOID(env, napi_create_string_utf8(env, parameters.description.c_str(), NAPI_AUTO_LENGTH, &nDescription)); + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objParameters, "description", nDescription)); + HILOG_INFO("ConvertParameters parameters.description=%{public}s.", parameters.description.c_str()); + napi_value nName; + NAPI_CALL_RETURN_VOID(env, napi_create_string_utf8(env, parameters.name.c_str(), NAPI_AUTO_LENGTH, &nName)); + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objParameters, "name", nName)); + HILOG_INFO("ConvertParameters parameters.name=%{public}s.", parameters.name.c_str()); + napi_value nType; + NAPI_CALL_RETURN_VOID(env, napi_create_string_utf8(env, parameters.type.c_str(), NAPI_AUTO_LENGTH, &nType)); + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objParameters, "type", nType)); + HILOG_INFO("ConvertParameters parameters.type=%{public}s.", parameters.type.c_str()); +} - napi_value nMinWidth; - NAPI_CALL_RETURN_VOID(env, napi_create_int32(env, DEFAULT_INT32, &nMinWidth)); - NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objForm, "minFormWidth", nMinWidth)); - HILOG_INFO("form.nMinWidth=%{public}d.", form.minWidth); +static void ConvertResults(napi_env env, napi_value objResults, const Results &results) +{ + napi_value nDescription; + NAPI_CALL_RETURN_VOID(env, napi_create_string_utf8(env, results.description.c_str(), NAPI_AUTO_LENGTH, &nDescription)); + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objResults, "description", nDescription)); + HILOG_INFO("ConvertResults results.description=%{public}s.", results.description.c_str()); + napi_value nName; + NAPI_CALL_RETURN_VOID(env, napi_create_string_utf8(env, results.name.c_str(), NAPI_AUTO_LENGTH, &nName)); + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objResults, "name", nName)); + HILOG_INFO("ConvertResults results.name=%{public}s.", results.name.c_str()); + napi_value nType; + NAPI_CALL_RETURN_VOID(env, napi_create_string_utf8(env, results.type.c_str(), NAPI_AUTO_LENGTH, &nType)); + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objResults, "type", nType)); + HILOG_INFO("ConvertResults results.type=%{public}s.", results.type.c_str()); +} - napi_value nDefaultHeight; - NAPI_CALL_RETURN_VOID(env, napi_create_int32(env, DEFAULT_INT32, &nDefaultHeight)); - NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objForm, "defaultFormHeight", nDefaultHeight)); - HILOG_INFO("form.nDefaultHeight=%{public}d.", form.defaultHeight); - napi_value nDefaultWidth; - NAPI_CALL_RETURN_VOID(env, napi_create_int32(env, DEFAULT_INT32, &nDefaultWidth)); - NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objForm, "defaultFormWidth", nDefaultWidth)); - HILOG_INFO("form.nDefaultWidth=%{public}d.", form.defaultWidth); +static void ConvertMetaData(napi_env env, napi_value objMetaData, const MetaData &metaData) +{ + napi_value nCustomizeDatas; + NAPI_CALL_RETURN_VOID(env, napi_create_array(env, &nCustomizeDatas)); + for (size_t idx = 0; idx < metaData.customizeData.size(); idx++) { + napi_value nCustomizeData; + NAPI_CALL_RETURN_VOID(env, napi_create_object(env, &nCustomizeData)); + ConvertCustomizeData(env, nCustomizeData, metaData.customizeData[idx]); + NAPI_CALL_RETURN_VOID(env, napi_set_element(env, nCustomizeDatas, idx, nCustomizeData)); + } + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objMetaData, "customizeDatas", nCustomizeDatas)); + + napi_value nParameters; + NAPI_CALL_RETURN_VOID(env, napi_create_array(env, &nParameters)); + for (size_t idx = 0; idx < metaData.parameters.size(); idx++) { + napi_value nParameter; + NAPI_CALL_RETURN_VOID(env, napi_create_object(env, &nParameter)); + ConvertParameters(env, nParameter, metaData.parameters[idx]); + NAPI_CALL_RETURN_VOID(env, napi_set_element(env, nParameters, idx, nParameter)); + } + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objMetaData, "parameters", nParameters)); + + napi_value nResults; + NAPI_CALL_RETURN_VOID(env, napi_create_array(env, &nResults)); + for (size_t idx = 0; idx < metaData.results.size(); idx++) { + napi_value nResult; + NAPI_CALL_RETURN_VOID(env, napi_create_object(env, &nResult)); + ConvertResults(env, nResult, metaData.results[idx]); + NAPI_CALL_RETURN_VOID(env, napi_set_element(env, nResults, idx, nResult)); + } + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objMetaData, "results", nResults)); } + static void ConvertAbilityInfo(napi_env env, napi_value objAbilityInfo, const AbilityInfo &abilityInfo) { napi_value nName; @@ -299,14 +349,6 @@ static void ConvertAbilityInfo(napi_env env, napi_value objAbilityInfo, const Ab NAPI_CALL_RETURN_VOID(env, napi_create_int32(env, DEFAULT_INT32, &nBackgroundModes)); NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objAbilityInfo, "backgroundModes", nBackgroundModes)); - napi_value nDefaultFormHeight; - NAPI_CALL_RETURN_VOID(env, napi_create_int32(env, DEFAULT_INT32, &nDefaultFormHeight)); - NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objAbilityInfo, "defaultFormHeight", nDefaultFormHeight)); - - napi_value nDefaultFormWidth; - NAPI_CALL_RETURN_VOID(env, napi_create_int32(env, DEFAULT_INT32, &nDefaultFormWidth)); - NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objAbilityInfo, "defaultFormWidth", nDefaultFormWidth)); - napi_value nDescriptionId; NAPI_CALL_RETURN_VOID(env, napi_create_int32(env, DEFAULT_INT32, &nDescriptionId)); NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objAbilityInfo, "descriptionId", nDescriptionId)); @@ -315,10 +357,6 @@ static void ConvertAbilityInfo(napi_env env, napi_value objAbilityInfo, const Ab NAPI_CALL_RETURN_VOID(env, napi_get_boolean(env, false, &nFormEnabled)); NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objAbilityInfo, "formEnabled", nFormEnabled)); - napi_value nFormEntity; - NAPI_CALL_RETURN_VOID(env, napi_create_int32(env, DEFAULT_INT32, &nFormEntity)); - NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objAbilityInfo, "formEntity", nFormEntity)); - napi_value nIconId; NAPI_CALL_RETURN_VOID(env, napi_create_int32(env, DEFAULT_INT32, &nIconId)); NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objAbilityInfo, "iconId", nIconId)); @@ -327,18 +365,36 @@ static void ConvertAbilityInfo(napi_env env, napi_value objAbilityInfo, const Ab NAPI_CALL_RETURN_VOID(env, napi_create_int32(env, DEFAULT_INT32, &nLabelId)); NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objAbilityInfo, "labelId", nLabelId)); + napi_value nFormEntities; + NAPI_CALL_RETURN_VOID(env, napi_create_array(env, &nFormEntities)); + for (size_t idx = 0; idx < abilityInfo.formEntity.size(); idx++) { + napi_value nFormEntity; + NAPI_CALL_RETURN_VOID( + env, napi_create_string_utf8(env, abilityInfo.formEntity[idx].c_str(), NAPI_AUTO_LENGTH, &nFormEntity)); + NAPI_CALL_RETURN_VOID(env, napi_set_element(env, nFormEntities, idx, nFormEntity)); + } + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objAbilityInfo, "formEntity", nFormEntities)); + napi_value nMinFormHeight; - NAPI_CALL_RETURN_VOID(env, napi_create_int32(env, DEFAULT_INT32, &nMinFormHeight)); + NAPI_CALL_RETURN_VOID(env, napi_create_int32(env, abilityInfo.minFormHeight, &nMinFormHeight)); NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objAbilityInfo, "minFormHeight", nMinFormHeight)); + napi_value nMinFormWidth; + NAPI_CALL_RETURN_VOID(env, napi_create_int32(env, abilityInfo.minFormWidth, &nMinFormWidth)); + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objAbilityInfo, "minFormWidth", nMinFormWidth)); + + napi_value nDefaultFormHeight; + NAPI_CALL_RETURN_VOID(env, napi_create_int32(env, abilityInfo.defaultFormHeight, &nDefaultFormHeight)); + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objAbilityInfo, "defaultFormHeight", nDefaultFormHeight)); + + napi_value nDefaultFormWidth; + NAPI_CALL_RETURN_VOID(env, napi_create_int32(env, abilityInfo.defaultFormWidth, &nDefaultFormWidth)); + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objAbilityInfo, "defaultFormWidth", nDefaultFormWidth)); + napi_value nSubType; NAPI_CALL_RETURN_VOID(env, napi_create_int32(env, DEFAULT_INT32, &nSubType)); NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objAbilityInfo, "subType", nSubType)); - napi_value nMinFormWidth; - NAPI_CALL_RETURN_VOID(env, napi_create_int32(env, DEFAULT_INT32, &nMinFormWidth)); - NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objAbilityInfo, "minFormWidth", nMinFormWidth)); - napi_value nReadPermission; NAPI_CALL_RETURN_VOID(env, napi_create_string_utf8(env, std::string().c_str(), NAPI_AUTO_LENGTH, &nReadPermission)); NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objAbilityInfo, "readPermission", nReadPermission)); @@ -351,15 +407,16 @@ static void ConvertAbilityInfo(napi_env env, napi_value objAbilityInfo, const Ab napi_value nTargetAbility; NAPI_CALL_RETURN_VOID(env, napi_create_string_utf8(env, std::string().c_str(), NAPI_AUTO_LENGTH, &nTargetAbility)); NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objAbilityInfo, "targetAbility", nTargetAbility)); + napi_value nTheme; NAPI_CALL_RETURN_VOID(env, napi_create_string_utf8(env, std::string().c_str(), NAPI_AUTO_LENGTH, &nTheme)); NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objAbilityInfo, "theme", nTheme)); HILOG_INFO("nTheme=%{public}s.", abilityInfo.theme.c_str()); - napi_value nForm; - NAPI_CALL_RETURN_VOID(env, napi_create_object(env, &nForm)); - ConvertForm(env, nForm, abilityInfo.form); - NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objAbilityInfo, "form", nForm)); + napi_value nMetaData; + NAPI_CALL_RETURN_VOID(env, napi_create_object(env, &nMetaData)); + ConvertMetaData(env, nMetaData, abilityInfo.metaData); + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objAbilityInfo, "metaData", nMetaData)); } static void ConvertBundleInfo(napi_env env, napi_value objBundleInfo, const BundleInfo &bundleInfo) @@ -474,7 +531,7 @@ static void ConvertBundleInfo(napi_env env, napi_value objBundleInfo, const Bund env, napi_set_named_property(env, objBundleInfo, "entryInstallationFree", nEntryInstallationFree)); } -static void ConvertCustomizeData(napi_env env, napi_value objformInfo, const CustomizeData &customizeData) +static void ConvertFormCustomizeData(napi_env env, napi_value objformInfo, const FormCustomizeData &customizeData) { napi_value nName; NAPI_CALL_RETURN_VOID(env, napi_create_string_utf8(env, customizeData.name.c_str(), NAPI_AUTO_LENGTH, &nName)); @@ -568,12 +625,76 @@ static void ConvertFormInfo(napi_env env, napi_value objformInfo, const FormInfo for (size_t idx = 0; idx < formInfo.customizeDatas.size(); idx++) { napi_value nCustomizeData; NAPI_CALL_RETURN_VOID(env, napi_create_object(env, &nCustomizeData)); - ConvertCustomizeData(env, nCustomizeData, formInfo.customizeDatas[idx]); + ConvertFormCustomizeData(env, nCustomizeData, formInfo.customizeDatas[idx]); NAPI_CALL_RETURN_VOID(env, napi_set_element(env, nCustomizeDatas, idx, nCustomizeData)); } NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objformInfo, "customizeDatas", nCustomizeDatas)); } +static void ConvertShortcutIntent(napi_env env, napi_value objShortcutInfo, const ShortcutIntent &shortcutIntent) +{ + napi_value nTargetBundle; + NAPI_CALL_RETURN_VOID(env, napi_create_string_utf8(env, shortcutIntent.targetBundle.c_str(), NAPI_AUTO_LENGTH, &nTargetBundle)); + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objShortcutInfo, "targetBundle", nTargetBundle)); + napi_value nTargetClass; + NAPI_CALL_RETURN_VOID(env, napi_create_string_utf8(env, shortcutIntent.targetClass.c_str(), NAPI_AUTO_LENGTH, &nTargetClass)); + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objShortcutInfo, "targetClass", nTargetClass)); +} + +static void ConvertShortcutInfos(napi_env env, napi_value objShortcutInfo, const ShortcutInfo &shortcutInfo) +{ + napi_value nId; + NAPI_CALL_RETURN_VOID(env, napi_create_string_utf8(env, shortcutInfo.id.c_str(), NAPI_AUTO_LENGTH, &nId)); + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objShortcutInfo, "id", nId)); + HILOG_INFO("ConvertShortcutInfos Id=%{public}s.", shortcutInfo.id.c_str()); + + napi_value nBundleName; + NAPI_CALL_RETURN_VOID( + env, napi_create_string_utf8(env, shortcutInfo.bundleName.c_str(), NAPI_AUTO_LENGTH, &nBundleName)); + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objShortcutInfo, "bundleName", nBundleName)); + + napi_value nHostAbility; + NAPI_CALL_RETURN_VOID( + env, napi_create_string_utf8(env, shortcutInfo.hostAbility.c_str(), NAPI_AUTO_LENGTH, &nHostAbility)); + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objShortcutInfo, "hostAbility", nHostAbility)); + + napi_value nIcon; + NAPI_CALL_RETURN_VOID( + env, napi_create_string_utf8(env, shortcutInfo.icon.c_str(), NAPI_AUTO_LENGTH, &nIcon)); + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objShortcutInfo, "icon", nIcon)); + + napi_value nLabel; + NAPI_CALL_RETURN_VOID( + env, napi_create_string_utf8(env, shortcutInfo.label.c_str(), NAPI_AUTO_LENGTH, &nLabel)); + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objShortcutInfo, "label", nLabel)); + + napi_value nDisableMessage; + NAPI_CALL_RETURN_VOID( + env, napi_create_string_utf8(env, shortcutInfo.disableMessage.c_str(), NAPI_AUTO_LENGTH, &nDisableMessage)); + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objShortcutInfo, "disableMessage", nDisableMessage)); + + napi_value nIsStatic; + NAPI_CALL_RETURN_VOID(env, napi_get_boolean(env, shortcutInfo.isStatic, &nIsStatic)); + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objShortcutInfo, "isStatic", nIsStatic)); + + napi_value nIsHomeShortcut; + NAPI_CALL_RETURN_VOID(env, napi_get_boolean(env, shortcutInfo.isHomeShortcut, &nIsHomeShortcut)); + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objShortcutInfo, "isHomeShortcut", nIsHomeShortcut)); + + napi_value nIsEnables; + NAPI_CALL_RETURN_VOID(env, napi_get_boolean(env, shortcutInfo.isEnables, &nIsEnables)); + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objShortcutInfo, "isEnables", nIsEnables)); + + napi_value nIntents; + NAPI_CALL_RETURN_VOID(env, napi_create_array(env, &nIntents)); + for (size_t idx = 0; idx < shortcutInfo.intents.size(); idx++) { + napi_value nIntent; + NAPI_CALL_RETURN_VOID(env, napi_create_object(env, &nIntent)); + ConvertShortcutIntent(env, nIntent, shortcutInfo.intents[idx]); + NAPI_CALL_RETURN_VOID(env, napi_set_element(env, nIntents, idx, nIntent)); + } + NAPI_CALL_RETURN_VOID(env, napi_set_named_property(env, objShortcutInfo, "intents", nIntents)); +} static std::string GetStringFromNAPI(napi_env env, napi_value value) { std::string result; @@ -2474,6 +2595,126 @@ napi_value GetFormsInfoByApp(napi_env env, napi_callback_info info) } } +static void ProcessShortcutInfos(napi_env env, napi_value result, const std::vector &shortcutInfos) +{ + if (shortcutInfos.size() > 0) { + HILOG_INFO("-----ShortcutInfos is not null-----"); + size_t index = 0; + for (const auto &item : shortcutInfos) { + HILOG_INFO("shortcutId{%s} ", item.id.c_str()); + HILOG_INFO("bundleName{%s} ", item.bundleName.c_str()); + napi_value objShortcutInfo; + NAPI_CALL_RETURN_VOID(env, napi_create_object(env, &objShortcutInfo)); + ConvertShortcutInfos(env, objShortcutInfo, item); + NAPI_CALL_RETURN_VOID(env, napi_set_element(env, result, index, objShortcutInfo)); + index++; + } + } else { + HILOG_INFO("-----ShortcutInfos is null-----"); + } +} + +static bool InnerGetShortcutInfos(napi_env env, const std::string &bundleName, std::vector &shortcutInfos) +{ + auto iBundleMgr = GetBundleMgr(); + if (!iBundleMgr) { + HILOG_ERROR("can not get iBundleMgr"); + return false; + } + return iBundleMgr-> GetShortcutInfos(bundleName, shortcutInfos); +} +/** + * Promise and async callback + */ +napi_value GetShortcutInfos(napi_env env, napi_callback_info info) +{ + size_t argc = ARGS_SIZE_THREE; + napi_value argv[ARGS_SIZE_THREE] = {nullptr}; + napi_value thisArg; + void *data = nullptr; + NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisArg, &data)); + HILOG_INFO("ARGCSIZE is =%{public}d.", argc); + std::string bundleName; + ParseString(env, bundleName, argv[0]); + AsyncShortcutInfosCallbackInfo *asyncCallbackInfo = new AsyncShortcutInfosCallbackInfo{ + .env = env, .asyncWork = nullptr, .deferred = nullptr, .bundleName = bundleName}; + if (argc > (ARGS_SIZE_TWO - CALLBACK_SIZE)) { + HILOG_INFO("GetShortcutInfos asyncCallback."); + napi_value resourceName; + NAPI_CALL(env, napi_create_string_latin1(env, "GetShortcutInfos", NAPI_AUTO_LENGTH, &resourceName)); + napi_valuetype valuetype = napi_undefined; + napi_typeof(env, argv[ARGS_SIZE_ONE], &valuetype); + NAPI_ASSERT(env, valuetype == napi_function, "Wrong argument type. Function expected."); + NAPI_CALL(env, napi_create_reference(env, argv[ARGS_SIZE_ONE], 1, &asyncCallbackInfo->callback)); + + napi_create_async_work( + env, + nullptr, + resourceName, + [](napi_env env, void *data) { + AsyncShortcutInfosCallbackInfo *asyncCallbackInfo = (AsyncShortcutInfosCallbackInfo *)data; + asyncCallbackInfo->ret = + InnerGetShortcutInfos(env, asyncCallbackInfo->bundleName, asyncCallbackInfo->shortcutInfos); + }, + [](napi_env env, napi_status status, void *data) { + AsyncShortcutInfosCallbackInfo *asyncCallbackInfo = (AsyncShortcutInfosCallbackInfo *)data; + napi_value result[ARGS_SIZE_TWO] = {0}; + napi_value callback = 0; + napi_value undefined = 0; + napi_value callResult = 0; + napi_get_undefined(env, &undefined); + napi_create_array(env, &result[PARAM1]); + ProcessShortcutInfos(env, result[PARAM1], asyncCallbackInfo->shortcutInfos); + result[PARAM0] = GetCallbackErrorValue(env, asyncCallbackInfo->ret ? CODE_SUCCESS : CODE_FAILED); + napi_get_reference_value(env, asyncCallbackInfo->callback, &callback); + napi_call_function(env, undefined, callback, ARGS_SIZE_TWO, &result[PARAM0], &callResult); + + if (asyncCallbackInfo->callback != nullptr) { + napi_delete_reference(env, asyncCallbackInfo->callback); + } + napi_delete_async_work(env, asyncCallbackInfo->asyncWork); + delete asyncCallbackInfo; + }, + (void *)asyncCallbackInfo, + &asyncCallbackInfo->asyncWork); + NAPI_CALL(env, napi_queue_async_work(env, asyncCallbackInfo->asyncWork)); + napi_value result; + NAPI_CALL(env, napi_create_int32(env, 1, &result)); + return result; + } else { + HILOG_INFO("GetShortcutInfos promise."); + napi_deferred deferred; + napi_value promise; + NAPI_CALL(env, napi_create_promise(env, &deferred, &promise)); + asyncCallbackInfo->deferred = deferred; + + napi_value resourceName; + napi_create_string_latin1(env, "GetShortcutInfos", NAPI_AUTO_LENGTH, &resourceName); + napi_create_async_work( + env, + nullptr, + resourceName, + [](napi_env env, void *data) { + AsyncShortcutInfosCallbackInfo *asyncCallbackInfo = (AsyncShortcutInfosCallbackInfo *)data; + InnerGetShortcutInfos(env, asyncCallbackInfo->bundleName, asyncCallbackInfo->shortcutInfos); + }, + [](napi_env env, napi_status status, void *data) { + HILOG_INFO("=================load================="); + AsyncShortcutInfosCallbackInfo *asyncCallbackInfo = (AsyncShortcutInfosCallbackInfo *)data; + napi_value result; + napi_create_array(env, &result); + ProcessShortcutInfos(env, result, asyncCallbackInfo->shortcutInfos); + napi_resolve_deferred(asyncCallbackInfo->env, asyncCallbackInfo->deferred, result); + napi_delete_async_work(env, asyncCallbackInfo->asyncWork); + delete asyncCallbackInfo; + }, + (void *)asyncCallbackInfo, + &asyncCallbackInfo->asyncWork); + napi_queue_async_work(env, asyncCallbackInfo->asyncWork); + return promise; + } +} + void CreateAbilityTypeObject(napi_env env, napi_value value) { napi_value nUnknow; diff --git a/kits/appkit/napi/bundlemgr/bundle_mgr.h b/kits/appkit/napi/bundlemgr/bundle_mgr.h index 70ab2b5fa1a873850d5d81b9fe3bc3142a8c7a05..e3625bcd718135ede73b30e45d0c1a41abbad067 100644 --- a/kits/appkit/napi/bundlemgr/bundle_mgr.h +++ b/kits/appkit/napi/bundlemgr/bundle_mgr.h @@ -147,6 +147,16 @@ struct AsyncFormInfosByAppCallbackInfo { bool ret = false; }; +struct AsyncShortcutInfosCallbackInfo { + napi_env env; + napi_async_work asyncWork; + napi_deferred deferred; + napi_ref callback = 0; + std::string bundleName; + std::vector shortcutInfos; + bool ret = false; +}; + extern napi_value g_classBundleInstaller; napi_value GetApplicationInfos(napi_env env, napi_callback_info); @@ -163,6 +173,7 @@ napi_value BundleInstallerConstructor(napi_env env, napi_callback_info info); napi_value GetAllFormsInfo(napi_env env, napi_callback_info info); napi_value GetFormsInfoByApp(napi_env env, napi_callback_info info); napi_value GetFormsInfoByModule(napi_env env, napi_callback_info info); +napi_value GetShortcutInfos(napi_env env, napi_callback_info info); void CreateAbilityTypeObject(napi_env env, napi_value value); void CreateAbilitySubTypeObject(napi_env env, napi_value value); void CreateDisplayOrientationObject(napi_env env, napi_value value); diff --git a/kits/appkit/napi/bundlemgr/native_module.cpp b/kits/appkit/napi/bundlemgr/native_module.cpp index 59b7319bcca3ee9bba10d49c6b8730455015a165..47abb8f2e7acd1abfbc58b30578f398dd8bd0793 100644 --- a/kits/appkit/napi/bundlemgr/native_module.cpp +++ b/kits/appkit/napi/bundlemgr/native_module.cpp @@ -93,6 +93,7 @@ static napi_value Init(napi_env env, napi_value exports) DECLARE_NAPI_FUNCTION("getFormsInfoByModule", GetFormsInfoByModule), DECLARE_NAPI_FUNCTION("getFormsInfo", GetFormsInfoByApp), DECLARE_NAPI_FUNCTION("getAllFormsInfo", GetAllFormsInfo), + DECLARE_NAPI_FUNCTION("getShortcutInfos", GetShortcutInfos), DECLARE_NAPI_PROPERTY("AbilityType", nAbilityType), DECLARE_NAPI_PROPERTY("AbilitySubType", nAbilitySubType), DECLARE_NAPI_PROPERTY("DisplayOrientation", nDisplayOrientation), diff --git a/kits/appkit/native/app/include/context.h b/kits/appkit/native/app/include/context.h index 1a410433f50df258719af90a590cd43536dc48d3..f08b28c2ecc45b3a55f1bb4e24b5506fe21d56b0 100755 --- a/kits/appkit/native/app/include/context.h +++ b/kits/appkit/native/app/include/context.h @@ -27,6 +27,7 @@ #include "dummy_hap_module_info.h" #include "hap_module_info.h" #include "task/task_priority.h" +#include "mission_information.h" namespace OHOS { namespace AppExecFwk { @@ -629,8 +630,8 @@ public: * @return Returns true is first in Mission. */ virtual bool IsFirstInMission() = 0; - - /** + + /** * @brief Obtains a task dispatcher that is bound to the UI thread. * * @return Returns the task dispatcher that is bound to the UI thread. @@ -675,6 +676,34 @@ public: */ virtual std::shared_ptr GetGlobalTaskDispatcher(const TaskPriority &priority) = 0; + /** + * @brief Requires that tasks associated with a given capability token be moved to the background + * + * @param nonFirst If nonfirst is false and not the lowest ability of the mission, you cannot move mission to end + * + * @return Returns true on success, others on failure. + */ + virtual bool MoveMissionToEnd(bool nonFirst) = 0; + + /** + * @brief Sets the application to start its ability in lock mission mode. + */ + virtual void LockMission() = 0; + + /** + * @brief Unlocks this ability by exiting the lock mission mode. + */ + virtual void UnlockMission() = 0; + + /** + * @brief Sets description information about the mission containing this ability. + * + * @param MissionInformation Indicates the object containing information about the + * mission. This parameter cannot be null. + * @return Returns true on success, others on failure. + */ + virtual bool SetMissionInformation(const MissionInformation &missionInformation) = 0; + friend DataAbilityHelper; friend ContinuationConnector; diff --git a/kits/appkit/native/app/include/context_container.h b/kits/appkit/native/app/include/context_container.h index c2cd1d62c28a94d74a1fd86dcef519f40699210d..862d6b8efa57eefac036026b67433468bad76324 100755 --- a/kits/appkit/native/app/include/context_container.h +++ b/kits/appkit/native/app/include/context_container.h @@ -514,6 +514,34 @@ public: */ std::shared_ptr GetGlobalTaskDispatcher(const TaskPriority &priority) override; + /** + * @brief Requires that tasks associated with a given capability token be moved to the background + * + * @param nonFirst If nonfirst is false and not the lowest ability of the mission, you cannot move mission to end + * + * @return Returns true on success, others on failure. + */ + bool MoveMissionToEnd(bool nonFirst) override; + + /** + * @brief Sets the application to start its ability in lock mission mode. + */ + void LockMission() override; + + /** + * @brief Unlocks this ability by exiting the lock mission mode. + */ + void UnlockMission() override; + + /** + * @brief Sets description information about the mission containing this ability. + * + * @param MissionInformation Indicates the object containing information about the + * mission. This parameter cannot be null. + * @return Returns true on success, others on failure. + */ + bool SetMissionInformation(const MissionInformation &missionInformation) override; + private: std::shared_ptr baseContext_; }; diff --git a/kits/appkit/native/app/include/context_deal.h b/kits/appkit/native/app/include/context_deal.h index a5f3a4c4b209526867810ac458912f32023e7620..32ac461e603850c7add044758cd2db04b4fee261 100755 --- a/kits/appkit/native/app/include/context_deal.h +++ b/kits/appkit/native/app/include/context_deal.h @@ -675,6 +675,33 @@ public: * @return Returns a global task dispatcher. */ std::shared_ptr GetGlobalTaskDispatcher(const TaskPriority &priority) override; + /** + * @brief Requires that tasks associated with a given capability token be moved to the background + * + * @param nonFirst If nonfirst is false and not the lowest ability of the mission, you cannot move mission to end + * + * @return Returns true on success, others on failure. + */ + bool MoveMissionToEnd(bool nonFirst) override; + + /** + * @brief Sets the application to start its ability in lock mission mode. + */ + void LockMission() override; + + /** + * @brief Unlocks this ability by exiting the lock mission mode. + */ + void UnlockMission() override; + + /** + * @brief Sets description information about the mission containing this ability. + * + * @param MissionInformation Indicates the object containing information about the + * mission. This parameter cannot be null. + * @return Returns true on success, others on failure. + */ + bool SetMissionInformation(const MissionInformation &missionInformation) override; /** * @brief Set EventRunner for main thread. diff --git a/kits/appkit/native/app/src/context_container.cpp b/kits/appkit/native/app/src/context_container.cpp index 6ed8c8ecb47166d202d5c81d162a83d798f2b718..ec87ec513dbc15221e565e2edef1dd3d537929b8 100755 --- a/kits/appkit/native/app/src/context_container.cpp +++ b/kits/appkit/native/app/src/context_container.cpp @@ -17,6 +17,7 @@ #include "ability_manager_errors.h" #include "application_context.h" #include "bundle_constants.h" +#include "ability_manager_client.h" namespace OHOS { namespace AppExecFwk { @@ -1012,5 +1013,101 @@ std::shared_ptr ContextContainer::GetGlobalTaskDispatcher(const } } +/** + * @brief Requires that tasks associated with a given capability token be moved to the background + * + * @param nonFirst If nonfirst is false and not the lowest ability of the mission, you cannot move mission to end + * + * @return Returns true on success, others on failure. + */ +bool ContextContainer::MoveMissionToEnd(bool nonFirst) +{ + sptr token = GetToken(); + if (token == nullptr) { + APP_LOGE("ContextContainer::MoveMissionToEnd GetToken return nullptr"); + return false; + } + + auto abilityClient = AAFwk::AbilityManagerClient::GetInstance(); + if (abilityClient == nullptr) { + APP_LOGE("ContextContainer::MoveMissionToEnd abilityClient is nullptr"); + return false; + } + + ErrCode errval = abilityClient->MoveMissionToEnd(token, nonFirst); + if (errval != ERR_OK) { + APP_LOGE("ContextContainer::MoveMissionToEnd MoveMissionToEnd retval is %d", errval); + } + + return (errval == ERR_OK) ? true : false; +} + +/** + * @brief Sets the application to start its ability in lock mission mode. + */ +void ContextContainer::LockMission() +{ + auto abilityClient = AAFwk::AbilityManagerClient::GetInstance(); + if (abilityClient == nullptr) { + APP_LOGE("ContextContainer::LockMission abilityClient is nullptr"); + return; + } + + ErrCode errval = abilityClient->LockMission(GetMissionId()); + if (errval != ERR_OK) { + APP_LOGE("ContextContainer::LockMission LockMission retval is %d", errval); + } +} + +/** + * @brief Unlocks this ability by exiting the lock mission mode. + */ +void ContextContainer::UnlockMission() +{ + auto abilityClient = AAFwk::AbilityManagerClient::GetInstance(); + if (abilityClient == nullptr) { + APP_LOGE("ContextContainer::UnlockMission abilityClient is nullptr"); + return; + } + + ErrCode errval = abilityClient->UnlockMission(GetMissionId()); + if (errval != ERR_OK) { + APP_LOGE("ContextContainer::UnlockMission UnlockMission retval is %d", errval); + } +} + +/** + * @brief Sets description information about the mission containing this ability. + * + * @param MissionInformation Indicates the object containing information about the + * mission. This parameter cannot be null. + * @return Returns true on success, others on failure. + */ +bool ContextContainer::SetMissionInformation(const MissionInformation &missionInformation) +{ + sptr token = GetToken(); + if (token == nullptr) { + APP_LOGE("ContextContainer::SetMissionInformation GetToken return nullptr"); + return false; + } + + auto abilityClient = AAFwk::AbilityManagerClient::GetInstance(); + if (abilityClient == nullptr) { + APP_LOGE("ContextContainer::SetMissionInformation abilityClient is nullptr"); + return false; + } + + AAFwk::MissionDescriptionInfo missionInfoMat; + missionInfoMat.label = missionInformation.label; + missionInfoMat.iconPath = missionInformation.iconPath; + + ErrCode errval = abilityClient->SetMissionDescriptionInfo(token, missionInfoMat); + if (errval != ERR_OK) { + APP_LOGE("ContextContainer::SetMissionInformation SetMissionDescriptionInfo retval is %d", errval); + } + + return (errval == ERR_OK) ? true : false; +} + } // namespace AppExecFwk } // namespace OHOS diff --git a/kits/appkit/native/app/src/context_deal.cpp b/kits/appkit/native/app/src/context_deal.cpp index 64dd2ca9fa48b9aeadbe7a448d700e83f79b49fb..b84ff9650b75f5fb7a3d844e30cba22581e8a5d5 100755 --- a/kits/appkit/native/app/src/context_deal.cpp +++ b/kits/appkit/native/app/src/context_deal.cpp @@ -1194,6 +1194,11 @@ void ContextDeal::SetRunner(const std::shared_ptr &runner) mainEventRunner_ = runner; } +/** + * @brief init HapModuleInfo data + * + * @return Returns true on success, others on failure. + */ bool ContextDeal::HapModuleInfoRequestInit() { sptr ptr = GetBundleManager(); @@ -1216,5 +1221,41 @@ bool ContextDeal::HapModuleInfoRequestInit() return true; } +/** + * @brief Requires that tasks associated with a given capability token be moved to the background + * + * @param nonFirst If nonfirst is false and not the lowest ability of the mission, you cannot move mission to end + * + * @return Returns true on success, others on failure. + */ +bool ContextDeal::MoveMissionToEnd(bool nonFirst) +{ + return false; +} + +/** + * @brief Sets the application to start its ability in lock mission mode. + */ +void ContextDeal::LockMission() +{} + +/** + * @brief Unlocks this ability by exiting the lock mission mode. + */ +void ContextDeal::UnlockMission() +{} + +/** + * @brief Sets description information about the mission containing this ability. + * + * @param MissionInformation Indicates the object containing information about the + * mission. This parameter cannot be null. + * @return Returns true on success, others on failure. + */ +bool ContextDeal::SetMissionInformation(const MissionInformation &missionInformation) +{ + return false; +} + } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file diff --git a/sa_profile/BUILD.gn b/sa_profile/BUILD.gn index a7a99a086c4bf2aba0855001a86cfa560de2d21e..56173ba8a66946bda751c6d06753a2e5d0168119 100644 --- a/sa_profile/BUILD.gn +++ b/sa_profile/BUILD.gn @@ -24,7 +24,11 @@ ohos_sa_profile("appexecfwk_sa_profile") { } ohos_prebuilt_etc("foundation.rc") { - source = "foundation.rc" + if (use_musl) { + source = "foundation.cfg" + } else { + source = "foundation.rc" + } relative_install_dir = "init" subsystem_name = "appexecfwk" part_name = "appexecfwk_standard" diff --git a/sa_profile/foundation.cfg b/sa_profile/foundation.cfg new file mode 100644 index 0000000000000000000000000000000000000000..67a08206cc7cc134c6363a071e6200763f5a3227 --- /dev/null +++ b/sa_profile/foundation.cfg @@ -0,0 +1,47 @@ +{ + "jobs" : [{ + "name" : "init", + "cmds" : [ + "mkdir /dev/cpuctl/background", + "chown system system /dev/cpuctl/background", + "chmod 0755 /dev/cpuctl/background", + "chmod 0755 /dev/cpuctl/background/tasks", + "write /dev/cpuctl/background/cpu.shares 512", + "write /dev/cpuset/background/cpus 0", + "mkdir /dev/freezer", + "chown system system /dev/freezer", + "chmod 0755 /dev/freezer", + "mount cgroup none /dev/freezer freezer", + "mkdir /dev/freezer/frozen", + "mkdir /dev/freezer/thawed", + "chown system system /dev/freezer/frozen", + "chown system system /dev/freezer/frozen/tasks", + "chown system system /dev/freezer/thawed", + "chown system system /dev/freezer/thawed/tasks", + "chmod 0755 /dev/freezer/frozen", + "chmod 0755 /dev/freezer/frozen/tasks", + "chmod 0755 /dev/freezer/thawed", + "chmod 0755 /dev/freezer/thawed/tasks", + "write /dev/freezer/frozen/freezer.state FROZEN", + "write /dev/freezer/thawed/freezer.state THAWED" + ] + }, { + "name" : "boot", + "cmds" : [ + "chown radio system /sys/power/wake_lock", + "chown radio system /sys/power/wake_unlock", + "chmod 0664 /sys/power/wakeup_count", + "start foundation" + ] + } + ], + "services" : [{ + "name" : "foundation", + "path" : ["/system/bin/sa_main", "/system/profile/foundation.xml"], + "importance" : -20, + "uid" : "system", + "gid" : ["system"], + "caps" : ["SYS_PTRACE", "KILL"] + } + ] +} diff --git a/services/appmgr/BUILD.gn b/services/appmgr/BUILD.gn index 577dd6cdf37b279c3b8d08c7242c8f8215867182..2915693ea521132636107e36424cef2ef8d32185 100644 --- a/services/appmgr/BUILD.gn +++ b/services/appmgr/BUILD.gn @@ -19,8 +19,8 @@ config("appmgr_config") { "include", "${appspawn_path}/include", "//utils/system/safwk/native/include", - "//base/notification/ces_standard/cesfwk/innerkits/include", - "//base/notification/ces_standard/cesfwk/kits/native/include", + "//base/notification/ces_standard/frameworks/core/include", + "//base/notification/ces_standard/interfaces/innerkits/native/include", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk/main/cpp/include", ] } @@ -109,7 +109,6 @@ ohos_shared_library("libams") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${libs_path}/libeventhandler:libeventhandler_target", - "//base/notification/ces_standard/cesfwk/innerkits:cesfwk_innerkits", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", "//base/startup/appspawn_standard:appspawn_socket_client", "//foundation/aafwk/standard/interfaces/innerkits/base:base", @@ -120,6 +119,8 @@ ohos_shared_library("libams") { ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/appmgr/src/app_mgr_service_inner.cpp b/services/appmgr/src/app_mgr_service_inner.cpp index 8e2fc749c15682b0c61dbf04a7997d993c53b450..29fb059ca382a945d878ea0c4fedfb2e10673c3b 100644 --- a/services/appmgr/src/app_mgr_service_inner.cpp +++ b/services/appmgr/src/app_mgr_service_inner.cpp @@ -282,6 +282,7 @@ void AppMgrServiceInner::ClearUpApplicationData(const std::string &bundleName, i result = Permission::PermissionKit::RemoveUserGrantedReqPermissions(bundleName, Constants::DEFAULT_USERID); if (result) { APP_LOGE("RemoveUserGrantedReqPermissions failed"); + return; } } if (result) { diff --git a/services/appmgr/test/BUILD.gn b/services/appmgr/test/BUILD.gn index 2ec12e94837c18b9aeb465cd1dc272409b73f746..0576f5b08b29f26d986ab8fecfcac7920f409089 100644 --- a/services/appmgr/test/BUILD.gn +++ b/services/appmgr/test/BUILD.gn @@ -77,7 +77,6 @@ ohos_source_set("appmgr_test_source") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "//base/notification/ces_standard/cesfwk/innerkits:cesfwk_innerkits", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/aafwk/standard/interfaces/innerkits/want:want", @@ -86,6 +85,7 @@ ohos_source_set("appmgr_test_source") { ] external_deps = [ + "ces_standard:cesfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/appmgr/test/mock/include/mock_bundle_manager.h b/services/appmgr/test/mock/include/mock_bundle_manager.h index b06d611b7c245d33ddfcf207ee90b9a4ee9310b9..312d5f4182e1e5303e1f48f55ea2178db480cfd5 100644 --- a/services/appmgr/test/mock/include/mock_bundle_manager.h +++ b/services/appmgr/test/mock/include/mock_bundle_manager.h @@ -332,6 +332,10 @@ public: { return true; } + virtual bool GetShortcutInfos(const std::string &bundleName, std::vector &shortcutInfos) override + { + return true; + } }; } // namespace AppExecFwk diff --git a/services/bundlemgr/BUILD.gn b/services/bundlemgr/BUILD.gn index 69ea62db5f3c70bbca0885e8993ada28f9686b38..39078241eb3d30f05e8b6613597300a5eb431e8a 100644 --- a/services/bundlemgr/BUILD.gn +++ b/services/bundlemgr/BUILD.gn @@ -20,7 +20,6 @@ config("bundlemgr_config") { include_dirs = [ "include", "//utils/system/safwk/native/include", - "//foundation/appexecfwk/standard/event/cesfwk/kits/native/include", ] } @@ -120,7 +119,7 @@ ohos_shared_library("libbms") { "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content/", "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", - "//base/notification/ces_standard/cesfwk/kits/native/include", + "//base/notification/ces_standard/interfaces/innerkits/native/include", "//utils/system/safwk/native/include", ] @@ -157,7 +156,6 @@ ohos_shared_library("libbms") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${common_path}:libappexecfwk_common", "${libs_path}/libeventhandler:libeventhandler_target", - "//base/notification/ces_standard/cesfwk/kits/native:cesfwk_kits", "//base/security/appverify/interfaces/innerkits/appverify:libhapverify", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", "//foundation/aafwk/standard/interfaces/innerkits/base:base", @@ -168,6 +166,8 @@ ohos_shared_library("libbms") { ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] @@ -209,7 +209,11 @@ ohos_executable("installs") { } ohos_prebuilt_etc("installs.rc") { - source = "installs.rc" + if (use_musl) { + source = "installs.cfg" + } else { + source = "installs.rc" + } relative_install_dir = "init" subsystem_name = "appexecfwk" part_name = "appexecfwk_standard" diff --git a/services/bundlemgr/include/bundle_data_mgr.h b/services/bundlemgr/include/bundle_data_mgr.h index c572ea7eb5e68c07316b3db49491fe7616512eac..0a962c6856e4ed28e8d0f2e4c212c73449248336 100755 --- a/services/bundlemgr/include/bundle_data_mgr.h +++ b/services/bundlemgr/include/bundle_data_mgr.h @@ -352,30 +352,33 @@ public: std::shared_ptr GetDataStorage() const; /** * @brief Obtains the FormInfo objects provided by all applications on the device. - * @param formInfo List of FormInfo objects if obtained; returns an empty List if no FormInfo is available on the - * device. + * @param formInfos List of FormInfo objects if obtained; * @return Returns true if this function is successfully called; returns false otherwise. */ bool GetAllFormsInfo(std::vector &formInfos) const; /** * @brief Obtains the FormInfo objects provided by a specified application on the device. - * @param bundleName Indicates the bundle name of the HarmonyOS application. - * @param formInfo List of FormInfo objects if obtained; returns an empty List if no FormInfo is available on the - * device. + * @param bundleName Indicates the bundle name of the application. + * @param formInfos List of FormInfo objects if obtained; * @return Returns true if this function is successfully called; returns false otherwise. */ bool GetFormsInfoByApp(const std::string &bundleName, std::vector &formInfos) const; /** * @brief Obtains the FormInfo objects provided by a specified module name. - * @param formInfo List of FormInfo objects if obtained; returns an empty List if no FormInfo is available on the - * device. - * @param moduleName Indicates the module name of the HarmonyOS application. - * @param bundleName Indicates the bundle name of the HarmonyOS application. + * @param formInfos List of FormInfo objects if obtained; + * @param moduleName Indicates the module name of the application. + * @param bundleName Indicates the bundle name of the application. * @return Returns true if this function is successfully called; returns false otherwise. */ bool GetFormsInfoByModule( const std::string &bundleName, const std::string &moduleName, std::vector &formInfos) const; - + /** + * @brief Obtains the ShortcutInfo objects provided by a specified application on the device. + * @param bundleName Indicates the bundle name of the application. + * @param shortcutInfos List of ShortcutInfo objects if obtained. + * @return Returns true if this function is successfully called; returns false otherwise. + */ + bool GetShortcutInfos(const std::string &bundleName, std::vector &shortcutInfos) const; private: /** * @brief Init transferStates. diff --git a/services/bundlemgr/include/bundle_mgr_host_impl.h b/services/bundlemgr/include/bundle_mgr_host_impl.h index 3997c33ee2e3d120e425312c21ae0ad944b0aaee..aba344a3999f2e8503bbcf2a15d1d8767952ee97 100644 --- a/services/bundlemgr/include/bundle_mgr_host_impl.h +++ b/services/bundlemgr/include/bundle_mgr_host_impl.h @@ -350,7 +350,13 @@ public: */ virtual bool GetFormsInfoByModule( const std::string &bundleName, const std::string &moduleName, std::vector &formInfos) override; - + /** + * @brief Obtains the ShortcutInfo objects provided by a specified application on the device. + * @param bundleName Indicates the bundle name of the application. + * @param shortcutInfos List of ShortcutInfo objects if obtained. + * @return Returns true if GetShortcutInfos successfully; returns false otherwise. + */ + virtual bool GetShortcutInfos(const std::string &bundleName, std::vector &shortcutInfos) override; private: const std::shared_ptr GetDataMgrFromService(); }; diff --git a/services/bundlemgr/include/inner_bundle_info.h b/services/bundlemgr/include/inner_bundle_info.h index 16291a9f2ea615165547d9945258a1f5e685f09f..f67d5e15d5b8a1b83951da06e60eab534f968298 100644 --- a/services/bundlemgr/include/inner_bundle_info.h +++ b/services/bundlemgr/include/inner_bundle_info.h @@ -28,34 +28,11 @@ #include "bundle_constants.h" #include "json_serializer.h" #include "common_profile.h" +#include "shortcut_info.h" namespace OHOS { namespace AppExecFwk { -struct Parameters { - std::string description; - std::string name; - std::string type; -}; - -struct Results { - std::string description; - std::string name; - std::string type; -}; - -struct InnerCustomizeData { - std::string name; - std::string value; - std::string extra; -}; - -struct MetaData { - std::vector parameters; - std::vector results; - std::vector customizeData; -}; - struct Distro { bool deliveryWithInstall; std::string moduleName; @@ -351,6 +328,17 @@ public: formInfos_.try_emplace(forms.first, forms.second); } } + /** + * @brief Add shortcut infos to old InnerBundleInfo object. + * @param shortcutInfos Indicates the Shortcut object to be add. + * @return + */ + void AddModuleShortcutInfo(const std::map &shortcutInfos) + { + for (const auto &shortcut : shortcutInfos) { + shortcutInfos_.try_emplace(shortcut.first, shortcut.second); + } + } /** * @brief Add innerModuleInfos to old InnerBundleInfo object. * @param innerModuleInfos Indicates the InnerModuleInfo object to be add. @@ -927,13 +915,22 @@ public: } /** * @brief Insert formInfo. - * @param modulePackage Indicates the modulePackage object as key. - * @param abilityInfo Indicates the formInfo object as value. + * @param keyName Indicates object as key. + * @param formInfos Indicates the formInfo object as value. */ void InsertFormInfos(const std::string &keyName, const std::vector &formInfos) { formInfos_.emplace(keyName, formInfos); } + /** + * @brief Insert shortcutInfos. + * @param keyName Indicates object as key. + * @param shortcutInfos Indicates the shortcutInfos object as value. + */ + void InsertShortcutInfos(const std::string &keyName, const ShortcutInfo &shortcutInfos) + { + shortcutInfos_.emplace(keyName, shortcutInfos); + } // use for new Info in updating progress void RestoreFromOldInfo(const InnerBundleInfo &oldInfo) { @@ -970,16 +967,20 @@ public: bool CheckSpecialMetaData(const std::string &metaData) const; /** * @brief Obtains the FormInfo objects provided by all applications on the device. - * @param moduleName Indicates the module name of the HarmonyOS application. - * @param formInfos list of FormInfo objects if obtained; returns an empty List if no FormInfo is available on the device. + * @param moduleName Indicates the module name of the application. + * @param formInfos List of FormInfo objects if obtained; */ void GetFormsInfoByModule(const std::string &moduleName, std::vector &formInfos) const; /** * @brief Obtains the FormInfo objects provided by a specified application on the device. - * @param formInfos list of FormInfo objects if obtained; returns an empty List if no FormInfo is available on the device. + * @param formInfos List of FormInfo objects if obtained; */ void GetFormsInfoByApp(std::vector &formInfos) const; - + /** + * @brief Obtains the ShortcutInfo objects provided by a specified application on the device. + * @param shortcutInfos List of ShortcutInfo objects if obtained. + */ + void GetShortcutInfos(std::vector &shortcutInfos) const; private: // using for get bool isSupportBackup_ = false; @@ -1004,15 +1005,12 @@ private: std::map baseAbilityInfos_; std::map innerModuleInfos_; std::map> skillInfos_; + std::map shortcutInfos_; }; void from_json(const nlohmann::json &jsonObject, InnerModuleInfo &info); void from_json(const nlohmann::json &jsonObject, SkillUri &uri); void from_json(const nlohmann::json &jsonObject, Skill &skill); -void from_json(const nlohmann::json &jsonObject, InnerCustomizeData &customizeData); -void from_json(const nlohmann::json &jsonObject, Parameters ¶meters); -void from_json(const nlohmann::json &jsonObject, Results &results); -void from_json(const nlohmann::json &jsonObject, MetaData &metaData); void from_json(const nlohmann::json &jsonObject, Distro &distro); void from_json(const nlohmann::json &jsonObject, ReqPermission &ReqPermission); void from_json(const nlohmann::json &jsonObject, DefPermission &DefPermission); diff --git a/services/bundlemgr/installs.cfg b/services/bundlemgr/installs.cfg new file mode 100644 index 0000000000000000000000000000000000000000..4c45e7747627a614fd90d428d38965ca55c0ad64 --- /dev/null +++ b/services/bundlemgr/installs.cfg @@ -0,0 +1,17 @@ +{ + "jobs" : [{ + "name" : "late-fs", + "cmds" : [ + "start installs" + ] + } + ], + "services" : [{ + "name" : "installs", + "path" : ["/system/bin/installs"], + "importance" : -20, + "uid" : "root", + "gid" : ["root"] + } + ] +} diff --git a/services/bundlemgr/src/bundle_data_mgr.cpp b/services/bundlemgr/src/bundle_data_mgr.cpp index cd0edecbdeaa6f078c0abd1b3da90eb28585bfd9..76e7a17dcac159632704ae10ef1396cab288a8fc 100755 --- a/services/bundlemgr/src/bundle_data_mgr.cpp +++ b/services/bundlemgr/src/bundle_data_mgr.cpp @@ -1325,5 +1325,34 @@ bool BundleDataMgr::GetFormsInfoByApp(const std::string &bundleName, std::vector APP_LOGE("App forminfo find success"); return true; } + +bool BundleDataMgr::GetShortcutInfos(const std::string &bundleName, std::vector &shortcutInfos) const +{ + if (bundleName.empty()) { + APP_LOGW("bundle name is empty"); + return false; + } + std::lock_guard lock(bundleInfoMutex_); + if (bundleInfos_.empty()) { + APP_LOGI("bundleInfos_ data is empty"); + return false; + } + auto infoItem = bundleInfos_.find(bundleName); + if (infoItem == bundleInfos_.end()) { + return false; + } + auto innerBundleInfo = infoItem->second.find(Constants::CURRENT_DEVICE_ID); + if (innerBundleInfo == infoItem->second.end()) { + return false; + } + if (innerBundleInfo->second.IsDisabled()) { + APP_LOGI("app %{public}s is disabled", innerBundleInfo->second.GetBundleName().c_str()); + return false; + } + innerBundleInfo->second.GetShortcutInfos(shortcutInfos); + APP_LOGE("shortcutInfo find success"); + return true; +} + } // namespace AppExecFwk } // namespace OHOS diff --git a/services/bundlemgr/src/bundle_mgr_host_impl.cpp b/services/bundlemgr/src/bundle_mgr_host_impl.cpp index d7f2300f19f68e01f5edcb3c6417c4a37d49610c..7d9a94cda75983db6aa7f32a7cf78b7212495f03 100755 --- a/services/bundlemgr/src/bundle_mgr_host_impl.cpp +++ b/services/bundlemgr/src/bundle_mgr_host_impl.cpp @@ -521,6 +521,16 @@ bool BundleMgrHostImpl::GetFormsInfoByModule( return dataMgr->GetFormsInfoByModule(bundleName, moduleName, formInfos); } +bool BundleMgrHostImpl::GetShortcutInfos(const std::string &bundleName, std::vector &shortcutInfos) +{ + auto dataMgr = GetDataMgrFromService(); + if (dataMgr == nullptr) { + APP_LOGE("DataMgr is nullptr"); + return false; + } + return dataMgr->GetShortcutInfos(bundleName, shortcutInfos); +} + const std::shared_ptr BundleMgrHostImpl::GetDataMgrFromService() { return DelayedSingleton::GetInstance()->GetDataMgr(); diff --git a/services/bundlemgr/src/bundle_profile.cpp b/services/bundlemgr/src/bundle_profile.cpp index 2747ac213e9af77542e0d5cceb119bcda2d161f5..27611f30615555d86795dee69f77149f77c9e24a 100644 --- a/services/bundlemgr/src/bundle_profile.cpp +++ b/services/bundlemgr/src/bundle_profile.cpp @@ -153,6 +153,30 @@ struct Forms { FormsMetaData metaData; }; +struct Parameters { + std::string description; + std::string name; + std::string type; +}; + +struct Results { + std::string description; + std::string name; + std::string type; +}; + +struct CustomizeData { + std::string name; + std::string value; + std::string extra; +}; + +struct MetaData { + std::vector parameters; + std::vector results; + std::vector customizeData; +}; + struct UriPermission { std::string mode; std::string path; @@ -223,6 +247,7 @@ struct CommonEvent { struct Shortcut { std::string shortcutId; std::string label; + std::string icon; std::vector intents; }; @@ -668,6 +693,128 @@ void from_json(const nlohmann::json &jsonObject, Form &form) ArrayType::NOT_ARRAY); } +void from_json(const nlohmann::json &jsonObject, CustomizeData &customizeData) +{ + // these are not required fields. + const auto &jsonObjectEnd = jsonObject.end(); + GetValueIfFindKey(jsonObject, + jsonObjectEnd, + PROFILE_KEY_NAME, + customizeData.name, + JsonType::STRING, + false, + parseResult, + ArrayType::NOT_ARRAY); + GetValueIfFindKey(jsonObject, + jsonObjectEnd, + BUNDLE_MODULE_META_KEY_EXTRA, + customizeData.extra, + JsonType::STRING, + false, + parseResult, + ArrayType::NOT_ARRAY); + GetValueIfFindKey(jsonObject, + jsonObjectEnd, + BUNDLE_MODULE_META_KEY_VALUE, + customizeData.value, + JsonType::STRING, + false, + parseResult, + ArrayType::NOT_ARRAY); +} + +void from_json(const nlohmann::json &jsonObject, Parameters ¶meters) +{ + // these are required fields. + const auto &jsonObjectEnd = jsonObject.end(); + GetValueIfFindKey(jsonObject, + jsonObjectEnd, + BUNDLE_MODULE_PROFILE_KEY_TYPE, + parameters.type, + JsonType::STRING, + true, + parseResult, + ArrayType::NOT_ARRAY); + // these are not required fields. + GetValueIfFindKey(jsonObject, + jsonObjectEnd, + PROFILE_KEY_DESCRIPTION, + parameters.description, + JsonType::STRING, + false, + parseResult, + ArrayType::NOT_ARRAY); + GetValueIfFindKey(jsonObject, + jsonObjectEnd, + PROFILE_KEY_NAME, + parameters.name, + JsonType::STRING, + false, + parseResult, + ArrayType::NOT_ARRAY); +} + +void from_json(const nlohmann::json &jsonObject, Results &results) +{ + // these are required fields. + const auto &jsonObjectEnd = jsonObject.end(); + GetValueIfFindKey(jsonObject, + jsonObjectEnd, + BUNDLE_MODULE_PROFILE_KEY_TYPE, + results.type, + JsonType::STRING, + true, + parseResult, + ArrayType::NOT_ARRAY); + // these are not required fields. + GetValueIfFindKey(jsonObject, + jsonObjectEnd, + PROFILE_KEY_DESCRIPTION, + results.description, + JsonType::STRING, + false, + parseResult, + ArrayType::NOT_ARRAY); + GetValueIfFindKey(jsonObject, + jsonObjectEnd, + PROFILE_KEY_NAME, + results.name, + JsonType::STRING, + false, + parseResult, + ArrayType::NOT_ARRAY); +} + +void from_json(const nlohmann::json &jsonObject, MetaData &metaData) +{ + // these are not required fields. + const auto &jsonObjectEnd = jsonObject.end(); + GetValueIfFindKey>(jsonObject, + jsonObjectEnd, + BUNDLE_MODULE_META_KEY_CUSTOMIZE_DATA, + metaData.customizeData, + JsonType::ARRAY, + false, + parseResult, + ArrayType::OBJECT); + GetValueIfFindKey>(jsonObject, + jsonObjectEnd, + BUNDLE_MODULE_META_KEY_PARAMETERS, + metaData.parameters, + JsonType::ARRAY, + false, + parseResult, + ArrayType::OBJECT); + GetValueIfFindKey>(jsonObject, + jsonObjectEnd, + BUNDLE_MODULE_META_KEY_RESULTS, + metaData.results, + JsonType::ARRAY, + false, + parseResult, + ArrayType::OBJECT); +} + void from_json(const nlohmann::json &jsonObject, FormsCustomizeData &customizeDataForms) { // these are not required fields. @@ -1201,14 +1348,14 @@ void from_json(const nlohmann::json &jsonObject, Js &js) ArrayType::NOT_ARRAY); } -void from_json(const nlohmann::json &jsonObject, Intent &intent) +void from_json(const nlohmann::json &jsonObject, Intent &intents) { // these are not required fields. const auto &jsonObjectEnd = jsonObject.end(); GetValueIfFindKey(jsonObject, jsonObjectEnd, BUNDLE_MODULE_PROFILE_KEY_TARGET_CLASS, - intent.targetClass, + intents.targetClass, JsonType::STRING, false, parseResult, @@ -1216,7 +1363,7 @@ void from_json(const nlohmann::json &jsonObject, Intent &intent) GetValueIfFindKey(jsonObject, jsonObjectEnd, BUNDLE_MODULE_PROFILE_KEY_TARGET_BUNDLE, - intent.targetBundle, + intents.targetBundle, JsonType::STRING, false, parseResult, @@ -1291,6 +1438,14 @@ void from_json(const nlohmann::json &jsonObject, Shortcut &shortcut) false, parseResult, ArrayType::NOT_ARRAY); + GetValueIfFindKey(jsonObject, + jsonObjectEnd, + BUNDLE_MODULE_PROFILE_KEY_ICON, + shortcut.icon, + JsonType::STRING, + false, + parseResult, + ArrayType::NOT_ARRAY); GetValueIfFindKey>(jsonObject, jsonObjectEnd, BUNDLE_MODULE_PROFILE_KEY_SHORTCUT_INTENTS, @@ -1557,7 +1712,7 @@ bool ConvertFormInfo(FormInfo &forminfos, const ProfileReader::Forms &form) forminfos.updateDuration = form.updateDuration; forminfos.jsComponentName = form.jsComponentName; for (auto data : form.metaData.customizeData) { - CustomizeData customizeData; + FormCustomizeData customizeData; customizeData.name = data.name; customizeData.value = data.value; forminfos.customizeDatas.emplace_back(customizeData); @@ -1628,10 +1783,35 @@ bool TransformToInfo(const ProfileReader::ConfigJson &configJson, BundleInfo &bu return true; } +void GetMetaData(MetaData &metaData, const ProfileReader::MetaData &profileMetaData) +{ + for (const auto& item : profileMetaData.parameters) { + Parameters parameter; + parameter.description = item.description; + parameter.name = item.name; + parameter.type = item.type; + metaData.parameters.emplace_back(parameter); + } + for (const auto& item : profileMetaData.results) { + Results result; + result.description = item.description; + result.name = item.name; + result.type = item.type; + metaData.results.emplace_back(result); + } + for (const auto& item : profileMetaData.customizeData) { + CustomizeData customizeData; + customizeData.name = item.name; + customizeData.extra = item.extra; + customizeData.value = item.value; + metaData.customizeData.emplace_back(customizeData); + } +} + bool TransformToInfo(const ProfileReader::ConfigJson &configJson, InnerModuleInfo &innerModuleInfo) { innerModuleInfo.modulePackage = configJson.module.package; - innerModuleInfo.moduleName = configJson.module.name; + innerModuleInfo.moduleName = configJson.module.distro.moduleName; innerModuleInfo.description = configJson.module.description; auto colorModeInfo = std::find_if(std::begin(ProfileReader::moduleColorMode), std::end(ProfileReader::moduleColorMode), @@ -1639,7 +1819,7 @@ bool TransformToInfo(const ProfileReader::ConfigJson &configJson, InnerModuleInf if (colorModeInfo != ProfileReader::moduleColorMode.end()) { innerModuleInfo.colorMode = colorModeInfo->second; } - innerModuleInfo.metaData = configJson.module.metaData; + GetMetaData(innerModuleInfo.metaData, configJson.module.metaData); innerModuleInfo.distro = configJson.module.distro; innerModuleInfo.reqCapabilities = configJson.module.reqCapabilities; innerModuleInfo.defPermissions = configJson.module.defPermissions; @@ -1689,17 +1869,18 @@ bool TransformToInfo( abilityInfo.uri = ability.uri; abilityInfo.package = configJson.module.package; abilityInfo.bundleName = configJson.app.bundleName; - abilityInfo.moduleName = configJson.module.name; + abilityInfo.moduleName = configJson.module.distro.moduleName; abilityInfo.applicationName = configJson.app.bundleName; abilityInfo.targetAbility = ability.targetAbility; abilityInfo.enabled = true; abilityInfo.readPermission = ability.readPermission; abilityInfo.writePermission = ability.writePermission; - abilityInfo.form.formEntity = ability.form.formEntity; - abilityInfo.form.minHeight = ability.form.minHeight; - abilityInfo.form.defaultHeight = ability.form.defaultHeight; - abilityInfo.form.minWidth = ability.form.minWidth; - abilityInfo.form.defaultWidth = ability.form.defaultWidth; + abilityInfo.formEntity = ability.form.formEntity; + abilityInfo.minFormHeight = ability.form.minHeight; + abilityInfo.defaultFormHeight = ability.form.defaultHeight; + abilityInfo.minFormWidth = ability.form.minWidth; + abilityInfo.defaultFormWidth = ability.form.defaultWidth; + GetMetaData(abilityInfo.metaData, ability.metaData); return true; } @@ -1723,7 +1904,21 @@ bool TransformToInfo(ProfileReader::ConfigJson &configJson, InnerBundleInfo &inn InnerModuleInfo innerModuleInfo; TransformToInfo(configJson, innerModuleInfo); - + for (const auto &info : configJson.module.shortcuts) { + ShortcutInfo shortcutInfo; + shortcutInfo.id = info.shortcutId; + shortcutInfo.bundleName = configJson.app.bundleName; + shortcutInfo.icon = info.icon; + shortcutInfo.label = info.label; + for (const auto &intent : info.intents) { + ShortcutIntent shortcutIntent; + shortcutIntent.targetBundle = intent.targetBundle; + shortcutIntent.targetClass = intent.targetClass; + shortcutInfo.intents.emplace_back(shortcutIntent); + } + std::string shortcutkey = configJson.app.bundleName + configJson.module.package + info.shortcutId; + innerBundleInfo.InsertShortcutInfos(shortcutkey, shortcutInfo); + } bool find = false; for (const auto &ability : configJson.module.abilities) { AbilityInfo abilityInfo; diff --git a/services/bundlemgr/src/inner_bundle_info.cpp b/services/bundlemgr/src/inner_bundle_info.cpp index bf7279757859deef040d224929e91f60ace47dc0..f523b5371db717647f79a0c7a41f20255a9b6c24 100644 --- a/services/bundlemgr/src/inner_bundle_info.cpp +++ b/services/bundlemgr/src/inner_bundle_info.cpp @@ -54,6 +54,7 @@ const std::string MODULE_RES_PATH = "moduleResPath"; const std::string MODULE_ABILITY_KEYS = "abilityKeys"; const std::string MODULE_SKILL_KEYS = "skillKeys"; const std::string MODULE_FORMS = "formInfos"; +const std::string MODULE_SHORTCUT = "shortcutInfos"; } // namespace @@ -67,41 +68,7 @@ InnerBundleInfo::~InnerBundleInfo() APP_LOGD("inner bundle info instance is destroyed"); } -void to_json(nlohmann::json &jsonObject, const InnerCustomizeData &customizeData) -{ - jsonObject = nlohmann::json{ - {ProfileReader::PROFILE_KEY_NAME, customizeData.name}, - {ProfileReader::BUNDLE_MODULE_META_KEY_EXTRA, customizeData.extra}, - {ProfileReader::BUNDLE_MODULE_META_KEY_VALUE, customizeData.value} - }; -} -void to_json(nlohmann::json &jsonObject, const Parameters ¶meters) -{ - jsonObject = nlohmann::json{ - {ProfileReader::BUNDLE_MODULE_PROFILE_KEY_TYPE, parameters.type}, - {ProfileReader::PROFILE_KEY_DESCRIPTION, parameters.description}, - {ProfileReader::PROFILE_KEY_NAME, parameters.name} - }; -} - -void to_json(nlohmann::json &jsonObject, const Results &results) -{ - jsonObject = nlohmann::json{ - {ProfileReader::BUNDLE_MODULE_PROFILE_KEY_TYPE, results.type}, - {ProfileReader::PROFILE_KEY_DESCRIPTION, results.description}, - {ProfileReader::PROFILE_KEY_NAME, results.name} - }; -} - -void to_json(nlohmann::json &jsonObject, const MetaData &metaData) -{ - jsonObject = nlohmann::json{ - {ProfileReader::BUNDLE_MODULE_META_KEY_CUSTOMIZE_DATA, metaData.customizeData}, - {ProfileReader::BUNDLE_MODULE_META_KEY_PARAMETERS, metaData.parameters}, - {ProfileReader::BUNDLE_MODULE_META_KEY_RESULTS, metaData.results} - }; -} void to_json(nlohmann::json &jsonObject, const Distro &distro) { @@ -203,6 +170,7 @@ void InnerBundleInfo::ToJson(nlohmann::json &jsonObject) const jsonObject[APP_FEATURE] = appFeature_; jsonObject[HAS_ENTRY] = hasEntry_; jsonObject[MODULE_FORMS] = formInfos_; + jsonObject[MODULE_SHORTCUT] = shortcutInfos_; } void from_json(const nlohmann::json &jsonObject, InnerModuleInfo &info) @@ -408,127 +376,7 @@ void from_json(const nlohmann::json &jsonObject, Skill &skill) ArrayType::OBJECT); } -void from_json(const nlohmann::json &jsonObject, InnerCustomizeData &customizeData) -{ - // these are not required fields. - const auto &jsonObjectEnd = jsonObject.end(); - GetValueIfFindKey(jsonObject, - jsonObjectEnd, - ProfileReader::PROFILE_KEY_NAME, - customizeData.name, - JsonType::STRING, - false, - ProfileReader::parseResult, - ArrayType::NOT_ARRAY); - GetValueIfFindKey(jsonObject, - jsonObjectEnd, - ProfileReader::BUNDLE_MODULE_META_KEY_EXTRA, - customizeData.extra, - JsonType::STRING, - false, - ProfileReader::parseResult, - ArrayType::NOT_ARRAY); - GetValueIfFindKey(jsonObject, - jsonObjectEnd, - ProfileReader::BUNDLE_MODULE_META_KEY_VALUE, - customizeData.value, - JsonType::STRING, - false, - ProfileReader::parseResult, - ArrayType::NOT_ARRAY); -} - -void from_json(const nlohmann::json &jsonObject, Parameters ¶meters) -{ - // these are required fields. - const auto &jsonObjectEnd = jsonObject.end(); - GetValueIfFindKey(jsonObject, - jsonObjectEnd, - ProfileReader::BUNDLE_MODULE_PROFILE_KEY_TYPE, - parameters.type, - JsonType::STRING, - true, - ProfileReader::parseResult, - ArrayType::NOT_ARRAY); - // these are not required fields. - GetValueIfFindKey(jsonObject, - jsonObjectEnd, - ProfileReader::PROFILE_KEY_DESCRIPTION, - parameters.description, - JsonType::STRING, - false, - ProfileReader::parseResult, - ArrayType::NOT_ARRAY); - GetValueIfFindKey(jsonObject, - jsonObjectEnd, - ProfileReader::PROFILE_KEY_NAME, - parameters.name, - JsonType::STRING, - false, - ProfileReader::parseResult, - ArrayType::NOT_ARRAY); -} - -void from_json(const nlohmann::json &jsonObject, Results &results) -{ - // these are required fields. - const auto &jsonObjectEnd = jsonObject.end(); - GetValueIfFindKey(jsonObject, - jsonObjectEnd, - ProfileReader::BUNDLE_MODULE_PROFILE_KEY_TYPE, - results.type, - JsonType::STRING, - true, - ProfileReader::parseResult, - ArrayType::NOT_ARRAY); - // these are not required fields. - GetValueIfFindKey(jsonObject, - jsonObjectEnd, - ProfileReader::PROFILE_KEY_DESCRIPTION, - results.description, - JsonType::STRING, - false, - ProfileReader::parseResult, - ArrayType::NOT_ARRAY); - GetValueIfFindKey(jsonObject, - jsonObjectEnd, - ProfileReader::PROFILE_KEY_NAME, - results.name, - JsonType::STRING, - false, - ProfileReader::parseResult, - ArrayType::NOT_ARRAY); -} -void from_json(const nlohmann::json &jsonObject, MetaData &metaData) -{ - // these are not required fields. - const auto &jsonObjectEnd = jsonObject.end(); - GetValueIfFindKey>(jsonObject, - jsonObjectEnd, - ProfileReader::BUNDLE_MODULE_META_KEY_CUSTOMIZE_DATA, - metaData.customizeData, - JsonType::ARRAY, - false, - ProfileReader::parseResult, - ArrayType::OBJECT); - GetValueIfFindKey>(jsonObject, - jsonObjectEnd, - ProfileReader::BUNDLE_MODULE_META_KEY_PARAMETERS, - metaData.parameters, - JsonType::ARRAY, - false, - ProfileReader::parseResult, - ArrayType::OBJECT); - GetValueIfFindKey>(jsonObject, - jsonObjectEnd, - ProfileReader::BUNDLE_MODULE_META_KEY_RESULTS, - metaData.results, - JsonType::ARRAY, - false, - ProfileReader::parseResult, - ArrayType::OBJECT); -} void from_json(const nlohmann::json &jsonObject, Distro &distro) { @@ -809,6 +657,14 @@ int32_t InnerBundleInfo::FromJson(const nlohmann::json &jsonObject) true, ProfileReader::parseResult, ArrayType::NOT_ARRAY); + GetValueIfFindKey>(jsonObject, + jsonObjectEnd, + MODULE_SHORTCUT, + shortcutInfos_, + JsonType::OBJECT, + true, + ProfileReader::parseResult, + ArrayType::NOT_ARRAY); GetValueIfFindKey(jsonObject, jsonObjectEnd, HAS_ENTRY, @@ -899,6 +755,7 @@ bool InnerBundleInfo::AddModuleInfo(const InnerBundleInfo &newInfo) AddModuleAbilityInfo(newInfo.baseAbilityInfos_); AddModuleSkillInfo(newInfo.skillInfos_); AddModuleFormInfo(newInfo.formInfos_); + AddModuleShortcutInfo(newInfo.shortcutInfos_); return true; } @@ -934,6 +791,9 @@ void InnerBundleInfo::UpdateModuleInfo(const InnerBundleInfo &newInfo) ++it; } } + for (auto it = shortcutInfos_.begin(); it != shortcutInfos_.end();) { + (it->first.find(newInfo.currentPackage_) != std::string::npos) ? shortcutInfos_.erase(it++) : (++it); + } if (!hasEntry_ && newInfo.HasEntry()) { hasEntry_ = true; } @@ -944,6 +804,7 @@ void InnerBundleInfo::UpdateModuleInfo(const InnerBundleInfo &newInfo) AddModuleAbilityInfo(newInfo.baseAbilityInfos_); AddModuleSkillInfo(newInfo.skillInfos_); AddModuleFormInfo(newInfo.formInfos_); + AddModuleShortcutInfo(newInfo.shortcutInfos_); } void InnerBundleInfo::RemoveModuleInfo(const std::string &modulePackage) @@ -967,6 +828,9 @@ void InnerBundleInfo::RemoveModuleInfo(const std::string &modulePackage) for (auto it = formInfos_.begin(); it != formInfos_.end();) { (it->first.find(modulePackage) != std::string::npos) ? formInfos_.erase(it++) : (++it); } + for (auto it = shortcutInfos_.begin(); it != shortcutInfos_.end();) { + (it->first.find(modulePackage) != std::string::npos) ? shortcutInfos_.erase(it++) : (++it); + } } std::string InnerBundleInfo::ToString() const @@ -990,6 +854,7 @@ std::string InnerBundleInfo::ToString() const j[PROVISION_ID] = provisionId_; j[HAS_ENTRY] = hasEntry_; j[MODULE_FORMS] = formInfos_; + j[MODULE_SHORTCUT] = shortcutInfos_; return j.dump(); } @@ -1080,5 +945,12 @@ void InnerBundleInfo::GetFormsInfoByApp(std::vector &formInfos) const } } +void InnerBundleInfo::GetShortcutInfos(std::vector &shortcutInfos) const +{ + for (const auto &shortcut : shortcutInfos_) { + shortcutInfos.emplace_back(shortcut.second); + } +} + } // namespace AppExecFwk } // namespace OHOS diff --git a/services/bundlemgr/test/BUILD.gn b/services/bundlemgr/test/BUILD.gn index 4c5fbe47778f39bbdf4d508bdb150a3b364a8c8d..7d4582a6d709251dc2096d416938f4bee22bfa86 100644 --- a/services/bundlemgr/test/BUILD.gn +++ b/services/bundlemgr/test/BUILD.gn @@ -24,7 +24,7 @@ config("bundlemgr_test_config") { "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/aafwk/standard/services/common/include", - "//base/notification/ces_standard/cesfwk/kits/native/include", + "//base/notification/ces_standard/interfaces/innerkits/native/include", ] configs = [ diff --git a/services/bundlemgr/test/mock/include/mock_ability_mgr_host.h b/services/bundlemgr/test/mock/include/mock_ability_mgr_host.h index fdfd233141482145770c0dbe4db2c18545bb9952..e702d4d634b62467d9c021486c970db44062edfd 100644 --- a/services/bundlemgr/test/mock/include/mock_ability_mgr_host.h +++ b/services/bundlemgr/test/mock/include/mock_ability_mgr_host.h @@ -179,6 +179,17 @@ public: return 0; } + int SetMissionDescriptionInfo( + const sptr &token, const MissionDescriptionInfo &missionDescriptionInfo) override + { + return 0; + } + + int GetMissionLockModeState() override + { + return 0; + } + virtual sptr GetWantSender( const WantSenderInfo &wantSenderInfo, const sptr &callerToken) override { diff --git a/services/bundlemgr/test/unittest/bms_bundle_data_storage_test/bms_bundle_data_storage_database_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_data_storage_test/bms_bundle_data_storage_database_test.cpp index 481e1448e9811292662e4137ed7d862a519d28bb..c2a9745cb9671a682e2d37438328e635eaf89d62 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_data_storage_test/bms_bundle_data_storage_database_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_data_storage_test/bms_bundle_data_storage_database_test.cpp @@ -78,6 +78,23 @@ protected: "minWidth": 0, "defaultWidth": 200 }, + "metaData": { + "customizeData": [{ + ? "name" : "string", + ? "value" : "string", + ? "extra" : "$string:customizeData_description" + }], + "parameters": [{ + "name" : "string", + ? "type" : "Float", + ? "description" : "$string:parameters_description" + }], + "results": [{ + ? "name" : "string", + ? "type" : "Float", + ? "description" : "$string:results_description" + }] + }, "isLauncherAbility": true, "isNativeAbility": false, "kind": "page", @@ -237,6 +254,43 @@ protected: } ] }, + "formInfos": { + "com.ohos.launchercom.ohos.launchercom.ohos.launcher.MainAbility": [ + { + "package": "com.ohos.launcher", + "bundleName": "com.ohos.launcher", + "originalBundleName": "com.ohos.launcher", + "relatedBundleName": "com.ohos.launcher", + "moduleName": "launcher", + "abilityName": "com.ohos.launcher.MainAbility", + "name": "Form_JS", + "description": "It's JS Form", + "jsComponentName": "com.ohos.launcher", + "deepLink": "com.example.myapplication.fa/.MainAbility", + "formConfigAbility": "com.example.myapplication.fa/.MainAbility", + "scheduledUpateTime": "21:05", + "descriptionId": 125, + "updateDuration": 1, + "defaultDimension": 1, + "defaultFlag": true, + "formVisibleNotify": true, + "updateEnabled": true, + "type": 0, + "colorMode": 0, + "supportDimensions": [ + 1 + ], + "landscapeLayouts": [], + "portraitLayouts": [], + "customizeData": [ + { + "name": "originWidgetName", + "value": "com.weather.testWidget" + } + ] + } + ] + }, "uid": 10000, "userId_": 0 } diff --git a/services/bundlemgr/test/unittest/bms_bundle_installer_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_installer_test/BUILD.gn index 0522846f7ad3ed7ab544aa104d659fb353bfd64c..d53bae1274f152ca3a5daef08dfa765bb08e6b95 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_installer_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_installer_test/BUILD.gn @@ -54,7 +54,6 @@ ohos_unittest("BmsBundleInstallerTest") { deps = [ "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${libs_path}/libeventhandler:libeventhandler_target", - "//base/notification/ces_standard/cesfwk/kits/native:cesfwk_kits", "//base/security/appverify/interfaces/innerkits/appverify:libhapverify", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", "//foundation/aafwk/standard/interfaces/innerkits/base:base", @@ -68,6 +67,7 @@ ohos_unittest("BmsBundleInstallerTest") { deps += bundle_install_deps external_deps = [ + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/BUILD.gn index 82d2a45ddadcb266de9254586197d807dfe43250..78b57c41d48b5f1223d17a92651ab870bb403414 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/BUILD.gn @@ -59,7 +59,6 @@ ohos_unittest("BmsBundleKitServiceTest") { deps = [ "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${libs_path}/libeventhandler:libeventhandler_target", - "//base/notification/ces_standard/cesfwk/kits/native:cesfwk_kits", "//base/security/appverify/interfaces/innerkits/appverify:libhapverify", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", "//foundation/aafwk/standard/interfaces/innerkits/base:base", @@ -73,6 +72,7 @@ ohos_unittest("BmsBundleKitServiceTest") { deps += bundle_install_deps external_deps = [ + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_kit_service_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_kit_service_test.cpp index 1a261c66b1a0246bbf3b8426c0174155b677e5f1..7e7a0c352e3bc996e117231e713e8d7da0f52136 100755 --- a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_kit_service_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_kit_service_test.cpp @@ -24,6 +24,7 @@ #include "bundle_info.h" #include "installd/installd_service.h" #include "installd_client.h" +#include "inner_bundle_info.h" #include "mock_clean_cache.h" #include "mock_bundle_status.h" @@ -58,6 +59,7 @@ const int APPLICATION_INFO_FLAGS = 1; const int DEFAULT_USER_ID = 0; const std::string LABEL = "hello"; const std::string DESCRIPTION = "mainEntry"; +const std::string THEME = "mytheme"; const std::string ICON_PATH = "/data/data/icon.png"; const std::string KIND = "test"; const std::string ACTION = "action.system.home"; @@ -68,6 +70,14 @@ const std::string TARGET_ABILITY = "MockTargetAbility"; const AbilityType ABILITY_TYPE = AbilityType::PAGE; const DisplayOrientation ORIENTATION = DisplayOrientation::PORTRAIT; const LaunchMode LAUNCH_MODE = LaunchMode::SINGLETON; +const std::vector FORM_ENTITY = {"homeScreen","searchbox"}; +const int DEFAULT_FORM_HEIGHT = 100; +const int DEFAULT_FORM_WIDTH = 200; +const std::string META_DATA_DESCRIPTION = "description"; +const std::string META_DATA_NAME = "name"; +const std::string META_DATA_TYPE = "type"; +const std::string META_DATA_VALUE = "value"; +const std::string META_DATA_EXTRA = "extra"; const ModuleColorMode COLOR_MODE = ModuleColorMode::AUTO; const std::string CODE_PATH = "/data/accounts/account_0/com.example.bundlekit.test/code"; const std::string RESOURCE_PATH = "/data/accounts/account_0/com.example.bundlekit.test/res"; @@ -96,6 +106,25 @@ const std::string DATA_BASE_DIR = "/data/accounts/account_0/appdata/com.example. const std::string TEST_DATA_BASE_DIR = "/data/accounts/account_0/appdata/com.example.bundlekit.test/database/database"; const std::string CACHE_DIR = "/data/accounts/account_0/appdata/com.example.bundlekit.test/cache"; const std::string TEST_CACHE_DIR = "/data/accounts/account_0/appdata/com.example.bundlekit.test/cache/cache"; +const std::string FORM_NAME = "form_js"; +const std::string FORM_PATH = "data/app"; +const std::string FORM_JS_COMPONENT_NAME = "JS"; +const std::string FORM_DESCRIPTION = "description"; +const std::string FORM_SCHEDULED_UPDATE_TIME = "11:00"; +const std::string FORM_CUSTOMIZE_DATAS_NAME = "customizeDataName"; +const std::string FORM_CUSTOMIZE_DATAS_VALUE = "customizeDataValue"; +const std::string FORM_PORTRAIT_LAYOUTS1 = "port1"; +const std::string FORM_PORTRAIT_LAYOUTS2 = "port2"; +const std::string FORM_LANDSCAPE_LAYOUTS1 = "land1"; +const std::string FORM_LANDSCAPE_LAYOUTS2 = "land2"; +const std::string SHORTCUT_TEST_ID = "shortcutTestId"; +const std::string SHORTCUT_DEMO_ID = "shortcutDemoId"; +const std::string SHORTCUT_HOST_ABILITY = "hostAbility"; +const std::string SHORTCUT_ICON = "/data/test/bms_bundle"; +const std::string SHORTCUT_LABEL = "shortcutLabel"; +const std::string SHORTCUT_DISABLE_MESSAGE = "shortcutDisableMessage"; +const std::string SHORTCUT_INTENTS_TARGET_BUNDLE = "targetBundle"; +const std::string SHORTCUT_INTENTS_TARGET_CLASS = "targetClass"; } // namespace @@ -112,6 +141,9 @@ public: void MockUninstallBundle(const std::string &bundleName) const; AbilityInfo MockAbilityInfo( const std::string &bundleName, const std::string &module, const std::string &abilityName) const; + FormInfo MockFormInfo( + const std::string &bundleName, const std::string &module, const std::string &abilityName) const; + ShortcutInfo MockShortcutInfo(const std::string &bundleName, const std::string &shortcutId) const; void CheckBundleInfo(const std::string &bundleName, const std::string &moduleName, const uint32_t abilitySize, const BundleInfo &bundleInfo) const; void CheckBundleArchiveInfo(const std::string &bundleName, const std::string &moduleName, @@ -130,6 +162,10 @@ public: void CheckFileNonExist() const; void CheckCacheExist() const; void CheckCacheNonExist() const; + void CheckFormInfoTest(const std::vector &forms) const; + void CheckFormInfoDemo(const std::vector &forms) const; + void CheckShortcutInfoTest(std::vector &shortcutInfos) const; + void CheckShortcutInfoDemo(std::vector &shortcutInfos) const; public: std::shared_ptr bundleMgrService_ = DelayedSingleton::GetInstance(); @@ -198,10 +234,11 @@ void BmsBundleKitServiceTest::MockInstallBundle( AppExecFwk::Parameters parameters{"description", "name", "type"}; AppExecFwk::Results results{"description", "name", "type"}; - AppExecFwk::InnerCustomizeData customizeData{"name", "value", "extra"}; + AppExecFwk::CustomizeData customizeData{"name", "value", "extra"}; MetaData metaData{{parameters}, {results}, {customizeData}}; moduleInfo.metaData = metaData; + FormInfo form = MockFormInfo(bundleName, moduleName, abilityName); AbilityInfo abilityInfo = MockAbilityInfo(bundleName, moduleName, abilityName); innerBundleInfo.SetBaseApplicationInfo(appInfo); innerBundleInfo.SetBaseBundleInfo(bundleInfo); @@ -218,7 +255,19 @@ void BmsBundleKitServiceTest::MockInstallBundle( innerBundleInfo.SetMainAbility(keyName); innerBundleInfo.InsertSkillInfo(keyName, skills); } - + std::vector formInfos; + formInfos.emplace_back(form); + if(bundleName == BUNDLE_NAME_TEST) { + ShortcutInfo shortcut = MockShortcutInfo(bundleName, SHORTCUT_TEST_ID); + std::string shortcutKey = bundleName + moduleName + SHORTCUT_TEST_ID; + innerBundleInfo.InsertShortcutInfos(shortcutKey, shortcut); + } + else { + ShortcutInfo shortcut = MockShortcutInfo(bundleName, SHORTCUT_DEMO_ID); + std::string shortcutKey = bundleName + moduleName + SHORTCUT_DEMO_ID; + innerBundleInfo.InsertShortcutInfos(shortcutKey, shortcut); + } + innerBundleInfo.InsertFormInfos(keyName, formInfos); auto dataMgr = GetBundleDataMgr(); ASSERT_NE(dataMgr, nullptr); bool startRet = dataMgr->UpdateBundleInstallState(bundleName, InstallState::INSTALL_START); @@ -230,6 +279,57 @@ void BmsBundleKitServiceTest::MockInstallBundle( ASSERT_TRUE(addRet); } +FormInfo BmsBundleKitServiceTest::MockFormInfo( + const std::string &bundleName, const std::string &moduleName, const std::string &abilityName) const +{ + FormInfo formInfo; + formInfo.name = FORM_NAME; + formInfo.bundleName = bundleName; + formInfo.abilityName = abilityName; + formInfo.moduleName = moduleName; + formInfo.package = PACKAGE_NAME; + formInfo.descriptionId = 123; + formInfo.formConfigAbility = FORM_PATH; + formInfo.description = FORM_DESCRIPTION; + formInfo.defaultFlag = false; + formInfo.type = FormType::JS; + formInfo.colorMode = FormsColorMode::LIGHT_MODE; + formInfo.supportDimensions = {1, 2}; + formInfo.portraitLayouts = {FORM_PORTRAIT_LAYOUTS1, FORM_PORTRAIT_LAYOUTS2}; + formInfo.landscapeLayouts = {FORM_LANDSCAPE_LAYOUTS1, FORM_LANDSCAPE_LAYOUTS2}; + formInfo.defaultDimension = 1; + formInfo.updateDuration = 0; + formInfo.formVisibleNotify = true; + formInfo.deepLink = FORM_PATH; + formInfo.scheduledUpateTime = FORM_SCHEDULED_UPDATE_TIME; + formInfo.updateEnabled = true; + formInfo.jsComponentName = FORM_JS_COMPONENT_NAME; + for (auto &info : formInfo.customizeDatas) { + info.name = FORM_CUSTOMIZE_DATAS_NAME; + info.value = FORM_CUSTOMIZE_DATAS_VALUE; + } + return formInfo; +} + +ShortcutInfo BmsBundleKitServiceTest::MockShortcutInfo(const std::string &bundleName, const std::string &shortcutId) const +{ + ShortcutInfo shortcutInfos; + shortcutInfos.id = shortcutId; + shortcutInfos.bundleName = bundleName; + shortcutInfos.hostAbility = SHORTCUT_HOST_ABILITY; + shortcutInfos.icon = SHORTCUT_ICON; + shortcutInfos.label = SHORTCUT_LABEL; + shortcutInfos.disableMessage = SHORTCUT_DISABLE_MESSAGE; + shortcutInfos.isStatic = true; + shortcutInfos.isHomeShortcut = true; + shortcutInfos.isEnables = true; + for (auto &info : shortcutInfos.intents) { + info.targetBundle = SHORTCUT_INTENTS_TARGET_BUNDLE; + info.targetClass = SHORTCUT_INTENTS_TARGET_CLASS; + } + return shortcutInfos; +} + void BmsBundleKitServiceTest::MockUninstallBundle(const std::string &bundleName) const { auto dataMgr = GetBundleDataMgr(); @@ -252,18 +352,27 @@ AbilityInfo BmsBundleKitServiceTest::MockAbilityInfo( abilityInfo.deviceId = DEVICE_ID; abilityInfo.label = LABEL; abilityInfo.description = DESCRIPTION; + abilityInfo.theme = THEME; abilityInfo.iconPath = ICON_PATH; abilityInfo.visible = VISIBLE; abilityInfo.kind = KIND; abilityInfo.type = ABILITY_TYPE; abilityInfo.orientation = ORIENTATION; abilityInfo.launchMode = LAUNCH_MODE; + abilityInfo.formEntity = {"homeScreen","searchbox"}, + abilityInfo.defaultFormHeight = DEFAULT_FORM_HEIGHT; + abilityInfo.defaultFormWidth = DEFAULT_FORM_WIDTH; abilityInfo.codePath = CODE_PATH; abilityInfo.resourcePath = RESOURCE_PATH; abilityInfo.libPath = LIB_PATH; abilityInfo.uri = URI; abilityInfo.enabled = true; abilityInfo.targetAbility = TARGET_ABILITY; + AppExecFwk::Parameters parameters{"description", "name", "type"}; + AppExecFwk::Results results{"description", "name", "type"}; + AppExecFwk::CustomizeData customizeData{"name", "value", "extra"}; + MetaData metaData{{parameters}, {results}, {customizeData}}; + abilityInfo.metaData = metaData; return abilityInfo; } @@ -331,12 +440,31 @@ void BmsBundleKitServiceTest::CheckAbilityInfo( EXPECT_EQ(LABEL, abilityInfo.label); EXPECT_EQ(DESCRIPTION, abilityInfo.description); EXPECT_EQ(DEVICE_ID, abilityInfo.deviceId); + EXPECT_EQ(THEME, abilityInfo.theme); EXPECT_EQ(ICON_PATH, abilityInfo.iconPath); EXPECT_EQ(CODE_PATH, abilityInfo.codePath); EXPECT_EQ(ORIENTATION, abilityInfo.orientation); EXPECT_EQ(LAUNCH_MODE, abilityInfo.launchMode); EXPECT_EQ(URI, abilityInfo.uri); EXPECT_EQ(TARGET_ABILITY, abilityInfo.targetAbility); + EXPECT_EQ(FORM_ENTITY, abilityInfo.formEntity); + EXPECT_EQ(DEFAULT_FORM_HEIGHT, abilityInfo.defaultFormHeight); + EXPECT_EQ(DEFAULT_FORM_WIDTH, abilityInfo.defaultFormWidth); + for (auto &info : abilityInfo.metaData.customizeData) { + EXPECT_EQ(info.name, META_DATA_NAME); + EXPECT_EQ(info.value, META_DATA_VALUE); + EXPECT_EQ(info.extra, META_DATA_EXTRA); + } + for (auto &info : abilityInfo.metaData.parameters) { + EXPECT_EQ(info.description, META_DATA_DESCRIPTION); + EXPECT_EQ(info.name, META_DATA_NAME); + EXPECT_EQ(info.type, META_DATA_TYPE); + } + for (auto &info : abilityInfo.metaData.results) { + EXPECT_EQ(info.description, META_DATA_DESCRIPTION); + EXPECT_EQ(info.name, META_DATA_NAME); + EXPECT_EQ(info.type, META_DATA_TYPE); + } } void BmsBundleKitServiceTest::CheckModuleInfo(const HapModuleInfo &hapModuleInfo) const @@ -460,6 +588,104 @@ void BmsBundleKitServiceTest::CheckCacheNonExist() const ASSERT_NE(dataExist, 0); } +void BmsBundleKitServiceTest::CheckFormInfoTest(const std::vector &formInfos) const +{ + for (auto &formInfo : formInfos) { + EXPECT_EQ(formInfo.name, FORM_NAME); + EXPECT_EQ(formInfo.bundleName, BUNDLE_NAME_TEST); + EXPECT_EQ(formInfo.moduleName, MODULE_NAME_TEST); + EXPECT_EQ(formInfo.abilityName, ABILITY_NAME_TEST); + EXPECT_EQ(formInfo.description, FORM_DESCRIPTION); + EXPECT_EQ(formInfo.formConfigAbility, FORM_PATH); + EXPECT_EQ(formInfo.defaultFlag, false); + EXPECT_EQ(formInfo.type, FormType::JS); + EXPECT_EQ(formInfo.colorMode, FormsColorMode::LIGHT_MODE); + EXPECT_EQ(formInfo.descriptionId, 123); + EXPECT_EQ(formInfo.deepLink, FORM_PATH); + EXPECT_EQ(formInfo.package, PACKAGE_NAME); + EXPECT_EQ(formInfo.formVisibleNotify, true); + unsigned i = 2; + EXPECT_EQ(formInfo.supportDimensions.size(), i); + EXPECT_EQ(formInfo.defaultDimension, 1); + EXPECT_EQ(formInfo.updateDuration, 0); + EXPECT_EQ(formInfo.scheduledUpateTime, FORM_SCHEDULED_UPDATE_TIME); + EXPECT_EQ(formInfo.jsComponentName, FORM_JS_COMPONENT_NAME); + EXPECT_EQ(formInfo.updateEnabled, true); + for (auto &info : formInfo.customizeDatas) { + EXPECT_EQ(info.name, FORM_CUSTOMIZE_DATAS_NAME); + EXPECT_EQ(info.value, FORM_CUSTOMIZE_DATAS_VALUE); + } + } +} + +void BmsBundleKitServiceTest::CheckFormInfoDemo(const std::vector &formInfos) const +{ + for (const auto &formInfo : formInfos) { + EXPECT_EQ(formInfo.name, FORM_NAME); + EXPECT_EQ(formInfo.bundleName, BUNDLE_NAME_DEMO); + EXPECT_EQ(formInfo.moduleName, MODULE_NAME_DEMO); + EXPECT_EQ(formInfo.abilityName, ABILITY_NAME_TEST); + EXPECT_EQ(formInfo.description, FORM_DESCRIPTION); + EXPECT_EQ(formInfo.formConfigAbility, FORM_PATH); + EXPECT_EQ(formInfo.defaultFlag, false); + EXPECT_EQ(formInfo.type, FormType::JS); + EXPECT_EQ(formInfo.colorMode, FormsColorMode::LIGHT_MODE); + EXPECT_EQ(formInfo.descriptionId, 123); + EXPECT_EQ(formInfo.deepLink, FORM_PATH); + EXPECT_EQ(formInfo.package, PACKAGE_NAME); + EXPECT_EQ(formInfo.formVisibleNotify, true); + unsigned i = 2; + EXPECT_EQ(formInfo.supportDimensions.size(), i); + EXPECT_EQ(formInfo.defaultDimension, 1); + EXPECT_EQ(formInfo.updateDuration, 0); + EXPECT_EQ(formInfo.scheduledUpateTime, FORM_SCHEDULED_UPDATE_TIME); + EXPECT_EQ(formInfo.jsComponentName, FORM_JS_COMPONENT_NAME); + EXPECT_EQ(formInfo.updateEnabled, true); + for (auto &info : formInfo.customizeDatas) { + EXPECT_EQ(info.name, FORM_CUSTOMIZE_DATAS_NAME); + EXPECT_EQ(info.value, FORM_CUSTOMIZE_DATAS_VALUE); + } + } +} + +void BmsBundleKitServiceTest::CheckShortcutInfoTest(std::vector &shortcutInfos) const +{ + for (const auto &shortcutInfo : shortcutInfos) { + EXPECT_EQ(shortcutInfo.id, SHORTCUT_TEST_ID); + EXPECT_EQ(shortcutInfo.bundleName, BUNDLE_NAME_TEST); + EXPECT_EQ(shortcutInfo.hostAbility, SHORTCUT_HOST_ABILITY); + EXPECT_EQ(shortcutInfo.icon, SHORTCUT_ICON); + EXPECT_EQ(shortcutInfo.label, SHORTCUT_LABEL); + EXPECT_EQ(shortcutInfo.disableMessage, SHORTCUT_DISABLE_MESSAGE); + EXPECT_EQ(shortcutInfo.isStatic, true); + EXPECT_EQ(shortcutInfo.isHomeShortcut, true); + EXPECT_EQ(shortcutInfo.isEnables, true); + for (auto &intent : shortcutInfo.intents) { + EXPECT_EQ(intent.targetBundle, SHORTCUT_INTENTS_TARGET_BUNDLE); + EXPECT_EQ(intent.targetClass, SHORTCUT_INTENTS_TARGET_CLASS); + } + } +} + +void BmsBundleKitServiceTest::CheckShortcutInfoDemo(std::vector &shortcutInfos) const +{ + for (const auto &shortcutInfo : shortcutInfos) { + EXPECT_EQ(shortcutInfo.id, SHORTCUT_DEMO_ID); + EXPECT_EQ(shortcutInfo.bundleName, BUNDLE_NAME_DEMO); + EXPECT_EQ(shortcutInfo.hostAbility, SHORTCUT_HOST_ABILITY); + EXPECT_EQ(shortcutInfo.icon, SHORTCUT_ICON); + EXPECT_EQ(shortcutInfo.label, SHORTCUT_LABEL); + EXPECT_EQ(shortcutInfo.disableMessage, SHORTCUT_DISABLE_MESSAGE); + EXPECT_EQ(shortcutInfo.isStatic, true); + EXPECT_EQ(shortcutInfo.isHomeShortcut, true); + EXPECT_EQ(shortcutInfo.isEnables, true); + for (auto &intent : shortcutInfo.intents) { + EXPECT_EQ(intent.targetBundle, SHORTCUT_INTENTS_TARGET_BUNDLE); + EXPECT_EQ(intent.targetClass, SHORTCUT_INTENTS_TARGET_CLASS); + } + } +} + /** * @tc.number: GetBundleInfo_0100 * @tc.name: test can get the bundleName's bundle info @@ -470,12 +696,10 @@ HWTEST_F(BmsBundleKitServiceTest, GetBundleInfo_0100, Function | SmallTest | Lev { MockInstallBundle(BUNDLE_NAME_TEST, MODULE_NAME_TEST, ABILITY_NAME_TEST); MockInstallBundle(BUNDLE_NAME_DEMO, MODULE_NAME_DEMO, ABILITY_NAME_DEMO); - BundleInfo testResult; bool testRet = GetBundleDataMgr()->GetBundleInfo(BUNDLE_NAME_TEST, BundleFlag::GET_BUNDLE_DEFAULT, testResult); EXPECT_TRUE(testRet); CheckBundleInfo(BUNDLE_NAME_TEST, MODULE_NAME_TEST, ABILITY_SIZE_ZERO, testResult); - BundleInfo demoResult; bool demoRet = GetBundleDataMgr()->GetBundleInfo(BUNDLE_NAME_DEMO, BundleFlag::GET_BUNDLE_WITH_ABILITIES, demoResult); @@ -2186,7 +2410,7 @@ HWTEST_F(BmsBundleKitServiceTest, GetAbilityIcon_0100, Function | SmallTest | Le * @tc.desc: 1.system run normally * 2.get empty ability icon */ -HWTEST_F(BmsBundleKitServiceTest,GetAbilityIcon_0200, Function | SmallTest | Level1) +HWTEST_F(BmsBundleKitServiceTest, GetAbilityIcon_0200, Function | SmallTest | Level1) { std::string icon = GetBundleDataMgr()->GetAbilityIcon(BUNDLE_NAME_TEST, ABILITY_NAME_TEST); EXPECT_EQ(EMPTY_STRING, icon); @@ -2223,3 +2447,310 @@ HWTEST_F(BmsBundleKitServiceTest, GetAbilityIcon_0400, Function | SmallTest | Le MockUninstallBundle(BUNDLE_NAME_TEST); } +/** + * @tc.number: GetFormInfoByModule_0100 + * @tc.name: test can get the formInfo + * @tc.desc: 1.system run normally + * 2.get formInfo by moduleName successful + */ +HWTEST_F(BmsBundleKitServiceTest, GetFormInfoByModule_0100, Function | SmallTest | Level1) +{ + MockInstallBundle(BUNDLE_NAME_TEST, MODULE_NAME_TEST, ABILITY_NAME_TEST); + std::vector formInfos; + auto result = GetBundleDataMgr()->GetFormsInfoByModule(BUNDLE_NAME_TEST, MODULE_NAME_TEST, formInfos); + EXPECT_EQ(result, true); + EXPECT_FALSE(formInfos.empty()); + CheckFormInfoTest(formInfos); + MockUninstallBundle(BUNDLE_NAME_TEST); +} + +/** + * @tc.number: GetFormInfoByModule_0200 + * @tc.name: test can get the formInfo + * @tc.desc: 1.system run normally + * 2.get forms info in different bundle + */ +HWTEST_F(BmsBundleKitServiceTest, GetFormInfoByModule_0200, Function | SmallTest | Level1) +{ + MockInstallBundle(BUNDLE_NAME_TEST, MODULE_NAME_TEST, ABILITY_NAME_TEST); + std::vector formInfo1; + auto result = GetBundleDataMgr()->GetFormsInfoByModule(BUNDLE_NAME_TEST, MODULE_NAME_TEST, formInfo1); + EXPECT_EQ(result, true); + EXPECT_FALSE(formInfo1.empty()); + CheckFormInfoTest(formInfo1); + + MockInstallBundle(BUNDLE_NAME_DEMO, MODULE_NAME_DEMO, ABILITY_NAME_TEST); + std::vector formInfo2; + auto result1 = GetBundleDataMgr()->GetFormsInfoByModule(BUNDLE_NAME_DEMO, MODULE_NAME_DEMO, formInfo2); + EXPECT_EQ(result1, true); + EXPECT_FALSE(formInfo2.empty()); + CheckFormInfoDemo(formInfo2); + + MockUninstallBundle(BUNDLE_NAME_TEST); + MockUninstallBundle(BUNDLE_NAME_DEMO); +} + +/** + * @tc.number: GetFormInfoByModule_0400 + * @tc.name: test can not get the formInfo + * @tc.desc:1.system run normally + * 2.get form info with error moduleName + */ +HWTEST_F(BmsBundleKitServiceTest, GetFormInfoByModule_0300, Function | SmallTest | Level1) +{ + MockInstallBundle(BUNDLE_NAME_TEST, MODULE_NAME_TEST, ABILITY_NAME_TEST); + std::vector formInfos; + GetBundleDataMgr()->GetFormsInfoByModule(BUNDLE_NAME_TEST, MODULE_NAME_DEMO, formInfos); + EXPECT_TRUE(formInfos.empty()); + MockUninstallBundle(BUNDLE_NAME_TEST); +} + +/** + * @tc.number: GetFormInfoByModule_0400 + * @tc.name: test can not get the formInfo + * @tc.desc: 1.system run normally + * 2.get form info with empty moduleName + */ +HWTEST_F(BmsBundleKitServiceTest, GetFormInfoByModule_0400, Function | SmallTest | Level1) +{ + MockInstallBundle(BUNDLE_NAME_TEST, MODULE_NAME_TEST, ABILITY_NAME_DEMO); + std::vector formInfos; + GetBundleDataMgr()->GetFormsInfoByModule(BUNDLE_NAME_TEST, EMPTY_STRING, formInfos); + EXPECT_TRUE(formInfos.empty()); + MockUninstallBundle(BUNDLE_NAME_TEST); +} + +/** + * @tc.number: GetFormInfoByModule_0500 + * @tc.name: test can not get the formInfo + * @tc.desc: 1.system run normally + * 2.get form info with non bundle + */ +HWTEST_F(BmsBundleKitServiceTest, GetFormInfoByModule_0500, Function | SmallTest | Level1) +{ + std::vector formInfos; + GetBundleDataMgr()->GetFormsInfoByModule(BUNDLE_NAME_TEST, EMPTY_STRING, formInfos); + EXPECT_TRUE(formInfos.empty()); +} + +/** + * @tc.number: GetFormInfoByApp_0100 + * @tc.name: test can get the formInfo by bundlename + * @tc.desc: 1.system run normally + * 2.get form info by bundleName + */ +HWTEST_F(BmsBundleKitServiceTest, GetFormInfoByApp_0100, Function | SmallTest | Level1) +{ + MockInstallBundle(BUNDLE_NAME_TEST, MODULE_NAME_TEST, ABILITY_NAME_TEST); + std::vector formInfos; + auto result = GetBundleDataMgr()->GetFormsInfoByApp(BUNDLE_NAME_TEST, formInfos); + EXPECT_EQ(result, true); + EXPECT_FALSE(formInfos.empty()); + CheckFormInfoTest(formInfos); + MockUninstallBundle(BUNDLE_NAME_TEST); +} + +/** + * @tc.number: GetFormInfoByApp_0200 + * @tc.name: test can get the formInfo in different app by bundlename + * @tc.desc: 1.system run normally + * 2.get form info by different bundleName + */ +HWTEST_F(BmsBundleKitServiceTest, GetFormInfoByApp_0200, Function | SmallTest | Level1) +{ + MockInstallBundle(BUNDLE_NAME_TEST, MODULE_NAME_TEST, ABILITY_NAME_TEST); + std::vector formInfo1; + auto result = GetBundleDataMgr()->GetFormsInfoByApp(BUNDLE_NAME_TEST, formInfo1); + EXPECT_EQ(result, true); + EXPECT_FALSE(formInfo1.empty()); + CheckFormInfoTest(formInfo1); + + MockInstallBundle(BUNDLE_NAME_DEMO, MODULE_NAME_DEMO, ABILITY_NAME_TEST); + std::vector formInfo2; + auto result1 = GetBundleDataMgr()->GetFormsInfoByApp(BUNDLE_NAME_DEMO, formInfo2); + EXPECT_EQ(result1, true); + EXPECT_FALSE(formInfo2.empty()); + CheckFormInfoDemo(formInfo2); + + MockUninstallBundle(BUNDLE_NAME_TEST); + MockUninstallBundle(BUNDLE_NAME_DEMO); +} + +/** + * @tc.number: GetFormInfoByApp_0300 + * @tc.name: test can't get the formInfo in app by error app name + * @tc.desc: 1.system run normally + * 2.get form info by error bundleName + */ +HWTEST_F(BmsBundleKitServiceTest, GetFormInfoByApp_0300, Function | SmallTest | Level1) +{ + MockInstallBundle(BUNDLE_NAME_TEST, MODULE_NAME_TEST, ABILITY_NAME_TEST); + std::vector formInfo1; + GetBundleDataMgr()->GetFormsInfoByApp(BUNDLE_NAME_DEMO, formInfo1); + EXPECT_TRUE(formInfo1.empty()); + MockUninstallBundle(BUNDLE_NAME_TEST); +} + +/** + * @tc.number: GetFormInfoByApp_0400 + * @tc.name: test can't get the formInfo in app by empty app name + * @tc.desc: 1.system run normally + * 2.get form info by empty bundleName + */ +HWTEST_F(BmsBundleKitServiceTest, GetFormInfoByApp_0400, Function | SmallTest | Level1) +{ + MockInstallBundle(BUNDLE_NAME_TEST, MODULE_NAME_TEST, ABILITY_NAME_TEST); + std::vector formInfo1; + GetBundleDataMgr()->GetFormsInfoByApp(EMPTY_STRING, formInfo1); + EXPECT_TRUE(formInfo1.empty()); + MockUninstallBundle(BUNDLE_NAME_TEST); +} + +/** + * @tc.number: GetFormInfoByApp_0500 + * @tc.name: test can't get the formInfo have no bundle + * @tc.desc: 1.system run normally + * 2.get form info with non bundle + */ +HWTEST_F(BmsBundleKitServiceTest, GetFormInfoByApp_0500, Function | SmallTest | Level1) +{ + std::vector formInfo1; + GetBundleDataMgr()->GetFormsInfoByApp(BUNDLE_NAME_DEMO, formInfo1); + EXPECT_TRUE(formInfo1.empty()); +} + +/** + * @tc.number: GetAllFormInfo_0100 + * @tc.name: test can get all the formInfo + * @tc.desc: 1.system run normally + * 2.get forms by all the bundle + */ +HWTEST_F(BmsBundleKitServiceTest, GetAllFormInfo_0100, Function | SmallTest | Level1) +{ + MockInstallBundle(BUNDLE_NAME_TEST, MODULE_NAME_TEST, ABILITY_NAME_TEST); + std::vector formInfos; + auto result = GetBundleDataMgr()->GetAllFormsInfo(formInfos); + EXPECT_EQ(result, true); + EXPECT_FALSE(formInfos.empty()); + CheckFormInfoTest(formInfos); + MockUninstallBundle(BUNDLE_NAME_TEST); +} + +/** + * @tc.number: GetAllFormInfo_0100 + * @tc.name: test can get all the formInfo + * @tc.desc: 1.system run normally + * 2.get forms by all the bundle + */ +HWTEST_F(BmsBundleKitServiceTest, GetAllFormInfo_0200, Function | SmallTest | Level1) +{ + MockInstallBundle(BUNDLE_NAME_TEST, MODULE_NAME_TEST, ABILITY_NAME_TEST); + MockInstallBundle(BUNDLE_NAME_DEMO, MODULE_NAME_DEMO, ABILITY_NAME_TEST); + std::vector formInfos; + auto result = GetBundleDataMgr()->GetAllFormsInfo(formInfos); + EXPECT_FALSE(formInfos.empty()); + EXPECT_EQ(result, true); + for (const auto &info : formInfos) { + if (info.bundleName != BUNDLE_NAME_TEST) { + std::vector formInfo1; + formInfo1.emplace_back(info); + CheckFormInfoDemo(formInfo1); + } else { + std::vector formInfo2; + formInfo2.emplace_back(info); + CheckFormInfoTest(formInfo2); + } + } + MockUninstallBundle(BUNDLE_NAME_TEST); + MockUninstallBundle(BUNDLE_NAME_DEMO); +} + +/** + * @tc.number: GetAllFormInfo_0300 + * @tc.name: test can not get have no form + * @tc.desc: 1.system run normally + * 2.get forms by all the bundle + */ +HWTEST_F(BmsBundleKitServiceTest, GetAllFormInfo_0300, Function | SmallTest | Level1) +{ + std::vector formInfos; + GetBundleDataMgr()->GetAllFormsInfo(formInfos); + EXPECT_TRUE(formInfos.empty()); +} + +/** + * @tc.number: GetShortcutInfos_0100 + * @tc.name: test can get shortcutInfo by bundleName + * @tc.desc: 1.can get shortcutInfo + */ +HWTEST_F(BmsBundleKitServiceTest, GetShortcutInfos_0100, Function | SmallTest | Level1) +{ + MockInstallBundle(BUNDLE_NAME_TEST, MODULE_NAME_TEST, ABILITY_NAME_TEST); + std::vector shortcutInfos; + auto result = GetBundleDataMgr()->GetShortcutInfos(BUNDLE_NAME_TEST, shortcutInfos); + EXPECT_TRUE(result); + CheckShortcutInfoTest(shortcutInfos); + MockUninstallBundle(BUNDLE_NAME_TEST); +} + +/** + * @tc.number: GetShortcutInfos_0200 + * @tc.name: test have two bundle can get shortcutInfo by bundleName + * @tc.desc: 1.can get shortcutInfo + */ +HWTEST_F(BmsBundleKitServiceTest, GetShortcutInfos_0200, Function | SmallTest | Level1) +{ + MockInstallBundle(BUNDLE_NAME_TEST, MODULE_NAME_TEST, ABILITY_NAME_TEST); + MockInstallBundle(BUNDLE_NAME_DEMO, MODULE_NAME_DEMO, ABILITY_NAME_TEST); + std::vector shortcutInfo1; + auto result1 = GetBundleDataMgr()->GetShortcutInfos(BUNDLE_NAME_TEST, shortcutInfo1); + EXPECT_TRUE(result1); + CheckShortcutInfoTest(shortcutInfo1); + std::vector shortcutInfo2; + auto result2 = GetBundleDataMgr()->GetShortcutInfos(BUNDLE_NAME_DEMO, shortcutInfo2); + EXPECT_TRUE(result2); + CheckShortcutInfoDemo(shortcutInfo2); + MockUninstallBundle(BUNDLE_NAME_TEST); + MockUninstallBundle(BUNDLE_NAME_DEMO); +} + +/** + * @tc.number: GetShortcutInfos_0300 + * @tc.name: test can't get the shortcutInfo in app by error app name + * @tc.desc: 1.have not get shortcutinfo by appName + */ +HWTEST_F(BmsBundleKitServiceTest, GetShortcutInfos_0300, Function | SmallTest | Level1) +{ + MockInstallBundle(BUNDLE_NAME_TEST, MODULE_NAME_TEST, ABILITY_NAME_TEST); + std::vector shortcutInfos; + GetBundleDataMgr()->GetShortcutInfos(BUNDLE_NAME_DEMO, shortcutInfos); + EXPECT_TRUE(shortcutInfos.empty()); + MockUninstallBundle(BUNDLE_NAME_TEST); +} + +/** + * @tc.number: GetShortcutInfos_0400 + * @tc.name: test can't get the shortcutInfo in app by null app name + * @tc.desc: 1.have not get shortcutinfo by null app name + */ +HWTEST_F(BmsBundleKitServiceTest, GetShortcutInfos_0400, Function | SmallTest | Level1) +{ + MockInstallBundle(BUNDLE_NAME_TEST, MODULE_NAME_TEST, ABILITY_NAME_TEST); + std::vector shortcutInfos; + GetBundleDataMgr()->GetShortcutInfos(EMPTY_STRING, shortcutInfos); + EXPECT_TRUE(shortcutInfos.empty()); + MockUninstallBundle(BUNDLE_NAME_TEST); +} + +/** + * @tc.number: GetShortcutInfos_0500 + * @tc.name: test can't get the shortcutInfo have no bundle + * @tc.desc: 1.have not get shortcutInfo by appName + * 2.can't get shortcutInfo + */ +HWTEST_F(BmsBundleKitServiceTest, GetShortcutInfos_0500, Function | SmallTest | Level1) +{ + std::vector shortcutInfos; + GetBundleDataMgr()->GetShortcutInfos(BUNDLE_NAME_TEST, shortcutInfos); + EXPECT_TRUE(shortcutInfos.empty()); +} \ No newline at end of file diff --git a/services/bundlemgr/test/unittest/bms_bundle_parser_test/bms_bundle_parser_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_parser_test/bms_bundle_parser_test.cpp index 9ba4d204cdc392b6b1f01b2c8ab89ca0b585b71e..c2c1923a49b465e7460f30b74f30630dcc647e0c 100755 --- a/services/bundlemgr/test/unittest/bms_bundle_parser_test/bms_bundle_parser_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_parser_test/bms_bundle_parser_test.cpp @@ -75,6 +75,19 @@ const nlohmann::json CONFIG_JSON = R"( "deviceType": [ "car" ], + "shortcuts": [ + { + "shortcutId": "id", + "label": "$string:shortcut", + "icon": "$media:icon", + "intents": [ + { + "targetBundle": "com.huawei.hiworld.himusic", + "targetClass": "com.huawei.hiworld.himusic.entry.MainAbility" + } + ] + } + ], "abilities": [ { "name": ".MainAbility", @@ -84,6 +97,38 @@ const nlohmann::json CONFIG_JSON = R"( "launchType": "standard", "orientation": "unspecified", "visible": true, + "forms": [ + { + "name": "Form_JS", + "description": "It's JS Form", + "type": "JS", + "colorMode": "auto", + "isDefault": false, + "updateEnabled": true, + "scheduledUpdateTime": "21:05", + "updateDuration": 1, + "defaultDimension": "1*2", + "supportDimensions": [ + "1*2" + ], + "landscapeLayouts": [ + "$layout:ability_form" + ], + "portraitLayouts": [ + "$layout:ability_form" + ], + "deepLink": "ability://com.example.myapplication.fa/.MainAbility", + "formConfigAbility": "ability://com.example.myapplication.fa/.MainAbility", + "metaData": { + "customizeData": [ + { + "name": "originWidgetName", + "value": "com.weather.testWidget" + } + ] + } + } + ], "skills": [ { "actions": [ @@ -95,7 +140,7 @@ const nlohmann::json CONFIG_JSON = R"( } ], "type": "page", - "formEnabled": false + "formEnabled": true }, { "name": ".PlayService", @@ -160,7 +205,8 @@ protected: void CheckNoPropProfileParseDeviceConfig(const std::string &propKey, const ErrCode expectCode) const; void CheckNoPropProfileParseModule(const std::string &propKey, const ErrCode expectCode) const; void CheckProfilePermission(const nlohmann::json &checkedProfileJson) const; - + void CheckProfileForms(const nlohmann::json &checkedProfileJson) const; + void CheckProfileShortcut(const nlohmann::json &checkedProfileJson) const; protected: std::ostringstream pathStream_; }; @@ -336,6 +382,30 @@ void BmsBundleParserTest::CheckProfilePermission(const nlohmann::json &checkedPr EXPECT_EQ(result, ERR_APPEXECFWK_PARSE_PROFILE_MISSING_PROP) << profileFileBuffer.str(); } +void BmsBundleParserTest::CheckProfileForms(const nlohmann::json &checkedProfileJson) const +{ + BundleProfile bundleProfile; + InnerBundleInfo innerBundleInfo; + std::ostringstream profileFileBuffer; + + profileFileBuffer << checkedProfileJson.dump(); + + ErrCode result = bundleProfile.TransformTo(profileFileBuffer, innerBundleInfo); + EXPECT_EQ(result, ERR_APPEXECFWK_PARSE_PROFILE_MISSING_PROP) << profileFileBuffer.str(); +} + +void BmsBundleParserTest::CheckProfileShortcut(const nlohmann::json &checkedProfileJson) const +{ + BundleProfile bundleProfile; + InnerBundleInfo innerBundleInfo; + std::ostringstream profileFileBuffer; + + profileFileBuffer << checkedProfileJson.dump(); + + ErrCode result = bundleProfile.TransformTo(profileFileBuffer, innerBundleInfo); + EXPECT_EQ(result, ERR_APPEXECFWK_PARSE_PROFILE_MISSING_PROP) << profileFileBuffer.str(); +} + /** * @tc.number: BmsBundleParser * Function: BundleParser @@ -813,6 +883,142 @@ HWTEST_F(BmsBundleParserTest, TestParse_2300, Function | SmallTest | Level1) CheckProfilePermission(errorReqPermJson); } +/** + * @tc.number: TestParse_2400 + * @tc.name: parse bundle package by config.json + * @tc.desc: 1. system running normally + * 2. test parsing failed when forms prop has error in the config.json + */ +HWTEST_F(BmsBundleParserTest, TestParse_2400, Function | SmallTest | Level1) +{ + nlohmann::json errorFormsJson = CONFIG_JSON; + errorFormsJson[BUNDLE_PROFILE_KEY_MODULE][BUNDLE_MODULE_PROFILE_KEY_ABILITIES]= R"( + [{ + "skills": [ + { + "entities": [ + "entity.system.home", + "flag.home.intent.from.system" + ], + "actions": [ + "action.system.home" + ] + } + ], + "forms": [ + { + "description": "~!@#$%^&*(){}[]:;'?<>,.|`/./+_-", + "type": "~!@#$%^&*(){}[]:;'?<>,.|`/./+_-", + "colorMode": "~!@#$%^&*(){}[]:;'?<>,.|`/./+_-", + "isDefault": "~!@#$%^&*(){}[]:;'?<>,.|`/./+_-", + "updateEnabled": "~!@#$%^&*(){}[]:;'?<>,.|`/./+_-", + "scheduledUpateTime": "~!@#$%^&*(){}[]:;'?<>,.|`/./+_-", + "updateDuration": "~!@#$%^&*(){}[]:;'?<>,.|`/./+_-", + "defaultDimension": "~!@#$%^&*(){}[]:;'?<>,.|`/./+_-", + "supportDimensions": [ + "~!@#$%^&*(){}[]:;'?<>,.|`/./+_-", + "~!@#$%^&*(){}[]:;'?<>,.|`/./+_-" + ], + "jsComponentName": "~!@#$%^&*(){}[]:;'?<>,.|`/./+_-", + "deepLink": "~!@#$%^&*(){}[]:;'?<>,.|`/./+_-", + "metaData": { + "customizeData": [ + { + "name": "~!@#$%^&*(){}[]:;'?<>,.|`/./+_-", + "value": "~!@#$%^&*(){}[]:;'?<>,.|`/./+_-" + } + ] + } + } + ], + "name": "com.example.napi_test_suite.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "label": "MyApplication11", + "type": "page", + "launchType": "standard" + }] + + )"_json; + CheckProfileForms(errorFormsJson); +} + +/** + * @tc.number: TestParse_2500 + * @tc.name: parse bundle package by config.json + * @tc.desc: 1. system running normally + * 2. test parsing failed when forms prop has empty in the config.json + */ +HWTEST_F(BmsBundleParserTest, TestParse_2500, Function | SmallTest | Level1) +{ + nlohmann::json errorFormsJson = CONFIG_JSON; + errorFormsJson[BUNDLE_PROFILE_KEY_MODULE][BUNDLE_MODULE_PROFILE_KEY_ABILITIES] = R"( + [{ + "skills": [ + { + "entities": [ + "entity.system.home", + "flag.home.intent.from.system" + ], + "actions": [ + "action.system.home" + ] + } + ], + "forms": [{ + }], + "name": "com.example.napi_test_suite.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "label": "MyApplication11", + "type": "page", + "launchType": "standard" + }] + )"_json; + CheckProfileForms(errorFormsJson); +} + +/** + * @tc.number: TestParse_2600 + * @tc.name: parse bundle package by config.json + * @tc.desc: 1. system running normally + * 2. test parsing failed when shortcuts prop has empty in the config.json + */ +HWTEST_F(BmsBundleParserTest, TestParse_2600, Function | SmallTest | Level1) +{ + nlohmann::json errorShortcutJson = CONFIG_JSON; + errorShortcutJson[BUNDLE_PROFILE_KEY_MODULE][BUNDLE_MODULE_PROFILE_KEY_SHORTCUTS] = R"( + [{ + + }] + )"_json; + CheckProfileShortcut(errorShortcutJson); +} + +/** + * @tc.number: TestParse_2700 + * @tc.name: parse bundle package by config.json + * @tc.desc: 1. system running normally + * 2. test parsing failed when shortcuts prop has error in the config.json + */ +HWTEST_F(BmsBundleParserTest, TestParse_2700, Function | SmallTest | Level1) +{ + nlohmann::json errorShortcutJson = CONFIG_JSON; + errorShortcutJson[BUNDLE_PROFILE_KEY_MODULE][BUNDLE_MODULE_PROFILE_KEY_SHORTCUTS] = R"( + [{ + "shortcutId": "~!@#$%^&*(){}[]:;'?<>,.|`/./+_-", + "label": "~!@#$%^&*(){}[]:;'?<>,.|`/./+_-", + "icon": "~!@#$%^&*(){}[]:;'?<>,.|`/./+_-", + "intents": [ + { + "targetBundle": "~!@#$%^&*(){}[]:;'?<>,.|`/./+_-", + "targetClass": "~!@#$%^&*(){}[]:;'?<>,.|`/./+_-" + } + ] + }] + )"_json; + CheckProfileShortcut(errorShortcutJson); +} /** * @tc.number: TestExtractByName_0100 * @tc.name: extract file stream by file name from package diff --git a/services/bundlemgr/test/unittest/bms_bundle_permission_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_permission_test/BUILD.gn index 1e8f0c7d61fd747f15a15078c5421431100758c3..864e9a68c2949a1ad1b4e799df0bd27cdf3169f0 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_permission_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_permission_test/BUILD.gn @@ -58,7 +58,6 @@ ohos_unittest("BmsBundlePermissionTest") { deps = [ "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${libs_path}/libeventhandler:libeventhandler_target", - "//base/notification/ces_standard/cesfwk/kits/native:cesfwk_kits", "//base/security/appverify/interfaces/innerkits/appverify:libhapverify", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", "//foundation/aafwk/standard/interfaces/innerkits/base:base", @@ -72,6 +71,7 @@ ohos_unittest("BmsBundlePermissionTest") { deps += bundle_install_deps external_deps = [ + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/bundlemgr/test/unittest/bms_bundle_permission_test/bms_bundle_permission_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_permission_test/bms_bundle_permission_test.cpp index 3072243cad5a1990b138d54831f5aba83bb175e6..ccd86ee3e7eb5aeb8cdc5ee3d4436bbd46e28c19 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_permission_test/bms_bundle_permission_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_permission_test/bms_bundle_permission_test.cpp @@ -419,8 +419,8 @@ void BmsBundlePermissionTest::MockDefPermissionBundleSystemGrant(InnerBundleInfo AppExecFwk::Parameters parameters{"description", "name", "type"}; AppExecFwk::Results results{"description", "name", "type"}; - AppExecFwk::InnerCustomizeData InnerCustomizeData{"name", "value", "extra"}; - MetaData metaData{{parameters}, {results}, {InnerCustomizeData}}; + AppExecFwk::CustomizeData customizeData{"name", "value", "extra"}; + MetaData metaData{{parameters}, {results}, {customizeData}}; moduleInfo.metaData = metaData; innerbundleinfo.SetCurrentModulePackage(PACKAGE_NAME); innerbundleinfo.SetBaseApplicationInfo(appInfo); @@ -463,8 +463,8 @@ void BmsBundlePermissionTest::MockUpdateDefPermissionBundleSystemGrant(InnerBund AppExecFwk::Parameters parameters{"description", "name", "type"}; AppExecFwk::Results results{"description", "name", "type"}; - AppExecFwk::InnerCustomizeData InnerCustomizeData{"name", "value", "extra"}; - MetaData metaData{{parameters}, {results}, {InnerCustomizeData}}; + AppExecFwk::CustomizeData customizeData{"name", "value", "extra"}; + MetaData metaData{{parameters}, {results}, {customizeData}}; moduleInfo.metaData = metaData; innerbundleinfo.SetCurrentModulePackage(PACKAGE_NAME); innerbundleinfo.SetBaseApplicationInfo(appInfo); @@ -507,8 +507,8 @@ void BmsBundlePermissionTest::MockDefPermissionBundleTestReqpermission(InnerBund AppExecFwk::Parameters parameters{"description", "name", "type"}; AppExecFwk::Results results{"description", "name", "type"}; - AppExecFwk::InnerCustomizeData InnerCustomizeData{"name", "value", "extra"}; - MetaData metaData{{parameters}, {results}, {InnerCustomizeData}}; + AppExecFwk::CustomizeData customizeData{"name", "value", "extra"}; + MetaData metaData{{parameters}, {results}, {customizeData}}; moduleInfo.metaData = metaData; innerbundleinfo.SetCurrentModulePackage(PACKAGE_NAME); innerbundleinfo.SetBaseApplicationInfo(appInfo); @@ -550,8 +550,8 @@ void BmsBundlePermissionTest::MockNoDefPermissionBundle(InnerBundleInfo &innerbu AppExecFwk::Parameters parameters{"description", "name", "type"}; AppExecFwk::Results results{"description", "name", "type"}; - AppExecFwk::InnerCustomizeData InnerCustomizeData{"name", "value", "extra"}; - MetaData metaData{{parameters}, {results}, {InnerCustomizeData}}; + AppExecFwk::CustomizeData customizeData{"name", "value", "extra"}; + MetaData metaData{{parameters}, {results}, {customizeData}}; moduleInfo.metaData = metaData; innerbundleinfo.SetCurrentModulePackage(PACKAGE_NAME); innerbundleinfo.SetBaseApplicationInfo(appInfo); @@ -594,8 +594,8 @@ void BmsBundlePermissionTest::MockNoAvailableScopeDefPermissionBundle(InnerBundl AppExecFwk::Parameters parameters{"description", "name", "type"}; AppExecFwk::Results results{"description", "name", "type"}; - AppExecFwk::InnerCustomizeData InnerCustomizeData{"name", "value", "extra"}; - MetaData metaData{{parameters}, {results}, {InnerCustomizeData}}; + AppExecFwk::CustomizeData customizeData{"name", "value", "extra"}; + MetaData metaData{{parameters}, {results}, {customizeData}}; moduleInfo.metaData = metaData; innerbundleinfo.SetCurrentModulePackage(PACKAGE_NAME); innerbundleinfo.SetBaseApplicationInfo(appInfo); @@ -643,8 +643,8 @@ void BmsBundlePermissionTest::MockDefPermissionBundleUserGrant(InnerBundleInfo & AppExecFwk::Parameters parameters{"description", "name", "type"}; AppExecFwk::Results results{"description", "name", "type"}; - AppExecFwk::InnerCustomizeData InnerCustomizeData{"name", "value", "extra"}; - MetaData metaData{{parameters}, {results}, {InnerCustomizeData}}; + AppExecFwk::CustomizeData customizeData{"name", "value", "extra"}; + MetaData metaData{{parameters}, {results}, {customizeData}}; moduleInfo.metaData = metaData; innerbundleinfo.SetCurrentModulePackage(PACKAGE_NAME); innerbundleinfo.SetBaseApplicationInfo(appInfo); @@ -688,8 +688,8 @@ void BmsBundlePermissionTest::MockSameDefPermissionNameBundleSystemGrant(InnerBu AppExecFwk::Parameters parameters{"description", "name", "type"}; AppExecFwk::Results results{"description", "name", "type"}; - AppExecFwk::InnerCustomizeData InnerCustomizeData{"name", "value", "extra"}; - MetaData metaData{{parameters}, {results}, {InnerCustomizeData}}; + AppExecFwk::CustomizeData customizeData{"name", "value", "extra"}; + MetaData metaData{{parameters}, {results}, {customizeData}}; moduleInfo.metaData = metaData; innerbundleinfo.SetCurrentModulePackage(PACKAGE_NAME); innerbundleinfo.SetBaseApplicationInfo(appInfo); @@ -732,8 +732,8 @@ void BmsBundlePermissionTest::MockDefPermissionBundleSame(InnerBundleInfo &inner AppExecFwk::Parameters parameters{"description", "name", "type"}; AppExecFwk::Results results{"description", "name", "type"}; - AppExecFwk::InnerCustomizeData InnerCustomizeData{"name", "value", "extra"}; - MetaData metaData{{parameters}, {results}, {InnerCustomizeData}}; + AppExecFwk::CustomizeData customizeData{"name", "value", "extra"}; + MetaData metaData{{parameters}, {results}, {customizeData}}; moduleInfo.metaData = metaData; innerbundleinfo.SetCurrentModulePackage(PACKAGE_NAME); innerbundleinfo.SetBaseApplicationInfo(appInfo); @@ -777,8 +777,8 @@ void BmsBundlePermissionTest::MockReqPermissionBundle(InnerBundleInfo &innerbund AppExecFwk::Parameters parameters{"description", "name", "type"}; AppExecFwk::Results results{"description", "name", "type"}; - AppExecFwk::InnerCustomizeData InnerCustomizeData{"name", "value", "extra"}; - MetaData metaData{{parameters}, {results}, {InnerCustomizeData}}; + AppExecFwk::CustomizeData customizeData{"name", "value", "extra"}; + MetaData metaData{{parameters}, {results}, {customizeData}}; moduleInfo.metaData = metaData; innerbundleinfo.SetCurrentModulePackage(PACKAGE_NAME); innerbundleinfo.SetBaseApplicationInfo(appInfo); @@ -821,8 +821,8 @@ void BmsBundlePermissionTest::MockOtherReqPermissionBundle(InnerBundleInfo &inne AppExecFwk::Parameters parameters{"description", "name", "type"}; AppExecFwk::Results results{"description", "name", "type"}; - AppExecFwk::InnerCustomizeData InnerCustomizeData{"name", "value", "extra"}; - MetaData metaData{{parameters}, {results}, {InnerCustomizeData}}; + AppExecFwk::CustomizeData customizeData{"name", "value", "extra"}; + MetaData metaData{{parameters}, {results}, {customizeData}}; moduleInfo.metaData = metaData; innerbundleinfo.SetCurrentModulePackage(PACKAGE_NAME); innerbundleinfo.SetBaseApplicationInfo(appInfo); diff --git a/services/bundlemgr/test/unittest/bms_bundle_uninstaller_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_uninstaller_test/BUILD.gn index f12860fd73b38767142be356f213508be968250a..93467df52cd41c012e54ecf12e544656538ac46b 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_uninstaller_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_uninstaller_test/BUILD.gn @@ -59,7 +59,6 @@ ohos_unittest("BmsBundleUninstallerTest") { deps = [ "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${libs_path}/libeventhandler:libeventhandler_target", - "//base/notification/ces_standard/cesfwk/kits/native:cesfwk_kits", "//base/security/appverify/interfaces/innerkits/appverify:libhapverify", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", "//foundation/aafwk/standard/interfaces/innerkits/base:base", @@ -73,6 +72,7 @@ ohos_unittest("BmsBundleUninstallerTest") { deps += bundle_install_deps external_deps = [ + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/bundlemgr/test/unittest/bms_bundle_updater_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_updater_test/BUILD.gn index 41be5dbb890ec5d11a503da4352760c90b6bef3f..3b86be9ea797ff7dc06a8156728a4149c05f09b0 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_updater_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_updater_test/BUILD.gn @@ -63,7 +63,6 @@ ohos_unittest("BmsBundleUpdaterTest") { deps = [ "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${libs_path}/libeventhandler:libeventhandler_target", - "//base/notification/ces_standard/cesfwk/kits/native:cesfwk_kits", "//base/security/appverify/interfaces/innerkits/appverify:libhapverify", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", "//foundation/aafwk/standard/interfaces/innerkits/base:base", @@ -77,6 +76,7 @@ ohos_unittest("BmsBundleUpdaterTest") { deps += bundle_install_deps external_deps = [ + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/bundlemgr/test/unittest/bms_service_bundle_scan_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_service_bundle_scan_test/BUILD.gn index 1743ee33de159274aef3585ab13af651ba4996c1..df19802567218138d3676c6c90ca49c2884777cd 100644 --- a/services/bundlemgr/test/unittest/bms_service_bundle_scan_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_service_bundle_scan_test/BUILD.gn @@ -49,7 +49,6 @@ ohos_unittest("BmsServiceBundleScanTest") { deps = [ "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${libs_path}/libeventhandler:libeventhandler_target", - "//base/notification/ces_standard/cesfwk/kits/native:cesfwk_kits", "//base/security/appverify/interfaces/innerkits/appverify:libhapverify", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", "//foundation/aafwk/standard/interfaces/innerkits/base:base", @@ -62,6 +61,7 @@ ohos_unittest("BmsServiceBundleScanTest") { deps += bundle_install_deps external_deps = [ + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/bundlemgr/test/unittest/bms_service_startup_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_service_startup_test/BUILD.gn index 3b8203702df64c4bfb6dbe534c85300550afcd66..f6486bdf038d0a323410b5aa5e834e45e043785b 100644 --- a/services/bundlemgr/test/unittest/bms_service_startup_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_service_startup_test/BUILD.gn @@ -49,7 +49,6 @@ ohos_unittest("BmsServiceStartupTest") { deps = [ "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${libs_path}/libeventhandler:libeventhandler_target", - "//base/notification/ces_standard/cesfwk/kits/native:cesfwk_kits", "//base/security/appverify/interfaces/innerkits/appverify:libhapverify", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", "//foundation/aafwk/standard/interfaces/innerkits/base:base", @@ -63,6 +62,7 @@ ohos_unittest("BmsServiceStartupTest") { deps += bundle_install_deps external_deps = [ + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/test/BUILD.gn b/services/test/BUILD.gn index a9638d49abcee807fdc71c6c6feec5eb14a4af37..d761495f7efa2a1c82a9d0744b63e0ae53330e0d 100644 --- a/services/test/BUILD.gn +++ b/services/test/BUILD.gn @@ -16,7 +16,7 @@ import("//foundation/appexecfwk/standard/appexecfwk.gni") config("services_module_test_config") { include_dirs = [ "mock/include", - "//base/notification/ces_standard/cesfwk/kits/native/include", + "//base/notification/ces_standard/interfaces/innerkits/native/include", ] configs = [] diff --git a/services/test/mock/include/mock_ability_mgr_host.h b/services/test/mock/include/mock_ability_mgr_host.h index 66f173aa20f66886c885f977be0deac31683d4ec..31d9f786934bfb6b43f3e7f4d4ed9f32e55c72b3 100644 --- a/services/test/mock/include/mock_ability_mgr_host.h +++ b/services/test/mock/include/mock_ability_mgr_host.h @@ -173,6 +173,17 @@ public: return 0; } + int SetMissionDescriptionInfo( + const sptr &token, const MissionDescriptionInfo &missionDescriptionInfo) override + { + return 0; + } + + int GetMissionLockModeState() override + { + return 0; + } + virtual sptr GetWantSender( const WantSenderInfo &wantSenderInfo, const sptr &callerToken) override { diff --git a/services/test/moduletest/common/ams/BUILD.gn b/services/test/moduletest/common/ams/BUILD.gn index 108020e2ada008c9a11ed571f4ee1ba8a8702332..5aae50c1fd501496410138fa85150b4f41a4bfe9 100755 --- a/services/test/moduletest/common/ams/BUILD.gn +++ b/services/test/moduletest/common/ams/BUILD.gn @@ -73,7 +73,6 @@ ohos_source_set("appmgr_mst_source") { "${innerkits_path}/appexecfwk_base:appexecfwk_base", "${innerkits_path}/appexecfwk_core:appexecfwk_core", "${libs_path}/libeventhandler:libeventhandler_target", - "//base/notification/ces_standard/cesfwk/innerkits:cesfwk_innerkits", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", "//base/startup/appspawn_standard:appspawn_socket_client", "//foundation/aafwk/standard/interfaces/innerkits/base:base", @@ -85,6 +84,7 @@ ohos_source_set("appmgr_mst_source") { ] external_deps = [ + "ces_standard:cesfwk_core", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/test/moduletest/common/bms/bundle_installer_test/BUILD.gn b/services/test/moduletest/common/bms/bundle_installer_test/BUILD.gn index c7984bf718585d922851fecc952cba460e89b3ad..1dc596fe57e6f3b465c9522640070ab78efce635 100755 --- a/services/test/moduletest/common/bms/bundle_installer_test/BUILD.gn +++ b/services/test/moduletest/common/bms/bundle_installer_test/BUILD.gn @@ -33,7 +33,6 @@ ohos_moduletest("BmsBundleInstallerModuleTest") { "//foundation/aafwk/standard/interfaces/innerkits/want/include", "//third_party/json/include", "${services_path}/test/mock/include", - "//foundation/appexecfwk/standard/event/cesfwk/kits/native/include", ] sources = [ @@ -67,7 +66,6 @@ ohos_moduletest("BmsBundleInstallerModuleTest") { "${services_path}/bundlemgr:bundle_parser", "${services_path}/bundlemgr:parser_common", "${services_path}/test/moduletest/utils:tool_common", - "//base/notification/ces_standard/cesfwk/kits/native:cesfwk_kits", "//base/security/appverify/interfaces/innerkits/appverify:libhapverify", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", "//foundation/aafwk/standard/interfaces/innerkits/base:base", @@ -81,6 +79,7 @@ ohos_moduletest("BmsBundleInstallerModuleTest") { deps += bundle_install_deps external_deps = [ + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/test/moduletest/common/bms/bundle_installer_test/bms_bundle_installer_module_test.cpp b/services/test/moduletest/common/bms/bundle_installer_test/bms_bundle_installer_module_test.cpp index 0c23662664ead1451cf78a46bf055bb6717ad472..42541c91d2e41f107024f433c9af9563645e72ef 100644 --- a/services/test/moduletest/common/bms/bundle_installer_test/bms_bundle_installer_module_test.cpp +++ b/services/test/moduletest/common/bms/bundle_installer_test/bms_bundle_installer_module_test.cpp @@ -97,8 +97,10 @@ public: return bms_->IsServiceReady(); } - void SaveBundleDataToStorage(const std::string &bundleName, const std::string &data, const std::string &deviceId); - void DeleteBundleDataToStorage(const std::string &bundleName, const std::string &deviceId); + void SaveBundleDataToStorage(std::unique_ptr &kvStorePtr, const std::string &bundleName, + const std::string &data, const std::string &deviceId); + void DeleteBundleDataToStorage( + std::unique_ptr &kvStorePtr, const std::string &bundleName, const std::string &deviceId); void DeleteBundleDataToStorage(); std::unique_ptr GetKvStorePtr(DistributedKvDataManager &dataManager); InnerBundleInfo CreateInnerBundleInfo(const std::string &bundleName); @@ -159,6 +161,7 @@ protected: "bundleName": "com.ohos.launcher", "codePath": "", "description": "$string:mainability_description", + "theme": "mytheme", "deviceCapabilities": [], "deviceId": "", "deviceTypes": [ @@ -184,7 +187,14 @@ protected: "type": 1, "uri": "", "visible": false, - "writePermission": "" + "writePermission": "", + "form": { + "formEntity": ["homeScreen", "searchbox"], + "minHeight": 0, + "defaultHeight": 100, + "minWidth": 0, + "defaultWidth": 200 + } } }, "baseApplicationInfo": { @@ -355,6 +365,64 @@ protected: } ] }, + "formInfos": { + "com.ohos.launchercom.ohos.launchercom.ohos.launcher.MainAbility": [ + { + "package": "com.ohos.launcher", + "bundleName": "com.ohos.launcher", + "originalBundleName": "com.ohos.launcher", + "relatedBundleName": "com.ohos.launcher", + "moduleName": "launcher", + "abilityName": "com.ohos.launcher.MainAbility", + "name": "Form_JS", + "description": "It's JS Form", + "jsComponentName": "com.ohos.launcher", + "deepLink": "com.example.myapplication.fa/.MainAbility", + "formConfigAbility": "com.example.myapplication.fa/.MainAbility", + "scheduledUpateTime": "21:05", + "descriptionId": 125, + "updateDuration": 1, + "defaultDimension": 1, + "defaultFlag": true, + "formVisibleNotify": true, + "updateEnabled": true, + "type": 0, + "colorMode": 0, + "supportDimensions": [ + 1 + ], + "landscapeLayouts": [], + "portraitLayouts": [], + "customizeData": [ + { + "name": "originWidgetName", + "value": "com.weather.testWidget" + } + ] + } + ] + }, + "shortcutInfos": { + "com.ohos.launchercom.ohos.launcherid": [ + { + "id": "id", + "bundleName": "com.ohos.launcher", + "hostAbility": "com.ohos.launcher.MainAbility", + "icon": "/data/bms_bundle", + "label": "shortcutInfo", + "disableMessage": "disableMessage", + "isStatic": true, + "isHomeShortcut": true, + "isEnables": true, + "intents": [ + { + "targetBundle": "com.ohos.launcher", + "targetClass": "com.ohos.launcher.MainAbility" + } + ] + } + ] + } "uid": 2103, "userId_": 0 } @@ -439,14 +507,9 @@ BmsBundleInstallerModuleTest::~BmsBundleInstallerModuleTest() bms_.reset(); } -void BmsBundleInstallerModuleTest::SaveBundleDataToStorage( +void BmsBundleInstallerModuleTest::SaveBundleDataToStorage(std::unique_ptr &kvStorePtr, const std::string &bundleName, const std::string &data, const std::string &deviceId) { - DistributedKvDataManager dataManager; - std::unique_ptr kvStorePtr = GetKvStorePtr(dataManager); - if (!kvStorePtr) { - ASSERT_TRUE(false) << "kvStorePtr is nullptr"; - } Status status; std::string keyString = deviceId + "_" + bundleName; @@ -454,21 +517,14 @@ void BmsBundleInstallerModuleTest::SaveBundleDataToStorage( Value value(data); status = kvStorePtr->Put(key, value); if (status != Status::SUCCESS) { + std::cout << static_cast(status) << std::endl; ASSERT_TRUE(false) << "save fail"; } - - AppId appId{"bundle_manager_service"}; - StoreId storeId{"installed_bundle_datas"}; - dataManager.CloseKvStore(appId, storeId); } -void BmsBundleInstallerModuleTest::DeleteBundleDataToStorage(const std::string &bundleName, const std::string &deviceId) +void BmsBundleInstallerModuleTest::DeleteBundleDataToStorage( + std::unique_ptr &kvStorePtr, const std::string &bundleName, const std::string &deviceId) { - DistributedKvDataManager dataManager; - std::unique_ptr kvStorePtr = GetKvStorePtr(dataManager); - if (!kvStorePtr) { - ASSERT_TRUE(false) << "kvStorePtr is nullptr"; - } Status status; std::string keyString = deviceId + "_" + bundleName; @@ -477,10 +533,6 @@ void BmsBundleInstallerModuleTest::DeleteBundleDataToStorage(const std::string & if (status != Status::SUCCESS) { ASSERT_TRUE(false) << "delete fail"; } - - AppId appId{Constants::APP_ID}; - StoreId storeId{Constants::STORE_ID}; - dataManager.CloseKvStore(appId, storeId); } void BmsBundleInstallerModuleTest::DeleteBundleDataToStorage() @@ -1499,6 +1551,12 @@ HWTEST_F(BmsBundleInstallerModuleTest, BundleDataStorage003, TestSize.Level3) * @tc.steps: step1. load data to storageDb, which have normal and abnormal data */ StartBundleMgrService(); + DistributedKvDataManager dataManager; + std::unique_ptr kvStorePtr = GetKvStorePtr(dataManager); + if (!kvStorePtr) { + ASSERT_TRUE(false) << "kvStorePtr is nullptr"; + } + int saveTimes = 100; int pos = 50; std::string deviceId = Constants::CURRENT_DEVICE_ID; @@ -1507,10 +1565,10 @@ HWTEST_F(BmsBundleInstallerModuleTest, BundleDataStorage003, TestSize.Level3) for (int i = 0; i < saveTimes; i++) { std::string bundleName = "ohos.system" + std::to_string(i); if (i == pos) { - SaveBundleDataToStorage(bundleName, abnormalData, deviceId); + SaveBundleDataToStorage(kvStorePtr, bundleName, abnormalData, deviceId); } else { InnerBundleInfo innerBundleInfo = CreateInnerBundleInfo(bundleName); - SaveBundleDataToStorage(bundleName, innerBundleInfo.ToString(), deviceId); + SaveBundleDataToStorage(kvStorePtr, bundleName, innerBundleInfo.ToString(), deviceId); } bundleNames.emplace_back(bundleName); } @@ -1541,7 +1599,9 @@ HWTEST_F(BmsBundleInstallerModuleTest, BundleDataStorage003, TestSize.Level3) EXPECT_TRUE(getAppInfo) << "Get Application: " + bundleNames[i] + " fail!"; EXPECT_EQ(appInfo.bundleName, bundleNames[i]) << "appinfo bundleName is wrong"; } - std::this_thread::sleep_for(10ms); - DeleteBundleDataToStorage(bundleNames[i], deviceId); + DeleteBundleDataToStorage(kvStorePtr, bundleNames[i], deviceId); } + AppId appId{Constants::APP_ID}; + StoreId storeId{Constants::STORE_ID}; + dataManager.CloseKvStore(appId, storeId); } \ No newline at end of file diff --git a/services/test/moduletest/common/bms/bundle_uninstall_test/BUILD.gn b/services/test/moduletest/common/bms/bundle_uninstall_test/BUILD.gn index 9ab98077c3597a83bf66597882dead0a4c4ed4c4..1d5d96d8118a7b5bfcc2477b69f0ebbcad34ad4d 100755 --- a/services/test/moduletest/common/bms/bundle_uninstall_test/BUILD.gn +++ b/services/test/moduletest/common/bms/bundle_uninstall_test/BUILD.gn @@ -65,7 +65,6 @@ ohos_moduletest("BmsBundleUninstallerModuleTest") { "${services_path}/bundlemgr:bundle_parser", "${services_path}/bundlemgr:parser_common", "${services_path}/test/moduletest/utils:tool_common", - "//base/notification/ces_standard/cesfwk/kits/native:cesfwk_kits", "//base/security/appverify/interfaces/innerkits/appverify:libhapverify", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", "//foundation/aafwk/standard/interfaces/innerkits/base:base", @@ -76,6 +75,7 @@ ohos_moduletest("BmsBundleUninstallerModuleTest") { ] external_deps = [ + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/services/test/moduletest/common/bms/service_start_process_test/BUILD.gn b/services/test/moduletest/common/bms/service_start_process_test/BUILD.gn index 8a1743ffac8f073418b08969ae717052d37f0980..8a8e4a39e6fa2889dacc6f4a1462d59187333227 100755 --- a/services/test/moduletest/common/bms/service_start_process_test/BUILD.gn +++ b/services/test/moduletest/common/bms/service_start_process_test/BUILD.gn @@ -52,7 +52,6 @@ ohos_moduletest("BmsServiceStartModuleTest") { deps = [ "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${libs_path}/libeventhandler:libeventhandler_target", - "//base/notification/ces_standard/cesfwk/kits/native:cesfwk_kits", "//base/security/appverify/interfaces/innerkits/appverify:libhapverify", "//base/security/permission/interfaces/innerkits/permission_standard/permissionsdk:libpermissionsdk_standard", "//foundation/aafwk/standard/interfaces/innerkits/base:base", @@ -66,6 +65,7 @@ ohos_moduletest("BmsServiceStartModuleTest") { deps += bundle_install_deps external_deps = [ + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/BUILD.gn index d6c4e204f461c8b402df201ccb41111da1dc25bd..b5090f27d3967034c753b4b9a99be78dd4e561ea 100644 --- a/test/resource/amssystemtestability/abilitySrc/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/BUILD.gn @@ -13,6 +13,8 @@ group("ams_system_test_app") { deps = [ + "amsAbilityAppendTestA:amsAbilityAppendTestA", + "amsAbilityAppendTestB:amsAbilityAppendTestB", "amsDataSystemTestA:amsDataSystemTestA", "amsDataSystemTestB:amsDataSystemTestB", "amsDataSystemTestC:amsDataSystemTestC", diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..7212ea4c6551e7818f83f0e8ce4ee51b26be9c4b --- /dev/null +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/BUILD.gn @@ -0,0 +1,67 @@ +# 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.gni") +import("//foundation/appexecfwk/standard/appexecfwk.gni") +SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA" +SUBST_TOOLS_DIR = + "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +config("amsAbilityAppendTestAConfig") { + visibility = [ ":*" ] + include_dirs = [ + "${SUBDEMOSYSTEM_DIR}/include", + "${kits_path}/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${innerkits_path}/libeventhandler/include", + "${services_path}/bundlemgr/include", + "${aafwk_path}/services/abilitymgr/include", + "${common_path}/log/include", + "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", + "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common", + "${SUBST_TOOLS_DIR}/include", + ] + defines = [ + "APP_LOG_TAG = \"amsAbilityAppendTestA\"", + "LOG_DOMAIN = 0xD002200", + ] + cflags = [] + if (target_cpu == "arm") { + cflags += [ "-DBINDER_IPC_32BIT" ] + } +} +ohos_shared_library("amsAbilityAppendTestA") { + sources = [ + "${SUBDEMOSYSTEM_DIR}/src/main_ability.cpp", + "${SUBDEMOSYSTEM_DIR}/src/second_ability.cpp", + "${SUBDEMOSYSTEM_DIR}/src/test_utils.cpp", + ] + configs = [ ":amsAbilityAppendTestAConfig" ] + deps = [ + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/want:want", + "${common_path}:libappexecfwk_common", + "${innerkits_path}/appexecfwk_base:appexecfwk_base", + "${innerkits_path}/appexecfwk_core:appexecfwk_core", + "${kits_path}:appkit_native", + "${services_path}/bundlemgr:libbms", + "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", + "//utils/native/base:utilsbase", + ] + external_deps = [ + "ces_standard:cesfwk_innerkits", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + ] + subsystem_name = "amssystemtestability" +} diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/config.json b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/config.json new file mode 100644 index 0000000000000000000000000000000000000000..36dd6f311d8b97d3eb44cea9e67fcc21ec7ae49b --- /dev/null +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/config.json @@ -0,0 +1,51 @@ +{ + "app":{ + "bundleName": "com.ohos.amsst.AppAppendA", + "vendor": "ix", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 3, + "target": 3 + } + }, + "deviceConfig": { + "default": { + } + }, + "module": { + "package":"com.ohos.AppAppendA.src", + "name":"MainAbility", + "deviceType": [ + "tv", + "car" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "testability", + "moduleType": "entry" + }, + "abilities": [{ + "name": "MainAbility", + "icon": "$media:snowball", + "label": "Main Ability", + "launchType": "standard", + "orientation": "unspecified", + "type": "page", + "visible": true, + "skills": [ + ] + }, + { + "name": "SecondAbility", + "icon": "$media:snowflakes", + "label": "Second Ability", + "launchType": "standard", + "orientation": "unspecified", + "type": "service", + "visible": true + }] + } +} \ No newline at end of file diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/include/main_ability.h b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/include/main_ability.h new file mode 100644 index 0000000000000000000000000000000000000000..fcbe2e0786af1dc0e02fe931e9f03b3027d7bc15 --- /dev/null +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/include/main_ability.h @@ -0,0 +1,123 @@ +/* + * 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. + */ + +#ifndef AMS_ABILITY_APPEND_TEST_A_MAIN_ABILITY_H +#define AMS_ABILITY_APPEND_TEST_A_MAIN_ABILITY_H +#include "ability.h" +#include "ability_loader.h" +#include "common_event.h" +#include "common_event_manager.h" +#include "ability_append_test_info.h" + +namespace OHOS { +namespace AppExecFwk { +using namespace OHOS::EventFwk; +class FirstEventSubscriber; +class MainAbility : public Ability { +public: + void SubscribeEvent(); + void TestAbility(int apiIndex, int caseIndex, int code); + + void OnSetCallerCase1(int code); + void TerminateAndRemoveMissonCase1(int code); + void TerminateAbilityResultCase1(int code); + void GetDispalyOrientationCase1(int code); + void GetPreferencesDirCase1(int code); + void StartAbilitiesCase1(int code); + void GetColorModeCase1(int code); + void SetColorModeCase1(int code); + void IsFirstInMissionCase1(int code); + + MainAbility() + { + mapCase_ = { + {(int)AppendApi::OnSetCaller, + { + [this](int code) { OnSetCallerCase1(code); }, + }}, + {(int)AppendApi::TerminateAndRemoveMisson, + { + [this](int code) { TerminateAndRemoveMissonCase1(code); }, + }}, + {(int)AppendApi::TerminateAbilityResult, + { + [this](int code) { TerminateAbilityResultCase1(code); }, + }}, + {(int)AppendApi::GetDispalyOrientation, + { + [this](int code) { GetDispalyOrientationCase1(code); }, + }}, + {(int)AppendApi::GetPreferencesDir, + { + [this](int code) { GetPreferencesDirCase1(code); }, + }}, + {(int)AppendApi::StartAbilities, + { + [this](int code) { StartAbilitiesCase1(code); }, + }}, + {(int)AppendApi::GetColorMode, + { + [this](int code) { GetColorModeCase1(code); }, + }}, + {(int)AppendApi::SetColorMode, + { + [this](int code) { SetColorModeCase1(code); }, + }}, + {(int)AppendApi::IsFirstInMission, + { + [this](int code) { IsFirstInMissionCase1(code); }, + }}, + }; + } + + std::unordered_map>> mapCase_; + ~MainAbility(); + +protected: + void Init(const std::shared_ptr &abilityInfo, const std::shared_ptr &application, + std::shared_ptr &handler, const sptr &token) override; + virtual void OnStart(const Want &want) override; + virtual void OnStop() override; + virtual void OnActive() override; + virtual void OnInactive() override; + virtual void OnBackground() override; + virtual void OnForeground(const Want &want) override; + virtual Uri OnSetCaller() override; + std::shared_ptr subscriber_; +}; +class FirstEventSubscriber : public EventFwk::CommonEventSubscriber { +public: + explicit FirstEventSubscriber(const EventFwk::CommonEventSubscribeInfo &sp) : CommonEventSubscriber(sp) + { + mapTestFunc_ = { + {"Ability", [this](int apiIndex, int caseIndex, int code) { TestAbility(apiIndex, caseIndex, code); }}, + }; + mainAbility = nullptr; + } + + void TestAbility(int apiIndex, int caseIndex, int code) + { + mainAbility->TestAbility(apiIndex, caseIndex, code); + } + + virtual void OnReceiveEvent(const EventFwk::CommonEventData &data); + + MainAbility *mainAbility; + std::unordered_map> mapTestFunc_; + ~FirstEventSubscriber() = default; +}; +} // namespace AppExecFwk +} // namespace OHOS +#endif // AMS_ABILITY_APPEND_TEST_A_MAIN_ABILITY_H \ No newline at end of file diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/include/second_ability.h b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/include/second_ability.h new file mode 100644 index 0000000000000000000000000000000000000000..f459dffbff7e34b5ee1c960eb7b334d67efdb717 --- /dev/null +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/include/second_ability.h @@ -0,0 +1,84 @@ +/* + * 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. + */ + +#ifndef AMS_ABILITY_APPEND_TEST_A_SECOND_ABILITY_H +#define AMS_ABILITY_APPEND_TEST_A_SECOND_ABILITY_H +#include "ability.h" +#include "ability_loader.h" +#include "common_event.h" +#include "common_event_manager.h" +#include "ability_append_test_info.h" + +namespace OHOS { +namespace AppExecFwk { +using namespace OHOS::EventFwk; +class SecondEventSubscriber; +class SecondAbility : public Ability { +public: + void SubscribeEvent(); + void TestAbility(int apiIndex, int caseIndex, int code); + void TerminateAbilityResultCase1(int code); + + SecondAbility() + { + mapCase_ = { + {(int)AppendApi::TerminateAbilityResult, + { + [this](int code) { TerminateAbilityResultCase1(code); }, + }}, + }; + } + + std::unordered_map>> mapCase_; + ~SecondAbility(); + +protected: + void Init(const std::shared_ptr &abilityInfo, const std::shared_ptr &application, + std::shared_ptr &handler, const sptr &token) override; + virtual void OnStart(const Want &want) override; + virtual void OnStop() override; + virtual void OnActive() override; + virtual void OnInactive() override; + virtual void OnBackground() override; + virtual void OnForeground(const Want &want) override; + virtual void OnCommand(const AAFwk::Want &want, bool restart, int startId) override; + virtual sptr OnConnect(const Want &want) override; + virtual void OnDisconnect(const Want &want) override; + std::shared_ptr subscriber_; +}; +class SecondEventSubscriber : public EventFwk::CommonEventSubscriber { +public: + explicit SecondEventSubscriber(const EventFwk::CommonEventSubscribeInfo &sp) : CommonEventSubscriber(sp) + { + mapTestFunc_ = { + {"Ability", [this](int apiIndex, int caseIndex, int code) { TestAbility(apiIndex, caseIndex, code); }}, + }; + mainAbility = nullptr; + } + + void TestAbility(int apiIndex, int caseIndex, int code) + { + mainAbility->TestAbility(apiIndex, caseIndex, code); + } + + virtual void OnReceiveEvent(const EventFwk::CommonEventData &data); + + SecondAbility *mainAbility; + std::unordered_map> mapTestFunc_; + ~SecondEventSubscriber() = default; +}; +} // namespace AppExecFwk +} // namespace OHOS +#endif // AMS_ABILITY_APPEND_TEST_A_SECOND_ABILITY_H \ No newline at end of file diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/include/test_utils.h b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/include/test_utils.h new file mode 100644 index 0000000000000000000000000000000000000000..64b40f888ec52c9ea73da85d972d20bc734ad447 --- /dev/null +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/include/test_utils.h @@ -0,0 +1,41 @@ +/* + * 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. + */ +#ifndef TEST_UTILS_H +#define TEST_UTILS_H +#include "ability_info.h" +#include "ability_lifecycle.h" +#include "application_info.h" +#include "process_info.h" +#include "want.h" + +namespace OHOS { +namespace AppExecFwk { +const int OnStateChangedEventWant = LifeCycle::Event::UNDEFINED; +const int OnStateChangedEvent = (int)LifeCycle::Event::UNDEFINED + 1; +const int requestCodeForTerminate = 10; +const int requestCodeForResult = 20; + +class TestUtils { +public: + TestUtils() = default; + virtual ~TestUtils() = default; + static bool PublishEvent(const std::string &eventName, const int &code, const std::string &data); + static Want MakeWant(std::string deviceId, std::string abilityName, std::string bundleName, + std::map params); + static std::vector split(const std::string &in, const std::string &delim); +}; +} // namespace AppExecFwk +} // namespace OHOS +#endif // TEST_UTILS_H \ No newline at end of file diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/main_ability.cpp b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/main_ability.cpp new file mode 100644 index 0000000000000000000000000000000000000000..0ee77556032cf9665bdb9fdb11d577b6b4a88e10 --- /dev/null +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/main_ability.cpp @@ -0,0 +1,206 @@ +/* + * 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. + */ + +#include "main_ability.h" +#include "app_log_wrapper.h" +#include "test_utils.h" + +namespace OHOS { +namespace AppExecFwk { +using namespace OHOS::EventFwk; + +void MainAbility::Init(const std::shared_ptr &abilityInfo, + const std::shared_ptr &application, std::shared_ptr &handler, + const sptr &token) +{ + APP_LOGI("MainAbility::Init"); + Ability::Init(abilityInfo, application, handler, token); +} + +MainAbility::~MainAbility() +{ + CommonEventManager::UnSubscribeCommonEvent(subscriber_); +} + +void MainAbility::OnStart(const Want &want) +{ + APP_LOGI("MainAbility::onStart"); + SubscribeEvent(); + Ability::OnStart(want); + TestUtils::PublishEvent(g_EVENT_RESP_FIRST_LIFECYCLE, MAIN_ABILITY_A_CODE, "onStart"); +} + +void MainAbility::OnStop() +{ + APP_LOGI("MainAbility::OnStop"); + Ability::OnStop(); + CommonEventManager::UnSubscribeCommonEvent(subscriber_); + TestUtils::PublishEvent(g_EVENT_RESP_FIRST_LIFECYCLE, MAIN_ABILITY_A_CODE, "OnStop"); +} + +void MainAbility::OnActive() +{ + APP_LOGI("MainAbility::OnActive"); + Ability::OnActive(); + TestUtils::PublishEvent(g_EVENT_RESP_FIRST_LIFECYCLE, MAIN_ABILITY_A_CODE, "OnActive"); +} + +void MainAbility::OnInactive() +{ + APP_LOGI("MainAbility::OnInactive"); + Ability::OnInactive(); + TestUtils::PublishEvent(g_EVENT_RESP_FIRST_LIFECYCLE, MAIN_ABILITY_A_CODE, "OnInactive"); +} + +void MainAbility::OnBackground() +{ + APP_LOGI("MainAbility::OnBackground"); + Ability::OnBackground(); + TestUtils::PublishEvent(g_EVENT_RESP_FIRST_LIFECYCLE, MAIN_ABILITY_A_CODE, "OnBackground"); +} + +void MainAbility::OnForeground(const Want &want) +{ + APP_LOGI("MainAbility::OnForeground"); + Ability::OnForeground(want); + TestUtils::PublishEvent(g_EVENT_RESP_FIRST_LIFECYCLE, MAIN_ABILITY_A_CODE, "OnForeground"); +} + +Uri MainAbility::OnSetCaller() +{ + APP_LOGI("MainAbility::OnSetCaller"); + TestUtils::PublishEvent(g_EVENT_RESP_FIRST_LIFECYCLE, MAIN_ABILITY_A_CODE, "OnSetCaller"); + return Ability::OnSetCaller(); +} + +void MainAbility::SubscribeEvent() +{ + std::vector eventList = { + g_EVENT_REQU_FIRST, + }; + MatchingSkills matchingSkills; + for (const auto &e : eventList) { + matchingSkills.AddEvent(e); + } + CommonEventSubscribeInfo subscribeInfo(matchingSkills); + subscribeInfo.SetPriority(1); + subscriber_ = std::make_shared(subscribeInfo); + subscriber_->mainAbility = this; + CommonEventManager::SubscribeCommonEvent(subscriber_); +} + +void FirstEventSubscriber::OnReceiveEvent(const CommonEventData &data) +{ + APP_LOGI("FirstEventSubscriber::OnReceiveEvent:event=%{public}s", data.GetWant().GetAction().c_str()); + APP_LOGI("FirstEventSubscriber::OnReceiveEvent:data=%{public}s", data.GetData().c_str()); + APP_LOGI("FirstEventSubscriber::OnReceiveEvent:code=%{public}d", data.GetCode()); + auto eventName = data.GetWant().GetAction(); + if (std::strcmp(eventName.c_str(), g_EVENT_REQU_FIRST.c_str()) == 0) { + auto target = data.GetData(); + auto caseInfo = TestUtils::split(target, "_"); + if (caseInfo.size() < 3) { + return; + } + if (mapTestFunc_.find(caseInfo[0]) != mapTestFunc_.end()) { + mapTestFunc_[caseInfo[0]](std::stoi(caseInfo[1]), std::stoi(caseInfo[2]), data.GetCode()); + } else { + APP_LOGI("OnReceiveEvent: CommonEventData error(%{public}s)", target.c_str()); + } + } +} + +void MainAbility::TestAbility(int apiIndex, int caseIndex, int code) +{ + APP_LOGI("MainAbility::TestAbility"); + if (mapCase_.find(apiIndex) != mapCase_.end()) { + if (caseIndex < (int)mapCase_[apiIndex].size()) { + mapCase_[apiIndex][caseIndex](code); + } + } +} + +void MainAbility::OnSetCallerCase1(int code) +{ + bool result = true; + TestUtils::PublishEvent(g_EVENT_RESP_FIRST, code, std::to_string(result)); +} + +void MainAbility::TerminateAndRemoveMissonCase1(int code) +{ + bool result = true; + TestUtils::PublishEvent(g_EVENT_RESP_FIRST, code, std::to_string(result)); + TerminateAndRemoveMission(); +} + +void MainAbility::TerminateAbilityResultCase1(int code) +{ + bool result = TerminateAbilityResult(1); + TestUtils::PublishEvent(g_EVENT_RESP_FIRST, code, std::to_string(result)); +} + +void MainAbility::GetDispalyOrientationCase1(int code) +{ + bool result = true; + int orientation = GetDisplayOrientation(); + result = orientation == static_cast(DisplayOrientation::UNSPECIFIED); + TestUtils::PublishEvent(g_EVENT_RESP_FIRST, code, std::to_string(result)); +} + +void MainAbility::GetPreferencesDirCase1(int code) +{ + bool result = true; + string preferencesDir = GetPreferencesDir(); + result = !preferencesDir.empty(); + result = result & (bool)preferencesDir.find(this->GetBundleName()); + result = result & (bool)preferencesDir.find("com.ohos.amsst.AppAppendA/files/MainAbility/preferences"); + + TestUtils::PublishEvent(g_EVENT_RESP_FIRST, code, std::to_string(result)); +} + +void MainAbility::StartAbilitiesCase1(int code) +{ + bool result = true; + std::map params; + Want want1 = TestUtils::MakeWant("", "SecondAbility", "com.ohos.amsst.AppAppendA", params); + Want want2 = TestUtils::MakeWant("", "MainAbility", "com.ohos.amsst.AppAppendB", params); + std::vector wants = {want1, want2}; + AbilityContext::StartAbilities(wants); + TestUtils::PublishEvent(g_EVENT_RESP_FIRST, code, std::to_string(result)); +} + +void MainAbility::GetColorModeCase1(int code) +{ + int colormode = GetColorMode(); + bool result = colormode == static_cast(ModuleColorMode::AUTO); + TestUtils::PublishEvent(g_EVENT_RESP_FIRST, code, std::to_string(result)); +} + +void MainAbility::SetColorModeCase1(int code) +{ + SetColorMode((int)ModuleColorMode::DARK); + int colormode = GetColorMode(); + bool result = colormode == static_cast(ModuleColorMode::DARK); + TestUtils::PublishEvent(g_EVENT_RESP_FIRST, code, std::to_string(result)); +} + +void MainAbility::IsFirstInMissionCase1(int code) +{ + bool result = IsFirstInMission(); + TestUtils::PublishEvent(g_EVENT_RESP_FIRST, code, std::to_string(result)); +} + +REGISTER_AA(MainAbility) +} // namespace AppExecFwk +} // namespace OHOS diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/second_ability.cpp b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/second_ability.cpp new file mode 100644 index 0000000000000000000000000000000000000000..74d9768f8a42a4b3cc9f4e70f2cbcb85330f1a98 --- /dev/null +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/second_ability.cpp @@ -0,0 +1,159 @@ +/* + * 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. + */ + +#include "second_ability.h" +#include "app_log_wrapper.h" +#include "test_utils.h" + +namespace OHOS { +namespace AppExecFwk { +using namespace OHOS::EventFwk; + +void SecondAbility::Init(const std::shared_ptr &abilityInfo, + const std::shared_ptr &application, std::shared_ptr &handler, + const sptr &token) +{ + APP_LOGI("SecondAbility::Init"); + Ability::Init(abilityInfo, application, handler, token); +} + +SecondAbility::~SecondAbility() +{ + CommonEventManager::UnSubscribeCommonEvent(subscriber_); +} + +void SecondAbility::OnStart(const Want &want) +{ + APP_LOGI("SecondAbility::onStart"); + SubscribeEvent(); + Ability::OnStart(want); + TestUtils::PublishEvent(g_EVENT_RESP_SECOND_LIFECYCLE, SECOND_ABILITY_A_CODE, "onStart"); +} + +void SecondAbility::OnStop() +{ + APP_LOGI("SecondAbility::OnStop"); + Ability::OnStop(); + CommonEventManager::UnSubscribeCommonEvent(subscriber_); + TestUtils::PublishEvent(g_EVENT_RESP_SECOND_LIFECYCLE, SECOND_ABILITY_A_CODE, "OnStop"); +} + +void SecondAbility::OnActive() +{ + APP_LOGI("SecondAbility::OnActive"); + Ability::OnActive(); + TestUtils::PublishEvent(g_EVENT_RESP_SECOND_LIFECYCLE, SECOND_ABILITY_A_CODE, "OnActive"); +} + +void SecondAbility::OnInactive() +{ + APP_LOGI("SecondAbility::OnInactive"); + Ability::OnInactive(); + TestUtils::PublishEvent(g_EVENT_RESP_SECOND_LIFECYCLE, SECOND_ABILITY_A_CODE, "OnInactive"); +} + +void SecondAbility::OnBackground() +{ + APP_LOGI("SecondAbility::OnBackground"); + Ability::OnBackground(); + TestUtils::PublishEvent(g_EVENT_RESP_SECOND_LIFECYCLE, SECOND_ABILITY_A_CODE, "OnBackground"); +} + +void SecondAbility::OnForeground(const Want &want) +{ + APP_LOGI("SecondAbility::OnForeground"); + Ability::OnForeground(want); + TestUtils::PublishEvent(g_EVENT_RESP_SECOND_LIFECYCLE, SECOND_ABILITY_A_CODE, "OnForeground"); +} + +void SecondAbility::OnCommand(const AAFwk::Want &want, bool restart, int startId) +{ + APP_LOGI("AmsStServiceAbilityA1::OnCommand"); + + Ability::OnCommand(want, restart, startId); + TestUtils::PublishEvent(g_EVENT_RESP_SECOND_LIFECYCLE, SECOND_ABILITY_A_CODE, "OnActive"); +} + +sptr SecondAbility::OnConnect(const Want &want) +{ + APP_LOGI("AmsStServiceAbilityA1::OnConnect"); + + sptr ret = Ability::OnConnect(want); + TestUtils::PublishEvent(g_EVENT_RESP_SECOND_LIFECYCLE, SECOND_ABILITY_A_CODE, "OnActive"); + return ret; +} +void SecondAbility::OnDisconnect(const Want &want) +{ + APP_LOGI("AmsStServiceAbilityA1::OnDisconnect"); + + Ability::OnDisconnect(want); + TestUtils::PublishEvent(g_EVENT_RESP_SECOND_LIFECYCLE, SECOND_ABILITY_A_CODE, "OnDisconnect"); +} + +void SecondAbility::SubscribeEvent() +{ + std::vector eventList = { + g_EVENT_REQU_SECOND, + }; + MatchingSkills matchingSkills; + for (const auto &e : eventList) { + matchingSkills.AddEvent(e); + } + CommonEventSubscribeInfo subscribeInfo(matchingSkills); + subscribeInfo.SetPriority(1); + subscriber_ = std::make_shared(subscribeInfo); + subscriber_->mainAbility = this; + CommonEventManager::SubscribeCommonEvent(subscriber_); +} + +void SecondEventSubscriber::OnReceiveEvent(const CommonEventData &data) +{ + APP_LOGI("SecondEventSubscriber::OnReceiveEvent:event=%{public}s", data.GetWant().GetAction().c_str()); + APP_LOGI("SecondEventSubscriber::OnReceiveEvent:data=%{public}s", data.GetData().c_str()); + APP_LOGI("SecondEventSubscriber::OnReceiveEvent:code=%{public}d", data.GetCode()); + auto eventName = data.GetWant().GetAction(); + if (std::strcmp(eventName.c_str(), g_EVENT_REQU_SECOND.c_str()) == 0) { + auto target = data.GetData(); + auto caseInfo = TestUtils::split(target, "_"); + if (caseInfo.size() < 3) { + return; + } + if (mapTestFunc_.find(caseInfo[0]) != mapTestFunc_.end()) { + mapTestFunc_[caseInfo[0]](std::stoi(caseInfo[1]), std::stoi(caseInfo[2]), data.GetCode()); + } else { + APP_LOGI("OnReceiveEvent: CommonEventData error(%{public}s)", target.c_str()); + } + } +} + +void SecondAbility::TestAbility(int apiIndex, int caseIndex, int code) +{ + APP_LOGI("SecondAbility::TestAbility"); + if (mapCase_.find(apiIndex) != mapCase_.end()) { + if (caseIndex < (int)mapCase_[apiIndex].size()) { + mapCase_[apiIndex][caseIndex](code); + } + } +} + +void SecondAbility::TerminateAbilityResultCase1(int code) +{ + bool result = TerminateAbilityResult(1); + TestUtils::PublishEvent(g_EVENT_RESP_SECOND, code, std::to_string(result)); +} + +REGISTER_AA(SecondAbility) +} // namespace AppExecFwk +} // namespace OHOS diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/test_utils.cpp new file mode 100644 index 0000000000000000000000000000000000000000..07ebf00c47128276f0e83d0aa5783fec0a417147 --- /dev/null +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/test_utils.cpp @@ -0,0 +1,55 @@ +/* + * 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. + */ +#include "test_utils.h" +#include +#include +#include +#include +#include "common_event_data.h" +#include "common_event_manager.h" +namespace OHOS { +namespace AppExecFwk { +using namespace OHOS::EventFwk; +bool TestUtils::PublishEvent(const std::string &eventName, const int &code, const std::string &data) +{ + Want want; + want.SetAction(eventName); + CommonEventData commonData; + commonData.SetWant(want); + commonData.SetCode(code); + commonData.SetData(data); + return CommonEventManager::PublishCommonEvent(commonData); +} + +Want TestUtils::MakeWant( + std::string deviceId, std::string abilityName, std::string bundleName, std::map params) +{ + ElementName element(deviceId, bundleName, abilityName); + Want want; + want.SetElement(element); + for (const auto ¶m : params) { + want.SetParam(param.first, param.second); + } + return want; +} + +std::vector TestUtils::split(const std::string &in, const std::string &delim) +{ + std::regex reg{delim}; + return std::vector{ + std::sregex_token_iterator(in.begin(), in.end(), reg, -1), std::sregex_token_iterator()}; +} +} // namespace AppExecFwk +} // namespace OHOS \ No newline at end of file diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..1dbdeec9359c42df680da5e7c22c8956fddb8120 --- /dev/null +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/BUILD.gn @@ -0,0 +1,66 @@ +# 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.gni") +import("//foundation/appexecfwk/standard/appexecfwk.gni") +SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB" +SUBST_TOOLS_DIR = + "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" +config("amsAbilityAppendTestBConfig") { + visibility = [ ":*" ] + include_dirs = [ + "${SUBDEMOSYSTEM_DIR}/include", + "${kits_path}/appkit/native/app", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${innerkits_path}/libeventhandler/include", + "${services_path}/bundlemgr/include", + "${aafwk_path}/services/abilitymgr/include", + "${common_path}/log/include", + "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", + "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common", + "${SUBST_TOOLS_DIR}/include", + ] + defines = [ + "APP_LOG_TAG = \"amsAbilityAppendTestB\"", + "LOG_DOMAIN = 0xD002200", + ] + cflags = [] + if (target_cpu == "arm") { + cflags += [ "-DBINDER_IPC_32BIT" ] + } +} +ohos_shared_library("amsAbilityAppendTestB") { + sources = [ + "${SUBDEMOSYSTEM_DIR}/src/main_ability.cpp", + "${SUBDEMOSYSTEM_DIR}/src/test_utils.cpp", + ] + configs = [ ":amsAbilityAppendTestBConfig" ] + deps = [ + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", + "${aafwk_path}/interfaces/innerkits/want:want", + "${common_path}:libappexecfwk_common", + "${innerkits_path}/appexecfwk_base:appexecfwk_base", + "${innerkits_path}/appexecfwk_core:appexecfwk_core", + "${kits_path}:appkit_native", + "${services_path}/bundlemgr:libbms", + "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", + "//utils/native/base:utilsbase", + ] + external_deps = [ + "ces_standard:cesfwk_innerkits", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + ] + subsystem_name = "amssystemtestability" +} diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/config.json b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/config.json new file mode 100644 index 0000000000000000000000000000000000000000..161d93630e6a24be7d8a0b5fe0080543dd81d878 --- /dev/null +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/config.json @@ -0,0 +1,42 @@ +{ + "app":{ + "bundleName": "com.ohos.amsst.AppAppendB", + "vendor": "ix", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 3, + "target": 3 + } + }, + "deviceConfig": { + "default": { + } + }, + "module": { + "package":"com.ohos.AppAppendB.src", + "name":"MainAbility", + "deviceType": [ + "tv", + "car" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "testability", + "moduleType": "entry" + }, + "abilities": [{ + "name": "MainAbility", + "icon": "$media:snowball", + "label": "Main Ability", + "launchType": "standard", + "orientation": "unspecified", + "type": "page", + "visible": true, + "skills": [ + ] + }] + } +} \ No newline at end of file diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/include/main_ability.h b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/include/main_ability.h new file mode 100644 index 0000000000000000000000000000000000000000..7435e87ef3697deabad105b543479ac06584e68b --- /dev/null +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/include/main_ability.h @@ -0,0 +1,73 @@ +/* + * 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. + */ + +#ifndef AMS_ABILITY_APPEND_TEST_B_MAIN_ABILITY_H +#define AMS_ABILITY_APPEND_TEST_B_MAIN_ABILITY_H +#include "ability.h" +#include "ability_loader.h" +#include "common_event.h" +#include "common_event_manager.h" +#include "ability_append_test_info.h" + +namespace OHOS { +namespace AppExecFwk { +using namespace OHOS::EventFwk; +class FirstEventSubscriber; +class MainAbility : public Ability { +public: + MainAbility() + { + mapCase_ = {}; + } + void SubscribeEvent(); + void TestAbility(int apiIndex, int caseIndex, int code); + ~MainAbility(); + std::unordered_map>> mapCase_; + +protected: + void Init(const std::shared_ptr &abilityInfo, const std::shared_ptr &application, + std::shared_ptr &handler, const sptr &token) override; + virtual void OnStart(const Want &want) override; + virtual void OnStop() override; + virtual void OnActive() override; + virtual void OnInactive() override; + virtual void OnBackground() override; + virtual void OnForeground(const Want &want) override; + std::shared_ptr subscriber_; +}; +class FirstEventSubscriber : public EventFwk::CommonEventSubscriber { +public: + explicit FirstEventSubscriber(const EventFwk::CommonEventSubscribeInfo &sp) : CommonEventSubscriber(sp) + { + mapTestFunc_ = { + {"Ability", [this](int apiIndex, int caseIndex, int code) { TestAbility(apiIndex, caseIndex, code); }}, + }; + mainAbility = nullptr; + } + + void TestAbility(int apiIndex, int caseIndex, int code) + { + mainAbility->TestAbility(apiIndex, caseIndex, code); + } + + virtual void OnReceiveEvent(const EventFwk::CommonEventData &data); + + MainAbility *mainAbility; + std::unordered_map> mapTestFunc_; + ~FirstEventSubscriber(){}; +}; +} // namespace AppExecFwk +} // namespace OHOS +#endif // AMS_ABILITY_APPEND_TEST_B_MAIN_ABILITY_H \ No newline at end of file diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/include/test_utils.h b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/include/test_utils.h new file mode 100644 index 0000000000000000000000000000000000000000..64b40f888ec52c9ea73da85d972d20bc734ad447 --- /dev/null +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/include/test_utils.h @@ -0,0 +1,41 @@ +/* + * 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. + */ +#ifndef TEST_UTILS_H +#define TEST_UTILS_H +#include "ability_info.h" +#include "ability_lifecycle.h" +#include "application_info.h" +#include "process_info.h" +#include "want.h" + +namespace OHOS { +namespace AppExecFwk { +const int OnStateChangedEventWant = LifeCycle::Event::UNDEFINED; +const int OnStateChangedEvent = (int)LifeCycle::Event::UNDEFINED + 1; +const int requestCodeForTerminate = 10; +const int requestCodeForResult = 20; + +class TestUtils { +public: + TestUtils() = default; + virtual ~TestUtils() = default; + static bool PublishEvent(const std::string &eventName, const int &code, const std::string &data); + static Want MakeWant(std::string deviceId, std::string abilityName, std::string bundleName, + std::map params); + static std::vector split(const std::string &in, const std::string &delim); +}; +} // namespace AppExecFwk +} // namespace OHOS +#endif // TEST_UTILS_H \ No newline at end of file diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/src/main_ability.cpp b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/src/main_ability.cpp new file mode 100644 index 0000000000000000000000000000000000000000..db038f3117a282e90f5ef9b2e9c5681325531547 --- /dev/null +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/src/main_ability.cpp @@ -0,0 +1,129 @@ +/* + * 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. + */ + +#include "main_ability.h" +#include "app_log_wrapper.h" +#include "test_utils.h" + +namespace OHOS { +namespace AppExecFwk { +using namespace OHOS::EventFwk; + +void MainAbility::Init(const std::shared_ptr &abilityInfo, + const std::shared_ptr &application, std::shared_ptr &handler, + const sptr &token) +{ + APP_LOGI("MainAbility::Init"); + Ability::Init(abilityInfo, application, handler, token); +} + +void MainAbility::OnStart(const Want &want) +{ + APP_LOGI("MainAbility::onStart"); + SubscribeEvent(); + Ability::OnStart(want); + TestUtils::PublishEvent(g_EVENT_RESP_FIRSTB_LIFECYCLE, MAIN_ABILITY_B_CODE, "onStart"); +} + +void MainAbility::OnStop() +{ + APP_LOGI("MainAbility::OnStop"); + Ability::OnStop(); + CommonEventManager::UnSubscribeCommonEvent(subscriber_); + TestUtils::PublishEvent(g_EVENT_RESP_FIRSTB_LIFECYCLE, MAIN_ABILITY_B_CODE, "OnStop"); +} + +void MainAbility::OnActive() +{ + APP_LOGI("MainAbility::OnActive"); + Ability::OnActive(); + TestUtils::PublishEvent(g_EVENT_RESP_FIRSTB_LIFECYCLE, MAIN_ABILITY_B_CODE, "OnActive"); +} + +void MainAbility::OnInactive() +{ + APP_LOGI("MainAbility::OnInactive"); + Ability::OnInactive(); + TestUtils::PublishEvent(g_EVENT_RESP_FIRSTB_LIFECYCLE, MAIN_ABILITY_B_CODE, "OnInactive"); +} + +void MainAbility::OnBackground() +{ + APP_LOGI("MainAbility::OnBackground"); + Ability::OnBackground(); + TestUtils::PublishEvent(g_EVENT_RESP_FIRSTB_LIFECYCLE, MAIN_ABILITY_B_CODE, "OnBackground"); +} + +void MainAbility::OnForeground(const Want &want) +{ + APP_LOGI("MainAbility::OnForeground"); + Ability::OnForeground(want); + TestUtils::PublishEvent(g_EVENT_RESP_FIRSTB_LIFECYCLE, MAIN_ABILITY_B_CODE, "OnForeground"); +} + +MainAbility::~MainAbility() +{ + CommonEventManager::UnSubscribeCommonEvent(subscriber_); +} + +void MainAbility::SubscribeEvent() +{ + std::vector eventList = { + g_EVENT_REQU_FIRSTB, + }; + MatchingSkills matchingSkills; + for (const auto &e : eventList) { + matchingSkills.AddEvent(e); + } + CommonEventSubscribeInfo subscribeInfo(matchingSkills); + subscribeInfo.SetPriority(1); + subscriber_ = std::make_shared(subscribeInfo); + subscriber_->mainAbility = this; + CommonEventManager::SubscribeCommonEvent(subscriber_); +} + +void FirstEventSubscriber::OnReceiveEvent(const CommonEventData &data) +{ + APP_LOGI("FirstEventSubscriber::OnReceiveEvent:event=%{public}s", data.GetWant().GetAction().c_str()); + APP_LOGI("FirstEventSubscriber::OnReceiveEvent:data=%{public}s", data.GetData().c_str()); + APP_LOGI("FirstEventSubscriber::OnReceiveEvent:code=%{public}d", data.GetCode()); + auto eventName = data.GetWant().GetAction(); + if (std::strcmp(eventName.c_str(), g_EVENT_REQU_FIRSTB.c_str()) == 0) { + auto target = data.GetData(); + auto caseInfo = TestUtils::split(target, "_"); + if (caseInfo.size() < 3) { + return; + } + if (mapTestFunc_.find(caseInfo[0]) != mapTestFunc_.end()) { + mapTestFunc_[caseInfo[0]](std::stoi(caseInfo[1]), std::stoi(caseInfo[2]), data.GetCode()); + } else { + APP_LOGI("OnReceiveEvent: CommonEventData error(%{public}s)", target.c_str()); + } + } +} + +void MainAbility::TestAbility(int apiIndex, int caseIndex, int code) +{ + APP_LOGI("MainAbility::TestAbility"); + if (mapCase_.find(apiIndex) != mapCase_.end()) { + if (caseIndex < (int)mapCase_[apiIndex].size()) { + mapCase_[apiIndex][caseIndex](code); + } + } +} + +REGISTER_AA(MainAbility) +} // namespace AppExecFwk +} // namespace OHOS diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/src/test_utils.cpp new file mode 100644 index 0000000000000000000000000000000000000000..07ebf00c47128276f0e83d0aa5783fec0a417147 --- /dev/null +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/src/test_utils.cpp @@ -0,0 +1,55 @@ +/* + * 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. + */ +#include "test_utils.h" +#include +#include +#include +#include +#include "common_event_data.h" +#include "common_event_manager.h" +namespace OHOS { +namespace AppExecFwk { +using namespace OHOS::EventFwk; +bool TestUtils::PublishEvent(const std::string &eventName, const int &code, const std::string &data) +{ + Want want; + want.SetAction(eventName); + CommonEventData commonData; + commonData.SetWant(want); + commonData.SetCode(code); + commonData.SetData(data); + return CommonEventManager::PublishCommonEvent(commonData); +} + +Want TestUtils::MakeWant( + std::string deviceId, std::string abilityName, std::string bundleName, std::map params) +{ + ElementName element(deviceId, bundleName, abilityName); + Want want; + want.SetElement(element); + for (const auto ¶m : params) { + want.SetParam(param.first, param.second); + } + return want; +} + +std::vector TestUtils::split(const std::string &in, const std::string &delim) +{ + std::regex reg{delim}; + return std::vector{ + std::sregex_token_iterator(in.begin(), in.end(), reg, -1), std::sregex_token_iterator()}; +} +} // namespace AppExecFwk +} // namespace OHOS \ No newline at end of file diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/BUILD.gn index 1825e3a6985e1b0b0af0c162b48ec2522e92c2e8..67ea8c33d3035e96e7fdd7265ea59243031c6cc9 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/BUILD.gn @@ -13,7 +13,6 @@ import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") -EVENT_DIR = "//base/notification/ces_standard/cesfwk" SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA" SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" @@ -29,7 +28,6 @@ config("amsDataSystemTestAConfig") { "${aafwk_path}/services/abilitymgr/include", "${common_path}/log/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", - "${EVENT_DIR}/kits/native/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -50,7 +48,6 @@ ohos_shared_library("amsDataSystemTestA") { ] configs = [ ":amsDataSystemTestAConfig" ] deps = [ - "${EVENT_DIR}/kits/native:cesfwk_kits", "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", "${aafwk_path}/interfaces/innerkits/want:want", @@ -63,6 +60,7 @@ ohos_shared_library("amsDataSystemTestA") { "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/BUILD.gn index 99b3bd5ac8a0793f9bb2f582af8c9cc244807c95..1c95a8a84fa6f15b275703e1d314025e9583547d 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/BUILD.gn @@ -13,7 +13,6 @@ import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") -EVENT_DIR = "//base/notification/ces_standard/cesfwk" SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB" SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" config("amsDataSystemTestBConfig") { @@ -28,7 +27,6 @@ config("amsDataSystemTestBConfig") { "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/appexecfwk/standard/common/log/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", - "${EVENT_DIR}/kits/native/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -49,7 +47,6 @@ ohos_shared_library("amsDataSystemTestB") { ] configs = [ ":amsDataSystemTestBConfig" ] deps = [ - "${EVENT_DIR}/kits/native:cesfwk_kits", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/interfaces/innerkits/want:want", @@ -62,6 +59,7 @@ ohos_shared_library("amsDataSystemTestB") { "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/BUILD.gn index 64f8248cd1100943a31c399a3f9ab501c69c3540..4e22015ca94f1e9d2e27b37d8e5fb292e347e4ea 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/BUILD.gn @@ -13,7 +13,6 @@ import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") -EVENT_DIR = "//base/notification/ces_standard/cesfwk" SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC" SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" config("amsDataSystemTestCConfig") { @@ -28,7 +27,6 @@ config("amsDataSystemTestCConfig") { "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/appexecfwk/standard/common/log/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", - "${EVENT_DIR}/kits/native/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -49,7 +47,6 @@ ohos_shared_library("amsDataSystemTestC") { ] configs = [ ":amsDataSystemTestCConfig" ] deps = [ - "${EVENT_DIR}/kits/native:cesfwk_kits", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", "//foundation/aafwk/standard/interfaces/innerkits/want:want", @@ -62,6 +59,7 @@ ohos_shared_library("amsDataSystemTestC") { "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/BUILD.gn index 0fbdd427fdbe30942dff93c2ce8001a44c7b36d2..fb2b7102a0cfab2eea4a0619a68f93bbb0b83176 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/BUILD.gn @@ -13,9 +13,6 @@ import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") -event_cesfwk_path = "//base/notification/ces_standard/cesfwk" -event_cesfwk_kits_path = "${event_cesfwk_path}/kits" -event_cesfwk_innerkits_path = "${event_cesfwk_path}/innerkits" config("amsKitSTAbilityManagerConfig") { visibility = [ ":*" ] include_dirs = [ @@ -27,8 +24,6 @@ config("amsKitSTAbilityManagerConfig") { "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", "${appexecfwk_path}/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", - "${event_cesfwk_innerkits_path}/include", - "${event_cesfwk_kits_path}/native/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", "//utils/system/safwk/native/include", "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common", @@ -55,13 +50,13 @@ ohos_shared_library("amsKitSTAbilityManager") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/kits:appkit_native", "${appexecfwk_path}/services/bundlemgr:libbms", - "${event_cesfwk_innerkits_path}:cesfwk_innerkits", - "${event_cesfwk_kits_path}/native:cesfwk_kits", "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/src/kit_test_ability_manager_second.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/src/kit_test_ability_manager_second.cpp index cf027e8506d23ac552acd6bb9181cc4395072c9b..009b1c10c2a637fd6a655d187ac75b275e0a42bc 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/src/kit_test_ability_manager_second.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/src/kit_test_ability_manager_second.cpp @@ -402,6 +402,7 @@ void KitTestAbilityManagerSecond::OnNewWant(const Want &want) { APP_LOGI("KitTestAbilityManagerSecond::OnNewWant"); Ability::OnNewWant(want); + GetWantInfo(want); std::string eventData = GetAbilityName() + g_abilityStateOnNewWant; PublishEvent(g_respPageManagerSecondAbilityST, 0, eventData); } diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/BUILD.gn index 9e6d26d2dcd44225080e4b5fd6d476fa5c92c87b..90253da90a42f1ebbb957785d40e6534608142ed 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/BUILD.gn @@ -13,9 +13,6 @@ import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") -event_cesfwk_path = "//base/notification/ces_standard/cesfwk" -event_cesfwk_kits_path = "${event_cesfwk_path}/kits" -event_cesfwk_innerkits_path = "${event_cesfwk_path}/innerkits" config("amsKitSystemTestconfig") { visibility = [ ":*" ] include_dirs = [ @@ -27,8 +24,6 @@ config("amsKitSystemTestconfig") { "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", "${appexecfwk_path}/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", - "${event_cesfwk_innerkits_path}/include", - "${event_cesfwk_kits_path}/native/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", "//utils/system/safwk/native/include", "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common", @@ -64,13 +59,13 @@ ohos_shared_library("amsKitSystemTest") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/kits:appkit_native", "${appexecfwk_path}/services/bundlemgr:libbms", - "${event_cesfwk_innerkits_path}:cesfwk_innerkits", - "${event_cesfwk_kits_path}/native:cesfwk_kits", "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/sixth_ability.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/sixth_ability.cpp index 01404d97765da76a6f2d19737ddc964acb45c6e0..4b61a8c75357304e0ce910ff4aea54f85d97d546 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/sixth_ability.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/sixth_ability.cpp @@ -411,7 +411,6 @@ void SixthAbility::OnBackground() void SixthAbility::OnForeground(const Want &want) { APP_LOGI("SixthAbility::OnForeground"); - GetWantInfo(want); Ability::OnForeground(want); std::string eventData = GetAbilityName() + g_abilityStateOnForeground; TestUtils::PublishEvent(g_respPageSixthAbilityST, 0, eventData); diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA/BUILD.gn index 574973c49f713b26f2520fb59658ab66a8fe511b..0a50173b9c063b720194fe045974bc1a538c9280 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") -EVENT_DIR = "//base/notification/ces_standard/cesfwk" SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA" SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" @@ -29,7 +28,6 @@ config("amsKitSystemTestAConfig") { "${common_path}/log/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common", - "${EVENT_DIR}/kits/native/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -49,7 +47,6 @@ ohos_shared_library("amsKitSystemTestA") { ] configs = [ ":amsKitSystemTestAConfig" ] deps = [ - "${EVENT_DIR}/kits/native:cesfwk_kits", "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", "${aafwk_path}/interfaces/innerkits/want:want", @@ -62,6 +59,7 @@ ohos_shared_library("amsKitSystemTestA") { "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/BUILD.gn index 21f5c1108113418d0f5f9c4c036f35da538a0560..17299a601edaac639ecf1cd4cc4932520146b297 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") -EVENT_DIR = "//base/notification/ces_standard/cesfwk" SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB" SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" @@ -29,7 +28,6 @@ config("amsKitSystemTestBConfig") { "${common_path}/log/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common", - "${EVENT_DIR}/kits/native/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -48,7 +46,6 @@ ohos_shared_library("amsKitSystemTestB") { ] configs = [ ":amsKitSystemTestBConfig" ] deps = [ - "${EVENT_DIR}/kits/native:cesfwk_kits", "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", "${aafwk_path}/interfaces/innerkits/want:want", @@ -61,6 +58,7 @@ ohos_shared_library("amsKitSystemTestB") { "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/BUILD.gn index 0c4c3adce7a5fcf47c1f79253baeada9dbaa6a97..aeccfe7ea00bf0df24b185fc59783f2b19f20961 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/BUILD.gn @@ -13,7 +13,6 @@ import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") -EVENT_DIR = "//base/notification/ces_standard/cesfwk" SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA" SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" @@ -29,7 +28,6 @@ config("amsKitSystemTestDataAConfig") { "${aafwk_path}/services/abilitymgr/include", "${common_path}/log/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", - "${EVENT_DIR}/kits/native/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -53,7 +51,6 @@ ohos_shared_library("amsKitSystemTestDataA") { ] configs = [ ":amsKitSystemTestDataAConfig" ] deps = [ - "${EVENT_DIR}/kits/native:cesfwk_kits", "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", "${aafwk_path}/interfaces/innerkits/want:want", @@ -66,6 +63,7 @@ ohos_shared_library("amsKitSystemTestDataA") { "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/BUILD.gn index 4c3ed6982da2c9a2bf85955e008a1cab2806ca79..00a21f15d81d6273aacac930493449cb0c07821b 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/BUILD.gn @@ -13,7 +13,6 @@ import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") -EVENT_DIR = "//base/notification/ces_standard/cesfwk" SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB" SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" @@ -29,7 +28,6 @@ config("amsKitSystemTestDataBConfig") { "${aafwk_path}/services/abilitymgr/include", "${common_path}/log/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", - "${EVENT_DIR}/kits/native/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -51,7 +49,6 @@ ohos_shared_library("amsKitSystemTestDataB") { ] configs = [ ":amsKitSystemTestDataBConfig" ] deps = [ - "${EVENT_DIR}/kits/native:cesfwk_kits", "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", "${aafwk_path}/interfaces/innerkits/want:want", @@ -64,6 +61,7 @@ ohos_shared_library("amsKitSystemTestDataB") { "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/BUILD.gn index 66cb4a5804dcd4abafb34344114752186ffbf91a..e35cd0f6c19eff1d381adc3998b4a39d615bd0fc 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/BUILD.gn @@ -26,8 +26,6 @@ config("amsSystemTestCConfig") { "${aafwk_path}/services/abilitymgr/include", "${appexecfwk_path}/common/log/include", "//foundation/distributedschedule/services/dtbschedmgr/include", - "${even_path}/cesfwk/innerkits/include", - "${even_path}/cesfwk/kits/native/include", ] defines = [ "APP_LOG_TAG = \"amsKitSystemTestPageA\"", @@ -55,12 +53,12 @@ ohos_shared_library("amsKitSystemTestPageA") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/kits:appkit_native", "${appexecfwk_path}/services/bundlemgr:libbms", - "${even_path}/cesfwk/innerkits:cesfwk_innerkits", - "${even_path}/cesfwk/kits/native:cesfwk_kits", "${libs_path}/libeventhandler:libeventhandler_target", "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/src/ability_ability.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/src/ability_ability.cpp index 464feeb412e2d9b9af713864c2e84bb586d210de..0060598daaf505785786a261d9e5cc0399dc428d 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/src/ability_ability.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/src/ability_ability.cpp @@ -214,7 +214,7 @@ void AbilityAbility::TestConnectAbility() connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); bool ret = ConnectAbility(want, connCallback_); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, ret, "TestConnectAbility"); } break; @@ -222,7 +222,7 @@ void AbilityAbility::TestConnectAbility() stub_ = new (std::nothrow) AbilityConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); bool ret = ConnectAbility(want, connCallback_); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, ret, "TestConnectAbility"); } break; @@ -259,13 +259,13 @@ void AbilityAbility::TestStopAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.page.AppKitA", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.page.AppKitA", params); bool ret = StopAbility(want); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); bool ret = StopAbility(want); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; @@ -278,7 +278,7 @@ void AbilityAbility::TestStopAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); bool ret = StopAbility(want); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; @@ -300,7 +300,7 @@ void AbilityAbility::TestDisconnectAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); stub_ = new (std::nothrow) AbilityConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = ConnectAbility(want, connCallback_); @@ -309,7 +309,7 @@ void AbilityAbility::TestDisconnectAbility() } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); stub_ = new (std::nothrow) AbilityConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = ConnectAbility(want, connCallback_); @@ -328,7 +328,7 @@ void AbilityAbility::TestDisconnectAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); stub_ = new (std::nothrow) AbilityConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = ConnectAbility(want, connCallback_); @@ -354,7 +354,7 @@ void AbilityAbility::TestStartAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); StartAbility(want, INT_MAX); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, 1, "TestStartAbility"); sleep(1); @@ -362,7 +362,7 @@ void AbilityAbility::TestStartAbility() } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); StartAbility(want, INT_MIN); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, 1, "TestStartAbility"); sleep(1); @@ -377,7 +377,7 @@ void AbilityAbility::TestStartAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); StartAbility(want, 0); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, 1, "TestStartAbility"); } break; @@ -400,7 +400,7 @@ void AbilityAbility::TestTerminateAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); StartAbility(want, 0); sleep(1); StopAbility(want); @@ -410,7 +410,7 @@ void AbilityAbility::TestTerminateAbility() } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); StartAbility(want, 0); sleep(1); StopAbility(want); @@ -428,7 +428,7 @@ void AbilityAbility::TestTerminateAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); StartAbility(want, 0); sleep(1); TerminateAbility(); @@ -449,7 +449,7 @@ void AbilityAbility::TestStartAbilityWithSetting() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); StartAbility(want, *AbilityStartSetting::GetEmptySetting().get()); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, 1, "TestStartAbilityWithSetting"); sleep(1); @@ -457,7 +457,7 @@ void AbilityAbility::TestStartAbilityWithSetting() } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); StartAbility(want, *AbilityStartSetting::GetEmptySetting().get()); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, 1, "TestStartAbilityWithSetting"); sleep(1); @@ -472,7 +472,7 @@ void AbilityAbility::TestStartAbilityWithSetting() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); StartAbility(want, *AbilityStartSetting::GetEmptySetting().get()); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, 1, "TestStartAbilityWithSetting"); } break; @@ -491,13 +491,13 @@ void AbilityAbility::TestStartAbilityForResult() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.page.AppKitA", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.page.AppKitA", params); StartAbilityForResult(want, INT_MAX); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, 1, "TestStartAbilityForResult"); } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); StartAbilityForResult(want, INT_MIN); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, 1, "TestStartAbilityForResult"); sleep(1); @@ -512,7 +512,7 @@ void AbilityAbility::TestStartAbilityForResult() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); StartAbilityForResult(want, 0); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, 1, "TestStartAbilityForResult"); } break; @@ -535,7 +535,7 @@ void AbilityAbility::TestAbilityStartAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); StartAbility(want); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, 1, "TestAbilityStartAbility"); sleep(1); @@ -543,7 +543,7 @@ void AbilityAbility::TestAbilityStartAbility() } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); StartAbility(want); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, 1, "TestAbilityStartAbility"); sleep(1); @@ -558,7 +558,7 @@ void AbilityAbility::TestAbilityStartAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); StartAbility(want); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, 1, "TestAbilityStartAbility"); } break; @@ -585,7 +585,7 @@ void AbilityAbility::TestAbilityConnectAbility() connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); bool ret = ConnectAbility(want, connCallback_); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, ret, "TestAbilityConnectAbility"); sleep(1); @@ -595,7 +595,7 @@ void AbilityAbility::TestAbilityConnectAbility() stub_ = new (std::nothrow) AbilityConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); bool ret = ConnectAbility(want, connCallback_); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, ret, "TestAbilityConnectAbility"); sleep(1); @@ -634,7 +634,7 @@ void AbilityAbility::TestAbilityStopAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); StartAbility(want); sleep(1); bool ret = StopAbility(want); @@ -642,7 +642,7 @@ void AbilityAbility::TestAbilityStopAbility() } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); StartAbility(want); sleep(1); bool ret = StopAbility(want); @@ -657,7 +657,7 @@ void AbilityAbility::TestAbilityStopAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); StartAbility(want); bool ret = StopAbility(want); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, ret, "TestAbilityStopAbility"); @@ -727,7 +727,7 @@ void AbilityAbility::TestAbilityDisconnectAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); stub_ = new (std::nothrow) AbilityConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = ConnectAbility(want, connCallback_); @@ -737,7 +737,7 @@ void AbilityAbility::TestAbilityDisconnectAbility() } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); stub_ = new (std::nothrow) AbilityConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = ConnectAbility(want, connCallback_); @@ -758,7 +758,7 @@ void AbilityAbility::TestAbilityDisconnectAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); stub_ = new (std::nothrow) AbilityConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = ConnectAbility(want, connCallback_); diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/src/ability_context_ability.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/src/ability_context_ability.cpp index d11fb9169779ba2371143378cadaec1175d87fb4..283ac05ac30b8690229059ac53aa56d179491275 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/src/ability_context_ability.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/src/ability_context_ability.cpp @@ -132,7 +132,7 @@ void AbilityContextAbility::TestConnectAbility() connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, ret, "TestConnectAbility"); } break; @@ -140,7 +140,7 @@ void AbilityContextAbility::TestConnectAbility() stub_ = new (std::nothrow) AbilityContextConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, ret, "TestConnectAbility"); } break; @@ -173,13 +173,13 @@ void AbilityContextAbility::TestStopAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); bool ret = BaseAbility::GetContext()->StopAbility(want); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); bool ret = BaseAbility::GetContext()->StopAbility(want); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; @@ -192,7 +192,7 @@ void AbilityContextAbility::TestStopAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); bool ret = BaseAbility::GetContext()->StopAbility(want); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; @@ -214,7 +214,7 @@ void AbilityContextAbility::TestDisconnectAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); stub_ = new (std::nothrow) AbilityContextConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); @@ -223,7 +223,7 @@ void AbilityContextAbility::TestDisconnectAbility() } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); stub_ = new (std::nothrow) AbilityContextConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); @@ -242,7 +242,7 @@ void AbilityContextAbility::TestDisconnectAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); stub_ = new (std::nothrow) AbilityContextConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); @@ -264,13 +264,13 @@ void AbilityContextAbility::TestStartAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); BaseAbility::GetContext()->StartAbility(want, 0); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, 1, "TestStartAbility"); } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); BaseAbility::GetContext()->StartAbility(want, 0); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, 1, "TestStartAbility"); } break; @@ -283,7 +283,7 @@ void AbilityContextAbility::TestStartAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); BaseAbility::GetContext()->StartAbility(want, 0); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, 1, "TestStartAbility"); } break; @@ -302,7 +302,7 @@ void AbilityContextAbility::TestTerminateAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); BaseAbility::GetContext()->StartAbility(want, 0); sleep(1); BaseAbility::GetContext()->StopAbility(want); @@ -312,7 +312,7 @@ void AbilityContextAbility::TestTerminateAbility() } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); BaseAbility::GetContext()->StartAbility(want, 0); sleep(1); BaseAbility::GetContext()->StopAbility(want); @@ -329,7 +329,7 @@ void AbilityContextAbility::TestTerminateAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); BaseAbility::GetContext()->StartAbility(want, 0); BaseAbility::GetContext()->TerminateAbility(); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, 1, "TestTerminateAbility"); diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/src/ability_life_cycle_ability.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/src/ability_life_cycle_ability.cpp index 15d8b6973aa099b6ed169feb30c0cc0487bb21a3..08ef9ee33f6c7062c3dd4ed8948a80f9e7b0fe77 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/src/ability_life_cycle_ability.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/src/ability_life_cycle_ability.cpp @@ -176,7 +176,7 @@ void AbilityLifeCycleAbility::TestConnectAbility() connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, ret, "TestConnectAbility"); } break; @@ -184,7 +184,7 @@ void AbilityLifeCycleAbility::TestConnectAbility() stub_ = new (std::nothrow) AbilityLifeCycleConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, ret, "TestConnectAbility"); } break; @@ -217,13 +217,13 @@ void AbilityLifeCycleAbility::TestStopAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); bool ret = BaseAbility::GetContext()->StopAbility(want); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); bool ret = BaseAbility::GetContext()->StopAbility(want); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; @@ -236,7 +236,7 @@ void AbilityLifeCycleAbility::TestStopAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); bool ret = BaseAbility::GetContext()->StopAbility(want); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; @@ -258,7 +258,7 @@ void AbilityLifeCycleAbility::TestDisconnectAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); stub_ = new (std::nothrow) AbilityLifeCycleConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); @@ -267,7 +267,7 @@ void AbilityLifeCycleAbility::TestDisconnectAbility() } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); stub_ = new (std::nothrow) AbilityLifeCycleConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); @@ -286,7 +286,7 @@ void AbilityLifeCycleAbility::TestDisconnectAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); stub_ = new (std::nothrow) AbilityLifeCycleConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); @@ -308,13 +308,13 @@ void AbilityLifeCycleAbility::TestStartAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); BaseAbility::GetContext()->StartAbility(want, 0); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, 1, "TestStartAbility"); } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); BaseAbility::GetContext()->StartAbility(want, 0); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, 1, "TestStartAbility"); } break; @@ -327,7 +327,7 @@ void AbilityLifeCycleAbility::TestStartAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); BaseAbility::GetContext()->StartAbility(want, 0); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, 1, "TestStartAbility"); } break; @@ -346,14 +346,14 @@ void AbilityLifeCycleAbility::TestTerminateAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); BaseAbility::GetContext()->StartAbility(want, 0); BaseAbility::GetContext()->TerminateAbility(); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, 1, "TestTerminateAbility"); } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); BaseAbility::GetContext()->StartAbility(want, 0); BaseAbility::GetContext()->TerminateAbility(); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, 1, "TestTerminateAbility"); @@ -367,7 +367,7 @@ void AbilityLifeCycleAbility::TestTerminateAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); BaseAbility::GetContext()->StartAbility(want, 0); BaseAbility::GetContext()->TerminateAbility(); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, 1, "TestTerminateAbility"); diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/src/life_cycle_observer_ability.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/src/life_cycle_observer_ability.cpp index 39529bb81666d9825d0b323b4a35e9d514172eab..4653d6331658f05a5129de9aa650f8bde6772b8f 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/src/life_cycle_observer_ability.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/src/life_cycle_observer_ability.cpp @@ -283,7 +283,7 @@ void LifeCycleObserverAbility::TestConnectAbility() connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); TestUtils::PublishEvent(APP_LIFE_CYCLE_OBSERVER_RESP_EVENT_NAME, ret, "TestConnectAbility"); } break; @@ -291,7 +291,7 @@ void LifeCycleObserverAbility::TestConnectAbility() stub_ = new (std::nothrow) LifeCycleObserverConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); TestUtils::PublishEvent(APP_LIFE_CYCLE_OBSERVER_RESP_EVENT_NAME, ret, "TestConnectAbility"); } break; @@ -324,13 +324,13 @@ void LifeCycleObserverAbility::TestStopAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); bool ret = BaseAbility::GetContext()->StopAbility(want); TestUtils::PublishEvent(APP_LIFE_CYCLE_OBSERVER_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); bool ret = BaseAbility::GetContext()->StopAbility(want); TestUtils::PublishEvent(APP_LIFE_CYCLE_OBSERVER_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; @@ -343,7 +343,7 @@ void LifeCycleObserverAbility::TestStopAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); bool ret = BaseAbility::GetContext()->StopAbility(want); TestUtils::PublishEvent(APP_LIFE_CYCLE_OBSERVER_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; @@ -365,7 +365,7 @@ void LifeCycleObserverAbility::TestDisconnectAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); stub_ = new (std::nothrow) LifeCycleObserverConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); @@ -374,7 +374,7 @@ void LifeCycleObserverAbility::TestDisconnectAbility() } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); stub_ = new (std::nothrow) LifeCycleObserverConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); @@ -393,7 +393,7 @@ void LifeCycleObserverAbility::TestDisconnectAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); stub_ = new (std::nothrow) LifeCycleObserverConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); @@ -415,13 +415,13 @@ void LifeCycleObserverAbility::TestStartAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); BaseAbility::GetContext()->StartAbility(want, 0); TestUtils::PublishEvent(APP_LIFE_CYCLE_OBSERVER_RESP_EVENT_NAME, 1, "TestStartAbility"); } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); BaseAbility::GetContext()->StartAbility(want, 0); TestUtils::PublishEvent(APP_LIFE_CYCLE_OBSERVER_RESP_EVENT_NAME, 1, "TestStartAbility"); } break; @@ -434,7 +434,7 @@ void LifeCycleObserverAbility::TestStartAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); BaseAbility::GetContext()->StartAbility(want, 0); TestUtils::PublishEvent(APP_LIFE_CYCLE_OBSERVER_RESP_EVENT_NAME, 1, "TestStartAbility"); } break; @@ -453,14 +453,14 @@ void LifeCycleObserverAbility::TestTerminateAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); BaseAbility::GetContext()->StartAbility(want, 0); BaseAbility::GetContext()->TerminateAbility(); TestUtils::PublishEvent(APP_LIFE_CYCLE_OBSERVER_RESP_EVENT_NAME, 1, "TestTerminateAbility"); } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); BaseAbility::GetContext()->StartAbility(want, 0); BaseAbility::GetContext()->TerminateAbility(); TestUtils::PublishEvent(APP_LIFE_CYCLE_OBSERVER_RESP_EVENT_NAME, 1, "TestTerminateAbility"); @@ -474,7 +474,7 @@ void LifeCycleObserverAbility::TestTerminateAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); BaseAbility::GetContext()->StartAbility(want, 0); BaseAbility::GetContext()->TerminateAbility(); TestUtils::PublishEvent(APP_LIFE_CYCLE_OBSERVER_RESP_EVENT_NAME, 1, "TestTerminateAbility"); diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/BUILD.gn index 41a8734efa0863b638d1fdfdd924021c15505a3a..cebf6cc9dedc9c6bca2b247eb37725535096a8a7 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/BUILD.gn @@ -14,9 +14,6 @@ import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") subdemosystem_path = "${system_test_app_path}/amsKitSystemTestService" -event_cesfwk_path = "//base/notification/ces_standard/cesfwk" -event_cesfwk_kits_path = "${event_cesfwk_path}/kits" -event_cesfwk_innerkits_path = "${event_cesfwk_path}/innerkits" config("amsKitSystemTestServiceconfig") { visibility = [ ":*" ] include_dirs = [ @@ -28,8 +25,6 @@ config("amsKitSystemTestServiceconfig") { "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", "${appexecfwk_path}/kits/appkit/native/app", "${appexecfwk_path}/services/bundlemgr/include", - "${event_cesfwk_innerkits_path}/include", - "${event_cesfwk_kits_path}/native/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", "//utils/system/safwk/native/include", ] @@ -63,12 +58,12 @@ ohos_shared_library("amsKitSystemTestService") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/kits:appkit_native", "${appexecfwk_path}/services/bundlemgr:libbms", - "${event_cesfwk_innerkits_path}:cesfwk_innerkits", - "${event_cesfwk_kits_path}/native:cesfwk_kits", "${libs_path}/libeventhandler:libeventhandler_target", "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/ability_ability.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/ability_ability.cpp index 2627ac871d6c67731227184142b6cbb7e5434d82..282f42fe45e218f19a4991b215f1e308d294083c 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/ability_ability.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/ability_ability.cpp @@ -194,7 +194,7 @@ void AbilityAbility::TestConnectAbility() connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); bool ret = ConnectAbility(want, connCallback_); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, ret, "TestConnectAbility"); sleep(2); @@ -204,7 +204,7 @@ void AbilityAbility::TestConnectAbility() stub_ = new (std::nothrow) AbilityConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); bool ret = ConnectAbility(want, connCallback_); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, ret, "TestConnectAbility"); sleep(2); @@ -247,13 +247,13 @@ void AbilityAbility::TestStopAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); bool ret = StopAbility(want); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); bool ret = StopAbility(want); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; @@ -266,7 +266,7 @@ void AbilityAbility::TestStopAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); bool ret = StopAbility(want); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; @@ -292,7 +292,7 @@ void AbilityAbility::TestDisconnectAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); stub_ = new (std::nothrow) AbilityConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = ConnectAbility(want, connCallback_); @@ -301,7 +301,7 @@ void AbilityAbility::TestDisconnectAbility() } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); stub_ = new (std::nothrow) AbilityConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = ConnectAbility(want, connCallback_); @@ -320,7 +320,7 @@ void AbilityAbility::TestDisconnectAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); stub_ = new (std::nothrow) AbilityConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = ConnectAbility(want, connCallback_); @@ -346,13 +346,13 @@ void AbilityAbility::TestStartAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); StartAbility(want, INT_MAX); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, 1, "TestStartAbility"); } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); StartAbility(want, INT_MIN); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, 1, "TestStartAbility"); } break; @@ -365,7 +365,7 @@ void AbilityAbility::TestStartAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); StartAbility(want, 0); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, 1, "TestStartAbility"); } break; @@ -388,7 +388,7 @@ void AbilityAbility::TestTerminateAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); StartAbility(want, 0); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, 1, "TestTerminateAbility"); sleep(2); @@ -397,7 +397,7 @@ void AbilityAbility::TestTerminateAbility() } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); StartAbility(want, 0); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, 1, "TestTerminateAbility"); sleep(2); @@ -413,7 +413,7 @@ void AbilityAbility::TestTerminateAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); StartAbility(want, 0); sleep(2); TerminateAbility(); @@ -438,7 +438,7 @@ void AbilityAbility::TestAbilityStartAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); StartAbility(want); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, 1, "TestAbilityStartAbility"); sleep(1); @@ -446,7 +446,7 @@ void AbilityAbility::TestAbilityStartAbility() } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); StartAbility(want); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, 1, "TestAbilityStartAbility"); sleep(1); @@ -461,7 +461,7 @@ void AbilityAbility::TestAbilityStartAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); StartAbility(want); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, 1, "TestAbilityStartAbility"); } break; @@ -488,7 +488,7 @@ void AbilityAbility::TestAbilityConnectAbility() connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); bool ret = ConnectAbility(want, connCallback_); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, ret, "TestAbilityConnectAbility"); sleep(2); @@ -498,7 +498,7 @@ void AbilityAbility::TestAbilityConnectAbility() stub_ = new (std::nothrow) AbilityConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); bool ret = ConnectAbility(want, connCallback_); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, ret, "TestAbilityConnectAbility"); sleep(2); @@ -537,7 +537,7 @@ void AbilityAbility::TestAbilityStopAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); StartAbility(want); sleep(1); bool ret = StopAbility(want); @@ -545,7 +545,7 @@ void AbilityAbility::TestAbilityStopAbility() } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); StartAbility(want); sleep(1); bool ret = StopAbility(want); @@ -560,7 +560,7 @@ void AbilityAbility::TestAbilityStopAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); StartAbility(want); bool ret = StopAbility(want); TestUtils::PublishEvent(APP_ABILITY_RESP_EVENT_NAME, ret, "TestAbilityStopAbility"); @@ -630,7 +630,7 @@ void AbilityAbility::TestAbilityDisconnectAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); stub_ = new (std::nothrow) AbilityConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = ConnectAbility(want, connCallback_); @@ -640,7 +640,7 @@ void AbilityAbility::TestAbilityDisconnectAbility() } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); stub_ = new (std::nothrow) AbilityConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = ConnectAbility(want, connCallback_); @@ -661,7 +661,7 @@ void AbilityAbility::TestAbilityDisconnectAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); stub_ = new (std::nothrow) AbilityConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = ConnectAbility(want, connCallback_); diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/ability_connection_ability.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/ability_connection_ability.cpp index caaea210a8ba85645462caa2b43d5d49cecc56b9..054b04669acaa7d7c808ca49da9d3704de411e18 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/ability_connection_ability.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/ability_connection_ability.cpp @@ -142,7 +142,7 @@ void AbilityConnectionAbility::TestConnectAbility() connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); TestUtils::PublishEvent(APP_ABILITY_CONNECTION_RESP_EVENT_NAME, ret, "TestConnectAbility"); sleep(1); @@ -152,7 +152,7 @@ void AbilityConnectionAbility::TestConnectAbility() stub_ = new (std::nothrow) AbilityConnectionConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); TestUtils::PublishEvent(APP_ABILITY_CONNECTION_RESP_EVENT_NAME, ret, "TestConnectAbility"); sleep(1); @@ -191,13 +191,13 @@ void AbilityConnectionAbility::TestStopAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); bool ret = BaseAbility::GetContext()->StopAbility(want); TestUtils::PublishEvent(APP_ABILITY_CONNECTION_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); bool ret = BaseAbility::GetContext()->StopAbility(want); TestUtils::PublishEvent(APP_ABILITY_CONNECTION_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; @@ -210,7 +210,7 @@ void AbilityConnectionAbility::TestStopAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); bool ret = BaseAbility::GetContext()->StopAbility(want); TestUtils::PublishEvent(APP_ABILITY_CONNECTION_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; @@ -233,7 +233,7 @@ void AbilityConnectionAbility::TestDisconnectAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); stub_ = new (std::nothrow) AbilityConnectionConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); @@ -243,7 +243,7 @@ void AbilityConnectionAbility::TestDisconnectAbility() } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); stub_ = new (std::nothrow) AbilityConnectionConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); @@ -264,7 +264,7 @@ void AbilityConnectionAbility::TestDisconnectAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); stub_ = new (std::nothrow) AbilityConnectionConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); @@ -287,13 +287,13 @@ void AbilityConnectionAbility::TestStartAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); BaseAbility::GetContext()->StartAbility(want, 0); TestUtils::PublishEvent(APP_ABILITY_CONNECTION_RESP_EVENT_NAME, 1, "TestStartAbility"); } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); BaseAbility::GetContext()->StartAbility(want, 0); TestUtils::PublishEvent(APP_ABILITY_CONNECTION_RESP_EVENT_NAME, 1, "TestStartAbility"); } break; @@ -306,7 +306,7 @@ void AbilityConnectionAbility::TestStartAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); BaseAbility::GetContext()->StartAbility(want, 0); TestUtils::PublishEvent(APP_ABILITY_CONNECTION_RESP_EVENT_NAME, 1, "TestStartAbility"); } break; @@ -325,14 +325,14 @@ void AbilityConnectionAbility::TestTerminateAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); BaseAbility::GetContext()->StartAbility(want, 0); BaseAbility::GetContext()->TerminateAbility(); TestUtils::PublishEvent(APP_ABILITY_CONNECTION_RESP_EVENT_NAME, 1, "TestTerminateAbility"); } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); BaseAbility::GetContext()->StartAbility(want, 0); BaseAbility::GetContext()->TerminateAbility(); TestUtils::PublishEvent(APP_ABILITY_CONNECTION_RESP_EVENT_NAME, 1, "TestTerminateAbility"); @@ -346,7 +346,7 @@ void AbilityConnectionAbility::TestTerminateAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); BaseAbility::GetContext()->StartAbility(want, 0); BaseAbility::GetContext()->TerminateAbility(); TestUtils::PublishEvent(APP_ABILITY_CONNECTION_RESP_EVENT_NAME, 1, "TestTerminateAbility"); diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/ability_context_ability.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/ability_context_ability.cpp index a69d04ada13d239e7da9f9390b824ae0a7de9edf..a8155eda53fa557102b5fafde57d0a89a26506d7 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/ability_context_ability.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/ability_context_ability.cpp @@ -143,7 +143,7 @@ void AbilityContextAbility::TestConnectAbility() connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, ret, "TestConnectAbility"); sleep(1); @@ -153,7 +153,7 @@ void AbilityContextAbility::TestConnectAbility() stub_ = new (std::nothrow) AbilityContextConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, ret, "TestConnectAbility"); sleep(1); @@ -192,13 +192,13 @@ void AbilityContextAbility::TestStopAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); bool ret = BaseAbility::GetContext()->StopAbility(want); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); bool ret = BaseAbility::GetContext()->StopAbility(want); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; @@ -211,7 +211,7 @@ void AbilityContextAbility::TestStopAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); bool ret = BaseAbility::GetContext()->StopAbility(want); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; @@ -233,7 +233,7 @@ void AbilityContextAbility::TestDisconnectAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); stub_ = new (std::nothrow) AbilityContextConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); @@ -243,7 +243,7 @@ void AbilityContextAbility::TestDisconnectAbility() } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); stub_ = new (std::nothrow) AbilityContextConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); @@ -263,7 +263,7 @@ void AbilityContextAbility::TestDisconnectAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); stub_ = new (std::nothrow) AbilityContextConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); @@ -285,7 +285,7 @@ void AbilityContextAbility::TestStartAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); BaseAbility::GetContext()->StartAbility(want, 0); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, 1, "TestStartAbility"); sleep(2); @@ -293,7 +293,7 @@ void AbilityContextAbility::TestStartAbility() } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); BaseAbility::GetContext()->StartAbility(want, 0); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, 1, "TestStartAbility"); sleep(2); @@ -308,7 +308,7 @@ void AbilityContextAbility::TestStartAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); BaseAbility::GetContext()->StartAbility(want, 0); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, 1, "TestStartAbility"); } break; @@ -327,7 +327,7 @@ void AbilityContextAbility::TestTerminateAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); BaseAbility::GetContext()->StartAbility(want, 0); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, 1, "TestTerminateAbility"); sleep(2); @@ -336,7 +336,7 @@ void AbilityContextAbility::TestTerminateAbility() } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); BaseAbility::GetContext()->StartAbility(want, 0); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, 1, "TestTerminateAbility"); sleep(2); @@ -352,7 +352,7 @@ void AbilityContextAbility::TestTerminateAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); BaseAbility::GetContext()->StartAbility(want, 0); BaseAbility::GetContext()->TerminateAbility(); TestUtils::PublishEvent(APP_ABILITY_CONTEXT_RESP_EVENT_NAME, 1, "TestTerminateAbility"); diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/ability_life_cycle_ability.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/ability_life_cycle_ability.cpp index 6439fa06d1c1b44535c83d90284d368aab6526a1..2ccf0e524b6942032336966c424453110b96db11 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/ability_life_cycle_ability.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/ability_life_cycle_ability.cpp @@ -182,7 +182,7 @@ void AbilityLifeCycleAbility::TestConnectAbility() connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); TestUtils::PublishEvent(APP_ABILITY_LIFE_CYCLE_RESP_EVENT_NAME, ret, "TestConnectAbility"); } break; @@ -190,7 +190,7 @@ void AbilityLifeCycleAbility::TestConnectAbility() stub_ = new (std::nothrow) AbilityLifeCycleConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); TestUtils::PublishEvent(APP_ABILITY_LIFE_CYCLE_RESP_EVENT_NAME, ret, "TestConnectAbility"); } break; @@ -223,13 +223,13 @@ void AbilityLifeCycleAbility::TestStopAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); bool ret = BaseAbility::GetContext()->StopAbility(want); TestUtils::PublishEvent(APP_ABILITY_LIFE_CYCLE_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); bool ret = BaseAbility::GetContext()->StopAbility(want); TestUtils::PublishEvent(APP_ABILITY_LIFE_CYCLE_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; @@ -242,7 +242,7 @@ void AbilityLifeCycleAbility::TestStopAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); bool ret = BaseAbility::GetContext()->StopAbility(want); TestUtils::PublishEvent(APP_ABILITY_LIFE_CYCLE_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; @@ -264,7 +264,7 @@ void AbilityLifeCycleAbility::TestDisconnectAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); stub_ = new (std::nothrow) AbilityLifeCycleConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); @@ -273,7 +273,7 @@ void AbilityLifeCycleAbility::TestDisconnectAbility() } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); stub_ = new (std::nothrow) AbilityLifeCycleConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); @@ -292,7 +292,7 @@ void AbilityLifeCycleAbility::TestDisconnectAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); stub_ = new (std::nothrow) AbilityLifeCycleConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); @@ -314,13 +314,13 @@ void AbilityLifeCycleAbility::TestStartAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); BaseAbility::GetContext()->StartAbility(want, 0); TestUtils::PublishEvent(APP_ABILITY_LIFE_CYCLE_RESP_EVENT_NAME, 1, "TestStartAbility"); } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); BaseAbility::GetContext()->StartAbility(want, 0); TestUtils::PublishEvent(APP_ABILITY_LIFE_CYCLE_RESP_EVENT_NAME, 1, "TestStartAbility"); } break; @@ -333,7 +333,7 @@ void AbilityLifeCycleAbility::TestStartAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); BaseAbility::GetContext()->StartAbility(want, 0); TestUtils::PublishEvent(APP_ABILITY_LIFE_CYCLE_RESP_EVENT_NAME, 1, "TestStartAbility"); } break; @@ -352,14 +352,14 @@ void AbilityLifeCycleAbility::TestTerminateAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); BaseAbility::GetContext()->StartAbility(want, 0); BaseAbility::GetContext()->TerminateAbility(); TestUtils::PublishEvent(APP_ABILITY_LIFE_CYCLE_RESP_EVENT_NAME, 1, "TestTerminateAbility"); } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); BaseAbility::GetContext()->StartAbility(want, 0); BaseAbility::GetContext()->TerminateAbility(); TestUtils::PublishEvent(APP_ABILITY_LIFE_CYCLE_RESP_EVENT_NAME, 1, "TestTerminateAbility"); @@ -373,7 +373,7 @@ void AbilityLifeCycleAbility::TestTerminateAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); BaseAbility::GetContext()->StartAbility(want, 0); BaseAbility::GetContext()->TerminateAbility(); TestUtils::PublishEvent(APP_ABILITY_LIFE_CYCLE_RESP_EVENT_NAME, 1, "TestTerminateAbility"); diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/life_cycle_observer_ability.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/life_cycle_observer_ability.cpp index fa0cbd0584a0e1a35117461c1fa82f2907ab065d..4a61746250ba165767f53646d896a910b1ce877a 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/life_cycle_observer_ability.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/life_cycle_observer_ability.cpp @@ -282,7 +282,7 @@ void LifeCycleObserverAbility::TestConnectAbility() connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); TestUtils::PublishEvent(APP_LIFE_CYCLE_OBSERVER_RESP_EVENT_NAME, ret, "TestConnectAbility"); } break; @@ -290,7 +290,7 @@ void LifeCycleObserverAbility::TestConnectAbility() stub_ = new (std::nothrow) LifeCycleObserverConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); TestUtils::PublishEvent(APP_LIFE_CYCLE_OBSERVER_RESP_EVENT_NAME, ret, "TestConnectAbility"); } break; @@ -323,13 +323,13 @@ void LifeCycleObserverAbility::TestStopAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); bool ret = BaseAbility::GetContext()->StopAbility(want); TestUtils::PublishEvent(APP_LIFE_CYCLE_OBSERVER_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); bool ret = BaseAbility::GetContext()->StopAbility(want); TestUtils::PublishEvent(APP_LIFE_CYCLE_OBSERVER_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; @@ -342,7 +342,7 @@ void LifeCycleObserverAbility::TestStopAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); bool ret = BaseAbility::GetContext()->StopAbility(want); TestUtils::PublishEvent(APP_LIFE_CYCLE_OBSERVER_RESP_EVENT_NAME, ret, "TestStopAbility"); } break; @@ -364,7 +364,7 @@ void LifeCycleObserverAbility::TestDisconnectAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); stub_ = new (std::nothrow) LifeCycleObserverConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); @@ -373,7 +373,7 @@ void LifeCycleObserverAbility::TestDisconnectAbility() } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); stub_ = new (std::nothrow) LifeCycleObserverConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); @@ -392,7 +392,7 @@ void LifeCycleObserverAbility::TestDisconnectAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); stub_ = new (std::nothrow) LifeCycleObserverConnectCallback(); connCallback_ = new (std::nothrow) AbilityConnectionProxy(stub_); bool ret = BaseAbility::GetContext()->ConnectAbility(want, connCallback_); @@ -414,13 +414,13 @@ void LifeCycleObserverAbility::TestStartAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); BaseAbility::GetContext()->StartAbility(want, 0); TestUtils::PublishEvent(APP_LIFE_CYCLE_OBSERVER_RESP_EVENT_NAME, 1, "TestStartAbility"); } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); BaseAbility::GetContext()->StartAbility(want, 0); TestUtils::PublishEvent(APP_LIFE_CYCLE_OBSERVER_RESP_EVENT_NAME, 1, "TestStartAbility"); } break; @@ -433,7 +433,7 @@ void LifeCycleObserverAbility::TestStartAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); BaseAbility::GetContext()->StartAbility(want, 0); TestUtils::PublishEvent(APP_LIFE_CYCLE_OBSERVER_RESP_EVENT_NAME, 1, "TestStartAbility"); } break; @@ -452,14 +452,14 @@ void LifeCycleObserverAbility::TestTerminateAbility() case CaseIndex::TWO: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKit", params); BaseAbility::GetContext()->StartAbility(want, 0); BaseAbility::GetContext()->TerminateAbility(); TestUtils::PublishEvent(APP_LIFE_CYCLE_OBSERVER_RESP_EVENT_NAME, 1, "TestTerminateAbility"); } break; case CaseIndex::THREE: { MAP_STR_STR params; - Want want = TestUtils::MakeWant("device", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); + Want want = TestUtils::MakeWant("", "AmsStServiceAbilityA1", "com.ohos.amsst.service.appA", params); BaseAbility::GetContext()->StartAbility(want, 0); BaseAbility::GetContext()->TerminateAbility(); TestUtils::PublishEvent(APP_LIFE_CYCLE_OBSERVER_RESP_EVENT_NAME, 1, "TestTerminateAbility"); @@ -473,7 +473,7 @@ void LifeCycleObserverAbility::TestTerminateAbility() case CaseIndex::FIVE: { MAP_STR_STR params; Want want = - TestUtils::MakeWant("device", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); + TestUtils::MakeWant("", "LifecycleCallbacksAbility", "com.ohos.amsst.service.AppKitx", params); BaseAbility::GetContext()->StartAbility(want, 0); BaseAbility::GetContext()->TerminateAbility(); TestUtils::PublishEvent(APP_LIFE_CYCLE_OBSERVER_RESP_EVENT_NAME, 1, "TestTerminateAbility"); diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestA/BUILD.gn index 975ca79d0f50cdb21c4b47ff90ab4dfb89f30f11..15c1495a73595a91ad42f6e69c77f4f50d5fc1bb 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestA/BUILD.gn @@ -13,7 +13,6 @@ import("//build/ohos.gni") SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestA" SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" -EVENT_DIR = "//base/notification/ces_standard/cesfwk" config("amsSystemTestAConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,8 +25,6 @@ config("amsSystemTestAConfig") { "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/appexecfwk/standard/common/log/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", - "${EVENT_DIR}/innerkits/include", - "${EVENT_DIR}/kits/native/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -47,8 +44,6 @@ ohos_shared_library("amsSystemTestA") { ] configs = [ ":amsSystemTestAConfig" ] deps = [ - "${EVENT_DIR}/innerkits:cesfwk_innerkits", - "${EVENT_DIR}/kits/native:cesfwk_kits", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", @@ -59,6 +54,8 @@ ohos_shared_library("amsSystemTestA") { "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestB/BUILD.gn index b3ace29273d18718f0851f7080d12d110a24affb..a04c7f21a789b7ab7f01e27cbd906b43bfe44840 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestB/BUILD.gn @@ -13,7 +13,6 @@ import("//build/ohos.gni") SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestB" SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" -EVENT_DIR = "//base/notification/ces_standard/cesfwk" config("amsSystemTestBConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,8 +25,6 @@ config("amsSystemTestBConfig") { "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/appexecfwk/standard/common/log/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", - "${EVENT_DIR}/innerkits/include", - "${EVENT_DIR}/kits/native/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -42,8 +39,6 @@ ohos_shared_library("amsSystemTestB") { ] configs = [ ":amsSystemTestBConfig" ] deps = [ - "${EVENT_DIR}/innerkits:cesfwk_innerkits", - "${EVENT_DIR}/kits/native:cesfwk_kits", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", @@ -54,6 +49,8 @@ ohos_shared_library("amsSystemTestB") { "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestC/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestC/BUILD.gn index b1e75c48db1b1f3b9284f1594ce4b93445079dd7..74f3c45135c0b7ae88f752b9ea4bcfa185146bd1 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestC/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestC/BUILD.gn @@ -13,7 +13,6 @@ import("//build/ohos.gni") SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestC" SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" -EVENT_DIR = "//base/notification/ces_standard/cesfwk" config("amsSystemTestCConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,8 +25,6 @@ config("amsSystemTestCConfig") { "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/appexecfwk/standard/common/log/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", - "${EVENT_DIR}/innerkits/include", - "${EVENT_DIR}/kits/native/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -44,8 +41,6 @@ ohos_shared_library("amsSystemTestC") { ] configs = [ ":amsSystemTestCConfig" ] deps = [ - "${EVENT_DIR}/innerkits:cesfwk_innerkits", - "${EVENT_DIR}/kits/native:cesfwk_kits", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", @@ -56,6 +51,8 @@ ohos_shared_library("amsSystemTestC") { "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestD/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestD/BUILD.gn index cfa45adac3aeb2bd149d26df3c08e605cfd06bf4..e5af356eb02b5aaa342b183853299a73d8604e91 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestD/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestD/BUILD.gn @@ -13,7 +13,6 @@ import("//build/ohos.gni") SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestD" SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" -EVENT_DIR = "//base/notification/ces_standard/cesfwk" config("amsSystemTestDConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,8 +25,6 @@ config("amsSystemTestDConfig") { "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/appexecfwk/standard/common/log/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", - "${EVENT_DIR}/innerkits/include", - "${EVENT_DIR}/kits/native/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -43,8 +40,6 @@ ohos_shared_library("amsSystemTestD") { ] configs = [ ":amsSystemTestDConfig" ] deps = [ - "${EVENT_DIR}/innerkits:cesfwk_innerkits", - "${EVENT_DIR}/kits/native:cesfwk_kits", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", @@ -55,6 +50,8 @@ ohos_shared_library("amsSystemTestD") { "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/BUILD.gn index 15cf5a324163a71fcec8f6337b5aed89cfd63412..9c933fd95ebcbfef68ce96ab05dcc202b9d04e15 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestDFX/BUILD.gn @@ -27,8 +27,6 @@ config("amsSystemTestCConfig") { "${aafwk_path}/services/abilitymgr/include", "${appexecfwk_path}/common/log/include", "//foundation/distributedschedule/services/dtbschedmgr/include", - "${even_path}/cesfwk/innerkits/include", - "${even_path}/cesfwk/kits/native/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -52,11 +50,11 @@ ohos_shared_library("amsSystemTestDFX") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/kits:appkit_native", "${appexecfwk_path}/services/bundlemgr:libbms", - "${even_path}/cesfwk/innerkits:cesfwk_innerkits", - "${even_path}/cesfwk/kits/native:cesfwk_kits", "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestE/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestE/BUILD.gn index afeecacd854cce1048628d4cb15c303d63011003..41780838261f309eaff7258ddea9c0cbdfadfe3c 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestE/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestE/BUILD.gn @@ -13,7 +13,6 @@ import("//build/ohos.gni") SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestE" SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" -EVENT_DIR = "//base/notification/ces_standard/cesfwk" config("amsSystemTestEConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,8 +25,6 @@ config("amsSystemTestEConfig") { "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/appexecfwk/standard/common/log/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", - "${EVENT_DIR}/innerkits/include", - "${EVENT_DIR}/kits/native/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -42,8 +39,6 @@ ohos_shared_library("amsSystemTestE") { ] configs = [ ":amsSystemTestEConfig" ] deps = [ - "${EVENT_DIR}/innerkits:cesfwk_innerkits", - "${EVENT_DIR}/kits/native:cesfwk_kits", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", @@ -54,6 +49,8 @@ ohos_shared_library("amsSystemTestE") { "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestF/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestF/BUILD.gn index c6ab3fe5be0066f8ec9edca6307fc984714da5bd..5e524aaade53f854e36a74e59dd0b54a159a2657 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestF/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestF/BUILD.gn @@ -13,7 +13,6 @@ import("//build/ohos.gni") SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestF" SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" -EVENT_DIR = "//base/notification/ces_standard/cesfwk" config("amsSystemTestFConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,8 +25,6 @@ config("amsSystemTestFConfig") { "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/appexecfwk/standard/common/log/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", - "${EVENT_DIR}/innerkits/include", - "${EVENT_DIR}/kits/native/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -44,8 +41,6 @@ ohos_shared_library("amsSystemTestF") { ] configs = [ ":amsSystemTestFConfig" ] deps = [ - "${EVENT_DIR}/innerkits:cesfwk_innerkits", - "${EVENT_DIR}/kits/native:cesfwk_kits", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", @@ -56,6 +51,8 @@ ohos_shared_library("amsSystemTestF") { "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestG/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestG/BUILD.gn index de06ac2cc7c4d44797a43046618a5f66d4822286..7774c08c8c368158a597e98f36d3ff4c77c9e258 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestG/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestG/BUILD.gn @@ -13,7 +13,6 @@ import("//build/ohos.gni") SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestG" SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" -EVENT_DIR = "//base/notification/ces_standard/cesfwk" config("amsSystemTestGConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,8 +25,6 @@ config("amsSystemTestGConfig") { "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/appexecfwk/standard/common/log/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", - "${EVENT_DIR}/innerkits/include", - "${EVENT_DIR}/kits/native/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -43,8 +40,6 @@ ohos_shared_library("amsSystemTestG") { ] configs = [ ":amsSystemTestGConfig" ] deps = [ - "${EVENT_DIR}/innerkits:cesfwk_innerkits", - "${EVENT_DIR}/kits/native:cesfwk_kits", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", @@ -55,6 +50,8 @@ ohos_shared_library("amsSystemTestG") { "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestH/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestH/BUILD.gn index e541d328bf5a360dc89bdd01d7cce3111d102db2..23c0b47df1a3f50d9274ee9d55a78b1281098d42 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestH/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestH/BUILD.gn @@ -13,7 +13,6 @@ import("//build/ohos.gni") SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestH" SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" -EVENT_DIR = "//base/notification/ces_standard/cesfwk" config("amsSystemTestHConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,8 +25,6 @@ config("amsSystemTestHConfig") { "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/appexecfwk/standard/common/log/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", - "${EVENT_DIR}/innerkits/include", - "${EVENT_DIR}/kits/native/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -42,8 +39,6 @@ ohos_shared_library("amsSystemTestH") { ] configs = [ ":amsSystemTestHConfig" ] deps = [ - "${EVENT_DIR}/innerkits:cesfwk_innerkits", - "${EVENT_DIR}/kits/native:cesfwk_kits", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", @@ -54,6 +49,8 @@ ohos_shared_library("amsSystemTestH") { "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestI/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestI/BUILD.gn index e5fd0fb19e6f5568c49e3cda015d9944a3888a83..93d83c87e135cde2602a1c9881a9cbb8f1acddc9 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestI/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestI/BUILD.gn @@ -13,7 +13,6 @@ import("//build/ohos.gni") SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestI" SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" -EVENT_DIR = "//base/notification/ces_standard/cesfwk" config("amsSystemTestIConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,8 +25,6 @@ config("amsSystemTestIConfig") { "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/appexecfwk/standard/common/log/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", - "${EVENT_DIR}/innerkits/include", - "${EVENT_DIR}/kits/native/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -45,8 +42,6 @@ ohos_shared_library("amsSystemTestI") { ] configs = [ ":amsSystemTestIConfig" ] deps = [ - "${EVENT_DIR}/innerkits:cesfwk_innerkits", - "${EVENT_DIR}/kits/native:cesfwk_kits", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", @@ -57,6 +52,8 @@ ohos_shared_library("amsSystemTestI") { "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestM/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestM/BUILD.gn index 3720701cafffdcbdbd0eb251f6b23af148aedd99..7169e15dc40fa8854efa1c5d9e85c334d144f711 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestM/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestM/BUILD.gn @@ -13,7 +13,6 @@ import("//build/ohos.gni") SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestM" SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" -EVENT_DIR = "//base/notification/ces_standard/cesfwk" config("amsSystemTestMConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,8 +25,6 @@ config("amsSystemTestMConfig") { "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/appexecfwk/standard/common/log/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", - "${EVENT_DIR}/innerkits/include", - "${EVENT_DIR}/kits/native/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -42,8 +39,6 @@ ohos_shared_library("amsSystemTestM") { ] configs = [ ":amsSystemTestMConfig" ] deps = [ - "${EVENT_DIR}/innerkits:cesfwk_innerkits", - "${EVENT_DIR}/kits/native:cesfwk_kits", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", @@ -54,6 +49,8 @@ ohos_shared_library("amsSystemTestM") { "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestN/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestN/BUILD.gn index 17dcb530b2c35b77dcdc9056bbc0cbd427287fc6..c11714f5ce4cf4c8ebacf837ba98bb9a2a7cb946 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestN/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestN/BUILD.gn @@ -13,7 +13,6 @@ import("//build/ohos.gni") SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestN" SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" -EVENT_DIR = "//base/notification/ces_standard/cesfwk" config("amsSystemTestNConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,8 +25,6 @@ config("amsSystemTestNConfig") { "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/appexecfwk/standard/common/log/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", - "${EVENT_DIR}/innerkits/include", - "${EVENT_DIR}/kits/native/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -45,8 +42,6 @@ ohos_shared_library("amsSystemTestN") { ] configs = [ ":amsSystemTestNConfig" ] deps = [ - "${EVENT_DIR}/innerkits:cesfwk_innerkits", - "${EVENT_DIR}/kits/native:cesfwk_kits", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", @@ -57,6 +52,8 @@ ohos_shared_library("amsSystemTestN") { "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestO/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestO/BUILD.gn index 363cf86a5bbd837335d2055f15938877b3854910..dd3df12a8b0dad3fb961ecdd6bb181b8d487a42b 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestO/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestO/BUILD.gn @@ -13,7 +13,6 @@ import("//build/ohos.gni") SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestO" SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" -EVENT_DIR = "//base/notification/ces_standard/cesfwk" config("amsSystemTestOConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,8 +25,6 @@ config("amsSystemTestOConfig") { "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/appexecfwk/standard/common/log/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", - "${EVENT_DIR}/innerkits/include", - "${EVENT_DIR}/kits/native/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -42,8 +39,6 @@ ohos_shared_library("amsSystemTestO") { ] configs = [ ":amsSystemTestOConfig" ] deps = [ - "${EVENT_DIR}/innerkits:cesfwk_innerkits", - "${EVENT_DIR}/kits/native:cesfwk_kits", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", @@ -54,6 +49,8 @@ ohos_shared_library("amsSystemTestO") { "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestP/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestP/BUILD.gn index 5998f8eefc037e626b663d33ebaf88a50027bacf..1cd342493356d5ec76e05d7866395a7ed5b43cc9 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestP/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestP/BUILD.gn @@ -13,7 +13,6 @@ import("//build/ohos.gni") SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestP" SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" -EVENT_DIR = "//base/notification/ces_standard/cesfwk" config("amsSystemTestPConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,8 +25,6 @@ config("amsSystemTestPConfig") { "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/appexecfwk/standard/common/log/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", - "${EVENT_DIR}/innerkits/include", - "${EVENT_DIR}/kits/native/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -42,8 +39,6 @@ ohos_shared_library("amsSystemTestP") { ] configs = [ ":amsSystemTestPConfig" ] deps = [ - "${EVENT_DIR}/innerkits:cesfwk_innerkits", - "${EVENT_DIR}/kits/native:cesfwk_kits", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", @@ -54,6 +49,8 @@ ohos_shared_library("amsSystemTestP") { "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestQ/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestQ/BUILD.gn index 15827cfbf25b0a8e121d36189e9f0a3fed8e34a4..713895c4574fdb0e3a9d1ff1ec808f3cf0cf9213 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestQ/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestQ/BUILD.gn @@ -13,7 +13,6 @@ import("//build/ohos.gni") SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestQ" SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" -EVENT_DIR = "//base/notification/ces_standard/cesfwk" config("amsSystemTestQConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,8 +25,6 @@ config("amsSystemTestQConfig") { "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/appexecfwk/standard/common/log/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", - "${EVENT_DIR}/innerkits/include", - "${EVENT_DIR}/kits/native/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -45,8 +42,6 @@ ohos_shared_library("amsSystemTestQ") { ] configs = [ ":amsSystemTestQConfig" ] deps = [ - "${EVENT_DIR}/innerkits:cesfwk_innerkits", - "${EVENT_DIR}/kits/native:cesfwk_kits", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", @@ -57,6 +52,8 @@ ohos_shared_library("amsSystemTestQ") { "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestR/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestR/BUILD.gn index 87b766940a95f23b12a8a8489e6de725e9191706..ee162705375395f7bab6d497dd5039b856cb80db 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestR/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestR/BUILD.gn @@ -13,7 +13,6 @@ import("//build/ohos.gni") SUBDEMOSYSTEM_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/amsSystemTestR" SUBST_TOOLS_DIR = "//foundation/appexecfwk/standard/test/resource/amssystemtestability/abilitySrc/tools" -EVENT_DIR = "//base/notification/ces_standard/cesfwk" config("amsSystemTestRConfig") { visibility = [ ":*" ] include_dirs = [ @@ -26,8 +25,6 @@ config("amsSystemTestRConfig") { "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/appexecfwk/standard/common/log/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", - "${EVENT_DIR}/innerkits/include", - "${EVENT_DIR}/kits/native/include", "${SUBST_TOOLS_DIR}/include", ] defines = [ @@ -45,8 +42,6 @@ ohos_shared_library("amsSystemTestR") { ] configs = [ ":amsSystemTestRConfig" ] deps = [ - "${EVENT_DIR}/innerkits:cesfwk_innerkits", - "${EVENT_DIR}/kits/native:cesfwk_kits", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", @@ -57,6 +52,8 @@ ohos_shared_library("amsSystemTestR") { "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceA/BUILD.gn index ae2adb1ec5207ed071e8e3cf5459630537bd0fc8..8b82e60c477e2e854e272143c8f39ae46802ebaf 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceA/BUILD.gn @@ -26,8 +26,6 @@ config("amsSystemTestCConfig") { "${aafwk_path}/services/abilitymgr/include", "${appexecfwk_path}/common/log/include", "//foundation/distributedschedule/services/dtbschedmgr/include", - "${even_path}/cesfwk/innerkits/include", - "${even_path}/cesfwk/kits/native/include", ] defines = [ "APP_LOG_TAG = \"amsSystemTestServiceA\"", @@ -46,11 +44,11 @@ ohos_shared_library("amsSystemTestServiceA") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/kits:appkit_native", "${appexecfwk_path}/services/bundlemgr:libbms", - "${even_path}/cesfwk/innerkits:cesfwk_innerkits", - "${even_path}/cesfwk/kits/native:cesfwk_kits", "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceB/BUILD.gn index 6a6d6d0c1beecefd3928f3840e9384c3eab362b2..73d83f5a5a21242744834da96a4a5887c877b882 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceB/BUILD.gn @@ -26,8 +26,6 @@ config("amsSystemTestCConfig") { "${aafwk_path}/services/abilitymgr/include", "${appexecfwk_path}/common/log/include", "//foundation/distributedschedule/services/dtbschedmgr/include", - "${even_path}/cesfwk/innerkits/include", - "${even_path}/cesfwk/kits/native/include", ] defines = [ "APP_LOG_TAG = \"amsSystemTestServiceB\"", @@ -49,11 +47,11 @@ ohos_shared_library("amsSystemTestServiceB") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/kits:appkit_native", "${appexecfwk_path}/services/bundlemgr:libbms", - "${even_path}/cesfwk/innerkits:cesfwk_innerkits", - "${even_path}/cesfwk/kits/native:cesfwk_kits", "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceC/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceC/BUILD.gn index 3823d42b3eb070aab493a159b8e058d82372fe3c..8c918f78fd3fb75697dd2a1e6c5fef773d8be0a0 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceC/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceC/BUILD.gn @@ -26,8 +26,6 @@ config("amsSystemTestCConfig") { "${aafwk_path}/services/abilitymgr/include", "${appexecfwk_path}/common/log/include", "//foundation/distributedschedule/services/dtbschedmgr/include", - "${even_path}/cesfwk/innerkits/include", - "${even_path}/cesfwk/kits/native/include", ] defines = [ "APP_LOG_TAG = \"amsSystemTestServiceC\"", @@ -45,11 +43,11 @@ ohos_shared_library("amsSystemTestServiceC") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/kits:appkit_native", "${appexecfwk_path}/services/bundlemgr:libbms", - "${even_path}/cesfwk/innerkits:cesfwk_innerkits", - "${even_path}/cesfwk/kits/native:cesfwk_kits", "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceD/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceD/BUILD.gn index b0dec5959b1190ed9f21ad577fdb82b3c7d1a4d9..8ff0c393022e5d79bbd91e17079ab2f27a0ec794 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceD/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceD/BUILD.gn @@ -26,8 +26,6 @@ config("amsSystemTestCConfig") { "${aafwk_path}/services/abilitymgr/include", "${appexecfwk_path}/common/log/include", "//foundation/distributedschedule/services/dtbschedmgr/include", - "${even_path}/cesfwk/innerkits/include", - "${even_path}/cesfwk/kits/native/include", ] defines = [ "APP_LOG_TAG = \"amsSystemTestServiceD\"", @@ -46,12 +44,12 @@ ohos_shared_library("amsSystemTestServiceD") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/kits:appkit_native", "${appexecfwk_path}/services/bundlemgr:libbms", - "${even_path}/cesfwk/innerkits:cesfwk_innerkits", - "${even_path}/cesfwk/kits/native:cesfwk_kits", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceE/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceE/BUILD.gn index 70a2ed6915612e5fa9b1af4443d71fc64ab20273..916afa438a92b2744deb61398a9d4689acc32992 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceE/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceE/BUILD.gn @@ -26,8 +26,6 @@ config("amsSystemTestCConfig") { "${aafwk_path}/services/abilitymgr/include", "${appexecfwk_path}/common/log/include", "//foundation/distributedschedule/services/dtbschedmgr/include", - "${even_path}/cesfwk/innerkits/include", - "${even_path}/cesfwk/kits/native/include", ] defines = [ "APP_LOG_TAG = \"amsSystemTestServiceE\"", @@ -46,12 +44,12 @@ ohos_shared_library("amsSystemTestServiceE") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/kits:appkit_native", "${appexecfwk_path}/services/bundlemgr:libbms", - "${even_path}/cesfwk/innerkits:cesfwk_innerkits", - "${even_path}/cesfwk/kits/native:cesfwk_kits", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceF/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceF/BUILD.gn index 5107998ad962e6567f36db5c4d65bd525df8a5f4..ab187939ff45692d1cc31a58a2d3f5a93de23349 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceF/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceF/BUILD.gn @@ -26,8 +26,6 @@ config("amsSystemTestCConfig") { "${aafwk_path}/services/abilitymgr/include", "${appexecfwk_path}/common/log/include", "//foundation/distributedschedule/services/dtbschedmgr/include", - "${even_path}/cesfwk/innerkits/include", - "${even_path}/cesfwk/kits/native/include", ] defines = [ "APP_LOG_TAG = \"amsSystemTestServiceF\"", @@ -45,12 +43,12 @@ ohos_shared_library("amsSystemTestServiceF") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/kits:appkit_native", "${appexecfwk_path}/services/bundlemgr:libbms", - "${even_path}/cesfwk/innerkits:cesfwk_innerkits", - "${even_path}/cesfwk/kits/native:cesfwk_kits", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceG/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceG/BUILD.gn index 1620da8c33b36a88f792ee5e0967da9f411bfc67..4f0aaca9fa58591080368f09f877ae4ada7f4802 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceG/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceG/BUILD.gn @@ -26,8 +26,6 @@ config("amsSystemTestCConfig") { "${aafwk_path}/services/abilitymgr/include", "${appexecfwk_path}/common/log/include", "//foundation/distributedschedule/services/dtbschedmgr/include", - "${even_path}/cesfwk/innerkits/include", - "${even_path}/cesfwk/kits/native/include", ] defines = [ "APP_LOG_TAG = \"amsSystemTestServiceG\"", @@ -46,12 +44,12 @@ ohos_shared_library("amsSystemTestServiceG") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/kits:appkit_native", "${appexecfwk_path}/services/bundlemgr:libbms", - "${even_path}/cesfwk/innerkits:cesfwk_innerkits", - "${even_path}/cesfwk/kits/native:cesfwk_kits", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceH/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceH/BUILD.gn index 6901d7a72baf259930f367ff1638bf9d3a5b8a83..0974c7d7d5a8f0ca0c551d84244d81152de986dc 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceH/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsSystemTestServiceH/BUILD.gn @@ -26,8 +26,6 @@ config("amsSystemTestCConfig") { "${aafwk_path}/services/abilitymgr/include", "${appexecfwk_path}/common/log/include", "//foundation/distributedschedule/services/dtbschedmgr/include", - "${even_path}/cesfwk/innerkits/include", - "${even_path}/cesfwk/kits/native/include", ] defines = [ "APP_LOG_TAG = \"amsSystemTestServiceH\"", @@ -46,12 +44,12 @@ ohos_shared_library("amsSystemTestServiceH") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/kits:appkit_native", "${appexecfwk_path}/services/bundlemgr:libbms", - "${even_path}/cesfwk/innerkits:cesfwk_innerkits", - "${even_path}/cesfwk/kits/native:cesfwk_kits", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/common/ability_append_test_info.h b/test/resource/amssystemtestability/abilitySrc/common/ability_append_test_info.h new file mode 100644 index 0000000000000000000000000000000000000000..639bed97d3927af44c6ff496a07dadb41d6f9e18 --- /dev/null +++ b/test/resource/amssystemtestability/abilitySrc/common/ability_append_test_info.h @@ -0,0 +1,57 @@ +/* + * 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. + */ + +#ifndef ABILITY_APPEND_TEST_INFO_H +#define ABILITY_APPEND_TEST_INFO_H + +namespace OHOS { +namespace AppExecFwk { +const std::string g_EVENT_REQU_FIRST = "requ_com_ohos_amsst_appkit_first"; +const std::string g_EVENT_RESP_FIRST = "resp_com_ohos_amsst_appkit_first"; +const std::string g_EVENT_RESP_FIRST_LIFECYCLE = "resp_com_ohos_amsst_appkit_first_lifecycle"; + +const std::string g_EVENT_REQU_FIRSTB = "requ_com_ohos_amsst_appkit_firstb"; +const std::string g_EVENT_RESP_FIRSTB = "resp_com_ohos_amsst_appkit_firstb"; +const std::string g_EVENT_RESP_FIRSTB_LIFECYCLE = "resp_com_ohos_amsst_appkit_firstb_lifecycle"; + +const std::string g_EVENT_REQU_SECOND = "requ_com_ohos_amsst_appkit_second"; +const std::string g_EVENT_RESP_SECOND = "resp_com_ohos_amsst_appkit_second"; +const std::string g_EVENT_RESP_SECOND_LIFECYCLE = "resp_com_ohos_amsst_appkit_second_lifecycle"; + +const int MAIN_ABILITY_A_CODE = 100; +const int SECOND_ABILITY_A_CODE = 200; +const int MAIN_ABILITY_B_CODE = 300; + +enum class AppendApi { + OnSetCaller, + TerminateAndRemoveMisson, + GetString, + GetStringArray, + GetIntArray, + GetPattern, + GetColor, + TerminateAbilityResult, + GetDispalyOrientation, + GetPreferencesDir, + StartAbilities, + GetColorMode, + SetColorMode, + IsFirstInMission, + End +}; + +} // namespace AppExecFwk +} // namespace OHOS +#endif // ABILITY_APPEND_TEST_INFO_H \ No newline at end of file diff --git a/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/BUILD.gn index 5dbcd0c624ecdb02441c969eeb9a90efa458d3e4..ef9b7a1b1e7fe51dd290d10628b9812e21b4dd6a 100644 --- a/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") -EVENT_DIR = "//base/notification/ces_standard/cesfwk" SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA" SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" @@ -28,7 +27,6 @@ config("taskDispatcherTestAConfig") { "${aafwk_path}/services/abilitymgr/include", "${common_path}/log/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", - "${EVENT_DIR}/kits/native/include", "${SUBST_TOOLS_DIR}/include", "//foundation/appexecfwk/standard/test/systemtest/common/task_dispatcher/include", @@ -54,7 +52,6 @@ ohos_shared_library("taskDispatcherTestA") { "//foundation/appexecfwk/standard/test/systemtest/common/task_dispatcher:system_test_task_dispatcher_config", ] deps = [ - "${EVENT_DIR}/kits/native:cesfwk_kits", "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", "${aafwk_path}/interfaces/innerkits/want:want", @@ -67,6 +64,7 @@ ohos_shared_library("taskDispatcherTestA") { "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestB/BUILD.gn index 763613f0dc08c0a35e94f7c9abc401d385270adb..f5a8a5243f2bc20c85f5d918b383a42d515564a0 100644 --- a/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestB/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/ohos.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") -EVENT_DIR = "//base/notification/ces_standard/cesfwk" SUBDEMOSYSTEM_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestB" SUBST_TOOLS_DIR = "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/tools" @@ -28,7 +27,6 @@ config("taskDispatcherTestBConfig") { "${aafwk_path}/services/abilitymgr/include", "${common_path}/log/include", "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", - "${EVENT_DIR}/kits/native/include", "${SUBST_TOOLS_DIR}/include", "//foundation/appexecfwk/standard/test/systemtest/common/task_dispatcher/include", @@ -54,7 +52,6 @@ ohos_shared_library("taskDispatcherTestB") { "//foundation/appexecfwk/standard/test/systemtest/common/task_dispatcher:system_test_task_dispatcher_config", ] deps = [ - "${EVENT_DIR}/kits/native:cesfwk_kits", "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", "${aafwk_path}/interfaces/innerkits/want:want", @@ -67,6 +64,7 @@ ohos_shared_library("taskDispatcherTestB") { "//utils/native/base:utilsbase", ] external_deps = [ + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/systemtest/common/ams/BUILD.gn b/test/systemtest/common/ams/BUILD.gn index 3fe027c89584efc7120a6fb66095870f73bdf210..b8671e39ca3b89315ce652b4cf74df3e1302dc10 100755 --- a/test/systemtest/common/ams/BUILD.gn +++ b/test/systemtest/common/ams/BUILD.gn @@ -31,6 +31,7 @@ group("systemtest") { deps = [ "ams_aa_command_test:systemtest", + "ams_ability_append_test:systemtest", "ams_app_process_manage_test:systemtest", "ams_data_ability_test:systemtest", "ams_dfx_test:systemtest", diff --git a/test/systemtest/common/ams/ams_aa_command_test/BUILD.gn b/test/systemtest/common/ams/ams_aa_command_test/BUILD.gn index d144275b180e83abe7b43bb18ce85b4c711974e3..684690e1739fb1fb0b064855c1a9e4b500f875ce 100644 --- a/test/systemtest/common/ams/ams_aa_command_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_aa_command_test/BUILD.gn @@ -13,7 +13,6 @@ import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") -EVENT_DIR = "//base/notification/ces_standard/cesfwk" module_output_path = "appexecfwk_standard/ams" ohos_systemtest("ams_aa_command_test") { @@ -24,8 +23,6 @@ ohos_systemtest("ams_aa_command_test") { "//foundation/aafwk/standard/tools/aa/include", "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", "//foundation/distributedschedule/safwk/services/safwk/include", - "${EVENT_DIR}/innerkits/include", - "${EVENT_DIR}/kits/native/include", ] sources = [ @@ -45,8 +42,6 @@ ohos_systemtest("ams_aa_command_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "${EVENT_DIR}/innerkits:cesfwk_innerkits", - "${EVENT_DIR}/kits/native:cesfwk_kits", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/aafwk/standard/services/abilitymgr:abilityms", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", @@ -58,6 +53,8 @@ ohos_systemtest("ams_aa_command_test") { ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/systemtest/common/ams/ams_ability_append_test/BUILD.gn b/test/systemtest/common/ams/ams_ability_append_test/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..24e24e606804ac50264b9179273bb7040989db80 --- /dev/null +++ b/test/systemtest/common/ams/ams_ability_append_test/BUILD.gn @@ -0,0 +1,65 @@ +# 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/test.gni") +import("//foundation/appexecfwk/standard/appexecfwk.gni") +module_output_path = "appexecfwk_standard/ams" + +ohos_systemtest("ams_ability_append_test") { + module_out_path = module_output_path + + include_dirs = [ + "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common/", + "//foundation/distributedschedule/safwk/services/safwk/include", + "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", + ] + + sources = [ + "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/event.cpp", + "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/module_test_dump_util.cpp", + "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/stoperator.cpp", + "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/src/system_test_ability_util.cpp", + "ams_ability_append_test.cpp", + ] + + configs = [ + "${aafwk_path}/services/abilitymgr:abilityms_config", + "${appexecfwk_path}/services/appmgr:appmgr_config", + ] + cflags = [] + if (target_cpu == "arm") { + cflags += [ "-DBINDER_IPC_32BIT" ] + } + deps = [ + "${aafwk_path}/interfaces/innerkits/want:want", + "${aafwk_path}/services/abilitymgr:abilityms", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "//third_party/googletest:gtest_main", + "//utils/native/base:utils", + ] + + external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + ] +} + +group("systemtest") { + testonly = true + + deps = [ ":ams_ability_append_test" ] +} diff --git a/test/systemtest/common/ams/ams_ability_append_test/ams_ability_append_test.cpp b/test/systemtest/common/ams/ams_ability_append_test/ams_ability_append_test.cpp new file mode 100644 index 0000000000000000000000000000000000000000..6ade3e98f6368768222bafdd4a3022f9ac4df9ef --- /dev/null +++ b/test/systemtest/common/ams/ams_ability_append_test/ams_ability_append_test.cpp @@ -0,0 +1,444 @@ +/* + * 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. + */ +#include +#include +#include +#include +#include +#include +#include +#include + +#include "ability_append_test_info.h" +#include "ability_lifecycle.h" +#include "ability_lifecycle_executor.h" +#include "ability_manager_errors.h" +#include "ability_manager_service.h" +#include "app_mgr_service.h" +#include "common_event.h" +#include "common_event_manager.h" +#include "event.h" +#include "hilog_wrapper.h" +#include "module_test_dump_util.h" +#include "sa_mgr_client.h" +#include "semaphore_ex.h" +#include "skills.h" +#include "stoperator.h" +#include "system_ability_definition.h" +#include "system_test_ability_util.h" +#include "uri.h" +namespace { +using namespace OHOS; +using namespace OHOS::AAFwk; +using namespace OHOS::AppExecFwk; +using namespace OHOS::EventFwk; +using namespace OHOS::MTUtil; +using namespace OHOS::STtools; +using namespace OHOS::STABUtil; +using namespace testing::ext; + +using MAP_STR_STR = std::map; +static const string KIT_BUNDLE_NAME = "com.ohos.amsst.AppAppend"; +static const string KIT_HAP_NAME = "amsAbilityAppendTest"; +static const string FIRST_ABILITY_NAME = "MainAbility"; +static const string SECOND_ABILITY_NAME = "SecondAbility"; +static const string THIRD_ABILITY_NAME = "MainAbility"; +static constexpr int WAIT_TIME = 1; + +static string g_eventMessage = ""; +class AmsAbilityAppendTest : public testing::Test { +public: + static void SetUpTestCase(void); + static void TearDownTestCase(void); + void SetUp(); + void TearDown(); + + static void Reinstall(const std::string &hapName, const std::string &bundleName); + void ResetSystem() const; + static bool SubscribeEvent(); + static int TestWaitCompleted(Event &event, const std::string &eventName, const int code, const int timeout = 10); + static void TestCompleted(Event &event, const std::string &eventName, const int code); + + class AppEventSubscriber : public CommonEventSubscriber { + public: + explicit AppEventSubscriber(const CommonEventSubscribeInfo &sp) : CommonEventSubscriber(sp){}; + virtual void OnReceiveEvent(const CommonEventData &data) override; + ~AppEventSubscriber(){}; + }; + + static sptr g_abilityMs; + static Event event; +}; + +Event AmsAbilityAppendTest::event = Event(); +sptr AmsAbilityAppendTest::g_abilityMs = nullptr; + +void AmsAbilityAppendTest::AppEventSubscriber::OnReceiveEvent(const CommonEventData &data) +{ + GTEST_LOG_(INFO) << "OnReceiveEvent: event=" << data.GetWant().GetAction(); + GTEST_LOG_(INFO) << "OnReceiveEvent: data=" << data.GetData(); + GTEST_LOG_(INFO) << "OnReceiveEvent: code=" << data.GetCode(); + if (data.GetWant().GetAction() == g_EVENT_RESP_FIRST_LIFECYCLE || + data.GetWant().GetAction() == g_EVENT_RESP_FIRSTB_LIFECYCLE || + data.GetWant().GetAction() == g_EVENT_RESP_SECOND_LIFECYCLE) { + TestCompleted(event, data.GetData(), data.GetCode()); + } else if (data.GetWant().GetAction() == g_EVENT_RESP_FIRST || data.GetWant().GetAction() == g_EVENT_RESP_FIRSTB || + data.GetWant().GetAction() == g_EVENT_RESP_SECOND) { + g_eventMessage = data.GetData(); + TestCompleted(event, data.GetWant().GetAction(), data.GetCode()); + GTEST_LOG_(INFO) << "OnReceiveEvent: g_eventMessage=" << data.GetData(); + } +} + +int AmsAbilityAppendTest::TestWaitCompleted( + Event &event, const std::string &eventName, const int code, const int timeout) +{ + GTEST_LOG_(INFO) << "TestWaitCompleted : " << eventName << " " << code; + return STAbilityUtil::WaitCompleted(event, eventName, code, timeout); +} + +void AmsAbilityAppendTest::TestCompleted(Event &event, const std::string &eventName, const int code) +{ + GTEST_LOG_(INFO) << "TestCompleted : " << eventName << " " << code; + return STAbilityUtil::Completed(event, eventName, code); +} + +void AmsAbilityAppendTest::SetUpTestCase(void) +{ + if (!SubscribeEvent()) { + GTEST_LOG_(INFO) << "SubscribeEvent error"; + } +} + +void AmsAbilityAppendTest::TearDownTestCase(void) +{} + +static int CODE_ = 0; +void AmsAbilityAppendTest::SetUp(void) +{ + ResetSystem(); + STAbilityUtil::Install(KIT_HAP_NAME + "A"); + STAbilityUtil::Install(KIT_HAP_NAME + "B"); + STAbilityUtil::CleanMsg(event); + + CODE_++; +} + +void AmsAbilityAppendTest::TearDown(void) +{ + STAbilityUtil::Uninstall(KIT_BUNDLE_NAME + "A"); + STAbilityUtil::Uninstall(KIT_BUNDLE_NAME + "B"); + // sleep(2); + STAbilityUtil::CleanMsg(event); +} + +bool AmsAbilityAppendTest::SubscribeEvent() +{ + std::vector eventList = {g_EVENT_RESP_FIRST_LIFECYCLE, + g_EVENT_RESP_SECOND_LIFECYCLE, + g_EVENT_RESP_FIRSTB_LIFECYCLE, + g_EVENT_RESP_FIRST, + g_EVENT_RESP_SECOND, + g_EVENT_RESP_FIRSTB}; + MatchingSkills matchingSkills; + for (const auto &e : eventList) { + matchingSkills.AddEvent(e); + } + CommonEventSubscribeInfo subscribeInfo(matchingSkills); + subscribeInfo.SetPriority(1); + auto subscriber = std::make_shared(subscribeInfo); + return CommonEventManager::SubscribeCommonEvent(subscriber); +} + +void AmsAbilityAppendTest::Reinstall(const std::string &hapName, const std::string &bundleName) +{ + STAbilityUtil::Uninstall(bundleName); + STAbilityUtil::Install(hapName); +} + +void AmsAbilityAppendTest::ResetSystem() const +{ + GTEST_LOG_(INFO) << "ResetSystem"; +} + +/** + * @tc.number : AMS_Ability_Append_00100 + * @tc.name : test OnSetCaller in ability.h + * @tc.desc : Verify that the result of OnSetCaller function is correct. + */ +HWTEST_F(AmsAbilityAppendTest, AMS_Ability_Append_00100, Function | MediumTest | Level1) +{ + GTEST_LOG_(INFO) << "AmsAbilityAppendTest AMS_Ability_Append_00100 start"; + MAP_STR_STR params; + Want want = STAbilityUtil::MakeWant("device", FIRST_ABILITY_NAME, KIT_BUNDLE_NAME + "A", params); + // start first ability + ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME); + GTEST_LOG_(INFO) << eCode; + + EXPECT_EQ(TestWaitCompleted(event, "onStart", MAIN_ABILITY_A_CODE), 0); + EXPECT_EQ(TestWaitCompleted(event, "OnActive", MAIN_ABILITY_A_CODE), 0); + + STAbilityUtil::CleanMsg(event); + STAbilityUtil::PublishEvent( + g_EVENT_REQU_FIRST, CODE_, "Ability_" + std::to_string((int)AppendApi::OnSetCaller) + "_0"); + EXPECT_EQ(TestWaitCompleted(event, g_EVENT_RESP_FIRST, CODE_), 0); + string appInfo = g_eventMessage; + + GTEST_LOG_(INFO) << appInfo; + EXPECT_EQ(appInfo, "1"); + GTEST_LOG_(INFO) << "AmsAbilityAppendTest AMS_Ability_Append_00100 end"; +} + +/** + * @tc.number : AMS_Ability_Append_00200 + * @tc.name : test TerminateAndRemoveMisson in ability.h + * @tc.desc : Verify that the result of TerminateAndRemoveMisson function is correct. + */ +HWTEST_F(AmsAbilityAppendTest, AMS_Ability_Append_00200, Function | MediumTest | Level1) +{ + GTEST_LOG_(INFO) << "AmsAbilityAppendTest AMS_Ability_Append_00200 start"; + MAP_STR_STR params; + Want wantFirst = STAbilityUtil::MakeWant("device", FIRST_ABILITY_NAME, KIT_BUNDLE_NAME + "A", params); + // start first ability + ErrCode eCode = STAbilityUtil::StartAbility(wantFirst, g_abilityMs, WAIT_TIME); + GTEST_LOG_(INFO) << eCode; + EXPECT_EQ(TestWaitCompleted(event, "onStart", MAIN_ABILITY_A_CODE), 0); + EXPECT_EQ(TestWaitCompleted(event, "OnActive", MAIN_ABILITY_A_CODE), 0); + + auto abilityMs = STAbilityUtil::GetAbilityManagerService(); + Want wantEntity; + wantEntity.AddEntity(Want::FLAG_HOME_INTENT_FROM_SYSTEM); + STAbilityUtil::StartAbility(wantEntity, abilityMs); + + sleep(5); + Want wantSecond = STAbilityUtil::MakeWant("device", THIRD_ABILITY_NAME, KIT_BUNDLE_NAME + "B", params); + // start first ability + eCode = STAbilityUtil::StartAbility(wantSecond, g_abilityMs, WAIT_TIME); + GTEST_LOG_(INFO) << eCode; + EXPECT_EQ(TestWaitCompleted(event, "onStart", MAIN_ABILITY_B_CODE), 0); + EXPECT_EQ(TestWaitCompleted(event, "OnActive", MAIN_ABILITY_B_CODE), 0); + + EXPECT_EQ(TestWaitCompleted(event, "OnBackground", MAIN_ABILITY_A_CODE), 0); + STAbilityUtil::PublishEvent( + g_EVENT_REQU_FIRST, CODE_, "Ability_" + std::to_string((int)AppendApi::TerminateAndRemoveMisson) + "_0"); + EXPECT_EQ(TestWaitCompleted(event, g_EVENT_RESP_FIRST, CODE_), 0); + string appInfo = g_eventMessage; + GTEST_LOG_(INFO) << appInfo; + EXPECT_EQ(appInfo, "1"); + EXPECT_EQ(TestWaitCompleted(event, "OnStop", MAIN_ABILITY_A_CODE), 0); + STAbilityUtil::CleanMsg(event); + GTEST_LOG_(INFO) << "AmsAbilityAppendTest AMS_Ability_Append_00200 end"; +} + +/** + * @tc.number : AMS_Ability_Append_00300 + * @tc.name : test TerminateAbilityResult in ability.h + * @tc.desc : Verify that the result of TerminateAbilityResult function is correct. + */ +HWTEST_F(AmsAbilityAppendTest, AMS_Ability_Append_00300, Function | MediumTest | Level1) +{ + GTEST_LOG_(INFO) << "AmsAbilityAppendTest AMS_Ability_Append_00300 start"; + MAP_STR_STR params; + Want want = STAbilityUtil::MakeWant("device", SECOND_ABILITY_NAME, KIT_BUNDLE_NAME + "A", params); + // start first ability + ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME); + GTEST_LOG_(INFO) << eCode; + + EXPECT_EQ(TestWaitCompleted(event, "onStart", SECOND_ABILITY_A_CODE), 0); + EXPECT_EQ(TestWaitCompleted(event, "OnActive", SECOND_ABILITY_A_CODE), 0); + + STAbilityUtil::CleanMsg(event); + STAbilityUtil::PublishEvent( + g_EVENT_REQU_SECOND, CODE_, "Ability_" + std::to_string((int)AppendApi::TerminateAbilityResult) + "_0"); + EXPECT_EQ(TestWaitCompleted(event, g_EVENT_RESP_SECOND, CODE_), 0); + string appInfo = g_eventMessage; + + GTEST_LOG_(INFO) << appInfo; + EXPECT_EQ(appInfo, "1"); + EXPECT_EQ(TestWaitCompleted(event, "OnStop", SECOND_ABILITY_A_CODE), 0); + GTEST_LOG_(INFO) << "AmsAbilityAppendTest AMS_Ability_Append_00300 end"; +} + +/** + * @tc.number : AMS_Ability_Append_00400 + * @tc.name : test GetDispalyOrientation in ability.h + * @tc.desc : Verify that the result of GetDispalyOrientation function is correct. + */ +HWTEST_F(AmsAbilityAppendTest, AMS_Ability_Append_00400, Function | MediumTest | Level1) +{ + GTEST_LOG_(INFO) << "AmsAbilityAppendTest AMS_Ability_Append_00400 start"; + MAP_STR_STR params; + Want want = STAbilityUtil::MakeWant("device", FIRST_ABILITY_NAME, KIT_BUNDLE_NAME + "A", params); + // start first ability + ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME); + GTEST_LOG_(INFO) << eCode; + + EXPECT_EQ(TestWaitCompleted(event, "onStart", MAIN_ABILITY_A_CODE), 0); + EXPECT_EQ(TestWaitCompleted(event, "OnActive", MAIN_ABILITY_A_CODE), 0); + + STAbilityUtil::CleanMsg(event); + STAbilityUtil::PublishEvent( + g_EVENT_REQU_FIRST, CODE_, "Ability_" + std::to_string((int)AppendApi::GetDispalyOrientation) + "_0"); + EXPECT_EQ(TestWaitCompleted(event, g_EVENT_RESP_FIRST, CODE_), 0); + string appInfo = g_eventMessage; + + GTEST_LOG_(INFO) << appInfo; + EXPECT_EQ(appInfo, "1"); + GTEST_LOG_(INFO) << "AmsAbilityAppendTest AMS_Ability_Append_00400 end"; +} + +/** + * @tc.number : AMS_Ability_Append_00500 + * @tc.name : test GetPreferencesDir in ability.h + * @tc.desc : Verify that the result of GetPreferencesDir function is correct. + */ +HWTEST_F(AmsAbilityAppendTest, AMS_Ability_Append_00500, Function | MediumTest | Level1) +{ + GTEST_LOG_(INFO) << "AmsAbilityAppendTest AMS_Ability_Append_00500 start"; + MAP_STR_STR params; + Want want = STAbilityUtil::MakeWant("device", FIRST_ABILITY_NAME, KIT_BUNDLE_NAME + "A", params); + // start first ability + ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME); + GTEST_LOG_(INFO) << eCode; + + EXPECT_EQ(TestWaitCompleted(event, "onStart", MAIN_ABILITY_A_CODE), 0); + EXPECT_EQ(TestWaitCompleted(event, "OnActive", MAIN_ABILITY_A_CODE), 0); + + STAbilityUtil::CleanMsg(event); + STAbilityUtil::PublishEvent( + g_EVENT_REQU_FIRST, CODE_, "Ability_" + std::to_string((int)AppendApi::GetPreferencesDir) + "_0"); + EXPECT_EQ(TestWaitCompleted(event, g_EVENT_RESP_FIRST, CODE_), 0); + string appInfo = g_eventMessage; + + GTEST_LOG_(INFO) << appInfo; + EXPECT_EQ(appInfo, "1"); + GTEST_LOG_(INFO) << "AmsAbilityAppendTest AMS_Ability_Append_00500 end"; +} + +/** + * @tc.number : AMS_Ability_Append_00600 + * @tc.name : test StartAbilities in ability.h + * @tc.desc : Verify that the result of StartAbilities function is correct. + */ +HWTEST_F(AmsAbilityAppendTest, AMS_Ability_Append_00600, Function | MediumTest | Level1) +{ + GTEST_LOG_(INFO) << "AmsAbilityAppendTest AMS_Ability_Append_00600 start"; + MAP_STR_STR params; + Want want = STAbilityUtil::MakeWant("device", FIRST_ABILITY_NAME, KIT_BUNDLE_NAME + "A", params); + // start first ability + ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME); + GTEST_LOG_(INFO) << eCode; + + EXPECT_EQ(TestWaitCompleted(event, "onStart", MAIN_ABILITY_A_CODE), 0); + EXPECT_EQ(TestWaitCompleted(event, "OnActive", MAIN_ABILITY_A_CODE), 0); + + STAbilityUtil::CleanMsg(event); + STAbilityUtil::PublishEvent( + g_EVENT_REQU_FIRST, CODE_, "Ability_" + std::to_string((int)AppendApi::StartAbilities) + "_0"); + EXPECT_EQ(TestWaitCompleted(event, g_EVENT_RESP_FIRST, CODE_), 0); + string appInfo = g_eventMessage; + GTEST_LOG_(INFO) << appInfo; + EXPECT_EQ(appInfo, "1"); + EXPECT_EQ(TestWaitCompleted(event, "onStart", SECOND_ABILITY_A_CODE), 0); + EXPECT_EQ(TestWaitCompleted(event, "OnActive", SECOND_ABILITY_A_CODE), 0); + EXPECT_EQ(TestWaitCompleted(event, "onStart", MAIN_ABILITY_B_CODE), 0); + EXPECT_EQ(TestWaitCompleted(event, "OnActive", MAIN_ABILITY_B_CODE), 0); + GTEST_LOG_(INFO) << "AmsAbilityAppendTest AMS_Ability_Append_00600 end"; +} + +/** + * @tc.number : AMS_Ability_Append_00700 + * @tc.name : test GetColorMode in ability.h + * @tc.desc : Verify that the result of GetColorMode function is correct. + */ +HWTEST_F(AmsAbilityAppendTest, AMS_Ability_Append_00700, Function | MediumTest | Level1) +{ + GTEST_LOG_(INFO) << "AmsAbilityAppendTest AMS_Ability_Append_00700 start"; + MAP_STR_STR params; + Want want = STAbilityUtil::MakeWant("device", FIRST_ABILITY_NAME, KIT_BUNDLE_NAME + "A", params); + // start first ability + ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME); + GTEST_LOG_(INFO) << eCode; + + EXPECT_EQ(TestWaitCompleted(event, "onStart", MAIN_ABILITY_A_CODE), 0); + EXPECT_EQ(TestWaitCompleted(event, "OnActive", MAIN_ABILITY_A_CODE), 0); + + STAbilityUtil::CleanMsg(event); + STAbilityUtil::PublishEvent( + g_EVENT_REQU_FIRST, CODE_, "Ability_" + std::to_string((int)AppendApi::GetColorMode) + "_0"); + EXPECT_EQ(TestWaitCompleted(event, g_EVENT_RESP_FIRST, CODE_), 0); + string appInfo = g_eventMessage; + + GTEST_LOG_(INFO) << appInfo; + EXPECT_EQ(appInfo, "1"); + GTEST_LOG_(INFO) << "AmsAbilityAppendTest AMS_Ability_Append_00700 end"; +} + +/** + * @tc.number : AMS_Ability_Append_00800 + * @tc.name : test SetColorMode in ability.h + * @tc.desc : Verify that the result of SetColorMode function is correct. + */ +HWTEST_F(AmsAbilityAppendTest, AMS_Ability_Append_00800, Function | MediumTest | Level1) +{ + GTEST_LOG_(INFO) << "AmsAbilityAppendTest AMS_Ability_Append_00800 start"; + MAP_STR_STR params; + Want want = STAbilityUtil::MakeWant("device", FIRST_ABILITY_NAME, KIT_BUNDLE_NAME + "A", params); + // start first ability + ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME); + GTEST_LOG_(INFO) << eCode; + + EXPECT_EQ(TestWaitCompleted(event, "onStart", MAIN_ABILITY_A_CODE), 0); + EXPECT_EQ(TestWaitCompleted(event, "OnActive", MAIN_ABILITY_A_CODE), 0); + + STAbilityUtil::CleanMsg(event); + STAbilityUtil::PublishEvent( + g_EVENT_REQU_FIRST, CODE_, "Ability_" + std::to_string((int)AppendApi::SetColorMode) + "_0"); + EXPECT_EQ(TestWaitCompleted(event, g_EVENT_RESP_FIRST, CODE_), 0); + string appInfo = g_eventMessage; + + GTEST_LOG_(INFO) << appInfo; + EXPECT_EQ(appInfo, "1"); + GTEST_LOG_(INFO) << "AmsAbilityAppendTest AMS_Ability_Append_00800 end"; +} + +/** + * @tc.number : AMS_Ability_Append_00900 + * @tc.name : test IsFirstInMission in ability.h + * @tc.desc : Verify that the result of IsFirstInMission function is correct. + */ +HWTEST_F(AmsAbilityAppendTest, AMS_Ability_Append_00900, Function | MediumTest | Level1) +{ + GTEST_LOG_(INFO) << "AmsAbilityAppendTest AMS_Ability_Append_00900 start"; + MAP_STR_STR params; + Want want = STAbilityUtil::MakeWant("device", FIRST_ABILITY_NAME, KIT_BUNDLE_NAME + "A", params); + // start first ability + ErrCode eCode = STAbilityUtil::StartAbility(want, g_abilityMs, WAIT_TIME); + GTEST_LOG_(INFO) << eCode; + + EXPECT_EQ(TestWaitCompleted(event, "onStart", MAIN_ABILITY_A_CODE), 0); + EXPECT_EQ(TestWaitCompleted(event, "OnActive", MAIN_ABILITY_A_CODE), 0); + + STAbilityUtil::CleanMsg(event); + STAbilityUtil::PublishEvent( + g_EVENT_REQU_FIRST, CODE_, "Ability_" + std::to_string((int)AppendApi::IsFirstInMission) + "_0"); + EXPECT_EQ(TestWaitCompleted(event, g_EVENT_RESP_FIRST, CODE_), 0); + string appInfo = g_eventMessage; + + GTEST_LOG_(INFO) << appInfo; + EXPECT_EQ(appInfo, "1"); + GTEST_LOG_(INFO) << "AmsAbilityAppendTest AMS_Ability_Append_00900 end"; +} +} // namespace \ No newline at end of file diff --git a/test/systemtest/common/ams/ams_app_process_manage_test/BUILD.gn b/test/systemtest/common/ams/ams_app_process_manage_test/BUILD.gn index bfa0c5c7b06862b11b06a4497b0eb18046b775ad..a305d3cc51b70ab0030d8e2b2c6b57d60ef1dd7c 100644 --- a/test/systemtest/common/ams/ams_app_process_manage_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_app_process_manage_test/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") -EVENT_DIR = "//base/notification/ces_standard/cesfwk" module_output_path = "appexecfwk_standard/ams" ohos_systemtest("ams_app_process_manage_test") { @@ -20,8 +19,6 @@ ohos_systemtest("ams_app_process_manage_test") { include_dirs = [ "//foundation/distributedschedule/safwk/services/safwk/include", - "${EVENT_DIR}/innerkits/include", - "${EVENT_DIR}/kits/native/include", "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common", "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", ] @@ -43,8 +40,6 @@ ohos_systemtest("ams_app_process_manage_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "${EVENT_DIR}/innerkits:cesfwk_innerkits", - "${EVENT_DIR}/kits/native:cesfwk_kits", "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", @@ -56,6 +51,8 @@ ohos_systemtest("ams_app_process_manage_test") { ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/systemtest/common/ams/ams_data_ability_test/BUILD.gn b/test/systemtest/common/ams/ams_data_ability_test/BUILD.gn index daadf45e93f015d2aa3348ed46834a565f4129d7..1688797f5ea89dfe8170940e25b772315ab27fe9 100644 --- a/test/systemtest/common/ams/ams_data_ability_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_data_ability_test/BUILD.gn @@ -9,12 +9,11 @@ # 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. +# limitations under the License. import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") -EVENT_DIR = "//base/notification/ces_standard/cesfwk" module_output_path = "appexecfwk_standard/ams" ohos_systemtest("ams_data_ability_test") { @@ -22,8 +21,6 @@ ohos_systemtest("ams_data_ability_test") { include_dirs = [ "//foundation/distributedschedule/safwk/services/safwk/include", - "${EVENT_DIR}/innerkits/include", - "${EVENT_DIR}/kits/native/include", "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", ] @@ -44,8 +41,6 @@ ohos_systemtest("ams_data_ability_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "${EVENT_DIR}/innerkits:cesfwk_innerkits", - "${EVENT_DIR}/kits/native:cesfwk_kits", "${aafwk_path}/frameworks/kits/ability/native:dummy_classes", "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", @@ -59,6 +54,8 @@ ohos_systemtest("ams_data_ability_test") { ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/systemtest/common/ams/ams_dfx_test/BUILD.gn b/test/systemtest/common/ams/ams_dfx_test/BUILD.gn index fe281609ada7dd8de727957ed84323e93994f664..15748cce11f5fccbd6840830bdb772bcc2742816 100644 --- a/test/systemtest/common/ams/ams_dfx_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_dfx_test/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") -EVENT_DIR = "//base/notification/ces_standard/cesfwk" module_output_path = "appexecfwk_standard/ams" ohos_systemtest("ams_dfx_test") { @@ -20,8 +19,6 @@ ohos_systemtest("ams_dfx_test") { include_dirs = [ "//foundation/distributedschedule/safwk/services/safwk/include", - "${EVENT_DIR}/innerkits/include", - "${EVENT_DIR}/kits/native/include", "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common", "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", ] @@ -43,8 +40,6 @@ ohos_systemtest("ams_dfx_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "${EVENT_DIR}/innerkits:cesfwk_innerkits", - "${EVENT_DIR}/kits/native:cesfwk_kits", "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", @@ -56,6 +51,8 @@ ohos_systemtest("ams_dfx_test") { ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/systemtest/common/ams/ams_dfx_test/ams_dfx_test.cpp b/test/systemtest/common/ams/ams_dfx_test/ams_dfx_test.cpp index b4de0bf4ae67bbb8170a7a2e5a300126ec8d02eb..64cba34fe8aee241291d8a6304b4787bb16aacae 100644 --- a/test/systemtest/common/ams/ams_dfx_test/ams_dfx_test.cpp +++ b/test/systemtest/common/ams/ams_dfx_test/ams_dfx_test.cpp @@ -436,6 +436,7 @@ HWTEST_F(AmsDFXTest, AMS_DFX_0200, TestSize.Level1) */ HWTEST_F(AmsDFXTest, AMS_DFX_0300, TestSize.Level1) { + std::this_thread::sleep_for(std::chrono::milliseconds(5000)); GTEST_LOG_(INFO) << "AmsDFXTest AMS_DFX_0300 start"; std::string bundleName = bundleNameBase + "R"; std::string abilityName = abilityNameBase + "R1"; diff --git a/test/systemtest/common/ams/ams_kit_test/BUILD.gn b/test/systemtest/common/ams/ams_kit_test/BUILD.gn index bb55c2e7d3fd709905d4ea2e706261dd91e1e82d..0758fd398b5c128d58b3b20275005bdf73608b9d 100644 --- a/test/systemtest/common/ams/ams_kit_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_kit_test/BUILD.gn @@ -13,17 +13,12 @@ import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") -event_cesfwk_path = "//base/notification/ces_standard/cesfwk" -event_cesfwk_kits_path = "${event_cesfwk_path}/kits" -event_cesfwk_innerkits_path = "${event_cesfwk_path}/innerkits" module_output_path = "appexecfwk_standard/ams" ohos_systemtest("ams_kit_test") { module_out_path = module_output_path include_dirs = [ "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common/", "${appexecfwk_path}/test/systemtest/common/ams/tool/include", - "${event_cesfwk_innerkits_path}/include", - "${event_cesfwk_kits_path}/native/include", "//foundation/distributedschedule/safwk/services/safwk/include", "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", "//base/notification/ces_standard/test/systemtest/common/resource", @@ -49,13 +44,13 @@ ohos_systemtest("ams_kit_test") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", - "${event_cesfwk_innerkits_path}:cesfwk_innerkits", - "${event_cesfwk_kits_path}/native:cesfwk_kits", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] @@ -65,8 +60,6 @@ ohos_systemtest("ams_kit_service_ability_test") { module_out_path = module_output_path include_dirs = [ "${appexecfwk_path}/test/systemtest/common/ams/tool/include", - "${event_cesfwk_innerkits_path}/include", - "${event_cesfwk_kits_path}/native/include", "//foundation/distributedschedule/safwk/services/safwk/include", "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", "//base/notification/ces_standard/test/systemtest/common/resource", @@ -92,13 +85,13 @@ ohos_systemtest("ams_kit_service_ability_test") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", - "${event_cesfwk_innerkits_path}:cesfwk_innerkits", - "${event_cesfwk_kits_path}/native:cesfwk_kits", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] @@ -108,8 +101,6 @@ ohos_systemtest("ams_kit_data_test") { module_out_path = module_output_path include_dirs = [ "${appexecfwk_path}/test/systemtest/common/ams/tool/include", - "${event_cesfwk_innerkits_path}/include", - "${event_cesfwk_kits_path}/native/include", "//foundation/distributedschedule/safwk/services/safwk/include", "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", "//base/notification/ces_standard/test/systemtest/common/resource", @@ -137,14 +128,14 @@ ohos_systemtest("ams_kit_data_test") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", - "${event_cesfwk_innerkits_path}:cesfwk_innerkits", - "${event_cesfwk_kits_path}/native:cesfwk_kits", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] @@ -155,8 +146,6 @@ ohos_systemtest("ams_kit_a_test") { include_dirs = [ "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common/", "${appexecfwk_path}/test/systemtest/common/ams/tool/include", - "${event_cesfwk_innerkits_path}/include", - "${event_cesfwk_kits_path}/native/include", "//foundation/distributedschedule/safwk/services/safwk/include", "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", "//base/notification/ces_standard/test/systemtest/common/resource", @@ -182,14 +171,14 @@ ohos_systemtest("ams_kit_a_test") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", - "${event_cesfwk_innerkits_path}:cesfwk_innerkits", - "${event_cesfwk_kits_path}/native:cesfwk_kits", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] @@ -200,8 +189,6 @@ ohos_systemtest("ams_kit_want_test") { include_dirs = [ "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common/", "${appexecfwk_path}/test/systemtest/common/ams/tool/include", - "${event_cesfwk_innerkits_path}/include", - "${event_cesfwk_kits_path}/native/include", "//foundation/distributedschedule/safwk/services/safwk/include", "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", "//base/notification/ces_standard/test/systemtest/common/resource", @@ -227,13 +214,13 @@ ohos_systemtest("ams_kit_want_test") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", - "${event_cesfwk_innerkits_path}:cesfwk_innerkits", - "${event_cesfwk_kits_path}/native:cesfwk_kits", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] @@ -244,8 +231,6 @@ ohos_systemtest("ams_kit_skills_test") { include_dirs = [ "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common/", "${appexecfwk_path}/test/systemtest/common/ams/tool/include", - "${event_cesfwk_innerkits_path}/include", - "${event_cesfwk_kits_path}/native/include", "//foundation/distributedschedule/safwk/services/safwk/include", "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", "//base/notification/ces_standard/test/systemtest/common/resource", @@ -271,13 +256,13 @@ ohos_systemtest("ams_kit_skills_test") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", - "${event_cesfwk_innerkits_path}:cesfwk_innerkits", - "${event_cesfwk_kits_path}/native:cesfwk_kits", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] @@ -288,8 +273,6 @@ ohos_systemtest("ams_kit_lifecycle_test") { include_dirs = [ "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common/", "${appexecfwk_path}/test/systemtest/common/ams/tool/include", - "${event_cesfwk_innerkits_path}/include", - "${event_cesfwk_kits_path}/native/include", "//foundation/distributedschedule/safwk/services/safwk/include", "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", "//base/notification/ces_standard/test/systemtest/common/resource", @@ -315,13 +298,13 @@ ohos_systemtest("ams_kit_lifecycle_test") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", - "${event_cesfwk_innerkits_path}:cesfwk_innerkits", - "${event_cesfwk_kits_path}/native:cesfwk_kits", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] @@ -332,8 +315,6 @@ ohos_systemtest("ams_kit_processinfo_test") { include_dirs = [ "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common/", "${appexecfwk_path}/test/systemtest/common/ams/tool/include", - "${event_cesfwk_innerkits_path}/include", - "${event_cesfwk_kits_path}/native/include", "//foundation/distributedschedule/safwk/services/safwk/include", "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", "//base/notification/ces_standard/test/systemtest/common/resource", @@ -359,13 +340,13 @@ ohos_systemtest("ams_kit_processinfo_test") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", - "${event_cesfwk_innerkits_path}:cesfwk_innerkits", - "${event_cesfwk_kits_path}/native:cesfwk_kits", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_a_test.cpp b/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_a_test.cpp index f79d203026a7cac652eaf59269d7b4beab93c5a4..e06591436c978f5923f889d21e681ee9d7655305 100644 --- a/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_a_test.cpp +++ b/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_a_test.cpp @@ -56,7 +56,7 @@ static const string KIT_HAP_NAME = "amsKitSystemTest"; static const string FIRST_ABILITY_NAME = "MainAbility"; static const string SECOND_ABILITY_NAME = "SecondAbility"; static const string THIRD_ABILITY_NAME = "MainAbility"; -static constexpr int WAIT_TIME = 1; +static constexpr int WAIT_TIME = 5; static const int MAIN_ABILITY_A_CODE = 100; static const int SECOND_ABILITY_A_CODE = 200; diff --git a/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_processinfo_test.cpp b/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_processinfo_test.cpp index 3e3d0888726c6d26fd91a875269a77b11f44d6f6..f2beb2d18a7f9fb216e175c4c800f14b3d5d8ac1 100644 --- a/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_processinfo_test.cpp +++ b/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_processinfo_test.cpp @@ -941,8 +941,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_0100, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_0100 : " << i; @@ -964,8 +964,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_0200, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_0200 : " << i; @@ -987,8 +987,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_0300, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_0300 : " << i; @@ -1010,8 +1010,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_0400, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_0400 : " << i; @@ -1033,8 +1033,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_0500, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_0500 : " << i; @@ -1056,8 +1056,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_0600, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_0600 : " << i; @@ -1079,8 +1079,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_0700, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_0700 : " << i; @@ -1102,8 +1102,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_0800, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_0800 : " << i; @@ -1125,8 +1125,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_0900, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_0900 : " << i; @@ -1148,8 +1148,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_1000, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_1000 : " << i; @@ -1171,8 +1171,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_1100, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_1100 : " << i; @@ -1194,8 +1194,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_1200, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_1200 : " << i; @@ -1217,8 +1217,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_1300, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_1300 : " << i; @@ -1240,8 +1240,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_1400, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_1400 : " << i; @@ -1263,8 +1263,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_1500, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_1500 : " << i; @@ -1286,8 +1286,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_1600, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_1600 : " << i; @@ -1309,8 +1309,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_1700, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_1700 : " << i; @@ -1332,8 +1332,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_1800, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_1800 : " << i; @@ -1355,8 +1355,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_1900, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_1900 : " << i; @@ -1378,8 +1378,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_2000, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_2000 : " << i; @@ -1401,8 +1401,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_2100, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_2100 : " << i; @@ -1424,8 +1424,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_2200, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_2200 : " << i; @@ -1447,8 +1447,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_2300, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_2300 : " << i; @@ -1470,8 +1470,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_2400, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_2400 : " << i; @@ -1493,8 +1493,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_2500, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_2500 : " << i; @@ -1516,8 +1516,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_2600, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_2600 : " << i; @@ -1539,8 +1539,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_2700, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_2700 : " << i; @@ -1562,8 +1562,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_2800, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_2800 : " << i; @@ -1585,8 +1585,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_2900, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_2900 : " << i; @@ -1608,8 +1608,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_3000, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_3000 : " << i; @@ -1631,8 +1631,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_3100, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_3100 : " << i; @@ -1654,8 +1654,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_3200, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_3200 : " << i; @@ -1677,8 +1677,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_3300, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_3300 : " << i; @@ -1700,8 +1700,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_3400, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_3400 : " << i; @@ -1723,8 +1723,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_3500, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_3500 : " << i; @@ -1746,8 +1746,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_3600, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_3600 : " << i; @@ -1769,8 +1769,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_3700, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_3700 : " << i; @@ -1792,8 +1792,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_3800, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_3800 : " << i; @@ -1815,8 +1815,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_3900, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_3900 : " << i; @@ -1838,8 +1838,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_4000, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_4000 : " << i; @@ -1861,8 +1861,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_4100, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_4100 : " << i; @@ -1884,8 +1884,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_4200, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_4200 : " << i; @@ -1907,8 +1907,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_4300, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_4300 : " << i; @@ -1930,8 +1930,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_4400, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_4400 : " << i; @@ -1953,8 +1953,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_4500, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_4500 : " << i; @@ -1976,8 +1976,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_4600, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_4600 : " << i; @@ -1999,8 +1999,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_4700, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_4700 : " << i; @@ -2022,8 +2022,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_4800, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_4800 : " << i; @@ -2045,8 +2045,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_4900, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_4900 : " << i; @@ -2068,8 +2068,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_5000, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_5000 : " << i; @@ -2091,8 +2091,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_5100, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_5100 : " << i; @@ -2114,8 +2114,8 @@ HWTEST_F(ActsAmsKitProcessInfoTest, AMS_Page_WantParams_5200, Function | MediumT for (int i = 1; i <= stLevel_.AMSLevel; i++) { STAbilityUtil::PublishEvent(g_EVENT_REQU_FIFTH, ++amsKitSystemTestFifthAbilityCode, data); EXPECT_EQ(0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_FIFTH, amsKitSystemTestFifthAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result) { GTEST_LOG_(INFO) << "AMS_Page_WantParams_5200 : " << i; diff --git a/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_test.cpp b/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_test.cpp index 2b4709fa4ca5f4793000c778f379c92e3bdbe7e5..5da6140faf116c6946cb6aee766f0e7055ba1ffd 100644 --- a/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_test.cpp +++ b/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_test.cpp @@ -89,6 +89,7 @@ public: void TestSkills(Want want); void StartAbilityKitTest(const std::string &abilityName, const std::string &bundleName); void CleanMsg(); + void ShowDump(); class AppEventSubscriber : public CommonEventSubscriber { public: explicit AppEventSubscriber(const CommonEventSubscribeInfo &sp) : CommonEventSubscriber(sp){}; @@ -148,7 +149,6 @@ void ActsAmsKitTest::SetUp(void) void ActsAmsKitTest::TearDown(void) { STAbilityUtil::RemoveStack(1, abilityMs, WAIT_TIME, WAIT_LAUNCHER_OK); - STAbilityUtil::KillBundleProcess(bundleNameList); CleanMsg(); } @@ -186,6 +186,17 @@ void ActsAmsKitTest::CleanMsg() STAbilityUtil::CleanMsg(abilityEvent); } +void ActsAmsKitTest::ShowDump() +{ + if (abilityMs) { + std::vector dumpInfo; + abilityMs->DumpState("-a", dumpInfo); + for (const auto &info : dumpInfo) { + std::cout << info << std::endl; + } + } +} + /** * @tc.number : AMS_Page_AbilityManager_0100 * @tc.name : AbilityManager::GetAllRunningProcesses @@ -408,8 +419,8 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_0800, Function | MediumTest | L HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_0900, Function | MediumTest | Level1) { bool result = false; + StartAbilityKitTest(abilityManagerName, bundleName2); for (int i = 1; i <= stLevel_.AMSLevel; i++) { - StartAbilityKitTest(abilityManagerName, bundleName2); int apiIndex = static_cast(AbilityManagerApi::GetAllRunningProcesses); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_8"; STAbilityUtil::PublishEvent(g_requPageManagerAbilityST, ++amsKitSTCode, eventData); @@ -647,8 +658,8 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_1700, Function | MediumTest | L HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_1800, Function | MediumTest | Level1) { bool result = false; + StartAbilityKitTest(abilityManagerName, bundleName2); for (int i = 1; i <= stLevel_.AMSLevel; i++) { - StartAbilityKitTest(abilityManagerName, bundleName2); int apiIndex = static_cast(AbilityManagerApi::GetAllStackInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_7"; STAbilityUtil::PublishEvent(g_requPageManagerAbilityST, ++amsKitSTCode, eventData); @@ -879,8 +890,8 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2600, Function | MediumTest | L HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2700, Function | MediumTest | Level1) { bool result = false; + StartAbilityKitTest(abilityManagerName, bundleName2); for (int i = 1; i <= stLevel_.AMSLevel; i++) { - StartAbilityKitTest(abilityManagerName, bundleName2); int apiIndex = static_cast(AbilityManagerApi::QueryRecentAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_7"; STAbilityUtil::PublishEvent(g_requPageManagerAbilityST, ++amsKitSTCode, eventData); @@ -906,8 +917,8 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2700, Function | MediumTest | L HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2800, Function | MediumTest | Level1) { bool result = false; + StartAbilityKitTest(abilityManagerName, bundleName2); for (int i = 1; i <= stLevel_.AMSLevel; i++) { - StartAbilityKitTest(abilityManagerName, bundleName2); int apiIndex = static_cast(AbilityManagerApi::QueryRecentAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_8"; STAbilityUtil::PublishEvent(g_requPageManagerAbilityST, ++amsKitSTCode, eventData); @@ -933,8 +944,8 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2800, Function | MediumTest | L HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2900, Function | MediumTest | Level1) { bool result = false; + StartAbilityKitTest(abilityManagerName, bundleName2); for (int i = 1; i <= stLevel_.AMSLevel; i++) { - StartAbilityKitTest(abilityManagerName, bundleName2); int apiIndex = static_cast(AbilityManagerApi::QueryRecentAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_9"; STAbilityUtil::PublishEvent(g_requPageManagerAbilityST, ++amsKitSTCode, eventData); @@ -1061,8 +1072,8 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3300, Function | MediumTest | L HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3400, Function | MediumTest | Level1) { bool result = false; + StartAbilityKitTest(abilityManagerName, bundleName2); for (int i = 1; i <= stLevel_.AMSLevel; i++) { - StartAbilityKitTest(abilityManagerName, bundleName2); int apiIndex = static_cast(AbilityManagerApi::QueryRunningAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_4"; STAbilityUtil::PublishEvent(g_requPageManagerAbilityST, ++amsKitSTCode, eventData); @@ -1088,8 +1099,8 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3400, Function | MediumTest | L HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3500, Function | MediumTest | Level1) { bool result = false; + StartAbilityKitTest(abilityManagerName, bundleName2); for (int i = 1; i <= stLevel_.AMSLevel; i++) { - StartAbilityKitTest(abilityManagerName, bundleName2); int apiIndex = static_cast(AbilityManagerApi::QueryRunningAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_5"; STAbilityUtil::PublishEvent(g_requPageManagerAbilityST, ++amsKitSTCode, eventData); @@ -1115,8 +1126,8 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3500, Function | MediumTest | L HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3600, Function | MediumTest | Level1) { bool result = false; + StartAbilityKitTest(abilityManagerName, bundleName2); for (int i = 1; i <= stLevel_.AMSLevel; i++) { - StartAbilityKitTest(abilityManagerName, bundleName2); int apiIndex = static_cast(AbilityManagerApi::QueryRunningAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_6"; STAbilityUtil::PublishEvent(g_requPageManagerAbilityST, ++amsKitSTCode, eventData); @@ -1141,8 +1152,8 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3600, Function | MediumTest | L HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3700, Function | MediumTest | Level1) { bool result = false; + StartAbilityKitTest(abilityManagerName, bundleName2); for (int i = 1; i <= stLevel_.AMSLevel; i++) { - StartAbilityKitTest(abilityManagerName, bundleName2); int apiIndex = static_cast(AbilityManagerApi::MoveMissionToTop); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_0"; STAbilityUtil::PublishEvent(g_requPageManagerAbilityST, ++amsKitSTCode, eventData); @@ -2033,8 +2044,8 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_Application_2700, Function | MediumTest | Leve EXPECT_EQ(STAbilityUtil::WaitCompleted(abilityEvent, thirdAbilityName + g_onAbilityStart, 0), 0); EXPECT_EQ(STAbilityUtil::WaitCompleted(abilityEvent, thirdAbilityName + g_onAbilityActive, 0), 0); EXPECT_EQ(STAbilityUtil::WaitCompleted(abilityEvent, sixthAbilityName + g_onAbilityBackground, 0), 0); - CleanMsg(); + STAbilityUtil::RemoveStack(1, abilityMs, WAIT_TIME, WAIT_LAUNCHER_OK); } } @@ -2049,20 +2060,22 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_Application_2800, Function | MediumTest | Leve { for (int i = 1; i <= stLevel_.AMSLevel; i++) { MAP_STR_STR params; + int onStopWantCount = 1; params["targetBundle"] = bundleName3; params["targetAbility"] = abilityNameBase; Want want = STAbilityUtil::MakeWant("device", sixthAbilityName, bundleName2, params); STAbilityUtil::StartAbility(want, abilityMs); EXPECT_EQ(STAbilityUtil::WaitCompleted(abilityEvent, sixthAbilityName + g_onAbilityActive, 0), 0); EXPECT_EQ(STAbilityUtil::WaitCompleted(abilityEvent, sixthAbilityName + g_onAbilityInactive, 0), 0); + EXPECT_EQ( + STAbilityUtil::WaitCompleted(abilityEvent, abilityNameBase + g_abilityStateOnActive, onStopWantCount), 0); EXPECT_EQ(STAbilityUtil::WaitCompleted(abilityEvent, sixthAbilityName + g_onAbilityBackground, 0), 0); STAbilityUtil::StopAbility(terminatePageAbility, 0, abilityNameBase); - int onStopWantCount = 1; + EXPECT_EQ(STAbilityUtil::WaitCompleted(abilityEvent, sixthAbilityName + g_onAbilityActive, 0), 0); EXPECT_EQ( STAbilityUtil::WaitCompleted(abilityEvent, abilityNameBase + g_abilityStateOnStop, onStopWantCount), 0); - EXPECT_EQ(STAbilityUtil::WaitCompleted(abilityEvent, sixthAbilityName + g_onAbilityForeground, 0), 0); - EXPECT_EQ(STAbilityUtil::WaitCompleted(abilityEvent, sixthAbilityName + g_onAbilityActive, 0), 0); CleanMsg(); + STAbilityUtil::RemoveStack(1, abilityMs, WAIT_TIME, WAIT_LAUNCHER_OK); } } \ No newline at end of file diff --git a/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_want_test.cpp b/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_want_test.cpp index 082f9cd30292c7cdda62b71ae03c28802ad59c3c..3492271d79e5fe8be2c8e2015a8739140be64e43 100644 --- a/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_want_test.cpp +++ b/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_want_test.cpp @@ -186,8 +186,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_0100, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_0100 : " << i; @@ -210,8 +210,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_0200, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_0200 : " << i; @@ -234,8 +234,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_0300, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_0300 : " << i; @@ -258,8 +258,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_0400, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_0400 : " << i; @@ -282,8 +282,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_0500, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_0500 : " << i; @@ -306,8 +306,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_0600, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_0600 : " << i; @@ -330,8 +330,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_0700, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_0700 : " << i; @@ -354,8 +354,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_0800, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_0800 : " << i; @@ -378,8 +378,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_0900, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_0900 : " << i; @@ -402,8 +402,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_1000, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_1000 : " << i; @@ -426,8 +426,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_1100, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_1100 : " << i; @@ -450,8 +450,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_1200, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_1200 : " << i; @@ -474,8 +474,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_1300, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_1300 : " << i; @@ -498,8 +498,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_1400, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_1400 : " << i; @@ -522,8 +522,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_1500, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_1500 : " << i; @@ -546,8 +546,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_1600, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_1600 : " << i; @@ -570,8 +570,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_1700, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_1700 : " << i; @@ -594,8 +594,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_1800, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_1800 : " << i; @@ -618,8 +618,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_1900, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_1900 : " << i; @@ -642,8 +642,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_2000, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_2000 : " << i; @@ -666,8 +666,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_2100, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_2100 : " << i; @@ -690,8 +690,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_2200, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_2200 : " << i; @@ -714,8 +714,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_2300, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_2300 : " << i; @@ -738,8 +738,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_2400, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_2400 : " << i; @@ -762,8 +762,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_2500, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_2500 : " << i; @@ -786,8 +786,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_2600, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_2600 : " << i; @@ -810,8 +810,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_2700, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_2700 : " << i; @@ -834,8 +834,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_2800, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_2800 : " << i; @@ -858,8 +858,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_2900, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_2900 : " << i; @@ -882,8 +882,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_3000, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_3000 : " << i; @@ -906,8 +906,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_3100, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_3100 : " << i; @@ -930,8 +930,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_3200, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_3200 : " << i; @@ -954,8 +954,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_3300, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_3300 : " << i; @@ -978,8 +978,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_3400, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_3400 : " << i; @@ -1002,8 +1002,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_3500, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_3500 : " << i; @@ -1026,8 +1026,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_3600, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_3600 : " << i; @@ -1050,8 +1050,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_3700, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_3700 : " << i; @@ -1074,8 +1074,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_3800, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_3800 : " << i; @@ -1098,8 +1098,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_3900, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_3900 : " << i; @@ -1122,8 +1122,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_4000, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_4000 : " << i; @@ -1146,8 +1146,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_4100, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_4100 : " << i; @@ -1170,8 +1170,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_4200, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_4200 : " << i; @@ -1194,8 +1194,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_4300, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_4300 : " << i; @@ -1218,8 +1218,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_4400, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_4400 : " << i; @@ -1242,8 +1242,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_4500, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_4500 : " << i; @@ -1266,8 +1266,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_4600, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_4600 : " << i; @@ -1290,8 +1290,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_4700, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_4700 : " << i; @@ -1314,8 +1314,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_4800, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_4800 : " << i; @@ -1338,8 +1338,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_4900, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_4900 : " << i; @@ -1362,8 +1362,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_5000, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_5000 : " << i; @@ -1386,8 +1386,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_5100, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_5100 : " << i; @@ -1410,8 +1410,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_5200, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_5200 : " << i; @@ -1434,8 +1434,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_5300, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_5300 : " << i; @@ -1458,8 +1458,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_5400, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_5400 : " << i; @@ -1482,8 +1482,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_5500, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_5500 : " << i; @@ -1506,8 +1506,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_5600, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_5600 : " << i; @@ -1530,8 +1530,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_5700, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_5700 : " << i; @@ -1554,8 +1554,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_5800, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_5800 : " << i; @@ -1578,8 +1578,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_5900, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_5900 : " << i; @@ -1602,8 +1602,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_6000, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_6000 : " << i; @@ -1626,8 +1626,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_6100, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_6100 : " << i; @@ -1650,8 +1650,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_6200, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_6200 : " << i; @@ -1674,8 +1674,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_6300, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_6300 : " << i; @@ -1698,8 +1698,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_6400, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_6400 : " << i; @@ -1722,8 +1722,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_6500, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_6500 : " << i; @@ -1746,8 +1746,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_6600, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_6600 : " << i; @@ -1770,8 +1770,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_6700, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_6700 : " << i; @@ -1794,8 +1794,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_6800, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_6800 : " << i; @@ -1818,8 +1818,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_6900, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_6900 : " << i; @@ -1842,8 +1842,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_7000, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_7000 : " << i; @@ -1866,8 +1866,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_7100, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_7100 : " << i; @@ -1890,8 +1890,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_7200, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_7200 : " << i; @@ -1914,8 +1914,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_7300, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_7300 : " << i; @@ -1938,8 +1938,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_7400, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_7400 : " << i; @@ -1962,8 +1962,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_7500, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_7500 : " << i; @@ -1986,8 +1986,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_7600, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_7600 : " << i; @@ -2010,8 +2010,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_7700, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_7700 : " << i; @@ -2034,8 +2034,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_7800, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_7800 : " << i; @@ -2058,8 +2058,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_7900, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_7900 : " << i; @@ -2082,8 +2082,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_8000, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_8000 : " << i; @@ -2106,8 +2106,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_8100, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_8100 : " << i; @@ -2130,8 +2130,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_8200, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_8200 : " << i; @@ -2154,8 +2154,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_8300, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_8300 : " << i; @@ -2178,8 +2178,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_8400, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_8400 : " << i; @@ -2202,8 +2202,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_8500, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_8500 : " << i; @@ -2226,8 +2226,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_8600, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_8600 : " << i; @@ -2250,8 +2250,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_8700, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_8700 : " << i; @@ -2274,8 +2274,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_8800, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_8800 : " << i; @@ -2298,8 +2298,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_8900, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_8900 : " << i; @@ -2322,8 +2322,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_9000, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_9000 : " << i; @@ -2346,8 +2346,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_9100, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_9100 : " << i; @@ -2370,8 +2370,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_9200, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_9200 : " << i; @@ -2394,8 +2394,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_9300, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_9300 : " << i; @@ -2418,8 +2418,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_9400, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_9400 : " << i; @@ -2442,8 +2442,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_9500, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_9500 : " << i; @@ -2466,8 +2466,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_9600, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_9600 : " << i; @@ -2490,8 +2490,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_9700, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_9700 : " << i; @@ -2514,8 +2514,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_9800, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_9800 : " << i; @@ -2538,8 +2538,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_9900, Function | MediumTest | Level1) STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_9900 : " << i; @@ -2562,8 +2562,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_10000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_10000 : " << i; @@ -2586,8 +2586,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_10100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_10100 : " << i; @@ -2610,8 +2610,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_10200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_10200 : " << i; @@ -2634,8 +2634,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_10300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_10300 : " << i; @@ -2658,8 +2658,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_10400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_10400 : " << i; @@ -2682,8 +2682,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_10500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_10500 : " << i; @@ -2706,8 +2706,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_10600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_10600 : " << i; @@ -2730,8 +2730,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_10700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_10700 : " << i; @@ -2754,8 +2754,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_10800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_10800 : " << i; @@ -2778,8 +2778,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_10900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_10900 : " << i; @@ -2802,8 +2802,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_11000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_11000 : " << i; @@ -2826,8 +2826,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_11100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_11100 : " << i; @@ -2850,8 +2850,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_11200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_11200 : " << i; @@ -2874,8 +2874,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_11300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_11300 : " << i; @@ -2898,8 +2898,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_11400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_11400 : " << i; @@ -2922,8 +2922,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_11500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_11500 : " << i; @@ -2946,8 +2946,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_11600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_11600 : " << i; @@ -2970,8 +2970,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_11700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_11700 : " << i; @@ -2994,8 +2994,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_11800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_11800 : " << i; @@ -3018,8 +3018,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_11900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_11900 : " << i; @@ -3042,8 +3042,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_12000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_12000 : " << i; @@ -3066,8 +3066,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_12100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_12100 : " << i; @@ -3090,8 +3090,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_12200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_12200 : " << i; @@ -3114,8 +3114,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_12300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_12300 : " << i; @@ -3138,8 +3138,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_12400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_12400 : " << i; @@ -3162,8 +3162,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_12500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_12500 : " << i; @@ -3186,8 +3186,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_12600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_12600 : " << i; @@ -3210,8 +3210,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_12700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_12700 : " << i; @@ -3234,8 +3234,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_12800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_12800 : " << i; @@ -3258,8 +3258,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_12900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_12900 : " << i; @@ -3282,8 +3282,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_13000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_13000 : " << i; @@ -3306,8 +3306,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_13100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_13100 : " << i; @@ -3330,8 +3330,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_13200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_13200 : " << i; @@ -3354,8 +3354,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_13300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_13300 : " << i; @@ -3378,8 +3378,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_13400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_13400 : " << i; @@ -3402,8 +3402,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_13500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_13500 : " << i; @@ -3426,8 +3426,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_13600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_13600 : " << i; @@ -3450,8 +3450,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_13700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_13700 : " << i; @@ -3474,8 +3474,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_13800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_13800 : " << i; @@ -3498,8 +3498,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_13900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_13900 : " << i; @@ -3522,8 +3522,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_14000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_14000 : " << i; @@ -3546,8 +3546,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_14100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_14100 : " << i; @@ -3570,8 +3570,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_14200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_14200 : " << i; @@ -3594,8 +3594,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_14300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_14300 : " << i; @@ -3618,8 +3618,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_14400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_14400 : " << i; @@ -3642,8 +3642,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_14500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_14500 : " << i; @@ -3666,8 +3666,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_14600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_14600 : " << i; @@ -3690,8 +3690,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_14700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_14700 : " << i; @@ -3714,8 +3714,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_14800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_14800 : " << i; @@ -3738,8 +3738,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_14900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_14900 : " << i; @@ -3762,8 +3762,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_15000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_15000 : " << i; @@ -3786,8 +3786,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_15100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_15100 : " << i; @@ -3810,8 +3810,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_15200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_15200 : " << i; @@ -3834,8 +3834,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_15300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_15300 : " << i; @@ -3858,8 +3858,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_15400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_15400 : " << i; @@ -3882,8 +3882,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_15500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_15500 : " << i; @@ -3906,8 +3906,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_15600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_15600 : " << i; @@ -3930,8 +3930,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_15700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_15700 : " << i; @@ -3954,8 +3954,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_15800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_15800 : " << i; @@ -3978,8 +3978,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_15900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_15900 : " << i; @@ -4002,8 +4002,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_16000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_16000 : " << i; @@ -4026,8 +4026,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_16100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_16100 : " << i; @@ -4050,8 +4050,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_16200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_16200 : " << i; @@ -4074,8 +4074,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_16300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_16300 : " << i; @@ -4098,8 +4098,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_16400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_16400 : " << i; @@ -4122,8 +4122,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_16500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_16500 : " << i; @@ -4146,8 +4146,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_16600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_16600 : " << i; @@ -4170,8 +4170,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_16700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_16700 : " << i; @@ -4194,8 +4194,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_16800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_16800 : " << i; @@ -4218,8 +4218,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_16900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_16900 : " << i; @@ -4242,8 +4242,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_17000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_17000 : " << i; @@ -4266,8 +4266,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_17100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_17100 : " << i; @@ -4290,8 +4290,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_17200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_17200 : " << i; @@ -4314,8 +4314,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_17300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_17300 : " << i; @@ -4338,8 +4338,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_17400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_17400 : " << i; @@ -4362,8 +4362,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_17500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_17500 : " << i; @@ -4386,8 +4386,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_17600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_17600 : " << i; @@ -4410,8 +4410,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_17700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_17700 : " << i; @@ -4434,8 +4434,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_17800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_17800 : " << i; @@ -4458,8 +4458,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_17900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_17900 : " << i; @@ -4482,8 +4482,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_18000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_18000 : " << i; @@ -4506,8 +4506,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_18100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_18100 : " << i; @@ -4530,8 +4530,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_18200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_18200 : " << i; @@ -4554,8 +4554,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_18300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_18300 : " << i; @@ -4578,8 +4578,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_18400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_18400 : " << i; @@ -4602,8 +4602,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_18500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_18500 : " << i; @@ -4626,8 +4626,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_18600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_18600 : " << i; @@ -4650,8 +4650,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_18700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_18700 : " << i; @@ -4674,8 +4674,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_18800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_18800 : " << i; @@ -4698,8 +4698,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_18900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_18900 : " << i; @@ -4722,8 +4722,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_19000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_19000 : " << i; @@ -4746,8 +4746,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_19100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_19100 : " << i; @@ -4770,8 +4770,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_19200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_19200 : " << i; @@ -4794,8 +4794,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_19300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_19300 : " << i; @@ -4818,8 +4818,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_19400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_19400 : " << i; @@ -4842,8 +4842,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_19500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_19500 : " << i; @@ -4866,8 +4866,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_19600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_19600 : " << i; @@ -4890,8 +4890,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_19700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_19700 : " << i; @@ -4914,8 +4914,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_19800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_19800 : " << i; @@ -4938,8 +4938,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_19900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_19900 : " << i; @@ -4962,8 +4962,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_20000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_20000 : " << i; @@ -4986,8 +4986,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_20100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_20100 : " << i; @@ -5010,8 +5010,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_20200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_20200 : " << i; @@ -5034,8 +5034,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_20300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_20300 : " << i; @@ -5058,8 +5058,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_20400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_20400 : " << i; @@ -5082,8 +5082,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_20500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_20500 : " << i; @@ -5106,8 +5106,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_20600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_20600 : " << i; @@ -5130,8 +5130,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_20700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_20700 : " << i; @@ -5154,8 +5154,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_20800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_20800 : " << i; @@ -5178,8 +5178,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_20900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_20900 : " << i; @@ -5202,8 +5202,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_21000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_21000 : " << i; @@ -5226,8 +5226,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_21100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_21100 : " << i; @@ -5250,8 +5250,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_21200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_21200 : " << i; @@ -5274,8 +5274,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_21300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_21300 : " << i; @@ -5298,8 +5298,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_21400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_21400 : " << i; @@ -5322,8 +5322,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_21500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_21500 : " << i; @@ -5346,8 +5346,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_21600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_21600 : " << i; @@ -5370,8 +5370,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_21700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_21700 : " << i; @@ -5394,8 +5394,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_21800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_21800 : " << i; @@ -5418,8 +5418,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_21900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_21900 : " << i; @@ -5442,8 +5442,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_22000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_22000 : " << i; @@ -5466,8 +5466,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_22100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_22100 : " << i; @@ -5490,8 +5490,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_22200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_22200 : " << i; @@ -5514,8 +5514,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_22300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_22300 : " << i; @@ -5538,8 +5538,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_22400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_22400 : " << i; @@ -5562,8 +5562,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_22500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_22500 : " << i; @@ -5586,8 +5586,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_22600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_22600 : " << i; @@ -5610,8 +5610,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_22700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_22700 : " << i; @@ -5634,8 +5634,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_22800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_22800 : " << i; @@ -5658,8 +5658,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_22900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_22900 : " << i; @@ -5682,8 +5682,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_23000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_23000 : " << i; @@ -5706,8 +5706,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_23100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_23100 : " << i; @@ -5730,8 +5730,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_23200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_23200 : " << i; @@ -5754,8 +5754,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_23300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_23300 : " << i; @@ -5778,8 +5778,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_23400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_23400 : " << i; @@ -5802,8 +5802,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_23500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_23500 : " << i; @@ -5826,8 +5826,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_23600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_23600 : " << i; @@ -5850,8 +5850,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_23700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_23700 : " << i; @@ -5874,8 +5874,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_23800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_23800 : " << i; @@ -5898,8 +5898,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_23900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_23900 : " << i; @@ -5922,8 +5922,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_24000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_24000 : " << i; @@ -5946,8 +5946,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_24100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_24100 : " << i; @@ -5970,8 +5970,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_24200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_24200 : " << i; @@ -5994,8 +5994,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_24300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_24300 : " << i; @@ -6018,8 +6018,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_24400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_24400 : " << i; @@ -6042,8 +6042,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_24500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_24500 : " << i; @@ -6066,8 +6066,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_24600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_24600 : " << i; @@ -6090,8 +6090,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_24700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_24700 : " << i; @@ -6114,8 +6114,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_24800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_24800 : " << i; @@ -6138,8 +6138,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_24900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_24900 : " << i; @@ -6162,8 +6162,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_25000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_25000 : " << i; @@ -6186,8 +6186,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_25100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_25100 : " << i; @@ -6210,8 +6210,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_25200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_25200 : " << i; @@ -6234,8 +6234,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_25300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_25300 : " << i; @@ -6258,8 +6258,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_25400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_25400 : " << i; @@ -6282,8 +6282,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_25500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_25500 : " << i; @@ -6306,8 +6306,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_25600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_25600 : " << i; @@ -6330,8 +6330,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_25700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_25700 : " << i; @@ -6354,8 +6354,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_25800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_25800 : " << i; @@ -6378,8 +6378,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_25900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_25900 : " << i; @@ -6402,8 +6402,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_26000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_26000 : " << i; @@ -6426,8 +6426,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_26100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_26100 : " << i; @@ -6450,8 +6450,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_26200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_26200 : " << i; @@ -6474,8 +6474,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_26300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_26300 : " << i; @@ -6498,8 +6498,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_26400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_26400 : " << i; @@ -6522,8 +6522,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_26500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_26500 : " << i; @@ -6546,8 +6546,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_26600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_26600 : " << i; @@ -6570,8 +6570,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_26700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_26700 : " << i; @@ -6594,8 +6594,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_26800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_26800 : " << i; @@ -6618,8 +6618,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_26900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_26900 : " << i; @@ -6642,8 +6642,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_27000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_27000 : " << i; @@ -6666,8 +6666,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_27100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_27100 : " << i; @@ -6690,8 +6690,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_27200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_27200 : " << i; @@ -6714,8 +6714,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_27300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_27300 : " << i; @@ -6738,8 +6738,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_27400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_27400 : " << i; @@ -6762,8 +6762,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_27500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_27500 : " << i; @@ -6786,8 +6786,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_27600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_27600 : " << i; @@ -6810,8 +6810,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_27700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_27700 : " << i; @@ -6834,8 +6834,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_27800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_27800 : " << i; @@ -6858,8 +6858,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_27900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_27900 : " << i; @@ -6882,8 +6882,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_28000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_28000 : " << i; @@ -6906,8 +6906,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_28100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_28100 : " << i; @@ -6930,8 +6930,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_28200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_28200 : " << i; @@ -6954,8 +6954,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_28300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_28300 : " << i; @@ -6978,8 +6978,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_28400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_28400 : " << i; @@ -7002,8 +7002,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_28500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_28500 : " << i; @@ -7026,8 +7026,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_28600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_28600 : " << i; @@ -7050,8 +7050,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_28700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_28700 : " << i; @@ -7074,8 +7074,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_28800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_28800 : " << i; @@ -7098,8 +7098,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_28900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_28900 : " << i; @@ -7122,8 +7122,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_29000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_29000 : " << i; @@ -7146,8 +7146,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_29100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_29100 : " << i; @@ -7170,8 +7170,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_29200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_29200 : " << i; @@ -7194,8 +7194,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_29300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_29300 : " << i; @@ -7218,8 +7218,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_29400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_29400 : " << i; @@ -7242,8 +7242,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_29500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_29500 : " << i; @@ -7266,8 +7266,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_29600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_29600 : " << i; @@ -7290,8 +7290,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_29700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_29700 : " << i; @@ -7314,8 +7314,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_29800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_29800 : " << i; @@ -7338,8 +7338,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_29900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_29900 : " << i; @@ -7362,8 +7362,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_30000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_30000 : " << i; @@ -7386,8 +7386,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_30100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_30100 : " << i; @@ -7410,8 +7410,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_30200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_30200 : " << i; @@ -7434,8 +7434,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_30300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_30300 : " << i; @@ -7458,8 +7458,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_30400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_30400 : " << i; @@ -7482,8 +7482,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_30500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_30500 : " << i; @@ -7506,8 +7506,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_30600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_30600 : " << i; @@ -7530,8 +7530,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_30700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_30700 : " << i; @@ -7554,8 +7554,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_30800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_30800 : " << i; @@ -7578,8 +7578,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_30900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_30900 : " << i; @@ -7602,8 +7602,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_31000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_31000 : " << i; @@ -7626,8 +7626,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_31100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_31100 : " << i; @@ -7650,8 +7650,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_31200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_31200 : " << i; @@ -7674,8 +7674,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_31300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_31300 : " << i; @@ -7698,8 +7698,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_31400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_31400 : " << i; @@ -7722,8 +7722,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_31500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_31500 : " << i; @@ -7746,8 +7746,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_31600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_31600 : " << i; @@ -7770,8 +7770,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_31700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_31700 : " << i; @@ -7794,8 +7794,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_31800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_31800 : " << i; @@ -7818,8 +7818,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_31900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_31900 : " << i; @@ -7842,8 +7842,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_32000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_32000 : " << i; @@ -7866,8 +7866,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_32100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_32100 : " << i; @@ -7890,8 +7890,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_32200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_32200 : " << i; @@ -7914,8 +7914,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_32300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_32300 : " << i; @@ -7938,8 +7938,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_32400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_32400 : " << i; @@ -7962,8 +7962,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_32500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_32500 : " << i; @@ -7986,8 +7986,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_32600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_32600 : " << i; @@ -8010,8 +8010,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_32700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_32700 : " << i; @@ -8034,8 +8034,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_32800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_32800 : " << i; @@ -8058,8 +8058,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_32900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_32900 : " << i; @@ -8082,8 +8082,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_33000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_33000 : " << i; @@ -8106,8 +8106,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_33100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_33100 : " << i; @@ -8130,8 +8130,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_33200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_33200 : " << i; @@ -8154,8 +8154,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_33300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_33300 : " << i; @@ -8178,8 +8178,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_33400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_33400 : " << i; @@ -8202,8 +8202,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_33500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_33500 : " << i; @@ -8226,8 +8226,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_33600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_33600 : " << i; @@ -8250,8 +8250,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_33700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_33700 : " << i; @@ -8274,8 +8274,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_33800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_33800 : " << i; @@ -8298,8 +8298,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_33900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_33900 : " << i; @@ -8322,8 +8322,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_34000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_34000 : " << i; @@ -8346,8 +8346,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_34100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_34100 : " << i; @@ -8370,8 +8370,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_34200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_34200 : " << i; @@ -8394,8 +8394,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_34300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_34300 : " << i; @@ -8418,8 +8418,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_34400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_34400 : " << i; @@ -8442,8 +8442,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_34500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_34500 : " << i; @@ -8466,8 +8466,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_34600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_34600 : " << i; @@ -8490,8 +8490,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_34700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_34700 : " << i; @@ -8514,8 +8514,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_34800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_34800 : " << i; @@ -8538,8 +8538,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_34900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_34900 : " << i; @@ -8562,8 +8562,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_35000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_35000 : " << i; @@ -8586,8 +8586,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_35100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_35100 : " << i; @@ -8610,8 +8610,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_35200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_35200 : " << i; @@ -8634,8 +8634,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_35300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_35300 : " << i; @@ -8658,8 +8658,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_35400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_35400 : " << i; @@ -8682,8 +8682,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_35500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_35500 : " << i; @@ -8706,8 +8706,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_35600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_35600 : " << i; @@ -8730,8 +8730,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_35700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_35700 : " << i; @@ -8754,8 +8754,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_35800, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_35800 : " << i; @@ -8778,8 +8778,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_35900, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_35900 : " << i; @@ -8802,8 +8802,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_36000, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_36000 : " << i; @@ -8826,8 +8826,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_36100, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_36100 : " << i; @@ -8850,8 +8850,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_36200, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_36200 : " << i; @@ -8874,8 +8874,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_36300, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_36300 : " << i; @@ -8898,8 +8898,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_36400, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_36400 : " << i; @@ -8922,8 +8922,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_36500, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_36500 : " << i; @@ -8946,8 +8946,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_36600, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_36600 : " << i; @@ -8970,8 +8970,8 @@ HWTEST_F(ActsAmsKitWantTest, AMS_Page_Want_36700, Function | MediumTest | Level1 STAbilityUtil::PublishEvent(g_EVENT_REQU_SECOND, ++amsKitSystemTestSecondAbilityCode, data); EXPECT_EQ( 0, STAbilityUtil::WaitCompleted(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode, delay)); - data = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); - result = data.compare("1") == 0; + std::string respData = STAbilityUtil::GetData(event, g_EVENT_RESP_SECOND, amsKitSystemTestSecondAbilityCode); + result = respData.compare("1") == 0; EXPECT_TRUE(result); if (!result && i > 1) { GTEST_LOG_(INFO) << "AMS_Page_Want_36700 : " << i; diff --git a/test/systemtest/common/ams/ams_page_ability_test/BUILD.gn b/test/systemtest/common/ams/ams_page_ability_test/BUILD.gn index 7489bb576fe2384e8228e56b98ff92a385dfeab9..b5db3c8266353bf84ff7e5aee5b5d671597cb1f8 100644 --- a/test/systemtest/common/ams/ams_page_ability_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_page_ability_test/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") -EVENT_DIR = "//base/notification/ces_standard/cesfwk" module_output_path = "appexecfwk_standard/ams" ohos_systemtest("ams_page_ability_test") { @@ -20,8 +19,6 @@ ohos_systemtest("ams_page_ability_test") { include_dirs = [ "//foundation/distributedschedule/safwk/services/safwk/include", - "${EVENT_DIR}/innerkits/include", - "${EVENT_DIR}/kits/native/include", "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", ] @@ -42,8 +39,6 @@ ohos_systemtest("ams_page_ability_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "${EVENT_DIR}/innerkits:cesfwk_innerkits", - "${EVENT_DIR}/kits/native:cesfwk_kits", "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", @@ -55,6 +50,8 @@ ohos_systemtest("ams_page_ability_test") { ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/systemtest/common/ams/ams_page_ability_test/ams_page_ability_test.cpp b/test/systemtest/common/ams/ams_page_ability_test/ams_page_ability_test.cpp index e6af8b3ac1b30f59a7483bade7d4736e5581d00a..d4f7ea3be81427212ffa2c9b610c1859f3665edd 100644 --- a/test/systemtest/common/ams/ams_page_ability_test/ams_page_ability_test.cpp +++ b/test/systemtest/common/ams/ams_page_ability_test/ams_page_ability_test.cpp @@ -3199,14 +3199,15 @@ HWTEST_F(AmsPageAbilityTest, AMS_Page_Ability_6400, Function | MediumTest | Leve std::vector dumpInfo; abilityMs_->DumpState((DUMP_STACK + " 1"), dumpInfo); MTDumpUtil::GetInstance()->GetAll("AbilityName", dumpInfo, result); - std::vector expectedResult = {abilityName2, abilityName1, abilityName3, abilityName5}; + std::vector expectedResult = {abilityName2, abilityName2, abilityName1, abilityName3, abilityName5}; EXPECT_TRUE(MTDumpUtil::GetInstance()->CompStrVec(result, expectedResult)); MissionStackInfo missionStackInfo; GetAllStackInfo(missionStackInfo); EXPECT_TRUE(missionStackInfo.missionRecords.size() == 3); auto abilityInfos = missionStackInfo.missionRecords[0].abilityRecordInfos; EXPECT_EQ(0, abilityInfos[0].mainName.compare(abilityName2)); - EXPECT_EQ(0, abilityInfos[1].mainName.compare(abilityName1)); + EXPECT_EQ(0, abilityInfos[1].mainName.compare(abilityName2)); + EXPECT_EQ(0, abilityInfos[2].mainName.compare(abilityName1)); abilityInfos = missionStackInfo.missionRecords[1].abilityRecordInfos; EXPECT_EQ(0, abilityInfos[0].mainName.compare(abilityName3)); abilityInfos = missionStackInfo.missionRecords[2].abilityRecordInfos; diff --git a/test/systemtest/common/ams/ams_power_test/BUILD.gn b/test/systemtest/common/ams/ams_power_test/BUILD.gn index af4fc10234a7a5d3498a68eb6a846950b0330724..a8f782b54c1757ff8c7e06b8f8b3dc4aefeed597 100644 --- a/test/systemtest/common/ams/ams_power_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_power_test/BUILD.gn @@ -12,7 +12,6 @@ # limitations under the License. import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") -EVENT_DIR = "//base/notification/ces_standard/cesfwk" module_output_path = "appexecfwk_standard/ams" ohos_systemtest("ams_power_test") { @@ -20,8 +19,6 @@ ohos_systemtest("ams_power_test") { include_dirs = [ "//foundation/distributedschedule/safwk/services/safwk/include", - "${EVENT_DIR}/innerkits/include", - "${EVENT_DIR}/kits/native/include", "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common", "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", ] @@ -43,8 +40,6 @@ ohos_systemtest("ams_power_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "${EVENT_DIR}/innerkits:cesfwk_innerkits", - "${EVENT_DIR}/kits/native:cesfwk_kits", "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", @@ -56,6 +51,8 @@ ohos_systemtest("ams_power_test") { ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/systemtest/common/ams/ams_service_ability_test/BUILD.gn b/test/systemtest/common/ams/ams_service_ability_test/BUILD.gn index 82e2affd99adbf6a98dd553e7c4a7a20c2286a44..082648f0e9f5a7dc9c72d8aea3d146ff0cdb63a3 100755 --- a/test/systemtest/common/ams/ams_service_ability_test/BUILD.gn +++ b/test/systemtest/common/ams/ams_service_ability_test/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") @@ -21,8 +21,6 @@ ohos_systemtest("ams_service_ability_test") { include_dirs = [ "//foundation/distributedschedule/services/safwk/include", - "${even_path}/cesfwk/innerkits/include", - "${even_path}/cesfwk/kits/native/include", "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", ] @@ -48,8 +46,6 @@ ohos_systemtest("ams_service_ability_test") { "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler", - "${even_path}/cesfwk/innerkits:cesfwk_innerkits", - "${even_path}/cesfwk/kits/native:cesfwk_kits", "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//third_party/googletest:gtest_main", @@ -57,6 +53,8 @@ ohos_systemtest("ams_service_ability_test") { ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/systemtest/common/ams/ams_service_ability_test/ams_service_ability_test.cpp b/test/systemtest/common/ams/ams_service_ability_test/ams_service_ability_test.cpp index 4535c0898003999e5a37c67c4b596df09e1573e8..07e31570359dceb49dbc3df00728dc3c71c23379 100644 --- a/test/systemtest/common/ams/ams_service_ability_test/ams_service_ability_test.cpp +++ b/test/systemtest/common/ams/ams_service_ability_test/ams_service_ability_test.cpp @@ -1977,10 +1977,10 @@ HWTEST_F(AmsServiceAbilityTest, AppSpawn_TEST_0100, Function | MediumTest | Leve { GTEST_LOG_(INFO) << "AmsServiceAbilityTest AppSpawn_TEST_0100 start"; - std::string cmd = "ps -ef |grep appspawn |grep -v grep | awk '{print $1}'"; + std::string cmd = "ps -ef |grep appspawn |grep -v grep"; std::string result; ExecuteSystemForResult(cmd, result); - EXPECT_EQ(Trim(result).compare("root"), 0); + EXPECT_NE(result.find("root"), std::string::npos); GTEST_LOG_(INFO) << "AmsServiceAbilityTest AppSpawn_TEST_0100 end"; } @@ -2010,10 +2010,10 @@ HWTEST_F(AmsServiceAbilityTest, AppSpawn_TEST_0200, Function | MediumTest | Leve usleep(WAIT_TIME); // check app process information - std::string cmd = "ps -ef |grep com.ohos.amsst.service.appA |grep -v grep | awk '{print $2}'"; + std::string cmd = "ps -ef |grep com.ohos.amsst.service.appA |grep -v grep"; std::string result; ExecuteSystemForResult(cmd, result); - EXPECT_FALSE(Trim(result).empty()); + EXPECT_FALSE(result.empty()); usleep(WAIT_TIME); // stop ability @@ -2066,7 +2066,7 @@ HWTEST_F(AmsServiceAbilityTest, AppSpawn_0300, Function | MediumTest | Level1) 0); // check app process information - std::string cmd = "ps -ef |grep com.ohos.amsst.service.appA |grep -v grep | awk '{print $2}'"; + std::string cmd = "ps -ef |grep com.ohos.amsst.service.appA |grep -v grep"; std::string result; ExecuteSystemForResult(cmd, result); EXPECT_TRUE(Trim(result).empty()); @@ -2104,7 +2104,7 @@ HWTEST_F(AmsServiceAbilityTest, AppSpawn_0400, Function | MediumTest | Level1) usleep(WAIT_TIME * 5); // check app process information - std::string cmd = "ps -ef |grep com.ohos.amsst.service.appA |grep -v grep | awk '{print $2}'"; + std::string cmd = "ps -ef |grep com.ohos.amsst.service.appA |grep -v grep"; std::string result; ExecuteSystemForResult(cmd, result); EXPECT_TRUE(Trim(result).empty()); diff --git a/test/systemtest/common/ams/tool/BUILD.gn b/test/systemtest/common/ams/tool/BUILD.gn index d1f59f7aaa169fc39b82c43675294b333bddb435..b92bc15c53b91fa13608909aae4557d774fda899 100644 --- a/test/systemtest/common/ams/tool/BUILD.gn +++ b/test/systemtest/common/ams/tool/BUILD.gn @@ -13,14 +13,11 @@ import("//build/ohos.gni") import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") -EVENT_DIR = "//base/notification/ces_standard/cesfwk" config("system_test_ability_util_config") { include_dirs = [ "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", "//foundation/distributedschedule/safwk/services/safwk/include", - "${EVENT_DIR}/innerkits/include", - "${EVENT_DIR}/kits/native/include", ] cflags = [] if (target_cpu == "arm") { @@ -44,8 +41,6 @@ ohos_shared_library("system_test_ability_util_lib") { ] deps = [ - "${EVENT_DIR}/innerkits:cesfwk_innerkits", - "${EVENT_DIR}/kits/native:cesfwk_kits", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/aafwk/standard/services/abilitymgr:abilityms", "//foundation/aafwk/standard/services/test/moduletest/module_test_dump_util:module_test_dump_util_lib", @@ -57,6 +52,8 @@ ohos_shared_library("system_test_ability_util_lib") { ] external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/systemtest/common/bms/bms_install_system_test/BUILD.gn b/test/systemtest/common/bms/bms_install_system_test/BUILD.gn index 6a533d6ba1701e84c51ec59aab7985ffb55133cb..a7b274ab64ff155bebe339a830fce4d33a888fd2 100755 --- a/test/systemtest/common/bms/bms_install_system_test/BUILD.gn +++ b/test/systemtest/common/bms/bms_install_system_test/BUILD.gn @@ -9,20 +9,16 @@ # 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. +# limitations under the License. import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") -EVENT_DIR = "//base/notification/ces_standard/cesfwk" module_output_path = "appexecfwk_standard/bundlemgrsst" ohos_systemtest("BmsInstallSystemTest") { module_out_path = module_output_path - include_dirs = [ - "${EVENT_DIR}/kits/native/include", - "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content/", - ] + include_dirs = [ "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content/" ] sources = [ "bms_install_system_test.cpp" ] cflags = [] @@ -30,7 +26,6 @@ ohos_systemtest("BmsInstallSystemTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "${EVENT_DIR}/kits/native:cesfwk_kits", "${common_path}:libappexecfwk_common", "${innerkits_path}/appexecfwk_base:appexecfwk_base", "${innerkits_path}/appexecfwk_core:appexecfwk_core", @@ -45,6 +40,7 @@ ohos_systemtest("BmsInstallSystemTest") { defines = [ "APP_LOG_TAG = \"BundleMgrTool\"" ] external_deps = [ + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/test/systemtest/common/task_dispatcher/BUILD.gn b/test/systemtest/common/task_dispatcher/BUILD.gn index 69ee72f2bd326437e32eb39ee80bcf5911b79017..c3cfdbf7e4b7a9e0fa3db628ab6000e2a727a07b 100755 --- a/test/systemtest/common/task_dispatcher/BUILD.gn +++ b/test/systemtest/common/task_dispatcher/BUILD.gn @@ -14,7 +14,6 @@ import("//build/ohos.gni") import("//build/test.gni") import("//foundation/appexecfwk/standard/appexecfwk.gni") -EVENT_DIR = "//base/notification/ces_standard/cesfwk" module_output_path = "appexecfwk_standard/task_dispatcher/" config("system_test_task_dispatcher_config") { @@ -34,7 +33,6 @@ ohos_systemtest("task_dispatcher_test") { include_dirs = [ "//foundation/distributedschedule/safwk/services/safwk/include", - "${EVENT_DIR}/kits/native/include", "//foundation/appexecfwk/standard/test/systemtest/common/task_dispatcher/include", "//foundation/appexecfwk/standard/test/systemtest/common/ams/tool/include", @@ -64,7 +62,6 @@ ohos_systemtest("task_dispatcher_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ - "${EVENT_DIR}/kits/native:cesfwk_kits", "${aafwk_path}/interfaces/innerkits/want:want", "${aafwk_path}/services/abilitymgr:abilityms", "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", @@ -79,6 +76,7 @@ ohos_systemtest("task_dispatcher_test") { ] external_deps = [ + "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", ] diff --git a/tools/test/mock/mock_bundle_mgr_host.h b/tools/test/mock/mock_bundle_mgr_host.h index 3c5e51eb3c21ebbba57bc699f9c565eeaca2048f..9df3ac8d90f51a0bd1606deff5289ad622f635ed 100644 --- a/tools/test/mock/mock_bundle_mgr_host.h +++ b/tools/test/mock/mock_bundle_mgr_host.h @@ -82,8 +82,10 @@ public: bool(const std::vector &uids, const sptr &callback)); MOCK_METHOD1(UnregisterPermissionsChanged, bool(const sptr &callback)); MOCK_METHOD1(GetAllFormsInfo, bool(std::vector &formInfos)); - MOCK_METHOD2(GetFormsInfoByApp, bool(const std::string &bundleName,std::vector &formInfos)); - MOCK_METHOD3(GetFormsInfoByModule, bool(const std::string &bundleName, const std::string &moduleName, std::vector &formInfos)); + MOCK_METHOD2(GetFormsInfoByApp, bool(const std::string &bundleName, std::vector &formInfos)); + MOCK_METHOD3(GetFormsInfoByModule, + bool(const std::string &bundleName, const std::string &moduleName, std::vector &formInfos)); + MOCK_METHOD2(GetShortcutInfos, bool(const std::string &bundleName, std::vector &shortcutInfos)); }; } // namespace AppExecFwk