update tests for the refactoring

gen/tests/test_basic.py

@@ -2,9 +2,8 @@
 # -*- coding: utf-8 -*-
 import pytest
 
-from gen_cid import generate_cid
 from gen_cid import utils
-
+import gen_cid
 
 types_with_alias = []
 types_no_alias = []
@@ -154,11 +153,11 @@ types_no_alias.append({"var": ["_NEHS"],
                        ]})
 
 
-
 def resolve_vars_and_funcs_to_cid(vars, funcs):
-    header_filename = "data/input/test_data/test_lib.h"
+    header_filename = "src/test_data/test_lib.h"
     libclang_path = "/opt/local/libexec/llvm-9.0/lib/libclang.dylib"
-    header = generate_cid.parse(libclang_path, header_filename, funcs, vars)
+    cidtools = gen_cid.CIDTools(libclang_path, header_filename)
+    header = cidtools.extract(vars,funcs)
 
     # Debug output
     utils.write_json(header["ast"], header["out_dir"] + "/" + header["filename"] + ".ast.json")

gen/tests/test_synth_shed.py

@@ -2,19 +2,15 @@
 # -*- coding: utf-8 -*-
 import pytest
 
-from gen_cid import generate_cid
+import gen_cid
 from gen_cid import utils
 
 
 def resolve_vars_and_funcs_to_cid(vars, funcs):
-    header_filename = "data/input/synth_shed/synth_shed.h"
+    header_filename = "src/synth_shed/synth_shed.h"
     libclang_path = "/opt/local/libexec/llvm-9.0/lib/libclang.dylib"
-    header = generate_cid.parse(libclang_path, header_filename, funcs, vars)
-
-    # Debug output
-    utils.write_json(header["ast"], header["out_dir"] + "/" + header["filename"] + ".ast.json")
-    utils.write_json(header["cid"], header["out_dir"] + "/" + header["filename"] + ".cid.json")
-    utils.write_json(header, header["out_dir"] + "/" + header["filename"] + ".header.json")
+    cidtools = gen_cid.CIDTools(libclang_path,header_filename)
+    header = cidtools.extract(funcs, vars, debug_ast=True,debug_cid=True)
 
     return header["cid"]