diff --git a/interfaces/innerkits/appverify/src/provision/provision_verify.cpp b/interfaces/innerkits/appverify/src/provision/provision_verify.cpp index a93b989e6d5f57f2a18df96cd21b4f9fe5d00a49..7e8d4b87c10fc29a27cff9e2acfb1a15c2eeceeb 100644 --- a/interfaces/innerkits/appverify/src/provision/provision_verify.cpp +++ b/interfaces/innerkits/appverify/src/provision/provision_verify.cpp @@ -78,7 +78,6 @@ const string KEY_APP_IDENTIFIER = "app-identifier"; const string GENERIC_BUNDLE_NAME = ".*"; const string VALUE_DEVELOPMENT_MODE = "1"; -const int32_t MAXIMUM_NUM_DEVICES = 100; const int32_t VERSION_CODE_TWO = 2; const int32_t DEVELOPMENT_MODE_LENGTH = 2; @@ -298,10 +297,7 @@ AppProvisionVerifyResult CheckDeviceID(ProvisionInfo& info) return PROVISION_DEVICE_UNAUTHORIZED; } - if (info.debugInfo.deviceIds.size() > MAXIMUM_NUM_DEVICES) { - HAPVERIFY_LOG_ERROR(LABEL, "No. of device IDs in list exceed maximum number %{public}d", MAXIMUM_NUM_DEVICES); - return PROVISION_NUM_DEVICE_EXCEEDED; - } + HAPVERIFY_LOG_DEBUG(LABEL, "number of device ids in list: %{public}d", info.debugInfo.deviceIds.size()); if (info.debugInfo.deviceIdType != VALUE_DEVICE_ID_TYPE_UDID) { HAPVERIFY_LOG_ERROR(LABEL, "type of device ID is not supported."); diff --git a/interfaces/innerkits/appverify/src/ticket/ticket_verify.cpp b/interfaces/innerkits/appverify/src/ticket/ticket_verify.cpp index a2302c7c819a0f0fe8af0915612072c2fe6b234c..568119a61d693ffd8bd3438c12998fd4222c195e 100644 --- a/interfaces/innerkits/appverify/src/ticket/ticket_verify.cpp +++ b/interfaces/innerkits/appverify/src/ticket/ticket_verify.cpp @@ -36,7 +36,6 @@ #include "util/pkcs7_context.h" namespace { -const int32_t MAXIMUM_DEVICES = 100; const int32_t TICKET_MAX_SIZE = 18432; const std::string TICKET_FILE_PATH = "/data/update/ticket/"; const std::string VALUE_DEVICE_TYPE_UDID = "udid"; @@ -84,10 +83,7 @@ AppProvisionVerifyResult CheckDevice(ProvisionInfo& info) return PROVISION_DEVICE_UNAUTHORIZED; } - if (info.debugInfo.deviceIds.size() > MAXIMUM_DEVICES) { - HAPVERIFY_LOG_ERROR(LABEL, "No. of device IDs in list exceed maximum number %{public}d", MAXIMUM_DEVICES); - return PROVISION_NUM_DEVICE_EXCEEDED; - } + HAPVERIFY_LOG_DEBUG(LABEL, "number of device ids in list: %{public}d", info.debugInfo.deviceIds.size()); if (info.debugInfo.deviceIdType != VALUE_DEVICE_TYPE_UDID) { HAPVERIFY_LOG_ERROR(LABEL, "type of device ID is not supported."); diff --git a/interfaces/innerkits/appverify/test/unittest/src/provision_verify_test.cpp b/interfaces/innerkits/appverify/test/unittest/src/provision_verify_test.cpp index 0d4af4dd1cadb4df2a3d6ea0f003d5af228a0874..c72ccbe1fe11eac86086100abacf4efe9577c64e 100644 --- a/interfaces/innerkits/appverify/test/unittest/src/provision_verify_test.cpp +++ b/interfaces/innerkits/appverify/test/unittest/src/provision_verify_test.cpp @@ -315,9 +315,9 @@ HWTEST_F(ProvisionVerifyTest, ProvisionVerify004, TestSize.Level1) HWTEST_F(ProvisionVerifyTest, ProvisionVerify005, TestSize.Level1) { /* - * @tc.steps: step5. input a HarmonyAppProvision with a list of device IDs (Exceed maximum number) + * @tc.steps: step5. input a HarmonyAppProvision with a list of device IDs (Exceed 100) * and run ParseAndVerify function. - * @tc.expected: step5. return code will be PROVISION_NUM_DEVICE_EXCEEDED. + * @tc.expected: step5. return code will be PROVISION_OK. */ std::string prefixNumDeviceExceededProvision = R"( { @@ -346,11 +346,20 @@ HWTEST_F(ProvisionVerifyTest, ProvisionVerify005, TestSize.Level1) for (int32_t i = 0; i < MAXIMUM_NUM_DEVICES; i++) { prefixNumDeviceExceededProvision += R"("1234ABCD",)"; } - prefixNumDeviceExceededProvision += R"("1234ABCD")"; + string deviceId = ""; +#ifndef STANDARD_SYSTEM + OHOS::AccountSA::OhosAccountKits::GetInstance().GetUdid(deviceId); +#else + char udid[DEV_UUID_LEN] = {0}; + int32_t udidRet = GetDevUdid(udid, sizeof(udid)); + ASSERT_EQ(udidRet, EC_SUCCESS); + deviceId = std::string(udid, sizeof(udid) - 1); +#endif + prefixNumDeviceExceededProvision += R"(")" + deviceId + R"(")"; prefixNumDeviceExceededProvision += postfixNumDeviceExceededProvision; ProvisionInfo info; int32_t ret = ParseAndVerify(prefixNumDeviceExceededProvision, info); - ASSERT_EQ(ret, AppProvisionVerifyResult::PROVISION_NUM_DEVICE_EXCEEDED); + ASSERT_EQ(ret, AppProvisionVerifyResult::PROVISION_OK); } /**