You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ye...@apache.org on 2011/07/21 13:00:43 UTC

svn commit: r1149111 - in /poi/trunk/src: documentation/content/xdocs/status.xml java/org/apache/poi/ddf/EscherProperty.java testcases/org/apache/poi/ddf/TestEscherProperty.java

Author: yegor
Date: Thu Jul 21 11:00:41 2011
New Revision: 1149111

URL: http://svn.apache.org/viewvc?rev=1149111&view=rev
Log:
bug 50401 - fixed EscherProperty to return property name instead of 'unknown' for complex properties

Added:
    poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherProperty.java
      - copied, changed from r1149095, poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherPropertyFactory.java
Modified:
    poi/trunk/src/documentation/content/xdocs/status.xml
    poi/trunk/src/java/org/apache/poi/ddf/EscherProperty.java

Modified: poi/trunk/src/documentation/content/xdocs/status.xml
URL: http://svn.apache.org/viewvc/poi/trunk/src/documentation/content/xdocs/status.xml?rev=1149111&r1=1149110&r2=1149111&view=diff
==============================================================================
--- poi/trunk/src/documentation/content/xdocs/status.xml (original)
+++ poi/trunk/src/documentation/content/xdocs/status.xml Thu Jul 21 11:00:41 2011
@@ -34,6 +34,7 @@
 
     <changes>
         <release version="3.8-beta4" date="2011-??-??">
+           <action dev="poi-developers" type="fix">50401 - fixed EscherProperty to return property name instead of 'unknown' for complex properties </action>
            <action dev="poi-developers" type="add">Initial support for endnotes and footnotes in HWPF</action>
            <action dev="poi-developers" type="fix">51470 - avoid exception when cloning XSSF sheets with background images</action>
            <action dev="poi-developers" type="fix">51481 - Fixed autofilters in HSSF to avoid warnings in Excel 2007</action>

Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherProperty.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherProperty.java?rev=1149111&r1=1149110&r2=1149111&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherProperty.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherProperty.java Thu Jul 21 11:00:41 2011
@@ -62,7 +62,7 @@ public abstract class EscherProperty {
     }
 
     public String getName() {
-        return EscherProperties.getPropertyName(_id);
+        return EscherProperties.getPropertyName(getPropertyNumber());
     }
 
     /**

Copied: poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherProperty.java (from r1149095, poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherPropertyFactory.java)
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherProperty.java?p2=poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherProperty.java&p1=poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherPropertyFactory.java&r1=1149095&r2=1149111&rev=1149111&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherPropertyFactory.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ddf/TestEscherProperty.java Thu Jul 21 11:00:41 2011
@@ -20,35 +20,38 @@ package org.apache.poi.ddf;
 import junit.framework.TestCase;
 
 import java.util.List;
+import java.lang.reflect.Field;
 
 import org.apache.poi.util.HexRead;
 import org.apache.poi.util.HexDump;
 
 /**
- * @author Glen Stampoultzis  (glens @ superlinksoftware.com)
+ * @author Yegor Kozlov
  */
-public class TestEscherPropertyFactory extends TestCase
+public class TestEscherProperty extends TestCase
 {
-    public void testCreateProperties() {
-        String dataStr = "41 C1 " +     // propid, complex ind
-                "03 00 00 00 " +         // size of complex property
-                "01 00 " +              // propid, complex ind
-                "00 00 00 00 " +         // value
-                "41 C1 " +              // propid, complex ind
-                "03 00 00 00 " +         // size of complex property
-                "01 02 03 " +
-                "01 02 03 "
-                ;
-        byte[] data = HexRead.readFromString( dataStr );
-        EscherPropertyFactory f = new EscherPropertyFactory();
-        List props = f.createProperties( data, 0, (short)3 );
-        EscherComplexProperty p1 = (EscherComplexProperty) props.get( 0 );
-        assertEquals( (short)0xC141, p1.getId() );
-        assertEquals( "[01, 02, 03]", HexDump.toHex( p1.getComplexData() ) );
+    /**
+     * assure that EscherProperty.getName() returns correct name for complex properties
+     * See Bugzilla 50401 
+     */
+    public void testPropertyNames() throws Exception {
+        EscherProperty p1 = new EscherSimpleProperty( EscherProperties.GROUPSHAPE__SHAPENAME, 0);
+        assertEquals("groupshape.shapename", p1.getName());
+        assertEquals(EscherProperties.GROUPSHAPE__SHAPENAME, p1.getPropertyNumber());
+        assertFalse(p1.isComplex());
 
-        EscherComplexProperty p3 = (EscherComplexProperty) props.get( 2 );
-        assertEquals( (short)0xC141, p3.getId() );
-        assertEquals( "[01, 02, 03]", HexDump.toHex( p3.getComplexData() ) );
-    }
-}
+        EscherProperty p2 = new EscherComplexProperty(
+                EscherProperties.GROUPSHAPE__SHAPENAME, false, new byte[10]);
+        assertEquals("groupshape.shapename", p2.getName());
+        assertEquals(EscherProperties.GROUPSHAPE__SHAPENAME, p2.getPropertyNumber());
+        assertTrue(p2.isComplex());
+        assertFalse(p2.isBlipId());
 
+        EscherProperty p3 = new EscherComplexProperty(
+                EscherProperties.GROUPSHAPE__SHAPENAME, true, new byte[10]);
+        assertEquals("groupshape.shapename", p3.getName());
+        assertEquals(EscherProperties.GROUPSHAPE__SHAPENAME, p3.getPropertyNumber());
+        assertTrue(p3.isComplex());
+        assertTrue(p3.isBlipId());
+    }
+}
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org