Skip to content

Commit 803062e

Browse files
WmbatWmbat
committed
Fixing sign conversion warnings in MatchersRanges.tests
1 parent 52904f9 commit 803062e

9 files changed

+36
-36
lines changed

‎tests/SelfTest/Baselines/compact.sw.approved.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ MatchersRanges.tests.cpp:<line number>: passed: c, !Contains(1) for: { 4, 5, 6 }
316316
MatchersRanges.tests.cpp:<line number>: passed: a, Contains(0, close_enough) for: { 1, 2, 3 } contains element 0
317317
MatchersRanges.tests.cpp:<line number>: passed: b, Contains(0, close_enough) for: { 0, 1, 2 } contains element 0
318318
MatchersRanges.tests.cpp:<line number>: passed: c, !Contains(0, close_enough) for: { 4, 5, 6 } not contains element 0
319-
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
319+
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
320320
MatchersRanges.tests.cpp:<line number>: passed: in, Contains(1) for: { 1, 2, 3, 4, 5 } contains element 1
321321
MatchersRanges.tests.cpp:<line number>: passed: in, !Contains(8) for: { 1, 2, 3, 4, 5 } not contains element 8
322322
MatchersRanges.tests.cpp:<line number>: passed: in, Contains(MoveOnlyTestElement{ 2 }) for: { 1, 2, 3 } contains element 2

‎tests/SelfTest/Baselines/compact.sw.multi.approved.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ MatchersRanges.tests.cpp:<line number>: passed: c, !Contains(1) for: { 4, 5, 6 }
314314
MatchersRanges.tests.cpp:<line number>: passed: a, Contains(0, close_enough) for: { 1, 2, 3 } contains element 0
315315
MatchersRanges.tests.cpp:<line number>: passed: b, Contains(0, close_enough) for: { 0, 1, 2 } contains element 0
316316
MatchersRanges.tests.cpp:<line number>: passed: c, !Contains(0, close_enough) for: { 4, 5, 6 } not contains element 0
317-
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
317+
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
318318
MatchersRanges.tests.cpp:<line number>: passed: in, Contains(1) for: { 1, 2, 3, 4, 5 } contains element 1
319319
MatchersRanges.tests.cpp:<line number>: passed: in, !Contains(8) for: { 1, 2, 3, 4, 5 } not contains element 8
320320
MatchersRanges.tests.cpp:<line number>: passed: in, Contains(MoveOnlyTestElement{ 2 }) for: { 1, 2, 3 } contains element 2

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2605,7 +2605,7 @@ MatchersRanges.tests.cpp:<line number>
26052605
...............................................................................
26062606

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

‎tests/SelfTest/Baselines/console.sw.multi.approved.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2603,7 +2603,7 @@ MatchersRanges.tests.cpp:<line number>
26032603
...............................................................................
26042604

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

@@ -5368,7 +5368,7 @@ Generators.tests.cpp:<line number>
53685368
...............................................................................
53695369

53705370
Generators.tests.cpp:<line number>: PASSED:
5371-
REQUIRE( 4u * i > str.size() )
5371+
REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
53725372
with expansion:
53735373
4 > 2
53745374

@@ -5380,7 +5380,7 @@ Generators.tests.cpp:<line number>
53805380
...............................................................................
53815381

53825382
Generators.tests.cpp:<line number>: PASSED:
5383-
REQUIRE( 4u * i > str.size() )
5383+
REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
53845384
with expansion:
53855385
4 > 3
53865386

@@ -5428,7 +5428,7 @@ Generators.tests.cpp:<line number>
54285428
...............................................................................
54295429

54305430
Generators.tests.cpp:<line number>: PASSED:
5431-
REQUIRE( 4u * i > str.size() )
5431+
REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
54325432
with expansion:
54335433
8 > 1
54345434

@@ -5440,7 +5440,7 @@ Generators.tests.cpp:<line number>
54405440
...............................................................................
54415441

54425442
Generators.tests.cpp:<line number>: PASSED:
5443-
REQUIRE( 4u * i > str.size() )
5443+
REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
54445444
with expansion:
54455445
8 > 2
54465446

@@ -5452,7 +5452,7 @@ Generators.tests.cpp:<line number>
54525452
...............................................................................
54535453

54545454
Generators.tests.cpp:<line number>: PASSED:
5455-
REQUIRE( 4u * i > str.size() )
5455+
REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
54565456
with expansion:
54575457
8 > 3
54585458

@@ -5500,7 +5500,7 @@ Generators.tests.cpp:<line number>
55005500
...............................................................................
55015501

55025502
Generators.tests.cpp:<line number>: PASSED:
5503-
REQUIRE( 4u * i > str.size() )
5503+
REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
55045504
with expansion:
55055505
12 > 1
55065506

@@ -5512,7 +5512,7 @@ Generators.tests.cpp:<line number>
55125512
...............................................................................
55135513

55145514
Generators.tests.cpp:<line number>: PASSED:
5515-
REQUIRE( 4u * i > str.size() )
5515+
REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
55165516
with expansion:
55175517
12 > 2
55185518

@@ -5524,7 +5524,7 @@ Generators.tests.cpp:<line number>
55245524
...............................................................................
55255525

55265526
Generators.tests.cpp:<line number>: PASSED:
5527-
REQUIRE( 4u * i > str.size() )
5527+
REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
55285528
with expansion:
55295529
12 > 3
55305530

‎tests/SelfTest/Baselines/tap.sw.approved.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ ok {test-number} - b, Contains(0, close_enough) for: { 0, 1, 2 } contains elemen
629629
# Basic use of the Contains range matcher
630630
ok {test-number} - c, !Contains(0, close_enough) for: { 4, 5, 6 } not contains element 0
631631
# Basic use of the Contains range matcher
632-
ok {test-number} - a, Contains(4, [](auto&& lhs, size_t sz) { return lhs.size() == sz; }) for: { "abc", "abcd", "abcde" } contains element 4
632+
ok {test-number} - a, Contains(4u, [](auto&& lhs, size_t sz) { return lhs.size() == sz; }) for: { "abc", "abcd", "abcde" } contains element 4
633633
# Basic use of the Contains range matcher
634634
ok {test-number} - in, Contains(1) for: { 1, 2, 3, 4, 5 } contains element 1
635635
# Basic use of the Contains range matcher

‎tests/SelfTest/Baselines/tap.sw.multi.approved.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ ok {test-number} - b, Contains(0, close_enough) for: { 0, 1, 2 } contains elemen
627627
# Basic use of the Contains range matcher
628628
ok {test-number} - c, !Contains(0, close_enough) for: { 4, 5, 6 } not contains element 0
629629
# Basic use of the Contains range matcher
630-
ok {test-number} - a, Contains(4, [](auto&& lhs, size_t sz) { return lhs.size() == sz; }) for: { "abc", "abcd", "abcde" } contains element 4
630+
ok {test-number} - a, Contains(4u, [](auto&& lhs, size_t sz) { return lhs.size() == sz; }) for: { "abc", "abcd", "abcde" } contains element 4
631631
# Basic use of the Contains range matcher
632632
ok {test-number} - in, Contains(1) for: { 1, 2, 3, 4, 5 } contains element 1
633633
# Basic use of the Contains range matcher

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2750,7 +2750,7 @@ Nor would this
27502750
<Section name="Different element type, custom comparisons" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
27512751
<Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
27522752
<Original>
2753-
a, Contains(4, [](auto&amp;&amp; lhs, size_t sz) { return lhs.size() == sz; })
2753+
a, Contains(4u, [](auto&amp;&amp; lhs, size_t sz) { return lhs.size() == sz; })
27542754
</Original>
27552755
<Expanded>
27562756
{ "abc", "abcd", "abcde" } contains element 4
@@ -6086,7 +6086,7 @@ C
60866086
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
60876087
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
60886088
<Original>
6089-
4u * static_cast<std::size_t>(i) > str.size()
6089+
4u * static_cast&lt;std::size_t>(i) > str.size()
60906090
</Original>
60916091
<Expanded>
60926092
4 > 1
@@ -6097,7 +6097,7 @@ C
60976097
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
60986098
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
60996099
<Original>
6100-
4u * static_cast<std::size_t>(i) > str.size()
6100+
4u * static_cast&lt;std::size_t>(i) > str.size()
61016101
</Original>
61026102
<Expanded>
61036103
4 > 2
@@ -6108,7 +6108,7 @@ C
61086108
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
61096109
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
61106110
<Original>
6111-
4u * static_cast<std::size_t>(i) > str.size()
6111+
4u * static_cast&lt;std::size_t>(i) > str.size()
61126112
</Original>
61136113
<Expanded>
61146114
4 > 3
@@ -6152,7 +6152,7 @@ C
61526152
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
61536153
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
61546154
<Original>
6155-
4u * static_cast<std::size_t>(i) > str.size()
6155+
4u * static_cast&lt;std::size_t>(i) > str.size()
61566156
</Original>
61576157
<Expanded>
61586158
8 > 1
@@ -6163,7 +6163,7 @@ C
61636163
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
61646164
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
61656165
<Original>
6166-
4u * static_cast<std::size_t>(i) > str.size()
6166+
4u * static_cast&lt;std::size_t>(i) > str.size()
61676167
</Original>
61686168
<Expanded>
61696169
8 > 2
@@ -6174,7 +6174,7 @@ C
61746174
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
61756175
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
61766176
<Original>
6177-
4u * static_cast<std::size_t>(i) > str.size()
6177+
4u * static_cast&lt;std::size_t>(i) > str.size()
61786178
</Original>
61796179
<Expanded>
61806180
8 > 3
@@ -6218,7 +6218,7 @@ C
62186218
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62196219
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62206220
<Original>
6221-
4u * static_cast<std::size_t>(i) > str.size()
6221+
4u * static_cast&lt;std::size_t>(i) > str.size()
62226222
</Original>
62236223
<Expanded>
62246224
12 > 1
@@ -6229,7 +6229,7 @@ C
62296229
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62306230
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62316231
<Original>
6232-
4u * static_cast<std::size_t>(i) > str.size()
6232+
4u * static_cast&lt;std::size_t>(i) > str.size()
62336233
</Original>
62346234
<Expanded>
62356235
12 > 2
@@ -6240,7 +6240,7 @@ C
62406240
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62416241
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62426242
<Original>
6243-
4u * static_cast<std::size_t>(i) > str.size()
6243+
4u * static_cast&lt;std::size_t>(i) > str.size()
62446244
</Original>
62456245
<Expanded>
62466246
12 > 3

‎tests/SelfTest/Baselines/xml.sw.multi.approved.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2750,7 +2750,7 @@ Nor would this
27502750
<Section name="Different element type, custom comparisons" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
27512751
<Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
27522752
<Original>
2753-
a, Contains(4, [](auto&amp;&amp; lhs, size_t sz) { return lhs.size() == sz; })
2753+
a, Contains(4u, [](auto&amp;&amp; lhs, size_t sz) { return lhs.size() == sz; })
27542754
</Original>
27552755
<Expanded>
27562756
{ "abc", "abcd", "abcde" } contains element 4
@@ -6086,7 +6086,7 @@ C
60866086
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
60876087
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
60886088
<Original>
6089-
4u * static_cast<std::size_t>(i) > str.size()
6089+
4u * static_cast&lt;std::size_t>(i) > str.size()
60906090
</Original>
60916091
<Expanded>
60926092
4 > 1
@@ -6097,7 +6097,7 @@ C
60976097
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
60986098
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
60996099
<Original>
6100-
4u * static_cast<std::size_t>(i) > str.size()
6100+
4u * static_cast&lt;std::size_t>(i) > str.size()
61016101
</Original>
61026102
<Expanded>
61036103
4 > 2
@@ -6108,7 +6108,7 @@ C
61086108
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
61096109
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
61106110
<Original>
6111-
4u * static_cast<std::size_t>(i) > str.size()
6111+
4u * static_cast&lt;std::size_t>(i) > str.size()
61126112
</Original>
61136113
<Expanded>
61146114
4 > 3
@@ -6152,7 +6152,7 @@ C
61526152
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
61536153
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
61546154
<Original>
6155-
4u * static_cast<std::size_t>(i) > str.size()
6155+
4u * static_cast&lt;std::size_t>(i) > str.size()
61566156
</Original>
61576157
<Expanded>
61586158
8 > 1
@@ -6163,7 +6163,7 @@ C
61636163
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
61646164
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
61656165
<Original>
6166-
4u * static_cast<std::size_t>(i) > str.size()
6166+
4u * static_cast&lt;std::size_t>(i) > str.size()
61676167
</Original>
61686168
<Expanded>
61696169
8 > 2
@@ -6174,7 +6174,7 @@ C
61746174
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
61756175
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
61766176
<Original>
6177-
4u * static_cast<std::size_t>(i) > str.size()
6177+
4u * static_cast&lt;std::size_t>(i) > str.size()
61786178
</Original>
61796179
<Expanded>
61806180
8 > 3
@@ -6218,7 +6218,7 @@ C
62186218
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62196219
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62206220
<Original>
6221-
4u * static_cast<std::size_t>(i) > str.size()
6221+
4u * static_cast&lt;std::size_t>(i) > str.size()
62226222
</Original>
62236223
<Expanded>
62246224
12 > 1
@@ -6229,7 +6229,7 @@ C
62296229
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62306230
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62316231
<Original>
6232-
4u * static_cast<std::size_t>(i) > str.size()
6232+
4u * static_cast&lt;std::size_t>(i) > str.size()
62336233
</Original>
62346234
<Expanded>
62356235
12 > 2
@@ -6240,7 +6240,7 @@ C
62406240
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62416241
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62426242
<Original>
6243-
4u * static_cast<std::size_t>(i) > str.size()
6243+
4u * static_cast&lt;std::size_t>(i) > str.size()
62446244
</Original>
62456245
<Expanded>
62466246
12 > 3

‎tests/SelfTest/UsageTests/MatchersRanges.tests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ TEST_CASE("Basic use of the Contains range matcher", "[matchers][templated][cont
7575
SECTION("Different element type, custom comparisons") {
7676
std::array<std::string, 3> a{ { "abc", "abcd" , "abcde" } };
7777

78-
REQUIRE_THAT(a, Contains(4, [](auto&& lhs, size_t sz) {
78+
REQUIRE_THAT(a, Contains(4u, [](auto&& lhs, size_t sz) {
7979
return lhs.size() == sz;
8080
}));
8181
}
@@ -914,4 +914,4 @@ TEST_CASE( "Type conversions of RangeEquals and similar",
914914
UnorderedRangeEquals( array_a_plus_1, close_enough ) );
915915
}
916916
}
917-
}
917+
}

0 commit comments

Comments
 (0)