feat: Independent compile

Signed-off-by: zhuofan0129 <861080528@qq.com>
This commit is contained in:
zhuofan0129 2024-08-09 11:49:58 +08:00
parent 9253b70f15
commit bac46b8e71
5 changed files with 38 additions and 33 deletions

View File

@ -47,7 +47,8 @@
"ipc",
"safwk",
"samgr",
"openssl"
"openssl",
"access_token"
],
"third_party": [ "openssl" ]
},

View File

@ -58,19 +58,22 @@ class DslmMsgInterfaceMock : public DslmMsgInterface {
public:
DslmMsgInterfaceMock();
~DslmMsgInterfaceMock() override;
MOCK_METHOD1(IsMessengerReady, bool(const Messenger *messenger));
MOCK_METHOD5(SendMsgTo, uint64_t(const Messenger *messenger, uint64_t transNo, const DeviceIdentify *devId,
const uint8_t *msg, uint32_t msgLen));
MOCK_METHOD3(GetDeviceOnlineStatus,
bool(const Messenger *messenger, const DeviceIdentify *devId, int32_t *level));
MOCK_METHOD3(GetSelfDeviceIdentify, bool(const Messenger *messenger, DeviceIdentify *devId, int32_t *level));
MOCK_METHOD3(ForEachDeviceProcess, void(const Messenger *messenger, const DeviceProcessor processor, void *para));
MOCK_METHOD1(Socket, int32_t(SocketInfo info));
MOCK_METHOD4(Listen,
int32_t(int32_t socket, const QosTV qos[], uint32_t qosCount, const ISocketListener *listener));
MOCK_METHOD4(Bind, int32_t(int32_t socket, const QosTV qos[], uint32_t qosCount, const ISocketListener *listener));
MOCK_METHOD3(SendBytes, int32_t(int32_t socket, const void *data, uint32_t len));
MOCK_METHOD1(Shutdown, void(int32_t socket));
MOCK_METHOD(bool, IsMessengerReady, (const Messenger *messenger), (override));
MOCK_METHOD(uint64_t, SendMsgTo, (const Messenger *messenger, uint64_t transNo, const DeviceIdentify *devId,
const uint8_t *msg, uint32_t msgLen), (override));
MOCK_METHOD(bool, GetDeviceOnlineStatus,
(const Messenger *messenger, const DeviceIdentify *devId, int32_t *level), (override));
MOCK_METHOD(bool, GetSelfDeviceIdentify, (const Messenger *messenger, DeviceIdentify *devId, int32_t *level),
(override));
MOCK_METHOD(void, ForEachDeviceProcess, (const Messenger *messenger, const DeviceProcessor processor, void *para),
(override));
MOCK_METHOD(int32_t, Socket, (SocketInfo info), (override));
MOCK_METHOD(int32_t, Listen,
(int32_t socket, const QosTV qos[], uint32_t qosCount, const ISocketListener *listener), (override));
MOCK_METHOD(int32_t, Bind, (int32_t socket, const QosTV qos[], uint32_t qosCount,
const ISocketListener *listener), (override));
MOCK_METHOD(int32_t, SendBytes, (int32_t socket, const void *data, uint32_t len), (override));
MOCK_METHOD(void, Shutdown, (int32_t socket), (override));
void MakeMsgLoopback() const;
void MakeSelfDeviceId(const DeviceIdentify *devId) const;
void MakeDeviceOnline(const DeviceIdentify *devId) const;

View File

@ -113,7 +113,7 @@ HWTEST_F(DslmMsgLibTest, DeviceSocketTestCase2, TestSize.Level0)
char dummy[] = {'a', 0};
PeerSocketInfo peer = {.name = dummy, .networkId = dummy};
{
DeviceIdentify id {.identity = {'a'}, .length = 1};
DeviceIdentify id {.length = 1, .identity = {'a'}};
uint8_t msg[UINT8_MAX] = {0};
UtPushMsgDataToPendingList(0, &id, msg, 1);
}
@ -186,8 +186,8 @@ HWTEST_F(DslmMsgLibTest, ProcessSocketMessageReceivedTest, TestSize.Level0)
.pkgName = "pkg",
.primarySockName = "pr",
.secondarySockName = "",
.threadCnt = 1,
.messageReceiver = [](const DeviceIdentify *, const uint8_t *, uint32_t) { return 0; },
.threadCnt = 1,
};
auto ret = InitDeviceSocketManager(queue, &config);
EXPECT_TRUE(ret);
@ -287,18 +287,19 @@ HWTEST_F(DslmMsgLibTest, MessengerSendMsgToTest, TestSize.Level0)
MessengerConfig config = {.pkgName = "pkg",
.primarySockName = "pr",
.secondarySockName = "se",
.messageReceiver = [](const DeviceIdentify *, const uint8_t *, uint32_t) { return 0; },
.threadCnt = 1,
.messageReceiver = [](const DeviceIdentify *, const uint8_t *, uint32_t) { return 0; }};
};
auto ret = InitDeviceSocketManager(queue, &config);
EXPECT_TRUE(ret);
uint8_t msg[UINT8_MAX] = {0};
{
DeviceIdentify idt {.identity = {'a'}, .length = 1};
DeviceIdentify idt {.length = 1, .identity = {'a'}};
MessengerSendMsgTo(0, &idt, msg, UINT8_MAX);
}
{
DeviceIdentify idt {.identity = {'x'}, .length = 1};
DeviceIdentify idt {.length = 1, .identity = {'x'}};
MessengerSendMsgTo(0, &idt, msg, UINT8_MAX);
}
EXPECT_TRUE(DeInitDeviceSocketManager());
@ -334,7 +335,7 @@ HWTEST_F(DslmMsgLibTest, CreateQueueMsgDataTest, TestSize.Level0)
uint32_t queueDataLen = 0;
auto *data = CreateQueueMsgData(&idt, msg, UINT8_MAX, &queueDataLen);
ASSERT_NE(data, nullptr);
EXPECT_EQ(data->msgLen, UINT8_MAX);
EXPECT_EQ(data->msgLen, static_cast<uint32_t>(UINT8_MAX));
EXPECT_EQ(queueDataLen, UINT8_MAX + sizeof(QueueMsgData));
}
}
@ -532,11 +533,11 @@ HWTEST_F(DslmMsgLibTest, MessengerGetDeviceOnlineStatus, TestSize.Level0)
EXPECT_FALSE(MessengerGetDeviceOnlineStatus(nullptr, nullptr));
}
{
DeviceIdentify idt {.identity = {'a'}, .length = 1};
DeviceIdentify idt {.length = 1, .identity = {'a'}};
EXPECT_FALSE(MessengerGetDeviceOnlineStatus(&idt, nullptr));
}
{
DeviceIdentify idt {.identity = {'a'}, .length = 1};
DeviceIdentify idt {.length = 1, .identity = {'a'}};
int32_t level = 0;
EXPECT_FALSE(MessengerGetDeviceOnlineStatus(&idt, &level));
}

View File

@ -30,14 +30,14 @@ class DslmRequestCallback {
public:
DslmRequestCallback() = default;
virtual ~DslmRequestCallback() = default;
virtual void RequestCallback(uint32_t cookie, uint32_t result, const DslmCallbackInfo *info) = 0;
virtual void RequestCallback(uint32_t cookie, uint32_t result, const DslmCallbackInfo *info) = 0;
};
class DslmRequestCallbackMock : public DslmRequestCallback {
public:
DslmRequestCallbackMock();
~DslmRequestCallbackMock() override;
MOCK_METHOD3(RequestCallback, void(uint32_t cookie, uint32_t result, const DslmCallbackInfo *info));
MOCK_METHOD(void, RequestCallback, (uint32_t cookie, uint32_t result, const DslmCallbackInfo *info), (override));
static void MockedCallback(uint32_t owner, uint32_t cookie, uint32_t result, const DslmCallbackInfo *info);

View File

@ -1701,7 +1701,7 @@ HWTEST_F(DslmTest, OnMsgSendResultNotifier_case1, TestSize.Level0)
uint32_t res = 2; // ERR_SESSION_OPEN_FAILED
ScheduleDslmStateMachine(deviceInfo, EVENT_MSG_SEND_FAILED, &res);
EXPECT_GE(deviceInfo->machine.currState, 0);
EXPECT_GE(deviceInfo->machine.currState, static_cast<uint32_t>(0));
ScheduleDslmStateMachine(deviceInfo, EVENT_DEVICE_OFFLINE, &res);
mockMsg.MakeDeviceOffline(&identify);
}
@ -2045,7 +2045,7 @@ HWTEST_F(DslmTest, DslmDumper_case1, TestSize.Level0)
ReportAppInvokeEvent(nullptr);
ReportSecurityInfoSyncEvent(nullptr);
auto handle = DslmUtilsStartPeriodicTimerTask(100, [](const void *context) { return; }, nullptr);
ASSERT_NE(handle, 0);
ASSERT_NE(handle, static_cast<uint32_t>(0));
DslmUtilsStopTimerTask(handle);
}
@ -2057,35 +2057,35 @@ HWTEST_F(DslmTest, DslmQueue_case1, TestSize.Level0)
auto proc = [](const uint8_t *data, uint32_t len) { return; };
{
auto ret = QueueWork(queue, proc, nullptr, 0);
EXPECT_EQ(ret, WORK_QUEUE_OK);
EXPECT_EQ(ret, static_cast<uint32_t>(WORK_QUEUE_OK));
}
{
auto ret = QueueWork(nullptr, nullptr, nullptr, 0);
EXPECT_EQ(ret, WORK_QUEUE_NULL_PTR);
EXPECT_EQ(ret, static_cast<uint32_t>(WORK_QUEUE_NULL_PTR));
ret = QueueWork(queue, nullptr, nullptr, 0);
EXPECT_EQ(ret, WORK_QUEUE_NULL_PTR);
EXPECT_EQ(ret, static_cast<uint32_t>(WORK_QUEUE_NULL_PTR));
}
{
auto sleepfunc = [](const uint8_t *data, uint32_t len) { this_thread::sleep_for(milliseconds(600)); };
auto ret = QueueWork(queue, sleepfunc, nullptr, 0);
EXPECT_EQ(ret, WORK_QUEUE_OK);
EXPECT_EQ(ret, static_cast<uint32_t>(WORK_QUEUE_OK));
ret = QueueWork(queue, sleepfunc, nullptr, 0);
(void)QueueWork(queue, proc, nullptr, 0);
(void)QueueWork(queue, proc, nullptr, 0);
(void)QueueWork(queue, proc, nullptr, 0);
(void)QueueWork(queue, proc, nullptr, 0);
(void)QueueWork(queue, proc, nullptr, 0);
EXPECT_GE(ret, WORK_QUEUE_OK);
EXPECT_GE(ret, static_cast<uint32_t>(WORK_QUEUE_OK));
}
{
auto ret = DestroyWorkQueue(queue);
EXPECT_EQ(ret, 0);
EXPECT_EQ(ret, static_cast<uint32_t>(0));
}
{
auto ret = DestroyWorkQueue(nullptr);
EXPECT_EQ(ret, WORK_QUEUE_NULL_PTR);
EXPECT_EQ(ret, static_cast<uint32_t>(WORK_QUEUE_NULL_PTR));
}
}
} // namespace DslmUnitTest