From 9af13a1747882bbaa34c36f01c74eddda7b68abb Mon Sep 17 00:00:00 2001 From: xinking129 Date: Sat, 1 Jul 2023 18:32:20 +0800 Subject: [PATCH 1/3] NFC Test Add AbilitySkillInfo Or ExtensionAbilitySkillInfo And Test Select Types. Signed-off-by: xinking129 --- .../bms_bundle_data_storage_database_test.cpp | 40 ++++ .../bms_bundle_data_mgr_test.cpp | 194 ++++++++++++++++++ 2 files changed, 234 insertions(+) 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 4e7047a1b7..c9a0f8e1de 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 @@ -1833,6 +1833,46 @@ HWTEST_F(BmsBundleDataStorageDatabaseTest, InnerBundleInfo_0200, Function | Smal EXPECT_EQ(ret, true); } +/** + * @tc.number: InnerBundleInfo_0300 + * @tc.name: Test Match + * @tc.desc: Use Match to match Types's different Uri And Type of InnerBundleInfoCpp + */ +HWTEST_F(BmsBundleDataStorageDatabaseTest, InnerBundleInfo_0300, Function | SmallTest | Level1) +{ + OHOS::AAFwk::Want wantForNFC; + const std::string strActionForNFC = "ohos.nfc.tag.action.TAG_FOUND"; + const std::string strType = "tag-tech/NFcA"; + wantForNFC.SetAction(strActionForNFC); + wantForNFC.SetType(strType); + std::vector vecTypes; + vecTypes.emplace_back("tag-tech/NFcA"); + vecTypes.emplace_back("tag-tech/IsoDep"); + const std::string strkey = "ohos.ability.params.uriTypes"; + wantForNFC.SetParam(strkey, vecTypes); + Skill skillForNFC; + std::vector vecActions; + vecActions.emplace_back("action.system.home"); + vecActions.emplace_back("ohos.nfc.tag.action.TAG_FOUND"); + skillForNFC.actions = vecActions; + std::vector vecUrisForNFC; + SkillUri urisForNFC1; + urisForNFC1.type = "tag-tech/NFcA"; + vecUrisForNFC.emplace_back(urisForNFC1); + SkillUri urisForNFC2; + urisForNFC2.type = "tag-tech/IsoDep"; + vecUrisForNFC.emplace_back(urisForNFC2); + skillForNFC.uris = vecUrisForNFC; + bool ret = skillForNFC.Match(wantForNFC); + EXPECT_EQ(ret, true); + + vecTypes[0] = "tag-tech/a"; + vecTypes[1] = "tag-tech/b"; + wantForNFC.SetParam(strkey, vecTypes); + ret = skillForNFC.Match(wantForNFC); + EXPECT_EQ(ret, false); +} + /** * @tc.number: InnerBundleInfo_0400 * @tc.name: Test BuildDefaultUserInfo diff --git a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_data_mgr_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_data_mgr_test.cpp index ab3afe08f9..0459112a21 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_data_mgr_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_data_mgr_test.cpp @@ -3361,4 +3361,198 @@ HWTEST_F(BmsBundleDataMgrTest, BundleExceptionHandler_0200, TestSize.Level1) ret = BundleUtil::DeleteDir(moduleDir); EXPECT_TRUE(ret); } + +/** + * @tc.number: TestAddAbilitySkillUrisInfo_0100 + * @tc.name: test AddAbilitySkillUrisInfo + * @tc.desc: 1.AddAbilitySkillUrisInfo + */ +HWTEST_F(BmsBundleDataMgrTest, TestAddAbilitySkillUrisInfo_0100, Function | MediumTest | Level1) +{ + auto dataMgr = GetBundleDataMgr(); + EXPECT_NE(dataMgr, nullptr); + + int32_t flags = 512; + SkillUri uri1; + uri1.scheme = "scheme1"; + uri1.host = "host1"; + uri1.port = "port1"; + uri1.path = "path1"; + uri1.pathStartWith = "pathStartWith1"; + uri1.pathRegex = "pathRegex1"; + uri1.type = "type1"; + + SkillUri uri2; + uri2.scheme = "scheme2"; + uri2.host = "host2"; + uri2.port = "port2"; + uri2.path = "path2"; + uri2.pathStartWith = "pathStartWith2"; + uri2.pathRegex = "pathRegex2"; + uri2.type = "type2"; + + Skill skill; + std::vector vecUris; + vecUris.emplace_back(uri1); + vecUris.emplace_back(uri2); + skill.uris = vecUris; + AbilityInfo abilityInfo; + dataMgr->AddAbilitySkillUrisInfo(flags, skill, abilityInfo); + if (abilityInfo.skillUri.size() > 0) + { + EXPECT_STREQ(abilityInfo.skillUri[0].scheme.c_str(), uri1.scheme.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[0].host.c_str(), uri1.host.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[0].port.c_str(), uri1.port.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[0].path.c_str(), uri1.path.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[0].pathStartWith.c_str(), uri1.pathStartWith.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[0].pathRegex.c_str(), uri1.pathRegex.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[0].type.c_str(), uri1.type.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[1].scheme.c_str(), uri2.scheme.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[1].host.c_str(), uri2.host.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[1].port.c_str(), uri2.port.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[1].path.c_str(), uri2.path.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[1].pathStartWith.c_str(), uri2.pathStartWith.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[1].pathRegex.c_str(), uri2.pathRegex.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[1].type.c_str(), uri2.type.c_str()); + } + else + { + EXPECT_TRUE(false); + } +} + +/** + * @tc.number: TestAddAbilitySkillUrisInfo_0200 + * @tc.name: test AddAbilitySkillUrisInfo + * @tc.desc: 1.AddAbilitySkillUrisInfo + */ +HWTEST_F(BmsBundleDataMgrTest, TestAddAbilitySkillUrisInfo_0200, Function | MediumTest | Level1) +{ + auto dataMgr = GetBundleDataMgr(); + EXPECT_NE(dataMgr, nullptr); + + int32_t flags = 1024; + SkillUri uri1; + uri1.scheme = "scheme1"; + uri1.host = "host1"; + uri1.port = "port1"; + uri1.path = "path1"; + uri1.pathStartWith = "pathStartWith1"; + uri1.pathRegex = "pathRegex1"; + uri1.type = "type1"; + + SkillUri uri2; + uri2.scheme = "scheme2"; + uri2.host = "host2"; + uri2.port = "port2"; + uri2.path = "path2"; + uri2.pathStartWith = "pathStartWith2"; + uri2.pathRegex = "pathRegex2"; + uri2.type = "type2"; + + Skill skill; + std::vector vecUris; + vecUris.emplace_back(uri1); + vecUris.emplace_back(uri2); + AbilityInfo abilityInfo; + dataMgr->AddAbilitySkillUrisInfo(flags, skill, abilityInfo); + EXPECT_EQ(abilityInfo.skillUri.size(), 0); +} +/** + * @tc.number: TestAddExtensionSkillUrisInfo_0100 + * @tc.name: test AddExtensionSkillUrisInfo + * @tc.desc: 1.AddExtensionSkillUrisInfo + */ +HWTEST_F(BmsBundleDataMgrTest, TestAddExtensionSkillUrisInfo_0100, Function | MediumTest | Level1) +{ + auto dataMgr = GetBundleDataMgr(); + EXPECT_NE(dataMgr, nullptr); + + int32_t flags = 512; + SkillUri uri1; + uri1.scheme = "scheme1"; + uri1.host = "host1"; + uri1.port = "port1"; + uri1.path = "path1"; + uri1.pathStartWith = "pathStartWith1"; + uri1.pathRegex = "pathRegex1"; + uri1.type = "type1"; + + SkillUri uri2; + uri2.scheme = "scheme2"; + uri2.host = "host2"; + uri2.port = "port2"; + uri2.path = "path2"; + uri2.pathStartWith = "pathStartWith2"; + uri2.pathRegex = "pathRegex2"; + uri2.type = "type2"; + + Skill skill; + std::vector vecUris; + vecUris.emplace_back(uri1); + vecUris.emplace_back(uri2); + skill.uris = vecUris; + ExtensionAbilityInfo extensionAbilityInfo; + dataMgr->AddExtensionSkillUrisInfo(flags, skill, extensionAbilityInfo); + if (extensionAbilityInfo.skillUri.size() > 0) + { + EXPECT_STREQ(extensionAbilityInfo.skillUri[0].scheme.c_str(), uri1.scheme.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[0].host.c_str(), uri1.host.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[0].port.c_str(), uri1.port.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[0].path.c_str(), uri1.path.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[0].pathStartWith.c_str(), uri1.pathStartWith.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[0].pathRegex.c_str(), uri1.pathRegex.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[0].type.c_str(), uri1.type.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[1].scheme.c_str(), uri2.scheme.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[1].host.c_str(), uri2.host.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[1].port.c_str(), uri2.port.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[1].path.c_str(), uri2.path.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[1].pathStartWith.c_str(), uri2.pathStartWith.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[1].pathRegex.c_str(), uri2.pathRegex.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[1].type.c_str(), uri2.type.c_str()); + } + else + { + EXPECT_TRUE(false); + } +} + +/** + * @tc.number: TestAddAbilitySkillUrisInfo_0200 + * @tc.name: test AddAbilitySkillUrisInfo + * @tc.desc: 1.AddAbilitySkillUrisInfo + */ +HWTEST_F(BmsBundleDataMgrTest, TestAddExtensionSkillUrisInfo_0200, Function | MediumTest | Level1) +{ + auto dataMgr = GetBundleDataMgr(); + EXPECT_NE(dataMgr, nullptr); + + int32_t flags = 1024; + SkillUri uri1; + uri1.scheme = "scheme1"; + uri1.host = "host1"; + uri1.port = "port1"; + uri1.path = "path1"; + uri1.pathStartWith = "pathStartWith1"; + uri1.pathRegex = "pathRegex1"; + uri1.type = "type1"; + + SkillUri uri2; + uri2.scheme = "scheme2"; + uri2.host = "host2"; + uri2.port = "port2"; + uri2.path = "path2"; + uri2.pathStartWith = "pathStartWith2"; + uri2.pathRegex = "pathRegex2"; + uri2.type = "type2"; + + Skill skill; + std::vector vecUris; + vecUris.emplace_back(uri1); + vecUris.emplace_back(uri2); + skill.uris = vecUris; + ExtensionAbilityInfo extensionAbilityInfo; + dataMgr->AddExtensionSkillUrisInfo(flags, skill, extensionAbilityInfo); + EXPECT_EQ(extensionAbilityInfo.skillUri.size(), 0); +} } \ No newline at end of file -- Gitee From 4a6c294090d7970c72af45f875ac8d6ae3c3e7a4 Mon Sep 17 00:00:00 2001 From: xinking129 Date: Fri, 7 Jul 2023 10:49:34 +0800 Subject: [PATCH 2/3] change mistake Signed-off-by: xinking129 --- .../bms_bundle_data_storage_database_test.cpp | 12 +- .../bms_bundle_data_mgr_test.cpp | 223 +++++++++--------- 2 files changed, 115 insertions(+), 120 deletions(-) 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 c9a0f8e1de..a7b34d7948 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 @@ -1856,12 +1856,12 @@ HWTEST_F(BmsBundleDataStorageDatabaseTest, InnerBundleInfo_0300, Function | Smal vecActions.emplace_back("ohos.nfc.tag.action.TAG_FOUND"); skillForNFC.actions = vecActions; std::vector vecUrisForNFC; - SkillUri urisForNFC1; - urisForNFC1.type = "tag-tech/NFcA"; - vecUrisForNFC.emplace_back(urisForNFC1); - SkillUri urisForNFC2; - urisForNFC2.type = "tag-tech/IsoDep"; - vecUrisForNFC.emplace_back(urisForNFC2); + SkillUri urisForNFCFirst; + urisForNFCFirst.type = "tag-tech/NFcA"; + vecUrisForNFC.emplace_back(urisForNFCFirst); + SkillUri urisForNFCSecond; + urisForNFCSecond.type = "tag-tech/IsoDep"; + vecUrisForNFC.emplace_back(urisForNFCSecond); skillForNFC.uris = vecUrisForNFC; bool ret = skillForNFC.Match(wantForNFC); EXPECT_EQ(ret, true); diff --git a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_data_mgr_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_data_mgr_test.cpp index 0459112a21..a4fb768485 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_data_mgr_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_data_mgr_test.cpp @@ -3373,52 +3373,50 @@ HWTEST_F(BmsBundleDataMgrTest, TestAddAbilitySkillUrisInfo_0100, Function | Medi EXPECT_NE(dataMgr, nullptr); int32_t flags = 512; - SkillUri uri1; - uri1.scheme = "scheme1"; - uri1.host = "host1"; - uri1.port = "port1"; - uri1.path = "path1"; - uri1.pathStartWith = "pathStartWith1"; - uri1.pathRegex = "pathRegex1"; - uri1.type = "type1"; - - SkillUri uri2; - uri2.scheme = "scheme2"; - uri2.host = "host2"; - uri2.port = "port2"; - uri2.path = "path2"; - uri2.pathStartWith = "pathStartWith2"; - uri2.pathRegex = "pathRegex2"; - uri2.type = "type2"; + SkillUri uriFirst; + uriFirst.scheme = "scheme1"; + uriFirst.host = "host1"; + uriFirst.port = "port1"; + uriFirst.path = "path1"; + uriFirst.pathStartWith = "pathStartWith1"; + uriFirst.pathRegex = "pathRegex1"; + uriFirst.type = "type1"; + + SkillUri uriSecond; + uriSecond.scheme = "scheme2"; + uriSecond.host = "host2"; + uriSecond.port = "port2"; + uriSecond.path = "path2"; + uriSecond.pathStartWith = "pathStartWith2"; + uriSecond.pathRegex = "pathRegex2"; + uriSecond.type = "type2"; Skill skill; std::vector vecUris; - vecUris.emplace_back(uri1); - vecUris.emplace_back(uri2); + vecUris.emplace_back(uriFirst); + vecUris.emplace_back(uriSecond); skill.uris = vecUris; AbilityInfo abilityInfo; dataMgr->AddAbilitySkillUrisInfo(flags, skill, abilityInfo); - if (abilityInfo.skillUri.size() > 0) - { - EXPECT_STREQ(abilityInfo.skillUri[0].scheme.c_str(), uri1.scheme.c_str()); - EXPECT_STREQ(abilityInfo.skillUri[0].host.c_str(), uri1.host.c_str()); - EXPECT_STREQ(abilityInfo.skillUri[0].port.c_str(), uri1.port.c_str()); - EXPECT_STREQ(abilityInfo.skillUri[0].path.c_str(), uri1.path.c_str()); - EXPECT_STREQ(abilityInfo.skillUri[0].pathStartWith.c_str(), uri1.pathStartWith.c_str()); - EXPECT_STREQ(abilityInfo.skillUri[0].pathRegex.c_str(), uri1.pathRegex.c_str()); - EXPECT_STREQ(abilityInfo.skillUri[0].type.c_str(), uri1.type.c_str()); - EXPECT_STREQ(abilityInfo.skillUri[1].scheme.c_str(), uri2.scheme.c_str()); - EXPECT_STREQ(abilityInfo.skillUri[1].host.c_str(), uri2.host.c_str()); - EXPECT_STREQ(abilityInfo.skillUri[1].port.c_str(), uri2.port.c_str()); - EXPECT_STREQ(abilityInfo.skillUri[1].path.c_str(), uri2.path.c_str()); - EXPECT_STREQ(abilityInfo.skillUri[1].pathStartWith.c_str(), uri2.pathStartWith.c_str()); - EXPECT_STREQ(abilityInfo.skillUri[1].pathRegex.c_str(), uri2.pathRegex.c_str()); - EXPECT_STREQ(abilityInfo.skillUri[1].type.c_str(), uri2.type.c_str()); - } - else - { + if (abilityInfo.skillUri.size() = 0) { EXPECT_TRUE(false); + return; } + + EXPECT_STREQ(abilityInfo.skillUri[0].scheme.c_str(), uriFirst.scheme.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[0].host.c_str(), uriFirst.host.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[0].port.c_str(), uriFirst.port.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[0].path.c_str(), uriFirst.path.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[0].pathStartWith.c_str(), uriFirst.pathStartWith.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[0].pathRegex.c_str(), uriFirst.pathRegex.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[0].type.c_str(), uriFirst.type.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[1].scheme.c_str(), uriSecond.scheme.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[1].host.c_str(), uriSecond.host.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[1].port.c_str(), uriSecond.port.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[1].path.c_str(), uriSecond.path.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[1].pathStartWith.c_str(), uriSecond.pathStartWith.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[1].pathRegex.c_str(), uriSecond.pathRegex.c_str()); + EXPECT_STREQ(abilityInfo.skillUri[1].type.c_str(), uriSecond.type.c_str()); } /** @@ -3432,28 +3430,28 @@ HWTEST_F(BmsBundleDataMgrTest, TestAddAbilitySkillUrisInfo_0200, Function | Medi EXPECT_NE(dataMgr, nullptr); int32_t flags = 1024; - SkillUri uri1; - uri1.scheme = "scheme1"; - uri1.host = "host1"; - uri1.port = "port1"; - uri1.path = "path1"; - uri1.pathStartWith = "pathStartWith1"; - uri1.pathRegex = "pathRegex1"; - uri1.type = "type1"; - - SkillUri uri2; - uri2.scheme = "scheme2"; - uri2.host = "host2"; - uri2.port = "port2"; - uri2.path = "path2"; - uri2.pathStartWith = "pathStartWith2"; - uri2.pathRegex = "pathRegex2"; - uri2.type = "type2"; + SkillUri uriFirst; + uriFirst.scheme = "scheme1"; + uriFirst.host = "host1"; + uriFirst.port = "port1"; + uriFirst.path = "path1"; + uriFirst.pathStartWith = "pathStartWith1"; + uriFirst.pathRegex = "pathRegex1"; + uriFirst.type = "type1"; + + SkillUri uriSecond; + uriSecond.scheme = "scheme2"; + uriSecond.host = "host2"; + uriSecond.port = "port2"; + uriSecond.path = "path2"; + uriSecond.pathStartWith = "pathStartWith2"; + uriSecond.pathRegex = "pathRegex2"; + uriSecond.type = "type2"; Skill skill; std::vector vecUris; - vecUris.emplace_back(uri1); - vecUris.emplace_back(uri2); + vecUris.emplace_back(uriFirst); + vecUris.emplace_back(uriSecond); AbilityInfo abilityInfo; dataMgr->AddAbilitySkillUrisInfo(flags, skill, abilityInfo); EXPECT_EQ(abilityInfo.skillUri.size(), 0); @@ -3469,52 +3467,49 @@ HWTEST_F(BmsBundleDataMgrTest, TestAddExtensionSkillUrisInfo_0100, Function | Me EXPECT_NE(dataMgr, nullptr); int32_t flags = 512; - SkillUri uri1; - uri1.scheme = "scheme1"; - uri1.host = "host1"; - uri1.port = "port1"; - uri1.path = "path1"; - uri1.pathStartWith = "pathStartWith1"; - uri1.pathRegex = "pathRegex1"; - uri1.type = "type1"; - - SkillUri uri2; - uri2.scheme = "scheme2"; - uri2.host = "host2"; - uri2.port = "port2"; - uri2.path = "path2"; - uri2.pathStartWith = "pathStartWith2"; - uri2.pathRegex = "pathRegex2"; - uri2.type = "type2"; + SkillUri uriFirst; + uriFirst.scheme = "scheme1"; + uriFirst.host = "host1"; + uriFirst.port = "port1"; + uriFirst.path = "path1"; + uriFirst.pathStartWith = "pathStartWith1"; + uriFirst.pathRegex = "pathRegex1"; + uriFirst.type = "type1"; + + SkillUri uriSecond; + uriSecond.scheme = "scheme2"; + uriSecond.host = "host2"; + uriSecond.port = "port2"; + uriSecond.path = "path2"; + uriSecond.pathStartWith = "pathStartWith2"; + uriSecond.pathRegex = "pathRegex2"; + uriSecond.type = "type2"; Skill skill; std::vector vecUris; - vecUris.emplace_back(uri1); - vecUris.emplace_back(uri2); + vecUris.emplace_back(uriFirst); + vecUris.emplace_back(uriSecond); skill.uris = vecUris; ExtensionAbilityInfo extensionAbilityInfo; dataMgr->AddExtensionSkillUrisInfo(flags, skill, extensionAbilityInfo); - if (extensionAbilityInfo.skillUri.size() > 0) - { - EXPECT_STREQ(extensionAbilityInfo.skillUri[0].scheme.c_str(), uri1.scheme.c_str()); - EXPECT_STREQ(extensionAbilityInfo.skillUri[0].host.c_str(), uri1.host.c_str()); - EXPECT_STREQ(extensionAbilityInfo.skillUri[0].port.c_str(), uri1.port.c_str()); - EXPECT_STREQ(extensionAbilityInfo.skillUri[0].path.c_str(), uri1.path.c_str()); - EXPECT_STREQ(extensionAbilityInfo.skillUri[0].pathStartWith.c_str(), uri1.pathStartWith.c_str()); - EXPECT_STREQ(extensionAbilityInfo.skillUri[0].pathRegex.c_str(), uri1.pathRegex.c_str()); - EXPECT_STREQ(extensionAbilityInfo.skillUri[0].type.c_str(), uri1.type.c_str()); - EXPECT_STREQ(extensionAbilityInfo.skillUri[1].scheme.c_str(), uri2.scheme.c_str()); - EXPECT_STREQ(extensionAbilityInfo.skillUri[1].host.c_str(), uri2.host.c_str()); - EXPECT_STREQ(extensionAbilityInfo.skillUri[1].port.c_str(), uri2.port.c_str()); - EXPECT_STREQ(extensionAbilityInfo.skillUri[1].path.c_str(), uri2.path.c_str()); - EXPECT_STREQ(extensionAbilityInfo.skillUri[1].pathStartWith.c_str(), uri2.pathStartWith.c_str()); - EXPECT_STREQ(extensionAbilityInfo.skillUri[1].pathRegex.c_str(), uri2.pathRegex.c_str()); - EXPECT_STREQ(extensionAbilityInfo.skillUri[1].type.c_str(), uri2.type.c_str()); - } - else - { + if (extensionAbilityInfo.skillUri.size() > 0) { EXPECT_TRUE(false); + return; } + EXPECT_STREQ(extensionAbilityInfo.skillUri[0].scheme.c_str(), uriFirst.scheme.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[0].host.c_str(), uriFirst.host.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[0].port.c_str(), uriFirst.port.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[0].path.c_str(), uriFirst.path.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[0].pathStartWith.c_str(), uriFirst.pathStartWith.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[0].pathRegex.c_str(), uriFirst.pathRegex.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[0].type.c_str(), uriFirst.type.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[1].scheme.c_str(), uriSecond.scheme.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[1].host.c_str(), uriSecond.host.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[1].port.c_str(), uriSecond.port.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[1].path.c_str(), uriSecond.path.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[1].pathStartWith.c_str(), uriSecond.pathStartWith.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[1].pathRegex.c_str(), uriSecond.pathRegex.c_str()); + EXPECT_STREQ(extensionAbilityInfo.skillUri[1].type.c_str(), uriSecond.type.c_str()); } /** @@ -3528,28 +3523,28 @@ HWTEST_F(BmsBundleDataMgrTest, TestAddExtensionSkillUrisInfo_0200, Function | Me EXPECT_NE(dataMgr, nullptr); int32_t flags = 1024; - SkillUri uri1; - uri1.scheme = "scheme1"; - uri1.host = "host1"; - uri1.port = "port1"; - uri1.path = "path1"; - uri1.pathStartWith = "pathStartWith1"; - uri1.pathRegex = "pathRegex1"; - uri1.type = "type1"; - - SkillUri uri2; - uri2.scheme = "scheme2"; - uri2.host = "host2"; - uri2.port = "port2"; - uri2.path = "path2"; - uri2.pathStartWith = "pathStartWith2"; - uri2.pathRegex = "pathRegex2"; - uri2.type = "type2"; + SkillUri uriFirst; + uriFirst.scheme = "scheme1"; + uriFirst.host = "host1"; + uriFirst.port = "port1"; + uriFirst.path = "path1"; + uriFirst.pathStartWith = "pathStartWith1"; + uriFirst.pathRegex = "pathRegex1"; + uriFirst.type = "type1"; + + SkillUri uriSecond; + uriSecond.scheme = "scheme2"; + uriSecond.host = "host2"; + uriSecond.port = "port2"; + uriSecond.path = "path2"; + uriSecond.pathStartWith = "pathStartWith2"; + uriSecond.pathRegex = "pathRegex2"; + uriSecond.type = "type2"; Skill skill; std::vector vecUris; - vecUris.emplace_back(uri1); - vecUris.emplace_back(uri2); + vecUris.emplace_back(uriFirst); + vecUris.emplace_back(uriSecond); skill.uris = vecUris; ExtensionAbilityInfo extensionAbilityInfo; dataMgr->AddExtensionSkillUrisInfo(flags, skill, extensionAbilityInfo); -- Gitee From 939c17d59dcf976c33ab94f8fb18728169142400 Mon Sep 17 00:00:00 2001 From: xinking129 Date: Fri, 7 Jul 2023 14:50:52 +0800 Subject: [PATCH 3/3] change mistake Signed-off-by: xinking129 --- .../bms_bundle_kit_service_test/bms_bundle_data_mgr_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_data_mgr_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_data_mgr_test.cpp index b667abe72d..013457ffcd 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_data_mgr_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_data_mgr_test.cpp @@ -3576,7 +3576,7 @@ HWTEST_F(BmsBundleDataMgrTest, TestAddAbilitySkillUrisInfo_0100, Function | Medi skill.uris = vecUris; AbilityInfo abilityInfo; dataMgr->AddAbilitySkillUrisInfo(flags, skill, abilityInfo); - if (abilityInfo.skillUri.size() = 0) { + if (abilityInfo.skillUri.size() == 0) { EXPECT_TRUE(false); return; } @@ -3670,7 +3670,7 @@ HWTEST_F(BmsBundleDataMgrTest, TestAddExtensionSkillUrisInfo_0100, Function | Me skill.uris = vecUris; ExtensionAbilityInfo extensionAbilityInfo; dataMgr->AddExtensionSkillUrisInfo(flags, skill, extensionAbilityInfo); - if (extensionAbilityInfo.skillUri.size() > 0) { + if (extensionAbilityInfo.skillUri.size() == 0) { EXPECT_TRUE(false); return; } -- Gitee