paragraph.end_bookmark tests

Benjamin Toornstra · Benjamin Toornstra · commit bdbd6fe552a2 · 2019-09-07T07:47:04.000+02:00
diff --git a/docx/text/paragraph.py b/docx/text/paragraph.py
@@ -57,7 +57,7 @@ def alignment(self, value):
     @lazyproperty
     def _bookmarks(self):
         """Global |Bookmarks| object for overall document."""
-        raise NotImplementedError
+        return self.part.bookmarks
 
     def clear(self):
         """
diff --git a/tests/text/test_paragraph.py b/tests/text/test_paragraph.py
@@ -29,6 +29,18 @@
 
 
 class DescribeParagraph(object):
+    def it_can_end_a_bookmark(self, end_bookmark_fixture):
+        blockContainer, name, bookmarkStart, expected_xml = end_bookmark_fixture
+
+        blkcntnr = Paragraph(blockContainer, None)
+        bookmark_ = _Bookmark((bookmarkStart, None))
+
+        bookmark = blkcntnr.end_bookmark(bookmark_)
+
+        assert blkcntnr._element.xml == expected_xml
+        assert bookmark.name == name
+        assert bookmark is bookmark_
+
     def it_can_start_a_bookmark(
         self,
         start_bookmark_fixture,
@@ -208,6 +220,30 @@ def clear_fixture(self, request):
         expected_xml = xml(expected_cxml)
         return paragraph, expected_xml
 
+    @pytest.fixture(
+        params=[
+            # ---at start of paragraph---
+            (
+                "w:p/(w:bookmarkStart{w:name=bmk-1, w:id=24})",
+                "w:bookmarkStart{w:name=bmk-1, w:id=24}",
+                "w:p/(w:bookmarkStart{w:name=bmk-1, w:id=24},w:bookmarkEnd{w:id=24})",
+            ),
+            (
+                # ---run in between bookmarks---
+                'w:p/(w:bookmarkStart{w:name=bmk-1, w:id=24}, w:r/w:t"foobar")',
+                "w:bookmarkStart{w:name=bmk-1, w:id=24}",
+                'w:p/(w:bookmarkStart{w:name=bmk-1, w:id=24},w:r/w:t"foobar", w:bookmarkEnd{w:id=24})',
+            ),
+        ]
+    )
+    def end_bookmark_fixture(self, request):
+        cxml, bookmark_cxml, expected_cxml = request.param
+        blockContainer = element(cxml)
+        bookmarkStart = element(bookmark_cxml)
+        expected_xml = xml(expected_cxml)
+        name = "bmk-1"
+        return blockContainer, name, bookmarkStart, expected_xml
+
     @pytest.fixture(params=[(None, None), ("Foo", None), (None, "Bar"), ("Foo", "Bar")])
     def insert_before_fixture(self, request, _insert_paragraph_before_, add_run_):
         text, style = request.param
