Skip to content

Commit a02195b

Browse files
bjacotgbjacotg
committed
Prefer \x1B over the unicode character
1 parent 3d83c05 commit a02195b

File tree

2 files changed

+61
-61
lines changed

2 files changed

+61
-61
lines changed

‎googletest/src/matchers/eq_matcher.rs‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -304,17 +304,17 @@ mod tests {
304304
verify_that!(
305305
result,
306306
err(displays_as(contains_substring(indoc! {
307-
r#"
308-
Actual: Strukt { int: 123, string: "something" },
309-
which isn't equal to Strukt { int: 321, string: "someone" }
307+
"
308+
Actual: Strukt { int: 123, string: \"something\" },
309+
which isn't equal to Strukt { int: 321, string: \"someone\" }
310310
Difference:
311311
Strukt {
312-
[1;31m int: 123,[0m
313-
[1;34m int: 321,[0m
314-
[1;31m string: "something",[0m
315-
[1;34m string: "someone",[0m
312+
\x1B[1;31m int: 123,\x1B[0m
313+
\x1B[1;34m int: 321,\x1B[0m
314+
\x1B[1;31m string: \"something\",\x1B[0m
315+
\x1B[1;34m string: \"someone\",\x1B[0m
316316
}
317-
"#})))
317+
"})))
318318
)
319319
}
320320

@@ -324,19 +324,19 @@ mod tests {
324324
verify_that!(
325325
result,
326326
err(displays_as(contains_substring(indoc! {
327-
r#"
327+
"
328328
Value of: vec![1, 2, 3]
329329
Expected: is equal to [1, 3, 4]
330330
Actual: [1, 2, 3],
331331
which isn't equal to [1, 3, 4]
332332
Difference:
333333
[
334334
1,
335-
[1;31m 2,[0m
335+
\x1B[1;31m 2,\x1B[0m
336336
3,
337-
[1;34m 4,[0m
337+
\x1B[1;34m 4,\x1B[0m
338338
]
339-
"#})))
339+
"})))
340340
)
341341
}
342342

@@ -346,20 +346,20 @@ mod tests {
346346
verify_that!(
347347
result,
348348
err(displays_as(contains_substring(indoc! {
349-
r#"
349+
"
350350
Value of: vec![1, 2, 3, 4, 5]
351351
Expected: is equal to [1, 3, 5]
352352
Actual: [1, 2, 3, 4, 5],
353353
which isn't equal to [1, 3, 5]
354354
Difference:
355355
[
356356
1,
357-
[1;31m 2,[0m
357+
\x1B[1;31m 2,\x1B[0m
358358
3,
359-
[1;31m 4,[0m
359+
\x1B[1;31m 4,\x1B[0m
360360
5,
361361
]
362-
"#})))
362+
"})))
363363
)
364364
}
365365

@@ -372,15 +372,15 @@ mod tests {
372372
"
373373
Difference:
374374
[
375-
[1;31m 1,[0m
376-
[1;31m 2,[0m
375+
\x1B[1;31m 1,\x1B[0m
376+
\x1B[1;31m 2,\x1B[0m
377377
3,
378378
4,
379-
[3m<---- 43 common lines omitted ---->[0m
379+
\x1B[3m<---- 43 common lines omitted ---->\x1B[0m
380380
48,
381381
49,
382-
[1;34m 50,[0m
383-
[1;34m 51,[0m
382+
\x1B[1;34m 50,\x1B[0m
383+
\x1B[1;34m 51,\x1B[0m
384384
]"})))
385385
)
386386
}
@@ -394,15 +394,15 @@ mod tests {
394394
"
395395
Difference:
396396
[
397-
[1;31m 1,[0m
398-
[1;31m 2,[0m
397+
\x1B[1;31m 1,\x1B[0m
398+
\x1B[1;31m 2,\x1B[0m
399399
3,
400400
4,
401401
5,
402402
6,
403403
7,
404-
[1;34m 8,[0m
405-
[1;34m 9,[0m
404+
\x1B[1;34m 8,\x1B[0m
405+
\x1B[1;34m 9,\x1B[0m
406406
]"})))
407407
)
408408
}
@@ -417,11 +417,11 @@ mod tests {
417417
Difference:
418418
[
419419
1,
420-
[3m<---- 46 common lines omitted ---->[0m
420+
\x1B[3m<---- 46 common lines omitted ---->\x1B[0m
421421
48,
422422
49,
423-
[1;34m 50,[0m
424-
[1;34m 51,[0m
423+
\x1B[1;34m 50,\x1B[0m
424+
\x1B[1;34m 51,\x1B[0m
425425
]"})))
426426
)
427427
}
@@ -435,11 +435,11 @@ mod tests {
435435
"
436436
Difference:
437437
[
438-
[1;31m 1,[0m
439-
[1;31m 2,[0m
438+
\x1B[1;31m 1,\x1B[0m
439+
\x1B[1;31m 2,\x1B[0m
440440
3,
441441
4,
442-
[3m<---- 46 common lines omitted ---->[0m
442+
\x1B[3m<---- 46 common lines omitted ---->\x1B[0m
443443
51,
444444
]"})))
445445
)
@@ -484,12 +484,12 @@ mod tests {
484484
verify_that!(
485485
result,
486486
err(displays_as(contains_substring(indoc!(
487-
r#"
487+
"
488488
First line
489-
[1;31mSecond line[0m
490-
[1;34mSecond lines[0m
489+
\x1B[1;31mSecond line\x1B[0m
490+
\x1B[1;34mSecond lines\x1B[0m
491491
Third line
492-
"#
492+
"
493493
))))
494494
)
495495
}

‎googletest/src/matchers/str_matcher.rs‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -974,8 +974,8 @@ mod tests {
974974
err(displays_as(contains_substring(indoc!(
975975
"
976976
First line
977-
[1;31mSecond line[0m
978-
[1;34mSecond lines[0m
977+
\x1B[1;31mSecond line\x1B[0m
978+
\x1B[1;34mSecond lines\x1B[0m
979979
Third line
980980
"
981981
))))
@@ -1007,10 +1007,10 @@ mod tests {
10071007
err(displays_as(contains_substring(indoc!(
10081008
"
10091009
First line
1010-
[1;31mSecond line[0m
1011-
[1;34mSecond lines[0m
1010+
\x1B[1;31mSecond line\x1B[0m
1011+
\x1B[1;34mSecond lines\x1B[0m
10121012
Third line
1013-
[3m<---- remaining lines omitted ---->[0m
1013+
\x1B[3m<---- remaining lines omitted ---->\x1B[0m
10141014
"
10151015
))))
10161016
)
@@ -1040,9 +1040,9 @@ mod tests {
10401040
err(displays_as(contains_substring(indoc!(
10411041
"
10421042
First line
1043-
[1;31mSecond line[0m
1044-
[1;34mSecond lines[0m
1045-
[3m<---- remaining lines omitted ---->[0m
1043+
\x1B[1;31mSecond line\x1B[0m
1044+
\x1B[1;34mSecond lines\x1B[0m
1045+
\x1B[3m<---- remaining lines omitted ---->\x1B[0m
10461046
"
10471047
))))
10481048
)
@@ -1073,10 +1073,10 @@ mod tests {
10731073
err(displays_as(contains_substring(indoc!(
10741074
"
10751075
Difference:
1076-
[3m<---- remaining lines omitted ---->[0m
1076+
\x1B[3m<---- remaining lines omitted ---->\x1B[0m
10771077
Second line
1078-
[1;34mThird lines[0m
1079-
[1;31mThird line[0m
1078+
\x1B[1;34mThird lines\x1B[0m
1079+
\x1B[1;31mThird line\x1B[0m
10801080
Fourth line
10811081
"
10821082
))))
@@ -1110,12 +1110,12 @@ mod tests {
11101110
err(displays_as(contains_substring(indoc!(
11111111
"
11121112
Difference:
1113-
[3m<---- remaining lines omitted ---->[0m
1113+
\x1B[3m<---- remaining lines omitted ---->\x1B[0m
11141114
Second line
1115-
[1;34mThird lines[0m
1116-
[1;31mThird line[0m
1115+
\x1B[1;34mThird lines\x1B[0m
1116+
\x1B[1;31mThird line\x1B[0m
11171117
Fourth line
1118-
[3m<---- remaining lines omitted ---->[0m"
1118+
\x1B[3m<---- remaining lines omitted ---->\x1B[0m"
11191119
))))
11201120
)
11211121
}
@@ -1147,15 +1147,15 @@ mod tests {
11471147
err(displays_as(contains_substring(indoc!(
11481148
"
11491149
Difference:
1150-
[3m<---- remaining lines omitted ---->[0m
1151-
[1;34mline[0m
1152-
[1;31mSecond line[0m
1150+
\x1B[3m<---- remaining lines omitted ---->\x1B[0m
1151+
\x1B[1;34mline\x1B[0m
1152+
\x1B[1;31mSecond line\x1B[0m
11531153
Third line
1154-
[1;34mFoorth line[0m
1155-
[1;31mFourth line[0m
1156-
[1;34mFifth[0m
1157-
[1;31mFifth line[0m
1158-
[3m<---- remaining lines omitted ---->[0m
1154+
\x1B[1;34mFoorth line\x1B[0m
1155+
\x1B[1;31mFourth line\x1B[0m
1156+
\x1B[1;34mFifth\x1B[0m
1157+
\x1B[1;31mFifth line\x1B[0m
1158+
\x1B[3m<---- remaining lines omitted ---->\x1B[0m
11591159
"
11601160
))))
11611161
)
@@ -1186,10 +1186,10 @@ mod tests {
11861186
err(displays_as(contains_substring(indoc!(
11871187
"
11881188
First line
1189-
[1;31mSecond line[0m
1190-
[1;34mSecond lines[0m
1189+
\x1B[1;31mSecond line\x1B[0m
1190+
\x1B[1;34mSecond lines\x1B[0m
11911191
Third line
1192-
[1;31mFourth line[0m
1192+
\x1B[1;31mFourth line\x1B[0m
11931193
"
11941194
))))
11951195
)

0 commit comments

Comments
 (0)