8000 Rebased · log4cplus/Catch@3dc3763 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3dc3763

Browse files
philsquaredphilsquared
committed
Rebased
1 parent 3f9e3e2 commit 3dc3763

File tree

4 files changed

+252
-15
lines changed

4 files changed

+252
-15
lines changed

‎projects/SelfTest/Baselines/console.std.approved.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ warning:
759759
error
760760

761761
-------------------------------------------------------------------------------
762-
A failing expression with a non streamable type is still captured[failing]
762+
A failing expression with a non streamable type is still captured
763763
-------------------------------------------------------------------------------
764764
TrickyTests.cpp:<line number>
765765
...............................................................................
@@ -775,7 +775,7 @@ with expansion:
775775
{?} == {?}
776776

777777
-------------------------------------------------------------------------------
778-
string literals of different sizes can be compared[failing]
778+
string literals of different sizes can be compared
779779
-------------------------------------------------------------------------------
780780
TrickyTests.cpp:<line number>
781781
...............................................................................
@@ -786,6 +786,6 @@ with expansion:
786786
"first" == "second"
787787

788788
===============================================================================
789-
test cases: 148 | 109 passed | 38 failed | 1 failed as expected
790-
assertions: 739 | 647 passed | 79 failed | 13 failed as expected
789+
test cases: 149 | 110 passed | 38 failed | 1 failed as expected
790+
assertions: 751 | 659 passed | 79 failed | 13 failed as expected
791791

‎projects/SelfTest/Baselines/console.sw.approved.txt

Lines changed: 118 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4518,6 +4518,120 @@ with expansion:
45184518
five
45194519
six"
45204520

4521+
-------------------------------------------------------------------------------
4522+
replaceInPlace
4523+
replace single char
4524+
-------------------------------------------------------------------------------
4525+
TestMain.cpp:<line number>
4526+
...............................................................................
4527+
4528+
TestMain.cpp:<line number>:
4529+
PASSED:
4530+
CHECK( replaceInPlace( letters, "b", "z" ) )
4531+
with expansion:
4532+
true
4533+
4534+
TestMain.cpp:<line number>:
4535+
PASSED:
4536+
CHECK( letters == "azcdefcg" )
4537+
with expansion:
4538+
"azcdefcg" == "azcdefcg"
4539+
4540+
-------------------------------------------------------------------------------
4541+
replaceInPlace
4542+
replace two chars
4543+
-------------------------------------------------------------------------------
4544+
TestMain.cpp:<line number>
4545+
...............................................................................
4546+
4547+
TestMain.cpp:<line number>:
4548+
PASSED:
4549+
CHECK( replaceInPlace( letters, "c", "z" ) )
4550+
with expansion:
4551+
true
4552+
4553+
TestMain.cpp:<line number>:
4554+
PASSED:
4555+
CHECK( letters == "abzdefzg" )
4556+
with expansion:
4557+
"abzdefzg" == "abzdefzg"
4558+
4559+
-------------------------------------------------------------------------------
4560+
replaceInPlace
4561+
replace first char
4562+
-------------------------------------------------------------------------------
4563+
TestMain.cpp:<line number>
4564+
...............................................................................
4565+
4566+
TestMain.cpp:<line number>:
4567+
PASSED:
4568+
CHECK( replaceInPlace( letters, "a", "z" ) )
4569+
with expansion:
4570+
true
4571+
4572+
TestMain.cpp:<line number>:
4573+
PASSED:
4574+
CHECK( letters == "zbcdefcg" )
4575+
with expansion:
4576+
"zbcdefcg" == "zbcdefcg"
4577+
4578+
-------------------------------------------------------------------------------
4579+
replaceInPlace
4580+
replace last char
4581+
-------------------------------------------------------------------------------
4582+
TestMain.cpp:<line number>
4583+
...............................................................................
4584+
4585+
TestMain.cpp:<line number>:
4586+
PASSED:
4587+
CHECK( replaceInPlace( letters, "g", "z" ) )
4588+
with expansion:
4589+
true
4590+
4591+
TestMain.cpp:<line number>:
4592+
PASSED:
4593+
CHECK( letters == "abcdefcz" )
4594+
with expansion:
4595+
"abcdefcz" == "abcdefcz"
4596+
4597+
-------------------------------------------------------------------------------
4598+
replaceInPlace
4599+
replace all chars
4600+
-------------------------------------------------------------------------------
4601+
TestMain.cpp:<line number>
4602+
...............................................................................
4603+
4604+
TestMain.cpp:<line number>:
4605+
PASSED:
4606+
CHECK( replaceInPlace( letters, letters, "replaced" ) )
4607+
with expansion:
4608+
true
4609+
4610+
TestMain.cpp:<line number>:
4611+
PASSED:
4612+
CHECK( letters == "replaced" )
4613+
with expansion:
4614+
"replaced" == "replaced"
4615+
4616+
-------------------------------------------------------------------------------
4617+
replaceInPlace
4618+
replace no chars
4619+
-------------------------------------------------------------------------------
4620+
TestMain.cpp:<line number>
4621+
...............................................................................
4622+
4623+
TestMain.cpp:<line number>:
4624+
PASSED:
4625+
CHECK_FALSE( replaceInPlace( letters, "x", "z" ) )
4626+
with expansion:
4627+
!false
4628+
4629+
TestMain.cpp:<line number>:
4630+
PASSED:
4631+
CHECK( letters == letters )
4632+
with expansion:
4633+
"abcdefcg" == "abcdefcg"
4634+
45214635
hello
45224636
hello
45234637
-------------------------------------------------------------------------------
@@ -5604,7 +5718,7 @@ warning:
56045718
No assertions in test case 'Where the LHS is not a simple value[failing]'
56055719

56065720
-------------------------------------------------------------------------------
5607-
A failing expression with a non streamable type is still captured[failing]
5721+
A failing expression with a non streamable type is still captured
56085722
-------------------------------------------------------------------------------
56095723
TrickyTests.cpp:<line number>
56105724
...............................................................................
@@ -5620,7 +5734,7 @@ with expansion:
56205734
{?} == {?}
56215735

56225736
-------------------------------------------------------------------------------
5623-
string literals of different sizes can be compared[failing]
5737+
string literals of different sizes can be compared
56245738
-------------------------------------------------------------------------------
56255739
TrickyTests.cpp:<line number>
56265740
...............................................................................
@@ -7683,6 +7797,6 @@ with expansion:
76837797
true
76847798

76857799
===============================================================================
7686-
test cases: 148 | 93 passed | 54 failed | 1 failed as expected
7687-
assertions: 759 | 647 passed | 99 failed | 13 failed as expected
7800+
test cases: 149 | 94 passed | 54 failed | 1 failed as expected
7801+
assertions: 771 | 659 passed | 99 failed | 13 failed as expected
76887802

‎projects/SelfTest/Baselines/junit.sw.approved.txt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<testsuites>
2-
<testsuite name="all tests" errors="12" failures="87" tests="759" hostname="tbd" time="{duration}" timestamp="tbd">
2+
<testsuite name="all tests" errors="12" failures="87" tests="771" hostname="tbd" time="{duration}" timestamp="tbd">
33
<testcase classname="global" name="toString(enum)" time="{duration}"/>
44
<testcase classname="global" name="toString(enum w/operator&lt;&lt;)" time="{duration}"/>
55
<testcase classname="global" name="toString(enum class)" time="{duration}"/>
@@ -485,6 +485,12 @@ MiscTests.cpp:<line number>
485485
<testcase classname="Long strings can be wrapped" name="With newlines/Wrapped once" time="{duration}"/>
486486
<testcase classname="Long strings can be wrapped" name="With newlines/Wrapped twice" time="{duration}"/>
487487
<testcase classname="Long strings can be wrapped" name="With tabs" time="{duration}"/>
488+
<testcase classname="replaceInPlace" name="replace single char" time="{duration}"/>
489+
<testcase classname="replaceInPlace" name="replace two chars" time="{duration}"/>
490+
<testcase classname="replaceInPlace" name="replace first char" time="{duration}"/>
491+
<testcase classname="replaceInPlace" name="replace last char" time="{duration}"/>
492+
<testcase classname="replaceInPlace" name="replace all chars" time="{duration}"/>
493+
<testcase classname="replaceInPlace" name="replace no chars" time="{duration}"/>
488494
<testcase classname="global" name="Strings can be rendered with colour" time="{duration}">
489495
<system-out>
490496
hello
@@ -496,15 +502,15 @@ hello
496502
<testcase classname="global" name="Parsing a std::pair" time="{duration}"/>
497503
<testcase classname="global" name="Where the is more to the expression after the RHS[failing]" time="{duration}"/>
498504
<testcase classname="global" name="Where the LHS is not a simple value[failing]" time="{duration}"/>
499-
<testcase classname="global" name="A failing expression with a non streamable type is still captured[failing]" time="{duration}">
505+
<testcase classname="global" name="A failing expression with a non streamable type is still captured" time="{duration}">
500506
<failure message="0x<hex digits> == 0x<hex digits>" type="CHECK">
501507
TrickyTests.cpp:<line number>
502508
</failure>
503509
<failure message="{?} == {?}" type="CHECK">
504510
TrickyTests.cpp:<line number>
505511
</failure>
506512
</testcase>
507-
<testcase classname="global" name="string literals of different sizes can be compared[failing]" time="{duration}">
513+
<testcase classname="global" name="string literals of different sizes can be compared" time="{duration}">
508514
<failure message="&quot;first&quot; == &quot;second&quot;" type="REQUIRE">
509515
TrickyTests.cpp:<line number>
510516
</failure>

‎projects/SelfTest/Baselines/xml.sw.approved.txt

Lines changed: 121 additions & 4 deletions
4834
Original file line numberDiff line numberDiff line change
@@ -4714,6 +4714,123 @@ four&quot;
47144714
</Section>
47154715
<OverallResult success="true"/>
47164716
</TestCase>
4717+
<TestCase name="replaceInPlace">
4718+
<Section name="replace single char">
4719+
<Expression success="true" filename="projects/SelfTest/TestMain.cpp" >
4720+
<Original>
4721+
replaceInPlace( letters, &quot;b&quot;, &quot;z&quot; )
4722+
</Original>
4723+
<Expanded>
4724+
true
4725+
</Expanded>
4726+
</Expression>
4727+
<Expression success="true" filename="projects/SelfTest/TestMain.cpp" >
4728+
<Original>
4729+
letters == &quot;azcdefcg&quot;
4730+
</Original>
4731+
<Expanded>
4732+
&quot;azcdefcg&quot; == &quot;azcdefcg&quot;
4733+
</Expanded>
4734+
</Expression>
4735+
<OverallResults successes="2" failures="0" expectedFailures="0"/>
4736+
</Section>
4737+
<Section name="replace two chars">
4738+
<Expression success="true" filename="projects/SelfTest/TestMain.cpp" >
4739+
<Original>
4740+
replaceInPlace( letters, &quot;c&quot;, &quot;z&quot; )
4741+
</Original>
4742+
<Expanded>
4743+
true
4744+
</Expanded>
4745+
</Expression>
4746+
<Expression success="true" filename="projects/SelfTest/TestMain.cpp" >
4747+
<Original>
4748+
letters == &quot;abzdefzg&quot;
4749+
</Original>
4750+
<Expanded>
4751+
&quot;abzdefzg&quot; == &quot;abzdefzg&quot;
4752+
</Expanded>
4753+
</Expression>
4754+
<OverallResults successes="2" failures="0" expectedFailures="0"/>
4755+
</Section>
4756+
<Section name="replace first char">
4757+
<Expression success="true" filename="projects/SelfTest/TestMain.cpp" >
4758+
<Original>
4759+
replaceInPlace( letters, &quot;a&quot;, &quot;z&quot; )
4760+
</Original>
4761+
<Expanded>
4762+
true
4763+
</Expanded>
4764+
</Expression>
4765+
<Expression success="true" filename="projects/SelfTest/TestMain.cpp" >
4766+
<Original>
4767+
letters == &quot;zbcdefcg&quot;
4768+
</Original>
4769+
<Expanded>
4770+
&quot;zbcdefcg&quot; == &quot;zbcdefcg&quot;
4771+
</Expanded>
4772+
</Expression>
4773+
<OverallResults successes="2" failures="0" expectedFailures="0"/>
4774+
</Section>
4775+
<Section name="replace last char">
4776+
<Expression success="true" filename="projects/SelfTest/TestMain.cpp" >
4777+
<Original>
4778+
replaceInPlace( letters, &quot;g&quot;, &quot;z&quot; )
4779+
</Original>
4780+
<Expanded>
4781+
true
4782+
</Expanded>
4783+
</Expression>
4784+
<Expression success="true" filename="projects/SelfTest/TestMain.cpp" >
4785+
<Original>
4786+
letters == &quot;abcdefcz&quot;
4787+
</Original>
4788+
<Expanded>
4789+
&quot;abcdefcz&quot; == &quot;abcdefcz&quot;
4790+
</Expanded>
4791+
</Expression>
4792+
<OverallResults successes="2" failures="0" expectedFailures="0"/>
4793+
</Section>
4794+
<Section name="replace all chars">
4795+
<Expression success="true" filename="projects/SelfTest/TestMain.cpp" >
4796+
<Original>
4797+
replaceInPlace( letters, letters, &quot;replaced&quot; )
4798+
</Original>
4799+
<Expanded>
4800+
true
4801+
</Expanded>
4802+
</Expression>
4803+
<Expression success="true" filename="projects/SelfTest/TestMain.cpp" >
4804+
<Original>
4805+
letters == &quot;replaced&quot;
4806+
</Original>
4807+
<Expanded>
4808+
&quot;replaced&quot; == &quot;replaced&quot;
4809+
</Expanded>
4810+
</Expression>
4811+
<OverallResults successes="2" failures="0" expectedFailures="0"/>
4812+
</Section>
4813+
<Section name="replace no chars">
4814+
<Expression success="true" filename="projects/SelfTest/TestMain.cpp" >
4815+
<Original>
4816+
!replaceInPlace( letters, &quot;x&quot;, &quot;z&quot; )
4817+
</Original>
4818+
<Expanded>
4819+
!false
4820+
</Expanded>
4821+
</Expression>
4822+
<Expression success="true" filename="projects/SelfTest/TestMain.cpp" >
4823+
<Original>
4824+
letters == letters
4825+
</Original>
4826+
<Expanded>
4827+
&quot;abcdefcg&quot; == &quot;abcdefcg&quot;
4828+
</Expanded>
4829+
</Expression>
4830+
<OverallResults successes="2" failures="0" expectedFailures="0"/>
4831+
</Section>
4832+
<OverallResult success="true"/>
4833+
</TestCase>
4717
<TestCase name="Strings can be rendered with colour">
47184835
<OverallResult success="true"/>
47194836
</TestCase>
@@ -5774,7 +5891,7 @@ there&quot;
57745891
</Warning>
57755892
<OverallResult success="true"/>
57765893
</TestCase>
5777-
<TestCase name="A failing expression with a non streamable type is still captured[failing]">
5894+
<TestCase name="A failing expression with a non streamable type is still captured">
57785895
<Expression success="false" filename="projects/SelfTest/TrickyTests.cpp" >
57795896
<Original>
57805897
&amp;o1 == &amp;o2
@@ -5793,7 +5910,7 @@ there&quot;
57935910
</Expression>
57945911
<OverallResult success="false"/>
57955912
</TestCase>
5796-
<TestCase name="string literals of different sizes can be compared[failing]">
5913+
<TestCase name="string literals of different sizes can be compared">
57975914
<Expression success="false" filename="projects/SelfTest/TrickyTests.cpp" >
57985915
<Original>
57995916
std::string( &quot;first&quot; ) == &quot;second&quot;
@@ -7950,7 +8067,7 @@ there&quot;
79508067
</Section>
79518068
<OverallResult success="true"/>
79528069
</TestCase>
7953-
<OverallResults successes="647" failures="99" expectedFailures="13"/>
8070+
<OverallResults successes="659" failures="99" expectedFailures="13"/>
79548071
</Group>
7955-
<OverallResults successes="647" failures="99" expectedFailures="13"/>
8072+
<OverallResults successes="659" failures="99" expectedFailures="13"/>
79568073
</Catch>

0 commit comments

Comments
 (0)
0