Anonymous avatar Anonymous committed ad63733

i115273,[Automation]: shift old documentation to new style using printlogs

Comments (0)

Files changed (16)

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

 '*
 '\******************************************************************************
 testcase tGallery_DialogTest
-    '///Open a new Writer document
-    '///Tools / Gallery
-    printlog "- Working with Gallery-Beamer!"
+    printlog "Open a new Writer document"
     gApplication = "WRITER"
     call hNewDocument
+    printlog "Tools / Gallery"
     call hOpenGallery
     Kontext "DocumentWriter"
-        '///+Undock the <i>Gallery Beamer</i>
-        printlog "- undock the Gallery Beamer"
-        Kontext "Gallery"
-            Gallery.Undock ( AlignTop )
-            sleep(2)
-            '///+<ul><li>Move the gallery-window</li></ul>
-            printlog "  - move the gallery window"
-            Gallery.move ( 20, 20 )
-            sleep(2)
-            '///+Dock the <i>Gallery Beamer</i>
-            printlog "- dock the Gallery Beamer"
-            Gallery.Dock ( AlignTop )
-            sleep(2)
-            '///+Close the <i>Gallery Beamer</i> (Tools / Gallery)
-            printlog "- close the Gallery Beamer"
-        ToolsGallery
+    printlog "Undock the Gallery Beamer"
+    Kontext "Gallery"
+    Gallery.Undock ( AlignTop )
+    sleep(2)
+    printlog "Move the gallery-window"
+    Gallery.move ( 20, 20 )
+    sleep(2)
+    printlog "- dock the Gallery Beamer"
+    Gallery.Dock ( AlignTop )
+    sleep(2)
+    printlog "- close the Gallery Beamer"
+    ToolsGallery
     call hCloseDocument
-endcase
+endcase 'tGallery_DialogTest
 
 '-------------------------------------------------------------------------
 
     Dim i as Integer 
     Dim j as Integer
     Dim Gallerytext as string
-    '///Activate and update all gallery themes (NET installation: Activate only!)
-    '///Open a new Writer document
-    '///+Tools / Gallery
-    '///+Click on each theme and update it (via context menu)
+    printlog "Open a new Writer document"
+    printlog "Tools / Gallery"
+    printlog "Click on each theme and update it (via context menu)"
     printlog "activate and update all gallery-themes"
     gApplication = "WRITER"
     call hNewDocument
     Kontext
     call hOpenGallery
     Kontext "Gallery"
-        iThemeCount = Gallerys.GetItemCount
-        for i=1 to iThemeCount
-            if gNetzInst = FALSE then
-                Kontext "Gallery"
-                    Gallerytext = Gallerys.GetItemText(i)
-                    printlog "- " + i + ". entry (" & Gallerytext & ")"
-                    Gallerys.Select i
-                    Gallerys.MouseMove ( 10, 10 )
-                    Gallerys.OpenContextMenu
-                    sleep (3)
-                    printlog "  - update"
-                    hMenuSelectNr (1)
-                    sleep (3)
-                    Kontext "Messagebox"
-                    if Messagebox.Exists(3) then
-                        if Messagebox.getRT=304 then
-                            printlog "- 'MyTheme' is the " & i & "'s entry."
-                            Messagebox.No
-                        end if
+    iThemeCount = Gallerys.GetItemCount
+    for i=1 to iThemeCount
+        if gNetzInst = FALSE then
+            Kontext "Gallery"
+            Gallerytext = Gallerys.GetItemText(i)
+            printlog "- " + i + ". entry (" & Gallerytext & ")"
+            Gallerys.Select i
+            Gallerys.MouseMove ( 10, 10 )
+            Gallerys.OpenContextMenu
+            sleep (3)
+            printlog "update the theme"
+            hMenuSelectNr (1)
+            sleep (3)
+            Kontext "Messagebox"
+            if Messagebox.Exists(3) then
+                if Messagebox.getRT=304 then
+                    printlog "- 'MyTheme' is the " & i & "'s entry."
+                    Messagebox.No
+                end if
+            else
+                for j = 1 to 800
+                    Kontext "AktualisierenGallery"
+                    if AktualisierenGallery.Exists then
+                        printlog "DEBUG (j): " & j
+                        sleep (1)
                     else
-                        for j = 1 to 800
-                            Kontext "AktualisierenGallery"
-                                if AktualisierenGallery.Exists then
-                                    printlog "DEBUG (j): " & j
-                                    sleep (1)
-                                else
-                                    printlog "DEBUG: 800 reached!"
-                                    j=801
-                                end if
-                        next j
+                        printlog "DEBUG: 800 reached!"
+                        j=801
                     end if
+                next j
             end if
-        next i
+        end if
+    next i
     call hCloseDocument
-endcase
+endcase 'tGallery_ActivateAndUpdateAllThemes
 
 '-------------------------------------------------------------------------
 
         sFileName = ConvertPath ( gTesttoolPath + "graphics\required\input\gallery\gal_" + iSprache + ".txt" )
     end if
 
-    '///Check the names for the gallery themes
-    '///Open a new Writer document
-    '///+Tools / Gallery
+    printlog "Open a new Writer document"
+    printlog "+Tools / Gallery"
     gApplication = "WRITER"
     call hNewDocument
     Kontext
     call hOpenGallery
-    '///+Check the number of gallery themes. For StarOffice: should be 32. For OpenOffice.Org: should be 6.
+    printlog "+Check the number of gallery themes. For StarOffice: should be 32. For OpenOffice.Org: should be 6."
     printlog "- check the number of gallery-themes"
     Kontext "Gallery"
-        if NOT gOOO then 
-            if bAsianLan then
-                iGalleryThemes = 29 ' Flags are not allowed!
-            else
-                iGalleryThemes = 30
-            end if
+    if NOT gOOO then 
+        if bAsianLan then
+            iGalleryThemes = 29 ' Flags are not allowed!
         else
-            if bAsianLan then
-                iGalleryThemes = 6  ' Flags are not allowed!
-            else
-                iGalleryThemes = 6
-            end if
+           iGalleryThemes = 30
         end if
-        iThemeCount = Gallerys.GetItemCount
-        if (iThemeCount <> iGalleryThemes) then
-            warnlog "Difference in count of gallery themes; found: '" + iThemeCount + "'; expected: '"+ iGalleryThemes +"'"
+    else
+        if bAsianLan then
+             iGalleryThemes = 6  ' Flags are not allowed!
+        else
+             iGalleryThemes = 6
         end if
-        for i=1 to iThemeCount
+    end if
+    iThemeCount = Gallerys.GetItemCount
+    if (iThemeCount <> iGalleryThemes) then
+        warnlog "Difference in count of gallery themes; found: '" + iThemeCount + "'; expected: '"+ iGalleryThemes +"'"
+    end if
+    for i=1 to iThemeCount
         Gallerys.Select i
         ListAppend ( siList(), Gallerys.GetSelText )
     next i
-    '///+Check all names with a list which depends on language (<i>gTestToolPath</i>/graphics/udpate/input/gallery)
     printlog "- check the names of gallery-themes"
     if Dir ( sFilename ) = "" then
         warnlog "The file for comparison does not exists. The file will be written!"
     end if
     ToolsGallery
     call hCloseDocument
-endcase
+endcase 'tGallery_CheckNames
 
 '-------------------------------------------------------------------------
 
     Dim iMenuEntries as Integer
     Dim i as Integer
     Dim iThemeCount as Integer
-    '/// Check the contextmenu for the gallery themes
-    '/// Open a new Writer document
-    '/// +Tools / Gallery
+    printlog " Open a new Writer document"
+    printlog " +Tools / Gallery"
     printlog "check the contextmenu for the gallery-themes"
     gApplication = "WRITER"
     call hNewDocument
     call hOpenGallery
-    '/// +Testing <i>rename</i> and <i>properties</i> for each gallery theme (via context-menu)
-    '/// +<ul><li>Only the private gallery theme must be deleteable (different 3 entries in the context-menu than the rest)</li></ul>
+    printlog " Testing rename and properties for each gallery theme (via context-menu)"
+    printlog " Only the private gallery theme must be deleteable (different 3 entries in the context-menu than the rest)"
     Kontext "Gallery"
         iThemeCount = Gallerys.GetItemCount
         Gallerys.MouseMove ( 10, 10 )
         next i
         ToolsGallery
     call hCloseDocument
-endcase
+endcase 'tGallery_CheckContextMenuForGalleryThemes
 
 '-------------------------------------------------------------------------
 
 testcase tGallery_CreateAndWorkWithANewGalleryThemes
     Dim iMenuEntries as Integer
     Dim j as Integer
-    '/// Open a new Writer document
-    '/// Tools / Gallery
+    printlog "Open a new Writer document"
+    printlog "Tools / Gallery"
     printlog "create a new gallery-theme ( TT-theme )"
     gApplication = "WRITER"
     call hNewDocument
     call hOpenGallery
     iMenuEntries = Gallerys.GetItemCount
     printlog "- Clicking on 'New Theme' and creating a new theme"
-    '/// Create a new gallery-theme
-    '/// + by clicking on <i>New Theme</i>
     NewTheme.Click
-    '/// +Activate <i>General</i> tabpage and insert <b><i>TT-theme</b></i> as name
+    printlog "Activate General tabpage and insert TT-theme as name"
     Kontext
     Active.SetPage TabAllgemeinGallery
     Kontext "TabAllgemeinGallery"
         NeuesThema.SetText "TT-theme"
         sleep (1)
-        printlog "  - named the new theme 'TT-theme' on the general-page"
-        printlog "  - insert all files out of '[gTestToolpath]\global\input\graf_inp' in the files-page"
-        '/// +Activate <i>Files</i> tabpage
+        printlog "named the new theme 'TT-theme' on the general-page"
+        printlog "insert all files out of '[gTestToolpath]\global\input\graf_inp' in the files-page"
+        printlog "Activate Files tabpage"
         Kontext
         Active.SetPage TabDateien
         Kontext "TabDateien"
             printlog "     - click 'add' without a selected file => insert-graphic-dialog has to be be visible"
-            '/// +Click on <i>Add</i> (If no file is selected the <i>Graphic-Insert</i> dialog has to be be opened -> close it)
             Hinzufuegen.Click
             sleep (1)
             Kontext "GrafikEinfuegenDlg"
                 GrafikEinfuegenDlg.Cancel
                 sleep (1)
                 printlog "     - click 'find files' to insert the path for graphics"
-                '///+Click on <i>Find Files</i> => <i>select-path</i> dialog will be visible
         Kontext "TabDateien"
             Suche.Click
             sleep (1)
-            '/// +Insert [gTesttoolPath]/input/global/graf_inp as path-name as click on <i>Select</i>
+            printlog "Insert [gTesttoolPath]/input/global/graf_inp as path-name as click on Select"
         Kontext "OeffnenDlg"
             Pfad.SetText ( convertPath ( gTesttoolPath + "global\input\graf_inp" ) )
             sleep (1)
             Auswaehlen.Click
             sleep (10)
-            '/// +Click on <i>Add</i> for some graphics
             printlog "     - 'add' one by one"
         Kontext "TabDateien"
         DateiListe.Select 1
         DateiListe.Select 1
         Hinzufuegen.Click
         sleep (1)
-        '/// +Click on <i>Add all</i> for rest of the graphics
-        '/// +<ul><li>apply-dialog -> cancel</li></ul>
-        '/// +click on <i>Add all</i> for rest of the graphics
-        printlog "     - 'add all' for the rest of the files"
+        printlog " Click on Add all for rest of the graphics"
+        printlog " click on Add all for rest of the graphics"
         DateiListe.Select 1
         HinzufuegenAlle.Click
         printlog "     - apply-dialog -> cancel"
                 next j
         end if
         Kontext "TabDateien"
-            printlog "  - click 'OK' for the tabpages"
+            printlog "click 'OK' for the tabpages"
             TabDateien.OK
-            '/// +Check if the new entry is inserted and select it
-            printlog "  - check if the new entrie is inserted and select it"
+            printlog "Check if the new entry is inserted and select it"
         Kontext "Gallery"
             if Gallerys.GetItemCount <> ( iMenuEntries + 1 ) then
                 warnlog "No new theme was created => the test ends here"
                 ToolsGallery
                 call hCloseDocument
             else
-                gMouseClick 50,50            '/// make mouseclick to set focus ///'
+                gMouseClick 50,50            
+                printlog " make mouseclick to set focus"
                 Kontext "Gallery"
                 Gallerys.Select "TT-theme"
                 Gallerys.MouseMove ( 10, 10 )
                 sleep (1)
                 Gallerys.OpenContextMenu
-                '/// +Update the entry (1. entry in context menu ) => cancel it
-                printlog "  - update the entry => cancel the update"
+                printlog "Update the entry (1. entry in context menu ) => cancel it"
                 sleep (3)
                 hMenuSelectNr (1)
                 sleep (1)
                     Kontext "Gallery"
                         Gallerys.Select "TT-theme"
                         Gallerys.OpenContextMenu
-                        '/// +Update it (1. entry in context menu )
-                        printlog "  - update"
+                        printlog " +Update it (1. entry in context menu )"
                         sleep (3)
                         hMenuSelectNr (1)
                         for j=1 to 100
                                 sleep (1)
                             end if
                         next j
-                    '/// +Rename it (3. entry in context menu)
-                    printlog "  - rename ( 3. entry in context-menu )"
+                    printlog "Rename it (3. entry in context menu)"
                     Kontext "Gallery"
                         Gallerys.OpenContextMenu
                         sleep (3)
                             GalleryNewTitle.OK
                     Kontext "Gallery"
                         Gallerys.Select "New TT-theme"
-                        '///+Add new files in properties (4. entry in context menu)
-                        printlog "  - add new graphics in properties ( 4. entry in context-menu )"
+                        printlog "add new graphics in properties ( 4. entry in context-menu )"
                     Kontext "Gallery"
                         Gallerys.OpenContextMenu
                         sleep (3)
                             DateiListe.Select 1
                             Hinzufuegen.Click
                             TabDateien.OK
-                            '/// +Delete the entry (2. entry in context menu)
-                            printlog "  - delete the entry ( 2. entry in context-menu )"
-                            printlog "     - messagebox -> no"
+                            printlog "delete the entry ( 2. entry in context-menu )"
+                            printlog "messagebox -> no"
                     Kontext "Gallery"
                         Gallerys.Select "New TT-theme"
                         sleep (3)
                         Kontext "Active"
                             sleep (1)
                             Active.No
-                            printlog "     - messagebox -> yes"
+                            printlog "messagebox -> yes"
                     Kontext "Gallery"
                         sleep (1)
                         Gallerys.Select "New TT-theme"
                         hMenuSelectNr (2)
                         Kontext "Active"
                             Active.Yes
-                    try
+                        try
                         Kontext "Gallery"
                         Gallerys.Select "New TT-theme"
                         warnlog "The entry isn't deleted!"
             sleep 10
         ToolsGallery
     call hCloseDocument
-endcase
+endcase 'tGallery_CreateAndWorkWithANewGalleryThemes
 
 '-------------------------------------------------------------------------
 
         case 48     :   jpeg_bkg =  2    : iAnimation =  1   :   iSound = 17
         case 49     :   jpeg_bkg = 12   : iAnimation =  1   :   iSound = 16
         case 55     :   jpeg_bkg = 21   : iAnimation =  1   :   iSound = 28
-        case 81     :   jpeg_bkg = 21   : iAnimation =  1   :   iSound = 10  'FHA TODO: Find out the right numbers for Asian languages.
+        case 81     :   jpeg_bkg = 21   : iAnimation =  1   :   iSound = 10  
         case 82     :   jpeg_bkg =  1    : iAnimation = 17  :   iSound = 12
         case 86     :   jpeg_bkg =  1    : iAnimation =  9   :   iSound = 13
         case 88     :   jpeg_bkg =  1    : iAnimation =  7   :   iSound = 20
         case else :   jpeg_bkg = 10   : iAnimation =  1    :   iSound = 17
-                  warnlog "Please insert the entrienumbers for 'Backgrounds', 'Sounds' and one with normal files ( Animations )"
+        warnlog "Please insert the entrienumbers for 'Backgrounds', 'Sounds' and one with normal files ( Animations )"
         end select
-    else  ' Testing OOO
+    else 
         select case iSprache
             case 01     :   jpeg_bkg =  1   :   iAnimation =  5     :   iSound =  2
             case 07     :   jpeg_bkg =  1   :   iAnimation =  5     :   iSound =  2
                 warnlog "Please insert the entrienumbers for 'Backgrounds', 'Sounds' and one with normal files ( Animations )"
         end select
     end if
-    '/// Open a new Writer document
-    '/// Tools / Gallery
     printlog "open a writer and the gallery"
     gApplication = "WRITER"
     call hNewDocument
     Kontext
     call hOpenGallery
-    '/// Check the view for Background-pictures (JPEGs), for standard graphic files (Animation) and for <i>Sound</i> objects
+    printlog "Check the view for Background-pictures (JPEGs), for standard graphic files (Animation) and for Sound objects"
     for i=1 to 3
         if i=1 then
             Gallerys.Select jpeg_bkg
         else
             iPreview = 2 : iTitle = 0
         end if
-        '/// Test the list-view
-        '/// +Click on List-View-Button in toolbar
-        printlog "- list-view"
-        printlog "  - open the list-view"
+        printlog " Click on List-View-Button in toolbar
         ListView.Click
         sleep (1)
-        printlog "  - Press Home + Enter to focus and enter Preview-mode."
-        '/// +Double-click on an object (preview has to be visible)
+        printlog "Press Home + Enter to focus and enter Preview-mode."
         View.TypeKeys "<HOME>"
         View.TypeKeys "<RETURN>"
         sleep (2)
-        '/// +Back to normal view with Enter
+        printlog "Back to normal view with Enter"
         View.TypeKeys "<RETURN>"
         sleep (2)
-        '/// +Preview out of context menu on/off
-        printlog "  - preview out of context menu on/off"
+        printlog "preview out of context menu on/off"
         View.TypeKeys "<HOME>"
         Sleep (2)
         View.OpenContextMenu true
         hMenuSelectNr ( iPreview )
         sleep (3)
         kontext "Gallery"
-            Sleep (2)
-            View.OpenContextMenu true
+        Sleep (2)
+        View.OpenContextMenu true
+        sleep (2)
+        hMenuSelectNr ( iPreview )
+        sleep (3)
+        printlog " +Title (FAT installation only)
+        if gNetzInst = FALSE then
+            printlog "  - title"
+            Kontext "Gallery"
             sleep (2)
-            hMenuSelectNr ( iPreview )
-            sleep (3)
-            '/// +Title (FAT installation only)
-            if gNetzInst = FALSE then
-                printlog "  - title"
-                Kontext "Gallery"
-                    sleep (2)
-                    View.OpenContextMenu true
-                    sleep (3)
-                    hMenuSelectNr ( iTitle )
-                    Kontext "GalleryNewTitle"
-                        sleep (1)
-                        GalleryNewTitle.Cancel
-                        sleep (1)
-                    Kontext "Gallery"
-            end if
             View.OpenContextMenu true
             sleep (3)
-            hMenuSelectNr ( iPreview )
-            sleep (3)
-            '/// Should now be in Preview-mode. Check if we are. ///'
-            View.OpenContextMenu true
-            sleep (3)
-            printlog MenuIsItemChecked (MenuGetItemID(iPreview+1))
-            if MenuIsItemChecked (MenuGetItemID(iPreview+1)) then
-                Printlog "   Entered Preview-mode correctly"
-                sleep (1)
-            else
-                Warnlog "   Didnt seem to enter preview-mode correctly."
-            end if
-            MenuSelect (0)
+            hMenuSelectNr ( iTitle )
+            Kontext "GalleryNewTitle"
             sleep (1)
-            '/// From here, try switching to icon-view ///'
-            '///+Click on Icon-View-Button in toolbar
-            printlog "- icon-view"
-            if IconView.isEnabled then
-                IconView.Click
-                qaErrorLog "The bug 64543 has been fixed! Please report to FHA."
-            end if
+            GalleryNewTitle.Cancel
             sleep (1)
-            View.TypeKeys "<HOME>"
-            printlog "  - Enter to get out of Preview-mode"
-            '/// +Press Return on an object (preview has to be visible)
-            View.TypeKeys "<RETURN>"
-            sleep (2)
-            '/// +Back to normal view with Return
-            View.TypeKeys "<RETURN>"
-            sleep (2)
-            '/// +Preview out of context menu on/off
-            printlog "  - preview out of context menu on/off"
-            View.TypeKeys "<HOME>"
-            sleep (3)
-            View.OpenContextMenu true
-            sleep (3)
-            hMenuSelectNr ( iPreview )
-            sleep (3)
-            View.OpenContextMenu true
-            sleep (3)
-            hMenuSelectNr ( iPreview )
-            sleep (3)
-            '/// +Title (FAT installation only)
-            if gNetzInst = FALSE then
-                printlog "  - title"
-                try
-                    View.OpenContextMenu true
-                    sleep (3)
-                catch
-                    warnlog "Could not open Contextmenu for Title nr:" +iTitle
-                endcatch
-                hMenuSelectNr ( iTitle )
-                Kontext "GalleryNewTitle"
-                    GalleryNewTitle.Cancel
-                Kontext "Gallery"
-            end if
-        next i
-        sleep 1 ' else crash
-   ToolsGallery
-
-    '/// If the MediaPlayer exists - close it ///'
+            Kontext "Gallery"
+        end if
+        View.OpenContextMenu true
+        sleep (3)
+        hMenuSelectNr ( iPreview )
+        sleep (3)
+        printlog " Should now be in Preview-mode. Check if we are."
+        View.OpenContextMenu true
+        sleep (3)
+        printlog MenuIsItemChecked (MenuGetItemID(iPreview+1))
+        if MenuIsItemChecked (MenuGetItemID(iPreview+1)) then
+            printlog "   Entered Preview-mode correctly"
+            sleep (1)
+        else
+            Warnlog "   Didnt seem to enter preview-mode correctly."
+        end if
+        MenuSelect (0)
+        sleep (1)
+        printlog "Click on Icon-View-Button in toolbar"
+        if IconView.isEnabled then
+            IconView.Click
+            qaErrorLog "The bug 64543 has been fixed! Please report to FHA."
+        end if
+        sleep (1)
+        View.TypeKeys "<HOME>"
+        printlog "Enter to get out of Preview-mode"
+        View.TypeKeys "<RETURN>"
+        sleep (2)
+        printlog "Back to normal view with Return"
+        View.TypeKeys "<RETURN>"
+        sleep (2)
+        printlog "preview out of context menu on/off"
+        View.TypeKeys "<HOME>"
+        sleep (3)
+        View.OpenContextMenu true
+        sleep (3)
+        hMenuSelectNr ( iPreview )
+        sleep (3)
+        View.OpenContextMenu true
+        sleep (3)
+        hMenuSelectNr ( iPreview )
+        sleep (3)
+        printlog "Title (FAT installation only)"
+        if gNetzInst = FALSE then
+            printlog "title"
+            try
+                View.OpenContextMenu true
+                sleep (3)
+            catch
+                warnlog "Could not open Contextmenu for Title nr:" +iTitle
+            endcatch
+            hMenuSelectNr ( iTitle )
+            Kontext "GalleryNewTitle"
+            GalleryNewTitle.Cancel
+            Kontext "Gallery"
+        end if
+    next i
+    sleep 1 ' else crash
+    ToolsGallery
+    printlog " If the MediaPlayer exists - close it"
     kontext "Mplayer"
-        if Mplayer.Exists then
-            if (gApplication = "IMPRESS") then
-                kontext "DocumentImpress"
-            else
-                kontext "DocumentDraw"
-            end if
-            ToolsMediaPlayer
+    if Mplayer.Exists then
+        if (gApplication = "IMPRESS") then
+            kontext "DocumentImpress"
+        else
+            kontext "DocumentDraw"
+        end if
+        ToolsMediaPlayer
         else
             if (gApplication = "IMPRESS") then
                 kontext "DocumentImpress"
         end if
 
     call hCloseDocument
-endcase
+endcase 'tGallery_GalleryView_Preview
 
 '-------------------------------------------------------------------------
 
     Dim i as Integer
     Dim j as Integer
     Dim k as Integer
-    '/// Test gallery-view -> insert gallery-object with context-menu (3D-Object (<i>internal object</i>), Animation (<i>as file</i>))
+    printlog " Test gallery-view -> insert gallery-object with context-menu (3D-Object internal object), Animation (as file))"
     if NOT gOOO then
         select case iSprache
             case 01     :   jpeg_bkg = 3     :   iAnimation =  1
                                 warnlog "Please insert the entrienumbers for 'Backgrounds' and one with normal files ( Animations )"
         end select
     end if
-    '/// Test following for all applications (Writer, Calc, Impress, Draw)
-    for i=1 to 4           ' each application
+    printlog "Test following for all applications (Writer, Calc, Impress, Draw)"
+    for i=1 to 4
         if i=1 then gApplication = "WRITER"
         if i=2 then gApplication = "CALC"
         if i=3 then gApplication = "IMPRESS"
         if i=4 then gApplication = "DRAW"
 
-        '/// +Open a new document
-        '/// +Open the Gallery
+        printlog "Open a new document"
+        printlog "Open the Gallery"
         printlog gApplication  'Chr(13)
         call hNewDocument
         call hOpenGallery
-        '/// +Select 3D-theme (these are internal objects and not realy files)
-        '/// +<ul><li>on context menu there are only 2 entries for insert (copy, link)
-        '/// +<li>insert the object per <i>copy</i></li>
-        '/// +<li>insert the object per <i>link</i></li></ul>
-        '/// +Select Animation theme (these are realy files)
-        '/// +<ul><li>On context menu there are only 2 entries for insert (copy, link ) for Calc, Draw Impress</li>
-        '/// +<li>On context menu there are only 3 entries for insert (copy, link, background / page, paragraph ) for Writer</li>
-        '/// +<li>insert the object per <i>copy</i></li>
-        '/// +<li>insert the object per <i>link</i></li>
-        '/// +<li>Only for the Writer:<ul>
-        '/// +<li>Insert the object per background / page</li>
-        '/// +<li>insert the object per background / paragraph</li></ul></li></ul>
-        '/// +Close the Gallery
-        '/// +Close the document
-        '/// Since the GraphicObjectbar could disturb our testing, we close it if it is open ///'
-        '      kontext "GraphicObjectbar"
-        '      if GraphicObjectbar.Exists then GraphicObjectbar.Close
-        for j=1 to 2        ' the two gallery-theme
+        printlog "Select 3D-theme (these are internal objects and not realy files)"
+        printlog "on context menu there are only 2 entries for insert (copy, link)"
+        printlog "insert the object per copy"
+        printlog "Select Animation theme (these are realy files)"
+        printlog "On context menu there are only 2 entries for insert (copy, link ) for Calc, Draw Impress"
+        printlog "On context menu there are only 3 entries for insert (copy, link, background / page, paragraph ) for Writer"
+        printlog "insert the object per copy"
+        printlog "insert the object per link"
+        printlog "Only for the Writer:"
+        printlog "Insert the object per background / page"
+        printlog "insert the object per background / paragraph"
+        printlog "Close the Gallery"
+        printlog "Close the document"
+        printlog "Since the GraphicObjectbar could disturb our testing, we close it if it is open"
+       
+        for j=1 to 2        
             if j=1 then
                 Gallerys.Select jpeg_bkg
                 printlog " selected gallery-theme : Backgrounds"
                     View.typekeys "<DOWN>,<UP>"
 
                     sleep (3)
-                    View.TypeKeys "<SHIFT F10>" ' OpenContextMenu
+                    View.TypeKeys "<SHIFT F10>" 
                     sleep (3)
                     hMenuSelectNr ( 1 )
 
                         sleep (3)
 
                         printlog "   - link"
-                        View.TypeKeys "<SHIFT F10>" 'OpenContextMenu
+                        View.TypeKeys "<SHIFT F10>" 
                         sleep (1)
                         hMenuSelectNr ( 1 )
                         hMenuSelectNr ( 2 )
                         sleep (3)
 
                         printlog "   - background -> page"
-                        View.TypeKeys "<SHIFT F10>" 'OpenContextMenu
+                        View.TypeKeys "<SHIFT F10>" 
                         sleep (2)
                         hMenuSelectNr ( 1 )
                         hMenuSelectNr ( 3 )
                         sleep (3)
 
                         printlog "   - background -> paragraph"
-                        View.TypeKeys "<SHIFT F10>" 'OpenContextMenu
+                        View.TypeKeys "<SHIFT F10>" 
                         sleep (2)
                         hMenuSelectNr ( 1 )
                         hMenuSelectNr ( 3 )
                     kontext "Gallery"
 
                 next k
-            else              ' test for other applications ( calc, impress, draw )
+            else             
                 kontext "GraphicObjectbar"
                     if GraphicObjectbar.Exists then
                         if GraphicObjectbar.isDocked = False then
                     for k=1 to 2
                         if k=1 then
                             ListView.Click
-                            printlog "  - insert on list view"
+                            printlog "insert on list view"
                         else
                             IconView.Click
-                            printlog "  - insert on icon view"
+                            printlog "insert on icon view"
                         end if
 
                     sleep (1)
                     View.typekeys "<DOWN>,<UP>"
 
                     sleep (1)
-                    View.TypeKeys "<SHIFT F10>" 'OpenContextMenu
+                    View.TypeKeys "<SHIFT F10>" 
                     printlog "    - copy"
                     sleep (3)
                     hMenuSelectNr ( 1 )
                     sleep (3)
 
                     if j=2 then
-                        View.TypeKeys "<SHIFT F10>" 'OpenContextMenu
+                        View.TypeKeys "<SHIFT F10>" 
                         printlog "    - link"
                         sleep (3)
                         hMenuSelectNr ( 1 )
         call hCloseDocument
         WaitSlot (2000)
     next i
-endcase
+endcase 'tGallery_GalleryView_Insert
 
 '-------------------------------------------------------------------------
 
         Goto NotForNetInst
     end if
 
-    '/// Test gallery view -> delete objects with context-menu ( Backgrounds (<i>internal object</i>), Animation (<i>file</i>), Sound (<i>file</i>))
+    printlog " Test gallery view -> delete objects with context-menu ( Backgrounds (internal object), Animation (file), Sound (file))"
     select case iSprache
         case 01   : jpeg_bkg = 1    :   iAnimation = 2   :  iSound = 28
         case 07   : jpeg_bkg = 29  :   iAnimation = 1   :  iSound =  6
                   warnlog "Please insert the entrienumbers for '3D-graphics', 'Sounds' and one with normal files ( Animations )"
     end select
 
-    '/// Open a new writer-doc
-    '/// Tools / Gallery
+    printlog " Open a new writer-doc"
+    printlog " Tools / Gallery"
     gApplication = "WRITER"
     call hNewDocument
     call hOpenGallery
-    '/// Delete one object in list-view and icon-view for 3D, Animation and Sound
+    printlog "Delete one object in list-view and icon-view for 3D, Animation and Sound"
     for i=1 to 3
         Kontext "Gallery"
             if i=1 then
                         Kontext "Gallery"
                             sleep (1)
                             View.MouseMove ( 5, 15 )
-                            View.TypeKeys "<SHIFT F10>" 'OpenContextMenu true
+                            View.TypeKeys "<SHIFT F10>"
                             hMenuSelectNr ( 4 )
                             kontext "Active"
                                 if k=1 then
                                     Active.No
-                                    printlog "      delete one object => no"
+                                    printlog "delete one object => no"
                                 else
                                     Active.Yes
-                                    printlog "      delete one object => yes"
+                                    printlog "delete one object => yes"
                                 end if
                     next k
             next j
     next i
     ToolsGallery
     call hCloseDocument
-    'NOTE: Jump End NotForNetInst
-    NotForNetInst:
-endcase
+endcase 'tGallery_GalleryView_Delete
 
 '-------------------------------------------------------------------------
 testcase tGallery_Quick_check
 
-    '/// Short check, if at least 2 files exist in the gallery, and if they are > 0 in size ///'
-    '/// One in the gallery folder itself and the other one in a subfolder. ///'
+    printlog " Short check, if at least 2 files exist in the gallery, and if they are > 0 in size"
+    printlog " One in the gallery folder itself and the other one in a subfolder."
     dim sFile(1) as string
     dim i as integer
 
     sFile(0) = ConvertPath ( gOfficeBasisPath + "share/gallery/apples.gif" ) '
     sFile(1) = ConvertPath ( gOfficeBasisPath + "share/gallery/bullets/coffee_1.gif" ) '
-    '/// Open a new document
+    printlog " Open a new document"
     call hNewDocument
     for i = 0 to 1
-    '/// Click to deselect any selected objects ///'
+    printlog " Click to deselect any selected objects"
         gMouseclick 1, 50
         if FileExists(sFile(i)) then
             if (FileLen(sFile(i)) > 0 ) then
             warnlog "File doesn't exist: '" + sFile(i) + "'"
         end if
     next i
-    '///close the document
+    printlog "close the document"
     call hCloseDocument
-endcase
-
+endcase 'tGallery_Quick_check

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

 '* short description : Checking all gallery themes
 '*
 '*****************************************************************
-'*
-' #1 tLoad100GalleryGraphicFiles  'Inserting 100 gallery graphics and checking the sizes
-' #1 tCheckAllGalleryGraphicFiles 'Checking the size ( > 0 Byte ) of all gallery-files.
-' #1 tInsertGalleryObjects        'Inserting random objects via contextmenu-insert-copy.
-' #0 LoadGraphic
-' #0 CheckGraphic
-' #0 makeNumOutOfText
-' #1 tSettingsToCM 'Measurement unit for textdocuments to cm
-' #1 tResetSettings 'Resetting the measurement unit for textdocuments.
-'*
-'\******************************************************************************
 
 testcase tSettingsToCM
 
     printlog " Setting the measurement unit for textdocuments to cm."
-    printlog " +Tools / options / text documents / general"
+    printlog " Tools / options / text documents / general"
     ExitRestartTheOffice
     WaitSlot (10000)
     Call hNewDocument
 '-------------------------------------------------------------------------
 testcase tLoad100GalleryGraphicFiles
 
-    '/// Inserting all gallery graphics in a Writer document and checking the sizes.
+    printlog "Inserting all gallery graphics in a Writer document and checking the sizes."
     Dim lsFiles (3000) as String
     Dim lsGraphics (3000) as String
     Dim i as Integer
     Dim corLoad as Boolean
     Dim x as boolean
 
-    '/// Geting all installed gallery objects out of the installation in a list.
+    printlog "Geting all installed gallery objects out of the installation in a list."
     if gNetzInst = TRUE then
         GetAllFileList ( ConvertPath ( gOfficeBasisPath + "share\gallery\" ), "*.*", lsFiles () )
     else
     end if
     call GetOnlyGraphics ( lsFiles (), lsGraphics() )
     iCount = ListCount ( lsGraphics() )
-    printlog "   We have " + iCount + " graphics in the gallery."
-    '/// + Open a new document
+    printlog "We have " + iCount + " graphics in the gallery."
+    printlog "Open a new document"
     call hNewDocument
 
     for i = 1 to 100
 
         corLoad = FALSE
         try
-            '/// <i>Loop begin</i>
-            '/// + Inserting all gallery files and checking the sizes
-            '/// +- Iinsert / graphic / from file
-            '/// +- Check the size in 'format / graphics' on the <i>Type</i> tabpage
-            '/// +-- The size should noz be smaler than 17*25cm / photos 21*25cm
-            '///    + Deleting the graphic with &lt;delete&gt; of the keyboard
-            '/// <i>Loop ends</i>
+            printlog "Loop begin"
+            printlog "Inserting all gallery files and checking the sizes"
+            printlog "Iinsert / graphic / from file"
+            printlog "Check the size in 'format / graphics' on the Type tabpage"
+            printlog "The size should not be smaler than 17*25cm / photos 21*25cm"
+            printlog "Deleting the graphic with &lt;delete&gt; of the keyboard"
+            printlog "Loop ends"
             x = LoadGraphic ( lsGraphics(t), corLoad )
             sleep(1)
-            printlog
         catch
             ExceptLog
             if corLoad = FALSE then
             end if
         endcatch
         if (not x) then
-            printlog "   Tested nr: " + t + " : " + lsGraphics(t)
+            printlog "Tested nr: " + t + " : " + lsGraphics(t)"
         end if
     next i
 
-    '/// Close the gallery ///'
+    printlog "Close the gallery"
     ToolsGallery
     WaitSlot (2000)
-    '/// Close the document ///'
+    printlog "Close the document"
     call hCloseDocument
 endcase 'tLoadAllGalleryGraphicFiles
 
 '-------------------------------------------------------------------------
 
 testcase tCheckAllGalleryGraphicFiles
-'/// Checking the filesize of all gallery graphics.
+printlog "Checking the filesize of all gallery graphics."
     Dim lsFiles (3000) as String
     Dim lsGraphics (3000) as String
     Dim i as Integer
     Dim corLoad as Boolean
     Dim x as boolean
 
-    '/// Geting all installed gallery objects out of the installation in a list.
+    printlog " Geting all installed gallery objects out of the installation in a list."
     if gNetzInst = TRUE then
         GetAllFileList ( ConvertPath ( gOfficeBasisPath + "share\gallery\" ), "*.*", lsFiles () )
     else
     end if
     call GetOnlyGraphics ( lsFiles (), lsGraphics() )
     iCount = ListCount ( lsGraphics() )
-    printlog "   We have " + iCount + " graphics in the gallery."
-    '/// Open a new document
+    printlog "We have " + iCount + " graphics in the gallery."
+    printlog "Open a new document"
     call hNewDocument
 
     for i=1 to iCount
         corLoad = FALSE
         try
-            '/// <i>Loop begin</i>
-            '///+ Inserting all gallery files and checking the sizes
-            '///+- Iinsert / graphic / from file
-            '///+- Check the size in 'format / graphics' on the <i>Type</i> tabpage
-            '///+-- The size should noz be smaler than 17*25cm / photos 21*25cm
-            '///+ Deleting the graphic with &lt;delete&gt; of the keyboard
-            '/// <i>Loop ends</i>
+            printlog "Loop begin"
+            printlog "Inserting all gallery files and checking the sizes"
+            printlog "Iinsert / graphic / from file"
+            printlog "Check the size in 'format / graphics' on the <i>Type</i> tabpage"
+            printlog "The size should noz be smaler than 17*25cm / photos 21*25cm"
+            printlog "Deleting the graphic with &lt;delete&gt; of the keyboard"
+            printlog "Loop ends"
             x = CheckGraphic ( lsGraphics(i), corLoad )
         catch
             ExceptLog
             printlog "   Tested nr: " + i + " : " + lsGraphics(i)
         end if
     next i
-    '/// Close the gallery ///'
+    printlog " Close the gallery"
     ToolsGallery
     WaitSlot (2000)
-    '/// Close the document ///'
+    printlog " Close the document"
     call hCloseDocument
 endcase 'tLoadAllGalleryGraphicFiles
 
     Dim iCount as Integer
     Dim corLoad, x as Boolean
 
-    '/// 1. Select theme ///'
+    printlog "1. Select theme"
     call hNewDocument
     call hOpenGallery
     kontext "Gallery"
         CountOfThemes = Gallerys.GetItemCount
         for ct = 1 to CountOfThemes
             Gallerys.Select ct
-            printlog "   Selected Gallery-Theme nr: " + ct + ": " + Gallerys.GetSelText
+            printlog "Selected Gallery-Theme nr: " + ct + ": " + Gallerys.GetSelText
             kontext "Gallery"
                 CountOfItems = View.GetItemCount()
-                '/// 2. Choose if we should test 3,4 or 5 objects. ///'
+                printlog " 2. Choose if we should test 3,4 or 5 objects."
                 for d = 1 to 1
                     randomize
                     HowManyItems=Int((5*Rnd)+(3*Rnd))
                     if CountOfItems = 0 then
-                        QaErrorLog "   There were no objects in the the gallery-theme on position: " + ct
+                        QaErrorLog "There were no objects in the the gallery-theme on position: " + ct
                     else
                         if (HowManyItems<3) then 'just so we get it between 3 and 5.
                             d = d - 1
                         else
-                            printlog "   Will now select and copy " + HowManyItems + " items from this Theme."
+                            printlog "Will now select and copy " + HowManyItems + " items from this Theme."
                         end if
                         for i = 1 to HowManyItems
-                            '/// 3. Select the objects ///'
+                            printlog " 3. Select the objects"
                             for x = 1 to 1
                                 randomize
                                 WhichOne=Int(CountOfItems*RND) '(5*Rnd)+(CountOfItems*Rnd))
                                     dim number as integer
                                     number = MenuGetItemCount
                                     if (number > 2) AND (number < 10) then
-                                        '/// 4. Copy the selected item into our document. ///'
-                                        hMenuSelectNr (1) 'Insert
-                                        hMenuSelectNr (1) 'As Copy
+                                        printlog " 4. Copy the selected item into our document."
+                                        hMenuSelectNr (1) 
+                                        hMenuSelectNr (1) 
                                         sleep (1)
                                     else
-                                        Warnlog "   The contextmenu came up, but the number of entries were strange."
-                                        printlog "   Number of entries:" + number
+                                        Warnlog "The contextmenu came up, but the number of entries were strange."
+                                        printlog "Number of entries:" + number
                                         MenuSelect(0)
                                     end if
                                 catch
-                                    warnlog "   A contextmenu didnt come up for the gallery-theme on position: " + ct
+                                    warnlog "A contextmenu didnt come up for the gallery-theme on position: " + ct
                                     i = HowManyItems
                                 endcatch
-                            '/// 5. Repeat 3.-5. until 2. is fulfilled. ///'
+                            printlog "5. Repeat 3.-5. until 2. is fulfilled."
                         next i
-                    end if 'if the theme didnt have any objects, we landed here.
+                    end if 
         next d
-        '/// 6. Change Theme. ///'
-        '/// 7. Repeat 2. - 8. until all themes are done. ///'
+        printlog " 6. Change Theme."
+        printlog " 7. Repeat 2. - 8. until all themes are done."
     next ct
 
     Kontext "Gallery"
             WaitSlot (2000)
         end if
         
-    '/// Remove the last copied object. ///'
+    printlog " Remove the last copied object."
     hTypeKeys "<DELETE>"
     call hCloseDocument
     
     call hCloseDocument
     
 endcase 'tResetSettings
-'-------------------------------------------------------------------------
+'-------------------------------------------------------------------------

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

 
     sFilter (0) = 0 ' initalize ;-)...
     printlog " used document: graphics\required\input\tbo_alf_.od?"
-    sFileName = "graphics\required\input\tbo_alf_." + ExtensionString    ' this is the file with all features
+    sFileName = "graphics\required\input\tbo_alf_." + ExtensionString
     printlog "FileName is " + sFileName
-    sFile = "isas_"                                ' this is the filename of the export files
+    sFile = "isas_"
     sPath = ConvertPath ( gOfficePath + "user/work/graphics/required/"+gApplication+"\"+ gPlatform) ' this is the export path
     printlog "sPath is " + sPath
     if dir (sPath) = "" then
     end if
 
     printlog " deleting all files in output directory: \\user\\work\\graphics\\required\\gApplication gPlatform isas_*"
-    if gSamePC = TRUE then ' delete export directory
+    if gSamePC = TRUE then 
         GetFileList ( sPath, sFile+"*", Exlist() )
         if KillFileList ( Exlist() ) <> TRUE then
             Warnlog "Couldn't delete all Files in Output-Export-Directory, the followings are still there:"
     WaitSlot (3000)
     
     printlog "running 5 times save as with different Filters"
-    for i = 1 to 6 'run it 5 times
+    for i = 1 to 6
         printlog "calling Save as Dialog"
         FileSaveAs
         WaitSlot (2000)

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

     InsertChart
     WaitSlot (2000)
     Kontext "Messagebox"
-        if Messagebox.Exists then
-            Warnlog Messagebox.GetText
-            Messagebox.OK
-            sleep 1
-        end if
+    if Messagebox.Exists then
+        Warnlog Messagebox.GetText
+        Messagebox.OK
+        sleep 1
+    end if
     gMouseClick 1,1
     sleep 2
     printlog "close application "
     InsertSpreadsheetDraw
     WaitSlot (2000)
     Kontext "Messagebox"
-        if Messagebox.Exists (5) then
-            Warnlog Messagebox.GetText
-            Messagebox.OK
-        end if
-        sleep 2
-        printlog "click somewhere out of the object, to deselect it "
-        gMouseClick 1,1
-        sleep 1
-        printlog "select and delete object with keys: <Tab><Delete> "
-        hTypekeys "<Tab><Delete>"
-        sleep 2
+    if Messagebox.Exists (5) then
+        Warnlog Messagebox.GetText
+        Messagebox.OK
+    end if
+    sleep 2
+    printlog "click somewhere out of the object, to deselect it "
+    gMouseClick 1,1
+    sleep 1
+    printlog "select and delete object with keys: <Tab><Delete> "
+    hTypekeys "<Tab><Delete>"
+    sleep 2
     printlog "close application "
     Call hCloseDocument
     

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

     call tiFormatFontwork
     call tiFormatGroup
     printlog " format->group is also modify->group "
-    '        tiFormatLayer ' not in impress
+
 end sub
 '------------------------------------------------------------------------------
 testcase tiFormatDefault

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

     call tiToolsEyedropper    
     call tToolsOptionsTest ' global one
 end sub
+
 '-------------------------------------------------------------------------------
+
 testcase tiToolsSpellchecking
 
     if not gOOO then ' Spellcheck doesn't work in OOo builds.
-        '/// open application ///'
+        printlog "open application"
            Call hNewDocument
-            WaitSlot (2000)    'sleep 2
-        '/// call subroutine 'hSetSpellHypLanguage' for setting the default language in th eoptions, to enable it for languages, which don't provide a dictionary (usually asian ones) ///'
+            WaitSlot (2000) 
+        printlog " call subroutine 'hSetSpellHypLanguage' for setting the default language in th eoptions, to enable it for languages, which don't provide a dictionary (usually asian ones)"
            call hSetSpellHypLanguage
-        '/// create textframe with content ///'
+        printlog "create textframe with content"
            Call hTextrahmenErstellen ("Whaaaat", 10, 10, 30, 40)
            sleep 1
-        '/// Tools->Spellcheck->Check ///'
+        printlog "Tools->Spellcheck->Check"
            ToolsSpellCheck
             WaitSlot (1000)    'sleep 1
             Kontext "MessageBox"
                     Kontext "Rechtschreibung"
                         if Rechtschreibung.exists then
                             Call DialogTest ( Rechtschreibung )
-                            '/// close dialog 'Spellcheck' ///'
+                            printlog "close dialog 'Spellcheck'"
                             Rechtschreibung.Close
                         else
                             warnlog " Spellcheck dialog didn't came up :-("
                         end if
                 end if
                 sleep 1
-                '/// say OK to messagebox about 'Spellcheck has been completed' ///'
+                printlog "say OK to messagebox about 'Spellcheck has been completed'"
                 Kontext "Messagebox"
                 if Messagebox.exists (5) then
                     warnlog "Shouldn't be any messagebox after pressing close in spellchecker"
                     sleep (2)
                     Kontext
                 end if
-            '/// close application ///'
+            printlog "close application"
         Call hCloseDocument
     else goto endsub
     endif
-endcase
+endcase 'tiToolsSpellchecking
+
 '-------------------------------------------------------------------------------
+
 testcase tiToolsSpellcheckingAutomatic
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
-    '/// Tools->Spellcheck->AutoSpellcheck ///'
+    printlog "Tools->Spellcheck->AutoSpellchec"
     ToolsSpellcheckAutoSpellcheck
-    '/// create textframe with text ///'
+    printlog " create textframe with text "
     Call hTextrahmenErstellen ("What", 10, 10, 30, 40)
     sleep 2
-    '/// Tools->Spellcheck->AutoSpellcheck ///'
+    printlog "Tools->Spellcheck->AutoSpellcheck "
     ToolsSpellcheckAutoSpellcheck
-    '/// close application ///'
+    printlog "close application "
     Call hCloseDocument
-endcase
+endcase 'tiToolsSpellcheckingAutomatic
+
 '-------------------------------------------------------------------------------
+
 testcase tiToolsThesaurus
     Dim sWord as string
     Dim sExt as string
                      sWord = "Hello"
                   endif
     end select
-
     PrintLog "Thesaurus with 1 word: " + sWord
-
     if( Ucase(gApplication) = "DRAW" ) then
         sExt = ".odg"
     elseif( Ucase(gApplication) = "IMPRESS" ) then
         sExt = ".odp"
     endif
-
     Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_" + iSprache + sExt)
     Call sMakeReadOnlyDocumentEditable()
     Call hTextrahmenErstellen (sWord,20,20,50,30)
     sleep 1
-
     printlog "select the word"
     hTypeKeys "<Home><SHIFT END>"
 
          warnlog "the thesaurus does not appear"
     end if
     Call hCloseDocument
-endcase
+endcase 'tiToolsThesaurus
+
 '-------------------------------------------------------------------------------
+
 testcase tiToolsHyphenation
-    '/// open application ///'
+    printlog "open application "
     Call hNewDocument
-    '/// Tools->Hyphenation ///'
+    printlog "Tools->Hyphenation "
     ToolsLanguageHyphenationDraw
-    WaitSlot (2000)    'sleep 2
-    '/// Tools->Hyphenation ///'
+    WaitSlot (2000)
+    printlog "Tools->Hyphenation "
     ToolsLanguageHyphenationDraw
-    '/// close application ///'
+    printlog "close application "
     Call hCloseDocument
-endcase
+endcase 'tiToolsHyphenation
+
 '-------------------------------------------------------------------------------
+
 testcase tiToolsAutoCorrect
     dim iLanguage as integer ' for resetting the language
-    '/// open application ///'
+    printlog "open application "
     Call hNewDocument
-    WaitSlot (1000)    'sleep 1
-    '/// Tools->Autocorrect ///'
+    WaitSlot (1000)   
+    printlog "Tools->Autocorrect "
     ToolsAutocorrect
-    WaitSlot (2000)    'sleep 1
+    WaitSlot (2000) 
     Kontext
-    '/// select tabpage 'Replace' ///'
+    printlog "select tabpage 'Replace' "
     Messagebox.SetPage TabErsetzung
     Kontext "TabErsetzung"
-        Call DialogTest ( TabErsetzung )
-        '/// remember the language, that is selected in the 'Replacements and exceptions for Language' Listbox ///'
-        iLanguage = WelcheSprache.GetSelIndex
-        '///+ change the language to the 1st from the top ///'
-        WelcheSprache.Select 1 ' select language with empty list
-        '///+ type something into the field 'replace' ///'
-        Kuerzel.SetText "a"
-        '///+ type something into the field 'with' ///'
-        ErsetzenDurch.SetText "b"
-        '///+ click button 'new' ///'
-        Neu.Click
-        sleep 1
-        '///+ click button 'delete' ///'
+    Call DialogTest ( TabErsetzung )
+    printlog "remember the language, that is selected in the 'Replacements and exceptions for Language' Listbox "
+    iLanguage = WelcheSprache.GetSelIndex
+    printlog "+ change the language to the 1st from the top "
+    WelcheSprache.Select 1 ' select language with empty list
+    printlog "+ type something into the field 'replace' "
+    Kuerzel.SetText "a"
+    printlog "+ type something into the field 'with' "
+    ErsetzenDurch.SetText "b"
+    printlog "+ click button 'new' "
+    Neu.Click
+    sleep 1
+    printlog "+ click button 'delete' "
+    Loeschen.Click
+    sleep 1
+    try
+        printlog "+ click button 'delete' again "
         Loeschen.Click
-        sleep 1
-        try
-            '///+ click button 'delete' again ///'
-            Loeschen.Click
-        catch
-            printlog "ok was CRASH before" '#
-        endcatch
-        '///+ if nothing happens it is ok, was a Crash before :-( ///'
-        '///+ restore cthe remembered language ///'
-        WelcheSprache.select (iLanguage)
-        Kontext
-        '/// select tabpage 'Exception' ///'
-        Messagebox.SetPage TabAusnahmen
-            Kontext "TabAusnahmen"
-            Call DialogTest ( TabAusnahmen )
-            '/// type something into the field 'Abbreviations' ///'
-            Abkuerzungen.settext "Lala"
-            '///+ click button 'new' in 'Abbreviations' ///'
-            AbkuerzungenNeu.click
-            '///+ click button 'delete' in 'Abbreviations' ///'
-            AbkuerzungenLoeschen.click
-            '/// type something into the field 'Word with TWo INitial CApitals' ///'
-            Woerter.settext "LALA"
-            '///+ check the checkbox 'AutoInclude' in 'Word with TWo INitial CApitals' ///'
-            WoerterAutomatisch.Check
-            '///+ click button 'new' in 'Word with TWo INitial CApitals' ///'
-            WoerterNeu.click
-            '///+ click button 'delete' in 'Word with TWo INitial CApitals' ///'
-            WoerterLoeschen.click
-            '///+ UNcheck the checkbox 'AutoInclude' in 'Word with TWo INitial CApitals' ///'
-            WoerterAutomatisch.UnCheck
-            Kontext
-            '/// select tabpage 'Options' ///'
-            Messagebox.SetPage TabOptionen
-                Kontext "TabOptionen"
-                Call DialogTest ( TabOptionen )
-                Kontext
-            '/// select tabpage 'Custom Quotes' ///'
-            Messagebox.SetPage TabLocalizedOptions
-                Kontext "TabLocalizedOptions"  ' 1a
-                    '/// in the part of 'single quotes': ///'
-                    '///+ check 'replace' ///'
-                    '///+ click 'start quote' ///'
-                    SingleQuotesReplace.Check
-                    SingleQuotesStart.Click
-                    Kontext "Sonderzeichen"
-                        Call DialogTest ( Sonderzeichen, 1 )
-                        '///+  cancel dialog 'start quote' ///'
-                        Sonderzeichen.Cancel
-                Kontext "TabLocalizedOptions"  ' 1b
-                    '///+ click 'end quote' ///'
-                    SingleQuotesEnd.Click
-                    Kontext "Sonderzeichen"
-                        Call DialogTest ( Sonderzeichen, 2 )
-                        '///+  cancel dialog 'end quote' ///'
-                        Sonderzeichen.Cancel
-                Kontext "TabLocalizedOptions"  ' 1s
-                    '///+ click button 'default' ///'
-                    SingleQuotesDefault.Click
+    catch
+        printlog "ok was CRASH before"
+    endcatch
+    printlog "+ if nothing happens it is ok, was a Crash before :-( "
+    printlog "+ restore cthe remembered language "
+    WelcheSprache.select (iLanguage)
+    Kontext
+    printlog "select tabpage 'Exception' "
+    Messagebox.SetPage TabAusnahmen
+    Kontext "TabAusnahmen"
+    Call DialogTest ( TabAusnahmen )
+    printlog "type something into the field 'Abbreviations' "
+    Abkuerzungen.settext "Lala"
+    printlog "+ click button 'new' in 'Abbreviations' "
+    AbkuerzungenNeu.click
+    printlog "+ click button 'delete' in 'Abbreviations' "
+    AbkuerzungenLoeschen.click
+    printlog "type something into the field 'Word with TWo INitial CApitals' "
+    Woerter.settext "LALA"
+    printlog "+ check the checkbox 'AutoInclude' in 'Word with TWo INitial CApitals' "
+    WoerterAutomatisch.Check
+    printlog "+ click button 'new' in 'Word with TWo INitial CApitals' "
+    WoerterNeu.click
+    printlog "+ click button 'delete' in 'Word with TWo INitial CApitals' "
+    WoerterLoeschen.click
+    printlog "+ UNcheck the checkbox 'AutoInclude' in 'Word with TWo INitial CApitals' "
+    WoerterAutomatisch.UnCheck
+    Kontext
+    printlog "select tabpage 'Options' "
+    Messagebox.SetPage TabOptionen
+    Kontext "TabOptionen"
+    Call DialogTest ( TabOptionen )
+    Kontext
+    printlog "select tabpage 'Custom Quotes' "
+    Messagebox.SetPage TabLocalizedOptions
+    Kontext "TabLocalizedOptions"  ' 1a
+    printlog "in the part of 'single quotes': "
+    printlog "+ check 'replace' "
+    printlog "+ click 'start quote' "
+    SingleQuotesReplace.Check
+    SingleQuotesStart.Click
+    Kontext "Sonderzeichen"
+    Call DialogTest ( Sonderzeichen, 1 )
+    printlog "+  cancel dialog 'start quote' "
+    Sonderzeichen.Cancel
+    Kontext "TabLocalizedOptions"  ' 1b
+    printlog "+ click 'end quote' "
+    SingleQuotesEnd.Click
+    Kontext "Sonderzeichen"
+    Call DialogTest ( Sonderzeichen, 2 )
+    printlog "+  cancel dialog 'end quote' "
+    Sonderzeichen.Cancel
+    Kontext "TabLocalizedOptions"  ' 1s
+    printlog "+ click button 'default' "
+    SingleQuotesDefault.Click
 
-                Kontext "TabLocalizedOptions"  ' 2a
-                    '/// in the part of 'double quotes': ///'
-                    '///+ click 'start quote' ///'
-                    DoubleQuotesStart.Click
-                    Kontext "Sonderzeichen"
-                        Call DialogTest ( Sonderzeichen, 3 )
-                        '///+  cancel dialog 'start quote' ///'
-                        Sonderzeichen.Cancel
-                Kontext "TabLocalizedOptions"  ' 2b
-                    '///+ click 'end quote' ///'
-                    DoubleQuotesEnd.Click
-                    Kontext "Sonderzeichen"
-                        Call DialogTest ( Sonderzeichen, 4 )
-                        '///+  cancel dialog 'end quote' ///'
-                        Sonderzeichen.Cancel
-                Kontext "TabLocalizedOptions"  ' 2s
-                    '///+ click button 'default' ///'
-                    DoubleQuotesDefault.Click
-                    '///+ UNcheck 'replace' ///'
-                    SingleQuotesReplace.UnCheck
-                    '/// cancel dialog 'AtorCorrect' ///'
-                    TabLocalizedOptions.cancel
-    '/// close application ///'
+    Kontext "TabLocalizedOptions"  ' 2a
+    printlog " in the part of 'double quotes': "
+    printlog "+ click 'start quote' "
+    DoubleQuotesStart.Click
+    Kontext "Sonderzeichen"
+    Call DialogTest ( Sonderzeichen, 3 )
+    printlog "+  cancel dialog 'start quote' "
+    Sonderzeichen.Cancel
+    Kontext "TabLocalizedOptions"  ' 2b
+    printlog "+ click 'end quote' "
+    DoubleQuotesEnd.Click
+    Kontext "Sonderzeichen"
+    Call DialogTest ( Sonderzeichen, 4 )
+    printlog "+  cancel dialog 'end quote' "
+    Sonderzeichen.Cancel
+    Kontext "TabLocalizedOptions"  ' 2s
+    printlog "+ click button 'default' "
+    DoubleQuotesDefault.Click
+    printlog "+ UNcheck 'replace' "
+    SingleQuotesReplace.UnCheck
+    printlog " cancel dialog 'AtorCorrect' "
+    TabLocalizedOptions.cancel
+    printlog " close application "
     Call hCloseDocument
-endcase
+
+endcase 'tiToolsAutoCorrect
 '-------------------------------------------------------------------------------
+
 testcase tChineseTranslation
 
     qaerrorlog( "#i89634# - Chinese Translation dialog does not close" )
         sFileName = "graphics\required\input\tchinese.odg"
     end if
 
-    '/// Open application ///'
+    printlog "Open application "
     Call hNewDocument
-    WaitSlot (2000)    'sleep 1
-    '/// Save old state and Activate Support for Asian language ///'
+    WaitSlot (2000) 
+    printlog "Save old state and Activate Support for Asian language "
     bSavedAsianSupport = ActiveDeactivateAsianSupport(TRUE)
-    '/// Open Document ///'
+    printlog "Open Document "
     Call hFileOpen ( ConvertPath(gTesttoolPath + sFileName) )
-    '/// If write-protected - open as Temp-file ///'
+    printlog "If write-protected - open as Temp-file "
     sleep (2)
     Kontext "Standardbar"
-        if Bearbeiten.GetState(2) <> 1 then
-            Bearbeiten.Click '0 = not pressed. 1 = pressed.
-            Kontext
-            if Active.Exists(1) then
-                Active.Yes
-            else
-                warnlog "No messagebox after making document editable? - Test canceled here"
-                goto endsub
-            end if
+    if Bearbeiten.GetState(2) <> 1 then
+        Bearbeiten.Click '0 = not pressed. 1 = pressed.
+        Kontext
+        if Active.Exists(1) then
+            Active.Yes
+        else
+            warnlog "No messagebox after making document editable? - Test canceled here"
+            goto endsub
         end if
+    end if
     if uCase(gApplication) = "IMPRESS" then
         Kontext "DocumentImpress"
     else
         Kontext "DocumentDraw"
     end if
-    '/// Select all, Press RETURN to enter text in Editmode ///'
-    '/// Move marker to top of the text, go two steps right, mark two characters ///'
+    printlog "Select all, Press RETURN to enter text in Editmode "
+    printlog "Move marker to top of the text, go two steps right, mark two characters "
     EditSelectAll
     hTypeKeys "<RETURN>"
     hTypeKeys "<MOD1 HOME><RIGHT><RIGHT><SHIFT RIGHT RIGHT>"
-    '/// Open Chinesetranslation ///'
+    printlog "Open Chinesetranslation "
     ToolsChineseTranslation
     WaitSlot (2000)    'sleep 1
     kontext "ChineseTranslation"
-        '/// Check if everything is there ///'
-        Call DialogTest ( ChineseTranslation )
-        '/// Click on EditTerms ///'
-        EditTerms.Click
-        kontext "ChineseDictionary"
-            '/// Check if everything is there ///'
-            Call DialogTest ( ChineseDictionary )
-            '/// Close dialog 'ChineseDictionary' with 'OK' ///'
-            ChineseDictionary.Ok
+    printlog " Check if everything is there "
+    Call DialogTest ( ChineseTranslation )
+    printlog " Click on EditTerms "
+    EditTerms.Click
+    kontext "ChineseDictionary"
+    printlog " Check if everything is there "
+    Call DialogTest ( ChineseDictionary )
+    printlog " Close dialog 'ChineseDictionary' with 'OK' "
+    ChineseDictionary.Ok
     kontext "ChineseTranslation"
-        '/// Close dialog 'Chinese' with 'OK' ///'
-        ChineseTranslation.OK
+    printlog " Close dialog 'Chinese' with 'OK' "
+    ChineseTranslation.OK
     kontext
-        '/// if messagebox exist, say OK; ('Spellcheck completed' or 'Word not found') ///'
-        if Messagebox.exists (5) then
-            printlog "Messagebox: "+Messagebox.gettext+"'"
-            Messagebox.ok
-        end if
-    '/// Restore old state for Asian language ///'
+    printlog " if messagebox exist, say OK; ('Spellcheck completed' or 'Word not found') "
+    if Messagebox.exists (5) then
+        printlog "Messagebox: "+Messagebox.gettext+"'"
+        Messagebox.ok
+    end if
+    printlog " Restore old state for Asian language "
     ActiveDeactivateAsianSupport(bSavedAsianSupport)
-    '/// Close application ///'
+    printlog " Close application "
     Call hCloseDocument
-endcase
+
+endcase 'tChineseTranslation
 '-------------------------------------------------------------------------------
+
 testcase tiToolsMacro
-    '/// open application ///'
+    printlog "open application "
     Call hNewDocument
     WaitSlot (2000)    'sleep 2
-    '/// Tools->Macro ///'
+    printlog "Tools->Macro "
     ToolsMacro
     Kontext "Makro"
-        Call DialogTest ( Makro )
-        '/// click button 'organizer...' ///'
-        Verwalten.Click
-
+    Call DialogTest ( Makro )
+    printlog "click button 'organizer...' "
+    Verwalten.Click
     Kontext
-        '/// switch to tabpage 'Modules' ///'
-        Messagebox.SetPage TabModule
-        Kontext "TabModule"
-            Call DialogTest ( TabModule )
-
+    printlog "switch to tabpage 'Modules' "
+    Messagebox.SetPage TabModule
+    Kontext "TabModule"
+    Call DialogTest ( TabModule )
     Kontext
-        '/// switch to tabpage 'Libraries' ///'
-        Messagebox.SetPage TabBibliotheken
-        Kontext "TabBibliotheken"
-            Call DialogTest ( TabBibliotheken )
-            '/// click lbutton 'append' ///'
-            Hinzufuegen.Click
-            Kontext "Messagebox"
-                if Messagebox.Exists (5) then
-                    if Messagebox.GetRT = 304 then
-                        Warnlog Messagebox.Gettext
-                        Messagebox.Ok
-                    end if
-                end if
-            Kontext "OeffnenDlg"
-                '/// cancel dialog 'append libraries' ///'
-                OeffnenDlg.Cancel
-        Kontext "TabBibliotheken"
-            '/// click button 'new' ///'
-            Neu.Click
-            kontext "NeueBibliothek"
-                sleep 1 'Bibliotheksname
-                '/// cancel dialog 'new library' ///'
-                NeueBibliothek.cancel
-        Kontext "TabBibliotheken"
-            '/// close dialog 'macro organizer' ///'
-            TabBibliotheken.Close
+    printlog "switch to tabpage 'Libraries' "
+    Messagebox.SetPage TabBibliotheken
+    Kontext "TabBibliotheken"
+    Call DialogTest ( TabBibliotheken )
+    printlog "click lbutton 'append' "
+    Hinzufuegen.Click
+    Kontext "Messagebox"
+    if Messagebox.Exists (5) then
+        if Messagebox.GetRT = 304 then
+            Warnlog Messagebox.Gettext
+            Messagebox.Ok
+        end if
+    end if
+    Kontext "OeffnenDlg"
+    printlog "cancel dialog 'append libraries' "
+    OeffnenDlg.Cancel
+    Kontext "TabBibliotheken"
+    printlog "click button 'new' "
+    Neu.Click
+    kontext "NeueBibliothek"
+    sleep 1 'Bibliotheksname
+    printlog "cancel dialog 'new library' "
+    NeueBibliothek.cancel
+    Kontext "TabBibliotheken"
+    printlog "close dialog 'macro organizer' "
+    TabBibliotheken.Close
 
     Kontext "Makro"
-        '/// close dialog 'macro' ///'
-        Makro.Cancel
-    '/// close application ///'
+    printlog "close dialog 'macro' "
+    Makro.Cancel
+    printlog "close application "
     Call hCloseDocument
-endcase
+endcase 'tiToolsMacro
+
 '-------------------------------------------------------------------------------
+
 testcase tiToolsGallery
-    '/// open application ///'
+    printlog "open application "
     Call hNewDocument
-    '/// Tools->Gallery ///'
+    printlog "Tools->Gallery "
     ToolsGallery
     WaitSlot (2000)    'sleep 1
-    '/// Tools->Gallery ///'
+    printlog "Tools->Gallery "
     ToolsGallery
-    '/// close application ///'
+    printlog "close application "
     Call hCloseDocument
-endcase
+endcase'tiToolsGallery
+
 '-------------------------------------------------------------------------------
+
 testcase tiToolsEyedropper
-    '/// open application ///'
+    printlog "open application "
     Call hNewDocument
-    '/// Tools->Eyedropper ///'
+    printlog "Tools->Eyedropper "
     ToolsEyedropper
     Kontext "Pipette"
         Call DialogTest (Pipette)
-        '/// close dialog 'Eyedropper' ///'
+        printlog "close dialog 'Eyedropper' "
         Pipette.Close
         sleep 1
-    '/// close application ///'
+    printlog "close application "
     Call hCloseDocument
-endcase
+endcase 'tiToolsEyedropper
 

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

 sub id_007
 
     printLog Chr(13) + "---------    id_007    ----------"
-    ' in imp available via context menu, in draw via modify menu
 
     call tdModifyFlipVertikal
     call tdModifyFlipHorizontal
     call tdModifyCombineSplit
 end sub
 '-------------------------------------------------------------------------------
+
 testcase tdModifyFlipVertikal
-
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument            ' imp: contextmenue same SID!
     sleep 1
-    '/// create rectangle ///'
+    printlog "create rectangle"
     Call hRechteckErstellen ( 10, 10, 20, 40 )
     try
-        '/// imp: Kontextmenu: Flip->Vertically ///'
-        '///+ Modify->Flip->Vertically ///'
+        printlog "imp: Kontextmenu: Flip->Vertically"
         ContextFlipVerticalDraw
         Printlog "- Flip-vertical is working"
     catch
    	    Warnlog "- Flip-Vertical does not work"
     endcatch
     sleep 1
-    '/// close application ///'
+    printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tdModifyFlipVertikal
 
 '------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tdModifyFlipHorizontal
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument            ' imp: contextmenue same SID!
     WaitSlot (1000)
-    '/// create rectangle ///'
+    printlog "create rectangle"
     Call hRechteckErstellen ( 10, 10, 20, 40 )
     try
-        '/// imp: Kontextmenu: Flip->Horizontally ///'
-        '///+ Modify->Flip->Horizontally ///'
+        printlog "imp: Kontextmenu: Flip->Horizontally"
         ContextFlipHorizontalDraw
         Printlog "- Flip-horizontal is working"
     catch
    	    Warnlog "- Flip-horizontal does not work"
     endcatch
     sleep 1
-    '/// close application ///'
+    printlog "close application"
     Call hCloseDocument
-endcase
+endcase 'tdModifyFlipHorizontal
 
 '------------------------------------------------------------------------------------------------------------------------------------------------
 
 testcase tdContextConvertIntoCurve
-    '/// open application ///'
+    printlog "open application"
     Call hNewDocument
-    '/// create rectangle ///'
+    printlog "create rectangle"
     Call hRechteckErstellen ( 10, 10, 20, 40 )