From 5073ed5f2cef69bef5b656b784fffa773bfefab2 Mon Sep 17 00:00:00 2001 From: h30013885 Date: Tue, 21 May 2024 10:18:53 +0800 Subject: [PATCH] fix tdd Signed-off-by: h30013885 --- test/fuzztest/devauthfunc_fuzzer/devauthfunc_fuzzer.cpp | 2 +- test/unittest/deviceauth/BUILD.gn | 1 + test/unittest/deviceauth/source/creds_manager_test.cpp | 2 +- test/unittest/deviceauth/source/deviceauth_standard_test.cpp | 2 +- test/unittest/deviceauth/source/mk_agree_test.cpp | 2 +- test/unittest/deviceauth/source/protocol_task_main_mock.c | 5 +++++ .../unit_test/services/creds_manager/creds_manager_test.cpp | 2 +- .../os_account_adapter/os_account_adapter_test.cpp | 2 +- 8 files changed, 12 insertions(+), 6 deletions(-) diff --git a/test/fuzztest/devauthfunc_fuzzer/devauthfunc_fuzzer.cpp b/test/fuzztest/devauthfunc_fuzzer/devauthfunc_fuzzer.cpp index 5e257e86..2e449456 100644 --- a/test/fuzztest/devauthfunc_fuzzer/devauthfunc_fuzzer.cpp +++ b/test/fuzztest/devauthfunc_fuzzer/devauthfunc_fuzzer.cpp @@ -63,7 +63,7 @@ namespace OHOS { #define TEST_DEV_AUTH_SLEEP_TIME 50000 #define TEST_DEV_AUTH_SLEEP_TIME2 600000 #define TEST_TRANSMIT_DATA_LEN 2048 -#define TEST_HKS_DATA_PATH "/data/service/el1/public/huks_service/maindata/+0+0+0+0" +#define TEST_HKS_DATA_PATH "/data/service/el1/public/huks_service/tmp/+0+0+0+0" #define TEST_DEV_AUTH_TEMP_KEY_PAIR_LEN 32 static const int32_t TEST_AUTH_OS_ACCOUNT_ID = 100; static const int TEST_DEV_AUTH_BUFFER_SIZE = 128; diff --git a/test/unittest/deviceauth/BUILD.gn b/test/unittest/deviceauth/BUILD.gn index bd449981..0b47746d 100644 --- a/test/unittest/deviceauth/BUILD.gn +++ b/test/unittest/deviceauth/BUILD.gn @@ -118,6 +118,7 @@ ohos_unittest("deviceauth_llt") { "ENABLE_P2P_AUTH_EC_SPEKE", "DEV_AUTH_FUNC_TEST", "ENABLE_PSEUDONYM", + "DEFAULT_V2_NOT_SUPPORT", ] cflags = [ "-DHILOG_ENABLE" ] diff --git a/test/unittest/deviceauth/source/creds_manager_test.cpp b/test/unittest/deviceauth/source/creds_manager_test.cpp index 96fe2ef0..efef20d4 100644 --- a/test/unittest/deviceauth/source/creds_manager_test.cpp +++ b/test/unittest/deviceauth/source/creds_manager_test.cpp @@ -39,7 +39,7 @@ static const std::string TEST_SYM_AUTH_CODE2 = "2f7562744654535564586e665467546b static const std::string TEST_SYM_USER_ID3 = "1234ABCDE"; static const std::string TEST_SYM_DEVICE_ID3 = "TestAuthId3"; static const std::string TEST_GROUP_DATA_PATH = "/data/service/el1/public/deviceauthMock"; -static const std::string TEST_HKS_DATA_PATH = "/data/service/el1/public/huks_service/maindata/+0+0+0+0"; +static const std::string TEST_HKS_DATA_PATH = "/data/service/el1/public/huks_service/tmp/+0+0+0+0"; static const int TEST_DEV_AUTH_BUFFER_SIZE = 128; diff --git a/test/unittest/deviceauth/source/deviceauth_standard_test.cpp b/test/unittest/deviceauth/source/deviceauth_standard_test.cpp index 52457539..441265a1 100644 --- a/test/unittest/deviceauth/source/deviceauth_standard_test.cpp +++ b/test/unittest/deviceauth/source/deviceauth_standard_test.cpp @@ -61,7 +61,7 @@ namespace { #define TEST_QUERY_PARAMS "bac" #define TEST_PIN_CODE "123456" #define TEST_GROUP_DATA_PATH "/data/service/el1/public/deviceauthMock" -#define TEST_HKS_DATA_PATH "/data/service/el1/public/huks_service/maindata/+0+0+0+0" +#define TEST_HKS_DATA_PATH "/data/service/el1/public/huks_service/tmp/+0+0+0+0" #define TEST_DEV_AUTH_TEMP_KEY_PAIR_LEN 32 #define TEST_DEV_AUTH_SLEEP_TIME 50000 #define TEST_DEV_AUTH_SLEEP_TIME2 60000 diff --git a/test/unittest/deviceauth/source/mk_agree_test.cpp b/test/unittest/deviceauth/source/mk_agree_test.cpp index f5f2a173..6e3ce5c5 100644 --- a/test/unittest/deviceauth/source/mk_agree_test.cpp +++ b/test/unittest/deviceauth/source/mk_agree_test.cpp @@ -35,7 +35,7 @@ namespace { #define TEST_DEV_PK "87364761534f454d33567a73424e794f" #define BYTE_TO_HEX_OPER_LENGTH 2 -static const std::string TEST_HKS_DATA_PATH = "/data/service/el1/public/huks_service/maindata/+0+0+0+0"; +static const std::string TEST_HKS_DATA_PATH = "/data/service/el1/public/huks_service/tmp/+0+0+0+0"; static const std::string TEST_GROUP_DATA_PATH = "/data/service/el1/public/deviceauthMock"; static const int TEST_DEV_AUTH_BUFFER_SIZE = 128; diff --git a/test/unittest/deviceauth/source/protocol_task_main_mock.c b/test/unittest/deviceauth/source/protocol_task_main_mock.c index 3ba293c4..607879c9 100644 --- a/test/unittest/deviceauth/source/protocol_task_main_mock.c +++ b/test/unittest/deviceauth/source/protocol_task_main_mock.c @@ -28,7 +28,12 @@ static bool g_isIsoSupported = true; static bool g_isPakeV1Supported = true; + +#ifdef DEFAULT_V2_NOT_SUPPORT +static bool g_isSessionV2Supported = false; +#else static bool g_isSessionV2Supported = true; +#endif void SetPakeV1Supported(bool isSupported) { diff --git a/test/unittest/tdd_framework/unit_test/services/creds_manager/creds_manager_test.cpp b/test/unittest/tdd_framework/unit_test/services/creds_manager/creds_manager_test.cpp index 52fcc793..25610fef 100644 --- a/test/unittest/tdd_framework/unit_test/services/creds_manager/creds_manager_test.cpp +++ b/test/unittest/tdd_framework/unit_test/services/creds_manager/creds_manager_test.cpp @@ -64,7 +64,7 @@ static const std::string TEST_AUTH_PARAMS = "{\"peerConnDeviceId\":\"52E2706717D "749558BD2E6492C\",\"servicePkgName\":\"TestAppId\",\"isClient\":true}"; static const std::string TEST_AUTH_CODE = "1234123412341234123412341234123412341234123412341234123412341234"; static const std::string TEST_GROUP_DATA_PATH = "/data/service/el1/public/deviceauthMock"; -static const std::string TEST_HKS_DATA_PATH = "/data/service/el1/public/huks_service/maindata/+0+0+0+0"; +static const std::string TEST_HKS_DATA_PATH = "/data/service/el1/public/huks_service/tmp/+0+0+0+0"; static const int TEST_DEV_AUTH_BUFFER_SIZE = 128; static const int32_t TEST_AUTH_OS_ACCOUNT_ID = 100; diff --git a/test/unittest/tdd_framework/unit_test/services/frameworks/os_account_adapter/os_account_adapter_test.cpp b/test/unittest/tdd_framework/unit_test/services/frameworks/os_account_adapter/os_account_adapter_test.cpp index 714be39d..a4f59ece 100644 --- a/test/unittest/tdd_framework/unit_test/services/frameworks/os_account_adapter/os_account_adapter_test.cpp +++ b/test/unittest/tdd_framework/unit_test/services/frameworks/os_account_adapter/os_account_adapter_test.cpp @@ -40,7 +40,7 @@ namespace { #define TEST_AUTH_ID "TestAuthId" #define TEST_USER_ID "4269DC28B639681698809A67EDAD08E39F207900038F91FEF95DD042FE2874E4" #define TEST_GROUP_DATA_PATH "/data/service/el1/public/deviceauthMock" -#define TEST_HKS_DATA_PATH "/data/service/el1/public/huks_service/maindata/+0+0+0+0" +#define TEST_HKS_DATA_PATH "/data/service/el1/public/huks_service/tmp/+0+0+0+0" #define TEST_REQ_ID 123 #define TEST_OS_ACCOUNT_ID 100 #define TEST_OS_ACCOUNT_ID2 105