diff options
Diffstat (limited to 'poi-ooxml/src/test/java')
| -rw-r--r-- | poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java | 10 | ||||
| -rw-r--r-- | poi-ooxml/src/test/java/org/apache/poi/xssf/TestXSSFCloneSheet.java | 13 |
2 files changed, 12 insertions, 11 deletions
diff --git a/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java index 7bbbea564b..b00be391ac 100644 --- a/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java +++ b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java @@ -326,10 +326,12 @@ class TestRelationships { assertNotNull(rId1); URI parent = drawingPart.getPartName().getURI(); // Hyperlink is not a target of relativize() because it is not resolved based on sourceURI in getTargetURI() -// URI rel1 = parent.relativize(rId1.getTargetURI()); -// URI rel11 = PackagingURIHelper.relativizeURI(drawingPart.getPartName().getURI(), rId1.getTargetURI()); -// assertEquals("'Another Sheet'!A1", rel1.getFragment()); -// assertEquals("'Another Sheet'!A1", rel11.getFragment()); + URI rel1 = parent.relativize(rId1.getTargetURI()); + assertEquals("'Another Sheet'!A1", rel1.getFragment()); + URI rel11 = PackagingURIHelper.relativizeURI(drawingPart.getPartName().getURI(), rId1.getTargetURI()); + // the following changed with https://github.com/apache/poi/pull/617 + //assertEquals("'Another Sheet'!A1", rel11.getFragment()); + assertNull(rel11.getFragment()); PackageRelationship rId2 = drawingPart.getRelationship("rId2"); URI rel2 = PackagingURIHelper.relativizeURI(drawingPart.getPartName().getURI(), rId2.getTargetURI()); diff --git a/poi-ooxml/src/test/java/org/apache/poi/xssf/TestXSSFCloneSheet.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/TestXSSFCloneSheet.java index bf6499d6ce..da7ae0f37a 100644 --- a/poi-ooxml/src/test/java/org/apache/poi/xssf/TestXSSFCloneSheet.java +++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/TestXSSFCloneSheet.java @@ -17,13 +17,6 @@ package org.apache.poi.xssf; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertInstanceOf; -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - import org.apache.poi.ooxml.ReferenceRelationship; import org.apache.poi.openxml4j.opc.PackageRelationship; import org.apache.poi.openxml4j.opc.PackageRelationshipTypes; @@ -47,6 +40,8 @@ import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTPictureNo import java.io.IOException; +import static org.junit.jupiter.api.Assertions.*; + class TestXSSFCloneSheet extends BaseTestCloneSheet { public TestXSSFCloneSheet() { super(XSSFITestDataProvider.instance); @@ -208,6 +203,10 @@ class TestXSSFCloneSheet extends BaseTestCloneSheet { PackageRelationship imageRel2 = drawing2.getRelationPartById(imageRelId2).getRelationship(); assertEquals(imageRelationType, imageRel2.getRelationshipType()); assertEquals(imageTargetUrl, imageRel2.getTargetURI().toString()); + + assertTrue(drawing2.removeReferenceRelationship(linkRelId2)); + assertFalse(drawing2.removeReferenceRelationship(linkRelId2)); + assertNull(drawing2.getReferenceRelationship(linkRelId2)); } } } |