add generate_getters_and_setters() function

Author: MrMaydo

src/method_generator.py

@@ -1,5 +1,6 @@
 import re
 from dataclasses import dataclass
+from typing import List
 
 
 JAVA_KEYWORDS = {
@@ -33,37 +34,46 @@ class Field:
     type: str
 
 
-def generate_getter(attr: Field) -> str:
-    attr_name = attr.name
-    attr_type = attr.type
+def generate_getters_and_setters(fields: List[Field]) -> str:
+    methods: list[str] = []
+    for field in fields:
+        methods.append(generate_getter(field))
+        methods.append(generate_setter(field))
 
-    _validate_java_identifier(attr_name)
+    return "\n\n".join(methods)
 
-    getter_name = "get" + attr_name[0].upper() + attr_name[1:]
+
+def generate_getter(field: Field) -> str:
+    field_name = field.name
+    field_type = field.type
+
+    _validate_java_identifier(field_name)
+
+    getter_name = "get" + field_name[0].upper() + field_name[1:]
 
     getter = [
         "",
-        f"{indent_lvl1}public {attr_type} {getter_name}() {{",
-        f"{indent_lvl2}return {attr_name};",
+        f"{indent_lvl1}public {field_type} {getter_name}() {{",
+        f"{indent_lvl2}return {field_name};",
         f"{indent_lvl1}}}"
     ]
     getter = "\n".join(getter)
 
     return getter
 
 
-def generate_setter(attr: Field) -> str:
-    attr_name = attr.name
-    attr_type = attr.type
+def generate_setter(field: Field) -> str:
+    field_name = field.name
+    field_type = field.type
 
-    _validate_java_identifier(attr_name)
+    _validate_java_identifier(field_name)
 
-    setter_name = "set" + attr_name[0].upper() + attr_name[1:]
+    setter_name = "set" + field_name[0].upper() + field_name[1:]
 
     setter = [
         "",
-        f"{indent_lvl1}public void {setter_name}({attr_type} {attr_name}) {{",
-        f"{indent_lvl2}this.{attr_name} = {attr_name};",
+        f"{indent_lvl1}public void {setter_name}({field_type} {field_name}) {{",
+        f"{indent_lvl2}this.{field_name} = {field_name};",
         f"{indent_lvl1}}}"
     ]
     setter = "\n".join(setter)

tests/test_method_generator.py

@@ -1,6 +1,6 @@
 import pytest
 
-from src.method_generator import generate_getter, Field, generate_setter
+from src.method_generator import generate_getter, Field, generate_setter, generate_getters_and_setters
 
 JAVA_KEYWORDS = {
     "abstract", "assert", "boolean", "break", "byte", "case", "catch",
@@ -55,7 +55,7 @@ def test_generate_getter_custom_object():
 
 def test_generate_getter_invalid_name():
     EMPTY_NAMES = {None, ""}
-    invalid_names = JAVA_KEYWORDS | JAVA_BUILTIN_TYPES | JAVA_LITERALS | EMPTY_NAMES
+    invalid_names = JAVA_KEYWORDS | JAVA_BUILTIN_TYPES | JAVA_LITERALS | EMPTY_NAMES | {"3", "abc-d"}
     for name in invalid_names:
         attr = Field(name=name, type="String")
         with pytest.raises(ValueError):
@@ -64,36 +64,55 @@ def test_generate_getter_invalid_name():
 
 def test_generate_setter_integer():
     attr = Field(name="exampleAttribute", type="int")
-    expected = f"""
-    public void setExampleAttribute(int exampleAttribute) {{
+    expected = """
+    public void setExampleAttribute(int exampleAttribute) {
         this.exampleAttribute = exampleAttribute;
-    }}"""
+    }"""
     assert (generate_setter(attr) == expected)
 
 
 def test_generate_setter_string():
     attr = Field(name="someName", type="String")
-    expected = f"""
-    public void setSomeName(String someName) {{
+    expected = """
+    public void setSomeName(String someName) {
         this.someName = someName;
-    }}"""
+    }"""
     assert (generate_setter(attr) == expected)
 
 
 def test_generate_setter_custom_object():
     attr = Field(name="customData", type="CustomObject")
-    expected = f"""
-    public void setCustomData(CustomObject customData) {{
+    expected = """
+    public void setCustomData(CustomObject customData) {
         this.customData = customData;
-    }}"""
+    }"""
     assert (generate_setter(attr) == expected)
 
 
 def test_generate_setter_invalid_name():
     EMPTY_NAMES = {None, ""}
-    invalid_names = JAVA_KEYWORDS | JAVA_BUILTIN_TYPES | JAVA_LITERALS | EMPTY_NAMES
+    invalid_names = JAVA_KEYWORDS | JAVA_BUILTIN_TYPES | JAVA_LITERALS | EMPTY_NAMES | {"9", "gf*d"}
     for name in invalid_names:
         attr = Field(name=name, type="String")
         with pytest.raises(ValueError):
             generate_setter(attr)
 
+
+def test_generate_getters_and_setters():
+    attr1 = Field(name="exampleAttribute", type="int")
+    attr2 = Field(name="customData", type="CustomObject")
+    attributes = [attr1, attr2]
+    expected = """
+    public int getExampleAttribute() {
+        return exampleAttribute;
+    }\n\n
+    public void setExampleAttribute(int exampleAttribute) {
+        this.exampleAttribute = exampleAttribute;
+    }\n\n
+    public CustomObject getCustomData() {
+        return customData;
+    }\n\n
+    public void setCustomData(CustomObject customData) {
+        this.customData = customData;
+    }"""
+    assert generate_getters_and_setters(attributes) == expected