You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2019/12/06 04:28:55 UTC
svn commit: r1870909 - in
/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox:
cos/COSObjectKeyTest.java pdfwriter/COSWriterXRefEntryTest.java
pdmodel/PageLayoutTest.java pdmodel/PageModeTest.java
pdmodel/graphics/state/RenderingIntentTest.java
Author: tilman
Date: Fri Dec 6 04:28:55 2019
New Revision: 1870909
URL: http://svn.apache.org/viewvc?rev=1870909&view=rev
Log:
PDFBOX-4071: remove deprecated
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/COSObjectKeyTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfwriter/COSWriterXRefEntryTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/PageLayoutTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/PageModeTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/state/RenderingIntentTest.java
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/COSObjectKeyTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/COSObjectKeyTest.java?rev=1870909&r1=1870908&r2=1870909&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/COSObjectKeyTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/cos/COSObjectKeyTest.java Fri Dec 6 04:28:55 2019
@@ -17,15 +17,10 @@
package org.apache.pdfbox.cos;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
public class COSObjectKeyTest
{
- @Rule
- public ExpectedException thrown = ExpectedException.none();
-
@Test
public void compareToInputNotNullOutputZero()
{
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfwriter/COSWriterXRefEntryTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfwriter/COSWriterXRefEntryTest.java?rev=1870909&r1=1870908&r2=1870909&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfwriter/COSWriterXRefEntryTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfwriter/COSWriterXRefEntryTest.java Fri Dec 6 04:28:55 2019
@@ -17,15 +17,10 @@
package org.apache.pdfbox.pdfwriter;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
public class COSWriterXRefEntryTest
{
- @Rule
- public ExpectedException thrown = ExpectedException.none();
-
@Test
public void compareToInputNullOutputNegative()
{
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/PageLayoutTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/PageLayoutTest.java?rev=1870909&r1=1870908&r2=1870909&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/PageLayoutTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/PageLayoutTest.java Fri Dec 6 04:28:55 2019
@@ -19,9 +19,8 @@ import java.util.EnumSet;
import java.util.HashSet;
import java.util.Set;
import static org.junit.Assert.assertEquals;
-import org.junit.Rule;
+import static org.junit.Assert.assertThrows;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
public class PageLayoutTest
{
@@ -48,18 +47,9 @@ public class PageLayoutTest
/**
* @author John Bergqvist
*/
- @Rule public ExpectedException thrown = ExpectedException.none();
@Test
public void fromStringInputNotNullOutputIllegalArgumentException()
{
-
- // Arrange
- final String value = "SinglePag";
-
- // Act
- thrown.expect(IllegalArgumentException.class);
- PageLayout.fromString(value);
-
- // Method is not expected to return due to exception thrown
+ assertThrows(IllegalArgumentException.class, () -> PageLayout.fromString("SinglePag"));
}
}
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/PageModeTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/PageModeTest.java?rev=1870909&r1=1870908&r2=1870909&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/PageModeTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/PageModeTest.java Fri Dec 6 04:28:55 2019
@@ -17,15 +17,10 @@
package org.apache.pdfbox.pdmodel;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
public class PageModeTest
{
- @Rule
- public ExpectedException thrown = ExpectedException.none();
-
@Test
public void fromStringInputNotNullOutputNotNull()
{
@@ -107,27 +102,13 @@ public class PageModeTest
@Test
public void fromStringInputNotNullOutputIllegalArgumentException()
{
- // Arrange
- final String value = "";
-
- // Act
- thrown.expect(IllegalArgumentException.class);
- PageMode.fromString(value);
-
- // Method is not expected to return due to exception thrown
+ Assert.assertThrows(IllegalArgumentException.class, () -> PageMode.fromString(""));
}
@Test
public void fromStringInputNotNullOutputIllegalArgumentException2()
{
- // Arrange
- final String value = "Dulacb`ecj";
-
- // Act
- thrown.expect(IllegalArgumentException.class);
- PageMode.fromString(value);
-
- // Method is not expected to return due to exception thrown
+ Assert.assertThrows(IllegalArgumentException.class, () -> PageMode.fromString("Dulacb`ecj"));
}
@Test
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/state/RenderingIntentTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/state/RenderingIntentTest.java?rev=1870909&r1=1870908&r2=1870909&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/state/RenderingIntentTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/state/RenderingIntentTest.java Fri Dec 6 04:28:55 2019
@@ -17,15 +17,10 @@
package org.apache.pdfbox.pdmodel.graphics.state;
import org.junit.Assert;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
public class RenderingIntentTest
{
- @Rule
- public ExpectedException thrown = ExpectedException.none();
-
@Test
public void fromStringInputNotNullOutputNotNull()
{