[ooo-build-commit] Branch 'ooo/OOO320' - 2 commits - testautomation/dbaccess testautomation/extensions testautomation/framework testautomation/global

Jan Holesovsky kendy at kemper.freedesktop.org
Fri Dec 4 00:43:10 PST 2009


 testautomation/dbaccess/optional/includes/frm_Forms.inc                 |   11 ++++--
 testautomation/extensions/optional/includes/publisher.inc               |    3 -
 testautomation/framework/required/includes/basic_dialog_i18n_import.inc |   17 ++++++++--
 testautomation/global/input/accelerators.txt                            |    1 
 4 files changed, 22 insertions(+), 10 deletions(-)

New commits:
commit 744338e9592e8bd8c19dc035f5c4b3edcaf9d8ec
Author: Oliver Bolte <obo at openoffice.org>
Date:   Tue Dec 1 11:49:03 2009 +0000

    CWS-TOOLING: integrate CWS automationooo320m6
    2009-11-30 13:04:34 +0100 jsk  r277671 : <no issue> Remove invalid warning from testcase
    2009-11-27 13:10:52 +0100 jsk  r277668 : automationooo320m6: #i107266# - Try to avoid flase warning because of delayed listbox fillage (is this correct english?<g>)
    2009-11-26 16:23:39 +0100 jsk  r277663 : automationooo320m6: #i107212# - Added accelerator for cs as suggested by xlastovi

diff --git a/testautomation/extensions/optional/includes/publisher.inc b/testautomation/extensions/optional/includes/publisher.inc
index 8bfd7ad..9af9abb 100755
--- a/testautomation/extensions/optional/includes/publisher.inc
+++ b/testautomation/extensions/optional/includes/publisher.inc
@@ -39,9 +39,6 @@
 
 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/required/includes/basic_dialog_i18n_import.inc b/testautomation/framework/required/includes/basic_dialog_i18n_import.inc
index b1567c8..eaba271 100755
--- a/testautomation/framework/required/includes/basic_dialog_i18n_import.inc
+++ b/testautomation/framework/required/includes/basic_dialog_i18n_import.inc
@@ -39,12 +39,15 @@
 
 testcase tBasicDialogI18nImport
 
-    printlog( "Dialogs that show up when importing Multi locale dialogs into BASIC IDE" )
+    printlog( "Dialogs that show up when importing multi locale dialogs into BASIC IDE" )
     
     dim cDialogPath as string
         cDialogPath = gTesttoolPath & "framework\required\input\basic_ide\Dialog5.xdl"
         cDialogPath = convertpath( cDialogPath )
         
+    dim iNumberOfLanguages as integer
+    dim iTry as integer
+        
     const LANGUAGE_COUNT = 5
         
     printlog( "Open BASIC-IDE" )
@@ -85,12 +88,20 @@ testcase tBasicDialogI18nImport
                 sleep(1)
                 Kontext "TranslationBar"
                 if ( TranslationBar.exists() ) then
+
+                    for iTry = 1 to 5
+                        iNumberOfLanguages = CurrentLanguage.getItemCount()
+                        if ( iNumberOfLanguages = LANGUAGE_COUNT ) then
+                            exit for
+                        endif
+                        wait( 100 )
+                    next iTry
                 
                     printlog( "Check number of imported languages" )
-                    if ( CurrentLanguage.getItemCount() <> LANGUAGE_COUNT ) then
+                    if ( iNumberOfLanguages <> LANGUAGE_COUNT ) then
                         warnlog( "Incorrect language count in listbox <CurrentLanguage>" )
                         printlog( "Expected: " & LANGUAGE_COUNT )
-                        printlog( "Found...: " & CurrentLanguage.getItemCount() )
+                        printlog( "Found...: " & iNumberOfLanguages )
                     endif
                     
                     Kontext "DialogBar"
diff --git a/testautomation/global/input/accelerators.txt b/testautomation/global/input/accelerators.txt
index 1f1d882..cb518c9 100755
--- a/testautomation/global/input/accelerators.txt
+++ b/testautomation/global/input/accelerators.txt
@@ -158,6 +158,7 @@ ko-KR=mod2 u
 zh-CN=mod2 u
 zh-TW=mod2 u
 sl=mod2 i
+cs=mod2 a
 
 
 # This is the accelerator that switches tabs in the BASIC IDE. I found it by accident
commit bf752d17a387a3fdf25f699ea30c670b726318e2
Author: Oliver Bolte <obo at openoffice.org>
Date:   Tue Dec 1 08:53:35 2009 +0000

    CWS-TOOLING: integrate CWS dba32j
    2009-11-26 09:30:10 +0100 msc  r277648 : #100000 fix urgent testscript error
    2009-11-25 10:27:56 +0100 msc  r277625 : #i100000 fix urgent testscript error
    2009-11-17 22:16:46 +0100 fs  r277544 : CWS-TOOLING: rebase CWS dba32j to branches/OOO320 at 277531 (milestone: OOO320:m5)
    2009-11-17 14:26:47 +0100 fs  r277535 : ooops, didn't mean to commit this uncommented line
    2009-11-14 20:50:29 +0100 fs  r277505 : add a --disable-pango switch to SM's configure options, and add a patch which makes certain code respect it (well, respect it better than currently, by not using some pango_x_* functions, which are not always available, even when pango itself is present)
    2009-11-14 20:47:41 +0100 fs  r277504 : spelling
    2009-11-13 14:04:00 +0100 fs  r277502 : #i100764# (commit approved by ab at openoffice.org): getModelFromBasic: do not start with the parent's parent when looking for ThisComponent, but walk up the anchestor chain, starting with the immediate parent
    2009-11-13 11:04:15 +0100 fs  r277496 : #i100764# better heuristics for determining whether or not to participate in the ThisComponent game
    2009-11-13 11:02:30 +0100 fs  r277495 : #i100764# set the WB_EXT_DOCUMENT style at the backing component's container window, when creating it without the TaskCreator (which would normally do this)
    2009-11-11 13:49:11 +0100 fs  r277452 : #i106816#
    2009-11-11 13:48:53 +0100 fs  r277451 : fix the CREATETARBAL target, which is expected to create the zips used as prebuilts. The *inc.zip missed the NSS files in case NSS was built externally
    2009-11-11 12:15:34 +0100 fs  r277449 : update ignore list
    2009-11-11 12:09:23 +0100 fs  r277448 : add a link to the Mozilla build tools download location
    2009-11-11 12:07:16 +0100 fs  r277447 : add a link to the Mozilla build tools download location
    2009-11-06 16:23:12 +0100 fs  r277393 : #i106643#
    2009-11-03 23:20:29 +0100 fs  r277328 : #i106574#
    reverted the recent fix for issue #i105235#, and implemented a better one.
    2009-11-02 12:59:48 +0100 fs  r277294 : #i106550# errorOccured: also display the error when we're not in a nested form action - form actions are allowed to be triggered by other instances as well

diff --git a/testautomation/dbaccess/optional/includes/frm_Forms.inc b/testautomation/dbaccess/optional/includes/frm_Forms.inc
index 5bc5b4c..817a443 100755
--- a/testautomation/dbaccess/optional/includes/frm_Forms.inc
+++ b/testautomation/dbaccess/optional/includes/frm_Forms.inc
@@ -530,9 +530,10 @@ testcase tCreateSubForms
      DataSource.setText(gDSName)	
      TabDataForm.TypeKeys("<RETURN>")
      '/// set the table TT_Forms
-     printlog "set the table TT_Forms"              
-	 Content.setText("TT_Forms")
-     TabDataForm.TypeKeys("<RETURN>")
+     printlog "set the table TT_Forms"
+     Content.setText("TT_Forms")
+     sleep(1)
+     Content.TypeKeys("<RETURN>",true)
      sleep(1)
   	Kontext "FormPropertiesDialog"
      sleep(1)
@@ -607,7 +608,9 @@ testcase tCreateSubForms
        '/// set the sql string : select * from TT_Forms where id=:var1"
        printlog "set the sql string : select * from TT_Forms where id=:var1"
        TabDataForm.TypeKeys "<RETURN>" , true
-       TabDataForm.TypeKeys "select * from TT_Forms where id=:var1" , true
+       sleep(1)
+       Content.TypeKeys "select * from TT_Forms where id=:var1" , true
+       sleep(1)
        '/// set link master field
        printlog "set link master field"
        TabDataForm.TypeKeys "<TAB>" , 11 , true


More information about the ooo-build-commit mailing list