From 8d9f0bc8c19f7a3ccf4d571c5f5ea23d60968aa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=90=9B?= Date: Thu, 1 Apr 2021 10:53:55 +0800 Subject: [PATCH 1/5] update interfaces/innerkits/appverify_lite/unittest/src/hap_verify_test.cpp. --- .../appverify_lite/unittest/src/hap_verify_test.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/interfaces/innerkits/appverify_lite/unittest/src/hap_verify_test.cpp b/interfaces/innerkits/appverify_lite/unittest/src/hap_verify_test.cpp index 80ce7bc..1953255 100755 --- a/interfaces/innerkits/appverify_lite/unittest/src/hap_verify_test.cpp +++ b/interfaces/innerkits/appverify_lite/unittest/src/hap_verify_test.cpp @@ -19,6 +19,8 @@ #include "app_verify_pub.h" #include "write_file.h" +const int DELAY_TIME = 4; + using namespace std; using namespace testing::ext; namespace { @@ -66,6 +68,7 @@ HWTEST_F(app_verify_test, test001, TestSize.Level3) const char *signedHap = "./business_packet.hap"; DeleteFile(signedHap); CopyFile(GetBusinessHap(), signedHap); + sleep(DELAY_TIME); VerifyResult verifyResult = {0}; int32_t resultCode = APPVERI_AppVerify(signedHap, &verifyResult); ASSERT_TRUE(resultCode == V_OK); @@ -90,6 +93,7 @@ HWTEST_F(app_verify_test, test002, TestSize.Level3) const char *unsignedHap = "./unsigned_packet.hap"; DeleteFile(unsignedHap); CopyFile(GetUnsignedHap(), unsignedHap); + sleep(DELAY_TIME); VerifyResult verifyResult = {0}; int32_t resultCode = APPVERI_AppVerify(unsignedHap, &verifyResult); ASSERT_TRUE(resultCode != V_OK); @@ -116,6 +120,7 @@ HWTEST_F(app_verify_test, test003, TestSize.Level3) const char *udidUnmatchHap = "./udid_wrong_test.hap"; DeleteFile(udidUnmatchHap); CopyFile(GetWrongUdidHap(), udidUnmatchHap); + sleep(DELAY_TIME); VerifyResult verifyResult = {0}; int32_t resultCode = APPVERI_AppVerify(udidUnmatchHap, &verifyResult); ASSERT_TRUE(resultCode != V_OK); @@ -144,6 +149,7 @@ HWTEST_F(app_verify_test, test004, TestSize.Level3) const char *udidMatchHap = "./udid_right_test.hap"; DeleteFile(udidMatchHap); CopyFile(GetRightUdidHap(), udidMatchHap); + sleep(DELAY_TIME); VerifyResult verifyResult = {0}; int32_t resultCode = APPVERI_AppVerify(udidMatchHap, &verifyResult); ASSERT_TRUE(resultCode == V_OK); @@ -170,6 +176,7 @@ HWTEST_F(app_verify_test, test005, TestSize.Level3) const char *tamperedHap = "./modified_packet.hap"; DeleteFile(tamperedHap); CopyFile(GetModifiedHap(), tamperedHap); + sleep(DELAY_TIME); VerifyResult verifyResult = {0}; int32_t resultCode = APPVERI_AppVerify(tamperedHap, &verifyResult); ASSERT_TRUE(resultCode != V_OK); @@ -196,6 +203,7 @@ HWTEST_F(app_verify_test, test006, TestSize.Level3) const char *testHap = "./success_test.hap"; DeleteFile(testHap); CopyFile(GetSuccessHap(), testHap); + sleep(DELAY_TIME); VerifyResult verifyResult = {0}; int32_t resultCode = APPVERI_AppVerify(testHap, &verifyResult); ASSERT_TRUE(resultCode != V_OK); @@ -206,6 +214,7 @@ HWTEST_F(app_verify_test, test006, TestSize.Level3) const char *businessHap = "./business_packet.hap"; DeleteFile(businessHap); CopyFile(GetBusinessHap(), businessHap); + sleep(DELAY_TIME); VerifyResult verifyResult1 = {0}; resultCode = APPVERI_AppVerify(businessHap, &verifyResult1); APPVERI_FreeVerifyRst(&verifyResult1); @@ -232,6 +241,7 @@ HWTEST_F(app_verify_test, test007, TestSize.Level3) const char *businessHap = "./business_packet.hap"; DeleteFile(businessHap); CopyFile(GetBusinessHap(), businessHap); + sleep(DELAY_TIME); VerifyResult verifyResult = {0}; int32_t resultCode = APPVERI_AppVerify(businessHap, &verifyResult); ASSERT_TRUE(resultCode == V_OK); @@ -241,6 +251,7 @@ HWTEST_F(app_verify_test, test007, TestSize.Level3) const char *testHap = "./success_test.hap"; DeleteFile(testHap); CopyFile(GetSuccessHap(), testHap); + sleep(DELAY_TIME); VerifyResult verifyResult1 = {0}; APPVERI_SetActsMode(true); resultCode = APPVERI_AppVerify(testHap, &verifyResult1); @@ -268,6 +279,7 @@ HWTEST_F(app_verify_test, test008, TestSize.Level3) const char *wrongHap = "./wrong_license.hap"; DeleteFile(wrongHap); CopyFile(GetWrongLiceseHap(), wrongHap); + sleep(DELAY_TIME); VerifyResult verifyResult = {0}; int32_t resultCode = APPVERI_AppVerify(wrongHap, &verifyResult); ASSERT_TRUE(resultCode != V_OK); -- Gitee From 494f3031aecdefd2c4d8870dcade0c96a3c0734a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=90=9B?= Date: Thu, 1 Apr 2021 11:40:28 +0800 Subject: [PATCH 2/5] update interfaces/innerkits/appverify_lite/unittest/src/write_file.cpp. --- .../unittest/src/write_file.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/interfaces/innerkits/appverify_lite/unittest/src/write_file.cpp b/interfaces/innerkits/appverify_lite/unittest/src/write_file.cpp index 955fd6d..68a929e 100755 --- a/interfaces/innerkits/appverify_lite/unittest/src/write_file.cpp +++ b/interfaces/innerkits/appverify_lite/unittest/src/write_file.cpp @@ -14,24 +14,25 @@ */ #include "write_file.h" + +#include +#include +#include #include -#include -#include -#include -#include #include #include #include + #include "mbedtls/base64.h" #include "securec.h" -const int MAX_FILE_LEN = 1000000; -const int ONCE_WRITE = 2000; +static const int MAX_FILE_LEN = 1000000; +static const int ONCE_WRITE = 2000; int CopyFile(const char *org, const char *dest) { int ret = 0; - if (org == NULL || dest == NULL) { + if (org == nullptr || dest == nullptr) { return -1; } int in = open(dest, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); @@ -45,7 +46,7 @@ int CopyFile(const char *org, const char *dest) return -1; } char *buffer = (char *)malloc(wholeLen); - if (buffer == NULL) { + if (buffer == nullptr) { close(in); return -1; } @@ -71,7 +72,7 @@ EXIT: void DeleteFile(const char *path) { - if (path == NULL) { + if (path == nullptr) { return; } remove(path); -- Gitee From 904061d09d211c8310367f9b1233aa3b0a93b99d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=90=9B?= Date: Thu, 1 Apr 2021 20:18:14 +0800 Subject: [PATCH 3/5] update interfaces/innerkits/appverify_lite/unittest/src/hap_verify_test.cpp. --- .../innerkits/appverify_lite/unittest/src/hap_verify_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interfaces/innerkits/appverify_lite/unittest/src/hap_verify_test.cpp b/interfaces/innerkits/appverify_lite/unittest/src/hap_verify_test.cpp index 1953255..0cc88af 100755 --- a/interfaces/innerkits/appverify_lite/unittest/src/hap_verify_test.cpp +++ b/interfaces/innerkits/appverify_lite/unittest/src/hap_verify_test.cpp @@ -19,11 +19,11 @@ #include "app_verify_pub.h" #include "write_file.h" -const int DELAY_TIME = 4; - using namespace std; using namespace testing::ext; namespace { +const int DELAY_TIME = 4; + class app_verify_test : public testing::Test { public: static void SetUpTestCase(void); -- Gitee From b0db67742369e2ee1f24736d25dea572e9c46e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=90=9B?= Date: Thu, 1 Apr 2021 20:18:48 +0800 Subject: [PATCH 4/5] update interfaces/innerkits/appverify_lite/unittest/src/write_file.cpp. --- .../innerkits/appverify_lite/unittest/src/write_file.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/interfaces/innerkits/appverify_lite/unittest/src/write_file.cpp b/interfaces/innerkits/appverify_lite/unittest/src/write_file.cpp index 68a929e..9b1630c 100755 --- a/interfaces/innerkits/appverify_lite/unittest/src/write_file.cpp +++ b/interfaces/innerkits/appverify_lite/unittest/src/write_file.cpp @@ -26,8 +26,10 @@ #include "mbedtls/base64.h" #include "securec.h" -static const int MAX_FILE_LEN = 1000000; -static const int ONCE_WRITE = 2000; +namespace { + static const int MAX_FILE_LEN = 1000000; + static const int ONCE_WRITE = 2000; +} int CopyFile(const char *org, const char *dest) { -- Gitee From ba39b722aece8e9be07072614280cc9e04dd6fa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=90=9B?= Date: Thu, 1 Apr 2021 20:22:14 +0800 Subject: [PATCH 5/5] update interfaces/innerkits/appverify_lite/unittest/src/write_file.cpp. --- .../innerkits/appverify_lite/unittest/src/write_file.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interfaces/innerkits/appverify_lite/unittest/src/write_file.cpp b/interfaces/innerkits/appverify_lite/unittest/src/write_file.cpp index 9b1630c..6c7ab38 100755 --- a/interfaces/innerkits/appverify_lite/unittest/src/write_file.cpp +++ b/interfaces/innerkits/appverify_lite/unittest/src/write_file.cpp @@ -27,8 +27,8 @@ #include "securec.h" namespace { - static const int MAX_FILE_LEN = 1000000; - static const int ONCE_WRITE = 2000; + const int MAX_FILE_LEN = 1000000; + const int ONCE_WRITE = 2000; } int CopyFile(const char *org, const char *dest) -- Gitee