3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 05:16:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing sign conversion warnings in MatchersRanges.tests

Browse Source
This commit is contained in:
wmbat 2023-12-06 17:44:21 -05:00
parent 52904f981f
commit 803062eb29
9 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/SelfTest/Baselines/compact.sw.approved.txt
View File

@ -316,7 +316,7 @@ MatchersRanges.tests.cpp:<line number>: passed: c, !Contains(1) for: { 4, 5, 6 }
MatchersRanges.tests.cpp:<line number>: passed: a, Contains(0, close_enough) for: { 1, 2, 3 } contains element 0
MatchersRanges.tests.cpp:<line number>: passed: b, Contains(0, close_enough) for: { 0, 1, 2 } contains element 0
MatchersRanges.tests.cpp:<line number>: passed: c, !Contains(0, close_enough) for: { 4, 5, 6 } not contains element 0
MatchersRanges.tests.cpp:<line number>: passed: a, Contains(4, [](auto&& lhs, size_t sz) { return lhs.size() == sz; }) for: { "abc", "abcd", "abcde" } contains element 4
MatchersRanges.tests.cpp:<line number>: passed: a, Contains(4u, [](auto&& lhs, size_t sz) { return lhs.size() == sz; }) for: { "abc", "abcd", "abcde" } contains element 4
MatchersRanges.tests.cpp:<line number>: passed: in, Contains(1) for: { 1, 2, 3, 4, 5 } contains element 1
MatchersRanges.tests.cpp:<line number>: passed: in, !Contains(8) for: { 1, 2, 3, 4, 5 } not contains element 8
MatchersRanges.tests.cpp:<line number>: passed: in, Contains(MoveOnlyTestElement{ 2 }) for: { 1, 2, 3 } contains element 2

2
tests/SelfTest/Baselines/compact.sw.multi.approved.txt
View File

@ -314,7 +314,7 @@ MatchersRanges.tests.cpp:<line number>: passed: c, !Contains(1) for: { 4, 5, 6 }
MatchersRanges.tests.cpp:<line number>: passed: a, Contains(0, close_enough) for: { 1, 2, 3 } contains element 0
MatchersRanges.tests.cpp:<line number>: passed: b, Contains(0, close_enough) for: { 0, 1, 2 } contains element 0
MatchersRanges.tests.cpp:<line number>: passed: c, !Contains(0, close_enough) for: { 4, 5, 6 } not contains element 0
MatchersRanges.tests.cpp:<line number>: passed: a, Contains(4, [](auto&& lhs, size_t sz) { return lhs.size() == sz; }) for: { "abc", "abcd", "abcde" } contains element 4
MatchersRanges.tests.cpp:<line number>: passed: a, Contains(4u, [](auto&& lhs, size_t sz) { return lhs.size() == sz; }) for: { "abc", "abcd", "abcde" } contains element 4
MatchersRanges.tests.cpp:<line number>: passed: in, Contains(1) for: { 1, 2, 3, 4, 5 } contains element 1
MatchersRanges.tests.cpp:<line number>: passed: in, !Contains(8) for: { 1, 2, 3, 4, 5 } not contains element 8
MatchersRanges.tests.cpp:<line number>: passed: in, Contains(MoveOnlyTestElement{ 2 }) for: { 1, 2, 3 } contains element 2

2
tests/SelfTest/Baselines/console.sw.approved.txt
View File

@ -2605,7 +2605,7 @@ MatchersRanges.tests.cpp:<line number>
...............................................................................
MatchersRanges.tests.cpp:<line number>: PASSED:
REQUIRE_THAT( a, Contains(4, [](auto&& lhs, size_t sz) { return lhs.size() == sz; }) )
REQUIRE_THAT( a, Contains(4u, [](auto&& lhs, size_t sz) { return lhs.size() == sz; }) )
with expansion:
{ "abc", "abcd", "abcde" } contains element 4

18
tests/SelfTest/Baselines/console.sw.multi.approved.txt
View File

@ -2603,7 +2603,7 @@ MatchersRanges.tests.cpp:<line number>
...............................................................................
MatchersRanges.tests.cpp:<line number>: PASSED:
REQUIRE_THAT( a, Contains(4, [](auto&& lhs, size_t sz) { return lhs.size() == sz; }) )
REQUIRE_THAT( a, Contains(4u, [](auto&& lhs, size_t sz) { return lhs.size() == sz; }) )
with expansion:
{ "abc", "abcd", "abcde" } contains element 4
@ -5368,7 +5368,7 @@ Generators.tests.cpp:<line number>
...............................................................................
Generators.tests.cpp:<line number>: PASSED:
REQUIRE( 4u * i > str.size() )
REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
with expansion:
4 > 2
@ -5380,7 +5380,7 @@ Generators.tests.cpp:<line number>
...............................................................................
Generators.tests.cpp:<line number>: PASSED:
REQUIRE( 4u * i > str.size() )
REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
with expansion:
4 > 3
@ -5428,7 +5428,7 @@ Generators.tests.cpp:<line number>
...............................................................................
Generators.tests.cpp:<line number>: PASSED:
REQUIRE( 4u * i > str.size() )
REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
with expansion:
8 > 1
@ -5440,7 +5440,7 @@ Generators.tests.cpp:<line number>
...............................................................................
Generators.tests.cpp:<line number>: PASSED:
REQUIRE( 4u * i > str.size() )
REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
with expansion:
8 > 2
@ -5452,7 +5452,7 @@ Generators.tests.cpp:<line number>
...............................................................................
Generators.tests.cpp:<line number>: PASSED:
REQUIRE( 4u * i > str.size() )
REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
with expansion:
8 > 3
@ -5500,7 +5500,7 @@ Generators.tests.cpp:<line number>
...............................................................................
Generators.tests.cpp:<line number>: PASSED:
REQUIRE( 4u * i > str.size() )
REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
with expansion:
12 > 1
@ -5512,7 +5512,7 @@ Generators.tests.cpp:<line number>
...............................................................................
Generators.tests.cpp:<line number>: PASSED:
REQUIRE( 4u * i > str.size() )
REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
with expansion:
12 > 2
@ -5524,7 +5524,7 @@ Generators.tests.cpp:<line number>
...............................................................................
Generators.tests.cpp:<line number>: PASSED:
REQUIRE( 4u * i > str.size() )
REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
with expansion:
12 > 3

2
tests/SelfTest/Baselines/tap.sw.approved.txt
View File

@ -629,7 +629,7 @@ ok {test-number} - b, Contains(0, close_enough) for: { 0, 1, 2 } contains elemen
# Basic use of the Contains range matcher
ok {test-number} - c, !Contains(0, close_enough) for: { 4, 5, 6 } not contains element 0
# Basic use of the Contains range matcher
ok {test-number} - a, Contains(4, [](auto&& lhs, size_t sz) { return lhs.size() == sz; }) for: { "abc", "abcd", "abcde" } contains element 4
ok {test-number} - a, Contains(4u, [](auto&& lhs, size_t sz) { return lhs.size() == sz; }) for: { "abc", "abcd", "abcde" } contains element 4
# Basic use of the Contains range matcher
ok {test-number} - in, Contains(1) for: { 1, 2, 3, 4, 5 } contains element 1
# Basic use of the Contains range matcher

2
tests/SelfTest/Baselines/tap.sw.multi.approved.txt
View File

@ -627,7 +627,7 @@ ok {test-number} - b, Contains(0, close_enough) for: { 0, 1, 2 } contains elemen
# Basic use of the Contains range matcher
ok {test-number} - c, !Contains(0, close_enough) for: { 4, 5, 6 } not contains element 0
# Basic use of the Contains range matcher
ok {test-number} - a, Contains(4, [](auto&& lhs, size_t sz) { return lhs.size() == sz; }) for: { "abc", "abcd", "abcde" } contains element 4
ok {test-number} - a, Contains(4u, [](auto&& lhs, size_t sz) { return lhs.size() == sz; }) for: { "abc", "abcd", "abcde" } contains element 4
# Basic use of the Contains range matcher
ok {test-number} - in, Contains(1) for: { 1, 2, 3, 4, 5 } contains element 1
# Basic use of the Contains range matcher

20
tests/SelfTest/Baselines/xml.sw.approved.txt
View File

@ -2750,7 +2750,7 @@ Nor would this
<Section name="Different element type, custom comparisons" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
<Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
<Original>
a, Contains(4, [](auto&amp;&amp; lhs, size_t sz) { return lhs.size() == sz; })
a, Contains(4u, [](auto&amp;&amp; lhs, size_t sz) { return lhs.size() == sz; })
</Original>
<Expanded>
{ "abc", "abcd", "abcde" } contains element 4
@ -6086,7 +6086,7 @@ C
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Original>
4u * static_cast<std::size_t>(i) > str.size()
4u * static_cast&lt;std::size_t>(i) > str.size()
</Original>
<Expanded>
4 > 1
@ -6097,7 +6097,7 @@ C
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Original>
4u * static_cast<std::size_t>(i) > str.size()
4u * static_cast&lt;std::size_t>(i) > str.size()
</Original>
<Expanded>
4 > 2
@ -6108,7 +6108,7 @@ C
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Original>
4u * static_cast<std::size_t>(i) > str.size()
4u * static_cast&lt;std::size_t>(i) > str.size()
</Original>
<Expanded>
4 > 3
@ -6152,7 +6152,7 @@ C
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Original>
4u * static_cast<std::size_t>(i) > str.size()
4u * static_cast&lt;std::size_t>(i) > str.size()
</Original>
<Expanded>
8 > 1
@ -6163,7 +6163,7 @@ C
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Original>
4u * static_cast<std::size_t>(i) > str.size()
4u * static_cast&lt;std::size_t>(i) > str.size()
</Original>
<Expanded>
8 > 2
@ -6174,7 +6174,7 @@ C
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Original>
4u * static_cast<std::size_t>(i) > str.size()
4u * static_cast&lt;std::size_t>(i) > str.size()
</Original>
<Expanded>
8 > 3
@ -6218,7 +6218,7 @@ C
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Original>
4u * static_cast<std::size_t>(i) > str.size()
4u * static_cast&lt;std::size_t>(i) > str.size()
</Original>
<Expanded>
12 > 1
@ -6229,7 +6229,7 @@ C
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Original>
4u * static_cast<std::size_t>(i) > str.size()
4u * static_cast&lt;std::size_t>(i) > str.size()
</Original>
<Expanded>
12 > 2
@ -6240,7 +6240,7 @@ C
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Original>
4u * static_cast<std::size_t>(i) > str.size()
4u * static_cast&lt;std::size_t>(i) > str.size()
</Original>
<Expanded>
12 > 3

20
tests/SelfTest/Baselines/xml.sw.multi.approved.txt
View File

@ -2750,7 +2750,7 @@ Nor would this
<Section name="Different element type, custom comparisons" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
<Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
<Original>
a, Contains(4, [](auto&amp;&amp; lhs, size_t sz) { return lhs.size() == sz; })
a, Contains(4u, [](auto&amp;&amp; lhs, size_t sz) { return lhs.size() == sz; })
</Original>
<Expanded>
{ "abc", "abcd", "abcde" } contains element 4
@ -6086,7 +6086,7 @@ C
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Original>
4u * static_cast<std::size_t>(i) > str.size()
4u * static_cast&lt;std::size_t>(i) > str.size()
</Original>
<Expanded>
4 > 1
@ -6097,7 +6097,7 @@ C
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Original>
4u * static_cast<std::size_t>(i) > str.size()
4u * static_cast&lt;std::size_t>(i) > str.size()
</Original>
<Expanded>
4 > 2
@ -6108,7 +6108,7 @@ C
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Original>
4u * static_cast<std::size_t>(i) > str.size()
4u * static_cast&lt;std::size_t>(i) > str.size()
</Original>
<Expanded>
4 > 3
@ -6152,7 +6152,7 @@ C
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Original>
4u * static_cast<std::size_t>(i) > str.size()
4u * static_cast&lt;std::size_t>(i) > str.size()
</Original>
<Expanded>
8 > 1
@ -6163,7 +6163,7 @@ C
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Original>
4u * static_cast<std::size_t>(i) > str.size()
4u * static_cast&lt;std::size_t>(i) > str.size()
</Original>
<Expanded>
8 > 2
@ -6174,7 +6174,7 @@ C
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Original>
4u * static_cast<std::size_t>(i) > str.size()
4u * static_cast&lt;std::size_t>(i) > str.size()
</Original>
<Expanded>
8 > 3
@ -6218,7 +6218,7 @@ C
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Original>
4u * static_cast<std::size_t>(i) > str.size()
4u * static_cast&lt;std::size_t>(i) > str.size()
</Original>
<Expanded>
12 > 1
@ -6229,7 +6229,7 @@ C
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Original>
4u * static_cast<std::size_t>(i) > str.size()
4u * static_cast&lt;std::size_t>(i) > str.size()
</Original>
<Expanded>
12 > 2
@ -6240,7 +6240,7 @@ C
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
<Original>
4u * static_cast<std::size_t>(i) > str.size()
4u * static_cast&lt;std::size_t>(i) > str.size()
</Original>
<Expanded>
12 > 3

4
tests/SelfTest/UsageTests/MatchersRanges.tests.cpp
View File

@ -75,7 +75,7 @@ TEST_CASE("Basic use of the Contains range matcher", "[matchers][templated][cont
SECTION("Different element type, custom comparisons") {
std::array<std::string, 3> a{ { "abc", "abcd" , "abcde" } };
REQUIRE_THAT(a, Contains(4, [](auto&& lhs, size_t sz) {
REQUIRE_THAT(a, Contains(4u, [](auto&& lhs, size_t sz) {
return lhs.size() == sz;
}));
}
@ -914,4 +914,4 @@ TEST_CASE( "Type conversions of RangeEquals and similar",
UnorderedRangeEquals( array_a_plus_1, close_enough ) );
}
}
}
}