summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsmoketestoo_native/smoketest.pl18
-rwxr-xr-xtestautomation/framework/optional/includes/basic_package_export.inc209
-rwxr-xr-xtestautomation/framework/optional/includes/extras_file_open.inc67
-rwxr-xr-xtestautomation/framework/optional/includes/filedlg_autocomplete.inc56
-rwxr-xr-xtestautomation/framework/optional/includes/filedlg_cjk_files.inc30
-rwxr-xr-xtestautomation/framework/optional/includes/filedlg_filternames.inc10
-rwxr-xr-xtestautomation/framework/optional/includes/filedlg_multiselection.inc3
-rwxr-xr-xtestautomation/framework/optional/includes/filedlg_reserved_names_unix.inc4
-rwxr-xr-xtestautomation/framework/optional/includes/security_macrosecurity.inc17
-rwxr-xr-xtestautomation/framework/tools/includes/fileoperations.inc53
-rwxr-xr-xtestautomation/graphics/optional/g_insert.bas2
-rwxr-xr-xtestautomation/graphics/optional/includes/global/export_graphic_2.inc23
-rwxr-xr-xtestautomation/graphics/optional/includes/global/g_insert.inc54
-rwxr-xr-xtestautomation/graphics/optional/includes/global/g_spellcheck.inc12
-rwxr-xr-xtestautomation/graphics/optional/includes/global/g_tables.inc8
-rwxr-xr-xtestautomation/graphics/optional/includes/global/g_tools.inc2
-rwxr-xr-xtestautomation/graphics/optional/includes/impress/i_us_present.inc7
-rwxr-xr-xtestautomation/writer/optional/includes/clipboard/w_216_.inc42
-rwxr-xr-xtestautomation/writer/optional/includes/formatcharacter/w_format_character1.inc146
-rwxr-xr-xtestautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc106
-rwxr-xr-xtestautomation/writer/optional/includes/navigator/w_navigator.inc2
-rwxr-xr-xtestautomation/writer/optional/includes/undo/w_undo_history_3.inc23
-rwxr-xr-xtestautomation/writer/required/includes/w_004_.inc12
-rw-r--r--testautomation/writer/tools/includes/w_tools_undo.inc8
-rwxr-xr-xtestautomation/xml/optional/includes/f_xml_save_ms_ole.inc2
-rw-r--r--testshl2/source/dynamicregister.cxx6
-rw-r--r--testshl2/source/terminate.cxx8
27 files changed, 465 insertions, 465 deletions
diff --git a/smoketestoo_native/smoketest.pl b/smoketestoo_native/smoketest.pl
index 8ee0b9efcf44..91f6ed681fc1 100755
--- a/smoketestoo_native/smoketest.pl
+++ b/smoketestoo_native/smoketest.pl
@@ -42,6 +42,7 @@ use File::Basename;
use File::Path;
use File::Copy;
use Getopt::Long;
+use SourceConfig;
########################
# #
@@ -57,6 +58,7 @@ $is_do_deinstall = 0;
$is_without_msiexec = 1;
$is_oo = 1;
+$sourceconfig_obj;
$gui = $ENV{GUI};
$temp_path = $ENV{TEMP};
$vcsid = $ENV{VCSID};
@@ -860,12 +862,22 @@ sub getInstset {
foreach $project (@install_list) {
@DirArray=();
$TestDir1 = "$RootDir$project$PathSeparator$ENV{INPATH}$PathSeparator$PRODUCT$PathSeparator$packpackage$PathSeparator" . "install$PathSeparator";
- $TestDir2 = "$StandDir$project$PathSeparator$ENV{INPATH}$PathSeparator$PRODUCT$PathSeparator$packpackage$PathSeparator" . "install$PathSeparator";
if (-e "$TestDir1") {
$InstDir= $TestDir1;
}
- elsif (-e "$TestDir2") {
- $InstDir="$TestDir2";
+ else {
+ $sourceconfig_obj = SourceConfig->new() if (!defined ($sourceconfig_obj));
+ my $module_path = $sourceconfig_obj->get_module_path($project);
+ # only if module exists
+ if (defined ($module_path)) {
+ $TestDir2 = "$module_path$PathSeparator$ENV{INPATH}$PathSeparator$PRODUCT$PathSeparator$packpackage$PathSeparator" . "install$PathSeparator";
+ }
+ else {
+ $TestDir2 = $module_path;
+ }
+ if (defined ($TestDir2) && -e "$TestDir2") {
+ $InstDir="$TestDir2";
+ }
}
if ($InstDir eq "") {
next;
diff --git a/testautomation/framework/optional/includes/basic_package_export.inc b/testautomation/framework/optional/includes/basic_package_export.inc
index f02e60c79a83..19784c25883f 100755
--- a/testautomation/framework/optional/includes/basic_package_export.inc
+++ b/testautomation/framework/optional/includes/basic_package_export.inc
@@ -40,9 +40,7 @@
testcase tBasicPackageExport
' Assumption: All actions take place in the user/work directory
- ' macro taken from framework/tools/input/macros.txt::tBasicLibraryExport
-
- printlog( "Export BASIC libraries as package" )
+ printlog( "Export BASIC libraries as package/extension" )
const PACKAGE_NAME = "tBasicExport.oxt"
const LIBRARY_NAME = "tBasicExport"
@@ -51,14 +49,11 @@ testcase tBasicPackageExport
dim cDocumentName as string
dim cLibraryName as string
-
+
dim iNodeCount as integer
-
dim iCurrentLib as integer
- dim cFile as string
- cFile = hGetWorkPath() & PACKAGE_NAME
-
+ dim cFile as string : cFile = hGetWorkPath() & PACKAGE_NAME
dim cPackageFileName as string
@@ -80,97 +75,123 @@ testcase tBasicPackageExport
printlog( "Select the second document" )
kontext "Makro"
- iNodeCount = hGetNodeCount( MakroAus )
- cDocumentName = hSelectNode( MakroAus, iNodeCount )
+ if ( Makro.exists( 1 ) ) then
+ iNodeCount = hGetNodeCount( MakroAus )
+ cDocumentName = hSelectNode( MakroAus, iNodeCount )
- printlog( "Click <Manage...>" )
- Verwalten.click()
-
- printlog( "Go to the libraries tabpage" )
- hSelectBasicObjectOrganizerTab( 3 )
-
- kontext "TabBibliotheken"
- printlog( "Select the document at pos. " & DOCUMENT_POSITION )
- Bibliothek.select( DOCUMENT_POSITION )
-
- printlog( "Verify that the correct document has been selected" )
- if ( Bibliothek.getSelText() <> cDocumentName ) then
- warnlog( "Incorrect document selected on libraries tab, aborting" )
- goto endsub
- endif
-
- printlog( "Click <New...>" )
- Neu.click()
-
- kontext "NeueBibliothek"
- printlog( "Name the new library: " & LIBRARY_NAME )
- BibliotheksName.setText( LIBRARY_NAME )
- NeueBibliothek.ok()
-
- kontext "TabBibliotheken"
- cLibraryName = BibliotheksListe.getSelText()
- if ( cLibraryName <> LIBRARY_NAME ) then
- warnlog( "The new library is not selected in the libraries list" )
+ printlog( "Click <Manage...>" )
+ Verwalten.click()
+
+ printlog( "Go to the libraries tabpage" )
+ hSelectBasicObjectOrganizerTab( 3 )
+
+ kontext "TabBibliotheken"
+ printlog( "Select the document at pos. " & DOCUMENT_POSITION )
+ Bibliothek.select( DOCUMENT_POSITION )
+
+ printlog( "Verify that the correct document has been selected" )
+ if ( Bibliothek.getSelText() <> cDocumentName ) then
+ warnlog( "Incorrect document selected on libraries tab, aborting test" )
+ goto endsub
+ endif
+
+ printlog( "Click <New...>" )
+ Neu.click()
+
+ kontext "NeueBibliothek"
+ if ( NeueBibliothek.exists( 1 ) ) then
+ printlog( "Name the new library: " & LIBRARY_NAME )
+ BibliotheksName.setText( LIBRARY_NAME )
+ NeueBibliothek.ok()
+ else
+ warnlog( "Dialog <NeueBibliothek> did not open" )
+ goto endsub
+ endif
+
+ kontext "TabBibliotheken"
+ cLibraryName = BibliotheksListe.getSelText()
+ if ( cLibraryName <> LIBRARY_NAME ) then
+ warnlog( "The new library is not selected in the libraries list" )
+ else
+ printlog( "The correct library is selected in the libraries list" )
+ endif
+
+ printlog( "Click <Edit...>" )
+ Bearbeiten.click()
+
+ printlog( "Insert a test macro (something simple, e.g. a messagebox" )
+ hInsertMacroFromFile( LIBRARY_NAME )
+
+ printlog( "Close the BASIC IDE" )
+ hCloseBasicIDE()
else
- printlog( "The correct library is selected in the libraries list" )
+ warnlog( "Dialog <Makro> did not open, aborting test" )
+ goto endsub
endif
- printlog( "Click <Edit...>" )
- Bearbeiten.click()
-
- printlog( "Insert a test macro (something simple, e.g. a messagebox" )
- hInsertMacroFromFile( LIBRARY_NAME )
-
- printlog( "Close the BASIC IDE" )
- hCloseBasicIDE()
-
printlog( "Open the BASIC organizer" )
ToolsMacro_uno
printlog( "Select the work document" )
kontext "Makro"
- iNodeCount = hGetNodeCount( MakroAus )
- hSelectNode( MakroAus, iNodeCount )
-
- printlog( "Manage..." )
- Verwalten.click()
-
- printlog( "Libraries tab" )
- hSelectBasicObjectOrganizerTab( 3 )
-
- kontext "TabBibliotheken"
- Bibliothek.select( DOCUMENT_POSITION )
-
- printlog( "Select the new library" )
- kontext "TabBibliotheken"
- for iCurrentLib = 1 to Bibliotheksliste.getItemCount()
- Bibliotheksliste.select( iCurrentLib )
- if ( Bibliotheksliste.getSelText() = LIBRARY_NAME ) then
- exit for
+ if ( Makro.exists( 1 ) ) then
+ iNodeCount = hGetNodeCount( MakroAus )
+ hSelectNode( MakroAus, iNodeCount )
+
+ printlog( "Manage..." )
+ Verwalten.click()
+
+ printlog( "Libraries tab" )
+ hSelectBasicObjectOrganizerTab( 3 )
+
+ kontext "TabBibliotheken"
+ if ( TabBibliotheken.exists( 1 ) and TabBibliotheken.isVisible() ) then
+ Bibliothek.select( DOCUMENT_POSITION )
+
+ printlog( "Select the new library" )
+ kontext "TabBibliotheken"
+ for iCurrentLib = 1 to Bibliotheksliste.getItemCount()
+ Bibliotheksliste.select( iCurrentLib )
+ if ( Bibliotheksliste.getSelText() = LIBRARY_NAME ) then
+ exit for
+ endif
+ next iCurrentLib
+
+ kontext "TabBibliotheken"
+ printlog( "Export the package, close the document afterwards" )
+ Export.click()
+
+ kontext "ExportBasicLibraryDlg"
+ if ( ExportBasicLibraryDlg.exists( 1 ) ) then
+ printlog( "Select to export as package" )
+ ExportAsPackage.check()
+ ExportBasicLibraryDlg.ok()
+
+ kontext "SpeichernDlg"
+ if ( SpeichernDlg.exists( 1 ) ) then
+ printlog( "Save the file, automatic filename extension must be checked" )
+ DateiName.setText( hGetWorkPath() & LIBRARY_NAME ) ' automatic filename extension/uno-pkg is default
+ Speichern.click()
+ else
+ warnlog( "Dialog <File Save> did not open" )
+ endif
+ else
+ warnlog( "Dialog <Export Basic Library> did not open" )
+ endif
+
+ kontext "TabBibliotheken"
+ printlog( "Close libraires tabpage" )
+ TabBibliotheken.cancel()
+ else
+ warnlog( "Dialog <TabBibliotheken> is not available" )
endif
- next iCurrentLib
-
- kontext "TabBibliotheken"
- printlog( "Export the package, close the document afterwards" )
- Export.click()
-
- kontext "ExportBasicLibraryDlg"
- printlog( "Select to export as package" )
- ExportAsPackage.check()
- ExportBasicLibraryDlg.ok()
-
- kontext "SpeichernDlg"
- printlog( "Save the file, automatic filename extension must be checked" )
- DateiName.setText( hGetWorkPath() & LIBRARY_NAME ) ' automatic filename extension/uno-pkg is default
- Speichern.click()
-
- kontext "TabBibliotheken"
- printlog( "Close libraires tabpage" )
- TabBibliotheken.cancel()
-
- kontext "Makro"
- printlog( "Close BASIC organizer" )
- Makro.cancel()
+
+ kontext "Makro"
+ printlog( "Close BASIC organizer" )
+ Makro.cancel()
+ else
+ warnlog( "Dialog <Makro> did not open" )
+ endif
printlog( "Close all files" )
hFileCloseAll()
@@ -190,17 +211,17 @@ testcase tBasicPackageExport
endif
printlog( "Verify file size" )
- if ( FileLen( cPackageFileName ) <> PACKAGE_SIZE ) then
- warnlog( "#i105719# - The exported test-package has an incorrect file size." )
+' if ( FileLen( cPackageFileName ) <> PACKAGE_SIZE ) then
+' warnlog( "#i105719# - The exported test-package has an incorrect file size." )
if ( FileLen( cPackageFileName ) = 0 ) then
printlog( "File has zero bytes, it is empty." )
else
printlog( "Size is.: " & FileLen( cPackageFileName ) )
printlog( "Expected: " & PACKAGE_SIZE )
endif
- else
- printlog( "File has correct size" )
- endif
+' else
+' printlog( "File has correct size" )
+' endif
endcase
diff --git a/testautomation/framework/optional/includes/extras_file_open.inc b/testautomation/framework/optional/includes/extras_file_open.inc
index dd2f3149100c..62ad0b7e6587 100755
--- a/testautomation/framework/optional/includes/extras_file_open.inc
+++ b/testautomation/framework/optional/includes/extras_file_open.inc
@@ -45,6 +45,8 @@ private const MAX_FILE_COUNT = 3000 ' the max number of templates or samples
testcase tOpenObjectsWithFileDialog( cCategory as string )
+ printlog( "Open templates and samples using the file open dialog" )
+
const CFN = "tOpenObjectsWithFileDialog::"
@@ -75,9 +77,15 @@ testcase tOpenObjectsWithFileDialog( cCategory as string )
cOfficePath = gOfficeBasisPath
else
cOfficePath = mid( gOfficeBasisPath, len( gNetzOfficePath ) + 1 )
+ if ( FileExists( cOfficePath ) ) then
+ printlog( "Using: " & cOfficePath )
+ else
+ warnlog( "Test script error: Invalid Office path: " & cOfficePath )
+ goto endsub
+ endif
endif
- printlog( "Using: " & cOfficePath )
+ printlog( "Build path to templates/samples directory" )
select case cCategory
case "SAMPLES" : sRootPath = cOfficePath & "share\samples\" & gISOLang
sRootPathFallback = "/opt/openoffice.org/basis3.0/share/samples/" & gISOLang
@@ -92,10 +100,10 @@ testcase tOpenObjectsWithFileDialog( cCategory as string )
sRootPath = convertpath( sRootPath )
- if ( dir( sRootPath ) = "" ) then
+ if ( NOT FileExists( sRootPath ) ) then
qaerrorlog( "Root Path does not exist: " & sRootPath )
sRootPath = sRootPathFallback
- if ( dir( sRootPathFallback ) = "" ) then
+ if ( NOT FileExists( sRootPathFallback ) ) then
warnlog( "No usable office root path found. Aborting test" )
goto endsub
printlog( "Using hard coded fallback" )
@@ -104,10 +112,12 @@ testcase tOpenObjectsWithFileDialog( cCategory as string )
printlog( "Using path..: " & sRootPath )
printlog( "Using filter: " & sFilter )
+
+ printlog( "Retrieve filelist from directory" )
GetAllFileList ( sRootPath, sFilter, lsFile() )
hListDelete( lsFile(), 1 )
- ' Remove .lock-files
+ printlog( "Remove posible .lock-files from list" )
iTemplateCount = listCount( lsFile() )
iCurrentTemplate = 1
while( iCurrentTemplate <= iTemplateCount )
@@ -119,7 +129,7 @@ testcase tOpenObjectsWithFileDialog( cCategory as string )
endif
wend
- ' do not test wizard related files
+ printlog( "Remove Wizard related files from list" )
iTemplateCount = listCount( lsFile() )
iCurrentTemplate = 1
while( iCurrentTemplate <= iTemplateCount )
@@ -131,6 +141,7 @@ testcase tOpenObjectsWithFileDialog( cCategory as string )
endif
wend
+ printlog( "Files to be loaded:" )
hListPrint ( lsFile() , "" , "" )
if ( listcount( lsfile() ) = 1 ) then
if ( gProductName = "OpenOffice.org" ) then
@@ -140,6 +151,8 @@ testcase tOpenObjectsWithFileDialog( cCategory as string )
warnlog( "Filelist seems to be incomplete. GetAllFileList() failed!" )
goto endsub
endif
+ else
+ printlog( "List of samples/templates appears to be valid" )
endif
iTemplateCount = listCount( lsFile() )
@@ -151,41 +164,53 @@ testcase tOpenObjectsWithFileDialog( cCategory as string )
' sFileIn holds the file we currently work with
sFileIn = lsFile( iCurrentTemplate )
- brc = hFileOpen( sFileIn )
- brc = hHandleActivesOnLoad( 0 , 2 )
+ printlog( "Load: " & sFileIn )
+ hFileOpen( sFileIn )
+ printlog( "Handle known dialogs" )
+ hHandleActivesOnLoad( 0 , 2 )
+
+ printlog( "Check for Filter Selection dialog" )
Kontext "FilterAuswahl"
if ( FilterAuswahl.exists( 1 ) ) then
warnlog( "Loading failed, ASCII filter dialog present" )
FilterAuswahl.cancel()
- while( getDocumentCount > 0 )
- hDestroyDocument()
- wend
+ hFileCloseAll()
else
- brc = hCloseNavigator()
+ printlog( "Close navigator, if open" )
+ hCloseNavigator()
- ' Build the filename
sFileOut = cCategory & "_" & iCurrentTemplate
sFileOut = convertpath( sPathOut & sFileOut )
-
- brc = hFileSaveAsKill( sFileOut )
+
+ printlog( "Saving file to: " & sFileOut )
+ hFileSaveAsKill( sFileOut )
' note: this is delayed, because the dialogs take time to pop up
' even while the dialog is visible, we can work with the doc.
- brc = hHandleInitialDialogs()
+ printlog( "Handle known dialogs" )
+ hHandleInitialDialogs()
- brc = hDestroyDocument()
+ printlog( "Close document" )
+ hDestroyDocument()
- brc = hFileOpen( sFileOut )
- brc = hHandleActivesOnLoad( 0 , 2 )
- brc = hCloseNavigator()
+ printlog( "Load document again" )
+ hFileOpen( sFileOut )
+
+ printlog( "Handle known dialogs" )
+ hHandleActivesOnLoad( 0 , 2 )
+
+ printlog( "Close navigator, if open" )
+ hCloseNavigator()
- brc = hDestroyDocument()
+ printlog( "Close document" )
+ hDestroyDocument()
endif
- brc = hDeleteFile( sFileOut )
+ printlog( "Delete file" )
+ hDeleteFile( sFileOut )
next iCurrentTemplate
diff --git a/testautomation/framework/optional/includes/filedlg_autocomplete.inc b/testautomation/framework/optional/includes/filedlg_autocomplete.inc
index 264685d85594..94d0db418196 100755
--- a/testautomation/framework/optional/includes/filedlg_autocomplete.inc
+++ b/testautomation/framework/optional/includes/filedlg_autocomplete.inc
@@ -39,17 +39,18 @@
testcase tAutocomplete
-
+ printlog( "Autocompletion in the OpenOffice.org file picker" )
' IMPORTANT NOTE: Autocompletion is asynchronous. This means that no rule
' exists when exactly it is going to strike. If you are
' using a networked environment you have to make sure that
' all network ressources deliver a decent performance as
' this seriously influences the speed of the autocompletion.
-
- dim cBasePath as string
-
+
+ ' Assemble a work directory path
const WORKDIR = "autocomplete"
+ dim cBasePath as string : cBasePath = hGetWorkPath()
+ dim cWorkDir as string : cWorkDir = cBasePath & WORKDIR
' These are the files we create in the users homedirectory
dim aWorkFile( 3 ) as string
@@ -65,7 +66,6 @@ testcase tAutocomplete
aWildCard( 1 ) = "autocomplete_?.odt"
aWildCard( 2 ) = "autocomplete_b?.odt"
aWildCard( 3 ) = "autocomplete_*.odt"
-
dim cCurrentPath as string
dim cAutocomplete as string
@@ -80,41 +80,46 @@ testcase tAutocomplete
dim slot
- do while( getDocumentCount > 0 )
- call hCloseDocument()
- loop
-
- cBasePath = hGetWorkPath()
- aFullPath( 1 ) = cBasePath & WORKDIR & gPathSigne & aWorkFile( 1 )
- aFullPath( 2 ) = cBasePath & WORKDIR & gPathSigne & aWorkFile( 2 )
- aFullPath( 3 ) = cBasePath & WORKDIR & gPathSigne & aWorkFile( 3 )
+ printlog( "Close all open documents" )
+ hFileCloseAll()
+
+ printlog( "Assemble 3 filenames for workfiles" )
+ aFullPath( 1 ) = cWorkDir & gPathSigne & aWorkFile( 1 )
+ aFullPath( 2 ) = cWorkDir & gPathSigne & aWorkFile( 2 )
+ aFullPath( 3 ) = cWorkDir & gPathSigne & aWorkFile( 3 )
+
+ printlog( "Delete the 3 workfiles if they exist" )
hDeleteFile( aFullPath( 1 ) )
hDeleteFile( aFullPath( 2 ) )
hDeleteFile( aFullPath( 3 ) )
+
+ printlog( "Try to remove conflicting work directories" )
if ( dir( cBasePath & WORKDIR ) <> "" ) then
- rmdir( cBasePath & WORKDIR )
+ rmdir( cWorkDir )
endif
- mkdir( cBasePath & WORKDIR )
- if ( dir( cBasePath & WORKDIR ) = "" ) then
+ printlog( "Create workdirectory: " & cWorkDir )
+ mkdir( cWorkDir )
+ if ( NOT FileExists( cWorkDir ) ) then
warnlog( "Failed to create work directory, aborting" )
goto endsub
endif
gApplication = "WRITER"
+ printlog( "Create the workfiles - 3 writer files with minimum content" )
for iCurrentDocument = 1 to 3
- call hNewDocument()
+ call hCreateDocument()
kontext "DocumentWriter"
DocumentWriter.typeKeys( aWorkFile( iCurrentDocument ) )
hFileSaveAs( aFullPath( iCurrentDocument ) )
- FileClose
+ hUseAsyncSlot( "FileClose" )
next iCurrentDocument
-
- printlog( "open the File Open dialog" )
- FileOpen
-
+ printlog( "Open the File Open dialog" )
+ hUseAsyncSlot( "FileOpen" )
+
kontext "OeffnenDlg"
+ printlog( "Click the <Standard> button to get to the default work directory" )
Standard.click()
cLeft = left( WORKDIR, iLeft )
@@ -131,7 +136,7 @@ testcase tAutocomplete
printlog( "Autocompletion succeeded for workdirectory" )
else
warnlog( "Autocompletion failed" )
- printlog( "Expected: " & cRight )
+ printlog( "Expected: " & cEFString )
printlog( "Found...: " & cAutocomplete )
endif
@@ -149,7 +154,7 @@ testcase tAutocomplete
printlog( "Autocompletion succeeded for first file" )
else
warnlog( "Autocompletion failed" )
- printlog( "Expected: " & cRight )
+ printlog( "Expected: " & cEFString )
printlog( "Found...: " & cAutocomplete )
endif
@@ -162,7 +167,7 @@ testcase tAutocomplete
printlog( "Autocompletion succeeded for second file" )
else
warnlog( "Autocompletion failed" )
- printlog( "Expected: " & cRight )
+ printlog( "Expected: " & cEFString )
printlog( "Found...: " & cAutocomplete )
endif
@@ -198,6 +203,7 @@ testcase tAutocomplete
kontext "OeffnenDlg"
OeffnenDlg.cancel()
+ printlog( "Delete workfiles and -directory" )
hDeleteFile( aFullPath( 1 ) )
hDeleteFile( aFullPath( 2 ) )
hDeleteFile( aFullPath( 3 ) )
diff --git a/testautomation/framework/optional/includes/filedlg_cjk_files.inc b/testautomation/framework/optional/includes/filedlg_cjk_files.inc
index 0c69736f1558..f616c6d4567a 100755
--- a/testautomation/framework/optional/includes/filedlg_cjk_files.inc
+++ b/testautomation/framework/optional/includes/filedlg_cjk_files.inc
@@ -39,27 +39,21 @@
testcase tSaveLoadDelFilesCJK()
+ printlog( "Save, load and delete files from the hight UTF-8 characters list" )
+
if ( not hTestLocale() ) then
- warnlog( "Test requires UTF-8 locale" )
- goto endsub
+ qaerrorlog( "Could not verify UTF-8 locale. Make sure an UTF-8 locale is used!" )
endif
-
dim cStrangeName as string
dim iCounter as integer ' iterator
- dim iRandom as long ' random number.(needs long for cjk chars)
+ dim iRandom as long ' random number
dim brc as boolean
- printlog( CHR$(13) )
- printlog( "Check if CJK-filenames are loaded/saved/deleted" )
- printlog( CHR$(13) )
-
- printlog( CHR$(13) + "Names with CJK-chars" )
- printlog( "" )
-
- ' Invoke randomizer
+ printlog( "Invoke randomizer" )
call randomize()
+ printlog( "Generate filenames, run tests" )
for iCounter = 1 to 2
iRandom = int( 19968 + ( 20911 * rnd ) )
@@ -67,10 +61,10 @@ testcase tSaveLoadDelFilesCJK()
printlog( " * Using decimal char: " & iRandom )
cStrangeName = hNameGen_append( iRandom )
- brc = hSaveLoadDelSuccess( cStrangeName )
+ hSaveLoadDelSuccess( cStrangeName )
cStrangeName = hNameGen_lead( iRandom )
- brc = hSaveLoadDelSuccess( cStrangeName )
+ hSaveLoadDelSuccess( cStrangeName )
kontext "active"
if( active.exists() ) then
@@ -78,17 +72,17 @@ testcase tSaveLoadDelFilesCJK()
printlog( active.gettext() )
active.ok()
endif
-
+
+ printlog( "Delete the file" )
hDeleteFile( hGetWorkPath() & cStrangeName )
+ printlog( "Close navigator, if it exists" )
hCloseNavigator()
-
next iCounter
printlog( "Close the document" )
- brc = hDestroyDocument()
-
+ hDestroyDocument()
endcase
diff --git a/testautomation/framework/optional/includes/filedlg_filternames.inc b/testautomation/framework/optional/includes/filedlg_filternames.inc
index ce0b7231b5c5..e524f40d955f 100755
--- a/testautomation/framework/optional/includes/filedlg_filternames.inc
+++ b/testautomation/framework/optional/includes/filedlg_filternames.inc
@@ -39,6 +39,7 @@
testcase tVerifyFilterNames
+ printlog( "Verify filternames listed in the file open dialog" )
if ( gIsoLang <> "en-US" ) then
qaerrorlog( "No testing for non-US languages" )
@@ -77,12 +78,14 @@ testcase tVerifyFilterNames
dim cFileOut as string
cFileOut = hGetWorkPath() & cFile
-
+ printlog( "Create a new document" )
hCreateDocument()
+ printlog( "Open the File Open dialog" )
FileOpen
Kontext "OeffnenDlg"
+ printlog( "Read the filterlist (en_US only), compare against a reference" )
if ( OeffnenDlg.exists( 1 ) ) then
iFilterCount = DateiTyp.getItemCount()
@@ -101,7 +104,7 @@ testcase tVerifyFilterNames
try
asFilterNames( iCurrentItem ) = DateiTyp.getItemText( iCurrentItem )
catch
- printlog( "Test broke at pos: " & iCurrentItem )
+ printlog( "Problem encountered at pos: " & iCurrentItem )
endcatch
next iCurrentItem
@@ -113,7 +116,8 @@ testcase tVerifyFilterNames
else
warnlog( "File Open dialog not present." )
endif
-
+
+ printlog( "Close the document" )
hDestroyDocument()
if ( iErr <> 0 ) then
diff --git a/testautomation/framework/optional/includes/filedlg_multiselection.inc b/testautomation/framework/optional/includes/filedlg_multiselection.inc
index d95ae9e1a8b0..00deab80b27c 100755
--- a/testautomation/framework/optional/includes/filedlg_multiselection.inc
+++ b/testautomation/framework/optional/includes/filedlg_multiselection.inc
@@ -157,7 +157,8 @@ testcase tFiledlgMultiselection1()
wend
if ( iCurrentTime > 120000 ) then
- warnlog( "#i105289# Slow loading of files, should be less than 120 seconds on all platforms" )
+ 'Closed issue: qaerrorlog( "#i105289# Slow loading of files, should be less than 120 seconds on all platforms" )
+ printlog( "Slow file loading (exceeds 120 seconds)" )
endif
lWait = getSystemTicks - lTime ' time diff
diff --git a/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc b/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc
index a414101cfa4b..e84eff3f328f 100755
--- a/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc
+++ b/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc
@@ -39,9 +39,10 @@
testcase tSaveReservedNamesUNIX()
+ printlog( "Names that are reserved on WINDOWS but are OK on UNIX" )
if ( gPlatGroup = "w95" ) then
- printlog( "Test not relevant for Unix(like)"
+ printlog( "Test not relevant for Windows/DOS family of OSes" )
goto endsub
endif
@@ -53,7 +54,6 @@ testcase tSaveReservedNamesUNIX()
printlog( "" )
printlog( "Document Type is: " & hNumericDocType( iCurrentDocType ) )
- printlog( "Names that are reserved on WINDOWS but are OK on UNIX" )
irc = hSaveLoadDelSuccess( "NUL" , true )
if ( irc <> 0 ) then warnlog( "failed" )
diff --git a/testautomation/framework/optional/includes/security_macrosecurity.inc b/testautomation/framework/optional/includes/security_macrosecurity.inc
index 4c69aa062c45..c9083ff5229e 100755
--- a/testautomation/framework/optional/includes/security_macrosecurity.inc
+++ b/testautomation/framework/optional/includes/security_macrosecurity.inc
@@ -56,6 +56,7 @@ end sub
testcase tMacroSecurityLevels( cFileFormat )
+ printlog( "Check macro execution behavior for all macro security levels" )
dim cWorkFile as string
cWorkFile = gTesttoolPath & "framework\optional\input\BasicDocs\"
@@ -80,18 +81,23 @@ testcase tMacroSecurityLevels( cFileFormat )
' |---------------------------------------------------------|
' *) Covered by test "f_sec_trusted_path.bas"
+ printlog( "Load a document with macro for each of the four security levels" )
for iSecLevel = 0 to 3
- printlog( "" )
+ printlog( "Set macro security level to " & iSecLevel )
hSetMacroSecurityAPI( iSecLevel )
- FileOpen( "URL", cWorkFile, "FrameName", "_default" )
+
+ printlog( "Load document..." )
+ hFileOpen( cWorkFile )
+
+ printlog( "Check security level dependent behavior" )
select case iSecLevel
case 0 : brc = hIdentifyExecutedMacro()
if ( not brc ) then
if ( gApplication = "MATH" ) then
qaerrorlog( "#i68291# Math document forgets eventbinding" )
else
- qaerrorlog( "#i53711# Macro was not found/executed" )
+ warnlog( "#i53711# Macro was not found/executed" )
endif
endif
@@ -104,8 +110,7 @@ testcase tMacroSecurityLevels( cFileFormat )
if ( gApplication = "MATH" ) then
qaerrorlog( "#i68291# Math document forgets eventbinding" )
else
- qaerrorlog( "#i53711# Macro was not found/executed" )
- 'warnlog( "#i65885# - CWS Warnings01/Macro not executed on load" )
+ warnlog( "#i53711# Macro was not found/executed" )
endif
endif
@@ -125,10 +130,12 @@ testcase tMacroSecurityLevels( cFileFormat )
endif
end select
+ printlog( "Close document" )
brc = hDestroyDocument()
next iSecLevel
+ printlog( "Reset security level to default" )
hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_DEFAULT )
endcase
diff --git a/testautomation/framework/tools/includes/fileoperations.inc b/testautomation/framework/tools/includes/fileoperations.inc
index 3f2078c24c92..d4abf557afe8 100755
--- a/testautomation/framework/tools/includes/fileoperations.inc
+++ b/testautomation/framework/tools/includes/fileoperations.inc
@@ -62,8 +62,7 @@ function hSaveLoadDelSuccess( cFile as string ) as integer
'///<ul>
dim brc as boolean
- dim cFileExt as string
- cFileExt = cFile & hGetSuffix( "current" )
+ dim cFileExt as string : cFileExt = cFile & hGetSuffix( "current" )
const CFN = "hSaveLoadDelSuccess::"
@@ -160,14 +159,13 @@ function hLoadFileExpectSuccess( fpath as string ) as boolean
'///<u>Description</u>:
'///<ul>
- dim brc as boolean
- brc = true
+ dim brc as boolean : brc = true
const CFN = "hLoadFileExpectSuccess::"
printlog( CFN & "Enter with option: " & fpath )
'///+<li>Click FileOpen (or use the menu)</li>
- FileOpen
+ hUseAsyncSlot( "FileOpen" )
'///+<li>Enter the filename (with extension)</li>
'printlog( " - Type the filepath/name into the entryfield" )
@@ -232,13 +230,12 @@ function hLoadFileExpectFailure( fpath as string ) as boolean
const CFN = "hLoadFileExpectFailure::"
- dim brc as boolean
- brc = true
+ dim brc as boolean : brc = true
printlog( CFN & "Enter with option: " & fpath )
'///+<li>Click FileOpen</li>
- FileOpen
+ hUseAsyncSlot( "FileOpen" )
Kontext "OeffnenDLG"
'///+<li>Enter filepath</li>
@@ -321,24 +318,21 @@ function hSaveFileExpectSuccess( fpath as string , bReplace as boolean ) as bool
'///<ul>
const CFN = "hSaveFileExpectSuccess::"
- dim brc as boolean
- brc = true
+ dim brc as boolean : brc = true
dim iDocumentCount as integer
printlog( CFN & "Enter with options: " & fpath & ", " & bReplace )
'///+<li>Make sure we start from the backing window</li>
- do while ( getDocumentCount > 0 )
- hCloseDocument()
- loop
+ hFileCloseAll()
'///+<li>Open a new document</li>
hCreateDocument()
'///+<li>Click &quot;Save As...&quot;</li>
- FileSaveAs
+ hUseAsyncSlot( "FileSaveAs" )
Kontext "SpeichernDlg"
if ( SpeichernDlg.exists( 1 ) ) then
@@ -429,8 +423,7 @@ function hSaveFileExpectFailure( fpath as string , errortype as integer ) as boo
' This sequence tries to save a document with an invalid name. The errormsg
' is closed, the filedialog cancelled and the file closed.
- dim brc as boolean
- brc = false
+ dim brc as boolean : brc = false
dim cMsg as string
@@ -442,7 +435,7 @@ function hSaveFileExpectFailure( fpath as string , errortype as integer ) as boo
'///+<li>Click &quot;Save As;&quot;</li>
printlog( "" )
printlog( CFN & "Enter with options: " & fpath & ", " & errortype )
- FileSaveAs
+ hUseAsyncSlot( "FileSaveAs" )
'///+<li>Enter the filename</li>
kontext "SpeichernDlg"
@@ -549,14 +542,13 @@ function hCreateDirectoryExpectSuccess( dirname as string ) as boolean
'///<u>Description</u>:
'///<ul>
- dim brc as boolean
- brc = true
+ dim brc as boolean : brc = true
const CFN = "hCreateDirectoryExpectSuccess::"
printlog( CFN & "Enter with option: " & dirname )
'///+<li>Click &quot;File Open&quot;</li>
- FileOpen
+ hUseAsyncSlot( "FileOpen" )
'///+<li>Click on &quot;New folder&quot;</li>
Kontext "OeffnenDlg"
@@ -646,7 +638,7 @@ function hDeleteFileViaFileOpen( cFile as String ) as boolean
endif
'///+<li>Click &quot;File Open&quot;</li>
- FileOpen
+ hUseAsyncSlot( "FileOpen" )
'///+<li>Look for the requested file, get the position from the filelist</li>
Kontext "OeffnenDLG"
@@ -725,14 +717,16 @@ function hGetFileCountViaFileOpen() as integer
'///<ul>
'///+<li>Click &quot;File open&quot;</li>
- FileOpen
+ hUseAsyncSlot( "FileOpen" )
'///+<li>Retrieve the number of items in the filepicker window</li>
Kontext "OeffnenDLG"
- hGetFileCountViaFileOpen() = DateiAuswahl.getItemCount()
-
- '///+<li>Close &quot;File Open&quot;</li>
- OeffnenDLG.cancel()
+ if ( OeffnenDlg.exists( 2 ) ) then
+ hGetFileCountViaFileOpen() = DateiAuswahl.getItemCount()
+ OeffnenDLG.cancel()
+ else
+ hGetFileCountViaFileOpen() = -1
+ endif
'///</ul>
end function
@@ -871,10 +865,9 @@ function hFindFileObjectViaFileOpen( cName as string ) as integer
dim iCurrentObject as integer
dim cCurrentName as string
dim iFileOpenItemCount as integer
- dim iPos as integer
- iPos = 0
- dim cPath as string
- cPath = cName
+
+ dim iPos as integer : iPos = 0
+ dim cPath as string : cPath = cName
dim iPathItems as integer
dim asPathList( 100 ) as string
diff --git a/testautomation/graphics/optional/g_insert.bas b/testautomation/graphics/optional/g_insert.bas
index 92067c394754..62d8422925f6 100755
--- a/testautomation/graphics/optional/g_insert.bas
+++ b/testautomation/graphics/optional/g_insert.bas
@@ -60,7 +60,6 @@ sub main
Call tInsertSpreadsheet
Call tInsertGraphics
Call tInsertObjectPlugIn ' Doesn't exist in the VCL
- Call tInsertObjectApplet
Call tInsertObjectFormula ' Is in the VCL in InsertObjectOLEObject
Call tInsertChart
Call tdInsertFile
@@ -82,7 +81,6 @@ sub main
Call tInsertSpreadsheet
Call tInsertGraphics
Call tInsertObjectPlugIn ' Doesn't exist in the VCL
- Call tInsertObjectApplet
Call tInsertObjectFormula ' Is in the VCL in InsertObjectOLEObject
' Call tInsertChart
Call tdInsertFile
diff --git a/testautomation/graphics/optional/includes/global/export_graphic_2.inc b/testautomation/graphics/optional/includes/global/export_graphic_2.inc
index c39e12f73afd..a053bc2dfe64 100755
--- a/testautomation/graphics/optional/includes/global/export_graphic_2.inc
+++ b/testautomation/graphics/optional/includes/global/export_graphic_2.inc
@@ -519,7 +519,7 @@ testcase tPDF_Creator
gApplication = "WRITER"
sleep 5 ' wait for document to be loaded
' /Creator
- bTemp = hFindeImDokument ("<</Creator<",true)
+ bTemp = hFindeImDokument ("<</Creator<",true,true)
if (bTemp = TRUE) then
Printlog "OK"
else
@@ -569,22 +569,7 @@ testcase tPDF_Creator
endif
endif
endif
- ' /CreationDate (
- bTemp = hFindeImDokument ("/CreationDate(")
- if (bTemp = TRUE) then
- Printlog "OK"
- else
- warnlog " /CreationDate not found in pdf file :-("
- endif
- hTypeKeys("<left><right><shift end>")
- editcopy
- sTemp = getClipboardText()
- sTemp = left(sTemp, inStr(sTemp, ")")-1)
- printlog sTemp + " -- " + len(sTemp)
- iCreatorOffset = iCreatorOffset + (len(sTemp) - 23)
- if (len(sTemp) <> 23) then
- warnlog "Date is longer than expected; is: '" + sTemp2 + "'"
- endif
+
gApplication = sApp
call hCloseDocument
call hCloseDocument
@@ -785,7 +770,7 @@ qaerrorlog
else
warnlog "File didn't get saved :-("
endif
-
+ hCloseDocument ()
sleep 5
hNewDocument()
sleep 5
@@ -867,7 +852,7 @@ qaerrorlog
call hCloseDocument
-endcase
+endcase 'tBMP
'-------------------------------------------------------------------------------
testcase tEMF
diff --git a/testautomation/graphics/optional/includes/global/g_insert.inc b/testautomation/graphics/optional/includes/global/g_insert.inc
index 87689a73e944..c8a77778fb1e 100755
--- a/testautomation/graphics/optional/includes/global/g_insert.inc
+++ b/testautomation/graphics/optional/includes/global/g_insert.inc
@@ -36,19 +36,6 @@
'* short description :
'*
'**************************************************************************************
-' #1 tInsertFloatingFrame
-' #1 tInsertFields
-' #1 tdInsertObjectOleObjects
-' #1 tdInsertSnapPoint_Line
-' #1 tInsertSpecialCharacter
-' #1 tInsertSpreadsheet
-' #1 tInsertGraphics
-' #1 tInsertObjectPlugIn
-' #1 tInsertObjectApplet
-' #1 tInsertObjectFormula
-' #1 tInsertChart
-' #1 tdInsertFile
-'\*************************************************************************************
testcase tdInsertObjectOleObjects
@@ -743,48 +730,7 @@ testcase tInsertGraphics
endcase 'tInsertGraphics
'-------------------------------------------------------------------------------
-testcase tInsertObjectApplet
- printlog " open application "
- Call hNewDocument
- printlog " Insert->Object->Applet "
- sleep 1
- InsertObjectApplet
- Kontext "AppletEinfuegen"
- printlog " press button 'Search' "
- sleep 2
- Suchen.Click
- Kontext "OeffnenDlg"
- printlog " set filename to 'global\\input\\java\\rocket.class' "
- Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\java\Clock.class")
- printlog " close dialog 'Open' by pressing 'Open' "
- sleep 2
- Oeffnen.Click
- Kontext "AppletEinfuegen"
- printlog " close dialog 'Insert Applet' by pressing OK "
- sleep 2
- AppletEinfuegen.OK
- sleep 3
- printlog " deselect object by typing key [Escape] "
- hTypeKeys ("<Escape>")
- sleep 3
- try
- printlog " Edit->Select All "
- EditSelectAll
- printlog " delete object by typing key [Delete] "
- sleep 3
- hTypeKeys "<DELETE>"
- catch
- Warnlog "Delete did not work, maybe some error while creating the object before"
- endcatch
- sleep 1
- ' gMouseclick 70,70
- printlog " close application "
- Call hCloseDocument
-
-endcase 'tInsertObjectApplet
-
-'-------------------------------------------------------------------------------
testcase tInsertObjectFormula
printlog " open application "
diff --git a/testautomation/graphics/optional/includes/global/g_spellcheck.inc b/testautomation/graphics/optional/includes/global/g_spellcheck.inc
index c2ab184675c7..cb3b2f9fe934 100755
--- a/testautomation/graphics/optional/includes/global/g_spellcheck.inc
+++ b/testautomation/graphics/optional/includes/global/g_spellcheck.inc
@@ -190,7 +190,7 @@ testcase tiToolsSpellcheckError
ToolsOptions
Kontext "ExtrasOptionenDlg"
hToolsOptions("LANGUAGESETTINGS","Languages")
- Westlich.Select 32
+ Westlich.Select 34
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
printlog "Create 1 textbox with 1 spelling error (test replace always)"
@@ -489,16 +489,6 @@ testcase tiToolsSpellcheckCheck
goto endsub
end if
Kontext "Spellcheck"
- printlog "Save the current Dictionary Language."
- s = DictionaryLanguage.GetSelIndex
- for i= 1 to DictionaryLanguage.GetItemCount
- DictionaryLanguage.Select i
- sleep 1
- printlog "Dictionary language is: # "+i+": "+DictionaryLanguage.GetSelText
- next i
- iWord(1) = 1
- iWord(2) = 2
- DictionaryLanguage.Select s
printlog "Close dialog 'Spellcheck'."
Spellcheck.Close
Kontext "Active"
diff --git a/testautomation/graphics/optional/includes/global/g_tables.inc b/testautomation/graphics/optional/includes/global/g_tables.inc
index 6b647963025c..99b5a84f97ac 100755
--- a/testautomation/graphics/optional/includes/global/g_tables.inc
+++ b/testautomation/graphics/optional/includes/global/g_tables.inc
@@ -59,11 +59,11 @@ testcase tiInsertTableUsingMenu
if (UCase(gApplication)) = "IMPRESS" then
DocumentImpress.UseMenu
hMenuSelectNr(4)
- hMenuSelectNr(13)
+ hMenuSelectNr(14)
else
DocumentDraw.UseMenu
hMenuSelectNr(4)
- hMenuSelectNr(10)
+ hMenuSelectNr(11)
endif
@@ -222,11 +222,11 @@ testcase tiTableObjectBar
if (UCase(gApplication)) = "IMPRESS" then
DocumentImpress.UseMenu
hMenuSelectNr(4)
- hMenuSelectNr(13)
+ hMenuSelectNr(14)
else
DocumentDraw.UseMenu
hMenuSelectNr(4)
- hMenuSelectNr(10)
+ hMenuSelectNr(11)
endif
Kontext "InsertTableImpress"
diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc
index 1e58bda65745..7602dc98a9af 100755
--- a/testautomation/graphics/optional/includes/global/g_tools.inc
+++ b/testautomation/graphics/optional/includes/global/g_tools.inc
@@ -126,7 +126,7 @@ testcase tiToolsThesaurus
ToolsOptions
Kontext "ExtrasOptionenDlg"
hToolsOptions("LANGUAGESETTINGS","Languages")
-Westlich.Select 32
+Westlich.Select 34
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
sleep 1
diff --git a/testautomation/graphics/optional/includes/impress/i_us_present.inc b/testautomation/graphics/optional/includes/impress/i_us_present.inc
index 6b95ef90b958..26afac12e190 100755
--- a/testautomation/graphics/optional/includes/impress/i_us_present.inc
+++ b/testautomation/graphics/optional/includes/impress/i_us_present.inc
@@ -232,10 +232,11 @@ testcase i_us_presentation2
SlidesControl.FadeIn
printlog " Did the 'mistake' to FadeIn/Out the Slidepane"
-
- '/// Make a Mouse Double-Click on the left part of the Layout, to input a picture ///'
+
+ printlog "activating the input picture area"
kontext "DocumentImpress"
- DocumentImpress.MouseDoubleClick 30,50
+ DocumentImpress.TypeKeys "<TAB>",2
+ DocumentImpress.TypeKeys "<RETURN>"
sleep (1)
'/// Graphics-Import-dialogue. Select "i_us_large.jpg" ///'
diff --git a/testautomation/writer/optional/includes/clipboard/w_216_.inc b/testautomation/writer/optional/includes/clipboard/w_216_.inc
index d285a3e12190..f85736751d34 100755
--- a/testautomation/writer/optional/includes/clipboard/w_216_.inc
+++ b/testautomation/writer/optional/includes/clipboard/w_216_.inc
@@ -59,6 +59,9 @@ testcase HTMLToWRITERText
Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false)
Call sMakeReadOnlyDocumentEditable
sleep (3)
+ if GetDocumentCount() = 2 then
+ Warnlog "#i104365#read only document remains opened"
+ endif
printlog " Jump to beginning of document "
Call wTypeKeys "<Mod1 Home>"
Call wTypeKeys "<Shift Down><Shift End>"
@@ -112,7 +115,9 @@ testcase HTMLToWRITERText
goto endsub
end if
printlog " Close saved document "
- Call hCloseDocument
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
' ----------------------------------------------------------------------------------------------
@@ -125,6 +130,9 @@ testcase HTMLToWRITERField
printlog " Copy selected text "
Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html")
Call sMakeReadOnlyDocumentEditable
+ if GetDocumentCount() = 2 then
+ Warnlog "#i104365#read only document remains opened"
+ endif
printlog " Jump to beginning of document "
Call wTypeKeys "<Mod1 Home>"
Call wTypeKeys "<Down>",2
@@ -177,7 +185,9 @@ testcase HTMLToWRITERField
goto endsub
end if
printlog " Close saved document "
- Call hCloseDocument
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
' ----------------------------------------------------------------------------------------------
@@ -190,6 +200,9 @@ testcase HTMLToWRITERTable
printlog " Copy selected table "
Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false)
Call sMakeReadOnlyDocumentEditable
+ if GetDocumentCount() = 2 then
+ Warnlog "#i104365#read only document remains opened"
+ endif
printlog " Jump to beginning of document "
Call wTypeKeys "<Mod1 Home>"
Call wTypeKeys "<Down>",5
@@ -242,7 +255,9 @@ testcase HTMLToWRITERTable
goto endsub
end if
printlog " Close saved document "
- Call hCloseDocument
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
' ----------------------------------------------------------------------------------------------
@@ -255,6 +270,9 @@ testcase HTMLToWRITERGraphicLinked
printlog " Copy selected Linked Graphic "
Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false)
Call sMakeReadOnlyDocumentEditable
+ if GetDocumentCount() = 2 then
+ Warnlog "#i104365#read only document remains opened"
+ endif
printlog " Jump to beginning of document "
Call wTypeKeys "<Mod1 Home>"
Call wTypeKeys ( "<Shift F4>" )
@@ -296,7 +314,9 @@ testcase HTMLToWRITERGraphicLinked
goto endsub
end if
printlog " Close saved document "
- Call hCloseDocument
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
' ----------------------------------------------------------------------------------------------
@@ -309,6 +329,9 @@ testcase HTMLToWRITERControl
printlog " Copy selected Control "
Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false)
Call sMakeReadOnlyDocumentEditable
+ if GetDocumentCount() = 2 then
+ Warnlog "#i104365#read only document remains opened"
+ endif
printlog " Jump to beginning of document "
Call wTypeKeys "<Mod1 Home>"
Call wTypeKeys ( "<Shift F4>" )
@@ -351,7 +374,9 @@ testcase HTMLToWRITERControl
goto endsub
end if
printlog " Close saved document "
- Call hCloseDocument
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
' ----------------------------------------------------------------------------------------------
@@ -364,6 +389,9 @@ testcase HTMLToWRITERFloatingFrame
printlog " Copy selected Floating Frame "
Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false)
Call sMakeReadOnlyDocumentEditable
+ if GetDocumentCount() = 2 then
+ Warnlog "#i104365#read only document remains opened"
+ endif
printlog " Jump to beginning of document "
Call wTypeKeys "<Mod1 Home>"
Call wTypeKeys ( "<Shift F4>" )
@@ -412,5 +440,7 @@ testcase HTMLToWRITERFloatingFrame
goto endsub
end if
printlog " Close saved document "
- Call hCloseDocument
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
diff --git a/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc b/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc
index 20b8f62b7853..4e648e87de12 100755
--- a/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc
+++ b/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc
@@ -138,17 +138,18 @@ testcase tFormatCharacter3
Dim Vergleich3 as string
Dim Vergleich4 as string
Dim vLink as integer
- '/// Format / Character ///
- PrintLog "- Format / Character"
-
- '/// New document ///
+
+ printlog "New document"
Call hNewDocument
- printlog " - adjust character"
- '/// Select Format / Character ///
+ printlog "add some text to document => 'formatted text with hyperlink'"
+ Call wTypeKeys ("formatted text with hyperlink")
+ printlog "select text"
+ Call wTypeKeys ("<Shift Home>")
+
FormatCharacter
WaitSlot (5)
Kontext
- '/// On Tabpage 'Font' adjust settings ///
+ printlog "On Tabpage 'Font' adjust settings"
active.SetPage TabFont
kontext "TabFont"
try
@@ -168,20 +169,20 @@ testcase tFormatCharacter3
endcatch
wait 100
Kontext
- '/// On Tabpage 'Font Effects' adjust settings ///
+ printlog "On Tabpage 'Font Effects' adjust settings"
active.SetPage TabFontEffects
kontext "TabFontEffects"
Blinking.Check
Kontext
Active.Setpage TabFontPosition
- '/// On Tabpage 'Font Position ' adjust settings ///
+ printlog "On Tabpage 'Font Position ' adjust settings"
Kontext "TabFontPosition"
Spacing.Select 2
SpacingBy.More 3
Vergleich4 = SpacingBy.GetText
if Right ( Vergleich4, 2 ) <> "pt" then Warnlog "Wrong Unit at Spacing by"
Kontext
- '/// On Tabpage 'Hyperlink' adjust settings ///
+ printlog "On Tabpage 'Hyperlink' adjust settings"
active.SetPage TabHyperlinkZeichen
kontext "TabHyperlinkZeichen"
URLName.SetText "www.mikeportnoy.com"
@@ -200,13 +201,9 @@ testcase tFormatCharacter3
Sleep 1
Hintergrundfarbe.Typekeys "<Down><Left>", 4
TabHintergrund.OK
- '/// Close dialog and reopen with Format / Character ///
+ printlog "Close dialog"
- Call wTypeKeys "This is formatted text <Home><Right>"
-
- printlog " - check character"
-
- '/// Check settings made ///
+ printlog "Reopen with Format / Character and check settings made"
Call wTypeKeys "<Home><Right>"
FormatCharacter
Kontext
@@ -234,38 +231,30 @@ testcase tFormatCharacter3
Kontext
active.SetPage TabHyperlinkZeichen
kontext "TabHyperlinkZeichen"
- if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "#i41171#Wrong URL : " + URLName.GetText
+ if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "##i105855##Wrong URL : " + URLName.GetText
SetClipboard UrlName.Gettext
- if NameText.GetText <> "A hyperlink with testtool" then Warnlog "Wrong Linkname : " + NameText.GetText
- if TargetFrame.GetSelIndex <> 2 then Warnlog "Wrong Target selected : " + TargetFrame.GetSelText
- if UnbesuchterLink.GetSelIndex <> vLink then Warnlog "Wrong Style for unused Link :" + UnbesuchterLink.GetSelIndex
+ if NameText.GetText <> "A hyperlink with testtool" then Warnlog "#i105855#Wrong Linkname : " + NameText.GetText
+ if TargetFrame.GetSelIndex <> 2 then Warnlog "#i105855#Wrong Target selected : " + TargetFrame.GetSelText
+ if UnbesuchterLink.GetSelIndex <> vLink then Warnlog "#i105855#Wrong Style for unused Link :" + UnbesuchterLink.GetSelIndex
TabHyperlinkZeichen.OK
+ printlog "Save document as '../user/work/format1.sxw' and close it"
if gApplication = "WRITER" then
Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\format1.odt", "writer8")
else
Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\format1.odm", "writer8") 'gMasterDocFilter
- end if
- '/// Save document as '../user/work/format1.sxw' and close it ///
+ end if
- if getclipboardtext="http://www.mikeportnoy.com/" then
- printlog " - activate Link"
- end if
- Sleep 20
-
- printlog " - check saved character format"
- Sleep 1
+ printlog "Close document"
Call hCloseDocument
- Sleep 2
+ printlog "reopen previous saved document and check saved character format"
if gApplication = "WRITER" then
Call hFileOpen ( gOfficePath + "user\work\format1.odt" )
else
Call hFileOpen ( gOfficePath + "user\work\format1.odm" )
end if
- Call wTypeKeys "<Home><Right>"
+ Call wTypeKeys "<Mod1 Home><Right>"
Wait 500
- '/// Reopen previous saved documentand check settings made under Format / Character ///
-
FormatCharacter
WaitSlot (3)
Kontext
@@ -292,9 +281,9 @@ testcase tFormatCharacter3
Kontext
active.SetPage TabHyperlinkZeichen
kontext "TabHyperlinkZeichen"
- if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "#i41171#Wrong URL : " + URLName.GetText
- if NameText.GetText <> "A hyperlink with testtool" then Warnlog "Wrong Linkname : " + NameText.GetText
- if TargetFrame.GetSelIndex <> 2 then Warnlog "Wrong Target selected : " + TargetFrame.GetSelText
+ if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "#i105855#Wrong URL : " + URLName.GetText
+ if NameText.GetText <> "A hyperlink with testtool" then Warnlog "#i105855#Wrong Linkname : " + NameText.GetText
+ if TargetFrame.GetSelIndex <> 2 then Warnlog "#i105855#Wrong Target selected : " + TargetFrame.GetSelText
TabHyperlinkZeichen.OK
'/// Close document ///
Call hCloseDocument
@@ -487,18 +476,21 @@ endcase
testcase tFormatCharacter
Dim Vergleich1%, Vergleich2$, Vergleich3$, Vergleich4$
-
- '/// Format / Character ///
+
PrintLog "- Format / Character"
-
- '/// New document ///
Call hNewDocument
+
+ printlog "add some text to document => 'formatted text with hyperlink'"
+ Call wTypeKeys ("formatted text with hyperlink")
+ printlog "select text"
+ Call wTypeKeys ("<Shift Home>")
+
printlog " - adjust character"
- '/// Select Format / Character ///
+ printlog "Format->Character"
FormatCharacter
Sleep 5
Kontext
- '/// On Tabpage 'Font' adjust settings ///
+ printlog "On Tabpage 'Font' adjust settings"
active.SetPage TabFont
kontext "TabFont"
try
@@ -518,24 +510,24 @@ testcase tFormatCharacter
endcatch
wait 100
Kontext
- '/// On Tabpage 'Font Effects' adjust settings ///
+ printlog "On Tabpage 'Font Effects' adjust settings"
active.SetPage TabFontEffects
kontext "TabFontEffects"
Blinking.Check
Kontext
Active.Setpage TabFontPosition
- '/// On Tabpage 'Font Position ' adjust settings ///
+ printlog "On Tabpage 'Font Position ' adjust settings"
Kontext "TabFontPosition"
Spacing.Select 2
SpacingBy.More 3
Vergleich4$ = SpacingBy.GetText
if Right ( Vergleich4$, 2 ) <> "pt" then Warnlog "Wrong Unit at Spacing by"
Kontext
- '/// On Tabpage 'Hyperlink' adjust settings ///
+ printlog "On Tabpage 'Hyperlink' adjust settings"
active.SetPage TabHyperlinkZeichen
kontext "TabHyperlinkZeichen"
URLName.SetText "www.mikeportnoy.com"
- NameText.SetText "Ein Link mit dem Testtool"
+ NameText.SetText "Link created by testtool"
TargetFrame.Select 2
UnbesuchterLink.Select 6
@@ -545,14 +537,12 @@ testcase tFormatCharacter
Sleep 1
Hintergrundfarbe.Typekeys "<Down><Left>", 4
TabHintergrund.OK
- '/// Close dialog and reopen with Format / Character ///
-
- Call wTypeKeys "Dies ist ein formatierter Text <Home><Right>"
-
- printlog " - check character"
+ printlog "Close dialog"
- '/// Check settings made ///
- Call wTypeKeys "<Home><Right>"
+ printlog " Type Home- and Right-Key"
+ Call wTypeKeys "<Home><Right>"
+
+ printlog "recheck settings made with opening Format->Character"
FormatCharacter
Kontext
active.SetPage TabFont
@@ -579,38 +569,30 @@ testcase tFormatCharacter
Kontext
active.SetPage TabHyperlinkZeichen
kontext "TabHyperlinkZeichen"
- if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "Wrong URL : " + URLName.GetText + " (#BugID:90982)"
+ if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "#i105855#Wrong URL : " + URLName.GetText + " (#BugID:90982)"
SetClipboard UrlName.Gettext
- if NameText.GetText <> "Ein Link mit dem Testtool" then Warnlog "Wrong Linkname : " + NameText.GetText
- if TargetFrame.GetSelIndex <> 2 then Warnlog "Wrong Target selected : " + TargetFrame.GetSelText
- if UnbesuchterLink.GetSelIndex <> 6 then Warnlog "Wrong Style for unused Link :" + UnbesuchterLink.GetSelIndex
+ if NameText.GetText <> "Link created by testtool" then Warnlog "#i105855#Wrong Linkname : " + NameText.GetText
+ if TargetFrame.GetSelIndex <> 2 then Warnlog "#i105855#Wrong Target selected : " + TargetFrame.GetSelText
+ if UnbesuchterLink.GetSelIndex <> 6 then Warnlog "#i105855#Wrong Style for unused Link :" + UnbesuchterLink.GetSelIndex
TabHyperlinkZeichen.OK
+ printlog "Save document as '../user/work/format1.sxw' and close it"
if gApplication = "WRITER" then
Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\format1.odt", "writer8" )
else
Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\format1.odm", "writer8" ) 'gMasterDocFilter
- end if
- '/// Save document as '../user/work/format1.sxw' and close it ///
-
- if getclipboardtext="http://www.mikeportnoy.com/" then
- printlog " - activate Link"
- end if
- Sleep 20
-
- printlog " - check saved character format"
- Sleep 1
+ end if
Call hCloseDocument
- Sleep 2
+ printlog "re-open previous saved document"
if gApplication = "WRITER" then
- Call hFileOpen ( gOfficePath + "user\work\format1.odt" )
+ Call hFileOpen ( gOfficePath + "user\work\format1.odt" )
else
- Call hFileOpen ( gOfficePath + "user\work\format1.odm" )
+ Call hFileOpen ( gOfficePath + "user\work\format1.odm" )
end if
- Call wTypeKeys "<Home><Right>"
+ Call wTypeKeys "<Mod1 Home><Right>"
Wait 500
- '/// Reopen previous saved documentand check settings made under Format / Character ///
+ printlog "Execute Format->Character and re-check settings made"
FormatCharacter
Sleep 3
@@ -618,13 +600,13 @@ testcase tFormatCharacter
active.SetPage TabFont
kontext "TabFont"
try
- if FontWest.GetSelText <> Vergleich2$ then Warnlog "Font should "+ Vergleich2$ +" is "+ FontWest.GetSelText
- if StyleWest.GetSelIndex <> Vergleich1% then Warnlog "FontStyle should " +Vergleich3$+" is "+ StyleWest.GetSelText
- if SizeWest.GetSelIndex <> 24 then Warnlog "Wrong Font Size : " + SizeWest.GetSelText
+ if FontWest.GetSelText <> Vergleich2$ then Warnlog "Font should "+ Vergleich2$ +" is "+ FontWest.GetSelText
+ if StyleWest.GetSelIndex <> Vergleich1% then Warnlog "FontStyle should " +Vergleich3$+" is "+ StyleWest.GetSelText
+ if SizeWest.GetSelIndex <> 24 then Warnlog "Wrong Font Size : " + SizeWest.GetSelText
catch
- if Font.GetSelText <> Vergleich2$ then Warnlog "Font should "+ Vergleich2$ +" is "+ Font.GetSelText
- if Style.GetSelIndex <> Vergleich1% then Warnlog "FontStyle should " +Vergleich3$+" is "+ Style.GetSelText
- if Size.GetSelIndex <> 24 then Warnlog "Wrong Font Size : " + Size.GetSelText
+ if Font.GetSelText <> Vergleich2$ then Warnlog "Font should "+ Vergleich2$ +" is "+ Font.GetSelText
+ if Style.GetSelIndex <> Vergleich1% then Warnlog "FontStyle should " +Vergleich3$+" is "+ Style.GetSelText
+ if Size.GetSelIndex <> 24 then Warnlog "Wrong Font Size : " + Size.GetSelText
endcatch
Kontext
active.SetPage TabFontEffects
@@ -638,11 +620,11 @@ testcase tFormatCharacter
Kontext
active.SetPage TabHyperlinkZeichen
kontext "TabHyperlinkZeichen"
- if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "Wrong URL : " + URLName.GetText
- if NameText.GetText <> "Ein Link mit dem Testtool" then Warnlog "Wrong Linkname : " + NameText.GetText
- if TargetFrame.GetSelIndex <> 2 then Warnlog "Wrong Target selected : " + TargetFrame.GetSelText
+ if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "#i105855#Wrong URL : " + URLName.GetText
+ if NameText.GetText <> "Link created by testtool" then Warnlog "#i105855#Wrong Linkname : " + NameText.GetText
+ if TargetFrame.GetSelIndex <> 2 then Warnlog "#i105855#Wrong Target selected : " + TargetFrame.GetSelText
TabHyperlinkZeichen.OK
- '/// Close document ///
+ printlog "Close document"
Call hCloseDocument
endcase
diff --git a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc
index cdd4bc0b9ef0..5dabe72ff6ca 100755
--- a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc
+++ b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc
@@ -1162,58 +1162,60 @@ endcase
testcase tParagraphIndent17
- Dim sTestFile1 as String
- Dim sTestFile2 as String
-
- sTestFile1 = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\AddSpacingShouldCheck.doc")
- sTestFile2 = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\AddSpacingShouldNotCheck.doc")
-
- PrintLog "- Test 'Add spacing between paragarph and talbes' when importing from MS-Word"
- '/// <b>Test 'Add spacing between paragarph and talbes' when importing from MS-Word</b>
-
- Call hNewDocument
-
- '/// 1.Open the test file - AddSpacingShouldCheck.doc
- '/// In Tools/Optionis/Text Document/Compatibility,
- '/// + the 'Add spacing between paragarph and talbes'
- '/// + should be checked
- Call hFileOpen(sTestFile1)
- Call sMakeReadOnlyDocumentEditable
-
- ToolsOptions
- Call hToolsOptions("WRITER","COMPATIBILITY")
- Kontext "TabCompatibility"
- Sleep 2
- Options.TypeKeys "<Down>"
- if Options.IsChecked <> TRUE then
- warnlog "'Add spacing between paragarph and talbes' should be checked"
- end if
- Kontext "ExtrasOptionenDlg"
- ExtrasOptionenDlg.OK
-
- Call hCloseDocument
-
- Call hNewDocument
-
- '/// 2.Open the test file - AddSpacingShouldNotCheck.doc
- '/// In Tools/Optionis/Text Document/Compatibility,
- '/// + the 'Add spacing between paragarph and talbes'
- '/// + should NOT be checked
- Call hFileOpen(sTestFile2)
- Call sMakeReadOnlyDocumentEditable
-
- ToolsOptions
- Call hToolsOptions("WRITER","COMPATIBILITY")
- Kontext "TabCompatibility"
- Sleep 2
- Options.TypeKeys "<Down>"
- if Options.IsChecked = TRUE then
- warnlog "'Add spacing between paragarph and talbes' should NOT be checked"
- end if
- Kontext "ExtrasOptionenDlg"
- ExtrasOptionenDlg.OK
-
- Call hCloseDocument
+ Dim sTestFile1 as String
+ Dim sTestFile2 as String
+
+ sTestFile1 = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\AddSpacingShouldCheck.doc")
+ sTestFile2 = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\AddSpacingShouldNotCheck.doc")
+
+ PrintLog "- Test 'Add spacing between paragarph and talbes' when importing from MS-Word"
+ '/// <b>Test 'Add spacing between paragarph and talbes' when importing from MS-Word</b>
+
+ Call hNewDocument
+
+ '/// 1.Open the test file - AddSpacingShouldCheck.doc
+ '/// In Tools/Optionis/Text Document/Compatibility,
+ '/// + the 'Add spacing between paragarph and talbes'
+ '/// + should be checked
+ Call hFileOpen(sTestFile1)
+ Call sMakeReadOnlyDocumentEditable
+
+ ToolsOptions
+ Call hToolsOptions("WRITER","COMPATIBILITY")
+ Kontext "TabCompatibility"
+ Sleep 2
+ Options.TypeKeys "<Down>"
+ if Options.IsChecked <> TRUE then
+ warnlog "'Add spacing between paragarph and talbes' should be checked"
+ end if
+ Kontext "ExtrasOptionenDlg"
+ ExtrasOptionenDlg.OK
+
+ Call hCloseDocument
+
+ Call hNewDocument
+
+ '/// 2.Open the test file - AddSpacingShouldNotCheck.doc
+ '/// In Tools/Optionis/Text Document/Compatibility,
+ '/// + the 'Add spacing between paragarph and talbes'
+ '/// + should NOT be checked
+ Call hFileOpen(sTestFile2)
+ Call sMakeReadOnlyDocumentEditable
+
+ ToolsOptions
+ Call hToolsOptions("WRITER","COMPATIBILITY")
+ Kontext "TabCompatibility"
+ Sleep 2
+ Options.TypeKeys "<Down>"
+ if Options.IsChecked = TRUE then
+ warnlog "'Add spacing between paragarph and talbes' should NOT be checked"
+ end if
+ Kontext "ExtrasOptionenDlg"
+ ExtrasOptionenDlg.OK
+
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
diff --git a/testautomation/writer/optional/includes/navigator/w_navigator.inc b/testautomation/writer/optional/includes/navigator/w_navigator.inc
index 21dc8ec9a369..31f146fb733a 100755
--- a/testautomation/writer/optional/includes/navigator/w_navigator.inc
+++ b/testautomation/writer/optional/includes/navigator/w_navigator.inc
@@ -217,7 +217,7 @@ endcase
' **********************************************************************
testcase tViewNavigator3
- WarnLog "#i94614# - tViewNavigator3 outcommented"
+ QAErrorlog "#i94614# - tViewNavigator3 outcommented"
goto endsub
Dim NavigationTearOff as boolean
diff --git a/testautomation/writer/optional/includes/undo/w_undo_history_3.inc b/testautomation/writer/optional/includes/undo/w_undo_history_3.inc
index f0e3d8966ea2..0edd49e1f4a2 100755
--- a/testautomation/writer/optional/includes/undo/w_undo_history_3.inc
+++ b/testautomation/writer/optional/includes/undo/w_undo_history_3.inc
@@ -45,7 +45,7 @@ sub w_undo_history_3
Call tUndoCaption ' Insert Caption
Call tUndoAutoText ' Insert Autotext
Call tUndoBookmark ' Bookmark (Insert/Rename/Delete)
- Call tUndoNote ' Note (Insert/Delete)
+ Call tUndoComment ' Comment (Insert/Delete)
Call tUndoScript ' Script (Insert/Delete)
Call tUndoIndexes ' Index/Bibliography entrys (Insert/Delete)
Call tUndoFrames ' Frames (Insert/Rename/Delete)
@@ -293,26 +293,23 @@ goto endsub
endcase
-testcase tUndoNote
+testcase tUndoComment
- '/// <B>Note (Insert/Delete)</B>
- printlog "- Insert Note"
- '/// new document
+ printlog "New document"
Call hNewDocument
- '/// Insert / Note
+ printlog "Insert / Comment"
InsertNoteWriter
- '/// string in Undo-list has to be: "Insert note")
- Call CheckUndoStringInUndoList ( 10, "InsertNote" )
- printlog "- Delete Note"
- '/// Bring up the Navigator, find the entry "Notes", expand it, and select the expanded section.
+ printlog "String in Undo-list has to be: 'Insert Comment'"
+ Call CheckUndoStringInUndoList ( 10, "InsertComment" )
+ printlog "- Delete Comment"
+ printlog "Bring up the Navigator, find the entry 'Comments', expand it, and select the expanded section."
Call wNavigatorAuswahl( 11, 1 )
- '/// Enter 'Delete' 'Backspace'
kontext "Navigator"
Navigator.TypeKeys "<DELETE>"
'/// Close the Navigator
ViewNavigator
- '/// string in Undo-list has to be: "Delete: 'This is a note'")
- Call CheckUndoStringInUndoList ( 10, "DeleteNote" )
+ '/// string in Undo-list has to be: "Delete comment")
+ Call CheckUndoStringInUndoList ( 10, "DeleteComment" )
'/// Close document
Call hCloseDocument
diff --git a/testautomation/writer/required/includes/w_004_.inc b/testautomation/writer/required/includes/w_004_.inc
index 85768207f587..88322855a484 100755
--- a/testautomation/writer/required/includes/w_004_.inc
+++ b/testautomation/writer/required/includes/w_004_.inc
@@ -55,7 +55,7 @@ sub w_004_
Call tInsertCaption
Call tInsertBookmark
Call tInsertCrossReference
- Call tInsertNote
+ Call tInsertComment
Call tInsertScript
Call tInsertIndexesEntry
Call tInsertIndexesIndex
@@ -479,22 +479,22 @@ endcase
'-----------------------------------------------------------
-testcase tInsertNote
+testcase tInsertComment
dim sNoteText as String
- PrintLog "- Insert / Note"
+ PrintLog "- Insert / Comment"
Call hNewDocument
- printlog " Insert / Note"
+ printlog " Insert / Comment"
InsertNoteWriter
Kontext "DocumentWriter"
- sNoteText = "Testnote inserted by testtool !"
+ sNoteText = "Comment inserted by testtool !"
Call wTypeKeys (sNoteText)
Call wNavigatorAuswahl( 11, 1 )
Kontext "NavigatorWriter"
if Auswahlliste.Gettext <> sNoteText then
- warnlog ("Note was not inserted correctly (Focus problem?")
+ warnlog ("Comment was not inserted correctly (Focus problem?")
end if
printlog " Close active document"
diff --git a/testautomation/writer/tools/includes/w_tools_undo.inc b/testautomation/writer/tools/includes/w_tools_undo.inc
index d896d8d13856..11b4756bb6eb 100644
--- a/testautomation/writer/tools/includes/w_tools_undo.inc
+++ b/testautomation/writer/tools/includes/w_tools_undo.inc
@@ -414,17 +414,17 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string)
Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList
end select
- Case "InsertNote"
+ Case "InsertComment"
Select Case iSprache
- Case 01: if UndoStringFromUndoList <> "Insert note" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+ Case 01: if UndoStringFromUndoList <> "Insert comment" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
Case 34: if UndoStringFromUndoList <> "Insertar nota" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
Case 86: if UndoStringFromUndoList <> "插入 批注" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList
end select
- Case "DeleteNote"
+ Case "DeleteComment"
Select Case iSprache
- Case 01: if UndoStringFromUndoList <> "Delete note" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+ Case 01: if UndoStringFromUndoList <> "Delete comment" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
Case 34: if UndoStringFromUndoList <> "Eliminar nota" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
Case 86: if UndoStringFromUndoList <> "删除 批注" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList
diff --git a/testautomation/xml/optional/includes/f_xml_save_ms_ole.inc b/testautomation/xml/optional/includes/f_xml_save_ms_ole.inc
index d57626d32e1f..5f61ba73cbe9 100755
--- a/testautomation/xml/optional/includes/f_xml_save_ms_ole.inc
+++ b/testautomation/xml/optional/includes/f_xml_save_ms_ole.inc
@@ -172,7 +172,7 @@ testcase tXML_OLE_Conversion ( sCurrentTestDocument as STRING )
select case sCurrentOLE
case "mat"
SAXSeekElement( 1 )
- if SAXGetElementName() <> "math:math" then
+ if SAXGetElementName() <> "math" then
warnlog "A Math object was expected here -> Check this out!"
endif
case else
diff --git a/testshl2/source/dynamicregister.cxx b/testshl2/source/dynamicregister.cxx
index 02fb05871303..801e7702ab65 100644
--- a/testshl2/source/dynamicregister.cxx
+++ b/testshl2/source/dynamicregister.cxx
@@ -46,14 +46,14 @@
namespace fixes
{
- void changedir(const char* _sPath)
+ int changedir(const char* _sPath)
{
#if defined(WIN32)
// chdir(_sPath) is marked depricated since Visual C++ 2005
// use _chdir instead
- ::_chdir(_sPath);
+ return ::_chdir(_sPath);
#else
- ::chdir(_sPath);
+ return ::chdir(_sPath);
#endif
}
}
diff --git a/testshl2/source/terminate.cxx b/testshl2/source/terminate.cxx
index 3db99d55d43a..b2dc95b0e860 100644
--- a/testshl2/source/terminate.cxx
+++ b/testshl2/source/terminate.cxx
@@ -116,7 +116,13 @@ int ProcessHandler::readPIDFromFile()
// exit(0);
}
// if file exist, wait short, maybe the other tool writes it down.
- fscanf(in, "%d", &nPID);
+ if (fscanf(in, "%d", &nPID) != 1)
+ {
+ // fprintf(stderr, "warning: (testshl.cxx) can't read own pid.\n");
+ fclose(in);
+ return 0;
+ // exit(0);
+ }
fclose(in);
}
else