[ooo-build-commit] Branch 'ooo/master' - 3 commits - testautomation/dbaccess testautomation/framework testautomation/global testautomation/spreadsheet testautomation/writer testtools/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue Sep 8 23:55:33 PDT 2009
testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc | 12
testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc | 24 -
testautomation/dbaccess/tools/dbcreatetools.inc | 2
testautomation/framework/optional/f_options_ooo.bas | 1
testautomation/framework/optional/includes/options_ooo_colors.inc | 212 ++++++---
testautomation/framework/optional/includes/options_ooo_view.inc | 16
testautomation/framework/optional/input/options/ooo_view_changed.ref | 2
testautomation/framework/optional/input/options/ooo_view_defaults.ref | 2
testautomation/framework/required/f_first.bas | 4
testautomation/framework/required/includes/standard_toolbar_3.inc | 215 +++-------
testautomation/framework/required/input/mailmerge_data.odb |binary
testautomation/framework/tools/includes/options_tools.inc | 54 +-
testautomation/global/tools/includes/optional/t_docfuncs.inc | 177 +-------
testautomation/global/tools/includes/required/t_filters.inc | 2
testautomation/global/tools/includes/required/t_tools1.inc | 34 -
testautomation/global/win/etab_e_g.win | 2
testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc | 2
testautomation/writer/required/includes/w_001_.inc | 6
testtools/source/cliversioning/version_libs/version_3_1_1.dll |binary
19 files changed, 329 insertions(+), 438 deletions(-)
New commits:
commit 7225d1a8d42c010cb68308a4260a1953ed2f533f
Author: Oliver Bolte <obo at openoffice.org>
Date: Tue Sep 8 12:05:44 2009 +0000
CWS-TOOLING: integrate CWS jskhgpilot2
diff --git a/testautomation/framework/optional/f_options_ooo.bas b/testautomation/framework/optional/f_options_ooo.bas
index 6730568..d21514e 100755
--- a/testautomation/framework/optional/f_options_ooo.bas
+++ b/testautomation/framework/optional/f_options_ooo.bas
@@ -39,6 +39,7 @@
sub main
+ GLOBAL_USE_NEW_SLEEP = TRUE
use "framework\optional\includes\options_ooo_general.inc"
use "framework\optional\includes\options_ooo_memory.inc"
diff --git a/testautomation/framework/optional/includes/options_ooo_colors.inc b/testautomation/framework/optional/includes/options_ooo_colors.inc
index b9dd964..60278f6 100755
--- a/testautomation/framework/optional/includes/options_ooo_colors.inc
+++ b/testautomation/framework/optional/includes/options_ooo_colors.inc
@@ -37,118 +37,176 @@
'*
'\******************************************************************************
-
testcase tOOoColors
- dim USERCOLOR as String
+
+ printlog( "OOo color palette" )
+
dim myColor(4) as String
dim oldColor(4) as String
dim currentColor(4) as String
dim chColor(4) as String
- dim iDefaultColorCount as Integer
- dim iModifiedColorCount as Integer
- dim iTemp as integer
- dim i as integer
- USERCOLOR = "TT-Test" + iSprache
- myColor(1) = USERCOLOR
+ const DEFAULT_COLOR_COUNT = 103
+ const CHANGED_COLOR_COUNT = 104
+ const USER_COLOR = "TT-Test-Color"
+
+ myColor(1) = USER_COLOR
myColor(2) = "255"
myColor(3) = "245"
myColor(4) = "200"
-
- printlog " testing Tools/Options -> colors"
- '///check if all settings are saved in configuration ( StarOffice / Colors )
- '///open Tools / Options / StarOffice / Colors
- printlog " - Save current settings and modify/add some colors"
+
+ printlog( "Check if all settings are saved in configuration ( StarOffice / Colors )" )
+ printlog( "Open Tools / Options / StarOffice / Colors" )
ToolsOptions
+
+ Kontext "ExtrasOptionenDlg"
+ if ( ExtrasOptionenDlg.exists( 1 ) ) then
+
hToolsOptions ( "StarOffice", "Colors" )
+
+ printlog( "Delete the userdefined color if it exists" )
+ if ( Farbe.GetItemCount() <> DEFAULT_COLOR_COUNT + 1 ) then
+ call DeleteColor( USER_COLOR )
+ endif
- '///determine the number of currently registered colors
- iDefaultColorCount = Farbe.GetItemCount()
- for i = 1 to iDefaultColorCount
- printlog "("+i+"/"+iDefaultColorCount +"): '"+Farbe.getItemText(i)+"'"
- next i
- printlog " - Currently colors are listed: '" + iDefaultColorCount + "'"
- '///delete the userdefined color if it exists
- call DeleteColor( USERCOLOR )
- '///determine the number of currently registered colors
+ printlog( "Check the number of currently registered colors - cancel test on error" )
Kontext "TabFarben"
- iDefaultColorCount = Farbe.GetItemCount
- printlog " - Colors after deleting: '" + iDefaultColorCount + "'"
- '///select the last color in the list
- printlog " - jump to the last color in the list."
+ if ( Farbe.GetItemCount() <> DEFAULT_COLOR_COUNT ) then
+ warnlog( "The number of colors has changed, stopping test" )
+ printlog( "Expected: " & DEFAULT_COLOR_COUNT )
+ printlog( "Found...: " & Farbe.getItemCount() )
+ printlog( "Close the Tools/Options dialog with OK" )
+ Kontext "ExtrasOptionenDlg"
+ ExtrasOptionenDlg.OK
+ WaitSlot( 2000 )
+ goto endsub
+ else
+ printlog( "Number of colors is ok: " & DEFAULT_COLOR_COUNT )
+ endif
+
+ printlog( "Jump to the last color in the list." )
Kontext "TabFarben"
- Farbe.Select( iDefaultColorCount )
- '///get the settings for the current selected color
- '(204,204,255)
- call getColorRGB(oldColor())
- '///change settings for last color and press 'modify'
- '(255,255,255)
- call ModifyColorRGB_PGUP(iDefaultColorCount)
- '///get the changed colors (Sun 4,255,255,255)
+ Farbe.Select( Farbe.GetItemCount() )
+
+ printlog( "Get the settings for the current selected color" )
+ call getColorRGB(oldColor()) '(204,204,255)
+
+ printlog( "Change settings for last color and press 'modify'" )
+ call ModifyColorRGB_PGUP( DEFAULT_COLOR_COUNT ) '(255,255,255)
+
+ printlog( "Get the changed colors (Sun 4,255,255,255)" )
call GetColorRGB(chColor())
- '///change the settings again and save it as TT-Test (adding to the list)
- '(255,245,200)
- call CreateNewColor(myColor())
- '///get the current number of registered colors (should be 92)
+
+ printlog( "Change the settings again and save it as TT-Test (adding to the list)" )
+ call CreateNewColor(myColor()) '(255,245,200)
+
+ printlog( "Check the number of currently registered colors" )
Kontext "TabFarben"
- iModifiedColorCount = Farbe.getItemCount
- printlog " - Currently colors are listed: '" + iModifiedColorCount + "'"
- '///close the options dialog with OK
- printlog " - close extras/options"
+ if ( Farbe.getItemCount() <> CHANGED_COLOR_COUNT ) then
+ warnlog( "The number of colors has changed" )
+ printlog( "Expected: " & CHANGED_COLOR_COUNT )
+ printlog( "Found...: " & Farbe.getItemCount() )
+ else
+ printlog( "Number of colors is ok: " & DEFAULT_COLOR_COUNT )
+ endif
+
+ printlog( "Close the Tools/Options dialog with OK" )
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- Sleep(3)
+ WaitSlot( 2000 )
+ else
+ warnlog( "Tools/Options dialog not open" )
+ endif
- '///exit and restart the office
- printlog " - exit/restart StarOffice"
+ printlog( "Exit and restart the office" )
ExitRestartTheOffice
- '///check the changes
- printlog " - first check of changes (modifications)"
- '///open tools / options / StarOffice / Colors
+
+ printlog( "Check the changes" )
ToolsOptions
+
+ Kontext "ExtrasOptionenDlg"
+ if ( ExtrasOptionenDlg.exists( 1 ) ) then
+
hToolsOptions ( "StarOffice", "Colors" )
- '///check the number of colors ( is the new entry saved )
- '(92)
- iTemp = Farbe.getItemCount
- printlog "Current color count: '" + iTemp + "'"
- if (iTemp <> iModifiedColorCount) then
- Warnlog "The number of registered colors is incorrect. Should be: '" + iModifiedColorCount + "' is: '"+ iTemp + "'"
- end if
- '///select the changed color and check the changes
+
+ printlog( "Check the number of colors (Plus one color)" )
+ Kontext "TabFarben"
+ if ( Farbe.getItemCount() <> CHANGED_COLOR_COUNT ) then
+ warnlog( "The number of colors has changed" )
+ printlog( "Expected: " & CHANGED_COLOR_COUNT )
+ printlog( "Found...: " & Farbe.getItemCount() )
+ else
+ printlog( "Number of colors is ok: " & DEFAULT_COLOR_COUNT )
+ endif
+
+ printlog( "Select the changed color and check the changes" )
Kontext "TabFarben"
- Farbe.Select(iDefaultColorCount)
+ Farbe.Select( DEFAULT_COLOR_COUNT )
call compareTwoColorsRGB(chColor())
- '///select the new color ( TT-Test ) and check the name and the settings
+
+ printlog( "Select the new color ( TT-Test ) and check the name and the settings" )
Kontext "TabFarben"
- Farbe.Select(iModifiedColorCount)
+ Farbe.Select( CHANGED_COLOR_COUNT )
call CompareTwoColorsRGB(myColor())
- '///delete the new userdefined color
- call deleteColor( USERCOLOR )
- '///reset the modified color to default
+ printlog( "Delete the new userdefined color" )
+ call deleteColor( USER_COLOR )
+
+ printlog( "Check the number of colors (One removed)" )
Kontext "TabFarben"
- Farbe.Select(iDefaultColorCount)
+ if ( Farbe.getItemCount() <> DEFAULT_COLOR_COUNT ) then
+ warnlog( "The number of colors has changed" )
+ printlog( "Expected: " & DEFAULT_COLOR_COUNT )
+ printlog( "Found...: " & Farbe.getItemCount() )
+ else
+ printlog( "Number of colors is ok: " & DEFAULT_COLOR_COUNT )
+ endif
+
+ printlog( "reset the modified color to default" )
+ Kontext "TabFarben"
+ Farbe.Select( DEFAULT_COLOR_COUNT )
call ModifyColorRGB(oldColor())
- '///close options dialog with OK
+
+ printlog( "Close options dialog with OK" )
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
- Sleep(3)
-
- '///reopen options dialog and check the reset
- printlog " - Second check of changes (reset)"
+ WaitSlot( 2000 )
+
+ else
+ warnlog( "Tools/Options dialog not open" )
+ endif
+
+ printlog( "Reopen options dialog and check the reset" )
ToolsOptions
+
+ Kontext "ExtrasOptionenDlg"
+ if ( ExtrasOptionenDlg.exists( 1 ) ) then
+
hToolsOptions ( "StarOffice", "Colors" )
- '///check if the number of colors in the list has been restored
- iTemp = Farbe.getItemCount
- printlog "Current color count: '" + iTemp + "'"
- if (iTemp <> iDefaultColorCount) then
- Warnlog "The number of registered colors is incorrect. Should be: '" + iDefaultColorCount + "' is: '"+ iTemp + "'"
- endif
- '///check if the last color has been reset to defaults.
+
+ printlog( "Check if the number of colors in the list has been restored" )
Kontext "TabFarben"
- Farbe.Select(iDefaultColorCount)
+ if ( Farbe.getItemCount() <> DEFAULT_COLOR_COUNT ) then
+ warnlog( "The number of colors has changed" )
+ printlog( "Expected: " & DEFAULT_COLOR_COUNT )
+ printlog( "Found...: " & Farbe.getItemCount() )
+ else
+ printlog( "Number of colors is ok: " & DEFAULT_COLOR_COUNT )
+ endif
+
+
+ printlog( "Check if the last color has been reset to defaults." )
+ Kontext "TabFarben"
+ Farbe.Select( DEFAULT_COLOR_COUNT )
call compareTwoColorsRGB(oldColor())
- '///close options dialog with OK
+
+ printlog( "Close options dialog with OK" )
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
+ WaitSlot( 2000 )
+
+ else
+ warnlog( "Tools/Options dialog not open" )
+ endif
+
endcase
diff --git a/testautomation/framework/optional/includes/options_ooo_view.inc b/testautomation/framework/optional/includes/options_ooo_view.inc
index 6cd38ac..c631cc6 100755
--- a/testautomation/framework/optional/includes/options_ooo_view.inc
+++ b/testautomation/framework/optional/includes/options_ooo_view.inc
@@ -123,7 +123,13 @@ sub checkPage( sFile as string , bDisabled as boolean, optional iMiddleMouseButt
else
printlog( "Hardware acceleration is not available on this system" )
endif
- checkCheckBox( sFile , "*" , UseAntiAliasing )
+
+ if ( UseAntiAliasing.isEnabled() ) then
+ checkCheckBox( sFile , "*" , UseAntiAliasing )
+ else
+ printlog( "Antialiasing is not available on this system" )
+ endif
+
checkListBox( sFile , "*" , MousePositioning)
' needs to get handled differently on platforms!
iMiddleMouseButton = MausAktion.getSelIndex
@@ -209,7 +215,13 @@ sub changePage( sFile as string , bInverted as boolean, optional iMiddleMouseBut
else
printlog( "Harware acceleration is not available on this system" )
endif
- setCheckBox( sFile , "*" , useantialiasing )
+
+ if ( UseAntiAliasing.isEnabled() ) then
+ setCheckBox( sFile , "*" , useantialiasing )
+ else
+ printlog( "Antialiasing is not available on this system" )
+ endif
+
setListBox( sFile , "*" , MousePositioning )
' needs to get handled differently on platforms!
if iMiddleMouseButtonExtern = 1 then
diff --git a/testautomation/framework/optional/input/options/ooo_view_changed.ref b/testautomation/framework/optional/input/options/ooo_view_changed.ref
index 3ef9884..210aa30 100755
--- a/testautomation/framework/optional/input/options/ooo_view_changed.ref
+++ b/testautomation/framework/optional/input/options/ooo_view_changed.ref
@@ -11,7 +11,7 @@ schriftenhistorie=unchecked
dokumentansicht=unchecked
geoeffnetedokumente=checked
opengl=checked
-UseHardwareAcceleration=checked
+usehardwareacceleration=unchecked
useantialiasing=unchecked
mousepositioning=2
mausaktion=1
diff --git a/testautomation/framework/optional/input/options/ooo_view_defaults.ref b/testautomation/framework/optional/input/options/ooo_view_defaults.ref
index f56b006..919ea81 100755
--- a/testautomation/framework/optional/input/options/ooo_view_defaults.ref
+++ b/testautomation/framework/optional/input/options/ooo_view_defaults.ref
@@ -11,7 +11,7 @@ dokumentansicht=checked
geoeffnetedokumente=unchecked
opengl=unchecked
useantialiasing=checked
-usehardwareacceleration=disabled
+usehardwareacceleration=checked
mousepositioning=3
mausaktion=2
transparency=checked
diff --git a/testautomation/framework/required/f_first.bas b/testautomation/framework/required/f_first.bas
index aaeff2f..71533eb 100755
--- a/testautomation/framework/required/f_first.bas
+++ b/testautomation/framework/required/f_first.bas
@@ -40,6 +40,10 @@
sub main
+ ' Disable sleep() calls. If you encounter unexpected test interruptions
+ ' you should try to outcomment this or set the value to FALSE.
+ GLOBAL_USE_NEW_SLEEP = TRUE
+
use "framework\required\includes\first.inc"
use "framework\required\includes\graphics_import.inc"
diff --git a/testautomation/framework/required/includes/standard_toolbar_3.inc b/testautomation/framework/required/includes/standard_toolbar_3.inc
index 2af30fe..ef4012a 100755
--- a/testautomation/framework/required/includes/standard_toolbar_3.inc
+++ b/testautomation/framework/required/includes/standard_toolbar_3.inc
@@ -40,304 +40,223 @@
testcase tStandardBar_3
dim sFileOut as String
+ dim HyperlinkTabID as integer
+ dim iTabPage as integer
- '///<h1>Update test for all icons on the StandardBar</h1>
+ printlog( "Icons on the standardbar" )
- '///<ul>
- printlog "************************************************************"
- printlog "Check all visible icons on the Standardbar"
- printlog "************************************************************"
-
gApplication = "CALC"
- '///+<li>Setup: Delete files from the workdirectory to ensure a clean test</li>
+ printlog( "Cleanup test environment - delete files" )
sFileOut = hGetWorkPath() & "FWK-update-functionbar" & hGetSuffix( "current" )
ConvertPath ( sFileOut )
hDeleteFile( sFileOut )
- '///+<li>Setup: Reset the Standardbar to defaults</li>
+ printlog( "Reset the standardbar to defaults" )
hResetStandardBar()
- printlog "check all entries on the 'Standardbar'"
-
- '///+<li>Skipping testing of URL field, it is hidden by default and tested somewhere else</li>
- printlog "Skipping URL-Field"
-
- '///+<li>File Save</li>
- '///<ul>
-
- printlog "Save File"
- gApplication = "CALC"
- '///+<li>New Spreadsheet document, ensure that the navigator is closed</li>
printlog( "New Spreadsheet document" )
hCreateDocument()
+
Kontext "Navigator"
if ( Navigator.Exists() ) then
Navigator.close()
endif
- '///+<li>Insert some text in one cell (don't forget to press a <Enter> at the end)<br>
printlog( "Insert text into a random cell, press <Enter>" )
Kontext "DocumentCalc"
DocumentCalc.TypeKeys( "Only for a test.<Return>" )
- '///+ <i>Save-Button must be active -> click on the button</i></li>
- printlog( "Press the 'Save' button" )
-
Kontext "Standardbar"
+ printlog( "Press the 'Save' button" )
hWaitForObject( Speichern , 1000 )
Speichern.click()
- '///+<li>Set a filenname, remember it for further usage</li>
- printlog( "- Save the file to: " & sFileOut )
Kontext "SpeichernDlg"
+ printlog( "- Save the file to: " & sFileOut )
Dateiname.SetText( sFileOut )
Speichern.Click()
- '///+<li>Close the document</li>
printlog( "Close the document" )
hDestroyDocument()
-
- '///</ul>
- '///+<li>Edit File by pressing "File Open" button on the StandardBar</li>
-
- '///<ul>
- printlog( "Edit the file by pressing the 'File Open' button" )
-
- '///+<li>Click the File Open button<br>The File Open dialog should pop up</li>
- FileOpen
+ printlog( "Click the 'File Open' button" )
+ hUseAsyncSlot( "FileOpen" )
Kontext "OeffnenDlg"
+ Printlog( "Load test file in read-only mode" )
if ( OeffnenDlg.exists( 2 ) ) then
-
- '///+<li>Enter the name of the file we used earlier</li>
Dateiname.SetText( sFileOut )
-
- '///+<li>Check the "Read only" checkbox</li>
NurLesen.Check()
-
- '///+<li>Click "Open"</li>
oeffnen.click()
- sleep( 3 )
else
warnlog( "File Open dialog is missing" )
endif
+
+ wait( 2000 )
- '///+<li>Verify that the document is opened read-only<br>This can be done by
- '///+ travelling through the menus or trying to enter some text into the document.<br>
- '///+ In this case we try to insert a chart into the spreadsheet which should fail.</li>
Kontext "DocumentCalc"
+ printlog( "Try to insert a chart to verify that the document is read-only (this should fail)" )
try
- printlog( "Trying to insert a chart" )
InsertChartCalc
warnlog( "The document is not read-only" )
catch
- printlog( "Failed to insert chart -> Document is read-only. Good!" )
endcatch
-
- '///+<li>Click on "Edit File"<br>This should open another copy of the
- '///+ document. The copy should open in the foreground and be editable.</li>
Kontext "Standardbar"
+ printlog( "Click the <Edit File> button" )
hWaitForObject( Bearbeiten , 1000 )
- Bearbeiten.click()
+ Bearbeiten.click() : WaitSlot()
- '///+<li>Verify that the file can be edited by inserting a Chart</li>
+ printlog( "Try to insert a chart (should work this time)" )
InsertChartCalc
+
Kontext "ChartWizard"
if ( ChartWizard.exists( 2 ) ) then
- printlog( "Chart Wizard is open. Good." )
-
- '///+<li>Cancel Chart Wizard</li>
printlog( "Cancel Chart Wizard" )
ChartWizard.cancel()
- WaitSlot
+ WaitSlot()
else
warnlog( "Chart Wizard should be open" )
endif
-
-
- '///</ul>
- '///+<li>Skipping to print file directly</li>
- '///+<li>Cut / Copy / Paste</li>
-
- '///<ul>
- '///+<li>Select a row in the spreadsheet</li>
+ printlog( "Select a few cells for Cut/Copy/Paste test" )
Kontext "DocumentCalc"
DocumentCalc.TypeKeys( "<Up>", 7 )
DocumentCalc.TypeKeys( "<Shift Down>", 5 )
- '///+<li>Click on Cut</li>
printlog( "Cut" )
Kontext "Standardbar"
hWaitForObject( Ausschneiden , 1000 )
Ausschneiden.Click()
WaitSlot()
- '///+<li>Move one cell down</li>
Kontext "DocumentCalc"
+ printlog( "Move down one cell" )
DocumentCalc.TypeKeys( "<Down>" )
- '///+<li>Click on Paste</li>
printlog( "Paste" )
Kontext "Standardbar"
sleep( 3 ) ' No better solution found yet.
Einfuegen.Click()
Kontext "DocumentCalc"
+ printlog( "Move up 7 cells, then do <shift down>" )
DocumentCalc.TypeKeys( "<Up>", 7 )
DocumentCalc.TypeKeys( "<Shift Down>", 5 )
- waitslot
+ WaitSlot()
- '///+<li>Select a row in the spreadsheet at random</li>
- '///+<li>Click on Copy</li>
printlog( "Copy" )
Kontext "Standardbar"
hWaitForObject( Kopieren , 1000 )
Kopieren.Click()
- waitslot
-
- '///+<li>Press right-arrow and <return></li>
+ WaitSlot()
Kontext "DocumentCalc"
+ printlog( "Press right arrow and RETURN" )
DocumentCalc.TypeKeys( "<Right><Return>" )
- waitslot
+ WaitSlot()
- '///+<li>Click on Paste</li>
printlog( "Paste again" )
Kontext "Standardbar"
hWaitForObject( Einfuegen , 1000 )
Einfuegen.Click()
-
- '///</ul>
-
- '///+<li>Undo / Redo</li>
-
- '///<ul>
-
- '///+<li>click on Undo</li>
printlog( "Undo" )
hWaitForObject( Undo , 2000 )
Undo.Click()
WaitSlot()
- '///+<li>click on Redo</li>
+ printlog( "Redo" )
hWaitForObject( Redo , 2000 )
Redo.Click()
WaitSlot()
- '///</ul>
-
- '///+<li>Navigator ( on/off )</li>
-
- '///<ul>
- '///+<li>Click on Navigator -> on</li>
- printlog( "Open Navigator" )
Kontext "Standardbar"
+ printlog( "Open Navigator" )
hWaitForObject( NavigatorButton , 1000 )
NavigatorButton.Click()
- '///+<li>check if the navigator is visible</li>
-
Kontext "Navigator"
if ( Navigator.Exists( 1 ) ) then
- printlog( "Navigator present. Good." )
-
- '///+<li>Click on Navigator -> off</li>
printlog( "Close Navigator" )
Kontext "Standardbar"
NavigatorButton.Click()
-
- '///+<li>Verify that the navigator is closed</li>
- Kontext "Navigator"
- if ( Navigator.exists() ) then
- warnlog( "The navigator is still open" )
- else
- printlog( "Navigator is closed. Good." )
- endif
else
warnlog( "Navigator did not open" )
endif
- '///</ul>
-
- '///+<li>Hyperlink dialog ( on / off )</li>
- '///<ul>
+ Kontext "Navigator"
+ if ( Navigator.exists() ) then
+ warnlog( "The navigator should not be visible" )
+ endif
- '///+<li>Click on Hyperlink dialog -> on</li>
- printlog( "Click <HyperLink> to open the dialog" )
Kontext "Standardbar"
+ printlog( "Click <HyperLink> to open the dialog" )
hWaitForObject( HyperlinkDialog , 1000 )
HyperlinkDialog.Click()
- '///+<li>check if the Hyperlink dialog is visible
- Kontext "Hyperlink"
- if ( Hyperlink.Exists( 1 ) ) then
- printlog( "Hyperlink dialog is open" )
+ for iTabPage = 1 to 4
+ select case iTabPage
+ case 1: Kontext "Hyperlink"
+ if ( Hyperlink.exists() ) then HyperlinkTabID = 1
+ exit for
+ case 2: kontext "TabHyperlinkMailUndNews"
+ if ( TabHyperlinkMailUndNews.exists() ) then HyperlinkTabID = 2
+ exit for
+ case 3: kontext "TabHyperlinkDokument"
+ if ( TabHyperlinkDokument.exists() ) then HyperlinkTabID = 3
+ exit for
+ case 4: kontext "TabHyperlinkNeuesDokument"
+ if ( TabHyperlinkNeuesDokument.exists() ) then HyperlinkTabID = 4
+ exit for
+ case default:
+ HyperlinkTabID = 0
+ end select
+ next iTabPage
+
+ if ( HyperlinkTabID > 0 ) then
+
+ if ( HyperlinkTabID <> 1 ) then
+ qaerrorlog( "This is not the internet tabpage, did you " & _
+ "kill the userlayer before running the test?" )
+ endif
- '///+<li>Click on HyperLink again to close the dialog</li>
- printlog( "Click <HyperLink> to close" )
kontext "Standardbar"
+ printlog( "Click <HyperLink> to close" )
HyperlinkDialog.Click()
WaitSlot()
- kontext "HyperLink"
- if ( HyperLink.exists() ) then
- warnlog( "Hyperlink dialog not closed" )
- else
- printlog( "Hyperlink dialog has been closed. Good." )
- endif
else
- warnlog( "Hyperlink dialog is not open" )
+ warnlog( "#i104704# - Insert Hyperlink dialog cannot be accessed" )
+ Kontext "Standardbar"
+ HyperlinkDialog.Click()
endif
- '///+<li>click on Hyperlink dialog -> off
- '///</ul>
-
- '///+<li>Gallery ( on / off )</li>
-
- '///<ul>
- '///+<li>Click on the "Gallery" button</li>
- printlog( "Gallery button" )
Kontext "Standardbar"
- hWaitForObject( GalleryButton , 1000
+ printlog( "Gallery button" )
+ hWaitForObject( GalleryButton , 1000 )
GalleryButton.Click()
kontext "Gallery"
if ( Gallery.exists( 3 ) ) then
- printlog( "Gallery is open. Good." )
-
- '///+<li>Close the Gallery again</li>
printlog( "Gallery button again, to close" )
kontext "StandardBar"
GalleryButton.click()
- waitslot
+ WaitSlot()
kontext "Gallery"
if ( Gallery.exists() ) then
warnlog( "Gallery did not close " )
- else
- printlog( "Gallery is closed" )
endif
else
warnlog( "The Gallery did not open" )
endif
- '///</ul>
-
- '///+<li>Cleanup: Close both documents</li>
- do while( getDocumentCount > 0 )
- hDestroyDocument()
- loop
-
- '///+<li>Cleanup: Delete the workfile</li>
+ printlog( "Close all documents and delete files" )
+ hDestroyDocument()
hDeleteFile( sFileOut )
- '///</ul>
-
endcase
diff --git a/testautomation/framework/required/input/mailmerge_data.odb b/testautomation/framework/required/input/mailmerge_data.odb
index f0e678a..3ba8709 100755
Binary files a/testautomation/framework/required/input/mailmerge_data.odb and b/testautomation/framework/required/input/mailmerge_data.odb differ
diff --git a/testautomation/framework/tools/includes/options_tools.inc b/testautomation/framework/tools/includes/options_tools.inc
index 078f8db..862d85e 100755
--- a/testautomation/framework/tools/includes/options_tools.inc
+++ b/testautomation/framework/tools/includes/options_tools.inc
@@ -37,7 +37,6 @@
'*
'\******************************************************************************
-
sub GetPathList ( ls1 () as String, ls2 () as String, ls3 () as String )
Dim lsInterim ( 50 ) as String
@@ -270,13 +269,13 @@ sub MouseTestForViewOptions
'///mouse test for view options
Kontext "DocumentWriter"
- DocumentWriter.MouseMove 50, 50
- DocumentWriter.OpenContextMenu
- Sleep 1
+ DocumentWriter.MouseMove( 50, 50 )
+ DocumentWriter.OpenContextMenu()
+ Sleep( 1 )
Kontext "DocumentWriter"
DocumentWriter.MouseMove 50, 70
- hMenuClose
+ hMenuClose()
end sub
@@ -372,14 +371,15 @@ end sub
sub modifyColorRGB_PGUP( iColor as Integer )
'The current color's values are set to maximum (255) for RGB
- printlog "modifyColorRGB_PGUP:: - change the color by pressing PAGE UP in RGB listboxes."
+ printlog( "modifyColorRGB_PGUP:: - change the color by pressing PAGE UP in RGB listboxes." )
+
Kontext "TabFarben"
Farbe.Select(iColor)
R.TypeKeys("<PageUp>")
G.TypeKeys("<PageUp>")
B.TypeKeys("<PageUp>")
- printlog("modifyColorRGB_PGUP:: - press 'modify'")
- Aendern.Click
+ printlog("modifyColorRGB_PGUP:: Press 'modify'")
+ Aendern.Click()
Sleep (1)
end sub
@@ -390,7 +390,7 @@ sub createNewColor( aColor() as String )
' OUTPUT:
'The desired color is selected by name and created.
'If it already exists, there is a problem
- printlog( "createNewColor:: - adding a color to the list: '" + aColor(1) + "'"
+ printlog( "createNewColor:: Adding a color to the list: '" + aColor(1) + "'"
Kontext "TabFarben"
FarbName.setText(aColor(1))
R.SetText(aColor(2))
@@ -399,19 +399,20 @@ sub createNewColor( aColor() as String )
Sleep(1)
Hinzufuegen.Click
Sleep(1)
+
Kontext "DuplicateNameWarning"
if DuplicateNameWarning.Exists then
- warnlog "createNewColor:: - Color already exists."
+ warnlog "createNewColor:: Color already exists."
DuplicateNameWarning.OK
Kontext "NameDlg"
if NameDlg.Exists then
- printlog "createNewColor:: - Naming dialog shown. Good, cancelling"
+ printlog "createNewColor:: Naming dialog shown. Good, cancelling"
NameDlg.Cancel
else
- warnlog "createNewColor:: - Naming dialog didn't came up."
+ warnlog "createNewColor:: Naming dialog didn't came up."
end if
else
- printlog "createNewColor:: - New color has been created"
+ printlog "createNewColor:: New color has been created"
end if
end sub
@@ -422,16 +423,18 @@ sub getColorRGB( aColor() as String )
' OUTPUT: array: (1): Name; (2): Red value; (3): Green value; (4): Blue value
'A RGB color always has four attributes:
'The name and the three RGB values (0...255)
- printlog "GetColorRGB:: - determining the current color"
+ printlog( "GetColorRGB:: Determining the current color" )
FarbModell.Select(1)
- aColor(1) = FarbName.GetText
- aColor(2) = R.GetText
- aColor(3) = G.GetText
- aColor(4) = B.GetText
- printlog( "GetColorRGB:: N =" + aColor(1) )
- printlog( "GetColorRGB:: R =" + aColor(2) )
- printlog( "GetColorRGB:: G =" + aColor(3) )
- printlog( "GetColorRGB:: B =" + aColor(4) )
+
+ aColor(1) = FarbName.GetText()
+ aColor(2) = R.GetText()
+ aColor(3) = G.GetText()
+ aColor(4) = B.GetText()
+
+ printlog( "GetColorRGB:: N = " & aColor(1) )
+ printlog( "GetColorRGB:: R = " & aColor(2) )
+ printlog( "GetColorRGB:: G = " & aColor(3) )
+ printlog( "GetColorRGB:: B = " & aColor(4) )
end sub
'*******************************************************************************
@@ -446,13 +449,14 @@ sub compareTwoColorsRGB( aColor() as String )
dim i as Integer
dim bColor(4) as String
- printlog "compareTwoColorsRGB:: - compare saved default color with the current"
+ printlog( "compareTwoColorsRGB:: Compare saved default color with the current" )
call getColorRGB(bColor())
for i = 1 to 4
if aColor(i) <> bColor(i) then
- warnlog "compareTwoColorsRGB:: "+"("+i+") Expected: '" + aColor(i) + "' found: '" + bColor(i) + "'"
+ warnlog( "compareTwoColorsRGB:: " & "(" & i & ") Expected: '" _
+ & aColor( i ) & "' found: '" & bColor(i) & "'" )
else
- printlog "compareTwoColorsRGB:: "+"("+i+") OK"
+ printlog( "compareTwoColorsRGB:: " & "(" & i & ") OK" )
endif
next i
end sub
diff --git a/testautomation/global/tools/includes/optional/t_docfuncs.inc b/testautomation/global/tools/includes/optional/t_docfuncs.inc
index f758657..95df5c7 100755
--- a/testautomation/global/tools/includes/optional/t_docfuncs.inc
+++ b/testautomation/global/tools/includes/optional/t_docfuncs.inc
@@ -37,14 +37,14 @@
'*
'\******************************************************************************
-private const VERBOSE = false
+private const VERBOSE = FALSE
function hUseImpressAutopilot( bEnable as boolean ) as boolean
'///<h3>Enable/disable the Impress Autopilot in Tools/Options</h3>
'///<i>Starting point: Any plain document</i>
'///<ul>
- const CFN = "hUseImpressAutopilot::"
+ const CFN = "global::tools::includes::optional::t_docfuncs.inc::hUseImpressAutopilot::"
if ( VERBOSE ) then printlog( CFN & "Enter" )
@@ -97,7 +97,7 @@ function hCloseNavigator() as boolean
'///<h3>Function to close the navigator</h3>
'///<i>Starting point: Any document</i>
'///<ul>
- const CFN = "hCloseNavigator::"
+ const CFN = "global::tools::includes::optional::t_docfuncs.inc::hCloseNavigator::"
if ( VERBOSE ) then printlog( CFN & "Enter" )
@@ -133,7 +133,7 @@ function hNumericDocType( doctype as integer ) as string
'///<u>Using file: global/input/applications.txt as reference</u>
'///<ul>
- const CFN = "hNumericDocType::"
+ const CFN = "global::tools::includes::optional::t_docfuncs.inc::hNumericDocType::"
dim sFile as string
sFile = gTesttoolPath & "global\input\applications.txt"
@@ -142,7 +142,7 @@ function hNumericDocType( doctype as integer ) as string
dim sList( 100 ) as string
dim iDocTypes as integer
- 'printlog( CFN & "Enter" )
+ if ( VERBOSE ) then printlog( CFN & "Enter" )
'///+<li>Retrieve matching list from file</li>
hGetDataFileSection( sFile , sList() , "application" , "" , "" )
@@ -161,7 +161,7 @@ function hNumericDocType( doctype as integer ) as string
'///+<li>Set a plain text name as returnvalue for the function</li>
hGetDataFileSection( sFile , sList() , "application_names" , "" , "" )
hNumericDocType() = hGetValueForKeyAsString( sList() , gApplication )
- 'printlog( CFN & "Exit" )
+ if ( VERBOSE ) then printlog( CFN & "Exit" )
'///</ul>
end function
@@ -232,7 +232,7 @@ function hIdentifyWriterDoc( cString as string, bWarn as boolean ) as boolean
use "global\tools\includes\optional\t_stringtools.inc"
- const CFN = "hIdentifyWriterDoc::"
+ const CFN = "global::tools::includes::optional::t_docfuncs.inc::hIdentifyWriterDoc::"
dim cIdentifier as string
dim irc as integer ' some temporary returnvalue
@@ -322,7 +322,7 @@ function hCreateDocument() as boolean
'///<ul>
- const CFN = "hCreateDocument::"
+ const CFN = "global::tools::includes::optional::t_docfuncs.inc::hCreateDocument::"
dim iDocCountBefore as integer
dim iDocCountAfter as integer
@@ -385,7 +385,7 @@ function hDocumentTypeKeys( cString as string ) as boolean
'///<u>Description</u>:
'///<ul>
- const CFN = "hDocumentTypeKeys::"
+ const CFN = "global::tools::includes::optional::t_docfuncs.inc::hDocumentTypeKeys::"
dim brc as boolean
brc = true
@@ -428,144 +428,29 @@ end function
function hDestroyDocument() as boolean
-
- '///<h3>Enhanced version of hCloseDoc()</h3>
- '///<i>Close a document and print some additional information to the log to
- '///+ ease debugging tests which handle a lot of documents</i><br><br>
-
- '///<u>Parameter(s):</u><br>
- '///<ol>
- '///+<li>No input parameters</li>
- '///</ol>
-
-
- '///<u>Returns:</u><br>
- '///<ol>
- '///+<li>Return value description</li>
- '///<ul>
- '///+<li>TRUE: The document was closed successfully (-1 open document)</li>
- '///+<li>TRUE: We are on backing window, no document closed</li>
- '///+<li>FALSE: The number of documents is unchanged, closing failed</li>
- '///+<li>FALSE: If any error occurred during close (open dialogs etc.)</li>
- '///</ul>
- '///</ol>
-
- const CFN = "hDestroyDocument::"
- dim brc as boolean 'a multi purpose boolean returnvalue
- dim irc as integer
+ const CFN = "global::tools::includes::optional::t_docfuncs.inc::hDestroyDocument: "
+ dim iDocCount as integer : iDocCount = getDocumentCount()
+ hDestroyDocument() = false
- dim iOpenDocsBefore as integer
- dim iOpenDocsAfter as integer
- dim iAttemptToClose as integer
+ if ( iDocCount = 0 ) then exit function
+ if ( VERBOSE ) then printlog( CFN & "In.: Open: " & iDocCount )
- '///<u>Description:</u>
- '///<ul>
- '///+<li>Get the current number of documents</li>
- iOpenDocsBefore = getDocumentCount
- if ( VERBOSE ) then printlog( CFN & "Open documents before close: " & iOpenDocsBefore )
+ hUseAsyncSlot( "FileClose" )
- '///+<li>Handle special case of 0 open documents</li>
- '///<ul>
- if ( iOpenDocsBefore = 0 ) then
+ Kontext "Active"
+ if ( Active.Exists( 2 ) ) then
+ printlog( "Msgbox: " & Active.getText() )
+ try
+ Active.No
+ catch
+ Active.Click ( 202 )
+ endcatch
+ wait( 1000 )
+ end if
- '///+<li>If gApplication has been set to BACKGROUND explicitly we do a restart</li>
- if ( ucase( gApplication ) = "BACKGROUND" ) then
-
- do while ( getDocumentCount > 0 )
- hCloseDocument()
- loop
-
- iOpenDocsAfter = getDocumentCount
- printlog( CFN & "Open documents after restart: " & iOpenDocsAfter )
-
- if ( iOpenDocsAfter = 0 ) then
- hDestroyDocument() = true
- exit function
- else
- warnlog( CFN & "There should be 0 open documents" )
- hDestroyDocument() = false
- exit function
- endif
-
- '///+<li>Otherwise just do not close the backing window - do nothing</li>
- else
- printlog( CFN & "On backing window, no action taken" )
- hDestroyDocument() = true
- exit function
- endif
-
- endif
- '///</ul>
-
- '///+<li>Handle more than one open document - handle FileOpen/FileSave dialogs</li>
- '///<ul>
- brc = true
- for iAttemptToClose = 1 to 3
-
- '///+<li>FileOpen</li>
- kontext "OeffnenDlg"
- if ( OeffnenDlg.exists( 1 ) ) then
- qaerrorlog( CFN & "Closed FileOpen dialog. This was not expected." )
- OeffnenDlg.cancel()
- brc = false
- endif
-
- '///+<li>FileSave</li>
- kontext "SpeichernDlg"
- if ( SpeichernDlg.exists( 1 ) ) then
- qaerrorlog( CFN & "Closed FileSave dialog. This was not expected." )
- brc = false
- endif
-
- '///+<li>Check for any messagebox (some might still be floating around)</li>
- '///<ul>
- kontext "active"
- if ( active.exists( 1 ) ) then
-
- qaerrorlog( CFN & "Closed unexpected messagebox: " & active.getText() )
-
- '///+<li>Try to close the dialog clicking on "OK"</li>
- try
- active.ok()
- printlog( CFN & "Clicked <OK> to close the dialog" )
- catch
- printlog( CFN & "Failed using OK" )
- endcatch
-
- '///+<li>Try to close the dialog clicking on "YES"</li>
- try
- active.yes()
- printlog( CFN & "Clicked <YES> to close the dialog" )
- catch
- printlog( CFN & "Failed using <YES>" )
- endcatch
-
- brc = false
-
- endif
- '///</ul>
-
- '///+<li>Close the current document using hCloseDocument()</li>
- call hCloseDocument()
-
- '///+<li>Verify that the document has indeed been closed, exit function if yes</li>
- iOpenDocsAfter = getDocumentCount
- if ( iOpenDocsAfter = ( iOpenDocsBefore - 1 ) ) then
- printlog( CFN & "Document closed. Currently open: " & iOpenDocsAfter )
- hDestroyDocument() = brc
- exit function
- else
- qaerrorlog( CFN & "Failed to close document, retrying" )
- brc = false
- endif
-
- next iAttemptToClose
- '///</ul>
- '///</ul>
-
- if ( VERBOSE ) then printlog( CFN & "Exit with result: " & brc )
-
- hDestroyDocument() = brc
+ if ( getDocumentCount() = iDocCount ) then hCloseDocument()
+ if ( getDocumentCount() = iDocCount - 1 ) then hDestroyDocument() = true
+ if ( VERBOSE ) then printlog( CFN & "Out: Open: " & getDocumentCount() )
end function
@@ -593,7 +478,7 @@ function hInitSingleDoc() as boolean
'///</ul>
'///</ol>
- const CFN = "hInitSingleDoc::"
+ const CFN = "global::tools::includes::optional::t_docfuncs.inc::hInitSingleDoc::"
dim cOldApplication as string
'///<u>Description:</u>
@@ -649,7 +534,7 @@ function hInitBackingMode() as boolean
'///</ul>
'///</ol>
- const CFN = "hInitBackingMode::"
+ const CFN = "global::tools::includes::optional::t_docfuncs.inc::hInitBackingMode::"
'///<u>Description:</u>
'///<ul>
@@ -701,7 +586,7 @@ function hInitWriteDocIdentifier( cString as string ) as boolean
'///</ul>
'///</ol>
- const CFN = "hInitWriteDocIdentifier::"
+ const CFN = "global::tools::includes::optional::t_docfuncs.inc::hInitWriteDocIdentifier::"
'///<u>Description:</u>
'///<ul>
diff --git a/testautomation/global/tools/includes/required/t_filters.inc b/testautomation/global/tools/includes/required/t_filters.inc
index 43afe55..174527a 100755
--- a/testautomation/global/tools/includes/required/t_filters.inc
+++ b/testautomation/global/tools/includes/required/t_filters.inc
@@ -247,7 +247,7 @@ function hGetFilternameExtension ( vFilterName as string)
const CFN = "global::tools:includes:required::t_filters.inc::hGetFilternameExtension(): "
- 'Initializize UNO comminication
+ 'Initializize UNO communication
oUno = hGetUNOService( TRUE )
'Using the TypeDetection service
diff --git a/testautomation/global/tools/includes/required/t_tools1.inc b/testautomation/global/tools/includes/required/t_tools1.inc
index 7aa2227..c29a2d1 100755
--- a/testautomation/global/tools/includes/required/t_tools1.inc
+++ b/testautomation/global/tools/includes/required/t_tools1.inc
@@ -41,7 +41,7 @@ private SLEEP_TIME_REQUESTED as integer
private SLEEP_CALLS_SUM as integer
private SLEEP_TIME_USED as integer
-private const VERBOSE = true
+private const VERBOSE = FALSE
function GetClipboardText as string
@@ -240,13 +240,22 @@ end function
function Sleep( optional _iSeconds as integer ) as integer
+ const CFN = "global::tools::includes::required::Sleep(...): "
+
+ const STATUS_NO_DELAY = 0
+ const STATUS_TIMEOUT_EXCEEDED = 1
+ const STATUS_WAITSLOT_CRASHED = 2
+ const STATUS_CLASSIC_WAIT_USED = 3
+
+ ' This is the "classic" behavior of the sleep function. If you did not set
+ ' GLOBAL_USE_NEW_SLEEP to TRUE in your .bas file, this will be used.
if ( not GLOBAL_USE_NEW_SLEEP ) then
if ( IsMissing( _iSeconds ) ) then
wait( 1000 )
else
wait( _iSeconds * 1000 )
endif
- sleep() = 0
+ sleep() = STATUS_CLASSIC_WAIT_USED
exit function
endif
@@ -266,19 +275,17 @@ function Sleep( optional _iSeconds as integer ) as integer
' 2 = Wait() was used (classic method, fallback).
' 3 = Wait() was used (forced old behavior)
- const CFN = "global::tools::includes::required::Sleep(...): "
-
- const STATUS_NO_DELAY = 0
- const STATUS_TIMEOUT_EXCEEDED = 1
- const STATUS_WAITSLOT_CRASHED = 2
- const STATUS_CLASSIC_WAIT_USED = 3
-
dim iMilliseconds as integer
dim iStatus as integer : iStatus = 0
dim lBegin as long : lBegin = GetSystemTicks
dim iSeconds as integer : iSeconds = 5
dim iSystemDelay as integer : iSystemDelay = 1000
dim iTimeDiff as long : iTimeDiff = 0
+
+ ' On Solaris we are a little slower, so we increase the system delay a little
+ if ( instr( lcase( gtSysName ) , "solaris" ) > 0 ) then
+ iSystemDelay = 1500
+ endif
' Override default wait time (5 seconds) if parameter is given
if ( not IsMissing( _iSeconds ) ) then
@@ -314,7 +321,7 @@ function Sleep( optional _iSeconds as integer ) as integer
' Find out how long it took, warn if time was zero (sleep most likely not required)
iTimeDiff = GetSystemTicks - lBegin
if ( iTimeDiff = 0 ) then
- QAErrorLog( CFN & "Zero time. Please consider removing Sleep() statement" )
+ printlog( CFN & "Zero time. Please consider removing Sleep() statement" )
endif
if ( VERBOSE ) then
@@ -333,11 +340,11 @@ function Sleep( optional _iSeconds as integer ) as integer
& iTimeDiff & " ms, rc=" & iStatus )
select case iStatus
case STATUS_TIMEOUT_EXCEEDED :
- QAErrorLog( CFN & "Timeout exceeded. Please increase the delay" )
+ printlog( CFN & "Timeout exceeded." )
case STATUS_WAITSLOT_CRASHED :
- QAErrorlog( CFN & "Used Wait(n). WaitSlot() failed." )
+ printlog( CFN & "Used Wait(n). WaitSlot() failed." )
case STATUS_CLASSIC_WAIT_USED :
- QAErrorLog( CFN & "Used Wait(n). Classic behavior forced" )
+ printlog( CFN & "Used Wait(n). Classic behavior forced" )
end select
endif
Sleep() = iStatus
@@ -1215,6 +1222,7 @@ function hUseAsyncSlot( cSlot as string ) as integer
case "filesaveall" : FileSaveAll( "SynchronMode", TRUE )
case "fileexport" : FileExport
case "filereload" : FileReload( "SynchronMode", TRUE )
+ case "fileopen" : FileOpen
case "editdoc" : EditDoc
case "editcopy" : EditCopy
diff --git a/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc
index f6418e4..fe5ebd5 100755
--- a/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc
@@ -401,6 +401,8 @@ testcase tInsertHyperlink
'/// Open 'Hyperlink' – dialog via 'Insert – Hyperlink'
printlog " Open 'Hyperlink' – dialog via 'Insert – Hyperlink'"
InsertHyperlink
+ WaitSlot( 5000 )
+
Kontext "Hyperlink"
'/// Switch to category 'Internet' (first one)
printlog " Switch to category 'Internet'"
diff --git a/testautomation/writer/required/includes/w_001_.inc b/testautomation/writer/required/includes/w_001_.inc
index 0289414..6be95be 100755
--- a/testautomation/writer/required/includes/w_001_.inc
+++ b/testautomation/writer/required/includes/w_001_.inc
@@ -61,7 +61,7 @@ end sub
testcase tFileNewLabels
-Warnlog "#i102218# - tFileNewLabels outcommented due to bug."
+QAErrorLog "#i102218# - tFileNewLabels outcommented due to bug."
goto endsub
Dim iSheetFormat as integer
@@ -253,7 +253,7 @@ endcase
testcase tFileNewBusinessCards
-Warnlog "#i102218# - tFileNewBusinessCards outcommented due to bug."
+QAErrorLog "#i102218# - tFileNewBusinessCards outcommented due to bug."
goto endsub
Dim iFormat as integer
@@ -944,7 +944,7 @@ testcase tFileSaveWithPassword
PrintLog "File / Save as ..."
- FileSaveAs
+ hUseAsyncSlot( "FileSaveAs" )
Kontext "SpeichernDlg"
if ( SpeichernDlg.exists( 2 ) ) then
commit d7f79a1502da1144173aaa7a739b65f36353ac89
Author: Oliver Bolte <obo at openoffice.org>
Date: Tue Sep 8 08:54:47 2009 +0000
CWS-TOOLING: integrate CWS dba32f
2009-08-31 10:43:51 +0200 msc r275590 : #no issuezilla available# make the testcase more error proof
2009-08-31 10:43:28 +0200 msc r275589 : #no issuezilla available# make the testcase more error proof
2009-08-31 10:40:33 +0200 msc r275588 : i85993 remove bugid
2009-08-31 10:38:28 +0200 msc r275587 : i100000
2009-08-27 13:27:32 +0200 fs r275476 : #i103882#
2009-08-27 12:47:54 +0200 fs r275474 : #i104544#
do not allow re-entrance for impl_ensureControl_nothrow
Actually, this is part of the fix only. I also removed the code which triggered this re-entrance (from
the grid control implementation), but to ensure it won't happen, again, I added some safety herein.
2009-08-27 12:47:16 +0200 fs r275473 : #i104544# SetState: Do not call Update at the window which we just set text for. It should (sic\!) not be needed, but causes trouble
2009-08-27 10:18:05 +0200 mav r275461 : #i103266# do not allow any stream operation on package streams while commiting the package
2009-08-20 15:25:48 +0200 fs r275184 : #i104362# fall back to a ViewObjectContactOfSdrObj in case we don't have a page view
2009-08-20 15:25:06 +0200 fs r275183 : AUGMENT_LIBRARY_PATH
2009-08-20 15:10:34 +0200 fs r275182 : AUGMENT_LIBRARY_PATH
2009-08-20 09:50:36 +0200 oj r275167 : #i104266# notify propertyforward when new dest was created
2009-08-19 08:01:28 +0200 mav r275133 : #i103266# fix the typo
2009-08-18 22:45:34 +0200 fs r275131 : #i10000#
2009-08-18 13:53:07 +0200 oj r275105 : #i104266# set column settings after alter columns
2009-08-18 13:41:49 +0200 fs r275103 : #i102550# do not interpret names of existing data sources as system path
2009-08-18 13:13:05 +0200 oj r275097 : #i103882# use correct number Format
2009-08-18 12:59:13 +0200 fs r275094 : #i104181#
2009-08-18 09:07:48 +0200 fs r275079 : updated readme to refer to proper 1.1.14
2009-08-18 08:32:31 +0200 oj r275077 : #i104187# wrong default for FirstCellAsLabel corrected
2009-08-18 08:10:00 +0200 oj r275076 : #i104187# dispose status controller to avoid access of dead statusBar in sfx
2009-08-17 21:56:19 +0200 fs r275074 : merge fix for issue #102564# from dba32e
2009-08-17 15:34:40 +0200 fs r275058 : don't set MaxFieldSize to 0 unconditionally
2009-08-17 14:33:57 +0200 oj r275054 : #i103528# patch for bitxtor
2009-08-17 14:12:26 +0200 oj r275051 : #i104160# fix VerticalAlignment
2009-08-17 14:11:47 +0200 oj r275050 : #i104160# fix VerticalAlignment
2009-08-14 15:54:04 +0200 mav r274989 : #i103266# avoid possibility for race condition
2009-08-13 13:52:43 +0200 fs r274939 : improved diagnostics
2009-08-13 13:52:28 +0200 fs r274938 : typo
2009-08-13 12:51:03 +0200 fs r274934 : #i103763# provided by cloph: correct libIDL check when compiling Mozilla
2009-08-13 12:43:23 +0200 fs r274933 : #i103763# provided by cloph: allow to cross-compile prebuilt zips on Mac
2009-08-13 12:41:15 +0200 fs r274932 : #i103371# fire PREPARECLOSEDOC even for embedded objects (why not?)
2009-08-13 12:24:49 +0200 fs r274930 : #i99890# remove 'Insert Control' from the popup menu
2009-08-13 12:23:38 +0200 fs r274929 : #i99890# DoToolboxAction: assert unknown/unimplemented actions
2009-08-13 09:32:07 +0200 fs r274923 : #i103721#
2009-08-13 09:26:32 +0200 fs r274922 : #i99894# provided by dtardon: xforms_nowFunction: use proper memory allocation function
2009-08-13 09:20:21 +0200 fs r274921 : #i103938# provided by cmc: pass proper arguments to OUString::intern
2009-08-12 22:34:28 +0200 fs r274916 : #i104139# when executing a PopupMenu, pass the POPUPMENU_NOMOUSEUPCLOSE flag
diff --git a/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc b/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc
index 611778a..7265a53 100755
--- a/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc
@@ -48,9 +48,6 @@ end sub
'--------------------------------------------------------------------------------------
testcase tFromText
- qaerrorlog "#85993# control property dialog could not open"
- goto endsub
-
'/// Open a new document and empty clipboard
printlog "Open a new document and empty clipboard"
call hNewDocument
@@ -163,9 +160,6 @@ endcase
'--------------------------------------------------------------------------------------
testcase tFromCalc
- qaerrorlog "#85993# control property dialog could not open"
- goto endsub
-
'/// Open a new document and empty clipboard
printlog "Open a new document and empty clipboard"
gApplication = "CALC"
@@ -280,9 +274,6 @@ endcase
'--------------------------------------------------------------------------------------
testcase tFromDraw
- qaerrorlog "#85993# control property dialog could not open"
- goto endsub
-
'/// Open a new document and empty clipboard
printlog "Open a new document and empty clipboard"
gApplication = "DRAW"
@@ -396,9 +387,6 @@ endcase
'--------------------------------------------------------------------------------------
testcase tFromImpress
- qaerrorlog "#85993# control property dialog could not open"
- goto endsub
-
'/// Open a new document and empty clipboard
printlog "Open a new document and empty clipboard"
gApplication = "IMPRESS"
diff --git a/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc b/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc
index be1544c..98771d2 100755
--- a/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc
+++ b/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc
@@ -213,14 +213,24 @@ endcase
'-------------------------------------------------------------------------
testcase tMozilla
- call fCreateMozillaAddressbookDatasource(gOfficePath + "user/work/tt_mozilla.odb")
- call fOpendatabase(gOfficePath + "user/work/tt_mozilla.odb")
-
- Kontext "ContainerView"
- ViewTables
-
- call fCloseDatabase(true)
+ if ( fCreateMozillaAddressbookDatasource(gOfficePath + "user/work/tt_mozilla.odb") = true) then
+ if ( fOpendatabase(gOfficePath + "user/work/tt_mozilla.odb") = true) then
+ Kontext "ContainerView"
+ ViewTables
+ else
+ warnlog "mozilla database could not be open."
+ endif
+ else
+ qaerrorlog "mozilla database could not be created. Maybe you have no mozilla installed."
+ Kontext "MessageBox"
+ if (MessageBox.exists(1)) then
+ MessageBox.OK
+ endif
+ endif
+ ' try to close the database
+ call fCloseDatabase(false)
+
endcase
'-------------------------------------------------------------------------
testcase tJDBC
diff --git a/testautomation/dbaccess/tools/dbcreatetools.inc b/testautomation/dbaccess/tools/dbcreatetools.inc
index a138310..f3d5abd 100755
--- a/testautomation/dbaccess/tools/dbcreatetools.inc
+++ b/testautomation/dbaccess/tools/dbcreatetools.inc
@@ -1331,7 +1331,7 @@ function fCreateMozillaAddressbookDatasource(sFileName, optional sRegister) as b
call fClosedatabase(true)
catch
- warnlog "*** Failed *** Data source was not created"
+ qaerrorlog "*** Failed *** Data source was not created"
bOK = false
endcatch
diff --git a/testautomation/global/win/etab_e_g.win b/testautomation/global/win/etab_e_g.win
index 03539cd..1b236be 100755
--- a/testautomation/global/win/etab_e_g.win
+++ b/testautomation/global/win/etab_e_g.win
@@ -256,7 +256,7 @@ DefaultButton HID_PROP_DEFAULT_BUTTON
DefaultSelection HID_PROP_SELECTEDITEMS
DefaultSelection2 HID_PROP_DEFAULT_SELECT_SEQ
DefaultSelectionButton UID_PROP_DLG_SELECTION
-DefaultState HID_PROP_DEFAULT_CHECKED
+DefaultState HID_PROP_DEFAULT_STATE
DefaultSpinValue HID_PROP_DEFAULT_SPINVALUE
'DefaultValue HID_PROP_DEFAULT_LONG_VALUE
DefaultValue HID_PROP_DEFAULTVALUE
commit d0c57ca87cc5f8e15dd8fd75cec9d5812562100d
Author: Oliver Bolte <obo at openoffice.org>
Date: Tue Sep 8 07:19:21 2009 +0000
CWS-TOOLING: integrate CWS jl132
2009-08-31 13:06:06 +0200 jl r275601 : #i104650# increase versions of assemblies
2009-08-31 13:01:07 +0200 jl r275598 : #i104650# increase versions of assemblies
2009-08-31 12:36:40 +0200 jl r275597 : #i104650# new test library for 3.1.1 versions
2009-08-31 10:30:39 +0200 jl r275586 : CWS-TOOLING: rebase CWS jl132 to trunk at 275331 (milestone: DEV300:m56)
diff --git a/testtools/source/cliversioning/version_libs/version_3_1_1.dll b/testtools/source/cliversioning/version_libs/version_3_1_1.dll
new file mode 100644
index 0000000..9ff42fc
Binary files /dev/null and b/testtools/source/cliversioning/version_libs/version_3_1_1.dll differ
More information about the ooo-build-commit
mailing list