Author: tilman Date: Sun Mar 30 21:47:37 2014 New Revision: 1583208 URL: http://svn.apache.org/r1583208 Log: PDFBOX-2002: replaced deprecated junit import
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNameTreeNode.java pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNumberTreeNode.java pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestTTFParser.java Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java?rev=1583208&r1=1583207&r2=1583208&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java (original) +++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestPublicKeyEncryption.java Sun Mar 30 21:47:37 2014 @@ -24,15 +24,13 @@ import java.security.KeyStore; import java.security.NoSuchAlgorithmException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; - -import junit.framework.Assert; -import junit.framework.TestCase; - import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.encryption.AccessPermission; import org.apache.pdfbox.pdmodel.encryption.PublicKeyDecryptionMaterial; import org.apache.pdfbox.pdmodel.encryption.PublicKeyProtectionPolicy; import org.apache.pdfbox.pdmodel.encryption.PublicKeyRecipient; +import junit.framework.TestCase; +import org.junit.Assert; /** * Tests for public key encryption. Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNameTreeNode.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNameTreeNode.java?rev=1583208&r1=1583207&r2=1583208&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNameTreeNode.java (original) +++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNameTreeNode.java Sun Mar 30 21:47:37 2014 @@ -20,11 +20,9 @@ import java.io.IOException; import java.util.List; import java.util.SortedMap; import java.util.TreeMap; - -import org.apache.pdfbox.cos.COSInteger; - -import junit.framework.Assert; import junit.framework.TestCase; +import org.apache.pdfbox.cos.COSInteger; +import org.junit.Assert; /** * A test case for PDNameTreeNode. Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNumberTreeNode.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNumberTreeNode.java?rev=1583208&r1=1583207&r2=1583208&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNumberTreeNode.java (original) +++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNumberTreeNode.java Sun Mar 30 21:47:37 2014 @@ -21,12 +21,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.TreeMap; - -import junit.framework.Assert; import junit.framework.TestCase; - import org.apache.pdfbox.cos.COSBase; import org.apache.pdfbox.cos.COSInteger; +import org.junit.Assert; /** * A test case for PDNumberTreeNode. Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestTTFParser.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestTTFParser.java?rev=1583208&r1=1583207&r2=1583208&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestTTFParser.java (original) +++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestTTFParser.java Sun Mar 30 21:47:37 2014 @@ -18,9 +18,6 @@ package org.apache.pdfbox.pdmodel.font; import java.io.IOException; import java.io.InputStream; - -import junit.framework.Assert; - import org.apache.fontbox.ttf.CMAPEncodingEntry; import org.apache.fontbox.ttf.CMAPTable; import org.apache.fontbox.ttf.NameRecord; @@ -29,6 +26,7 @@ import org.apache.fontbox.ttf.TTFParser; import org.apache.fontbox.ttf.TrueTypeFont; import org.apache.pdfbox.encoding.Encoding; import org.apache.pdfbox.encoding.WinAnsiEncoding; +import org.junit.Assert; import org.junit.Test; /**