Replace try catch blocks with REQUIRE_THROWS_MATCHES

`REQUIRE_THROWS_MATCHES` is the functionality built into the catch
framework for this purpose. Using it allows more concise specification
of the requirement.

Author: thomasspriggs

jbmc/unit/java_bytecode/java_string_literals.cpp

@@ -11,6 +11,7 @@ Author: Diffblue Limited
 #include <java_bytecode/java_types.h>
 #include <java_bytecode/java_utils.h>
 #include <linking/static_lifetime_init.h>
+#include <testing-utils/invariant.h>
 #include <testing-utils/use_catch.h>
 #include <util/symbol_table.h>
 
@@ -29,21 +30,10 @@ TEST_CASE(
 
   create_java_initialize(symbol_table);
   symbol_table.get_writeable_ref(INITIALIZE_FUNCTION).value = code_blockt{};
-  try
-  {
-    const cbmc_invariants_should_throwt invariants_throw;
-    get_or_create_string_literal_symbol("bar", symbol_table, false);
-    FAIL("Expected invariant failure.");
-  }
-  catch(const invariant_failedt &exception)
-  {
-    REQUIRE_THAT(
-      exception.what(),
-      Catch::Matchers::Contains("Cannot create more string literals after "
-                                "making " INITIALIZE_FUNCTION));
-  }
-  catch(...)
-  {
-    FAIL("Incorrect exception type thrown.");
-  }
+  const cbmc_invariants_should_throwt invariants_throw;
+  REQUIRE_THROWS_MATCHES(
+    get_or_create_string_literal_symbol("bar", symbol_table, false),
+    invariant_failedt,
+    invariant_failure_containing("Cannot create more string literals after "
+                                 "making " INITIALIZE_FUNCTION));
 }

unit/goto-programs/remove_returns.cpp

@@ -6,6 +6,7 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
+#include <testing-utils/invariant.h>
 #include <testing-utils/use_catch.h>
 
 #include <goto-programs/goto_functions.h>
@@ -52,21 +53,10 @@ TEST_CASE(
       symbol_exprt{"local_variable", signedbv_typet{32}},
       symbol_exprt{"bar_function", code_typet{{}, signedbv_typet{32}}},
       {}});
-  try
-  {
-    const cbmc_invariants_should_throwt invariants_throw;
-    remove_returns(symbol_table, goto_functions);
-    FAIL("Expected invariant failure.");
-  }
-  catch(const invariant_failedt &exception)
-  {
-    REQUIRE_THAT(
-      exception.what(),
-      Catch::Matchers::Contains("called function `bar_function' should have an "
-                                "entry in the function map"));
-  }
-  catch(...)
-  {
-    FAIL("Incorrect exception type thrown.");
-  }
+  const cbmc_invariants_should_throwt invariants_throw;
+  REQUIRE_THROWS_MATCHES(
+    remove_returns(symbol_table, goto_functions),
+    invariant_failedt,
+    invariant_failure_containing("called function `bar_function' should have "
+                                 "an entry in the function map"));
 }

unit/util/symbol_table.cpp

@@ -2,6 +2,7 @@
 
 /// \file Tests for symbol_tablet
 
+#include <testing-utils/invariant.h>
 #include <testing-utils/use_catch.h>
 #include <util/exception_utils.h>
 #include <util/journalling_symbol_table.h>
@@ -359,19 +360,8 @@ TEST_CASE("symbol_tablet::lookup_ref invariant", "[core][utils][symbol_tablet]")
   symbol_table.insert(foo_symbol);
   const cbmc_invariants_should_throwt invariants_throw;
   REQUIRE_NOTHROW(symbol_table.lookup_ref("foo"));
-  try
-  {
-    symbol_table.lookup_ref("bar");
-    FAIL("Expected invariant failure.");
-  }
-  catch(const invariant_failedt &exception)
-  {
-    REQUIRE_THAT(
-      exception.what(),
-      Catch::Matchers::Contains("`bar' must exist in the symbol table."));
-  }
-  catch(...)
-  {
-    FAIL("Incorrect exception type thrown.");
-  }
+  REQUIRE_THROWS_MATCHES(
+    symbol_table.lookup_ref("bar"),
+    invariant_failedt,
+    invariant_failure_containing("`bar' must exist in the symbol table."));
 }