From 9b1601ce190df41684d67e49a7a3620d44dcc951 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Thu, 13 Jun 2024 11:21:17 +0100 Subject: Parse run highlights --- .../tests/documents/DocumentElementMakers.java | 2 ++ .../org/zwobble/mammoth/tests/docx/BodyXmlTests.java | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) (limited to 'src/test/java/org') diff --git a/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java b/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java index 510e776..e5bb12b 100644 --- a/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java +++ b/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java @@ -15,6 +15,7 @@ import static org.zwobble.mammoth.tests.Argument.arg; public class DocumentElementMakers { private static final ArgumentKey> STYLE = new ArgumentKey<>("style"); private static final ArgumentKey> NUMBERING = new ArgumentKey<>("numbering"); + private static final ArgumentKey> HIGHLIGHT = new ArgumentKey<>("highlight"); private static final ArgumentKey BOLD = new ArgumentKey<>("bold"); private static final ArgumentKey ITALIC = new ArgumentKey<>("italic"); private static final ArgumentKey UNDERLINE = new ArgumentKey<>("underline"); @@ -118,6 +119,7 @@ public class DocumentElementMakers { public static Run run(Object... args) { Arguments arguments = new Arguments(args); return new Run( + arguments.get(HIGHLIGHT, Optional.empty()), arguments.get(BOLD, false), arguments.get(ITALIC, false), arguments.get(UNDERLINE, false), diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java index 47d4d16..a5cb989 100644 --- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java @@ -859,6 +859,26 @@ public class BodyXmlTests { hasProperty("verticalAlignment", equalTo(VerticalAlignment.SUBSCRIPT))); } + @Test + public void runHasNoHighlightByDefault() { + XmlElement element = runXmlWithProperties(); + + DocumentElement result = readSuccess(bodyReader(), element); + + assertThat(result, hasProperty("highlight", equalTo(Optional.empty()))); + } + + @Test + public void runHasHighlightReadFromProperties() { + XmlElement element = runXmlWithProperties( + element("w:highlight", map("w:val", "yellow")) + ); + + DocumentElement result = readSuccess(bodyReader(), element); + + assertThat(result, hasProperty("highlight", equalTo(Optional.of("yellow")))); + } + @Test public void canReadTabElement() { XmlElement element = element("w:tab"); -- cgit v1.2.3