Merge pull request #2492 from strictdoc-project/stanislaw/section

chore(tests/integration): migrate remaining itests from [SECTION] to [[SECTION]]

Author: stanislaw

strictdoc/backend/reqif/p01_sdoc/reqif_to_sdoc_converter.py

@@ -36,7 +36,6 @@
 from strictdoc.backend.sdoc.models.model import (
     SDocDocumentIF,
     SDocNodeIF,
-    SDocSectionIF,
 )
 from strictdoc.backend.sdoc.models.node import SDocNode, SDocNodeField
 from strictdoc.backend.sdoc.models.reference import (
@@ -383,7 +382,7 @@ def create_document(
     def create_requirement_from_spec_object(
         spec_object: ReqIFSpecObject,
         context: P01_ReqIFToSDocBuildContext,
-        parent_section: Union[SDocSectionIF, SDocDocumentIF, SDocNodeIF],
+        parent_section: Union[SDocDocumentIF, SDocNodeIF],
         document_reference: DocumentReference,
         reqif_bundle: ReqIFBundle,
         level: int,

strictdoc/backend/reqif/p01_sdoc/sdoc_to_reqif_converter.py

@@ -51,7 +51,6 @@
     ParentReqReference,
     Reference,
 )
-from strictdoc.backend.sdoc.models.section import SDocSection
 from strictdoc.core.document_iterator import DocumentCachingIterator
 from strictdoc.core.document_tree import DocumentTree
 from strictdoc.helpers.cast import assert_cast
@@ -282,14 +281,6 @@ def convert_document_tree(
             for node_, _ in document_iterator.all_content(
                 print_fragments=False
             ):
-                if isinstance(node_, SDocSection):
-                    raise AssertionError(
-                        "[SECTION] tags are deprecated when using ReqIF export/import. "
-                        "Use [[SECTION]] tags instead. "
-                        "See the migration guide for more details: "
-                        "https://strictdoc.readthedocs.io/en/latest/latest/docs/strictdoc_01_user_guide.html#SECTION-UG-NODE-MIGRATION"
-                    )
-
                 if not isinstance(node_, SDocNode):
                     continue
                 leaf_or_composite_node = assert_cast(node_, SDocNode)

strictdoc/backend/sdoc/models/constants.py

@@ -43,10 +43,8 @@
     ParentReqReference,
     Reference,
 )
-from strictdoc.backend.sdoc.models.section import SDocSection
 
 SECTION_MODELS = [
-    SDocSection,
     DocumentFromFile,
     SDocNode,
     SDocNodeField,

strictdoc/backend/sdoc/models/document_from_file.py

@@ -11,7 +11,6 @@
     SDocDocumentIF,
     SDocElementIF,
     SDocNodeIF,
-    SDocSectionIF,
 )
 from strictdoc.backend.sdoc.models.node import SDocCompositeNode
 from strictdoc.helpers.auto_described import auto_described
@@ -21,10 +20,10 @@
 class DocumentFromFile(SDocDocumentFromFileIF):
     def __init__(
         self,
-        parent: Union[SDocDocumentIF, SDocSectionIF],
+        parent: Union[SDocDocumentIF, SDocNodeIF],
         file: str,
     ) -> None:
-        self.parent: Union[SDocDocumentIF, SDocSectionIF] = parent
+        self.parent: Union[SDocDocumentIF, SDocNodeIF] = parent
         self.file: str = file
 
         self.ng_has_requirements: bool = False
@@ -85,9 +84,7 @@ def configure_with_resolved_document(
 
         if isinstance(including_document_or_section, SDocDocumentIF):
             including_document = including_document_or_section
-        elif isinstance(
-            including_document_or_section, (SDocSectionIF, SDocCompositeNode)
-        ):
+        elif isinstance(including_document_or_section, SDocCompositeNode):
             including_document_: Optional[SDocDocumentIF] = (
                 including_document_or_section.get_document()
             )

strictdoc/backend/sdoc/models/document_grammar.py

@@ -41,7 +41,6 @@ def __init__(
     @staticmethod
     def create_default(
         parent: Optional[SDocDocumentIF],
-        create_section_element: bool = False,
         enable_mid: bool = False,
     ) -> "DocumentGrammar":
         text_element: GrammarElement = (
@@ -131,13 +130,12 @@ def create_default(
 
         elements: List[GrammarElement] = []
 
-        if create_section_element:
-            section_element: GrammarElement = (
-                DocumentGrammar.create_default_section_element(
-                    enable_mid=enable_mid
-                )
+        section_element: GrammarElement = (
+            DocumentGrammar.create_default_section_element(
+                enable_mid=enable_mid
             )
-            elements.append(section_element)
+        )
+        elements.append(section_element)
 
         elements.append(text_element)
         elements.append(requirement_element)

strictdoc/backend/sdoc/models/model.py

@@ -52,7 +52,7 @@ class SDocNodeFieldIF(ABC):
 class SDocNodeIF(ABC):
     reserved_mid: MID
     mid_permanent: bool
-    parent: Union["SDocNodeIF", "SDocDocumentIF", "SDocSectionIF"]
+    parent: Union["SDocNodeIF", "SDocDocumentIF"]
     node_type: str
     section_contents: List["SDocElementIF"]
     ng_level: Optional[int]
@@ -108,39 +108,6 @@ def blacklist_if_needed(self) -> None:
         raise NotImplementedError
 
 
-class SDocSectionIF(ABC):
-    reserved_mid: MID
-    reserved_uid: Optional[str]
-    mid_permanent: bool
-    parent: Union["SDocDocumentIF", "SDocSectionIF"]
-    section_contents: List["SDocElementIF"]
-    ng_level: Optional[int]
-    ng_resolved_custom_level: Optional[str]
-    ng_whitelisted: bool
-    ng_has_requirements: bool
-    autogen: bool
-
-    @abstractmethod
-    def get_document(self) -> Optional["SDocDocumentIF"]:
-        raise NotImplementedError
-
-    @abstractmethod
-    def get_prefix(self) -> str:
-        raise NotImplementedError
-
-    @abstractmethod
-    def get_debug_info(self) -> str:
-        raise NotImplementedError
-
-    @abstractmethod
-    def get_display_title(self, include_toc_number: bool = True) -> str:
-        raise NotImplementedError
-
-    @abstractmethod
-    def blacklist_if_needed(self) -> None:
-        raise NotImplementedError
-
-
 class SDocGrammarIF:
     pass
 
@@ -192,7 +159,7 @@ def blacklist_if_needed(self) -> None:
 
 
 class SDocDocumentFromFileIF(ABC):
-    parent: Union[SDocDocumentIF, SDocSectionIF]
+    parent: Union[SDocDocumentIF, SDocNodeIF]
     ng_resolved_custom_level: Optional[str]
     ng_whitelisted: bool
     autogen: bool
@@ -211,15 +178,13 @@ def section_contents(self) -> List[SDocDocumentIF]:
 
 SDocElementIF = Union[
     SDocNodeIF,
-    SDocSectionIF,
     SDocDocumentIF,
     SDocDocumentFromFileIF,
 ]
 
 
 SDocIteratedElementIF = Union[
     SDocNodeIF,
-    SDocSectionIF,
     SDocDocumentIF,
 ]
 

strictdoc/backend/sdoc/models/node.py

@@ -21,7 +21,6 @@
     SDocDocumentIF,
     SDocElementIF,
     SDocNodeIF,
-    SDocSectionIF,
 )
 from strictdoc.backend.sdoc.models.reference import (
     ChildReqReference,
@@ -103,7 +102,7 @@ def get_text_value(self) -> str:
 class SDocNode(SDocNodeIF):
     def __init__(
         self,
-        parent: Union[SDocDocumentIF, SDocSectionIF, SDocNodeIF],
+        parent: Union[SDocDocumentIF, SDocNodeIF],
         node_type: str,
         fields: List[SDocNodeField],
         relations: List[Reference],
@@ -116,7 +115,7 @@ def __init__(
         assert isinstance(node_type, str)
         assert isinstance(relations, list), relations
 
-        self.parent: Union[SDocDocumentIF, SDocSectionIF, SDocNodeIF] = parent
+        self.parent: Union[SDocDocumentIF, SDocNodeIF] = parent
 
         self.node_type: str = node_type
 
@@ -259,7 +258,10 @@ def get_display_title(
         if self.reserved_uid is not None:
             return self.reserved_uid
         if self.node_type == "TEXT":
-            if isinstance(self.parent, SDocSectionIF):
+            if (
+                isinstance(self.parent, SDocNode)
+                and self.parent.node_type == "SECTION"
+            ):
                 return f'Text node from section "{self.parent.get_display_title()}"'
             if isinstance(self.parent, SDocDocumentIF):
                 return f'Text node from document "{self.parent.get_display_title()}"'
@@ -778,7 +780,7 @@ def _update_has_meta(self) -> None:
 class SDocCompositeNode(SDocNode):
     def __init__(
         self,
-        parent: Union[SDocDocumentIF, SDocSectionIF, SDocNodeIF],
+        parent: Union[SDocDocumentIF, SDocNodeIF],
         **fields: Any,
     ) -> None:
         super().__init__(parent, **fields, is_composite=True)