[ooo-build-commit] Branch 'ooo/OOO320' - 2 commits - testautomation/extensions testautomation/global testautomation/writer
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Dec 16 22:36:54 PST 2009
testautomation/extensions/optional/includes/extensions.inc | 17
testautomation/extensions/optional/includes/publisher.inc | 80 +-
testautomation/global/tools/includes/required/t_doc1.inc | 1
testautomation/global/tools/includes/required/t_files.inc | 6
testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc | 8
testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc | 344 +++++-----
testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc | 3
testautomation/writer/required/includes/w_005b_.inc | 37 -
testautomation/writer/required/includes/w_020_.inc | 14
testautomation/writer/required/w_updt.bas | 2
testautomation/writer/tools/includes/w_tool1.inc | 11
testautomation/writer/tools/includes/w_tool2.inc | 18
12 files changed, 287 insertions(+), 254 deletions(-)
New commits:
commit a834014ddd91b4b4e8ea8af3f38cf2cd6918812f
Author: Oliver Bolte <obo at openoffice.org>
Date: Mon Dec 14 11:44:06 2009 +0000
CWS-TOOLING: integrate CWS jl146
2009-12-11 15:27:57 +0100 jsk r277793 : jl146: #i107038 - The page is now centered so the workarounds for UNIX(like) OS are no longer required. Fixed one timing issue in a tools library
2009-12-11 14:51:36 +0100 mav r277792 : #i107525# use the system file locking after storing process is over
2009-12-11 08:01:14 +0100 hde r277783 : reverted previous changes
2009-12-11 07:57:16 +0100 hde r277782 : Introduce new sub to change default page layout
2009-12-11 07:54:40 +0100 hde r277781 : Introduce new sub to change default page layout
2009-12-10 14:12:21 +0100 hde r277779 : FIX: initial dialog closed that opened after loading document, close all documents at end of testcase
2009-12-10 13:21:20 +0100 jsk r277778 : jl146: #i107038 - Added call to ViewZoom at the end of hNewDocument() for Writer documents
2009-12-10 13:19:53 +0100 mav r277777 : #i10000# adopt for unix
2009-12-10 11:58:47 +0100 hde r277774 : FIX: selection of tabpage failed
2009-12-10 11:58:16 +0100 mav r277773 : #i107512# let the singleton be registered
2009-12-10 11:28:23 +0100 jsk r277771 : jl146: #i107038 - Reverting changes made for the given issue as it is no longer reproducible in a m7.
2009-12-10 09:43:31 +0100 hde r277770 : FIX: document must'nt be read only, export Filter fixed
2009-12-09 21:51:15 +0100 mav r277769 : #i107525# let the original file be locked with the system file locking
2009-12-09 12:10:48 +0100 er r277763 : #i107501# #i107518# ScRange::Parse_XL_Header: reset external doc name if it was none
2009-12-09 11:54:32 +0100 jsk r277762 : jl149: #i107548 - e_extensions.bas was unable to handle root-installations. Now we identify the installation target directory messagebox (which only pops up if the user has the rights to install into shared layer). Otherwise we skip.
2009-12-09 08:56:16 +0100 jsk r277756 : sb146: #i107548 - Replacing publisher.inc with the version from cws sb111 (which brings dynamic waiting plus extra time for unopkg add to complete)
2009-12-08 15:11:19 +0100 jl r277751 : #i107528# incorrect string conversion of the path of the berkeley db causes the Extension Manager to abort
diff --git a/testautomation/extensions/optional/includes/extensions.inc b/testautomation/extensions/optional/includes/extensions.inc
index d873830..794e1bf 100755
--- a/testautomation/extensions/optional/includes/extensions.inc
+++ b/testautomation/extensions/optional/includes/extensions.inc
@@ -371,11 +371,18 @@ testcase tExtensionsFunction
kontext
if active.exists(5) then
sTemp = active.getText
- try
- active.yes
- catch
- warnlog( "Try...catch: Failed to click Yes-button" )
- endcatch
+ printlog "Messagebox: " + sTemp
+ ' We only want to handle the installation target here which only
+ ' pops up if we have the choice (rights to write to shared layer)
+ if active.getButtonCount = 3 then
+ try
+ active.yes
+ catch
+ warnlog( "Try...catch: Failed to click Yes-button" )
+ endcatch
+ else
+ printlog "No installation target message (this is probably a root-installation)"
+ endif
endif
'/// Progress dialog comes up ///'
diff --git a/testautomation/extensions/optional/includes/publisher.inc b/testautomation/extensions/optional/includes/publisher.inc
index 9af9abb..aa6fe69 100755
--- a/testautomation/extensions/optional/includes/publisher.inc
+++ b/testautomation/extensions/optional/includes/publisher.inc
@@ -56,15 +56,16 @@ testcase tExtensionPublisher
cBasePath = convertpath( cBasePath )
' Modify this file to add test cases or attributes
- dim cInfoFile as string
- cinfoFile = cBasePath & "extension.info"
+ dim cInfoFile as string : cinfoFile = cBasePath & "extension.info"
' The number of files to test. Information about this is stored in the file
' specified by cInfoFile
dim iFileCount as integer
dim iCurrentFile as integer
- dim iExitCounter as integer
dim iExtensionCount as integer
+ dim iExitCounter as integer
+ dim iCurrentExtensionCount as integer : iCurrentExtensionCount = 0
+ dim iTry as integer
' This is the data we get from the configuration file
dim cCurrentFileName as string
@@ -78,6 +79,7 @@ testcase tExtensionPublisher
dim cConfigArray( 60 ) as string
dim cTestString as string
+ dim bInstallationComplete as boolean : bInstallationComplete = false
iExtensionCount = hGetExtensionCount()
@@ -85,6 +87,9 @@ testcase tExtensionPublisher
hGetDataFileSection( cInfoFile, cConfigArray(), "info", "", "" )
iFileCount = int( hGetValueForKeyAsString( cConfigArray() , "filecount" ) )
printlog( cInfoFile & " specifies " & iFileCount & " documents to load" )
+
+ iExtensionCount = iExtensionCount + iFileCount
+ printlog( "Expected number of extensions after installation: " & iExtensionCount )
printlog( "Installing extensions" )
for iCurrentFile = 1 to iFileCount
@@ -93,41 +98,51 @@ testcase tExtensionPublisher
cCurrentFileName = hGetValueForKeyAsString( cConfigArray() , "file" )
cCurrentFileName = cBasePath & cCurrentFileName
sExtensionCLI( "add" , cCurrentFileName )
- WaitSlot( 5000 )
+ wait 1000 ' This is required, sExtensionCLI is asynchronous.
next iCurrentFile
- printlog( "Finished installing extensions" )
-
+ printlog( "Finished installing extensions, now verifying..." )
+
+ hNewDocument()
+ ToolsPackageManager
+
kontext "PackageManager"
- if ( not PackageManager.exists() ) then
- ToolsPackageManager
- kontext "PackageManager"
- if ( PackageManager.exists( 2 ) ) then
- printlog( "Extension Manager UI has been opened" )
- else
- warnlog( "Failed to open Extension Manager UI" )
+ if ( PackageManager.exists( 3 ) ) then
+
+ for iTry = 1 to 30
+
+ iCurrentExtensionCount = BrowsePackages.getItemCount()
+
+ if ( iCurrentExtensionCount = iExtensionCount ) then
+ printlog( "All extensions have been installed, good." )
+ bInstallationComplete = true
+ exit for
+ endif
+
+ printlog( "Waiting for listbox: Number of extensions: " & iCurrentExtensionCount )
+
+ next iTry
+
+ ' If one or more extensions have not been added to the list we better abort the
+ ' test as the remaining parts need all extensions to be installed causing
+ ' lots of cryptig errors to appear in the log.
+ if ( not bInstallationComplete ) then
+ warnlog( "Not all extensions have been installed. Aborting test." )
+ kontext "PackageManager"
+ if ( PackageManager.exists() ) then
+ PackageManager.cancel()
+ PackageManager.notExists( 2 )
+ endif
goto endsub
endif
else
- warnlog( "#i84786# Unopkg processes block UI" )
+ warnlog( "The Extension Manager did not open, Aborting test" )
goto endsub
endif
+
- iExitCounter = 0
- kontext "PackageManager"
- WaitSlot()
- do while ( BrowsePackages.getItemCount() < ( iExtensionCount + iFileCount ) )
- printlog( "Waiting for Extensions List to populate..." )
- Wait( 1000 )
- iExitCounter = iExitCounter + 1
- if ( iExitCounter = 30 ) then
- kontext "PackageManager"
- PackageManager.cancel()
- goto endsub
- endif
- loop
-
kontext "PackageManager"
+ printlog( "Going for the update-dialog" )
if ( Updates.isEnabled() ) then
printlog( "Updates-button is enabled" )
@@ -142,11 +157,14 @@ testcase tExtensionPublisher
wait( 1000 )
iExitCounter = iExitCounter + 1
if ( iExitCounter = 200 ) then
- warnlog( "Update list for extensions is stalled (expected: 7), found: " & AvailableUpdatesList.getItemCount() )
+ warnlog( "Update list for extensions is stalled (expected: 7), " & _
+ "found: " & AvailableUpdatesList.getItemCount() )
kontext "ExtensionUpdate"
ExtensionUpdate.cancel()
+ ExtensionUpdate.notExists( 2 )
kontext "PackageManager"
PackageManager.cancel()
+ PackageManager.notExists( 2 )
goto endsub
endif
loop
@@ -246,6 +264,7 @@ testcase tExtensionPublisher
kontext "ExtensionUpdate"
ExtensionUpdate.cancel()
+ ExtensionUpdate.notExists( 2 )
else
warnlog( "Extension Update dialog is not open" )
endif
@@ -256,6 +275,7 @@ testcase tExtensionPublisher
kontext "PackageManager"
PackageManager.close()
+ PackageManager.notExists( 2 )
printlog( "Removing extensions" )
for iCurrentFile = 1 to iFileCount
@@ -264,6 +284,8 @@ testcase tExtensionPublisher
sExtensionCLI( "remove" , cCurrentFileName )
next iCurrentFile
printlog( "Finished removing extensions" )
+
+ hFileCloseAll()
endcase
diff --git a/testautomation/global/tools/includes/required/t_doc1.inc b/testautomation/global/tools/includes/required/t_doc1.inc
index f1bc0f5..e85c321 100755
--- a/testautomation/global/tools/includes/required/t_doc1.inc
+++ b/testautomation/global/tools/includes/required/t_doc1.inc
@@ -189,6 +189,7 @@ sub hNewDocument ( optional bANewDoc )
case else : WarnLog "hNewDocument: No Applikation named '" + gApplication + "' exists in this routine!"
end select
Sleep 2
+
end sub
'
'-------------------------------------------------------------------------------
diff --git a/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc b/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc
index 1112d4b..3f7d55c 100755
--- a/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc
+++ b/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc
@@ -1032,6 +1032,10 @@ testcase tDropDownLB_17
PrintLog "- Open a word document which includes 2 entries."
Call hFileOpen(sTestFile)
Call sMakeReadOnlyDocumentEditable
+
+ Kontext "EditInputList"
+ if EditInputList.Exists then EditInputList.Cancel
+
PrintLog "- Set focus in front of first line."
Call wTypeKeys "<MOD1 Home>"
PrintLog "- Edit/Fields."
@@ -1085,7 +1089,9 @@ testcase tDropDownLB_17
FeldbefehlBearbeitenFunktionen.Cancel
- Call hCloseDocument ' <- close word document
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc
index 3c0595b..d6eefca 100755
--- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc
+++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic2.inc
@@ -631,116 +631,116 @@ endcase
testcase tInsertGraphic_18
- Dim sGraphicName1 as String
- Dim sGraphicName2 as String
- Dim sGraphicName3 as String
- Dim sWidth as String
- Dim sHeight as String
-
- sGraphicName1 = "TEST1"
- sGraphicName2 = "TEST2"
- sGraphicName3 = "TEST3"
-
- sWidth = "7"+ gSeperator + "00" + gMeasurementUnit
- sHeight = "6"+ gSeperator + "00" + gMeasurementUnit
+ Dim sGraphicName1 as String
+ Dim sGraphicName2 as String
+ Dim sGraphicName3 as String
+ Dim sWidth as String
+ Dim sHeight as String
- PrintLog "- Test Set different attributes via Contextmenu Arrange (send backward)"
- '/// Test Set different attributes via Contextmenu Arrange (send backward)
+ sGraphicName1 = "TEST1"
+ sGraphicName2 = "TEST2"
+ sGraphicName3 = "TEST3"
- Call hNewDocument
+ sWidth = "7"+ gSeperator + "00" + gMeasurementUnit
+ sHeight = "6"+ gSeperator + "00" + gMeasurementUnit
- Call wTypeKeys "<Return>"
+ PrintLog "- Test Set different attributes via Contextmenu Arrange (send backward)"
+ '/// Test Set different attributes via Contextmenu Arrange (send backward)
- '/// Insert three Graphics at the same place , and named in series
+ Call hNewDocument
- 'the 1st graphic
- fInsertGraphics("Bughunter.jpg")
+ Call wTypeKeys "<Return>"
- fFormatGraphic("TabZusaetze")
- Sleep 1
- ObjektName.SetText sGraphicName1
- TabZusaetze.OK
+ '/// Insert three Graphics at the same place , and named in series
- fFormatGraphic("TabType")
- KeepRatio.UnCheck
- Sleep 1
- Width.SetText sWidth
- wait 500
- Height.SetText sHeight
- wait 500
- TabType.OK
+ 'the 1st graphic
+ fInsertGraphics("Bughunter.jpg")
- Call wTypeKeys "<ESCape>"
+ fFormatGraphic("TabZusaetze")
+ Sleep 1
+ ObjektName.SetText sGraphicName1
+ Kontext
+ Active.Setpage TabType
+ Kontext "TabType"
+ KeepRatio.UnCheck
+ Sleep 1
+ Width.SetText sWidth
+ wait 500
+ Height.SetText sHeight
+ wait 500
+ TabType.OK
- 'the 2nd graphic
- fInsertGraphics("flowers.gif")
+ Call wTypeKeys "<ESCape>"
- fFormatGraphic("TabZusaetze")
- Sleep 1
- ObjektName.SetText sGraphicName2
- TabZusaetze.OK
+ 'the 2nd graphic
+ fInsertGraphics("flowers.gif")
- fFormatGraphic("TabType")
- KeepRatio.UnCheck
- Sleep 1
- Width.SetText sWidth
- wait 500
- Height.SetText sHeight
- wait 500
- TabType.OK
+ fFormatGraphic("TabZusaetze")
+ Sleep 1
+ ObjektName.SetText sGraphicName2
+ TabZusaetze.OK
- Call wTypeKeys "<ESCape>"
+ fFormatGraphic("TabType")
+ KeepRatio.UnCheck
+ Sleep 1
+ Width.SetText sWidth
+ wait 500
+ Height.SetText sHeight
+ wait 500
+ TabType.OK
- 'the 3rd graphic
- fInsertGraphics("game.bmp")
+ Call wTypeKeys "<ESCape>"
- fFormatGraphic("TabZusaetze")
- Sleep 1
- ObjektName.SetText sGraphicName3
- TabZusaetze.OK
+ 'the 3rd graphic
+ fInsertGraphics("game.bmp")
- fFormatGraphic("TabType")
- KeepRatio.UnCheck
- Sleep 1
- Width.SetText sWidth
- wait 500
- Height.SetText sHeight
- wait 500
- TabType.OK
+ fFormatGraphic("TabZusaetze")
+ Sleep 1
+ ObjektName.SetText sGraphicName3
+ TabZusaetze.OK
- '/// ContextMenu Arrange / Send backward
- Call wOpenContextMenu
+ fFormatGraphic("TabType")
+ KeepRatio.UnCheck
+ Sleep 1
+ Width.SetText sWidth
+ wait 500
+ Height.SetText sHeight
+ wait 500
+ TabType.OK
+
+ '/// ContextMenu Arrange / Send backward
+ Call wOpenContextMenu
hMenuSelectNr(1)
Sleep 2
hMenuSelectNr(3)
Sleep 1
- Call wTypeKeys "<ESCape>"
- Sleep 1
+ Call wTypeKeys "<ESCape>"
+ Sleep 1
- '/// Check if the attributes Arrange (send to back) works well
- Call wNavigatorAuswahl(4,1)
- Sleep 1
- fFormatGraphic("TabZusaetze")
- Sleep 1
- if ObjektName.GetText <> sGraphicName1 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName1 + " but get " +ObjektName.GetText
- TabZusaetze.Cancel
+ '/// Check if the attributes Arrange (send to back) works well
+ Call wNavigatorAuswahl(4,1)
+ Sleep 1
+ fFormatGraphic("TabZusaetze")
+ Sleep 1
+ if ObjektName.GetText <> sGraphicName1 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName1 + " but get " +ObjektName.GetText
+ TabZusaetze.Cancel
- Call wNavigatorAuswahl(4,2)
- Sleep 1
- fFormatGraphic("TabZusaetze")
- Sleep 1
- if ObjektName.GetText <> sGraphicName2 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName2 + " but get " +ObjektName.GetText
- TabZusaetze.Cancel
+ Call wNavigatorAuswahl(4,2)
+ Sleep 1
+ fFormatGraphic("TabZusaetze")
+ Sleep 1
+ if ObjektName.GetText <> sGraphicName2 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName2 + " but get " +ObjektName.GetText
+ TabZusaetze.Cancel
- Call wNavigatorAuswahl(4,3)
- Sleep 1
- fFormatGraphic("TabZusaetze")
- Sleep 1
- if ObjektName.GetText <> sGraphicName3 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName3 + " but get " +ObjektName.GetText
- TabZusaetze.Cancel
+ Call wNavigatorAuswahl(4,3)
+ Sleep 1
+ fFormatGraphic("TabZusaetze")
+ Sleep 1
+ if ObjektName.GetText <> sGraphicName3 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName3 + " but get " +ObjektName.GetText
+ TabZusaetze.Cancel
- Call hCloseDocument
+ Call hCloseDocument
endcase
@@ -748,120 +748,122 @@ endcase
testcase tInsertGraphic_19
- Dim sGraphicName1 as String
- Dim sGraphicName2 as String
- Dim sGraphicName3 as String
- Dim sWidth as String
- Dim sHeight as String
+ Dim sGraphicName1 as String
+ Dim sGraphicName2 as String
+ Dim sGraphicName3 as String
+ Dim sWidth as String
+ Dim sHeight as String
- sGraphicName1 = "TEST1"
- sGraphicName2 = "TEST2"
- sGraphicName3 = "TEST3"
+ sGraphicName1 = "TEST1"
+ sGraphicName2 = "TEST2"
+ sGraphicName3 = "TEST3"
- sWidth = "7"+ gSeperator + "00" + gMeasurementUnit
- sHeight = "6"+ gSeperator + "00" + gMeasurementUnit
+ sWidth = "7"+ gSeperator + "00" + gMeasurementUnit
+ sHeight = "6"+ gSeperator + "00" + gMeasurementUnit
- PrintLog "- Test Set different attributes via Contextmenu Arrange (bring to front)"
- '/// Test Set different attributes via Contextmenu Arrange (bring to front)
+ PrintLog "- Test Set different attributes via Contextmenu Arrange (bring to front)"
+ '/// Test Set different attributes via Contextmenu Arrange (bring to front)
- Call hNewDocument
+ Call hNewDocument
- Call wTypeKeys "<Return>"
+ Call wTypeKeys "<Return>"
- '/// Insert three Graphics at the same place , and named in series
+ '/// Insert three Graphics at the same place , and named in series
- 'the 1st graphic
- fInsertGraphics("Bughunter.jpg")
+ 'the 1st graphic
+ fInsertGraphics("Bughunter.jpg")
- fFormatGraphic("TabZusaetze")
- Sleep 1
- ObjektName.SetText sGraphicName1
- TabZusaetze.OK
+ fFormatGraphic("TabZusaetze")
+ Sleep 1
+ ObjektName.SetText sGraphicName1
- fFormatGraphic("TabType")
- KeepRatio.UnCheck
- Sleep 1
- Width.SetText sWidth
- wait 500
- Height.SetText sHeight
- wait 500
- TabType.OK
+ Kontext
+ Active.Setpage TabType
+ Kontext "TabType"
- Call wTypeKeys "<ESCape>"
+ KeepRatio.UnCheck
+ Sleep 1
+ Width.SetText sWidth
+ wait 500
+ Height.SetText sHeight
+ wait 500
+ TabType.OK
- 'the 2nd graphic
- fInsertGraphics("flowers.gif")
+ Call wTypeKeys "<ESCape>"
- fFormatGraphic("TabZusaetze")
- Sleep 1
- ObjektName.SetText sGraphicName2
- TabZusaetze.OK
+ 'the 2nd graphic
+ fInsertGraphics("flowers.gif")
- fFormatGraphic("TabType")
- KeepRatio.UnCheck
- Sleep 1
- Width.SetText sWidth
- wait 500
- Height.SetText sHeight
- wait 500
- TabType.OK
+ fFormatGraphic("TabZusaetze")
+ Sleep 1
+ ObjektName.SetText sGraphicName2
+ TabZusaetze.OK
- Call wTypeKeys "<ESCape>"
+ fFormatGraphic("TabType")
+ KeepRatio.UnCheck
+ Sleep 1
+ Width.SetText sWidth
+ wait 500
+ Height.SetText sHeight
+ wait 500
+ TabType.OK
- 'the 3rd graphic
- fInsertGraphics("game.bmp")
+ Call wTypeKeys "<ESCape>"
- fFormatGraphic("TabZusaetze")
- Sleep 1
- ObjektName.SetText sGraphicName3
- TabZusaetze.OK
+ 'the 3rd graphic
+ fInsertGraphics("game.bmp")
- fFormatGraphic("TabType")
- KeepRatio.UnCheck
- Sleep 1
- Width.SetText sWidth
- wait 500
- Height.SetText sHeight
- wait 500
- TabType.OK
+ fFormatGraphic("TabZusaetze")
+ Sleep 1
+ ObjektName.SetText sGraphicName3
+ TabZusaetze.OK
- '/// Format / Arrange / Send to back
- FormatArrangeSendToBack
- Sleep 2
+ fFormatGraphic("TabType")
+ KeepRatio.UnCheck
+ Sleep 1
+ Width.SetText sWidth
+ wait 500
+ Height.SetText sHeight
+ wait 500
+ TabType.OK
+
+ '/// Format / Arrange / Send to back
+ FormatArrangeSendToBack
+ Sleep 2
- '/// ContextMenu Arrange / bring to front
- Call wOpenContextMenu
+ '/// ContextMenu Arrange / bring to front
+ Call wOpenContextMenu
hMenuSelectNr(1)
Sleep 2
hMenuSelectNr(1)
Sleep 1
- Call wTypeKeys "<ESCape>"
- Sleep 1
+ Call wTypeKeys "<ESCape>"
+ Sleep 1
- '/// Check if the attributes Arrange (send to back) works well
- Call wNavigatorAuswahl(4,1)
- Sleep 1
- fFormatGraphic("TabZusaetze")
- Sleep 1
- if ObjektName.GetText <> sGraphicName1 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName1 + " but get " +ObjektName.GetText
- TabZusaetze.Cancel
+ '/// Check if the attributes Arrange (send to back) works well
+ Call wNavigatorAuswahl(4,1)
+ Sleep 1
+ fFormatGraphic("TabZusaetze")
+ Sleep 1
+ if ObjektName.GetText <> sGraphicName1 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName1 + " but get " +ObjektName.GetText
+ TabZusaetze.Cancel
- Call wNavigatorAuswahl(4,2)
- Sleep 1
- fFormatGraphic("TabZusaetze")
- Sleep 1
- if ObjektName.GetText <> sGraphicName2 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName2 + " but get " +ObjektName.GetText
- TabZusaetze.Cancel
+ Call wNavigatorAuswahl(4,2)
+ Sleep 1
+ fFormatGraphic("TabZusaetze")
+ Sleep 1
+ if ObjektName.GetText <> sGraphicName2 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName2 + " but get " +ObjektName.GetText
+ TabZusaetze.Cancel
- Call wNavigatorAuswahl(4,3)
- Sleep 1
- fFormatGraphic("TabZusaetze")
- Sleep 1
- if ObjektName.GetText <> sGraphicName3 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName3 + " but get " +ObjektName.GetText
- TabZusaetze.Cancel
+ Call wNavigatorAuswahl(4,3)
+ Sleep 1
+ fFormatGraphic("TabZusaetze")
+ Sleep 1
+ if ObjektName.GetText <> sGraphicName3 then Warnlog "The graphic's name is not correct ,should be "+sGraphicName3 + " but get " +ObjektName.GetText
+ TabZusaetze.Cancel
- Call hCloseDocument
+ Call hCloseDocument
endcase
diff --git a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc
index 9a7c142..d7f96d0 100755
--- a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc
+++ b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc
@@ -451,6 +451,7 @@ testcase i103265
Call hNewDocument
printlog "- Open test document"
Call hFileOpen ( gTesttoolPath + "writer\optional\input\regression\issuezilla\i103265.odt" )
+ Call sMakeReadOnlyDocumentEditable
printlog "- Update TOC"
ToolsUpdateAllIndexes
@@ -483,7 +484,7 @@ testcase i103265
printlog "- Save as HTML"
gApplication = "HTML"
- Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\ODFHyperlinksInTOCs.html", "HTML" )
+ Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\ODFHyperlinksInTOCs.html", "HTML (StarWriter)" )
Call hCloseDocument
printlog "- Reload"
diff --git a/testautomation/writer/required/includes/w_005b_.inc b/testautomation/writer/required/includes/w_005b_.inc
index 0e4f8ea..ce7ce26 100755
--- a/testautomation/writer/required/includes/w_005b_.inc
+++ b/testautomation/writer/required/includes/w_005b_.inc
@@ -892,16 +892,9 @@ testcase tFormatAlignmentArea
Call hNewDocument
printlog " Paste a rectangle from draw via clipboard"
- if gPlatgroup = "unx" then
- Call wZeichenobjektEinfuegen ( "Rechteck", 10, 30, 20, 45 )
- sleep (1)
- gMouseClick ( 15, 38 )
- else
- Call wZeichenobjektEinfuegen ( "Rechteck", 45, 30, 55, 45 )
- sleep (1)
- Call wObjektSelektieren ( 43, 25, 60, 50 )
- endif
-
+ Call wZeichenobjektEinfuegen ( "Rechteck", 45, 30, 55, 45 )
+ sleep (1)
+ Call wObjektSelektieren ( 43, 25, 60, 50 )
Sleep 1
try
printlog " Format / Anchor / As Character"
@@ -1158,11 +1151,7 @@ testcase tFormatStyleEdit
printlog " Insert a textobject from toolbar"
Sleep 2
- if gPlatgroup = "unx" then
- Call gMouseMove(10, 20, 30, 40)
- else
- Call gMouseMove(50, 20, 70, 40)
- endif
+ Call gMouseMove(50, 20, 70, 40)
hUseAsyncSlot( "FormatStyleBold" )
printlog " Format / Style / Bold"
@@ -1231,11 +1220,7 @@ testcase tFormatAlignmentEdit
Textobjekt.Click
printlog " Insert a textbox via 'Draw functions' toolbar"
- if gPlatgroup = "unx" then
- Call gMouseMove(10, 20, 30, 40)
- else
- Call gMouseMove(50, 20, 70, 40)
- endif
+ Call gMouseMove(50, 20, 70, 40)
printlog " Insert some text in document"
Call wTypeKeys ("Ein Wort")
@@ -1274,11 +1259,7 @@ testcase tFormatLineSpacing
Textobjekt.Click
printlog " In a textbox via 'Draw Functions' toolbox"
- if gPlatgroup = "unx" then
- Call gMouseMove(10, 20, 30, 40)
- else
- Call gMouseMove(50, 20, 70, 40)
- endif
+ Call gMouseMove(50, 20, 70, 40)
Sleep 1
printlog " Format / Spacing / Single line"
@@ -1319,11 +1300,7 @@ testcase tFormatParagraphEdit
Textobjekt.Click
printlog " In a textbox via 'Draw Functions' toolbox"
- if gPlatgroup = "unx" then
- Call gMouseMove(10, 20, 30, 40)
- else
- Call gMouseMove(50, 20, 70, 40)
- endif
+ Call gMouseMove(50, 20, 70, 40)
printlog " Format / Paragraph "
hUseAsyncSlot( "FormatParagraph" )
diff --git a/testautomation/writer/required/includes/w_020_.inc b/testautomation/writer/required/includes/w_020_.inc
index 05d1168..df888de 100755
--- a/testautomation/writer/required/includes/w_020_.inc
+++ b/testautomation/writer/required/includes/w_020_.inc
@@ -417,15 +417,11 @@ testcase t_TB_Form
Call sMenufunktionen("-Checkbox-")
Kontext "FormControls"
- if Ucase(gApplication) <> "HTML" then
+ if gApplication <> "HTML" then
wait 500
Label.Click
printlog " Insert a textbox from toolbox"
- if gplatgroup = "unx" then
- Call hMalZeichnenMitSelektion ( 10, 40, 21, 25 )
- else
- Call hMalZeichnenMitSelektion ( 57, 20, 68, 25 )
- endif
+ Call hMalZeichnenMitSelektion ( 57, 20, 68, 25 )
printlog "+ Open Control Properties"
Call sMenufunktionen("-Textbox-")
end if
@@ -454,11 +450,7 @@ testcase t_TB_Form
Combobox.Click
printlog " Insert a Combobox from toolbox"
Wait 500
- if gPlatgroup = "unx" then
- Call hMalZeichnenMitSelektion ( 41, 40, 52, 35 )
- else
- Call hMalZeichnenMitSelektion ( 57, 30, 68, 35 )
- endif
+ Call hMalZeichnenMitSelektion ( 57, 30, 68, 35 )
printlog "+ Step through pages of upcoming Autopilot"
Call sAutopilot_ListboxCombobox("Combo")
printlog "+ Open Control Properties"
diff --git a/testautomation/writer/required/w_updt.bas b/testautomation/writer/required/w_updt.bas
index 77c8d53..992a4cc 100755
--- a/testautomation/writer/required/w_updt.bas
+++ b/testautomation/writer/required/w_updt.bas
@@ -61,6 +61,8 @@ sub main
Printlog "******* Ressource-Test Writer Document *******"
+ Call wChangeDefaultView()
+
Call hStatusIn ( "writer", "w_updt.bas" )
Call w_001_ ' Menu File
Call w_001a_ ' Menu File
diff --git a/testautomation/writer/tools/includes/w_tool1.inc b/testautomation/writer/tools/includes/w_tool1.inc
index 19ef41a..4515c86 100755
--- a/testautomation/writer/tools/includes/w_tool1.inc
+++ b/testautomation/writer/tools/includes/w_tool1.inc
@@ -343,17 +343,20 @@ sub sMenufunktionen(Fuer_Was as string)
Kontext
try
- FormatControl
- Sleep 1
+ FormatControl
+ WaitSlot()
+
Kontext "ControlPropertiesDialog"
- if ControlPropertiesDialog.Exists then
+ if ControlPropertiesDialog.Exists( 2 ) then
ControlPropertiesDialog.Close
+ ControlPropertiesDialog.notExists( 2 )
else
FormatControl
Wait 500
Kontext "ControlPropertiesDialog"
- if ControlPropertiesDialog.Exists then
+ if ControlPropertiesDialog.Exists( 2 ) then
ControlPropertiesDialog.Close
+ ControlPropertiesDialog.notExists( 2 )
else
Warnlog " - Controlfieldproperties "+ Fuer_Was +" from Menu not available!"
end if
diff --git a/testautomation/writer/tools/includes/w_tool2.inc b/testautomation/writer/tools/includes/w_tool2.inc
index 280d18b..a68a5ee 100755
--- a/testautomation/writer/tools/includes/w_tool2.inc
+++ b/testautomation/writer/tools/includes/w_tool2.inc
@@ -409,3 +409,21 @@ function wDeleteAutotext(vAutotextName as string) as boolean
next ik
end function
+
+
+sub wChangeDefaultView()
+
+ ' #i107038: This code forces the writer to display one page only which is
+ ' zoomed to pagewidth, filling the entire - previously maximized - window.
+ ' This is required because the VCL Testtool might eventually draw objects
+ ' outside the document window depending on display size
+
+ Call hNewDocument
+ ViewZoom
+ Kontext "Massstab"
+ Vergroesserung100.check
+ Singlepage.check
+ Massstab.Ok
+ Call hCloseDocument
+
+end sub
\ No newline at end of file
commit 30dca234f12c38ccb6d776fd2e7953b3d94a038f
Author: Oliver Bolte <obo at openoffice.org>
Date: Mon Dec 14 11:14:52 2009 +0000
CWS-TOOLING: integrate CWS fwk132
2009-12-12 22:36:36 +0100 mav r277797 : #i107638# in some case no transfer is expected
2009-12-12 20:38:55 +0100 jsk r277796 : fwk132: <no issue> Found coding error, corrected
2009-12-12 02:22:18 +0100 mav r277795 : #i104974# workaround linux smb-client problem, be ready for errors while using mmap
2009-12-12 01:46:25 +0100 mav r277794 : #i104974# workaround impossibility to copy opened file
diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc
index db3205e..ffcc0d4 100755
--- a/testautomation/global/tools/includes/required/t_files.inc
+++ b/testautomation/global/tools/includes/required/t_files.inc
@@ -64,7 +64,7 @@ function hGrafikEinfuegen ( Grafik$ ) as Boolean
if ( GrafikEinfuegenDlg.exists( 2 ) ) then
Vorschau.Uncheck
- if gApplication <> "HTML" AND gApplication <> "HTML" then
+ if gApplication <> "HTML" then
Verknuepfen.UnCheck
end if
@@ -87,13 +87,15 @@ function hGrafikEinfuegen ( Grafik$ ) as Boolean
Kontext "GrafikEinfuegenDlg"
if GrafikEinfuegenDlg.Exists then
GrafikEinfuegenDlg.Cancel
+ GarfikEinfuegenDlg.notExists( 4 )
endif
else
hGrafikEinfuegen = IsImageLoaded
end if
else
- 'GrafikEinfuegeDlg not open
+ warnlog( "Insert graphics dialog not open" )
endif
+
end function
'
'-------------------------------------------------------------------------------
More information about the ooo-build-commit
mailing list