svn commit: r1787824 - in /pdfbox/branches/2.0/pdfbox/src: main/java/org/apache/pdfbox/pdmodel/fdf/FDFField.java test/java/org/apache/pdfbox/pdmodel/fdf/FDFFieldTest.java

[ms...@apache.org]

Author: msahyoun
Date: Mon Mar 20 18:20:13 2017
New Revision: 1787824

URL: http://svn.apache.org/viewvc?rev=1787824&view=rev
Log:
PDFBOX-3723: ensure return values for getValue() are inline with the javadoc; add initial unit test

Added:
    pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/fdf/FDFFieldTest.java   (with props)
Modified:
    pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFField.java

Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFField.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFField.java?rev=1787824&r1=1787823&r2=1787824&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFField.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFField.java Mon Mar 20 18:20:13 2017
@@ -227,9 +227,13 @@ public class FDFField implements COSObje
         {
             return COSArrayList.convertCOSStringCOSArrayToList((COSArray) value);
         }
-        else if (value instanceof COSString || value instanceof COSStream)
+        else if (value instanceof COSString)
         {
-            return value;
+            return ((COSString) value).getString();
+        }
+        else if (value instanceof COSStream)
+        {
+            return ((COSStream) value).toTextString();
         }
         else if (value != null)
         {

Added: pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/fdf/FDFFieldTest.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/fdf/FDFFieldTest.java?rev=1787824&view=auto
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/fdf/FDFFieldTest.java (added)
+++ pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/fdf/FDFFieldTest.java Mon Mar 20 18:20:13 2017
@@ -0,0 +1,105 @@
+/*
+ * 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 regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.pdfbox.pdmodel.fdf;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.pdfbox.cos.COSArray;
+import org.apache.pdfbox.cos.COSBase;
+import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.cos.COSStream;
+import org.apache.pdfbox.cos.COSString;
+import org.apache.pdfbox.pdmodel.common.COSArrayList;
+import org.junit.Test;
+
+/*
+ * Test some characteristics of FDFFields
+ */
+public class FDFFieldTest
+{
+    @Test
+    public void testCOSStringValue() throws IOException
+    {
+        String testString = "Test value";
+        COSString testCOSString = new COSString(testString);
+        
+        FDFField field = new FDFField();
+        field.setValue(testCOSString);
+        
+        assertEquals(testCOSString, (COSString) field.getCOSValue());
+        assertEquals(testString, field.getValue());
+    }
+
+    
+    @Test
+    public void testTextAsCOSStreamValue() throws IOException
+    {
+        String testString = "Test value";
+        byte[] testBytes = testString.getBytes("ASCII");
+        COSStream stream = createStream(testBytes, null);
+        
+        FDFField field = new FDFField();
+        field.setValue(stream);
+        
+        assertEquals(testString, field.getValue());
+    }
+        
+    @Test
+    public void testCOSNameValue() throws IOException
+    {
+        String testString = "Yes";
+        COSName testCOSSName = COSName.getPDFName(testString);
+        
+        FDFField field = new FDFField();
+        field.setValue(testCOSSName);
+        
+        assertEquals(testCOSSName, (COSName) field.getCOSValue());
+        assertEquals(testString, field.getValue());
+    }
+
+    @Test
+    public void testCOSArrayValue() throws IOException
+    {
+        List<String> testList = new ArrayList<String>();
+        testList.add("A");
+        testList.add("B");
+        
+        COSArray testCOSArray = COSArrayList.convertStringListToCOSStringCOSArray(testList);
+        
+        FDFField field = new FDFField();
+        field.setValue(testCOSArray);
+        
+        assertEquals(testCOSArray, (COSArray) field.getCOSValue());
+        assertEquals(testList, field.getValue());
+    }
+    
+    
+    private COSStream createStream(byte[] testString, COSBase filters) throws IOException
+    {
+        COSStream stream = new COSStream();
+        OutputStream output = stream.createOutputStream(filters);
+        output.write(testString);
+        output.close();
+        return stream;
+    }
+}

Propchange: pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/fdf/FDFFieldTest.java
------------------------------------------------------------------------------
    svn:eol-style = native