Skip to content

Commit d1742ad

Browse files
cjapplcjappl
committed
Cleanup logging name for review legibility
1 parent 1f09332 commit d1742ad

1 file changed

Lines changed: 79 additions & 73 deletions

File tree

‎test/test_rtlog.cpp‎

Lines changed: 79 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -104,33 +104,34 @@ TYPED_TEST_SUITE(TruncatedRtLogTest, TruncatedLoggerTypes);
104104
#ifdef RTLOG_USE_STB
105105

106106
TYPED_TEST(RtLogTest, BasicConstruction) {
107-
this->logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine},
108-
"Hello, world!");
109-
this->logger.Log({ExampleLogLevel::Info, ExampleLogRegion::Game},
110-
"Hello, world!");
111-
this->logger.Log({ExampleLogLevel::Warning, ExampleLogRegion::Network},
112-
"Hello, world!");
113-
this->logger.Log({ExampleLogLevel::Critical, ExampleLogRegion::Audio},
114-
"Hello, world!");
115-
116-
EXPECT_EQ(this->logger.PrintAndClearLogQueue(PrintMessage), 4);
107+
auto &logger = this->logger;
108+
logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine},
109+
"Hello, world!");
110+
logger.Log({ExampleLogLevel::Info, ExampleLogRegion::Game}, "Hello, world!");
111+
logger.Log({ExampleLogLevel::Warning, ExampleLogRegion::Network},
112+
"Hello, world!");
113+
logger.Log({ExampleLogLevel::Critical, ExampleLogRegion::Audio},
114+
"Hello, world!");
115+
116+
EXPECT_EQ(logger.PrintAndClearLogQueue(PrintMessage), 4);
117117
}
118118

119119
TYPED_TEST(RtLogTest, VaArgsWorksAsIntended) {
120-
this->logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine},
121-
"Hello, %lu!", 123ul);
122-
this->logger.Log({ExampleLogLevel::Info, ExampleLogRegion::Game},
123-
"Hello, %f!", 123.0);
124-
this->logger.Log({ExampleLogLevel::Warning, ExampleLogRegion::Network},
125-
"Hello, %lf!", 123.0);
126-
this->logger.Log({ExampleLogLevel::Critical, ExampleLogRegion::Audio},
127-
"Hello, %p!", (void *)123);
128-
this->logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine},
129-
"Hello, %d!", 123);
130-
this->logger.Log({ExampleLogLevel::Critical, ExampleLogRegion::Audio},
131-
"Hello, %s!", "world");
132-
133-
EXPECT_EQ(this->logger.PrintAndClearLogQueue(PrintMessage), 6);
120+
auto &logger = this->logger;
121+
logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine}, "Hello, %lu!",
122+
123ul);
123+
logger.Log({ExampleLogLevel::Info, ExampleLogRegion::Game}, "Hello, %f!",
124+
123.0);
125+
logger.Log({ExampleLogLevel::Warning, ExampleLogRegion::Network},
126+
"Hello, %lf!", 123.0);
127+
logger.Log({ExampleLogLevel::Critical, ExampleLogRegion::Audio}, "Hello, %p!",
128+
(void *)123);
129+
logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine}, "Hello, %d!",
130+
123);
131+
logger.Log({ExampleLogLevel::Critical, ExampleLogRegion::Audio}, "Hello, %s!",
132+
"world");
133+
134+
EXPECT_EQ(logger.PrintAndClearLogQueue(PrintMessage), 6);
134135
}
135136

136137
template <typename LoggerType>
@@ -143,49 +144,51 @@ void vaArgsTest(LoggerType &&logger, ExampleLogData &&data, const char *format,
143144
}
144145

145146
TYPED_TEST(RtLogTest, LogvVersionWorks) {
146-
vaArgsTest(this->logger, {ExampleLogLevel::Debug, ExampleLogRegion::Engine},
147+
auto &logger = this->logger;
148+
vaArgsTest(logger, {ExampleLogLevel::Debug, ExampleLogRegion::Engine},
147149
"Hello, %lu!", 123ul);
148-
vaArgsTest(this->logger, {ExampleLogLevel::Info, ExampleLogRegion::Game},
150+
vaArgsTest(logger, {ExampleLogLevel::Info, ExampleLogRegion::Game},
149151
"Hello, %f!", 123.0);
150-
vaArgsTest(this->logger,
151-
{ExampleLogLevel::Warning, ExampleLogRegion::Network},
152+
vaArgsTest(logger, {ExampleLogLevel::Warning, ExampleLogRegion::Network},
152153
"Hello, %lf!", 123.0);
153-
vaArgsTest(this->logger, {ExampleLogLevel::Critical, ExampleLogRegion::Audio},
154+
vaArgsTest(logger, {ExampleLogLevel::Critical, ExampleLogRegion::Audio},
154155
"Hello, %p!", (void *)123);
155-
vaArgsTest(this->logger, {ExampleLogLevel::Debug, ExampleLogRegion::Engine},
156+
vaArgsTest(logger, {ExampleLogLevel::Debug, ExampleLogRegion::Engine},
156157
"Hello, %d!", 123);
157-
vaArgsTest(this->logger, {ExampleLogLevel::Critical, ExampleLogRegion::Audio},
158+
vaArgsTest(logger, {ExampleLogLevel::Critical, ExampleLogRegion::Audio},
158159
"Hello, %s!", "world");
159160

160-
EXPECT_EQ(this->logger.PrintAndClearLogQueue(PrintMessage), 6);
161+
EXPECT_EQ(logger.PrintAndClearLogQueue(PrintMessage), 6);
161162
}
162163

163164
TYPED_TEST(RtLogTest, LoggerThreadDoesItsJob) {
164-
rtlog::LogProcessingThread thread(this->logger, PrintMessage,
165+
auto &logger = this->logger;
166+
rtlog::LogProcessingThread thread(logger, PrintMessage,
165167
std::chrono::milliseconds(10));
166168

167-
this->logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine},
168-
"Hello, %lu!", 123ul);
169-
this->logger.Log({ExampleLogLevel::Info, ExampleLogRegion::Game},
170-
"Hello, %f!", 123.0);
171-
this->logger.Log({ExampleLogLevel::Warning, ExampleLogRegion::Network},
172-
"Hello, %lf!", 123.0);
173-
this->logger.Log({ExampleLogLevel::Critical, ExampleLogRegion::Audio},
174-
"Hello, %p!", (void *)123);
175-
this->logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine},
176-
"Hello, %d!", 123);
177-
this->logger.Log({ExampleLogLevel::Critical, ExampleLogRegion::Audio},
178-
"Hello, %s!", "world");
169+
logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine}, "Hello, %lu!",
170+
123ul);
171+
logger.Log({ExampleLogLevel::Info, ExampleLogRegion::Game}, "Hello, %f!",
172+
123.0);
173+
logger.Log({ExampleLogLevel::Warning, ExampleLogRegion::Network},
174+
"Hello, %lf!", 123.0);
175+
logger.Log({ExampleLogLevel::Critical, ExampleLogRegion::Audio}, "Hello, %p!",
176+
(void *)123);
177+
logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine}, "Hello, %d!",
178+
123);
179+
logger.Log({ExampleLogLevel::Critical, ExampleLogRegion::Audio}, "Hello, %s!",
180+
"world");
179181

180182
thread.Stop();
181183
}
182184

183185
TYPED_TEST(TruncatedRtLogTest, ErrorsReturnedFromLog) {
184-
EXPECT_EQ(this->logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine},
185-
"Hello, %lu", 12ul),
186+
auto &logger = this->logger;
187+
EXPECT_EQ(logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine},
188+
"Hello, %lu", 12ul),
186189
rtlog::Status::Success);
187-
EXPECT_EQ(this->logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine},
188-
"Hello, %luxxxxxxxxxxxxxx", 123ul),
190+
EXPECT_EQ(logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine},
191+
"Hello, %luxxxxxxxxxxxxxx", 123ul),
189192
rtlog::Status::Error_MessageTruncated);
190193

191194
// Inspect truncated message
@@ -203,43 +206,46 @@ TYPED_TEST(TruncatedRtLogTest, ErrorsReturnedFromLog) {
203206
va_end(args);
204207

205208
EXPECT_STREQ(buffer.data(), "Hello, 12");
206-
EXPECT_EQ(strlen(buffer.data()), this->maxMessageLength - 1);
209+
EXPECT_EQ(strlen(buffer.data()), maxMessageLength - 1);
207210
};
208-
EXPECT_EQ(this->logger.PrintAndClearLogQueue(InspectLogMessage), 2);
211+
EXPECT_EQ(logger.PrintAndClearLogQueue(InspectLogMessage), 2);
209212
}
210213
#endif // RTLOG_USE_STB
211214

212215
#ifdef RTLOG_USE_FMTLIB
213216

214217
TYPED_TEST(RtLogTest, FormatLibVersionWorksAsIntended) {
215-
this->logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine},
216-
FMT_STRING("Hello, {}!"), 123l);
217-
this->logger.Log({ExampleLogLevel::Info, ExampleLogRegion::Game},
218-
FMT_STRING("Hello, {}!"), 123.0f);
219-
this->logger.Log({ExampleLogLevel::Warning, ExampleLogRegion::Network},
220-
FMT_STRING("Hello, {}!"), 123.0);
221-
this->logger.Log({ExampleLogLevel::Critical, ExampleLogRegion::Audio},
222-
FMT_STRING("Hello, {}!"), (void *)123);
223-
this->logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine},
224-
FMT_STRING("Hello, {}!"), 123);
225-
this->logger.Log({ExampleLogLevel::Critical, ExampleLogRegion::Audio},
226-
FMT_STRING("Hello, {}!"), "world");
227-
228-
EXPECT_EQ(this->logger.PrintAndClearLogQueue(PrintMessage), 6);
218+
auto &logger = this->logger;
219+
logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine},
220+
FMT_STRING("Hello, {}!"), 123l);
221+
logger.Log({ExampleLogLevel::Info, ExampleLogRegion::Game},
222+
FMT_STRING("Hello, {}!"), 123.0f);
223+
logger.Log({ExampleLogLevel::Warning, ExampleLogRegion::Network},
224+
FMT_STRING("Hello, {}!"), 123.0);
225+
logger.Log({ExampleLogLevel::Critical, ExampleLogRegion::Audio},
226+
FMT_STRING("Hello, {}!"), (void *)123);
227+
logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine},
228+
FMT_STRING("Hello, {}!"), 123);
229+
logger.Log({ExampleLogLevel::Critical, ExampleLogRegion::Audio},
230+
FMT_STRING("Hello, {}!"), "world");
231+
232+
EXPECT_EQ(logger.PrintAndClearLogQueue(PrintMessage), 6);
229233
}
230234

231235
TYPED_TEST(RtLogTest, LogReturnsSuccessOnNormalEnqueue) {
232-
EXPECT_EQ(this->logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine},
233-
FMT_STRING("Hello, {}!"), 123l),
236+
auto &logger = this->logger;
237+
EXPECT_EQ(logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine},
238+
FMT_STRING("Hello, {}!"), 123l),
234239
rtlog::Status::Success);
235240
}
236241

237242
TYPED_TEST(TruncatedRtLogTest, LogHandlesLongMessageTruncation) {
238-
EXPECT_EQ(this->logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine},
239-
FMT_STRING("Hello, {}"), 12ul),
243+
auto &logger = this->logger;
244+
EXPECT_EQ(logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine},
245+
FMT_STRING("Hello, {}"), 12ul),
240246
rtlog::Status::Success);
241-
EXPECT_EQ(this->logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine},
242-
FMT_STRING("Hello, {}xxxxxxxxxxx"), 123ul),
247+
EXPECT_EQ(logger.Log({ExampleLogLevel::Debug, ExampleLogRegion::Engine},
248+
FMT_STRING("Hello, {}xxxxxxxxxxx"), 123ul),
243249
rtlog::Status::Error_MessageTruncated);
244250

245251
auto InspectLogMessage = [=](const ExampleLogData &data,
@@ -257,10 +263,10 @@ TYPED_TEST(TruncatedRtLogTest, LogHandlesLongMessageTruncation) {
257263
va_end(args);
258264

259265
EXPECT_STREQ(buffer.data(), "Hello, 12");
260-
EXPECT_EQ(strlen(buffer.data()), this->maxMessageLength - 1);
266+
EXPECT_EQ(strlen(buffer.data()), maxMessageLength - 1);
261267
};
262268

263-
EXPECT_EQ(this->logger.PrintAndClearLogQueue(InspectLogMessage), 2);
269+
EXPECT_EQ(logger.PrintAndClearLogQueue(InspectLogMessage), 2);
264270
}
265271

266272
TEST(LoggerTest, SingleWriterLogHandlesQueueFullError) {

0 commit comments

Comments
 (0)