@@ -144,7 +144,8 @@ void helper_checkConfig(utils_log_config_t *expected, utils_log_config_t *is) {
144
144
145
145
TEST_F (test, parseEnv_errors) {
146
146
expected_message = " " ;
147
- loggerConfig = {false , false , LOG_ERROR, LOG_ERROR, NULL , " " };
147
+ loggerConfig =
148
+ utils_log_config_t {false , false , LOG_ERROR, LOG_ERROR, NULL , " " };
148
149
149
150
expect_fput_count = 0 ;
150
151
expected_stream = stderr;
@@ -217,8 +218,8 @@ TEST_F(test, parseEnv) {
217
218
flushLevel.first + " ;" +
218
219
output.first + " ;" +
219
220
timestamp.first + " ;" + pid.first ;
220
- b = loggerConfig = { false , false , LOG_ERROR,
221
- LOG_ERROR, NULL , " " };
221
+ b = loggerConfig = utils_log_config_t {
222
+ false , false , LOG_ERROR, LOG_ERROR, NULL , " " };
222
223
expect_fput_count = 0 ;
223
224
expect_fopen_count = 0 ;
224
225
expected_stream = stderr;
@@ -290,8 +291,8 @@ TEST_F(test, log_levels) {
290
291
expected_stream = stderr;
291
292
for (int i = LOG_DEBUG; i <= LOG_ERROR; i++) {
292
293
for (int j = LOG_DEBUG; j <= LOG_ERROR; j++) {
293
- loggerConfig = { false , false , ( utils_log_level_t )i,
294
- LOG_DEBUG, stderr, " " };
294
+ loggerConfig = utils_log_config_t {
295
+ false , false , ( utils_log_level_t )i, LOG_DEBUG, stderr, " " };
295
296
if (i > j) {
296
297
expect_fput_count = 0 ;
297
298
expect_fflush_count = 0 ;
@@ -314,7 +315,8 @@ TEST_F(test, log_outputs) {
314
315
expect_fflush_count = 1 ;
315
316
expected_message = " [DEBUG UMF] " + MOCK_FN_NAME + " : example log\n " ;
316
317
for (auto o : outs) {
317
- loggerConfig = {false , false , LOG_DEBUG, LOG_DEBUG, o, " " };
318
+ loggerConfig =
319
+ utils_log_config_t {false , false , LOG_DEBUG, LOG_DEBUG, o, " " };
318
320
expected_stream = o;
319
321
helper_test_log (LOG_DEBUG, MOCK_FN_NAME.c_str (), " %s" , " example log" );
320
322
}
@@ -325,8 +327,8 @@ TEST_F(test, flush_levels) {
325
327
expect_fput_count = 1 ;
326
328
for (int i = LOG_DEBUG; i <= LOG_ERROR; i++) {
327
329
for (int j = LOG_DEBUG; j <= LOG_ERROR; j++) {
328
- loggerConfig = { false , false , LOG_DEBUG, ( utils_log_level_t )i,
329
- stderr, " " };
330
+ loggerConfig = utils_log_config_t {
331
+ false , false , LOG_DEBUG, ( utils_log_level_t )i, stderr, " " };
330
332
if (i > j) {
331
333
expect_fflush_count = 0 ;
332
334
} else {
@@ -343,7 +345,8 @@ TEST_F(test, flush_levels) {
343
345
TEST_F (test, long_log) {
344
346
expect_fput_count = 1 ;
345
347
expect_fflush_count = 1 ;
346
- loggerConfig = {false , false , LOG_DEBUG, LOG_DEBUG, stderr, " " };
348
+ loggerConfig =
349
+ utils_log_config_t {false , false , LOG_DEBUG, LOG_DEBUG, stderr, " " };
347
350
expected_message = " [DEBUG UMF] " + MOCK_FN_NAME + " : " +
348
351
std::string (8189 - MOCK_FN_NAME.size (), ' x' ) + " \n " ;
349
352
helper_test_log (LOG_DEBUG, MOCK_FN_NAME.c_str (), " %s" ,
@@ -358,7 +361,8 @@ TEST_F(test, long_log) {
358
361
TEST_F (test, timestamp_log) {
359
362
expect_fput_count = 1 ;
360
363
expect_fflush_count = 1 ;
361
- loggerConfig = {true , false , LOG_DEBUG, LOG_DEBUG, stderr, " " };
364
+ loggerConfig =
365
+ utils_log_config_t {true , false , LOG_DEBUG, LOG_DEBUG, stderr, " " };
362
366
// TODO: for now we do not check output message,
363
367
// as it requires more sophisticated message validation (a.k.a regrex)
364
368
expected_message = " " ;
@@ -368,15 +372,17 @@ TEST_F(test, timestamp_log) {
368
372
TEST_F (test, pid_log) {
369
373
expect_fput_count = 1 ;
370
374
expect_fflush_count = 1 ;
371
- loggerConfig = {false , true , LOG_DEBUG, LOG_DEBUG, stderr, " " };
375
+ loggerConfig =
376
+ utils_log_config_t {false , true , LOG_DEBUG, LOG_DEBUG, stderr, " " };
372
377
// TODO: for now we do not check output message,
373
378
// as it requires more sophisticated message validation (a.k.a regrex)
374
379
expected_message = " " ;
375
380
helper_test_log (LOG_DEBUG, MOCK_FN_NAME.c_str (), " %s" , " example log" );
376
381
}
377
382
378
383
TEST_F (test, log_fatal) {
379
- loggerConfig = {false , false , LOG_DEBUG, LOG_DEBUG, NULL , " " };
384
+ loggerConfig =
385
+ utils_log_config_t {false , false , LOG_DEBUG, LOG_DEBUG, NULL , " " };
380
386
expected_stream = stderr;
381
387
expect_fput_count = 1 ;
382
388
expect_fflush_count = 1 ;
@@ -390,7 +396,8 @@ TEST_F(test, log_macros) {
390
396
expected_stream = stderr;
391
397
expect_fput_count = 1 ;
392
398
expect_fflush_count = 1 ;
393
- loggerConfig = {false , false , LOG_DEBUG, LOG_DEBUG, stderr, " " };
399
+ loggerConfig =
400
+ utils_log_config_t {false , false , LOG_DEBUG, LOG_DEBUG, stderr, " " };
394
401
395
402
expected_message = " [DEBUG UMF] TestBody: example log\n " ;
396
403
fput_count = 0 ;
@@ -437,7 +444,8 @@ template <typename... Args> void helper_test_plog(Args... args) {
437
444
}
438
445
439
446
TEST_F (test, plog_basic) {
440
- loggerConfig = {false , false , LOG_DEBUG, LOG_DEBUG, stderr, " " };
447
+ loggerConfig =
448
+ utils_log_config_t {false , false , LOG_DEBUG, LOG_DEBUG, stderr, " " };
441
449
expected_stream = stderr;
442
450
errno = 1 ;
443
451
strerr = " test error" ;
@@ -453,7 +461,8 @@ TEST_F(test, plog_basic) {
453
461
}
454
462
455
463
TEST_F (test, plog_invalid) {
456
- loggerConfig = {false , false , LOG_DEBUG, LOG_DEBUG, stderr, " " };
464
+ loggerConfig =
465
+ utils_log_config_t {false , false , LOG_DEBUG, LOG_DEBUG, stderr, " " };
457
466
expected_stream = stderr;
458
467
errno = INVALID_ERRNO;
459
468
strerr = " test error" ;
@@ -469,7 +478,8 @@ TEST_F(test, plog_invalid) {
469
478
}
470
479
471
480
TEST_F (test, plog_long_message) {
472
- loggerConfig = {false , false , LOG_DEBUG, LOG_DEBUG, stderr, " " };
481
+ loggerConfig =
482
+ utils_log_config_t {false , false , LOG_DEBUG, LOG_DEBUG, stderr, " " };
473
483
expected_stream = stderr;
474
484
expect_fput_count = 1 ;
475
485
expect_fflush_count = 1 ;
@@ -490,7 +500,8 @@ TEST_F(test, plog_long_message) {
490
500
}
491
501
492
502
TEST_F (test, plog_long_error) {
493
- loggerConfig = {false , false , LOG_DEBUG, LOG_DEBUG, stderr, " " };
503
+ loggerConfig =
504
+ utils_log_config_t {false , false , LOG_DEBUG, LOG_DEBUG, stderr, " " };
494
505
expected_stream = stderr;
495
506
expect_fput_count = 1 ;
496
507
expect_fflush_count = 1 ;
@@ -516,7 +527,8 @@ TEST_F(test, log_pmacros) {
516
527
expected_stream = stderr;
517
528
expect_fput_count = 1 ;
518
529
expect_fflush_count = 1 ;
519
- loggerConfig = {false , false , LOG_DEBUG, LOG_DEBUG, stderr, " " };
530
+ loggerConfig =
531
+ utils_log_config_t {false , false , LOG_DEBUG, LOG_DEBUG, stderr, " " };
520
532
errno = 1 ;
521
533
strerr = " test error" ;
522
534
0 commit comments