[ooo-build-commit] Branch 'ooo/OOO320' - testautomation/extensions testautomation/framework

[Jan Holesovsky]

 testautomation/extensions/optional/includes/publisher.inc         |    3 
 testautomation/framework/optional/includes/basic_eventbinding.inc |    2 
 testautomation/framework/optional/includes/basic_ide.inc          |   97 ++++------
 3 files changed, 48 insertions(+), 54 deletions(-)

New commits:
commit ae142a744681a1dd0d8d5fb31ca34a0312140146
Author: Oliver Bolte <obo at openoffice.org>
Date:   Mon Nov 16 11:26:57 2009 +0000

    CWS-TOOLING: integrate CWS automationOOO320m4
    2009-11-12 18:50:08 +0100 tbo  r277487 : automationooo320m4: #i106862# f_basic_eventbinding.bas tAssignComponentFunction
    2009-11-11 09:49:24 +0100 jsk  r277442 : automationOOO320m4: #i106802# - Resolve possible timing issues
    2009-11-10 15:22:07 +0100 jsk  r277429 : automationOOO320m4: #i106766# - Crash when cancelling extension update

diff --git a/testautomation/extensions/optional/includes/publisher.inc b/testautomation/extensions/optional/includes/publisher.inc
index 9af9abb..8bfd7ad 100755
--- a/testautomation/extensions/optional/includes/publisher.inc
+++ b/testautomation/extensions/optional/includes/publisher.inc
@@ -39,6 +39,9 @@
 
 testcase tExtensionPublisher
 
+    warnlog( "#i106766# - Crash when cancelling extension update" )
+    goto endsub
+
     printlog( "Extension Manager and Release Notes" )
 
     if ( gISOLang <> "en-US" ) then
diff --git a/testautomation/framework/optional/includes/basic_eventbinding.inc b/testautomation/framework/optional/includes/basic_eventbinding.inc
index 165b1e9..6340218 100755
--- a/testautomation/framework/optional/includes/basic_eventbinding.inc
+++ b/testautomation/framework/optional/includes/basic_eventbinding.inc
@@ -231,7 +231,7 @@ testcase tAssignComponentFunction
         for i = 1 to x
             sTemp = LibraryTreeList.getItemText(i)
             'printlog "("+i+"/"+x+"): '" + sTemp + "'"
-            if (("DialogComponent.odt"=sTemp) OR ("DIALOGCOMPONENT.ODT"=sTemp)) then
+            if (instr(stemp,"DialogComponent.odt") OR instr(stemp,"DIALOGCOMPONENT.ODT")) then
                 a = i
                 printlog "Found library ("+i+"/"+x+"): '" + sTemp + "'"
             endif
diff --git a/testautomation/framework/optional/includes/basic_ide.inc b/testautomation/framework/optional/includes/basic_ide.inc
index c60bf35..a5802e6 100755
--- a/testautomation/framework/optional/includes/basic_ide.inc
+++ b/testautomation/framework/optional/includes/basic_ide.inc
@@ -59,75 +59,37 @@ testcase tBasic_IDE_Toolbar_Module
 
     kontext "macrobar"
     printlog "- compile"
-    Compile.Click
-    if ( WaitSlot <> WSFinished ) then
-        warnlog( "Slot not finished within 1 second" )
-    endif
+    hClickToolbarButton( Compile )
 
     printlog "- Run Basic"
-    BasicRun.Click
-    if ( WaitSlot <> WSFinished ) then
-        warnlog( "Slot not finished within 1 second" )
-    endif
-
+    hClickToolbarButton( BasicRun )
 
     printlog "- Step Procedure"
-    ProcedureStep.Click
-    if ( WaitSlot <> WSFinished ) then
-        warnlog( "Slot not finished within 1 second" )
-    endif
-
+    hClickToolbarButton( ProcedureStep )
 
     printlog "- Stop Basic"
-    BasicStop.Click
-    if ( WaitSlot <> WSFinished ) then
-        warnlog( "Slot not finished within 1 second" )
-    endif
-
+    hClickToolbarButton( BasicStop )
 
     printlog "- Single Step"
-    SingleStep.Click
-    if ( WaitSlot <> WSFinished ) then
-        warnlog( "Slot not finished within 1 second" )
-    endif
-
+    hClickToolbarButton( SingleStep )
 
     printlog "- Step Back"
-    StepBack.Click()
-    if ( WaitSlot <> WSFinished ) then
-        warnlog( "Slot not finished within 1 second" )
-    endif
-
+    hClickToolbarButton( StepBack )
 
     printlog "- Breakpoint => activate"
-    Breakpoint.Click
-    if ( WaitSlot <> WSFinished ) then
-        warnlog( "Slot not finished within 1 second" )
-    endif
+    hClickToolbarButton( Breakpoint )
 
 
     printlog "- Breakpoint => deactivate"
-    Breakpoint.Click
-    if ( WaitSlot <> WSFinished ) then
-        warnlog( "Slot not finished within 1 second" )
-    endif
-
+    hClickToolbarButton( Breakpoint )
 
     printlog "- Add Watch => deactivate"
-    AddWatch.Click
-    if ( WaitSlot <> WSFinished ) then
-        warnlog( "Slot not finished within 1 second" )
-    endif
-
+    hClickToolbarButton( AddWatch )
 
     printlog "- Find Paranthese"
 
     kontext "macrobar"
-    FindParanthese.Click()
-    if ( WaitSlot <> WSFinished ) then
-        warnlog( "Slot not finished within 1 second" )
-    endif
-
+    hClickToolbarButton( FindParanthese )
 
     try
         Controls.TearOff()
@@ -161,11 +123,7 @@ testcase tBasic_IDE_Toolbar_Module
     kontext "macrobar"
     printlog "- Save Source Test "
 
-    SaveSourceTest.Click
-    if ( WaitSlot <> WSFinished ) then
-        warnlog( "Slot not finished within 1 second" )
-    endif
-
+    hClickToolbarButton( SaveSourceTest )
 
     kontext "speicherndlg"
     if ( SpeichernDlg.exists( 1 ) ) then
@@ -177,6 +135,7 @@ testcase tBasic_IDE_Toolbar_Module
 
     kontext "active"
     if ( Active.Exists( 1 ) ) then
+        printlog( "Closing Messagebox with <Yes>")
         Active.Yes()
     endif
 
@@ -347,4 +306,36 @@ testcase tBasic_IDE_Toolbar_Dialogs
 
 endcase
 
+'******************************************************************************'
+
+function hClickToolbarButton( oButton as object ) as boolean
+
+    const CFN = "hClickToolbarButton(): "
+
+    dim iTry as integer
+    dim brc as boolean : brc = false
+    
+    printlog( CFN & "Clicking button on toolbar: " & oButton.name() )
+    for iTry = 1 to 5
+    
+        try
+            oButton.click()
+            brc = true
+            exit for
+        catch
+            printlog( CFN & "Retrying..." )
+        endcatch
+        
+        if ( iTry = 5 ) then
+            exit for
+        endif
+        
+        wait( 500 )
+        
+    next iTry
+    
+    if ( WaitSlot( 2000 ) <> WSFinished ) then
+        warnlog( CFN & "Slot not finished within 1 second" )
+    endif
 
+end function