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 2021/07/26 15:58:46 UTC
svn commit: r1891811 - in /pdfbox/branches/2.0:
examples/src/test/java/org/apache/pdfbox/examples/pdmodel/
fontbox/src/test/java/org/apache/fontbox/ttf/
pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/
Author: tilman
Date: Mon Jul 26 15:58:46 2021
New Revision: 1891811
URL: http://svn.apache.org/viewvc?rev=1891811&view=rev
Log:
PDFBOX-4892: use assumeTrue to skip tests
Modified:
pdfbox/branches/2.0/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java
pdfbox/branches/2.0/fontbox/src/test/java/org/apache/fontbox/ttf/TTFSubsetterTest.java
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/PDFontTest.java
Modified: pdfbox/branches/2.0/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java?rev=1891811&r1=1891810&r2=1891811&view=diff
==============================================================================
--- pdfbox/branches/2.0/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java (original)
+++ pdfbox/branches/2.0/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java Mon Jul 26 15:58:46 2021
@@ -103,6 +103,7 @@ import org.bouncycastle.util.Selector;
import org.bouncycastle.util.Store;
import org.junit.Assert;
+import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -180,11 +181,7 @@ public class TestCreateSignature
checkSignature(new File(inDir, "sign_me.pdf"), new File(outDir, fileName), false);
// Also test CreateEmbeddedTimeStamp if tsa URL is available
- if (tsa == null || tsa.isEmpty())
- {
- System.err.println("No TSA URL defined, test skipped");
- return;
- }
+ Assume.assumeTrue("No TSA URL defined, test skipped", tsa != null && !tsa.isEmpty());
CreateEmbeddedTimeStamp tsaSigning = new CreateEmbeddedTimeStamp(tsa);
tsaSigning.embedTimeStamp(new File(outDir, fileName), new File(outDir, fileName2));
@@ -246,11 +243,7 @@ public class TestCreateSignature
mockServer.stopServer();
- if (tsa == null || tsa.isEmpty())
- {
- System.err.println("No TSA URL defined, test skipped");
- return;
- }
+ Assume.assumeTrue("No TSA URL defined, test skipped", tsa != null && !tsa.isEmpty());
CreateSignature signing2 = new CreateSignature(keyStore, password.toCharArray());
signing2.setExternalSigning(externallySign);
@@ -274,15 +267,8 @@ public class TestCreateSignature
throws IOException, CMSException, OperatorCreationException, GeneralSecurityException,
TSPException, CertificateVerificationException, OCSPException
{
- if (externallySign)
- {
- return; // runs only once, independent of externallySign
- }
- if (tsa == null || tsa.isEmpty())
- {
- System.err.println("No TSA URL defined, test skipped");
- return;
- }
+ Assume.assumeTrue(externallySign); // run only once, independent of externallySign
+ Assume.assumeTrue("No TSA URL defined, test skipped", tsa != null && !tsa.isEmpty());
final String fileName = "timestamped.pdf";
CreateSignedTimeStamp signing = new CreateSignedTimeStamp(tsa);
signing.signDetached(new File(inDir + "sign_me.pdf"), new File(outDir + fileName));
Modified: pdfbox/branches/2.0/fontbox/src/test/java/org/apache/fontbox/ttf/TTFSubsetterTest.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/test/java/org/apache/fontbox/ttf/TTFSubsetterTest.java?rev=1891811&r1=1891810&r2=1891811&view=diff
==============================================================================
--- pdfbox/branches/2.0/fontbox/src/test/java/org/apache/fontbox/ttf/TTFSubsetterTest.java (original)
+++ pdfbox/branches/2.0/fontbox/src/test/java/org/apache/fontbox/ttf/TTFSubsetterTest.java Mon Jul 26 15:58:46 2021
@@ -30,6 +30,7 @@ import static org.junit.Assert.assertFal
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import org.junit.Assume;
import org.junit.Test;
/**
@@ -138,11 +139,7 @@ public class TTFSubsetterTest
simhei = new File(uri);
}
}
- if (simhei == null)
- {
- System.err.println("SimHei font not available on this machine, test skipped");
- return;
- }
+ Assume.assumeTrue("SimHei font not available on this machine, test skipped", simhei != null);
System.out.println("SimHei font found!");
TrueTypeFont full = new TTFParser().parse(simhei);
Modified: pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/PDFontTest.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/PDFontTest.java?rev=1891811&r1=1891810&r2=1891811&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/PDFontTest.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/PDFontTest.java Mon Jul 26 15:58:46 2021
@@ -42,6 +42,7 @@ import org.apache.pdfbox.pdmodel.font.en
import org.apache.pdfbox.rendering.PDFRenderer;
import org.apache.pdfbox.text.PDFTextStripper;
import org.junit.Assert;
+import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
@@ -97,11 +98,7 @@ public class PDFontTest
public void testPDFBox3747() throws IOException
{
File file = new File("c:/windows/fonts", "calibri.ttf");
- if (!file.exists())
- {
- System.out.println("testPDFBox3747 skipped");
- return;
- }
+ Assume.assumeTrue("testPDFBox3747 skipped", file.exists());
PDDocument doc = new PDDocument();
PDPage page = new PDPage();
doc.addPage(page);
@@ -240,11 +237,7 @@ public class PDFontTest
break;
}
}
- if (ttc == null)
- {
- System.out.println("testFullEmbeddingTTC skipped, no .ttc files available");
- return;
- }
+ Assume.assumeTrue("testFullEmbeddingTTC skipped, no .ttc files available", ttc != null);
final List<String> names = new ArrayList<String>();
ttc.processAllFonts(new TrueTypeCollection.TrueTypeFontProcessor()