Rf 5 compatibility (#11)

Snooz82 · falk7 · web-flow · commit 7e80f0cb1160 · 2022-05-10T10:17:52.000+02:00
* fixed data types issue(s) with RF >= 5.0 , (#10) Co-authored-by: falk <61115124+falk7@users.noreply.github.com>
diff --git a/.gitignore b/.gitignore
@@ -136,3 +136,6 @@ dmypy.json
 *.zip
 *.resource
 *.xml
+
+#REMOVE again
+!test/*/*xml
diff --git a/src/Libdoc2TestBench/__init__.py b/src/Libdoc2TestBench/__init__.py
@@ -23,8 +23,9 @@
 from .testbenchwriter import Libdoc2TestBenchWriter
 from robot.libdocpkg import LibraryDocumentation
 from robot.version import get_full_version as robot_version_print
+from robot.libdocpkg.robotbuilder import LibraryDoc
 
-__version__ = "1.0"
+__version__ = "1.1.0"
 
 
 def start_libdoc2testbench():
@@ -259,14 +260,16 @@ def get_libdoc_lists(lib_or_res, lib_name, lib_version, docformat, specdocformat
     return libraries, resources
 
 
-def print_stat(libdoc):
+def print_stat(libdoc: LibraryDoc):
     print(f"{libdoc.type.lower()}: {libdoc.name}")
     print(f"  {len(libdoc.keywords)} Interactions")
-    if libdoc.data_types and libdoc.data_types.enums:
-        print(f"  {len(libdoc.data_types.enums)} Data Types")
 
+    data_types = libdoc.to_dictionary()["dataTypes"]
+    if data_types and data_types["enums"]:
+        print(f"  {len(data_types['enums'])} Data Types")
 
-def create_libdoc(lib_or_res, lib_name, lib_version, docformat, specdocformat):
+
+def create_libdoc(lib_or_res, lib_name, lib_version, docformat, specdocformat) -> LibraryDoc:
     try:
         libdoc = LibraryDocumentation(lib_or_res, lib_name, lib_version, docformat)
         if specdocformat == 'HTML':
diff --git a/src/Libdoc2TestBench/testbenchwriter.py b/src/Libdoc2TestBench/testbenchwriter.py
@@ -23,6 +23,7 @@
 from typing import List
 
 from robot.utils import XmlWriter
+from robot.libdocpkg.robotbuilder import LibraryDoc
 
 
 class ElementTypes(enum.Enum):
@@ -66,9 +67,9 @@ def __init__(self, pk_generator: PKGenerator, element, parent_element=None):
         self.element = element
         self.pk = pk_generator.get_pk()
         self.parent = parent_element
-
-        if element.doc:
-            self.html_desc = f"<html>{element.doc}</html>"
+        
+        if element["doc"]:
+            self.html_desc = f"<html>{element['doc']}</html>"
 
         self._set_name_and_register_in_all_elements()
 
@@ -78,7 +79,7 @@ def _set_name_and_register_in_all_elements(self):
         if self.parent:
             self.name = self.parent.name + '.' + self.element.name
         else:
-            self.name = self.element.name
+            self.name = self.element['name']
 
         # Register element for later access to element's unique pk
         Element.all_elements[self.name] = self.pk
@@ -97,14 +98,14 @@ class DataType(Element):
 
     def __init__(self, pk_generator: PKGenerator, data_type, parent_element=None):
         super().__init__(pk_generator, data_type)
-        self.type = data_type.type
+        self.type = data_type['type']
 
         # Holds all enum values, typed_dics are considered to be
         # generic for imbus TestBench purposes.
         self.representatives = {}
 
         if self.type == 'Enum':
-            self.members = data_type.members
+            self.members = data_type['members']
             for member in self.members:
                 key = f"{self.name}.{member['name']}"
                 value = f"{self.name}.{member['value']}"
@@ -362,10 +363,11 @@ def _write_interactions(self, libdoc, writer, attachment=False):
             writer.end('parameters')
             writer.end('element')  # close interaction tag
 
-    def _write_data_types(self, libdoc, writer):
+    def _write_data_types(self, libdoc: LibraryDoc, writer):
         datatypes = []
-        if libdoc.data_types.enums:
-            for data_type in libdoc.data_types.enums:
+        libdoc_dic = libdoc.to_dictionary()
+        if libdoc_dic["dataTypes"]["enums"]:
+            for data_type in libdoc_dic["dataTypes"]["enums"]:
                 datatypes.append(DataType(self.pk_generator, data_type))
 
             writer.start('element', {'type': ElementTypes.subdivision.value})
