Skip to content

Commit 01c021d

Browse files
WmbatTheWmbat
Wmbat
authored and
TheWmbat
committed
Fixing sign conversion warnings in MatchersRanges.tests
1 parent 6eaa74b commit 01c021d

File tree

9 files changed

+36
-36
lines changed

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
@@ -344,7 +344,7 @@ MatchersRanges.tests.cpp:<line number>: passed: c, !Contains(1) for: { 4, 5, 6 }
344344
MatchersRanges.tests.cpp:<line number>: passed: a, Contains(0, close_enough) for: { 1, 2, 3 } contains element 0
345345
MatchersRanges.tests.cpp:<line number>: passed: b, Contains(0, close_enough) for: { 0, 1, 2 } contains element 0
346346
MatchersRanges.tests.cpp:<line number>: passed: c, !Contains(0, close_enough) for: { 4, 5, 6 } not contains element 0
347-
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
347+
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
348348
MatchersRanges.tests.cpp:<line number>: passed: in, Contains(1) for: { 1, 2, 3, 4, 5 } contains element 1
349349
MatchersRanges.tests.cpp:<line number>: passed: in, !Contains(8) for: { 1, 2, 3, 4, 5 } not contains element 8
350350
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
@@ -342,7 +342,7 @@ MatchersRanges.tests.cpp:<line number>: passed: c, !Contains(1) for: { 4, 5, 6 }
342342
MatchersRanges.tests.cpp:<line number>: passed: a, Contains(0, close_enough) for: { 1, 2, 3 } contains element 0
343343
MatchersRanges.tests.cpp:<line number>: passed: b, Contains(0, close_enough) for: { 0, 1, 2 } contains element 0
344344
MatchersRanges.tests.cpp:<line number>: passed: c, !Contains(0, close_enough) for: { 4, 5, 6 } not contains element 0
345-
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
345+
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
346346
MatchersRanges.tests.cpp:<line number>: passed: in, Contains(1) for: { 1, 2, 3, 4, 5 } contains element 1
347347
MatchersRanges.tests.cpp:<line number>: passed: in, !Contains(8) for: { 1, 2, 3, 4, 5 } not contains element 8
348348
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
@@ -2677,7 +2677,7 @@ MatchersRanges.tests.cpp:<line number>
26772677
...............................................................................
26782678

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

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

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

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

@@ -5514,7 +5514,7 @@ Generators.tests.cpp:<line number>
55145514
...............................................................................
55155515

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

@@ -5526,7 +5526,7 @@ Generators.tests.cpp:<line number>
55265526
...............................................................................
55275527

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

@@ -5574,7 +5574,7 @@ Generators.tests.cpp:<line number>
55745574
...............................................................................
55755575

55765576
Generators.tests.cpp:<line number>: PASSED:
5577-
REQUIRE( 4u * i > str.size() )
5577+
REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
55785578
with expansion:
55795579
8 > 1
55805580

@@ -5586,7 +5586,7 @@ Generators.tests.cpp:<line number>
55865586
...............................................................................
55875587

55885588
Generators.tests.cpp:<line number>: PASSED:
5589-
REQUIRE( 4u * i > str.size() )
5589+
REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
55905590
with expansion:
55915591
8 > 2
55925592

@@ -5598,7 +5598,7 @@ Generators.tests.cpp:<line number>
55985598
...............................................................................
55995599

56005600
Generators.tests.cpp:<line number>: PASSED:
5601-
REQUIRE( 4u * i > str.size() )
5601+
REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
56025602
with expansion:
56035603
8 > 3
56045604

@@ -5646,7 +5646,7 @@ Generators.tests.cpp:<line number>
56465646
...............................................................................
56475647

56485648
Generators.tests.cpp:<line number>: PASSED:
5649-
REQUIRE( 4u * i > str.size() )
5649+
REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
56505650
with expansion:
56515651
12 > 1
56525652

@@ -5658,7 +5658,7 @@ Generators.tests.cpp:<line number>
56585658
...............................................................................
56595659

56605660
Generators.tests.cpp:<line number>: PASSED:
5661-
REQUIRE( 4u * i > str.size() )
5661+
REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
56625662
with expansion:
56635663
12 > 2
56645664

@@ -5670,7 +5670,7 @@ Generators.tests.cpp:<line number>
56705670
...............................................................................
56715671

56725672
Generators.tests.cpp:<line number>: PASSED:
5673-
REQUIRE( 4u * i > str.size() )
5673+
REQUIRE( 4u * static_cast<std::size_t>(i) > str.size() )
56745674
with expansion:
56755675
12 > 3
56765676

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ ok {test-number} - b, Contains(0, close_enough) for: { 0, 1, 2 } contains elemen
637637
# Basic use of the Contains range matcher
638638
ok {test-number} - c, !Contains(0, close_enough) for: { 4, 5, 6 } not contains element 0
639639
# Basic use of the Contains range matcher
640-
ok {test-number} - a, Contains(4, [](auto&& lhs, size_t sz) { return lhs.size() == sz; }) for: { "abc", "abcd", "abcde" } contains element 4
640+
ok {test-number} - a, Contains(4u, [](auto&& lhs, size_t sz) { return lhs.size() == sz; }) for: { "abc", "abcd", "abcde" } contains element 4
641641
# Basic use of the Contains range matcher
642642
ok {test-number} - in, Contains(1) for: { 1, 2, 3, 4, 5 } contains element 1
643643
# 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
@@ -635,7 +635,7 @@ ok {test-number} - b, Contains(0, close_enough) for: { 0, 1, 2 } contains elemen
635635
# Basic use of the Contains range matcher
636636
ok {test-number} - c, !Contains(0, close_enough) for: { 4, 5, 6 } not contains element 0
637637
# Basic use of the Contains range matcher
638-
ok {test-number} - a, Contains(4, [](auto&& lhs, size_t sz) { return lhs.size() == sz; }) for: { "abc", "abcd", "abcde" } contains element 4
638+
ok {test-number} - a, Contains(4u, [](auto&& lhs, size_t sz) { return lhs.size() == sz; }) for: { "abc", "abcd", "abcde" } contains element 4
639639
# Basic use of the Contains range matcher
640640
ok {test-number} - in, Contains(1) for: { 1, 2, 3, 4, 5 } contains element 1
641641
# 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
@@ -2824,7 +2824,7 @@ Approx( 1.23399996757507324 )
28242824
<Section name="Different element type, custom comparisons" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
28252825
<Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
28262826
<Original>
2827-
a, Contains(4, [](auto&amp;&amp; lhs, size_t sz) { return lhs.size() == sz; })
2827+
a, Contains(4u, [](auto&amp;&amp; lhs, size_t sz) { return lhs.size() == sz; })
28282828
</Original>
28292829
<Expanded>
28302830
{ "abc", "abcd", "abcde" } contains element 4
@@ -6226,7 +6226,7 @@ Approx( 1.30000000000000004 )
62266226
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62276227
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62286228
<Original>
6229-
4u * static_cast<std::size_t>(i) > str.size()
6229+
4u * static_cast&lt;std::size_t>(i) > str.size()
62306230
</Original>
62316231
<Expanded>
62326232
4 > 1
@@ -6237,7 +6237,7 @@ Approx( 1.30000000000000004 )
62376237
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62386238
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62396239
<Original>
6240-
4u * static_cast<std::size_t>(i) > str.size()
6240+
4u * static_cast&lt;std::size_t>(i) > str.size()
62416241
</Original>
62426242
<Expanded>
62436243
4 > 2
@@ -6248,7 +6248,7 @@ Approx( 1.30000000000000004 )
62486248
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62496249
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62506250
<Original>
6251-
4u * static_cast<std::size_t>(i) > str.size()
6251+
4u * static_cast&lt;std::size_t>(i) > str.size()
62526252
</Original>
62536253
<Expanded>
62546254
4 > 3
@@ -6292,7 +6292,7 @@ Approx( 1.30000000000000004 )
62926292
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62936293
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62946294
<Original>
6295-
4u * static_cast<std::size_t>(i) > str.size()
6295+
4u * static_cast&lt;std::size_t>(i) > str.size()
62966296
</Original>
62976297
<Expanded>
62986298
8 > 1
@@ -6303,7 +6303,7 @@ Approx( 1.30000000000000004 )
63036303
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
63046304
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
63056305
<Original>
6306-
4u * static_cast<std::size_t>(i) > str.size()
6306+
4u * static_cast&lt;std::size_t>(i) > str.size()
63076307
</Original>
63086308
<Expanded>
63096309
8 > 2
@@ -6314,7 +6314,7 @@ Approx( 1.30000000000000004 )
63146314
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
63156315
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
63166316
<Original>
6317-
4u * static_cast<std::size_t>(i) > str.size()
6317+
4u * static_cast&lt;std::size_t>(i) > str.size()
63186318
</Original>
63196319
<Expanded>
63206320
8 > 3
@@ -6358,7 +6358,7 @@ Approx( 1.30000000000000004 )
63586358
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
63596359
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
63606360
<Original>
6361-
4u * static_cast<std::size_t>(i) > str.size()
6361+
4u * static_cast&lt;std::size_t>(i) > str.size()
63626362
</Original>
63636363
<Expanded>
63646364
12 > 1
@@ -6369,7 +6369,7 @@ Approx( 1.30000000000000004 )
63696369
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
63706370
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
63716371
<Original>
6372-
4u * static_cast<std::size_t>(i) > str.size()
6372+
4u * static_cast&lt;std::size_t>(i) > str.size()
63736373
</Original>
63746374
<Expanded>
63756375
12 > 2
@@ -6380,7 +6380,7 @@ Approx( 1.30000000000000004 )
63806380
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
63816381
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
63826382
<Original>
6383-
4u * static_cast<std::size_t>(i) > str.size()
6383+
4u * static_cast&lt;std::size_t>(i) > str.size()
63846384
</Original>
63856385
<Expanded>
63866386
12 > 3

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2824,7 +2824,7 @@ Approx( 1.23399996757507324 )
28242824
<Section name="Different element type, custom comparisons" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
28252825
<Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
28262826
<Original>
2827-
a, Contains(4, [](auto&amp;&amp; lhs, size_t sz) { return lhs.size() == sz; })
2827+
a, Contains(4u, [](auto&amp;&amp; lhs, size_t sz) { return lhs.size() == sz; })
28282828
</Original>
28292829
<Expanded>
28302830
{ "abc", "abcd", "abcde" } contains element 4
@@ -6226,7 +6226,7 @@ Approx( 1.30000000000000004 )
62266226
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62276227
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62286228
<Original>
6229-
4u * static_cast<std::size_t>(i) > str.size()
6229+
4u * static_cast&lt;std::size_t>(i) > str.size()
62306230
</Original>
62316231
<Expanded>
62326232
4 > 1
@@ -6237,7 +6237,7 @@ Approx( 1.30000000000000004 )
62376237
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62386238
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62396239
<Original>
6240-
4u * static_cast<std::size_t>(i) > str.size()
6240+
4u * static_cast&lt;std::size_t>(i) > str.size()
62416241
</Original>
62426242
<Expanded>
62436243
4 > 2
@@ -6248,7 +6248,7 @@ Approx( 1.30000000000000004 )
62486248
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62496249
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62506250
<Original>
6251-
4u * static_cast<std::size_t>(i) > str.size()
6251+
4u * static_cast&lt;std::size_t>(i) > str.size()
62526252
</Original>
62536253
<Expanded>
62546254
4 > 3
@@ -6292,7 +6292,7 @@ Approx( 1.30000000000000004 )
62926292
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62936293
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
62946294
<Original>
6295-
4u * static_cast<std::size_t>(i) > str.size()
6295+
4u * static_cast&lt;std::size_t>(i) > str.size()
62966296
</Original>
62976297
<Expanded>
62986298
8 > 1
@@ -6303,7 +6303,7 @@ Approx( 1.30000000000000004 )
63036303
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
63046304
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
63056305
<Original>
6306-
4u * static_cast<std::size_t>(i) > str.size()
6306+
4u * static_cast&lt;std::size_t>(i) > str.size()
63076307
</Original>
63086308
<Expanded>
63096309
8 > 2
@@ -6314,7 +6314,7 @@ Approx( 1.30000000000000004 )
63146314
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
63156315
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
63166316
<Original>
6317-
4u * static_cast<std::size_t>(i) > str.size()
6317+
4u * static_cast&lt;std::size_t>(i) > str.size()
63186318
</Original>
63196319
<Expanded>
63206320
8 > 3
@@ -6358,7 +6358,7 @@ Approx( 1.30000000000000004 )
63586358
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
63596359
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
63606360
<Original>
6361-
4u * static_cast<std::size_t>(i) > str.size()
6361+
4u * static_cast&lt;std::size_t>(i) > str.size()
63626362
</Original>
63636363
<Expanded>
63646364
12 > 1
@@ -6369,7 +6369,7 @@ Approx( 1.30000000000000004 )
63696369
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
63706370
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
63716371
<Original>
6372-
4u * static_cast<std::size_t>(i) > str.size()
6372+
4u * static_cast&lt;std::size_t>(i) > str.size()
63736373
</Original>
63746374
<Expanded>
63756375
12 > 2
@@ -6380,7 +6380,7 @@ Approx( 1.30000000000000004 )
63806380
<Section name="two" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
63816381
<Expression success="true" type="REQUIRE" filename="tests/<exe-name>/UsageTests/Generators.tests.cpp" >
63826382
<Original>
6383-
4u * static_cast<std::size_t>(i) > str.size()
6383+
4u * static_cast&lt;std::size_t>(i) > str.size()
63846384
</Original>
63856385
<Expanded>
63866386
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
}
@@ -933,4 +933,4 @@ TEST_CASE( "Type conversions of RangeEquals and similar",
933933
UnorderedRangeEquals( array_a_plus_1, close_enough ) );
934934
}
935935
}
936-
}
936+
}

0 commit comments

Comments
 (0)