CWS-TOOLING: integrate CWS automation310d_DEV300

2009-03-19 09:49:31 +0100 jsk  r269729 : #i100313 - Fix newly introduced typo printloig
2009-03-19 08:13:52 +0100 jsk  r269714 : #i100344 - Extend the fix
2009-03-19 07:58:23 +0100 jsk  r269713 : #i100343 - Check for bad variable in tUsageTracking1
2009-03-19 07:54:56 +0100 jsk  r269712 : #i100344 - tEvolutionProperties - Evolution missing fix
2009-03-19 07:53:42 +0100 jsk  r269711 : #i100313 - ReportBuilder timeout fix
2009-03-18 14:43:49 +0100 wg  r269668 : i100233
2009-03-18 14:43:33 +0100 wg  r269667 : i100233
2009-03-18 14:41:58 +0100 wg  r269666 : i100233
2009-03-18 14:01:54 +0100 wg  r269661 : i100233
2009-03-17 20:39:26 +0100 jsk  r269631 : #i100233#
2009-03-17 20:25:45 +0100 jsk  r269630 : #i100232#
2009-03-17 20:22:13 +0100 jsk  r269629 : #i100233#
2009-03-17 16:05:58 +0100 wg  r269615 : i100233
2009-03-17 14:32:56 +0100 jsk  r269607 : #i100039#
2009-03-17 13:52:32 +0100 wg  r269606 : i100233
2009-03-17 13:39:54 +0100 jsk  r269604 : #i100267#
2009-03-17 13:36:31 +0100 wg  r269603 : i100233
2009-03-17 13:30:59 +0100 jsk  r269602 : #i100233#

2 files changed, 17 insertions, 7 deletions

diff --git a/testautomation/dbaccess/required/includes/DatabaseTypes.inc b/testautomation/dbaccess/required/includes/DatabaseTypes.inc
index 6d57ad4e4cc7..0285ccd50b12 100755
--- a/testautomation/dbaccess/required/includes/DatabaseTypes.inc
+++ b/testautomation/dbaccess/required/includes/DatabaseTypes.inc
@@ -324,7 +324,15 @@ testcase tEvolutionProperties
     Kontext "TabGeneral"    
         call DialogTest(TabGeneral)
         try
-            DataBaseType.select(getIdForDatabaseType("Evolution"))    
+            if ( DatabaseType.getItemCount() > 12 ) then
+                DataBaseType.select(getIdForDatabaseType("Evolution"))    
+                Kontext "ConnectionType"        
+                ConnectionType.OK
+            else
+                qaerrorlog "Evolution does not appear to be available on this system"
+                Kontext "ConnectionType"
+                ConnectionType.Cancel
+            endif
         catch
             warnlog "failed to select DataBaseType Evolution - maybe not installed or activated in this build"
             TabGeneral.Cancel
@@ -332,9 +340,6 @@ testcase tEvolutionProperties
             goto endsub
         endcatch
         
-    Kontext "ConnectionType"        
-        ConnectionType.OK
-        
     'call fCheckAdvancedDialog("Evolution")
         
     call fCloseDatabase()  
diff --git a/testautomation/dbaccess/required/includes/ReportBuilder01.inc b/testautomation/dbaccess/required/includes/ReportBuilder01.inc
index d165a613d682..15394e2e9b05 100755
--- a/testautomation/dbaccess/required/includes/ReportBuilder01.inc
+++ b/testautomation/dbaccess/required/includes/ReportBuilder01.inc
@@ -78,12 +78,13 @@ testcase tMainMenuBar
     '/// open the report designer
     call fOpenNewReportDesign
     
-    sleep(10)
+    
         
     '/// check the menu for the right entries
 
  'file menu    
     Kontext "ReportDesign"
+    if ( ReportDesign.exists( 20 ) ) then
         ReportDesign.UseMenu            
         '/// check if there are 10 items in the file menu.
         printlog "check if there are 10 items in the file menu."                
@@ -239,8 +240,12 @@ testcase tMainMenuBar
         call hMenuClose()
         
         
-    '/// close the report designer
-    call fCloseReportDesign
+        '/// close the report designer
+        call fCloseReportDesign
+     
+    else
+        warnlog "The Report Designer did not open within expected timeframe"
+    endif
     '/// close the database
     call fCloseDatabase