Renamed find declaration method

To be more consistent, renamed to require rather than find since it
throws if the declaration is not found

Author: thk123

unit/testing-utils/require_goto_statements.cpp

@@ -7,6 +7,7 @@
 \*******************************************************************/
 
 #include "require_goto_statements.h"
+#include "catch.hpp"
 
 #include <algorithm>
 #include <util/expr_iterator.h>
@@ -120,7 +121,7 @@ require_goto_statements::find_pointer_assignments(
 /// \param variable_name: The name of the variable.
 /// \param entry_point_instructions: The statements to look through
 /// \return The declaration statement corresponding to that variable
-const code_declt &require_goto_statements::find_declaration_by_name(
+const code_declt &require_goto_statements::require_declaration_of_name(
   const irep_idt &variable_name,
   const std::vector<codet> &entry_point_instructions)
 {

unit/testing-utils/require_goto_statements.h

@@ -19,6 +19,14 @@
 #ifndef CPROVER_TESTING_UTILS_CHECK_GOTO_FUNCTIONS_H
 #define CPROVER_TESTING_UTILS_CHECK_GOTO_FUNCTIONS_H
 
+namespace require_goto_statements
+{
+struct pointer_assignment_locationt
+{
+  optionalt<code_assignt> null_assignment;
+  std::vector<code_assignt> non_null_assignments;
+};
+
 class no_decl_found_exception : public std::exception
 {
 public:
@@ -38,26 +46,18 @@ class no_decl_found_exception : public std::exception
   std::string _varname;
 };
 
-namespace require_goto_statements
-{
 std::vector<code_assignt> find_struct_component_assignments(
   const std::vector<codet> &statements,
   const irep_idt &structure_name,
   const irep_idt &component_name);
 
-struct pointer_assignment_locationt
-{
-  optionalt<code_assignt> null_assignment;
-  std::vector<code_assignt> non_null_assignments;
-};
-
 std::vector<codet> get_all_statements(const exprt &function_value);
 
 pointer_assignment_locationt find_pointer_assignments(
   const irep_idt &pointer_name,
   const std::vector<codet> &instructions);
 
-const code_declt &find_declaration_by_name(
+const code_declt &require_declaration_of_name(
   const irep_idt &variable_name,
   const std::vector<codet> &entry_point_instructions);
 }