fixup unit tests

Author: thk123

jbmc/unit/java-testing-utils/require_goto_statements.cpp

@@ -11,15 +11,16 @@ Author: Diffblue Ltd.
 #include <testing-utils/catch.hpp>
 
 #include <algorithm>
-#include <util/expr_iterator.h>
 #include <goto-programs/goto_functions.h>
+#include <goto-programs/show_goto_functions.h>
+#include <iostream>
 #include <java_bytecode/java_types.h>
-#include <util/suffix.h>
+#include <util/expr_iterator.h>
 #include <util/expr_util.h>
-#include <iostream>
-#include <goto-programs/show_goto_functions.h>
+#include <util/suffix.h>
 
-optionalt<symbol_exprt> root_object(exprt lhs_expr, const symbol_tablet &symbol_table)
+optionalt<symbol_exprt>
+root_object(exprt lhs_expr, const symbol_tablet &symbol_table)
 {
   auto expr = skip_typecast(lhs_expr);
   int dereference_balance = 0;
@@ -139,7 +140,7 @@ require_goto_statements::find_struct_component_assignments(
             if(
               superclass_expr.get_component_name() == supercomponent_name &&
               root_object(ode.root_object(), symbol_table)->get_identifier() ==
-              structure_name)
+                structure_name)
             {
               if(
                 code_assign.rhs() ==
@@ -161,7 +162,8 @@ require_goto_statements::find_struct_component_assignments(
           // - component name: \p component_name
           // - operand (component of): symbol for \p structure_name
 
-          const auto &root_object = ::root_object(member_expr.struct_op(), symbol_table);
+          const auto &root_object =
+            ::root_object(member_expr.struct_op(), symbol_table);
           if(
             root_object && root_object->get_identifier() == structure_name &&
             member_expr.get_component_name() == component_name)
@@ -352,7 +354,9 @@ const irep_idt &require_goto_statements::require_struct_component_assignment(
       superclass_name,
       component_name,
       symbol_table);
-  INFO("looking for " << component_name << " in " << (superclass_name ? *superclass_name : structure_name));
+  INFO(
+    "looking for " << component_name << " in "
+                   << (superclass_name ? *superclass_name : structure_name));
   REQUIRE(component_assignments.non_null_assignments.size() == 1);
 
   // We are expecting that the resulting statement can be of two forms: