From 45ced503abb4ad1916c4c655578a7b06a5636cd8 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 13 Feb 2016 23:37:36 +0000 Subject: Add vertical alignment property to Run --- .../zwobble/mammoth/tests/documents/DocumentElementMakers.java | 6 ++---- src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java | 9 ++++++++- 2 files changed, 10 insertions(+), 5 deletions(-) (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 93d7f6a..890a68e 100644 --- a/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java +++ b/src/test/java/org/zwobble/mammoth/tests/documents/DocumentElementMakers.java @@ -2,10 +2,7 @@ package org.zwobble.mammoth.tests.documents; import com.natpryce.makeiteasy.Instantiator; import com.natpryce.makeiteasy.Property; -import org.zwobble.mammoth.documents.DocumentElement; -import org.zwobble.mammoth.documents.HasChildren; -import org.zwobble.mammoth.documents.Paragraph; -import org.zwobble.mammoth.documents.Run; +import org.zwobble.mammoth.documents.*; import java.util.List; import java.util.Optional; @@ -28,6 +25,7 @@ public class DocumentElementMakers { false, false, false, + VerticalAlignment.BASELINE, Optional.empty(), propertyLookup.valueOf(CHILDREN, list())); } 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 5c4c40d..d06a6a4 100644 --- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java @@ -257,7 +257,14 @@ public class BodyXmlTests { hasProperty("strikethrough", equalTo(true))); } - // TODO: vertical alignment + @Test + public void runHasBaselineVerticalAlignmentIfVerticalAlignmentElementIsNotPresent() { + XmlElement element = runXmlWithProperties(); + + assertThat( + readSuccess(a(bodyReader), element), + hasProperty("verticalAlignment", equalTo(VerticalAlignment.BASELINE))); + } @Test public void canReadTabElement() { -- cgit v1.2.3