diff --git a/BUILD.gn b/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..53ed70d1b03d059b0d8564e4c4fa84b4dbbf0868 --- /dev/null +++ b/BUILD.gn @@ -0,0 +1,19 @@ +# 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") + +group("unittest") { + testonly = true + deps = [ "test/unittest:updateservice_unittest" ] +} diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 8ac4ce1d300b538c295f8150a3f457552a7f6c21..7ea558a95acb23aa730f1ae4139fdc42c3d2f82b 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -11,8 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//build/ohos.gni") +import("//build/test.gni") +module_output_path = "updater/updateservice_test" config("utest_config") { visibility = [ ":*" ] @@ -27,7 +28,9 @@ config("utest_config") { ldflags = [ "--coverage" ] } -ohos_executable("updaterserver_ut") { +ohos_unittest("updateservice_unittest") { + testonly = true + module_out_path = module_output_path sources = [ "update_client/client_stub.cpp", "update_client/client_unittest.cpp", @@ -65,13 +68,13 @@ ohos_executable("updaterserver_ut") { "//base/update/updater/services/include/package", "//base/update/updater/test/unittest", "//third_party/bounds_checking_function/include", + "//third_party/googletest/googletest/include", "//third_party/node/src", "//foundation/ace/napi/interfaces/kits", "//third_party/cJSON", "//third_party/libxml2/include", "//third_party/curl/include", "//third_party/openssl/include", - "//third_party/bounds_checking_function/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include", "//foundation/distributedschedule/safwk/services/safwk/include", @@ -91,8 +94,8 @@ ohos_executable("updaterserver_ut") { "//third_party/bounds_checking_function:libsec_static", "//third_party/cJSON:cjson_static", "//third_party/curl:curl", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest", + "//third_party/googletest:gmock_main", + "//third_party/googletest:gtest_main", "//third_party/libxml2:xml2", "//third_party/lz4:liblz4_static", "//third_party/openssl:libcrypto_static", diff --git a/test/unittest/update_client/client_unittest.cpp b/test/unittest/update_client/client_unittest.cpp index 48825d22edd36bf05c1d7a5e103bb53ce812c870..fb8d4281ff9548089e818bb38104794709fa162a 100644 --- a/test/unittest/update_client/client_unittest.cpp +++ b/test/unittest/update_client/client_unittest.cpp @@ -36,6 +36,7 @@ using namespace std; using namespace updateClient; +using namespace testing::ext; using namespace OHOS::update_engine; static constexpr int PERCENT_20 = 20; static constexpr int PERCENT_40 = 40; @@ -406,7 +407,7 @@ public: } }; -TEST(UpdateClientTest, TestGetUpdate) +HWTEST_F(UpdateClientTest, TestGetUpdate, TestSize.Level1) { napi_value exports = nullptr; UpdateClientInit((napi_env)&g_testEnv, exports); @@ -416,7 +417,7 @@ TEST(UpdateClientTest, TestGetUpdate) test.TestGetUpdaterForOther(false); } -TEST(UpdateClientTest, TestGetUpdate2) +HWTEST_F(UpdateClientTest, TestGetUpdate2, TestSize.Level1) { UpdateClientTest test; test.TestGetUpdate(true); @@ -424,7 +425,7 @@ TEST(UpdateClientTest, TestGetUpdate2) test.TestGetUpdaterForOther(true); } -TEST(UpdateClientTest, TestCheckNewVersion) +HWTEST_F(UpdateClientTest, TestCheckNewVersion, TestSize.Level1) { UpdateClientTest test; test.TestGetUpdate(false); @@ -432,119 +433,119 @@ TEST(UpdateClientTest, TestCheckNewVersion) EXPECT_EQ(0, test.TestCheckNewVersion(true)); } -TEST(UpdateClientTest, TestDownloadVersion) +HWTEST_F(UpdateClientTest, TestDownloadVersion, TestSize.Level1) { UpdateClientTest test; EXPECT_EQ(0, test.TestDownloadVersion(false)); EXPECT_EQ(0, test.TestDownloadVersion(true)); } -TEST(UpdateClientTest, TestUpgradeVersion) +HWTEST_F(UpdateClientTest, TestUpgradeVersion, TestSize.Level1) { UpdateClientTest test; EXPECT_EQ(0, test.TestUpgradeVersion(false)); EXPECT_EQ(0, test.TestUpgradeVersion(true)); } -TEST(UpdateClientTest, TestSetUpdatePolicy) +HWTEST_F(UpdateClientTest, TestSetUpdatePolicy, TestSize.Level1) { UpdateClientTest test; EXPECT_EQ(0, test.TestSetUpdatePolicy(false)); EXPECT_EQ(0, test.TestSetUpdatePolicy(true)); } -TEST(UpdateClientTest, TestGetUpdatePolicy) +HWTEST_F(UpdateClientTest, TestGetUpdatePolicy, TestSize.Level1) { UpdateClientTest test; EXPECT_EQ(0, test.TestGetUpdatePolicy(false)); EXPECT_EQ(0, test.TestGetUpdatePolicy(true)); } -TEST(UpdateClientTest, TestGetUpgradeStatus) +HWTEST_F(UpdateClientTest, TestGetUpgradeStatus, TestSize.Level1) { UpdateClientTest test; EXPECT_EQ(0, test.TestGetUpgradeStatus(false)); EXPECT_EQ(0, test.TestGetUpgradeStatus(true)); } -TEST(UpdateClientTest, TestGetNewVersionInfo) +HWTEST_F(UpdateClientTest, TestGetNewVersionInfo, TestSize.Level1) { UpdateClientTest test; EXPECT_EQ(0, test.TestGetNewVersionInfo(false)); EXPECT_EQ(0, test.TestGetNewVersionInfo(true)); } -TEST(UpdateClientTest, TestApplyNewVersion) +HWTEST_F(UpdateClientTest, TestApplyNewVersion, TestSize.Level1) { UpdateClientTest test; EXPECT_EQ(0, test.TestApplyNewVersion(false)); EXPECT_EQ(0, test.TestApplyNewVersion(true)); } -TEST(UpdateClientTest, TestRebootAndClean) +HWTEST_F(UpdateClientTest, TestRebootAndClean, TestSize.Level1) { UpdateClientTest test; EXPECT_EQ(0, test.TestRebootAndClean(false)); EXPECT_EQ(0, test.TestRebootAndClean(true)); } -TEST(UpdateClientTest, TestVerifyUpdatePackage) +HWTEST_F(UpdateClientTest, TestVerifyUpdatePackage, TestSize.Level1) { UpdateClientTest test; EXPECT_EQ(0, test.TestVerifyUpdatePackage(false)); EXPECT_EQ(0, test.TestVerifyUpdatePackage(true)); } -TEST(UpdateClientTest, TestSubscribeEvent) +HWTEST_F(UpdateClientTest, TestSubscribeEvent, TestSize.Level1) { UpdateClientTest test; EXPECT_EQ(0, test.TestSubscribeEvent("downloadProgress")); EXPECT_EQ(0, test.TestUnsubscribeEvent(false, "downloadProgress")); } -TEST(UpdateClientTest, TestSubscribeEvent2) +HWTEST_F(UpdateClientTest, TestSubscribeEvent2, TestSize.Level1) { UpdateClientTest test; EXPECT_EQ(0, test.TestSubscribeEvent("downloadProgress")); EXPECT_EQ(0, test.TestUnsubscribeEvent(true, "downloadProgress")); } -TEST(UpdateClientTest, TestSubscribeEvent3) +HWTEST_F(UpdateClientTest, TestSubscribeEvent3, TestSize.Level1) { UpdateClientTest test; EXPECT_EQ(0, test.TestSubscribeEvent("upgradeProgress")); EXPECT_EQ(0, test.TestUnsubscribeEvent(false, "upgradeProgress")); } -TEST(UpdateClientTest, TestSubscribeEvent4) +HWTEST_F(UpdateClientTest, TestSubscribeEvent4, TestSize.Level1) { UpdateClientTest test; EXPECT_EQ(0, test.TestSubscribeEvent("upgradeProgress")); EXPECT_EQ(0, test.TestUnsubscribeEvent(true, "upgradeProgress")); } -TEST(UpdateClientTest, TestCancelUpgrade) +HWTEST_F(UpdateClientTest, TestCancelUpgrade, TestSize.Level1) { UpdateClientTest test; EXPECT_EQ(0, test.TestCancelUpgrade(2)); EXPECT_EQ(0, test.TestCancelUpgrade(3)); } -TEST(UpdateClientTest, TestNewClient) +HWTEST_F(UpdateClientTest, TestNewClient, TestSize.Level1) { napi_value thisVar = nullptr; UpdateClient *client = new UpdateClient((napi_env)&g_testEnv, thisVar); delete client; } -TEST(UpdateClientTest, TestUpdateAsyncessionNoCallback) +HWTEST_F(UpdateClientTest, TestUpdateAsyncessionNoCallback, TestSize.Level1) { UpdateSession *sess = new UpdateAsyncessionNoCallback(g_testClient, 2, 1, 0); EXPECT_NE(sess, nullptr); delete sess; } -TEST(UpdateClientTest, TestUpdatePromiseSession) +HWTEST_F(UpdateClientTest, TestUpdatePromiseSession, TestSize.Level1) { UpdateSession *sess = new UpdatePromiseSession (g_testClient, 2, 1, 0); EXPECT_NE(sess, nullptr); diff --git a/test/unittest/update_engine/server_unittest.cpp b/test/unittest/update_engine/server_unittest.cpp index d0f4e31fd4b367a34375f5840aa1b39d0b895e2e..ca14914328736b77e35fe968ab657a003297b26c 100644 --- a/test/unittest/update_engine/server_unittest.cpp +++ b/test/unittest/update_engine/server_unittest.cpp @@ -29,6 +29,7 @@ #include "iservice_registry.h" #include "iupdate_callback.h" #include "iupdate_service.h" +#include "parameters.h" #include "unittest_comm.h" #include "update_callback.h" #include "update_callback_proxy.h" @@ -38,6 +39,7 @@ #include "update_service_proxy.h" using namespace std; +using namespace testing::ext; using namespace OHOS; using namespace OHOS::update_engine; static const int32_t DLNOW_10 = 10; @@ -309,7 +311,7 @@ public: }); EXPECT_EQ(download == 0, 0); std::string serverAddr; - UpdateService::GetServerIp(serverAddr); + GetServerIp(serverAddr); std::string url = "http://"; url += serverAddr; url += "/updater.zip"; @@ -429,105 +431,105 @@ public: } }; -TEST(UpdateServerTest, TestDownload) +HWTEST_F(UpdateServerTest, TestDownload, TestSize.Level1) { UpdateServerTest test; test.TestCheckNewVersion(); test.TestDownload(); } -TEST(UpdateServerTest, TestDoUpdate) +HWTEST_F(UpdateServerTest, TestDoUpdate, TestSize.Level1) { UpdateServerTest test; test.TestDoUpdate(); } -TEST(UpdateServerTest, TestGetNewVersion) +HWTEST_F(UpdateServerTest, TestGetNewVersion, TestSize.Level1) { UpdateServerTest test; test.TestCheckNewVersion(); test.TestGetNewVersion(); } -TEST(UpdateServerTest, TestUpdatePolicy) +HWTEST_F(UpdateServerTest, TestUpdatePolicy, TestSize.Level1) { UpdateServerTest test; test.TestUpdatePolicy(); } -TEST(UpdateServerTest, TestGetUpgradeStatus) +HWTEST_F(UpdateServerTest, TestGetUpgradeStatus, TestSize.Level1) { UpdateServerTest test; test.TestGetUpgradeStatus(); } -TEST(UpdateServerTest, TestRebootAndClean) +HWTEST_F(UpdateServerTest, TestRebootAndClean, TestSize.Level1) { UpdateServerTest test; test.TestRebootAndClean(); } -TEST(UpdateServerTest, TestRebootAndInstall) +HWTEST_F(UpdateServerTest, TestRebootAndInstall, TestSize.Level1) { UpdateServerTest test; test.TestRebootAndInstall(); } -TEST(UpdateServerTest, TestRegisterUpdateCallback) +HWTEST_F(UpdateServerTest, TestRegisterUpdateCallback, TestSize.Level1) { UpdateServerTest test; test.TestRegisterUpdateCallback(); } -TEST(UpdateServerTest, TestUnRegisterUpdateCallback) +HWTEST_F(UpdateServerTest, TestUnRegisterUpdateCallback, TestSize.Level1) { UpdateServerTest test; test.TestUnRegisterUpdateCallback(); } -TEST(UpdateServerTest, TestReadCheckVersiondescriptInfo) +HWTEST_F(UpdateServerTest, TestReadCheckVersiondescriptInfo, TestSize.Level1) { UpdateServerTest test; test.TestReadCheckVersiondescriptInfo(); } -TEST(UpdateServerTest, TestUpdateCallbackCheckNewVersion) +HWTEST_F(UpdateServerTest, TestUpdateCallbackCheckNewVersion, TestSize.Level1) { UpdateServerTest test; test.TestUpdateCallbackCheckNewVersion(); } -TEST(UpdateServerTest, TestUpdateCallbackDownload) +HWTEST_F(UpdateServerTest, TestUpdateCallbackDownload, TestSize.Level1) { UpdateServerTest test; test.TestUpdateCallbackDownload(); } -TEST(UpdateServerTest, TestUpdateCallbackUpgrade) +HWTEST_F(UpdateServerTest, TestUpdateCallbackUpgrade, TestSize.Level1) { UpdateServerTest test; test.TestUpdateCallbackUpgrade(); } -TEST(UpdateServerTest, TestDownLoadProgress) +HWTEST_F(UpdateServerTest, TestDownLoadProgress, TestSize.Level1) { UpdateServerTest test; test.TestDownLoadProgress(); } -TEST(UpdateServerTest, TestNewUpdateService) +HWTEST_F(UpdateServerTest, TestNewUpdateService, TestSize.Level1) { UpdateServerTest test; test.TestNewUpdateService(); } -TEST(UpdateServerTest, TestUpdateServiceProxy) +HWTEST_F(UpdateServerTest, TestUpdateServiceProxy, TestSize.Level1) { UpdateServerTest test; test.TestUpdateServiceProxy(); } -TEST(UpdateServerTest, TestKitsResetService) +HWTEST_F(UpdateServerTest, TestKitsResetService, TestSize.Level1) { sptr systemMgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); EXPECT_NE(systemMgr, nullptr); @@ -545,7 +547,7 @@ TEST(UpdateServerTest, TestKitsResetService) delete saServer; } -TEST(UpdateServerTest, TestKitsRemoteCallbackOnCheckVersionDone) +HWTEST_F(UpdateServerTest, TestKitsRemoteCallbackOnCheckVersionDone, TestSize.Level1) { VersionInfo info {}; UpdateCallbackInfo callBackFun {}; @@ -555,7 +557,7 @@ TEST(UpdateServerTest, TestKitsRemoteCallbackOnCheckVersionDone) EXPECT_NE(remoteCallBack, nullptr); } -TEST(UpdateServerTest, TestKitsRemoteCallbackOnDownloadProgress) +HWTEST_F(UpdateServerTest, TestKitsRemoteCallbackOnDownloadProgress, TestSize.Level1) { Progress progress {}; UpdateCallbackInfo callBackFun {}; @@ -565,7 +567,7 @@ TEST(UpdateServerTest, TestKitsRemoteCallbackOnDownloadProgress) EXPECT_NE(remoteCallBack, nullptr); } -TEST(UpdateServerTest, TestKitsRemoteCallbackOnUpgradeProgress) +HWTEST_F(UpdateServerTest, TestKitsRemoteCallbackOnUpgradeProgress, TestSize.Level1) { Progress progress {}; UpdateCallbackInfo callBackFun {}; @@ -575,7 +577,7 @@ TEST(UpdateServerTest, TestKitsRemoteCallbackOnUpgradeProgress) EXPECT_NE(remoteCallBack, nullptr); } -TEST(UpdateServerTest, TestKitsRegisterUpdateCallback) +HWTEST_F(UpdateServerTest, TestKitsRegisterUpdateCallback, TestSize.Level1) { UpdateCallbackInfo callBackFun {}; UpdateContext ctx {}; @@ -585,20 +587,20 @@ TEST(UpdateServerTest, TestKitsRegisterUpdateCallback) EXPECT_EQ(ret, 0); } -TEST(UpdateServerTest, TestKitsDoUpdate) +HWTEST_F(UpdateServerTest, TestKitsDoUpdate, TestSize.Level1) { int ret = UpdateServiceKits::GetInstance().DoUpdate(); EXPECT_EQ(ret, 0); } -TEST(UpdateServerTest, TestKitsCancel) +HWTEST_F(UpdateServerTest, TestKitsCancel, TestSize.Level1) { int32_t service = 0; int ret = UpdateServiceKits::GetInstance().Cancel(service); EXPECT_EQ(ret, 0); } -TEST(UpdateServerTest, TestKitsRebootAndClean) +HWTEST_F(UpdateServerTest, TestKitsRebootAndClean, TestSize.Level1) { const std::string miscFile = "/dev/block/platform/soc/10100000.himci.eMMC/by-name/misc"; const std::string cmd = "--update_package=/data/updater/updater.zip"; @@ -606,7 +608,7 @@ TEST(UpdateServerTest, TestKitsRebootAndClean) EXPECT_NE(ret, 0); } -TEST(UpdateServerTest, TestKitsReadDataFromSSL) +HWTEST_F(UpdateServerTest, TestKitsReadDataFromSSL, TestSize.Level1) { int32_t engineSocket = 10; UpdateService *updateServer = new UpdateService(0, true); @@ -615,14 +617,14 @@ TEST(UpdateServerTest, TestKitsReadDataFromSSL) delete updateServer; } -TEST(UpdateServerTest, TestKits) +HWTEST_F(UpdateServerTest, TestKits, TestSize.Level1) { UpdateServiceKits *kit = new MockUpdateServiceKits(); EXPECT_NE(kit, nullptr); delete kit; } -TEST(UpdateServerTest, TestUpdateServiceKitsImpl) +HWTEST_F(UpdateServerTest, TestUpdateServiceKitsImpl, TestSize.Level1) { std::string miscFile = "/dev/block/platform/soc/10100000.himci.eMMC/by-name/misc"; std::string packageName = "/data/updater/updater/updater.zip"; @@ -630,7 +632,7 @@ TEST(UpdateServerTest, TestUpdateServiceKitsImpl) printf("RebootAndInstall: %d\n", ret); } -TEST(UpdateServerTest, TestUpdateServiceRegisterUpdateCallback) +HWTEST_F(UpdateServerTest, TestUpdateServiceRegisterUpdateCallback, TestSize.Level1) { UpdateContext ctx {}; UpdateService *updateServer = new UpdateService(0, true); @@ -638,7 +640,7 @@ TEST(UpdateServerTest, TestUpdateServiceRegisterUpdateCallback) delete updateServer; } -TEST(UpdateServerTest, TestVerifyDownloadPkg) +HWTEST_F(UpdateServerTest, TestVerifyDownloadPkg, TestSize.Level1) { Progress downloadProgress {}; std::string path = "/data/updater/updater/test.txt";