Merge pull request strictdoc-project#1297 from strictdoc-project/stan…

…islaw/section_uid_must_be_unique traceability_index: fix finding an existing node with a given UID
GGBeer · Sep 6, 2023 · 933af85 · 933af85
2 parents 5cecce4 + 75ff2b3
commit 933af85
Show file tree

Hide file tree

Showing 127 changed files with 305 additions and 24 deletions.
diff --git a/strictdoc/__init__.py b/strictdoc/__init__.py
@@ -1,6 +1,6 @@
 from strictdoc.core.environment import SDocRuntimeEnvironment
 
-__version__ = "0.0.44a6"
+__version__ = "0.0.44a7"
 
 
 environment = SDocRuntimeEnvironment(__file__)
diff --git a/strictdoc/core/traceability_index.py b/strictdoc/core/traceability_index.py
@@ -216,6 +216,25 @@ def get_coverage_info(
     def get_node_by_uid(self, uid):
         return self._requirements_parents[uid].requirement
 
+    def find_node_by_uid_weak(
+        self, uid
+    ) -> Union[Document, Section, Requirement, None]:
+        for document in self.document_tree.document_list:
+            document_iterator = DocumentCachingIterator(document)
+            for node in document_iterator.all_content():
+                if isinstance(node, Document):
+                    if node.config.uid == uid:
+                        return node
+                elif isinstance(node, Section):
+                    if node.reserved_uid == uid:
+                        return node
+                elif isinstance(node, Requirement):
+                    if node.reserved_uid == uid:
+                        return node
+                else:
+                    raise NotImplementedError
+        return None
+
     def get_section_by_uid_weak(self, uid):
         if uid not in self._requirements_parents:
             return None
@@ -555,27 +574,10 @@ def validate_can_create_uid(self, uid: str):
 
         existing_node_with_uid: Union[
             Document, Section, Requirement, None
-        ] = None
+        ] = self.find_node_by_uid_weak(uid)
 
-        for document in self.document_tree.document_list:
-            document_iterator = DocumentCachingIterator(document)
-            for node in document_iterator.all_content():
-                if isinstance(node, Document):
-                    if node.config.uid == uid:
-                        existing_node_with_uid = node
-                        break
-                elif isinstance(node, Section):
-                    if node.reserved_uid == uid:
-                        existing_node_with_uid = node
-                        break
-                elif isinstance(node, Requirement):
-                    if node.reserved_uid == uid:
-                        existing_node_with_uid = node
-                        break
-                else:
-                    raise NotImplementedError
-            else:
-                return
+        if existing_node_with_uid is None:
+            return
 
         raise SingleValidationError(
             "UID uniqueness validation error: "

diff --git a/...sts_in_tree/expected_output/document.sdoc → ...sts_in_tree/expected_output/document.sdoc b/...sts_in_tree/expected_output/document.sdoc → ...sts_in_tree/expected_output/document.sdoc
diff --git a/...lready_exists_in_tree/input/document.sdoc → ...lready_exists_in_tree/input/document.sdoc b/...lready_exists_in_tree/input/document.sdoc → ...lready_exists_in_tree/input/document.sdoc
diff --git a/...t_create_anchor_already_exists_in_tree.py → ...t_create_anchor_already_exists_in_tree.py b/...t_create_anchor_already_exists_in_tree.py → ...t_create_anchor_already_exists_in_tree.py
diff --git a/...ment_create_anchor_broken_rst/__init__.py → ...ment_create_anchor_broken_rst/__init__.py b/...ment_create_anchor_broken_rst/__init__.py → ...ment_create_anchor_broken_rst/__init__.py
diff --git a/..._broken_rst/expected_output/document.sdoc → ..._broken_rst/expected_output/document.sdoc b/..._broken_rst/expected_output/document.sdoc → ..._broken_rst/expected_output/document.sdoc
diff --git a/...ate_anchor_broken_rst/input/document.sdoc → ...ate_anchor_broken_rst/input/document.sdoc b/...ate_anchor_broken_rst/input/document.sdoc → ...ate_anchor_broken_rst/input/document.sdoc
diff --git a/...ent_create_anchor_broken_rst/test_case.py → ...ent_create_anchor_broken_rst/test_case.py b/...ent_create_anchor_broken_rst/test_case.py → ...ent_create_anchor_broken_rst/test_case.py
diff --git a/...ated_anchor/expected_output/document.sdoc → ...ated_anchor/expected_output/document.sdoc b/...ated_anchor/expected_output/document.sdoc → ...ated_anchor/expected_output/document.sdoc
diff --git a/...ate_duplicated_anchor/input/document.sdoc → ...ate_duplicated_anchor/input/document.sdoc b/...ate_duplicated_anchor/input/document.sdoc → ...ate_duplicated_anchor/input/document.sdoc
diff --git a/...test_document_create_duplicated_anchor.py → ...test_document_create_duplicated_anchor.py b/...test_document_create_duplicated_anchor.py → ...test_document_create_duplicated_anchor.py
diff --git a/...oming_links/expected_output/document.sdoc → ...oming_links/expected_output/document.sdoc b/...oming_links/expected_output/document.sdoc → ...oming_links/expected_output/document.sdoc
diff --git a/...at_has_incoming_links/input/document.sdoc → ...at_has_incoming_links/input/document.sdoc b/...at_has_incoming_links/input/document.sdoc → ...at_has_incoming_links/input/document.sdoc
diff --git a/..._remove_anchor_that_has_incoming_links.py → ..._remove_anchor_that_has_incoming_links.py b/..._remove_anchor_that_has_incoming_links.py → ..._remove_anchor_that_has_incoming_links.py
diff --git a/...oming_links/expected_output/document.sdoc → ...oming_links/expected_output/document.sdoc b/...oming_links/expected_output/document.sdoc → ...oming_links/expected_output/document.sdoc
diff --git a/...at_has_incoming_links/input/document.sdoc → ...at_has_incoming_links/input/document.sdoc b/...at_has_incoming_links/input/document.sdoc → ...at_has_incoming_links/input/document.sdoc
diff --git a/...xt_with_anchor_that_has_incoming_links.py → ...xt_with_anchor_that_has_incoming_links.py b/...xt_with_anchor_that_has_incoming_links.py → ...xt_with_anchor_that_has_incoming_links.py
diff --git a/...oming_links/expected_output/document.sdoc → ...oming_links/expected_output/document.sdoc b/...oming_links/expected_output/document.sdoc → ...oming_links/expected_output/document.sdoc
diff --git a/...at_has_incoming_links/input/document.sdoc → ...at_has_incoming_links/input/document.sdoc b/...at_has_incoming_links/input/document.sdoc → ...at_has_incoming_links/input/document.sdoc
diff --git a/...remove_section_that_has_incoming_links.py → ...remove_section_that_has_incoming_links.py b/...remove_section_that_has_incoming_links.py → ...remove_section_that_has_incoming_links.py
diff --git a/...isting_node/expected_output/document.sdoc → ...isting_node/expected_output/document.sdoc b/...isting_node/expected_output/document.sdoc → ...isting_node/expected_output/document.sdoc
diff --git a/...k_to_nonexisting_node/input/document.sdoc → ...k_to_nonexisting_node/input/document.sdoc b/...k_to_nonexisting_node/input/document.sdoc → ...k_to_nonexisting_node/input/document.sdoc
diff --git a/..._must_not_add_link_to_nonexisting_node.py → ..._must_not_add_link_to_nonexisting_node.py b/..._must_not_add_link_to_nonexisting_node.py → ..._must_not_add_link_to_nonexisting_node.py
diff --git a/...n_with_link/expected_output/document.sdoc → ...n_with_link/expected_output/document.sdoc b/...n_with_link/expected_output/document.sdoc → ...n_with_link/expected_output/document.sdoc
diff --git a/...ate_section_with_link/input/document.sdoc → ...ate_section_with_link/input/document.sdoc b/...ate_section_with_link/input/document.sdoc → ...ate_section_with_link/input/document.sdoc
diff --git a/...dd_anchor_and_create_section_with_link.py → ...dd_anchor_and_create_section_with_link.py b/...dd_anchor_and_create_section_with_link.py → ...dd_anchor_and_create_section_with_link.py
diff --git a/...d_anchor_and_replace_existing/__init__.py → ...d_anchor_and_replace_existing/__init__.py b/...d_anchor_and_replace_existing/__init__.py → ...d_anchor_and_replace_existing/__init__.py
diff --git a/...ce_existing/expected_output/document.sdoc → ...ce_existing/expected_output/document.sdoc b/...ce_existing/expected_output/document.sdoc → ...ce_existing/expected_output/document.sdoc
diff --git a/..._and_replace_existing/input/document.sdoc → ..._and_replace_existing/input/document.sdoc b/..._and_replace_existing/input/document.sdoc → ..._and_replace_existing/input/document.sdoc
diff --git a/..._anchor_and_replace_existing/test_case.py → ..._anchor_and_replace_existing/test_case.py b/..._anchor_and_replace_existing/test_case.py → ..._anchor_and_replace_existing/test_case.py
diff --git a/...cond_anchor/expected_output/document.sdoc → ...cond_anchor/expected_output/document.sdoc b/...cond_anchor/expected_output/document.sdoc → ...cond_anchor/expected_output/document.sdoc
diff --git a/...ent_add_second_anchor/input/document.sdoc → ...ent_add_second_anchor/input/document.sdoc b/...ent_add_second_anchor/input/document.sdoc → ...ent_add_second_anchor/input/document.sdoc
diff --git a/...test_update_document_add_second_anchor.py → ...test_update_document_add_second_anchor.py b/...test_update_document_add_second_anchor.py → ...test_update_document_add_second_anchor.py
diff --git a/...h_same_link/expected_output/document.sdoc → ...h_same_link/expected_output/document.sdoc b/...h_same_link/expected_output/document.sdoc → ...h_same_link/expected_output/document.sdoc
diff --git a/...e_text_with_same_link/input/document.sdoc → ...e_text_with_same_link/input/document.sdoc b/...e_text_with_same_link/input/document.sdoc → ...e_text_with_same_link/input/document.sdoc
diff --git a/...cument_update_free_text_with_same_link.py → ...cument_update_free_text_with_same_link.py b/...cument_update_free_text_with_same_link.py → ...cument_update_free_text_with_same_link.py
diff --git a/...same_anchor/expected_output/document.sdoc → ...same_anchor/expected_output/document.sdoc b/...same_anchor/expected_output/document.sdoc → ...same_anchor/expected_output/document.sdoc
diff --git a/...ment_with_same_anchor/input/document.sdoc → ...ment_with_same_anchor/input/document.sdoc b/...ment_with_same_anchor/input/document.sdoc → ...ment_with_same_anchor/input/document.sdoc
diff --git a/.../test_update_document_with_same_anchor.py → .../test_update_document_with_same_anchor.py b/.../test_update_document_with_same_anchor.py → .../test_update_document_with_same_anchor.py
diff --git a/...ust_not_add_anchor_broken_rst/__init__.py → ...ust_not_add_anchor_broken_rst/__init__.py b/...ust_not_add_anchor_broken_rst/__init__.py → ...ust_not_add_anchor_broken_rst/__init__.py
diff --git a/..._broken_rst/expected_output/document.sdoc → ..._broken_rst/expected_output/document.sdoc b/..._broken_rst/expected_output/document.sdoc → ..._broken_rst/expected_output/document.sdoc
diff --git a/...add_anchor_broken_rst/input/document.sdoc → ...add_anchor_broken_rst/input/document.sdoc b/...add_anchor_broken_rst/input/document.sdoc → ...add_anchor_broken_rst/input/document.sdoc
diff --git a/...st_not_add_anchor_broken_rst/test_case.py → ...st_not_add_anchor_broken_rst/test_case.py b/...st_not_add_anchor_broken_rst/test_case.py → ...st_not_add_anchor_broken_rst/test_case.py
diff --git a/...isting_node/expected_output/document.sdoc → ...isting_node/expected_output/document.sdoc b/...isting_node/expected_output/document.sdoc → ...isting_node/expected_output/document.sdoc
diff --git a/...k_to_nonexisting_node/input/document.sdoc → ...k_to_nonexisting_node/input/document.sdoc b/...k_to_nonexisting_node/input/document.sdoc → ...k_to_nonexisting_node/input/document.sdoc
diff --git a/..._must_not_add_link_to_nonexisting_node.py → ..._must_not_add_link_to_nonexisting_node.py b/..._must_not_add_link_to_nonexisting_node.py → ..._must_not_add_link_to_nonexisting_node.py
diff --git a/...section_add_anchor_broken_rst/__init__.py → ...section_add_anchor_broken_rst/__init__.py b/...section_add_anchor_broken_rst/__init__.py → ...section_add_anchor_broken_rst/__init__.py
diff --git a/..._broken_rst/expected_output/document.sdoc → ..._broken_rst/expected_output/document.sdoc b/..._broken_rst/expected_output/document.sdoc → ..._broken_rst/expected_output/document.sdoc
diff --git a/...add_anchor_broken_rst/input/document.sdoc → ...add_anchor_broken_rst/input/document.sdoc b/...add_anchor_broken_rst/input/document.sdoc → ...add_anchor_broken_rst/input/document.sdoc
diff --git a/...ection_add_anchor_broken_rst/test_case.py → ...ection_add_anchor_broken_rst/test_case.py b/...ection_add_anchor_broken_rst/test_case.py → ...ection_add_anchor_broken_rst/test_case.py
diff --git a/...sts_in_tree/expected_output/document.sdoc → ...sts_in_tree/expected_output/document.sdoc b/...sts_in_tree/expected_output/document.sdoc → ...sts_in_tree/expected_output/document.sdoc
diff --git a/...lready_exists_in_tree/input/document.sdoc → ...lready_exists_in_tree/input/document.sdoc b/...lready_exists_in_tree/input/document.sdoc → ...lready_exists_in_tree/input/document.sdoc
diff --git a/...add_anchor_that_already_exists_in_tree.py → ...add_anchor_that_already_exists_in_tree.py b/...add_anchor_that_already_exists_in_tree.py → ...add_anchor_that_already_exists_in_tree.py
diff --git a/...isting_node/expected_output/document.sdoc → ...isting_node/expected_output/document.sdoc b/...isting_node/expected_output/document.sdoc → ...isting_node/expected_output/document.sdoc
diff --git a/...k_to_nonexisting_node/input/document.sdoc → ...k_to_nonexisting_node/input/document.sdoc b/...k_to_nonexisting_node/input/document.sdoc → ...k_to_nonexisting_node/input/document.sdoc
diff --git a/..._must_not_add_link_to_nonexisting_node.py → ..._must_not_add_link_to_nonexisting_node.py b/..._must_not_add_link_to_nonexisting_node.py → ..._must_not_add_link_to_nonexisting_node.py
diff --git a/...o_same_node/expected_output/document.sdoc → ...o_same_node/expected_output/document.sdoc b/...o_same_node/expected_output/document.sdoc → ...o_same_node/expected_output/document.sdoc
diff --git a/...d_anchor_to_same_node/input/document.sdoc → ...d_anchor_to_same_node/input/document.sdoc b/...d_anchor_to_same_node/input/document.sdoc → ...d_anchor_to_same_node/input/document.sdoc
diff --git a/...add_new_duplicated_anchor_to_same_node.py → ...add_new_duplicated_anchor_to_same_node.py b/...add_new_duplicated_anchor_to_same_node.py → ...add_new_duplicated_anchor_to_same_node.py
diff --git a/...ng_anchor_with_incoming_links/__init__.py → ...ng_anchor_with_incoming_links/__init__.py b/...ng_anchor_with_incoming_links/__init__.py → ...ng_anchor_with_incoming_links/__init__.py
diff --git a/...oming_links/expected_output/document.sdoc → ...oming_links/expected_output/document.sdoc b/...oming_links/expected_output/document.sdoc → ...oming_links/expected_output/document.sdoc
diff --git a/...r_with_incoming_links/input/document.sdoc → ...r_with_incoming_links/input/document.sdoc b/...r_with_incoming_links/input/document.sdoc → ...r_with_incoming_links/input/document.sdoc
diff --git a/...g_anchor_with_incoming_links/test_case.py → ...g_anchor_with_incoming_links/test_case.py b/...g_anchor_with_incoming_links/test_case.py → ...g_anchor_with_incoming_links/test_case.py
diff --git a/...nchor_that_has_incoming_links/__init__.py → ...nchor_that_has_incoming_links/__init__.py b/...nchor_that_has_incoming_links/__init__.py → ...nchor_that_has_incoming_links/__init__.py
diff --git a/...oming_links/expected_output/document.sdoc → ...oming_links/expected_output/document.sdoc b/...oming_links/expected_output/document.sdoc → ...oming_links/expected_output/document.sdoc
diff --git a/...at_has_incoming_links/input/document.sdoc → ...at_has_incoming_links/input/document.sdoc b/...at_has_incoming_links/input/document.sdoc → ...at_has_incoming_links/input/document.sdoc
diff --git a/...chor_that_has_incoming_links/test_case.py → ...chor_that_has_incoming_links/test_case.py b/...chor_that_has_incoming_links/test_case.py → ...chor_that_has_incoming_links/test_case.py
diff --git a/...oming_links/expected_output/document.sdoc → ...oming_links/expected_output/document.sdoc b/...oming_links/expected_output/document.sdoc → ...oming_links/expected_output/document.sdoc
diff --git a/...at_has_incoming_links/input/document.sdoc → ...at_has_incoming_links/input/document.sdoc b/...at_has_incoming_links/input/document.sdoc → ...at_has_incoming_links/input/document.sdoc
diff --git a/...ion_remove_uid_that_has_incoming_links.py → ...ion_remove_uid_that_has_incoming_links.py b/...ion_remove_uid_that_has_incoming_links.py → ...ion_remove_uid_that_has_incoming_links.py
diff --git a/...oming_links/expected_output/document.sdoc → ...oming_links/expected_output/document.sdoc b/...oming_links/expected_output/document.sdoc → ...oming_links/expected_output/document.sdoc
diff --git a/...at_has_incoming_links/input/document.sdoc → ...at_has_incoming_links/input/document.sdoc b/...at_has_incoming_links/input/document.sdoc → ...at_has_incoming_links/input/document.sdoc
diff --git a/...ion_rename_uid_that_has_incoming_links.py → ...ion_rename_uid_that_has_incoming_links.py b/...ion_rename_uid_that_has_incoming_links.py → ...ion_rename_uid_that_has_incoming_links.py
diff --git a/...n_with_link/expected_output/document.sdoc → ...n_with_link/expected_output/document.sdoc b/...n_with_link/expected_output/document.sdoc → ...n_with_link/expected_output/document.sdoc
diff --git a/...and_section_with_link/input/document.sdoc → ...and_section_with_link/input/document.sdoc b/...and_section_with_link/input/document.sdoc → ...and_section_with_link/input/document.sdoc
diff --git a/...tion_with_anchor_and_section_with_link.py → ...tion_with_anchor_and_section_with_link.py b/...tion_with_anchor_and_section_with_link.py → ...tion_with_anchor_and_section_with_link.py
diff --git a/...her_section/expected_output/document.sdoc → ...her_section/expected_output/document.sdoc b/...her_section/expected_output/document.sdoc → ...her_section/expected_output/document.sdoc
diff --git a/...nk_in_another_section/input/document.sdoc → ...nk_in_another_section/input/document.sdoc b/...nk_in_another_section/input/document.sdoc → ...nk_in_another_section/input/document.sdoc
diff --git a/...in_section_and_link_in_another_section.py → ...in_section_and_link_in_another_section.py b/...in_section_and_link_in_another_section.py → ...in_section_and_link_in_another_section.py
diff --git a/...tion_anchor/expected_output/document.sdoc → ...tion_anchor/expected_output/document.sdoc b/...tion_anchor/expected_output/document.sdoc → ...tion_anchor/expected_output/document.sdoc
diff --git a/...isting_section_anchor/input/document.sdoc → ...isting_section_anchor/input/document.sdoc b/...isting_section_anchor/input/document.sdoc → ...isting_section_anchor/input/document.sdoc
diff --git a/...on_add_link_to_existing_section_anchor.py → ...on_add_link_to_existing_section_anchor.py b/...on_add_link_to_existing_section_anchor.py → ...on_add_link_to_existing_section_anchor.py
diff --git a/...cond_anchor/expected_output/document.sdoc → ...cond_anchor/expected_output/document.sdoc b/...cond_anchor/expected_output/document.sdoc → ...cond_anchor/expected_output/document.sdoc
diff --git a/...ion_add_second_anchor/input/document.sdoc → ...ion_add_second_anchor/input/document.sdoc b/...ion_add_second_anchor/input/document.sdoc → ...ion_add_second_anchor/input/document.sdoc
diff --git a/.../test_update_section_add_second_anchor.py → .../test_update_section_add_second_anchor.py b/.../test_update_section_add_second_anchor.py → .../test_update_section_add_second_anchor.py
diff --git a/...with_anchor/expected_output/document.sdoc → ...with_anchor/expected_output/document.sdoc b/...with_anchor/expected_output/document.sdoc → ...with_anchor/expected_output/document.sdoc
diff --git a/..._freetext_with_anchor/input/document.sdoc → ..._freetext_with_anchor/input/document.sdoc b/..._freetext_with_anchor/input/document.sdoc → ..._freetext_with_anchor/input/document.sdoc
diff --git a/...te_section_remove_freetext_with_anchor.py → ...te_section_remove_freetext_with_anchor.py b/...te_section_remove_freetext_with_anchor.py → ...te_section_remove_freetext_with_anchor.py
diff --git a/..._new_anchor/expected_output/document.sdoc → ..._new_anchor/expected_output/document.sdoc b/..._new_anchor/expected_output/document.sdoc → ..._new_anchor/expected_output/document.sdoc
diff --git a/...nchor_with_new_anchor/input/document.sdoc → ...nchor_with_new_anchor/input/document.sdoc b/...nchor_with_new_anchor/input/document.sdoc → ...nchor_with_new_anchor/input/document.sdoc
diff --git a/...section_replace_anchor_with_new_anchor.py → ...section_replace_anchor_with_new_anchor.py b/...section_replace_anchor_with_new_anchor.py → ...section_replace_anchor_with_new_anchor.py
diff --git a/...k_to_anchor/expected_output/document.sdoc → ...k_to_anchor/expected_output/document.sdoc b/...k_to_anchor/expected_output/document.sdoc → ...k_to_anchor/expected_output/document.sdoc
diff --git a/...nother_link_to_anchor/input/document.sdoc → ...nother_link_to_anchor/input/document.sdoc b/...nother_link_to_anchor/input/document.sdoc → ...nother_link_to_anchor/input/document.sdoc
diff --git a/..._to_anchor_with_another_link_to_anchor.py → ..._to_anchor_with_another_link_to_anchor.py b/..._to_anchor_with_another_link_to_anchor.py → ..._to_anchor_with_another_link_to_anchor.py
diff --git a/..._to_section/expected_output/document.sdoc → ..._to_section/expected_output/document.sdoc b/..._to_section/expected_output/document.sdoc → ..._to_section/expected_output/document.sdoc
diff --git a/...other_link_to_section/input/document.sdoc → ...other_link_to_section/input/document.sdoc b/...other_link_to_section/input/document.sdoc → ...other_link_to_section/input/document.sdoc
diff --git a/...o_section_with_another_link_to_section.py → ...o_section_with_another_link_to_section.py b/...o_section_with_another_link_to_section.py → ...o_section_with_another_link_to_section.py
diff --git a/...same_anchor/expected_output/document.sdoc → ...same_anchor/expected_output/document.sdoc b/...same_anchor/expected_output/document.sdoc → ...same_anchor/expected_output/document.sdoc
diff --git a/...tion_with_same_anchor/input/document.sdoc → ...tion_with_same_anchor/input/document.sdoc b/...tion_with_same_anchor/input/document.sdoc → ...tion_with_same_anchor/input/document.sdoc
diff --git a/...r/test_update_section_with_same_anchor.py → ...r/test_update_section_with_same_anchor.py b/...r/test_update_section_with_same_anchor.py → ...r/test_update_section_with_same_anchor.py
diff --git a/...ion_with_same_link_to_section/__init__.py → ...ion_with_same_link_to_section/__init__.py b/...ion_with_same_link_to_section/__init__.py → ...ion_with_same_link_to_section/__init__.py
diff --git a/..._to_section/expected_output/document.sdoc → ..._to_section/expected_output/document.sdoc b/..._to_section/expected_output/document.sdoc → ..._to_section/expected_output/document.sdoc
diff --git a/..._same_link_to_section/input/document.sdoc → ..._same_link_to_section/input/document.sdoc b/..._same_link_to_section/input/document.sdoc → ..._same_link_to_section/input/document.sdoc
diff --git a/...on_with_same_link_to_section/test_case.py → ...on_with_same_link_to_section/test_case.py b/...on_with_same_link_to_section/test_case.py → ...on_with_same_link_to_section/test_case.py
diff --git a/...reate_uid_that_already_exists/__init__.py → ...te_section_with_nonunique_uid/__init__.py b/...reate_uid_that_already_exists/__init__.py → ...te_section_with_nonunique_uid/__init__.py
diff --git a/...nunique_uid/expected_output/document.sdoc → ...nunique_uid/expected_output/document.sdoc b/...nunique_uid/expected_output/document.sdoc → ...nunique_uid/expected_output/document.sdoc
diff --git a/...on_with_nonunique_uid/input/document.sdoc → ...on_with_nonunique_uid/input/document.sdoc b/...on_with_nonunique_uid/input/document.sdoc → ...on_with_nonunique_uid/input/document.sdoc
diff --git a/...rror_create_section_with_nonunique_uid.py → ...e_section_with_nonunique_uid/test_case.py b/...rror_create_section_with_nonunique_uid.py → ...e_section_with_nonunique_uid/test_case.py
@@ -1,5 +1,4 @@
-from seleniumbase import BaseCase
-
+from tests.end2end.e2e_case import E2ECase
 from tests.end2end.end2end_test_setup import End2EndTestSetup
 from tests.end2end.helpers.screens.document.form_edit_section import (
     Form_EditSection,
@@ -10,7 +9,7 @@
 from tests.end2end.server import SDocTestServer
 
 
-class Test_UC03_G1_T01_SectionWithEmptyName(BaseCase):
+class Test(E2ECase):
     def test(self):
         test_setup = End2EndTestSetup(path_to_test_file=__file__)
 

diff --git a/...screens/document/create_section/_validations/create_two_section_with_same_uid/__init__.py b/...screens/document/create_section/_validations/create_two_section_with_same_uid/__init__.py
diff --git a/...reate_section/_validations/create_two_section_with_same_uid/expected_output/document.sdoc b/...reate_section/_validations/create_two_section_with_same_uid/expected_output/document.sdoc
@@ -0,0 +1,16 @@
+[DOCUMENT]
+TITLE: Document 1
+
+[FREETEXT]
+Hello world!
+[/FREETEXT]
+
+[SECTION]
+UID: SAME-UID
+TITLE: Section 1
+
+[FREETEXT]
+Section 1 free text.
+[/FREETEXT]
+
+[/SECTION]
diff --git a/...document/create_section/_validations/create_two_section_with_same_uid/input/document.sdoc b/...document/create_section/_validations/create_two_section_with_same_uid/input/document.sdoc
@@ -0,0 +1,6 @@
+[DOCUMENT]
+TITLE: Document 1
+
+[FREETEXT]
+Hello world!
+[/FREETEXT]
diff --git a/...creens/document/create_section/_validations/create_two_section_with_same_uid/test_case.py b/...creens/document/create_section/_validations/create_two_section_with_same_uid/test_case.py
@@ -0,0 +1,61 @@
+from tests.end2end.e2e_case import E2ECase
+from tests.end2end.end2end_test_setup import End2EndTestSetup
+from tests.end2end.helpers.screens.document.form_edit_section import (
+    Form_EditSection,
+)
+from tests.end2end.helpers.screens.project_index.screen_project_index import (
+    Screen_ProjectIndex,
+)
+from tests.end2end.server import SDocTestServer
+
+
+class Test(E2ECase):
+    def test(self):
+        test_setup = End2EndTestSetup(path_to_test_file=__file__)
+
+        with SDocTestServer(
+            input_path=test_setup.path_to_sandbox
+        ) as test_server:
+            self.open(test_server.get_host_and_port())
+
+            screen_project_index = Screen_ProjectIndex(self)
+
+            screen_project_index.assert_on_screen()
+            screen_project_index.assert_contains_document("Document 1")
+
+            screen_document = screen_project_index.do_click_on_first_document()
+
+            screen_document.assert_on_screen_document()
+            screen_document.assert_header_document_title("Document 1")
+
+            screen_document.assert_text("Hello world!")
+
+            root_node = screen_document.get_root_node()
+
+            root_node_menu = root_node.do_open_node_menu()
+
+            form_edit_section: Form_EditSection = (
+                root_node_menu.do_node_add_section_first()
+            )
+
+            form_edit_section.do_fill_in_title("Section 1")
+            form_edit_section.do_fill_in_text("Section 1 free text.")
+            form_edit_section.do_fill_in_uid("SAME-UID")
+            form_edit_section.do_form_submit()
+
+            created_section = screen_document.get_section()
+            created_section_menu = created_section.do_open_node_menu()
+
+            form_edit_section: Form_EditSection = (
+                created_section_menu.do_node_add_section_below()
+            )
+            form_edit_section.do_fill_in_title("Section 2")
+            form_edit_section.do_fill_in_text("Section 2 free text.")
+            form_edit_section.do_fill_in_uid("SAME-UID")
+
+            form_edit_section.do_form_submit_and_catch_error(
+                "The chosen UID must be unique. "
+                "There is another section 'Section 1' with a UID 'SAME-UID'."
+            )
+
+        assert test_setup.compare_sandbox_and_expected_output()
diff --git a/tests/end2end/screens/document/create_section/create_first_section/__init__.py b/tests/end2end/screens/document/create_section/create_first_section/__init__.py
diff --git a/...irst_section/test_create_first_section.py → ...section/create_first_section/test_case.py b/...irst_section/test_create_first_section.py → ...section/create_first_section/test_case.py
diff --git a/...screens/document/create_section/create_two_sections_then_update_with_same_uid/__init__.py b/...screens/document/create_section/create_two_sections_then_update_with_same_uid/__init__.py
diff --git a/...reate_section/create_two_sections_then_update_with_same_uid/expected_output/document.sdoc b/...reate_section/create_two_sections_then_update_with_same_uid/expected_output/document.sdoc
@@ -0,0 +1,25 @@
+[DOCUMENT]
+TITLE: Document 1
+
+[FREETEXT]
+Hello world!
+[/FREETEXT]
+
+[SECTION]
+UID: SAME-UID
+TITLE: Section 1
+
+[FREETEXT]
+Section 1 free text.
+[/FREETEXT]
+
+[/SECTION]
+
+[SECTION]
+TITLE: Section 2
+
+[FREETEXT]
+Section 2 free text.
+[/FREETEXT]
+
+[/SECTION]
diff --git a/...document/create_section/create_two_sections_then_update_with_same_uid/input/document.sdoc b/...document/create_section/create_two_sections_then_update_with_same_uid/input/document.sdoc
@@ -0,0 +1,6 @@
+[DOCUMENT]
+TITLE: Document 1
+
+[FREETEXT]
+Hello world!
+[/FREETEXT]
diff --git a/...creens/document/create_section/create_two_sections_then_update_with_same_uid/test_case.py b/...creens/document/create_section/create_two_sections_then_update_with_same_uid/test_case.py
@@ -0,0 +1,66 @@
+from tests.end2end.e2e_case import E2ECase
+from tests.end2end.end2end_test_setup import End2EndTestSetup
+from tests.end2end.helpers.screens.document.form_edit_section import (
+    Form_EditSection,
+)
+from tests.end2end.helpers.screens.project_index.screen_project_index import (
+    Screen_ProjectIndex,
+)
+from tests.end2end.server import SDocTestServer
+
+
+class Test(E2ECase):
+    def test(self):
+        test_setup = End2EndTestSetup(path_to_test_file=__file__)
+
+        with SDocTestServer(
+            input_path=test_setup.path_to_sandbox
+        ) as test_server:
+            self.open(test_server.get_host_and_port())
+
+            screen_project_index = Screen_ProjectIndex(self)
+
+            screen_project_index.assert_on_screen()
+            screen_project_index.assert_contains_document("Document 1")
+
+            screen_document = screen_project_index.do_click_on_first_document()
+
+            screen_document.assert_on_screen_document()
+            screen_document.assert_header_document_title("Document 1")
+
+            screen_document.assert_text("Hello world!")
+
+            root_node = screen_document.get_root_node()
+
+            root_node_menu = root_node.do_open_node_menu()
+
+            form_edit_section: Form_EditSection = (
+                root_node_menu.do_node_add_section_first()
+            )
+
+            form_edit_section.do_fill_in_title("Section 1")
+            form_edit_section.do_fill_in_text("Section 1 free text.")
+            form_edit_section.do_fill_in_uid("SAME-UID")
+            form_edit_section.do_form_submit()
+
+            created_section = screen_document.get_section()
+            created_section_menu = created_section.do_open_node_menu()
+
+            form_edit_section: Form_EditSection = (
+                created_section_menu.do_node_add_section_below()
+            )
+            form_edit_section.do_fill_in_title("Section 2")
+            form_edit_section.do_fill_in_text("Section 2 free text.")
+            form_edit_section.do_form_submit()
+
+            created_section = screen_document.get_section(node_order=2)
+            form_edit_section: Form_EditSection = (
+                created_section.do_open_form_edit_section()
+            )
+            form_edit_section.do_fill_in_uid("SAME-UID")
+            form_edit_section.do_form_submit_and_catch_error(
+                "UID uniqueness validation error: "
+                "There is already an existing node with this UID: Section 1."
+            )
+
+        assert test_setup.compare_sandbox_and_expected_output()
diff --git a/.../document/update_section/_validation/update_section_create_two_duplicate_uids/__init__.py b/.../document/update_section/_validation/update_section_create_two_duplicate_uids/__init__.py
diff --git a/...ection/_validation/update_section_create_two_duplicate_uids/expected_output/document.sdoc b/...ection/_validation/update_section_create_two_duplicate_uids/expected_output/document.sdoc
@@ -0,0 +1,25 @@
+[DOCUMENT]
+TITLE: Document 1
+
+[FREETEXT]
+Hello world!
+[/FREETEXT]
+
+[SECTION]
+UID: DUPLICATE_UID
+TITLE: First section
+
+[FREETEXT]
+This is a free text of this section.
+[/FREETEXT]
+
+[/SECTION]
+
+[SECTION]
+TITLE: Second section
+
+[FREETEXT]
+This is a free text of this section.
+[/FREETEXT]
+
+[/SECTION]
diff --git a/...t/update_section/_validation/update_section_create_two_duplicate_uids/input/document.sdoc b/...t/update_section/_validation/update_section_create_two_duplicate_uids/input/document.sdoc
@@ -0,0 +1,24 @@
+[DOCUMENT]
+TITLE: Document 1
+
+[FREETEXT]
+Hello world!
+[/FREETEXT]
+
+[SECTION]
+TITLE: First section
+
+[FREETEXT]
+This is a free text of this section.
+[/FREETEXT]
+
+[/SECTION]
+
+[SECTION]
+TITLE: Second section
+
+[FREETEXT]
+This is a free text of this section.
+[/FREETEXT]
+
+[/SECTION]
diff --git a/...document/update_section/_validation/update_section_create_two_duplicate_uids/test_case.py b/...document/update_section/_validation/update_section_create_two_duplicate_uids/test_case.py
@@ -0,0 +1,51 @@
+from seleniumbase import BaseCase
+
+from tests.end2end.end2end_test_setup import End2EndTestSetup
+from tests.end2end.helpers.screens.document.form_edit_section import (
+    Form_EditSection,
+)
+from tests.end2end.helpers.screens.project_index.screen_project_index import (
+    Screen_ProjectIndex,
+)
+from tests.end2end.server import SDocTestServer
+
+
+class Test(BaseCase):
+    def test(self):
+        test_setup = End2EndTestSetup(path_to_test_file=__file__)
+
+        with SDocTestServer(
+            input_path=test_setup.path_to_sandbox
+        ) as test_server:
+            self.open(test_server.get_host_and_port())
+
+            screen_project_index = Screen_ProjectIndex(self)
+
+            screen_project_index.assert_on_screen()
+            screen_project_index.assert_contains_document("Document 1")
+
+            screen_document = screen_project_index.do_click_on_first_document()
+
+            screen_document.assert_on_screen_document()
+            screen_document.assert_header_document_title("Document 1")
+
+            screen_document.assert_text("Hello world!")
+
+            section = screen_document.get_section()
+            form_edit_section: Form_EditSection = (
+                section.do_open_form_edit_section()
+            )
+            form_edit_section.do_fill_in_uid("DUPLICATE_UID")
+            form_edit_section.do_form_submit()
+
+            section = screen_document.get_section(node_order=2)
+            form_edit_section: Form_EditSection = (
+                section.do_open_form_edit_section()
+            )
+            form_edit_section.do_fill_in_uid("DUPLICATE_UID")
+            form_edit_section.do_form_submit_and_catch_error(
+                "UID uniqueness validation error: "
+                "There is already an existing node with this UID: First section."
+            )
+
+        assert test_setup.compare_sandbox_and_expected_output()
diff --git a/...ment/update_section/_validation/update_section_create_uid_that_already_exists/__init__.py b/...ment/update_section/_validation/update_section_create_uid_that_already_exists/__init__.py
diff --git a/...eady_exists/expected_output/document.sdoc → ...eady_exists/expected_output/document.sdoc b/...eady_exists/expected_output/document.sdoc → ...eady_exists/expected_output/document.sdoc
diff --git a/...d_that_already_exists/input/document.sdoc → ...d_that_already_exists/input/document.sdoc b/...d_that_already_exists/input/document.sdoc → ...d_that_already_exists/input/document.sdoc
diff --git a/...eate_uid_that_already_exists/test_case.py → ...eate_uid_that_already_exists/test_case.py b/...eate_uid_that_already_exists/test_case.py → ...eate_uid_that_already_exists/test_case.py