Fix some failed unit tests in model

Signed-off-by: xluo-actuate <xluo@actuate.com>
eclipse-birt · May 6, 2015 · 9ce7584 · 9ce7584
1 parent 9c813de
commit 9ce7584
Show file tree

Hide file tree

Showing 16 changed files with 660 additions and 612 deletions.
diff --git a/...est/org/eclipse/birt/report/model/core/golden/DeisgnElementCloneTest_gridClone_golden.xml b/...est/org/eclipse/birt/report/model/core/golden/DeisgnElementCloneTest_gridClone_golden.xml
@@ -34,24 +34,35 @@
                     </column>
                     <row id="13">
                         <cell id="14">
+                        	<property name="column">1</property>
+                            <property name="colSpan">2</property>
+                            <property name="rowSpan">1</property>
                             <label id="15"/>
                         </cell>
                     </row>
                     <row id="16">
                         <cell id="17">
+                        	<property name="column">1</property>
+                            <property name="colSpan">2</property>
+                            <property name="rowSpan">1</property>
                             <label id="18"/>
                         </cell>
                     </row>
                     <row id="19">
                         <cell id="20">
+                        	<property name="column">1</property>
+                            <property name="colSpan">2</property>
+                            <property name="rowSpan">1</property>
                             <label id="21"/>
                         </cell>
                     </row>
                 </grid>
                 <grid id="22">
                     <row id="23">
                         <cell id="24">
-                            <property name="column">1</property>
+                        	<property name="column">1</property>
+                            <property name="colSpan">1</property>
+                            <property name="rowSpan">1</property>
                             <label id="25"/>
                         </cell>
                     </row>
@@ -67,16 +78,25 @@
             </column>
             <row id="29">
                 <cell id="30">
+                	<property name="column">1</property>
+                    <property name="colSpan">2</property>
+                    <property name="rowSpan">1</property>
                     <label id="31"/>
                 </cell>
             </row>
             <row id="32">
                 <cell id="33">
+                	<property name="column">1</property>
+                    <property name="colSpan">2</property>
+                    <property name="rowSpan">1</property>
                     <label id="34"/>
                 </cell>
             </row>
             <row id="35">
                 <cell id="36">
+                	<property name="column">1</property>
+                    <property name="colSpan">2</property>
+                    <property name="rowSpan">1</property>
                     <label id="37"/>
                 </cell>
             </row>

diff --git a/...l.tests/test/org/eclipse/birt/report/model/core/golden/TableItemLocalPropsTest_golden.txt b/...l.tests/test/org/eclipse/birt/report/model/core/golden/TableItemLocalPropsTest_golden.txt
@@ -2,7 +2,7 @@ caption
 summary
 captionID
 isSummaryTable
-role
+tagType
 onPrepare
 onCreate
 onRender

diff --git a/....model.tests/test/org/eclipse/birt/report/model/core/golden/TableItemPropsTest_golden.txt b/....model.tests/test/org/eclipse/birt/report/model/core/golden/TableItemPropsTest_golden.txt
@@ -3,7 +3,6 @@ summary
 captionID
 isSummaryTable
 tagType
-role
 onPrepare
 onCreate
 onRender
@@ -100,6 +99,8 @@ allowExport
 pushDown
 theme
 language
+altText
+altTextID
 order
 style
 name

diff --git a/....report.model.tests/test/org/eclipse/birt/report/model/core/input/DesignElementTest_3.xml b/....report.model.tests/test/org/eclipse/birt/report/model/core/input/DesignElementTest_3.xml
@@ -35,18 +35,27 @@
                     </column>
                     <row>
                         <cell>
+                        	<property name="column">1</property>
+                            <property name="colSpan">2</property>
+                            <property name="rowSpan">1</property>
                             <label>
                             </label>
                         </cell>
                     </row>
                     <row>
                         <cell>
+                            <property name="column">1</property>
+                            <property name="colSpan">2</property>
+                            <property name="rowSpan">1</property>
                             <label>
                             </label>
                         </cell>
                     </row>
                     <row>
                         <cell>
+                            <property name="column">1</property>
+                            <property name="colSpan">2</property>
+                            <property name="rowSpan">1</property>
                             <label>
                             </label>
                         </cell>
@@ -56,6 +65,8 @@
                     <row>
                         <cell>
                             <property name="column">1</property>
+                            <property name="colSpan">1</property>
+                            <property name="rowSpan">1</property>
                             <label>
                             </label>
                         </cell>

diff --git a/...el.tests/test/org/eclipse/birt/report/model/extension/golden/PeerExtensionTest_golden.xml b/...el.tests/test/org/eclipse/birt/report/model/extension/golden/PeerExtensionTest_golden.xml
@@ -10,10 +10,10 @@
             <property name="columnSpacing">0.25mm</property>
             <contents>
                 <label name="label1" id="3">
+                	<property name="height">0.25mm</property>
+                    <property name="width">2mm</property>
                     <property name="x">1mm</property>
                     <property name="y">0.5mm</property>
-                    <property name="height">0.25mm</property>
-                    <property name="width">2mm</property>
                     <text-property name="text">First Page</text-property>
                 </label>
             </contents>

diff --git a/....tests/test/org/eclipse/birt/report/model/extension/golden/PeerExtensionTest_golden_1.xml b/....tests/test/org/eclipse/birt/report/model/extension/golden/PeerExtensionTest_golden_1.xml
@@ -10,10 +10,10 @@
             <property name="columnSpacing">0.25mm</property>
             <contents>
                 <label name="label1" id="3">
+                	<property name="height">0.25mm</property>
+                    <property name="width">2mm</property>
                     <property name="x">1mm</property>
                     <property name="y">0.5mm</property>
-                    <property name="height">0.25mm</property>
-                    <property name="width">2mm</property>
                     <text-property name="text">First Page</text-property>
                 </label>
             </contents>

diff --git a/....tests/test/org/eclipse/birt/report/model/extension/golden/PeerExtensionTest_golden_2.xml b/....tests/test/org/eclipse/birt/report/model/extension/golden/PeerExtensionTest_golden_2.xml
@@ -6,10 +6,10 @@
             <property name="leftMargin">0.8mm</property>
             <contents>
                 <label name="label1" id="13">
+                	<property name="height">0.25mm</property>
+                    <property name="width">2mm</property>
                     <property name="x">1mm</property>
                     <property name="y">0.5mm</property>
-                    <property name="height">0.25mm</property>
-                    <property name="width">2mm</property>
                     <text-property name="text">First Page</text-property>
                 </label>
             </contents>

diff --git a/....tests/test/org/eclipse/birt/report/model/extension/golden/PeerExtensionTest_golden_3.xml b/....tests/test/org/eclipse/birt/report/model/extension/golden/PeerExtensionTest_golden_3.xml
@@ -25,10 +25,10 @@
             <property name="columnSpacing">0.25mm</property>
             <contents>
                 <label name="label1" id="3">
+                	<property name="height">0.25mm</property>
+                    <property name="width">2mm</property>
                     <property name="x">1mm</property>
                     <property name="y">0.5mm</property>
-                    <property name="height">0.25mm</property>
-                    <property name="width">2mm</property>
                     <text-property name="text">First Page</text-property>
                 </label>
             </contents>