diffblue · thk123 · Jan 22, 2019 · Nov 9, 2018 · Jan 3, 2019 · Jan 3, 2019
diff --git a/jbmc/unit/java-testing-utils/load_java_class.cpp b/jbmc/unit/java-testing-utils/load_java_class.cpp
@@ -9,9 +9,9 @@ Author: Diffblue Ltd.
 #include "load_java_class.h"
 
 #include <iostream>
-#include <testing-utils/catch.hpp>
 #include <testing-utils/free_form_cmdline.h>
 #include <testing-utils/message.h>
+#include <testing-utils/use_catch.h>
 
 #include <util/config.h>
 #include <util/options.h>

diff --git a/jbmc/unit/java-testing-utils/require_goto_statements.cpp b/jbmc/unit/java-testing-utils/require_goto_statements.cpp
@@ -8,7 +8,7 @@ Author: Diffblue Ltd.
 
 #include "require_goto_statements.h"
 
-#include <testing-utils/catch.hpp>
+#include <testing-utils/use_catch.h>
 
 #include <algorithm>
 #include <util/expr_iterator.h>

diff --git a/jbmc/unit/java-testing-utils/require_parse_tree.h b/jbmc/unit/java-testing-utils/require_parse_tree.h
@@ -14,7 +14,7 @@ Author: Diffblue Ltd.
 
 #include <java_bytecode/java_bytecode_parse_tree.h>
 
-#include <testing-utils/catch.hpp>
+#include <testing-utils/use_catch.h>
 
 // NOLINTNEXTLINE(readability/namespace)
 namespace require_parse_tree

diff --git a/jbmc/unit/java-testing-utils/require_type.cpp b/jbmc/unit/java-testing-utils/require_type.cpp
@@ -8,7 +8,7 @@ Author: Diffblue Ltd.
 
 #include "require_type.h"
 
-#include <testing-utils/catch.hpp>
+#include <testing-utils/use_catch.h>
 #include <util/base_type.h>
 #include <util/namespace.h>
 #include <util/symbol_table.h>

diff --git a/jbmc/unit/java_bytecode/ci_lazy_methods/lazy_load_lambdas.cpp b/jbmc/unit/java_bytecode/ci_lazy_methods/lazy_load_lambdas.cpp
@@ -6,9 +6,9 @@ Author: Diffblue Limited.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
 #include <testing-utils/require_symbol.h>
+#include <testing-utils/use_catch.h>
 
 SCENARIO(
   "Lazy load lambda methods",

diff --git a/jbmc/unit/java_bytecode/expr2java.cpp b/jbmc/unit/java_bytecode/expr2java.cpp
@@ -6,8 +6,8 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java_bytecode/expr2java.h>
+#include <testing-utils/use_catch.h>
 
 TEST_CASE(
   "expr2java tests",

diff --git a/jbmc/unit/java_bytecode/goto-programs/class_hierarchy_graph.cpp b/jbmc/unit/java_bytecode/goto-programs/class_hierarchy_graph.cpp
@@ -6,8 +6,8 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
+#include <testing-utils/use_catch.h>
 
 #include <goto-programs/class_hierarchy.h>
 

diff --git a/jbmc/unit/java_bytecode/goto-programs/class_hierarchy_output.cpp b/jbmc/unit/java_bytecode/goto-programs/class_hierarchy_output.cpp
@@ -6,8 +6,8 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
+#include <testing-utils/use_catch.h>
 
 #include <goto-programs/class_hierarchy.h>
 

diff --git a/jbmc/unit/java_bytecode/goto-programs/remove_virtual_functions_without_fallback.cpp b/jbmc/unit/java_bytecode/goto-programs/remove_virtual_functions_without_fallback.cpp
@@ -7,8 +7,8 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
+#include <testing-utils/use_catch.h>
 
 #include <util/simplify_expr.h>
 #include <goto-programs/remove_virtual_functions.h>

diff --git a/jbmc/unit/java_bytecode/goto_program_generics/generic_bases_test.cpp b/jbmc/unit/java_bytecode/goto_program_generics/generic_bases_test.cpp
@@ -5,12 +5,12 @@ Module: Unit tests for instantiating generic superclasses and interfaces.
 Author: Diffblue Ltd.
 
 \*******************************************************************/
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
 #include <java-testing-utils/require_goto_statements.h>
-#include <util/config.h>
 #include <java-testing-utils/require_type.h>
 #include <testing-utils/require_symbol.h>
+#include <testing-utils/use_catch.h>
+#include <util/config.h>
 
 // NOTE: To inspect these tests at any point, use expr2java.
 // A good way to verify the validity of a test is to iterate

diff --git a/jbmc/unit/java_bytecode/goto_program_generics/generic_parameters_test.cpp b/jbmc/unit/java_bytecode/goto_program_generics/generic_parameters_test.cpp
@@ -5,12 +5,12 @@ Module: Unit tests for instantiating generic classes.
 Author: Diffblue Ltd.
 
 \*******************************************************************/
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
 #include <java-testing-utils/require_goto_statements.h>
-#include <util/config.h>
 #include <java-testing-utils/require_type.h>
 #include <testing-utils/require_symbol.h>
+#include <testing-utils/use_catch.h>
+#include <util/config.h>
 
 // NOTE: To inspect these tests at any point, use expr2java.
 // A good way to verify the validity of a test is to iterate

diff --git a/jbmc/unit/java_bytecode/goto_program_generics/mutually_recursive_generics.cpp b/jbmc/unit/java_bytecode/goto_program_generics/mutually_recursive_generics.cpp
@@ -9,7 +9,7 @@ Author: Diffblue Ltd.
 #include <java-testing-utils/load_java_class.h>
 #include <java-testing-utils/require_goto_statements.h>
 #include <java-testing-utils/require_type.h>
-#include <testing-utils/catch.hpp>
+#include <testing-utils/use_catch.h>
 
 SCENARIO(
   "Generics class with mutually recursive_generic parameters",

diff --git a/jbmc/unit/java_bytecode/inherited_static_fields/inherited_static_fields.cpp b/jbmc/unit/java_bytecode/inherited_static_fields/inherited_static_fields.cpp
@@ -6,8 +6,8 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
+#include <testing-utils/use_catch.h>
 
 #include <algorithm>
 

diff --git a/jbmc/unit/java_bytecode/java_bytecode_convert_class/convert_abstract_class.cpp b/jbmc/unit/java_bytecode/java_bytecode_convert_class/convert_abstract_class.cpp
@@ -6,7 +6,7 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
+#include <testing-utils/use_catch.h>
 
 #include <istream>
 #include <memory>

diff --git a/jbmc/unit/java_bytecode/java_bytecode_convert_class/convert_java_annotations.cpp b/jbmc/unit/java_bytecode/java_bytecode_convert_class/convert_java_annotations.cpp
@@ -10,7 +10,7 @@ Author: Diffblue Ltd.
 #include <java_bytecode/java_bytecode_convert_class.h>
 #include <java_bytecode/java_bytecode_parse_tree.h>
 #include <java_bytecode/java_types.h>
-#include <testing-utils/catch.hpp>
+#include <testing-utils/use_catch.h>
 
 SCENARIO(
   "java_bytecode_convert_annotations",

diff --git a/jbmc/unit/java_bytecode/java_bytecode_convert_method/convert_initalizers.cpp b/jbmc/unit/java_bytecode/java_bytecode_convert_method/convert_initalizers.cpp
@@ -6,7 +6,7 @@ Author: Diffblue Limited.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
+#include <testing-utils/use_catch.h>
 
 #include <memory>
 

diff --git a/jbmc/unit/java_bytecode/java_bytecode_convert_method/convert_invoke_dynamic.cpp b/jbmc/unit/java_bytecode/java_bytecode_convert_method/convert_invoke_dynamic.cpp
@@ -6,15 +6,15 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
+#include <goto-programs/class_hierarchy.h>
 #include <java-testing-utils/load_java_class.h>
 #include <java-testing-utils/require_goto_statements.h>
-#include <testing-utils/require_expr.h>
 #include <java-testing-utils/require_type.h>
-#include <testing-utils/run_test_with_compilers.h>
+#include <testing-utils/require_expr.h>
 #include <testing-utils/require_symbol.h>
+#include <testing-utils/run_test_with_compilers.h>
+#include <testing-utils/use_catch.h>
 #include <util/expr_iterator.h>
-#include <goto-programs/class_hierarchy.h>
 
 struct lambda_assignment_test_datat
 {

diff --git a/jbmc/unit/java_bytecode/java_bytecode_convert_method/convert_method.cpp b/jbmc/unit/java_bytecode/java_bytecode_convert_method/convert_method.cpp
@@ -6,7 +6,7 @@ Author: Diffblue Limited.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
+#include <testing-utils/use_catch.h>
 
 #include <util/symbol_table.h>
 

diff --git a/jbmc/unit/java_bytecode/java_bytecode_instrument/virtual_call_null_checks.cpp b/jbmc/unit/java_bytecode/java_bytecode_instrument/virtual_call_null_checks.cpp
@@ -7,9 +7,9 @@ Author: Diffblue Limited.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
-#include <testing-utils/message.h>
 #include <java-testing-utils/load_java_class.h>
+#include <testing-utils/message.h>
+#include <testing-utils/use_catch.h>
 
 #include <analyses/local_safe_pointers.h>
 #include <goto-programs/goto_convert_functions.h>

diff --git a/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_bounded_generic_inner_classes.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_bounded_generic_inner_classes.cpp
@@ -6,9 +6,9 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
 #include <java-testing-utils/require_type.h>
+#include <testing-utils/use_catch.h>
 
 SCENARIO(
   "parse_bounded_generic_inner_classes",

diff --git a/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_derived_generic_class.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_derived_generic_class.cpp
@@ -6,9 +6,9 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
 #include <java-testing-utils/require_type.h>
+#include <testing-utils/use_catch.h>
 
 SCENARIO(
   "parse_derived_generic_class",

diff --git a/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_functions_with_generics.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_functions_with_generics.cpp
@@ -6,9 +6,9 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
 #include <java-testing-utils/require_type.h>
+#include <testing-utils/use_catch.h>
 
 SCENARIO(
   "parse_functions_with_generics",

diff --git a/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_array_class.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_array_class.cpp
@@ -6,9 +6,9 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
 #include <java-testing-utils/require_type.h>
+#include <testing-utils/use_catch.h>
 
 SCENARIO(
   "parse_generic_array_class",

diff --git a/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class.cpp
@@ -6,9 +6,9 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
 #include <java-testing-utils/require_type.h>
+#include <testing-utils/use_catch.h>
 
 SCENARIO(
   "parse_generic_class_one_param",

diff --git a/..._bytecode/java_bytecode_parse_generics/parse_generic_class_with_generic_inner_classes.cpp b/..._bytecode/java_bytecode_parse_generics/parse_generic_class_with_generic_inner_classes.cpp
@@ -6,9 +6,9 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
 #include <java-testing-utils/require_type.h>
+#include <testing-utils/use_catch.h>
 
 SCENARIO(
   "parse_generic_class_with_generic_inner_classes_fields",

diff --git a/...nit/java_bytecode/java_bytecode_parse_generics/parse_generic_class_with_inner_classes.cpp b/...nit/java_bytecode/java_bytecode_parse_generics/parse_generic_class_with_inner_classes.cpp
@@ -6,9 +6,9 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
 #include <java-testing-utils/require_type.h>
+#include <testing-utils/use_catch.h>
 
 SCENARIO(
   "parse_generic_class_with_inner_classes",

diff --git a/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_fields.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_fields.cpp
@@ -6,9 +6,9 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
 #include <java-testing-utils/require_type.h>
+#include <testing-utils/use_catch.h>
 
 SCENARIO(
   "parse_generic_fields",

diff --git a/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_functions.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_functions.cpp
@@ -6,9 +6,9 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
 #include <java-testing-utils/require_type.h>
+#include <testing-utils/use_catch.h>
 
 SCENARIO(
   "parse_generic_functions",

diff --git a/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_superclasses.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_superclasses.cpp
@@ -8,9 +8,9 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
 #include <java-testing-utils/require_type.h>
+#include <testing-utils/use_catch.h>
 
 SCENARIO(
   "parse generic superclass signature",

diff --git a/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_wildcard_function.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_wildcard_function.cpp
@@ -6,8 +6,8 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
+#include <testing-utils/use_catch.h>
 
 SCENARIO(
   "parse_generic_wildcard",

diff --git a/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_lvtt_generic_local_vars.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_lvtt_generic_local_vars.cpp
@@ -8,7 +8,7 @@ Author: Diffblue Ltd.
 
 #include <java-testing-utils/load_java_class.h>
 #include <java-testing-utils/require_type.h>
-#include <testing-utils/catch.hpp>
+#include <testing-utils/use_catch.h>
 
 SCENARIO(
   "parse_lvtt_generic_local_vars",

diff --git a/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_nested_generics.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_nested_generics.cpp
@@ -6,9 +6,9 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
 #include <java-testing-utils/require_type.h>
+#include <testing-utils/use_catch.h>
 
 SCENARIO(
   "parse_nested_generics_fields",

diff --git a/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_recursive_generic_class.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_recursive_generic_class.cpp
@@ -6,8 +6,8 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
+#include <testing-utils/use_catch.h>
 
 SCENARIO(
   "parse_recursive_generic_class",

diff --git a/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_signature_descriptor_mismatch.cpp b/jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_signature_descriptor_mismatch.cpp
@@ -6,9 +6,9 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
 #include <java-testing-utils/require_type.h>
+#include <testing-utils/use_catch.h>
 
 SCENARIO(
   "parse_signature_descriptor_mismatch",

diff --git a/...ytecode/java_bytecode_parse_lambdas/java_bytecode_convert_class_lambda_method_handles.cpp b/...ytecode/java_bytecode_parse_lambdas/java_bytecode_convert_class_lambda_method_handles.cpp
@@ -8,10 +8,10 @@ Author: Diffblue Ltd.
 
 #include <algorithm>
 
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
-#include <testing-utils/run_test_with_compilers.h>
 #include <java-testing-utils/require_type.h>
+#include <testing-utils/run_test_with_compilers.h>
+#include <testing-utils/use_catch.h>
 
 SCENARIO(
   "Static lambdas in class symbol",

diff --git a/...nit/java_bytecode/java_bytecode_parse_lambdas/java_bytecode_parse_lambda_method_table.cpp b/...nit/java_bytecode/java_bytecode_parse_lambdas/java_bytecode_parse_lambda_method_table.cpp
@@ -13,8 +13,8 @@ Author: Diffblue Ltd.
 #include <java-testing-utils/require_parse_tree.h>
 
 #include <java_bytecode/java_bytecode_parser.h>
-#include <testing-utils/catch.hpp>
 #include <testing-utils/message.h>
+#include <testing-utils/use_catch.h>
 
 #include <java_bytecode/java_bytecode_parse_tree.h>
 #include <java_bytecode/java_types.h>

diff --git a/jbmc/unit/java_bytecode/java_bytecode_parser/parse_class_without_instructions.cpp b/jbmc/unit/java_bytecode/java_bytecode_parser/parse_class_without_instructions.cpp
@@ -12,7 +12,7 @@ Author: Diffblue Ltd.
 #include <testing-utils/message.h>
 #include <util/message.h>
 
-#include <testing-utils/catch.hpp>
+#include <testing-utils/use_catch.h>
 
 static void check_class_structure(
   const java_bytecode_parse_treet::classt &loaded_class)