Fixup approvals

catchorg · Jul 16, 2022 · cf4793c · cf4793c
1 parent 1b9fc4b
commit cf4793c
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 195 deletions.
diff --git a/tests/SelfTest/Baselines/compact.sw.approved.txt b/tests/SelfTest/Baselines/compact.sw.approved.txt
@@ -2020,7 +2020,6 @@ MatchersRanges.tests.cpp:<line number>: passed: data, !AllTrue() for: { false, f
 MatchersRanges.tests.cpp:<line number>: passed: data, AllTrue() for: { true, true, true, true, true } contains only true
 MatchersRanges.tests.cpp:<line number>: passed: data, !AllTrue() for: { true, true, false, true, true } not contains only true
 MatchersRanges.tests.cpp:<line number>: passed: data, !AllTrue() for: { false, false, false, false, false } not contains only true
-MatchersRanges.tests.cpp:<line number>: passed: needs_adl, AllTrue() for: { true, true, true, true, true } contains only true
 MatchersRanges.tests.cpp:<line number>: passed: mocked, AllTrue() for: { true, true, true, true, true } contains only 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
@@ -2055,7 +2054,6 @@ MatchersRanges.tests.cpp:<line number>: passed: data, !AnyTrue() for: { false, f
 MatchersRanges.tests.cpp:<line number>: passed: data, AnyTrue() for: { true, true, true, true, true } contains at least one true
 MatchersRanges.tests.cpp:<line number>: passed: data, AnyTrue() for: { false, false, true, false, false } contains at least one true
 MatchersRanges.tests.cpp:<line number>: passed: data, !AnyTrue() for: { false, false, false, false, false } not contains at least one true
-MatchersRanges.tests.cpp:<line number>: passed: needs_adl, AnyTrue() for: { false, false, true, false, false } contains at least one true
 MatchersRanges.tests.cpp:<line number>: passed: mocked, AnyTrue() for: { false, false, false, false, true } contains at least one 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
@@ -2090,7 +2088,6 @@ MatchersRanges.tests.cpp:<line number>: passed: data, NoneTrue() for: { false, f
 MatchersRanges.tests.cpp:<line number>: passed: data, !NoneTrue() for: { true, true, true, true, true } not contains no true
 MatchersRanges.tests.cpp:<line number>: passed: data, !NoneTrue() for: { false, false, true, false, false } not contains no true
 MatchersRanges.tests.cpp:<line number>: passed: data, NoneTrue() for: { false, false, false, false, false } contains no true
-MatchersRanges.tests.cpp:<line number>: passed: needs_adl, NoneTrue() for: { false, false, false, false, false } contains no true
 MatchersRanges.tests.cpp:<line number>: passed: mocked, NoneTrue() for: { false, false, false, false, false } contains no 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

diff --git a/tests/SelfTest/Baselines/compact.sw.multi.approved.txt b/tests/SelfTest/Baselines/compact.sw.multi.approved.txt
@@ -2013,7 +2013,6 @@ MatchersRanges.tests.cpp:<line number>: passed: data, !AllTrue() for: { false, f
 MatchersRanges.tests.cpp:<line number>: passed: data, AllTrue() for: { true, true, true, true, true } contains only true
 MatchersRanges.tests.cpp:<line number>: passed: data, !AllTrue() for: { true, true, false, true, true } not contains only true
 MatchersRanges.tests.cpp:<line number>: passed: data, !AllTrue() for: { false, false, false, false, false } not contains only true
-MatchersRanges.tests.cpp:<line number>: passed: needs_adl, AllTrue() for: { true, true, true, true, true } contains only true
 MatchersRanges.tests.cpp:<line number>: passed: mocked, AllTrue() for: { true, true, true, true, true } contains only 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
@@ -2048,7 +2047,6 @@ MatchersRanges.tests.cpp:<line number>: passed: data, !AnyTrue() for: { false, f
 MatchersRanges.tests.cpp:<line number>: passed: data, AnyTrue() for: { true, true, true, true, true } contains at least one true
 MatchersRanges.tests.cpp:<line number>: passed: data, AnyTrue() for: { false, false, true, false, false } contains at least one true
 MatchersRanges.tests.cpp:<line number>: passed: data, !AnyTrue() for: { false, false, false, false, false } not contains at least one true
-MatchersRanges.tests.cpp:<line number>: passed: needs_adl, AnyTrue() for: { false, false, true, false, false } contains at least one true
 MatchersRanges.tests.cpp:<line number>: passed: mocked, AnyTrue() for: { false, false, false, false, true } contains at least one 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
@@ -2083,7 +2081,6 @@ MatchersRanges.tests.cpp:<line number>: passed: data, NoneTrue() for: { false, f
 MatchersRanges.tests.cpp:<line number>: passed: data, !NoneTrue() for: { true, true, true, true, true } not contains no true
 MatchersRanges.tests.cpp:<line number>: passed: data, !NoneTrue() for: { false, false, true, false, false } not contains no true
 MatchersRanges.tests.cpp:<line number>: passed: data, NoneTrue() for: { false, false, false, false, false } contains no true
-MatchersRanges.tests.cpp:<line number>: passed: needs_adl, NoneTrue() for: { false, false, false, false, false } contains no true
 MatchersRanges.tests.cpp:<line number>: passed: mocked, NoneTrue() for: { false, false, false, false, false } contains no 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

diff --git a/tests/SelfTest/Baselines/console.std.approved.txt b/tests/SelfTest/Baselines/console.std.approved.txt
@@ -1395,5 +1395,5 @@ due to unexpected exception with message:
 
 ===============================================================================
 test cases:  394 |  318 passed |  69 failed |  7 failed as expected
-assertions: 2287 | 2132 passed | 128 failed | 27 failed as expected
+assertions: 2284 | 2129 passed | 128 failed | 27 failed as expected
 
diff --git a/tests/SelfTest/Baselines/console.sw.approved.txt b/tests/SelfTest/Baselines/console.sw.approved.txt
@@ -14237,18 +14237,6 @@ MatchersRanges.tests.cpp:<line number>: PASSED:
 with expansion:
   { false, false, false, false, false } not contains only true
 
--------------------------------------------------------------------------------
-Usage of AllTrue range matcher
-  Type requires ADL found begin and end
--------------------------------------------------------------------------------
-MatchersRanges.tests.cpp:<line number>
-...............................................................................
-
-MatchersRanges.tests.cpp:<line number>: PASSED:
-  REQUIRE_THAT( needs_adl, AllTrue() )
-with expansion:
-  { true, true, true, true, true } contains only true
-
 -------------------------------------------------------------------------------
 Usage of AllTrue range matcher
   Shortcircuiting
@@ -14524,18 +14512,6 @@ MatchersRanges.tests.cpp:<line number>: PASSED:
 with expansion:
   { false, false, false, false, false } not contains at least one true
 
--------------------------------------------------------------------------------
-Usage of AnyTrue range matcher
-  Type requires ADL found begin and end
--------------------------------------------------------------------------------
-MatchersRanges.tests.cpp:<line number>
-...............................................................................
-
-MatchersRanges.tests.cpp:<line number>: PASSED:
-  REQUIRE_THAT( needs_adl, AnyTrue() )
-with expansion:
-  { false, false, true, false, false } contains at least one true
-
 -------------------------------------------------------------------------------
 Usage of AnyTrue range matcher
   Shortcircuiting
@@ -14811,18 +14787,6 @@ MatchersRanges.tests.cpp:<line number>: PASSED:
 with expansion:
   { false, false, false, false, false } contains no true
 
--------------------------------------------------------------------------------
-Usage of NoneTrue range matcher
-  Type requires ADL found begin and end
--------------------------------------------------------------------------------
-MatchersRanges.tests.cpp:<line number>
-...............................................................................
-
-MatchersRanges.tests.cpp:<line number>: PASSED:
-  REQUIRE_THAT( needs_adl, NoneTrue() )
-with expansion:
-  { false, false, false, false, false } contains no true
-
 -------------------------------------------------------------------------------
 Usage of NoneTrue range matcher
   Shortcircuiting
@@ -18487,5 +18451,5 @@ Misc.tests.cpp:<line number>: PASSED:
 
 ===============================================================================
 test cases:  394 |  304 passed |  83 failed |  7 failed as expected
-assertions: 2302 | 2132 passed | 143 failed | 27 failed as expected
+assertions: 2299 | 2129 passed | 143 failed | 27 failed as expected
 
diff --git a/tests/SelfTest/Baselines/console.sw.multi.approved.txt b/tests/SelfTest/Baselines/console.sw.multi.approved.txt
@@ -14230,18 +14230,6 @@ MatchersRanges.tests.cpp:<line number>: PASSED:
 with expansion:
   { false, false, false, false, false } not contains only true
 
--------------------------------------------------------------------------------
-Usage of AllTrue range matcher
-  Type requires ADL found begin and end
--------------------------------------------------------------------------------
-MatchersRanges.tests.cpp:<line number>
-...............................................................................
-
-MatchersRanges.tests.cpp:<line number>: PASSED:
-  REQUIRE_THAT( needs_adl, AllTrue() )
-with expansion:
-  { true, true, true, true, true } contains only true
-
 -------------------------------------------------------------------------------
 Usage of AllTrue range matcher
   Shortcircuiting
@@ -14517,18 +14505,6 @@ MatchersRanges.tests.cpp:<line number>: PASSED:
 with expansion:
   { false, false, false, false, false } not contains at least one true
 
--------------------------------------------------------------------------------
-Usage of AnyTrue range matcher
-  Type requires ADL found begin and end
--------------------------------------------------------------------------------
-MatchersRanges.tests.cpp:<line number>
-...............................................................................
-
-MatchersRanges.tests.cpp:<line number>: PASSED:
-  REQUIRE_THAT( needs_adl, AnyTrue() )
-with expansion:
-  { false, false, true, false, false } contains at least one true
-
 -------------------------------------------------------------------------------
 Usage of AnyTrue range matcher
   Shortcircuiting
@@ -14804,18 +14780,6 @@ MatchersRanges.tests.cpp:<line number>: PASSED:
 with expansion:
   { false, false, false, false, false } contains no true
 
--------------------------------------------------------------------------------
-Usage of NoneTrue range matcher
-  Type requires ADL found begin and end
--------------------------------------------------------------------------------
-MatchersRanges.tests.cpp:<line number>
-...............................................................................
-
-MatchersRanges.tests.cpp:<line number>: PASSED:
-  REQUIRE_THAT( needs_adl, NoneTrue() )
-with expansion:
-  { false, false, false, false, false } contains no true
-
 -------------------------------------------------------------------------------
 Usage of NoneTrue range matcher
   Shortcircuiting
@@ -18479,5 +18443,5 @@ Misc.tests.cpp:<line number>: PASSED:
 
 ===============================================================================
 test cases:  394 |  304 passed |  83 failed |  7 failed as expected
-assertions: 2302 | 2132 passed | 143 failed | 27 failed as expected
+assertions: 2299 | 2129 passed | 143 failed | 27 failed as expected
 
diff --git a/tests/SelfTest/Baselines/junit.sw.approved.txt b/tests/SelfTest/Baselines/junit.sw.approved.txt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuitesloose text artifact
 >
-  <testsuite name="<exe-name>" errors="17" failures="126" tests="2302" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
+  <testsuite name="<exe-name>" errors="17" failures="126" tests="2299" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
     <properties>
       <property name="random-seed" value="1"/>
       <property name="filters" value="~[!nonportable]~[!benchmark]~[approvals] *"/>
@@ -1419,7 +1419,6 @@ Exception.tests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Contained type is convertible to bool/All true evaluates to true" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Contained type is convertible to bool/One false evalutes to false" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Contained type is convertible to bool/All false evaluates to false" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Type requires ADL found begin and end" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Shortcircuiting/All are read" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Shortcircuiting/Short-circuited" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AnyMatch range matcher/Basic usage" time="{duration}" status="run"/>
@@ -1433,7 +1432,6 @@ Exception.tests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Contained type is convertible to bool/All true evaluates to true" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Contained type is convertible to bool/One true evalutes to true" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Contained type is convertible to bool/All false evaluates to false" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Type requires ADL found begin and end" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Shortcircuiting/All are read" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Shortcircuiting/Short-circuited" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of NoneMatch range matcher/Basic usage" time="{duration}" status="run"/>
@@ -1447,7 +1445,6 @@ Exception.tests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Contained type is convertible to bool/All true evaluates to false" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Contained type is convertible to bool/One true evalutes to false" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Contained type is convertible to bool/All false evaluates to true" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Type requires ADL found begin and end" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Shortcircuiting/All are read" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Shortcircuiting/Short-circuited" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of the SizeIs range matcher/Some with stdlib containers" time="{duration}" status="run"/>

diff --git a/tests/SelfTest/Baselines/junit.sw.multi.approved.txt b/tests/SelfTest/Baselines/junit.sw.multi.approved.txt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites>
-  <testsuite name="<exe-name>" errors="17" failures="126" tests="2302" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
+  <testsuite name="<exe-name>" errors="17" failures="126" tests="2299" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
     <properties>
       <property name="random-seed" value="1"/>
       <property name="filters" value="~[!nonportable]~[!benchmark]~[approvals] *"/>
@@ -1418,7 +1418,6 @@ Exception.tests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Contained type is convertible to bool/All true evaluates to true" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Contained type is convertible to bool/One false evalutes to false" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Contained type is convertible to bool/All false evaluates to false" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Type requires ADL found begin and end" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Shortcircuiting/All are read" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AllTrue range matcher/Shortcircuiting/Short-circuited" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AnyMatch range matcher/Basic usage" time="{duration}" status="run"/>
@@ -1432,7 +1431,6 @@ Exception.tests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Contained type is convertible to bool/All true evaluates to true" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Contained type is convertible to bool/One true evalutes to true" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Contained type is convertible to bool/All false evaluates to false" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Type requires ADL found begin and end" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Shortcircuiting/All are read" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of AnyTrue range matcher/Shortcircuiting/Short-circuited" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of NoneMatch range matcher/Basic usage" time="{duration}" status="run"/>
@@ -1446,7 +1444,6 @@ Exception.tests.cpp:<line number>
     <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Contained type is convertible to bool/All true evaluates to false" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Contained type is convertible to bool/One true evalutes to false" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Contained type is convertible to bool/All false evaluates to true" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Type requires ADL found begin and end" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Shortcircuiting/All are read" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of NoneTrue range matcher/Shortcircuiting/Short-circuited" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Usage of the SizeIs range matcher/Some with stdlib containers" time="{duration}" status="run"/>