diff --git a/distributed_schedule_lite/dtbschedmgr_posix/BUILD.gn b/distributed_schedule_lite/dmsfwk_lite_posix/BUILD.gn similarity index 91% rename from distributed_schedule_lite/dtbschedmgr_posix/BUILD.gn rename to distributed_schedule_lite/dmsfwk_lite_posix/BUILD.gn index 898dd0253e36f616f0cb40cb91e3c46b9d58235b..68febbed212f7abcd6cc48dec4ee3fbbedf2e8d1 100755 --- a/distributed_schedule_lite/dtbschedmgr_posix/BUILD.gn +++ b/distributed_schedule_lite/dmsfwk_lite_posix/BUILD.gn @@ -18,7 +18,6 @@ hcpptest_suite("ActsDMSTest") { sources = [ "src/MsgParserFuncTest.cpp", "src/MsgParserLenFuncTest.cpp", - "src/StartAbilityFromRemoteFuncTest.cpp", "src/utils/DMSTestBase.cpp", "src/utils/dms_packet.cpp", ] @@ -31,7 +30,7 @@ hcpptest_suite("ActsDMSTest") { "//foundation/communication/ipc_lite/interfaces/kits", "//foundation/distributedschedule/samgr_lite/interfaces/kits/registry", "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", - "//foundation/distributedschedule/services/dtbschedmgr_lite/include", + "//foundation/distributedschedule/dmsfwk_lite/include", "//foundation/distributedschedule/samgr_lite/interfaces/innerkits", "${aafwk_lite_path}/interfaces/innerkits/abilitymgr_lite", @@ -46,7 +45,7 @@ hcpptest_suite("ActsDMSTest") { "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", "//foundation/distributedschedule/samgr_lite/samgr:samgr", - "//foundation/distributedschedule/services/dtbschedmgr_lite:dtbschedmgr", + "//foundation/distributedschedule/dmsfwk_lite:dtbschedmgr", "//third_party/bounds_checking_function:libsec_shared", ] cflags = [ "-Wno-error" ] diff --git a/distributed_schedule_lite/dtbschedmgr_posix/Test.json b/distributed_schedule_lite/dmsfwk_lite_posix/Test.json similarity index 100% rename from distributed_schedule_lite/dtbschedmgr_posix/Test.json rename to distributed_schedule_lite/dmsfwk_lite_posix/Test.json diff --git a/distributed_schedule_lite/dtbschedmgr_posix/src/MsgParserFuncTest.cpp b/distributed_schedule_lite/dmsfwk_lite_posix/src/MsgParserFuncTest.cpp similarity index 100% rename from distributed_schedule_lite/dtbschedmgr_posix/src/MsgParserFuncTest.cpp rename to distributed_schedule_lite/dmsfwk_lite_posix/src/MsgParserFuncTest.cpp diff --git a/distributed_schedule_lite/dtbschedmgr_posix/src/MsgParserLenFuncTest.cpp b/distributed_schedule_lite/dmsfwk_lite_posix/src/MsgParserLenFuncTest.cpp similarity index 100% rename from distributed_schedule_lite/dtbschedmgr_posix/src/MsgParserLenFuncTest.cpp rename to distributed_schedule_lite/dmsfwk_lite_posix/src/MsgParserLenFuncTest.cpp diff --git a/distributed_schedule_lite/dtbschedmgr_posix/src/utils/DMSTestBase.cpp b/distributed_schedule_lite/dmsfwk_lite_posix/src/utils/DMSTestBase.cpp similarity index 100% rename from distributed_schedule_lite/dtbschedmgr_posix/src/utils/DMSTestBase.cpp rename to distributed_schedule_lite/dmsfwk_lite_posix/src/utils/DMSTestBase.cpp diff --git a/distributed_schedule_lite/dtbschedmgr_posix/src/utils/DMSTestBase.h b/distributed_schedule_lite/dmsfwk_lite_posix/src/utils/DMSTestBase.h similarity index 100% rename from distributed_schedule_lite/dtbschedmgr_posix/src/utils/DMSTestBase.h rename to distributed_schedule_lite/dmsfwk_lite_posix/src/utils/DMSTestBase.h diff --git a/distributed_schedule_lite/dtbschedmgr_posix/src/utils/dms_packet.cpp b/distributed_schedule_lite/dmsfwk_lite_posix/src/utils/dms_packet.cpp similarity index 100% rename from distributed_schedule_lite/dtbschedmgr_posix/src/utils/dms_packet.cpp rename to distributed_schedule_lite/dmsfwk_lite_posix/src/utils/dms_packet.cpp diff --git a/distributed_schedule_lite/dtbschedmgr_posix/src/utils/dms_packet.h b/distributed_schedule_lite/dmsfwk_lite_posix/src/utils/dms_packet.h similarity index 100% rename from distributed_schedule_lite/dtbschedmgr_posix/src/utils/dms_packet.h rename to distributed_schedule_lite/dmsfwk_lite_posix/src/utils/dms_packet.h diff --git a/distributed_schedule_lite/dtbschedmgr_posix/src/StartAbilityFromRemoteFuncTest.cpp b/distributed_schedule_lite/dtbschedmgr_posix/src/StartAbilityFromRemoteFuncTest.cpp deleted file mode 100755 index 0368bcfb7c10bd8f71e84ed97d4d3b49a264632a..0000000000000000000000000000000000000000 --- a/distributed_schedule_lite/dtbschedmgr_posix/src/StartAbilityFromRemoteFuncTest.cpp +++ /dev/null @@ -1,300 +0,0 @@ -/* - * 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 "gtest/gtest.h" -#include "utils/DMSTestBase.h" -#include "utils/dms_packet.h" -#include "distributed_service_interface.h" - -using namespace testing::ext; - -static int8_t RunTest(const uint8_t *buffer, uint16_t bufferLen, const TlvParseCallback onTlvParseDone, - const StartAbilityCallback onStartAbilityDone) -{ - IDmsFeatureCallback dmsFeatureCallback = { - .onTlvParseDone = onTlvParseDone, - .onStartAbilityDone = onStartAbilityDone - }; - - CommuInterInfo interInfo; - interInfo.payloadLength = bufferLen; - interInfo.payload = buffer; - - return DmsLiteProcessCommuMsg(&interInfo, &dmsFeatureCallback); -} - -class StartAbilityFromRemoteFuncTest : public testing::Test { -protected: - // SetUpTestCase: Testsuit setup, run before 1st testcase - static void SetUpTestCase(void) - { - SystemInitProxy(); - } - // TearDownTestCase: Testsuit teardown, run after last testcase - static void TearDownTestCase(void) - { - UninstallHap(); - } - // Testcase setup - virtual void SetUp() - { - } - // Testcase teardown - virtual void TearDown() - { - } -}; - -/** - * @tc.number : DMSLite_DMS_StartAbilityFromRemoteFunc_0010 - * @tc.name : User can start ability from remote - * @tc.desc : [C- SOFTWARE -0200] -*/ -HWTEST_F(StartAbilityFromRemoteFuncTest, testStartAbilityFromRemoteFunc0010, Function | MediumTest | Level2) { - std::string bundleName = "com.huawei.helloworld"; - std::string abilityName = "AceAbility"; - std::string signature = "BERxL4Em2dAox98GRbsB31dRcsHDto7hjc5ztnc0cNMsHX33a0B2xgfJIJiGMBiAEcTlW3mbxzm6KIMyrKJj1z8="; - - char buffer[PACKET_DATA_SIZE] = {0}; - uint16_t dataSize = 0; - DmsPacket dmsPacket {buffer, PACKET_DATA_SIZE}; - DmsMsgInfo dmsMsgInfo = { - DMSLITE_COMMAND::START_ABILITY_FROM_REMOTE, - bundleName, - abilityName, - signature - }; - - if (!dmsPacket.BuildDmsPacket(dmsMsgInfo, dataSize)) { - printf("[hcpptest]E BuildDmsPacket failed"); - } - - auto onStartAbilityDone = [] (int8_t errCode) { - printf("[hcpptest]onStartAbilityDone call and errCode:%d \n", errCode); - }; - - int8_t resultCode = RunTest((uint8_t *)buffer, dataSize, nullptr, onStartAbilityDone); - ASSERT_EQ(resultCode, DMS_EC_START_ABILITY_SYNC_SUCCESS); -} - -/** - * @tc.number : DMSLite_DMS_StartAbilityFromRemoteFunc_0020 - * @tc.name : When start ability from remote with unknown comand id user get error code - * @tc.desc : [C- SOFTWARE -0200] -*/ -HWTEST_F(StartAbilityFromRemoteFuncTest, testStartAbilityFromRemoteFunc0020, Function | MediumTest | Level2) { - std::string bundleName = "com.huawei.helloworld"; - std::string abilityName = "AceAbility"; - std::string signature = "BERxL4Em2dAox98GRbsB31dRcsHDto7hjc5ztnc0cNMsHX33a0B2xgfJIJiGMBiAEcTlW3mbxzm6KIMyrKJj1z8="; - - char buffer[PACKET_DATA_SIZE] = {0}; - uint16_t dataSize = 0; - DmsPacket dmsPacket {buffer, PACKET_DATA_SIZE}; - DmsMsgInfo dmsMsgInfo = { - DMSLITE_COMMAND::START_ABILITY_FROM_REMOTE, - bundleName, - abilityName, - signature - }; - dmsMsgInfo.commandId = 9; - - if (!dmsPacket.BuildDmsPacket(dmsMsgInfo, dataSize)) { - printf("[hcpptest]E BuildDmsPacket failed"); - } - - auto onStartAbilityDone = [] (int8_t errCode) { - printf("[hcpptest]onStartAbilityDone call and errCode:%d \n", errCode); - }; - - int8_t resultCode = RunTest((uint8_t *)buffer, dataSize, nullptr, onStartAbilityDone); - ASSERT_EQ(resultCode, DMS_EC_UNKNOWN_COMMAND_ID); -} - -/** - * @tc.number : DMSLite_DMS_StartAbilityFromRemoteFunc_0030 - * @tc.name : When start ability from remote with unknown bundle name user get error code - * @tc.desc : [C- SOFTWARE -0200] -*/ -HWTEST_F(StartAbilityFromRemoteFuncTest, testStartAbilityFromRemoteFunc0030, Function | MediumTest | Level2) { - std::string bundleName = "com.huawei.unknownPackage"; - std::string abilityName = "AceAbility"; - std::string signature = "BERxL4Em2dAox98GRbsB31dRcsHDto7hjc5ztnc0cNMsHX33a0B2xgfJIJiGMBiAEcTlW3mbxzm6KIMyrKJj1z8="; - - char buffer[PACKET_DATA_SIZE] = {0}; - uint16_t dataSize = 0; - DmsPacket dmsPacket {buffer, PACKET_DATA_SIZE}; - DmsMsgInfo dmsMsgInfo = { - DMSLITE_COMMAND::START_ABILITY_FROM_REMOTE, - bundleName, - abilityName, - signature - }; - - if (!dmsPacket.BuildDmsPacket(dmsMsgInfo, dataSize)) { - printf("[hcpptest]E BuildDmsPacket failed"); - } - - auto onStartAbilityDone = [] (int8_t errCode) { - printf("[hcpptest]onStartAbilityDone call and errCode:%d \n", errCode); - }; - - int8_t resultCode = RunTest((uint8_t *)buffer, dataSize, nullptr, onStartAbilityDone); - ASSERT_EQ(resultCode, DMS_EC_GET_BUNDLEINFO_FAILURE); -} - -/** - * @tc.number : DMSLite_DMS_StartAbilityFromRemoteFunc_0040 - * @tc.name : When start ability from remote with unknown ability name user can not get error code - * @tc.desc : [C- SOFTWARE -0200] -*/ -HWTEST_F(StartAbilityFromRemoteFuncTest, testStartAbilityFromRemoteFunc0040, Function | MediumTest | Level2) { - std::string bundleName = "com.huawei.helloworld"; - std::string abilityName = "unknownAbility"; - std::string signature = "BERxL4Em2dAox98GRbsB31dRcsHDto7hjc5ztnc0cNMsHX33a0B2xgfJIJiGMBiAEcTlW3mbxzm6KIMyrKJj1z8="; - - char buffer[PACKET_DATA_SIZE] = {0}; - uint16_t dataSize = 0; - DmsPacket dmsPacket {buffer, PACKET_DATA_SIZE}; - DmsMsgInfo dmsMsgInfo = { - DMSLITE_COMMAND::START_ABILITY_FROM_REMOTE, - bundleName, - abilityName, - signature - }; - - if (!dmsPacket.BuildDmsPacket(dmsMsgInfo, dataSize)) { - printf("[hcpptest]E BuildDmsPacket failed"); - } - - auto onStartAbilityDone = [] (int8_t errCode) { - printf("[hcpptest]onStartAbilityDone call and errCode:%d \n", errCode); - }; - - int8_t resultCode = RunTest((uint8_t *)buffer, dataSize, nullptr, onStartAbilityDone); - ASSERT_EQ(resultCode, DMS_EC_START_ABILITY_SYNC_SUCCESS); -} - -/** - * @tc.number : DMSLite_DMS_StartAbilityFromRemoteFunc_0050 - * @tc.name : When start ability from remote with wrong signature user get error code - * @tc.desc : [C- SOFTWARE -0200] -*/ -HWTEST_F(StartAbilityFromRemoteFuncTest, testStartAbilityFromRemoteFunc0050, Function | MediumTest | Level2) { - std::string bundleName = "com.huawei.helloworld"; - std::string abilityName = "AceAbility"; - std::string signature = "wrongPublicKey"; - - char buffer[PACKET_DATA_SIZE] = {0}; - uint16_t dataSize = 0; - DmsPacket dmsPacket {buffer, PACKET_DATA_SIZE}; - DmsMsgInfo dmsMsgInfo = { - DMSLITE_COMMAND::START_ABILITY_FROM_REMOTE, - bundleName, - abilityName, - signature - }; - - if (!dmsPacket.BuildDmsPacket(dmsMsgInfo, dataSize)) { - printf("[hcpptest]E BuildDmsPacket failed"); - } - - auto onStartAbilityDone = [] (int8_t errCode) { - printf("[hcpptest]onStartAbilityDone call and errCode:%d \n", errCode); - }; - - int8_t resultCode = RunTest((uint8_t *)buffer, dataSize, nullptr, onStartAbilityDone); - ASSERT_EQ(resultCode, DMS_EC_CHECK_PERMISSION_FAILURE); -} - -/** - * @tc.number : DMSLite_DMS_StartAbilityFromRemoteFunc_0060 - * @tc.name : User can start ability repeatedly and no memory leak - * @tc.desc : [C- SOFTWARE -0200] -*/ -HWTEST_F(StartAbilityFromRemoteFuncTest, testStartAbilityFromRemoteFunc0060, Function | MediumTest | Level2) { - std::string bundleName = "com.huawei.helloworld"; - std::string abilityName = "AceAbility"; - std::string signature = "BERxL4Em2dAox98GRbsB31dRcsHDto7hjc5ztnc0cNMsHX33a0B2xgfJIJiGMBiAEcTlW3mbxzm6KIMyrKJj1z8="; - - char buffer[PACKET_DATA_SIZE] = {0}; - uint16_t dataSize = 0; - DmsPacket dmsPacket {buffer, PACKET_DATA_SIZE}; - DmsMsgInfo dmsMsgInfo = { - DMSLITE_COMMAND::START_ABILITY_FROM_REMOTE, - bundleName, - abilityName, - signature - }; - - if (!dmsPacket.BuildDmsPacket(dmsMsgInfo, dataSize)) { - printf("[hcpptest]E BuildDmsPacket failed"); - } - - auto onStartAbilityDone = [] (int8_t errCode) { - printf("[hcpptest]onStartAbilityDone call and errCode:%d \n", errCode); - }; - - for (int i = 0; i < PRESSURE_LEVEL0; i++) { - usleep(OPER_INTERVAL * MS2US); - int8_t resultCode = RunTest((uint8_t *)buffer, dataSize, nullptr, onStartAbilityDone); - ASSERT_EQ(resultCode, DMS_EC_START_ABILITY_SYNC_SUCCESS); - printf("[hcpptest]occurs: %d, resultCode:%d \n", i, resultCode); - } -} - -/** - * @tc.number : DMSLite_DMS_StartAbilityFromRemoteFunc_0070 - * @tc.name : When start ability from remote DMS cost time less than 50ms - * @tc.desc : [C- SOFTWARE -0200] -*/ -HWTEST_F(StartAbilityFromRemoteFuncTest, testStartAbilityFromRemoteFunc0070, Function | MediumTest | Level2) { - std::string bundleName = "com.huawei.helloworld"; - std::string abilityName = "AceAbility"; - std::string signature = "BERxL4Em2dAox98GRbsB31dRcsHDto7hjc5ztnc0cNMsHX33a0B2xgfJIJiGMBiAEcTlW3mbxzm6KIMyrKJj1z8="; - - char buffer[PACKET_DATA_SIZE] = {0}; - uint16_t dataSize = 0; - DmsPacket dmsPacket {buffer, PACKET_DATA_SIZE}; - DmsMsgInfo dmsMsgInfo = { - DMSLITE_COMMAND::START_ABILITY_FROM_REMOTE, - bundleName, - abilityName, - signature - }; - - if (!dmsPacket.BuildDmsPacket(dmsMsgInfo, dataSize)) { - printf("[hcpptest]E BuildDmsPacket failed"); - } - - auto onStartAbilityDone = [] (int8_t errCode) { - printf("[hcpptest]onStartAbilityDone call and errCode:%d \n", errCode); - }; - - long long totalTime = 0; - for (int i = 0; i < PRESSURE_LEVEL0; i++) { - usleep(OPER_INTERVAL * MS2US); - - long long startTime = GetSystemTime(); - RunTest((uint8_t *)buffer, dataSize, nullptr, onStartAbilityDone); - long long endTime = GetSystemTime(); - - totalTime = totalTime + (endTime - startTime); - } - - printf("[hcpptest]totalTime:%lld, averageTime:%lld \n", totalTime, totalTime / PRESSURE_LEVEL0); - - // usually it costs about 19ms, if bigger than 50ms need to analyse - ASSERT_EQ((totalTime / PRESSURE_LEVEL0) < 50, TRUE); -} \ No newline at end of file