Skip to content

Commit 56024c0

Browse files
horenmarhorenmar
committed
More tests for MapGenerator
1 parent edfed6c commit 56024c0

18 files changed

Lines changed: 673 additions & 155 deletions

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ Nor would this
193193
:test-result: PASS Less-than inequalities with different epsilons
194194
:test-result: PASS ManuallyRegistered
195195
:test-result: PASS MapGenerator can be skipped forward efficiently
196+
:test-result: PASS MapGenerator can handle not default constructible types
196197
:test-result: PASS Matchers can be (AllOf) composed with the && operator
197198
:test-result: PASS Matchers can be (AnyOf) composed with the || operator
198199
:test-result: PASS Matchers can be composed with both && and ||

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@
191191
:test-result: PASS Less-than inequalities with different epsilons
192192
:test-result: PASS ManuallyRegistered
193193
:test-result: PASS MapGenerator can be skipped forward efficiently
194+
:test-result: PASS MapGenerator can handle not default constructible types
194195
:test-result: PASS Matchers can be (AllOf) composed with the && operator
195196
:test-result: PASS Matchers can be (AnyOf) composed with the || operator
196197
:test-result: PASS Matchers can be composed with both && and ||

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

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,14 +1260,27 @@ Approx.tests.cpp:<line number>: passed: d <= Approx( 1.22 ).epsilon(0.1) for: 1.
12601260
Approx( 1.21999999999999997 )
12611261
Misc.tests.cpp:<line number>: passed: with 1 message: 'was called'
12621262
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == 0 for: 0 == 0
1263+
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == 0 for: 0 == 0
1264+
GeneratorsImpl.tests.cpp:<line number>: passed: map_generator.get() == 3 for: 3 == 3
1265+
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == 1 for: 1 == 1
1266+
GeneratorsImpl.tests.cpp:<line number>: passed: map_generator.get() == 3 for: 3 == 3
1267+
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == 1 for: 1 == 1
1268+
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == 1 for: 1 == 1
1269+
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == 0 for: 0 == 0
1270+
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == 0 for: 0 == 0
12631271
GeneratorsImpl.tests.cpp:<line number>: passed: map_generator.get() == 4 for: 4 == 4
1264-
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == map_calls_1 + 1 for: 1 == 1
1272+
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == 1 for: 1 == 1
12651273
GeneratorsImpl.tests.cpp:<line number>: passed: map_generator.get() == 4 for: 4 == 4
1266-
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == map_calls_1 + 1 for: 1 == 1
1274+
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == 1 for: 1 == 1
1275+
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == 1 for: 1 == 1
12671276
GeneratorsImpl.tests.cpp:<line number>: passed: map_generator.get() == 6 for: 6 == 6
1268-
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == map_calls_2 + 1 for: 2 == 2
1277+
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == 2 for: 2 == 2
12691278
GeneratorsImpl.tests.cpp:<line number>: passed: map_generator.skipToNthElement( 7 )
1270-
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == map_calls_2 + 1 for: 2 == 2
1279+
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == 2 for: 2 == 2
1280+
GeneratorsImpl.tests.cpp:<line number>: passed: map_generator.get().m_i == 1 for: 1 == 1
1281+
GeneratorsImpl.tests.cpp:<line number>: passed: map_generator.next() for: true
1282+
GeneratorsImpl.tests.cpp:<line number>: passed: map_generator.next() for: true
1283+
GeneratorsImpl.tests.cpp:<line number>: passed: map_generator.get().m_i == 3 for: 3 == 3
12711284
Matchers.tests.cpp:<line number>: passed: testStringForMatching(), ContainsSubstring( "string" ) && ContainsSubstring( "abc" ) && ContainsSubstring( "substring" ) && ContainsSubstring( "contains" ) for: "this string contains 'abc' as a substring" ( contains: "string" and contains: "abc" and contains: "substring" and contains: "contains" )
12721285
Matchers.tests.cpp:<line number>: passed: testStringForMatching(), ContainsSubstring( "string" ) || ContainsSubstring( "different" ) || ContainsSubstring( "random" ) for: "this string contains 'abc' as a substring" ( contains: "string" or contains: "different" or contains: "random" )
12731286
Matchers.tests.cpp:<line number>: passed: testStringForMatching2(), ContainsSubstring( "string" ) || ContainsSubstring( "different" ) || ContainsSubstring( "random" ) for: "some completely different text that contains one common word" ( contains: "string" or contains: "different" or contains: "random" )
@@ -2984,7 +2997,7 @@ InternalBenchmark.tests.cpp:<line number>: passed: med == 18. for: 18.0 == 18.0
29842997
InternalBenchmark.tests.cpp:<line number>: passed: q3 == 23. for: 23.0 == 23.0
29852998
Misc.tests.cpp:<line number>: passed:
29862999
Misc.tests.cpp:<line number>: passed:
2987-
test cases: 449 | 329 passed | 96 failed | 6 skipped | 18 failed as expected
2988-
assertions: 2400 | 2199 passed | 158 failed | 43 failed as expected
3000+
test cases: 450 | 330 passed | 96 failed | 6 skipped | 18 failed as expected
3001+
assertions: 2413 | 2212 passed | 158 failed | 43 failed as expected
29893002

29903003

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

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1258,14 +1258,27 @@ Approx.tests.cpp:<line number>: passed: d <= Approx( 1.22 ).epsilon(0.1) for: 1.
12581258
Approx( 1.21999999999999997 )
12591259
Misc.tests.cpp:<line number>: passed: with 1 message: 'was called'
12601260
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == 0 for: 0 == 0
1261+
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == 0 for: 0 == 0
1262+
GeneratorsImpl.tests.cpp:<line number>: passed: map_generator.get() == 3 for: 3 == 3
1263+
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == 1 for: 1 == 1
1264+
GeneratorsImpl.tests.cpp:<line number>: passed: map_generator.get() == 3 for: 3 == 3
1265+
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == 1 for: 1 == 1
1266+
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == 1 for: 1 == 1
1267+
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == 0 for: 0 == 0
1268+
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == 0 for: 0 == 0
12611269
GeneratorsImpl.tests.cpp:<line number>: passed: map_generator.get() == 4 for: 4 == 4
1262-
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == map_calls_1 + 1 for: 1 == 1
1270+
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == 1 for: 1 == 1
12631271
GeneratorsImpl.tests.cpp:<line number>: passed: map_generator.get() == 4 for: 4 == 4
1264-
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == map_calls_1 + 1 for: 1 == 1
1272+
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == 1 for: 1 == 1
1273+
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == 1 for: 1 == 1
12651274
GeneratorsImpl.tests.cpp:<line number>: passed: map_generator.get() == 6 for: 6 == 6
1266-
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == map_calls_2 + 1 for: 2 == 2
1275+
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == 2 for: 2 == 2
12671276
GeneratorsImpl.tests.cpp:<line number>: passed: map_generator.skipToNthElement( 7 )
1268-
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == map_calls_2 + 1 for: 2 == 2
1277+
GeneratorsImpl.tests.cpp:<line number>: passed: map_calls == 2 for: 2 == 2
1278+
GeneratorsImpl.tests.cpp:<line number>: passed: map_generator.get().m_i == 1 for: 1 == 1
1279+
GeneratorsImpl.tests.cpp:<line number>: passed: map_generator.next() for: true
1280+
GeneratorsImpl.tests.cpp:<line number>: passed: map_generator.next() for: true
1281+
GeneratorsImpl.tests.cpp:<line number>: passed: map_generator.get().m_i == 3 for: 3 == 3
12691282
Matchers.tests.cpp:<line number>: passed: testStringForMatching(), ContainsSubstring( "string" ) && ContainsSubstring( "abc" ) && ContainsSubstring( "substring" ) && ContainsSubstring( "contains" ) for: "this string contains 'abc' as a substring" ( contains: "string" and contains: "abc" and contains: "substring" and contains: "contains" )
12701283
Matchers.tests.cpp:<line number>: passed: testStringForMatching(), ContainsSubstring( "string" ) || ContainsSubstring( "different" ) || ContainsSubstring( "random" ) for: "this string contains 'abc' as a substring" ( contains: "string" or contains: "different" or contains: "random" )
12711284
Matchers.tests.cpp:<line number>: passed: testStringForMatching2(), ContainsSubstring( "string" ) || ContainsSubstring( "different" ) || ContainsSubstring( "random" ) for: "some completely different text that contains one common word" ( contains: "string" or contains: "different" or contains: "random" )
@@ -2973,7 +2986,7 @@ InternalBenchmark.tests.cpp:<line number>: passed: med == 18. for: 18.0 == 18.0
29732986
InternalBenchmark.tests.cpp:<line number>: passed: q3 == 23. for: 23.0 == 23.0
29742987
Misc.tests.cpp:<line number>: passed:
29752988
Misc.tests.cpp:<line number>: passed:
2976-
test cases: 449 | 329 passed | 96 failed | 6 skipped | 18 failed as expected
2977-
assertions: 2400 | 2199 passed | 158 failed | 43 failed as expected
2989+
test cases: 450 | 330 passed | 96 failed | 6 skipped | 18 failed as expected
2990+
assertions: 2413 | 2212 passed | 158 failed | 43 failed as expected
29782991

29792992

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1743,6 +1743,6 @@ due to unexpected exception with message:
17431743
Why would you throw a std::string?
17441744

17451745
===============================================================================
1746-
test cases: 449 | 347 passed | 76 failed | 7 skipped | 19 failed as expected
1747-
assertions: 2378 | 2199 passed | 136 failed | 43 failed as expected
1746+
test cases: 450 | 348 passed | 76 failed | 7 skipped | 19 failed as expected
1747+
assertions: 2391 | 2212 passed | 136 failed | 43 failed as expected
17481748

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

Lines changed: 85 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8255,10 +8255,58 @@ with message:
82558255

82568256
-------------------------------------------------------------------------------
82578257
MapGenerator can be skipped forward efficiently
8258+
via calls to next()
82588259
-------------------------------------------------------------------------------
82598260
GeneratorsImpl.tests.cpp:<line number>
82608261
...............................................................................
82618262

8263+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8264+
REQUIRE( map_calls == 0 )
8265+
with expansion:
8266+
0 == 0
8267+
8268+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8269+
REQUIRE( map_calls == 0 )
8270+
with expansion:
8271+
0 == 0
8272+
8273+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8274+
REQUIRE( map_generator.get() == 3 )
8275+
with expansion:
8276+
3 == 3
8277+
8278+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8279+
REQUIRE( map_calls == 1 )
8280+
with expansion:
8281+
1 == 1
8282+
8283+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8284+
REQUIRE( map_generator.get() == 3 )
8285+
with expansion:
8286+
3 == 3
8287+
8288+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8289+
REQUIRE( map_calls == 1 )
8290+
with expansion:
8291+
1 == 1
8292+
8293+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8294+
REQUIRE( map_calls == 1 )
8295+
with expansion:
8296+
1 == 1
8297+
8298+
-------------------------------------------------------------------------------
8299+
MapGenerator can be skipped forward efficiently
8300+
via calls to skipToNthElement()
8301+
-------------------------------------------------------------------------------
8302+
GeneratorsImpl.tests.cpp:<line number>
8303+
...............................................................................
8304+
8305+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8306+
REQUIRE( map_calls == 0 )
8307+
with expansion:
8308+
0 == 0
8309+
82628310
GeneratorsImpl.tests.cpp:<line number>: PASSED:
82638311
REQUIRE( map_calls == 0 )
82648312
with expansion:
@@ -8270,7 +8318,7 @@ with expansion:
82708318
4 == 4
82718319

82728320
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8273-
REQUIRE( map_calls == map_calls_1 + 1 )
8321+
REQUIRE( map_calls == 1 )
82748322
with expansion:
82758323
1 == 1
82768324

@@ -8280,7 +8328,12 @@ with expansion:
82808328
4 == 4
82818329

82828330
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8283-
REQUIRE( map_calls == map_calls_1 + 1 )
8331+
REQUIRE( map_calls == 1 )
8332+
with expansion:
8333+
1 == 1
8334+
8335+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8336+
REQUIRE( map_calls == 1 )
82848337
with expansion:
82858338
1 == 1
82868339

@@ -8290,18 +8343,44 @@ with expansion:
82908343
6 == 6
82918344

82928345
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8293-
REQUIRE( map_calls == map_calls_2 + 1 )
8346+
REQUIRE( map_calls == 2 )
82948347
with expansion:
82958348
2 == 2
82968349

82978350
GeneratorsImpl.tests.cpp:<line number>: PASSED:
82988351
REQUIRE_THROWS( map_generator.skipToNthElement( 7 ) )
82998352

83008353
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8301-
REQUIRE( map_calls == map_calls_2 + 1 )
8354+
REQUIRE( map_calls == 2 )
83028355
with expansion:
83038356
2 == 2
83048357

8358+
-------------------------------------------------------------------------------
8359+
MapGenerator can handle not default constructible types
8360+
-------------------------------------------------------------------------------
8361+
GeneratorsImpl.tests.cpp:<line number>
8362+
...............................................................................
8363+
8364+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8365+
REQUIRE( map_generator.get().m_i == 1 )
8366+
with expansion:
8367+
1 == 1
8368+
8369+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8370+
REQUIRE( map_generator.next() )
8371+
with expansion:
8372+
true
8373+
8374+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8375+
REQUIRE( map_generator.next() )
8376+
with expansion:
8377+
true
8378+
8379+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8380+
REQUIRE( map_generator.get().m_i == 3 )
8381+
with expansion:
8382+
3 == 3
8383+
83058384
-------------------------------------------------------------------------------
83068385
Matchers can be (AllOf) composed with the && operator
83078386
-------------------------------------------------------------------------------
@@ -20034,6 +20113,6 @@ Misc.tests.cpp:<line number>
2003420113
Misc.tests.cpp:<line number>: PASSED:
2003520114

2003620115
===============================================================================
20037-
test cases: 449 | 329 passed | 96 failed | 6 skipped | 18 failed as expected
20038-
assertions: 2400 | 2199 passed | 158 failed | 43 failed as expected
20116+
test cases: 450 | 330 passed | 96 failed | 6 skipped | 18 failed as expected
20117+
assertions: 2413 | 2212 passed | 158 failed | 43 failed as expected
2003920118

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

Lines changed: 85 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8253,10 +8253,58 @@ with message:
82538253

82548254
-------------------------------------------------------------------------------
82558255
MapGenerator can be skipped forward efficiently
8256+
via calls to next()
82568257
-------------------------------------------------------------------------------
82578258
GeneratorsImpl.tests.cpp:<line number>
82588259
...............................................................................
82598260

8261+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8262+
REQUIRE( map_calls == 0 )
8263+
with expansion:
8264+
0 == 0
8265+
8266+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8267+
REQUIRE( map_calls == 0 )
8268+
with expansion:
8269+
0 == 0
8270+
8271+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8272+
REQUIRE( map_generator.get() == 3 )
8273+
with expansion:
8274+
3 == 3
8275+
8276+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8277+
REQUIRE( map_calls == 1 )
8278+
with expansion:
8279+
1 == 1
8280+
8281+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8282+
REQUIRE( map_generator.get() == 3 )
8283+
with expansion:
8284+
3 == 3
8285+
8286+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8287+
REQUIRE( map_calls == 1 )
8288+
with expansion:
8289+
1 == 1
8290+
8291+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8292+
REQUIRE( map_calls == 1 )
8293+
with expansion:
8294+
1 == 1
8295+
8296+
-------------------------------------------------------------------------------
8297+
MapGenerator can be skipped forward efficiently
8298+
via calls to skipToNthElement()
8299+
-------------------------------------------------------------------------------
8300+
GeneratorsImpl.tests.cpp:<line number>
8301+
...............................................................................
8302+
8303+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8304+
REQUIRE( map_calls == 0 )
8305+
with expansion:
8306+
0 == 0
8307+
82608308
GeneratorsImpl.tests.cpp:<line number>: PASSED:
82618309
REQUIRE( map_calls == 0 )
82628310
with expansion:
@@ -8268,7 +8316,7 @@ with expansion:
82688316
4 == 4
82698317

82708318
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8271-
REQUIRE( map_calls == map_calls_1 + 1 )
8319+
REQUIRE( map_calls == 1 )
82728320
with expansion:
82738321
1 == 1
82748322

@@ -8278,7 +8326,12 @@ with expansion:
82788326
4 == 4
82798327

82808328
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8281-
REQUIRE( map_calls == map_calls_1 + 1 )
8329+
REQUIRE( map_calls == 1 )
8330+
with expansion:
8331+
1 == 1
8332+
8333+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8334+
REQUIRE( map_calls == 1 )
82828335
with expansion:
82838336
1 == 1
82848337

@@ -8288,18 +8341,44 @@ with expansion:
82888341
6 == 6
82898342

82908343
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8291-
REQUIRE( map_calls == map_calls_2 + 1 )
8344+
REQUIRE( map_calls == 2 )
82928345
with expansion:
82938346
2 == 2
82948347

82958348
GeneratorsImpl.tests.cpp:<line number>: PASSED:
82968349
REQUIRE_THROWS( map_generator.skipToNthElement( 7 ) )
82978350

82988351
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8299-
REQUIRE( map_calls == map_calls_2 + 1 )
8352+
REQUIRE( map_calls == 2 )
83008353
with expansion:
83018354
2 == 2
83028355

8356+
-------------------------------------------------------------------------------
8357+
MapGenerator can handle not default constructible types
8358+
-------------------------------------------------------------------------------
8359+
GeneratorsImpl.tests.cpp:<line number>
8360+
...............................................................................
8361+
8362+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8363+
REQUIRE( map_generator.get().m_i == 1 )
8364+
with expansion:
8365+
1 == 1
8366+
8367+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8368+
REQUIRE( map_generator.next() )
8369+
with expansion:
8370+
true
8371+
8372+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8373+
REQUIRE( map_generator.next() )
8374+
with expansion:
8375+
true
8376+
8377+
GeneratorsImpl.tests.cpp:<line number>: PASSED:
8378+
REQUIRE( map_generator.get().m_i == 3 )
8379+
with expansion:
8380+
3 == 3
8381+
83038382
-------------------------------------------------------------------------------
83048383
Matchers can be (AllOf) composed with the && operator
83058384
-------------------------------------------------------------------------------
@@ -20023,6 +20102,6 @@ Misc.tests.cpp:<line number>
2002320102
Misc.tests.cpp:<line number>: PASSED:
2002420103

2002520104
===============================================================================
20026-
test cases: 449 | 329 passed | 96 failed | 6 skipped | 18 failed as expected
20027-
assertions: 2400 | 2199 passed | 158 failed | 43 failed as expected
20105+
test cases: 450 | 330 passed | 96 failed | 6 skipped | 18 failed as expected
20106+
assertions: 2413 | 2212 passed | 158 failed | 43 failed as expected
2002820107

0 commit comments

Comments
 (0)