From 49c2c19c46f38d6bf9b7f0c1d43dddc5bb9dde84 Mon Sep 17 00:00:00 2001 From: Helge Delfs Date: Wed, 27 Jan 2010 13:03:49 +0100 Subject: cbosdo01:#i107088#adaptions for removel of options in Autocorrection --- testautomation/global/win/tab_t_z.win | 9 +- .../optional/includes/global/g_autocorrection.inc | 18 +- .../includes/autocorrection/w_autocorrect1.inc | 374 ++++------------ .../includes/autocorrection/w_autocorrect2.inc | 498 ++++++++++----------- testautomation/writer/required/includes/w_007_.inc | 10 +- .../tools/includes/w_tools_autocorrection.inc | 2 - 6 files changed, 345 insertions(+), 566 deletions(-) (limited to 'testautomation') diff --git a/testautomation/global/win/tab_t_z.win b/testautomation/global/win/tab_t_z.win index aa054c4b8406..fa51ce5d2c71 100755 --- a/testautomation/global/win/tab_t_z.win +++ b/testautomation/global/win/tab_t_z.win @@ -170,14 +170,7 @@ MFStartwert cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE MFEndwert cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE *TabTypografisch HID_OFAPAGE_AUTOCORR_QUOTE -EinfacheErsetzen cui:Checkbox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_SGL_TYPO -DoppelteErsetzen cui:CheckBox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_TYPO -EinfachWortanfang cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STARTQUOTE -EinfachWortende cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE -EinfachStandard cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STD -DoppeltWortanfang cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_STARTQUOTE -DoppeltWortende cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_ENDQUOTE -DoppeltStandard cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_DBL_STD +LocalizedOptions HID_OFAPAGE_QUOTE_SW_CLB Zurueck HID_TABDLG_RESET_BTN *TabUmlauf HID_FRM_EXT diff --git a/testautomation/graphics/optional/includes/global/g_autocorrection.inc b/testautomation/graphics/optional/includes/global/g_autocorrection.inc index 21cda12dc6f4..7c0fa1e05614 100755 --- a/testautomation/graphics/optional/includes/global/g_autocorrection.inc +++ b/testautomation/graphics/optional/includes/global/g_autocorrection.inc @@ -390,7 +390,7 @@ endcase '------------------------------------------------------------------------------- testcase tToolsAutocorrectOption - const cEntryCount = 9 + const cEntryCount = 7 dim i as integer dim iEntryCount as integer dim sEntries (20, 2) as string @@ -407,14 +407,14 @@ testcase tToolsAutocorrectOption sEntries (4,2) = "*Hello* " '"_Hello_ " sEntries (5,1) = "URL Recognition" sEntries (5,2) = "It is www.ksta.de " - sEntries (6,1) = "Replace 1st... with 1^st..." - sEntries (6,2) = "1st " - sEntries (7,1) = "Replace 1/2 ... with û ..." - sEntries (7,2) = "1/2 " - sEntries (8,1) = "Replace dashes" - sEntries (8,2) = "Hello - Hrbert " - sEntries (9,1) = "Ignore double spaces" - sEntries (9,2) = "Hello this is 2 blanks " + 'sEntries (6,1) = "Replace 1st... with 1^st..." + 'sEntries (6,2) = "1st " + 'sEntries (7,1) = "Replace 1/2 ... with û ..." + 'sEntries (7,2) = "1/2 " + sEntries (6,1) = "Replace dashes" + sEntries (6,2) = "Hello - Hrbert " + sEntries (7,1) = "Ignore double spaces" + sEntries (7,2) = "Hello this is 2 blanks " Printlog "- Tools / Autocorrect -options" Call hNewDocument() diff --git a/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc b/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc index 229289cdb556..3f03c44ebddb 100755 --- a/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc +++ b/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc @@ -35,30 +35,9 @@ '* '* short description : Test the AutoCorrect/AutoFormat/Options '* -'************************************************************************ -'* -' #1 tOpenDialog_1 -' #1 tReplaceDashes_1 -' #1 tToolsAutocorrectOptions_1 -' #1 tToolsAutocorrectOptions_2 -' #1 tToolsAutocorrectOptions_3 -' #1 tToolsAutocorrectOptions_4_1 -' #1 tToolsAutocorrectOptions_4_2 -' #1 tToolsAutocorrectOptions_5 -' #1 tToolsAutocorrectOptions_6 -' #1 tToolsAutocorrectOptions_7 -' #1 tToolsAutocorrectOptions_8 -' #1 tToolsAutocorrectOptions_11 -' #1 tToolsAutocorrectOptions_12 -' #1 tToolsAutocorrectOptions_13 -' #1 tToolsAutocorrectOptions_14 -' #1 tToolsAutocorrectOptions_16 -' #1 tToolsAutocorrectOptions_18 -' #1 tToolsAutocorrectOptions_19 -'* '\*********************************************************************** -sub w_autocorrect_autoformat_1 +sub w_autocorrect1 printLog Chr(13) + "- Test the AutoCorrect/AutoFormat Options features" @@ -70,16 +49,14 @@ sub w_autocorrect_autoformat_1 Call tToolsAutocorrectOptions_4_1 'Automatic bold Call tToolsAutocorrectOptions_4_2 'Automatic underline Call tToolsAutocorrectOptions_5 'URL Recognition - Call tToolsAutocorrectOptions_6 'Replace 1st ... with 1^st... - Call tToolsAutocorrectOptions_7 'Replace 1/2 ... with ½ ... - Call tToolsAutocorrectOptions_8 'Replace dashes - Call tToolsAutocorrectOptions_11 'Ignore double spaces - Call tToolsAutocorrectOptions_12 'Apply numbering - Call tToolsAutocorrectOptions_13 'Apply Border - Call tToolsAutocorrectOptions_14 'Create Table - Call Ttoolsautocorrectoptions_16 'Remove Blank Paragraphs - Call Ttoolsautocorrectoptions_18 'Replace bullets with • - Call tToolsAutocorrectOptions_19 'Replace standard quotes with custom quotes + Call tToolsAutocorrectOptions_6 'Replace dashes + Call tToolsAutocorrectOptions_7 'Ignore double spaces + Call tToolsAutocorrectOptions_8 'Apply numbering + Call tToolsAutocorrectOptions_9 'Apply Border + Call tToolsAutocorrectOptions_10 'Create Table + Call tToolsAutocorrectOptions_11 'Remove Blank Paragraphs + Call tToolsAutocorrectOptions_12 'Replace bullets with • + Call tToolsAutocorrectOptions_13 'Replace standard quotes with custom quotes end sub @@ -210,9 +187,9 @@ testcase tToolsAutocorrectOptions_1 EditCopy if GetClipboardText <> "Aabbcc" then Warnlog "The content should NOT be changed before Autoformat! M:N T:N" - goto testend - else - + Call hCloseDocument + goto endsub + else Call wTypeKeys "" FormatAutoformatApply Call wTypeKeys "" @@ -250,95 +227,94 @@ endcase testcase tToolsAutocorrectOptions_2 - Dim testContent as String - Dim hopeResult as String - Dim hopeResultBeforeAutoformat as String - Dim hopeResultAfterAutoformat as String + Dim testContent as String + Dim hopeResult as String + Dim hopeResultBeforeAutoformat as String + Dim hopeResultAfterAutoformat as String - printLog "Test 'Correct TWo INitial CApital' " - '/// Test 'Correct TWo INitial CApital' - Call hNewDocument + printLog "Test 'Correct TWo INitial CApital' " + '/// Test 'Correct TWo INitial CApital' + Call hNewDocument '/// M:Y T:Y (default) - testContent = "TEst" - hopeResult = "Test" - Call wTypeKeys testContent - Call wTypeKeys " " - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResult then Warnlog "Something wrong in Correct TWo INitial CApital when M:Y T:Y" + testContent = "TEst" + hopeResult = "Test" + Call wTypeKeys testContent + Call wTypeKeys " " + Call wTypeKeys "" + EditCopy + if GetClipboardText <> hopeResult then Warnlog "Something wrong in Correct TWo INitial CApital when M:Y T:Y" - Call wTypeKeys "" + Call wTypeKeys "" '/// M:Y T:N - testContent = "TEst" - hopeResultBeforeAutoformat = "TEst" - hopeResultAfterAutoformat = "Test" + testContent = "TEst" + hopeResultBeforeAutoformat = "TEst" + hopeResultAfterAutoformat = "Test" - Call fAutocorrectOptions("CorrectTWoINitialCApitals") + Call fAutocorrectOptions("CorrectTWoINitialCApitals") - Call wTypeKeys testContent - Call wTypeKeys " " - Call wTypeKeys "" + Call wTypeKeys testContent + Call wTypeKeys " " + Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResultBeforeAutoformat then - Warnlog "The content should NOT be changed before Autoformat! M:Y T:N" - goto GOING1 - end if + EditCopy + if GetClipboardText <> hopeResultBeforeAutoformat then + Warnlog "The content should NOT be changed before Autoformat! M:Y T:N" + goto GOING1 + end if - Call wTypeKeys "" - FormatAutoformatApply - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResultAfterAutoformat then - Warnlog "The content should be changed after Autoformat!M:Y T:N" - end if + Call wTypeKeys "" + FormatAutoformatApply + Call wTypeKeys "" + EditCopy + if GetClipboardText <> hopeResultAfterAutoformat then + Warnlog "The content should be changed after Autoformat!M:Y T:N" + end if -GOING1: - Call wTypeKeys "" + GOING1: + Call wTypeKeys "" '/// M:N T:Y - testContent = "TEst" - hopeResult = "Test" + testContent = "TEst" + hopeResult = "Test" - Call fAutocorrectOptions("CorrectTWoINitialCApitals") + Call fAutocorrectOptions("CorrectTWoINitialCApitals") - Call wTypeKeys testContent - Call wTypeKeys " " - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResult then Warnlog "Something wrong in Correct TWo INitial CApital when M:N T:Y" + Call wTypeKeys testContent + Call wTypeKeys " " + Call wTypeKeys "" + EditCopy + if GetClipboardText <> hopeResult then Warnlog "Something wrong in Correct TWo INitial CApital when M:N T:Y" - Call wTypeKeys "" + Call wTypeKeys "" '/// M:N T:N - testContent = "TEst" - hopeResultBeforeAutoformat = "TEst" - hopeResultAfterAutoformat = "TEst" + testContent = "TEst" + hopeResultBeforeAutoformat = "TEst" + hopeResultAfterAutoformat = "TEst" - Call fAutocorrectOptions("CorrectTWoINitialCApitals") + Call fAutocorrectOptions("CorrectTWoINitialCApitals") - Call wTypeKeys testContent - Call wTypeKeys " " - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResultBeforeAutoformat then + Call wTypeKeys testContent + Call wTypeKeys " " + Call wTypeKeys "" + EditCopy + if GetClipboardText <> hopeResultBeforeAutoformat then Warnlog "The content should NOT be changed before Autoformat! M:N T:N" - goto testend - end if + Call hCloseDocument + end if - Call wTypeKeys "" - FormatAutoformatApply - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResultAfterAutoformat then + Call wTypeKeys "" + FormatAutoformatApply + Call wTypeKeys "" + EditCopy + if GetClipboardText <> hopeResultAfterAutoformat then Warnlog "The content should NOT be changed after Autoformat! M:N T:N" - end if + end if -testend: '/// Recover to the default M:Y T:Y - Call fAutocorrectOptions("CorrectTWoINitialCApitals") + Call fAutocorrectOptions("CorrectTWoINitialCApitals") Call hCloseDocument @@ -922,192 +898,6 @@ endcase testcase tToolsAutocorrectOptions_6 Dim testContent as String - - printLog "Replace 1st ... with 1^st..." - '/// Replace 1st ... with 1^st... - Call hNewDocument - - testContent = "1st" - - '/// M:Y T:Y (default) - Call wTypeKeys testContent - Call wTypeKeys " " - Call wTypeKeys "" - - fFormatCharacter("TabFontPosition") - if SuperScript.IsChecked <> TRUE then Warnlog "The superscript should be checked when M:Y T:Y" - Normal.Check - TabFontPosition.OK - - EditSelectAll - Call wTypeKeys "" - - '/// M:Y T:N - Call fAutocorrectOptions("Replace1st") - - Call wTypeKeys testContent - Call wTypeKeys " " - Call wTypeKeys "" - - fFormatCharacter("TabFontPosition") - if SuperScript.IsChecked = TRUE then Warnlog "The superscript should NOT be checked when M:Y T:N before autoformat!" - Normal.Check - TabFontPosition.OK - - FormatAutoformatApply - - fFormatCharacter("TabFontPosition") - if SuperScript.IsChecked <> TRUE then Warnlog "The superscript should be checked when M:Y T:N after autoformat!" - Normal.Check - TabFontPosition.OK - - EditSelectAll - Call wTypeKeys "" - - '/// M:N T:Y - Call fAutocorrectOptions("Replace1st") - - Call wTypeKeys testContent - Call wTypeKeys " " - Call wTypeKeys "" - - fFormatCharacter("TabFontPosition") - if SuperScript.IsChecked <> TRUE then Warnlog "The superscript should be checked when M:N T:Y" - Normal.Check - TabFontPosition.OK - - EditSelectAll - Call wTypeKeys "" - - '/// M:N T:N - Call fAutocorrectOptions("Replace1st") - - Call wTypeKeys testContent - Call wTypeKeys " " - Call wTypeKeys "" - - fFormatCharacter("TabFontPosition") - if SuperScript.IsChecked = TRUE then Warnlog "The superscript should NOT be checked when M:N T:N before autoformat!" - Normal.Check - TabFontPosition.OK - - FormatAutoformatApply - - fFormatCharacter("TabFontPosition") - if SuperScript.IsChecked = TRUE then Warnlog "The superscript should NOT be checked when M:N T:N after autoformat!" - Normal.Check - TabFontPosition.OK - - '/// Recover to the default M:Y T:Y - Call fAutocorrectOptions("Replace1st") - - Call hCloseDocument - - -endcase - -'------------------------------------------------------------------------- - -testcase tToolsAutocorrectOptions_7 - - Dim testContent as String - Dim hopeResult as String - Dim hopeResultBeforeAutoformat as String - Dim hopeResultAfterAutoformat as String - - printLog "Replace 1/2 ... with ½ ... " - '/// Replace 1/2 ... with ½ ... - Call hNewDocument - - '/// M:Y T:Y (default) - testContent = "1/2" - hopeResult = "½" - Call wTypeKeys testContent - Call wTypeKeys " " - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResult then Warnlog "Something wrong in Replace 1/2 ... with ½ ... M:Y T:Y" - - Call wTypeKeys "" - - '/// M:Y T:N - testContent = "1/2" - hopeResultBeforeAutoformat = "1/2" - hopeResultAfterAutoformat = "½" - - Call fAutocorrectOptions("Replace1/2") - Call wTypeKeys testContent - Call wTypeKeys " " - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResultBeforeAutoformat then - Warnlog "The content should NOT be changed before Autoformat! M:Y T:N" - goto GOING1 - end if - - Call wTypeKeys "" - FormatAutoformatApply - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResultAfterAutoformat then - Warnlog "The content should be changed after Autoformat!M:Y T:N" - end if - -GOING1: - Call wTypeKeys "" - - '/// M:N T:Y - testContent = "1/2" - hopeResult = "½" - - Call fAutocorrectOptions("Replace1/2") - Call wTypeKeys testContent - Call wTypeKeys " " - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResult then Warnlog "Something wrong in Replace 1/2 ... with ½ ... when M:N T:Y" - - Call wTypeKeys "" - - '/// M:N T:N - testContent = "1/2" - hopeResultBeforeAutoformat = "1/2" - hopeResultAfterAutoformat = "1/2" - - Call fAutocorrectOptions("Replace1/2") - - Call wTypeKeys testContent - Call wTypeKeys " " - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResultBeforeAutoformat then - Warnlog "The content should NOT be changed before Autoformat! M:N T:N" - goto testend - end if - - Call wTypeKeys "" - FormatAutoformatApply - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResultAfterAutoformat then - Warnlog "The content should NOT be changed after Autoformat! M:N T:N" - end if - -testend: - - '/// Recover to the default - Call fAutocorrectOptions("Replace1/2") - - Call hCloseDocument - - -endcase - -'------------------------------------------------------------------------- - -testcase tToolsAutocorrectOptions_8 - - Dim testContent as String Dim hopeResult as String Dim hopeResultBeforeAutoformat Dim hopeResultAfterAutoformat as String @@ -1201,7 +991,7 @@ endcase '------------------------------------------------------------------------- -testcase tToolsAutocorrectOptions_11 +testcase tToolsAutocorrectOptions_7 Dim testContent as String Dim hopeResult as String @@ -1242,7 +1032,7 @@ endcase '------------------------------------------------------------------------- -testcase tToolsAutocorrectOptions_12 +testcase tToolsAutocorrectOptions_8 Dim firstLine as String Dim testContent as String @@ -1292,7 +1082,7 @@ endcase '------------------------------------------------------------------------- -testcase tToolsAutocorrectOptions_13 +testcase tToolsAutocorrectOptions_9 Dim testList() as String Dim testContent as String @@ -1372,7 +1162,7 @@ endcase '------------------------------------------------------------------------- -testcase tToolsAutocorrectOptions_14 +testcase tToolsAutocorrectOptions_10 Dim testContent as String Dim hopeResult as String @@ -1425,7 +1215,7 @@ endcase '------------------------------------------------------------------------- -testcase tToolsAutocorrectOptions_16 +testcase tToolsAutocorrectOptions_11 Dim testContent1 as String Dim testContent2 as String @@ -1500,7 +1290,7 @@ endcase '------------------------------------------------------------------------- -testcase tToolsAutocorrectOptions_18 +testcase tToolsAutocorrectOptions_12 Dim testContent as String Dim hopeResultBeforeAutoformat as String @@ -1571,7 +1361,7 @@ endcase '------------------------------------------------------------------------- -testcase tToolsAutocorrectOptions_19 +testcase tToolsAutocorrectOptions_13 Dim testContent as String Dim hopeResultBeforeAutoformat as String diff --git a/testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc b/testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc index e627b1632c62..95e380fc13f6 100755 --- a/testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc +++ b/testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc @@ -35,86 +35,80 @@ '* '* short description : Test AutoCorrect/AutoFormat/Word Completion '* -'************************************************************************ -'* -' #1 tToolsAutocorrectWordCompletion_1 -' #1 tToolsAutocorrectWordCompletion_2 -' #1 tToolsAutocorrectWordCompletion_3 -' #1 tToolsAutocorrectWordCompletion_4 -' #1 tToolsAutocorrectWordCompletion_5 -'* '\*********************************************************************** -sub w_autocorrect_autoformat_2 +sub w_autocorrect2 printLog Chr(13) + "- Test the AutoCorrect/AutoFormat Word Completion features" Call tToolsAutocorrectWordCompletion_1 'Check the default settings Call tToolsAutocorrectWordCompletion_2 'Check entries Call tToolsAutocorrectWordCompletion_3 'Check list of suggestions can be "scrolled" Call tToolsAutocorrectWordCompletion_4 'Test Max entries - Call Ttoolsautocorrectwordcompletion_5 'Check 'When closing a document, save the list for later use in other documents' - + Call tToolsAutocorrectWordCompletion_5 'Check 'When closing a document, save the list for later use in other documents' + Call tToolsAutocorrectWordCompletion_6 + end sub '------------------------------------------------------------------------- testcase tToolsAutocorrectWordCompletion_1 - Dim iAcceptWith as String - Dim iEntriesNumber as Integer - Dim sMinWordLength as String - Dim sMaxEntries as String - Dim sMinMaxEntries as String - - iAcceptWith = 2 - iEntriesNumber = 0 - sMinWordLength = "10" - sMaxEntries = "500" - sMinMaxEntries = "50" - - 'Delete all entries in the list - fDeleteAllEntries() - - printLog "Check the default settings" - '/// Check the default settings - '/// - Check box "Enable word completion" (default: checked) - '/// - Check box "Append Space" (default: unchecked) - '/// - Check box "Show as tip" (default: unchecked) - '/// - Check box "Collect Words" (default: checked) - '/// - Check box "When closing a document, save the list for later use in other documents" (default: checked) - '/// - List box "Accept with" (Default = "Return") - '/// - Spin box "minimal number of characters" default = 10 - '/// - Spin box "Max. entries" (default =500, minimum = 50) - '/// - Box: "List of words collected" -- should be empty after Office restart. - - Call hNewDocument - - ToolsAutocorrect - Active.Setpage TabWortergaenzung - Kontext "TabWortergaenzung" - - if WoerterErgaenzen.IsChecked <> TRUE then Warnlog "Complete words should be checked ." - if AppendSpace.IsChecked = TRUE then Warnlog "Append space should be UNchecked ." - if AlsTipphilfe.IsChecked = TRUE then Warnlog "Show as tip should be UNchecked ." - if VorschlaegeSammeln.IsChecked <> TRUE then Warnlog "Collect suggestions should be checked ." - if KeepList.IsChecked <> TRUE then Warnlog "When closing a document, save the list for later use in other documents should be checked ." - if AnnehmenMit.GetSelIndex <> iAcceptWith then Warnlog "The Accept with should be 'Enter' ." - if MinWortlaenge.GetText <> sMinWordLength then Warnlog "#i40540# Min word length should be " + sMinWordLength - if MaxEintraege.GetText <> sMaxEntries then Warnlog "Max entries should be " + sMaxEntries - if GesammelteWorte.GetItemCount <> iEntriesNumber then Warnlog "Entries number should be " + iEntriesNumber - - MaxEintraege.SetText "49" - - TabWortergaenzung.OK - - ToolsAutocorrect - Active.Setpage TabWortergaenzung - Kontext "TabWortergaenzung" - if MaxEintraege.GetText <> sMinMaxEntries then Warnlog "Max entries should be " + sMinMaxEntries - MaxEintraege.SetText sMaxEntries - TabWortergaenzung.OK - - Call hCloseDocument + Dim iAcceptWith as String + Dim iEntriesNumber as Integer + Dim sMinWordLength as String + Dim sMaxEntries as String + Dim sMinMaxEntries as String + + iAcceptWith = 2 + iEntriesNumber = 0 + sMinWordLength = "10" + sMaxEntries = "500" + sMinMaxEntries = "50" + + printLog "Check the default settings" + '/// Check the default settings + '/// - Check box "Enable word completion" (default: checked) + '/// - Check box "Append Space" (default: unchecked) + '/// - Check box "Show as tip" (default: unchecked) + '/// - Check box "Collect Words" (default: checked) + '/// - Check box "When closing a document, save the list for later use in other documents" (default: checked) + '/// - List box "Accept with" (Default = "Return") + '/// - Spin box "minimal number of characters" default = 10 + '/// - Spin box "Max. entries" (default =500, minimum = 50) + '/// - Box: "List of words collected" -- should be empty after Office restart. + + Call hNewDocument + 'Delete all entries in the list + Call fDeleteAllEntries() + + ToolsAutocorrect + Kontext + Active.Setpage TabWortergaenzung + Kontext "TabWortergaenzung" + + if WoerterErgaenzen.IsChecked = False then Warnlog "Complete words should be checked ." + if AppendSpace.IsChecked = TRUE then Warnlog "Append space should be UNchecked ." + if AlsTipphilfe.IsChecked = TRUE then Warnlog "Show as tip should be UNchecked ." + if VorschlaegeSammeln.IsChecked <> TRUE then Warnlog "Collect suggestions should be checked ." + if KeepList.IsChecked = TRUE then Warnlog "When closing a document, remove the words collected from it from the list should be unchecked ." + if AnnehmenMit.GetSelIndex <> iAcceptWith then Warnlog "The Accept with should be 'Enter' ." + if MinWortlaenge.GetText <> sMinWordLength then Warnlog "#i40540# Min word length should be " + sMinWordLength + if MaxEintraege.GetText <> sMaxEntries then Warnlog "Max entries should be " + sMaxEntries + if GesammelteWorte.GetItemCount <> iEntriesNumber then Warnlog "Entries number should be " + iEntriesNumber + + MaxEintraege.SetText "49" + + TabWortergaenzung.OK + + ToolsAutocorrect + Kontext + Active.Setpage TabWortergaenzung + Kontext "TabWortergaenzung" + if MaxEintraege.GetText <> sMinMaxEntries then Warnlog "Max entries should be " + sMinMaxEntries + MaxEintraege.SetText sMaxEntries + TabWortergaenzung.OK + + Call hCloseDocument endcase @@ -122,66 +116,67 @@ endcase testcase tToolsAutocorrectWordCompletion_2 - Dim iDefaultEntriesNumber as Integer - Dim iEntriesNumber as Integer - Dim i as Integer - Dim sMinWordLength as String - - iDefaultEntriesNumber = 0 - iEntriesNumber = 3 - sMinWordLength = "5" - - 'Delete all entries in the list - fDeleteAllEntries() - - printLog "Check the default settings" - '/// Check entries - '/// delete all entries first - '/// input some test words - '/// check if some words should are remembered in the entries - '/// delete all entries - '/// close and reopen dialog, check entries again - - Call hNewDocument - - ToolsAutocorrect - Active.Setpage TabWortergaenzung - Kontext "TabWortergaenzung" - if GesammelteWorte.GetItemCount <> iDefaultEntriesNumber then - Warnlog "Entries number should be " + iDefaultEntriesNumber - Warnlog "No test for this case" - TabWortergaenzung.Cancel - Goto NoTest - end if - MinWortlaenge.SetText sMinWordLength - TabWortergaenzung.OK + Dim iDefaultEntriesNumber as Integer + Dim iEntriesNumber as Integer + Dim i as Integer + Dim sMinWordLength as String + + iDefaultEntriesNumber = 0 + iEntriesNumber = 3 + sMinWordLength = "5" + + printLog "Check the default settings" + '/// Check entries + '/// delete all entries first + '/// input some test words + '/// check if some words should are remembered in the entries + '/// delete all entries + '/// close and reopen dialog, check entries again + + Call hNewDocument + 'Delete all entries in the list + Call fDeleteAllEntries() + + ToolsAutocorrect + Kontext + Active.Setpage TabWortergaenzung + Kontext "TabWortergaenzung" + if GesammelteWorte.GetItemCount <> iDefaultEntriesNumber then + Warnlog "Entries number should be " + iDefaultEntriesNumber + Warnlog "No test for this case" + TabWortergaenzung.Cancel + Call hCloseDocument + end if + MinWortlaenge.SetText sMinWordLength + TabWortergaenzung.OK Call wTypeKeys "Hello World ! This is a StarOffice Test ." Sleep 3 ToolsAutocorrect + Kontext Active.Setpage TabWortergaenzung Kontext "TabWortergaenzung" - if GesammelteWorte.GetItemCount <> iEntriesNumber then Warnlog "Entries number should be " + iEntriesNumber - for i = 1 to GesammelteWorte.GetItemCount - GesammelteWorte.Select 1 - if EintragLoeschen.IsEnabled then - EintragLoeschen.Click - else - i = GesammelteWorte.GetItemCount + 1 - end if - next i - TabWortergaenzung.OK - Sleep 1 + if GesammelteWorte.GetItemCount <> iEntriesNumber then Warnlog "Entries number should be " + iEntriesNumber + for i = 1 to GesammelteWorte.GetItemCount + GesammelteWorte.Select 1 + if EintragLoeschen.IsEnabled then + EintragLoeschen.Click + else + i = GesammelteWorte.GetItemCount + 1 + end if + next i + TabWortergaenzung.OK + Sleep 1 ToolsAutocorrect + Kontext Active.Setpage TabWortergaenzung Kontext "TabWortergaenzung" if GesammelteWorte.GetItemCount <> iDefaultEntriesNumber then Warnlog "Entries number should be " + iDefaultEntriesNumber TabWortergaenzung.Cancel -NoTest: - Call hCloseDocument + Call hCloseDocument endcase @@ -189,34 +184,33 @@ endcase testcase tToolsAutocorrectWordCompletion_3 - Dim aTestWord() as String - Dim sPartOfTestWord as String - Dim i as Integer - Dim j as Integer + Dim aTestWord() as String + Dim sPartOfTestWord as String + Dim i as Integer + Dim j as Integer - aTestWord = Array( _ - "accessibility" , _ - "accomplish" , _ - "account" , _ - ) - j = UBound(aTestWord) + aTestWord = Array( _ + "accessibility" , _ + "accomplish" , _ + "account" , _ + ) + j = UBound(aTestWord) - sPartOfTestWord = "acc" + sPartOfTestWord = "acc" - printLog "Check list of suggestions can be 'scrolled'" - '/// Check list of suggestions can be 'scrolled' + printLog "Check list of suggestions can be 'scrolled'" + '/// Check list of suggestions can be 'scrolled' - '/// input some test words with first 3 letters are same - '/// forward with - '/// backwards with - '/// endless loop test + '/// input some test words with first 3 letters are same + '/// forward with + '/// backwards with + '/// endless loop test - 'Delete all entries in the list - fDeleteAllEntries() - - Call hNewDocument + Call hNewDocument + 'Delete all entries in the list + Call fDeleteAllEntries() - 'forward with + 'forward with For i = 0 to j Call wTypeKeys aTestWord(i) Call wTypeKeys "" @@ -239,7 +233,7 @@ testcase tToolsAutocorrectWordCompletion_3 Call wTypeKeys "" next i - 'endless loop test + 'endless loop test Call wTypeKeys sPartOfTestWord Call wTypeKeys "", j+1 Sleep 2 @@ -252,14 +246,11 @@ testcase tToolsAutocorrectWordCompletion_3 if GetClipboardText <> aTestWord(0) then Warnlog "#102535# Should be " +aTestWord(0) +" but get " +GetClipboardText Call wTypeKeys "" - 'backwards with + 'backwards with For i = j to 0 step -1 Call wTypeKeys sPartOfTestWord - Call wTypeKeys "", j - if i > 0 then Call wTypeKeys "", i - Sleep 2 Call wTypeKeys "" Sleep 2 @@ -271,7 +262,7 @@ testcase tToolsAutocorrectWordCompletion_3 Call wTypeKeys "" next i - 'endless loop test + 'endless loop test Call wTypeKeys sPartOfTestWord Call wTypeKeys "" Sleep 2 @@ -283,7 +274,7 @@ testcase tToolsAutocorrectWordCompletion_3 Sleep 2 if GetClipboardText <> aTestWord(j) then Warnlog "#102535# Should be " +aTestWord(j) +" but get " +GetClipboardText - Call hCloseDocument + Call hCloseDocument endcase @@ -291,30 +282,30 @@ endcase testcase tToolsAutocorrectWordCompletion_4 - Dim sDefaultMaxEntries as String - Dim sTestMaxEntries as String - Dim sTestFile as String - Dim iTestMaxEntries as Integer - - sDefaultMaxEntries = "500" - sTestMaxEntries = "50" - sTestFile = "tToolsAutocorrectWordCompletion_4.sxw" - iTestMaxEntries = 50 + Dim sDefaultMaxEntries as String + Dim sTestMaxEntries as String + Dim sTestFile as String + Dim iTestMaxEntries as Integer - printLog "Test Max entries" - '/// Test Max entries + sDefaultMaxEntries = "500" + sTestMaxEntries = "50" + sTestFile = "tToolsAutocorrectWordCompletion_4.sxw" + iTestMaxEntries = 50 - '/// Delete all entries in the list - '/// set Max entries to 50 - '/// Open the test file ( The entries number is > 50 when Max entries is 500) - '/// check the number of entries. + printLog "Test Max entries" + '/// Test Max entries - 'Delete all entries in the list - fDeleteAllEntries() + '/// Delete all entries in the list + '/// set Max entries to 50 + '/// Open the test file ( The entries number is > 50 when Max entries is 500) + '/// check the number of entries. - Call hNewDocument + Call hNewDocument + 'Delete all entries in the list + Call fDeleteAllEntries() ToolsAutocorrect + Kontext Active.Setpage TabWortergaenzung Kontext "TabWortergaenzung" MaxEintraege.SetText sTestMaxEntries @@ -324,15 +315,16 @@ testcase tToolsAutocorrectWordCompletion_4 Sleep 4 ToolsAutocorrect + Kontext Active.Setpage TabWortergaenzung Kontext "TabWortergaenzung" if GesammelteWorte.GetItemCount > iTestMaxEntries then Warnlog "Entries number should be less than " + iTestMaxEntries - 'Recover to default - MaxEintraege.SetText sDefaultMaxEntries - TabWortergaenzung.OK + 'Recover to default + MaxEintraege.SetText sDefaultMaxEntries + TabWortergaenzung.OK - Call hCloseDocument + Call hCloseDocument endcase @@ -340,154 +332,160 @@ endcase testcase tToolsAutocorrectWordCompletion_5 - Dim sTestWord1 as String - Dim sTestWord2 as String - Dim sTestWord3 as String - Dim iEntriesNumber_Checked as Integer - Dim iEntriesNumber_UnChecked as Integer - - sTestWord1 = "kilometer " - sTestWord2 = "entertainment " - sTestWord3 = "education " - iEntriesNumber_Checked = 3 - iEntriesNumber_UnChecked = 1 - - printLog "Check 'When closing a document, save the list for later use in other documents'" - '/// Check 'When closing a document, save the list for later use in other documents' - '/// delete all entries first. - '/// 1) check when the checkbox is checked - '/// a) Open a file, type "kilometer" - '/// b) Open 2nd file, type "entertainment" and "education" - '/// c) Close 2nd file, the number of entries in first file should be 3 - '/// 2) check when the checkbox is Unchecked - '/// delete all entries , and Uncheck the testing checkbox - '/// a) Open a file, type "kilometer" - '/// b) Open 2nd file, type "entertainment" and "education" - '/// c) Close 2nd file, the number of entries in first file should be 1 - - 'Test when checkbox is checkec -- default - - 'Open 1st file - Call hNewDocument + Dim sTestWord1 as String + Dim sTestWord2 as String + Dim sTestWord3 as String + Dim iEntriesNumber_Checked as Integer + Dim iEntriesNumber_UnChecked as Integer + + sTestWord1 = "kilometer " + sTestWord2 = "entertainment " + sTestWord3 = "education " + iEntriesNumber_Checked = 3 + iEntriesNumber_UnChecked = 1 + + printLog "Check 'When closing a document, save the list for later use in other documents'" + '/// Check 'When closing a document, save the list for later use in other documents' + '/// delete all entries first. + '/// 1) check when the checkbox is checked + '/// a) Open a file, type "kilometer" + '/// b) Open 2nd file, type "entertainment" and "education" + '/// c) Close 2nd file, the number of entries in first file should be 3 + '/// 2) check when the checkbox is Unchecked + '/// delete all entries , and Uncheck the testing checkbox + '/// a) Open a file, type "kilometer" + '/// b) Open 2nd file, type "entertainment" and "education" + '/// c) Close 2nd file, the number of entries in first file should be 1 + + 'Test when checkbox is checkec -- default + + 'Open 1st file + Call hNewDocument 'Delete all entries in the list - fDeleteAllEntries() + Call fDeleteAllEntries() - Call wTypeKeys sTestWord1 + ' check checkbox + ToolsAutocorrect + Kontext + Active.Setpage TabWortergaenzung + Kontext "TabWortergaenzung" + KeepList.UnCheck + TabWortergaenzung.Ok + + Call wTypeKeys sTestWord1 'Open 2nd file - Call hNewDocument + Call hNewDocument - Call wTypeKeys sTestWord2 - Call wTypeKeys sTestWord3 + Call wTypeKeys sTestWord2 + Call wTypeKeys sTestWord3 ToolsAutocorrect + Kontext Active.Setpage TabWortergaenzung Kontext "TabWortergaenzung" if GesammelteWorte.GetItemCount <> iEntriesNumber_Checked then - Warnlog "Checked:Entries number should be equal " + iEntriesNumber_Checked + " in 2nd file ,but get " +GesammelteWorte.GetItemCount + Warnlog "Checked:Entries number should be equal " + iEntriesNumber_Checked + " in 2nd file ,but get " +GesammelteWorte.GetItemCount end if TabWortergaenzung.Cancel 'Close 2nd file - Call hCloseDocument + Call hCloseDocument ToolsAutocorrect + Kontext Active.Setpage TabWortergaenzung Kontext "TabWortergaenzung" - if GesammelteWorte.GetItemCount <> iEntriesNumber_Checked then - Warnlog "Checked:Entries number should be equal " + iEntriesNumber_Checked + " in 1st file ,but get " +GesammelteWorte.GetItemCount - end if - TabWortergaenzung.Cancel + if GesammelteWorte.GetItemCount <> iEntriesNumber_Checked then + Warnlog "Checked:Entries number should be equal " + iEntriesNumber_Checked + " in 1st file ,but get " +GesammelteWorte.GetItemCount + end if + TabWortergaenzung.Cancel - Call hCloseDocument + Call hCloseDocument - 'Test when checkbox is Unchecked - 'Open 1st file - Call hNewDocument + 'Test when checkbox is Unchecked + 'Open 1st file + Call hNewDocument 'Delete all entries in the list - fDeleteAllEntries() + fDeleteAllEntries() ToolsAutocorrect + Kontext Active.Setpage TabWortergaenzung Kontext "TabWortergaenzung" - KeepList.Uncheck - TabWortergaenzung.OK + KeepList.Check + TabWortergaenzung.OK - Call wTypeKeys sTestWord1 + Call wTypeKeys sTestWord1 'Open 2nd file - Call hNewDocument + Call hNewDocument - Call wTypeKeys sTestWord2 - Call wTypeKeys sTestWord3 + Call wTypeKeys sTestWord2 + Call wTypeKeys sTestWord3 ToolsAutocorrect + Kontext Active.Setpage TabWortergaenzung Kontext "TabWortergaenzung" if GesammelteWorte.GetItemCount <> iEntriesNumber_Checked then - Warnlog "UnChecked:Entries number should be equal " + iEntriesNumber_Checked + " in 2nd file ,but get " +GesammelteWorte.GetItemCount + Warnlog "UnChecked:Entries number should be equal " + iEntriesNumber_Checked + " in 2nd file ,but get " +GesammelteWorte.GetItemCount end if TabWortergaenzung.Cancel 'Close 2nd file - Call hCloseDocument + Call hCloseDocument ToolsAutocorrect + Kontext Active.Setpage TabWortergaenzung Kontext "TabWortergaenzung" if GesammelteWorte.GetItemCount <> iEntriesNumber_UnChecked then - Warnlog "UnChecked:Entries number should be equal " + iEntriesNumber_UnChecked + " in 2nd file ,but get " +GesammelteWorte.GetItemCount + Warnlog "UnChecked:Entries number should be equal " + iEntriesNumber_UnChecked + " in 2nd file ,but get " +GesammelteWorte.GetItemCount end if TabWortergaenzung.Cancel - 'Recover to the default - ToolsAutocorrect - Active.Setpage TabWortergaenzung - Kontext "TabWortergaenzung" - KeepList.Check - TabWortergaenzung.OK - - 'Close 1st file - Call hCloseDocument + 'Close 1st file + Call hCloseDocument endcase '------------------------------------------------------------------------- -testcase tToolsAutocorrectWordCompletion_x +testcase tToolsAutocorrectWordCompletion_6 - Dim sTestWord as String - Dim sPartOfTestWord as String + Dim sTestWord as String + Dim sPartOfTestWord as String - sTestWord = "StarOffice" - sPartOfTestWord = "Sta" + sTestWord = "StarOffice" + sPartOfTestWord = "Sta" - printLog "Check Show as Tip" - '/// Check Show as Tip + printLog "Check Show as Tip" + '/// Check Show as Tip - '/// When uncheck ( default) , the left word will be highlight - '/// When check , the left word will NOT be appeared, <--- can test - '/// and a help tip will appear <--- no way to test yet + '/// When uncheck ( default) , the left word will be highlight + '/// When check , the left word will NOT be appeared, <--- can test + '/// and a help tip will appear <--- no way to test yet - 'Show as Tip -- uncheck (default) - Call hNewDocument + 'Show as Tip -- uncheck (default) + Call hNewDocument - Call wTypeKeys sTestWord - Call wTypeKeys "" - Sleep 1 - Call wTypeKeys sPartOfTestWord - Sleep 4 - Call wTypeKeys "" - Call wTypeKeys "" + Call wTypeKeys sTestWord + Call wTypeKeys "" + Sleep 1 + Call wTypeKeys sPartOfTestWord + Sleep 4 + Call wTypeKeys "" + Call wTypeKeys "" - Sleep 1 - Call wTypeKeys "StaS" - Sleep 4 - Call wTypeKeys "" + Sleep 1 + Call wTypeKeys "StaS" + Sleep 4 + Call wTypeKeys "" - Call hCloseDocument + Call hCloseDocument endcase diff --git a/testautomation/writer/required/includes/w_007_.inc b/testautomation/writer/required/includes/w_007_.inc index 056145bdbf37..30911dee3fdd 100755 --- a/testautomation/writer/required/includes/w_007_.inc +++ b/testautomation/writer/required/includes/w_007_.inc @@ -488,8 +488,8 @@ testcase tToolsAutocorrectAutoformat Kontext "TabOptionenAutokorrektur" Call DialogTest ( TabOptionenAutokorrektur ) printlog " Step through all options in list" - printlog " Tabpage Options: With entry 11 button 'Edit' should be enabled" - Einstellungen.TypeKeys "",11 + printlog " Tabpage Options: With entry 10 button 'Edit' should be enabled" + Einstellungen.TypeKeys "",10 Wait 500 if Bearbeiten.IsEnabled then Bearbeiten.Click @@ -497,11 +497,11 @@ testcase tToolsAutocorrectAutoformat DialogTest (Sonderzeichen) Sonderzeichen.Cancel else - Warnlog "- Button 'Edit' on Entry 11 disabled!" + Warnlog "- Button 'Edit' on Entry 10 disabled!" end if Kontext "TabOptionenAutokorrektur" - printlog " Tabpage Options: With entry 17 button 'Edit' should be enabled" + printlog " Tabpage Options: With entry 16 button 'Edit' should be enabled" Einstellungen.TypeKeys "",6 Wait 500 if Bearbeiten.IsEnabled then @@ -514,7 +514,7 @@ testcase tToolsAutocorrectAutoformat end if Kontext "TabOptionenAutokorrektur" - printlog " Tabpage Options: With entry 19 button 'Edit' should be enabled" + printlog " Tabpage Options: With entry 18 button 'Edit' should be enabled" Einstellungen.TypeKeys "",2 Wait 500 if Bearbeiten.IsEnabled then diff --git a/testautomation/writer/tools/includes/w_tools_autocorrection.inc b/testautomation/writer/tools/includes/w_tools_autocorrection.inc index f259ce1dde51..285c9783b2e2 100644 --- a/testautomation/writer/tools/includes/w_tools_autocorrection.inc +++ b/testautomation/writer/tools/includes/w_tools_autocorrection.inc @@ -58,8 +58,6 @@ function fAutocorrectOptions(Options as String) case "CapitalizeFirstLetter" : Einstellungen.TypeKeys "",2 case "AutomaticBoldAndUnderline" : Einstellungen.TypeKeys "",3 case "URLRecognition" : Einstellungen.TypeKeys "",4 - case "Replace1st" : Einstellungen.TypeKeys "",5 - case "Replace1/2" : Einstellungen.TypeKeys "",6 case "ReplaceDashes" : Einstellungen.TypeKeys "",7 case "DeleteSpaceParagraph" : Einstellungen.TypeKeys "",8 case "DeleteSpaceLine" : Einstellungen.TypeKeys "",9 -- cgit From 9c470ecb7cec7f339b59d61985cdda08862db836 Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Wed, 3 Feb 2010 14:33:03 +0100 Subject: cbosdo01: i108312: adaptions in testautomation for moving/removal of code --- testautomation/global/win/etab_h_o.win | 12 ++++++++++++ testautomation/global/win/tab_t_z.win | 4 ---- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'testautomation') diff --git a/testautomation/global/win/etab_h_o.win b/testautomation/global/win/etab_h_o.win index 60334e1c287d..244e02f717bc 100755 --- a/testautomation/global/win/etab_h_o.win +++ b/testautomation/global/win/etab_h_o.win @@ -67,6 +67,18 @@ Records HID_DSADMIN_LDAP_ROWCOUNT DataSource extensions:ListBox:RID_PAGE_TABLESELECTION:LB_DATASOURCE Table extensions:ListBox:RID_PAGE_TABLESELECTION:LB_TABLE +*TabLocalizedOptions HID_OFAPAGE_AUTOCORR_QUOTE +LocalizedOptionsList HID_OFAPAGE_QUOTE_CLB +LocalizedOptions HID_OFAPAGE_QUOTE_SW_CLB +SingleQuotesReplace cui:Checkbox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_SGL_TYPO +SingleQuotesStart cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STARTQUOTE +SingleQuotesEnd cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE +SingleQuotesDefault cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STD +DoubleQuotesReplace cui:CheckBox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_TYPO +DoubleQuotesStart cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_STARTQUOTE +DoubleQuotesEnd cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_ENDQUOTE +DoubleQuotesDefault cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_DBL_STD + *TabMailMergeEMail HID_TP_MAILCONFIG YourName sw:Edit:TP_MAILCONFIG:ED_DISPLAYNAME EmailAddress sw:Edit:TP_MAILCONFIG:ED_ADDRESS diff --git a/testautomation/global/win/tab_t_z.win b/testautomation/global/win/tab_t_z.win index fa51ce5d2c71..be8f4870de47 100755 --- a/testautomation/global/win/tab_t_z.win +++ b/testautomation/global/win/tab_t_z.win @@ -169,10 +169,6 @@ MFRand cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER MFStartwert cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE MFEndwert cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE -*TabTypografisch HID_OFAPAGE_AUTOCORR_QUOTE -LocalizedOptions HID_OFAPAGE_QUOTE_SW_CLB -Zurueck HID_TABDLG_RESET_BTN - *TabUmlauf HID_FRM_EXT Kein sw:ImageRadioButton:TP_FRM_WRAP:RB_NO_WRAP Links sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_LEFT -- cgit From 19187829033905a77c450c4820cc432c52a8f6cf Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Wed, 3 Feb 2010 14:47:55 +0100 Subject: cbosdo01: i108312: adaptions in testautomation for moving/removal of code --- .../includes/autocorrection/w_autocorrect1.inc | 22 +++++++++++----------- .../writer/optional/includes/tools/tools1.inc | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'testautomation') diff --git a/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc b/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc index 3f03c44ebddb..1653f60d15dd 100755 --- a/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc +++ b/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc @@ -1379,18 +1379,18 @@ testcase tToolsAutocorrectOptions_13 ToolsAutoCorrect Kontext - Active.SetPage TabTypografisch - Kontext "TabTypografisch" - EinfacheErsetzen.UnCheck - EinfachWortAnfang.Click + Active.SetPage TabLocalizedOptions + Kontext "TabLocalizedOptions" + SingleQuotesReplace.UnCheck + SingleQuotesStart.Click Kontext "Sonderzeichen" Schriftliste.TypeKeys "" Schriftliste.TypeKeys "", 59 ' is [ Schriftliste.TypeKeys "" Sonderzeichen.OK - Kontext "TabTypografisch" - TabTypografisch.OK + Kontext "TabLocalizedOptions" + TabLocalizedOptions.OK wTypeKeys (testContent + "Hello") wait 100 @@ -1436,12 +1436,12 @@ testcase tToolsAutocorrectOptions_13 ToolsAutoCorrect Kontext - Active.Setpage TabTypografisch - Kontext "TabTypografisch" - EinfacheErsetzen.Check - EinfachStandard.Click + Active.Setpage TabLocalizedOptions + Kontext "TabLocalizedOptions" + SingleQuotesReplace.Check + SingleQuotesDefault.Click wait 100 - TabTypografisch.OK + TabLocalizedOptions.OK Call hCloseDocument diff --git a/testautomation/writer/optional/includes/tools/tools1.inc b/testautomation/writer/optional/includes/tools/tools1.inc index 4c0231a4fa16..f55322f2ffbc 100755 --- a/testautomation/writer/optional/includes/tools/tools1.inc +++ b/testautomation/writer/optional/includes/tools/tools1.inc @@ -319,7 +319,7 @@ function fToolsAutocorrect(Options as string) case "TabErsetzung" : active.SetPage TabErsetzung case "TabAusnahmen" : active.SetPage TabAusnahmen case "TabOptionenAutokorrektur" : active.SetPage TabOptionenAutokorrektur - case "TabTypografisch" : active.SetPage TabTypografisch + case "TabLocalizedOptions" : active.SetPage TabLocalizedOptions case "TabWortergaenzung" : active.SetPage TabWortergaenzung end Select -- cgit From 516d59756a5cdbdc1a9b27fbdd98ac68e2919bf9 Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Wed, 3 Feb 2010 14:48:56 +0100 Subject: cbosdo01: i108312: adaptions in testautomation for moving/removal of code --- testautomation/writer/required/includes/w_007_.inc | 34 +++++++++++----------- testautomation/writer/tools/includes/w_tool2.inc | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'testautomation') diff --git a/testautomation/writer/required/includes/w_007_.inc b/testautomation/writer/required/includes/w_007_.inc index 30911dee3fdd..dfee14e23025 100755 --- a/testautomation/writer/required/includes/w_007_.inc +++ b/testautomation/writer/required/includes/w_007_.inc @@ -489,7 +489,7 @@ testcase tToolsAutocorrectAutoformat Call DialogTest ( TabOptionenAutokorrektur ) printlog " Step through all options in list" printlog " Tabpage Options: With entry 10 button 'Edit' should be enabled" - Einstellungen.TypeKeys "",10 + Einstellungen.TypeKeys "",9 Wait 500 if Bearbeiten.IsEnabled then Bearbeiten.Click @@ -514,8 +514,8 @@ testcase tToolsAutocorrectAutoformat end if Kontext "TabOptionenAutokorrektur" - printlog " Tabpage Options: With entry 18 button 'Edit' should be enabled" - Einstellungen.TypeKeys "",2 + printlog " Tabpage Options: With entry 17 button 'Edit' should be enabled" + Einstellungen.TypeKeys "",1 Wait 500 if Bearbeiten.IsEnabled then Bearbeiten.Click @@ -524,40 +524,40 @@ testcase tToolsAutocorrectAutoformat Zusammenfassen.Cancel Kontext "TabOptionenAutokorrektur" else - Warnlog "- Button 'Edit' on Entry 18 disabled!" + Warnlog "- Button 'Edit' on Entry 17 disabled!" end if Kontext - active.SetPage TabTypografisch - Kontext "TabTypografisch" - EinfachWortAnfang.Click + active.SetPage TabLocalizedOptions + Kontext "TabLocalizedOptions" + SingleQuotesStart.Click Kontext "Sonderzeichen" Call DialogTest ( Sonderzeichen, 1 ) Sonderzeichen.Cancel - Kontext "TabTypografisch" - EinfachWortEnde.Click + Kontext "TabLocalizedOptions" + SingleQuotesEnd.Click Kontext "Sonderzeichen" Call DialogTest ( Sonderzeichen, 2 ) Sonderzeichen.Cancel - Kontext "TabTypografisch" - EinfachStandard.Click + Kontext "TabLocalizedOptions" + SingleQuotesDefault.Click - Kontext "TabTypografisch" - DoppeltWortAnfang.Click + Kontext "TabLocalizedOptions" + DoubleQuotesStart.Click Kontext "Sonderzeichen" Call DialogTest ( Sonderzeichen, 3 ) Sonderzeichen.Cancel - Kontext "TabTypografisch" - DoppeltWortEnde.Click + Kontext "TabLocalizedOptions" + DoubleQuotesEnd.Click Kontext "Sonderzeichen" Call DialogTest ( Sonderzeichen, 4 ) Sonderzeichen.Cancel - Kontext "TabTypografisch" - DoppeltStandard.Click + Kontext "TabLocalizedOptions" + DoubleQuotesDefault.Click Kontext Active.Setpage TabWortergaenzung diff --git a/testautomation/writer/tools/includes/w_tool2.inc b/testautomation/writer/tools/includes/w_tool2.inc index a68a5eea9ea4..542b695e848d 100755 --- a/testautomation/writer/tools/includes/w_tool2.inc +++ b/testautomation/writer/tools/includes/w_tool2.inc @@ -64,7 +64,7 @@ sub OptionenAufrufen(Seite as string) case "TabErsetzung" : active.SetPage TabErsetzung case "TabAusnahmen" : active.SetPage TabAusnahmen case "TabOptionen" : active.SetPage TabOptionen - case "TabTypografisch": active.SetPage TabTypografisch + case "TabLocalizedOptions": active.SetPage TabLocalizedOptions end select for i = 1 to 5 Kontext "Active" -- cgit From d982b442883a314010bc7514305f4af77f6a49b6 Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Wed, 3 Feb 2010 14:50:18 +0100 Subject: cbosdo01: i108312: adaptions in testautomation for moving/removal of code --- .../writer/optional/w_autocorrection.bas | 78 ++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 testautomation/writer/optional/w_autocorrection.bas (limited to 'testautomation') diff --git a/testautomation/writer/optional/w_autocorrection.bas b/testautomation/writer/optional/w_autocorrection.bas new file mode 100644 index 000000000000..a8549293f681 --- /dev/null +++ b/testautomation/writer/optional/w_autocorrection.bas @@ -0,0 +1,78 @@ +'encoding UTF-8 Do not remove or change this line! +'************************************************************************** +'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +'* +'* Copyright 2008 by Sun Microsystems, Inc. +'* +'* OpenOffice.org - a multi-platform office productivity suite +'* +'* $RCSfile: w_drawing_tools.bas,v $ +'* +'* $Revision: 1.1 $ +'* +'* last change: $Author: fredrikh $ $Date: 2008-06-18 09:11:25 $ +'* +'* 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 +'* +'* for a copy of the LGPLv3 License. +'* +'/************************************************************************ +'* +'* owner : helge.delfs@sun.com +'* +'* short description : Tools / Autocorrection test +'* +'\******************************************************************* + +global gSeperator as String +global gMeasurementUnit as String + +sub main + Dim StartZeit + StartZeit = Now() + + use "writer\tools\includes\w_tools.inc" + use "writer\tools\includes\w_tool3.inc" + use "writer\tools\includes\w_tools_autocorrection.inc" + use "writer\optional\includes\autocorrection\w_autocorrect1.inc" + use "writer\optional\includes\autocorrection\w_autocorrect2.inc" + + printlog Chr(13) + "Loading of Include - Files takes: " + Wielange ( StartZeit ) + printlog Chr(13) + "******* Writer - Autocorrection - Test *******" + 'Getting the decimal seperator from global function + gSeperator = GetDecimalSeperator() + 'Setting the measurement unit to centimeters. + gMeasurementUnit = fSetMeasurementToCM() + + Call hStatusIn ( "writer" , "w_autocorrection.bas" ) + + Call w_autocorrect1 + Call w_autocorrect2 + + Call hStatusOut + + Printlog Chr(13) + "End of Autocorrect - Test :" + Printlog "Duration: "+ WieLange ( StartZeit ) + Printlog "Date: " + Date + " Time: " + Time + +end sub + +sub LoadIncludeFiles + use "global\system\includes\master.inc" + use "global\system\includes\gvariabl.inc" + Call GetUseFiles + gApplication = "WRITER" +end sub -- cgit From 115a177418e0ad54ebc3b62df7a976f7b142e1ab Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Wed, 3 Feb 2010 14:50:46 +0100 Subject: cbosdo01: i108312: adaptions in testautomation for moving/removal of code --- .../required/includes/c_upd_toolsmenu.inc | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'testautomation') diff --git a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc index 21816865681f..5f3af612d3fe 100755 --- a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc @@ -615,50 +615,50 @@ testcase tToolsAutoCorrect '/// Switch to tabpage 'Custom Quotes' printlog " Switch to tabpage 'Custom Quotes'" Kontext - active.SetPage TabTypografisch - Kontext "TabTypografisch" - Call DialogTest ( TabTypografisch ) + active.SetPage TabLocalizedOptions + Kontext "TabLocalizedOptions" + Call DialogTest ( TabLocalizedOptions ) '/// Press on button for 'Start quote' for 'Single quotes' printlog " Press on button for 'Start quote' for 'Single quotes'" - EinfachWortAnfang.Click + SingleQuotesStart.Click Kontext "Sonderzeichen" '/// Close 'Start quote' dialog with 'Cancel' printlog " Close 'Start quote' dialog with 'Cancel'" Sonderzeichen.Cancel - Kontext "TabTypografisch" + Kontext "TabLocalizedOptions" '/// Press on button for 'End quote' for 'Single quotes' printlog " Press on button for 'End quote' for 'Single quotes'" - EinfachWortEnde.Click + SingleQuotesEnd.Click Kontext "Sonderzeichen" '/// Close 'End quote' dialog with 'Cancel' printlog " Close 'End quote' dialog with 'Cancel'" Sonderzeichen.Cancel - Kontext "TabTypografisch" + Kontext "TabLocalizedOptions" '/// Click on 'Default' button for 'Single quotes' printlog " Click on 'Default' button for 'Single quotes'" - EinfachStandard.Click + SingleQuotesDefault.Click '/// Press on button for 'Start quote' for 'Double quotes' printlog " Press on button for 'Start quote' for 'Double quotes'" - DoppeltWortAnfang.Click + DoubleQuotesStart.Click Kontext "Sonderzeichen" '/// Close 'Start quote' dialog with 'Cancel' printlog " Close 'Start quote' dialog with 'Cancel'" Sonderzeichen.Cancel - Kontext "TabTypografisch" + Kontext "TabLocalizedOptions" '/// Press on button for 'End quote' for 'Double quotes' printlog " Press on button for 'End quote' for 'Double quotes'" - DoppeltWortEnde.Click + DoubleQuotesEnd.Click Kontext "Sonderzeichen" '/// Close 'End quote' dialog with 'Cancel' printlog " Close 'End quote' dialog with 'Cancel'" Sonderzeichen.Cancel - Kontext "TabTypografisch" + Kontext "TabLocalizedOptions" '/// Click on 'Default' button for 'Double quotes' printlog " Click on 'Default' button for 'Double quotes'" - DoppeltStandard.Click + DoubleQuotesDefault.Click '/// Close 'AutoCorrect' dialog with 'Cancel' printlog " Close 'AutoCorrect' dialog with 'Cancel'" - TabTypografisch.cancel + TabLocalizedOptions.cancel '/// Close document printlog " Close document" call hCloseDocument -- cgit From f5850400fdfe21ab00d6e4c0e98e616a1f403972 Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Wed, 3 Feb 2010 14:59:34 +0100 Subject: cbosdo01: i108312: adaptions in testautomation for moving/removal of code --- .../optional/includes/global/g_autocorrection.inc | 58 +++++++++++----------- .../graphics/optional/includes/global/id_006.inc | 32 ++++++------ 2 files changed, 45 insertions(+), 45 deletions(-) (limited to 'testautomation') diff --git a/testautomation/graphics/optional/includes/global/g_autocorrection.inc b/testautomation/graphics/optional/includes/global/g_autocorrection.inc index 7c0fa1e05614..19640be9a86d 100755 --- a/testautomation/graphics/optional/includes/global/g_autocorrection.inc +++ b/testautomation/graphics/optional/includes/global/g_autocorrection.inc @@ -217,15 +217,15 @@ testcase tToolsAutocorrectCustomQuotes(bSimple as boolean) Printlog " - replace quotes" '------------------------------------------------------------------------------------------ ToolsAutocorrect Kontext - active.SetPage TabTypografisch - Kontext "TabTypografisch" + active.SetPage TabLocalizedOptions + Kontext "TabLocalizedOptions" if bSimple then - EinfacheErsetzen.Check + SingleQuotesReplace.Check else - DoppelteErsetzen.Check - DoppeltStandard.Click + DoubleQuotesReplace.Check + DoubleQuotesDefault.Click endif - TabTypografisch.OK + TabLocalizedOptions.OK sleep 5 gMouseClick 50,50 sleep 5 @@ -252,14 +252,14 @@ testcase tToolsAutocorrectCustomQuotes(bSimple as boolean) Printlog " - dont replace quotes" '------------------------------------------------------------------------------------------ ToolsAutocorrect Kontext - Active.SetPage TabTypografisch - Kontext "TabTypografisch" + Active.SetPage TabLocalizedOptions + Kontext "TabLocalizedOptions" if bSimple then - EinfacheErsetzen.Uncheck + SingleQuotesReplace.Uncheck else - DoppelteErsetzen.Uncheck + DoubleQuotesReplace.Uncheck endif - TabTypografisch.OK + TabLocalizedOptions.OK sleep 1 gMouseClick 50,50 sleep 1 @@ -285,13 +285,13 @@ testcase tToolsAutocorrectCustomQuotes(bSimple as boolean) Printlog " - replace quotes" '------------------------------------------------------------------------------------------ ToolsAutocorrect Kontext - active.SetPage TabTypografisch - Kontext "TabTypografisch" + active.SetPage TabLocalizedOptions + Kontext "TabLocalizedOptions" if bSimple then - EinfacheErsetzen.Check + SingleQuotesReplace.Check EinfachWortAnfang.Click else - DoppelteErsetzen.Check + DoubleQuotesReplace.Check DoppeltWortAnfang.Click endif Kontext "Sonderzeichen" @@ -301,7 +301,7 @@ testcase tToolsAutocorrectCustomQuotes(bSimple as boolean) sleep 1 Sonderzeichen.OK - Kontext "TabTypografisch" + Kontext "TabLocalizedOptions" if bSimple then EinfachWortEnde.Click else @@ -314,8 +314,8 @@ testcase tToolsAutocorrectCustomQuotes(bSimple as boolean) sleep 1 Sonderzeichen.OK - Kontext "TabTypografisch" - TabTypografisch.OK + Kontext "TabLocalizedOptions" + TabLocalizedOptions.OK sleep 5 gMouseClick 50,50 sleep 5 @@ -341,17 +341,17 @@ testcase tToolsAutocorrectCustomQuotes(bSimple as boolean) Printlog " - back to standard" '------------------------------------------------------------------------------------------ ToolsAutocorrect Kontext - active.SetPage TabTypografisch - Kontext "TabTypografisch" + active.SetPage TabLocalizedOptions + Kontext "TabLocalizedOptions" if bSimple then - EinfacheErsetzen.Check + SingleQuotesReplace.Check EinfachStandard.Click else - DoppelteErsetzen.Check - DoppeltStandard.Click + DoubleQuotesReplace.Check + DoubleQuotesDefault.Click endif - TabTypografisch.OK + TabLocalizedOptions.OK sleep 1 hTextrahmenErstellen ( Normal$ + "Hello" + Normal$ + " ",20,20,60,30) sleep 2 @@ -374,14 +374,14 @@ testcase tToolsAutocorrectCustomQuotes(bSimple as boolean) ToolsAutocorrect Kontext - active.SetPage TabTypografisch - Kontext "TabTypografisch" + active.SetPage TabLocalizedOptions + Kontext "TabLocalizedOptions" if bSimple then - EinfacheErsetzen.UnCheck + SingleQuotesReplace.UnCheck else - DoppelteErsetzen.UnCheck + DoubleQuotesReplace.UnCheck endif - TabTypografisch.OK + TabLocalizedOptions.OK sleep 1 hCloseDocument diff --git a/testautomation/graphics/optional/includes/global/id_006.inc b/testautomation/graphics/optional/includes/global/id_006.inc index fb774c22acb2..284e0b530c4a 100755 --- a/testautomation/graphics/optional/includes/global/id_006.inc +++ b/testautomation/graphics/optional/includes/global/id_006.inc @@ -199,35 +199,35 @@ testcase tiToolsAutoCorrect Kontext "TabOptionen" Call DialogTest ( TabOptionen ) Kontext - Messagebox.SetPage TabTypografisch - Kontext "TabTypografisch" ' 1a - EinfacheErsetzen.Check - EinfachWortAnfang.Click + Messagebox.SetPage TabLocalizedOptions + Kontext "TabLocalizedOptions" ' 1a + SingleQuotesReplace.Check + SingleQuotesStart.Click Kontext "Sonderzeichen" Call DialogTest ( Sonderzeichen, 1 ) Sonderzeichen.Cancel - Kontext "TabTypografisch" ' 1b - EinfachWortEnde.Click + Kontext "TabLocalizedOptions" ' 1b + SingleQuotesEnd.Click Kontext "Sonderzeichen" Call DialogTest ( Sonderzeichen, 2 ) Sonderzeichen.Cancel - Kontext "TabTypografisch" ' 1s - EinfachStandard.Click + Kontext "TabLocalizedOptions" ' 1s + SingleQuotesDefault.Click - Kontext "TabTypografisch" ' 2a - DoppeltWortAnfang.Click + Kontext "TabLocalizedOptions" ' 2a + DoubleQuotesStart.Click Kontext "Sonderzeichen" Call DialogTest ( Sonderzeichen, 3 ) Sonderzeichen.Cancel - Kontext "TabTypografisch" ' 2b - DoppeltWortEnde.Click + Kontext "TabLocalizedOptions" ' 2b + DoubleQuotesEnd.Click Kontext "Sonderzeichen" Call DialogTest ( Sonderzeichen, 4 ) Sonderzeichen.Cancel - Kontext "TabTypografisch" ' 2s - DoppeltStandard.Click - EinfacheErsetzen.UnCheck - TabTypografisch.cancel + Kontext "TabLocalizedOptions" ' 2s + DoubleQuotesDefault.Click + SingleQuotesReplace.UnCheck + TabLocalizedOptions.cancel Call hCloseDocument endcase -- cgit From 0f2d947941c6d7a2aa602071789ab754fe800469 Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Wed, 3 Feb 2010 15:00:05 +0100 Subject: cbosdo01: i108312: adaptions in testautomation for moving/removal of code --- .../graphics/required/includes/global/id_006.inc | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'testautomation') diff --git a/testautomation/graphics/required/includes/global/id_006.inc b/testautomation/graphics/required/includes/global/id_006.inc index d7a3834f64b7..edbc42b3d09b 100755 --- a/testautomation/graphics/required/includes/global/id_006.inc +++ b/testautomation/graphics/required/includes/global/id_006.inc @@ -250,50 +250,50 @@ testcase tiToolsAutoCorrect Call DialogTest ( TabOptionen ) Kontext '/// select tabpage 'Custom Quotes' ///' - Messagebox.SetPage TabTypografisch - Kontext "TabTypografisch" ' 1a + Messagebox.SetPage TabLocalizedOptions + Kontext "TabLocalizedOptions" ' 1a '/// in the part of 'single quotes': ///' '///+ check 'replace' ///' '///+ click 'start quote' ///' - EinfacheErsetzen.Check - EinfachWortAnfang.Click + SingleQuotesReplace.Check + SingleQuotesStart.Click Kontext "Sonderzeichen" Call DialogTest ( Sonderzeichen, 1 ) '///+ cancel dialog 'start quote' ///' Sonderzeichen.Cancel - Kontext "TabTypografisch" ' 1b + Kontext "TabLocalizedOptions" ' 1b '///+ click 'end quote' ///' - EinfachWortEnde.Click + SingleQuotesEnd.Click Kontext "Sonderzeichen" Call DialogTest ( Sonderzeichen, 2 ) '///+ cancel dialog 'end quote' ///' Sonderzeichen.Cancel - Kontext "TabTypografisch" ' 1s + Kontext "TabLocalizedOptions" ' 1s '///+ click button 'default' ///' - EinfachStandard.Click + SingleQuotesDefault.Click - Kontext "TabTypografisch" ' 2a + Kontext "TabLocalizedOptions" ' 2a '/// in the part of 'double quotes': ///' '///+ click 'start quote' ///' - DoppeltWortAnfang.Click + DoubleQuotesStart.Click Kontext "Sonderzeichen" Call DialogTest ( Sonderzeichen, 3 ) '///+ cancel dialog 'start quote' ///' Sonderzeichen.Cancel - Kontext "TabTypografisch" ' 2b + Kontext "TabLocalizedOptions" ' 2b '///+ click 'end quote' ///' - DoppeltWortEnde.Click + DoubleQuotesEnd.Click Kontext "Sonderzeichen" Call DialogTest ( Sonderzeichen, 4 ) '///+ cancel dialog 'end quote' ///' Sonderzeichen.Cancel - Kontext "TabTypografisch" ' 2s + Kontext "TabLocalizedOptions" ' 2s '///+ click button 'default' ///' - DoppeltStandard.Click + DoubleQuotesDefault.Click '///+ UNcheck 'replace' ///' - EinfacheErsetzen.UnCheck + SingleQuotesReplace.UnCheck '/// cancel dialog 'AtorCorrect' ///' - TabTypografisch.cancel + TabLocalizedOptions.cancel '/// close application ///' Call hCloseDocument endcase -- cgit From 5676a301f111cd324c8c0e695d405bb36363d223 Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Thu, 4 Feb 2010 10:25:11 +0100 Subject: cbosdo01: i108312: adaptions in testautomation for moving/removal of code --- testautomation/graphics/tools/id_tools_2.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testautomation') diff --git a/testautomation/graphics/tools/id_tools_2.inc b/testautomation/graphics/tools/id_tools_2.inc index 78a71da95775..15c5665867c4 100755 --- a/testautomation/graphics/tools/id_tools_2.inc +++ b/testautomation/graphics/tools/id_tools_2.inc @@ -142,8 +142,8 @@ sub sCheckCheck (i, Pruefung$, bEnabled) select case i ' Disabled sCheckUnderlined due to start of external program (web-browser) - FHA case 5: bEnabled 'sCheckUnderlined (bEnabled) - case 6: sCheckSupperscript (bEnabled) - case 8: sCheckDash (bEnabled) + case 6: sCheckDash (bEnabled) + case 8: sCheckSupperscript (bEnabled) case else: hTypeKeys "" EditCopy -- cgit From 95f8259766e12721355169e8ec3b0a38a46e241a Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Thu, 4 Feb 2010 10:25:39 +0100 Subject: cbosdo01: i108312: adaptions in testautomation for moving/removal of code --- .../graphics/optional/includes/global/g_autocorrection.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'testautomation') diff --git a/testautomation/graphics/optional/includes/global/g_autocorrection.inc b/testautomation/graphics/optional/includes/global/g_autocorrection.inc index 19640be9a86d..bceff84e9f5b 100755 --- a/testautomation/graphics/optional/includes/global/g_autocorrection.inc +++ b/testautomation/graphics/optional/includes/global/g_autocorrection.inc @@ -289,10 +289,10 @@ testcase tToolsAutocorrectCustomQuotes(bSimple as boolean) Kontext "TabLocalizedOptions" if bSimple then SingleQuotesReplace.Check - EinfachWortAnfang.Click + SingleQuotesStart.Click else DoubleQuotesReplace.Check - DoppeltWortAnfang.Click + DoubleQuotesStart.Click endif Kontext "Sonderzeichen" sleep 1 @@ -303,9 +303,9 @@ testcase tToolsAutocorrectCustomQuotes(bSimple as boolean) Kontext "TabLocalizedOptions" if bSimple then - EinfachWortEnde.Click + SingleQuotesEnd.Click else - DoppeltWortEnde.Click + DoubleQuotesEnd.Click endif Kontext "Sonderzeichen" sleep 1 @@ -345,7 +345,7 @@ testcase tToolsAutocorrectCustomQuotes(bSimple as boolean) Kontext "TabLocalizedOptions" if bSimple then SingleQuotesReplace.Check - EinfachStandard.Click + SingleQuotesDefault.Click else DoubleQuotesReplace.Check DoubleQuotesDefault.Click -- cgit From 326163b83a709676eb5e7e0f667aef0dec3b8632 Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Thu, 4 Feb 2010 10:55:46 +0100 Subject: cbosdo01: i108312: adaptions in testautomation for moving/removal of code --- .../tools/includes/w_tools_autocorrection.inc | 23 +++++++++++----------- 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'testautomation') diff --git a/testautomation/writer/tools/includes/w_tools_autocorrection.inc b/testautomation/writer/tools/includes/w_tools_autocorrection.inc index 285c9783b2e2..a6c01ce3c071 100644 --- a/testautomation/writer/tools/includes/w_tools_autocorrection.inc +++ b/testautomation/writer/tools/includes/w_tools_autocorrection.inc @@ -58,18 +58,17 @@ function fAutocorrectOptions(Options as String) case "CapitalizeFirstLetter" : Einstellungen.TypeKeys "",2 case "AutomaticBoldAndUnderline" : Einstellungen.TypeKeys "",3 case "URLRecognition" : Einstellungen.TypeKeys "",4 - case "ReplaceDashes" : Einstellungen.TypeKeys "",7 - case "DeleteSpaceParagraph" : Einstellungen.TypeKeys "",8 - case "DeleteSpaceLine" : Einstellungen.TypeKeys "",9 - case "IgnoreDoulbeSpaces" : Einstellungen.TypeKeys "",10 - case "ApplyNumbering" : Einstellungen.TypeKeys "",11 - case "ApplyBorder" : Einstellungen.TypeKeys "",12 - case "CreateTable" : Einstellungen.TypeKeys "",13 - case "ApplyStyles" : Einstellungen.TypeKeys "",14 - case "RemoveBlankParagraphs" : Einstellungen.TypeKeys "",15 - case "ReplaceCustomStyles" : Einstellungen.TypeKeys "",16 - case "ReplaceBullets" : Einstellungen.TypeKeys "",17 - case "ReplaceQuotes" : Einstellungen.TypeKeys "",18 + case "ReplaceDashes" : Einstellungen.TypeKeys "",5 + case "DeleteSpaceParagraph" : Einstellungen.TypeKeys "",6 + case "DeleteSpaceLine" : Einstellungen.TypeKeys "",7 + case "IgnoreDoulbeSpaces" : Einstellungen.TypeKeys "",8 + case "ApplyNumbering" : Einstellungen.TypeKeys "",9 + case "ApplyBorder" : Einstellungen.TypeKeys "",10 + case "CreateTable" : Einstellungen.TypeKeys "",11 + case "ApplyStyles" : Einstellungen.TypeKeys "",12 + case "RemoveBlankParagraphs" : Einstellungen.TypeKeys "",13 + case "ReplaceCustomStyles" : Einstellungen.TypeKeys "",14 + case "ReplaceBullets" : Einstellungen.TypeKeys "",15 case "CombineSingleLine" : Einstellungen.TypeKeys "" end select -- cgit From 1560517ee37922617d13787647e979f82d1aa89c Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Wed, 10 Feb 2010 14:23:07 +0100 Subject: cbosdo01: i108312: added test documents --- .../writer/optional/input/autocorrection/01-01.odt | Bin 0 -> 7798 bytes .../writer/optional/input/autocorrection/01.odt | Bin 0 -> 7798 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 testautomation/writer/optional/input/autocorrection/01-01.odt create mode 100644 testautomation/writer/optional/input/autocorrection/01.odt (limited to 'testautomation') diff --git a/testautomation/writer/optional/input/autocorrection/01-01.odt b/testautomation/writer/optional/input/autocorrection/01-01.odt new file mode 100644 index 000000000000..584bf749eaa9 Binary files /dev/null and b/testautomation/writer/optional/input/autocorrection/01-01.odt differ diff --git a/testautomation/writer/optional/input/autocorrection/01.odt b/testautomation/writer/optional/input/autocorrection/01.odt new file mode 100644 index 000000000000..97e76c18a1f1 Binary files /dev/null and b/testautomation/writer/optional/input/autocorrection/01.odt differ -- cgit From 3585161d14b240ea3909aa4272ab43942540621c Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Wed, 10 Feb 2010 15:06:37 +0100 Subject: cbosdo01: i108312: reworked function to select entrys in treelistbox --- .../tools/includes/w_tools_autocorrection.inc | 67 +++++++++++++++------- 1 file changed, 45 insertions(+), 22 deletions(-) (limited to 'testautomation') diff --git a/testautomation/writer/tools/includes/w_tools_autocorrection.inc b/testautomation/writer/tools/includes/w_tools_autocorrection.inc index a6c01ce3c071..d35c2a33e25b 100644 --- a/testautomation/writer/tools/includes/w_tools_autocorrection.inc +++ b/testautomation/writer/tools/includes/w_tools_autocorrection.inc @@ -41,39 +41,62 @@ '* '\*********************************************************************** -function fAutocorrectOptions(Options as String) +function fAutocorrectOptions(Options as String, iModify as integer, iType as integer) '/// Open Tools/Autocorrect/Autoformat diglog with tab page Options '///+ then choose the relevant Options and press 'space bar' + Dim iDown as integer ToolsAutocorrect Kontext Active.Setpage TabOptionenAutokorrektur Kontext "TabOptionenAutokorrektur" - Einstellungen.TypeKeys "" - Select case Options - case "UseReplacementTable" : wait 500 - case "CorrectTWoINitialCApitals" : Einstellungen.TypeKeys "" - case "CapitalizeFirstLetter" : Einstellungen.TypeKeys "",2 - case "AutomaticBoldAndUnderline" : Einstellungen.TypeKeys "",3 - case "URLRecognition" : Einstellungen.TypeKeys "",4 - case "ReplaceDashes" : Einstellungen.TypeKeys "",5 - case "DeleteSpaceParagraph" : Einstellungen.TypeKeys "",6 - case "DeleteSpaceLine" : Einstellungen.TypeKeys "",7 - case "IgnoreDoulbeSpaces" : Einstellungen.TypeKeys "",8 - case "ApplyNumbering" : Einstellungen.TypeKeys "",9 - case "ApplyBorder" : Einstellungen.TypeKeys "",10 - case "CreateTable" : Einstellungen.TypeKeys "",11 - case "ApplyStyles" : Einstellungen.TypeKeys "",12 - case "RemoveBlankParagraphs" : Einstellungen.TypeKeys "",13 - case "ReplaceCustomStyles" : Einstellungen.TypeKeys "",14 - case "ReplaceBullets" : Einstellungen.TypeKeys "",15 - case "CombineSingleLine" : Einstellungen.TypeKeys "" - + case "UseReplacementTable" : iDown = 1 + case "CorrectTWoINitialCApitals" : iDown = 2 + case "CapitalizeFirstLetter" : iDown = 3 + case "AutomaticBoldAndUnderline" : iDown = 4 + case "URLRecognition" : iDown = 5 + case "ReplaceDashes" : iDown = 6 + case "DeleteSpaceParagraph" : iDown = 7 + case "DeleteSpaceLine" : iDown = 8 + case "IgnoreDoubleSpaces" : iDown = 9 + case "ApplyNumbering" : iDown = 10 + case "ApplyBorder" : iDown = 11 + case "CreateTable" : iDown = 12 + case "ApplyStyles" : iDown = 13 + case "RemoveBlankParagraphs" : iDown = 14 + case "ReplaceCustomStyles" : iDown = 15 + case "ReplaceBullets" : iDown = 16 + case "CombineSingleLine" : iDown = 17 end select - Einstellungen.TypeKeys "" + ' *** Set requested state *** + ' ### Modify + Select Case iDown + Case 1,2,3,4,5,6,7,8,14,15,16,17 + if iModify = 1 then + Einstellungen.Check(iDown,2) + else + Einstellungen.UnCheck(iDown,2) + endif + if iDown < 9 then + ' ### Type + if iType = 1 then + Einstellungen.Check(iDown,3) + else + Einstellungen.UnCheck(iDown,3) + endif + endif + Case 9,10,11,12,13 + ' ### Type + if iType = 1 then + Einstellungen.Check(iDown,3) + else + Einstellungen.UnCheck(iDown,3) + endif + end select + wait 100 TabOptionenAutokorrektur.OK end function -- cgit From 4ab8630c6de353e3da7531e8d459afb2b07aa85a Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Wed, 10 Feb 2010 15:21:07 +0100 Subject: cbosdo01: i108312: reworked for activation in test cycle --- .../includes/autocorrection/w_autocorrect1.inc | 1285 ++++++++++---------- .../includes/autocorrection/w_autocorrect2.inc | 103 +- 2 files changed, 690 insertions(+), 698 deletions(-) (limited to 'testautomation') diff --git a/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc b/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc index 1653f60d15dd..f33aaaaccc44 100755 --- a/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc +++ b/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc @@ -120,19 +120,27 @@ testcase tToolsAutocorrectOptions_1 Kuerzel.SetText "Aabbcc" ErsetzenDurch.SetText "Aaccbb" Sleep 1 - Neu.Click + try + Neu.Click + catch + Warnlog "Seems settings are already made. Please remove entries from replacement table" + endcatch Sleep 1 TabErsetzung.OK - '/// M:Y T:Y (default) + printlog "- M:Y T:Y (default)" ToolsAutoCorrect Kontext Active.SetPage TabOptionenAutokorrektur Kontext "TabOptionenAutokorrektur" - Einstellungen.Select 1 - if Not Einstellungen.IsChecked then Warnlog "First Checkbox: " & Einstellungen.IsChecked - Einstellungen.TypeKeys "" - if Not Einstellungen.IsChecked then Warnlog "Second Checkbox: " & Einstellungen.IsChecked + if Einstellungen.IsChecked(1,2) = FALSE then + Warnlog "First Checkbox not checked by default" + Einstellungen.Check(1,2) + endif + if Einstellungen.IsChecked(1,3) = FALSE then + Warnlog "Second Checkbox not checked by default" + Einstellungen.Check(1,3) + endif TabOptionenAutokorrektur.Ok Call wTypeKeys "Aabbcc" @@ -143,8 +151,8 @@ testcase tToolsAutocorrectOptions_1 Call wTypeKeys "" - '/// M:Y T:N - Call fAutocorrectOptions("UseReplacementTable") + printlog "- M:Y T:N" + Call fAutocorrectOptions("UseReplacementTable", 1, 0) Call wTypeKeys "Aabbcc" Call wTypeKeys " " @@ -166,8 +174,8 @@ testcase tToolsAutocorrectOptions_1 Call wTypeKeys "" - '/// M:N T:Y - Call fAutocorrectOptions("UseReplacementTable") + printlog "- M:N T:Y" + Call fAutocorrectOptions("UseReplacementTable", 0, 1) Call wTypeKeys "Aabbcc" Call wTypeKeys " " @@ -178,8 +186,8 @@ testcase tToolsAutocorrectOptions_1 Call wTypeKeys "" - '/// M:N T:N - Call fAutocorrectOptions("UseReplacementTable") + printlog "- M:N T:N" + Call fAutocorrectOptions("UseReplacementTable", 0, 0) Call wTypeKeys "Aabbcc" Call wTypeKeys " " @@ -200,8 +208,8 @@ testcase tToolsAutocorrectOptions_1 end if end if - '/// Recover to the default M:Y T:Y - Call fAutocorrectOptions("UseReplacementTable") + printlog "- Recover to the default M:Y T:Y" + Call fAutocorrectOptions("UseReplacementTable", 1, 1) 'remove the test words which you insert in the replacement table Dim i as Integer @@ -252,7 +260,7 @@ testcase tToolsAutocorrectOptions_2 hopeResultBeforeAutoformat = "TEst" hopeResultAfterAutoformat = "Test" - Call fAutocorrectOptions("CorrectTWoINitialCApitals") + Call fAutocorrectOptions("CorrectTWoINitialCApitals",1,0) Call wTypeKeys testContent Call wTypeKeys " " @@ -279,7 +287,7 @@ testcase tToolsAutocorrectOptions_2 testContent = "TEst" hopeResult = "Test" - Call fAutocorrectOptions("CorrectTWoINitialCApitals") + Call fAutocorrectOptions("CorrectTWoINitialCApitals",0,1) Call wTypeKeys testContent Call wTypeKeys " " @@ -294,7 +302,7 @@ testcase tToolsAutocorrectOptions_2 hopeResultBeforeAutoformat = "TEst" hopeResultAfterAutoformat = "TEst" - Call fAutocorrectOptions("CorrectTWoINitialCApitals") + Call fAutocorrectOptions("CorrectTWoINitialCApitals",0,0) Call wTypeKeys testContent Call wTypeKeys " " @@ -314,7 +322,7 @@ testcase tToolsAutocorrectOptions_2 end if '/// Recover to the default M:Y T:Y - Call fAutocorrectOptions("CorrectTWoINitialCApitals") + Call fAutocorrectOptions("CorrectTWoINitialCApitals",1,1) Call hCloseDocument @@ -324,14 +332,14 @@ endcase testcase tToolsAutocorrectOptions_3 - Dim testContent as String - Dim hopeResult as String - Dim hopeResultBeforeAutoformat as String - Dim hopeResultAfterAutoformat as String + Dim testContent as String + Dim hopeResult as String + Dim hopeResultBeforeAutoformat as String + Dim hopeResultAfterAutoformat as String - printLog "Test 'Capitalize first letter of every setence'" - '/// Test 'Capitalize first letter of every setence' - Call hNewDocument + printLog "Test 'Capitalize first letter of every setence'" + '/// Test 'Capitalize first letter of every setence' + Call hNewDocument '/// M:Y T:Y (default) testContent = "the test for StarOffice automation. who is the author?" @@ -348,7 +356,7 @@ testcase tToolsAutocorrectOptions_3 hopeResultBeforeAutoformat = "the test for StarOffice automation. who is the author?" hopeResultAfterAutoformat = "The test for StarOffice automation. Who is the author?" - Call fAutocorrectOptions("CapitalizeFirstLetter") + Call fAutocorrectOptions("CapitalizeFirstLetter",1,0) Call wTypeKeys testContent Call wTypeKeys "" EditCopy @@ -372,7 +380,7 @@ GOING1: testContent = "the test for StarOffice automation. who is the author?" hopeResult = "The test for StarOffice automation. Who is the author?" - Call fAutocorrectOptions("CapitalizeFirstLetter") + Call fAutocorrectOptions("CapitalizeFirstLetter",0,1) Call wTypeKeys testContent Call wTypeKeys "" EditCopy @@ -385,7 +393,7 @@ GOING1: hopeResultBeforeAutoformat = "the test for StarOffice automation. who is the author?" hopeResultAfterAutoformat = "the test for StarOffice automation. who is the author?" - Call fAutocorrectOptions("CapitalizeFirstLetter") + Call fAutocorrectOptions("CapitalizeFirstLetter",0,0) Call wTypeKeys testContent Call wTypeKeys "" @@ -406,7 +414,7 @@ GOING1: testend: '/// Recover to the default - Call fAutocorrectOptions("CapitalizeFirstLetter") + Call fAutocorrectOptions("CapitalizeFirstLetter",1,1) Call hCloseDocument @@ -417,16 +425,16 @@ endcase testcase tToolsAutocorrectOptions_4_1 - Dim testContent as String - Dim hopeResult as String - Dim hopeResultBeforeAutoformat as String - Dim hopeResultAfterAutoformat as String - Dim getStyle as String - Dim hopeStyle as String + Dim testContent as String + Dim hopeResult as String + Dim hopeResultBeforeAutoformat as String + Dim hopeResultAfterAutoformat as String + Dim getStyle as String + Dim hopeStyle as String - printLog "Test 'Automatic bold and underline' --- bold " - '/// Test 'Automatic bold' - Call hNewDocument + printLog "Test 'Automatic bold and underline' --- bold " + '/// Test 'Automatic bold' + Call hNewDocument '/// M:Y T:Y (default) testContent = "*Test*" @@ -440,193 +448,193 @@ testcase tToolsAutocorrectOptions_4_1 fFormatCharacter("TabFont") try - getStyle = Style.GetSelText - Style.Select 3 - hopeStyle = Style.GetSelText + getStyle = Style.GetSelText + Style.Select 3 + hopeStyle = Style.GetSelText catch - getStyle = StyleWest.GetSelText - StyleWest.Select 3 - hopeStyle = StyleWest.GetSelText + getStyle = StyleWest.GetSelText + StyleWest.Select 3 + hopeStyle = StyleWest.GetSelText endcatch Sleep 1 - if getStyle <> hopeStyle then Warnlog "The style is NOT bold style when M:Y T:Y" + if getStyle <> hopeStyle then Warnlog "The style is NOT bold style when M:Y T:Y" try - Style.Select 1 + Style.Select 1 catch - StyleWest.Select 1 + StyleWest.Select 1 endcatch Sleep 1 - TabFont.OK - Sleep 1 + TabFont.OK + Sleep 1 - Call wTypeKeys "" + Call wTypeKeys "" '/// M:Y T:N - testContent = "*Test*" - hopeResultBeforeAutoformat = "*Test*" - hopeResultAfterAutoformat = "Test" + testContent = "*Test*" + hopeResultBeforeAutoformat = "*Test*" + hopeResultAfterAutoformat = "Test" - Call fAutocorrectOptions("AutomaticBoldAndUnderline") + Call fAutocorrectOptions("AutomaticBoldAndUnderline",1,0) - Call wTypeKeys testContent - Call wTypeKeys "" + Call wTypeKeys testContent + Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResultBeforeAutoformat then - Warnlog "The content should NOT be changed before Autoformat! M:Y T:N" - goto GOING1 - end if + EditCopy + if GetClipboardText <> hopeResultBeforeAutoformat then + Warnlog "The content should NOT be changed before Autoformat! M:Y T:N" + goto GOING1 + end if - fFormatCharacter("TabFont") + fFormatCharacter("TabFont") try - getStyle = Style.GetSelText - Style.Select 1 - hopeStyle = Style.GetSelText + getStyle = Style.GetSelText + Style.Select 1 + hopeStyle = Style.GetSelText catch - getStyle = StyleWest.GetSelText - StyleWest.Select 1 - hopeStyle = StyleWest.GetSelText + getStyle = StyleWest.GetSelText + StyleWest.Select 1 + hopeStyle = StyleWest.GetSelText endcatch Sleep 1 - if getStyle <> hopeStyle then Warnlog "The style should be standard style before autoformat!" - TabFont.Cancel + if getStyle <> hopeStyle then Warnlog "The style should be standard style before autoformat!" + TabFont.Cancel - Call wTypeKeys "" - FormatAutoformatApply - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResultAfterAutoformat then + Call wTypeKeys "" + FormatAutoformatApply + Call wTypeKeys "" + EditCopy + if GetClipboardText <> hopeResultAfterAutoformat then Warnlog "The content should be changed after Autoformat!M:Y T:N" - end if + end if - fFormatCharacter("TabFont") + Call fFormatCharacter("TabFont") try - getStyle = Style.GetSelText - Style.Select 3 - hopeStyle = Style.GetSelText + getStyle = Style.GetSelText + Style.Select 3 + hopeStyle = Style.GetSelText catch - getStyle = StyleWest.GetSelText - StyleWest.Select 3 - hopeStyle = StyleWest.GetSelText + getStyle = StyleWest.GetSelText + StyleWest.Select 3 + hopeStyle = StyleWest.GetSelText endcatch Sleep 1 - if getStyle <> hopeStyle then Warnlog "The style is NOT bold style when M:Y T:Y" + if getStyle <> hopeStyle then Warnlog "The style is NOT bold style when M:Y T:Y" try - Style.Select 1 + Style.Select 1 catch - StyleWest.Select 1 + StyleWest.Select 1 endcatch - Sleep 1 + Sleep 1 - TabFont.OK - Sleep 1 + TabFont.OK + Sleep 1 -GOING1: + GOING1: - Call wTypeKeys "" + Call wTypeKeys "" '/// M:N T:Y - testContent = "*Test*" - hopeResult = "Test" + testContent = "*Test*" + hopeResult = "Test" - Call fAutocorrectOptions("AutomaticBoldAndUnderline") + Call fAutocorrectOptions("AutomaticBoldAndUnderline",0,1) - Call wTypeKeys testContent - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResult then Warnlog "Something wrong in Automatic bold when M:Y T:Y" + Call wTypeKeys testContent + Call wTypeKeys "" + EditCopy + if GetClipboardText <> hopeResult then Warnlog "Something wrong in Automatic bold when M:Y T:Y" - fFormatCharacter("TabFont") + Call fFormatCharacter("TabFont") try - getStyle = Style.GetSelText - Style.Select 3 - hopeStyle = Style.GetSelText + getStyle = Style.GetSelText + Style.Select 3 + hopeStyle = Style.GetSelText catch - getStyle = StyleWest.GetSelText - StyleWest.Select 3 - hopeStyle = StyleWest.GetSelText + getStyle = StyleWest.GetSelText + StyleWest.Select 3 + hopeStyle = StyleWest.GetSelText endcatch Sleep 1 - if getStyle <> hopeStyle then Warnlog "The style is NOT bold style when M:Y T:Y" + if getStyle <> hopeStyle then Warnlog "The style is NOT bold style when M:Y T:Y" try - Style.Select 1 + Style.Select 1 catch - StyleWest.Select 1 + StyleWest.Select 1 endcatch - TabFont.OK - Sleep 1 + TabFont.OK + Sleep 1 - Call wTypeKeys "" + Call wTypeKeys "" '/// M:N T:N - testContent = "*Test*" - hopeResultBeforeAutoformat = "*Test*" - hopeResultAfterAutoformat = "*Test*" + testContent = "*Test*" + hopeResultBeforeAutoformat = "*Test*" + hopeResultAfterAutoformat = "*Test*" - Call fAutocorrectOptions("AutomaticBoldAndUnderline") + Call fAutocorrectOptions("AutomaticBoldAndUnderline",0,0) - Call wTypeKeys testContent - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResultBeforeAutoformat then + Call wTypeKeys testContent + Call wTypeKeys "" + EditCopy + if GetClipboardText <> hopeResultBeforeAutoformat then Warnlog "The content should NOT be changed before Autoformat! M:N T:N" goto testend - end if + end if - fFormatCharacter("TabFont") + Call fFormatCharacter("TabFont") try - getStyle = Style.GetSelText - Style.Select 1 - hopeStyle = Style.GetSelText + getStyle = Style.GetSelText + Style.Select 1 + hopeStyle = Style.GetSelText catch - getStyle = StyleWest.GetSelText - StyleWest.Select 1 - hopeStyle = StyleWest.GetSelText + getStyle = StyleWest.GetSelText + StyleWest.Select 1 + hopeStyle = StyleWest.GetSelText endcatch Sleep 1 - if getStyle <> hopeStyle then Warnlog "The style should be standard style before autoformat!" - TabFont.Cancel + if getStyle <> hopeStyle then Warnlog "The style should be standard style before autoformat!" + TabFont.Cancel - Call wTypeKeys "" - FormatAutoformatApply - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResultAfterAutoformat then + Call wTypeKeys "" + FormatAutoformatApply + Call wTypeKeys "" + EditCopy + if GetClipboardText <> hopeResultAfterAutoformat then Warnlog "The content should NOT be changed after Autoformat! M:N T:N" - end if + end if - fFormatCharacter("TabFont") + Call fFormatCharacter("TabFont") try - getStyle = Style.GetSelText - Style.Select 1 - hopeStyle = Style.GetSelText + getStyle = Style.GetSelText + Style.Select 1 + hopeStyle = Style.GetSelText catch - getStyle = StyleWest.GetSelText - StyleWest.Select 1 - hopeStyle = StyleWest.GetSelText + getStyle = StyleWest.GetSelText + StyleWest.Select 1 + hopeStyle = StyleWest.GetSelText endcatch Sleep 1 - if getStyle <> hopeStyle then Warnlog "The style should be standard style after autoformat!" - TabFont.OK - Sleep 1 + if getStyle <> hopeStyle then Warnlog "The style should be standard style after autoformat!" + TabFont.OK + Sleep 1 -testend: + testend: '/// Recover to the default M:Y T:Y - Call fAutocorrectOptions("AutomaticBoldAndUnderline") + Call fAutocorrectOptions("AutomaticBoldAndUnderline",1,1) Call hCloseDocument @@ -636,155 +644,155 @@ endcase testcase tToolsAutocorrectOptions_4_2 - Dim testContent as String - Dim hopeResult as String - Dim hopeResultBeforeAutoformat as String - Dim hopeResultAfterAutoformat as String - Dim getUnderlineStatus as Integer - Dim hopeUnderlineStatus as Integer ' 1 = without , 2 = single + Dim testContent as String + Dim hopeResult as String + Dim hopeResultBeforeAutoformat as String + Dim hopeResultAfterAutoformat as String + Dim getUnderlineStatus as Integer + Dim hopeUnderlineStatus as Integer ' 1 = without , 2 = single - printLog "Test 'Automatic bold and underline' --- underline " - '/// Test 'Automatic underline' - Call hNewDocument + printLog "Test 'Automatic bold and underline' --- underline " + '/// Test 'Automatic underline' + Call hNewDocument '/// M:Y T:Y (default) - testContent = "_Test_" - hopeResult = "Test" + testContent = "_Test_" + hopeResult = "Test" - Call wTypeKeys testContent - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResult then Warnlog "Something wrong in Automatic underline when M:Y T:Y" + Call wTypeKeys testContent + Call wTypeKeys "" + EditCopy + if GetClipboardText <> hopeResult then Warnlog "Something wrong in Automatic underline when M:Y T:Y" - fFormatCharacter("TabFontEffects") + Call fFormatCharacter("TabFontEffects") - getUnderlineStatus = Underline.GetSelIndex - Underline.Select 2 - hopeUnderlineStatus = Underline.GetSelIndex + getUnderlineStatus = Underline.GetSelIndex + Underline.Select 2 + hopeUnderlineStatus = Underline.GetSelIndex - if getUnderlineStatus <> hopeUnderlineStatus then Warnlog "The content is NOT underlined when M:Y T:Y" - Underline.Select 1 - TabFontEffects.OK - Sleep 1 + if getUnderlineStatus <> hopeUnderlineStatus then Warnlog "The content is NOT underlined when M:Y T:Y" + Underline.Select 1 + TabFontEffects.OK + Sleep 1 - Call wTypeKeys "" + Call wTypeKeys "" '/// M:Y T:N - testContent = "_Test_" - hopeResultBeforeAutoformat = "_Test_" - hopeResultAfterAutoformat = "Test" + testContent = "_Test_" + hopeResultBeforeAutoformat = "_Test_" + hopeResultAfterAutoformat = "Test" - Call fAutocorrectOptions("AutomaticBoldAndUnderline") + Call fAutocorrectOptions("AutomaticBoldAndUnderline",1,0) - Call wTypeKeys testContent - Call wTypeKeys "" + Call wTypeKeys testContent + Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResultBeforeAutoformat then + EditCopy + if GetClipboardText <> hopeResultBeforeAutoformat then Warnlog "The content should NOT be changed before Autoformat! M:Y T:N" goto GOING1 - end if + end if - fFormatCharacter("TabFontEffects") + Call fFormatCharacter("TabFontEffects") - getUnderlineStatus = Underline.GetSelIndex - Underline.Select 1 - Sleep 1 - hopeUnderlineStatus = Underline.GetSelIndex + getUnderlineStatus = Underline.GetSelIndex + Underline.Select 1 + Sleep 1 + hopeUnderlineStatus = Underline.GetSelIndex - if getUnderlineStatus <> hopeUnderlineStatus then Warnlog "The content should NOT be underlined when M:Y T:N before autoformat!" - TabFontEffects.OK - Sleep 1 + if getUnderlineStatus <> hopeUnderlineStatus then Warnlog "The content should NOT be underlined when M:Y T:N before autoformat!" + TabFontEffects.OK + Sleep 1 - Call wTypeKeys "" - FormatAutoformatApply - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResultAfterAutoformat then + Call wTypeKeys "" + FormatAutoformatApply + Call wTypeKeys "" + EditCopy + if GetClipboardText <> hopeResultAfterAutoformat then Warnlog "The content should be changed after Autoformat!M:Y T:N" - end if + end if - fFormatCharacter("TabFontEffects") - getUnderlineStatus = Underline.GetSelIndex - Underline.Select 2 - hopeUnderlineStatus = Underline.GetSelIndex + Call fFormatCharacter("TabFontEffects") + getUnderlineStatus = Underline.GetSelIndex + Underline.Select 2 + hopeUnderlineStatus = Underline.GetSelIndex - if getUnderlineStatus <> hopeUnderlineStatus then Warnlog "The content should be underlined when M:Y T:N" - Underline.Select 1 - TabFontEffects.OK - Sleep 1 -GOING1: - Call wTypeKeys "" + if getUnderlineStatus <> hopeUnderlineStatus then Warnlog "The content should be underlined when M:Y T:N" + Underline.Select 1 + TabFontEffects.OK + Sleep 1 + GOING1: + Call wTypeKeys "" '/// M:N T:Y - testContent = "_Test_" - hopeResult = "Test" + testContent = "_Test_" + hopeResult = "Test" - Call fAutocorrectOptions("AutomaticBoldAndUnderline") + Call fAutocorrectOptions("AutomaticBoldAndUnderline",0,1) - Call wTypeKeys testContent - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResult then Warnlog "Something wrong in Automatic bold when M:N T:Y" + Call wTypeKeys testContent + Call wTypeKeys "" + EditCopy + if GetClipboardText <> hopeResult then Warnlog "Something wrong in Automatic bold when M:N T:Y" - fFormatCharacter("TabFontEffects") - getUnderlineStatus = Underline.GetSelIndex - Underline.Select 2 - Sleep 1 - hopeUnderlineStatus = Underline.GetSelIndex + Call fFormatCharacter("TabFontEffects") + getUnderlineStatus = Underline.GetSelIndex + Underline.Select 2 + Sleep 1 + hopeUnderlineStatus = Underline.GetSelIndex - if getUnderlineStatus <> hopeUnderlineStatus then Warnlog "The content is NOT underlined when M:N T:Y" - Underline.Select 1 - Sleep 1 - TabFontEffects.OK - Sleep 1 + if getUnderlineStatus <> hopeUnderlineStatus then Warnlog "The content is NOT underlined when M:N T:Y" + Underline.Select 1 + Sleep 1 + TabFontEffects.OK + Sleep 1 - Call wTypeKeys "" + Call wTypeKeys "" '/// M:N T:N - testContent = "_Test_" - hopeResultBeforeAutoformat = "_Test_" - hopeResultAfterAutoformat = "_Test_" + testContent = "_Test_" + hopeResultBeforeAutoformat = "_Test_" + hopeResultAfterAutoformat = "_Test_" - Call fAutocorrectOptions("AutomaticBoldAndUnderline") + Call fAutocorrectOptions("AutomaticBoldAndUnderline",0,0) - Call wTypeKeys testContent - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResultBeforeAutoformat then + Call wTypeKeys testContent + Call wTypeKeys "" + EditCopy + if GetClipboardText <> hopeResultBeforeAutoformat then Warnlog "The content should NOT be changed before Autoformat! M:N T:N" goto testend - end if + end if - fFormatCharacter("TabFontEffects") - getUnderlineStatus = Underline.GetSelIndex - Underline.Select 1 - hopeUnderlineStatus = Underline.GetSelIndex + Call fFormatCharacter("TabFontEffects") + getUnderlineStatus = Underline.GetSelIndex + Underline.Select 1 + hopeUnderlineStatus = Underline.GetSelIndex - if getUnderlineStatus <> hopeUnderlineStatus then Warnlog "The content should NOT be underlined before autoformat!M:N T:N " - TabFontEffects.OK + if getUnderlineStatus <> hopeUnderlineStatus then Warnlog "The content should NOT be underlined before autoformat!M:N T:N " + TabFontEffects.OK - Call wTypeKeys "" - FormatAutoformatApply - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResultAfterAutoformat then - Warnlog "The content should NOT be changed after Autoformat! M:N T:N" - end if + Call wTypeKeys "" + FormatAutoformatApply + Call wTypeKeys "" + EditCopy + if GetClipboardText <> hopeResultAfterAutoformat then + Warnlog "The content should NOT be changed after Autoformat! M:N T:N" + end if - fFormatCharacter("TabFontEffects") - getUnderlineStatus = Underline.GetSelIndex - Underline.Select 1 - Sleep 1 - hopeUnderlineStatus = Underline.GetSelIndex + Call fFormatCharacter("TabFontEffects") + getUnderlineStatus = Underline.GetSelIndex + Underline.Select 1 + Sleep 1 + hopeUnderlineStatus = Underline.GetSelIndex - if getUnderlineStatus <> hopeUnderlineStatus then Warnlog "The content should NOT be underlined after autoformat! M:N T:N" - TabFontEffects.OK - Sleep 1 + if getUnderlineStatus <> hopeUnderlineStatus then Warnlog "The content should NOT be underlined after autoformat! M:N T:N" + TabFontEffects.OK + Sleep 1 -testend: + testend: '/// Recover to the default M:Y T:Y - Call fAutocorrectOptions("AutomaticBoldAndUnderline") + Call fAutocorrectOptions("AutomaticBoldAndUnderline",1,1) Call hCloseDocument @@ -794,100 +802,100 @@ endcase testcase tToolsAutocorrectOptions_5 - Dim testContent as String - Dim hopeResult as String - Dim hopeResultBeforeAutoformat as String - Dim hopeResultAfterAutoformat as String + Dim testContent as String + Dim hopeResult as String + Dim hopeResultBeforeAutoformat as String + Dim hopeResultAfterAutoformat as String - printLog "URL Recognition" - '/// URL Recognition - Call hNewDocument + printLog "URL Recognition" + '/// URL Recognition + Call hNewDocument '/// M:Y T:Y (default) - testContent = "WWW.sun.com" - hopeResult = "http://WWW.sun.com/" + testContent = "WWW.sun.com" + hopeResult = "http://WWW.sun.com/" - Call wTypeKeys testContent - Call wTypeKeys " " - Call wTypeKeys "" + Call wTypeKeys testContent + Call wTypeKeys " " + Call wTypeKeys "" - fFormatCharacter("TabHyperlinkZeichen") - if URLName.GetText <> hopeResult then Warnlog "The URL is NOT appeared when M:Y T:Y" - URLName.SetText "" - TabHyperlinkZeichen.OK + Call fFormatCharacter("TabHyperlinkZeichen") + if URLName.GetText <> hopeResult then Warnlog "The URL is NOT appeared when M:Y T:Y" + URLName.SetText "" + TabHyperlinkZeichen.OK Call hCloseDocument Call hNewDocument '/// M:Y T:N - testContent = "WWW.sun.com" - hopeResultBeforeAutoformat = "" - hopeResultAfterAutoformat = "http://WWW.sun.com/" + testContent = "WWW.sun.com" + hopeResultBeforeAutoformat = "" + hopeResultAfterAutoformat = "http://WWW.sun.com/" - Call fAutocorrectOptions("URLRecognition") + Call fAutocorrectOptions("URLRecognition",1,0) - Call wTypeKeys testContent - Call wTypeKeys " " - Call wTypeKeys "" + Call wTypeKeys testContent + Call wTypeKeys " " + Call wTypeKeys "" - fFormatCharacter("TabHyperlinkZeichen") - if URLName.GetText <> hopeResultBeforeAutoformat then Warnlog "The URL should NOT appeare when M:Y T:N before autoformat!" - URLName.SetText "" - TabHyperlinkZeichen.OK + Call fFormatCharacter("TabHyperlinkZeichen") + if URLName.GetText <> hopeResultBeforeAutoformat then Warnlog "The URL should NOT appeare when M:Y T:N before autoformat!" + URLName.SetText "" + TabHyperlinkZeichen.OK - FormatAutoformatApply + FormatAutoformatApply - fFormatCharacter("TabHyperlinkZeichen") - if URLName.GetText <> hopeResultAfterAutoformat then Warnlog "The URL should appeare when M:Y T:N after autoformat!" - URLName.SetText "" - TabHyperlinkZeichen.OK + Call fFormatCharacter("TabHyperlinkZeichen") + if URLName.GetText <> hopeResultAfterAutoformat then Warnlog "The URL should appeare when M:Y T:N after autoformat!" + URLName.SetText "" + TabHyperlinkZeichen.OK Call hCloseDocument Call hNewDocument '/// M:N T:Y - testContent = "WWW.sun.com" - hopeResult = "http://WWW.sun.com/" + testContent = "WWW.sun.com" + hopeResult = "http://WWW.sun.com/" - Call fAutocorrectOptions("URLRecognition") + Call fAutocorrectOptions("URLRecognition",0,1) - Call wTypeKeys testContent - Call wTypeKeys " " - Call wTypeKeys "" + Call wTypeKeys testContent + Call wTypeKeys " " + Call wTypeKeys "" - fFormatCharacter("TabHyperlinkZeichen") - if URLName.GetText <> hopeResult then Warnlog "The URL is NOT appeared when M:N T:Y" - URLName.SetText "" - TabHyperlinkZeichen.OK + Call fFormatCharacter("TabHyperlinkZeichen") + if URLName.GetText <> hopeResult then Warnlog "The URL is NOT appeared when M:N T:Y" + URLName.SetText "" + TabHyperlinkZeichen.OK Call hCloseDocument Call hNewDocument '/// M:N T:N - testContent = "WWW.sun.com" - hopeResultBeforeAutoformat = "" - hopeResultAfterAutoformat = "" + testContent = "WWW.sun.com" + hopeResultBeforeAutoformat = "" + hopeResultAfterAutoformat = "" - Call fAutocorrectOptions("URLRecognition") + Call fAutocorrectOptions("URLRecognition",0,0) - Call wTypeKeys testContent - Call wTypeKeys " " - Call wTypeKeys "" + Call wTypeKeys testContent + Call wTypeKeys " " + Call wTypeKeys "" - fFormatCharacter("TabHyperlinkZeichen") - if URLName.GetText <> hopeResultBeforeAutoformat then Warnlog "The URL should NOT appeare when M:N T:N before autoformat!" - URLName.SetText "" - TabHyperlinkZeichen.OK + Call fFormatCharacter("TabHyperlinkZeichen") + if URLName.GetText <> hopeResultBeforeAutoformat then Warnlog "The URL should NOT appeare when M:N T:N before autoformat!" + URLName.SetText "" + TabHyperlinkZeichen.OK - FormatAutoformatApply + FormatAutoformatApply - fFormatCharacter("TabHyperlinkZeichen") - if URLName.GetText <> hopeResultAfterAutoformat then Warnlog "The URL should NOT appeare when M:N T:N after autoformat!" - URLName.SetText "" - TabHyperlinkZeichen.OK + Call fFormatCharacter("TabHyperlinkZeichen") + if URLName.GetText <> hopeResultAfterAutoformat then Warnlog "The URL should NOT appeare when M:N T:N after autoformat!" + URLName.SetText "" + TabHyperlinkZeichen.OK '/// Recover to the default M:Y T:Y - Call fAutocorrectOptions("URLRecognition") + Call fAutocorrectOptions("URLRecognition",1,1) Call hCloseDocument @@ -897,93 +905,93 @@ endcase testcase tToolsAutocorrectOptions_6 - Dim testContent as String - Dim hopeResult as String - Dim hopeResultBeforeAutoformat - Dim hopeResultAfterAutoformat as String + Dim testContent as String + Dim hopeResult as String + Dim hopeResultBeforeAutoformat + Dim hopeResultAfterAutoformat as String - printLog "Replace dashes" - '/// Replace dashes - Call hNewDocument + printLog "Replace dashes" + '/// Replace dashes + Call hNewDocument '/// M:Y T:Y (default) - testContent = "Bla - Bla" - hopeResult = "Bla – Bla" - Call wTypeKeys testContent - Call wTypeKeys " " - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResult then Warnlog "Something wrong in Replace dashes M:Y T:Y" + testContent = "Bla - Bla" + hopeResult = "Bla – Bla" + Call wTypeKeys testContent + Call wTypeKeys " " + Call wTypeKeys "" + EditCopy + if GetClipboardText <> hopeResult then Warnlog "Something wrong in Replace dashes M:Y T:Y" - Call wTypeKeys "" + Call wTypeKeys "" '/// M:Y T:N - testContent = "Bla - Bla" - hopeResultBeforeAutoformat = "Bla - Bla" - hopeResultAfterAutoformat = "Bla – Bla" + testContent = "Bla - Bla" + hopeResultBeforeAutoformat = "Bla - Bla" + hopeResultAfterAutoformat = "Bla – Bla" - Call fAutocorrectOptions("ReplaceDashes") - Call wTypeKeys testContent - Call wTypeKeys " " - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResultBeforeAutoformat then + Call fAutocorrectOptions("ReplaceDashes",1,0) + Call wTypeKeys testContent + Call wTypeKeys " " + Call wTypeKeys "" + EditCopy + if GetClipboardText <> hopeResultBeforeAutoformat then Warnlog "The content should NOT be changed before Autoformat! M:Y T:N" goto GOING1 - end if + end if - Call wTypeKeys "" - FormatAutoformatApply - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResultAfterAutoformat then + Call wTypeKeys "" + FormatAutoformatApply + Call wTypeKeys "" + EditCopy + if GetClipboardText <> hopeResultAfterAutoformat then Warnlog "The content should be changed after Autoformat!M:Y T:N" - end if + end if -GOING1: - Call wTypeKeys "" + GOING1: + Call wTypeKeys "" '/// M:N T:Y - testContent = "Bla - Bla" - hopeResult = "Bla – Bla" + testContent = "Bla - Bla" + hopeResult = "Bla – Bla" - Call fAutocorrectOptions("ReplaceDashes") - Call wTypeKeys testContent - Call wTypeKeys " " - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResult then Warnlog "Something wrong in Replace dashes when M:N T:Y" + Call fAutocorrectOptions("ReplaceDashes",0,1) + Call wTypeKeys testContent + Call wTypeKeys " " + Call wTypeKeys "" + EditCopy + if GetClipboardText <> hopeResult then Warnlog "Something wrong in Replace dashes when M:N T:Y" - Call wTypeKeys "" + Call wTypeKeys "" '/// M:N T:N - testContent = "Bla - Bla" - hopeResultBeforeAutoformat = "Bla - Bla" - hopeResultAfterAutoformat = "Bla - Bla" + testContent = "Bla - Bla" + hopeResultBeforeAutoformat = "Bla - Bla" + hopeResultAfterAutoformat = "Bla - Bla" - Call fAutocorrectOptions("ReplaceDashes") + Call fAutocorrectOptions("ReplaceDashes",0,0) - Call wTypeKeys testContent - Call wTypeKeys " " - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResultBeforeAutoformat then + Call wTypeKeys testContent + Call wTypeKeys " " + Call wTypeKeys "" + EditCopy + if GetClipboardText <> hopeResultBeforeAutoformat then Warnlog "The content should NOT be changed before Autoformat! M:N T:N" goto testend - end if + end if - Call wTypeKeys "" - FormatAutoformatApply - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResultAfterAutoformat then + Call wTypeKeys "" + FormatAutoformatApply + Call wTypeKeys "" + EditCopy + if GetClipboardText <> hopeResultAfterAutoformat then Warnlog "The content should NOT be changed after Autoformat! M:N T:N" - end if + end if -testend: + testend: '/// Recover to the default - Call fAutocorrectOptions("ReplaceDashes") + Call fAutocorrectOptions("ReplaceDashes",1,1) Call hCloseDocument @@ -993,12 +1001,12 @@ endcase testcase tToolsAutocorrectOptions_7 - Dim testContent as String - Dim hopeResult as String + Dim testContent as String + Dim hopeResult as String - printLog "Ignore double spaces" - '/// Ignore double spaces - Call hNewDocument + printLog "Ignore double spaces" + '/// Ignore double spaces + Call hNewDocument '/// + T:N (default) testContent = "Two Space" @@ -1014,7 +1022,7 @@ testcase tToolsAutocorrectOptions_7 testContent = "Two Space" hopeResult = "Two Space" - Call fAutocorrectOptions("IgnoreDoulbeSpaces") + Call fAutocorrectOptions("IgnoreDoubleSpaces",1,1) Call wTypeKeys testContent Call wTypeKeys "" EditCopy @@ -1024,7 +1032,7 @@ testcase tToolsAutocorrectOptions_7 Call wTypeKeys "" '/// Recover to the default - Call fAutocorrectOptions("IgnoreDoulbeSpaces") + Call fAutocorrectOptions("IgnoreDoubleSpaces",0,0) Call hCloseDocument @@ -1034,47 +1042,52 @@ endcase testcase tToolsAutocorrectOptions_8 - Dim firstLine as String - Dim testContent as String - Dim hopeResult as String + Dim firstLine as String + Dim testContent as String + Dim hopeResult as String - printLog "Apply numbering" - '/// Apply numbering + printLog "Apply numbering" + '/// Apply numbering - Call hNewDocument + Call hNewDocument '/// + T:Y (default) - firstLine = "1. FirstLine" - testContent = "Test1" - hopeResult = "1.Test1" + firstLine = "1. FirstLine" + testContent = "Test1" + hopeResult = "1.Test1" - Call wTypeKeys firstLine - Call wTypeKeys "" - Call wTypeKeys testContent - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResult then Warnlog "Should Apply numbering when T:Y " + Call wTypeKeys firstLine + Call wTypeKeys "" + Call wTypeKeys testContent + Call wTypeKeys "" + Call wTypeKeys "" + Call wTypeKeys "" + EditCopy + printlog GetClipBoardtext + if GetClipboardText <> hopeResult then Warnlog "Should Apply numbering when T:Y. Not " & hopeResult & " but " & GetClipboardtext - EditSelectAll - Call wTypeKeys "" - Call wTypeKeys "",3 + EditSelectAll + Call wTypeKeys "" + Call wTypeKeys "",3 '/// + T:N - testContent = "Test1" - hopeResult = "Test1" + testContent = "Test1" + hopeResult = "Test1" - Call fAutocorrectOptions("ApplyNumbering") - Call wTypeKeys firstLine - Call wTypeKeys "" - Call wTypeKeys testContent - Call wTypeKeys "" - EditCopy + Call fAutocorrectOptions("ApplyNumbering",0,0) + Call wTypeKeys firstLine + Call wTypeKeys "" + Call wTypeKeys testContent + Call wTypeKeys "" + Call wTypeKeys "" + Call wTypeKeys "" + EditCopy - if GetClipboardText <> hopeResult then Warnlog "Should NOT Apply numbering when T:Y" + if GetClipboardText <> hopeResult then Warnlog "Should NOT Apply numbering when T:N. Not " & hopeResult & " but " & GetClipboardtext '/// Recover to the default - Call fAutocorrectOptions("ApplyNumbering") + Call fAutocorrectOptions("ApplyNumbering",1,1) Call hCloseDocument @@ -1084,79 +1097,71 @@ endcase testcase tToolsAutocorrectOptions_9 - Dim testList() as String - Dim testContent as String - Dim hopeResult as String - Dim i as String - Dim j as Integer - Dim bottom as String - - bottom = "0" + gSeperator + "10" + gMeasurementUnit - - testList = Array( _ - "---" , _ - "___" , _ - "===" , _ - "***" , _ - "~~~" , _ - "###" , _ - ) - j = UBound(testList) + Dim testList() as String + Dim testContent as String + Dim hopeResult as String + Dim i as integer + Dim bottom as String - '/// Apply border test , including - '/// + '---' , '___", "===", "***" , "~~~", "###" - printLog "Apply border" + bottom = "0" + gSeperator + "10" + gMeasurementUnit - Call hNewDocument + testList = Array( "---", "___", "===", "***", "~~~" , "###" ) - For i = 0 to j + '/// Apply border test , including + '/// + '---' , '___", "===", "***" , "~~~", "###" + printLog "Apply border" - '/// + T:Y (default) - testContent = testlist(i) + Call hNewDocument - Call wTypeKeys testContent - Call wTypeKeys "" - try + For i = 0 to 5 + + printlog testlist(i) + printlog "- T:Y (default)" + testContent = testlist(i) + + Call wTypeKeys testContent + Call wTypeKeys "" + try + EditCopy + Warnlog "Apply border is NOT correct when T:Y " +testlist(i) + catch + endcatch + + Call fFormatParagraph("TabUmrandung") + try + Unten.SetText bottom + catch + Warnlog "Apply border is NOT correct when T:Y " +testlist(i) + endcatch + TabUmrandung.Cancel + + Call wTypeKeys "" + + printlog "- T:N" + testContent = testlist(i) + hopeResult = testlist(i) + + Call fAutocorrectOptions("ApplyBorder",0,0) + Call wTypeKeys testContent + Call wTypeKeys "" EditCopy - Warnlog "Apply border is NOT correct when T:Y " +testlist(i) - catch - endcatch - - fFormatParagraph("TabUmrandung") - try - Unten.SetText bottom - catch - Warnlog "Apply border is NOT correct when T:Y " +testlist(i) - endcatch - TabUmrandung.Cancel - - Call wTypeKeys "" - - '/// + T:N - testContent = testlist(i) - hopeResult = testlist(i) - - Call fAutocorrectOptions("ApplyBorder") - Call wTypeKeys testContent - Call wTypeKeys "" - EditCopy - if GetClipboardText <> hopeResult then Warnlog "Something wrong when T:N "+testlist(i) + if GetClipboardText <> hopeResult then Warnlog "Something wrong when T:N "+testlist(i) - fFormatParagraph("TabUmrandung") - try - Unten.SetText bottom - Warnlog "Apply border is NOT correct when T:N "+testlist(i) - catch - endcatch - TabUmrandung.Cancel + Call fFormatParagraph("TabUmrandung") + try + Unten.SetText bottom + Warnlog "Apply border is NOT correct when T:N "+testlist(i) + catch + endcatch + TabUmrandung.Cancel - '/// Recover to the default - Call fAutocorrectOptions("ApplyBorder") + printlog "- Recover to the default" + Call fAutocorrectOptions("ApplyBorder",1,1) - next i + next i - Call hCloseDocument + Call hCloseDocument endcase @@ -1164,50 +1169,50 @@ endcase testcase tToolsAutocorrectOptions_10 - Dim testContent as String - Dim hopeResult as String + Dim testContent as String + Dim hopeResult as String - printLog "Create Table" - '/// Create Table - Call hNewDocument + printLog "Create Table" + '/// Create Table + Call hNewDocument '/// + T:Y (default) - testContent = "+---+" - Call wTypeKeys testContent - Call wTypeKeys "" - try + testContent = "+---+" + Call wTypeKeys testContent + Call wTypeKeys "" + try EditCopy Warnlog "Something wrong in create table T:Y" - catch - endcatch + catch + endcatch - try + try FormatRowDelete Sleep 1 - catch + catch Warnlog "Can't delete table ,T:Y" - endcatch + endcatch '/// + T:N - testContent = "+---+" - hopeResult = "+---+" + testContent = "+---+" + hopeResult = "+---+" - Call fAutocorrectOptions("CreateTable") - Call wTypeKeys testContent - Call wTypeKeys "" - EditCopy + Call fAutocorrectOptions("CreateTable",0,0) + Call wTypeKeys testContent + Call wTypeKeys "" + EditCopy - if GetClipboardText <> hopeResult then Warnlog "Something wrong when T:N" + if GetClipboardText <> hopeResult then Warnlog "Something wrong when T:N" - try + try FormatRowDelete Sleep 1 Warnlog "Should NOT generate table when T:N" - catch - endcatch + catch + endcatch '/// Recover to the default - Call fAutocorrectOptions("CreateTable") + Call fAutocorrectOptions("CreateTable",1,1) Call hCloseDocument @@ -1217,72 +1222,71 @@ endcase testcase tToolsAutocorrectOptions_11 - Dim testContent1 as String - Dim testContent2 as String - Dim hopeResultAfterAutoformat1 as String - Dim hopeResultAfterAutoformat2 as String - - testContent1 = "ABCD1234" - testContent2 = "EFGH5678" + Dim testContent1 as String + Dim testContent2 as String + Dim hopeResultAfterAutoformat1 as String + Dim hopeResultAfterAutoformat2 as String - hopeResultAfterAutoformat1 = "ABCD1234" - hopeResultAfterAutoformat2 = "EFGH5678" + testContent1 = "ABCD1234" + testContent2 = "EFGH5678" + hopeResultAfterAutoformat1 = "ABCD1234" + hopeResultAfterAutoformat2 = "EFGH5678" - printLog "Remove Blank Paragraphs" - '/// Remove Blank Paragraphs + printLog "Remove Blank Paragraphs" + '/// Remove Blank Paragraphs - Call hNewDocument + Call hNewDocument '/// M:N (default) - wTypeKeys testContent1 - wTypeKeys "",2 - wTypeKeys testContent2 + Call wTypeKeys testContent1 + Call wTypeKeys "",2 + Call wTypeKeys testContent2 - FormatAutoformatApply + FormatAutoformatApply - wTypeKeys "" - wait 200 - EditCopy - if GetClipboardText <> hopeResultAfterAutoformat1 then Warnlog "the first line's content is NOT correct when M:N" + Call wTypeKeys "" + wait 200 + EditCopy + if GetClipboardText <> hopeResultAfterAutoformat1 then Warnlog "the first line's content is NOT correct when M:N" - wTypeKeys "" - try + Call wTypeKeys "" + try EditCopy Warnlog "the second line's content is NOT correct when M:N" - catch - endcatch + catch + endcatch - wTypeKeys "" - wait 200 - EditCopy - if GetClipboardText <> hopeResultAfterAutoformat2 then Warnlog "the third line's content is NOT correct when M:N" + Call wTypeKeys "" + wait 200 + EditCopy + if GetClipboardText <> hopeResultAfterAutoformat2 then Warnlog "the third line's content is NOT correct when M:N" Call hCloseDocument Call hNewDocument '/// M:Y - Call fAutocorrectOptions("RemoveBlankParagraphs") + Call fAutocorrectOptions("RemoveBlankParagraphs",1,1) - wTypeKeys testContent1 - wTypeKeys "",2 - wTypeKeys testContent2 + Call wTypeKeys testContent1 + Call wTypeKeys "",2 + Call wTypeKeys testContent2 - FormatAutoformatApply + FormatAutoformatApply - wTypeKeys "" - wait 200 - EditCopy - if GetClipboardText <> hopeResultAfterAutoformat1 then Warnlog "the first line's content is NOT correct when M:Y" + Call wTypeKeys "" + wait 200 + EditCopy + if GetClipboardText <> hopeResultAfterAutoformat1 then Warnlog "the first line's content is NOT correct when M:Y" - wTypeKeys "" - wait 200 - EditCopy - if GetClipboardText <> hopeResultAfterAutoformat2 then Warnlog "the second line's content is NOT correct when M:Y" + Call wTypeKeys "" + wait 200 + EditCopy + if GetClipboardText <> hopeResultAfterAutoformat2 then Warnlog "the second line's content is NOT correct when M:Y" '/// Recover to the default - Call fAutocorrectOptions("RemoveBlankParagraphs") + Call fAutocorrectOptions("RemoveBlankParagraphs",0,0) Call hCloseDocument @@ -1292,37 +1296,37 @@ endcase testcase tToolsAutocorrectOptions_12 - Dim testContent as String - Dim hopeResultBeforeAutoformat as String - Dim hopeResultAfterAutoformat as String + Dim testContent as String + Dim hopeResultBeforeAutoformat as String + Dim hopeResultAfterAutoformat as String - printLog "Replace bullets with •" - '/// Replace bullets with • + printLog "Replace bullets with •" + '/// Replace bullets with • - Call hNewDocument + Call hNewDocument '/// M:Y (default) printLog "M:Y (default)" - testContent = "+ Hello" - hopeResultBeforeAutoformat = "+ Hello" - hopeResultAfterAutoformat = "• Hello" - - wTypeKeys testContent - wait 100 - wTypeKeys "" - Sleep 1 - GetClipboardText = "" - EditCopy - if GetClipboardText <> hopeResultBeforeAutoformat then Warnlog "should NOT change before autoformat " + testContent = "+ Hello" + hopeResultBeforeAutoformat = "+ Hello" + hopeResultAfterAutoformat = "• Hello" - FormatAutoformatApply + Call wTypeKeys testContent + wait 100 + Call wTypeKeys "" + Sleep 1 + GetClipboardText = "" + EditCopy + if GetClipboardText <> hopeResultBeforeAutoformat then Warnlog "should NOT change before autoformat " - wTypeKeys "" - Sleep 1 - GetClipboardText = "" - EditCopy - Sleep 1 - if GetClipboardText <> hopeResultAfterAutoformat then Warnlog "should change after autoformat " + FormatAutoformatApply + + Call wTypeKeys "" + Sleep 1 + GetClipboardText = "" + EditCopy + Sleep 1 + if GetClipboardText <> hopeResultAfterAutoformat then Warnlog "should change after autoformat " Call hCloseDocument @@ -1330,30 +1334,30 @@ testcase tToolsAutocorrectOptions_12 '/// M:N printLog "M:N" - testContent = "+ Hello" - hopeResultBeforeAutoformat = "+ Hello" - hopeResultAfterAutoformat = "+ Hello" + testContent = "+ Hello" + hopeResultBeforeAutoformat = "+ Hello" + hopeResultAfterAutoformat = "+ Hello" - Call fAutocorrectOptions("ReplaceBullets") + Call fAutocorrectOptions("ReplaceBullets",0,0) - wTypeKeys testContent - wait 100 - wTypeKeys "" - Sleep 1 - GetClipboardText = "" - EditCopy - if GetClipboardText <> hopeResultBeforeAutoformat then Warnlog "Should NOT change before autoformat " + Call wTypeKeys testContent + wait 100 + Call wTypeKeys "" + Sleep 1 + GetClipboardText = "" + EditCopy + if GetClipboardText <> hopeResultBeforeAutoformat then Warnlog "Should NOT change before autoformat " - FormatAutoformatApply - Sleep 1 - wTypeKeys "" - Sleep 1 - GetClipboardText = "" - EditCopy - if GetClipboardText <> hopeResultAfterAutoformat then Warnlog "Should NOT change after autoformat " + FormatAutoformatApply + Sleep 1 + Call wTypeKeys "" + Sleep 1 + GetClipboardText = "" + EditCopy + if GetClipboardText <> hopeResultAfterAutoformat then Warnlog "Should NOT change after autoformat " '/// Recover to the default - Call fAutocorrectOptions("ReplaceBullets") + Call fAutocorrectOptions("ReplaceBullets",1,1) Call hCloseDocument @@ -1363,87 +1367,86 @@ endcase testcase tToolsAutocorrectOptions_13 - Dim testContent as String - Dim hopeResultBeforeAutoformat as String - Dim hopeResultAfterAutoformat as String + Dim testContent as String + Dim hopeResultBeforeAutoformat as String + Dim hopeResultAfterAutoformat as String - printLog "Replace standard quotes with custom quotes" - '/// Replace standard quotes with custom quotes + printLog "Replace standard quotes with custom quotes" + '/// Replace standard quotes with custom quotes - Call hNewDocument + Call hNewDocument '/// M:Y (default) - testContent = "'" - hopeResultBeforeAutoformat = "'" - hopeResultAfterAutoformat = "[" - - ToolsAutoCorrect - Kontext - Active.SetPage TabLocalizedOptions - Kontext "TabLocalizedOptions" - SingleQuotesReplace.UnCheck - SingleQuotesStart.Click - Kontext "Sonderzeichen" - Schriftliste.TypeKeys "" - Schriftliste.TypeKeys "", 59 ' is [ - Schriftliste.TypeKeys "" - Sonderzeichen.OK - - Kontext "TabLocalizedOptions" - TabLocalizedOptions.OK - - wTypeKeys (testContent + "Hello") - wait 100 - wTypeKeys "" - Sleep 1 - EditCopy - if GetClipboardText <> hopeResultBeforeAutoformat then Warnlog "Should NOT change before autoformat " + testContent = "'" + hopeResultBeforeAutoformat = "'" + hopeResultAfterAutoformat = "[" - FormatAutoformatApply + ToolsAutoCorrect + Kontext + Active.SetPage TabLocalizedOptions + Kontext "TabLocalizedOptions" + SingleQuotesReplace.UnCheck + SingleQuotesStart.Click + Kontext "Sonderzeichen" + Schriftliste.TypeKeys "" + Schriftliste.TypeKeys "", 59 ' is [ + Schriftliste.TypeKeys "" + Sonderzeichen.OK + + Kontext "TabLocalizedOptions" + TabLocalizedOptions.OK + + Call wTypeKeys (testContent + "Hello") + wait 100 + Call wTypeKeys "" + Sleep 1 + EditCopy + if GetClipboardText <> hopeResultBeforeAutoformat then Warnlog "Should NOT change before autoformat " - wTypeKeys "" - Sleep 1 - EditCopy - if GetClipboardText <> hopeResultAfterAutoformat then Warnlog "Should change after autoformat " + FormatAutoformatApply + + Call wTypeKeys "" + Sleep 1 + EditCopy + if GetClipboardText <> hopeResultBeforeAutoformat then Warnlog "Should change after autoformat " Call hCloseDocument Call hNewDocument '/// M:N - testContent = "'" - hopeResultBeforeAutoformat = "'" - hopeResultAfterAutoformat = "'" + testContent = "'" + hopeResultBeforeAutoformat = "'" + hopeResultAfterAutoformat = "'" - Call fAutocorrectOptions("ReplaceQuotes") + Call fAutocorrectOptions("ReplaceQuotes",0,0) - wTypeKeys (testContent + "Hello") - wait 100 - wTypeKeys "" - Sleep 1 - EditCopy - if GetClipboardText <> hopeResultBeforeAutoformat then Warnlog "Should NOT change before autoformat " + Call wTypeKeys (testContent + "Hello") + wait 100 + Call wTypeKeys "" + Sleep 1 + EditCopy + if GetClipboardText <> hopeResultBeforeAutoformat then Warnlog "Should NOT change before autoformat " - FormatAutoformatApply + FormatAutoformatApply - wTypeKeys "" - Sleep 1 - EditCopy - if GetClipboardText <> hopeResultAfterAutoformat then Warnlog "Should NOT change after autoformat " + Call wTypeKeys "" + Sleep 1 + EditCopy + if GetClipboardText <> hopeResultAfterAutoformat then Warnlog "Should NOT change after autoformat " '/// Recover to the default - Call fAutocorrectOptions("ReplaceQuotes") + Call fAutocorrectOptions("ReplaceQuotes",1,1) - ToolsAutoCorrect - Kontext - Active.Setpage TabLocalizedOptions - Kontext "TabLocalizedOptions" - SingleQuotesReplace.Check - SingleQuotesDefault.Click - wait 100 - TabLocalizedOptions.OK + ToolsAutoCorrect + Kontext + Active.Setpage TabLocalizedOptions + Kontext "TabLocalizedOptions" + SingleQuotesReplace.Check + SingleQuotesDefault.Click + wait 100 + TabLocalizedOptions.OK Call hCloseDocument endcase - diff --git a/testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc b/testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc index 95e380fc13f6..e09db744680b 100755 --- a/testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc +++ b/testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc @@ -71,7 +71,7 @@ testcase tToolsAutocorrectWordCompletion_1 '/// - Check box "Append Space" (default: unchecked) '/// - Check box "Show as tip" (default: unchecked) '/// - Check box "Collect Words" (default: checked) - '/// - Check box "When closing a document, save the list for later use in other documents" (default: checked) + '/// - Check box "When closing a document, remove the words collected from it from the list" (default: unchecked) '/// - List box "Accept with" (Default = "Return") '/// - Spin box "minimal number of characters" default = 10 '/// - Spin box "Max. entries" (default =500, minimum = 50) @@ -92,7 +92,7 @@ testcase tToolsAutocorrectWordCompletion_1 if VorschlaegeSammeln.IsChecked <> TRUE then Warnlog "Collect suggestions should be checked ." if KeepList.IsChecked = TRUE then Warnlog "When closing a document, remove the words collected from it from the list should be unchecked ." if AnnehmenMit.GetSelIndex <> iAcceptWith then Warnlog "The Accept with should be 'Enter' ." - if MinWortlaenge.GetText <> sMinWordLength then Warnlog "#i40540# Min word length should be " + sMinWordLength + if MinWortlaenge.GetText <> sMinWordLength then Warnlog "Min word length should be " + sMinWordLength if MaxEintraege.GetText <> sMaxEntries then Warnlog "Max entries should be " + sMaxEntries if GesammelteWorte.GetItemCount <> iEntriesNumber then Warnlog "Entries number should be " + iEntriesNumber @@ -133,7 +133,8 @@ testcase tToolsAutocorrectWordCompletion_2 '/// delete all entries '/// close and reopen dialog, check entries again - Call hNewDocument + Call hFileOpen ( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) + Call sMakeReadOnlyDocumentEditable 'Delete all entries in the list Call fDeleteAllEntries() @@ -141,7 +142,7 @@ testcase tToolsAutocorrectWordCompletion_2 Kontext Active.Setpage TabWortergaenzung Kontext "TabWortergaenzung" - if GesammelteWorte.GetItemCount <> iDefaultEntriesNumber then + if GesammelteWorte.GetItemCount <> 0 then Warnlog "Entries number should be " + iDefaultEntriesNumber Warnlog "No test for this case" TabWortergaenzung.Cancel @@ -150,14 +151,14 @@ testcase tToolsAutocorrectWordCompletion_2 MinWortlaenge.SetText sMinWordLength TabWortergaenzung.OK - Call wTypeKeys "Hello World ! This is a StarOffice Test ." + Call wTypeKeys "Hello World ! This is a OpenOffice.org Test ." Sleep 3 ToolsAutocorrect Kontext Active.Setpage TabWortergaenzung Kontext "TabWortergaenzung" - if GesammelteWorte.GetItemCount <> iEntriesNumber then Warnlog "Entries number should be " + iEntriesNumber + if GesammelteWorte.GetItemCount <> 3 then Warnlog "Entries number should be " + iEntriesNumber for i = 1 to GesammelteWorte.GetItemCount GesammelteWorte.Select 1 if EintragLoeschen.IsEnabled then @@ -173,7 +174,7 @@ testcase tToolsAutocorrectWordCompletion_2 Kontext Active.Setpage TabWortergaenzung Kontext "TabWortergaenzung" - if GesammelteWorte.GetItemCount <> iDefaultEntriesNumber then Warnlog "Entries number should be " + iDefaultEntriesNumber + if GesammelteWorte.GetItemCount <> 0 then Warnlog "Entries number should be " + 0 TabWortergaenzung.Cancel Call hCloseDocument @@ -187,15 +188,10 @@ testcase tToolsAutocorrectWordCompletion_3 Dim aTestWord() as String Dim sPartOfTestWord as String Dim i as Integer - Dim j as Integer - - aTestWord = Array( _ - "accessibility" , _ - "accomplish" , _ - "account" , _ - ) - j = UBound(aTestWord) + Dim j as integer + aTestWord = Array( "accessibility", "accomplish", "accounting" ) + sPartOfTestWord = "acc" printLog "Check list of suggestions can be 'scrolled'" @@ -206,58 +202,48 @@ testcase tToolsAutocorrectWordCompletion_3 '/// backwards with '/// endless loop test - Call hNewDocument + Call hFileOpen ( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) + Call sMakeReadOnlyDocumentEditable 'Delete all entries in the list Call fDeleteAllEntries() 'forward with - For i = 0 to j + For i = 0 to 2 Call wTypeKeys aTestWord(i) Call wTypeKeys "" next i Sleep 2 - For i = 0 to j + For i = 0 to 2 Call wTypeKeys sPartOfTestWord - if i > 0 then Call wTypeKeys "", i Sleep 2 - Call wTypeKeys "" - Sleep 2 Call wTypeKeys "" - Sleep 2 EditCopy - Sleep 2 if GetClipboardText <> aTestWord(i) then Warnlog "#102535# Should be " +aTestWord(i) +" but get " +GetClipboardText Call wTypeKeys "" next i 'endless loop test Call wTypeKeys sPartOfTestWord - Call wTypeKeys "", j+1 - Sleep 2 + Call wTypeKeys "", 3 Call wTypeKeys "" - Sleep 2 Call wTypeKeys "" - Sleep 2 EditCopy - Sleep 2 if GetClipboardText <> aTestWord(0) then Warnlog "#102535# Should be " +aTestWord(0) +" but get " +GetClipboardText Call wTypeKeys "" 'backwards with + j = UBound (aTestWord) + For i = j to 0 step -1 Call wTypeKeys sPartOfTestWord Call wTypeKeys "", j if i > 0 then Call wTypeKeys "", i - Sleep 2 Call wTypeKeys "" - Sleep 2 Call wTypeKeys "" - Sleep 2 EditCopy - Sleep 2 if GetClipboardText <> aTestWord(j-i) then Warnlog "#102535# Should be " +aTestWord(j-i) +" but get " +GetClipboardText Call wTypeKeys "" next i @@ -265,14 +251,10 @@ testcase tToolsAutocorrectWordCompletion_3 'endless loop test Call wTypeKeys sPartOfTestWord Call wTypeKeys "" - Sleep 2 Call wTypeKeys "" - Sleep 2 Call wTypeKeys "" - Sleep 2 EditCopy - Sleep 2 - if GetClipboardText <> aTestWord(j) then Warnlog "#102535# Should be " +aTestWord(j) +" but get " +GetClipboardText + if GetClipboardText <> "accounting" then Warnlog "#102535# Should be 'accounting' but get " +GetClipboardText Call hCloseDocument @@ -312,6 +294,7 @@ testcase tToolsAutocorrectWordCompletion_4 TabWortergaenzung.OK Call hFileOpen ( gTesttoolPath + "writer\optional\input\advanced\" + sTestFile ) + Call sMakeReadOnlyDocumentEditable Sleep 4 ToolsAutocorrect @@ -344,14 +327,14 @@ testcase tToolsAutocorrectWordCompletion_5 iEntriesNumber_Checked = 3 iEntriesNumber_UnChecked = 1 - printLog "Check 'When closing a document, save the list for later use in other documents'" - '/// Check 'When closing a document, save the list for later use in other documents' + printLog "Check 'When closing a document, remove the words collected from it from the list'" + '/// Check 'When closing a document, remove the words collected from it from the list' '/// delete all entries first. - '/// 1) check when the checkbox is checked + '/// 1) check when the checkbox is unchecked '/// a) Open a file, type "kilometer" '/// b) Open 2nd file, type "entertainment" and "education" '/// c) Close 2nd file, the number of entries in first file should be 3 - '/// 2) check when the checkbox is Unchecked + '/// 2) check when the checkbox is checked '/// delete all entries , and Uncheck the testing checkbox '/// a) Open a file, type "kilometer" '/// b) Open 2nd file, type "entertainment" and "education" @@ -360,7 +343,8 @@ testcase tToolsAutocorrectWordCompletion_5 'Test when checkbox is checkec -- default 'Open 1st file - Call hNewDocument + Call hFileOpen ( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) + Call sMakeReadOnlyDocumentEditable 'Delete all entries in the list Call fDeleteAllEntries() @@ -370,13 +354,15 @@ testcase tToolsAutocorrectWordCompletion_5 Kontext Active.Setpage TabWortergaenzung Kontext "TabWortergaenzung" + MinWortlaenge.SetText 5 KeepList.UnCheck TabWortergaenzung.Ok Call wTypeKeys sTestWord1 'Open 2nd file - Call hNewDocument + Call hFileOpen ( gTesttoolPath + "writer\optional\input\autocorrection\01-01.odt" ) + Call sMakeReadOnlyDocumentEditable Call wTypeKeys sTestWord2 Call wTypeKeys sTestWord3 @@ -385,8 +371,8 @@ testcase tToolsAutocorrectWordCompletion_5 Kontext Active.Setpage TabWortergaenzung Kontext "TabWortergaenzung" - if GesammelteWorte.GetItemCount <> iEntriesNumber_Checked then - Warnlog "Checked:Entries number should be equal " + iEntriesNumber_Checked + " in 2nd file ,but get " +GesammelteWorte.GetItemCount + if GesammelteWorte.GetItemCount <> 3 then + Warnlog "Checked:Entries number should be equal 3 in 2nd file ,but get " + GesammelteWorte.GetItemCount end if TabWortergaenzung.Cancel @@ -397,16 +383,17 @@ testcase tToolsAutocorrectWordCompletion_5 Kontext Active.Setpage TabWortergaenzung Kontext "TabWortergaenzung" - if GesammelteWorte.GetItemCount <> iEntriesNumber_Checked then - Warnlog "Checked:Entries number should be equal " + iEntriesNumber_Checked + " in 1st file ,but get " +GesammelteWorte.GetItemCount + if GesammelteWorte.GetItemCount <> 3 then + Warnlog "Checked:Entries number should be equal 3 in 1st file ,but get " + GesammelteWorte.GetItemCount end if TabWortergaenzung.Cancel Call hCloseDocument - 'Test when checkbox is Unchecked + 'Test when checkbox is Checked 'Open 1st file - Call hNewDocument + Call hFileOpen ( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) + Call sMakeReadOnlyDocumentEditable 'Delete all entries in the list fDeleteAllEntries() @@ -422,7 +409,8 @@ testcase tToolsAutocorrectWordCompletion_5 Call wTypeKeys sTestWord1 'Open 2nd file - Call hNewDocument + Call hFileOpen ( gTesttoolPath + "writer\optional\input\autocorrection\01-01.odt" ) + Call sMakeReadOnlyDocumentEditable Call wTypeKeys sTestWord2 Call wTypeKeys sTestWord3 @@ -431,8 +419,8 @@ testcase tToolsAutocorrectWordCompletion_5 Kontext Active.Setpage TabWortergaenzung Kontext "TabWortergaenzung" - if GesammelteWorte.GetItemCount <> iEntriesNumber_Checked then - Warnlog "UnChecked:Entries number should be equal " + iEntriesNumber_Checked + " in 2nd file ,but get " +GesammelteWorte.GetItemCount + if GesammelteWorte.GetItemCount <> 3 then + Warnlog "UnChecked:Entries number should be equal 3 in 2nd file ,but get " + GesammelteWorte.GetItemCount end if TabWortergaenzung.Cancel @@ -443,8 +431,8 @@ testcase tToolsAutocorrectWordCompletion_5 Kontext Active.Setpage TabWortergaenzung Kontext "TabWortergaenzung" - if GesammelteWorte.GetItemCount <> iEntriesNumber_UnChecked then - Warnlog "UnChecked:Entries number should be equal " + iEntriesNumber_UnChecked + " in 2nd file ,but get " +GesammelteWorte.GetItemCount + if GesammelteWorte.GetItemCount <> 1 then + Warnlog "UnChecked:Entries number should be equal 1 in 2nd file ,but get " +GesammelteWorte.GetItemCount end if TabWortergaenzung.Cancel @@ -460,8 +448,8 @@ testcase tToolsAutocorrectWordCompletion_6 Dim sTestWord as String Dim sPartOfTestWord as String - sTestWord = "StarOffice" - sPartOfTestWord = "Sta" + sTestWord = "OpenOffice.org" + sPartOfTestWord = "Ope" printLog "Check Show as Tip" '/// Check Show as Tip @@ -471,7 +459,8 @@ testcase tToolsAutocorrectWordCompletion_6 '/// and a help tip will appear <--- no way to test yet 'Show as Tip -- uncheck (default) - Call hNewDocument + Call hFileOpen ( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) + Call sMakeReadOnlyDocumentEditable Call wTypeKeys sTestWord Call wTypeKeys "" -- cgit From 1040e1e7aef9f18c0fc367338d310b7fd6746477 Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Mon, 15 Feb 2010 16:34:12 +0100 Subject: cbosdo01: i108312: fixed integer to string --- .../writer/optional/includes/autocorrection/w_autocorrect2.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testautomation') diff --git a/testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc b/testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc index e09db744680b..cfa21c0ecd6a 100755 --- a/testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc +++ b/testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc @@ -354,7 +354,7 @@ testcase tToolsAutocorrectWordCompletion_5 Kontext Active.Setpage TabWortergaenzung Kontext "TabWortergaenzung" - MinWortlaenge.SetText 5 + MinWortlaenge.SetText "5" KeepList.UnCheck TabWortergaenzung.Ok -- cgit