[ooo-build-commit] Branch 'ooo/OOO310' - testautomation/dbaccess

[Jan Holesovsky]

 testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc |   19 ++++++++--
 1 file changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 79f90ed2caf1ecc0c46b4fb28cad381ca2aa1fa5
Author: Oliver Bolte <obo at openoffice.org>
Date:   Wed Jul 8 13:33:39 2009 +0000

    CWS-TOOLING: integrate CWS dba311a
    2009-07-03 13:24:10 +0200 msc  r273691 : #i100000#
    2009-06-24 11:31:54 +0200 fs  r273323 : line ends
    2009-06-24 11:30:25 +0200 fs  r273322 : line ends
    2009-06-09 07:29:25 +0200 oj  r272747 : #i102557# default 2nd table
    2009-06-08 15:59:51 +0200 fs  r272737 : #i102089# PrintOrPreviewContact: do not create a Primitive2DSequence for non-printable controls
    2009-06-05 11:22:36 +0200 fs  r272673 : #i102090# do not 'paint' controls which are in alive mode, and manually switched to invisible
    2009-06-02 11:44:34 +0200 oj  r272490 : #i102409# correct deletion in array list

diff --git a/testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc b/testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc
index 41bc2fa..2f1c62f 100755
--- a/testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc
+++ b/testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc
@@ -112,6 +112,8 @@ testcase tExecute
         sleep(1)
         BackGroundColor.select 11        
         sleep(2)
+        Height.setText("5")
+        Height.typeKeys("<RETURN>",true)
         
     ' select detail section with unselect the control
     Kontext "ReportDesign"
@@ -119,7 +121,7 @@ testcase tExecute
         ReportDesign.MouseUp(50, 10)
         sleep(1)
     Kontext "ReportGeneralProperties"           
-        Height.setText("0")
+        Height.setText("5")
         Height.typeKeys("<RETURN>",true)
         
     sleep(1) 
@@ -162,8 +164,19 @@ testcase tExecute
     SAXSeekElement("table:table")
 
     iNumberOfChilds = SAXGetChildCount 
-    if (iNumberOfChilds <> 64 ) then
-        warnlog "there should be 64 rows in the table, but there are " + iNumberOfChilds        
+    dim iLoop as integer
+    dim iCount as integer
+    iCount = 0
+    for iLoop = 1 to iNumberOfChilds
+	    SAXSeekElement(iLoop)
+		if ( SAXGetElementName() = "table:table-row" ) then
+			iCount = iCount + 1
+		endif
+		SAXSeekElement(0)
+	next
+	
+    if (iCount <> 59 ) then
+        warnlog "there should be 59 rows in the table, but there are " + iNumberOfChilds        
         SAXRelease
         goto endsub
     endif