Author: tilman Date: Sun Mar 30 21:10:06 2014 New Revision: 1583201 URL: http://svn.apache.org/r1583201 Log: PDFBOX-2002: replaced deprecated junit import with the current one
Modified: pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/DoubleSameTypeSchemaTest.java pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/XMPMetaDataTest.java pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/AbstractSchemaTester.java pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/AbstractXMPSchemaTest.java pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/AdobePDFErrorsTest.java pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/BasicJobTicketSchemaTest.java pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/PDFAIdentificationOthersTest.java pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/XMPSchemaTest.java pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/AbstractStructuredTypeTester.java pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/AttributeTest.java pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/TestAbstractStructuredType.java Modified: pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/DoubleSameTypeSchemaTest.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/DoubleSameTypeSchemaTest.java?rev=1583201&r1=1583200&r2=1583201&view=diff ============================================================================== --- pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/DoubleSameTypeSchemaTest.java (original) +++ pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/DoubleSameTypeSchemaTest.java Sun Mar 30 21:10:06 2014 @@ -23,12 +23,10 @@ package org.apache.xmpbox; import java.util.ArrayList; import java.util.List; - -import junit.framework.Assert; - import org.apache.xmpbox.schema.DublinCoreSchema; import org.apache.xmpbox.schema.XMPSchema; import org.apache.xmpbox.type.StructuredType; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; Modified: pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/XMPMetaDataTest.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/XMPMetaDataTest.java?rev=1583201&r1=1583200&r2=1583201&view=diff ============================================================================== --- pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/XMPMetaDataTest.java (original) +++ pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/XMPMetaDataTest.java Sun Mar 30 21:10:06 2014 @@ -22,11 +22,9 @@ package org.apache.xmpbox; import java.util.List; - -import junit.framework.Assert; - import org.apache.xmpbox.schema.XMPSchema; import org.apache.xmpbox.xml.XmpSerializationException; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.w3c.dom.Document; Modified: pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/AbstractSchemaTester.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/AbstractSchemaTester.java?rev=1583201&r1=1583200&r2=1583201&view=diff ============================================================================== --- pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/AbstractSchemaTester.java (original) +++ pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/AbstractSchemaTester.java Sun Mar 30 21:10:06 2014 @@ -23,9 +23,6 @@ package org.apache.xmpbox.schema; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.List; - -import junit.framework.Assert; - import org.apache.xmpbox.XMPMetadata; import org.apache.xmpbox.type.AbstractSimpleProperty; import org.apache.xmpbox.type.ArrayProperty; @@ -34,6 +31,7 @@ import org.apache.xmpbox.type.TypeMappin import org.apache.xmpbox.type.TypeTestingHelper; import org.apache.xmpbox.type.Types; import org.apache.xmpbox.xml.DomXmpParser; +import org.junit.Assert; import org.junit.Test; public abstract class AbstractSchemaTester Modified: pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/AbstractXMPSchemaTest.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/AbstractXMPSchemaTest.java?rev=1583201&r1=1583200&r2=1583201&view=diff ============================================================================== --- pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/AbstractXMPSchemaTest.java (original) +++ pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/AbstractXMPSchemaTest.java Sun Mar 30 21:10:06 2014 @@ -27,9 +27,6 @@ import java.util.Arrays; import java.util.Calendar; import java.util.List; import java.util.Map; - -import junit.framework.Assert; - import org.apache.xmpbox.XMPMetadata; import org.apache.xmpbox.type.AgentNameType; import org.apache.xmpbox.type.BooleanType; @@ -43,6 +40,7 @@ import org.apache.xmpbox.type.TypeMappin import org.apache.xmpbox.type.Types; import org.apache.xmpbox.type.URIType; import org.apache.xmpbox.type.URLType; +import org.junit.Assert; import org.junit.Test; public abstract class AbstractXMPSchemaTest Modified: pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/AdobePDFErrorsTest.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/AdobePDFErrorsTest.java?rev=1583201&r1=1583200&r2=1583201&view=diff ============================================================================== --- pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/AdobePDFErrorsTest.java (original) +++ pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/AdobePDFErrorsTest.java Sun Mar 30 21:10:06 2014 @@ -21,11 +21,10 @@ package org.apache.xmpbox.schema; -import junit.framework.Assert; - import org.apache.xmpbox.XMPMetadata; import org.apache.xmpbox.type.BadFieldValueException; import org.apache.xmpbox.xml.DomXmpParser; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; Modified: pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/BasicJobTicketSchemaTest.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/BasicJobTicketSchemaTest.java?rev=1583201&r1=1583200&r2=1583201&view=diff ============================================================================== --- pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/BasicJobTicketSchemaTest.java (original) +++ pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/BasicJobTicketSchemaTest.java Sun Mar 30 21:10:06 2014 @@ -23,15 +23,13 @@ package org.apache.xmpbox.schema; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.InputStream; - -import junit.framework.Assert; - import org.apache.commons.io.IOUtils; import org.apache.xmpbox.XMPMetadata; import org.apache.xmpbox.type.JobType; import org.apache.xmpbox.type.StructuredType; import org.apache.xmpbox.xml.DomXmpParser; import org.apache.xmpbox.xml.XmpSerializer; +import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; Modified: pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/PDFAIdentificationOthersTest.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/PDFAIdentificationOthersTest.java?rev=1583201&r1=1583200&r2=1583201&view=diff ============================================================================== --- pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/PDFAIdentificationOthersTest.java (original) +++ pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/PDFAIdentificationOthersTest.java Sun Mar 30 21:10:06 2014 @@ -21,10 +21,9 @@ package org.apache.xmpbox.schema; -import junit.framework.Assert; - import org.apache.xmpbox.XMPMetadata; import org.apache.xmpbox.type.BadFieldValueException; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; Modified: pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/XMPSchemaTest.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/XMPSchemaTest.java?rev=1583201&r1=1583200&r2=1583201&view=diff ============================================================================== --- pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/XMPSchemaTest.java (original) +++ pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/XMPSchemaTest.java Sun Mar 30 21:10:06 2014 @@ -24,9 +24,6 @@ package org.apache.xmpbox.schema; import java.io.IOException; import java.util.Calendar; import java.util.List; - -import junit.framework.Assert; - import org.apache.xmpbox.DateConverter; import org.apache.xmpbox.XMPMetadata; import org.apache.xmpbox.XmpConstants; @@ -40,6 +37,7 @@ import org.apache.xmpbox.type.DateType; import org.apache.xmpbox.type.IntegerType; import org.apache.xmpbox.type.TextType; import org.apache.xmpbox.type.TypeMapping; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; Modified: pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/AbstractStructuredTypeTester.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/AbstractStructuredTypeTester.java?rev=1583201&r1=1583200&r2=1583201&view=diff ============================================================================== --- pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/AbstractStructuredTypeTester.java (original) +++ pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/AbstractStructuredTypeTester.java Sun Mar 30 21:10:06 2014 @@ -24,11 +24,9 @@ package org.apache.xmpbox.type; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.List; - -import junit.framework.Assert; - import org.apache.xmpbox.XMPMetadata; import org.apache.xmpbox.xml.DomXmpParser; +import org.junit.Assert; import org.junit.Test; public abstract class AbstractStructuredTypeTester Modified: pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/AttributeTest.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/AttributeTest.java?rev=1583201&r1=1583200&r2=1583201&view=diff ============================================================================== --- pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/AttributeTest.java (original) +++ pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/AttributeTest.java Sun Mar 30 21:10:06 2014 @@ -21,8 +21,7 @@ package org.apache.xmpbox.type; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; public class AttributeTest Modified: pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/TestAbstractStructuredType.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/TestAbstractStructuredType.java?rev=1583201&r1=1583200&r2=1583201&view=diff ============================================================================== --- pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/TestAbstractStructuredType.java (original) +++ pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/TestAbstractStructuredType.java Sun Mar 30 21:10:06 2014 @@ -22,10 +22,8 @@ package org.apache.xmpbox.type; import java.util.Calendar; - -import junit.framework.Assert; - import org.apache.xmpbox.XMPMetadata; +import org.junit.Assert; import org.junit.Before; import org.junit.Test;