peakrdl-python 3.0.0rc3__tar.gz → 3.0.0rc4__tar.gz

{peakrdl_python-3.0.0rc3 → peakrdl_python-3.0.0rc4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: peakrdl-python
-Version: 3.0.0rc3
+Version: 3.0.0rc4
 Summary: Generate Python Register Access Layer (RAL) from SystemRDL
 Author: Keith Brady
 License:                     GNU GENERAL PUBLIC LICENSE

{peakrdl_python-3.0.0rc3 → peakrdl_python-3.0.0rc4}/src/peakrdl_python/__about__.py

@@ -17,4 +17,4 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Variables that describes the peakrdl-python Package
 """
-__version__ = "3.0.0rc3"
+__version__ = "3.0.0rc4"

{peakrdl_python-3.0.0rc3 → peakrdl_python-3.0.0rc4}/src/peakrdl_python/lib_test/_common_base_test_class.py

@@ -27,6 +27,7 @@ from ..lib import FieldEnumReadWrite, FieldEnumReadOnly, FieldEnumWriteOnly
 from ..lib import FieldAsyncReadOnly, FieldAsyncWriteOnly, FieldAsyncReadWrite
 from ..lib import FieldEnumAsyncReadOnly, FieldEnumAsyncWriteOnly, FieldEnumAsyncReadWrite
 from ..lib.base_register import BaseReg
+from ..lib import Base
 from .utilities import get_field_bitmask_int, get_field_inv_bitmask
 from ..sim_lib.simulator import BaseSimulator
 
@@ -107,3 +108,20 @@ class CommonTestBase(unittest.TestCase, ABC):
             self.assertEqual(rut.accesswidth, accesswidth)
         else:
             self.assertEqual(rut.accesswidth, width)
+
+    def _single_node_rdl_name_and_desc_test(self,
+                                            dut: Base,
+                                            rdl_name: Optional[str],
+                                            rdl_desc: Optional[str]) -> None:
+        """
+        Check the SystemRDL Name and Desc properties for a node
+        """
+        if rdl_name is None:
+            self.assertIsNone(dut.rdl_name)
+        else:
+            self.assertEqual(dut.rdl_name, rdl_name)
+
+        if rdl_desc is None:
+            self.assertIsNone(dut.rdl_desc)
+        else:
+            self.assertEqual(dut.rdl_desc, rdl_desc)

{peakrdl_python-3.0.0rc3 → peakrdl_python-3.0.0rc4}/src/peakrdl_python/templates/addrmap_tb.py.jinja

@@ -94,40 +94,15 @@ class {{fq_block_name}}_single_access({{top_node.inst_name}}_TestCase): # type:
             self.assertEqual(self.dut.{{'.'.join(get_python_path_segments(node))}}.full_inst_name, '{{'.'.join(node.get_path_segments())}}')  # type: ignore[union-attr]
         {% endfor %}
 
-    def test_name_property(self)  -> None:
+    def test_rdl_name_and_desc_property(self)  -> None:
         """
-        Walk the address map and check the name property has been correctly populated
+        Walk the address map and check the system rdl name and desc property has been correctly populated
         """
         {% for node in owned_elements.nodes -%}
         with self.subTest(msg='node: {{'.'.join(node.get_path_segments())}}'):
-            {% if skip_systemrdl_name_and_desc_properties %}
-                self.assertIsNone(self.dut.{{'.'.join(get_python_path_segments(node))}}.rdl_name)  # type: ignore[union-attr]
-            {% else %}
-                {% if node.get_property('name', default=None) is none %}
-            self.assertIsNone(self.dut.{{'.'.join(get_python_path_segments(node))}}.rdl_name)  # type: ignore[union-attr]
-                {% else %}
-            self.assertEqual(self.dut.{{'.'.join(get_python_path_segments(node))}}.rdl_name, {{node.get_property('name') | tojson}}) # type: ignore[union-attr]
-                {% endif %}
-            {% endif %}
-
-        {% endfor %}
-
-    def test_desc(self)  -> None:
-        """
-        Walk the address map and check the desc property has been correctly populated
-        """
-        {% for node in owned_elements.nodes -%}
-        with self.subTest(msg='node: {{'.'.join(node.get_path_segments())}}'):
-            {% if skip_systemrdl_name_and_desc_properties %}
-                self.assertIsNone(self.dut.{{'.'.join(get_python_path_segments(node))}}.rdl_desc)  # type: ignore[union-attr]
-            {% else %}
-                {% if node.get_property('desc', default=None) is none %}
-            self.assertIsNone(self.dut.{{'.'.join(get_python_path_segments(node))}}.rdl_desc)  # type: ignore[union-attr]
-                {% else %}
-            self.assertEqual(self.dut.{{'.'.join(get_python_path_segments(node))}}.rdl_desc, {{node.get_property('desc') | tojson}}) # type: ignore[union-attr]
-                {% endif %}
-            {% endif %}
-
+            self._single_node_rdl_name_and_desc_test(dut=self.dut.{{'.'.join(get_python_path_segments(node))}},
+                                                     rdl_name={% if skip_systemrdl_name_and_desc_properties %}None{% elif node.get_property('name', default=None) is none %}None{% else %}{{node.get_property('name') | tojson}}{% endif %},
+                                                     rdl_desc={% if skip_systemrdl_name_and_desc_properties %}None{% elif node.get_property('desc', default=None) is none %}None{% else %}{{node.get_property('desc') | tojson}}{% endif %})
         {% endfor %}
 
     def test_sizes(self) -> None:

{peakrdl_python-3.0.0rc3 → peakrdl_python-3.0.0rc4}/src/peakrdl_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: peakrdl-python
-Version: 3.0.0rc3
+Version: 3.0.0rc4
 Summary: Generate Python Register Access Layer (RAL) from SystemRDL
 Author: Keith Brady
 License:                     GNU GENERAL PUBLIC LICENSE