From 275f5539b54c953be26ee6cb0e750ad7beed300f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E6=B0=B8=E5=BB=B6?= Date: Thu, 28 Oct 2021 09:18:20 +0000 Subject: [PATCH] update aafwk_lite/ability_posix/src/AbilityMgrTest.cpp. --- .../ability_posix/src/AbilityMgrTest.cpp | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/aafwk_lite/ability_posix/src/AbilityMgrTest.cpp b/aafwk_lite/ability_posix/src/AbilityMgrTest.cpp index f09483d9a..a58703033 100755 --- a/aafwk_lite/ability_posix/src/AbilityMgrTest.cpp +++ b/aafwk_lite/ability_posix/src/AbilityMgrTest.cpp @@ -146,7 +146,7 @@ protected: bool uninstallResult = false; sem_init(&g_sem, 0, 0); InstallParam installParam = { .installLocation = 1, .keepData = false }; - uninstallResult = Uninstall("com.huawei.testnative", &installParam, TestBundleStateCallback); + uninstallResult = Uninstall("com.openharmony.testnative", &installParam, TestBundleStateCallback); sem_wait(&g_sem); if (uninstallResult) { printf("sem exit \n"); @@ -207,14 +207,14 @@ HWTEST_F(AbilityMgrTest, testSetWantElement, Function | MediumTest | Level0) Want want = { nullptr }; ElementName element = { nullptr }; SetElementDeviceID(&element, "0001000"); - SetElementBundleName(&element, "com.huawei.testnative"); + SetElementBundleName(&element, "com.openharmony.testnative"); SetElementAbilityName(&element, "SecondAbility"); if (element.abilityName != nullptr) { bool setResult = SetWantElement(&want, element); if (setResult) { EXPECT_STREQ(want.element->deviceId, "0001000"); EXPECT_STREQ(want.element->abilityName, "SecondAbility"); - EXPECT_STREQ(want.element->bundleName, "com.huawei.testnative"); + EXPECT_STREQ(want.element->bundleName, "com.openharmony.testnative"); } } ClearElement(&element); @@ -280,14 +280,14 @@ HWTEST_F(AbilityMgrTest, testWantToUri, Function | MediumTest | Level0) Want want = { nullptr }; ElementName element = { nullptr }; SetElementDeviceID(&element, "0001000"); - SetElementBundleName(&element, "com.huawei.testnative"); + SetElementBundleName(&element, "com.openharmony.testnative"); SetElementAbilityName(&element, "SecondAbility"); if (element.abilityName !=nullptr) { bool setResult = SetWantElement(&want, element); if (setResult) { const char *uri = WantToUri(want); printf("uri is %s \n", uri); - const char *expectResult = "#Want;device=0001000;bundle=com.huawei.testnative;ability=SecondAbility;end"; + const char *expectResult = "#Want;device=0001000;bundle=com.openharmony.testnative;ability=SecondAbility;end"; EXPECT_STREQ(uri, expectResult); free((void*)uri); } @@ -367,7 +367,7 @@ HWTEST_F(AbilityMgrTest, testWantParseUri, Function | MediumTest | Level0) Want want = { nullptr }; ElementName element = { nullptr }; SetElementDeviceID(&element, "0001000"); - SetElementBundleName(&element, "com.huawei.testnative"); + SetElementBundleName(&element, "com.openharmony.testnative"); SetElementAbilityName(&element, "SecondAbility"); if (element.abilityName != nullptr) { bool setResult = SetWantElement(&want, element); @@ -446,7 +446,7 @@ HWTEST_F(AbilityMgrTest, testGetBundleNameIllegal, Function | MediumTest | Level memset_s(&want, sizeof(Want), 0, sizeof(Want)); ElementName element; memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName)); - SetElementBundleName(&element, "com.huawei.testnative"); + SetElementBundleName(&element, "com.openharmony.testnative"); SetElementAbilityName(&element, "SecondAbility"); SetWantElement(&want, element); int result = StartAbility(&want); @@ -468,7 +468,7 @@ HWTEST_F(AbilityMgrTest, testGetSrcPathIllegal, Function | MediumTest | Level1) printf("------start testGetSrcPathIllegal------\n"); Want want = { nullptr }; ElementName element = { nullptr }; - SetElementBundleName(&element, "com.huawei.testnative"); + SetElementBundleName(&element, "com.openharmony.testnative"); SetElementAbilityName(&element, "SecondAbility"); SetWantElement(&want, element); int result = StartAbility(&want); @@ -489,7 +489,7 @@ HWTEST_F(AbilityMgrTest, testGetDataPathIllegal, Function | MediumTest | Level1) printf("------start testGetDataPathIllegal------\n"); Want want = { nullptr }; ElementName element = { nullptr }; - SetElementBundleName(&element, "com.huawei.testnative"); + SetElementBundleName(&element, "com.openharmony.testnative"); SetElementAbilityName(&element, "SecondAbility"); SetWantElement(&want, element); int result = StartAbility(&want); @@ -513,7 +513,7 @@ HWTEST_F(AbilityMgrTest, testDumpIllegal, Function | MediumTest | Level1) memset_s(&want, sizeof(Want), 0, sizeof(Want)); ElementName element; memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName)); - SetElementBundleName(&element, "com.huawei.testnative"); + SetElementBundleName(&element, "com.openharmony.testnative"); SetElementAbilityName(&element, "SecondAbility"); SetWantElement(&want, element); Ability *ability = new Ability(); @@ -536,7 +536,7 @@ HWTEST_F(AbilityMgrTest, testStartAbility, Function | MediumTest | Level1) printf("------start testStartAbility------\n"); Want want = { nullptr }; ElementName element = { nullptr }; - SetElementBundleName(&element, "com.huawei.testnative"); + SetElementBundleName(&element, "com.openharmony.testnative"); SetElementAbilityName(&element, "MainAbility"); SetWantElement(&want, element); int result = StartAbility(&want); @@ -573,7 +573,7 @@ HWTEST_F(AbilityMgrTest, testStopAbility, Function | MediumTest | Level0) printf("------start testStopAbility------\n"); Want want = { nullptr }; ElementName element = { nullptr }; - SetElementBundleName(&element, "com.huawei.testnative"); + SetElementBundleName(&element, "com.openharmony.testnative"); SetElementAbilityName(&element, "ServiceAbility"); SetWantElement(&want, element); g_errorCode = StartAbility(&want); @@ -613,7 +613,7 @@ HWTEST_F(AbilityMgrTest, testConnectAbility, Function | MediumTest | Level1) printf("------start testConnectAbility------\n"); Want want = { nullptr }; ElementName element = { nullptr }; - SetElementBundleName(&element, "com.huawei.testnative"); + SetElementBundleName(&element, "com.openharmony.testnative"); SetElementAbilityName(&element, "ServiceAbility"); SetWantElement(&want, element); sem_init(&g_sem, 0, 0); @@ -644,7 +644,7 @@ HWTEST_F(AbilityMgrTest, testDisConnectAbility, Function | MediumTest | Level1) printf("------start testDisConnectAbility------\n"); Want want = { nullptr }; ElementName element = { nullptr }; - SetElementBundleName(&element, "com.huawei.testnative"); + SetElementBundleName(&element, "com.openharmony.testnative"); SetElementAbilityName(&element, "ServiceAbility"); SetWantElement(&want, element); sem_init(&g_sem, 0, 0); @@ -677,7 +677,7 @@ HWTEST_F(AbilityMgrTest, testConnectAbilityIllegal, Function | MediumTest | Leve printf("------start testConnectAbilityIllegal------\n"); Want want = { nullptr }; ElementName element = { nullptr }; - SetElementBundleName(&element, "com.huawei.testnative"); + SetElementBundleName(&element, "com.openharmony.testnative"); SetElementAbilityName(&element, "ServiceAbility"); SetWantElement(&want, element); g_errorCode = ConnectAbility(nullptr, &g_conn, this); @@ -701,7 +701,7 @@ HWTEST_F(AbilityMgrTest, testDisConnectAbilityIllegal, Function | MediumTest | L printf("------start testDisConnectAbilityIllegal------\n"); Want want = { nullptr }; ElementName element = { nullptr }; - SetElementBundleName(&element, "com.huawei.testnative"); + SetElementBundleName(&element, "com.openharmony.testnative"); SetElementAbilityName(&element, "ServiceAbility"); SetWantElement(&want, element); sem_init(&g_sem, 0, 0); @@ -733,7 +733,7 @@ HWTEST_F(AbilityMgrTest, testTerminateAbility, Function | MediumTest | Level1) printf("------start testTerminateAbility------\n"); Want want = { nullptr }; ElementName element = { nullptr }; - SetElementBundleName(&element, "com.huawei.testnative"); + SetElementBundleName(&element, "com.openharmony.testnative"); SetElementAbilityName(&element, "SecondAbility"); SetWantElement(&want, element); int result1 = StartAbility(&want); @@ -764,7 +764,7 @@ HWTEST_F(AbilityMgrTest, testWantMatchBundle, Function | MediumTest | Level1) ElementName element; memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName)); SetElementAbilityName(&element, "MainAbility"); - SetElementBundleName(&element, "com.huawei.testnative"); + SetElementBundleName(&element, "com.openharmony.testnative"); SetElementDeviceID(&element, ""); SetWantElement(&want, element); AbilityInfo abilityInfo; @@ -800,7 +800,7 @@ HWTEST_F(AbilityMgrTest, testWantNotMathBundle, Function | MediumTest | Level2) std::string aName = "NoThisAbility"; memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName)); SetElementAbilityName(&element, aName.c_str()); - SetElementBundleName(&element, "com.huawei.nothishap"); + SetElementBundleName(&element, "com.openharmony.nothishap"); SetWantElement(&want, element); AbilityInfo abilityInfo; memset_s(&abilityInfo, sizeof(AbilityInfo), 0, sizeof(AbilityInfo)); @@ -829,7 +829,7 @@ HWTEST_F(AbilityMgrTest, testWantOnlyMathBundleName, Function | MediumTest | Lev std::string aName = "Ability"; memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName)); SetElementAbilityName(&element, aName.c_str()); - SetElementBundleName(&element, "com.huawei.testnative"); + SetElementBundleName(&element, "com.openharmony.testnative"); SetWantElement(&want, element); AbilityInfo abilityInfo; memset_s(&abilityInfo, sizeof(AbilityInfo), 0, sizeof(AbilityInfo)); @@ -858,7 +858,7 @@ HWTEST_F(AbilityMgrTest, testWantOnlyMathAbility, Function | MediumTest | Level1 std::string aName = "MainAbility"; memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName)); SetElementAbilityName(&element, aName.c_str()); - SetElementBundleName(&element, "com.huawei.test"); + SetElementBundleName(&element, "com.openharmony.test"); SetWantElement(&want, element); AbilityInfo abilityInfo; memset_s(&abilityInfo, sizeof(AbilityInfo), 0, sizeof(AbilityInfo)); @@ -886,7 +886,7 @@ HWTEST_F(AbilityMgrTest, testWantDataMatchLength, Function | MediumTest | Level1 ElementName element; memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName)); SetElementAbilityName(&element, "MainAbility"); - SetElementBundleName(&element, "com.huawei.testnative"); + SetElementBundleName(&element, "com.openharmony.testnative"); SetWantElement(&want, element); SetWantData(&want, "test", 5); AbilityInfo abilityInfo; @@ -919,7 +919,7 @@ HWTEST_F(AbilityMgrTest, testWantDataNotMatchLength, Function | MediumTest | Lev ElementName element; memset_s(&element, sizeof(ElementName), 0, sizeof(ElementName)); SetElementAbilityName(&element, "SecondAbility"); - SetElementBundleName(&element, "com.huawei.testnative"); + SetElementBundleName(&element, "com.openharmony.testnative"); SetWantElement(&want, element); SetWantData(&want, "test", 3); int result = StartAbility(&want); -- GitLab