You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2020/11/16 16:36:31 UTC
svn commit: r1883484 - in
/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline:
PDDocumentOutlineTest.java PDOutlineItemIteratorTest.java
PDOutlineItemTest.java PDOutlineNodeTest.java
Author: lehmi
Date: Mon Nov 16 16:36:31 2020
New Revision: 1883484
URL: http://svn.apache.org/viewvc?rev=1883484&view=rev
Log:
PDFBOX-5017: switch test to junit5
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDDocumentOutlineTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItemIteratorTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItemTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineNodeTest.java
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDDocumentOutlineTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDDocumentOutlineTest.java?rev=1883484&r1=1883483&r2=1883484&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDDocumentOutlineTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDDocumentOutlineTest.java Mon Nov 16 16:36:31 2020
@@ -16,10 +16,10 @@
*/
package org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Andrea Vacondio
@@ -40,8 +40,8 @@ public class PDDocumentOutlineTest
firstLevelChild.addLast(secondLevelChild);
assertEquals(0, secondLevelChild.getOpenCount());
assertEquals(-1, firstLevelChild.getOpenCount());
- assertFalse("Outlines count cannot be " + outline.getOpenCount(),
- outline.getOpenCount() < 0);
+ assertFalse(outline.getOpenCount() < 0,
+ "Outlines count cannot be " + outline.getOpenCount());
}
@Test
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItemIteratorTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItemIteratorTest.java?rev=1883484&r1=1883483&r2=1883484&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItemIteratorTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItemIteratorTest.java Mon Nov 16 16:36:31 2020
@@ -16,11 +16,12 @@
*/
package org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Andrea Vacondio
@@ -53,10 +54,11 @@ public class PDOutlineItemIteratorTest
assertFalse(iterator.hasNext());
}
- @Test(expected = UnsupportedOperationException.class)
public void removeUnsupported()
{
- new PDOutlineItemIterator(new PDOutlineItem()).remove();
+ assertThrows(UnsupportedOperationException.class,
+ () ->
+ new PDOutlineItemIterator(new PDOutlineItem()).remove());
}
@Test
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItemTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItemTest.java?rev=1883484&r1=1883483&r2=1883484&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItemTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItemTest.java Mon Nov 16 16:36:31 2020
@@ -16,10 +16,11 @@
*/
package org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* @author Andrea Vacondio
@@ -32,7 +33,7 @@ public class PDOutlineItemTest
private PDOutlineItem second;
private PDOutlineItem newSibling;
- @Before
+ @BeforeEach
public void setUp()
{
root = new PDOutlineItem();
@@ -171,21 +172,21 @@ public class PDOutlineItemTest
assertEquals(root.getNextSibling(), newSibling);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void cannotInsertSiblingBeforeAList()
{
PDOutlineItem child = new PDOutlineItem();
child.insertSiblingAfter(new PDOutlineItem());
child.insertSiblingAfter(new PDOutlineItem());
- root.insertSiblingBefore(child);
+ assertThrows(IllegalArgumentException.class, () -> root.insertSiblingBefore(child));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void cannotInsertSiblingAfterAList()
{
PDOutlineItem child = new PDOutlineItem();
child.insertSiblingAfter(new PDOutlineItem());
child.insertSiblingAfter(new PDOutlineItem());
- root.insertSiblingAfter(child);
+ assertThrows(IllegalArgumentException.class, () -> root.insertSiblingAfter(child));
}
}
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineNodeTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineNodeTest.java?rev=1883484&r1=1883483&r2=1883484&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineNodeTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineNodeTest.java Mon Nov 16 16:36:31 2020
@@ -16,14 +16,15 @@
*/
package org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* @author Andrea Vacondio
@@ -33,7 +34,7 @@ public class PDOutlineNodeTest
{
private PDOutlineItem root;
- @Before
+ @BeforeEach
public void setUp()
{
root = new PDOutlineItem();
@@ -316,22 +317,22 @@ public class PDOutlineNodeTest
assertEquals(-2, root.getOpenCount());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void cannotAddLastAList()
{
PDOutlineItem child = new PDOutlineItem();
child.insertSiblingAfter(new PDOutlineItem());
child.insertSiblingAfter(new PDOutlineItem());
- root.addLast(child);
+ assertThrows(IllegalArgumentException.class, () -> root.addLast(child));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void cannotAddFirstAList()
{
PDOutlineItem child = new PDOutlineItem();
child.insertSiblingAfter(new PDOutlineItem());
child.insertSiblingAfter(new PDOutlineItem());
- root.addFirst(child);
+ assertThrows(IllegalArgumentException.class, () -> root.addFirst(child));
}
@Test
@@ -367,6 +368,7 @@ public class PDOutlineNodeTest
}
assertEquals(0, counter);
}
+
@Test
public void openNodeAndAppend()
{