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 2012/08/06 22:57:01 UTC
svn commit: r1370012 - in
/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight: ./
integration/ metadata/ util/ utils/
Author: leleueri
Date: Mon Aug 6 20:57:00 2012
New Revision: 1370012
URL: http://svn.apache.org/viewvc?rev=1370012&view=rev
Log:
[https://issues.apache.org/jira/browse/PDFBOX-1312] Move TestCase of the previous implementation in new package
Added:
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/Benchmark.java
- copied, changed from r1296846, pdfbox/trunk/preflight/src/test/java/org/apache/padaf/preflight/Benchmark.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/
- copied from r1296846, pdfbox/trunk/preflight/src/test/java/org/apache/padaf/integration/
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/metadata/
- copied from r1296846, pdfbox/trunk/preflight/src/test/java/org/apache/padaf/preflight/xmp/
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/metadata/TestSynchronizedMetadataValidation.java
- copied, changed from r1355693, pdfbox/trunk/preflight/src/test/java/org/apache/padaf/preflight/xmp/TestSynchronizedMetadataValidation.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/util/
- copied from r1296846, pdfbox/trunk/preflight/src/test/java/org/apache/padaf/preflight/util/
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/utils/
- copied from r1296846, pdfbox/trunk/preflight/src/test/java/org/apache/padaf/preflight/utils/
Removed:
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/util/DocumentHandlerStub.java
Modified:
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestIsartorValidationFromClasspath.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestValidDirectory.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/AbstractInvalidFileTester.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestInvalidFiles.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestIsartorValidation.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestValidFiles.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/util/ByteArrayDataSource.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/util/IsartorPdfProvider.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/util/NOCatalogDocument.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/utils/TestCOSUtils.java
Copied: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/Benchmark.java (from r1296846, pdfbox/trunk/preflight/src/test/java/org/apache/padaf/preflight/Benchmark.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/Benchmark.java?p2=pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/Benchmark.java&p1=pdfbox/trunk/preflight/src/test/java/org/apache/padaf/preflight/Benchmark.java&r1=1296846&r2=1370012&rev=1370012&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/test/java/org/apache/padaf/preflight/Benchmark.java (original)
+++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/Benchmark.java Mon Aug 6 20:57:00 2012
@@ -19,10 +19,9 @@
*
****************************************************************************/
-package org.apache.padaf.preflight;
+package org.apache.pdfbox.preflight;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.FileWriter;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -32,13 +31,10 @@ import java.util.List;
import javax.activation.FileDataSource;
-
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.padaf.preflight.PdfAValidator;
-import org.apache.padaf.preflight.PdfAValidatorFactory;
-import org.apache.padaf.preflight.ValidationResult;
-import org.apache.padaf.preflight.ValidationResult.ValidationError;
+import org.apache.pdfbox.preflight.ValidationResult.ValidationError;
+import org.apache.pdfbox.preflight.parser.PreflightParser;
public class Benchmark {
@@ -67,21 +63,24 @@ public class Benchmark {
SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy hh:mm:ss.Z");
- PdfAValidator validator = new PdfAValidatorFactory().createValidatorInstance(PdfAValidatorFactory.PDF_A_1_b);
long startGTime = System.currentTimeMillis();
int size = lfd.size();
for (int i = 0 ; i < loop ; i++) {
File file = lfd.get(i%size);
long startLTime = System.currentTimeMillis();
- ValidationResult result = validator.validate(new FileDataSource(file));
+ PreflightParser parser = new PreflightParser(new FileDataSource(file));
+ parser.parse();
+ PreflightDocument document = parser.getPreflightDocument();
+ document.validate();
+ ValidationResult result = document.getResult();
if (!result.isValid()) {
resFile.write(file.getAbsolutePath() + " isn't PDF/A\n");
for (ValidationError error : result.getErrorsList()) {
resFile.write(error.getErrorCode() + " : " + error.getDetails() +"\n");
}
}
- result.closePdf();
+ document.close();
long endLTime = System.currentTimeMillis();
resFile.write(file.getName() + " (ms) : " + (endLTime - startLTime) + "\n");
resFile.flush();
Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestIsartorValidationFromClasspath.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestIsartorValidationFromClasspath.java?rev=1370012&r1=1370011&r2=1370012&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestIsartorValidationFromClasspath.java (original)
+++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestIsartorValidationFromClasspath.java Mon Aug 6 20:57:00 2012
@@ -36,8 +36,6 @@ import java.util.StringTokenizer;
import junit.framework.Assert;
import org.apache.commons.io.IOUtils;
-import org.apache.pdfbox.preflight.PreflightDocument;
-import org.apache.pdfbox.preflight.ValidationResult;
import org.apache.pdfbox.preflight.ValidationResult.ValidationError;
import org.apache.pdfbox.preflight.exception.ValidationException;
import org.apache.pdfbox.preflight.parser.PreflightParser;
@@ -90,6 +88,7 @@ public class TestIsartorValidationFromCl
public void validate() throws Exception {
PreflightDocument document = null;
try {
+ System.out.println(path);
InputStream input = this.getClass().getResourceAsStream(path);
PreflightParser parser = new PreflightParser(new org.apache.pdfbox.preflight.utils.ByteArrayDataSource(input));
parser.parse();
Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestValidDirectory.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestValidDirectory.java?rev=1370012&r1=1370011&r2=1370012&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestValidDirectory.java (original)
+++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestValidDirectory.java Mon Aug 6 20:57:00 2012
@@ -30,7 +30,6 @@ import javax.activation.FileDataSource;
import junit.framework.Assert;
-import org.apache.padaf.preflight.ValidationResult;
import org.apache.pdfbox.preflight.parser.PreflightParser;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -48,17 +47,17 @@ public class TestValidDirectory {
@Test
public void validate () throws Exception {
- ValidationResult result = null;
+ PreflightDocument document = null;
try {
System.out.println(target);
PreflightParser parser = new PreflightParser(new FileDataSource(target));
parser.parse();
- PreflightDocument document = (PreflightDocument) parser.getPDDocument();
+ document = (PreflightDocument) parser.getPDDocument();
document.validate();
Assert.assertTrue("Validation of " + target ,document.getResult().isValid());
} finally {
- if (result != null) {
- result.closePdf();
+ if (document != null) {
+ document.close();
}
}
}
Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/AbstractInvalidFileTester.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/AbstractInvalidFileTester.java?rev=1370012&r1=1296846&r2=1370012&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/AbstractInvalidFileTester.java (original)
+++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/AbstractInvalidFileTester.java Mon Aug 6 20:57:00 2012
@@ -1,4 +1,4 @@
-package org.apache.padaf.integration;
+package org.apache.pdfbox.preflight.integration;
/*****************************************************************************
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -31,11 +31,11 @@ import junit.framework.Assert;
import org.apache.commons.io.IOUtils;
import org.apache.log4j.Logger;
-import org.apache.padaf.preflight.PdfAValidator;
-import org.apache.padaf.preflight.PdfAValidatorFactory;
-import org.apache.padaf.preflight.ValidationException;
-import org.apache.padaf.preflight.ValidationResult;
-import org.apache.padaf.preflight.ValidationResult.ValidationError;
+import org.apache.pdfbox.preflight.PreflightDocument;
+import org.apache.pdfbox.preflight.ValidationResult;
+import org.apache.pdfbox.preflight.ValidationResult.ValidationError;
+import org.apache.pdfbox.preflight.exception.ValidationException;
+import org.apache.pdfbox.preflight.parser.PreflightParser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -51,11 +51,6 @@ public abstract class AbstractInvalidFil
protected OutputStream outputResult = null;
/**
- * The instance of validator
- */
- protected PdfAValidator validator = null;
-
- /**
* carry the expected error with the current test
*/
protected final String expectedError;
@@ -74,14 +69,11 @@ public abstract class AbstractInvalidFil
*
* @param path pdf/a file to test
* @param error expected error for this test
- * @throws ValidationException
*/
- public AbstractInvalidFileTester(File path, String error) throws ValidationException {
+ public AbstractInvalidFileTester(File path, String error) {
this.path = path;
this.expectedError = error;
this.logger = Logger.getLogger(this.getClass());
- PdfAValidatorFactory factory = new PdfAValidatorFactory();
- validator = factory.createValidatorInstance(PdfAValidatorFactory.PDF_A_1_b);
}
@@ -91,14 +83,17 @@ public abstract class AbstractInvalidFil
logger.warn("This is an empty test");
return;
}
- ValidationResult result = null;
+ PreflightDocument document = null;
try {
FileDataSource bds = new FileDataSource(path);
- result = validator.validate(bds);
- Assert.assertFalse(path + " : Isartor file should be invalid ("
- + path + ")", result.isValid());
- Assert.assertTrue(path + " : Should find at least one error",
- result.getErrorsList().size() > 0);
+ PreflightParser parser = new PreflightParser(bds);
+ parser.parse();
+ document = parser.getPreflightDocument();
+ document.validate();
+
+ ValidationResult result = document.getResult();
+ Assert.assertFalse(path + " : Isartor file should be invalid (" + path + ")", result.isValid());
+ Assert.assertTrue(path + " : Should find at least one error",result.getErrorsList().size() > 0);
// could contain more than one error
boolean found = false;
if (this.expectedError!=null) {
@@ -135,8 +130,8 @@ public abstract class AbstractInvalidFil
} catch (ValidationException e) {
throw new Exception(path + " :" + e.getMessage(), e);
} finally {
- if (result!=null) {
- result.closePdf();
+ if (document!=null) {
+ document.close();
}
}
}
Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestInvalidFiles.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestInvalidFiles.java?rev=1370012&r1=1296846&r2=1370012&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestInvalidFiles.java (original)
+++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestInvalidFiles.java Mon Aug 6 20:57:00 2012
@@ -1,4 +1,4 @@
-package org.apache.padaf.integration;
+package org.apache.pdfbox.preflight.integration;
/*****************************************************************************
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -33,7 +33,6 @@ import java.util.StringTokenizer;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.log4j.Logger;
-import org.apache.padaf.preflight.ValidationException;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -49,7 +48,7 @@ public class TestInvalidFiles extends Ab
protected static Logger staticLogger = Logger.getLogger("Test");
- public TestInvalidFiles(File path, String error) throws ValidationException {
+ public TestInvalidFiles(File path, String error) {
super(path,error);
}
Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestIsartorValidation.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestIsartorValidation.java?rev=1370012&r1=1296846&r2=1370012&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestIsartorValidation.java (original)
+++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestIsartorValidation.java Mon Aug 6 20:57:00 2012
@@ -1,4 +1,4 @@
-package org.apache.padaf.integration;
+package org.apache.pdfbox.preflight.integration;
/*****************************************************************************
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -33,7 +33,6 @@ import java.util.StringTokenizer;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.log4j.Logger;
-import org.apache.padaf.preflight.ValidationException;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -50,7 +49,7 @@ public class TestIsartorValidation exten
protected static Logger staticLogger = Logger.getLogger("Test");
- public TestIsartorValidation(File path, String error) throws ValidationException {
+ public TestIsartorValidation(File path, String error) {
super(path,error);
}
Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestValidFiles.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestValidFiles.java?rev=1370012&r1=1296846&r2=1370012&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestValidFiles.java (original)
+++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/TestValidFiles.java Mon Aug 6 20:57:00 2012
@@ -1,4 +1,4 @@
-package org.apache.padaf.integration;
+package org.apache.pdfbox.preflight.integration;
/*****************************************************************************
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -35,10 +35,10 @@ import junit.framework.Assert;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.log4j.Logger;
-import org.apache.padaf.preflight.PdfAValidator;
-import org.apache.padaf.preflight.PdfAValidatorFactory;
-import org.apache.padaf.preflight.ValidationException;
-import org.apache.padaf.preflight.ValidationResult;
+import org.apache.pdfbox.preflight.PreflightDocument;
+import org.apache.pdfbox.preflight.ValidationResult;
+import org.apache.pdfbox.preflight.exception.ValidationException;
+import org.apache.pdfbox.preflight.parser.PreflightParser;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -55,8 +55,6 @@ public class TestValidFiles {
protected static OutputStream isartorResultFile = null;
- protected static PdfAValidator validator = null;
-
protected File path;
protected static Logger staticLogger = Logger.getLogger("Test");
@@ -102,11 +100,7 @@ public class TestValidFiles {
@BeforeClass
public static void beforeClass() throws Exception {
- PdfAValidatorFactory factory = new PdfAValidatorFactory();
- validator = factory.createValidatorInstance(PdfAValidatorFactory.PDF_A_1_b);
-
String irp = System.getProperty(RESULTS_FILE);
-
if (irp==null) {
// no log file defined, use system.err
System.err.println("No result file defined, will use standart error");
@@ -127,14 +121,17 @@ public class TestValidFiles {
logger.warn("This is an empty test");
return;
}
- ValidationResult result = null;
+ PreflightDocument document = null;
try {
FileDataSource bds = new FileDataSource(path);
- result = validator.validate(bds);
- Assert.assertFalse(path + " : Isartor file should be invalid ("
- + path + ")", result.isValid());
- Assert.assertTrue(path + " : Should find at least one error",
- result.getErrorsList().size() > 0);
+ PreflightParser parser = new PreflightParser(bds);
+ parser.parse();
+ document = parser.getPreflightDocument();
+ document.validate();
+
+ ValidationResult result = document.getResult();
+ Assert.assertFalse(path + " : Isartor file should be invalid (" + path + ")", result.isValid());
+ Assert.assertTrue(path + " : Should find at least one error", result.getErrorsList().size() > 0);
// could contain more than one error
if (result.getErrorsList().size() > 0) {
Assert.fail("File expected valid : "+path.getAbsolutePath());
@@ -142,8 +139,8 @@ public class TestValidFiles {
} catch (ValidationException e) {
throw new Exception(path + " :" + e.getMessage(), e);
} finally {
- if (result!=null) {
- result.closePdf();
+ if (document!=null) {
+ document.close();
}
}
}
Copied: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/metadata/TestSynchronizedMetadataValidation.java (from r1355693, pdfbox/trunk/preflight/src/test/java/org/apache/padaf/preflight/xmp/TestSynchronizedMetadataValidation.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/metadata/TestSynchronizedMetadataValidation.java?p2=pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/metadata/TestSynchronizedMetadataValidation.java&p1=pdfbox/trunk/preflight/src/test/java/org/apache/padaf/preflight/xmp/TestSynchronizedMetadataValidation.java&r1=1355693&r2=1370012&rev=1370012&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/test/java/org/apache/padaf/preflight/xmp/TestSynchronizedMetadataValidation.java (original)
+++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/metadata/TestSynchronizedMetadataValidation.java Mon Aug 6 20:57:00 2012
@@ -19,7 +19,7 @@
*
****************************************************************************/
-package org.apache.padaf.preflight.xmp;
+package org.apache.pdfbox.preflight.metadata;
import java.io.IOException;
import java.util.Calendar;
@@ -28,21 +28,20 @@ import java.util.List;
import junit.framework.Assert;
-import org.apache.padaf.preflight.ValidationConstants;
-import org.apache.padaf.preflight.ValidationException;
-import org.apache.padaf.preflight.ValidationResult.ValidationError;
-import org.apache.padaf.preflight.xmp.SynchronizedMetaDataValidation;
import org.apache.padaf.xmpbox.XMPMetadata;
+import org.apache.padaf.xmpbox.parser.XMPDocumentBuilder;
import org.apache.padaf.xmpbox.schema.AdobePDFSchema;
import org.apache.padaf.xmpbox.schema.DublinCoreSchema;
import org.apache.padaf.xmpbox.schema.XMPBasicSchema;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDDocumentInformation;
+import org.apache.pdfbox.preflight.PreflightConstants;
+import org.apache.pdfbox.preflight.ValidationResult.ValidationError;
+import org.apache.pdfbox.preflight.exception.ValidationException;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-
/**
* Test Class of SynchronizedMetaDataValidation (for 6-7-3 Isartor Tests)
*
@@ -70,7 +69,7 @@ public class TestSynchronizedMetadataVal
try {
doc = new PDDocument();
dico = doc.getDocumentInformation();
- metadata = new XMPMetadata();
+ metadata = new XMPDocumentBuilder().createXMPMetadata();
} catch (IOException e) {
throw new Exception("Failed to create temporary test PDF/XMP Document");
}
@@ -152,7 +151,7 @@ public class TestSynchronizedMetadataVal
ve = sync.validateMetadataSynchronization(doc, metadata);
// Test Detection of an Empty XMP (without any schemas)
for (ValidationError valid : ve) {
- Assert.assertEquals(ValidationConstants.ERROR_METADATA_MISMATCH, valid
+ Assert.assertEquals(PreflightConstants.ERROR_METADATA_MISMATCH, valid
.getErrorCode());
}
} catch (ValidationException e) {
@@ -483,7 +482,7 @@ public class TestSynchronizedMetadataVal
try {
ve = sync.validateMetadataSynchronization(doc, metadata);
for (ValidationError valid : ve) {
- Assert.assertEquals(ValidationConstants.ERROR_METADATA_WRONG_NS_PREFIX,
+ Assert.assertEquals(PreflightConstants.ERROR_METADATA_WRONG_NS_PREFIX,
valid.getErrorCode());
}
} catch (ValidationException e) {
Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/util/ByteArrayDataSource.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/util/ByteArrayDataSource.java?rev=1370012&r1=1296846&r2=1370012&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/util/ByteArrayDataSource.java (original)
+++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/util/ByteArrayDataSource.java Mon Aug 6 20:57:00 2012
@@ -19,7 +19,7 @@
*
****************************************************************************/
-package org.apache.padaf.preflight.util;
+package org.apache.pdfbox.preflight.util;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/util/IsartorPdfProvider.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/util/IsartorPdfProvider.java?rev=1370012&r1=1296846&r2=1370012&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/util/IsartorPdfProvider.java (original)
+++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/util/IsartorPdfProvider.java Mon Aug 6 20:57:00 2012
@@ -19,13 +19,9 @@
*
****************************************************************************/
-package org.apache.padaf.preflight.util;
+package org.apache.pdfbox.preflight.util;
-import java.io.File;
import java.io.InputStream;
-import java.util.Iterator;
-
-import org.apache.commons.io.FileUtils;
public class IsartorPdfProvider {
// public static File path;
Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/util/NOCatalogDocument.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/util/NOCatalogDocument.java?rev=1370012&r1=1296846&r2=1370012&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/util/NOCatalogDocument.java (original)
+++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/util/NOCatalogDocument.java Mon Aug 6 20:57:00 2012
@@ -19,7 +19,7 @@
*
****************************************************************************/
-package org.apache.padaf.preflight.util;
+package org.apache.pdfbox.preflight.util;
import java.io.IOException;
Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/utils/TestCOSUtils.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/utils/TestCOSUtils.java?rev=1370012&r1=1296846&r2=1370012&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/utils/TestCOSUtils.java (original)
+++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/utils/TestCOSUtils.java Mon Aug 6 20:57:00 2012
@@ -19,18 +19,16 @@
*
****************************************************************************/
-package org.apache.padaf.preflight.utils;
+package org.apache.pdfbox.preflight.utils;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.fail;
import java.io.File;
import java.io.IOException;
-
import java.util.HashMap;
import java.util.Map;
-import org.apache.padaf.preflight.utils.COSUtils;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSDocument;
@@ -42,6 +40,7 @@ import org.apache.pdfbox.cos.COSString;
import org.apache.pdfbox.io.RandomAccess;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.persistence.util.COSObjectKey;
+import org.apache.pdfbox.preflight.utils.COSUtils;
import org.junit.Test;
public class TestCOSUtils {