test: update tests for refactored language support

- Update discover_functions calls to new (source, file_path) signature
- Use language-specific FunctionOptimizer subclasses in tests
- Add explicit utf-8 encoding to read_text()/write_text() for Windows
- Fix pytest fixture in TestTsJestSkipsConversion (was __init__)
- Update nonexistent file tests for source-based discover_functions
- Remove unused imports

Author: KRRT7

tests/test_code_deduplication.py

@@ -1,4 +1,4 @@
-from codeflash.code_utils.deduplicate_code import are_codes_duplicate, normalize_code
+from codeflash.languages.python.normalizer import normalize_python_code as normalize_code
 
 
 def test_deduplicate1():
@@ -23,7 +23,7 @@ def compute_sum(numbers):
 """
 
     assert normalize_code(code1) == normalize_code(code2)
-    assert are_codes_duplicate(code1, code2)
+    assert normalize_code(code1) == normalize_code(code2)
 
     # Example 3: Same function and parameter names, different local variables (should match)
     code3 = """
@@ -43,7 +43,7 @@ def calculate_sum(numbers):
 """
 
     assert normalize_code(code3) == normalize_code(code4)
-    assert are_codes_duplicate(code3, code4)
+    assert normalize_code(code3) == normalize_code(code4)
 
     # Example 4: Nested functions and classes (preserving names)
     code5 = """

tests/test_code_replacement.py

@@ -18,7 +18,7 @@
 )
 from codeflash.discovery.functions_to_optimize import FunctionToOptimize
 from codeflash.models.models import CodeOptimizationContext, CodeStringsMarkdown, FunctionParent, FunctionSource
-from codeflash.optimization.function_optimizer import FunctionOptimizer
+from codeflash.languages.python.function_optimizer import PythonFunctionOptimizer
 from codeflash.verification.verification_utils import TestConfig
 
 os.environ["CODEFLASH_API_KEY"] = "cf-test-key"
@@ -54,7 +54,7 @@ def sorter(arr):
         test_framework="pytest",
         pytest_cmd="pytest",
     )
-    func_optimizer = FunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
+    func_optimizer = PythonFunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
     code_context: CodeOptimizationContext = func_optimizer.get_code_optimization_context().unwrap()
     original_helper_code: dict[Path, str] = {}
     helper_function_paths = {hf.file_path for hf in code_context.helper_functions}
@@ -834,7 +834,7 @@ def main_method(self):
         test_framework="pytest",
         pytest_cmd="pytest",
     )
-    func_optimizer = FunctionOptimizer(function_to_optimize=func_top_optimize, test_cfg=test_config)
+    func_optimizer = PythonFunctionOptimizer(function_to_optimize=func_top_optimize, test_cfg=test_config)
     code_context = func_optimizer.get_code_optimization_context().unwrap()
     assert code_context.testgen_context.flat.rstrip() == get_code_output.rstrip()
 
@@ -1745,7 +1745,7 @@ def new_function2(value):
         test_framework="pytest",
         pytest_cmd="pytest",
     )
-    func_optimizer = FunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
+    func_optimizer = PythonFunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
     code_context: CodeOptimizationContext = func_optimizer.get_code_optimization_context().unwrap()
     original_helper_code: dict[Path, str] = {}
     helper_function_paths = {hf.file_path for hf in code_context.helper_functions}
@@ -1824,7 +1824,7 @@ def new_function2(value):
         test_framework="pytest",
         pytest_cmd="pytest",
     )
-    func_optimizer = FunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
+    func_optimizer = PythonFunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
     code_context: CodeOptimizationContext = func_optimizer.get_code_optimization_context().unwrap()
     original_helper_code: dict[Path, str] = {}
     helper_function_paths = {hf.file_path for hf in code_context.helper_functions}
@@ -1904,7 +1904,7 @@ def new_function2(value):
         test_framework="pytest",
         pytest_cmd="pytest",
     )
-    func_optimizer = FunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
+    func_optimizer = PythonFunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
     code_context: CodeOptimizationContext = func_optimizer.get_code_optimization_context().unwrap()
     original_helper_code: dict[Path, str] = {}
     helper_function_paths = {hf.file_path for hf in code_context.helper_functions}
@@ -1983,7 +1983,7 @@ def new_function2(value):
         test_framework="pytest",
         pytest_cmd="pytest",
     )
-    func_optimizer = FunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
+    func_optimizer = PythonFunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
     code_context: CodeOptimizationContext = func_optimizer.get_code_optimization_context().unwrap()
     original_helper_code: dict[Path, str] = {}
     helper_function_paths = {hf.file_path for hf in code_context.helper_functions}
@@ -2063,7 +2063,7 @@ def new_function2(value):
         test_framework="pytest",
         pytest_cmd="pytest",
     )
-    func_optimizer = FunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
+    func_optimizer = PythonFunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
     code_context: CodeOptimizationContext = func_optimizer.get_code_optimization_context().unwrap()
     original_helper_code: dict[Path, str] = {}
     helper_function_paths = {hf.file_path for hf in code_context.helper_functions}
@@ -2153,7 +2153,7 @@ def new_function2(value):
         test_framework="pytest",
         pytest_cmd="pytest",
     )
-    func_optimizer = FunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
+    func_optimizer = PythonFunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
     code_context: CodeOptimizationContext = func_optimizer.get_code_optimization_context().unwrap()
     original_helper_code: dict[Path, str] = {}
     helper_function_paths = {hf.file_path for hf in code_context.helper_functions}
@@ -3453,7 +3453,7 @@ def hydrate_input_text_actions_with_field_names(
         test_framework="pytest",
         pytest_cmd="pytest",
     )
-    func_optimizer = FunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
+    func_optimizer = PythonFunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
     code_context: CodeOptimizationContext = func_optimizer.get_code_optimization_context().unwrap()
 
     original_helper_code: dict[Path, str] = {}

tests/test_function_dependencies.py

@@ -5,7 +5,7 @@
 from codeflash.discovery.functions_to_optimize import FunctionToOptimize
 from codeflash.either import is_successful
 from codeflash.models.models import FunctionParent
-from codeflash.optimization.function_optimizer import FunctionOptimizer
+from codeflash.languages.python.function_optimizer import PythonFunctionOptimizer
 from codeflash.verification.verification_utils import TestConfig
 
 
@@ -132,7 +132,7 @@ def test_class_method_dependencies() -> None:
         starting_line=None,
         ending_line=None,
     )
-    func_optimizer = FunctionOptimizer(
+    func_optimizer = PythonFunctionOptimizer(
         function_to_optimize=function_to_optimize,
         test_cfg=TestConfig(
             tests_root=file_path,
@@ -202,7 +202,7 @@ def test_recursive_function_context() -> None:
         starting_line=None,
         ending_line=None,
     )
-    func_optimizer = FunctionOptimizer(
+    func_optimizer = PythonFunctionOptimizer(
         function_to_optimize=function_to_optimize,
         test_cfg=TestConfig(
             tests_root=file_path,

tests/test_function_discovery.py

@@ -680,8 +680,14 @@ def test_in_dunder_tests():
 
         # Combine all discovered functions
         all_functions = {}
-        for discovered in [discovered_source, discovered_test, discovered_test_underscore,
-                          discovered_spec, discovered_tests_dir, discovered_dunder_tests]:
+        for discovered in [
+            discovered_source,
+            discovered_test,
+            discovered_test_underscore,
+            discovered_spec,
+            discovered_tests_dir,
+            discovered_dunder_tests,
+        ]:
             all_functions.update(discovered)
 
         # Test Case 1: tests_root == module_root (overlapping case)
@@ -781,9 +787,7 @@ def test_filter_functions_strict_string_matching():
 
         # Strict check: exactly these 3 files should remain (those with 'test' as substring only)
         expected_files = {contest_file, latest_file, attestation_file}
-        assert set(filtered.keys()) == expected_files, (
-            f"Expected files {expected_files}, got {set(filtered.keys())}"
-        )
+        assert set(filtered.keys()) == expected_files, f"Expected files {expected_files}, got {set(filtered.keys())}"
 
         # Strict check: each file should have exactly 1 function with the expected name
         assert [fn.function_name for fn in filtered[contest_file]] == ["run_contest"], (
@@ -871,9 +875,7 @@ def test_filter_functions_test_directory_patterns():
 
         # Strict check: exactly these 2 files should remain (those in non-test directories)
         expected_files = {contest_file, latest_file}
-        assert set(filtered.keys()) == expected_files, (
-            f"Expected files {expected_files}, got {set(filtered.keys())}"
-        )
+        assert set(filtered.keys()) == expected_files, f"Expected files {expected_files}, got {set(filtered.keys())}"
 
         # Strict check: each file should have exactly 1 function with the expected name
         assert [fn.function_name for fn in filtered[contest_file]] == ["get_scores"], (
@@ -936,9 +938,7 @@ def test_filter_functions_non_overlapping_tests_root():
 
         # Strict check: exactly these 2 files should remain (both in src/, not in tests/)
         expected_files = {source_file, test_in_src}
-        assert set(filtered.keys()) == expected_files, (
-            f"Expected files {expected_files}, got {set(filtered.keys())}"
-        )
+        assert set(filtered.keys()) == expected_files, f"Expected files {expected_files}, got {set(filtered.keys())}"
 
         # Strict check: each file should have exactly 1 function with the expected name
         assert [fn.function_name for fn in filtered[source_file]] == ["process"], (
@@ -1047,20 +1047,15 @@ def test_deep_copy():
         )
 
         root_functions = [fn.function_name for fn in filtered.get(root_source_file, [])]
-        assert root_functions == ["main"], (
-            f"Expected ['main'], got {root_functions}"
-        )
+        assert root_functions == ["main"], f"Expected ['main'], got {root_functions}"
 
         # Strict check: exactly 3 functions (2 from utils.py + 1 from main.py)
         assert count == 3, (
-            f"Expected exactly 3 functions, got {count}. "
-            f"Some source files may have been incorrectly filtered."
+            f"Expected exactly 3 functions, got {count}. Some source files may have been incorrectly filtered."
         )
 
         # Verify test file was properly filtered (should not be in results)
-        assert test_file not in filtered, (
-            f"Test file {test_file} should have been filtered but wasn't"
-        )
+        assert test_file not in filtered, f"Test file {test_file} should have been filtered but wasn't"
 
 
 def test_filter_functions_typescript_project_in_tests_folder():
@@ -1214,9 +1209,7 @@ def sample_data():
         # source_file and file_in_test_dir should remain
         # test_prefix_file, conftest_file, and test_in_subdir should be filtered
         expected_files = {source_file, file_in_test_dir}
-        assert set(filtered.keys()) == expected_files, (
-            f"Expected {expected_files}, got {set(filtered.keys())}"
-        )
+        assert set(filtered.keys()) == expected_files, f"Expected {expected_files}, got {set(filtered.keys())}"
         assert count == 2, f"Expected exactly 2 functions, got {count}"
 
 
@@ -1266,7 +1259,8 @@ def helper_method(self):
 """)
 
         support = PythonSupport()
-        functions = support.discover_functions(fixture_file)
+        source = fixture_file.read_text(encoding="utf-8")
+        functions = support.discover_functions(source, fixture_file)
         function_names = [fn.function_name for fn in functions]
 
         assert "regular_function" in function_names

tests/test_get_helper_code.py

@@ -7,7 +7,7 @@
 from codeflash.discovery.functions_to_optimize import FunctionToOptimize
 from codeflash.either import is_successful
 from codeflash.models.models import FunctionParent, get_code_block_splitter
-from codeflash.optimization.function_optimizer import FunctionOptimizer
+from codeflash.languages.python.function_optimizer import PythonFunctionOptimizer
 from codeflash.optimization.optimizer import Optimizer
 from codeflash.verification.verification_utils import TestConfig
 
@@ -233,7 +233,7 @@ def __call__(self, *args: _P.args, **kwargs: _P.kwargs) -> _R:
             test_framework="pytest",
             pytest_cmd="pytest",
         )
-        func_optimizer = FunctionOptimizer(function_to_optimize=function_to_optimize, test_cfg=test_config)
+        func_optimizer = PythonFunctionOptimizer(function_to_optimize=function_to_optimize, test_cfg=test_config)
         with open(file_path) as f:
             original_code = f.read()
         ctx_result = func_optimizer.get_code_optimization_context()
@@ -404,7 +404,7 @@ def test_bubble_sort_deps() -> None:
         test_framework="pytest",
         pytest_cmd="pytest",
     )
-    func_optimizer = FunctionOptimizer(function_to_optimize=function_to_optimize, test_cfg=test_config)
+    func_optimizer = PythonFunctionOptimizer(function_to_optimize=function_to_optimize, test_cfg=test_config)
     with open(file_path) as f:
         original_code = f.read()
     ctx_result = func_optimizer.get_code_optimization_context()

tests/test_instrument_line_profiler.py

@@ -5,7 +5,7 @@
 from codeflash.languages.python.static_analysis.line_profile_utils import add_decorator_imports, contains_jit_decorator
 from codeflash.discovery.functions_to_optimize import FunctionToOptimize
 from codeflash.models.models import CodeOptimizationContext
-from codeflash.optimization.function_optimizer import FunctionOptimizer
+from codeflash.languages.python.function_optimizer import PythonFunctionOptimizer
 from codeflash.verification.verification_utils import TestConfig
 
 
@@ -22,7 +22,7 @@ def test_add_decorator_imports_helper_in_class():
         pytest_cmd="pytest",
     )
     func = FunctionToOptimize(function_name="sort_classmethod", parents=[], file_path=code_path)
-    func_optimizer = FunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
+    func_optimizer = PythonFunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
     os.chdir(run_cwd)
     # func_optimizer = pass
     try:
@@ -94,7 +94,7 @@ def test_add_decorator_imports_helper_in_nested_class():
         pytest_cmd="pytest",
     )
     func = FunctionToOptimize(function_name="sort_classmethod", parents=[], file_path=code_path)
-    func_optimizer = FunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
+    func_optimizer = PythonFunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
     os.chdir(run_cwd)
     # func_optimizer = pass
     try:
@@ -143,7 +143,7 @@ def test_add_decorator_imports_nodeps():
         pytest_cmd="pytest",
     )
     func = FunctionToOptimize(function_name="sorter", parents=[], file_path=code_path)
-    func_optimizer = FunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
+    func_optimizer = PythonFunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
     os.chdir(run_cwd)
     # func_optimizer = pass
     try:
@@ -194,7 +194,7 @@ def test_add_decorator_imports_helper_outside():
         pytest_cmd="pytest",
     )
     func = FunctionToOptimize(function_name="sorter_deps", parents=[], file_path=code_path)
-    func_optimizer = FunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
+    func_optimizer = PythonFunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
     os.chdir(run_cwd)
     # func_optimizer = pass
     try:
@@ -271,7 +271,7 @@ def __init__(self, arr):
         pytest_cmd="pytest",
     )
     func = FunctionToOptimize(function_name="sorter", parents=[], file_path=code_write_path)
-    func_optimizer = FunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
+    func_optimizer = PythonFunctionOptimizer(function_to_optimize=func, test_cfg=test_config)
     os.chdir(run_cwd)
     # func_optimizer = pass
     try: