!2415 fix : LNNTest error

Merge pull request !2415 from chenbotong/master
This commit is contained in:
openharmony_ci 2022-09-27 02:18:58 +00:00 committed by Gitee
commit f52f1ec84c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 37 additions and 90 deletions

View File

@ -30,6 +30,10 @@ constexpr char PEERUID[MAX_ACCOUNT_HASH_LEN] = "021315ASD";
namespace OHOS {
using namespace testing::ext;
static LnnConnectionFsm *CreateConnectionFsm();
static LnnConnectionFsm *connFsm = nullptr;
static LnnConnectionFsm *connFsm2 = nullptr;
class LnnConnectionFsmTest : public testing::Test {
public:
static void SetUpTestCase();
@ -40,10 +44,16 @@ public:
void LnnConnectionFsmTest::SetUpTestCase()
{
LooperInit();
connFsm = CreateConnectionFsm();
connFsm2 = CreateConnectionFsm();
}
void LnnConnectionFsmTest::TearDownTestCase()
{
LooperDeinit();
LnnDestroyConnectionFsm(connFsm);
LnnDestroyConnectionFsm(connFsm2);
}
void LnnConnectionFsmTest::SetUp()
@ -79,11 +89,9 @@ void FsmStopCallback(struct tagLnnConnectionFsm *connFsm)
*/
HWTEST_F(LnnConnectionFsmTest, LNN_CREATE_CONNECTION_FSM_TEST_001, TestSize.Level0)
{
LooperInit();
ConnectionAddr *target = nullptr;
LnnConnectionFsm *connFsm = LnnCreateConnectionFsm(target);
EXPECT_TRUE(connFsm == nullptr);
LooperDeinit();
LnnConnectionFsm *fsm = LnnCreateConnectionFsm(target);
EXPECT_TRUE(fsm == nullptr);
}
/*
@ -94,11 +102,9 @@ HWTEST_F(LnnConnectionFsmTest, LNN_CREATE_CONNECTION_FSM_TEST_001, TestSize.Leve
*/
HWTEST_F(LnnConnectionFsmTest, LNN_DESTROY_CONNECTION_FSM_TEST_001, TestSize.Level0)
{
LooperInit();
LnnConnectionFsm *connFsm = nullptr;
LnnDestroyConnectionFsm(connFsm);
EXPECT_TRUE(connFsm == nullptr);
LooperDeinit();
LnnConnectionFsm *fsm = nullptr;
LnnDestroyConnectionFsm(fsm);
EXPECT_TRUE(fsm == nullptr);
}
/*
@ -109,34 +115,11 @@ HWTEST_F(LnnConnectionFsmTest, LNN_DESTROY_CONNECTION_FSM_TEST_001, TestSize.Lev
*/
HWTEST_F(LnnConnectionFsmTest, LNN_START_CONNECTION_FSM_TEST_001, TestSize.Level0)
{
LooperInit();
LnnConnectionFsm *connFsm = nullptr;
int32_t ret = LnnStartConnectionFsm(connFsm);
LnnConnectionFsm *fsm = nullptr;
int32_t ret = LnnStartConnectionFsm(fsm);
EXPECT_TRUE(ret == SOFTBUS_INVALID_PARAM);
connFsm = CreateConnectionFsm();
ret = LnnStartConnectionFsm(connFsm);
EXPECT_TRUE(ret == SOFTBUS_OK);
LnnDestroyConnectionFsm(connFsm);
LooperDeinit();
}
/*
* @tc.name: LNN_STOP_CONNECTION_FSM_TEST_001
* @tc.desc: test LnnStopConnectionFsm
* @tc.type: FUNC
* @tc.require: I5PRUD
*/
HWTEST_F(LnnConnectionFsmTest, LNN_STOP_CONNECTION_FSM_TEST_001, TestSize.Level0)
{
LooperInit();
LnnConnectionFsm *connFsm = nullptr;
int32_t ret = LnnStopConnectionFsm(connFsm, FsmStopCallback);
EXPECT_TRUE(ret == SOFTBUS_INVALID_PARAM);
connFsm = CreateConnectionFsm();
ret = LnnStopConnectionFsm(connFsm, FsmStopCallback);
EXPECT_TRUE(ret == SOFTBUS_OK);
LnnDestroyConnectionFsm(connFsm);
LooperDeinit();
}
/*
@ -147,12 +130,8 @@ HWTEST_F(LnnConnectionFsmTest, LNN_STOP_CONNECTION_FSM_TEST_001, TestSize.Level0
*/
HWTEST_F(LnnConnectionFsmTest, LNN_SEND_JOIN_REQUEST_TO_CONNFSM_TEST_001, TestSize.Level0)
{
LooperInit();
LnnConnectionFsm *connFsm = CreateConnectionFsm();
int32_t ret = LnnSendJoinRequestToConnFsm(connFsm);
int32_t ret = LnnSendJoinRequestToConnFsm(connFsm2);
EXPECT_TRUE(ret == SOFTBUS_OK);
LnnDestroyConnectionFsm(connFsm);
LooperDeinit();
}
/*
@ -163,13 +142,9 @@ HWTEST_F(LnnConnectionFsmTest, LNN_SEND_JOIN_REQUEST_TO_CONNFSM_TEST_001, TestSi
*/
HWTEST_F(LnnConnectionFsmTest, LNN_SEND_AUTH_RESULT_MSG_TO_CONNFSM_TEST_001, TestSize.Level0)
{
LooperInit();
int32_t retCode = 1;
LnnConnectionFsm *connFsm = CreateConnectionFsm();
int32_t ret = LnnSendAuthResultMsgToConnFsm(connFsm, retCode);
int32_t ret = LnnSendAuthResultMsgToConnFsm(connFsm2, retCode);
EXPECT_TRUE(ret == SOFTBUS_OK);
LnnDestroyConnectionFsm(connFsm);
LooperDeinit();
}
/*
@ -180,12 +155,8 @@ HWTEST_F(LnnConnectionFsmTest, LNN_SEND_AUTH_RESULT_MSG_TO_CONNFSM_TEST_001, Tes
*/
HWTEST_F(LnnConnectionFsmTest, LNN_SEND_NOT_TRUSTED_TO_CONNFSM_TEST_001, TestSize.Level0)
{
LooperInit();
LnnConnectionFsm *connFsm = CreateConnectionFsm();
int32_t ret = LnnSendNotTrustedToConnFsm(connFsm);
int32_t ret = LnnSendNotTrustedToConnFsm(connFsm2);
EXPECT_TRUE(ret == SOFTBUS_OK);
LnnDestroyConnectionFsm(connFsm);
LooperDeinit();
}
/*
@ -196,12 +167,8 @@ HWTEST_F(LnnConnectionFsmTest, LNN_SEND_NOT_TRUSTED_TO_CONNFSM_TEST_001, TestSiz
*/
HWTEST_F(LnnConnectionFsmTest, LNN_SEND_DISCONNECT_MSG_TO_CONNFSM_TEST_001, TestSize.Level0)
{
LooperInit();
LnnConnectionFsm *connFsm = CreateConnectionFsm();
int32_t ret = LnnSendDisconnectMsgToConnFsm(connFsm);
int32_t ret = LnnSendDisconnectMsgToConnFsm(connFsm2);
EXPECT_TRUE(ret == SOFTBUS_OK);
LnnDestroyConnectionFsm(connFsm);
LooperDeinit();
}
/*
@ -212,12 +179,8 @@ HWTEST_F(LnnConnectionFsmTest, LNN_SEND_DISCONNECT_MSG_TO_CONNFSM_TEST_001, Test
*/
HWTEST_F(LnnConnectionFsmTest, LNN_SEND_LEAVE_REQUEST_TO_CONNFSM_TEST_001, TestSize.Level0)
{
LooperInit();
LnnConnectionFsm *connFsm = CreateConnectionFsm();
int32_t ret = LnnSendLeaveRequestToConnFsm(connFsm);
int32_t ret = LnnSendLeaveRequestToConnFsm(connFsm2);
EXPECT_TRUE(ret == SOFTBUS_OK);
LnnDestroyConnectionFsm(connFsm);
LooperDeinit();
}
/*
@ -228,12 +191,8 @@ HWTEST_F(LnnConnectionFsmTest, LNN_SEND_LEAVE_REQUEST_TO_CONNFSM_TEST_001, TestS
*/
HWTEST_F(LnnConnectionFsmTest, LNN_SEND_SYNC_OFFLINE_FINISH_TO_CONNFSM_TEST_001, TestSize.Level0)
{
LooperInit();
LnnConnectionFsm *connFsm = CreateConnectionFsm();
int32_t ret = LnnSendSyncOfflineFinishToConnFsm(connFsm);
int32_t ret = LnnSendSyncOfflineFinishToConnFsm(connFsm2);
EXPECT_TRUE(ret == SOFTBUS_OK);
LnnDestroyConnectionFsm(connFsm);
LooperDeinit();
}
/*
@ -244,11 +203,20 @@ HWTEST_F(LnnConnectionFsmTest, LNN_SEND_SYNC_OFFLINE_FINISH_TO_CONNFSM_TEST_001,
*/
HWTEST_F(LnnConnectionFsmTest, LNN_SEND_NEW_NETWORK_ONLINE_TO_CONNFSM_TEST_001, TestSize.Level0)
{
LooperInit();
LnnConnectionFsm *connFsm = CreateConnectionFsm();
int32_t ret = LnnSendNewNetworkOnlineToConnFsm(connFsm);
int32_t ret = LnnSendNewNetworkOnlineToConnFsm(connFsm2);
EXPECT_TRUE(ret == SOFTBUS_OK);
LnnDestroyConnectionFsm(connFsm);
LooperDeinit();
}
/*
* @tc.name: LNN_STOP_CONNECTION_FSM_TEST_001
* @tc.desc: test LnnStopConnectionFsm
* @tc.type: FUNC
* @tc.require: I5PRUD
*/
HWTEST_F(LnnConnectionFsmTest, LNN_STOP_CONNECTION_FSM_TEST_001, TestSize.Level0)
{
LnnConnectionFsm *fsm = nullptr;
int32_t ret = LnnStopConnectionFsm(fsm, FsmStopCallback);
EXPECT_TRUE(ret == SOFTBUS_INVALID_PARAM);
}
} // namespace OHOS

View File

@ -92,12 +92,9 @@ HWTEST_F(LnnNetBuilderTest, LNN_REQUEST_LEAVE_BY_ADDRTYPE_TEST_001, TestSize.Lev
bool type = true;
int32_t ret = LnnRequestLeaveByAddrType(&type, CONNECTION_ADDR_MAX);
EXPECT_TRUE(ret == SOFTBUS_ERR);
ret = LnnInitBusCenterEvent();
EXPECT_TRUE(ret == SOFTBUS_OK);
ret = LnnInitNetBuilder();
EXPECT_TRUE(ret == SOFTBUS_OK);
ret = LnnRequestLeaveByAddrType(&type, CONNECTION_ADDR_MAX);
LnnDeinitBusCenterEvent();
EXPECT_TRUE(ret == SOFTBUS_OK);
}
@ -114,12 +111,9 @@ HWTEST_F(LnnNetBuilderTest, LNN_REQUEST_LEAVE_SPECIFIC_TEST_001, TestSize.Level0
EXPECT_TRUE(ret == SOFTBUS_INVALID_PARAM);
ret = LnnRequestLeaveSpecific(NETWORKID, CONNECTION_ADDR_WLAN);
EXPECT_TRUE(ret == SOFTBUS_NO_INIT);
ret = LnnInitBusCenterEvent();
EXPECT_TRUE(ret == SOFTBUS_OK);
ret = LnnInitNetBuilder();
EXPECT_TRUE(ret == SOFTBUS_OK);
ret = LnnRequestLeaveSpecific(NETWORKID, CONNECTION_ADDR_WLAN);
LnnDeinitBusCenterEvent();
EXPECT_TRUE(ret == SOFTBUS_OK);
}
@ -133,12 +127,9 @@ HWTEST_F(LnnNetBuilderTest, LNN_REQUEST_LEAVE_INVALID_CONN_TEST_001, TestSize.Le
{
int32_t ret = LnnRequestLeaveInvalidConn(OLD_NETWORKID, CONNECTION_ADDR_WLAN, NETWORKID);
EXPECT_TRUE(ret == SOFTBUS_ERR);
ret = LnnInitBusCenterEvent();
EXPECT_TRUE(ret == SOFTBUS_OK);
ret = LnnInitNetBuilder();
EXPECT_TRUE(ret == SOFTBUS_OK);
ret = LnnRequestLeaveInvalidConn(OLD_NETWORKID, CONNECTION_ADDR_WLAN, NETWORKID);
LnnDeinitBusCenterEvent();
EXPECT_TRUE(ret == SOFTBUS_OK);
}
@ -152,12 +143,9 @@ HWTEST_F(LnnNetBuilderTest, LNN_REQUEST_CLEAN_CONN_FSM_TEST_001, TestSize.Level0
{
int32_t ret = LnnRequestCleanConnFsm(CONN_FSM_ID);
EXPECT_TRUE(ret == SOFTBUS_ERR);
ret = LnnInitBusCenterEvent();
EXPECT_TRUE(ret == SOFTBUS_OK);
ret = LnnInitNetBuilder();
EXPECT_TRUE(ret == SOFTBUS_OK);
ret = LnnRequestCleanConnFsm(CONN_FSM_ID);
LnnDeinitBusCenterEvent();
EXPECT_TRUE(ret == SOFTBUS_OK);
}
@ -177,12 +165,9 @@ HWTEST_F(LnnNetBuilderTest, LNN_NOTIFY_NODE_STATE_CHANGED_TEST_001, TestSize.Lev
memcpy_s(target.info.ip.ip, IP_STR_MAX_LEN, IP, strlen(IP));
int32_t ret = LnnNotifyNodeStateChanged(&target);
EXPECT_TRUE(ret == SOFTBUS_ERR);
ret = LnnInitBusCenterEvent();
EXPECT_TRUE(ret == SOFTBUS_OK);
ret = LnnInitNetBuilder();
EXPECT_TRUE(ret == SOFTBUS_OK);
ret = LnnNotifyNodeStateChanged(&target);
LnnDeinitBusCenterEvent();
EXPECT_TRUE(ret == SOFTBUS_OK);
}
@ -196,15 +181,12 @@ HWTEST_F(LnnNetBuilderTest, LNN_NOTIFY_MASTER_ELECT_TEST_001, TestSize.Level0)
{
int32_t ret = LnnNotifyMasterElect(NETWORKID, MASTER_UDID, MASTER_WEIGHT);
EXPECT_TRUE(ret == SOFTBUS_ERR);
ret = LnnInitBusCenterEvent();
EXPECT_TRUE(ret == SOFTBUS_OK);
ret = LnnInitNetBuilder();
EXPECT_TRUE(ret == SOFTBUS_OK);
char *networkId = nullptr;
ret = LnnNotifyMasterElect(networkId, MASTER_UDID, MASTER_WEIGHT);
EXPECT_TRUE(ret == SOFTBUS_INVALID_PARAM);
ret = LnnNotifyMasterElect(NETWORKID, MASTER_UDID, MASTER_WEIGHT);
LnnDeinitBusCenterEvent();
EXPECT_TRUE(ret == SOFTBUS_OK);
}
@ -219,8 +201,6 @@ HWTEST_F(LnnNetBuilderTest, LNN_UPDATE_NODE_ADDR_TEST_001, TestSize.Level0)
char *addr = nullptr;
int32_t ret = LnnUpdateNodeAddr(addr);
EXPECT_TRUE(ret == SOFTBUS_INVALID_PARAM);
ret = LnnInitBusCenterEvent();
EXPECT_TRUE(ret == SOFTBUS_OK);
ret = LnnInitNetBuilder();
EXPECT_TRUE(ret == SOFTBUS_OK);
ret = LnnUpdateNodeAddr(MASTER_UDID);
@ -229,6 +209,5 @@ HWTEST_F(LnnNetBuilderTest, LNN_UPDATE_NODE_ADDR_TEST_001, TestSize.Level0)
EXPECT_TRUE(ret == SOFTBUS_OK);
ret = LnnUpdateNodeAddr(MASTER_UDID);
EXPECT_TRUE(ret == SOFTBUS_OK);
LnnDeinitBusCenterEvent();
}
} // namespace OHOS