Merge pull request #134 from codellm-devkit/model-validation-test-fixture-updates

Model validation test fixture updates

Author: rahlk

cldk/models/java/models.py

@@ -436,11 +436,10 @@ def validate_source(cls, value) -> JMethodDetail:
         j_callable: JCallable = _CALLABLES_LOOKUP_TABLE.get(
             (type_declaration, signature),
             JCallable(
-                comments=[],
                 signature=signature,
                 is_implicit=True,
                 is_constructor="<init>" in value["callable_declaration"],
-                comment="",
+                comments=[],
                 annotations=[],
                 modifiers=[],
                 thrown_exceptions=[],
@@ -449,12 +448,15 @@ def validate_source(cls, value) -> JMethodDetail:
                     JCallableParameter(name=None, type=t, annotations=[], modifiers=[], start_column=-1, end_column=-1, start_line=-1, end_line=-1)
                     for t in value["callable_declaration"].split("(")[1].split(")")[0].split(",")
                 ],
+                return_type=None,
                 code="",
                 start_line=-1,
                 end_line=-1,
+                code_start_line=-1,
                 referenced_types=[],
                 accessed_fields=[],
                 call_sites=[],
+                is_entrypoint=False,
                 variable_declarations=[],
                 crud_operations=[],
                 crud_queries=[],

pyproject.toml

@@ -120,4 +120,4 @@ directory = "coverage_html_report"
 sample-c-application = "tests/resources/c/application/"
 sample-application = "tests/resources/java/application/"
 sample-application-analysis-json = "tests/resources/java/analysis_json/"
-codeanalyzer-jar-path = "tests/resources/java/codeanalyzer_jars/"
+codeanalyzer-jar-path = "cldk/analysis/java/codeanalyzer/jar/"

tests/analysis/java/test_java_analysis.py

@@ -650,11 +650,11 @@ def test_get_methods_in_class(test_fixture, analysis_json):
             eager_analysis=False,
         )
 
-        # Test that there are 30 methods in the Log class
+        # Test that there are 29 methods in the Log class
         methods = java_analysis.get_methods_in_class("com.ibm.websphere.samples.daytrader.util.Log")
         assert methods is not None
         assert isinstance(methods, Dict)
-        assert len(methods) == 30
+        assert len(methods) == 29
         for method in methods:
             assert isinstance(methods[method], JCallable)
 

tests/conftest.py

@@ -75,7 +75,7 @@ def codeanalyzer_jar_path():
     # Load the configuration
     config = toml.load(pyproject_path)
 
-    return Path(config["tool"]["cldk"]["testing"]["codeanalyzer-jar-path"]) / "2.3.0"
+    return Path(config["tool"]["cldk"]["testing"]["codeanalyzer-jar-path"])
 
 
 @pytest.fixture(scope="session", autouse=True)