diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:41 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:41 +0100 |
commit | f2574337dbf0d5d22d18ddbf0e8295c2ee6f4f3e (patch) | |
tree | 2421fa506d7678110b547679b5b60473f44238b1 /testautomation/writer/optional/includes | |
parent | a3e3f719efe2d7ca6afff7acea0dd3d264419865 (diff) | |
parent | 5d7f1bb1e74ae49ae7215588d836bd1ca2004b10 (diff) |
Merge commit 'ooo/DEV300_m103'
Conflicts:
smoketestdoc/com/sun/star/comp/smoketest/makefile.mk
smoketestdoc/data/Global.xml
smoketestdoc/data/OptionsDlg.xml
smoketestdoc/data/Test_10er.xml
smoketestoo_native/data/content.xml
smoketestoo_native/makefile.mk
Diffstat (limited to 'testautomation/writer/optional/includes')
27 files changed, 70 insertions, 85 deletions
diff --git a/testautomation/writer/optional/includes/clipboard/clipbrd_func.inc b/testautomation/writer/optional/includes/clipboard/clipbrd_func.inc index 0c9f976b187b..c30bfd52d351 100644 --- a/testautomation/writer/optional/includes/clipboard/clipbrd_func.inc +++ b/testautomation/writer/optional/includes/clipboard/clipbrd_func.inc @@ -55,13 +55,8 @@ function wPasteAvailableClipboardFormats(TheNumber as integer, CheckWhat as Stri printlog "- Paste as: " + ClipboardFormat Select Case CheckWhat Case "ctext", "DRAW" - if lcase(gPlatform) = "sol" and lcase(ClipboardFormat) = "bitmap" then - QAErrorlog "#i49505#Paste drawing object as bitmap crashes office" - goto s_next_item - else - InhaltEinfuegen.Ok - Sleep 3 - end if + InhaltEinfuegen.Ok + Sleep 3 Case else InhaltEinfuegen.Ok Sleep 3 diff --git a/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc b/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc index 729659dfc54d..4965250e7c9f 100644 --- a/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc +++ b/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc @@ -177,8 +177,6 @@ endcase testcase tPickGraphic - Warnlog "#i115132#Missing .uno Slots in context menus" - goto endsub printlog "Open context menu on not focussed graphic" Call hNewDocument Printlog " Set zoom to 100%" @@ -267,9 +265,6 @@ endcase testcase tHyperlinkEdit - Warnlog "#i115132#Missing .uno Slots in context menus" - goto endsub - printlog "Context menu on hyperlinks" printlog " Open a new text document" CALL hNewDocument @@ -392,9 +387,6 @@ endcase testcase tPickDrawingObjects - Warnlog "#i115132#Missing .uno Slots in context menus" - goto endsub - printlog "Context menu on drawing objects" printlog " Open a new text document" Call hNewDocument diff --git a/testautomation/writer/optional/includes/drawing/w_drawing_tools1.inc b/testautomation/writer/optional/includes/drawing/w_drawing_tools1.inc index 659bb2a4ddb7..9537eb2ae948 100644 --- a/testautomation/writer/optional/includes/drawing/w_drawing_tools1.inc +++ b/testautomation/writer/optional/includes/drawing/w_drawing_tools1.inc @@ -221,7 +221,7 @@ testcase tPositionAndSize_2 Sleep 1 fPositionAndSize("TabPositionAndSizeWriter") - if Horizontalby.Gettext <> sPositionX then Warnlog "#i40845# X-Position is wrong: Not -> "+sPositionX+" but -> "+Horizontalby.Gettext + if Horizontalby.Gettext <> sPositionX then Warnlog "X-Position is wrong: Not -> "+sPositionX+" but -> "+Horizontalby.Gettext if Verticalby.Gettext <> sPositionY then Warnlog "Y-Position is wrong: Not -> "+sPositionY+" but -> "+Verticalby.Gettext TabPositionAndSizeWriter.Cancel diff --git a/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc b/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc index 08ebbfed45d4..17babc991f7e 100644 --- a/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc +++ b/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc @@ -300,7 +300,7 @@ testcase tGroup_6 PrintLog "- Set the focus to rectangle , check if it is moved (Should NOT)" Call gMouseClick(41,40) Call fPositionAndSize("TabPositionAndSizeWriter") - if Horizontalby.Gettext <> sPositionX1 then Warnlog "#i106719#Rectangle should NOT be moved: X Not -> "+sPositionX1+" but -> "+ Horizontalby.Gettext + if Horizontalby.Gettext <> sPositionX1 then Warnlog "Rectangle should NOT be moved: X Not -> "+sPositionX1+" but -> "+ Horizontalby.Gettext if Verticalby.Gettext <> sPositionY1 then Warnlog "Rectangle should NOT be moved: Y Not -> "+sPositionY1+" but -> "+ Verticalby.Gettext TabPositionAndSizeWriter.Cancel @@ -371,7 +371,7 @@ testcase tGroup_7 PrintLog "- Set the focus to rectangle , check if it is moved (Should NOT)." Call gMouseClick(40,40) Call fPositionAndSize("TabPositionAndSizeWriter") - if Horizontalby.Gettext <> sPositionX1 then Warnlog "#i106719#Rectangle should NOT be moved: X Not -> "+sPositionX1+" but -> "+ Horizontalby.Gettext + if Horizontalby.Gettext <> sPositionX1 then Warnlog "Rectangle should NOT be moved: X Not -> "+sPositionX1+" but -> "+ Horizontalby.Gettext if Verticalby.Gettext <> sPositionY1 then Warnlog "Rectangle should NOT be moved: Y Not -> "+sPositionY1+" but -> "+ Verticalby.Gettext TabPositionAndSizeWriter.Cancel diff --git a/testautomation/writer/optional/includes/fields/w_fields2.inc b/testautomation/writer/optional/includes/fields/w_fields2.inc index 168fed204ebe..4ac611f39aa6 100644 --- a/testautomation/writer/optional/includes/fields/w_fields2.inc +++ b/testautomation/writer/optional/includes/fields/w_fields2.inc @@ -955,7 +955,7 @@ testcase tDocumentTemplate if GetClipboard <> sResult(i-1) then select case i-1 case 0 - QAErrorlog "#i70342#Field 'Templates->Category' is empty" + Warnlog "Field 'Templates->Category' is empty" case else Warnlog " - Should get " & sResult(i-1) & " but get " & GetClipboard end select diff --git a/testautomation/writer/optional/includes/fields/w_fields3.inc b/testautomation/writer/optional/includes/fields/w_fields3.inc index 64261c7e1ac6..c2fe3d5d27f6 100644 --- a/testautomation/writer/optional/includes/fields/w_fields3.inc +++ b/testautomation/writer/optional/includes/fields/w_fields3.inc @@ -278,7 +278,7 @@ testcase tInsertReferenceChapter Call wTypeKeys "<Shift Home>" if fGetFieldContent( ) <> "2" then - Warnlog "#i40625# Should get 2 , but get " & fGetFieldContent() + Warnlog "Should get 2 , but get " & fGetFieldContent() end if '/// Close the document @@ -776,7 +776,7 @@ testcase tInsertBookmarkChapter Call wTypeKeys "<Shift Home>" if fGetFieldContent( ) <> "2" then - Warnlog "#i40625# Should get 2 , but get " & fGetFieldContent() + Warnlog "Should get 2 , but get " & fGetFieldContent() end if '/// Close the document diff --git a/testautomation/writer/optional/includes/fields/w_fields4.inc b/testautomation/writer/optional/includes/fields/w_fields4.inc index 315c6b0f96d3..459e91da7912 100644 --- a/testautomation/writer/optional/includes/fields/w_fields4.inc +++ b/testautomation/writer/optional/includes/fields/w_fields4.inc @@ -261,7 +261,7 @@ endcase '----------------------------------------------------------------- testcase tDocInformationUserDefined - QAErrorLog "#i112077#Tabpage 'Custom properties' has no declaration" + Warnlog "#i95523#Tabpage 'Custom properties' has no declaration" goto endsub Dim sTestFile as String Dim sVarResult() as String diff --git a/testautomation/writer/optional/includes/fields/w_fields5.inc b/testautomation/writer/optional/includes/fields/w_fields5.inc index 75f94e8a3351..6ff7f2c1701d 100644 --- a/testautomation/writer/optional/includes/fields/w_fields5.inc +++ b/testautomation/writer/optional/includes/fields/w_fields5.inc @@ -182,7 +182,7 @@ testcase tVariablesSetValueToNumber for i = 0 to j Call wTypeKeys "<Shift Right>" if fGetFieldContent() <> sResult(i) then - QaErrorLog i & "#i94596# - Should get " & sResult(i) & " but get " & fGetFieldContent() + Warnlog i & "Should get " & sResult(i) & " but get " & fGetFieldContent() end if Call wTypeKeys "<Down><Home>" next i @@ -194,8 +194,6 @@ endcase '----------------------------------------------------------------- testcase tVariablesSetFormats - qaerrorlog "#i94596# - tVariablesSetFormats outcommented due to bug." - goto endsub Dim sName as String Dim sValue as String diff --git a/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc b/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc index df216304ea2e..9cfd50567a78 100644 --- a/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc +++ b/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc @@ -225,7 +225,7 @@ testcase tFormatCharacter3 Kontext active.SetPage TabHyperlinkZeichen kontext "TabHyperlinkZeichen" - if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "##i105855##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 "#i105855#Wrong Linkname : " + NameText.GetText if TargetFrame.GetSelIndex <> 2 then Warnlog "#i105855#Wrong Target selected : " + TargetFrame.GetSelText diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc index a7393d50f6df..ef6280b51cfd 100644 --- a/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc +++ b/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc @@ -753,7 +753,7 @@ testcase tFormatPage_13 if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 - if Seitennummer.GetText <> sPage2 then Warnlog "#i40333# 2nd pic isn't in page 3 !" + if Seitennummer.GetText <> sPage2 then Warnlog "2nd pic isn't in page 3 !" fCloseNavigator Wait 500 @@ -810,7 +810,7 @@ testcase tFormatPage_14 if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 - if Seitennummer.GetText <> sPage2 then Warnlog "#i40333# 2nd pic isn't in page 4 !" + if Seitennummer.GetText <> sPage2 then Warnlog "2nd pic isn't in page 4 !" fCloseNavigator Wait 500 diff --git a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc index 7c31482e37af..686c246d0400 100644 --- a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc +++ b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc @@ -939,7 +939,7 @@ testcase tParagraphIndent13 if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 - if Seitennummer.GetText <> "8" then Warnlog "#i73903#The 8th line should be in 8th page !" + if Seitennummer.GetText <> "8" then Warnlog "The 8th line should be in 8th page !" fCloseNavigator '/// check if the pic moves @@ -1008,7 +1008,7 @@ testcase tParagraphIndent14 if Not Navigator.Exists then ViewNavigator Kontext "NavigatorWriter" Sleep 1 - if Seitennummer.GetText <> "8" then Warnlog "#i73903#The 8th line should be in 8th page !" + if Seitennummer.GetText <> "8" then Warnlog "The 8th line should be in 8th page !" fCloseNavigator '/// check if the pic moves diff --git a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc index d204f8f2e02c..7d34b25d886a 100644 --- a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc +++ b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc @@ -197,7 +197,7 @@ testcase tParagraphAlignment4 Call fPositionAndSize("TabPositionAndSizeWriter") if fCalculateTolerance(Horizontalby.Gettext , sPositionX1) > 0.02 then if gPlatGroup = "unx" then - QaErrorLog "#i94769# - Different font-sizes under Linux/Unix compared with windows." + Warnlog "Different font-sizes under Linux/Unix compared with windows." else Warnlog "Alignment Justified doesn't work -1 !" end if @@ -210,7 +210,7 @@ testcase tParagraphAlignment4 Call fPositionAndSize("TabPositionAndSizeWriter") if Horizontalby.Gettext <> sPositionX2 then if gPlatGroup = "unx" then - QaErrorLog "#i94769# - Different font-sizes under Linux/Unix compared with windows." + Warnlog "Different font-sizes under Linux/Unix compared with windows." else warnlog "Alignment Justified doesn't work -2 !" end if @@ -310,7 +310,7 @@ testcase tParagraphAlignment6 Call fPositionAndSize("TabPositionAndSizeWriter") if Horizontalby.Gettext <> sPositionX1 then if gPlatGroup = "unx" then - QaErrorLog "#i94769# - Different font-sizes under Linux/Unix compared with windows." + Warnlog "Different font-sizes under Linux/Unix compared with windows." else warnlog "Alignment Justified doesn't work -1 !" end if diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc index 4e670f290f13..1def138817b4 100644 --- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc +++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc @@ -653,7 +653,7 @@ testcase tInsertGraphic_10 Call wTypeKeys ( "<Shift F4>" ) sleep(1) if fFormatGraphic("TabZusaetze") = false then - Warnlog "#i46300#linked JPEG pictures will disappear when doc is modified." + Warnlog "#linked JPEG pictures will disappear when doc is modified." kontext "TabZusatze" if ( TabZusaetze.exists() ) then TabZusaetze.close() diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc index 1a3624487ffb..2a161b2200d1 100644 --- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc +++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc @@ -903,7 +903,7 @@ testcase tInsertGraphic_29 fFormatGraphic("TabUmlauf") Sleep 1 - if Parallel.IsChecked <> TRUE then QaErrorLog "#i94558# - Graphic wrapping situation is wrong !" + if Parallel.IsChecked <> TRUE then Warnlog "Graphic wrapping situation is wrong !" if ErsterAbsatz.IsChecked <> TRUE then Warnlog "first paragraph configuration is wrong !" TabUmlauf.Cancel @@ -960,7 +960,7 @@ testcase tInsertGraphic_30 fFormatGraphic("TabUmlauf") Sleep 1 - if Parallel.IsChecked <> TRUE then QaErrorLog "#i94558# - Graphic wrapping situation is wrong !" + if Parallel.IsChecked <> TRUE then Warnlog "Graphic wrapping situation is wrong !" TabUmlauf.Cancel PrintLog " 3. Optimal Page Wrap:" @@ -1013,7 +1013,7 @@ testcase tInsertGraphic_30 fFormatGraphic("TabUmlauf") Sleep 1 - if Parallel.IsChecked <> TRUE then QaErrorLog "#i94558# - Graphic wrapping situation is wrong !" + if Parallel.IsChecked <> TRUE then Warnlog "Graphic wrapping situation is wrong !" if ErsterAbsatz.IsChecked <> TRUE then Warnlog "first paragraph configuration is wrong !" TabUmlauf.Cancel diff --git a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc index 33768d6ffc38..2598c2b5f912 100644 --- a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc +++ b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc @@ -80,7 +80,7 @@ testcase tExportAllReadableFormatsIntoODF if GetExtention ( sExportFile ) = "psw" then QAErrorlog "#i102221#Pocket Word filter puts General I/O Error" elseif LCase( sExceptionFile ) = "swdos.txt" then - QAErrorlog "#i114062#General I/O error loading StarWriter DOS file" + Warnlog "General I/O error loading StarWriter DOS file" else Call hFileOpenLocally( ImportFileList(i) ) printlog "- done" diff --git a/testautomation/writer/optional/includes/navigator/w_navigator.inc b/testautomation/writer/optional/includes/navigator/w_navigator.inc index e164bce470be..1750b4de3950 100644 --- a/testautomation/writer/optional/includes/navigator/w_navigator.inc +++ b/testautomation/writer/optional/includes/navigator/w_navigator.inc @@ -80,13 +80,13 @@ testcase tViewNavigator1 try Navigator.Size (300, 400) catch - Warnlog "Sizen Navigator doesn't work.. see #i32449" + Warnlog "Sizen Navigator doesn't work" endcatch Sleep 1 try Navigator.Size (xSize%, ySize%) catch - Printlog "Sizen Navigator doesn't work.. see #i32449" + Printlog "Sizen Navigator doesn't work" endcatch Sleep 1 @@ -176,12 +176,12 @@ testcase tViewNavigator2 try DocumentWriter.FadeOut catch - Warnlog "#i35096#Unable to Fade out Navigator!" + Warnlog "Unable to Fade out Navigator!" endcatch try DocumentWriter.FadeIn catch - Warnlog "#i35096#Unable to Fade out Navigator!" + Warnlog "Unable to Fade out Navigator!" endcatch Kontext "Navigator" @@ -231,7 +231,7 @@ testcase tViewNavigator3 Navigation.TearOff NavigationTearOff = true catch - Warnlog "Unable to tear off Navigation Toolbar! (#i32092)" + Warnlog "Unable to tear off Navigation Toolbar!" endcatch if NavigationTearOff = true then Sleep 1 diff --git a/testautomation/writer/optional/includes/number/w_205_.inc b/testautomation/writer/optional/includes/number/w_205_.inc index ade7afe66ad2..2d9c844ff922 100644 --- a/testautomation/writer/optional/includes/number/w_205_.inc +++ b/testautomation/writer/optional/includes/number/w_205_.inc @@ -274,35 +274,35 @@ testcase tFormatNumberingPosition Active.SetPage TabPositionNumerierung Kontext "TabPositionNumerierung" Level.Select 1 -' if Alignment.GetSelIndex <> 2 then Warnlog "#i38904#Level 1: Wrong alignment: Should = 2 Ist = "+ Alignment.GetSelIndex +' if Alignment.GetSelIndex <> 2 then Warnlog "Level 1: Wrong alignment: Should = 2 Ist = "+ Alignment.GetSelIndex if V1 <> AlignedAt.GetText then Warnlog "Level 1: Wrong Text <-> Rand: Should = "+ V1+ " Is = "+ AlignedAt.GetText if V2 <> IndentAt.GetText then Warnlog "Level 1: Wrong indent: Should = "+ V2+ " Is = "+ IndentAt.GetText Level.Select 3 ' if Not Relativ.IsChecked then Warnlog "Relativ is checked in Level 3!" - if Alignment.GetSelIndex <> 3 then Warnlog "#i38904#Level 3: Wrong alignment: Should = 3 Is = "+ Alignment.GetSelIndex + if Alignment.GetSelIndex <> 3 then Warnlog "Level 3: Wrong alignment: Should = 3 Is = "+ Alignment.GetSelIndex if V3 <> AlignedAt.GetText then Warnlog "Level 3: Wrong Text <-> Spacing to text: Should = "+ V3+ " Is = "+ AlignedAt.GetText ' if V4 <> AbstandTextNumerierung.GetText then Warnlog "Level 3: Wrong indent: Should = "+ V4+ " Is = "+ AbstandTextNumerierung.GetText Level.Select 4 ' if Not Relativ.IsChecked then Warnlog "Relativ is checked in Level 4!" - if Alignment.GetSelIndex <> 1 then Warnlog "#i38904#Level 4: Wrong alignment: Should = 1 Is = "+ Alignment.GetSelIndex + if Alignment.GetSelIndex <> 1 then Warnlog "Level 4: Wrong alignment: Should = 1 Is = "+ Alignment.GetSelIndex if V5 <> AlignedAt.GetText then Warnlog "Level 4: Wrong Text <-> Spacing to text: Should = "+ V5+ " Is = "+ AlignedAt.GetText ' if V6 <> AbstandTextNumerierung.GetText then Warnlog "Level 4: Wrong indent: Should = "+ V6+ " Is = "+ AbstandTextNumerierung.GetText if V7 <> IndentAt.GetText then Warnlog "Level 4: Wrong indent: Should = "+ V7+ " Is = "+ IndentAt.GetText Level.Select 6 ' if Not Relativ.IsChecked then Warnlog "Relativ is checked in Level 6!" - if Alignment.GetSelIndex <> 3 then Warnlog "#i38904#Level 6: Wrong alignment: Should = 3 Is = "+ Alignment.GetSelIndex + if Alignment.GetSelIndex <> 3 then Warnlog "Level 6: Wrong alignment: Should = 3 Is = "+ Alignment.GetSelIndex if V8 <> AlignedAt.GetText then Warnlog "Level 6: Wrong Text <-> Spacing to text: Should = "+ V8+ " Is = "+ AlignedAt.GetText ' if V9 <> AbstandTextNumerierung.GetText then Warnlog "Level 6: Wrong indent: Should = "+ V9+ " Is = "+ AbstandTextNumerierung.GetText if V10 <> IndentAt.GetText then Warnlog "Level 6: Wrong indent: Should = "+ V10+ " Is = "+ IndentAt.GetText Level.Select 9 ' if Not Relativ.IsChecked then Warnlog "Relativ is checked in Level 9!" - if Alignment.GetSelIndex <> 1 then Warnlog "#i38904#Level 9: Wrong alignment: Should = 1 Is = "+ Alignment.GetSelIndex + if Alignment.GetSelIndex <> 1 then Warnlog "Level 9: Wrong alignment: Should = 1 Is = "+ Alignment.GetSelIndex if V11 <> AlignedAt.GetText then Warnlog "Level 9: Wrong Text <-> Spacing to text: Should = "+ V11+ " Is = "+ AlignedAt.GetText ' if V12 <> AbstandTextNumerierung.GetText then Warnlog "Level 9: Wrong indent: Should = "+ V12+ " Is = "+ AbstandTextNumerierung.GetText if V13 <> IndentAt.GetText then Warnlog "Level 9: Wrong indent: Should = "+ V13+ " Is = "+ IndentAt.GetText Level.Select 10 ' if Not Relativ.IsChecked then Warnlog "Relativ is checked in Level 10!" - if Alignment.GetSelIndex <> 3 then Warnlog "#i38904#Level 10: Wrong alignment: Should = 3 Is = "+ Alignment.GetSelIndex + if Alignment.GetSelIndex <> 3 then Warnlog "Level 10: Wrong alignment: Should = 3 Is = "+ Alignment.GetSelIndex if V14 <> AlignedAt.GetText then Warnlog "Level 10: Wrong Text <-> Spacing to text: Should = "+ V14+ " Is = "+ AlignedAt.GetText ' if V15 <> AbstandTextNumerierung.GetText then Warnlog "Level 10: Wrong indent: Should = "+ V15+ " Is = "+ AbstandTextNumerierung.GetText if V16 <> IndentAt.GetText then Warnlog "Level 10: Wrong indent: Should = "+ V16+ " Is = "+ IndentAt.GetText @@ -324,35 +324,35 @@ testcase tFormatNumberingPosition Kontext "TabPositionNumerierung" Level.Select 1 - if Alignment.GetSelIndex <> 2 then Warnlog "#i38904#Level 1: Wrong alignment: Should = 2 Ist = "+ Alignment.GetSelIndex + if Alignment.GetSelIndex <> 2 then Warnlog "Level 1: Wrong alignment: Should = 2 Ist = "+ Alignment.GetSelIndex if V1 <> AlignedAt.GetText then Warnlog "Level 1: Wrong Text <-> Rand: Should = "+ V1+ " Is = "+ AlignedAt.GetText if V2 <> IndentAt.GetText then Warnlog "Level 1: Wrong indent: Should = "+ V2+ " Is = "+ IndentAt.GetText Level.Select 3 ' if Not Relativ.IsChecked then Relativ.Check - if Alignment.GetSelIndex <> 3 then Warnlog "#i38904#Level 3: Wrong alignment: Should = 3 Is = "+ Alignment.GetSelIndex + if Alignment.GetSelIndex <> 3 then Warnlog "Level 3: Wrong alignment: Should = 3 Is = "+ Alignment.GetSelIndex if V3 <> AlignedAt.GetText then Warnlog "Level 3: Wrong Text <-> Spacing to text: Should = "+ V3+ " Is = "+ AlignedAt.GetText ' if V4 <> AbstandTextNumerierung.GetText then Warnlog "Level 3: Wrong indent: Should = "+ V4+ " Is = "+ AbstandTextNumerierung.GetText Level.Select 4 ' if Not Relativ.IsChecked then Relativ.Check - if Alignment.GetSelIndex <> 1 then Warnlog "#i38904#Level 4: Wrong alignment: Should = 1 Is = "+ Alignment.GetSelIndex + if Alignment.GetSelIndex <> 1 then Warnlog "Level 4: Wrong alignment: Should = 1 Is = "+ Alignment.GetSelIndex if V5 <> AlignedAt.GetText then Warnlog "Level 4: Wrong Text <-> Spacing to text: Should = "+ V5+ " Is = "+ AlignedAt.GetText ' if V6 <> AbstandTextNumerierung.GetText then Warnlog "Level 4: Wrong indent: Should = "+ V6+ " Is = "+ AbstandTextNumerierung.GetText if V7 <> IndentAt.GetText then Warnlog "Level 4: Wrong indent: Should = "+ V7+ " Is = "+ IndentAt.GetText Level.Select 6 ' if Not Relativ.IsChecked then Relativ.Check - if Alignment.GetSelIndex <> 3 then Warnlog "#i38904#Level 6: Wrong alignment: Should = 3 Is = "+ Alignment.GetSelIndex + if Alignment.GetSelIndex <> 3 then Warnlog "Level 6: Wrong alignment: Should = 3 Is = "+ Alignment.GetSelIndex if V8 <> AlignedAt.GetText then Warnlog "Level 6: Wrong Text <-> Spacing to text: Should = "+ V8+ " Is = "+ AlignedAt.GetText ' if V9 <> AbstandTextNumerierung.GetText then Warnlog "Level 6: Wrong indent: Should = "+ V9+ " Is = "+ AbstandTextNumerierung.GetText if V10 <> IndentAt.GetText then Warnlog "Level 6: Wrong indent: Should = "+ V10+ " Is = "+ IndentAt.GetText Level.Select 9 ' if Not Relativ.IsChecked then Relativ.Check - if Alignment.GetSelIndex <> 1 then Warnlog "#i38904#Level 9: Wrong alignment: Should = 1 Is = "+ Alignment.GetSelIndex + if Alignment.GetSelIndex <> 1 then Warnlog "Level 9: Wrong alignment: Should = 1 Is = "+ Alignment.GetSelIndex if V11 <> AlignedAt.GetText then Warnlog "Level 9: Wrong Text <-> Spacing to text: Should = "+ V11+ " Is = "+ AlignedAt.GetText ' if V12 <> AbstandTextNumerierung.GetText then Warnlog "Level 9: Wrong indent: Should = "+ V12+ " Is = "+ AbstandTextNumerierung.GetText if V13 <> IndentAt.GetText then Warnlog "Level 9: Wrong indent: Should = "+ V13+ " Is = "+ IndentAt.GetText Level.Select 10 ' if Not Relativ.IsChecked then Relativ.Check - if Alignment.GetSelIndex <> 3 then Warnlog "#i38904#Level 10: Wrong alignment: Should = 3 Is = "+ Alignment.GetSelIndex + if Alignment.GetSelIndex <> 3 then Warnlog "Level 10: Wrong alignment: Should = 3 Is = "+ Alignment.GetSelIndex if V14 <> AlignedAt.GetText then Warnlog "Level 10: Wrong Text <-> Spacing to text: Should = "+ V14+ " Is = "+ AlignedAt.GetText ' if V15 <> AbstandTextNumerierung.GetText then Warnlog "Level 10: Wrong indent: Should = "+ V15+ " Is = "+ AbstandTextNumerierung.GetText if V16 <> IndentAt.GetText then Warnlog "Level 10: Wrong indent: Should = "+ V16+ " Is = "+ IndentAt.GetText diff --git a/testautomation/writer/optional/includes/number/w_205a_.inc b/testautomation/writer/optional/includes/number/w_205a_.inc index 385d2a5501f4..0d285395734d 100644 --- a/testautomation/writer/optional/includes/number/w_205a_.inc +++ b/testautomation/writer/optional/includes/number/w_205a_.inc @@ -866,7 +866,7 @@ testcase tToolsFootnoteEndnote if Davor.GetText <> "Hihi " then Warnlog "Endnote: 'Before' is wrong. Not 'Hihi ' but " + Davor.GetText if Dahinter.GetText <> " HaHa" then Warnlog "Endnote: Text after is wrong. Not ' HaHa' but " + Dahinter.GetText if Absatz.GetSelIndex <> 3 then Warnlog "Endnote: Wrong entry selected in paragraph. Not 3 but " + Absatz.GetSelIndex - if Seite.GetSelIndex <> 2 then Warnlog "#i40579#Endnote: Wrong Page entry selected. Not 2 but " + Seite.GetSelIndex + if Seite.GetSelIndex <> 2 then Warnlog "Endnote: Wrong Page entry selected. Not 2 but " + Seite.GetSelIndex if ZeichenvorlageTextbereich.GetSelIndex <> 4 then Warnlog "Endnote: Text area has been changed!" if ZeichenvorlageEndnotenbereich.GetSelIndex <> 5 then Warnlog "Endnote: Endnote area has been changed!" TabEndnoten.Cancel diff --git a/testautomation/writer/optional/includes/option/wh_o_2.inc b/testautomation/writer/optional/includes/option/wh_o_2.inc index ff58ce4e4f09..841af13dafec 100644 --- a/testautomation/writer/optional/includes/option/wh_o_2.inc +++ b/testautomation/writer/optional/includes/option/wh_o_2.inc @@ -114,7 +114,7 @@ testcase tToolsOptionsHTMLPrint ToolsOptions Call hToolsOptions ( "HTML" , "PRINT" ) - if ( bCheckboxStatus(1) = Grafiken.IsChecked ) Then WarnLog "#i108219#'Graphics' state changed" + if ( bCheckboxStatus(1) = Grafiken.IsChecked ) Then WarnLog "'Graphics' state changed" if ( bCheckboxStatus(2) = Kontrollfelder.IsChecked ) Then WarnLog "'Controls' state changed" if ( bCheckboxStatus(3) = Hintergrund.IsChecked ) Then WarnLog "'Background' state changed" if ( bCheckboxStatus(4) = SchwarzDrucken.IsChecked ) Then WarnLog "'Print black' state changed" diff --git a/testautomation/writer/optional/includes/redlining/w_redlining1.inc b/testautomation/writer/optional/includes/redlining/w_redlining1.inc index b08faaf6d8d8..f84205c34021 100644 --- a/testautomation/writer/optional/includes/redlining/w_redlining1.inc +++ b/testautomation/writer/optional/includes/redlining/w_redlining1.inc @@ -1149,7 +1149,7 @@ testcase tRedlining_16 try EditCopy catch - Warnlog "#i41424# Bullets cannot be removed by Del key" + Warnlog "Bullets cannot be removed by Del key" Call wTypeKeys "<Down><End>" Call wTypeKeys "<Shift Left>" EditCopy @@ -1199,7 +1199,7 @@ testcase tRedlining_16 try EditCopy catch - Warnlog "#i41424# Bullets cannot be removed by Del key" + Warnlog "Bullets cannot be removed by Del key" Call wTypeKeys "<Down><End>" Call wTypeKeys "<Shift Left>" EditCopy diff --git a/testautomation/writer/optional/includes/redlining/w_redlining2.inc b/testautomation/writer/optional/includes/redlining/w_redlining2.inc index 4b442a8b3464..f3930b8db721 100644 --- a/testautomation/writer/optional/includes/redlining/w_redlining2.inc +++ b/testautomation/writer/optional/includes/redlining/w_redlining2.inc @@ -440,7 +440,7 @@ testcase tAcceptReject_6 try AutoListe.Select 2 catch - QAErrorlog "#i99937#Change of author (User name) disregarded when changed during Office session" + Warnlog "Change of author (User name) disregarded when changed during Office session" Redlining.Close Call hCloseDocument goto endsub diff --git a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc index b10f029b1050..aa5cc4672277 100644 --- a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc +++ b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc @@ -123,7 +123,7 @@ testcase i64991 Kontext Active.Setpage TabSeite Kontext "TabSeite" - if Not Quer.IsChecked then Warnlog "#i64991#Setting a printer make the page styles to be lost" + if Not Quer.IsChecked then Warnlog "Setting a printer make the page styles to be lost" TabSeite.Cancel Call wTypeKeys ("<Down>") @@ -134,7 +134,7 @@ testcase i64991 Kontext Active.Setpage TabSeite Kontext "TabSeite" - if Not Hoch.IsChecked then Warnlog "#i64991#Setting a printer make the page styles to be lost" + if Not Hoch.IsChecked then Warnlog "Setting a printer make the page styles to be lost" TabSeite.Cancel end if diff --git a/testautomation/writer/optional/includes/section/w_section_2.inc b/testautomation/writer/optional/includes/section/w_section_2.inc index 1d79405dfd82..92aa69bff1d5 100644 --- a/testautomation/writer/optional/includes/section/w_section_2.inc +++ b/testautomation/writer/optional/includes/section/w_section_2.inc @@ -1038,7 +1038,7 @@ testcase tDisplaySection_9 end if if GetClipBoardtext <> shouldbe then - qaerrorlog "#i85766# - Copied text not correctly exported through the clipboard" ' "Problem with section" + Warnlog "Copied text not correctly exported through the clipboard" ' "Problem with section" end if Case 3 Call wTypeKeys "<Shift End>" diff --git a/testautomation/writer/optional/includes/shortcut/w_shortcuts.inc b/testautomation/writer/optional/includes/shortcut/w_shortcuts.inc index 22d64c36ed43..da1b7dd1704c 100644 --- a/testautomation/writer/optional/includes/shortcut/w_shortcuts.inc +++ b/testautomation/writer/optional/includes/shortcut/w_shortcuts.inc @@ -805,7 +805,7 @@ testcase tShortcutPasteUnformattedText printlog "- shortcut did work" else if gPlatgroup = "osx" then - Warnlog "#103102#It is not possible to customize the keyboard combination cmd+option on MAC OSX." + Warnlog "It is not possible to customize the keyboard combination cmd+option on MAC OSX." Call hCloseDocument goto endsub else diff --git a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc index a6dd6c18b997..df7e2c5dba34 100644 --- a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc +++ b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc @@ -69,7 +69,7 @@ testcase tToolsSpellcheckWithShortcut case 39 : Call wTypeKeys ("Don Cara Mio, capitoliooo?<Home>") case 49 : Call wTypeKeys ("Dies ist ein Rechtschreibtexxxxt<Home>") case 46 : Call wTypeKeys ("Det här är en rättstavningstexxxxt<Home>") - case 50 : Call wTypeKeys ("To je test črkvana<Home>") + case 50 : Call wTypeKeys ("To je test ?rkvana<Home>") case 07 : Printlog "- No Spellcheck in Russian!" goto endsub case 48 : Printlog "- No Spellcheck in Polish!" @@ -108,7 +108,7 @@ testcase tToolsSpellcheckWithShortcut printlog "OK, Spellchecker comes up" Spellcheck.Close 'closing spellchecker else - Warnlog "#i35000#Spellchecker does not come up with shortcut 'F7'" + Warnlog "Spellchecker does not come up with shortcut 'F7'" end if end if Call hCloseDocument @@ -169,7 +169,7 @@ testcase tToolsSpellcheckCorrect select case iSprache case 01 : FFText = "This is a text without any error.<Return>" case 03 : FFText = "Escreva os seus dados de utilizador correctamente e tome nota deles (guardar / imprimir).<Return>" - case 07 : FFText = "принятый Государственной Думой в первом чтении 16 ноября 1999 года.<Return>" + case 07 : FFText = "прин?тый Го?удар?твенной Думой в первом чтении 16 но?бр? 1999 года.<Return>" case 31 : FFText = "Dit werk is beschermd door de Auteurswet.<Return>" case 33 : FFText = "Il nous faut donc un de temps pour examiner avec soin tous les dossiers.<Return>" case 34 : FFText = "Este archivo contiene información importante sobre el programa.<Return>" @@ -235,9 +235,9 @@ testcase tToolsSpellcheck1Mistake case 03 : sErrorSampleText = "Escrive os seus dados de utilizador correctamente e tome nota deles." sWordToBeChecked = "Escrive" sLanguageName = "Português" - case 07 : sErrorSampleText = "Военная технического сaтрудничества, проблему задолженности и вопросы региональных связей." - sWordToBeChecked = "сaтрудничества" - sLanguageName = "Русский" + case 07 : sErrorSampleText = "Военна? техниче?кого ?aтрудниче?тва, проблему задолженно?ти и вопро?ы региональных ?в?зей." + sWordToBeChecked = "?aтрудниче?тва" + sLanguageName = "Ру??кий" case 31 : sErrorSampleText = "Wijek danken u voor uw interesse in het samenwerken met Sun Microsystems." sWordToBeChecked = "Wijek" sLanguageName = "Nederlands (NL)" @@ -267,7 +267,7 @@ testcase tToolsSpellcheck1Mistake sLanguageName = "Deutsch (Deutschland)" case 50 : sErrorSampleText = "Tuki je nekaj narobe." sWordToBeChecked = "Tuki" - sLanguageName = "Slovenščina" + sLanguageName = "Slovenš?ina" case 55 : sErrorSampleText = "Esta poderia ser a respista para suas preces?" sWordToBeChecked = "respista" sLanguageName = "Português (Brasil)" @@ -406,7 +406,7 @@ testcase tToolsSpellcheckForward case 46 : sDummy = "handbroken" : sWordToBeAdded = "viktikt" case 48 : sDummy = "znajdujacej" : sWordToBeAdded = "usuniete" case 49 : sDummy = "reichtt" : sWordToBeAdded = "viierter" - case 50 : sDummy = "Paglejmo" : sWordToBeAdded = "čtrto" + case 50 : sDummy = "Paglejmo" : sWordToBeAdded = "?trto" case 55 : sDummy = "horat" : sWordToBeAdded = "dpa" end select @@ -568,7 +568,7 @@ testcase tToolsSpellcheckOnlyOneWord select case iSprache case 01 : sWordToBeChecked = "excetionally" ' this word is wrong - case 07 : sWordToBeChecked = "Кaнституции" + case 07 : sWordToBeChecked = "Кaн?титуции" case 03 : sWordToBeChecked = "semstre" ' this word is wrong case 31 : sWordToBeChecked = "lidstartesn" ' this word is wrong case 33 : sWordToBeChecked = "heues" ' this word is wrong @@ -675,7 +675,7 @@ testcase tToolsSpellcheckOnlyOneWord try EditCopy if GetClipboardtext = sWordToBeChecked then - Warnlog "#i40498#Spellchecker does not commit changes correctly (" & GetClipboardtext & " found )" + Warnlog "Spellchecker does not commit changes correctly (" & GetClipboardtext & " found )" Call hCloseDocument goto endsub end if @@ -697,7 +697,7 @@ testcase tToolsSpellcheckOnlyOneWord if Active.Exists then if Active.GetRT = 304 then Active.Ok - Warnlog "#i40480#Spellchecker finishes though wrong words in documents" + Warnlog "Spellchecker finishes though wrong words in documents" end if end if catch diff --git a/testautomation/writer/optional/includes/stylist/w_stylist.inc b/testautomation/writer/optional/includes/stylist/w_stylist.inc index f5d3e706124d..ce607be28d30 100644 --- a/testautomation/writer/optional/includes/stylist/w_stylist.inc +++ b/testautomation/writer/optional/includes/stylist/w_stylist.inc @@ -112,13 +112,13 @@ testcase tFormatStylist1 try Stylist.Size 300, 400 catch - Warnlog "Sizen Stylist doesn't work.. see #i32449" + Warnlog "Sizen Stylist doesn't work" endcatch Sleep 1 try Stylist.Size xSize%, ySize% catch - Warnlog "Sizen Stylist doesn't work.. see #i32449" + Warnlog "Sizen Stylist doesn't work" endcatch Sleep 1 @@ -498,7 +498,7 @@ testcase tFormatStylist6 Kontext Active.Setpage TabHyperlinkZeichen Kontext "TabHyperlinkZeichen" - if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "#i41171#TabHyperlink: URL is wrong " + URLName.Gettext + if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "TabHyperlink: URL is wrong " + URLName.Gettext TabHyperlinkZeichen.OK end if @@ -635,7 +635,7 @@ testcase tAssigningStyles1 printlog "More..." Select Case iSprache Case 01 : sStyles = Array("Clear formatting", "Default", "Heading 1", "Heading 2", "Heading 3", "Text body", "More...") - Case 07 : sStyles = Array("Отменить форматирование", "Базовый", "Заголовок 1", "Заголовок 2", "Заголовок 3", "Основной текст", "Дополнительно...") + Case 07 : sStyles = Array("Отменить форматирование", "Базовый", "Заголовок 1", "Заголовок 2", "Заголовок 3", "О?новной тек?т", "Дополнительно...") Case 31 : sStyles = Array("Opmaak wissen", "Kop 1", "Kop 2", "Kop 3", "Standaard", "Tekstblok", "Meer...") Case 33 : sStyles = Array("Effacer le formatage", "Corps de texte", "Par défaut", "Titre 1", "Titre 2", "Titre 3", "Autres...") Case 34 : sStyles = Array("Borrar formato", "Cuerpo de texto", "Encabezado 1", "Encabezado 2", "Encabezado 3", "Predeterminado", "Más...") @@ -645,10 +645,10 @@ testcase tAssigningStyles1 Case 48 : sStyles = Array("Wyczyść formatowanie", "Domyślnie", "Nagłówek 1", "Nagłówek 2", "Nagłówek 3", "Treść tekstu", "Więcej...") Case 49 : sStyles = Array("Formatierung löschen", "Standard", "Textkörper", "Überschrift 1", "Überschrift 2", "Überschrift 3", "Weitere...") Case 55 : sStyles = Array("Limpar formatação", "Corpo do texto", "Padrão", "Título 1", "Título 2", "Título 3", "Mais...") - Case 81 : sStyles = Array("書式設定の解除", "本文", "標準", "見出し 1", "見出し 2", "見出し 3", "詳細...") - Case 82 : sStyles = Array("서식 지우기", "기본값", "제목 1", "제목 2", "제목 3", "텍스트 본문", "자세히...") - Case 86 : sStyles = Array("清除格式", "默认", "标题 1", "标题 2", "标题 3", "正文", "更多(~M)...") - Case 88 : sStyles = Array("清除格式", "內文", "標題 1", "標題 2", "標題 3", "預設", "更多...") + Case 81 : sStyles = Array("書?設定?解除", "本文", "標準", "見出? 1", "見出? 2", "見出? 3", "詳細...") + Case 82 : sStyles = Array("서? 지우기", "기본값", "제목 1", "제목 2", "제목 3", "?스트 본문", "?세히...") + Case 86 : sStyles = Array("清除格?", "默认", "标题 1", "标题 2", "标题 3", "正文", "更多(~M)...") + Case 88 : sStyles = Array("清除格?", "內文", "標題 1", "標題 2", "標題 3", "?設", "更多...") Case 90 : sStyles = Array("Biçimlendirmeyi temizle", "Başlık 1", "Başlık 2", "Başlık 3", "Metin gövdesi", "Varsayılan", "Diğer...") Case else : Warnlog "Current language not supported. Please add styles to list!" Kontext "Textobjectbar" diff --git a/testautomation/writer/optional/includes/textframes/w_textframes2.inc b/testautomation/writer/optional/includes/textframes/w_textframes2.inc index 466b0c99ab15..c4cc19006f36 100644 --- a/testautomation/writer/optional/includes/textframes/w_textframes2.inc +++ b/testautomation/writer/optional/includes/textframes/w_textframes2.inc @@ -178,7 +178,7 @@ testcase tTextframes_19 Kontext "Active" if Active.Exists then - Warnlog "#i40348# The frame should move by keyboard!" + Warnlog "The frame should move by keyboard!" Active.Ok end if @@ -188,7 +188,7 @@ testcase tTextframes_19 Wait 500 if GetClipboardText <> sTestText then Warnlog "Something wrong in the test . Clipboard:" +GetClipboardText catch - Warnlog "#i40348#" + Warnlog "The frame should move by keyboard!" endcatch Call hCloseDocument |