Add test cases for subclasses.

Author: grayfox88

py2puml/asserts.py

@@ -20,7 +20,7 @@ def assert_py2puml_is_stringio(domain_path: str, domain_module: str, expected_co
 def assert_multilines(actual_multilines: List[str], expected_multilines: Iterable[str]):
     line_index = 0
     for line_index, (actual_line, expected_line) in enumerate(zip(actual_multilines, expected_multilines)):
-        # print(actual_line)
+        # print(actual_line[:-1])
         assert actual_line == expected_line, f'actual and expected contents have changed at line {line_index + 1}: {actual_line=}, {expected_line=}'
 
     assert line_index + 1 == len(actual_multilines), f'actual and expected diagrams have {line_index + 1} lines'

tests/modules/withmethods/withinheritedmethods.py

@@ -0,0 +1,14 @@
+from .withmethods import Point
+
+
+class ThreeDimensionalPoint(Point):
+
+    def __init__(self, x: int, y: str, z: float):
+        super().__init__(x=x, y=y)
+        self.z = z
+
+    def move(self, offset: int):
+        self.x += offset
+
+    def check_positive(self) -> bool:
+        return self.x > 0

tests/modules/withmethods/withmethods.py

@@ -17,15 +17,14 @@ class Point:
     origin = Coordinates(0, 0)
 
     @staticmethod
-    def from_values(x: int, y: str, u: float, z: List[int]) -> 'Point':
-        return Point(x, y, u, z)
+    def from_values(x: int, y: str, u: float) -> 'Point':
+        return Point(x, y, u)
 
     def get_coordinates(self):
         return self.x, self.y
 
-    def __init__(self, x: int, y: str, unit: str, u: float, z: List[int]):
+    def __init__(self, x: int, y: str):
         self.coordinates: Coordinates = Coordinates(x, float(y))
-        # al the different imports of TimeUnit must be handled and result in the same 'short type' to display
         self.day_unit: withenum.TimeUnit = withenum.TimeUnit.DAYS
         self.hour_unit: modules.withenum.TimeUnit = modules.withenum.TimeUnit.HOURS
         self.time_resolution: Tuple[str, withenum.TimeUnit] = 'minute', TimeUnit.MINUTE

tests/puml_files/with_methods.puml

@@ -1,8 +1,7 @@
 @startuml tests.modules.withmethods
-namespace tests.modules.withmethods.withmethods {}
-class tests.modules.withmethods.withmethods.Coordinates {
-  x: float
-  y: float
+namespace tests.modules.withmethods {
+  namespace withmethods {}
+  namespace withinheritedmethods {}
 }
 class tests.modules.withmethods.withmethods.Point {
   PI: float {static}
@@ -12,9 +11,21 @@ class tests.modules.withmethods.withmethods.Point {
   time_resolution: Tuple[str, TimeUnit]
   x: int
   y: str
-  from_values(x: int, y: str, u: float, z: List[int]) -> 'Point'
+  from_values(x: int, y: str, u: float) -> 'Point'
+  get_coordinates(self)
+}
+class tests.modules.withmethods.withinheritedmethods.ThreeDimensionalPoint {
+  z: float
+  check_positive(self) -> bool
+  from_values(x: int, y: str, u: float) -> 'Point'
   get_coordinates(self)
+  move(self, offset: int)
+}
+class tests.modules.withmethods.withmethods.Coordinates {
+  x: float
+  y: float
 }
 tests.modules.withmethods.withmethods.Point *-- tests.modules.withmethods.withmethods.Coordinates
+tests.modules.withmethods.withmethods.Point <|-- tests.modules.withmethods.withinheritedmethods.ThreeDimensionalPoint
 footer Generated by //py2puml//
 @enduml

tests/py2puml/inspection/test_inspectclass.py

@@ -200,3 +200,29 @@ def test_inspect_module_should_find_methods(
     assert point_umlitem.methods[0].name == 'from_values'  # 2 - Static method
     assert point_umlitem.methods[1].name == 'get_coordinates'  # 1b - Instance method (regular)
     # FIXME: use 'assert_method' once UmlMethod restructured
+
+
+def test_inspect_module_inherited_methods(
+    domain_items_by_fqn: Dict[str, UmlItem], domain_relations: List[UmlRelation]
+):
+    '''
+    Test that inherited methods are not included in subclasses
+    '''
+
+    inspect_module(
+        import_module('tests.modules.withmethods.withinheritedmethods'),
+        'tests.modules.withmethods.withinheritedmethods',
+        domain_items_by_fqn, domain_relations
+    )
+
+    # ThreeDimensionalCoordinates UmlClass
+    coordinates_3d_umlitem: UmlClass = domain_items_by_fqn['tests.modules.withmethods.withinheritedmethods.ThreeDimensionalPoint']
+
+    # FIXME inherited methods should not be mentionned
+    assert len(coordinates_3d_umlitem.methods) == 4
+
+    assert coordinates_3d_umlitem.methods[0].name == 'check_positive'
+    assert coordinates_3d_umlitem.methods[1].name == 'from_values' # inherited method
+    assert coordinates_3d_umlitem.methods[2].name == 'get_coordinates' # inherited method
+    assert coordinates_3d_umlitem.methods[3].name == 'move'
+    # FIXME: use 'assert_method' once UmlMethod restructured