Merge pull request #265 from krcb197/256-optimise-test_inst_name

optimise `test_inst_name`

Author: krcb197

src/peakrdl_python/__about__.py

@@ -1,20 +1,20 @@
 """
 peakrdl-python is a tool to generate Python Register Access Layer (RAL) from SystemRDL
-Copyright (C) 2021 - 2023
+Copyright (C) 2021 - 2025
 
 This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+it under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation, either version 3 of
+the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License
+You should have received a copy of the GNU Lesser General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Variables that describes the peakrdl-python Package
 """
-__version__ = "3.0.0rc4"
+__version__ = "3.0.0rc5"

src/peakrdl_python/lib_test/_common_base_test_class.py

@@ -125,3 +125,14 @@ def _single_node_rdl_name_and_desc_test(self,
             self.assertIsNone(dut.rdl_desc)
         else:
             self.assertEqual(dut.rdl_desc, rdl_desc)
+
+    def _test_node_inst_name(self,
+                             dut: Base,
+                             parent_full_inst_name:str,
+                             inst_name:str) -> None:
+        """
+        Test the `inst_name` and `full_inst_name` attributes of a node
+        """
+        self.assertEqual(dut.inst_name, inst_name)
+        full_inst_name = parent_full_inst_name + '.' + inst_name
+        self.assertEqual(dut.full_inst_name, full_inst_name)

src/peakrdl_python/templates/addrmap_tb.py.jinja

@@ -90,8 +90,9 @@ class {{fq_block_name}}_single_access({{top_node.inst_name}}_TestCase): # type:
         """
         {% for node in owned_elements.nodes -%}
         with self.subTest(msg='node: {{'.'.join(node.get_path_segments())}}'):
-            self.assertEqual(self.dut.{{'.'.join(get_python_path_segments(node))}}.inst_name, '{{node.get_path_segments()[-1]}}') # type: ignore[union-attr]
-            self.assertEqual(self.dut.{{'.'.join(get_python_path_segments(node))}}.full_inst_name, '{{'.'.join(node.get_path_segments())}}')  # type: ignore[union-attr]
+            self._test_node_inst_name(dut=self.dut.{{'.'.join(get_python_path_segments(node))}},
+                                      inst_name='{{node.get_path_segments()[-1]}}',
+                                      parent_full_inst_name='{{'.'.join(node.get_path_segments()[:-1])}}')
         {% endfor %}
 
     def test_rdl_name_and_desc_property(self)  -> None: