From c5f65c146368f79ddbda7a2e6987f6a043f9cf26 Mon Sep 17 00:00:00 2001 From: Thorsten Bosbach Date: Thu, 27 Jan 2011 15:04:49 +0100 Subject: #i116658# update issue ids and remove obsolete ones --- .../optional/includes/CJK_FeatureSwitchTest_1.inc | 17 ++++-- .../framework/optional/includes/configuration.inc | 66 ++++------------------ .../optional/includes/options_loadsave_general.inc | 3 +- .../optional/includes/options_ooo_general.inc | 6 +- testautomation/math/optional/includes/m_101_.inc | 3 +- testautomation/math/optional/includes/m_105.inc | 6 +- testautomation/math/required/includes/m_001_.inc | 6 +- testautomation/math/required/includes/m_005_.inc | 3 +- testautomation/math/required/includes/m_007_.inc | 3 +- 9 files changed, 43 insertions(+), 70 deletions(-) mode change 100755 => 100644 testautomation/framework/optional/includes/configuration.inc mode change 100755 => 100644 testautomation/math/required/includes/m_007_.inc (limited to 'testautomation') diff --git a/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc b/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc index 081b35f322ec..63f552df63bf 100755 --- a/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc +++ b/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc @@ -346,7 +346,8 @@ testcase tWriterUIChangesTest7 Kontext "RubyDialog" DialogClose.Click Sleep 2 - QAErrorlog "#i40913# Something wrong in menu format/Ruby when Asian Language support is off" + '#i40913# + warnlog "Something wrong in menu format/Ruby when Asian Language support is off" catch endcatch end if @@ -398,25 +399,29 @@ testcase tWriterUIChangesTest8 try FormatChangeCaseHalfWidth - QAErrorlog "#i43434# Something wrong in submenu format/change case -> Half width when Asian Language support is off" + '#i43434# + warnlog "Something wrong in submenu format/change case -> Half width when Asian Language support is off" catch endcatch try FormatChangeCaseFullWidth - QAErrorlog "#i43434# Something wrong in submenu format/change case -> Full width when Asian Language support is off" + '#i43434# + warnlog "Something wrong in submenu format/change case -> Full width when Asian Language support is off" catch endcatch try FormatChangeCaseHiragana - QAErrorlog "#i43434# Something wrong in submenu format/change case -> Hiragana when Asian Language support is off" + '#i43434# + warnlog "Something wrong in submenu format/change case -> Hiragana when Asian Language support is off" catch endcatch try FormatChangeCaseKatagana - QAErrorlog "#i43434# Something wrong in submenu format/change case -> Katagana when Asian Language support is off" + '#i43434# + warnlog "Something wrong in submenu format/change case -> Katagana when Asian Language support is off" catch endcatch end if @@ -740,4 +745,4 @@ function hSystemHasAsianLocale() as boolean case else : hSystemHasAsianLocale() = false end select -end function \ No newline at end of file +end function diff --git a/testautomation/framework/optional/includes/configuration.inc b/testautomation/framework/optional/includes/configuration.inc old mode 100755 new mode 100644 index 0fce11bddd1b..9e63a4a9ad7e --- a/testautomation/framework/optional/includes/configuration.inc +++ b/testautomation/framework/optional/includes/configuration.inc @@ -44,7 +44,8 @@ sub sToolsCustomizeKeyboardFunction for i = 0 to a if ( i = 7 and gtSysName = "Solaris x86" ) then - qaerrorlog( "#i62423# Solaris: Crash when opening new database" ) + '#i62423# + warnlog( "Solaris: Crash when opening new database" ) else gApplication = aApplication(i) tToolsCustomizeKeyboardFunction(lList()) @@ -87,6 +88,7 @@ testcase tToolsCustomizeKeyboardFunction(lList()) dim i92080 as string dim i96322 as string dim i100037 as string + dim i115370 as string i60617 = ".uno:ContinueNumbering" i43969 = ".uno:MacroOrganizer" @@ -94,12 +96,13 @@ testcase tToolsCustomizeKeyboardFunction(lList()) i80850 = ".uno:ToggleFormula.uno:AssignMacro" i84982 = ".uno:FontDialogForParagraph" i84983 = ".uno:DBNewReportWithPreSelection" - i87950 = ".uno:DBMigrateScripts" - i87951 = ".uno:DeleteAllNotes.uno:DeleteAuthor.uno:DeleteNote.uno:HideAllNotes.uno:HideAuthor.uno:HideNote" - i87952 = ".uno:InsertApplet" - i92080 = ".uno:SaveGraphic" - i96322 = ".uno:ActivateStyleApply" - i100037 = ".uno:AcceptTracedChange, .uno:DeleteComment, .uno:RejectTracedChange, .uno:ReplyNote, .uno:TaskPaneInsertPage, .uno:ValidityReference" + i87950 = ".uno:DBMigrateScripts" + i87951 = ".uno:DeleteAllNotes.uno:DeleteAuthor.uno:DeleteNote.uno:HideAllNotes.uno:HideAuthor.uno:HideNote" + i87952 = ".uno:InsertApplet" + i92080 = ".uno:SaveGraphic" + i96322 = ".uno:ActivateStyleApply" + i100037 = ".uno:AcceptTracedChange, .uno:DeleteComment, .uno:RejectTracedChange, .uno:ReplyNote, .uno:TaskPaneInsertPage, .uno:ValidityReference" + i115370 = ".uno:TaskPaneInsertPage" Call hNewDocument sleep 2 @@ -130,53 +133,8 @@ testcase tToolsCustomizeKeyboardFunction(lList()) if (((mid(sTemp2,d+1,1)<>" ")AND(abs(asc(mid(sTemp2,d+1,1)))<128)) AND (abs(asc(mid(sTemp2,d-1,1)))<128))then listAppend(lList(),sTemp2) bErrorFound = false - if (inStr(i60617,sTemp2)>0) then - WarnLog "#i60617# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" - bErrorFound = true - endif - if (inStr(sTemp2,i64346)>0) then - WarnLog "#i64346# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" - bErrorFound = true - endif - if (inStr(i43969,sTemp2)>0) then - WarnLog "#i41265# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" - bErrorFound = true - endif - if (inStr(i80850,sTemp2)>0) then - WarnLog "#i80850# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" - bErrorFound = true - endif - if (inStr(i84982,sTemp2)>0) then - WarnLog "#i84982# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" - bErrorFound = true - endif - if (inStr(i84983,sTemp2)>0) then - WarnLog "#i84983# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" - bErrorFound = true - endif - if (inStr(i87950,sTemp2)>0) then - WarnLog "#i87950# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" - bErrorFound = true - endif - if (inStr(i87951,sTemp2)>0) then - WarnLog "#i87951# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" - bErrorFound = true - endif - if (inStr(i87952,sTemp2)>0) then - warnLog "#i87952# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" - bErrorFound = true - endif - if (inStr(i92080,sTemp2)>0) then - WarnLog "#i92080# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" - bErrorFound = true - endif - if (inStr(i96322,sTemp2)>0) then - WarnLog "#i96322# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" - bErrorFound = true - endif - - if (inStr(i100037,sTemp2)>0) then - WarnLog "#i100037# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" + if (inStr(i115370,sTemp2)>0) then + qaerrorlog "#i115370# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" bErrorFound = true endif if ( not bErrorFound ) then diff --git a/testautomation/framework/optional/includes/options_loadsave_general.inc b/testautomation/framework/optional/includes/options_loadsave_general.inc index d320fb6a6d72..69e08f7bef20 100644 --- a/testautomation/framework/optional/includes/options_loadsave_general.inc +++ b/testautomation/framework/optional/includes/options_loadsave_general.inc @@ -176,7 +176,8 @@ testcase tLoadSaveGeneral printlog( "Doctype: " & Dokumenttyp.getSelText() & " has filter: " & Filter.getSelText() ) if Filter.GetSelIndex <> 3 then - warnlog( "#i79150# some options in Tools/Options->Load/Save->General are not saved" ) + '#i79150# + warnlog( "Some options in Tools/Options->Load/Save->General are not saved" ) endif next i diff --git a/testautomation/framework/optional/includes/options_ooo_general.inc b/testautomation/framework/optional/includes/options_ooo_general.inc index 311f5bf8543d..343cac659971 100644 --- a/testautomation/framework/optional/includes/options_ooo_general.inc +++ b/testautomation/framework/optional/includes/options_ooo_general.inc @@ -85,7 +85,8 @@ testcase tOOoGeneral hToolsOptions ( "StarOffice", "General" ) if Zweistellig.GetText <> "1950" then - Warnlog "#i29810# - Year ( 2 digits ) => changes not saved: " + Zweistellig.GetText + '#i29810# + Warnlog "Year ( 2 digits ) => changes not saved: " + Zweistellig.GetText endif if not Aktivieren.IsChecked then @@ -116,7 +117,8 @@ testcase tOOoGeneral hToolsOptions ( "StarOffice", "General" ) if ( Zweistellig.GetText <> "1800" ) then - Warnlog( "#i29810# - Year ( 2 digits ) => changes not saved : " & Zweistellig.GetText() ) + '#i29810# + Warnlog( "Year ( 2 digits ) => changes not saved : " & Zweistellig.GetText() ) endif If DruckenStatus.IsChecked then diff --git a/testautomation/math/optional/includes/m_101_.inc b/testautomation/math/optional/includes/m_101_.inc index 58582452dc63..26a1d87ad6eb 100644 --- a/testautomation/math/optional/includes/m_101_.inc +++ b/testautomation/math/optional/includes/m_101_.inc @@ -281,7 +281,8 @@ testcase tFilePassword if Passwort.isEnabled then if NOT((instr(sTemp,gMathFilter) = 1)OR(instr(sTemp," (.sxm)") > 1)) then if (4=i) then - warnlog "#i112895# (" + i + "/" + x +"): '"+sTemp+"' Password Checkbox: Enabled" + '#i112895# + warnlog "(" + i + "/" + x +"): '"+sTemp+"' Password Checkbox: Enabled" else warnlog "(" + i + "/" + x +"): '"+sTemp+"' Password Checkbox: Enabled" endif diff --git a/testautomation/math/optional/includes/m_105.inc b/testautomation/math/optional/includes/m_105.inc index 0caad76e7ec5..2f16f4247854 100644 --- a/testautomation/math/optional/includes/m_105.inc +++ b/testautomation/math/optional/includes/m_105.inc @@ -408,7 +408,8 @@ testcase tToolsCatalog SymboleMath.close catch if ((2=i)AND(11=j))then - warnlog "#i42011# Expected: Timeout on closing Tools->Catalog with this character. (" + i + "/" + iSymbolSets + ")(" + j + "/" + x(i) + ")" + '#i42011# + warnlog "Expected: Timeout on closing Tools->Catalog with this character. (" + i + "/" + iSymbolSets + ")(" + j + "/" + x(i) + ")" else warnlog "Not Expected! Timeout on closing Tools->Catalog with this character. (" + i + "/" + iSymbolSets + ")(" + j + "/" + x(i) + ")" endif @@ -570,7 +571,8 @@ testcase tToolsCatalogNew try SymbolSet.select "TBOnewSymbolSet" catch - qaerrorlog "#i64504# Symbol set name is not saved on exiting OOo" + 'i64504 + qaerrorlog "Symbol set name is not saved on exiting OOo" SymbolSet.select "" endcatch SymbolSet.setText "TBOnewSymbolSet" diff --git a/testautomation/math/required/includes/m_001_.inc b/testautomation/math/required/includes/m_001_.inc index 7ddffee84d29..85546a0e222a 100755 --- a/testautomation/math/required/includes/m_001_.inc +++ b/testautomation/math/required/includes/m_001_.inc @@ -205,7 +205,8 @@ testcase tmFilePassword if ( SpeichernDlg.exists( 2 ) ) then Dateiname.SetText Datei$ if (Passwort.IsChecked <> TRUE) then - Warnlog "#i36015# Password has to be checked! :-(" + '#i36015# + Warnlog "Password has to be checked! :-(" Passwort.Check printlog "will be forced checked no!" endif @@ -255,7 +256,8 @@ testcase tmFilePassword Kontext "SpeichernDlg" Dateiname.SetText Datei$ if (Passwort.IsChecked <> TRUE) then - Warnlog "#i36015# Password has to be checked! :-(" + '#i36015# + Warnlog "Password has to be checked! :-(" Passwort.Check printlog "will be forced checked no!" endif diff --git a/testautomation/math/required/includes/m_005_.inc b/testautomation/math/required/includes/m_005_.inc index f2c2a5d0ca60..a7884f29f8a2 100644 --- a/testautomation/math/required/includes/m_005_.inc +++ b/testautomation/math/required/includes/m_005_.inc @@ -298,7 +298,8 @@ testcase tToolsExtensionManager ExtensionSoftwareLicenseAgreement.CANCEL kontext if active.exists(5) then - qaerrorlog "#i73307# Alzheimer feature extension licensing '" + active.getText + "'" + '#i73307# + warnlog "Alzheimer feature extension licensing '" + active.getText + "'" active.ok endif endif diff --git a/testautomation/math/required/includes/m_007_.inc b/testautomation/math/required/includes/m_007_.inc old mode 100755 new mode 100644 index fc8269c05c21..0b4c7c759ed3 --- a/testautomation/math/required/includes/m_007_.inc +++ b/testautomation/math/required/includes/m_007_.inc @@ -121,7 +121,8 @@ testcase tmHelpContents Printlog "HelpAbout: '" + HelpAbout.GetItemCount +"'" catch Index.Click - qaErrorLog "#i55563# Used Index Button" + '#i55563# + warnlog "Used Index Button" Printlog "HelpAbout: '" + HelpAbout.GetItemCount +"'" endcatch try -- cgit v1.2.3 From 5404b53cab99fdd392ae4dd60e1472c5accfe30f Mon Sep 17 00:00:00 2001 From: Thorsten Bosbach Date: Wed, 2 Feb 2011 11:03:16 +0100 Subject: Fix some changed constants --- .../framework/optional/includes/options_ooo_colors.inc | 10 ++++------ testautomation/math/optional/includes/m_105.inc | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'testautomation') diff --git a/testautomation/framework/optional/includes/options_ooo_colors.inc b/testautomation/framework/optional/includes/options_ooo_colors.inc index f7c68095e198..92489ecb15fc 100644 --- a/testautomation/framework/optional/includes/options_ooo_colors.inc +++ b/testautomation/framework/optional/includes/options_ooo_colors.inc @@ -40,8 +40,8 @@ testcase tOOoColors dim currentColor(4) as String dim chColor(4) as String - const DEFAULT_COLOR_COUNT = 99 - const CHANGED_COLOR_COUNT = 100 + const DEFAULT_COLOR_COUNT = 100 + const CHANGED_COLOR_COUNT = DEFAULT_COLOR_COUNT +1 const USER_COLOR = "TT-Test-Color" myColor(1) = USER_COLOR @@ -66,10 +66,8 @@ testcase tOOoColors printlog( "Check the number of currently registered colors - cancel test on error" ) Kontext "TabFarben" if ( Farbe.GetItemCount() <> DEFAULT_COLOR_COUNT ) then - warnlog( "The number of colors has changed, stopping test" ) - printlog( "Expected: " & DEFAULT_COLOR_COUNT ) - printlog( "Found...: " & Farbe.getItemCount() ) - printlog( "Close the Tools/Options dialog with OK" ) + warnlog "The number of colors has changed, stopping test; Expected: " & DEFAULT_COLOR_COUNT & "; Found...: " & Farbe.getItemCount() + printlog "Close the Tools/Options dialog with OK" Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK WaitSlot( 2000 ) diff --git a/testautomation/math/optional/includes/m_105.inc b/testautomation/math/optional/includes/m_105.inc index 2f16f4247854..48e45c41e1cb 100644 --- a/testautomation/math/optional/includes/m_105.inc +++ b/testautomation/math/optional/includes/m_105.inc @@ -453,8 +453,8 @@ testcase tToolsCatalog next j next i - if (listCount(lAllSymbols()) <> 106) then - warnlog "There have to be 106 Symbols, but there are: " + listCount(lAllSymbols()) + if (listCount(lAllSymbols()) <> 108) then + warnlog "There have to be 108 Symbols, but there are: " + listCount(lAllSymbols()) endif ' TODO: check sAllSymbols for not allowed characters! listCopy(lAllSymbols(),lAllSymbolsSort()) -- cgit v1.2.3