You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by gb...@apache.org on 2013/03/06 16:57:52 UTC
svn commit: r1453395 [11/11] - in /pdfbox/trunk/xmpbox: ./
src/main/java/org/apache/xmpbox/ src/main/java/org/apache/xmpbox/schema/
src/main/java/org/apache/xmpbox/type/ src/main/java/org/apache/xmpbox/xml/
src/test/java/org/apache/xmpbox/ src/test/jav...
Modified: pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/TestVersionType.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/TestVersionType.java?rev=1453395&r1=1453394&r2=1453395&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/TestVersionType.java (original)
+++ pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/TestVersionType.java Wed Mar 6 15:57:44 2013
@@ -24,52 +24,48 @@ package org.apache.xmpbox.type;
import java.util.ArrayList;
import java.util.Collection;
-import org.apache.xmpbox.type.AbstractStructuredType;
-import org.apache.xmpbox.type.Types;
-import org.apache.xmpbox.type.VersionType;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@RunWith(Parameterized.class)
-public class TestVersionType extends AbstractStructuredTypeTester{
+public class TestVersionType extends AbstractStructuredTypeTester
+{
- protected VersionType structured = null;
-
- @Before
- public void before () throws Exception {
- super.before();
- structured = new VersionType(xmp);
- }
-
- public TestVersionType (Class<? extends AbstractStructuredType> clz, String field,Types type) {
- super(clz, field, type);
- }
-
- @Override
- protected AbstractStructuredType getStructured() {
- return structured;
- }
+ protected VersionType structured = null;
-
- @Parameters
- public static Collection<Object[]> initializeParameters() throws Exception {
- Collection<Object[]> result = new ArrayList<Object[]>();
+ @Before
+ public void before() throws Exception
+ {
+ super.before();
+ structured = new VersionType(xmp);
+ }
+
+ public TestVersionType(Class<? extends AbstractStructuredType> clz, String field, Types type)
+ {
+ super(clz, field, type);
+ }
-// result.add(new Object [] {VersionType.class,"version",Types.Text});
-// result.add(new Object [] {VersionType.class,"comments",Types.Text});
-// result.add(new Object [] {VersionType.class,"modifyDate",Types.Date});
- result.add(new Object [] {VersionType.class,"modifier",Types.ProperName});
-
- return result;
-
+ @Override
+ protected AbstractStructuredType getStructured()
+ {
+ return structured;
}
+ @Parameters
+ public static Collection<Object[]> initializeParameters() throws Exception
+ {
+ Collection<Object[]> result = new ArrayList<Object[]>();
+
+ // result.add(new Object [] {VersionType.class,"version",Types.Text});
+ // result.add(new Object [] {VersionType.class,"comments",Types.Text});
+ // result.add(new Object []
+ // {VersionType.class,"modifyDate",Types.Date});
+ result.add(new Object[] { VersionType.class, "modifier", Types.ProperName });
+
+ return result;
+
+ }
-
-
-
-
-
}
Modified: pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/TypeTestingHelper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/TypeTestingHelper.java?rev=1453395&r1=1453394&r2=1453395&view=diff
==============================================================================
--- pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/TypeTestingHelper.java (original)
+++ pdfbox/trunk/xmpbox/src/test/java/org/apache/xmpbox/type/TypeTestingHelper.java Wed Mar 6 15:57:44 2013
@@ -1,4 +1,4 @@
- /*****************************************************************************
+/*****************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -27,88 +27,108 @@ import java.util.List;
import java.util.Random;
import java.util.UUID;
-import org.apache.xmpbox.type.DateType;
-import org.apache.xmpbox.type.IntegerType;
-import org.apache.xmpbox.type.PropertyType;
-import org.apache.xmpbox.type.TextType;
-import org.apache.xmpbox.type.Types;
-
-
-public final class TypeTestingHelper {
-
-
- public static String calculateSimpleGetter (String name) {
- StringBuilder sb = new StringBuilder(3+name.length());
- sb.append("get").append(calculateFieldNameForMethod(name));
- return sb.toString();
- }
-
- public static String calculateArrayGetter (String name) {
- StringBuilder sb = new StringBuilder(4+name.length());
- String fn = calculateFieldNameForMethod(name);
- sb.append("get").append(fn);
- if (!fn.endsWith("s")) {
- sb.append("s");
- }
- return sb.toString();
- }
-
- public static String calculateSimpleSetter (String name) {
- StringBuilder sb = new StringBuilder(3+name.length());
- sb.append("set").append(calculateFieldNameForMethod(name));
- return sb.toString();
- }
-
- public static String calculateFieldNameForMethod (String name) {
- StringBuilder sb = new StringBuilder(name.length());
- sb.append(name.substring(0, 1).toUpperCase()).append(name.substring(1));
- return sb.toString();
- }
-
-
- public static Class<?> getJavaType (Types type) {
- if (type.getImplementingClass()==TextType.class) {
- return String.class;
- } else if (type.getImplementingClass()==DateType.class) {
- return Calendar.class;
- } else if (type.getImplementingClass()==IntegerType.class) {
- return Integer.class;
- } else if (TextType.class.isAssignableFrom(type.getImplementingClass())) {
- return String.class;
- } else {
- throw new IllegalArgumentException("Type not expected in test : "+type.getImplementingClass());
- }
- }
-
- public static Object getJavaValue (Types type) {
- if (type.getImplementingClass()==TextType.class) {
- return UUID.randomUUID().toString();
- } else if (type.getImplementingClass()==DateType.class) {
- // use random because test are too fast (generate same calendar twice)
- Calendar calendar = Calendar.getInstance();
- Random rand = new Random();
- calendar.setTimeInMillis(rand.nextLong());
- return calendar;
- } else if (type.getImplementingClass()==IntegerType.class) {
- return new Integer(14);
- } else if (TextType.class.isAssignableFrom(type.getImplementingClass())) {
- // all derived from TextType
- return UUID.randomUUID().toString();
- } else {
- throw new IllegalArgumentException("Type not expected in test : "+type.getImplementingClass());
- }
- }
-
- public static List<Field> getXmpFields (Class<?> clz) {
- Field [] fields = clz.getFields();
- List<Field> result = new ArrayList<Field>(fields.length);
- for (Field field : fields) {
- if (field.getAnnotation(PropertyType.class)!=null) {
- result.add(field);
- }
- }
- return result;
- }
+public final class TypeTestingHelper
+{
+
+ public static String calculateSimpleGetter(String name)
+ {
+ StringBuilder sb = new StringBuilder(3 + name.length());
+ sb.append("get").append(calculateFieldNameForMethod(name));
+ return sb.toString();
+ }
+
+ public static String calculateArrayGetter(String name)
+ {
+ StringBuilder sb = new StringBuilder(4 + name.length());
+ String fn = calculateFieldNameForMethod(name);
+ sb.append("get").append(fn);
+ if (!fn.endsWith("s"))
+ {
+ sb.append("s");
+ }
+ return sb.toString();
+ }
+
+ public static String calculateSimpleSetter(String name)
+ {
+ StringBuilder sb = new StringBuilder(3 + name.length());
+ sb.append("set").append(calculateFieldNameForMethod(name));
+ return sb.toString();
+ }
+
+ public static String calculateFieldNameForMethod(String name)
+ {
+ StringBuilder sb = new StringBuilder(name.length());
+ sb.append(name.substring(0, 1).toUpperCase()).append(name.substring(1));
+ return sb.toString();
+ }
+
+ public static Class<?> getJavaType(Types type)
+ {
+ if (type.getImplementingClass() == TextType.class)
+ {
+ return String.class;
+ }
+ else if (type.getImplementingClass() == DateType.class)
+ {
+ return Calendar.class;
+ }
+ else if (type.getImplementingClass() == IntegerType.class)
+ {
+ return Integer.class;
+ }
+ else if (TextType.class.isAssignableFrom(type.getImplementingClass()))
+ {
+ return String.class;
+ }
+ else
+ {
+ throw new IllegalArgumentException("Type not expected in test : " + type.getImplementingClass());
+ }
+ }
+
+ public static Object getJavaValue(Types type)
+ {
+ if (type.getImplementingClass() == TextType.class)
+ {
+ return UUID.randomUUID().toString();
+ }
+ else if (type.getImplementingClass() == DateType.class)
+ {
+ // use random because test are too fast (generate same calendar
+ // twice)
+ Calendar calendar = Calendar.getInstance();
+ Random rand = new Random();
+ calendar.setTimeInMillis(rand.nextLong());
+ return calendar;
+ }
+ else if (type.getImplementingClass() == IntegerType.class)
+ {
+ return new Integer(14);
+ }
+ else if (TextType.class.isAssignableFrom(type.getImplementingClass()))
+ {
+ // all derived from TextType
+ return UUID.randomUUID().toString();
+ }
+ else
+ {
+ throw new IllegalArgumentException("Type not expected in test : " + type.getImplementingClass());
+ }
+ }
+
+ public static List<Field> getXmpFields(Class<?> clz)
+ {
+ Field[] fields = clz.getFields();
+ List<Field> result = new ArrayList<Field>(fields.length);
+ for (Field field : fields)
+ {
+ if (field.getAnnotation(PropertyType.class) != null)
+ {
+ result.add(field);
+ }
+ }
+ return result;
+ }
-
}