Refactor catch2 vector matchers to syntax required by newer version.

Author: NlightNFotis

jbmc/unit/java_bytecode/java_bytecode_convert_method/convert_invoke_dynamic.cpp

@@ -94,17 +94,15 @@ void validate_lambda_assignment(
   REQUIRE_THAT(
     parents,
     // NOLINTNEXTLINE(whitespace/braces)
-    Catch::Matchers::Vector::ContainsElementMatcher<irep_idt>{
-      test_data.lambda_interface});
+    Catch::Matchers::VectorContains(test_data.lambda_interface));
 
   const auto &interface_children =
     class_hierarchy.get_children_trans(test_data.lambda_interface);
 
   REQUIRE_THAT(
     interface_children,
     // NOLINTNEXTLINE(whitespace/braces)
-    Catch::Matchers::Vector::ContainsElementMatcher<irep_idt>{
-      tmp_class_identifier});
+    Catch::Matchers::VectorContains(tmp_class_identifier));
 
   THEN("The function in the class should call the lambda method")
   {
@@ -145,7 +143,7 @@ void validate_lambda_assignment(
 
     REQUIRE_THAT(
       function_call.arguments(),
-      Catch::Matchers::Vector::EqualsMatcher<exprt>{expected_args});
+      Catch::Matchers::Equals(std::vector<exprt>(expected_args)));
 
     if(test_data.should_return_value)
     {

unit/testing-utils/require_vectors_equal_unordered.h

@@ -22,7 +22,7 @@ void require_vectors_equal_unordered(
   const std::vector<T> &expected)
 {
   REQUIRE(actual.size() == expected.size());
-  REQUIRE_THAT(actual, Catch::Matchers::Vector::ContainsMatcher<T>{expected});
+  REQUIRE_THAT(actual, Catch::Matchers::UnorderedEquals(expected));
 }
 
 #endif // CPROVER_TESTING_UTILS_REQUIRE_VECTORS_EQUAL_UNORDERED_H

unit/util/string_utils/split_string.cpp

@@ -42,8 +42,8 @@ void run_on_all_variants(
       REQUIRE_THAT(
         result,
         // NOLINTNEXTLINE(whitespace/braces)
-        Catch::Matchers::Vector::EqualsMatcher<std::string>{
-          expected_results.no_strip_no_remove});
+        Catch::Matchers::Equals(
+          std::vector<std::string>(expected_results.no_strip_no_remove)));
     }
   }
   WHEN("Not stripping, removing empty")
@@ -56,8 +56,8 @@ void run_on_all_variants(
       REQUIRE_THAT(
         result,
         // NOLINTNEXTLINE(whitespace/braces)
-        Catch::Matchers::Vector::EqualsMatcher<std::string>{
-          expected_results.no_strip_remove_empty});
+        Catch::Matchers::Equals(
+          std::vector<std::string>(expected_results.no_strip_remove_empty)));
     }
   }
   WHEN("Stripping, not removing empty")
@@ -70,8 +70,8 @@ void run_on_all_variants(
       REQUIRE_THAT(
         result,
         // NOLINTNEXTLINE(whitespace/braces)
-        Catch::Matchers::Vector::EqualsMatcher<std::string>{
-          expected_results.strip_no_remove});
+        Catch::Matchers::Equals(
+          std::vector<std::string>(expected_results.strip_no_remove)));
     }
   }
   WHEN("Stripping and removing empty")
@@ -84,8 +84,8 @@ void run_on_all_variants(
       REQUIRE_THAT(
         result,
         // NOLINTNEXTLINE(whitespace/braces)
-        Catch::Matchers::Vector::EqualsMatcher<std::string>{
-          expected_results.strip_remove_empty});
+        Catch::Matchers::Equals(
+          std::vector<std::string>(expected_results.strip_remove_empty)));
     }
   }
 }
@@ -146,9 +146,7 @@ SCENARIO("split_string", "[core][utils][string_utils][split_string]")
       THEN("Should get expected vector")
       {
         std::vector<std::string> expected_result = {"a", "b", "c"};
-        REQUIRE_THAT(
-          result,
-          Catch::Matchers::Vector::EqualsMatcher<std::string>{expected_result});
+        REQUIRE_THAT(result, Catch::Matchers::Equals(expected_result));
       }
     }
     WHEN("Not stripping, removing empty")
@@ -159,9 +157,7 @@ SCENARIO("split_string", "[core][utils][string_utils][split_string]")
       THEN("Should get expected vector")
       {
         std::vector<std::string> expected_result = {"a", "b", "c"};
-        REQUIRE_THAT(
-          result,
-          Catch::Matchers::Vector::EqualsMatcher<std::string>{expected_result});
+        REQUIRE_THAT(result, Catch::Matchers::Equals(expected_result));
       }
     }
     // TODO(tkiley): here we should check what happens when trying to enable