fixed auto filters(added class HSSFCombobox)

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

3 files changed, 66 insertions, 7 deletions

diff --git a/src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java b/src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java
index 06564e94c4..7d5bfaee6d 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java
@@ -10,6 +10,7 @@ import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.util.HexDump;

 

 import java.io.IOException;

+import java.util.Arrays;

 

 import static junit.framework.Assert.assertEquals;

 

@@ -341,4 +342,59 @@ public class TestDrawingShapes extends TestCase {
         EscherDgRecord dgRecord = (EscherDgRecord) aggregate.getEscherRecord(0).getChild(0);

         assertEquals(dgRecord.getNumShapes(), 1);

     }

+

+    public void testTextForSimpleShape(){

+        HSSFWorkbook wb = new HSSFWorkbook();

+        HSSFSheet sheet = wb.createSheet();

+        HSSFPatriarch patriarch = sheet.createDrawingPatriarch();

+

+        HSSFSimpleShape shape = patriarch.createSimpleShape(new HSSFClientAnchor());

+        shape.setShapeType(HSSFSimpleShape.OBJECT_TYPE_RECTANGLE);

+

+        EscherAggregate agg = HSSFTestHelper.getEscherAggregate(patriarch);

+        assertNull(shape.getEscherContainer().getChildById(EscherTextboxRecord.RECORD_ID));

+        assertEquals(agg.getShapeToObjMapping().size(), 1);

+

+        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);

+        sheet = wb.getSheetAt(0);

+        patriarch = sheet.getDrawingPatriarch();

+

+        shape = (HSSFSimpleShape) patriarch.getChildren().get(0);

+

+        agg = HSSFTestHelper.getEscherAggregate(patriarch);

+        assertNull(shape.getEscherContainer().getChildById(EscherTextboxRecord.RECORD_ID));

+        assertEquals(agg.getShapeToObjMapping().size(), 1);

+

+        shape.setString(new HSSFRichTextString("string1"));

+        assertEquals(shape.getString().getString(), "string1");

+

+        assertNotNull(shape.getEscherContainer().getChildById(EscherTextboxRecord.RECORD_ID));

+        assertEquals(agg.getShapeToObjMapping().size(), 2);

+

+        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);

+

+        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);

+        sheet = wb.getSheetAt(0);

+        patriarch = sheet.getDrawingPatriarch();

+

+        shape = (HSSFSimpleShape) patriarch.getChildren().get(0);

+

+        assertNotNull(shape.getTextObjectRecord());

+        assertEquals(shape.getString().getString(), "string1");

+        assertNotNull(shape.getEscherContainer().getChildById(EscherTextboxRecord.RECORD_ID));

+        assertEquals(agg.getShapeToObjMapping().size(), 2);

+    }

+

+    public void testComboboxRecords(){

+        HSSFWorkbook wb = new HSSFWorkbook();

+        HSSFSheet sheet = wb.createSheet();

+        HSSFPatriarch patriarch = sheet.createDrawingPatriarch();

+

+        HSSFCombobox combobox = new HSSFCombobox(null, new HSSFClientAnchor());

+        HSSFTestHelper.setShapeId(combobox, 1024);

+        ComboboxShape comboboxShape = new ComboboxShape(combobox, 1024);

+

+        assertTrue(Arrays.equals(comboboxShape.getSpContainer().serialize(), combobox.getEscherContainer().serialize()));

+        assertTrue(Arrays.equals(comboboxShape.getObjRecord().serialize(), combobox.getObjRecord().serialize()));

+    }

 }

diff --git a/src/testcases/org/apache/poi/hssf/model/TestHSSFAnchor.java b/src/testcases/org/apache/poi/hssf/model/TestHSSFAnchor.java
index 9134332834..7d42b46375 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestHSSFAnchor.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestHSSFAnchor.java
@@ -54,11 +54,10 @@ public class TestHSSFAnchor extends TestCase {
         HSSFPatriarch drawing = sheet.getDrawingPatriarch();

 

         HSSFSimpleShape rectangle = (HSSFSimpleShape) drawing.getChildren().get(0);

-        rectangle.setShapeType(HSSFSimpleShape.OBJECT_TYPE_RECTANGLE);

 

         assertEquals(rectangle.getEscherContainer().getChild(0).getRecordId(), EscherSpRecord.RECORD_ID);

         assertEquals(rectangle.getEscherContainer().getChild(1).getRecordId(), EscherOptRecord.RECORD_ID);

-        assertEquals("  " + HexDump.toHex(rectangle.getEscherContainer().getChild(2).getRecordId()) + "    ", rectangle.getEscherContainer().getChild(2).getRecordId(), EscherClientAnchorRecord.RECORD_ID);

+        assertEquals(rectangle.getEscherContainer().getChild(2).getRecordId(), EscherClientAnchorRecord.RECORD_ID);

         assertEquals(rectangle.getEscherContainer().getChild(3).getRecordId(), EscherClientDataRecord.RECORD_ID);

 

         rectangle.setAnchor(new HSSFClientAnchor());

diff --git a/src/testcases/org/apache/poi/hssf/usermodel/HSSFTestHelper.java b/src/testcases/org/apache/poi/hssf/usermodel/HSSFTestHelper.java
index d5606362c8..50ff1dc50c 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/HSSFTestHelper.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/HSSFTestHelper.java
@@ -93,11 +93,11 @@ public class HSSFTestHelper {
             method.setAccessible(true);
             method.invoke(new EscherAggregate(new MockDrawingManager()), shape, escherParent, shapeToObj);
         } catch (NoSuchMethodException e) {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+            e.printStackTrace();
         } catch (InvocationTargetException e) {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+            e.printStackTrace();
         } catch (IllegalAccessException e) {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+            e.printStackTrace();
         }
     }
 
@@ -110,9 +110,13 @@ public class HSSFTestHelper {
         } catch (IllegalAccessException e) {
             e.printStackTrace();
         } catch (NoSuchMethodException e) {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+            e.printStackTrace();
         } catch (InvocationTargetException e) {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+            e.printStackTrace();
         }
     }
+
+    public static void setShapeId(HSSFShape shape, int id){
+        shape.setShapeId(id);
+    }
 }