This is an automated email from the ASF dual-hosted git repository.
lizhimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-client-cpp.git
The following commit(s) were added to refs/heads/master by this push:
new 58fbd95 [ISSUE #496] Fix compilation issues in test code (#497)
58fbd95 is described below
commit 58fbd95c9fc5085aead17365433145a691861bd8
Author: takagi <[email protected]>
AuthorDate: Wed Jul 2 11:39:39 2025 +0800
[ISSUE #496] Fix compilation issues in test code (#497)
---
test/src/MQClientAPIImpTest.cpp | 10 +++++-----
test/src/extern/CPullConsumerTest.cpp | 4 ++--
test/src/producer/DefaultMQProducerImplTest.cpp | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/test/src/MQClientAPIImpTest.cpp b/test/src/MQClientAPIImpTest.cpp
index d736870..69e2442 100644
--- a/test/src/MQClientAPIImpTest.cpp
+++ b/test/src/MQClientAPIImpTest.cpp
@@ -132,7 +132,7 @@ TEST(MQClientAPIImplTest, sendMessage) {
requestHeader->defaultTopicQueueNums = 4;
requestHeader->bornTimestamp = UtilAll::currentTimeMillis();
SendResult result =
- impl->sendMessage("127.0.0.0:10911", "testBroker", message,
requestHeader, 100, 1, ComMode_SYNC, nullptr, sc);
+ impl->sendMessage("127.0.0.0:10911", "testBroker", message,
*requestHeader, 100, 1, ComMode_SYNC, nullptr, sc);
EXPECT_EQ(result.getSendStatus(), SEND_OK);
EXPECT_EQ(result.getMsgId(), unique_msgId);
EXPECT_EQ(result.getQueueOffset(), 409600);
@@ -159,7 +159,7 @@ TEST(MQClientAPIImplTest, sendMessage) {
requestHeader2->defaultTopicQueueNums = 4;
requestHeader2->bornTimestamp = UtilAll::currentTimeMillis();
EXPECT_ANY_THROW(
- impl->sendMessage("127.0.0.0:10911", "testBroker", message,
requestHeader2, 100, 1, ComMode_ASYNC, nullptr, sc));
+ impl->sendMessage("127.0.0.0:10911", "testBroker", message,
*requestHeader2, 100, 1, ComMode_ASYNC, nullptr, sc));
SendMessageRequestHeader* requestHeader3 = new SendMessageRequestHeader();
requestHeader3->producerGroup = cid;
@@ -168,7 +168,7 @@ TEST(MQClientAPIImplTest, sendMessage) {
requestHeader3->defaultTopicQueueNums = 4;
requestHeader3->bornTimestamp = UtilAll::currentTimeMillis();
SendCallback* pSendCallback = new MyMockAutoDeleteSendCallback();
- EXPECT_NO_THROW(impl->sendMessage("127.0.0.0:10911", "testBroker", message,
requestHeader3, 100, 1, ComMode_ASYNC,
+ EXPECT_NO_THROW(impl->sendMessage("127.0.0.0:10911", "testBroker", message,
*requestHeader3, 100, 1, ComMode_ASYNC,
pSendCallback, sc));
SendMessageRequestHeader* requestHeader4 = new SendMessageRequestHeader();
@@ -178,7 +178,7 @@ TEST(MQClientAPIImplTest, sendMessage) {
requestHeader4->defaultTopicQueueNums = 4;
requestHeader4->bornTimestamp = UtilAll::currentTimeMillis();
SendCallback* pSendCallback2 = new MyMockAutoDeleteSendCallback();
- EXPECT_NO_THROW(impl->sendMessage("127.0.0.0:10911", "testBroker", message,
requestHeader4, 1000, 2, ComMode_ASYNC,
+ EXPECT_NO_THROW(impl->sendMessage("127.0.0.0:10911", "testBroker", message,
*requestHeader4, 1000, 2, ComMode_ASYNC,
pSendCallback2, sc));
SendMessageRequestHeader* requestHeader5 = new SendMessageRequestHeader();
@@ -188,7 +188,7 @@ TEST(MQClientAPIImplTest, sendMessage) {
requestHeader5->defaultTopicQueueNums = 4;
requestHeader5->bornTimestamp = UtilAll::currentTimeMillis();
SendCallback* pSendCallback3 = new MyMockAutoDeleteSendCallback();
- EXPECT_NO_THROW(impl->sendMessage("127.0.0.0:10911", "testBroker", message,
requestHeader5, 1000, 3, ComMode_ASYNC,
+ EXPECT_NO_THROW(impl->sendMessage("127.0.0.0:10911", "testBroker", message,
*requestHeader5, 1000, 3, ComMode_ASYNC,
pSendCallback3, sc));
}
diff --git a/test/src/extern/CPullConsumerTest.cpp
b/test/src/extern/CPullConsumerTest.cpp
index 0ebfde6..a5459d9 100644
--- a/test/src/extern/CPullConsumerTest.cpp
+++ b/test/src/extern/CPullConsumerTest.cpp
@@ -165,7 +165,7 @@ TEST(cpullConsumer, init) {
SessionCredentials sessionCredentials =
defaultMQPullConsumer->getSessionCredentials();
EXPECT_EQ(sessionCredentials.getAccessKey(), "accessKey");
- EXPECT_EQ(SetPullConsumerLogPath(pullConsumer, NULL), OK);
+ EXPECT_EQ(SetPullConsumerLogPath(pullConsumer, ""), OK);
//
EXPECT_EQ(SetPullConsumerLogFileNumAndSize(pullConsumer,NULL,NULL),NULL_POINTER);
EXPECT_EQ(SetPullConsumerLogLevel(pullConsumer, E_LOG_LEVEL_DEBUG), OK);
@@ -189,7 +189,7 @@ TEST(cpullConsumer, null) {
SessionCredentials sessionCredentials =
defaultMQPullConsumer->getSessionCredentials();
EXPECT_EQ(sessionCredentials.getAccessKey(), "accessKey");
- EXPECT_EQ(SetPullConsumerLogPath(pullConsumer, NULL), OK);
+ EXPECT_EQ(SetPullConsumerLogPath(pullConsumer, ""), OK);
//
EXPECT_EQ(SetPullConsumerLogFileNumAndSize(pullConsumer,NULL,NULL),NULL_POINTER);
EXPECT_EQ(SetPullConsumerLogLevel(pullConsumer, E_LOG_LEVEL_DEBUG), OK);
EXPECT_EQ(DestroyPullConsumer(pullConsumer), OK);
diff --git a/test/src/producer/DefaultMQProducerImplTest.cpp
b/test/src/producer/DefaultMQProducerImplTest.cpp
index a86041e..b54ec67 100644
--- a/test/src/producer/DefaultMQProducerImplTest.cpp
+++ b/test/src/producer/DefaultMQProducerImplTest.cpp
@@ -67,7 +67,7 @@ class MockMQClientAPIImpl : public MQClientAPIImpl {
SendResult(const string&,
const string&,
const MQMessage&,
- SendMessageRequestHeader*,
+ const SendMessageRequestHeader&,
int,
int,
int,
@@ -121,7 +121,7 @@ TEST(DefaultMQProducerImplTest, Sends) {
topicPublishInfo->updateMessageQueueList(mqA);
topicPublishInfo->updateMessageQueueList(mqB);
- SendResult okMQAResult(SEND_OK, "MSSAGEID", "OFFSETID", mqA, 1024,
"DEFAULT_REGION");
+ SendResult okMQAResult(SEND_OK, "MSSAGEID", "OFFSETID", mqA, 1024,
"DEFAULT_REGION", false);
SendResult okMQBResult(SEND_OK, "MSSAGEID", "OFFSETID", mqB, 2048);
okMQBResult.setRegionId("DEFAULT_REGION");
okMQBResult.toString();
@@ -202,7 +202,7 @@ TEST(DefaultMQProducerImplTest, Trace) {
topicPublishInfo->updateMessageQueueList(mqA);
topicPublishInfo->updateMessageQueueList(mqB);
- SendResult okMQAResult(SEND_OK, "MSSAGEID", "OFFSETID", mqA, 1024,
"DEFAULT_REGION");
+ SendResult okMQAResult(SEND_OK, "MSSAGEID", "OFFSETID", mqA, 1024,
"DEFAULT_REGION", false);
EXPECT_CALL(*mockFactory, start()).Times(1).WillOnce(Return());
EXPECT_CALL(*mockFactory, shutdown()).Times(1).WillOnce(Return());
