diff options
| author | Michael Williamson <mike@zwobble.org> | 2019-03-17 18:29:54 +0000 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2019-03-17 18:29:54 +0000 |
| commit | 65bcf3a7c50b1ec7b57d4974ad377ed66d6c98c8 (patch) | |
| tree | e4d3c58407866c140655552ca53f25eaca3c4a77 /src/test/java/org/zwobble/mammoth | |
| parent | 15daf7d09b8f3da093eea154f49579cdf2002fa7 (diff) | |
Defer resolution of abstract nums until necessary
Diffstat (limited to 'src/test/java/org/zwobble/mammoth')
| -rw-r--r-- | src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java | 17 |
1 files changed, 14 insertions, 3 deletions
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 b12a5fe..e115c1a 100644 --- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.function.Function; +import java.util.stream.Collectors; import static java.util.Arrays.asList; import static org.hamcrest.MatcherAssert.assertThat; @@ -197,7 +198,7 @@ public class BodyXmlTests { element("w:ilvl", map("w:val", "1")), element("w:numId", map("w:val", "42")))))))); - Numbering numbering = new Numbering(map("42", map("1", NumberingLevel.ordered("1")))); + Numbering numbering = numberingMap(map("42", map("1", NumberingLevel.ordered("1")))); assertThat( readSuccess(bodyReader(numbering), element), @@ -212,7 +213,7 @@ public class BodyXmlTests { element("w:numPr", map(), list( element("w:numId", map("w:val", "42")))))))); - Numbering numbering = new Numbering(map("42", map("1", NumberingLevel.ordered("1")))); + Numbering numbering = numberingMap(map("42", map("1", NumberingLevel.ordered("1")))); assertThat( readSuccess(bodyReader(numbering), element), @@ -227,7 +228,7 @@ public class BodyXmlTests { element("w:numPr", map(), list( element("w:ilvl", map("w:val", "1")))))))); - Numbering numbering = new Numbering(map("42", map("1", NumberingLevel.ordered("1")))); + Numbering numbering = numberingMap(map("42", map("1", NumberingLevel.ordered("1")))); assertThat( readSuccess(bodyReader(numbering), element), @@ -1437,4 +1438,14 @@ public class BodyXmlTests { private static Relationship imageRelationship(String relationshipId, String target) { return new Relationship(relationshipId, target, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"); } + + private static Numbering numberingMap(Map<String, Map<String, NumberingLevel>> numbering) { + return new Numbering( + numbering, + numbering.keySet().stream().collect(Collectors.toMap( + numId -> numId, + numId -> new Numbering.Num(Optional.of(numId)) + )) + ); + } } |