Use a non-concepts method of checking random-access iterators

This means C++20 isn't needed and we can always test this.

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

@@ -1966,6 +1966,7 @@ MatchersRanges.tests.cpp:<line number>: passed: array_int_3, !ElementsAre( array
 MatchersRanges.tests.cpp:<line number>: passed: array_int_3, !UnorderedElementsAre( array_int_4 ) for: { 1, 2, 3 } not unordered elements are { 1, 2, 3, 4 }
 MatchersRanges.tests.cpp:<line number>: passed: array_int_a, ElementsAre( vector_char_a ) for: { 1, 2, 3 } elements are { 1, 2, 3 }
 MatchersRanges.tests.cpp:<line number>: passed: array_int_a, UnorderedElementsAre( vector_char_a ) for: { 1, 2, 3 } unordered elements are { 1, 2, 3 }
+MatchersRanges.tests.cpp:<line number>: passed: with 1 message: 'ContainerIsRandomAccess( array_int_a ) != ContainerIsRandomAccess( list_char_a )'
 MatchersRanges.tests.cpp:<line number>: passed: array_int_a, ElementsAre( list_char_a ) for: { 1, 2, 3 } elements are { 1, 2, 3 }
 MatchersRanges.tests.cpp:<line number>: passed: array_int_a, UnorderedElementsAre( list_char_a ) for: { 1, 2, 3 } unordered elements are { 1, 2, 3 }
 MatchersRanges.tests.cpp:<line number>: passed: vector_int_a, ElementsAre( vector_char_a ) for: { 1, 2, 3 } elements are { 1, 2, 3 }

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

@@ -1959,6 +1959,7 @@ MatchersRanges.tests.cpp:<line number>: passed: array_int_3, !ElementsAre( array
 MatchersRanges.tests.cpp:<line number>: passed: array_int_3, !UnorderedElementsAre( array_int_4 ) for: { 1, 2, 3 } not unordered elements are { 1, 2, 3, 4 }
 MatchersRanges.tests.cpp:<line number>: passed: array_int_a, ElementsAre( vector_char_a ) for: { 1, 2, 3 } elements are { 1, 2, 3 }
 MatchersRanges.tests.cpp:<line number>: passed: array_int_a, UnorderedElementsAre( vector_char_a ) for: { 1, 2, 3 } unordered elements are { 1, 2, 3 }
+MatchersRanges.tests.cpp:<line number>: passed: with 1 message: 'ContainerIsRandomAccess( array_int_a ) != ContainerIsRandomAccess( list_char_a )'
 MatchersRanges.tests.cpp:<line number>: passed: array_int_a, ElementsAre( list_char_a ) for: { 1, 2, 3 } elements are { 1, 2, 3 }
 MatchersRanges.tests.cpp:<line number>: passed: array_int_a, UnorderedElementsAre( list_char_a ) for: { 1, 2, 3 } unordered elements are { 1, 2, 3 }
 MatchersRanges.tests.cpp:<line number>: passed: vector_int_a, ElementsAre( vector_char_a ) for: { 1, 2, 3 } elements are { 1, 2, 3 }

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

@@ -1396,5 +1396,5 @@ due to unexpected exception with message:
 
 ===============================================================================
 test cases:  386 |  310 passed |  69 failed |  7 failed as expected
-assertions: 2246 | 2091 passed | 128 failed | 27 failed as expected
+assertions: 2247 | 2092 passed | 128 failed | 27 failed as expected
 

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

@@ -13937,6 +13937,11 @@ Type conversions of ElementsAre and similar
 MatchersRanges.tests.cpp:<line number>
 ...............................................................................
 
+MatchersRanges.tests.cpp:<line number>: PASSED:
+with message:
+  ContainerIsRandomAccess( array_int_a ) != ContainerIsRandomAccess(
+  list_char_a )
+
 MatchersRanges.tests.cpp:<line number>: PASSED:
   CHECK_THAT( array_int_a, ElementsAre( list_char_a ) )
 with expansion:
@@ -18136,5 +18141,5 @@ Misc.tests.cpp:<line number>: PASSED:
 
 ===============================================================================
 test cases:  386 |  296 passed |  83 failed |  7 failed as expected
-assertions: 2261 | 2091 passed | 143 failed | 27 failed as expected
+assertions: 2262 | 2092 passed | 143 failed | 27 failed as expected
 

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

@@ -13930,6 +13930,11 @@ Type conversions of ElementsAre and similar
 MatchersRanges.tests.cpp:<line number>
 ...............................................................................
 
+MatchersRanges.tests.cpp:<line number>: PASSED:
+with message:
+  ContainerIsRandomAccess( array_int_a ) != ContainerIsRandomAccess(
+  list_char_a )
+
 MatchersRanges.tests.cpp:<line number>: PASSED:
   CHECK_THAT( array_int_a, ElementsAre( list_char_a ) )
 with expansion:
@@ -18128,5 +18133,5 @@ Misc.tests.cpp:<line number>: PASSED:
 
 ===============================================================================
 test cases:  386 |  296 passed |  83 failed |  7 failed as expected
-assertions: 2261 | 2091 passed | 143 failed | 27 failed as expected
+assertions: 2262 | 2092 passed | 143 failed | 27 failed as expected
 

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="2261" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
+  <testsuite name="<exe-name>" errors="17" failures="126" tests="2262" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
     <properties>
       <property name="random-seed" value="1"/>
       <property name="filters" value="~[!nonportable]~[!benchmark]~[approvals] *"/>

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="2261" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
+  <testsuite name="<exe-name>" errors="17" failures="126" tests="2262" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
     <properties>
       <property name="random-seed" value="1"/>
       <property name="filters" value="~[!nonportable]~[!benchmark]~[approvals] *"/>

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

@@ -3486,6 +3486,8 @@ ok {test-number} - array_int_a, ElementsAre( vector_char_a ) for: { 1, 2, 3 } el
 # Type conversions of ElementsAre and similar
 ok {test-number} - array_int_a, UnorderedElementsAre( vector_char_a ) for: { 1, 2, 3 } unordered elements are { 1, 2, 3 }
 # Type conversions of ElementsAre and similar
+ok {test-number} - with 1 message: 'ContainerIsRandomAccess( array_int_a ) != ContainerIsRandomAccess( list_char_a )'
+# Type conversions of ElementsAre and similar
 ok {test-number} - array_int_a, ElementsAre( list_char_a ) for: { 1, 2, 3 } elements are { 1, 2, 3 }
 # Type conversions of ElementsAre and similar
 ok {test-number} - array_int_a, UnorderedElementsAre( list_char_a ) for: { 1, 2, 3 } unordered elements are { 1, 2, 3 }
@@ -4524,5 +4526,5 @@ ok {test-number} - q3 == 23. for: 23.0 == 23.0
 ok {test-number} -
 # xmlentitycheck
 ok {test-number} -
-1..2261
+1..2262
 

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

@@ -3479,6 +3479,8 @@ ok {test-number} - array_int_a, ElementsAre( vector_char_a ) for: { 1, 2, 3 } el
 # Type conversions of ElementsAre and similar
 ok {test-number} - array_int_a, UnorderedElementsAre( vector_char_a ) for: { 1, 2, 3 } unordered elements are { 1, 2, 3 }
 # Type conversions of ElementsAre and similar
+ok {test-number} - with 1 message: 'ContainerIsRandomAccess( array_int_a ) != ContainerIsRandomAccess( list_char_a )'
+# Type conversions of ElementsAre and similar
 ok {test-number} - array_int_a, ElementsAre( list_char_a ) for: { 1, 2, 3 } elements are { 1, 2, 3 }
 # Type conversions of ElementsAre and similar
 ok {test-number} - array_int_a, UnorderedElementsAre( list_char_a ) for: { 1, 2, 3 } unordered elements are { 1, 2, 3 }
@@ -4516,5 +4518,5 @@ ok {test-number} - q3 == 23. for: 23.0 == 23.0
 ok {test-number} -
 # xmlentitycheck
 ok {test-number} -
-1..2261
+1..2262
 

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

@@ -16389,9 +16389,9 @@ There is no extra whitespace here
             { 1, 2, 3 } unordered elements are { 1, 2, 3 }
           </Expanded>
         </Expression>
-        <OverallResults successes="2" failures="0" expectedFailures="0"/>
+        <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
-      <OverallResults successes="2" failures="0" expectedFailures="0"/>
+      <OverallResults successes="3" failures="0" expectedFailures="0"/>
     </Section>
     <Section name="Value type" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
       <Section name="Two equal containers of different value types" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
@@ -21312,6 +21312,6 @@ loose text artifact
     </Section>
     <OverallResult success="true"/>
   </TestCase>
-  <OverallResults successes="2091" failures="143" expectedFailures="27"/>
+  <OverallResults successes="2092" failures="143" expectedFailures="27"/>
   <OverallResultsCases successes="296" failures="83" expectedFailures="7"/>
 </Catch2TestRun>

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

@@ -16389,9 +16389,9 @@ There is no extra whitespace here
             { 1, 2, 3 } unordered elements are { 1, 2, 3 }
           </Expanded>
         </Expression>
-        <OverallResults successes="2" failures="0" expectedFailures="0"/>
+        <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
-      <OverallResults successes="2" failures="0" expectedFailures="0"/>
+      <OverallResults successes="3" failures="0" expectedFailures="0"/>
     </Section>
     <Section name="Value type" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
       <Section name="Two equal containers of different value types" filename="tests/<exe-name>/UsageTests/MatchersRanges.tests.cpp" >
@@ -21311,6 +21311,6 @@ There is no extra whitespace here
     </Section>
     <OverallResult success="true"/>
   </TestCase>
-  <OverallResults successes="2091" failures="143" expectedFailures="27"/>
+  <OverallResults successes="2092" failures="143" expectedFailures="27"/>
   <OverallResultsCases successes="296" failures="83" expectedFailures="7"/>
 </Catch2TestRun>

tests/SelfTest/UsageTests/MatchersRanges.tests.cpp

@@ -21,11 +21,6 @@
 #include <map>
 #include <vector>
 
-#if defined(__cpp_concepts) && __cpp_concepts >= 201907L
-#define CONCEPT_TESTING
-#include <concepts>
-#endif
-
 namespace {
 namespace unrelated {
     class needs_ADL_begin {
@@ -683,6 +678,18 @@ TEST_CASE( "Usage of UnorderedElementsAre range matcher",
     // are left to the STL implementation
 }
 
+/**
+ * Return true if the type given has a random access iterator type.
+ */
+template <typename Container>
+static constexpr bool ContainerIsRandomAccess( const Container& ) {
+    using array_iter_category = typename std::iterator_traits<
+        typename Container::iterator>::iterator_category;
+
+    return std::is_base_of<std::random_access_iterator_tag,
+                           array_iter_category>::value;
+}
+
 TEST_CASE( "Type conversions of ElementsAre and similar",
            "[matchers][templated][quantifiers]" ) {
     using Catch::Matchers::ElementsAre;
@@ -718,11 +725,9 @@ TEST_CASE( "Type conversions of ElementsAre and similar",
             const std::array<int, 3> array_int_a{ { 1, 2, 3 } };
             const std::list<int> list_char_a{ 1, 2, 3 };
 
-#ifdef CONCEPT_TESTING
             // Verify these types really are different in random access nature
-            static_assert( std::random_access_iterator<decltype(array_int_a)::iterator> );
-            static_assert( !std::random_access_iterator<decltype(list_char_a)::iterator> );
-#endif
+            STATIC_REQUIRE( ContainerIsRandomAccess( array_int_a ) !=
+                            ContainerIsRandomAccess( list_char_a ) );
 
             CHECK_THAT( array_int_a, ElementsAre( list_char_a ) );
             CHECK_THAT( array_int_a, UnorderedElementsAre( list_char_a ) );
@@ -744,7 +749,6 @@ TEST_CASE( "Type conversions of ElementsAre and similar",
         }
     } 
 
-
     SECTION( "Custom predicate" ) {
 
         auto close_enough = []( int lhs, int rhs ) {