Skip to content

Commit 555c25c

Browse files
committed
Few fixups from self review
1 parent d8c4f2d commit 555c25c

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

test/test_rtlog.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,13 @@ TYPED_TEST(RtLogTest, LoggerThreadDoesItsJob) {
184184

185185
TYPED_TEST(TruncatedRtLogTest, ErrorsReturnedFromLog) {
186186
auto &logger = this->logger;
187+
auto maxMessageLength = this->maxMessageLength;
187188
EXPECT_EQ(logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine},
188189
"Hello, %lu", 12ul),
189190
rtlog::Status::Success);
191+
190192
EXPECT_EQ(logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine},
191-
"Hello, %luxxxxxxxxxxxxxx", 123ul),
193+
"Hello, %lu! xxxxxxxxxxx", 123ul),
192194
rtlog::Status::Error_MessageTruncated);
193195

194196
// Inspect truncated message
@@ -206,7 +208,7 @@ TYPED_TEST(TruncatedRtLogTest, ErrorsReturnedFromLog) {
206208
va_end(args);
207209

208210
EXPECT_STREQ(buffer.data(), "Hello, 12");
209-
EXPECT_EQ(strlen(buffer.data()), this->maxMessageLength - 1);
211+
EXPECT_EQ(strlen(buffer.data()), maxMessageLength - 1);
210212
};
211213
EXPECT_EQ(logger.PrintAndClearLogQueue(InspectLogMessage), 2);
212214
}
@@ -241,11 +243,9 @@ TYPED_TEST(RtLogTest, LogReturnsSuccessOnNormalEnqueue) {
241243

242244
TYPED_TEST(TruncatedRtLogTest, LogHandlesLongMessageTruncation) {
243245
auto &logger = this->logger;
246+
auto maxMessageLength = this->maxMessageLength;
244247
EXPECT_EQ(logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine},
245-
FMT_STRING("Hello, {}"), 12ul),
246-
rtlog::Status::Success);
247-
EXPECT_EQ(logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine},
248-
FMT_STRING("Hello, {}xxxxxxxxxxx"), 123ul),
248+
FMT_STRING("Hello, {}! xxxxxxxxxxx"), 123l),
249249
rtlog::Status::Error_MessageTruncated);
250250

251251
auto InspectLogMessage = [=](const ExampleLogData &data,
@@ -263,10 +263,10 @@ TYPED_TEST(TruncatedRtLogTest, LogHandlesLongMessageTruncation) {
263263
va_end(args);
264264

265265
EXPECT_STREQ(buffer.data(), "Hello, 12");
266-
EXPECT_EQ(strlen(buffer.data()), this->maxMessageLength - 1);
266+
EXPECT_EQ(strlen(buffer.data()), maxMessageLength - 1);
267267
};
268268

269-
EXPECT_EQ(logger.PrintAndClearLogQueue(InspectLogMessage), 2);
269+
EXPECT_EQ(logger.PrintAndClearLogQueue(InspectLogMessage), 1);
270270
}
271271

272272
TEST(LoggerTest, SingleWriterLogHandlesQueueFullError) {

0 commit comments

Comments
 (0)