Add test cases for subclasses.

Author: grayfox88

tests/data/with_methods.puml

@@ -1,19 +1,27 @@
 @startuml
-class tests.modules.withmethods.withmethods.Coordinates {
-  x: float
-  y: float
-}
 class tests.modules.withmethods.withmethods.Point {
   PI: float {static}
+  origin: Point {static}
   coordinates: Coordinates
   day_unit: TimeUnit
   hour_unit: TimeUnit
   time_resolution: Tuple[str, TimeUnit]
   x: int
   y: str
-  void __init__(x: int, y: str, unit: str, u: float, z: List[int])
-  (float, float) get_coordinates()
-  {static} Point from_values(x: int, y: str, u: float, z: List[int])
+  {static} from_values(x: int, y: str, u: float, z: List[int]) -> Point
+  get_coordinates() -> Tuple(float, float)
+  __init__(x: int, y: str, unit: str, u: float, z: List[int])
+}
+class tests.modules.withmethods.withinheritedmethods.ThreeDimensionalPoint {
+  z: float
+  __init__(x: int, y: str, z: float)
+  move(offset: int)
+  check_positive() -> bool
+}
+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
 @enduml

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/py2puml/inspection/test_inspectclass.py

@@ -152,12 +152,7 @@ def test_inspect_module_should_unwrap_decorated_constructor():
 
 
 def test_inspect_module_should_find_methods():
-    """ Test that methods are detected including static methods
-
-    This test case assumes that the methods will be sorted by type as follow:
-        1a - instance methods (special methods aka "dunder")
-        1b - all other instance methods
-        2 - static methods """
+    """ Test that methods are detected including static methods """
 
     domain_items_by_fqn: Dict[str, UmlItem] = {}
     domain_relations: List[UmlRelation] = []
@@ -175,7 +170,28 @@ def test_inspect_module_should_find_methods():
     point_umlitem: UmlClass = domain_items_by_fqn['tests.modules.withmethods.withmethods.Point']
     assert len(point_umlitem.methods) == 3
 
-    assert point_umlitem.methods[0].name == '__init__'  # 1a - Instance method (special)
-    assert point_umlitem.methods[1].name == 'get_coordinates'  # 1b - Instance method (regular)
-    assert point_umlitem.methods[2].name == 'from_values'  # 2 - Static method
+    assert point_umlitem.methods[0].name == 'from_values'
+    assert point_umlitem.methods[1].name == 'get_coordinates'
+    assert point_umlitem.methods[2].name == '__init__'
+    # FIXME: use 'assert_method' once UmlMethod restructured
+
+
+def test_inspect_module_inherited_methods():
+    """ Test that inherited methods are not included in subclasses """
+
+    domain_items_by_fqn: Dict[str, UmlItem] = {}
+    domain_relations: List[UmlRelation] = []
+    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']
+    assert len(coordinates_3d_umlitem.methods) == 3
+
+    assert coordinates_3d_umlitem.methods[0].name == '__init__'
+    assert coordinates_3d_umlitem.methods[1].name == 'move'
+    assert coordinates_3d_umlitem.methods[2].name == 'check_positive'
     # FIXME: use 'assert_method' once UmlMethod restructured

tests/py2puml/test_py2puml.py

@@ -29,7 +29,7 @@ def test_py2puml_with_subdomain():
 
 
 def test_py2puml_with_methods():
-    """ Test py2puml with a class containing methods """
+    """ Test py2puml with classes containing methods """
     with open(DATA_DIR / 'with_methods.puml', 'r', encoding='utf-8') as fref:
         expected_data = fref.read()
     puml_content = py2puml.py2puml('tests/modules/withmethods', 'tests.modules.withmethods')