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/15 15:45:13 UTC
svn commit: r1883445 - in /pdfbox/trunk/fontbox: ./
src/test/java/org/apache/fontbox/afm/ src/test/java/org/apache/fontbox/cff/
src/test/java/org/apache/fontbox/cmap/ src/test/java/org/apache/fontbox/ttf/
src/test/java/org/apache/fontbox/ttf/gsub/
Author: lehmi
Date: Sun Nov 15 15:45:13 2020
New Revision: 1883445
URL: http://svn.apache.org/viewvc?rev=1883445&view=rev
Log:
PDFBOX-5017: switch test to junit5
Modified:
pdfbox/trunk/fontbox/pom.xml
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/AFMParserTest.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/CharMetricTest.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/CompositePartTest.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/CompositeTest.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/FontMetricsTest.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/KernPairTest.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/LigatureTest.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/TrackKernTest.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cff/CFFParserTest.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cff/CharStringCommandTest.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cff/Type1FontUtilTest.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/CIDRangeTest.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMap.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMapParser.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/TestCodespaceRange.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/BufferedRandomAccessFileTest.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/GSUBTableDebugger.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/GlyphSubstitutionTableTest.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/RAFDataStreamTest.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/TTFSubsetterTest.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/TestMemoryTTFDataStream.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/TestTTFParser.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/gsub/CompoundCharacterTokenizerTest.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/gsub/GlyphArraySplitterRegexImplTest.java
Modified: pdfbox/trunk/fontbox/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/pom.xml?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/pom.xml (original)
+++ pdfbox/trunk/fontbox/pom.xml Sun Nov 15 15:45:13 2020
@@ -47,8 +47,8 @@
<artifactId>junit-jupiter-api</artifactId>
</dependency>
<dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
</dependency>
</dependencies>
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/AFMParserTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/AFMParserTest.java?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/AFMParserTest.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/AFMParserTest.java Sun Nov 15 15:45:13 2020
@@ -17,12 +17,12 @@
package org.apache.fontbox.afm;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayInputStream;
import java.io.FileInputStream;
@@ -32,7 +32,7 @@ import java.util.List;
import java.util.Optional;
import org.apache.fontbox.util.BoundingBox;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/CharMetricTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/CharMetricTest.java?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/CharMetricTest.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/CharMetricTest.java Sun Nov 15 15:45:13 2020
@@ -17,13 +17,13 @@
package org.apache.fontbox.afm;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.List;
import org.apache.fontbox.util.BoundingBox;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class CharMetricTest
{
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/CompositePartTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/CompositePartTest.java?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/CompositePartTest.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/CompositePartTest.java Sun Nov 15 15:45:13 2020
@@ -17,9 +17,9 @@
package org.apache.fontbox.afm;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class CompositePartTest
{
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/CompositeTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/CompositeTest.java?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/CompositeTest.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/CompositeTest.java Sun Nov 15 15:45:13 2020
@@ -17,12 +17,12 @@
package org.apache.fontbox.afm;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class CompositeTest
{
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/FontMetricsTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/FontMetricsTest.java?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/FontMetricsTest.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/FontMetricsTest.java Sun Nov 15 15:45:13 2020
@@ -17,14 +17,14 @@
package org.apache.fontbox.afm;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.List;
import org.apache.fontbox.util.BoundingBox;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FontMetricsTest
{
@@ -291,4 +291,4 @@ public class FontMetricsTest
assertEquals(25, fontMetrics.getAverageCharacterWidth(), 0f);
}
-}
\ No newline at end of file
+}
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/KernPairTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/KernPairTest.java?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/KernPairTest.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/KernPairTest.java Sun Nov 15 15:45:13 2020
@@ -17,9 +17,9 @@
package org.apache.fontbox.afm;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class KernPairTest
{
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/LigatureTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/LigatureTest.java?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/LigatureTest.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/LigatureTest.java Sun Nov 15 15:45:13 2020
@@ -17,9 +17,9 @@
package org.apache.fontbox.afm;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class LigatureTest
{
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/TrackKernTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/TrackKernTest.java?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/TrackKernTest.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/TrackKernTest.java Sun Nov 15 15:45:13 2020
@@ -17,9 +17,9 @@
package org.apache.fontbox.afm;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TrackKernTest
{
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cff/CFFParserTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cff/CFFParserTest.java?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cff/CFFParserTest.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cff/CFFParserTest.java Sun Nov 15 15:45:13 2020
@@ -15,13 +15,14 @@
*/
package org.apache.fontbox.cff;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.List;
-import static junit.framework.TestCase.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
@@ -83,10 +84,10 @@ public class CFFParserTest
private void assertNumberList(String message, int[] expected, List<Number> found)
{
- assertEquals(message, expected.length, found.size());
+ assertEquals(expected.length, found.size(), message);
for (int i = 0; i < expected.length; i++)
{
- assertEquals(message, expected[i], found.get(i).intValue());
+ assertEquals(expected[i], found.get(i).intValue(), message);
}
}
}
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cff/CharStringCommandTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cff/CharStringCommandTest.java?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cff/CharStringCommandTest.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cff/CharStringCommandTest.java Sun Nov 15 15:45:13 2020
@@ -17,16 +17,16 @@
package org.apache.fontbox.cff;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.util.Arrays;
import org.apache.fontbox.cff.CharStringCommand.Key;
import org.apache.fontbox.cff.CharStringCommand.Type1KeyWord;
import org.apache.fontbox.cff.CharStringCommand.Type2KeyWord;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class CharStringCommandTest
{
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cff/Type1FontUtilTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cff/Type1FontUtilTest.java?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cff/Type1FontUtilTest.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cff/Type1FontUtilTest.java Sun Nov 15 15:45:13 2020
@@ -17,16 +17,15 @@
package org.apache.fontbox.cff;
import java.util.Random;
-import junit.framework.TestCase;
-import static org.junit.Assert.assertArrayEquals;
-import org.junit.internal.ArrayComparisonFailure;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import org.junit.jupiter.api.Test;
/**
* This class includes some tests for the Type1FontUtil class.
*
* @author Villu Ruusmann
*/
-public class Type1FontUtilTest extends TestCase
+public class Type1FontUtilTest
{
static final long DEFAULTSEED = 12345;
static final long LOOPS = 1000;
@@ -34,6 +33,7 @@ public class Type1FontUtilTest extends T
/**
* Tests the hex encoding/decoding.
*/
+ @Test
public void testHexEncoding()
{
long seed = DEFAULTSEED;
@@ -44,19 +44,20 @@ public class Type1FontUtilTest extends T
}
}
- private void tryHexEncoding(long seed) throws ArrayComparisonFailure
+ private void tryHexEncoding(long seed)
{
byte[] bytes = createRandomByteArray(128, seed);
String encodedBytes = Type1FontUtil.hexEncode(bytes);
byte[] decodedBytes = Type1FontUtil.hexDecode(encodedBytes);
- assertArrayEquals("Seed: " + seed, bytes, decodedBytes);
+ assertArrayEquals(bytes, decodedBytes, "Seed: " + seed);
}
/**
* Tests the eexec encryption/decryption.
*/
+ @Test
public void testEexecEncryption()
{
long seed = DEFAULTSEED;
@@ -67,19 +68,20 @@ public class Type1FontUtilTest extends T
}
}
- private void tryEexecEncryption(long seed) throws ArrayComparisonFailure
+ private void tryEexecEncryption(long seed)
{
byte[] bytes = createRandomByteArray(128, seed);
byte[] encryptedBytes = Type1FontUtil.eexecEncrypt(bytes);
byte[] decryptedBytes = Type1FontUtil.eexecDecrypt(encryptedBytes);
- assertArrayEquals("Seed: " + seed, bytes, decryptedBytes);
+ assertArrayEquals(bytes, decryptedBytes, "Seed: " + seed);
}
/**
* Tests the charstring encryption/decryption.
*/
+ @Test
public void testCharstringEncryption()
{
long seed = DEFAULTSEED;
@@ -90,14 +92,14 @@ public class Type1FontUtilTest extends T
}
}
- private void tryCharstringEncryption(long seed) throws ArrayComparisonFailure
+ private void tryCharstringEncryption(long seed)
{
byte[] bytes = createRandomByteArray(128, seed);
byte[] encryptedBytes = Type1FontUtil.charstringEncrypt(bytes, 4);
byte[] decryptedBytes = Type1FontUtil.charstringDecrypt(encryptedBytes, 4);
- assertArrayEquals("Seed: " + seed, bytes, decryptedBytes);
+ assertArrayEquals(bytes, decryptedBytes, "Seed: " + seed);
}
private static byte[] createRandomByteArray(int arrayLength, long seed)
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/CIDRangeTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/CIDRangeTest.java?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/CIDRangeTest.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/CIDRangeTest.java Sun Nov 15 15:45:13 2020
@@ -15,9 +15,9 @@
*/
package org.apache.fontbox.cmap;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class CIDRangeTest
{
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMap.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMap.java?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMap.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMap.java Sun Nov 15 15:45:13 2020
@@ -16,25 +16,27 @@
*/
package org.apache.fontbox.cmap;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.io.IOException;
import org.apache.fontbox.ttf.CmapLookup;
import org.apache.fontbox.ttf.TTFParser;
import org.apache.fontbox.ttf.TrueTypeFont;
-
-import junit.framework.TestCase;
+import org.junit.jupiter.api.Test;
/**
* This will test the CMap implementation.
*
*/
-public class TestCMap extends TestCase
+public class TestCMap
{
/**
* Check whether the mapping is working correct.
* @throws IOException If something went wrong during adding a mapping
*/
+ @Test
public void testLookup() throws IOException
{
byte[] bs = new byte[] { (byte) 200 };
@@ -49,6 +51,7 @@ public class TestCMap extends TestCase
*
* @throws IOException
*/
+ @Test
public void testPDFBox3997() throws IOException
{
try (TrueTypeFont ttf = new TTFParser().parse("target/pdfs/NotoEmoji-Regular.ttf"))
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMapParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMapParser.java?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMapParser.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/TestCMapParser.java Sun Nov 15 15:45:13 2020
@@ -16,11 +16,15 @@
*/
package org.apache.fontbox.cmap;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import java.io.File;
import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* This will test the CMapParser implementation.
@@ -45,47 +49,42 @@ public class TestCMapParser
// char mappings
byte[] bytes1 = {0, 1};
- Assert.assertEquals("bytes 00 01 from bfrange <0001> <0005> <0041>", "A",
- cMap.toUnicode(bytes1));
+ assertEquals("A", cMap.toUnicode(bytes1), "bytes 00 01 from bfrange <0001> <0005> <0041>");
byte[] bytes2 = {1, 00};
String str2 = "0";
- Assert.assertEquals("bytes 01 00 from bfrange <0100> <0109> <0030>", str2,
- cMap.toUnicode(bytes2));
+ assertEquals(str2,
+ cMap.toUnicode(bytes2), "bytes 01 00 from bfrange <0100> <0109> <0030>");
byte[] bytes3 = { 1, 32 };
- Assert.assertEquals("bytes 01 00 from bfrange <0100> <0109> <0030>", "P",
- cMap.toUnicode(bytes3));
+ assertEquals("P", cMap.toUnicode(bytes3), "bytes 01 00 from bfrange <0100> <0109> <0030>");
byte[] bytes4 = { 1, 33 };
- Assert.assertEquals("bytes 01 00 from bfrange <0100> <0109> <0030>", "R",
- cMap.toUnicode(bytes4));
+ assertEquals("R", cMap.toUnicode(bytes4), "bytes 01 00 from bfrange <0100> <0109> <0030>");
byte[] bytes5 = { 0, 10 };
String str5 = "*";
- Assert.assertEquals("bytes 00 0A from bfchar <000A> <002A>", str5,
- cMap.toUnicode(bytes5));
+ assertEquals(str5, cMap.toUnicode(bytes5), "bytes 00 0A from bfchar <000A> <002A>");
byte[] bytes6 = { 1, 10 };
String str6 = "+";
- Assert.assertEquals("bytes 01 0A from bfchar <010A> <002B>", str6,
- cMap.toUnicode(bytes6));
+ assertEquals(str6, cMap.toUnicode(bytes6), "bytes 01 0A from bfchar <010A> <002B>");
// CID mappings
byte[] cid1 = new byte[] { 0, 65 };
- Assert.assertEquals("CID 65 from cidrange <0000> <00ff> 0 ", 65, cMap.toCID(cid1));
+ assertEquals(65, cMap.toCID(cid1), "CID 65 from cidrange <0000> <00ff> 0 ");
byte[] cid2 = new byte[] { 1, 24 };
int strCID2 = 0x0118;
- Assert.assertEquals("CID 280 from cidrange <0100> <01ff> 256", strCID2, cMap.toCID(cid2));
+ assertEquals(strCID2, cMap.toCID(cid2), "CID 280 from cidrange <0100> <01ff> 256");
byte[] cid3 = new byte[] { 2, 8 };
int strCID3 = 0x0208;
- Assert.assertEquals("CID 520 from cidchar <0208> 520", strCID3, cMap.toCID(cid3));
+ assertEquals(strCID3, cMap.toCID(cid3), "CID 520 from cidchar <0208> 520");
byte[] cid4 = new byte[] { 1, 0x2c };
int strCID4 = 0x12C;
- Assert.assertEquals("CID 300 from cidrange <0300> <0300> 300", strCID4, cMap.toCID(cid4));
+ assertEquals(strCID4, cMap.toCID(cid4), "CID 300 from cidrange <0300> <0300> 300");
}
@Test
@@ -97,10 +96,10 @@ public class TestCMapParser
CMapParser parser = new CMapParser();
CMap cMap = parser.parse(new File(inDir, "Identity-H"));
- Assert.assertEquals("Indentity-H CID 65", 65, cMap.toCID(new byte[] { 0, 65 }));
- Assert.assertEquals("Indentity-H CID 12345", 12345, cMap.toCID(new byte[] { 0x30, 0x39 }));
- Assert.assertEquals("Indentity-H CID 0xFFFF", 0xFFFF,
- cMap.toCID(new byte[] { (byte) 0xFF, (byte) 0xFF }));
+ assertEquals(65, cMap.toCID(new byte[] { 0, 65 }), "Indentity-H CID 65");
+ assertEquals(12345, cMap.toCID(new byte[] { 0x30, 0x39 }), "Indentity-H CID 12345");
+ assertEquals(0xFFFF, cMap.toCID(new byte[] { (byte) 0xFF, (byte) 0xFF }),
+ "Indentity-H CID 0xFFFF");
}
@Test
@@ -113,27 +112,21 @@ public class TestCMapParser
CMap cMap = parser.parse(new File(inDir, "UniJIS-UTF16-H"));
// the next 3 cases demonstrate the issue of possible false result values of CMap.toCID(int code)
- Assert.assertEquals("UniJIS-UTF16-H CID 0xb1 -> 694", 694, cMap.toCID(0xb1));
- Assert.assertNotEquals("UniJIS-UTF16-H CID 0xb1 -> 694", 694, cMap.toCID(0xb1, 1));
- Assert.assertEquals("UniJIS-UTF16-H CID 0x00b1 -> 694", 694, cMap.toCID(0xb1, 2));
+ assertEquals(694, cMap.toCID(0xb1), "UniJIS-UTF16-H CID 0xb1 -> 694");
+ assertNotEquals(694, cMap.toCID(0xb1, 1), "UniJIS-UTF16-H CID 0xb1 -> 694");
+ assertEquals(694, cMap.toCID(0xb1, 2), "UniJIS-UTF16-H CID 0x00b1 -> 694");
// 1:1 cid char mapping
- Assert.assertEquals("UniJIS-UTF16-H CID 0x00b1 -> 694",
- 694,
- cMap.toCID(new byte[] { 0x00, (byte) 0xb1 }));
- Assert.assertEquals(
- "UniJIS-UTF16-H CID 0xd850dc4b -> 20168",
- 20168,
- cMap.toCID(new byte[] { (byte) 0xd8, 0x50, (byte) 0xdc, 0x4b }));
+ assertEquals(694, cMap.toCID(new byte[] { 0x00, (byte) 0xb1 }),
+ "UniJIS-UTF16-H CID 0x00b1 -> 694");
+ assertEquals(20168, cMap.toCID(new byte[] { (byte) 0xd8, 0x50, (byte) 0xdc, 0x4b }),
+ "UniJIS-UTF16-H CID 0xd850dc4b -> 20168");
// cid range mapping
- Assert.assertEquals(
- "UniJIS-UTF16-H CID 0x5434 -> 19223",
- 19223,
- cMap.toCID(new byte[] { 0x54, 0x34 }));
- Assert.assertEquals("UniJIS-UTF16-H CID 0xd83cdd12 -> 10006",
- 10006,
- cMap.toCID(new byte[] { (byte) 0xd8, 0x3c, (byte) 0xdd, 0x12 }));
+ assertEquals(19223, cMap.toCID(new byte[] { 0x54, 0x34 }),
+ "UniJIS-UTF16-H CID 0x5434 -> 19223");
+ assertEquals(10006, cMap.toCID(new byte[] { (byte) 0xd8, 0x3c, (byte) 0xdd, 0x12 }),
+ "UniJIS-UTF16-H CID 0xd83cdd12 -> 10006");
}
@@ -146,7 +139,7 @@ public class TestCMapParser
CMapParser parser = new CMapParser();
CMap cMap = parser.parse(new File(inDir, "UniJIS-UCS2-H"));
- Assert.assertEquals("UniJIS-UCS2-H CID 65 -> 34", 34, cMap.toCID(new byte[] { 0, 65 }));
+ assertEquals(34, cMap.toCID(new byte[] { 0, 65 }), "UniJIS-UCS2-H CID 65 -> 34");
}
@Test
@@ -158,8 +151,8 @@ public class TestCMapParser
CMapParser parser = new CMapParser();
CMap cMap = parser.parse(new File(inDir, "Adobe-GB1-UCS2"));
- Assert.assertEquals("Adobe-GB1-UCS2 CID 0x11 -> \"0\"", "0",
- cMap.toUnicode(new byte[] { 0, 0x11 }));
+ assertEquals("0", cMap.toUnicode(new byte[] { 0, 0x11 }),
+ "Adobe-GB1-UCS2 CID 0x11 -> \"0\"");
}
/**
@@ -171,7 +164,7 @@ public class TestCMapParser
{
CMap cMap = new CMapParser().parse(new File("src/test/resources/cmap", "CMapNoWhitespace"));
- Assert.assertNotNull("Failed to parse nasty CMap file", cMap);
+ assertNotNull(cMap, "Failed to parse nasty CMap file");
}
@Test
@@ -180,14 +173,13 @@ public class TestCMapParser
CMap cMap = new CMapParser()
.parse(new File("src/test/resources/cmap", "CMapMalformedbfrange1"));
- Assert.assertNotNull("Failed to parse malformed CMap file", cMap);
+ assertNotNull(cMap, "Failed to parse malformed CMap file");
byte[] bytes1 = { 0, 1 };
- Assert.assertEquals("bytes 00 01 from bfrange <0001> <0009> <0041>", "A",
- cMap.toUnicode(bytes1));
+ assertEquals("A", cMap.toUnicode(bytes1), "bytes 00 01 from bfrange <0001> <0009> <0041>");
byte[] bytes2 = { 1, 00 };
- Assert.assertNull(cMap.toUnicode(bytes2));
+ assertNull(cMap.toUnicode(bytes2));
}
@@ -197,17 +189,17 @@ public class TestCMapParser
CMap cMap = new CMapParser()
.parse(new File("src/test/resources/cmap", "CMapMalformedbfrange2"));
- Assert.assertNotNull("Failed to parse malformed CMap file", cMap);
+ assertNotNull(cMap, "Failed to parse malformed CMap file");
- Assert.assertEquals("bytes 00 01 from bfrange <0001> <0009> <0030>", "0",
- cMap.toUnicode(new byte[] { 0, 1 }));
+ assertEquals("0", cMap.toUnicode(new byte[] { 0, 1 }),
+ "bytes 00 01 from bfrange <0001> <0009> <0030>");
- Assert.assertEquals("bytes 02 32 from bfrange <0232> <0432> <0041>", "A",
- cMap.toUnicode(new byte[] { 2, 0x32 }));
+ assertEquals("A", cMap.toUnicode(new byte[] { 2, 0x32 }),
+ "bytes 02 32 from bfrange <0232> <0432> <0041>");
// check border values
- Assert.assertNotNull(cMap.toUnicode(new byte[] { 2, (byte) 0xF0 }));
- Assert.assertNull(cMap.toUnicode(new byte[] { 2, (byte) 0xF1 }));
+ assertNotNull(cMap.toUnicode(new byte[] { 2, (byte) 0xF0 }));
+ assertNull(cMap.toUnicode(new byte[] { 2, (byte) 0xF1 }));
}
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/TestCodespaceRange.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/TestCodespaceRange.java?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/TestCodespaceRange.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/cmap/TestCodespaceRange.java Sun Nov 15 15:45:13 2020
@@ -16,13 +16,16 @@
*/
package org.apache.fontbox.cmap;
-import junit.framework.TestCase;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* This will test the CodeSpaceRange implementation.
*
*/
-public class TestCodespaceRange extends TestCase
+public class TestCodespaceRange
{
/**
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/BufferedRandomAccessFileTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/BufferedRandomAccessFileTest.java?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/BufferedRandomAccessFileTest.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/BufferedRandomAccessFileTest.java Sun Nov 15 15:45:13 2020
@@ -1,5 +1,3 @@
-package org.apache.fontbox.ttf;
-
/*
* Copyright 2016 The Apache Software Foundation.
*
@@ -15,14 +13,16 @@ package org.apache.fontbox.ttf;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.fontbox.ttf;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Cameron Rollhieser
@@ -57,7 +57,7 @@ public class BufferedRandomAccessFileTes
{
totalAmountRead += amountRead;
}
- Assert.assertEquals(10, totalAmountRead);
+ assertEquals(10, totalAmountRead);
}
file.delete();
}
@@ -84,71 +84,71 @@ public class BufferedRandomAccessFileTes
{
int count = 4;
int bytesRead = braf.read(readBuffer, 0, count);
- Assert.assertEquals(4, braf.getFilePointer());
- Assert.assertEquals(count, bytesRead);
- Assert.assertEquals("0123", new String(readBuffer, 0, count));
+ assertEquals(4, braf.getFilePointer());
+ assertEquals(count, bytesRead);
+ assertEquals("0123", new String(readBuffer, 0, count));
count = 6;
bytesRead = braf.read(readBuffer, 0, count);
- Assert.assertEquals(10, braf.getFilePointer());
- Assert.assertEquals(count, bytesRead);
- Assert.assertEquals("45678A", new String(readBuffer, 0, count));
+ assertEquals(10, braf.getFilePointer());
+ assertEquals(count, bytesRead);
+ assertEquals("45678A", new String(readBuffer, 0, count));
count = 10;
bytesRead = braf.read(readBuffer, 0, count);
- Assert.assertEquals(20, braf.getFilePointer());
- Assert.assertEquals(count, bytesRead);
- Assert.assertEquals("012345678B", new String(readBuffer, 0, count));
+ assertEquals(20, braf.getFilePointer());
+ assertEquals(count, bytesRead);
+ assertEquals("012345678B", new String(readBuffer, 0, count));
count = 10;
bytesRead = braf.read(readBuffer, 0, count);
- Assert.assertEquals(30, braf.getFilePointer());
- Assert.assertEquals(count, bytesRead);
- Assert.assertEquals("012345678C", new String(readBuffer, 0, count));
+ assertEquals(30, braf.getFilePointer());
+ assertEquals(count, bytesRead);
+ assertEquals("012345678C", new String(readBuffer, 0, count));
count = 10;
bytesRead = braf.read(readBuffer, 0, count);
- Assert.assertEquals(40, braf.getFilePointer());
- Assert.assertEquals(count, bytesRead);
- Assert.assertEquals("012345678D", new String(readBuffer, 0, count));
+ assertEquals(40, braf.getFilePointer());
+ assertEquals(count, bytesRead);
+ assertEquals("012345678D", new String(readBuffer, 0, count));
- Assert.assertEquals(-1, braf.read());
+ assertEquals(-1, braf.read());
braf.seek(0);
braf.read(readBuffer, 0, 7);
- Assert.assertEquals(7, braf.getFilePointer());
+ assertEquals(7, braf.getFilePointer());
count = 16;
bytesRead = braf.read(readBuffer, 0, count);
- Assert.assertEquals(23, braf.getFilePointer());
- Assert.assertEquals(count, bytesRead);
- Assert.assertEquals("78A012345678B012", new String(readBuffer, 0, count));
+ assertEquals(23, braf.getFilePointer());
+ assertEquals(count, bytesRead);
+ assertEquals("78A012345678B012", new String(readBuffer, 0, count));
bytesRead = braf.read(readBuffer, 0, 99);
- Assert.assertEquals(40, braf.getFilePointer());
- Assert.assertEquals(17, bytesRead);
- Assert.assertEquals("345678C012345678D", new String(readBuffer, 0, 17));
+ assertEquals(40, braf.getFilePointer());
+ assertEquals(17, bytesRead);
+ assertEquals("345678C012345678D", new String(readBuffer, 0, 17));
- Assert.assertEquals(-1, braf.read());
+ assertEquals(-1, braf.read());
braf.seek(0);
braf.read(readBuffer, 0, 7);
- Assert.assertEquals(7, braf.getFilePointer());
+ assertEquals(7, braf.getFilePointer());
count = 23;
bytesRead = braf.read(readBuffer, 0, count);
- Assert.assertEquals(30, braf.getFilePointer());
- Assert.assertEquals(count, bytesRead);
- Assert.assertEquals("78A012345678B012345678C", new String(readBuffer, 0, count));
+ assertEquals(30, braf.getFilePointer());
+ assertEquals(count, bytesRead);
+ assertEquals("78A012345678B012345678C", new String(readBuffer, 0, count));
braf.seek(0);
braf.read(readBuffer, 0, 10);
- Assert.assertEquals(10, braf.getFilePointer());
+ assertEquals(10, braf.getFilePointer());
count = 23;
bytesRead = braf.read(readBuffer, 0, count);
- Assert.assertEquals(33, braf.getFilePointer());
- Assert.assertEquals(count, bytesRead);
- Assert.assertEquals("012345678B012345678C012", new String(readBuffer, 0, count));
+ assertEquals(33, braf.getFilePointer());
+ assertEquals(count, bytesRead);
+ assertEquals("012345678B012345678C012", new String(readBuffer, 0, count));
}
file.delete();
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/GSUBTableDebugger.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/GSUBTableDebugger.java?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/GSUBTableDebugger.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/GSUBTableDebugger.java Sun Nov 15 15:45:13 2020
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.fontbox.ttf.gsub.GSUBTablePrintUtil;
import org.apache.fontbox.ttf.model.GsubData;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* This class is to be used mainly for debugging purposes. Prints the GSUB Feature table for debugging.
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/GlyphSubstitutionTableTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/GlyphSubstitutionTableTest.java?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/GlyphSubstitutionTableTest.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/GlyphSubstitutionTableTest.java Sun Nov 15 15:45:13 2020
@@ -16,9 +16,9 @@
*/
package org.apache.fontbox.ttf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.BufferedReader;
import java.io.IOException;
@@ -35,7 +35,7 @@ import org.apache.fontbox.ttf.model.Gsub
import org.apache.fontbox.ttf.model.Language;
import org.apache.fontbox.ttf.model.MapBackedScriptFeature;
import org.apache.fontbox.ttf.model.ScriptFeature;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class GlyphSubstitutionTableTest
{
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/RAFDataStreamTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/RAFDataStreamTest.java?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/RAFDataStreamTest.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/RAFDataStreamTest.java Sun Nov 15 15:45:13 2020
@@ -17,7 +17,7 @@
package org.apache.fontbox.ttf;
import java.io.IOException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/TTFSubsetterTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/TTFSubsetterTest.java?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/TTFSubsetterTest.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/TTFSubsetterTest.java Sun Nov 15 15:45:13 2020
@@ -25,12 +25,12 @@ import java.util.List;
import java.util.Locale;
import java.util.Map.Entry;
import org.apache.fontbox.util.autodetect.FontFileFinder;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
/**
*
@@ -256,8 +256,10 @@ public class TTFSubsetterTest
assertEquals("uni200A", pst.getName(3));
assertEquals("dieresis.uc", pst.getName(4));
- assertTrue("Hair space path should be empty", subset.getPath("uni200A").getBounds2D().isEmpty());
- assertFalse("UC dieresis path should not be empty", subset.getPath("dieresis.uc").getBounds2D().isEmpty());
+ assertTrue(subset.getPath("uni200A").getBounds2D().isEmpty(),
+ "Hair space path should be empty");
+ assertFalse(subset.getPath("dieresis.uc").getBounds2D().isEmpty(),
+ "UC dieresis path should not be empty");
}
}
}
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/TestMemoryTTFDataStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/TestMemoryTTFDataStream.java?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/TestMemoryTTFDataStream.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/TestMemoryTTFDataStream.java Sun Nov 15 15:45:13 2020
@@ -16,14 +16,14 @@
*/
package org.apache.fontbox.ttf;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import org.junit.Test;
-
-import junit.framework.TestCase;
+import org.junit.jupiter.api.Test;
-public class TestMemoryTTFDataStream extends TestCase
+public class TestMemoryTTFDataStream
{
@Test
public void testEOF() throws IOException
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/TestTTFParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/TestTTFParser.java?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/TestTTFParser.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/TestTTFParser.java Sun Nov 15 15:45:13 2020
@@ -15,19 +15,19 @@
*/
package org.apache.fontbox.ttf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.io.File;
import java.io.IOException;
import java.util.Calendar;
import java.util.TimeZone;
-import junit.framework.TestCase;
-
/**
* This will test the TTFParser implementation.
*
* @author Tim Allison
*/
-public class TestTTFParser extends TestCase
+public class TestTTFParser
{
/**
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/gsub/CompoundCharacterTokenizerTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/gsub/CompoundCharacterTokenizerTest.java?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/gsub/CompoundCharacterTokenizerTest.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/gsub/CompoundCharacterTokenizerTest.java Sun Nov 15 15:45:13 2020
@@ -17,14 +17,14 @@
package org.apache.fontbox.ttf.gsub;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class CompoundCharacterTokenizerTest
{
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/gsub/GlyphArraySplitterRegexImplTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/gsub/GlyphArraySplitterRegexImplTest.java?rev=1883445&r1=1883444&r2=1883445&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/gsub/GlyphArraySplitterRegexImplTest.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/ttf/gsub/GlyphArraySplitterRegexImplTest.java Sun Nov 15 15:45:13 2020
@@ -17,14 +17,14 @@
package org.apache.fontbox.ttf.gsub;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class GlyphArraySplitterRegexImplTest
{