From 59f4df1d2d39e1dee5278626bd2efb16d4a56847 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 1 Aug 2021 17:22:46 +0100 Subject: Explicitly set expected href in tests --- .../zwobble/mammoth/tests/docx/BodyXmlTests.java | 50 ++++++++++++++-------- 1 file changed, 31 insertions(+), 19 deletions(-) (limited to 'src') 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 7e7e980..75af768 100644 --- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java +++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java @@ -286,10 +286,7 @@ public class BodyXmlTests { @SafeVarargs private final Matcher isHyperlinkedRun(Matcher... matchers) { return isRun(hasChildren( - allOf( - isHyperlink(hasHref(URI)), - isHyperlink(matchers) - ) + isHyperlink(matchers) )); } @@ -308,9 +305,12 @@ public class BodyXmlTests { assertThat(paragraph, isParagraph(hasChildren( isEmptyRun(), isEmptyHyperlinkedRun(), - isHyperlinkedRun(hasChildren( - isTextElement("this is a hyperlink") - )), + isHyperlinkedRun( + hasHref(URI), + hasChildren( + isTextElement("this is a hyperlink") + ) + ), isEmptyRun() ))); } @@ -357,9 +357,12 @@ public class BodyXmlTests { assertThat(paragraph, isParagraph(hasChildren( isEmptyRun(), isEmptyHyperlinkedRun(), - isHyperlinkedRun(hasChildren( - isTextElement("this is a hyperlink") - )), + isHyperlinkedRun( + hasHref(URI), + hasChildren( + isTextElement("this is a hyperlink") + ) + ), isEmptyRun() ))); } @@ -389,9 +392,12 @@ public class BodyXmlTests { isEmptyHyperlinkedRun(), isEmptyHyperlinkedRun(), isEmptyHyperlinkedRun(), - isHyperlinkedRun(hasChildren( - isTextElement("this is a hyperlink") - )), + isHyperlinkedRun( + hasHref(URI), + hasChildren( + isTextElement("this is a hyperlink") + ) + ), isEmptyRun() ))); } @@ -419,9 +425,12 @@ public class BodyXmlTests { isEmptyHyperlinkedRun(), isEmptyHyperlinkedRun(), isEmptyHyperlinkedRun(), - isHyperlinkedRun(hasChildren( - isTextElement("John Doe") - )), + isHyperlinkedRun( + hasHref(URI), + hasChildren( + isTextElement("John Doe") + ) + ), isEmptyHyperlinkedRun(), isEmptyRun() ))); @@ -446,9 +455,12 @@ public class BodyXmlTests { isEmptyHyperlinkedRun(), isEmptyHyperlinkedRun(), isEmptyHyperlinkedRun(), - isHyperlinkedRun(hasChildren( - isTextElement("this is a hyperlink") - )), + isHyperlinkedRun( + hasHref(URI), + hasChildren( + isTextElement("this is a hyperlink") + ) + ), isEmptyRun() ))); } -- cgit v1.2.3