Pass list of Relationship instances into Relationships

3 files changed, 29 insertions, 18 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 772fdd3..690ae98 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/BodyXmlTests.java
@@ -945,8 +945,9 @@ public class BodyXmlTests {
 
     @Test
     public void hyperlinkIsReadAsExternalHyperlinkIfItHasARelationshipId() {
-        Relationships relationships = new Relationships(
-            map("r42", new Relationship("http://example.com")));
+        Relationships relationships = new Relationships(list(
+            hyperlinkRelationship("r42", "http://example.com")
+        ));
         XmlElement element = element("w:hyperlink", map("r:id", "r42"), list(runXml(list())));
         assertThat(
             readSuccess(bodyReader(relationships), element),
@@ -960,9 +961,9 @@ public class BodyXmlTests {
 
     @Test
     public void hyperlinkIsReadAsExternalHyperlinkIfItHasARelationshipIdAndAnAnchor() {
-        Relationships relationships = new Relationships(
-            map("r42", new Relationship("http://example.com/"))
-        );
+        Relationships relationships = new Relationships(list(
+            hyperlinkRelationship("r42", "http://example.com/")
+        ));
         XmlElement element = element("w:hyperlink", map("r:id", "r42", "w:anchor", "fragment"), list(runXml(list())));
         assertThat(
             readSuccess(bodyReader(relationships), element),
@@ -972,9 +973,9 @@ public class BodyXmlTests {
 
     @Test
     public void hyperlinkExistingFragmentIsReplacedWhenAnchorIsSetOnExternalLink() {
-        Relationships relationships = new Relationships(
-            map("r42", new Relationship("http://example.com/#previous"))
-        );
+        Relationships relationships = new Relationships(list(
+            hyperlinkRelationship("r42", "http://example.com/#previous")
+        ));
         XmlElement element = element("w:hyperlink", map("r:id", "r42", "w:anchor", "fragment"), list(runXml(list())));
         assertThat(
             readSuccess(bodyReader(relationships), element),
@@ -1176,8 +1177,9 @@ public class BodyXmlTests {
     }
 
     private Image readEmbeddedImage(XmlElement element) {
-        Relationships relationships = new Relationships(map(
-            IMAGE_RELATIONSHIP_ID, new Relationship("media/hat.png")));
+        Relationships relationships = new Relationships(list(
+            imageRelationship(IMAGE_RELATIONSHIP_ID, "media/hat.png")
+        ));
         Archive file = InMemoryArchive.fromStrings(map("word/media/hat.png", IMAGE_BYTES));
 
         return (Image) readSuccess(
@@ -1202,8 +1204,9 @@ public class BodyXmlTests {
     @Test
     public void warningIfImageTypeIsUnsupportedByWebBrowsers() {
         XmlElement element = inlineImageXml(embeddedBlipXml(IMAGE_RELATIONSHIP_ID), "");
-        Relationships relationships = new Relationships(map(
-            IMAGE_RELATIONSHIP_ID, new Relationship("media/hat.emf")));
+        Relationships relationships = new Relationships(list(
+            imageRelationship(IMAGE_RELATIONSHIP_ID, "media/hat.emf")
+        ));
         Archive file = InMemoryArchive.fromStrings(map("word/media/hat.emf", IMAGE_BYTES));
         ContentTypes contentTypes = new ContentTypes(map("emf", "image/x-emf"), map());
 
@@ -1219,8 +1222,9 @@ public class BodyXmlTests {
     @Test
     public void canReadLinkedPictures() throws IOException {
         XmlElement element = inlineImageXml(linkedBlipXml(IMAGE_RELATIONSHIP_ID), "");
-        Relationships relationships = new Relationships(map(
-            IMAGE_RELATIONSHIP_ID, new Relationship("file:///media/hat.png")));
+        Relationships relationships = new Relationships(list(
+            imageRelationship(IMAGE_RELATIONSHIP_ID, "file:///media/hat.png")
+        ));
 
         Image image = (Image) readSuccess(
             bodyReader(relationships, new InMemoryFileReader(map("file:///media/hat.png", IMAGE_BYTES))),
@@ -1421,4 +1425,12 @@ public class BodyXmlTests {
     private static Text text(String value) {
         return new Text(value);
     }
+
+    private static Relationship hyperlinkRelationship(String relationshipId, String target) {
+        return new Relationship(relationshipId, target);
+    }
+
+    private static Relationship imageRelationship(String relationshipId, String target) {
+        return new Relationship(relationshipId, target);
+    }
 }
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsTests.java
index c860ba1..3c32852 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsTests.java
@@ -4,16 +4,15 @@ import org.junit.jupiter.api.Test;
 import org.zwobble.mammoth.internal.docx.Relationships;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.zwobble.mammoth.internal.util.Maps.map;
 import static org.zwobble.mammoth.tests.util.MammothAsserts.assertThrows;
 
 public class RelationshipsTests {
     @Test
     public void exceptionIsThrownIfRelationshipCannotBeFound() {
-        Relationships relationships = new Relationships(map());
+        Relationships relationships = Relationships.EMPTY;
         RuntimeException exception = assertThrows(
             RuntimeException.class,
-            () -> relationships.findRelationshipById("rId5"));
+            () -> relationships.findTargetByRelationshipId("rId5"));
         assertEquals("Could not find relationship 'rId5'", exception.getMessage());
     }
 }
diff --git a/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsXmlTests.java b/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsXmlTests.java
index 6313591..fb268b5 100644
--- a/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsXmlTests.java
+++ b/src/test/java/org/zwobble/mammoth/tests/docx/RelationshipsXmlTests.java
@@ -21,6 +21,6 @@ public class RelationshipsXmlTests {
 
         Relationships relationships = readRelationshipsXmlElement(element);
 
-        assertEquals("http://example.com", relationships.findRelationshipById("rId8").getTarget());
+        assertEquals("http://example.com", relationships.findTargetByRelationshipId("rId8"));
     }
 }