Commits

Anonymous committed c1ca922 Merge

CWS-TOOLING: integrate CWS automationooo330m6

Comments (0)

Files changed (16)

testautomation/dbaccess/required/input/oracle-report-builder.oxt

Binary file added.

testautomation/dbaccess/required/input/sun-report-builder.oxt

Binary file removed.

testautomation/dbaccess/tools/reporttools.inc

     dim i as integer
     use "global/tools/includes/optional/t_extension_manager_tools.inc"
     if (not hIsExtensionAlreadyInstalled("Report Builder")) then
-        i = hExtensionAddGUI( gTesttoolPath + "dbaccess/required/input/sun-report-builder.oxt", "AcceptLicense,InstallForUser" )
+        i = hExtensionAddGUI( gTesttoolPath + "dbaccess/required/input/oracle-report-builder.oxt", "AcceptLicense,InstallForUser" )
         if (i > 0) then    
             tools_reporttools_InstallExtension = 0
         else

testautomation/graphics/optional/includes/global/g_demoguide.inc

     MenuSelect(MenuGetItemID(3))
     View.OpenMenu
     MenuSelect(MenuGetItemID(2))
-    sleep 2    
+    printlog "needing a longer wait here for first start of the master page previews"
+    wait(20000)
     Kontext "AvailableForUsePreview"
     AvailableForUsePreview.TypeKeys "<HOME> <RIGHT> <RETURN>"
     sleep (5)

testautomation/graphics/optional/includes/global/g_edit.inc

   else
 
       Call hNewDocument
+      call sSelectEmptyLayout
       sleep 1               '/// new document ///'
       InsertObjectOLEObject             '/// insert writer ole object ///'
       Kontext "OLEObjektEinfuegen"

testautomation/graphics/optional/includes/global/g_tables.inc

 
     Kontext "InsertTableImpress"
     printlog "Inserting table."
-    InsertTableImpress.OK
-
+    if InsertTableImpress.Exists(1) then
+        InsertTableImpress.OK
+    else
+        sleep (1)
+        InsertTableImpress.OK
+    endif
     printlog "Selecting table for geeting the TableObjectBar."
     printlog "Switching between Draw/Impress"
     if ( gApplication = "IMPRESS" )then

testautomation/graphics/optional/includes/global/g_tools.inc

 
     PrintLog "Thesaurus with 1 word: " + sWord
 
-    if( Ucase(gApplication) = "DRAW" ) then
-        sExt = ".odg"
-        Kontext "DrawDocument"
-    elseif( Ucase(gApplication) = "IMPRESS" ) then
-        sExt = ".odp"
-        Kontext "ImpressDocument"
-    endif
-
-    Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_" + iSprache + sExt)
-
+    Call hNewDocument
     Call hTextrahmenErstellen (sWord,20,20,50,30)
     sleep 1
 

testautomation/graphics/optional/includes/impress/i_us2_present.inc

     DocumentImpress.UseMenu
     hMenuSelectNr (4)
     hMenuSelectNr (1)
+    call sSelectEmptyLayout
     sleep (1)
 
     kontext "Slides"

testautomation/graphics/optional/includes/impress/i_us_present.inc

     printlog "New master"
     MenuSelect(MenuGetItemID(1))
     sleep (1)
-    ViewMasterPage
-    kontext "Slides"
-    SlidesControl.OpenContextMenu(true)
-    sleep (2)
-    MenuSelect(MenuGetItemID(1)) 'New Master
-    sleep (1)
-    printlog "   Inserted second Master-Slide"
+    printlog "Inserted second Master-Slide"
 
 
     printlog "set background to picture(Gallery)"
     Kontext "Gallery"
     if Gallery.Exists(2) then
-        warnlog "   The Gallery was already visible. Check earlier ran tests for inconsistency."
+        warnlog "The Gallery was already visible. Check earlier ran tests for inconsistency."
         sleep (2)
     else
         ToolsGallery
     sleep (2)
     Kontext "ExportierenDlg"
     if ExportierenDlg.IsVisible(5) then
-        printlog "   Gallery-object correctly copied into Slide."
+        printlog "Gallery-object correctly copied into Slide."
         ExportierenDlg.Close
-        ToolsGallery
         WaitSlot (2000)
     end if
     kontext "GraphicObjectbar"
         kontext "DocumentImpress"
         ViewToolbarsPicture
     end if
-    Kontext "Gallery"
-    View.TypeKeys "<HOME><RIGHT><RIGHT>"
-    printlog "'OpenContextMenu"
-    View.TypeKeys "<SHIFT F10>"
-    sleep (2)
-    MenuSelect(MenuGetItemID(1))   'Insert
-    sleep (2)
-    MenuSelect(MenuGetItemID(1))   'Copy
-    sleep (2)
-    printlog "Check that we really got a copy of the object "
-    kontext "DocumentImpress"
-    DocumentImpress.OpenContextMenu(true)
-    sleep (2)
-    MenuSelect 27353
-    sleep (2)
-    Kontext "ExportierenDlg"
-    if ExportierenDlg.IsVisible(5) then
-        printlog "   Gallery-object correctly copied into Slide."
-        ExportierenDlg.Close
-    else
-        warnlog "   Doesn't seem like we copied anything from the Gallery... ?"
-    end if
-    kontext "GraphicObjectbar"
-    if GraphicObjectbar.Exists(5) = FALSE then
-        kontext "DocumentImpress"
-        ViewToolbarsPicture
-    end if
+
     kontext "Gallery"
     Gallerys.Select (iPictures)
     printlog " 50% Transparency"
     Width.SetText "16"
     Height.SetText "16"
     Mosaic.OK
-    kontext "GraphicFilterBar"
-    GraphicFilterBar.Close
-    ToolsGallery
-    WaitSlot (1000)
-    kontext "DocumentImpress"
-    hTypeKeys "<TAB>"
-    sleep (1)
 
     kontext "GraphicFilterBar"
     Mosaic.Click
-
     kontext "Mosaic"
     if ( Mosaic.exists( 2 ) ) then
         Width.SetText "16"
     else
         warnlog( "Dialog <Mosaic> did not open" )
     endif
-
     kontext "GraphicFilterBar"
     GraphicFilterBar.Close
-
     ToolsGallery
     WaitSlot (1000)
-
     kontext "DocumentImpress"
     gMouseClick 50,50
     sleep (1)
-
     FormatPositionAndSize
 
     kontext
     if ( Active.exists( 2 ) ) then
         active.setPage(TabPositionAndSize)
         kontext "TabPositionAndSize"
-        Width.SetText "800"
-        Height.SetText "600"
+        Width.SetText "15"
+        Height.SetText "11"
         SizePosition.TypeKeys "<RIGHT><DOWN>"
         TabPositionAndSize.OK
     else
     PresentationFile1 = ConvertPath( gOfficePath + "user\work\PowerPes1.odp" )
     PresentationFile2 = ConvertPath( gOfficePath + "user\work\PowerPes2.odp" )
 
-    if ( FileExists( PresentationFile1 ) ) then 'if file exists...
+     if ( FileExists( PresentationFile1 ) ) then 'if file exists...
         hFileOpen (PresentationFile1)
     else
         warnlog "   This test is supposed to run after the previous testcase has been run. Notify the Automatic-tester."
         goto endsub
     end if
-
+    sleep (2)
     printlog "New Slide"
     kontext "slides"
     SlidesControl.TypeKeys( "<PAGEDOWN>", 3 )
 
     MenuSelect(MenuGetItemID(1)) 'New Slide  'No 2
     printlog "   Inserted second normal Slide"
-
+    call sSelectEmptyLayout
     printlog "2. Layouts: Text. Bild: Gallery: Animation - Gif"
     Kontext "Tasks"
     printlog "to get to the very first position"
 
     printlog "   Did the 'mistake' to FadeIn/Out the Slidepane"
 
-    printlog "activating the input picture area"
-    kontext "DocumentImpress"
-    DocumentImpress.TypeKeys "<TAB>",2
-    DocumentImpress.TypeKeys "<RETURN>"
-    sleep (1)
+InsertGraphicsFromFile
+Kontext "GrafikEinfuegenDlg"
+if GrafikEinfuegenDlg.exists(5) then
+printlog "   The Insertgraphics-dialogue showed up correctly."
+sleep (5)
+else
+warnlog "   The Insertgraphics-dialogue didn't show up."
+endif
 
     printlog "Graphics-Import-dialogue. Select i_us_large.jpg"
     Kontext "GrafikEinfuegenDlg"

testautomation/graphics/required/includes/global/id_002.inc

     printlog " open application "
     Call hNewDocument
     WaitSlot (2000)
+    call sSelectEmptyLayout()
     printlog " insert something to be able to use this function"
     printlog "+ Insert->Fields->Date (fixed)"
     printlog "+ deselect object, select, editmode "

testautomation/graphics/tools/id_tools_2.inc

     Dim iHMax
     if app.FileLen(sFile) = "0" then warnlog "   the file (" + (sFile) + ") seems to be zero bytes large."
     call hGrafikEinfuegen ( sFile )
+    sleep (1)
     FormatGraphics
     Kontext
     Active.SetPage TabType

testautomation/spreadsheet/required/includes/c_upd_filemenu.inc

     Kontext "TextImport"
     TextImport.ok
     Printlog " - CSV import dialog is in function"
+    sleep (1)
     Kontext "DocumentCalc"
     printlog " Close document"
     Call hCloseDocument

testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc

     printlog " Check that there are alternatives available"
     if Alternatives.GetItemCount < 1 then
         warnlog "There are no alternatives available"
-    else Alternatives.Select (1)
+    else
+        Alternatives.Select (1)
+        sleep (1)
         if ReplaceWith.GetText = "" then
             warnlog "The repacle with field is empty"
         end if

testautomation/writer/optional/input/import/dostext.txt

-Dies ist ein ganz einfacher Dos-Text.
-
-Es werden auch ein paar Sonderzeichen benutzt:
-
-\=Chr(92)
-�=Chr(132)
--=Chr(45)
-�=Chr(245)
-
-Lieber Test schau doch mal was Du hiermit anfangen kannst.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Jetzt hoffe ich, da� das Dokument auf der 2 Seite ist, wenn nicht dann ist es schlecht. Aber hier wird auch mal geschaut, ob die Grenze von 256 Zeichen pro Zeile keine Probleme machen. Dies w�re doch ein ganz sch�n doofer Fehler, hoffentlich wurde das schon mal getestet. Wie lang geht die Zeile im Dos-Editor denn noch, ich bin doch schon bei 348 Spalten. Oh es geht doch sehr viel weiter, dann h�re ich hier mal auf.
-
-
-
-
-
-Tschau
-  TZ
+Dies ist ein ganz einfacher Dos-Text.
+
+Es werden auch ein paar Sonderzeichen benutzt:
+
+\=Chr(92)
+�=Chr(132)
+-=Chr(45)
+�=Chr(245)
+
+Lieber Test schau doch mal was Du hiermit anfangen kannst.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Jetzt hoffe ich, da� das Dokument auf der 2 Seite ist, wenn nicht dann ist es schlecht. Aber hier wird auch mal geschaut, ob die Grenze von 256 Zeichen pro Zeile keine Probleme machen. Dies w�re doch ein ganz sch�n doofer Fehler, hoffentlich wurde das schon mal getestet. Wie lang geht die Zeile im Dos-Editor denn noch, ich bin doch schon bei 348 Spalten. Oh es geht doch sehr viel weiter, dann h�re ich hier mal auf.
+
+
+
+
+
+Tschau
+  TZ

testautomation/writer/optional/input/import/swdos.txt

Binary file modified.

testautomation/writer/required/includes/w_004_.inc

 
     printlog " Insert / Comment"
     InsertNoteWriter
+    wait 500
     Kontext "DocumentWriter"
     sNoteText = "Comment inserted by testtool !"
     Call wTypeKeys (sNoteText)