testgenie-py 0.1.6__py3-none-any.whl → 0.1.7__py3-none-any.whl

testgen/util/z3_utils/z3_test_case.py

@@ -9,7 +9,7 @@ from testgen.util.z3_utils import ast_to_z3
 from testgen.util.z3_utils.constraint_extractor import extract_branch_conditions
 
 
-def solve_branch_condition(file_name: str, func_node: ast.FunctionDef, uncovered_lines: List[int]) -> List[TestCase]:
+def solve_branch_condition(file_name: str, class_name: str | None, func_node: ast.FunctionDef, uncovered_lines: List[int]) -> List[TestCase]:
     branch_conditions, param_types = extract_branch_conditions(func_node)
     uncovered_conditions = [bc for bc in branch_conditions if bc.line_number in uncovered_lines]
     test_cases = []
@@ -25,6 +25,10 @@ def solve_branch_condition(file_name: str, func_node: ast.FunctionDef, uncovered
             # Create default values for all parameters
             param_values = {}
             for param_name in param_types:
+                # Skip 'self' parameter for class methods
+                if param_name == 'self':
+                    continue
+                    
                 # Set default values based on type
                 if param_types[param_name] == "int":
                     param_values[param_name] = 0
@@ -39,32 +43,38 @@ def solve_branch_condition(file_name: str, func_node: ast.FunctionDef, uncovered
 
             # Update with model values where available
             for var_name, z3_var in z3_vars.items():
-                if var_name in param_types and z3_var in model:
+                if var_name in param_types:
                     try:
+
+                        model_value = model.evaluate(z3_var)
+
                         if param_types[var_name] == "int":
-                            param_values[var_name] = model[z3_var].as_long()
+                            param_values[var_name] = model_value.as_long()
                         elif param_types[var_name] == "float":
-                            param_values[var_name] = float(model[z3_var].as_decimal())
+                            param_values[var_name] = float(model_value.as_decimal(10))
                         elif param_types[var_name] == "bool":
-                            param_values[var_name] = z3.is_true(model[z3_var])
+                            param_values[var_name] = z3.is_true(model_value)
                         elif param_types[var_name] == "str":
-                            param_values[var_name] = str(model[z3_var])
+                            str_val = str(model_value)
+                            if str_val.startswith('"') and str_val.endswith('"'):
+                                str_val = str_val[1:-1]
+                            param_values[var_name] = str_val
                         else:
                             param_values[var_name] = model[z3_var].as_long()
                     except Exception as e:
-                        print(f"Error converting Z3 model value for {var_name}: {e}")
+                        print(f"Couldn't get {var_name} from model: {e}")
+                        # Keep the default value we already set
 
             # Ensure all parameters are included in correct order
             ordered_params = []
             for arg in func_node.args.args:
                 arg_name = arg.arg
-                if arg_name == 'self':  # Skip self parameter for class methods
+                if arg_name == 'self':  # Skip self parameter
                     continue
                 if arg_name in param_values:
                     ordered_params.append(param_values[arg_name])
                 else:
-                    print(f"Warning: Missing value for parameter {arg_name}")
-                    # Provide default values based on annotation if available
+                    # Default value handling if parameter not in solution
                     if hasattr(arg, 'annotation') and arg.annotation:
                         if isinstance(arg.annotation, ast.Name):
                             if arg.annotation.id == 'int':
@@ -85,7 +95,12 @@ def solve_branch_condition(file_name: str, func_node: ast.FunctionDef, uncovered
             func_name = func_node.name
             try:
                 module = testgen.util.file_utils.load_module(file_name)
-                func = getattr(module, func_name)
+                if class_name is not None:
+                    class_obj = getattr(module, class_name)
+                    instance = class_obj()
+                    func = getattr(instance, func_name)
+                else:
+                    func = getattr(module, func_name)
                 result = func(*ordered_params)
                 test_cases.append(TestCase(func_name, tuple(ordered_params), result))
             except Exception as e:

{testgenie_py-0.1.6.dist-info → testgenie_py-0.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: testgenie-py
-Version: 0.1.6
+Version: 0.1.7
 Summary: 
 Author: cjseitz
 Author-email: charlesjseitz@gmail.com

{testgenie_py-0.1.6.dist-info → testgenie_py-0.1.7.dist-info}/RECORD

@@ -1,3 +1,4 @@
+testgen/.coverage,sha256=LBC31i6ROQvL24jd3a-mAlGfailO1bmEWlrTCTbxC8s,53248
 testgen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 testgen/analyzer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 testgen/analyzer/ast_analyzer.py,sha256=JmqiosxgZJm2fhNDr5VUBpKKHmf8S2HP9Jm0Xl7NnnI,6783
@@ -6,16 +7,25 @@ testgen/analyzer/contracts/contract.py,sha256=6rNYJOy_2GrOhGtaXTDIOX6pTEOqo856Fx
 testgen/analyzer/contracts/no_exception_contract.py,sha256=rTWTuu5XKmvzBPD6yNAqiNehk9lbWn_Z8zFj-_djZ_w,512
 testgen/analyzer/contracts/nonnull_contract.py,sha256=uurnrVptImYTVpSnu8ckdlU6c94AbiOWFoH1YnAQU0w,508
 testgen/analyzer/fuzz_analyzer.py,sha256=ktkDdh3mgHjcC4ZitGo9fa9RjnGqkdehaYJeSKssWss,4299
-testgen/analyzer/random_feedback_analyzer.py,sha256=S_8iRNmgNa2wIlhLZV798H5QWY9zwKpSs2MFE61uV60,13114
+testgen/analyzer/random_feedback_analyzer.py,sha256=tQkYwrYCH1xeSU5j1aoh0vUMyZwFC-1dFWf5eIlhcH8,13219
 testgen/analyzer/reinforcement_analyzer.py,sha256=U6W7g-xDFS_P0aqxjPRnaXjGp2gOC9TMdfWaetFV7eE,3568
 testgen/analyzer/test_case_analyzer.py,sha256=foHRbz9K6WAn711sXbp-smJHDjI8GTG8F2TpovLZVEo,1530
 testgen/analyzer/test_case_analyzer_context.py,sha256=7umDPHBjoTaCRvZOdNynpnWsr14Gy0E2hpMBPK8mz3Q,2128
+testgen/code_to_test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+testgen/code_to_test/boolean.py,sha256=RM2byJDKFTx1FFrxnPG_uZWb24OcOH20Uh-D1Z-yPcE,3373
+testgen/code_to_test/calculator.py,sha256=j7lw21BYg_vxaQVCrjOlhQOpObjSe5gu9xzthmdGphk,830
+testgen/code_to_test/code_to_fuzz.py,sha256=cwgRpUdXjTlrUHSHMtA2TAj8Y-ddAn6CaUdXPM4MRmo,4826
+testgen/code_to_test/code_to_fuzz_lite.py,sha256=EjS4GB5klnJrvZIDDpS9iIt0iZETVJI0ez9DmihMiYc,10429
+testgen/code_to_test/decisions.py,sha256=ZiW-EF1yTOWeQVZ7Xh0oIPHK2NSNPUzVxCY0E2GbYvQ,1376
+testgen/code_to_test/math_utils.py,sha256=FqPQz5-e1oklzGyTVYNO8JMKDg5ob8z05VOlpKfKvvw,853
+testgen/code_to_test/no_types.py,sha256=kD8CGjVAxVeCjQC45abO773sRNIjiZ4jvhwPRV8-kt0,675
+testgen/code_to_test/sample_code_bin.py,sha256=kMvV_-oFeAkxUmDx41Pw0iTTmMG1pvX31TezXPWMOkE,4225
 testgen/controller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-testgen/controller/cli_controller.py,sha256=dKtqQMGw1IYRQox5gmQr53KAxEtrhesUdvI0KJkMjBo,8242
-testgen/controller/docker_controller.py,sha256=fBRJFdY5NU6ipRY7Gihs-IA-EcpSa79Xu6GVh6_eaxk,6601
-testgen/docker/Dockerfile,sha256=_xr3CWP9hhBIZbf4qRzWewBUAIkXoZGAh36g3yXpAbc,513
-testgen/docker/poetry.lock,sha256=Xg2WyFgruylJ51Pvfi03Hc-VDeKj3f5DhM56XIXRBpI,30057
-testgen/docker/pyproject.toml,sha256=QToniOghAyI6Hp5V-OWknO3Mo7cpa_HCV5lqynYYuPA,438
+testgen/controller/cli_controller.py,sha256=jSwT6Cy3JQhxFPRXaODdZ1md5uXO83Q0IrYh86sIdiE,8832
+testgen/controller/docker_controller.py,sha256=Jz1Nc7LW-njvCLDk3svPCVz5UDeQ7gAEFLHXrU1Yrws,7237
+testgen/docker/Dockerfile,sha256=OLaWW4i6uUvVQinzYOmazGDAILyM8czcfl-ENkHLKQw,534
+testgen/docker/poetry.lock,sha256=3ZPF2N4KtpMRc9qfamUXumMw7qGmQHaZDaxJ9_bMo7U,51684
+testgen/docker/pyproject.toml,sha256=JWhMupWM7aQFO7-teR9sfFahKB3aM4NPO8on5P3TRxw,563
 testgen/generator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 testgen/generator/code_generator.py,sha256=V5Donxz3r3ZW56xyyldJwOuDBaX6e8NOyPc8UzllQs8,2467
 testgen/generator/doctest_generator.py,sha256=Dkaf2l72ENk1mqNP3WkOnIY-iqrTHh-443AWtxzRWGY,8806
@@ -33,36 +43,38 @@ testgen/models/generator_context.py,sha256=V-T9i-3Ar-gdBzQqidyqBb05PTmOu2LtdQdAI
 testgen/models/test_case.py,sha256=jwodn-6fKHCh4SO2qycbrFyggCb9UlwTZ8k3RdTObDQ,216
 testgen/presentation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 testgen/presentation/cli_view.py,sha256=2fZrsvZ-Wi4j37UvogsK9_yQV5o3A20jowIr6iFRu-s,296
-testgen/q_table/global_q_table.json,sha256=T1EOATQ6L9FJL8bI3HxavYBdH8l95qGC5AdiUFz2ohM,6528
+testgen/q_table/global_q_table.json,sha256=xSMRf5ddtLJAogE_RXleAbkmujgAYU3uiblBJmKqc5w,12059
 testgen/reinforcement/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 testgen/reinforcement/abstract_state.py,sha256=M9Kp8fyJzsTzpyL3ca4HjjYpGXy9DRMw-IG7OgFVisY,154
 testgen/reinforcement/agent.py,sha256=wvgbi-OVoVJMwhasGgsP2y1TKLiC5qjjTwZBNqKNRns,6098
-testgen/reinforcement/environment.py,sha256=z9ENIkbiB0N9Dbhm8yruQeSV1h4sK0QDkDRF_IO1VtI,8601
-testgen/reinforcement/statement_coverage_state.py,sha256=hyoxkpOi_vdtjuAZ3PDz_fECurqWeNjeIhtng5TARCk,1523
+testgen/reinforcement/environment.py,sha256=bNsk9ejPo2ICY-FM6lwGD2W6YEuoE_N70DKazvjfrqU,10825
+testgen/reinforcement/statement_coverage_state.py,sha256=mTZ0uiFnyiIoHcQXlJv9FDSH4y1r3rxltYEdZcMaSSg,1552
 testgen/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-testgen/service/analysis_service.py,sha256=SvQEhwbE_lWTRrWdT70C4kbh-H2xxf0mP8zlqSX_xqI,10670
-testgen/service/cfg_service.py,sha256=7QWNM7WgX6iEwAV1qJuacKEAYihHyDqsOEMlu5Z3aA0,2207
-testgen/service/generator_service.py,sha256=iKDPyCDlektRDLD6pLrR0CWiAF81xezkFHGyT31mre8,6920
-testgen/service/service.py,sha256=WcCf8SOYAoElwFoYFpsWfZk8V675AY0pot5-QQp7AP4,15407
+testgen/service/analysis_service.py,sha256=LPvsb6XwFQIOn05niamDiJx_HqCyTX2UznREvKjfvWo,10973
+testgen/service/cfg_service.py,sha256=ejgwbFlwla9Mfy4OJ-hsLAxo0TV3jO06hkldeEU-akQ,2236
+testgen/service/generator_service.py,sha256=MOkojB4ipp-fRF0buW-rIgFJLlBaRQKzoRxyJksylao,7382
+testgen/service/logging_service.py,sha256=vEQsluxwO-dAxWY4Xkwt8v5XeaXEv3GZh3ZYAsFCOEs,3116
+testgen/service/service.py,sha256=HDHm5NS_qC5EvFCcdOJAR6B3lQb8fPEmwRfZz1dV4j0,17001
 testgen/sqlite/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 testgen/sqlite/db.py,sha256=RUt88ndT4CQRo9aZzLGXPHRK1iw0LyDEGnoWlOLzKGM,2390
 testgen/sqlite/db_service.py,sha256=i87YkhMP0VNyug5p1tWUvnzHB8isFcSIRe9vJJTmFLA,8954
+testgen/testgen.db,sha256=iyQiDqur-JoS70QD-VYkJFkgjb_YcK2jBAP2aZvvAhY,106496
 testgen/tree/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 testgen/tree/node.py,sha256=ONJtbACShN4yNj1X-UslFRgLyBP6mrbg7qZr3c6dWyA,165
 testgen/tree/tree_utils.py,sha256=gT7jucky6_GWVOlDI6jpv6RMeWCkntGOHIYLvHxD85k,2122
 testgen/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-testgen/util/coverage_utils.py,sha256=lmta8F-ASsZpaAOs_YucSTHNHHEn4M0rUR7eeboZtZc,6044
-testgen/util/coverage_visualizer.py,sha256=rYmwV4uTo02YAVPy3KKlLyKofr3IuhytFBNanu0z6Ok,5668
-testgen/util/file_utils.py,sha256=P6zzABvuTlO2EAJdgFKwNxKNF_HHD0vcSkROeHrYTbg,3699
-testgen/util/randomizer.py,sha256=hAW9szYhPWyQEkn7NTFuJRRIoYcVmvnzMf3dDwWdMKM,4479
+testgen/util/coverage_utils.py,sha256=Le5kC02gZewJEzzIE_Jfw17qOoPIZa9p3UTDWfwxUi0,7578
+testgen/util/coverage_visualizer.py,sha256=Jp9d7SJaGKD38g4GWSOI4TusXtMYgMgQNPGrUnuVynk,5704
+testgen/util/file_utils.py,sha256=wBiFKg2TjmKAx4QTMH93LOkR-pWU86frrir6eG1fpQE,5902
+testgen/util/randomizer.py,sha256=J_M24XYxkPjD6wVCr8PmP_Iasc4CgwRJngxZOO6zofc,5039
 testgen/util/utils.py,sha256=_TPXveAcI_TR9XLU8qaDx63CrZJDvpzSWl_gfYchJz0,5665
 testgen/util/z3_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 testgen/util/z3_utils/ast_to_z3.py,sha256=V87cvlH2OlO7_owuVTqygymMmK_FyesBovi6qe-BUcg,3180
 testgen/util/z3_utils/branch_condition.py,sha256=N9FNR-iJmxIC62NpDQNVZ1OP14rXXqYzdA_NODPDUm4,2453
 testgen/util/z3_utils/constraint_extractor.py,sha256=RXJLpmk6dAvHZ27839VXKXNtdy9St1F-17-pSEFu4bM,1285
 testgen/util/z3_utils/variable_finder.py,sha256=dUh3F9_L_BDMz1ybiGss09LLcM_egbitgj0FT5Nh9u4,245
-testgen/util/z3_utils/z3_test_case.py,sha256=cAafR5x7YMsWnqVFYU21h2jHO-SiaTDPdKe44cGQ5_M,4409
-testgenie_py-0.1.6.dist-info/METADATA,sha256=vpoH_Ly1RVOj-HmOKUJOSh0O5rua6fuo6yb7KmfsaC8,843
-testgenie_py-0.1.6.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-testgenie_py-0.1.6.dist-info/entry_points.txt,sha256=OUN4GqB4zHlHWwWGjwIPbur4E_ZqQgkeeqaCLhzRZgg,47
-testgenie_py-0.1.6.dist-info/RECORD,,
+testgen/util/z3_utils/z3_test_case.py,sha256=yF4oJOrXMLzOwDUqXdoeg83MOTl3pvc_lYaZcS01CuQ,4983
+testgenie_py-0.1.7.dist-info/METADATA,sha256=NEqEmswegGYpbG08DuV50BxSw3yvYbXDQJdgujnH5I8,843
+testgenie_py-0.1.7.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+testgenie_py-0.1.7.dist-info/entry_points.txt,sha256=OUN4GqB4zHlHWwWGjwIPbur4E_ZqQgkeeqaCLhzRZgg,47
+testgenie_py-0.1.7.dist-info/RECORD,,