[Tests] Replaces deprecated function call related to Visitor_behavior

tests/misc/bug_0209.ml

@@ -3,7 +3,8 @@ let main () =
      Logic_env.Builtins.apply *)
   ignore
     (File.create_project_from_visitor "foo"
-       (fun p -> new Visitor.generic_frama_c_visitor (Cil.copy_visit p)));
+       (fun p ->
+          new Visitor.generic_frama_c_visitor (Visitor_behavior.copy_visit p)));
   let p = Project.create "bar" in
   (* Computing the AST first calls File.cil_init, than calls
      Logic_env.Builtins.apply. This second call raises an exception because

tests/spec/Extend.ml

@@ -50,7 +50,7 @@ let visit_bar vis ext =
   | Ext_id idx ->
     let l = Bar_table.find idx in
     let l' = Cil.mapNoCopy (Cil.visitCilPredicate vis) l in
-    if Cil.is_copy_behavior vis#behavior then begin
+    if Visitor_behavior.is_copy vis#behavior then begin
       let idx' = Count.next () in
       Queue.add (fun () -> Bar_table.add idx' l') vis#get_filling_actions;
       Cil.ChangeTo(Ext_id idx')

tests/spec/property_test.ml

@@ -20,7 +20,7 @@ class visit prj =
             From [ Logic_const.new_identified_term (Logic_const.tvar x);
                    Logic_const.new_identified_term (Logic_const.tvar c)]
           ];
-        let nkf = Cil.get_kernel_function self#behavior kf in
+        let nkf = Visitor_behavior.get_kernel_function self#behavior kf in
         let keep_empty = true in
         let post b =
           Queue.add

tests/syntax/Refresh_visitor.ml

 open Cil_types
-open Cil
+open Visitor_behavior
 
 let category = Kernel.register_category "refresh-test"
 

tests/syntax/copy_visitor_bts_1073.ml

@@ -11,11 +11,11 @@ object(self)
         let f1 = Visitor.visitFramacFunction (self:>Visitor.frama_c_visitor) f
         in
         let v2 = Cil.copyVarinfo f.svar (f.svar.vname ^ "1") in
-        let orig = Cil.get_original_varinfo self#behavior f.svar in
-        Cil.set_varinfo self#behavior orig v2;
-        Cil.set_orig_varinfo self#behavior v2 orig;
-        Cil.reset_behavior_fundec self#behavior;
-        Cil.reset_behavior_stmt self#behavior;
+        let orig = Visitor_behavior.get_original_varinfo self#behavior f.svar in
+        Visitor_behavior.set_varinfo self#behavior orig v2;
+        Visitor_behavior.set_orig_varinfo self#behavior v2 orig;
+        Visitor_behavior.reset_fundec self#behavior;
+        Visitor_behavior.reset_stmt self#behavior;
         let f2 = Visitor.visitFramacFunction (self:>Visitor.frama_c_visitor) f
         in
         f2.svar <- v2;

tests/syntax/transient_block.ml

@@ -9,7 +9,8 @@ class vis prj = object(self)
     let s1 = Cil.mkStmtOneInstr ~valid_sid:true instr in
     let b = Cil.mkBlock [s1] in
     if create then begin
-      let f = Cil.get_fundec self#behavior (Extlib.the self#current_func) in
+      let f = Visitor_behavior.get_fundec
+          self#behavior (Extlib.the self#current_func) in
       let y = Cil.makeLocalVar f ~scope:b "y" (TInt(IInt,[])) in
       my_var <- Some y;
       let loc = Cil_datatype.Location.unknown in
@@ -31,7 +32,8 @@ class vis prj = object(self)
        with Log.AbortFatal _ ->
          Kernel.feedback "transient_block fatal error on %a as expected"
            Printer.pp_instr instr;
-         let f = Cil.get_fundec self#behavior (Extlib.the self#current_func) in
+         let f = Visitor_behavior.get_fundec
+             self#behavior (Extlib.the self#current_func) in
          let y = Extlib.the my_var in
          f.slocals <-
            List.filter