Based on reading of the new file format docs, start to tweak how fixed length vs variable length / multi-valued properties are handled

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1593861 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 17 insertions, 3 deletions

diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java b/src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java
index cf46878572..4108ec0ec9 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java
+++ b/src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java
@@ -31,6 +31,7 @@ import java.util.TimeZone;
 import org.apache.poi.POIDataSamples;
 import org.apache.poi.POITestCase;
 import org.apache.poi.hsmf.datatypes.ChunkBasedPropertyValue;
+import org.apache.poi.hsmf.datatypes.Chunks;
 import org.apache.poi.hsmf.datatypes.MAPIProperty;
 import org.apache.poi.hsmf.datatypes.PropertyValue;
 import org.apache.poi.hsmf.datatypes.PropertyValue.LongPropertyValue;
@@ -86,9 +87,12 @@ public final class TestFixedSizedProperties extends POITestCase {
     * Check we find properties of a variety of different types
     */
    public void testPropertyValueTypes() throws Exception {
-       Map<MAPIProperty,List<PropertyValue>> props =
-               mapiMessageSucceeds.getMainChunks().getProperties();
-       HashSet<Class<? extends PropertyValue>> seenTypes = new HashSet<Class<? extends PropertyValue>>();
+       Chunks mainChunks = mapiMessageSucceeds.getMainChunks();
+       
+       // Ask to have the values looked up
+       Map<MAPIProperty,List<PropertyValue>> props = mainChunks.getProperties();
+       HashSet<Class<? extends PropertyValue>> seenTypes = 
+               new HashSet<Class<? extends PropertyValue>>();
        for (List<PropertyValue> pvs : props.values()) {
            for (PropertyValue pv : pvs) {
                seenTypes.add(pv.getClass());
@@ -97,6 +101,16 @@ public final class TestFixedSizedProperties extends POITestCase {
        assertTrue(seenTypes.toString(), seenTypes.size() > 3);
        assertTrue(seenTypes.toString(), seenTypes.contains(LongPropertyValue.class));
        assertTrue(seenTypes.toString(), seenTypes.contains(TimePropertyValue.class));
+       assertFalse(seenTypes.toString(), seenTypes.contains(ChunkBasedPropertyValue.class));
+       
+       // Ask for the raw values
+       seenTypes.clear();
+       for (PropertyValue pv : mainChunks.getRawProperties().values()) {
+           seenTypes.add(pv.getClass());
+       }
+       assertTrue(seenTypes.toString(), seenTypes.size() > 3);
+       assertTrue(seenTypes.toString(), seenTypes.contains(LongPropertyValue.class));
+       assertTrue(seenTypes.toString(), seenTypes.contains(TimePropertyValue.class));
        assertTrue(seenTypes.toString(), seenTypes.contains(ChunkBasedPropertyValue.class));
    }