You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ms...@apache.org on 2015/03/14 13:35:08 UTC
svn commit: r1666676 - in
/pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox:
TestValidatePermitedMetadata.java parser/DeserializationTest.java
schema/AbstractSchemaTester.java type/AbstractStructuredTypeTester.java
type/AbstractTypeTester.java
Author: msahyoun
Date: Sat Mar 14 12:35:08 2015
New Revision: 1666676
URL: http://svn.apache.org/r1666676
Log:
PDFBOX-2576 fix source code formatting
Modified:
pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/TestValidatePermitedMetadata.java
pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/parser/DeserializationTest.java
pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/schema/AbstractSchemaTester.java
pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/AbstractStructuredTypeTester.java
pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/AbstractTypeTester.java
Modified: pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/TestValidatePermitedMetadata.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/TestValidatePermitedMetadata.java?rev=1666676&r1=1666675&r2=1666676&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/TestValidatePermitedMetadata.java (original)
+++ pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/TestValidatePermitedMetadata.java Sat Mar 14 12:35:08 2015
@@ -42,7 +42,8 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertTrue;
@RunWith(Parameterized.class)
-public class TestValidatePermitedMetadata {
+public class TestValidatePermitedMetadata
+{
@Parameters(name="{0} {1} {2}")
public static Collection<Object[]> initializeParameters() throws Exception
@@ -51,8 +52,10 @@ public class TestValidatePermitedMetadat
InputStream is = TestValidatePermitedMetadata.class.getResourceAsStream("/permited_metadata.txt");
BufferedReader reader = new BufferedReader(new InputStreamReader(is));
String line = reader.readLine();
- while (line!=null) {
- if (line.startsWith("http://")) {
+ while (line!=null)
+ {
+ if (line.startsWith("http://"))
+ {
// this is a line to handle
int pos = line.lastIndexOf(':');
int spos = line.lastIndexOf('/',pos);
@@ -73,13 +76,15 @@ public class TestValidatePermitedMetadat
private String preferred;
- public TestValidatePermitedMetadata (String ns, String prf, String fn) {
+ public TestValidatePermitedMetadata (String ns, String prf, String fn)
+ {
this.namespace = ns;
this.preferred = prf;
this.fieldname = fn;
}
@Test
- public void checkExistence () throws Exception {
+ public void checkExistence() throws Exception
+ {
// ensure schema exists
XMPMetadata xmpmd = new XMPMetadata();
TypeMapping mapping = new TypeMapping(xmpmd);
@@ -91,18 +96,24 @@ public class TestValidatePermitedMetadat
// ensure field is defined
boolean found = false;
Class<?> clz = schema.getClass();
- for (Field dfield : clz.getDeclaredFields()) {
+ for (Field dfield : clz.getDeclaredFields())
+ {
PropertyType ptype = dfield.getAnnotation(PropertyType.class);
- if (ptype!=null) {
+ if (ptype!=null)
+ {
// is a field definition
- if (String.class.equals(dfield.getType())) {
+ if (String.class.equals(dfield.getType()))
+ {
String value = (String) dfield.get(clz);
- if (fieldname.equals(value)) {
+ if (fieldname.equals(value))
+ {
// found the field defining
found = true;
break;
}
- } else {
+ }
+ else
+ {
// All field declaration are string
throw new IllegalArgumentException("Should be a string : "+dfield.getName());
}
@@ -110,7 +121,8 @@ public class TestValidatePermitedMetadat
}
}
- String msg = String.format("Did not find field definition for '%s' in %s (%s)",fieldname,clz.getSimpleName(),namespace);
+ String msg = String.format("Did not find field definition for '%s' in %s (%s)",
+ fieldname,clz.getSimpleName(),namespace);
assertTrue(msg,found);
}
Modified: pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/parser/DeserializationTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/parser/DeserializationTest.java?rev=1666676&r1=1666675&r2=1666676&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/parser/DeserializationTest.java (original)
+++ pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/parser/DeserializationTest.java Sat Mar 14 12:35:08 2015
@@ -341,7 +341,8 @@ public class DeserializationTest
}
@Test
- public void testSpaceTextValues () throws Exception {
+ public void testSpaceTextValues() throws Exception
+ {
// check values with spaces at start or end
// in this case, the value should not be trimmed
InputStream is = DomXmpParser.class.getResourceAsStream("/validxmp/only_space_fields.xmp");
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=1666676&r1=1666675&r2=1666676&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 Sat Mar 14 12:35:08 2015
@@ -107,14 +107,18 @@ public abstract class AbstractSchemaTest
public void testRandomSettingValue() throws Exception
{
initializeSeed(new Random());
- for (int i=0; i < RAND_LOOP_COUNT;i++) {
+ for (int i=0; i < RAND_LOOP_COUNT;i++)
+ {
internalTestSettingValue();
}
}
- private void internalTestSettingValue() throws Exception {
+ private void internalTestSettingValue() throws Exception
+ {
if (cardinality != Cardinality.Simple)
+ {
return;
+ }
XMPSchema schema = getSchema();
// only test simple properties
Object value = getJavaValue(type);
@@ -145,14 +149,18 @@ public abstract class AbstractSchemaTest
public void testRandomSettingValueInArray() throws Exception
{
initializeSeed(new Random());
- for (int i=0; i < RAND_LOOP_COUNT;i++) {
+ for (int i=0; i < RAND_LOOP_COUNT;i++)
+ {
internalTestSettingValueInArray();
}
}
- private void internalTestSettingValueInArray() throws Exception {
+ private void internalTestSettingValueInArray() throws Exception
+ {
if (cardinality == Cardinality.Simple)
+ {
return;
+ }
XMPSchema schema = getSchema();
// only test array properties
Object value = getJavaValue(type);
@@ -193,14 +201,18 @@ public abstract class AbstractSchemaTest
public void testRandomPropertySetterSimple() throws Exception
{
initializeSeed(new Random());
- for (int i=0; i < RAND_LOOP_COUNT;i++) {
+ for (int i=0; i < RAND_LOOP_COUNT;i++)
+ {
internalTestPropertySetterSimple();
}
}
- private void internalTestPropertySetterSimple() throws Exception {
+ private void internalTestPropertySetterSimple() throws Exception
+ {
if (cardinality != Cardinality.Simple)
+ {
return;
+ }
XMPSchema schema = getSchema();
String setter = calculateSimpleSetter(fieldName) + "Property";
Object value = getJavaValue(type);
@@ -220,7 +232,8 @@ public abstract class AbstractSchemaTest
}
@Test
- public void testPropertySetterInArray() throws Exception {
+ public void testPropertySetterInArray() throws Exception
+ {
internalTestPropertySetterInArray();
}
@@ -228,14 +241,18 @@ public abstract class AbstractSchemaTest
public void testRandomPropertySetterInArray() throws Exception
{
initializeSeed(new Random());
- for (int i=0; i < RAND_LOOP_COUNT;i++) {
+ for (int i=0; i < RAND_LOOP_COUNT;i++)
+ {
internalTestPropertySetterInArray();
}
}
- private void internalTestPropertySetterInArray() throws Exception {
+ private void internalTestPropertySetterInArray() throws Exception
+ {
if (cardinality == Cardinality.Simple)
+ {
return;
+ }
XMPSchema schema = getSchema();
// add value
String setter = "add" + calculateFieldNameForMethod(fieldName);
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=1666676&r1=1666675&r2=1666676&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 Sat Mar 14 12:35:08 2015
@@ -85,12 +85,13 @@ public abstract class AbstractStructured
public void testRandomSettingValue() throws Exception
{
initializeSeed(new Random());
- for (int i=0; i < RAND_LOOP_COUNT;i++) {
+ for (int i=0; i < RAND_LOOP_COUNT;i++)
+ {
internalTestSettingValue();
}
}
- private void internalTestSettingValue () throws Exception
+ private void internalTestSettingValue() throws Exception
{
AbstractStructuredType structured = getStructured();
Object value = getJavaValue(type);
@@ -120,13 +121,14 @@ public abstract class AbstractStructured
public void testRandomPropertyType() throws Exception
{
initializeSeed(new Random());
- for (int i=0; i < RAND_LOOP_COUNT;i++) {
+ for (int i=0; i < RAND_LOOP_COUNT;i++)
+ {
internalTestPropertyType();
}
}
- private void internalTestPropertyType () throws Exception
+ private void internalTestPropertyType() throws Exception
{
AbstractStructuredType structured = getStructured();
Object value = getJavaValue(type);
@@ -148,12 +150,13 @@ public abstract class AbstractStructured
public void testRandomSetter() throws Exception
{
initializeSeed(new Random());
- for (int i=0; i < RAND_LOOP_COUNT;i++) {
+ for (int i=0; i < RAND_LOOP_COUNT;i++)
+ {
internalTestSetter();
}
}
- private void internalTestSetter () throws Exception
+ private void internalTestSetter() throws Exception
{
AbstractStructuredType structured = getStructured();
String setter = calculateSimpleSetter(fieldName);
Modified: pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/AbstractTypeTester.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/AbstractTypeTester.java?rev=1666676&r1=1666675&r2=1666676&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/AbstractTypeTester.java (original)
+++ pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/AbstractTypeTester.java Sat Mar 14 12:35:08 2015
@@ -39,7 +39,8 @@ public abstract class AbstractTypeTester
private Random counterRandom = new Random(COUNTER_SEED);
- protected void initializeSeed (Random rand) {
+ protected void initializeSeed (Random rand)
+ {
this.counterRandom = rand;
}