openharmony/device_manager
1
0
Fork 0
mirror of https://github.com/openharmony/device_manager.git synced 2026-07-18 16:24:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

修复TDD失败问题

Browse Source 
Signed-off-by: renguang1116 <renguang@huawei.com>
This commit is contained in:
renguang1116
2022-03-21 11:35:27 +08:00
parent d6562c0ddf
commit a81f9a5ddb
5 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/include/dm_constants.h
+8
View File
@@ -196,6 +196,14 @@ const std::string EVENT_INIT_CODE = "2";
// timer
const std::string TIMER_PREFIX = "deviceManagerTimer:";
const std::string AUTHENTICATE_TIMEOUT_TASK = TIMER_PREFIX + "authenticate";
const std::string NEGOTIATE_TIMEOUT_TASK = TIMER_PREFIX + "negotiate";
const std::string CONFIRM_TIMEOUT_TASK = TIMER_PREFIX + "confirm";
const std::string SHOW_TIMEOUT_TASK = TIMER_PREFIX + "show";
const std::string INPUT_TIMEOUT_TASK = TIMER_PREFIX + "input";
const std::string ADD_TIMEOUT_TASK = TIMER_PREFIX + "add";
const std::string WAIT_NEGOTIATE_TIMEOUT_TASK = TIMER_PREFIX + "waitNegotiate";
const std::string WAIT_REQUEST_TIMEOUT_TASK = TIMER_PREFIX + "waitRequest";
const std::string STATE_TIMER_PREFIX = "stateTimer_";
const int32_t TIMER_PREFIX_LENGTH = 19;
const int32_t TIMER_DEFAULT = 0;
services/devicemanagerservice/src/authentication/dm_auth_manager.cpp
-9
View File
@@ -35,15 +35,6 @@
namespace OHOS {
namespace DistributedHardware {
const std::string AUTHENTICATE_TIMEOUT_TASK = TIMER_PREFIX + "authenticate";
const std::string NEGOTIATE_TIMEOUT_TASK = TIMER_PREFIX + "negotiate";
const std::string CONFIRM_TIMEOUT_TASK = TIMER_PREFIX + "confirm";
const std::string SHOW_TIMEOUT_TASK = TIMER_PREFIX + "show";
const std::string INPUT_TIMEOUT_TASK = TIMER_PREFIX + "input";
const std::string ADD_TIMEOUT_TASK = TIMER_PREFIX + "add";
const std::string WAIT_NEGOTIATE_TIMEOUT_TASK = TIMER_PREFIX + "waitNegotiate";
const std::string WAIT_REQUEST_TIMEOUT_TASK = TIMER_PREFIX + "waitRequest";
const int32_t SESSION_CANCEL_TIMEOUT = 0;
const int32_t AUTHENTICATE_TIMEOUT = 120;
const int32_t CONFIRM_TIMEOUT = 60;
test/unittest/UTTest_auth_request_state.cpp
-3
View File
@@ -35,9 +35,6 @@ void AuthRequestStateTest::TearDownTestCase()
}
namespace {
std::string AUTHENTICATE_TIMEOUT_TASK = "authenticateTimeoutTask";
std::string NEGOTIATE_TIMEOUT_TASK = "negotiateTimeoutTask";
std::string CONFIRM_TIMEOUT_TASK = "confirmTimeoutTask";
std::string INPUT_TIMEOUT_TASK = "inputTimeoutTask";
std::string ADD_TIMEOUT_TASK = "addTimeoutTask";
test/unittest/UTTest_device_manager_service.cpp
-2
View File
@@ -40,8 +40,6 @@ void DeviceManagerServiceTest::TearDownTestCase()
}
namespace {
std::string INPUT_TIMEOUT_TASK = "inputTimeoutTask";
/**
* @tc.name: StartDeviceDiscovery_001
* @tc.desc: Set StartDeviceDiscovery's flag bit intFlag_ to False and return DM_NOT_INIT
test/unittest/UTTest_dm_auth_manager.cpp
-6
View File
@@ -38,12 +38,6 @@ void DmAuthManagerTest::TearDownTestCase()
}
namespace {
std::string AUTHENTICATE_TIMEOUT_TASK = "authenticateTimeoutTask";
std::string NEGOTIATE_TIMEOUT_TASK = "negotiateTimeoutTask";
std::string CONFIRM_TIMEOUT_TASK = "confirmTimeoutTask";
std::string INPUT_TIMEOUT_TASK = "inputTimeoutTask";
std::string ADD_TIMEOUT_TASK = "addTimeoutTask";
std::shared_ptr<SoftbusConnector> softbusConnector = std::make_shared<SoftbusConnector>();
std::shared_ptr<DeviceManagerServiceListener> listener = std::make_shared<DeviceManagerServiceListener>();
std::shared_ptr<HiChainConnector> hiChainConnector_ = std::make_shared<HiChainConnector>();