diff options
author | Thorsten Bosbach <Thorsten.Bosbach@Oracle.Com> | 2010-10-19 16:44:25 +0200 |
---|---|---|
committer | Thorsten Bosbach <Thorsten.Bosbach@Oracle.Com> | 2010-10-19 16:44:25 +0200 |
commit | 2b816892590a1980331803de8a21bbfe0dc08a25 (patch) | |
tree | 1fe9fe7f5ab7d13d5c94168a759a13f9326aed02 /testautomation | |
parent | a7c54f6a4dba6158e2b7a154b30d3645be65bbc8 (diff) |
#i115122# hid.lst is again static
Diffstat (limited to 'testautomation')
-rw-r--r-- | testautomation/global/hid/readme.txt | 130 | ||||
-rw-r--r-- | testautomation/global/system/includes/master.inc | 98 | ||||
-rw-r--r-- | testautomation/global/tools/includes/required/t_tools2.inc | 26 | ||||
-rw-r--r-- | testautomation/global/win/edia_t_z.win | 2 | ||||
-rwxr-xr-x | testautomation/tools/hid/cons.txt | 83 | ||||
-rwxr-xr-x | testautomation/tools/hid/hid.bat | 2 | ||||
-rwxr-xr-x | testautomation/tools/hid/hid.pl | 92 | ||||
-rwxr-xr-x | testautomation/tools/hid/hid.sh | 2 |
8 files changed, 1 insertions, 434 deletions
diff --git a/testautomation/global/hid/readme.txt b/testautomation/global/hid/readme.txt deleted file mode 100644 index 7d786f27ba1a..000000000000 --- a/testautomation/global/hid/readme.txt +++ /dev/null @@ -1,130 +0,0 @@ -Introduction ------------- - -This is the former location of the file: hid.lst -It is intended, that after a fresh checkout from svn you will not find it here anymore. -There will be no hid.lst anymore in source code repository for testautomation. - -But the file hid.lst is essential for running automated tests with VCL -TestTool: Your OOo installation may already contain it at: -<OOo installation directory>/basis-link/program/hid.lst -(Depending on your installation you need to install the 'testtool' package) - -As a fallback you will find the file hid.lst online at: -http://quaste.services.openoffice.org/index.php?option=com_quaste&task=tests_overview&workspace=DEV300&milestone=m51&download=2 -(Please substitute DEV300 and m51 with the respective version numbers from your used OOo installation) -See announcement on QUASTe: http://quaste.services.openoffice.org/index.php?option=com_content&task=view&id=14&Itemid=1 - -As another fallback, the testautomation archives from Maho Nakata will already contain the hid.lst from QUASTe: -http://ooopackages.good-day.net/pub/OpenOffice.org/qa/testautomation/ -Announcement is here: http://qa.openoffice.org/servlets/ReadMsg?list=dev&msgNo=12515 - -Action needed for tests with VCL TestTool? It depends; - -Ideal processing ----------------- - -When checking out the VCL TestTool environment from svn; -OOo is already installed and the installation path is set -in the VCL TestTool seetings; -> http://wiki.services.openoffice.org/wiki/VCLTesttool - -The first test run will recognize the absence of hid.lst in the directory -testautomation/global/hid, but finds hid.lst file in OOo -installation directory; -Then VCL TestTool will copy it from OOo installation to testautomation -directory - the test can start; - -When using the testautomation archives from Nakata Maho, -> http://ooopackages.good-day.net/pub/OpenOffice.org/qa/testautomation/ -there will still be already a hid.lst file in the testautomation -directory. - --------------------------------------------------------------------- - -Longer description to this change ---------------------------------- - -The change was necessarry since there were always several conflicts on -integration of several CWS's modifying the hid.lst file into one master. -The hid.lst is refused to checked in by Release Engineering after -building OOo, since they claim it is too late then and all files are -tagged then already in svn. -The file changes when new UI is put into, or removed from OOo; -It matches the number of an UI element known by OOo to a speaking name, -used in VCL TestTool test scripts. -There were always two hid.lst files in OOo: -- The first one, that is also the source for the second one, is -generated during building OOo; -- The second one, the one found in 'testautomation' was run through -several scripts to make it useable for testautomation and always -verified manually for errors; - -With some fixes in DEV300m42/m45 and issue i101284 the generation of -hid.lst was changed during building of OOo, to use the resulting hid.lst -at the end also for testautomation; -This makes the second hid.lst now superfluous, since the hid.lst is also -delivered with every OOo installation; - -The locations of the hid.lst: -- After an OOo build it is found at: solver/300/unxmacxp.pro/bin/hid.lst - (due to a bug in deliver this one might be the wrong one, then you find - it in: instsetoo_native/unxmacxi.pro/bin/hid.lst) - To get the hid.lst build, you need to use 'configure' with the switch: --enable-hids -- In an installed OOo: - Win32: Program Files\Sun\StarOffice 9\Basis\program\hid.lst - Mac OS: StarOffice.app/Contents/basis-link/program/hid.lst - Linux: /opt/openoffice.org/basis3.2/program/hid.lst -- Online at http://quaste.services.openoffice.org/index.php?option=com_quaste&task=tests_overview&workspace=DEV300&milestone=m51&download=2 - With the respected values for the version replaced. - -The file is finaly needed at: testautomation/global/hid/hid.lst - -When using testautomation packages from: -> http://ooopackages.good-day.net/pub/OpenOffice.org/qa/testautomation/ -No additional action should be required, since a hid.lst will be at the -needed location. - -When checking out testautomation from svn, hid.lst is tried to find and -copied by VCL TestTool on first test run. - -When manual action is required ------------------------------- - -In case the target directory for hid.lst is not writeable by the user -who is running the test, manual action is required: -Open your VCL TestTool settings and change the hid directory path -to the basis program directory of your OOo installation; E.g.: -openoffice.org3/basis-link/program -> http://wiki.services.openoffice.org/wiki/VCLTesttool - -There is also some output in the resultfile of the test, that should -give some hint, about the hid.lst; Either it was already there, got -copied from OOo or simply just not found. - -If no hid.lst file is found, or could not be copied a messagebox comes up, -telling the reason and testing is aborted. Then please read the -additional messages in the resultfile. - -There might also be the case where the version of the hid.lst does not match the -version of the used OOo. Then there is an informal message shown. -The version should not differ, please check and correct the location of -the hid.lst file. Some reasons might be: -- the build was not done with configure switch --enable-hids; - then the hid.lst comes from helpcontent2/helpers/hid.lst, which - is a constant one, which is far too old. -As for the VCL TestTool environment, the hid.lst file is also version dependant to OOo. - -Current warnings in results ---------------------------- - -There are currenty about 99 warnings in the beginning, which are already -fixed in CWS dba32e: i103219, butis not yet integrated into the master. - -Getting help ------------- - -If nothing helps, do not hesitate to ask on maling list: -dev@qa.openoffice.org -Start your subject with '[automation]: ' - diff --git a/testautomation/global/system/includes/master.inc b/testautomation/global/system/includes/master.inc index 880496e3dc42..3825dadff409 100644 --- a/testautomation/global/system/includes/master.inc +++ b/testautomation/global/system/includes/master.inc @@ -84,7 +84,6 @@ sub GetUseFiles Call GetIniInformation '///+<li><b>GetIniInformation</b>: Get all information out of the <i>testtool.ini/.testtoolrc</i> and set it on global variables (iniinfo.inc)</li> Call GetOfficeInformation '///+<li><b>GetOfficeInformation</b>: Set <i>sAppExe</i> for startup (iniinfo.inc)</li> - Call prepareHidLst Call LoadDeclaration '///+<ul><li><b>LoadDeclaration</b>: Load all declaration files (master.inc)</li> Call FirstOfficeStart '///+<li><b>FirstOfficeStart</b>: Try to start the office for first time (master.inc)</li> @@ -133,97 +132,6 @@ sub GetUseFiles end sub '------------------------------------------------------------------------- -function checkWriteable() as boolean - '//// Check hid.lst destination for user writeability - dim sTestDir as string - dim bReturn as boolean - - bReturn = FALSE - try - sTestDir = "tbotest" ' nasty bug, if the path is with a path sign at the end; usually on windows root dirs :-( - if (right(ConvertPath(gtHidLstPath, gtPlatform), 1) <> hGetPathSigne(gtPlatform)) then - sTestDir = hgetPathSigne(gtPlatform) + sTestDir - end if - MkDir (ConvertPath(gtHidLstPath + sTestDir, gtPlatform)) - RmDir (ConvertPath(gtHidLstPath + sTestDir, gtPlatform)) - - bReturn = TRUE - catch - ' fail - bReturn = FALSE - endcatch - checkWriteable = bReturn -end function -'------------------------------------------------------------------------- - -sub prepareHidLst - '/// Determine and set OOo version information - '/// Check if hid.lst is at default location: testautomation/global/hid - '/// If not, check OOo basis path for hid.lst; check if default location from above is writeable for user - '/// Copy hid.lst from OOo basis path to the default location - '/// If something fails, give warnlog - dim sHidOOo as string - dim iShellReturn as integer - dim qHost as string - dim qPath as string - - gVersionsnummer = FindBuildID - ' split versionstring into its parts - call hSetBuildVersionInformation(False) - qHost = "quaste.services.openoffice.org" - qPath = "/index.php?option=com_quaste&task=tests_overview&download=2" + "&workspace=" + gMajor + "&milestone=" + gMinor - ' check for hid.lst in $HID_DIR_LOCATION! - if (fileExists(gtHidLstPath + "hid.lst")) then - printlog "Found hid.lst file; It is taken from: " + gtHidLstPath - else - ' check for hid.lst in OOo installation - sHidOOo = convertPath(gOfficeBasisPath + "program/" + "hid.lst") - if (fileExists(sHidOOo)) then - printlog "Found hid.lst file; It exists in OOo installation: " + sHidOOo - - ' make compatibility hint against version.txt - - ' check for writeable global/hid/ - if (checkWriteable()) then - ' copy hid.lst - fileCopy(sHidOOo, gtHidLstPath + "hid.lst") - printlog "File hid.lst successfull copied to location in VCL TestTool settings: " + gtHidLstPath - else - ' fail: make hint for hid.lst path - warnlog "File hid.lst could not be copied to default location, due to missing access rights" - warnlog "Please open the settings in VCL TestTool and change the path for HID directory to: " + sHidOOo - if MsgBox ("The test won't start! Further informations are in the result file below...", 16, "Error with hid.lst file") = 1 then end - end if - else - ' Disabled, because Joomla! can not provide plain text webpage - 'if (checkWriteable()) then - 'try to get from Quaste via http - 'httpSetProxy(Host, Port) - ' try - ' iShellReturn = httpSend(qHost, qPath, 80, gtHidLstPath + "hid.lst") - ' catch - ' iShellReturn = 99 - ' endcatch - ' when using internal httpSend, iShellReturn contains http status numbers: 200 means: ok - ' if (iShellReturn <> 200) then - ' warnlog "Fetching file hid.lst with internal httpsend command failed with error code: " + iShellReturn + chr(13) + qHost+qPath + chr(13) + gtHidLstPath + "hid.lst" - ' no hid.lst in OOo available and not available via http... - ' warnlog "No hid.lst file in OOo installation or on Quaste server found; Please read documentation at " + ConvertPath (gTestToolPath + "global\hid\readme.txt") + " or ask on mailing list: dev@qa.openoffice.org" - ' kill gtHidLstPath + "hid.lst" - ' else - ' printlog "File hid.lst successfull fetched from "+qHost+qPath+" and saved to location in VCL TestTool settings: " + gtHidLstPath - ' endif - 'else - ' warnlog "File hid.lst could not be saved to default location, due to missing access rights" - ' warnlog "Please download hid.lst file from: "+qHost+qPath+" and open the settings in VCL TestTool and change the path for HID directory to your download location." - warnlog "Please download hid.lst file from: "+ chr(13) +"http://"+qHost+qPath+ chr(13) + "and save it to: "+ chr(13) + gtHidLstPath+"hid.lst" - if MsgBox ("The test won't start! Further informations are in the result file below...", 16, "Error with hid.lst file") = 1 then end - 'end if - end if - end if -end sub -'------------------------------------------------------------------------- - sub LoadDeclaration '/// Include all .sid-declarations (all menu-items as SlotIDs) '///+<German names> (<u><b>DEPRECATED</u>, only fixes allowed!</b>) @@ -680,12 +588,7 @@ sub hFirstOutput Dim sDir as String Dim sDir1 as String Dim sMajor as String - Dim sHidVersion as String - sHidVersion = getBuildNumHidLst - if lCase(trim(sHidVersion)) <> lCase(gMajor + "." + gMinor) then - qaErrorLog "Version of file hid.lst differs from OOo version" - end if if gSamePC = TRUE then if (len(gMajor)>3) then sMajor = left(gMajor,3) @@ -722,7 +625,6 @@ sub hFirstOutput 'http://wiki.services.openoffice.org/wiki/QUASTe printlog "** Status feature (QUASTe) : Enabled " + gLocalStatusDatabase end if - printlog "** HID.LST based on milestone : " + sHidVersion printlog "----------------------------------------------------------------------------------------------------" printlog "** Application installation path : " + gNetzOfficePath printlog "** User configuration path : " + gOfficePath diff --git a/testautomation/global/tools/includes/required/t_tools2.inc b/testautomation/global/tools/includes/required/t_tools2.inc index 76422a5e8108..13cf7d4af68e 100644 --- a/testautomation/global/tools/includes/required/t_tools2.inc +++ b/testautomation/global/tools/includes/required/t_tools2.inc @@ -226,32 +226,6 @@ end function '------------------------------------------------------------------------- -function GetBuildNumHidLst as String -'/// Get the "BuildId" out of the <i>hid.lst</i>. - Dim FileNum as Integer - Dim xmlZeile as String - dim iIndex as integer - dim sTemp as string - - if Dir (gtHidLstPath + "hid.lst") <> "" then - FileNum = FreeFile - Open (gtHidLstPath + "hid.lst") For Input As #FileNum - do until EOF(#FileNum) = True - line input #FileNum, xmlZeile - iIndex = inStr (1, xmlZeile, "010101010101010", 1) - sTemp = Left (xmlZeile, abs(iIndex - 1)) - ' usually only the first line is read - if (sTemp <> "") then exit do - loop - Close #FileNum - GetBuildNumHidLst = sTemp - else - GetBuildNumHidLst = "" - end if -end function - -'------------------------------------------------------------------------- - function hGetUNOService(optional bSilent as boolean, optional byRef sUnoPortExternal as string) as object '/// Function enables the UNO communication inside the '///+ TestTool to the office application. diff --git a/testautomation/global/win/edia_t_z.win b/testautomation/global/win/edia_t_z.win index 9fe554029532..5acdef31038b 100644 --- a/testautomation/global/win/edia_t_z.win +++ b/testautomation/global/win/edia_t_z.win @@ -130,7 +130,7 @@ RecentFile sym:FILTER_HID_XML_FILTER_TEST_IMPORT_RECENT FixedRecentFile sym:FILTER_HID_XML_FILTER_TEST_IMPORT_RECENT_FILE CloseBtn sym:FILTER_HID_XML_FILTER_TEST_CLOSE -*Thesaurus .uno:Thesaurus +*Thesaurus .uno:ThesaurusDialog CurrentWord sym:cui:ComboBox:RID_SVXDLG_THESAURUS:CB_WORD RecallCurrentWord sym:cui:ImageButton:RID_SVXDLG_THESAURUS:BTN_LEFT Alternatives sym:CUI_HID_CT_THES_ALTERNATIVES diff --git a/testautomation/tools/hid/cons.txt b/testautomation/tools/hid/cons.txt deleted file mode 100755 index ad1b62d7671f..000000000000 --- a/testautomation/tools/hid/cons.txt +++ /dev/null @@ -1,83 +0,0 @@ -644j_HID_Eigen 01010100101010101010101010 - -TB_SW_TEXT_TOOLBOX 23265 -TB_SW_TABLE_TOOLBOX 23266 -TB_SW_GRAFIK_TOOLBOX 23268 -TB_SW_DRAW_TEXTBOX_TOOLBOX 23269 -TB_SW_DRAW_TEXT_TOOLBOX 23270 -TB_SW_NUM_TOOLBOX 23271 -TB_SW_OLE_TOOLBOX 23272 -TB_SW_TOOLS_TOOLBOX 23273 -TB_SW_PREVIEW_TOOLBOX 20631 -HDE_OL_SW_FORMAT_GRAFIK 23267 -HDE_HID_LAB_LAB 54920 -HDE_PDF_EXPORT_DLG 33375 -TB_WEB_TOOLS_TOOLBOX 20402 -TB_WEB_TOOLBOX 20403 - -TB_SC_TEXT_TOOLBOX 25001 -TB_SC_DRAW_Text_TOOLBOX 25005 -TB_SC_PREVIEW_TOOLBOX 25006 -TB_SC_TOOLS_TOOLBOX 25035 -TB_SC_OLE_TOOLBOX 26436 - -TB_IM_TOOLS_TOOLBOX 23011 -TB_IM_DIA_TOOLBOX 23012 -TB_IM_TOOLBOX 23030 -TB_IM_SLIDE_OBJ_TOOLBOX 23014 -TB_SD_BEZIER_TOOLBOX 23015 -TB_IM_TEXT_TOOLBOX 23016 -TB_IM_OUTLINIG_TOOLBOX 23017 -TB_SD_GLUEPOINTS_TOOLBOX 23019 -TB_IM_OPTIONS_TOOLBOX 23020 -TB_IM_COMMONTASK_TOOLBOX 23021 -TB_SD_TOOLS_TOOLBOX 23025 -TB_SD_OPTION_TOOLBOX 23026 -TB_SD_TOOLBOX 23027 -TB_SD_TEXT_TOOLBOX 23028 - -TB_Fullscreen_Toolbox 558 - -TB_Basic_Controls 63543 - -HDE_PRN_UNX_PAPER 602472448 -HDE_PRN_UNX_PAPERSIZE 602476034 -HDE_PRN_UNX_ORIENTATION 602476036 -HDE_PRN_UNX_DUPLEX 602476038 -HDE_PRN_UNX_INPUT_SLOT 602476040 -HDE_PRN_UNX_SCALE 602479114 -HDE_PRN_UNX_DEVICE 602456064 -HDE_PRN_UNX_OPTION 602459652 -HDE_PRN_UNX_VALUE 602459654 -HDE_PRN_UNX_POSTSCRIPT 602465288 -HDE_PRN_UNX_COLOR 602459658 -HDE_PRN_UNX_COLORDEPTH 602465292 -HDE_PRN_UNX_COMPRESS 602457101 - -SID_VERB_OPEN 6103 -SID_VERB_START 6102 - -TB_Macro 14850 -TB_Macro_Controls 14916 -TZ_Filter_Warning 34195 - -MSC_Super_ID 123456 -MSC_Super_ID2 1234567 -MSC_Super_ID3 12345678 - -sfx2:ListBox:TP_CONFIG_ACCEL:BOX_ACC_KEY 575016462 - -HID_OPTIONS_JAVA_LIST 39997 - -PDF1TBO 867876864 -PDF2TBO 867860480 - -FontWork1TBO 40026 -FontWork2TBO 40027 - -Eval1TBO 64360 -Eval2TBO 64361 -HTMLTBO 808846359 - - - diff --git a/testautomation/tools/hid/hid.bat b/testautomation/tools/hid/hid.bat deleted file mode 100755 index b454bb366012..000000000000 --- a/testautomation/tools/hid/hid.bat +++ /dev/null @@ -1,2 +0,0 @@ -perl.exe hid.pl hid.lst hid.txt cons.txt - diff --git a/testautomation/tools/hid/hid.pl b/testautomation/tools/hid/hid.pl deleted file mode 100755 index 3a36b02cb31e..000000000000 --- a/testautomation/tools/hid/hid.pl +++ /dev/null @@ -1,92 +0,0 @@ -#************************************************************************** -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#****************************************************************** -#* -#* Owner : thorsten.bosbach@oracle.com -#* -#* short description : Generate a cleaned hid.lst -#* -#****************************************************************** -# -# syntax : hid.pl Input Output ConstantEntries -# usually: hid.pl hid.lst hid.txt const.txt -# - -for (@ARGV){print $_."\n";} -open (HID,"<".@ARGV[0]) || die "Can't find old HID-file (first argument)"; -@ary=( <HID> ); -close HID; -open (HID,">".@ARGV[1]) || die "Can't find new HID-file (second argument)"; - -@longnum = @longname = (); - -for (@ary) { - s/MN_VIEW 21//g; # remove slots that are wrong - s/MN_INSERT 24//g; - s/MN_SUB_TOOLBAR 92//g; - s/SID_OBJECT_MIRROR 27085//g; - s/UID_SQLERROR_BUTTONMORE 38844//g; - s/MN_EXTRA 22//g; # ------------------------------------------- - s/RID_UNDO_DELETE_WARNING 20558//g; - s/.* 01010101010//g; - s/ +/ /g; # remove double blanks - @x = split(/\s+/) ; # seperate Longnames and HIDs -# @x[0]=~ tr/a-z/A-Z/; -# @x[1]=~ tr/a-z/A-Z/; - $longname[++$#longname] = @x[0]; - $longnum[++$#longnum] = @x[1]; - $_=@x[0]." ".@x[1]."\n"; -} - -@ary = @ary[ sort{ # sort - @longnum[$a] <=> @longnum[$b] || - @longname[$a] cmp @longname[$b] - }0..$#ary - ]; - -# @ary = grep( !/^ *$/, @ary); - -#remove double entries - -$n=""; -for (@ary) { - if ($n eq $_ || $_>0 ){ - $_=""; - } - else{ - $n=$_; - } - } - -@ary = grep( !/^ *$/, @ary); - -# to insert the constant entries at the beginning, read it and write it out -open (CON,"<".@ARGV[2]) || die "Can't find constant entries-file: const.txt (third argument)"; -@const=( <CON> ); -close CON; -print HID @const; - -print HID @ary; -close HID; diff --git a/testautomation/tools/hid/hid.sh b/testautomation/tools/hid/hid.sh deleted file mode 100755 index f7c6d27a5f98..000000000000 --- a/testautomation/tools/hid/hid.sh +++ /dev/null @@ -1,2 +0,0 @@ - perl hid.pl hid.lst hid.txt cons.txt - cp hid.txt ../../global/hid/hid.lst |