Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/tests/SelfTest
diff options
context:
space:
mode:
authorschallerr2022-03-09 23:13:37 +0100
committerGitHub2022-03-09 23:13:37 +0100
commit81f612c96c898e2ca1174c3342fdeccaa276f242 (patch)
tree141ce423c49cb621f761011d20fe8e15b6eae7af /tests/SelfTest
parent913f79a661a02be5791be9bdf2b8ee123579b51d (diff)
downloadcatch3-81f612c96c898e2ca1174c3342fdeccaa276f242.tar.gz
Refactor MatchersRanges test utils (#2386)
- do not hardcode content of containers - prefix members with m_ - add const and non-const iterators to `with_mocked_iterator_access` - remove `m_touched` as it wasn't filled properly and isn't used anyway
Diffstat (limited to 'tests/SelfTest')
-rw-r--r--tests/SelfTest/Baselines/compact.sw.approved.txt60
-rw-r--r--tests/SelfTest/Baselines/compact.sw.multi.approved.txt60
-rw-r--r--tests/SelfTest/Baselines/console.sw.approved.txt60
-rw-r--r--tests/SelfTest/Baselines/console.sw.multi.approved.txt60
-rw-r--r--tests/SelfTest/Baselines/tap.sw.approved.txt60
-rw-r--r--tests/SelfTest/Baselines/tap.sw.multi.approved.txt60
-rw-r--r--tests/SelfTest/Baselines/xml.sw.approved.txt60
-rw-r--r--tests/SelfTest/Baselines/xml.sw.multi.approved.txt60
-rw-r--r--tests/SelfTest/UsageTests/MatchersRanges.tests.cpp210
9 files changed, 355 insertions, 335 deletions
diff --git a/tests/SelfTest/Baselines/compact.sw.approved.txt b/tests/SelfTest/Baselines/compact.sw.approved.txt
index 235f58ed..9a32e6ca 100644
--- a/tests/SelfTest/Baselines/compact.sw.approved.txt
+++ b/tests/SelfTest/Baselines/compact.sw.approved.txt
@@ -1967,47 +1967,47 @@ MatchersRanges.tests.cpp:<line number>: passed: data, AllMatch(SizeIs(5)) for: {
MatchersRanges.tests.cpp:<line number>: passed: data, !AllMatch(Contains(0) && Contains(1)) for: { { 0, 1, 2, 3, 5 }, { 4, -3, -2, 5, 0 }, { 0, 0, 0, 5, 0 }, { 0, -5, 0, 5, 0 }, { 1, 0, 0, -1, 5 } } not all match ( contains element 0 and contains element 1 )
MatchersRanges.tests.cpp:<line number>: passed: needs_adl, AllMatch( Predicate<int>( []( int elem ) { return elem < 6; } ) ) for: { 1, 2, 3, 4, 5 } all match matches undescribed predicate
MatchersRanges.tests.cpp:<line number>: passed: mocked, allMatch for: { 1, 2, 3, 4, 5 } all match matches undescribed predicate
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[0] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[1] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[2] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[3] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[4] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[0] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[1] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[2] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[3] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[4] for: true
MatchersRanges.tests.cpp:<line number>: passed: mocked, !allMatch for: { 1, 2, 3, 4, 5 } not all match matches undescribed predicate
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[0] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[1] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[2] for: true
-MatchersRanges.tests.cpp:<line number>: passed: !(mocked.derefed[3]) for: !false
-MatchersRanges.tests.cpp:<line number>: passed: !(mocked.derefed[4]) for: !false
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[0] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[1] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[2] for: true
+MatchersRanges.tests.cpp:<line number>: passed: !(mocked.m_derefed[3]) for: !false
+MatchersRanges.tests.cpp:<line number>: passed: !(mocked.m_derefed[4]) for: !false
MatchersRanges.tests.cpp:<line number>: passed: data, AnyMatch(SizeIs(5)) for: { { 0, 1, 2, 3, 5 }, { 4, -3, -2, 5, 0 }, { 0, 0, 0, 5, 0 }, { 0, -5, 0, 5, 0 }, { 1, 0, 0, -1, 5 } } any match has size == 5
MatchersRanges.tests.cpp:<line number>: passed: data, !AnyMatch(Contains(0) && Contains(10)) for: { { 0, 1, 2, 3, 5 }, { 4, -3, -2, 5, 0 }, { 0, 0, 0, 5, 0 }, { 0, -5, 0, 5, 0 }, { 1, 0, 0, -1, 5 } } not any match ( contains element 0 and contains element 10 )
MatchersRanges.tests.cpp:<line number>: passed: needs_adl, AnyMatch( Predicate<int>( []( int elem ) { return elem < 3; } ) ) for: { 1, 2, 3, 4, 5 } any match matches undescribed predicate
MatchersRanges.tests.cpp:<line number>: passed: mocked, !anyMatch for: { 1, 2, 3, 4, 5 } not any match matches undescribed predicate
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[0] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[1] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[2] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[3] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[4] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[0] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[1] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[2] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[3] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[4] for: true
MatchersRanges.tests.cpp:<line number>: passed: mocked, anyMatch for: { 1, 2, 3, 4, 5 } any match matches undescribed predicate
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[0] for: true
-MatchersRanges.tests.cpp:<line number>: passed: !(mocked.derefed[1]) for: !false
-MatchersRanges.tests.cpp:<line number>: passed: !(mocked.derefed[2]) for: !false
-MatchersRanges.tests.cpp:<line number>: passed: !(mocked.derefed[3]) for: !false
-MatchersRanges.tests.cpp:<line number>: passed: !(mocked.derefed[4]) for: !false
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[0] for: true
+MatchersRanges.tests.cpp:<line number>: passed: !(mocked.m_derefed[1]) for: !false
+MatchersRanges.tests.cpp:<line number>: passed: !(mocked.m_derefed[2]) for: !false
+MatchersRanges.tests.cpp:<line number>: passed: !(mocked.m_derefed[3]) for: !false
+MatchersRanges.tests.cpp:<line number>: passed: !(mocked.m_derefed[4]) for: !false
MatchersRanges.tests.cpp:<line number>: passed: data, NoneMatch(SizeIs(6)) for: { { 0, 1, 2, 3, 5 }, { 4, -3, -2, 5, 0 }, { 0, 0, 0, 5, 0 }, { 0, -5, 0, 5, 0 }, { 1, 0, 0, -1, 5 } } none match has size == 6
MatchersRanges.tests.cpp:<line number>: passed: data, !NoneMatch(Contains(0) && Contains(1)) for: { { 0, 1, 2, 3, 5 }, { 4, -3, -2, 5, 0 }, { 0, 0, 0, 5, 0 }, { 0, -5, 0, 5, 0 }, { 1, 0, 0, -1, 5 } } not none match ( contains element 0 and contains element 1 )
MatchersRanges.tests.cpp:<line number>: passed: needs_adl, NoneMatch( Predicate<int>( []( int elem ) { return elem > 6; } ) ) for: { 1, 2, 3, 4, 5 } none match matches undescribed predicate
MatchersRanges.tests.cpp:<line number>: passed: mocked, noneMatch for: { 1, 2, 3, 4, 5 } none match matches undescribed predicate
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[0] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[1] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[2] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[3] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[4] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[0] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[1] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[2] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[3] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[4] for: true
MatchersRanges.tests.cpp:<line number>: passed: mocked, !noneMatch for: { 1, 2, 3, 4, 5 } not none match matches undescribed predicate
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[0] for: true
-MatchersRanges.tests.cpp:<line number>: passed: !(mocked.derefed[1]) for: !false
-MatchersRanges.tests.cpp:<line number>: passed: !(mocked.derefed[2]) for: !false
-MatchersRanges.tests.cpp:<line number>: passed: !(mocked.derefed[3]) for: !false
-MatchersRanges.tests.cpp:<line number>: passed: !(mocked.derefed[4]) for: !false
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[0] for: true
+MatchersRanges.tests.cpp:<line number>: passed: !(mocked.m_derefed[1]) for: !false
+MatchersRanges.tests.cpp:<line number>: passed: !(mocked.m_derefed[2]) for: !false
+MatchersRanges.tests.cpp:<line number>: passed: !(mocked.m_derefed[3]) for: !false
+MatchersRanges.tests.cpp:<line number>: passed: !(mocked.m_derefed[4]) for: !false
MatchersRanges.tests.cpp:<line number>: passed: empty_vec, SizeIs(0) for: { } has size == 0
MatchersRanges.tests.cpp:<line number>: passed: empty_vec, !SizeIs(2) for: { } not has size == 2
MatchersRanges.tests.cpp:<line number>: passed: empty_vec, SizeIs(Lt(2)) for: { } size matches is less than 2
diff --git a/tests/SelfTest/Baselines/compact.sw.multi.approved.txt b/tests/SelfTest/Baselines/compact.sw.multi.approved.txt
index f364a55a..4b54102b 100644
--- a/tests/SelfTest/Baselines/compact.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/compact.sw.multi.approved.txt
@@ -1960,47 +1960,47 @@ MatchersRanges.tests.cpp:<line number>: passed: data, AllMatch(SizeIs(5)) for: {
MatchersRanges.tests.cpp:<line number>: passed: data, !AllMatch(Contains(0) && Contains(1)) for: { { 0, 1, 2, 3, 5 }, { 4, -3, -2, 5, 0 }, { 0, 0, 0, 5, 0 }, { 0, -5, 0, 5, 0 }, { 1, 0, 0, -1, 5 } } not all match ( contains element 0 and contains element 1 )
MatchersRanges.tests.cpp:<line number>: passed: needs_adl, AllMatch( Predicate<int>( []( int elem ) { return elem < 6; } ) ) for: { 1, 2, 3, 4, 5 } all match matches undescribed predicate
MatchersRanges.tests.cpp:<line number>: passed: mocked, allMatch for: { 1, 2, 3, 4, 5 } all match matches undescribed predicate
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[0] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[1] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[2] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[3] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[4] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[0] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[1] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[2] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[3] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[4] for: true
MatchersRanges.tests.cpp:<line number>: passed: mocked, !allMatch for: { 1, 2, 3, 4, 5 } not all match matches undescribed predicate
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[0] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[1] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[2] for: true
-MatchersRanges.tests.cpp:<line number>: passed: !(mocked.derefed[3]) for: !false
-MatchersRanges.tests.cpp:<line number>: passed: !(mocked.derefed[4]) for: !false
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[0] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[1] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[2] for: true
+MatchersRanges.tests.cpp:<line number>: passed: !(mocked.m_derefed[3]) for: !false
+MatchersRanges.tests.cpp:<line number>: passed: !(mocked.m_derefed[4]) for: !false
MatchersRanges.tests.cpp:<line number>: passed: data, AnyMatch(SizeIs(5)) for: { { 0, 1, 2, 3, 5 }, { 4, -3, -2, 5, 0 }, { 0, 0, 0, 5, 0 }, { 0, -5, 0, 5, 0 }, { 1, 0, 0, -1, 5 } } any match has size == 5
MatchersRanges.tests.cpp:<line number>: passed: data, !AnyMatch(Contains(0) && Contains(10)) for: { { 0, 1, 2, 3, 5 }, { 4, -3, -2, 5, 0 }, { 0, 0, 0, 5, 0 }, { 0, -5, 0, 5, 0 }, { 1, 0, 0, -1, 5 } } not any match ( contains element 0 and contains element 10 )
MatchersRanges.tests.cpp:<line number>: passed: needs_adl, AnyMatch( Predicate<int>( []( int elem ) { return elem < 3; } ) ) for: { 1, 2, 3, 4, 5 } any match matches undescribed predicate
MatchersRanges.tests.cpp:<line number>: passed: mocked, !anyMatch for: { 1, 2, 3, 4, 5 } not any match matches undescribed predicate
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[0] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[1] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[2] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[3] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[4] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[0] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[1] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[2] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[3] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[4] for: true
MatchersRanges.tests.cpp:<line number>: passed: mocked, anyMatch for: { 1, 2, 3, 4, 5 } any match matches undescribed predicate
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[0] for: true
-MatchersRanges.tests.cpp:<line number>: passed: !(mocked.derefed[1]) for: !false
-MatchersRanges.tests.cpp:<line number>: passed: !(mocked.derefed[2]) for: !false
-MatchersRanges.tests.cpp:<line number>: passed: !(mocked.derefed[3]) for: !false
-MatchersRanges.tests.cpp:<line number>: passed: !(mocked.derefed[4]) for: !false
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[0] for: true
+MatchersRanges.tests.cpp:<line number>: passed: !(mocked.m_derefed[1]) for: !false
+MatchersRanges.tests.cpp:<line number>: passed: !(mocked.m_derefed[2]) for: !false
+MatchersRanges.tests.cpp:<line number>: passed: !(mocked.m_derefed[3]) for: !false
+MatchersRanges.tests.cpp:<line number>: passed: !(mocked.m_derefed[4]) for: !false
MatchersRanges.tests.cpp:<line number>: passed: data, NoneMatch(SizeIs(6)) for: { { 0, 1, 2, 3, 5 }, { 4, -3, -2, 5, 0 }, { 0, 0, 0, 5, 0 }, { 0, -5, 0, 5, 0 }, { 1, 0, 0, -1, 5 } } none match has size == 6
MatchersRanges.tests.cpp:<line number>: passed: data, !NoneMatch(Contains(0) && Contains(1)) for: { { 0, 1, 2, 3, 5 }, { 4, -3, -2, 5, 0 }, { 0, 0, 0, 5, 0 }, { 0, -5, 0, 5, 0 }, { 1, 0, 0, -1, 5 } } not none match ( contains element 0 and contains element 1 )
MatchersRanges.tests.cpp:<line number>: passed: needs_adl, NoneMatch( Predicate<int>( []( int elem ) { return elem > 6; } ) ) for: { 1, 2, 3, 4, 5 } none match matches undescribed predicate
MatchersRanges.tests.cpp:<line number>: passed: mocked, noneMatch for: { 1, 2, 3, 4, 5 } none match matches undescribed predicate
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[0] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[1] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[2] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[3] for: true
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[4] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[0] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[1] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[2] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[3] for: true
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[4] for: true
MatchersRanges.tests.cpp:<line number>: passed: mocked, !noneMatch for: { 1, 2, 3, 4, 5 } not none match matches undescribed predicate
-MatchersRanges.tests.cpp:<line number>: passed: mocked.derefed[0] for: true
-MatchersRanges.tests.cpp:<line number>: passed: !(mocked.derefed[1]) for: !false
-MatchersRanges.tests.cpp:<line number>: passed: !(mocked.derefed[2]) for: !false
-MatchersRanges.tests.cpp:<line number>: passed: !(mocked.derefed[3]) for: !false
-MatchersRanges.tests.cpp:<line number>: passed: !(mocked.derefed[4]) for: !false
+MatchersRanges.tests.cpp:<line number>: passed: mocked.m_derefed[0] for: true
+MatchersRanges.tests.cpp:<line number>: passed: !(mocked.m_derefed[1]) for: !false
+MatchersRanges.tests.cpp:<line number>: passed: !(mocked.m_derefed[2]) for: !false
+MatchersRanges.tests.cpp:<line number>: passed: !(mocked.m_derefed[3]) for: !false
+MatchersRanges.tests.cpp:<line number>: passed: !(mocked.m_derefed[4]) for: !false
MatchersRanges.tests.cpp:<line number>: passed: empty_vec, SizeIs(0) for: { } has size == 0
MatchersRanges.tests.cpp:<line number>: passed: empty_vec, !SizeIs(2) for: { } not has size == 2
MatchersRanges.tests.cpp:<line number>: passed: empty_vec, SizeIs(Lt(2)) for: { } size matches is less than 2
diff --git a/tests/SelfTest/Baselines/console.sw.approved.txt b/tests/SelfTest/Baselines/console.sw.approved.txt
index aec59fb3..c17023ac 100644
--- a/tests/SelfTest/Baselines/console.sw.approved.txt
+++ b/tests/SelfTest/Baselines/console.sw.approved.txt
@@ -13955,27 +13955,27 @@ with expansion:
{ 1, 2, 3, 4, 5 } all match matches undescribed predicate
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[0] )
+ REQUIRE( mocked.m_derefed[0] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[1] )
+ REQUIRE( mocked.m_derefed[1] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[2] )
+ REQUIRE( mocked.m_derefed[2] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[3] )
+ REQUIRE( mocked.m_derefed[3] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[4] )
+ REQUIRE( mocked.m_derefed[4] )
with expansion:
true
@@ -13993,27 +13993,27 @@ with expansion:
{ 1, 2, 3, 4, 5 } not all match matches undescribed predicate
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[0] )
+ REQUIRE( mocked.m_derefed[0] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[1] )
+ REQUIRE( mocked.m_derefed[1] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[2] )
+ REQUIRE( mocked.m_derefed[2] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE_FALSE( mocked.derefed[3] )
+ REQUIRE_FALSE( mocked.m_derefed[3] )
with expansion:
!false
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE_FALSE( mocked.derefed[4] )
+ REQUIRE_FALSE( mocked.m_derefed[4] )
with expansion:
!false
@@ -14063,27 +14063,27 @@ with expansion:
{ 1, 2, 3, 4, 5 } not any match matches undescribed predicate
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[0] )
+ REQUIRE( mocked.m_derefed[0] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[1] )
+ REQUIRE( mocked.m_derefed[1] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[2] )
+ REQUIRE( mocked.m_derefed[2] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[3] )
+ REQUIRE( mocked.m_derefed[3] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[4] )
+ REQUIRE( mocked.m_derefed[4] )
with expansion:
true
@@ -14101,27 +14101,27 @@ with expansion:
{ 1, 2, 3, 4, 5 } any match matches undescribed predicate
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[0] )
+ REQUIRE( mocked.m_derefed[0] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE_FALSE( mocked.derefed[1] )
+ REQUIRE_FALSE( mocked.m_derefed[1] )
with expansion:
!false
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE_FALSE( mocked.derefed[2] )
+ REQUIRE_FALSE( mocked.m_derefed[2] )
with expansion:
!false
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE_FALSE( mocked.derefed[3] )
+ REQUIRE_FALSE( mocked.m_derefed[3] )
with expansion:
!false
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE_FALSE( mocked.derefed[4] )
+ REQUIRE_FALSE( mocked.m_derefed[4] )
with expansion:
!false
@@ -14171,27 +14171,27 @@ with expansion:
{ 1, 2, 3, 4, 5 } none match matches undescribed predicate
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[0] )
+ REQUIRE( mocked.m_derefed[0] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[1] )
+ REQUIRE( mocked.m_derefed[1] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[2] )
+ REQUIRE( mocked.m_derefed[2] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[3] )
+ REQUIRE( mocked.m_derefed[3] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[4] )
+ REQUIRE( mocked.m_derefed[4] )
with expansion:
true
@@ -14209,27 +14209,27 @@ with expansion:
{ 1, 2, 3, 4, 5 } not none match matches undescribed predicate
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[0] )
+ REQUIRE( mocked.m_derefed[0] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE_FALSE( mocked.derefed[1] )
+ REQUIRE_FALSE( mocked.m_derefed[1] )
with expansion:
!false
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE_FALSE( mocked.derefed[2] )
+ REQUIRE_FALSE( mocked.m_derefed[2] )
with expansion:
!false
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE_FALSE( mocked.derefed[3] )
+ REQUIRE_FALSE( mocked.m_derefed[3] )
with expansion:
!false
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE_FALSE( mocked.derefed[4] )
+ REQUIRE_FALSE( mocked.m_derefed[4] )
with expansion:
!false
diff --git a/tests/SelfTest/Baselines/console.sw.multi.approved.txt b/tests/SelfTest/Baselines/console.sw.multi.approved.txt
index a9ccc32f..d034ed27 100644
--- a/tests/SelfTest/Baselines/console.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/console.sw.multi.approved.txt
@@ -13948,27 +13948,27 @@ with expansion:
{ 1, 2, 3, 4, 5 } all match matches undescribed predicate
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[0] )
+ REQUIRE( mocked.m_derefed[0] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[1] )
+ REQUIRE( mocked.m_derefed[1] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[2] )
+ REQUIRE( mocked.m_derefed[2] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[3] )
+ REQUIRE( mocked.m_derefed[3] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[4] )
+ REQUIRE( mocked.m_derefed[4] )
with expansion:
true
@@ -13986,27 +13986,27 @@ with expansion:
{ 1, 2, 3, 4, 5 } not all match matches undescribed predicate
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[0] )
+ REQUIRE( mocked.m_derefed[0] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[1] )
+ REQUIRE( mocked.m_derefed[1] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[2] )
+ REQUIRE( mocked.m_derefed[2] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE_FALSE( mocked.derefed[3] )
+ REQUIRE_FALSE( mocked.m_derefed[3] )
with expansion:
!false
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE_FALSE( mocked.derefed[4] )
+ REQUIRE_FALSE( mocked.m_derefed[4] )
with expansion:
!false
@@ -14056,27 +14056,27 @@ with expansion:
{ 1, 2, 3, 4, 5 } not any match matches undescribed predicate
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[0] )
+ REQUIRE( mocked.m_derefed[0] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[1] )
+ REQUIRE( mocked.m_derefed[1] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[2] )
+ REQUIRE( mocked.m_derefed[2] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[3] )
+ REQUIRE( mocked.m_derefed[3] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[4] )
+ REQUIRE( mocked.m_derefed[4] )
with expansion:
true
@@ -14094,27 +14094,27 @@ with expansion:
{ 1, 2, 3, 4, 5 } any match matches undescribed predicate
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[0] )
+ REQUIRE( mocked.m_derefed[0] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE_FALSE( mocked.derefed[1] )
+ REQUIRE_FALSE( mocked.m_derefed[1] )
with expansion:
!false
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE_FALSE( mocked.derefed[2] )
+ REQUIRE_FALSE( mocked.m_derefed[2] )
with expansion:
!false
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE_FALSE( mocked.derefed[3] )
+ REQUIRE_FALSE( mocked.m_derefed[3] )
with expansion:
!false
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE_FALSE( mocked.derefed[4] )
+ REQUIRE_FALSE( mocked.m_derefed[4] )
with expansion:
!false
@@ -14164,27 +14164,27 @@ with expansion:
{ 1, 2, 3, 4, 5 } none match matches undescribed predicate
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[0] )
+ REQUIRE( mocked.m_derefed[0] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[1] )
+ REQUIRE( mocked.m_derefed[1] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[2] )
+ REQUIRE( mocked.m_derefed[2] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[3] )
+ REQUIRE( mocked.m_derefed[3] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[4] )
+ REQUIRE( mocked.m_derefed[4] )
with expansion:
true
@@ -14202,27 +14202,27 @@ with expansion:
{ 1, 2, 3, 4, 5 } not none match matches undescribed predicate
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE( mocked.derefed[0] )
+ REQUIRE( mocked.m_derefed[0] )
with expansion:
true
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE_FALSE( mocked.derefed[1] )
+ REQUIRE_FALSE( mocked.m_derefed[1] )
with expansion:
!false
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE_FALSE( mocked.derefed[2] )
+ REQUIRE_FALSE( mocked.m_derefed[2] )
with expansion:
!false
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE_FALSE( mocked.derefed[3] )
+ REQUIRE_FALSE( mocked.m_derefed[3] )
with expansion:
!false
MatchersRanges.tests.cpp:<line number>: PASSED:
- REQUIRE_FALSE( mocked.derefed[4] )
+ REQUIRE_FALSE( mocked.m_derefed[4] )
with expansion:
!false
diff --git a/tests/SelfTest/Baselines/tap.sw.approved.txt b/tests/SelfTest/Baselines/tap.sw.approved.txt
index bec30dda..97f7df9b 100644
--- a/tests/SelfTest/Baselines/tap.sw.approved.txt
+++ b/tests/SelfTest/Baselines/tap.sw.approved.txt
@@ -3488,27 +3488,27 @@ ok {test-number} - needs_adl, AllMatch( Predicate<int>( []( int elem ) { return
# Usage of AllMatch range matcher
ok {test-number} - mocked, allMatch for: { 1, 2, 3, 4, 5 } all match matches undescribed predicate
# Usage of AllMatch range matcher
-ok {test-number} - mocked.derefed[0] for: true
+ok {test-number} - mocked.m_derefed[0] for: true
# Usage of AllMatch range matcher
-ok {test-number} - mocked.derefed[1] for: true
+ok {test-number} - mocked.m_derefed[1] for: true
# Usage of AllMatch range matcher
-ok {test-number} - mocked.derefed[2] for: true
+ok {test-number} - mocked.m_derefed[2] for: true
# Usage of AllMatch range matcher
-ok {test-number} - mocked.derefed[3] for: true
+ok {test-number} - mocked.m_derefed[3] for: true
# Usage of AllMatch range matcher
-ok {test-number} - mocked.derefed[4] for: true
+ok {test-number} - mocked.m_derefed[4] for: true
# Usage of AllMatch range matcher
ok {test-number} - mocked, !allMatch for: { 1, 2, 3, 4, 5 } not all match matches undescribed predicate
# Usage of AllMatch range matcher
-ok {test-number} - mocked.derefed[0] for: true
+ok {test-number} - mocked.m_derefed[0] for: true
# Usage of AllMatch range matcher
-ok {test-number} - mocked.derefed[1] for: true
+ok {test-number} - mocked.m_derefed[1] for: true
# Usage of AllMatch range matcher
-ok {test-number} - mocked.derefed[2] for: true
+ok {test-number} - mocked.m_derefed[2] for: true
# Usage of AllMatch range matcher
-ok {test-number} - !(mocked.derefed[3]) for: !false
+ok {test-number} - !(mocked.m_derefed[3]) for: !false
# Usage of AllMatch range matcher
-ok {test-number} - !(mocked.derefed[4]) for: !false
+ok {test-number} - !(mocked.m_derefed[4]) for: !false
# Usage of AnyMatch range matcher
ok {test-number} - data, AnyMatch(SizeIs(5)) for: { { 0, 1, 2, 3, 5 }, { 4, -3, -2, 5, 0 }, { 0, 0, 0, 5, 0 }, { 0, -5, 0, 5, 0 }, { 1, 0, 0, -1, 5 } } any match has size == 5
# Usage of AnyMatch range matcher
@@ -3518,27 +3518,27 @@ ok {test-number} - needs_adl, AnyMatch( Predicate<int>( []( int elem ) { return
# Usage of AnyMatch range matcher
ok {test-number} - mocked, !anyMatch for: { 1, 2, 3, 4, 5 } not any match matches undescribed predicate
# Usage of AnyMatch range matcher
-ok {test-number} - mocked.derefed[0] for: true
+ok {test-number} - mocked.m_derefed[0] for: true
# Usage of AnyMatch range matcher
-ok {test-number} - mocked.derefed[1] for: true
+ok {test-number} - mocked.m_derefed[1] for: true
# Usage of AnyMatch range matcher
-ok {test-number} - mocked.derefed[2] for: true
+ok {test-number} - mocked.m_derefed[2] for: true
# Usage of AnyMatch range matcher
-ok {test-number} - mocked.derefed[3] for: true
+ok {test-number} - mocked.m_derefed[3] for: true
# Usage of AnyMatch range matcher
-ok {test-number} - mocked.derefed[4] for: true
+ok {test-number} - mocked.m_derefed[4] for: true
# Usage of AnyMatch range matcher
ok {test-number} - mocked, anyMatch for: { 1, 2, 3, 4, 5 } any match matches undescribed predicate
# Usage of AnyMatch range matcher
-ok {test-number} - mocked.derefed[0] for: true
+ok {test-number} - mocked.m_derefed[0] for: true
# Usage of AnyMatch range matcher
-ok {test-number} - !(mocked.derefed[1]) for: !false
+ok {test-number} - !(mocked.m_derefed[1]) for: !false
# Usage of AnyMatch range matcher
-ok {test-number} - !(mocked.derefed[2]) for: !false
+ok {test-number} - !(mocked.m_derefed[2]) for: !false
# Usage of AnyMatch range matcher
-ok {test-number} - !(mocked.derefed[3]) for: !false
+ok {test-number} - !(mocked.m_derefed[3]) for: !false
# Usage of AnyMatch range matcher
-ok {test-number} - !(mocked.derefed[4]) for: !false
+ok {test-number} - !(mocked.m_derefed[4]) for: !false
# Usage of NoneMatch range matcher
ok {test-number} - data, NoneMatch(SizeIs(6)) for: { { 0, 1, 2, 3, 5 }, { 4, -3, -2, 5, 0 }, { 0, 0, 0, 5, 0 }, { 0, -5, 0, 5, 0 }, { 1, 0, 0, -1, 5 } } none match has size == 6
# Usage of NoneMatch range matcher
@@ -3548,27 +3548,27 @@ ok {test-number} - needs_adl, NoneMatch( Predicate<int>( []( int elem ) { return
# Usage of NoneMatch range matcher
ok {test-number} - mocked, noneMatch for: { 1, 2, 3, 4, 5 } none match matches undescribed predicate
# Usage of NoneMatch range matcher
-ok {test-number} - mocked.derefed[0] for: true
+ok {test-number} - mocked.m_derefed[0] for: true
# Usage of NoneMatch range matcher
-ok {test-number} - mocked.derefed[1] for: true
+ok {test-number} - mocked.m_derefed[1] for: true
# Usage of NoneMatch range matcher
-ok {test-number} - mocked.derefed[2] for: true
+ok {test-number} - mocked.m_derefed[2] for: true
# Usage of NoneMatch range matcher
-ok {test-number} - mocked.derefed[3] for: true
+ok {test-number} - mocked.m_derefed[3] for: true
# Usage of NoneMatch range matcher
-ok {test-number} - mocked.derefed[4] for: true
+ok {test-number} - mocked.m_derefed[4] for: true
# Usage of NoneMatch range matcher
ok {test-number} - mocked, !noneMatch for: { 1, 2, 3, 4, 5 } not none match matches undescribed predicate
# Usage of NoneMatch range matcher
-ok {test-number} - mocked.derefed[0] for: true
+ok {test-number} - mocked.m_derefed[0] for: true
# Usage of NoneMatch range matcher
-ok {test-number} - !(mocked.derefed[1]) for: !false
+ok {test-number} - !(mocked.m_derefed[1]) for: !false
# Usage of NoneMatch range matcher
-ok {test-number} - !(mocked.derefed[2]) for: !false
+ok {test-number} - !(mocked.m_derefed[2]) for: !false
# Usage of NoneMatch range matcher
-ok {test-number} - !(mocked.derefed[3]) for: !false
+ok {test-number} - !(mocked.m_derefed[3]) for: !false
# Usage of NoneMatch range matcher
-ok {test-number} - !(mocked.derefed[4]) for: !false
+ok {test-number} - !(mocked.m_derefed[4]) for: !false
# Usage of the SizeIs range matcher
ok {test-number} - empty_vec, SizeIs(0) for: { } has size == 0
# Usage of the SizeIs range matcher
diff --git a/tests/SelfTest/Baselines/tap.sw.multi.approved.txt b/tests/SelfTest/Baselines/tap.sw.multi.approved.txt
index e9f01e12..ca6dfc81 100644
--- a/