From 3ce3842f24d6d822d1a85422273059bfb228ef33 Mon Sep 17 00:00:00 2001 From: "Ocke Janssen [oj]" Date: Fri, 22 Jan 2010 08:14:22 +0100 Subject: dba33f: #i108548# extend SingleSelectQueryComposer appendFilterByColumn with additonal parameter --- .../java/ifc/sdb/_XSingleSelectQueryComposer.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java index 03c9a43c918f..3926fa049bb1 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java +++ b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java @@ -39,6 +39,7 @@ import lib.StatusException; import lib.Status; import com.sun.star.beans.PropertyValue; import com.sun.star.beans.XPropertySet; +import com.sun.star.sdb.SQLFilterOperator; /** * Testing com.sun.star.sdb.XSingleSelectQueryComposer @@ -168,7 +169,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { boolean ok = true; try{ - oObj.appendFilterByColumn(xProp, true); + oObj.appendFilterByColumn(xProp, true,SQLFilterOperator.EQUAL); log.println("appendFilterByColumn: " + xQueryAna.getFilter()); ok = ok && (xQueryAna.getFilter().indexOf(colName) > 0); @@ -179,7 +180,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { try{ - oObj.appendFilterByColumn(xProp, false); + oObj.appendFilterByColumn(xProp, false,SQLFilterOperator.EQUAL); log.println("appendFilterByColumn: " + xQueryAna.getFilter()); ok = ok && (xQueryAna.getFilter().indexOf(colName) > 0); @@ -190,8 +191,8 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { try{ XPropertySet dummy = null; - oObj.appendFilterByColumn(dummy, true); - log.println("unexpected Exception was not thorwn"); + oObj.appendFilterByColumn(dummy, true,SQLFilterOperator.EQUAL); + log.println("expected Exception was not thrown"); tRes.tested("appendFilterByColumn()", false); } catch (com.sun.star.sdbc.SQLException e){ @@ -223,7 +224,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { try{ XPropertySet dummy = null; oObj.appendGroupByColumn(dummy); - log.println("unexpected Exception was not thorwn"); + log.println("expected Exception was not thrown"); tRes.tested("appendGroupByColumn()", false); } catch (com.sun.star.sdbc.SQLException e){ @@ -316,7 +317,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { boolean ok = true; try{ - oObj.appendHavingClauseByColumn(xProp, true); + oObj.appendHavingClauseByColumn(xProp, true,SQLFilterOperator.EQUAL); log.println("appendHavingClauseByColumn: " + xQueryAna.getFilter()); ok = ok && (xQueryAna.getFilter().indexOf(colName) > 0); @@ -326,8 +327,8 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { } try{ XPropertySet dummy = null; - oObj.appendHavingClauseByColumn(dummy, true); - log.println("unexpected Exception was not thorwn"); + oObj.appendHavingClauseByColumn(dummy, true,SQLFilterOperator.EQUAL); + log.println("expected Exception was not thrown"); tRes.tested("appendHavingClauseByColumn()", false); } catch (com.sun.star.sdbc.SQLException e){ @@ -359,7 +360,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { try{ XPropertySet dummy = null; oObj.appendOrderByColumn(dummy, true); - log.println("unexpected Exception was not thorwn"); + log.println("expected Exception was not thrown"); tRes.tested("appendOrderByColumn()", false); } catch (com.sun.star.sdbc.SQLException e){ -- cgit From f6970be6edb55ee2167987f757a7d6e6224e4279 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Thu, 25 Feb 2010 11:08:48 +0100 Subject: cws tl74: merge --- .../global/required/includes/g_option.inc | 18 +++++++++--------- testautomation/global/sid/all.sid | 2 -- testautomation/global/sid/e_all.sid | 2 ++ testautomation/global/win/dial_p_s.win | 10 ---------- testautomation/global/win/edia_d_h.win | 12 ++++++++++++ .../graphics/optional/includes/global/g_tools.inc | 18 +++++++++--------- .../graphics/optional/includes/global/id_006.inc | 4 ++-- .../graphics/required/includes/global/id_006.inc | 4 ++-- .../required/includes/c_upd_toolsmenu.inc | 6 +++--- .../includes/hyphenation/w_hyphenation.inc | 20 ++++++++++---------- .../writer/optional/includes/regexp/search.inc | 4 ++-- testautomation/writer/required/includes/w_007_.inc | 22 +++++++++++----------- 12 files changed, 62 insertions(+), 60 deletions(-) mode change 100644 => 100755 testautomation/global/sid/all.sid mode change 100644 => 100755 testautomation/global/sid/e_all.sid diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc index d590016bc8ba..0beb0b02a3ed 100755 --- a/testautomation/global/required/includes/g_option.inc +++ b/testautomation/global/required/includes/g_option.inc @@ -508,21 +508,21 @@ testcase tToolsOptionsLanguageSettings Optionen.TypeKeys "", 6 WaitSlot() ' similar effect as a NOOP OptionenBearbeiten.Click - Kontext "SilbentrennungOptionen" - Call DialogTest ( SilbentrennungOptionen ) - SilbentrennungOptionen.Cancel + Kontext "HyphenationOptions" + Call DialogTest ( HyphenationOptions ) + HyphenationOptions.Cancel Kontext "TabLinguistik" Optionen.TypeKeys "" OptionenBearbeiten.Click - Kontext "SilbentrennungOptionen" - Call DialogTest ( SilbentrennungOptionen ) - SilbentrennungOptionen.Cancel + Kontext "HyphenationOptions" + Call DialogTest ( HyphenationOptions ) + HyphenationOptions.Cancel Kontext "TabLinguistik" Optionen.TypeKeys "" OptionenBearbeiten.Click - Kontext "SilbentrennungOptionen" - Call DialogTest ( SilbentrennungOptionen ) - SilbentrennungOptionen.Cancel + Kontext "HyphenationOptions" + Call DialogTest ( HyphenationOptions ) + HyphenationOptions.Cancel endif case 3,5 : try diff --git a/testautomation/global/sid/all.sid b/testautomation/global/sid/all.sid old mode 100644 new mode 100755 index 7c8f6618b059..e7a1d94c7d58 --- a/testautomation/global/sid/all.sid +++ b/testautomation/global/sid/all.sid @@ -481,7 +481,6 @@ FormatAusrichtung SID_ALIGN ' **** ' **** Alle ExtrasRechtschreibungAutomatisch SID_AUTOSPELL_CHECK -ExtrasSilbentrennung FN_HYPHENATE_OPT_DLG ExtrasAutoKorrektur SID_AUTO_CORRECT_DLG ExtrasMakro SID_BASICCHOOSER ExtrasAnpassen SID_CONFIG @@ -527,7 +526,6 @@ ExtrasAutoEingabe FID_AUTOCOMPLETE ' **** Draw / Impress ExtrasThesaurusDraw SID_THESAURUS -ExtrasSilbentrennungDraw SID_HYPHENATION ExtrasPipette SID_BMPMASK ExtrasDiawechsel .uno:SlideChangeWindow ExtrasAnimation SID_ANIMATION_OBJECTS diff --git a/testautomation/global/sid/e_all.sid b/testautomation/global/sid/e_all.sid old mode 100644 new mode 100755 index 82b161d7f51d..8083a6ebe727 --- a/testautomation/global/sid/e_all.sid +++ b/testautomation/global/sid/e_all.sid @@ -735,6 +735,7 @@ ToolsUpdateAllIndexes FN_UPDATE_TOX ToolsBibliographyDatabase SID_COMP_BIBLIOGRAPHY ToolsWordCount FN_WORDCOUNT_DIALOG TableTableProperties .uno:TableDialog +ToolsLanguageHyphenation FN_HYPHENATE_OPT_DLG ' **** WriterWeb ToolsPageFormatting FN_REPAGINATE @@ -767,6 +768,7 @@ ToolsGallery .uno:Gallery ToolsEyedropper SID_BMPMASK ToolsMediaPlayer .uno:AVMediaPlayer ToolsChineseTranslation .uno:ChineseConversion +ToolsLanguageHyphenationDraw SID_HYPHENATION ' **** Math ToolsSymbolsCatalog SID_SYMBOLS_CATALOGUE diff --git a/testautomation/global/win/dial_p_s.win b/testautomation/global/win/dial_p_s.win index 30e5ae62e6e4..f165ccd0d2dc 100755 --- a/testautomation/global/win/dial_p_s.win +++ b/testautomation/global/win/dial_p_s.win @@ -234,16 +234,6 @@ FormatRTF sw:CheckBox:DLG_MAILMERGE:CB_FORMAT_RTF FormatStarWriter sw:CheckBox:DLG_MAILMERGE:CB_FORMAT_SW Datenbankfeldliste sw:ListBox:DLG_MAILMERGE:LB_COLUMN -*Silbentrennung HID_HYPHENATE svx:ModalDialog:RID_SVXDLG_HYPHENATE -Wort svx:Edit:RID_SVXDLG_HYPHENATE:ED_WORD -Vor svx:ImageButton:RID_SVXDLG_HYPHENATE:BTN_LEFT -Zurueck svx:ImageButton:RID_SVXDLG_HYPHENATE:BTN_RIGHT -Weiter svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE -Entfernen svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE - -*SilbentrennungOptionen HID_LNGDLG_NUM_PREBREAK -ZeichenVorUmbruch cui:NumericField:RID_SVXDLG_LNG_ED_NUM_PREBREAK:ED_PREBREAK - *Sonderzeichen SID_CHARMAP Schrift cui:ListBox:RID_SVXDLG_CHARMAP:LB_FONT SchriftListe HID_CHARMAP_CTL_SHOWSET diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win index de1b69ab4429..a95bf2b755d4 100755 --- a/testautomation/global/win/edia_d_h.win +++ b/testautomation/global/win/edia_d_h.win @@ -467,3 +467,15 @@ Suggestion3 cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_3 Suggestion4 cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_4 NewEntry cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_NEW DeleteEntry cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_DELETE + +*Hyphenation HID_HYPHENATE svx:ModalDialog:RID_SVXDLG_HYPHENATE +Wort svx:Edit:RID_SVXDLG_HYPHENATE:ED_WORD +Vor svx:ImageButton:RID_SVXDLG_HYPHENATE:BTN_LEFT +Zurueck svx:ImageButton:RID_SVXDLG_HYPHENATE:BTN_RIGHT +Weiter svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE +Entfernen svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE +HyphenateAll svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_ALL + +*HyphenationOptions HID_LNGDLG_NUM_PREBREAK +ZeichenVorUmbruch cui:NumericField:RID_SVXDLG_LNG_ED_NUM_PREBREAK:ED_PREBREAK + diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc index 7602dc98a9af..fb5689429a18 100755 --- a/testautomation/graphics/optional/includes/global/g_tools.inc +++ b/testautomation/graphics/optional/includes/global/g_tools.inc @@ -170,11 +170,11 @@ testcase tiToolsHyphenation1 printlog " - Hyphenation without any text" Call hNewDocument '/// New impress document ///' sleep 3 - ExtrasSilbentrennungDraw '/// Try Silbentrennung with empty document ///' - Kontext "Silbentrennung" - if Silbentrennung.Exists(1) = True Then + ToolsLanguageHyphenationDraw '/// Try with empty document ///' + Kontext "Hyphenation" + if Hyphenation.Exists(1) = True Then Warnlog " - Dialog ist da" - Silbentrennung.Cancel + Hyphenation.Cancel else Printlog " - Hyphenation activated" end if @@ -206,11 +206,11 @@ testcase tiToolsHyphenation1 endif end select hTypeKeys "" - ExtrasSilbentrennungDraw '/// Try Silbentrennung ///' - Kontext "Silbentrennung" - if Silbentrennung.Exists =True Then + ToolsLanguageHyphenationDraw '/// Try ///' + Kontext "Hyphenation" + if Hyphenation.Exists =True Then Warnlog "Dialog exists" - Silbentrennung.Cancel + Hyphenation.Cancel else Kontext "Active" if Active.Exists then Active.OK @@ -281,7 +281,7 @@ testcase tiToolsHyphenation2 EditCopy sDraw = GetClipboardText() EditSelectAll '/// Select whole text ///' - ExtrasSilbentrennungDraw '/// Run Hyphenation ///' + ToolsLanguageHyphenationDraw '/// Run Hyphenation ///' gMouseClick 50,50 hTypeKeys "" '/// Select part of text and compare it with original text at this place ///' sleep 3 diff --git a/testautomation/graphics/optional/includes/global/id_006.inc b/testautomation/graphics/optional/includes/global/id_006.inc index fb774c22acb2..f3d1f44ea190 100755 --- a/testautomation/graphics/optional/includes/global/id_006.inc +++ b/testautomation/graphics/optional/includes/global/id_006.inc @@ -152,9 +152,9 @@ endcase testcase tiToolsHyphenation Call hNewDocument - ExtrasSilbentrennungDraw + ToolsLanguageHyphenationDraw WaitSlot (2000) 'sleep 2 - ExtrasSilbentrennungDraw + ToolsLanguageHyphenationDraw Call hCloseDocument endcase diff --git a/testautomation/graphics/required/includes/global/id_006.inc b/testautomation/graphics/required/includes/global/id_006.inc index d7a3834f64b7..4c5921c5621d 100755 --- a/testautomation/graphics/required/includes/global/id_006.inc +++ b/testautomation/graphics/required/includes/global/id_006.inc @@ -178,10 +178,10 @@ testcase tiToolsHyphenation '/// open application ///' Call hNewDocument '/// Tools->Hyphenation ///' - ExtrasSilbentrennungDraw + ToolsLanguageHyphenationDraw WaitSlot (2000) 'sleep 2 '/// Tools->Hyphenation ///' - ExtrasSilbentrennungDraw + ToolsLanguageHyphenationDraw '/// close application ///' Call hCloseDocument endcase diff --git a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc index 21816865681f..ef0a96c954a5 100755 --- a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc @@ -195,14 +195,14 @@ testcase tToolsSpellcheck '/// Click on 'Edit' – button printlog " Click on 'Edit' – button" OptionenBearbeiten.Click - Kontext "SilbentrennungOptionen" - Call DialogTest ( SilbentrennungOptionen ) + Kontext "HyphenationOptions" + Call DialogTest ( HyphenationOptions ) '/// Decrease 'Minimal word length' printlog " Decrease 'Minimal word length'" ZeichenVorUmbruch.More '/// Close dialog with 'Cancel' printlog " Close dialog with 'Cancel'" - SilbentrennungOptionen.Cancel + HyphenationOptions.Cancel Kontext "TabLinguistik" '/// Close dialog with 'Cancel' printlog " Close dialog with 'Cancel'" diff --git a/testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc b/testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc index 8b7296d1d5a4..d07f9983bdc9 100755 --- a/testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc +++ b/testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc @@ -179,9 +179,9 @@ testcase tHyphenation_3 printlog "Tools/Hyphenation" ToolsLanguageHyphenate - Kontext "Silbentrennung" + Kontext "Hyphenation" - if Not Silbentrennung.Exists then + if Not Hyphenation.Exists then Warnlog "Unable to bring up Dialog 'Hyphenation'!" Call hCloseDocument goto endsub @@ -190,21 +190,21 @@ testcase tHyphenation_3 printlog "check if get 'fol=low-ing'" if Wort.Gettext <> testWordInHyphenationDlg then Warnlog "Expected " & testWordInHyphenationDlg & " but found " & Wort.Gettext - Silbentrennung.Cancel + Hyphenation.Cancel Call hCloseDocument goto endsub end if if NOT Vor.IsEnabled then Warnlog "the 'Vor' button is Not enabled, or something wrong!" - Silbentrennung.Cancel + Hyphenation.Cancel Call hCloseDocument goto endsub end if printlog "add '-' between 'fol' and 'lowing' using left arrow key" Vor.Click - Silbentrennung.OK + Hyphenation.OK ' Messagebox 'Start hypheantion from the beginning ? Kontext "Active" @@ -291,9 +291,9 @@ testcase tHyphenation_4 printlog "Tools/Hyphenation" ToolsLanguageHyphenate - Kontext "Silbentrennung" + Kontext "Hyphenation" - if Not Silbentrennung.Exists then + if Not Hyphenation.Exists then Call hCloseDocument goto endsub end if @@ -301,7 +301,7 @@ testcase tHyphenation_4 printlog "check if get 'fol=low-ing'" if Wort.Gettext <> testWordInHyphenationDlg1 then Warnlog "Expected " & testWordInHyphenationDlg1 & " but found " & Wort.Gettext - Silbentrennung.Cancel + Hyphenation.Cancel Call hCloseDocument goto endsub end if @@ -309,7 +309,7 @@ testcase tHyphenation_4 printlog "click left arrow key" if NOT Vor.IsEnabled then Warnlog "the Vor button is Not enabled, or something wrong!" - Silbentrennung.Cancel + Hyphenation.Cancel Call hCloseDocument goto endsub end if @@ -340,7 +340,7 @@ testcase tHyphenation_4 Sleep 1 printlog "close all dialogs" - Silbentrennung.OK + Hyphenation.OK ' Messagebox 'Start hypheantion from the beginning ? Kontext "Active" diff --git a/testautomation/writer/optional/includes/regexp/search.inc b/testautomation/writer/optional/includes/regexp/search.inc index a450d6922742..a7cef4940f30 100755 --- a/testautomation/writer/optional/includes/regexp/search.inc +++ b/testautomation/writer/optional/includes/regexp/search.inc @@ -1190,7 +1190,7 @@ function wSelectAttributeName(aNumber as integer, AsianSupport as boolean, SetSt Case 31 Select Case iSprache - Case 49: aSelectIt = "Silbentrennung" + Case 49: aSelectIt = "Hyphenation" Case else: Warnlog "Language not supported. No test" exit function end select @@ -1469,7 +1469,7 @@ sub wCheckAttribute(aNumber as integer) Case 28 '"Schriftstellung asiatische Schrift" Case 29 '"Schusterjungen" Case 30 '"Seitenvorlage" - Case 31 '"Silbentrennung" + Case 31 '"Hyphenation" Case 32 '"Skalierung" Case 33 '"Sprache" Case 34 '"Sprache asiatische Schrift" diff --git a/testautomation/writer/required/includes/w_007_.inc b/testautomation/writer/required/includes/w_007_.inc index 056145bdbf37..3ca638fa16cf 100755 --- a/testautomation/writer/required/includes/w_007_.inc +++ b/testautomation/writer/required/includes/w_007_.inc @@ -161,9 +161,9 @@ testcase tToolsSpellcheck if OptionenBearbeiten.IsEnabled then OptionenBearbeiten.Click wait 500 - Kontext "SilbentrennungOptionen" - DialogTest ( SilbentrennungOptionen ) - SilbentrennungOptionen.Cancel + Kontext "HyphenationOptions" + DialogTest ( HyphenationOptions ) + HyphenationOptions.Cancel end if next i @@ -396,11 +396,11 @@ testcase tToolsHyphenation end if end if - Kontext "Silbentrennung" + Kontext "Hyphenation" printlog " Close upcoming 'Hyphenation' dialog" - if Silbentrennung.Exists then - Call DialogTest ( Silbentrennung ) - Silbentrennung.Cancel + if Hyphenation.Exists then + Call DialogTest ( Hyphenation ) + Hyphenation.Cancel else Warnlog "Dialog 'Hyphenation' not up!" Kontext "Active" @@ -1300,11 +1300,11 @@ testcase tMasterDocToolsHyphenation end if end if - Kontext "Silbentrennung" + Kontext "Hyphenation" printlog " Close upcoming 'Hyphenation' dialog" - if ( Silbentrennung.Exists( 2 ) ) then - Call DialogTest ( Silbentrennung ) - Silbentrennung.Cancel + if ( Hyphenation.Exists( 2 ) ) then + Call DialogTest ( Hyphenation ) + Hyphenation.Cancel else Warnlog "Dialog 'Hyphenation' not up!" Kontext "Active" -- cgit From 9c16e9c69126ac6347154049d264606541bd853d Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Wed, 10 Mar 2010 10:22:55 +0100 Subject: tl74:#i108360#Adaptions to have greenstate for Cat0 --- testautomation/global/sid/all.sid | 1 - testautomation/global/win/dial_p_s.win | 3 --- testautomation/global/win/dial_t_z.win | 8 +++----- testautomation/global/win/edia_d_h.win | 12 ++++++------ testautomation/writer/required/includes/w_007_.inc | 7 ------- 5 files changed, 9 insertions(+), 22 deletions(-) diff --git a/testautomation/global/sid/all.sid b/testautomation/global/sid/all.sid index e7a1d94c7d58..9e013175a93e 100755 --- a/testautomation/global/sid/all.sid +++ b/testautomation/global/sid/all.sid @@ -487,7 +487,6 @@ ExtrasAnpassen SID_CONFIG ExtrasOptionen SID_OPTIONS_TREEDIALOG ' **** Writer -ExtrasThesaurusWriter FN_THESAURUS_DLG ExtrasKapitelnumerierung FN_NUMBERING_OUTLINE_DLG ExtrasZeilennumerierung FN_LINE_NUMBERING_DLG ExtrasSeitennummer FN_CHANGE_PAGENUM diff --git a/testautomation/global/win/dial_p_s.win b/testautomation/global/win/dial_p_s.win index 7ba153a434b0..accef3714a3b 100755 --- a/testautomation/global/win/dial_p_s.win +++ b/testautomation/global/win/dial_p_s.win @@ -331,9 +331,6 @@ Zusaetze sc:MoreButton:RID_SCDLG_SPEC_FILTER:BTN_MORE FilterkriterienMin sc:ImageButton:RID_SCDLG_SPEC_FILTER:RB_CRITERIA_AREA FilterergebnisMin sc:ImageButton:RID_SCDLG_SPEC_FILTER:RB_COPY_AREA -*SpracheAuswaehlen HID_THES_LANGUAGE -Auswahl cui:ListBox:RID_SVXDLG_THES_LANGUAGE:LB_THES_LANGUAGE - *StandardFilter SID_FILTER FeldName1 sc:ListBox:RID_SCDLG_FILTER:LB_FIELD1 Feldname2 sc:ListBox:RID_SCDLG_FILTER:LB_FIELD2 diff --git a/testautomation/global/win/dial_t_z.win b/testautomation/global/win/dial_t_z.win index e660fdaeaf96..ada6c79efacb 100755 --- a/testautomation/global/win/dial_t_z.win +++ b/testautomation/global/win/dial_t_z.win @@ -142,12 +142,10 @@ Textmarken sw:ComboBox:DLG_INSERT_BOOKMARK:CB_BOOKMARK Loeschen sw:PushButton:DLG_INSERT_BOOKMARK:BT_DELETE *Thesaurus SID_THESAURUS -Wort cui:ListBox:RID_SVXDLG_THESAURUS:LB_WORD Ersetzen cui:Edit:RID_SVXDLG_THESAURUS:ED_REPL -Bedeutung cui:ListBox:RID_SVXDLG_THESAURUS:LB_MEAN -Synonym cui:ListBox:RID_SVXDLG_THESAURUS:LB_SYNON -Nachschlagen cui:PushButton:RID_SVXDLG_THESAURUS:BTN_LOOKUP -Sprache cui:PushButton:RID_SVXDLG_THESAURUS:BTN_LANGUAGE +RecallCurrentWord cui:ImageButton:RID_SVXDLG_THESAURUS:BTN_LEFT +Wort cui:ComboBox:RID_SVXDLG_THESAURUS:CB_WORD +Sprache cui:MenuButton:RID_SVXDLG_THESAURUS:MB_LANGUAGE *Ueberblenden SID_POLYGON_MORPHING Attributierung sd:CheckBox:DLG_MORPH:CBX_ATTRIBUTES diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win index a95bf2b755d4..815beca5591b 100755 --- a/testautomation/global/win/edia_d_h.win +++ b/testautomation/global/win/edia_d_h.win @@ -469,12 +469,12 @@ NewEntry cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_NEW DeleteEntry cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_DELETE *Hyphenation HID_HYPHENATE svx:ModalDialog:RID_SVXDLG_HYPHENATE -Wort svx:Edit:RID_SVXDLG_HYPHENATE:ED_WORD -Vor svx:ImageButton:RID_SVXDLG_HYPHENATE:BTN_LEFT -Zurueck svx:ImageButton:RID_SVXDLG_HYPHENATE:BTN_RIGHT -Weiter svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE -Entfernen svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE -HyphenateAll svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_ALL +Wort cui:Edit:RID_SVXDLG_HYPHENATE:ED_WORD +Vor cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_LEFT +Zurueck cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_RIGHT +Weiter cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE +Entfernen cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE +HyphenateAll cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_ALL *HyphenationOptions HID_LNGDLG_NUM_PREBREAK ZeichenVorUmbruch cui:NumericField:RID_SVXDLG_LNG_ED_NUM_PREBREAK:ED_PREBREAK diff --git a/testautomation/writer/required/includes/w_007_.inc b/testautomation/writer/required/includes/w_007_.inc index 17633575812a..9b9a19ca8676 100644 --- a/testautomation/writer/required/includes/w_007_.inc +++ b/testautomation/writer/required/includes/w_007_.inc @@ -289,13 +289,6 @@ testcase tToolsThesaurus Kontext "Thesaurus" DialogTest ( Thesaurus ) - printlog " In 'Thesaurus' dialog click 'Language'" - Sprache.Click - Kontext "SpracheAuswaehlen" - DialogTest ( SpracheAuswaehlen ) - printlog " Close 'Language' dialog" - SpracheAuswaehlen.Cancel - Kontext "Thesaurus" printlog " Close 'Thesaurus' dialog" Thesaurus.Cancel PrintLog "Close active documents" -- cgit From 456166f4efbe08ec4253e6ca627b24e4076e016f Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Mon, 15 Mar 2010 14:35:41 +0100 Subject: tl74#i105514#Autotests adapted for new thesaurus dialogs --- testautomation/global/win/dial_t_z.win | 6 - testautomation/global/win/edia_t_z.win | 7 + .../graphics/optional/includes/global/g_tools.inc | 47 ++--- .../optional/includes/spellcheck/w_spellcheck.inc | 228 ++++++--------------- 4 files changed, 94 insertions(+), 194 deletions(-) diff --git a/testautomation/global/win/dial_t_z.win b/testautomation/global/win/dial_t_z.win index ada6c79efacb..9efeef3dd197 100755 --- a/testautomation/global/win/dial_t_z.win +++ b/testautomation/global/win/dial_t_z.win @@ -141,12 +141,6 @@ Umrandung sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_BORDER Textmarken sw:ComboBox:DLG_INSERT_BOOKMARK:CB_BOOKMARK Loeschen sw:PushButton:DLG_INSERT_BOOKMARK:BT_DELETE -*Thesaurus SID_THESAURUS -Ersetzen cui:Edit:RID_SVXDLG_THESAURUS:ED_REPL -RecallCurrentWord cui:ImageButton:RID_SVXDLG_THESAURUS:BTN_LEFT -Wort cui:ComboBox:RID_SVXDLG_THESAURUS:CB_WORD -Sprache cui:MenuButton:RID_SVXDLG_THESAURUS:MB_LANGUAGE - *Ueberblenden SID_POLYGON_MORPHING Attributierung sd:CheckBox:DLG_MORPH:CBX_ATTRIBUTES GleicheOrientierung sd:CheckBox:DLG_MORPH:CBX_ORIENTATION diff --git a/testautomation/global/win/edia_t_z.win b/testautomation/global/win/edia_t_z.win index 67465a360f91..77fb020d48a1 100755 --- a/testautomation/global/win/edia_t_z.win +++ b/testautomation/global/win/edia_t_z.win @@ -128,6 +128,13 @@ RecentFile HID_XML_FILTER_TEST_IMPORT_RECENT FixedRecentFile HID_XML_FILTER_TEST_IMPORT_RECENT_FILE CloseBtn HID_XML_FILTER_TEST_CLOSE +*Thesaurus SID_THESAURUS +CurrentWord cui:ComboBox:RID_SVXDLG_THESAURUS:CB_WORD +RecallCurrentWord cui:ImageButton:RID_SVXDLG_THESAURUS:BTN_LEFT +Alternatives HID_CT_THES_ALTERNATIVES +ReplaceWith cui:Edit:RID_SVXDLG_THESAURUS:ED_REPL +Language cui:MenuButton:RID_SVXDLG_THESAURUS:MB_LANGUAGE + *UnsatisfiedDependencies desktop:ModalDialog:RID_DLG_DEPENDENCIES UnsatisfiedDependencyList desktop:ListBox:RID_DLG_DEPENDENCIES:RID_DLG_DEPENDENCIES_LIST diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc index 3fe80cd9f189..3de5d8b39a98 100644 --- a/testautomation/graphics/optional/includes/global/g_tools.inc +++ b/testautomation/graphics/optional/includes/global/g_tools.inc @@ -40,7 +40,7 @@ '------------------------------------------------------------------------------- testcase tiToolsThesaurus - Dim DasWort$ + Dim DasWort as string Dim ZaehlerBedeutung '/// for normal text, the thesaurus is enabled, if the format->character->language of the word has a thesaurus///' @@ -57,32 +57,32 @@ testcase tiToolsThesaurus endif select case iSprache - case 01 : DasWort$ = "Hello" - case 03 : DasWort$ = "Alo" + case 01 : DasWort = "Hello" + case 03 : DasWort = "Alo" case 07 : printlog "- No Thesaur for Russian available" goto endsub case 30 : Printlog "- No Thesaurus available !" goto endsub - case 31 : DasWort$ = "Guiten" - case 33 : DasWort$ = "Bonjour" - case 34 : DasWort$ = "Hola" + case 31 : DasWort = "Guiten" + case 33 : DasWort = "Bonjour" + case 34 : DasWort = "Hola" case 35 : Printlog "- No Thesaurus available !" goto endsub case 36 : Printlog "- No Thesaurus available !" goto endsub case 37 : Printlog "- No Thesaurus available !" goto endsub - case 39 : DasWort$ = "Ciao" + case 39 : DasWort = "Ciao" case 42 : Printlog "- No Thesaurus available !" goto endsub - case 45 : DasWort$ = "Hej" - case 46 : DasWort$ = "Välkommen" + case 45 : DasWort = "Hej" + case 46 : DasWort = "Välkommen" case 47 : Printlog "- No Thesaurus available !" goto endsub case 48 : Printlog "- No Thesaurus in Polish!" goto endsub - case 49 : DasWort$ = "Hallo" - case 50 : DasWort$ = "Prosojnica" + case 49 : DasWort = "Hallo" + case 50 : DasWort = "Prosojnica" case 51 : Printlog "- No Thesaurus available !" goto endsub case 55 : Printlog "- No Thesaurus in Brazilian!" @@ -92,10 +92,10 @@ testcase tiToolsThesaurus case else : if bAsianLan then hSetSpellHypLanguage - DasWort$ = "Hello" + DasWort = "Hello" else Warnlog "For the language " + iSprache +" nothing is prepared yet: insert text here" - DasWort$ = "Hello" + DasWort = "Hello" endif end select @@ -110,9 +110,9 @@ testcase tiToolsThesaurus PrintLog " No Thesaurus available" endcatch - PrintLog " Thesaurus with 1 word: " + DasWort$ + PrintLog " Thesaurus with 1 word: " + DasWort - Call hTextrahmenErstellen (DasWort$,20,20,50,30) + Call hTextrahmenErstellen (DasWort,20,20,50,30) sleep 1 hTypeKeys "" @@ -129,23 +129,23 @@ sleep 1 ExtrasThesaurusDraw '/// Thesaurus with only 1 word ///' Kontext "Thesaurus" if Thesaurus.Exists(3) then - if Wort.GetSelText <> DasWort$ Then WarnLog "marked word should be:" + DasWort$ + " but it is:" + Wort.GetSelText - if Wort.GetSelText = DasWort$ Then PrintLog " Marked word is correctly changed" '/// Control if word has changed ///' - ZaehlerBedeutung=Bedeutung.GetItemCount - if Bedeutung.GetItemCount = 0 Then + if CurrentWord.GetSelText <> DasWort Then WarnLog "marked word should be:" + DasWort + " but it is:" + CurrentWord.GetSelText + if CurrentWord.GetSelText = DasWort Then PrintLog " Marked word is correctly changed" '/// Control if word has changed ///' + ZaehlerBedeutung=Alternatives.GetItemCount + if Alternatives.GetItemCount = 0 Then PrintLog " There are no suggestions for this word" sleep 1 else if ZaehlerBedeutung=1 Then - Bedeutung.Select ZaehlerBedeutung + Alternatives.Select ZaehlerBedeutung else - Bedeutung.Select (ZaehlerBedeutung - 1) + Alternatives.Select (ZaehlerBedeutung - 1) end if sleep 1 Synonym.Select 1 '/// Select synonym 1///' sleep 1 if Ersetzen.GetText=Synonym.GetSelText Then PrintLog " Meaning transfered into Replace edit field" - if Ersetzen.GetText<>Synonym.GetSelText Then WarnLog " Replacement should have been: '" + Bedeutung.GetSelText + "' but it is '" + Ersetzen.GetText+"'" + if Ersetzen.GetText<>Synonym.GetSelText Then WarnLog " Replacement should have been: '" + Alternatives.GetSelText + "' but it is '" + Ersetzen.GetText+"'" endif Thesaurus.Cancel else @@ -219,7 +219,8 @@ testcase tiToolsHyphenation2 dim iWaitIndex as integer dim sExt as string - Dim i : Dim DasWort : Dim DasWort2 : Dim DasWort3 : Dim DasWort4 : Dim DasWort5 : Dim DasWort6 : Dim DasWort7 + Dim i : Dim DasWort2 : Dim DasWort3 : Dim DasWort4 : Dim DasWort5 : Dim DasWort6 : Dim DasWort7 + Dim DasWort as string dim sDraw as string dim sFile as string PrintLog "- Tools/Hyphenation2" diff --git a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc index e4818c34029f..894e60cd1bdc 100644 --- a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc +++ b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc @@ -1228,7 +1228,7 @@ endcase testcase tToolsThesaurus Dim sWordInitial as string - Dim sLanguageToBeSelected as string + Dim sLanguageToBeSelected as integer Dim sWordToBeFound as string Dim sWordReplacedWith as string Dim i as integer @@ -1283,19 +1283,13 @@ testcase tToolsThesaurus '/// Call Thesaurus without a written word /// ToolsLanguageThesaurus Kontext "Thesaurus" - if Ersetzen.GetText <> "" then Warnlog "- Though no word has been selected there is a replacetext in the textfield!" - printlog "- enter one word and search" - Ersetzen.SetText sWordInitial - Nachschlagen.Click - Kontext "Active" - if Active.Exists then - Warnlog Active.Gettext - Active.ok - end if - Kontext "Thesaurus" - if Bedeutung.GetSelText(1) = "" then Warnlog "No meaning text" - if Ersetzen.Gettext = "" then Ersetzen.SetText = sWordInitial - sWordToBeFound = Ersetzen.GetText + if CurrentWord.GetSelText <> "" then Warnlog "- Though no word has been selected Current Word textfield is filled !" + if ReplaceWith.GetText <> "" then Warnlog "- Though no word has been selected there is a replacetext in the textfield!" + printlog "Set language dependent word in textfield Current Word" + CurrentWord.Settext sWordInitial + if Alternatives.GetSelText(1) = "" then Warnlog "No alternatives text" + if ReplaceWith.Gettext <> Alternatives.GetSelText(1) then Warnlog "Replace with textfield was not filled with word from alternative" + sWordToBeFound = ReplaceWith.GetText Thesaurus.OK Call wTypeKeys "" wait 200 @@ -1310,166 +1304,70 @@ testcase tToolsThesaurus printlog " Open new preformatted-document where the formatting is set to the language we wish to test." call hFileOpen (TheFile,false) - Call sMakeReadOnlyDocumentEditable - - printlog "- check the language" - Call wTypeKeys sWordInitial + "" - '/// Check language in Thesaurus /// - ToolsLanguageThesaurus - Kontext "Thesaurus" - - Sprache.Click - Kontext "SpracheAuswaehlen" - select case iSprache ' iSystemSprache - case 01 : sLanguageToBeSelected = "English (USA)" - case 07 : sLanguageToBeSelected = "Русский" - case 03 : sLanguageToBeSelected = "Português" - case 31 : sLanguageToBeSelected = "Nederlands (NL)" - case 33 : sLanguageToBeSelected = "Français (France)" - case 34 : sLanguageToBeSelected = "Español (España)" - case 36 : sLanguageToBeSelected = "Madyar" - case 39 : sLanguageToBeSelected = "Italiano (Italia)" - case 45 : sLanguageToBeSelected = "Dansk" - case 46 : sLanguageToBeSelected = "svenska (Sverige)" - case 48 : sLanguageToBeSelected = "Polski" - case 49 : sLanguageToBeSelected = "Deutsch (Deutschland)" - end select - SpracheAuswaehlen.OK - Sleep 5 - - Kontext "Thesaurus" - printlog "- Search for a Synonym" - '/// Search for a synonym /// - Synonym.Select 1 - wait 500 - sWordToBeFound = Synonym.GetSelText - if Ersetzen.GetText <> sWordToBeFound then Warnlog "Synonym has not been taken over" - Nachschlagen.Click - wait 500 - if Wort.GetSelText <> sWordToBeFound then Warnlog "Synonym has not been added to the word listand activated" - - printlog "- Search for a meaning" - '/// Search for a meaning /// - wait 500 - Bedeutung.Select 1 - wait 500 - Nachschlagen.Click - Sleep 1 - Kontext "Active" - if Active.Exists then - printlog "- " + Active.Gettext - Active.Ok - Kontext "Thesaurus" - else ' Nur wenn Wort auch enthalten ist - Kontext "Thesaurus" - for i = 1 to 100 - if Bedeutung.GetSeltext <> "" then i = 101 - Sleep 1 - next i - sWordToBeFound = Bedeutung.GetSelText - if Instr ( Ersetzen.GetText, sWordToBeFound ) <> 0 then - Warnlog "Meaning has not been overtaken" - end if - end if - - printlog "- Replace unchecked ( Cursor in front of words 1. character )" - '/// replace unchecked /// - sWordReplacedWith = Ersetzen.GetText - Thesaurus.OK - Call wTypeKeys "" - wait 200 - EditCopy - if GetClipboardText <> sWordReplacedWith then Warnlog "Text has not been correctly replaced, not => " + sWordReplacedWith + " but => " + GetClipboardText - - Call wTypeKeys "" + sWordInitial + Call sMakeReadOnlyDocumentEditable + + Call wTypeKeys sWordInitial Call wTypeKeys "" - printlog "- Replace unchecked ( Cursor in word )" + printlog "- Replace ( select alternative with cursor within word )" ToolsLanguageThesaurus Kontext "Thesaurus" wait 500 - if Synonym.GetItemCount >0 then - Synonym.Select 1 - sWordReplacedWith = Ersetzen.GetText - Thesaurus.OK - Call wTypeKeys "" - wait 200 - EditCopy - if GetClipboardText <> sWordReplacedWith then Warnlog "Text has not been correctly replaced, not => " + sWordReplacedWith + " but => " + GetClipboardText - else - Warnlog "- No Synonym when cursor is in word!" - Thesaurus.Ok - end if - - Call wTypeKeys "" - Call wTypeKeys sWordInitial + "" + if CurrentWord.GetSeltext = sWordInitial then + sWordToBeFound = ReplaceWith.Gettext + if Alternatives.GetItemCount > 0 then + printlog "Select last entry in alternatives list" + Alternatives.Select Alternatives.GetItemCount + Alternatives.TypeKeys "" + if ReplaceWith.Gettext = sWordToBeFound then + Warnlog "Though alternative was selected replace with was not changed" + else + sWordToBeFound = ReplaceWith.Gettext + end if + Thesaurus.OK + Call wTypeKeys "" + wait 200 + EditCopy + if GetClipboardText <> sWordReplacedWith then Warnlog "Text has not been correctly replaced, not => " + sWordReplacedWith + " but => " + GetClipboardText + else + Warnlog "- No Alternative for current word" + Thesaurus.Ok + end if + else + Warnlog "Current word is not selected word !" + end if + Call wTypeKeys "" + Call wTypeKeys sWordInitial + printlog "- Replace unchecked ( Cursor at words end )" ToolsLanguageThesaurus Kontext "Thesaurus" - if Synonym.GetItemCount >0 then - Synonym.Select 1 - sWordReplacedWith = Ersetzen.GetText - Thesaurus.OK - Call wTypeKeys "" - wait 200 - EditCopy - if GetClipboardText <> sWordReplacedWith then Warnlog "Text has not been correctly replaced, not => " + sWordReplacedWith + " but => " + Trim$(GetClipboardText) - else - Warnlog "- No sysnonym when cursor pointed to words end!" - Thesaurus.Ok - end if - - Call wTypeKeys "" - Call wTypeKeys sWordInitial + "" - - printlog "- Replace checked ( back to front )" - '/// replace checked /// - ToolsLanguageThesaurus - Kontext "Thesaurus" - if Synonym.GetItemCount >0 then - Synonym.Select 1 - sWordReplacedWith = Ersetzen.GetText - Thesaurus.Ok - Call wTypeKeys "" - wait 200 - EditCopy - if GetClipboardText <> sWordReplacedWith then Warnlog "Text has not been correctly replaced, not => " + sWordReplacedWith + " but => " + GetClipboardText - else - Nachschlagen.Click - Kontext "Active" - if Active.Exists then - Active.Ok - Kontext "Thesaurus" - Thesaurus.OK - end if - end if - - Call wTypeKeys "" - Call wTypeKeys sWordInitial + "" - printlog "- Replace checked ( front to back )" - ToolsLanguageThesaurus - Kontext "Thesaurus" - if Synonym.GetItemCount >0 then - Synonym.Select 1 - sWordReplacedWith = Ersetzen.GetText - Thesaurus.Ok - Call wTypeKeys "" - wait 200 - EditCopy - if GetClipboardText <> sWordReplacedWith then Warnlog "Text has not been correctly replaced, not => " + sWordReplacedWith + " but => " + GetClipboardText - else - Warnlog "- No sysnonym when word is marked!" - Thesaurus.Ok - end if - - Call wTypeKeys "" - Call wTypeKeys sWordInitial + "" - - printlog "- Part of Replace checked ( back to front ) - no checking anymore" - ToolsLanguageThesaurus - Kontext "Thesaurus" - Thesaurus.OK + wait 500 + if CurrentWord.GetSeltext = sWordInitial then + sWordToBeFound = ReplaceWith.Gettext + if Alternatives.GetItemCount > 0 then + printlog "Select last entry in alternatives list" + Alternatives.Select Alternatives.GetItemCount + Alternatives.TypeKeys "" + if ReplaceWith.Gettext = sWordToBeFound then + Warnlog "Though alternative was selected replace with was not changed" + else + sWordToBeFound = ReplaceWith.Gettext + end if + Thesaurus.OK + Call wTypeKeys "" + wait 200 + EditCopy + if GetClipboardText <> sWordReplacedWith then Warnlog "Text has not been correctly replaced, not => " + sWordReplacedWith + " but => " + GetClipboardText + else + Warnlog "- No Alternative for current word" + Thesaurus.Ok + end if + else + Warnlog "Current word is not selected word !" + end if + '/// Close thesaurus and writerdocument /// Call hCloseDocument endcase -- cgit From dbb03cb9bb4d922340ae08725032ad2f870eccd0 Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Wed, 17 Mar 2010 08:32:18 +0100 Subject: tl74#i108360#Adaptions for new thesaurus dialog --- .../writer/optional/includes/spellcheck/w_spellcheck.inc | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc index 894e60cd1bdc..018411859667 100644 --- a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc +++ b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc @@ -1287,8 +1287,14 @@ testcase tToolsThesaurus if ReplaceWith.GetText <> "" then Warnlog "- Though no word has been selected there is a replacetext in the textfield!" printlog "Set language dependent word in textfield Current Word" CurrentWord.Settext sWordInitial - if Alternatives.GetSelText(1) = "" then Warnlog "No alternatives text" - if ReplaceWith.Gettext <> Alternatives.GetSelText(1) then Warnlog "Replace with textfield was not filled with word from alternative" + wait 500 + if Alternatives.GetItemCount > 0 then + Warnlog "No alternatives text" + else + if ReplaceWith.Gettext <> Alternatives.GetSelText(1) then + Warnlog "Replace with textfield was not filled with word from alternative" + endif + endif sWordToBeFound = ReplaceWith.GetText Thesaurus.OK Call wTypeKeys "" @@ -1315,7 +1321,7 @@ testcase tToolsThesaurus wait 500 if CurrentWord.GetSeltext = sWordInitial then sWordToBeFound = ReplaceWith.Gettext - if Alternatives.GetItemCount > 0 then + if Alternatives.GetItemCount = 0 then printlog "Select last entry in alternatives list" Alternatives.Select Alternatives.GetItemCount Alternatives.TypeKeys "" @@ -1328,7 +1334,7 @@ testcase tToolsThesaurus Call wTypeKeys "" wait 200 EditCopy - if GetClipboardText <> sWordReplacedWith then Warnlog "Text has not been correctly replaced, not => " + sWordReplacedWith + " but => " + GetClipboardText + if GetClipboardText <> sWordToBeFound then Warnlog "Text has not been correctly replaced, not => " + sWordToBeFound + " but => " + GetClipboardText else Warnlog "- No Alternative for current word" Thesaurus.Ok @@ -1359,7 +1365,7 @@ testcase tToolsThesaurus Call wTypeKeys "" wait 200 EditCopy - if GetClipboardText <> sWordReplacedWith then Warnlog "Text has not been correctly replaced, not => " + sWordReplacedWith + " but => " + GetClipboardText + if GetClipboardText <> sWordToBeFound then Warnlog "Text has not been correctly replaced, not => " + sWordToBeFound + " but => " + GetClipboardText else Warnlog "- No Alternative for current word" Thesaurus.Ok -- cgit From a4ae1e9adf533d36cfbedf2eb4a1b2c0f7942025 Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Wed, 17 Mar 2010 08:51:07 +0100 Subject: tl74#i108360#Adaptions for new thesaurus dialog --- testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc index 018411859667..c208ae271609 100644 --- a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc +++ b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc @@ -1288,7 +1288,7 @@ testcase tToolsThesaurus printlog "Set language dependent word in textfield Current Word" CurrentWord.Settext sWordInitial wait 500 - if Alternatives.GetItemCount > 0 then + if Alternatives.GetItemCount = 0 then Warnlog "No alternatives text" else if ReplaceWith.Gettext <> Alternatives.GetSelText(1) then @@ -1321,7 +1321,7 @@ testcase tToolsThesaurus wait 500 if CurrentWord.GetSeltext = sWordInitial then sWordToBeFound = ReplaceWith.Gettext - if Alternatives.GetItemCount = 0 then + if Alternatives.GetItemCount > 0 then printlog "Select last entry in alternatives list" Alternatives.Select Alternatives.GetItemCount Alternatives.TypeKeys "" -- cgit From 76bf13636f12f7b56b6b48775183cd255b50cd56 Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Wed, 17 Mar 2010 13:12:40 +0100 Subject: tl74#i108360#Adaptions for new thesaurus dialog --- testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc index c208ae271609..e96c205cf79c 100644 --- a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc +++ b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc @@ -1232,6 +1232,7 @@ testcase tToolsThesaurus Dim sWordToBeFound as string Dim sWordReplacedWith as string Dim i as integer + Dim j as integer Dim TheFile as String PrintLog "- Tools / Thesaurus" @@ -1287,11 +1288,12 @@ testcase tToolsThesaurus if ReplaceWith.GetText <> "" then Warnlog "- Though no word has been selected there is a replacetext in the textfield!" printlog "Set language dependent word in textfield Current Word" CurrentWord.Settext sWordInitial + wait 500 if Alternatives.GetItemCount = 0 then Warnlog "No alternatives text" else - if ReplaceWith.Gettext <> Alternatives.GetSelText(1) then + if ReplaceWith.Gettext <> Alternatives.GetText(Alternatives.GetSelIndex) then Warnlog "Replace with textfield was not filled with word from alternative" endif endif -- cgit From 6c0d5a5b1cc02b72931d0f2ff57607ead6fb0a0a Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Wed, 17 Mar 2010 15:02:10 +0100 Subject: tl74#i1601#Added slots Toggle case, First Letter Capitalized and Sentence case --- testautomation/global/sid/e_all.sid | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testautomation/global/sid/e_all.sid b/testautomation/global/sid/e_all.sid index 8083a6ebe727..3ae2ed4e8417 100755 --- a/testautomation/global/sid/e_all.sid +++ b/testautomation/global/sid/e_all.sid @@ -415,6 +415,9 @@ FormatStylesLoad SID_TEMPLATE_LOAD FormatStylist SID_STYLE_DESIGNER FormatControl SID_FM_CTL_PROPERTIES FormatForm SID_FM_PROPERTIES +FormatChangeCaseToSentence .uno:ChangeCaseToSentenceCase +FormatChangeCaseCapitalizeEveryWord .uno:ChangeCaseToTitleCase +FormatChangeCaseToggleCase .uno:ChangeCaseToToggleCase FormatChangeCaseUpper .uno:ChangeCaseToUpper FormatChangeCaseLower .uno:ChangeCaseToLower FormatChangeCaseHalfWidth .uno:ChangeCaseToHalfWidth -- cgit From f119d919823f94c1c73e4d77f485c91a077b1035 Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Wed, 17 Mar 2010 15:30:54 +0100 Subject: tl74#i1601#Added slots Toggle case, First Letter Capitalized and Sentence case --- testautomation/writer/required/includes/w_005_.inc | 43 +++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/testautomation/writer/required/includes/w_005_.inc b/testautomation/writer/required/includes/w_005_.inc index 830ce39adc24..93fe9ac0237b 100644 --- a/testautomation/writer/required/includes/w_005_.inc +++ b/testautomation/writer/required/includes/w_005_.inc @@ -232,14 +232,55 @@ testcase tFormatChangeCase printlog " Open new document" Call hNewDocument printlog " Insert some text in document and select text" - Call wTypeKeys ("Hello World!") + Call wTypeKeys ("call him now ! please") Call wTypeKeys ("") printlog " Format / Case Characters / Upper" hUseAsyncSlot( "FormatChangeCaseUpper" ) + EditCopy + if GetClipboardtext() <> "CALL HIM NOW ! PLEASE" then + Warnlog "Sentence not 'CALL HIM NOW ! PLEASE' but " & GetClipboardtext() + else + printlog " " & GetClipboardtext() + endif printlog " Format / Case Characters / Lower" hUseAsyncSlot( "FormatChangeCaseLower" ) + EditCopy + if GetClipboardtext() <> "call him now ! please" then + Warnlog "Sentence not 'call him now ! please' but " & GetClipboardtext() + else + printlog " " & GetClipboardtext() + endif + + printlog " Format / Case Characters / Sentence Case" + FormatChangeCaseToSentence + EditCopy + if GetClipboardtext() <> "Call him now ! Please" then + Warnlog "Sentence not 'Call him now ! Please' but " & GetClipboardtext() + else + printlog " " & GetClipboardtext() + endif + + printlog " Format / Case Characters / Capitalize every word" + FormatChangeCaseCapitalizeEveryWord + EditCopy + if GetClipboardtext() <> "Call Him Now ! Please" then + Warnlog "Sentence not 'Call Him Now ! Please' but " & GetClipboardtext() + else + printlog " " & GetClipboardtext() + endif + + + printlog " Format / Case Characters / tOGGLE cASE" + FormatChangeCaseToggleCase + EditCopy + if GetClipboardtext() <> "cALL hIM nOW ! pLEASE" then + Warnlog "Sentence not 'cALL hIM nOW ! pLEASE' but " & GetClipboardtext() + else + printlog " " & GetClipboardtext() + endif + if ( gAsianSup ) then try -- cgit From 517fb6fdb13d6e008f2141193a9296cba626a0d8 Mon Sep 17 00:00:00 2001 From: "Marc Neumann [msc]" Date: Thu, 18 Mar 2010 13:09:36 +0100 Subject: tl74: #108360# fixed for new thesaurus and refactoring --- testautomation/graphics/optional/g_tools.bas | 2 + .../graphics/optional/includes/global/g_tools.inc | 212 +++++++++++++-------- testautomation/graphics/required/d_updt.bas | 2 +- testautomation/graphics/required/i_updt_1.bas | 2 +- .../graphics/required/includes/global/id_006.inc | 206 +++++++++++--------- testautomation/graphics/tools/id_tools_2.inc | 18 -- 6 files changed, 246 insertions(+), 196 deletions(-) diff --git a/testautomation/graphics/optional/g_tools.bas b/testautomation/graphics/optional/g_tools.bas index bb890f970722..bb65e6b27d43 100755 --- a/testautomation/graphics/optional/g_tools.bas +++ b/testautomation/graphics/optional/g_tools.bas @@ -43,6 +43,7 @@ sub main PrintLog "-------------------------" + gApplication + "-------------------" Call tiToolsThesaurus + Call tiToolsThesaurusWithoutText Call tiToolsHyphenation1 Call tiToolsHyphenation2 Call tToolsMacro @@ -50,6 +51,7 @@ sub main gApplication = "DRAW" PrintLog "-------------------------" + gApplication + "-------------------" Call tiToolsThesaurus + Call tiToolsThesaurusWithoutText Call tiToolsHyphenation1 Call tiToolsHyphenation2 Call tToolsMacro diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc index 3de5d8b39a98..dcfe8707d6d6 100644 --- a/testautomation/graphics/optional/includes/global/g_tools.inc +++ b/testautomation/graphics/optional/includes/global/g_tools.inc @@ -40,49 +40,54 @@ '------------------------------------------------------------------------------- testcase tiToolsThesaurus - Dim DasWort as string - Dim ZaehlerBedeutung - -'/// for normal text, the thesaurus is enabled, if the format->character->language of the word has a thesaurus///' -'///+ unfortunately in textboxes this doesn't work, you can give the word a langauge, but this is been ignored by///' -'///+ our thesaurus :-(((///' -'/// so especially for asian languages you have to set a default language in the options, to be able to use///' -'///+ the thesaurus there - fallback to englisch, because there is no ? thesaurus for cjk languages ??///' - - '/// First we make sure we test a language where Thesa - ' As long as OOo has no modules for that, disabled - if gOOO = True then - printlog "No spellchecking in OOo" - goto endsub - endif + Dim sWord as string + Dim sChangedWord as string + Dim sReplaceWord as string + Dim sExt as string + Dim ZaehlerBedeutung + 'for normal text, the thesaurus is enabled, + 'if the format->character->language of the word has a thesaurus + 'unfortunately in textboxes this doesn't work, you can give the word a langauge, + 'but this is been ignored by our thesaurus + 'so especially for asian languages you have to set a default language in the options, + 'to be able to use the thesaurus there - fallback to englisch, + 'because there is no thesaurus for cjk languages + + 'As long as OOo has no modules for that, disabled + if gOOO = True then + printlog "No spellchecking in OOo" + goto endsub + endif + + 'First we make sure we test a language where Thesaurus select case iSprache - case 01 : DasWort = "Hello" - case 03 : DasWort = "Alo" + case 01 : sWord = "Hello" + case 03 : sWord = "Alo" case 07 : printlog "- No Thesaur for Russian available" goto endsub case 30 : Printlog "- No Thesaurus available !" goto endsub - case 31 : DasWort = "Guiten" - case 33 : DasWort = "Bonjour" - case 34 : DasWort = "Hola" + case 31 : sWord = "Guiten" + case 33 : sWord = "Bonjour" + case 34 : sWord = "Hola" case 35 : Printlog "- No Thesaurus available !" goto endsub case 36 : Printlog "- No Thesaurus available !" goto endsub case 37 : Printlog "- No Thesaurus available !" goto endsub - case 39 : DasWort = "Ciao" + case 39 : sWord = "Ciao" case 42 : Printlog "- No Thesaurus available !" goto endsub - case 45 : DasWort = "Hej" - case 46 : DasWort = "Välkommen" + case 45 : sWord = "Hej" + case 46 : sWord = "Välkommen" case 47 : Printlog "- No Thesaurus available !" goto endsub case 48 : Printlog "- No Thesaurus in Polish!" goto endsub - case 49 : DasWort = "Hallo" - case 50 : DasWort = "Prosojnica" + case 49 : sWord = "Hallo" + case 50 : sWord = "Prosojnica" case 51 : Printlog "- No Thesaurus available !" goto endsub case 55 : Printlog "- No Thesaurus in Brazilian!" @@ -92,72 +97,113 @@ testcase tiToolsThesaurus case else : if bAsianLan then hSetSpellHypLanguage - DasWort = "Hello" + sWord = "Hello" else Warnlog "For the language " + iSprache +" nothing is prepared yet: insert text here" - DasWort = "Hello" + sWord = "Hello" endif end select + + PrintLog "Thesaurus with 1 word: " + sWord + + if( Ucase(gApplication) = "DRAW" ) then + sExt = ".odg" + elseif( Ucase(gApplication) = "IMPRESS" ) then + sExt = ".odp" + endif + + Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_" + iSprache + sExt) + + Call hTextrahmenErstellen (sWord,20,20,50,30) + sleep 1 + + printlog "select the word" + hTypeKeys "" + + try + ExtrasThesaurusDraw + catch + warnlog "No Thesaurus available." + hCloseDocument() + goto endsub + endcatch + + Kontext "Thesaurus" + if Thesaurus.Exists(3) then + + if CurrentWord.GetSelText <> sWord Then + WarnLog "marked word should be:" + sWord + " but it is:" + CurrentWord.GetSelText + else + PrintLog "Marked word is correctly changed" + endif - printlog " Thesaurus without any word in the document" - Call hNewDocument '/// New document ///' - try - ExtrasThesaurusDraw '/// try thesaurus in empty document ///' - Kontext "Thesaurus" - Thesaurus.Cancel - WarnLog " If no word is in the document, Thesaurus shouldn't be available" - catch - PrintLog " No Thesaurus available" - endcatch - - PrintLog " Thesaurus with 1 word: " + DasWort - - Call hTextrahmenErstellen (DasWort,20,20,50,30) - sleep 1 - - hTypeKeys "" - '------------------------ -ToolsOptions -Kontext "ExtrasOptionenDlg" -hToolsOptions("LANGUAGESETTINGS","Languages") -Westlich.Select 34 -Kontext "ExtrasOptionenDlg" -ExtrasOptionenDlg.OK -sleep 1 - '------------------------ - try - ExtrasThesaurusDraw '/// Thesaurus with only 1 word ///' - Kontext "Thesaurus" - if Thesaurus.Exists(3) then - if CurrentWord.GetSelText <> DasWort Then WarnLog "marked word should be:" + DasWort + " but it is:" + CurrentWord.GetSelText - if CurrentWord.GetSelText = DasWort Then PrintLog " Marked word is correctly changed" '/// Control if word has changed ///' - ZaehlerBedeutung=Alternatives.GetItemCount if Alternatives.GetItemCount = 0 Then - PrintLog " There are no suggestions for this word" - sleep 1 + warnlog "There are no alternative for this word" + sleep 1 else - if ZaehlerBedeutung=1 Then - Alternatives.Select ZaehlerBedeutung - else - Alternatives.Select (ZaehlerBedeutung - 1) - end if - sleep 1 - Synonym.Select 1 '/// Select synonym 1///' - sleep 1 - if Ersetzen.GetText=Synonym.GetSelText Then PrintLog " Meaning transfered into Replace edit field" - if Ersetzen.GetText<>Synonym.GetSelText Then WarnLog " Replacement should have been: '" + Alternatives.GetSelText + "' but it is '" + Ersetzen.GetText+"'" - endif - Thesaurus.Cancel - else - warnlog " thesaurus didn't come up, that's bad :-(" - end if - catch - warnLog " No Thesaurus available ??! check if options western has smth selected !! !TL!" - endcatch - Call hCloseDocument '/// Close document ///' - -endcase 'tiToolsThesaurus + printlog "select the first alternative" + Alternatives.Select 1 + + printlog "check if the selected alternative apprear in the ReplaceWith field." + if ( ReplaceWith.getText() <> Alternatives.getSeltext(1,3) ) then + warnlog "the text is no transfered to the ReplaceWith field." + else + printlog "the text is transfered to the ReplaceWith field." + endif + + sReplaceWord = ReplaceWith.getText() + sleep 1 + endif + Thesaurus.OK + + if(Ucase(gApplication) = "DRAW") then + Kontext "Draw" + elseif(Ucase(gApplication) = "IMPRESS") then + Kontext "Impress" + else ' fallback + warnlog "gApplication is wrong" + goto endsub + endif + + hTypeKeys "" + EditCopy + sChangedWord = getClipboard() + printlog "sChangedWord = " + sChangedWord + if(sChangedWord <> sReplaceWord) then + warnlog "the text was not replaced" + else + printlog "the text was successfull replaced" + endif + else + warnlog "thesaurus didn't come up." + end if + + Call hCloseDocument + +endcase +'------------------------------------------------------------------------------- +testcase tiToolsThesaurusWithoutText + + printlog "Thesaurus without any word in the document" + Call hNewDocument + try + ExtrasThesaurusDraw + catch + PrintLog "the Thesaurus is correctly not available" + call hCloseDocument + goto endsub + endcatch + + WarnLog "If no word is in the document, Thesaurus shouldn't be available" + Kontext "Thesaurus" + if Thesaurus.Exists then + Thesaurus.Cancel + endif + + Call hCloseDocument + +endcase '------------------------------------------------------------------------------- testcase tiToolsHyphenation1 diff --git a/testautomation/graphics/required/d_updt.bas b/testautomation/graphics/required/d_updt.bas index 9d56a2c87fed..d191f2adea1c 100755 --- a/testautomation/graphics/required/d_updt.bas +++ b/testautomation/graphics/required/d_updt.bas @@ -63,7 +63,7 @@ sub main call id_004 Call D_005_ call id_005 - call id_006 + call id_Tools call d_007 call id_007 call id_008 diff --git a/testautomation/graphics/required/i_updt_1.bas b/testautomation/graphics/required/i_updt_1.bas index 1d9b28f2aea9..141b261e3ee9 100755 --- a/testautomation/graphics/required/i_updt_1.bas +++ b/testautomation/graphics/required/i_updt_1.bas @@ -58,7 +58,7 @@ sub main Call im_004_ call id_004 call id_005 - call id_006 + call id_Tools Call hStatusOut end sub diff --git a/testautomation/graphics/required/includes/global/id_006.inc b/testautomation/graphics/required/includes/global/id_006.inc index 948cab1c4a04..a2a435735268 100644 --- a/testautomation/graphics/required/includes/global/id_006.inc +++ b/testautomation/graphics/required/includes/global/id_006.inc @@ -42,7 +42,21 @@ ' #1 tiToolsOptions '\********************************************************************************** - +'------------------------------------------------------------------------------ +sub id_Tools + printLog "--------- id_006 ----------" + call tiToolsSpellchecking + call tiToolsSpellcheckingAutomatic + call tiToolsThesaurus + call tiToolsHyphenation + call tiToolsAutoCorrect + call tChineseTranslation + call tiToolsMacro + call tiToolsGallery + call tiToolsEyedropper + call tToolsOptionsTest ' global one +end sub +'------------------------------------------------------------------------------- testcase tiToolsSpellchecking if not gOOO then ' Spellcheck doesn't work in OOo builds. @@ -86,9 +100,7 @@ testcase tiToolsSpellchecking else goto endsub endif endcase - -'-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - +'------------------------------------------------------------------------------- testcase tiToolsSpellcheckingAutomatic '/// open application ///' Call hNewDocument @@ -102,72 +114,104 @@ testcase tiToolsSpellcheckingAutomatic '/// close application ///' Call hCloseDocument endcase +'------------------------------------------------------------------------------- +testcase tiToolsThesaurus -'-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + Dim sWord as string + Dim sExt as string -testcase tiToolsThesaurus - qaerrorlog "#i93133#: Thesaurus not active in loaded bugdoc" - goto endsub - if not gOOO then ' Thesaurus doesn't work in OOo builds. + 'for normal text, the thesaurus is enabled, + 'if the format->character->language of the word has a thesaurus + 'unfortunately in textboxes this doesn't work, you can give the word a langauge, + 'but this is been ignored by our thesaurus + 'so especially for asian languages you have to set a default language in the options, + 'to be able to use the thesaurus there - fallback to englisch, + 'because there is no thesaurus for cjk languages - dim sFileName as String - - '/// call subroutine 'hSetSpellHypLanguage' for setting the default language in the options, to enable it for languages, which don't provide a dictionary (usually asian ones) ///' - call hSetSpellHypLanguage - '/// open application-specific document which contains an American-formatted textframe with text. And select the text ///' - if (gApplication = "IMPRESS") then - sFileName = (ConvertPath (gTesttoolPath + "graphics\required\input\engtext.odp")) - else - sFileName = (ConvertPath (gTesttoolPath + "graphics\required\input\engtext.odg")) - end if - if hFileExists ( sFileName ) = FALSE then - warnlog "The language-file was not found or accessible! The test ends." + 'As long as OOo has no modules for that, disabled + if gOOO = True then + printlog "No spellchecking in OOo" goto endsub - end if - Call hFileOpen (sFileName) - - sleep (2) - - hTypeKeys "" - hTypeKeys "" - - ' Call hTextrahmenErstellen ("SimpleTest" + "", 10, 10, 30, 40) - try - '/// Tools->Thesaurus ///' - ExtrasThesaurusDraw - Kontext "Thesaurus" - Call DialogTest ( Thesaurus ) - '/// click button 'language' ///' - Sprache.Click - Kontext "SpracheAuswaehlen" - Call DialogTest ( SpracheAuswaehlen ) - '/// cancel dialog 'select language' ///' - SpracheAuswaehlen.cancel - Kontext "Thesaurus" - '/// click button 'search' ///' - Nachschlagen.Click - kontext - '/// if messagebox exist, say OK; (word not found) ///' - if Messagebox.exists (5) then - printlog "Messagebox: word not in thesaurus: '"+Messagebox.gettext+"'" - Messagebox.ok - end if - sleep 1 - Kontext "Thesaurus" - '/// cancel dialog 'Thesaurus' ///' - Thesaurus.Cancel - catch - warnlog "Thesaurus didn't work :-(" - endcatch - sleep 1 - '/// close application ///' - Call hCloseDocument - else goto endsub endif -endcase -'-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + 'First we make sure we test a language where Thesaurus + select case iSprache + case 01 : sWord = "Hello" + case 03 : sWord = "Alo" + case 07 : printlog "- No Thesaur for Russian available" + goto endsub + case 30 : Printlog "- No Thesaurus available !" + goto endsub + case 31 : sWord = "Guiten" + case 33 : sWord = "Bonjour" + case 34 : sWord = "Hola" + case 35 : Printlog "- No Thesaurus available !" + goto endsub + case 36 : Printlog "- No Thesaurus available !" + goto endsub + case 37 : Printlog "- No Thesaurus available !" + goto endsub + case 39 : sWord = "Ciao" + case 42 : Printlog "- No Thesaurus available !" + goto endsub + case 45 : sWord = "Hej" + case 46 : sWord = "Välkommen" + case 47 : Printlog "- No Thesaurus available !" + goto endsub + case 48 : Printlog "- No Thesaurus in Polish!" + goto endsub + case 49 : sWord = "Hallo" + case 50 : sWord = "Prosojnica" + case 51 : Printlog "- No Thesaurus available !" + goto endsub + case 55 : Printlog "- No Thesaurus in Brazilian!" + goto endsub + case 90 : Printlog "- No Thesaurus available !" + goto endsub + + case else : if bAsianLan then + hSetSpellHypLanguage + sWord = "Hello" + else + Warnlog "For the language " + iSprache +" nothing is prepared yet: insert text here" + sWord = "Hello" + endif + end select + + PrintLog "Thesaurus with 1 word: " + sWord + + if( Ucase(gApplication) = "DRAW" ) then + sExt = ".odg" + elseif( Ucase(gApplication) = "IMPRESS" ) then + sExt = ".odp" + endif + + Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_" + iSprache + sExt) + Call hTextrahmenErstellen (sWord,20,20,50,30) + sleep 1 + + printlog "select the word" + hTypeKeys "" + + try + ExtrasThesaurusDraw + catch + warnlog "No Thesaurus available." + hCloseDocument() + goto endsub + endcatch + + Kontext "Thesaurus" + if Thesaurus.Exists(3) then + Thesaurus.Cancel + else + warnlog "the thesaurus does not appear" + endif + Call hCloseDocument + +endcase +'------------------------------------------------------------------------------- testcase tiToolsHyphenation '/// open application ///' Call hNewDocument @@ -179,7 +223,7 @@ testcase tiToolsHyphenation '/// close application ///' Call hCloseDocument endcase - +'------------------------------------------------------------------------------- testcase tiToolsAutoCorrect dim iLanguage as integer ' for resetting the language '/// open application ///' @@ -291,9 +335,7 @@ testcase tiToolsAutoCorrect '/// close application ///' Call hCloseDocument endcase - -'-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - +'------------------------------------------------------------------------------- testcase tChineseTranslation qaerrorlog( "#i89634# - Chinese Translation dialog does not close" ) @@ -365,9 +407,7 @@ testcase tChineseTranslation '/// Close application ///' Call hCloseDocument endcase - -'-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - +'------------------------------------------------------------------------------- testcase tiToolsMacro '/// open application ///' Call hNewDocument @@ -419,9 +459,7 @@ testcase tiToolsMacro '/// close application ///' Call hCloseDocument endcase - -'-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - +'------------------------------------------------------------------------------- testcase tiToolsGallery '/// open application ///' Call hNewDocument @@ -433,9 +471,7 @@ testcase tiToolsGallery '/// close application ///' Call hCloseDocument endcase - -'-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - +'------------------------------------------------------------------------------- testcase tiToolsEyedropper '/// open application ///' Call hNewDocument @@ -449,20 +485,4 @@ testcase tiToolsEyedropper '/// close application ///' Call hCloseDocument endcase - -'-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -testcase tiToolsOptions - '/// open application ///' - Call hNewDocument - '/// Tools->Options ///' - ToolsOptions - WaitSlot (2000) 'sleep 1 - kontext "OptionenDlg" - '/// close dialog 'Options' ///' - OptionenDlg.Close - '/// close application ///' - Call hCloseDocument -endcase - -'-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +'------------------------------------------------------------------------------- \ No newline at end of file diff --git a/testautomation/graphics/tools/id_tools_2.inc b/testautomation/graphics/tools/id_tools_2.inc index 6cf18494915d..501965a591d0 100644 --- a/testautomation/graphics/tools/id_tools_2.inc +++ b/testautomation/graphics/tools/id_tools_2.inc @@ -835,24 +835,6 @@ sub id_005 ' tiFormatLayer ' not in impress end sub -'------------------------------------------------------------------------------ -sub id_006 - - printLog Chr(13) + "--------- id_006 ----------" - - call tiToolsSpellchecking - call tiToolsSpellcheckingAutomatic - call tiToolsThesaurus - call tiToolsHyphenation - call tiToolsAutoCorrect - call tChineseTranslation - call tiToolsMacro - call tiToolsGallery - call tiToolsEyedropper - call tiToolsOptions ' get just called one time here... - Call tToolsOptionsTest ' global one -end sub - '------------------------------------------------------------------------------- sub id_007 -- cgit From cd763a88f403c743975d4a9ef8b8770eefde61f8 Mon Sep 17 00:00:00 2001 From: "Marc Neumann [msc]" Date: Fri, 19 Mar 2010 15:22:12 +0100 Subject: tl74: #108360# fixed for new thesaurus and refactoring --- testautomation/graphics/optional/g_tools.bas | 2 + .../graphics/optional/includes/global/g_tools.inc | 105 +++++++++++++++++++++ 2 files changed, 107 insertions(+) diff --git a/testautomation/graphics/optional/g_tools.bas b/testautomation/graphics/optional/g_tools.bas index bb65e6b27d43..272840602ac4 100755 --- a/testautomation/graphics/optional/g_tools.bas +++ b/testautomation/graphics/optional/g_tools.bas @@ -44,6 +44,7 @@ sub main PrintLog "-------------------------" + gApplication + "-------------------" Call tiToolsThesaurus Call tiToolsThesaurusWithoutText + Call tiToolsThesaurusContextMenu Call tiToolsHyphenation1 Call tiToolsHyphenation2 Call tToolsMacro @@ -52,6 +53,7 @@ sub main PrintLog "-------------------------" + gApplication + "-------------------" Call tiToolsThesaurus Call tiToolsThesaurusWithoutText + Call tiToolsThesaurusContextMenu Call tiToolsHyphenation1 Call tiToolsHyphenation2 Call tToolsMacro diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc index dcfe8707d6d6..00148148fb2f 100644 --- a/testautomation/graphics/optional/includes/global/g_tools.inc +++ b/testautomation/graphics/optional/includes/global/g_tools.inc @@ -203,6 +203,111 @@ testcase tiToolsThesaurusWithoutText Call hCloseDocument +endcase +'------------------------------------------------------------------------------- +testcase tiToolsThesaurusContextMenu + + Dim sWord as string + Dim sExt as string + Dim iItemCount as Integer + + 'for normal text, the thesaurus is enabled, + 'if the format->character->language of the word has a thesaurus + 'unfortunately in textboxes this doesn't work, you can give the word a langauge, + 'but this is been ignored by our thesaurus + 'so especially for asian languages you have to set a default language in the options, + 'to be able to use the thesaurus there - fallback to englisch, + 'because there is no thesaurus for cjk languages + + 'As long as OOo has no modules for that, disabled + if gOOO = True then + printlog "No spellchecking in OOo" + goto endsub + endif + + 'First we make sure we test a language where Thesaurus + select case iSprache + case 01 : sWord = "Hello" + case 03 : sWord = "Alo" + case 07 : printlog "- No Thesaur for Russian available" + goto endsub + case 30 : Printlog "- No Thesaurus available !" + goto endsub + case 31 : sWord = "Guiten" + case 33 : sWord = "Bonjour" + case 34 : sWord = "Hola" + case 35 : Printlog "- No Thesaurus available !" + goto endsub + case 36 : Printlog "- No Thesaurus available !" + goto endsub + case 37 : Printlog "- No Thesaurus available !" + goto endsub + case 39 : sWord = "Ciao" + case 42 : Printlog "- No Thesaurus available !" + goto endsub + case 45 : sWord = "Hej" + case 46 : sWord = "Välkommen" + case 47 : Printlog "- No Thesaurus available !" + goto endsub + case 48 : Printlog "- No Thesaurus in Polish!" + goto endsub + case 49 : sWord = "Hallo" + case 50 : sWord = "Prosojnica" + case 51 : Printlog "- No Thesaurus available !" + goto endsub + case 55 : Printlog "- No Thesaurus in Brazilian!" + goto endsub + case 90 : Printlog "- No Thesaurus available !" + goto endsub + + case else : if bAsianLan then + hSetSpellHypLanguage + sWord = "Hello" + else + Warnlog "For the language " + iSprache +" nothing is prepared yet: insert text here" + sWord = "Hello" + endif + end select + + PrintLog "Thesaurus with 1 word: " + sWord + + if( Ucase(gApplication) = "DRAW" ) then + sExt = ".odg" + Kontext "DrawDocument" + elseif( Ucase(gApplication) = "IMPRESS" ) then + sExt = ".odp" + Kontext "ImpressDocument" + endif + + Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_" + iSprache + sExt) + + Call hTextrahmenErstellen (sWord,20,20,50,30) + sleep 1 + + printlog "select the word" + hTypeKeys "" + + hOpenContextMenu + + hMenuSelectNr(14) ' the synonyms + iItemCount = hMenuItemGetCount + printlog iItemCount + if(iItemCount <= 2 ) then ' none and Thesaurus item + warnlog "There should be a synonymus display for the word '" + sWord + "' but it isn't." + endif + + hMenuSelectNr(iItemCount) ' the last item + + Kontext "Thesaurus" + if Thesaurus.Exists(5) then + printlog "Thesaurus dialog appear from the context menu" + Thesaurus.Cancel + else + warnlog "the thesaurus dialog does not appear fro mthe context menu of a selected word" + endif + + call hCloseDocument + endcase '------------------------------------------------------------------------------- testcase tiToolsHyphenation1 -- cgit From 3930a0e5b4f98175dbc74f95615e82cf9b568e22 Mon Sep 17 00:00:00 2001 From: "Marc Neumann [msc]" Date: Tue, 23 Mar 2010 15:49:58 +0100 Subject: cws tl74: #108360# --- testautomation/graphics/required/input/recht_49.odp | Bin 13159 -> 12783 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/testautomation/graphics/required/input/recht_49.odp b/testautomation/graphics/required/input/recht_49.odp index 445c11940122..88c93c2856b4 100755 Binary files a/testautomation/graphics/required/input/recht_49.odp and b/testautomation/graphics/required/input/recht_49.odp differ -- cgit From dc652167c03be837eeb224b8c258d836bde211d6 Mon Sep 17 00:00:00 2001 From: "Marc Neumann [msc]" Date: Tue, 23 Mar 2010 16:04:09 +0100 Subject: cws tl74: #108360# --- testautomation/graphics/required/input/recht_3.odp | Bin 13728 -> 12737 bytes testautomation/graphics/required/input/recht_31.odp | Bin 13837 -> 14160 bytes testautomation/graphics/required/input/recht_33.odp | Bin 12994 -> 13251 bytes testautomation/graphics/required/input/recht_34.odp | Bin 14831 -> 19479 bytes testautomation/graphics/required/input/recht_36.odp | Bin 14284 -> 14155 bytes testautomation/graphics/required/input/recht_39.odp | Bin 11319 -> 12338 bytes testautomation/graphics/required/input/recht_46.odp | Bin 15605 -> 19434 bytes testautomation/graphics/required/input/recht_48.odp | Bin 12666 -> 13346 bytes testautomation/graphics/required/input/recht_55.odp | Bin 13487 -> 18380 bytes 9 files changed, 0 insertions(+), 0 deletions(-) diff --git a/testautomation/graphics/required/input/recht_3.odp b/testautomation/graphics/required/input/recht_3.odp index 77001190ba1a..768fbad4b780 100755 Binary files a/testautomation/graphics/required/input/recht_3.odp and b/testautomation/graphics/required/input/recht_3.odp differ diff --git a/testautomation/graphics/required/input/recht_31.odp b/testautomation/graphics/required/input/recht_31.odp index a8fd2717ba3f..23f5c77c141d 100755 Binary files a/testautomation/graphics/required/input/recht_31.odp and b/testautomation/graphics/required/input/recht_31.odp differ diff --git a/testautomation/graphics/required/input/recht_33.odp b/testautomation/graphics/required/input/recht_33.odp index e98bb9a22dc7..c6acada2537e 100755 Binary files a/testautomation/graphics/required/input/recht_33.odp and b/testautomation/graphics/required/input/recht_33.odp differ diff --git a/testautomation/graphics/required/input/recht_34.odp b/testautomation/graphics/required/input/recht_34.odp index fbfe0ae7ffae..2dcbd561f9e5 100755 Binary files a/testautomation/graphics/required/input/recht_34.odp and b/testautomation/graphics/required/input/recht_34.odp differ diff --git a/testautomation/graphics/required/input/recht_36.odp b/testautomation/graphics/required/input/recht_36.odp index a1f80f1109db..45f7fd3a47cb 100755 Binary files a/testautomation/graphics/required/input/recht_36.odp and b/testautomation/graphics/required/input/recht_36.odp differ diff --git a/testautomation/graphics/required/input/recht_39.odp b/testautomation/graphics/required/input/recht_39.odp index feda53696ecf..bf649b488030 100755 Binary files a/testautomation/graphics/required/input/recht_39.odp and b/testautomation/graphics/required/input/recht_39.odp differ diff --git a/testautomation/graphics/required/input/recht_46.odp b/testautomation/graphics/required/input/recht_46.odp index d6ec036f014d..e9de83b58c8b 100755 Binary files a/testautomation/graphics/required/input/recht_46.odp and b/testautomation/graphics/required/input/recht_46.odp differ diff --git a/testautomation/graphics/required/input/recht_48.odp b/testautomation/graphics/required/input/recht_48.odp index 4d905a8fe4d8..f836b0521f8b 100755 Binary files a/testautomation/graphics/required/input/recht_48.odp and b/testautomation/graphics/required/input/recht_48.odp differ diff --git a/testautomation/graphics/required/input/recht_55.odp b/testautomation/graphics/required/input/recht_55.odp index 2d63df264710..6e78d94e8c49 100755 Binary files a/testautomation/graphics/required/input/recht_55.odp and b/testautomation/graphics/required/input/recht_55.odp differ -- cgit From 0e8f6eb591f4125b936e0ae911dff78415370e9b Mon Sep 17 00:00:00 2001 From: "Marc Neumann [msc]" Date: Wed, 24 Mar 2010 10:43:18 +0100 Subject: cws tl74: #108359# --- .../graphics/optional/includes/global/g_tools.inc | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc index 00148148fb2f..b77b57629839 100644 --- a/testautomation/graphics/optional/includes/global/g_tools.inc +++ b/testautomation/graphics/optional/includes/global/g_tools.inc @@ -43,6 +43,7 @@ testcase tiToolsThesaurus Dim sWord as string Dim sChangedWord as string Dim sReplaceWord as string + Dim sAlternativeText as string Dim sExt as string Dim ZaehlerBedeutung @@ -145,8 +146,16 @@ testcase tiToolsThesaurus Alternatives.Select 1 printlog "check if the selected alternative apprear in the ReplaceWith field." - if ( ReplaceWith.getText() <> Alternatives.getSeltext(1,3) ) then - warnlog "the text is no transfered to the ReplaceWith field." + + sAlternativeText = Alternatives.getSeltext(1,3) + 'remove the part in the () if there is any + if( Instr(sAlternativeText, "(") <> 0 ) then + sAlternativeText = left(sAlternativeText, Instr(sAlternativeText, "(") - 2 ) + endif + + if ( ReplaceWith.getText() <> sAlternativeText ) then + warnlog "the text is no transfered to the ReplaceWith field. " +_ + "ReplaceWith = " + ReplaceWith.getText() + ", Alternative = " + sAlternativeText else printlog "the text is transfered to the ReplaceWith field." endif @@ -189,7 +198,7 @@ testcase tiToolsThesaurusWithoutText try ExtrasThesaurusDraw catch - PrintLog "the Thesaurus is correctly not available" + printlog "the Thesaurus is correctly not available" call hCloseDocument goto endsub endcatch -- cgit From 558299cf33c9992d25e104a80115b70b060eae31 Mon Sep 17 00:00:00 2001 From: Oliver Craemer Date: Wed, 24 Mar 2010 12:34:56 +0100 Subject: #i110357# [Automation] adapt spreadsheettestscripts for new thesaurus --- .../required/includes/c_upd_toolsmenu.inc | 44 +++++++--------------- 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc index 2b00a3bf601d..434aae88f786 100644 --- a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc @@ -391,21 +391,17 @@ endcase testcase tToolsLanguageThesaurus '///Tools – Language – Chinese Translation - '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\english.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\english.ods" Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\english.ods" )) - '/// If the file is not editable, click the edit button on standardbar printlog "If the file is not editable, click the edit button on standardbar" call sMakeReadOnlyDocumentEditable Kontext "DocumentCalc" - '/// Enter 'blabla' in a cell - printlog " Enter 'blabla' in a cell" + printlog " Enter 'test' in a cell" Call fCalcSelectRange ("B2") - DocumentCalc.TypeKeys "blabla" - '/// Open 'Thesaurus' dialog by 'Tools – Language – Thesaurus + DocumentCalc.TypeKeys "test" printlog " Open 'Thesaurus' dialog by 'Tools – Language – Thesaurus" try - ToolsLanguageThesaurusCalc + ToolsLanguageThesaurus catch warnlog "Thesaurus did not work" call hCloseDocument @@ -413,34 +409,20 @@ testcase tToolsLanguageThesaurus endcatch Kontext "Thesaurus" DialogTest ( Thesaurus ) - '/// Click on 'Search' button - printlog " Click on 'Search' button" - Nachschlagen.Click - '/// Close messagebox with 'OK' - printlog " Close messagebox with 'OK'" - Kontext - if Active.exists then - Active.OK + printlog " Check if the cellcontent test is correctly read" + if CurrentWord.GetSelText <> "test" then + warnlog "The cellcontent is not test but is " & CurrentWord.GetSelText end if - Kontext "Thesaurus" - '/// Click on 'Language' button - printlog " Click on 'Language' button" - Sprache.Click - Kontext "SpracheAuswaehlen" - DialogTest ( SpracheAuswaehlen ) - '/// Verify that the list has entries - printlog " Verify that the list has entries" - If Auswahl.GetItemCount < 1 then - warnlog "There are no languages available" + printlog " Check that there are alternatives available" + if Alternatives.GetItemCount < 1 then + warnlog "There are no alternatives available" + else Alternatives.Select (1) + if ReplaceWith.GetText = "" then + warnlog "The repacle with field is empty" + end if end if - '/// Close 'Select Language' dialog with 'Cancel' - printlog " Close 'Select Language' dialog with 'Cancel'" - SpracheAuswaehlen.Cancel - Kontext "Thesaurus" - '/// Close 'Thesaurus' with 'Cancel' printlog " Close 'Thesaurus' with 'Cancel'" Thesaurus.Cancel - '/// Close document printlog " Close document" call hCloseDocument -- cgit From 020130022f263a2fe058369207d83eb41e289e67 Mon Sep 17 00:00:00 2001 From: Oliver Craemer Date: Wed, 24 Mar 2010 15:48:51 +0100 Subject: #i110357# [Automation] adapt spreadsheettestscripts for new thesaurus --- testautomation/global/sid/all.sid | 1 - testautomation/global/sid/e_all.sid | 1 - 2 files changed, 2 deletions(-) diff --git a/testautomation/global/sid/all.sid b/testautomation/global/sid/all.sid index 9e013175a93e..6144e0ff7e27 100755 --- a/testautomation/global/sid/all.sid +++ b/testautomation/global/sid/all.sid @@ -505,7 +505,6 @@ ExtrasAktualisierenSeitenformatierung FN_REPAGINATE ExtrasSeitenformatierung FN_REPAGINATE ' **** Calc -ExtrasThesaurusCalc SID_THESAURUS ExtrasDetektivAlleSpurenEntfernen SID_DETECTIVE_DEL_ALL ExtrasDetektivFuellModus SID_DETECTIVE_FILLMODE ExtrasDetektivSpurZumFehler SID_DETECTIVE_ADD_ERR diff --git a/testautomation/global/sid/e_all.sid b/testautomation/global/sid/e_all.sid index 878c145f748a..7af3c9a79b26 100755 --- a/testautomation/global/sid/e_all.sid +++ b/testautomation/global/sid/e_all.sid @@ -745,7 +745,6 @@ ToolsPageFormatting FN_REPAGINATE ' **** Calc ToolsSpellcheckAutoCheckCalc SID_AUTOSPELL_CHECK -ToolsLanguageThesaurusCalc .uno:Thesaurus ToolsLanguageHyphenateCalc .uno:Hyphenate ToolsDetectiveRemoveAllTraces SID_DETECTIVE_DEL_ALL ToolsDetectiveFillMode SID_DETECTIVE_FILLMODE -- cgit From 603cf369c5bc571bc6c11f2a8b3d06275d287e2c Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Wed, 7 Apr 2010 08:26:29 +0200 Subject: tl74#i107229#testautomation for thesaurus in right click context menu --- .../optional/includes/spellcheck/w_spellcheck.inc | 91 +++++++++++++++++++++- 1 file changed, 87 insertions(+), 4 deletions(-) diff --git a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc index e96c205cf79c..3dfd505d129c 100644 --- a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc +++ b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc @@ -1227,12 +1227,9 @@ endcase ' ******************************************************************* testcase tToolsThesaurus + Dim sWordInitial as string - Dim sLanguageToBeSelected as integer Dim sWordToBeFound as string - Dim sWordReplacedWith as string - Dim i as integer - Dim j as integer Dim TheFile as String PrintLog "- Tools / Thesaurus" @@ -1379,3 +1376,89 @@ testcase tToolsThesaurus '/// Close thesaurus and writerdocument /// Call hCloseDocument endcase + +' ******************************************************************* + +testcase tToolsThesaurusSynonyms + + Dim sWordInitial as string + Dim sNumberOfSuggestions as string + Dim sReplaceWithWord as string + Dim TheFile as String + + PrintLog "- Tools / Thesaurus" + + printlog " Open document where the formatting is set to the language we wish to test." + TheFile = Convertpath (gTesttoolpath + "writer\optional\input\spellcheck\spellcheck_" + iSprache + ".odt") + if hFileExists ( TheFile ) <> TRUE then + Warnlog "Found no Document for the language you're testing in, Please inform the Test-Developer." + exit sub + end if + + select case iSprache + case 01 : sWordInitial = "Morning" + case 03 : sWordInitial = "Confirmam" + case 07 : Printlog "- No Thesaurus in Russian!" + goto endsub + case 31 : sWordInitial = "Hulp" + case 33 : sWordInitial = "Payer" + case 34 : sWordInitial = "Suficiente" + case 36 : Printlog "- No Thesaurus in Hungarian!" + goto endsub + case 39 : sWordInitial = "Lingua" + case 45 : sWordInitial = "Først" + case 46 : sWordInitial = "Däng" + case 48 : sWordInitial = "wypowiedź" + case 49 : sWordInitial = "Mann" + case 55 : Printlog "- No Thesaurus in Portuguese (Brazil) !" + goto endsub + case 81 : Printlog "- No Thesaurus in Japanese!" + goto endsub + case 82 : Printlog "- No Thesaurus in Korean!" + goto endsub + case 86 : Printlog "- No Thesaurus in Chinese (simplified)!" + goto endsub + case 88 : Printlog "- No Thesaurus in Chinese (traditional)!" + goto endsub + case 30, 35, 36, 37, 42, 47, 48, 51, 90 + Printlog "- No Thesaurus available !" + goto endsub + case else : QAErrorlog "The language " + iSprache + " has no defined errortext. No Test!" + goto endsub + end select + + printlog "Open new preformatted-writerdocument" + call hFileOpen (TheFile,false) + Call sMakeReadOnlyDocumentEditable + Call wTypeKeys sWordInitial + Call wTypeKeys "" + + printlog "Open contextmenu in wrong word" + Call wTypeKeys "" + printlog "Select 'Synonyms' in context menu" + Call hMenuSelectNr (13) + sNumberOfSuggestions=MenuGetItemCount - 2 + '/// Check if there is a suggestion and replace word /// + if sNumberOfSuggestions <=0 then + Warnlog "- No synonyms in Context menu for the first wrong word!" + else + printlog "- Context menu has " + sNumberOfSuggestions + " synonyms for the 1. wrong word!" + sReplaceWithWord=hMenuItemGetText (1) + Call hMenuSelectNr (1) + Call wTypeKeys "" + try + EditCopy + if GetClipboardtext<> sReplaceWithWord then + Warnlog "- 1. wrong Word has not been replaced with " + sReplaceWithWord + " but "+ GetClipBoardtext + else + printlog "- 1. wrong word has been replaced with the 1. entry in context menu!" + end if + catch + endcatch + end if + Call hCloseDocument + +endcase + + + -- cgit From 005df3ca336ad05fe872745f797c4cdd39e61db7 Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Mon, 26 Apr 2010 11:51:35 +0200 Subject: tl74#108360#readonly document should be made readable --- testautomation/graphics/required/includes/global/id_006.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 testautomation/graphics/required/includes/global/id_006.inc diff --git a/testautomation/graphics/required/includes/global/id_006.inc b/testautomation/graphics/required/includes/global/id_006.inc old mode 100644 new mode 100755 index a2a435735268..8e16f5ef5593 --- a/testautomation/graphics/required/includes/global/id_006.inc +++ b/testautomation/graphics/required/includes/global/id_006.inc @@ -187,7 +187,7 @@ testcase tiToolsThesaurus endif Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_" + iSprache + sExt) - + Call sMakeReadOnlyDocumentEditable() Call hTextrahmenErstellen (sWord,20,20,50,30) sleep 1 -- cgit From 37f107ae85b6a289085ae821ae109ff7d10e44fb Mon Sep 17 00:00:00 2001 From: "Marc Neumann [msc]" Date: Mon, 26 Apr 2010 12:09:03 +0200 Subject: tl74#108360#readonly document should be made readable --- testautomation/graphics/optional/includes/global/g_tools.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 testautomation/graphics/optional/includes/global/g_tools.inc diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc old mode 100644 new mode 100755 index b77b57629839..2d802af5b40c --- a/testautomation/graphics/optional/includes/global/g_tools.inc +++ b/testautomation/graphics/optional/includes/global/g_tools.inc @@ -114,7 +114,7 @@ testcase tiToolsThesaurus endif Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_" + iSprache + sExt) - + Call sMakeReadOnlyDocumentEditable() Call hTextrahmenErstellen (sWord,20,20,50,30) sleep 1 -- cgit From 6a0f6b52d4ac7452488a59e71126247260b82878 Mon Sep 17 00:00:00 2001 From: wg111939 Date: Tue, 11 May 2010 13:37:55 +0200 Subject: Adjusting tests for renaissance2 changes --- .../graphics/optional/d_export_graphic_a.bas | 0 .../graphics/optional/d_export_graphic_b.bas | 0 .../graphics/optional/export_graphic_a.bas | 0 .../graphics/optional/export_graphic_b.bas | 0 .../graphics/optional/g_accessability.bas | 1 + testautomation/graphics/optional/g_area.bas | 0 .../graphics/optional/g_arrangealign.bas | 0 .../graphics/optional/g_autocorrection.bas | 0 testautomation/graphics/optional/g_character.bas | 0 testautomation/graphics/optional/g_clipboard.bas | 0 testautomation/graphics/optional/g_clipexport.bas | 0 testautomation/graphics/optional/g_convertto.bas | 145 ++++----- testautomation/graphics/optional/g_crossfading.bas | 1 + .../graphics/optional/g_customshapes.bas | 1 + testautomation/graphics/optional/g_demoguide.bas | 0 testautomation/graphics/optional/g_dimensions.bas | 0 testautomation/graphics/optional/g_edit.bas | 0 testautomation/graphics/optional/g_export_html.bas | 0 testautomation/graphics/optional/g_findreplace.bas | 0 testautomation/graphics/optional/g_format.bas | 0 testautomation/graphics/optional/g_group.bas | 1 + testautomation/graphics/optional/g_imagemap.bas | 0 testautomation/graphics/optional/g_insert.bas | 0 testautomation/graphics/optional/g_line.bas | 2 +- testautomation/graphics/optional/g_load_save.bas | 0 testautomation/graphics/optional/g_mediaplayer.bas | 0 testautomation/graphics/optional/g_navigator.bas | 0 testautomation/graphics/optional/g_ole.bas | 1 + testautomation/graphics/optional/g_paneview.bas | 0 testautomation/graphics/optional/g_paragraph.bas | 0 .../graphics/optional/g_savepictureas.bas | 1 + testautomation/graphics/optional/g_shaddow.bas | 0 testautomation/graphics/optional/g_slidelayer.bas | 0 testautomation/graphics/optional/g_spellcheck.bas | 0 testautomation/graphics/optional/g_stylist.bas | 0 testautomation/graphics/optional/g_tables.bas | 0 testautomation/graphics/optional/g_toolbars.bas | 0 testautomation/graphics/optional/g_tools.bas | 0 testautomation/graphics/optional/g_zoom.bas | 0 testautomation/graphics/optional/gallery.bas | 0 testautomation/graphics/optional/gallery2.bas | 0 testautomation/graphics/optional/i_animation.bas | 1 + .../graphics/optional/i_headerfooter.bas | 0 testautomation/graphics/optional/i_only_updt_1.bas | 0 testautomation/graphics/optional/i_only_updt_2.bas | 0 testautomation/graphics/optional/i_pengine.bas | 0 .../graphics/optional/i_saveloadlayout.bas | 6 +- testautomation/graphics/optional/i_shape.bas | 0 testautomation/graphics/optional/i_slidecopy.bas | 1 + testautomation/graphics/optional/i_slideshow.bas | 0 .../graphics/optional/i_us_presentation.bas | 0 testautomation/graphics/optional/i_view.bas | 0 .../optional/includes/global/export_graphic_2.inc | 0 .../optional/includes/global/g_accessability.inc | 29 +- .../optional/includes/global/g_arrangealign.inc | 3 +- .../optional/includes/global/g_clipboard.inc | 1 + .../optional/includes/global/g_convertto.inc | 3 + .../optional/includes/global/g_crossfading.inc | 3 +- .../optional/includes/global/g_customshapes.inc | 1 + .../optional/includes/global/g_demoguide.inc | 1 + .../graphics/optional/includes/global/g_edit.inc | 74 +++-- .../graphics/optional/includes/global/g_format.inc | 5 +- .../graphics/optional/includes/global/g_group.inc | 3 +- .../graphics/optional/includes/global/g_line.inc | 1 + .../optional/includes/global/g_mediaplayer.inc | 2 +- .../graphics/optional/includes/global/g_ole.inc | 1 + .../optional/includes/global/g_savepictureas.inc | 4 + .../optional/includes/global/g_shaddow.inc | 1 + .../graphics/optional/includes/global/g_tables.inc | 2 +- .../optional/includes/impress/i_animation.inc | 3 +- .../optional/includes/impress/i_pengine2.inc | 1 + .../optional/includes/impress/i_saveloadlayout.inc | 338 ++++----------------- .../optional/includes/impress/i_slidecopy.inc | 71 ++--- .../optional/includes/impress/i_slidelayer.inc | 1 + .../optional/includes/impress/i_slideshow2.inc | 6 +- .../optional/includes/impress/i_slideshow3.inc | 2 + .../optional/includes/impress/i_us2_present.inc | 8 +- .../optional/includes/impress/i_us_present.inc | 227 +++++++------- testautomation/graphics/required/d_opt.bas | 0 testautomation/graphics/required/d_updt.bas | 0 testautomation/graphics/required/i_opt.bas | 0 testautomation/graphics/required/i_updt_1.bas | 0 testautomation/graphics/required/i_updt_2.bas | 0 .../graphics/required/includes/global/id_002.inc | 13 +- .../graphics/required/includes/global/id_005.inc | 1 + .../graphics/required/includes/global/id_007.inc | 6 +- .../graphics/required/includes/global/id_011.inc | 1 + .../graphics/required/includes/global/id_opt_1.inc | 2 +- .../graphics/required/includes/impress/im_003_.inc | 2 +- .../graphics/required/input/255chars.dxf | 0 .../graphics/required/input/29secsound.wav | Bin .../graphics/required/input/Blueprint.odg | Bin .../graphics/required/input/FormatConnector.odg | Bin .../graphics/required/input/FormatConnector.odp | Bin .../required/input/SaveAsPicture/SaveAsPicture.PSD | Bin .../required/input/SaveAsPicture/SaveAsPicture.bmp | Bin .../required/input/SaveAsPicture/SaveAsPicture.cgm | Bin .../required/input/SaveAsPicture/SaveAsPicture.dxf | 0 .../required/input/SaveAsPicture/SaveAsPicture.emf | Bin .../required/input/SaveAsPicture/SaveAsPicture.eps | Bin .../required/input/SaveAsPicture/SaveAsPicture.gif | Bin .../input/SaveAsPicture/SaveAsPicture.giff | Bin .../input/SaveAsPicture/SaveAsPicture.jpeg | Bin .../required/input/SaveAsPicture/SaveAsPicture.jpg | Bin .../required/input/SaveAsPicture/SaveAsPicture.met | Bin .../required/input/SaveAsPicture/SaveAsPicture.pbm | Bin .../required/input/SaveAsPicture/SaveAsPicture.pcd | Bin .../required/input/SaveAsPicture/SaveAsPicture.pct | Bin .../required/input/SaveAsPicture/SaveAsPicture.pcx | Bin .../required/input/SaveAsPicture/SaveAsPicture.pgm | 0 .../required/input/SaveAsPicture/SaveAsPicture.png | Bin .../required/input/SaveAsPicture/SaveAsPicture.ppm | 0 .../required/input/SaveAsPicture/SaveAsPicture.ras | Bin .../required/input/SaveAsPicture/SaveAsPicture.sgf | Bin .../required/input/SaveAsPicture/SaveAsPicture.sgv | Bin .../required/input/SaveAsPicture/SaveAsPicture.svm | Bin .../required/input/SaveAsPicture/SaveAsPicture.tga | Bin .../required/input/SaveAsPicture/SaveAsPicture.tif | Bin .../input/SaveAsPicture/SaveAsPicture.tiff | Bin .../required/input/SaveAsPicture/SaveAsPicture.wmf | Bin .../required/input/SaveAsPicture/SaveAsPicture.xbm | 0 .../required/input/SaveAsPicture/SaveAsPicture.xpm | 0 .../graphics/required/input/allshapes.odp | Bin .../graphics/required/input/allshapes2.odp | Bin testautomation/graphics/required/input/blip.wav | Bin testautomation/graphics/required/input/diashow.odp | Bin .../graphics/required/input/dotNetOverview.ppt | Bin testautomation/graphics/required/input/effects.odp | Bin testautomation/graphics/required/input/einfg.ini | 0 testautomation/graphics/required/input/engtext.odg | Bin testautomation/graphics/required/input/engtext.odp | Bin .../graphics/required/input/export_graphic2.odp | Bin .../graphics/required/input/export_graphic3.odg | Bin .../graphics/required/input/export_graphic3.odp | Bin testautomation/graphics/required/input/frame1.htm | 0 .../graphics/required/input/gallery/gal_1.txt | 0 .../graphics/required/input/gallery/gal_31.txt | 0 .../graphics/required/input/gallery/gal_33.txt | 0 .../graphics/required/input/gallery/gal_34.txt | 0 .../graphics/required/input/gallery/gal_36.txt | 0 .../graphics/required/input/gallery/gal_39.txt | 0 .../graphics/required/input/gallery/gal_46.txt | 0 .../graphics/required/input/gallery/gal_48.txt | 0 .../graphics/required/input/gallery/gal_49.txt | 0 .../graphics/required/input/gallery/gal_55.txt | 0 .../graphics/required/input/gallery/gal_7.txt | 0 .../graphics/required/input/gallery/gal_81.txt | 0 .../graphics/required/input/gallery/gal_82.txt | 0 .../graphics/required/input/gallery/gal_86.txt | 0 .../graphics/required/input/gallery/gal_88.txt | 0 .../graphics/required/input/gallery/gal_oo_1.txt | 0 .../graphics/required/input/gallery/gal_oo_49.txt | 0 .../graphics/required/input/gallery/gal_oo_50.txt | 0 .../graphics/required/input/gallery/gal_oo_84.txt | 0 .../graphics/required/input/generic_de.ppt | Bin .../graphics/required/input/graphicexport.odg | Bin .../graphics/required/input/graphicexport.odp | Bin .../graphics/required/input/graphicexport_pdf.odg | Bin .../graphics/required/input/graphicexport_pdf.odp | Bin testautomation/graphics/required/input/gridtst.odg | Bin testautomation/graphics/required/input/gridtst.odp | Bin testautomation/graphics/required/input/gridtst.sxd | Bin testautomation/graphics/required/input/gridtst.sxi | Bin .../graphics/required/input/i_us_large.jpg | Bin .../graphics/required/input/imsusmap.cgm | Bin testautomation/graphics/required/input/leer.odg | Bin testautomation/graphics/required/input/leer.odp | Bin testautomation/graphics/required/input/ole.bmp | Bin testautomation/graphics/required/input/oletest.odg | Bin .../graphics/required/input/outlinefromwriter.odt | Bin .../graphics/required/input/passwo52.sda | Bin .../graphics/required/input/passwo52.sdd | Bin testautomation/graphics/required/input/recht_1.odg | Bin testautomation/graphics/required/input/recht_1.odp | Bin testautomation/graphics/required/input/recht_3.odg | Bin testautomation/graphics/required/input/recht_3.odp | Bin .../graphics/required/input/recht_31.odg | Bin .../graphics/required/input/recht_31.odp | Bin .../graphics/required/input/recht_33.odg | Bin .../graphics/required/input/recht_33.odp | Bin .../graphics/required/input/recht_34.odg | Bin .../graphics/required/input/recht_34.odp | Bin .../graphics/required/input/recht_36.odg | Bin .../graphics/required/input/recht_36.odp | Bin .../graphics/required/input/recht_39.odg | Bin .../graphics/required/input/recht_39.odp | Bin .../graphics/required/input/recht_46.odg | Bin .../graphics/required/input/recht_46.odp | Bin .../graphics/required/input/recht_48.odg | Bin .../graphics/required/input/recht_48.odp | Bin .../graphics/required/input/recht_48.sxd | Bin .../graphics/required/input/recht_48.sxi | Bin .../graphics/required/input/recht_49.odg | Bin .../graphics/required/input/recht_49.odp | Bin .../graphics/required/input/recht_50.odg | Bin .../graphics/required/input/recht_50.odp | Bin .../graphics/required/input/recht_55.odg | Bin .../graphics/required/input/recht_55.odp | Bin .../graphics/required/input/recht_81.odg | Bin .../graphics/required/input/recht_81.odp | Bin .../graphics/required/input/rightfont.odg | Bin .../graphics/required/input/rightfont.odp | Bin .../graphics/required/input/rightfont1.odg | Bin .../graphics/required/input/rightfont1.odp | Bin .../graphics/required/input/rightfont33.odg | Bin .../graphics/required/input/rightfont33.odp | Bin .../graphics/required/input/rightfont34.odg | Bin .../graphics/required/input/rightfont34.odp | Bin .../graphics/required/input/rightfont36.odg | Bin .../graphics/required/input/rightfont36.odp | Bin .../graphics/required/input/rightfont39.odg | Bin .../graphics/required/input/rightfont39.odp | Bin .../graphics/required/input/rightfont46.odg | Bin .../graphics/required/input/rightfont46.odp | Bin .../graphics/required/input/rightfont48.odg | Bin .../graphics/required/input/rightfont48.odp | Bin .../graphics/required/input/rightfont49.odg | Bin .../graphics/required/input/rightfont49.odp | Bin .../graphics/required/input/rightfont50.odp | Bin .../graphics/required/input/rightfont55.odg | Bin .../graphics/required/input/rightfont55.odp | Bin testautomation/graphics/required/input/sample.mov | Bin .../graphics/required/input/screen_white.wmf | Bin .../graphics/required/input/shapes/1Lines.ppt | Bin .../graphics/required/input/shapes/2Connectors.ppt | Bin .../required/input/shapes/3BasicShapes.ppt | Bin .../required/input/shapes/4BlockArrows.ppt | Bin .../graphics/required/input/shapes/5Flowchart.ppt | Bin .../required/input/shapes/6StarsBanners.ppt | Bin .../graphics/required/input/shapes/7Callouts.ppt | Bin .../required/input/shapes/8ActionButtons.ppt | Bin .../graphics/required/input/silben_1.odg | Bin .../graphics/required/input/silben_1.odp | Bin .../graphics/required/input/silben_31.odg | Bin .../graphics/required/input/silben_31.odp | Bin .../graphics/required/input/silben_31.sxd | Bin .../graphics/required/input/silben_31.sxi | Bin .../graphics/required/input/silben_33.odg | Bin .../graphics/required/input/silben_33.odp | Bin .../graphics/required/input/silben_34.odg | Bin .../graphics/required/input/silben_34.odp | Bin .../graphics/required/input/silben_36.odg | Bin .../graphics/required/input/silben_36.odp | Bin .../graphics/required/input/silben_39.odg | Bin .../graphics/required/input/silben_39.odp | Bin .../graphics/required/input/silben_46.odg | Bin .../graphics/required/input/silben_46.odp | Bin .../graphics/required/input/silben_48.odg | Bin .../graphics/required/input/silben_48.odp | Bin .../graphics/required/input/silben_49.odg | Bin .../graphics/required/input/silben_49.odp | Bin .../graphics/required/input/silben_50.odg | Bin .../graphics/required/input/silben_50.odp | Bin .../graphics/required/input/silben_55.odg | Bin .../graphics/required/input/silben_55.odp | Bin .../graphics/required/input/spellb_1.odg | Bin .../graphics/required/input/spellb_1.odp | Bin .../graphics/required/input/spellb_1.txt | 0 .../graphics/required/input/spellb_31.odg | Bin .../graphics/required/input/spellb_31.odp | Bin .../graphics/required/input/spellb_31.txt | 0 .../graphics/required/input/spellb_33.odg | Bin .../graphics/required/input/spellb_33.odp | Bin .../graphics/required/input/spellb_33.txt | 0 .../graphics/required/input/spellb_34.odg | Bin .../graphics/required/input/spellb_34.odp | Bin .../graphics/required/input/spellb_34.txt | 0 .../graphics/required/input/spellb_36.odg | Bin .../graphics/required/input/spellb_36.odp | Bin .../graphics/required/input/spellb_36.txt | 0 .../graphics/required/input/spellb_39.odg | Bin .../graphics/required/input/spellb_39.odp | Bin .../graphics/required/input/spellb_39.txt | 0 .../graphics/required/input/spellb_49.odg | Bin .../graphics/required/input/spellb_49.odp | Bin .../graphics/required/input/spellb_49.txt | 0 .../graphics/required/input/spellb_50.odg | Bin .../graphics/required/input/spellb_50.odp | Bin .../graphics/required/input/spellb_50.txt | 0 .../graphics/required/input/spellb_55.odg | Bin .../graphics/required/input/spellb_55.odp | Bin .../graphics/required/input/spellb_55.txt | 0 .../graphics/required/input/spellb_7.odg | Bin .../graphics/required/input/spellb_7.odp | Bin .../graphics/required/input/spellb_7.txt | 0 .../graphics/required/input/spellb_82.odg | Bin .../graphics/required/input/spellb_82.odp | Bin .../graphics/required/input/spellb_82.txt | 0 .../graphics/required/input/spellb_86.odg | Bin .../graphics/required/input/spellb_86.odp | Bin .../graphics/required/input/spellb_86.txt | 0 .../graphics/required/input/spellb_88.odg | Bin .../graphics/required/input/spellb_88.odp | Bin .../graphics/required/input/spellb_88.txt | 0 .../graphics/required/input/tbo_alf_.odg | Bin .../graphics/required/input/tbo_alf_.odp | Bin .../graphics/required/input/tchinese.odg | Bin .../graphics/required/input/tchinese.odp | Bin testautomation/graphics/tools/id_tools_2.inc | 15 + testautomation/graphics/tools/locale_1.txt | 0 testautomation/graphics/tools/makeLokaleTxt.bas | 0 301 files changed, 419 insertions(+), 573 deletions(-) mode change 100755 => 100644 testautomation/graphics/optional/d_export_graphic_a.bas mode change 100755 => 100644 testautomation/graphics/optional/d_export_graphic_b.bas mode change 100755 => 100644 testautomation/graphics/optional/export_graphic_a.bas mode change 100755 => 100644 testautomation/graphics/optional/export_graphic_b.bas mode change 100755 => 100644 testautomation/graphics/optional/g_accessability.bas mode change 100755 => 100644 testautomation/graphics/optional/g_area.bas mode change 100755 => 100644 testautomation/graphics/optional/g_arrangealign.bas mode change 100755 => 100644 testautomation/graphics/optional/g_autocorrection.bas mode change 100755 => 100644 testautomation/graphics/optional/g_character.bas mode change 100755 => 100644 testautomation/graphics/optional/g_clipboard.bas mode change 100755 => 100644 testautomation/graphics/optional/g_clipexport.bas mode change 100755 => 100644 testautomation/graphics/optional/g_convertto.bas mode change 100755 => 100644 testautomation/graphics/optional/g_crossfading.bas mode change 100755 => 100644 testautomation/graphics/optional/g_customshapes.bas mode change 100755 => 100644 testautomation/graphics/optional/g_demoguide.bas mode change 100755 => 100644 testautomation/graphics/optional/g_dimensions.bas mode change 100755 => 100644 testautomation/graphics/optional/g_edit.bas mode change 100755 => 100644 testautomation/graphics/optional/g_export_html.bas mode change 100755 => 100644 testautomation/graphics/optional/g_findreplace.bas mode change 100755 => 100644 testautomation/graphics/optional/g_format.bas mode change 100755 => 100644 testautomation/graphics/optional/g_group.bas mode change 100755 => 100644 testautomation/graphics/optional/g_imagemap.bas mode change 100755 => 100644 testautomation/graphics/optional/g_insert.bas mode change 100755 => 100644 testautomation/graphics/optional/g_line.bas mode change 100755 => 100644 testautomation/graphics/optional/g_load_save.bas mode change 100755 => 100644 testautomation/graphics/optional/g_mediaplayer.bas mode change 100755 => 100644 testautomation/graphics/optional/g_navigator.bas mode change 100755 => 100644 testautomation/graphics/optional/g_ole.bas mode change 100755 => 100644 testautomation/graphics/optional/g_paneview.bas mode change 100755 => 100644 testautomation/graphics/optional/g_paragraph.bas mode change 100755 => 100644 testautomation/graphics/optional/g_savepictureas.bas mode change 100755 => 100644 testautomation/graphics/optional/g_shaddow.bas mode change 100755 => 100644 testautomation/graphics/optional/g_slidelayer.bas mode change 100755 => 100644 testautomation/graphics/optional/g_spellcheck.bas mode change 100755 => 100644 testautomation/graphics/optional/g_stylist.bas mode change 100755 => 100644 testautomation/graphics/optional/g_tables.bas mode change 100755 => 100644 testautomation/graphics/optional/g_toolbars.bas mode change 100755 => 100644 testautomation/graphics/optional/g_tools.bas mode change 100755 => 100644 testautomation/graphics/optional/g_zoom.bas mode change 100755 => 100644 testautomation/graphics/optional/gallery.bas mode change 100755 => 100644 testautomation/graphics/optional/gallery2.bas mode change 100755 => 100644 testautomation/graphics/optional/i_animation.bas mode change 100755 => 100644 testautomation/graphics/optional/i_headerfooter.bas mode change 100755 => 100644 testautomation/graphics/optional/i_only_updt_1.bas mode change 100755 => 100644 testautomation/graphics/optional/i_only_updt_2.bas mode change 100755 => 100644 testautomation/graphics/optional/i_pengine.bas mode change 100755 => 100644 testautomation/graphics/optional/i_saveloadlayout.bas mode change 100755 => 100644 testautomation/graphics/optional/i_shape.bas mode change 100755 => 100644 testautomation/graphics/optional/i_slidecopy.bas mode change 100755 => 100644 testautomation/graphics/optional/i_slideshow.bas mode change 100755 => 100644 testautomation/graphics/optional/i_us_presentation.bas mode change 100755 => 100644 testautomation/graphics/optional/i_view.bas mode change 100755 => 100644 testautomation/graphics/optional/includes/global/export_graphic_2.inc mode change 100755 => 100644 testautomation/graphics/required/d_opt.bas mode change 100755 => 100644 testautomation/graphics/required/d_updt.bas mode change 100755 => 100644 testautomation/graphics/required/i_opt.bas mode change 100755 => 100644 testautomation/graphics/required/i_updt_1.bas mode change 100755 => 100644 testautomation/graphics/required/i_updt_2.bas mode change 100755 => 100644 testautomation/graphics/required/input/255chars.dxf mode change 100755 => 100644 testautomation/graphics/required/input/29secsound.wav mode change 100755 => 100644 testautomation/graphics/required/input/Blueprint.odg mode change 100755 => 100644 testautomation/graphics/required/input/FormatConnector.odg mode change 100755 => 100644 testautomation/graphics/required/input/FormatConnector.odp mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.PSD mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.bmp mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.cgm mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.dxf mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.emf mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.eps mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.gif mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.giff mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.jpeg mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.jpg mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.met mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.pbm mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.pcd mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.pct mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.pcx mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.pgm mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.png mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.ppm mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.ras mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.sgf mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.sgv mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.svm mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.tga mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.tif mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.tiff mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.wmf mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.xbm mode change 100755 => 100644 testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.xpm mode change 100755 => 100644 testautomation/graphics/required/input/allshapes.odp mode change 100755 => 100644 testautomation/graphics/required/input/allshapes2.odp mode change 100755 => 100644 testautomation/graphics/required/input/blip.wav mode change 100755 => 100644 testautomation/graphics/required/input/diashow.odp mode change 100755 => 100644 testautomation/graphics/required/input/dotNetOverview.ppt mode change 100755 => 100644 testautomation/graphics/required/input/effects.odp mode change 100755 => 100644 testautomation/graphics/required/input/einfg.ini mode change 100755 => 100644 testautomation/graphics/required/input/engtext.odg mode change 100755 => 100644 testautomation/graphics/required/input/engtext.odp mode change 100755 => 100644 testautomation/graphics/required/input/export_graphic2.odp mode change 100755 => 100644 testautomation/graphics/required/input/export_graphic3.odg mode change 100755 => 100644 testautomation/graphics/required/input/export_graphic3.odp mode change 100755 => 100644 testautomation/graphics/required/input/frame1.htm mode change 100755 => 100644 testautomation/graphics/required/input/gallery/gal_1.txt mode change 100755 => 100644 testautomation/graphics/required/input/gallery/gal_31.txt mode change 100755 => 100644 testautomation/graphics/required/input/gallery/gal_33.txt mode change 100755 => 100644 testautomation/graphics/required/input/gallery/gal_34.txt mode change 100755 => 100644 testautomation/graphics/required/input/gallery/gal_36.txt mode change 100755 => 100644 testautomation/graphics/required/input/gallery/gal_39.txt mode change 100755 => 100644 testautomation/graphics/required/input/gallery/gal_46.txt mode change 100755 => 100644 testautomation/graphics/required/input/gallery/gal_48.txt mode change 100755 => 100644 testautomation/graphics/required/input/gallery/gal_49.txt mode change 100755 => 100644 testautomation/graphics/required/input/gallery/gal_55.txt mode change 100755 => 100644 testautomation/graphics/required/input/gallery/gal_7.txt mode change 100755 => 100644 testautomation/graphics/required/input/gallery/gal_81.txt mode change 100755 => 100644 testautomation/graphics/required/input/gallery/gal_82.txt mode change 100755 => 100644 testautomation/graphics/required/input/gallery/gal_86.txt mode change 100755 => 100644 testautomation/graphics/required/input/gallery/gal_88.txt mode change 100755 => 100644 testautomation/graphics/required/input/gallery/gal_oo_1.txt mode change 100755 => 100644 testautomation/graphics/required/input/gallery/gal_oo_49.txt mode change 100755 => 100644 testautomation/graphics/required/input/gallery/gal_oo_50.txt mode change 100755 => 100644 testautomation/graphics/required/input/gallery/gal_oo_84.txt mode change 100755 => 100644 testautomation/graphics/required/input/generic_de.ppt mode change 100755 => 100644 testautomation/graphics/required/input/graphicexport.odg mode change 100755 => 100644 testautomation/graphics/required/input/graphicexport.odp mode change 100755 => 100644 testautomation/graphics/required/input/graphicexport_pdf.odg mode change 100755 => 100644 testautomation/graphics/required/input/graphicexport_pdf.odp mode change 100755 => 100644 testautomation/graphics/required/input/gridtst.odg mode change 100755 => 100644 testautomation/graphics/required/input/gridtst.odp mode change 100755 => 100644 testautomation/graphics/required/input/gridtst.sxd mode change 100755 => 100644 testautomation/graphics/required/input/gridtst.sxi mode change 100755 => 100644 testautomation/graphics/required/input/i_us_large.jpg mode change 100755 => 100644 testautomation/graphics/required/input/imsusmap.cgm mode change 100755 => 100644 testautomation/graphics/required/input/leer.odg mode change 100755 => 100644 testautomation/graphics/required/input/leer.odp mode change 100755 => 100644 testautomation/graphics/required/input/ole.bmp mode change 100755 => 100644 testautomation/graphics/required/input/oletest.odg mode change 100755 => 100644 testautomation/graphics/required/input/outlinefromwriter.odt mode change 100755 => 100644 testautomation/graphics/required/input/passwo52.sda mode change 100755 => 100644 testautomation/graphics/required/input/passwo52.sdd mode change 100755 => 100644 testautomation/graphics/required/input/recht_1.odg mode change 100755 => 100644 testautomation/graphics/required/input/recht_1.odp mode change 100755 => 100644 testautomation/graphics/required/input/recht_3.odg mode change 100755 => 100644 testautomation/graphics/required/input/recht_3.odp mode change 100755 => 100644 testautomation/graphics/required/input/recht_31.odg mode change 100755 => 100644 testautomation/graphics/required/input/recht_31.odp mode change 100755 => 100644 testautomation/graphics/required/input/recht_33.odg mode change 100755 => 100644 testautomation/graphics/required/input/recht_33.odp mode change 100755 => 100644 testautomation/graphics/required/input/recht_34.odg mode change 100755 => 100644 testautomation/graphics/required/input/recht_34.odp mode change 100755 => 100644 testautomation/graphics/required/input/recht_36.odg mode change 100755 => 100644 testautomation/graphics/required/input/recht_36.odp mode change 100755 => 100644 testautomation/graphics/required/input/recht_39.odg mode change 100755 => 100644 testautomation/graphics/required/input/recht_39.odp mode change 100755 => 100644 testautomation/graphics/required/input/recht_46.odg mode change 100755 => 100644 testautomation/graphics/required/input/recht_46.odp mode change 100755 => 100644 testautomation/graphics/required/input/recht_48.odg mode change 100755 => 100644 testautomation/graphics/required/input/recht_48.odp mode change 100755 => 100644 testautomation/graphics/required/input/recht_48.sxd mode change 100755 => 100644 testautomation/graphics/required/input/recht_48.sxi mode change 100755 => 100644 testautomation/graphics/required/input/recht_49.odg mode change 100755 => 100644 testautomation/graphics/required/input/recht_49.odp mode change 100755 => 100644 testautomation/graphics/required/input/recht_50.odg mode change 100755 => 100644 testautomation/graphics/required/input/recht_50.odp mode change 100755 => 100644 testautomation/graphics/required/input/recht_55.odg mode change 100755 => 100644 testautomation/graphics/required/input/recht_55.odp mode change 100755 => 100644 testautomation/graphics/required/input/recht_81.odg mode change 100755 => 100644 testautomation/graphics/required/input/recht_81.odp mode change 100755 => 100644 testautomation/graphics/required/input/rightfont.odg mode change 100755 => 100644 testautomation/graphics/required/input/rightfont.odp mode change 100755 => 100644 testautomation/graphics/required/input/rightfont1.odg mode change 100755 => 100644 testautomation/graphics/required/input/rightfont1.odp mode change 100755 => 100644 testautomation/graphics/required/input/rightfont33.odg mode change 100755 => 100644 testautomation/graphics/required/input/rightfont33.odp mode change 100755 => 100644 testautomation/graphics/required/input/rightfont34.odg mode change 100755 => 100644 testautomation/graphics/required/input/rightfont34.odp mode change 100755 => 100644 testautomation/graphics/required/input/rightfont36.odg mode change 100755 => 100644 testautomation/graphics/required/input/rightfont36.odp mode change 100755 => 100644 testautomation/graphics/required/input/rightfont39.odg mode change 100755 => 100644 testautomation/graphics/required/input/rightfont39.odp mode change 100755 => 100644 testautomation/graphics/required/input/rightfont46.odg mode change 100755 => 100644 testautomation/graphics/required/input/rightfont46.odp mode change 100755 => 100644 testautomation/graphics/required/input/rightfont48.odg mode change 100755 => 100644 testautomation/graphics/required/input/rightfont48.odp mode change 100755 => 100644 testautomation/graphics/required/input/rightfont49.odg mode change 100755 => 100644 testautomation/graphics/required/input/rightfont49.odp mode change 100755 => 100644 testautomation/graphics/required/input/rightfont50.odp mode change 100755 => 100644 testautomation/graphics/required/input/rightfont55.odg mode change 100755 => 100644 testautomation/graphics/required/input/rightfont55.odp mode change 100755 => 100644 testautomation/graphics/required/input/sample.mov mode change 100755 => 100644 testautomation/graphics/required/input/screen_white.wmf mode change 100755 => 100644 testautomation/graphics/required/input/shapes/1Lines.ppt mode change 100755 => 100644 testautomation/graphics/required/input/shapes/2Connectors.ppt mode change 100755 => 100644 testautomation/graphics/required/input/shapes/3BasicShapes.ppt mode change 100755 => 100644 testautomation/graphics/required/input/shapes/4BlockArrows.ppt mode change 100755 => 100644 testautomation/graphics/required/input/shapes/5Flowchart.ppt mode change 100755 => 100644 testautomation/graphics/required/input/shapes/6StarsBanners.ppt mode change 100755 => 100644 testautomation/graphics/required/input/shapes/7Callouts.ppt mode change 100755 => 100644 testautomation/graphics/required/input/shapes/8ActionButtons.ppt mode change 100755 => 100644 testautomation/graphics/required/input/silben_1.odg mode change 100755 => 100644 testautomation/graphics/required/input/silben_1.odp mode change 100755 => 100644 testautomation/graphics/required/input/silben_31.odg mode change 100755 => 100644 testautomation/graphics/required/input/silben_31.odp mode change 100755 => 100644 testautomation/graphics/required/input/silben_31.sxd mode change 100755 => 100644 testautomation/graphics/required/input/silben_31.sxi mode change 100755 => 100644 testautomation/graphics/required/input/silben_33.odg mode change 100755 => 100644 testautomation/graphics/required/input/silben_33.odp mode change 100755 => 100644 testautomation/graphics/required/input/silben_34.odg mode change 100755 => 100644 testautomation/graphics/required/input/silben_34.odp mode change 100755 => 100644 testautomation/graphics/required/input/silben_36.odg mode change 100755 => 100644 testautomation/graphics/required/input/silben_36.odp mode change 100755 => 100644 testautomation/graphics/required/input/silben_39.odg mode change 100755 => 100644 testautomation/graphics/required/input/silben_39.odp mode change 100755 => 100644 testautomation/graphics/required/input/silben_46.odg mode change 100755 => 100644 testautomation/graphics/required/input/silben_46.odp mode change 100755 => 100644 testautomation/graphics/required/input/silben_48.odg mode change 100755 => 100644 testautomation/graphics/required/input/silben_48.odp mode change 100755 => 100644 testautomation/graphics/required/input/silben_49.odg mode change 100755 => 100644 testautomation/graphics/required/input/silben_49.odp mode change 100755 => 100644 testautomation/graphics/required/input/silben_50.odg mode change 100755 => 100644 testautomation/graphics/required/input/silben_50.odp mode change 100755 => 100644 testautomation/graphics/required/input/silben_55.odg mode change 100755 => 100644 testautomation/graphics/required/input/silben_55.odp mode change 100755 => 100644 testautomation/graphics/required/input/spellb_1.odg mode change 100755 => 100644 testautomation/graphics/required/input/spellb_1.odp mode change 100755 => 100644 testautomation/graphics/required/input/spellb_1.txt mode change 100755 => 100644 testautomation/graphics/required/input/spellb_31.odg mode change 100755 => 100644 testautomation/graphics/required/input/spellb_31.odp mode change 100755 => 100644 testautomation/graphics/required/input/spellb_31.txt mode change 100755 => 100644 testautomation/graphics/required/input/spellb_33.odg mode change 100755 => 100644 testautomation/graphics/required/input/spellb_33.odp mode change 100755 => 100644 testautomation/graphics/required/input/spellb_33.txt mode change 100755 => 100644 testautomation/graphics/required/input/spellb_34.odg mode change 100755 => 100644 testautomation/graphics/required/input/spellb_34.odp mode change 100755 => 100644 testautomation/graphics/required/input/spellb_34.txt mode change 100755 => 100644 testautomation/graphics/required/input/spellb_36.odg mode change 100755 => 100644 testautomation/graphics/required/input/spellb_36.odp mode change 100755 => 100644 testautomation/graphics/required/input/spellb_36.txt mode change 100755 => 100644 testautomation/graphics/required/input/spellb_39.odg mode change 100755 => 100644 testautomation/graphics/required/input/spellb_39.odp mode change 100755 => 100644 testautomation/graphics/required/input/spellb_39.txt mode change 100755 => 100644 testautomation/graphics/required/input/spellb_49.odg mode change 100755 => 100644 testautomation/graphics/required/input/spellb_49.odp mode change 100755 => 100644 testautomation/graphics/required/input/spellb_49.txt mode change 100755 => 100644 testautomation/graphics/required/input/spellb_50.odg mode change 100755 => 100644 testautomation/graphics/required/input/spellb_50.odp mode change 100755 => 100644 testautomation/graphics/required/input/spellb_50.txt mode change 100755 => 100644 testautomation/graphics/required/input/spellb_55.odg mode change 100755 => 100644 testautomation/graphics/required/input/spellb_55.odp mode change 100755 => 100644 testautomation/graphics/required/input/spellb_55.txt mode change 100755 => 100644 testautomation/graphics/required/input/spellb_7.odg mode change 100755 => 100644 testautomation/graphics/required/input/spellb_7.odp mode change 100755 => 100644 testautomation/graphics/required/input/spellb_7.txt mode change 100755 => 100644 testautomation/graphics/required/input/spellb_82.odg mode change 100755 => 100644 testautomation/graphics/required/input/spellb_82.odp mode change 100755 => 100644 testautomation/graphics/required/input/spellb_82.txt mode change 100755 => 100644 testautomation/graphics/required/input/spellb_86.odg mode change 100755 => 100644 testautomation/graphics/required/input/spellb_86.odp mode change 100755 => 100644 testautomation/graphics/required/input/spellb_86.txt mode change 100755 => 100644 testautomation/graphics/required/input/spellb_88.odg mode change 100755 => 100644 testautomation/graphics/required/input/spellb_88.odp mode change 100755 => 100644 testautomation/graphics/required/input/spellb_88.txt mode change 100755 => 100644 testautomation/graphics/required/input/tbo_alf_.odg mode change 100755 => 100644 testautomation/graphics/required/input/tbo_alf_.odp mode change 100755 => 100644 testautomation/graphics/required/input/tchinese.odg mode change 100755 => 100644 testautomation/graphics/required/input/tchinese.odp mode change 100755 => 100644 testautomation/graphics/tools/locale_1.txt mode change 100755 => 100644 testautomation/graphics/tools/makeLokaleTxt.bas diff --git a/testautomation/graphics/optional/d_export_graphic_a.bas b/testautomation/graphics/optional/d_export_graphic_a.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/d_export_graphic_b.bas b/testautomation/graphics/optional/d_export_graphic_b.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/export_graphic_a.bas b/testautomation/graphics/optional/export_graphic_a.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/export_graphic_b.bas b/testautomation/graphics/optional/export_graphic_b.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_accessability.bas b/testautomation/graphics/optional/g_accessability.bas old mode 100755 new mode 100644 index db1e9e68474a..fc03755763b5 --- a/testautomation/graphics/optional/g_accessability.bas +++ b/testautomation/graphics/optional/g_accessability.bas @@ -36,6 +36,7 @@ sub main Call hStatusIn ( "Graphics","g_accessability.bas") use "graphics\tools\id_tools.inc" + use "graphics\tools\id_tools_2.inc" use "graphics\optional\includes\global\g_accessability.inc" PrintLog "-------------------------" + gApplication + "-------------------" diff --git a/testautomation/graphics/optional/g_area.bas b/testautomation/graphics/optional/g_area.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_arrangealign.bas b/testautomation/graphics/optional/g_arrangealign.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_autocorrection.bas b/testautomation/graphics/optional/g_autocorrection.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_character.bas b/testautomation/graphics/optional/g_character.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_clipboard.bas b/testautomation/graphics/optional/g_clipboard.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_clipexport.bas b/testautomation/graphics/optional/g_clipexport.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_convertto.bas b/testautomation/graphics/optional/g_convertto.bas old mode 100755 new mode 100644 index bdc86266b96e..4a1e76cfe04d --- a/testautomation/graphics/optional/g_convertto.bas +++ b/testautomation/graphics/optional/g_convertto.bas @@ -1,72 +1,73 @@ -'encoding UTF-8 Do not remove or change this line! -'************************************************************************** -' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -' -' Copyright 2000, 2010 Oracle and/or its affiliates. -' -' OpenOffice.org - a multi-platform office productivity suite -' -' This file is part of OpenOffice.org. -' -' OpenOffice.org is free software: you can redistribute it and/or modify -' it under the terms of the GNU Lesser General Public License version 3 -' only, as published by the Free Software Foundation. -' -' OpenOffice.org is distributed in the hope that it will be useful, -' but WITHOUT ANY WARRANTY; without even the implied warranty of -' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -' GNU Lesser General Public License version 3 for more details -' (a copy is included in the LICENSE file that accompanied this code). -' -' You should have received a copy of the GNU Lesser General Public License -' version 3 along with OpenOffice.org. If not, see -' -' for a copy of the LGPLv3 License. -' -'/************************************************************************ -'* -'* Owner : wolfram.garten@sun.com -'* -'* short description : Graphics Function: Convert to ... -'* -'\****************************************************************** - -global Ueber_Text_1 as string -global Ueber_Text_2 as string -global Ueber_Text_3 as string - -sub main - PrintLog "------------------------- g_convertto test -------------------------" - Call hStatusIn ( "Graphics","g_convertto.bas") - - use "graphics\tools\id_tools.inc" - use "graphics\optional\includes\global\g_convertto.inc" - - PrintLog "-------------------------" + gApplication + "-------------------" - Call tiModifyConvertToPolygon - Call tdContextConvertIntoBitmap - Call tiAendernUmwandelnInKurve - Call tiAendernUmwandelnInPolygonGrafik - Call tiAendernUmwandelnIn3D - Call tiAendernUmwandelnIn3DRotationsKoerper - Call tiAendernUmwandelnInMetaFile - - gApplication = "DRAW" - PrintLog "-------------------------" + gApplication + "-------------------" - Call tiModifyConvertToPolygon - Call tdContextConvertIntoBitmap - Call tiAendernUmwandelnInKurve - Call tiAendernUmwandelnInPolygonGrafik - Call tiAendernUmwandelnIn3D - Call tiAendernUmwandelnIn3DRotationsKoerper - Call tiAendernUmwandelnInMetaFile - - Call hStatusOut -end sub - -sub LoadIncludeFiles - use "global\system\includes\master.inc" - use "global\system\includes\gvariabl.inc" - gApplication = "IMPRESS" - Call GetUseFiles -end sub +'encoding UTF-8 Do not remove or change this line! +'************************************************************************** +' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +' +' Copyright 2000, 2010 Oracle and/or its affiliates. +' +' OpenOffice.org - a multi-platform office productivity suite +' +' This file is part of OpenOffice.org. +' +' OpenOffice.org is free software: you can redistribute it and/or modify +' it under the terms of the GNU Lesser General Public License version 3 +' only, as published by the Free Software Foundation. +' +' OpenOffice.org is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU Lesser General Public License version 3 for more details +' (a copy is included in the LICENSE file that accompanied this code). +' +' You should have received a copy of the GNU Lesser General Public License +' version 3 along with OpenOffice.org. If not, see +' +' for a copy of the LGPLv3 License. +' +'/************************************************************************ +'* +'* Owner : wolfram.garten@sun.com +'* +'* short description : Graphics Function: Convert to ... +'* +'\****************************************************************** + +global Ueber_Text_1 as string +global Ueber_Text_2 as string +global Ueber_Text_3 as string + +sub main + PrintLog "------------------------- g_convertto test -------------------------" + Call hStatusIn ( "Graphics","g_convertto.bas") + + use "graphics\tools\id_tools.inc" + use "graphics\tools\id_tools_2.inc" + use "graphics\optional\includes\global\g_convertto.inc" + + PrintLog "-------------------------" + gApplication + "-------------------" + Call tiModifyConvertToPolygon + ' Call tdContextConvertIntoBitmap + Call tiAendernUmwandelnInKurve + Call tiAendernUmwandelnInPolygonGrafik + 'Call tiAendernUmwandelnIn3D + 'Call tiAendernUmwandelnIn3DRotationsKoerper + 'Call tiAendernUmwandelnInMetaFile + + gApplication = "DRAW" + PrintLog "-------------------------" + gApplication + "-------------------" + 'Call tiModifyConvertToPolygon + 'Call tdContextConvertIntoBitmap + 'Call tiAendernUmwandelnInKurve + 'Call tiAendernUmwandelnInPolygonGrafik + 'Call tiAendernUmwandelnIn3D + 'Call tiAendernUmwandelnIn3DRotationsKoerper + 'Call tiAendernUmwandelnInMetaFile + + Call hStatusOut +end sub + +sub LoadIncludeFiles + use "global\system\includes\master.inc" + use "global\system\includes\gvariabl.inc" + gApplication = "IMPRESS" + Call GetUseFiles +end sub diff --git a/testautomation/graphics/optional/g_crossfading.bas b/testautomation/graphics/optional/g_crossfading.bas old mode 100755 new mode 100644 index 52f7ce3acfe0..1520f995e8ab --- a/testautomation/graphics/optional/g_crossfading.bas +++ b/testautomation/graphics/optional/g_crossfading.bas @@ -36,6 +36,7 @@ sub main Call hStatusIn ( "Graphics","g_crossfading.bas") use "graphics\tools\id_tools.inc" + use "graphics\tools\id_tools_2.inc" use "graphics\optional\includes\global\g_crossfading.inc" PrintLog "-------------------------" + gApplication + "-------------------" diff --git a/testautomation/graphics/optional/g_customshapes.bas b/testautomation/graphics/optional/g_customshapes.bas old mode 100755 new mode 100644 index b4e96524deff..f759be72f680 --- a/testautomation/graphics/optional/g_customshapes.bas +++ b/testautomation/graphics/optional/g_customshapes.bas @@ -36,6 +36,7 @@ sub main Call hStatusIn ( "Graphics","g_customshapes.bas" ) use "graphics\tools\id_tools.inc" + use "graphics\tools\id_tools_2.inc" use "graphics\optional\includes\global\g_customshapes.inc" PrintLog "--------------------- " + gApplication + " -------------------" diff --git a/testautomation/graphics/optional/g_demoguide.bas b/testautomation/graphics/optional/g_demoguide.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_dimensions.bas b/testautomation/graphics/optional/g_dimensions.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_edit.bas b/testautomation/graphics/optional/g_edit.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_export_html.bas b/testautomation/graphics/optional/g_export_html.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_findreplace.bas b/testautomation/graphics/optional/g_findreplace.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_format.bas b/testautomation/graphics/optional/g_format.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_group.bas b/testautomation/graphics/optional/g_group.bas old mode 100755 new mode 100644 index 6cd539ac2577..f8d16e653c9c --- a/testautomation/graphics/optional/g_group.bas +++ b/testautomation/graphics/optional/g_group.bas @@ -36,6 +36,7 @@ sub main Call hStatusIn ( "Graphics","g_group.bas" ) use "graphics\tools\id_tools.inc" + use "graphics\tools\id_tools_2.inc" use "graphics\optional\includes\global\g_group.inc" PrintLog "-------------------------" + gApplication + "-------------------" diff --git a/testautomation/graphics/optional/g_imagemap.bas b/testautomation/graphics/optional/g_imagemap.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_insert.bas b/testautomation/graphics/optional/g_insert.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_line.bas b/testautomation/graphics/optional/g_line.bas old mode 100755 new mode 100644 index 89759e847389..867621aa88b0 --- a/testautomation/graphics/optional/g_line.bas +++ b/testautomation/graphics/optional/g_line.bas @@ -34,7 +34,7 @@ sub main PrintLog "------------------------- g_line test -------------------------" Call hStatusIn ( "Graphics","g_line.bas") - + use "graphics\tools\id_tools_2.inc" use "graphics\optional\includes\global\g_line.inc" PrintLog "-------------------------" + gApplication + "-------------------" diff --git a/testautomation/graphics/optional/g_load_save.bas b/testautomation/graphics/optional/g_load_save.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_mediaplayer.bas b/testautomation/graphics/optional/g_mediaplayer.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_navigator.bas b/testautomation/graphics/optional/g_navigator.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_ole.bas b/testautomation/graphics/optional/g_ole.bas old mode 100755 new mode 100644 index dc8c0490b5aa..6409388ef2f6 --- a/testautomation/graphics/optional/g_ole.bas +++ b/testautomation/graphics/optional/g_ole.bas @@ -39,6 +39,7 @@ sub main Call hStatusIn ( "Graphics","g_ole.bas") use "graphics\tools\id_tools.inc" + use "graphics\tools\id_tools_2.inc" use "graphics\optional\includes\global\g_ole.inc" PrintLog "-------------------------" + gApplication + "-------------------" diff --git a/testautomation/graphics/optional/g_paneview.bas b/testautomation/graphics/optional/g_paneview.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_paragraph.bas b/testautomation/graphics/optional/g_paragraph.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_savepictureas.bas b/testautomation/graphics/optional/g_savepictureas.bas old mode 100755 new mode 100644 index c34348039db1..e3c5f3fc5b8d --- a/testautomation/graphics/optional/g_savepictureas.bas +++ b/testautomation/graphics/optional/g_savepictureas.bas @@ -39,6 +39,7 @@ sub main Call hStatusIn ( "Graphics","g_savepictureas.bas" ) use "graphics\tools\id_tools.inc" + use "graphics\tools\id_tools_2.inc" use "graphics\optional\includes\global\g_savepictureas.inc" PrintLog "-------------------------" + gApplication + "-------------------" diff --git a/testautomation/graphics/optional/g_shaddow.bas b/testautomation/graphics/optional/g_shaddow.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_slidelayer.bas b/testautomation/graphics/optional/g_slidelayer.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_spellcheck.bas b/testautomation/graphics/optional/g_spellcheck.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_stylist.bas b/testautomation/graphics/optional/g_stylist.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_tables.bas b/testautomation/graphics/optional/g_tables.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_toolbars.bas b/testautomation/graphics/optional/g_toolbars.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_tools.bas b/testautomation/graphics/optional/g_tools.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/g_zoom.bas b/testautomation/graphics/optional/g_zoom.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/gallery.bas b/testautomation/graphics/optional/gallery.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/gallery2.bas b/testautomation/graphics/optional/gallery2.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/i_animation.bas b/testautomation/graphics/optional/i_animation.bas old mode 100755 new mode 100644 index 64b0921b8db2..6b2c4851a28a --- a/testautomation/graphics/optional/i_animation.bas +++ b/testautomation/graphics/optional/i_animation.bas @@ -36,6 +36,7 @@ sub main Call hStatusIn ( "Graphics","i_animation.bas") use "graphics\tools\id_tools.inc" + use "graphics\tools\id_tools_2.inc" use "graphics\optional\includes\impress\i_animation.inc" Call tExtrasAnimation diff --git a/testautomation/graphics/optional/i_headerfooter.bas b/testautomation/graphics/optional/i_headerfooter.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/i_only_updt_1.bas b/testautomation/graphics/optional/i_only_updt_1.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/i_only_updt_2.bas b/testautomation/graphics/optional/i_only_updt_2.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/i_pengine.bas b/testautomation/graphics/optional/i_pengine.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/i_saveloadlayout.bas b/testautomation/graphics/optional/i_saveloadlayout.bas old mode 100755 new mode 100644 index 2ce62f89c4d7..08fc52a44270 --- a/testautomation/graphics/optional/i_saveloadlayout.bas +++ b/testautomation/graphics/optional/i_saveloadlayout.bas @@ -41,11 +41,7 @@ sub main PrintLog "-------------------------" + gApplication + "-------------------" Call tSaveLoadLayoutEmpty Call tSaveLoadLayoutText - Call tSaveLoadLayoutPicture - Call tSaveLoadLayoutOutline - Call tSaveLoadLayoutChart - Call tSaveLoadLayoutSpreadsheet - Call tSaveLoadLayoutOLE + Call tSaveLoadLayoutContent Call hStatusOut end sub diff --git a/testautomation/graphics/optional/i_shape.bas b/testautomation/graphics/optional/i_shape.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/i_slidecopy.bas b/testautomation/graphics/optional/i_slidecopy.bas old mode 100755 new mode 100644 index 04c91a4bb10c..cc1ac3f9d7bd --- a/testautomation/graphics/optional/i_slidecopy.bas +++ b/testautomation/graphics/optional/i_slidecopy.bas @@ -38,6 +38,7 @@ sub main Call hStatusIn ( "Graphics","i_slidecopy.bas") use "graphics\tools\id_tools.inc" + use "graphics\tools\id_tools_2.inc" use "graphics\optional\includes\impress\i_slidecopy.inc" PrintLog "-------------------------" + gApplication + "-------------------" diff --git a/testautomation/graphics/optional/i_slideshow.bas b/testautomation/graphics/optional/i_slideshow.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/i_us_presentation.bas b/testautomation/graphics/optional/i_us_presentation.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/i_view.bas b/testautomation/graphics/optional/i_view.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/includes/global/export_graphic_2.inc b/testautomation/graphics/optional/includes/global/export_graphic_2.inc old mode 100755 new mode 100644 diff --git a/testautomation/graphics/optional/includes/global/g_accessability.inc b/testautomation/graphics/optional/includes/global/g_accessability.inc index a1385530f124..8d59b0c6b387 100644 --- a/testautomation/graphics/optional/includes/global/g_accessability.inc +++ b/testautomation/graphics/optional/includes/global/g_accessability.inc @@ -37,6 +37,7 @@ testcase tEis1549 call hNewDocument + call sSelectEmptyLayout call hTextrahmenErstellen ("Sun",20,20,70,20) hTypeKeys ("") @@ -116,10 +117,16 @@ testcase tEis1549 endcatch call hCloseDocument -endcase +endcase 'tEis1549 testcase tEis1523 call hNewDocument + + printlog "Switching between Draw/Impress" + if (UCase(gApplication)) = "IMPRESS" then + call sSelectEmptyLayout + + endif call hTextrahmenErstellen ("A",20,20,30,30) hTypeKeys ("") call hTextrahmenErstellen ("B",10,10,15,15) @@ -209,7 +216,7 @@ testcase tEis1523 endif call hCloseDocument -endcase +endcase 'tEis1523 testcase tEis1581 dim i as integer @@ -237,8 +244,11 @@ testcase tEis1581 LayoutsPreview.TypeKeys "" sleep (1) hTypeKeys ("") - sleep (1) - hTypeKeys ("") + + DocumentImpress.UseMenu + hMenuSelectNr(4) + hMenuSelectNr(13) + hMenuSelectNr(1) sleep (2) kontext "GeneralFileDialog" if GeneralFileDialog.exists then @@ -255,7 +265,7 @@ testcase tEis1581 Pagelayout_UndoDeleteWarning.ok endif sleep (1) - for i = 1 to 17 + for i = 1 to 3 kontext "Tasks" LayoutsPreview.TypeKeys "" kontext "Pagelayout_UndoDeleteWarning" @@ -267,9 +277,12 @@ testcase tEis1581 kontext "Tasks" LayoutsPreview.TypeKeys "" sleep (1) - hTypeKeys ("") + hTypeKeys ("") sleep (1) - hTypeKeys ("") + DocumentImpress.UseMenu + hMenuSelectNr(4) + hMenuSelectNr(16) + hMenuSelectNr(1) try sleep 2 ' InsertTitle *OLEObjektEinfuegen/OLEObjektInsert SID_INSERT_OBJECT @@ -281,4 +294,4 @@ testcase tEis1581 endcatch endif call hCloseDocument -endcase +endcase 'tEis1581 diff --git a/testautomation/graphics/optional/includes/global/g_arrangealign.inc b/testautomation/graphics/optional/includes/global/g_arrangealign.inc index 4d79d3c2f829..f9fab5625905 100644 --- a/testautomation/graphics/optional/includes/global/g_arrangealign.inc +++ b/testautomation/graphics/optional/includes/global/g_arrangealign.inc @@ -46,7 +46,8 @@ testcase tiDatei_Fuer_Anordnen_Erstellen dim zaehler as integer '/// This function creates the document, that will be used as reference and working object inthe following cases :-) ///' '///'Dim Datei ' somewhere global :-) defined in calling sub! :sub im_107c_ /// - call hNewDocument '/// new document ///' + call hNewDocument + call sSelectEmptyLayout '/// new document ///' if Dir(Datei)<>"" then app.Kill(Datei) ' kill old file for Zaehler = 1 to 3 '/// create 3 overlapping objects ///' Kontext diff --git a/testautomation/graphics/optional/includes/global/g_clipboard.inc b/testautomation/graphics/optional/includes/global/g_clipboard.inc index 574db14419e8..9bc85a4bbad1 100644 --- a/testautomation/graphics/optional/includes/global/g_clipboard.inc +++ b/testautomation/graphics/optional/includes/global/g_clipboard.inc @@ -216,6 +216,7 @@ testcase tiEditClipboard '/// open application ///' Call hNewDocument + Call sSelectEmptyLayout sleep 1 SetClipboard "" '/// Create rectangle ///' diff --git a/testautomation/graphics/optional/includes/global/g_convertto.inc b/testautomation/graphics/optional/includes/global/g_convertto.inc index a8fc7e5aa37d..8acac43a45fc 100644 --- a/testautomation/graphics/optional/includes/global/g_convertto.inc +++ b/testautomation/graphics/optional/includes/global/g_convertto.inc @@ -58,6 +58,7 @@ testcase tiModifyConvertToPolygon Dim Minanzahl as string Call hNewDocument + Call sSelectEmptyLayout sleep 3 hTextrahmenErstellen ("This is a text that will be transformed into a Polygon-object", 10,10,60,30) sleep 1 @@ -207,6 +208,7 @@ testcase tiAendernUmwandelnInKurve Printlog " ----- ContextConvertIntoCurve testen" Call hNewDocument '/// New impress document///' + Call sSelectEmptyLayout Call hTextrahmenErstellen ("I test,test,test,test only, if it works for you",20,20,60,30) '/// create textbox///' sleep 2 @@ -236,6 +238,7 @@ testcase tiAendernUmwandelnInPolygonGrafik Printlog "- Context/ConvertIntoPolygon" Call hNewDocument '/// new document ///' + Call sSelectEmptyLayout InsertGraphicsFromFile '/// insert graphic (desp.bmp) ///' diff --git a/testautomation/graphics/optional/includes/global/g_crossfading.inc b/testautomation/graphics/optional/includes/global/g_crossfading.inc index e530a28f1339..275f1ee49839 100644 --- a/testautomation/graphics/optional/includes/global/g_crossfading.inc +++ b/testautomation/graphics/optional/includes/global/g_crossfading.inc @@ -43,7 +43,8 @@ testcase tCrossfading dim CounterForX as integer dim anothercounter as integer - Call hNewDocument '/// New Impress document ///' + Call hNewDocument + Call sSelectEmptyLayout '/// New Impress document ///' gMouseClick 50,50 sleep 1 Call hRechteckErstellen ( 5, 5, 20, 30 ) '/// Create rectangle ///' diff --git a/testautomation/graphics/optional/includes/global/g_customshapes.inc b/testautomation/graphics/optional/includes/global/g_customshapes.inc index 3cd31dac77b6..0a9ec4c9ccda 100644 --- a/testautomation/graphics/optional/includes/global/g_customshapes.inc +++ b/testautomation/graphics/optional/includes/global/g_customshapes.inc @@ -40,6 +40,7 @@ testcase tCustomshapes '/// Create new document ///' Call hNewDocument + Call sSelectEmptyLayout if gApplication = "DRAW" then Kontext "Documentdraw" else '(Impress) diff --git a/testautomation/graphics/optional/includes/global/g_demoguide.inc b/testautomation/graphics/optional/includes/global/g_demoguide.inc index 56dd1f89e294..1d71bd3877d9 100644 --- a/testautomation/graphics/optional/includes/global/g_demoguide.inc +++ b/testautomation/graphics/optional/includes/global/g_demoguide.inc @@ -44,6 +44,7 @@ testcase t_Introduction '///Open new presentation printlog "Open new presentation" Call hNewDocument + Call sSelectEmptyLayout '///Open the Gallery printlog "Open the Gallery" diff --git a/testautomation/graphics/optional/includes/global/g_edit.inc b/testautomation/graphics/optional/includes/global/g_edit.inc index ef14cd1f477e..6313865b8912 100644 --- a/testautomation/graphics/optional/includes/global/g_edit.inc +++ b/testautomation/graphics/optional/includes/global/g_edit.inc @@ -100,39 +100,49 @@ endcase 'tEditDuplicate '--------------------------------------------------------- testcase tEditFields - Call hNewDocument - sleep 3 - InsertFieldsDateFix '/// Insert Date-Fix ///' - EditSelectAll '/// Select inserted field ///' - sleep 1 - hTypeKeys "" '/// Go into edit mode (F2) ///' - sleep 2 - EditSelectAll '/// Select the date///' - sleep 2 - EditfieldsDraw '/// Edit -fields///' - Kontext "FeldbefehlBearbeitenDraw" - sleep 2 - FeldtypFix.Check '/// check field type fix ///' - If FeldtypFix.Ischecked then - Printlog "OK FieldtypeFix checkable" - else - warnlog "FieldtypeFix not checkable" - end if - FeldtypVariabel.Check '/// check field type variabel///' - sleep 1 - If FeldtypVariabel.Ischecked then - Printlog "OK FieldtypeVariabel enabled" - else + Call hNewDocument + Call sSelectEmptyLayout + sleep 3 + printlog "insert date-fix" + InsertFieldsDateFix + printlog "select inserted field" + EditSelectAll + sleep 1 + printlog "go into edit mode" + hTypeKeys "" + sleep 2 + printlog "select date" + EditSelectAll + sleep 2 + printlog "edit fields" + EditfieldsDraw + Kontext "FeldbefehlBearbeitenDraw" + sleep 2 + printlog "check field type fix" + FeldtypFix.Check + If FeldtypFix.Ischecked then + Printlog "OK FieldtypeFix checkable" + else + warnlog "FieldtypeFix not checkable" + end if + printlog "check field type variable 1" + FeldtypVariabel.Check + sleep 1 + If FeldtypVariabel.Ischecked then + Printlog "OK FieldtypeVariabel enabled" + else warnlog "FieldtypeVariabel not enabled" - end if -' For Zaehler = 1 to FeldtypFormat.GetItemCount -' FeldTypFormat.Select Zaehler -' printlog "OK Format ", Zaehler, " = ", FeldtypFormat.GetSelText -' Next Zaehler - FeldbefehlBearbeitenDraw.OK '/// close edit fields dialog ///' - sleep 2 - Call hCloseDocument '/// close document ///' - sleep 2 + end if + ' For Zaehler = 1 to FeldtypFormat.GetItemCount + ' FeldTypFormat.Select Zaehler + ' printlog "OK Format ", Zaehler, " = ", FeldtypFormat.GetSelText + ' Next Zaehler + printlog "close edit fields dialog" + FeldbefehlBearbeitenDraw.OK + sleep 2 + printlog "Close Document" + Call hCloseDocument + sleep 2 endcase 'tEditFields '-------------------------------------------------------- diff --git a/testautomation/graphics/optional/includes/global/g_format.inc b/testautomation/graphics/optional/includes/global/g_format.inc index 0674a2f0cd56..2e2f1b0368ff 100644 --- a/testautomation/graphics/optional/includes/global/g_format.inc +++ b/testautomation/graphics/optional/includes/global/g_format.inc @@ -48,6 +48,7 @@ testcase tiFormatText '/// open application ///' Call hNewDocument + Call sSelectEmptyLayout '/// create a textbox with text ///' Call hTextrahmenErstellen ("This is a text, which, I hope, in Staroffice, will be automaticly formatted. Should that not be the case, then it doesn't matter.",20,20,70,20) WaitSlot (1000) @@ -699,7 +700,8 @@ testcase tiFormat3D_Effekte Dim Zaehler as integer Dim Posi as string - Call hNewDocument + Call hNewDocument + Call sSelectEmptyLayout printlog "new document" '-----------------------------------RECTANGLE------------------------------------------------------ Call hRechteckErstellen (20,20,60,70) '/// create rectangle ///' @@ -1187,6 +1189,7 @@ testcase tiFormatAufzaehlungszeichen PrintLog "- Format/Numbering and Bullets" Call hNewDocument + Call sSelectEmptyLayout WaitSlot (2000) Kontext "DocumentImpress" hTextrahmenErstellen ("Hello ",20,20,60,60) diff --git a/testautomation/graphics/optional/includes/global/g_group.inc b/testautomation/graphics/optional/includes/global/g_group.inc index b28029cfb534..3023e673a526 100644 --- a/testautomation/graphics/optional/includes/global/g_group.inc +++ b/testautomation/graphics/optional/includes/global/g_group.inc @@ -36,7 +36,8 @@ testcase tiGruppierung Dim PosX 'Variable fuer PositionX - Call hNewDocument '/// new document ///' + Call hNewDocument + Call sSelectEmptyLayout '/// new document ///' sleep 3 Kontext "DocumentImpress" sleep 2 diff --git a/testautomation/graphics/optional/includes/global/g_line.inc b/testautomation/graphics/optional/includes/global/g_line.inc index 3aad4234abd6..55869c258f43 100644 --- a/testautomation/graphics/optional/includes/global/g_line.inc +++ b/testautomation/graphics/optional/includes/global/g_line.inc @@ -331,6 +331,7 @@ testcase tLineConnect end if Call hNewDocument '/// New Impress / Draw document ///' + Call sSelectEmptyLayout sleep 3 kontext "GraphicObjectbar" if GraphicObjectbar.Exists then diff --git a/testautomation/graphics/optional/includes/global/g_mediaplayer.inc b/testautomation/graphics/optional/includes/global/g_mediaplayer.inc index 2382a00b6f0d..01fe8137ef64 100644 --- a/testautomation/graphics/optional/includes/global/g_mediaplayer.inc +++ b/testautomation/graphics/optional/includes/global/g_mediaplayer.inc @@ -232,7 +232,7 @@ testcase g_mediaplayer else kontext "DocumentDraw" endif - hTypeKeys ("") + hTypeKeys ("") hOpenContextMenu() hMenuSelectNr(1) diff --git a/testautomation/graphics/optional/includes/global/g_ole.inc b/testautomation/graphics/optional/includes/global/g_ole.inc index 520aa38af8a2..c360e443ee69 100644 --- a/testautomation/graphics/optional/includes/global/g_ole.inc +++ b/testautomation/graphics/optional/includes/global/g_ole.inc @@ -244,6 +244,7 @@ testcase tOLE_SaveLoad filename = ConvertPath (gOfficePath + "user\work\oletest." & ExtensionString) printlog "Create a new document." Call hNewDocument + Call sSelectEmptyLayout printlog "Insert->Object->OLE Object..." InsertObjectOLEObject Kontext "OLEObjektInsert" diff --git a/testautomation/graphics/optional/includes/global/g_savepictureas.inc b/testautomation/graphics/optional/includes/global/g_savepictureas.inc index 39d7af75e9e9..3888cf31d39e 100644 --- a/testautomation/graphics/optional/includes/global/g_savepictureas.inc +++ b/testautomation/graphics/optional/includes/global/g_savepictureas.inc @@ -70,6 +70,7 @@ testcase tContextSaveAsPicture endif Call hNewDocument + Call sSelectEmptyLayout setClipboard(" ") sleep 2 InsertGraphicsFromFile @@ -303,6 +304,7 @@ testcase tContextSaveAsPicture hTypeKeys "" call hCloseDocument call hNewDocument + Call sSelectEmptyLayout InsertGraphicsFromFile Kontext "GrafikEinfuegenDlg" if GrafikEinfuegenDlg.exists(5) then @@ -368,6 +370,7 @@ testcase tContextSavePictureLinkAsPicture endif Call hNewDocument + Call sSelectEmptyLayout setClipboard(" ") sleep 2 InsertGraphicsFromFile @@ -725,6 +728,7 @@ endif hTypeKeys "" call hCloseDocument call hNewDocument +Call sSelectEmptyLayout InsertGraphicsFromFile Kontext "GrafikEinfuegenDlg" if GrafikEinfuegenDlg.exists(5) then diff --git a/testautomation/graphics/optional/includes/global/g_shaddow.inc b/testautomation/graphics/optional/includes/global/g_shaddow.inc index 46ac99bb99f0..0a7708086371 100644 --- a/testautomation/graphics/optional/includes/global/g_shaddow.inc +++ b/testautomation/graphics/optional/includes/global/g_shaddow.inc @@ -63,6 +63,7 @@ testcase tiShaddow '/// Open application ///' Call hNewDocument + Call sSelectEmptyLayout sleep 1 '/// Import picture ///' diff --git a/testautomation/graphics/optional/includes/global/g_tables.inc b/testautomation/graphics/optional/includes/global/g_tables.inc index 2ffff217ba72..1414a857b598 100644 --- a/testautomation/graphics/optional/includes/global/g_tables.inc +++ b/testautomation/graphics/optional/includes/global/g_tables.inc @@ -231,7 +231,7 @@ testcase tiTableObjectBar printlog "Switching between Draw/Impress" if (UCase(gApplication)) = "IMPRESS" then Kontext "DocumentImpress" - DocumentImpress.TypeKeys "" + DocumentImpress.TypeKeys "",3 else Kontext "DocumentDraw" DocumentDraw.TypeKeys "" diff --git a/testautomation/graphics/optional/includes/impress/i_animation.inc b/testautomation/graphics/optional/includes/impress/i_animation.inc index af2a67956e03..471ef1fada85 100644 --- a/testautomation/graphics/optional/includes/impress/i_animation.inc +++ b/testautomation/graphics/optional/includes/impress/i_animation.inc @@ -39,7 +39,8 @@ testcase tExtrasAnimation Printlog "- Tools/Animation" Dim i - Call hNewDocument '/// New impress document ///' + Call hNewDocument + Call sSelectEmptyLayout '/// New impress document ///' sleep 2 InsertGraphicsFromFile '/// insert graphic file (sample.bmp) ///' sleep 1 diff --git a/testautomation/graphics/optional/includes/impress/i_pengine2.inc b/testautomation/graphics/optional/includes/impress/i_pengine2.inc index 6d825baedac5..f10b77f30db3 100644 --- a/testautomation/graphics/optional/includes/impress/i_pengine2.inc +++ b/testautomation/graphics/optional/includes/impress/i_pengine2.inc @@ -380,6 +380,7 @@ testcase tiPengine2ObjectsGetsEffects printlog "Create a new presentation." Call hNewDocument + Call sSelectEmptyLayout sleep (1) kontext "Toolbar" diff --git a/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc b/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc index f8a2b165b104..e5dbf1f53cc2 100644 --- a/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc +++ b/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc @@ -30,374 +30,146 @@ '* short description: Save & Load testing of Layout -templates. '* '************************************************************************************** -' #1 tSaveLoadLayoutEmpty -' #1 tSaveLoadLayoutOLE -' #1 tSaveLoadLayoutText -' #1 tSaveLoadLayoutOutline -' #1 tSaveLoadLayoutPicture -' #1 tSaveLoadLayoutChart -' #1 tSaveLoadLayoutSpreadsheet -'\************************************************************************************* testcase tSaveLoadLayoutEmpty - goto endsub Dim NewFileDir as String NewFileDir = ConvertPath (gOfficePath + "user\work\LayoutTest\") - '/// Create New folder in the Work-directory ///' + printlog "Create New folder in the Work-directory" printlog " Will try to create the directory: " + NewFileDir app.mkdir NewFileDir - '/// Create a new document, add an empty Layout, Save the document in all available Formats, and open the saved files. ///' + printlog "Create a new document, add an empty Layout, Save the document in all available Formats, and open the saved files." - '/// Make new Presentation ///' + printlog "Make new Presentation" gApplication = "IMPRESS" Call hNewDocument - '/// Choose and Insert an empty Layout. ///' + printlog "Choose and Insert an empty Layout." printlog " Choose and Insert an empty Layout." FormatModifyPage sleep (1) kontext "Tasks" - LayoutsPreview.TypeKeys "" - kontext "Pagelayout_UndoDeleteWarning" - if Pagelayout_UndoDeleteWarning.exists then + LayoutsPreview.TypeKeys "" + kontext "Pagelayout_UndoDeleteWarning" + if Pagelayout_UndoDeleteWarning.exists then Pagelayout_UndoDeleteWarning.ok end if kontext "Tasks" - '/// Press "Enter" to use the layout on the current slide ///' + printlog "Press Enter to use the layout on the current slide" LayoutsPreview.TypeKeys "" sleep (5) - '/// Save the document in different formats... ///' - '/// Close the file. ///' - '/// Load the different files. ///' + printlog "Save the document in different formats..." + printlog "Close the file." + printlog "Load the different files." call fSaveLoadAllFormats (NewFileDir) 'Runs the Function below. - '/// Delete the different files. ///' + printlog "Delete the different files." printlog " Will try to delete the directory: " + NewFileDir app.rmDir NewFileDir printlog "tSaveLoadLayoutEmpty ended." - '/// End the test ///' + printlog "End the test" endcase 'tSaveLoadLayoutEmpty '**************************************************************************************************** -testcase tSaveLoadLayoutOLE +testcase tSaveLoadLayoutText + printlog "Testing layout with text." Dim NewFileDir as String NewFileDir = ConvertPath (gOfficePath + "user\work\LayoutTest\") - '/// Create New folder in the Work-directory ///' - printlog " Will try to create the directory: " + NewFileDir + printlog "Create New folder in the Work-directory" + printlog " Will try to create the directory: " + NewFileDir app.mkdir NewFileDir - '/// Create a new document, add a Layout with an OLE-field, Save the document in all available Formats, and open the saved files. ///' + printlog "Create a new document, add a Layout with a Textfield, Save the document in all available Formats, and open the saved files." - '/// Make new Presentation ///' + printlog "Make new Presentation" gApplication = "IMPRESS" Call hNewDocument - '/// Choose and Insert an Layout with an OLE. ///' - printlog " Choose and Insert an Layout with an OLE." + printlog "Choose and Insert an Layout with a Text-field." FormatModifyPage sleep (1) kontext "Tasks" - LayoutsPreview.TypeKeys "" + LayoutsPreview.TypeKeys "" kontext "Pagelayout_UndoDeleteWarning" if Pagelayout_UndoDeleteWarning.exists then Pagelayout_UndoDeleteWarning.ok end if kontext "Tasks" - '/// select the OLE placeholder and activate it with [Return] ///' - LayoutsPreview.TypeKeys ("",13) - sleep (1) - LayoutsPreview.TypeKeys ("") - sleep (1) - kontext "DocumentImpress" - DocumentImpress.TypeKeys ("") - DocumentImpress.TypeKeys ("") - try - sleep (2) - kontext "OLEObjektInsert" - sleep (1) - OLEObjektInsert.Cancel - Printlog " Correctly inserted a layout with an 'Insert OLE-Object'-frame." - catch - warnlog "Ole wasn't selected :-(" - CALL hCloseDocument - Goto Endsub - endcatch - sleep (5) - - '/// Save the document in all available formats... ///' - '/// Close the file. ///' - '/// Load the different files. ///' - call fSaveLoadAllFormats (NewFileDir) 'Runs the Function below. - - '/// Delete the different files. ///' - printlog " Will try to delete the directory: " + NewFileDir - app.rmDir NewFileDir - - printlog "tSaveLoadLayoutOLE ended." - '/// End the test ///' -endcase 'tSaveLoadLayoutOLE - -'**************************************************************************************************** - -testcase tSaveLoadLayoutText - Dim NewFileDir as String - NewFileDir = ConvertPath (gOfficePath + "user\work\LayoutTest\") - - '/// Create New folder in the Work-directory ///' - printlog " Will try to create the directory: " + NewFileDir - app.mkdir NewFileDir - - '/// Create a new document, add a Layout with a Textfield, Save the document in all available Formats, and open the saved files. ///' - - '/// Make new Presentation ///' - gApplication = "IMPRESS" - Call hNewDocument - - '/// Choose and Insert an Layout with a Text-field. ///' - printlog " Choose and Insert an Layout with a Text-field." - FormatModifyPage + printlog "select the Text placeholder and activate it with [Return]" + LayoutsPreview.TypeKeys ("",5) sleep (1) - kontext "Tasks" - LayoutsPreview.TypeKeys "" - kontext "Pagelayout_UndoDeleteWarning" - if Pagelayout_UndoDeleteWarning.exists then - Pagelayout_UndoDeleteWarning.ok - end if - kontext "Tasks" - '/// select the Text placeholder and activate it with [Return] ///' - LayoutsPreview.TypeKeys ("") - sleep (1) - LayoutsPreview.TypeKeys ("") - sleep (1) - kontext "DocumentImpress" - DocumentImpress.TypeKeys ("") - DocumentImpress.TypeKeys ("") - DocumentImpress.TypeKeys ("") -' LayoutsPreview.TypeKeys "" + LayoutsPreview.TypeKeys ("") + sleep (1) + kontext "DocumentImpress" + DocumentImpress.TypeKeys ("") + DocumentImpress.TypeKeys ("") + DocumentImpress.TypeKeys ("") sleep (5) - '/// Save the document in all available formats... ///' - '/// Close the file. ///' - '/// Load the different files. ///' + printlog "Save the document in all available formats..." + printlog "Close the file." + printlog "Load the different files." call fSaveLoadAllFormats (NewFileDir) 'Runs the Function below. - '/// Delete the different files. ///' - printlog " Will try to delete the directory: " + NewFileDir + printlog "Delete the different files." + printlog "Will try to delete the directory: " + NewFileDir app.rmDir NewFileDir printlog "tSaveLoadLayoutText ended." - '/// End the test ///' endcase 'tSaveLoadLayoutText '**************************************************************************************************** -testcase tSaveLoadLayoutOutline +testcase tSaveLoadLayoutContent Dim NewFileDir as String NewFileDir = ConvertPath (gOfficePath + "user\work\LayoutTest\") - '/// Create New folder in the Work-directory ///' + printlog "Create New folder in the Work-directory" printlog " Will try to create the directory: " + NewFileDir app.mkdir NewFileDir - '/// Create a new document, add a Layout with an Outline-field, Save the document in all available Formats, and open the saved files. ///' + printlog "Create a new document, add a Layout with a Content-field, Save the document in all available Formats, and open the saved files." - '/// Make new Presentation ///' + printlog "Make new Presentation" gApplication = "IMPRESS" Call hNewDocument - '/// Choose and Insert an Layout with a Outline-field. ///' - printlog " Choose and Insert an Layout with a Outline-field." + printlog "Choose and Insert an Layout with a Content-field." FormatModifyPage sleep (1) kontext "Tasks" - LayoutsPreview.TypeKeys "" - kontext "Pagelayout_UndoDeleteWarning" - if Pagelayout_UndoDeleteWarning.exists then + LayoutsPreview.TypeKeys "" + kontext "Pagelayout_UndoDeleteWarning" + if Pagelayout_UndoDeleteWarning.exists then Pagelayout_UndoDeleteWarning.ok end if kontext "Tasks" - '/// select the Outline placeholder and activate it with [Return] ///' - LayoutsPreview.TypeKeys ("",3) - sleep (1) - LayoutsPreview.TypeKeys ("") - sleep (1) - kontext "DocumentImpress" - DocumentImpress.TypeKeys ("") - DocumentImpress.TypeKeys ("") - DocumentImpress.TypeKeys ("") - sleep (5) - - '/// Save the document in all available formats... ///' - '/// Close the file. ///' - '/// Load the different files. ///' - call fSaveLoadAllFormats (NewFileDir) 'Runs the Function below. - - '/// Delete the different files. ///' - printlog " Will try to delete the directory: " + NewFileDir - app.rmDir NewFileDir - - printlog "tSaveLoadLayoutOutline ended." - '/// End the test ///' -endcase 'tSaveLoadLayoutOutline - -'**************************************************************************************************** - -testcase tSaveLoadLayoutPicture - Dim NewFileDir as String - NewFileDir = ConvertPath (gOfficePath + "user\work\LayoutTest\") - - '/// Create New folder in the Work-directory ///' - printlog " Will try to create the directory: " + NewFileDir - app.mkdir NewFileDir - - '/// Create a new document, add a Layout with a Graphic-field, Save the document in all available Formats, and open the saved files. ///' - - '/// Make new Presentation ///' - gApplication = "IMPRESS" - Call hNewDocument - - '/// Choose and Insert an Layout with a Graphic-field. ///' - printlog " Choose and Insert an Layout with a Graphic-field." - FormatModifyPage + printlog "select the Picture placeholder and activate it with [Return]" + LayoutsPreview.TypeKeys ("",2) sleep (1) - kontext "Tasks" - LayoutsPreview.TypeKeys "" - kontext "Pagelayout_UndoDeleteWarning" - if Pagelayout_UndoDeleteWarning.exists then - Pagelayout_UndoDeleteWarning.ok - end if - kontext "Tasks" - '/// select the Picture placeholder and activate it with [Return] ///' - LayoutsPreview.TypeKeys ("",8) - sleep (1) - LayoutsPreview.TypeKeys ("") - sleep (1) - kontext "DocumentImpress" - DocumentImpress.TypeKeys ("") - DocumentImpress.TypeKeys ("") - DocumentImpress.TypeKeys ("") - sleep (5) + LayoutsPreview.TypeKeys ("") + sleep (1) + kontext "DocumentImpress" + DocumentImpress.TypeKeys ("") + DocumentImpress.TypeKeys ("") + DocumentImpress.TypeKeys ("") + sleep (5) - '/// Save the document in all available formats. ///' - '/// Close the file. ///' - '/// Load the different files. ///' + printlog "Save the document in all available formats." + printlog "Close the file." + printlog "Load the different files." call fSaveLoadAllFormats (NewFileDir) 'Runs the Function below. - '/// Delete the different files. ///' + printlog "Delete the different files." printlog " Will try to delete the directory: " + NewFileDir app.rmDir NewFileDir 'ConvertPath (gOfficePath + "user\work\LayoutTest\") printlog "tSaveLoadLayoutPicture ended." - '/// End the test ///' endcase 'tSaveLoadLayoutPicture '**************************************************************************************************** - -testcase tSaveLoadLayoutChart - Dim NewFileDir as String - NewFileDir = ConvertPath (gOfficePath + "user\work\LayoutTest\") - - '/// Create New folder in the Work-directory ///' - printlog " Will try to create the directory: " + NewFileDir - app.mkdir NewFileDir - - '/// Create a new document, add a Layout for a Chart, Save the document in all available formats, and open the saved files. ///' - - '/// Make new Presentation ///' - gApplication = "IMPRESS" - Call hNewDocument - - '/// Choose and Insert an Layout with a Chart-field. ///' - printlog " Choose and Insert an Layout with a Chart-field." - FormatModifyPage - sleep (1) - kontext "Tasks" - LayoutsPreview.TypeKeys "" - kontext "Pagelayout_UndoDeleteWarning" - if Pagelayout_UndoDeleteWarning.exists then - Pagelayout_UndoDeleteWarning.ok - end if - kontext "Tasks" - '/// select the Chart placeholder and activate it with [Return] ///' - LayoutsPreview.TypeKeys ("",6) - sleep (1) - LayoutsPreview.TypeKeys ("") - sleep (1) - kontext "DocumentImpress" - DocumentImpress.TypeKeys ("") - DocumentImpress.TypeKeys ("") - DocumentImpress.TypeKeys ("") - sleep (5) - - '/// Save the document in all available formats. ///' - '/// Close the file. ///' - '/// Load the different files. ///' - call fSaveLoadAllFormats (NewFileDir) 'Runs the Function below. - - '/// Delete the different files. ///' - printlog " Will try to delete the directory: " + NewFileDir - app.rmDir NewFileDir - - printlog "tSaveLoadLayoutChart ended." - '/// End the test ///' -endcase 'tSaveLoadLayoutChart - -'**************************************************************************************************** - -testcase tSaveLoadLayoutSpreadsheet - Dim NewFileDir as String - NewFileDir = ConvertPath (gOfficePath + "user\work\LayoutTest\") - - '/// Create New folder in the Work-directory ///' - printlog " Will try to create the directory: " + NewFileDir - app.mkdir NewFileDir - - '/// Create a new document, add a Layout containing a Spreadsheet, Save the document in all available Formats, and open the saved files. ///' - - '/// Make new Presentation ///' - gApplication = "IMPRESS" - Call hNewDocument - - '/// Choose and Insert an Layout with a Spreadsheet-field. ///' - printlog " Choose and Insert an Layout with a Spreadsheet-field." - FormatModifyPage - sleep 1 - kontext "Tasks" - LayoutsPreview.TypeKeys "" - kontext "Pagelayout_UndoDeleteWarning" - if Pagelayout_UndoDeleteWarning.exists then - Pagelayout_UndoDeleteWarning.ok - end if - kontext "Tasks" - '/// select the Spreadsheet placeholder and activate it with [Return] ///' - LayoutsPreview.TypeKeys ("",7) - sleep (1) - LayoutsPreview.TypeKeys ("") - sleep (1) - kontext "DocumentImpress" - DocumentImpress.TypeKeys ("") - DocumentImpress.TypeKeys ("") - DocumentImpress.TypeKeys ("") - sleep (5) - - '/// Save the document in all available formats. ///' - '/// Close the file. ///' - '/// Load the different files. ///' - call fSaveLoadAllFormats (NewFileDir) 'Runs the Function below. - - '/// Delete the different files. ///' - printlog " Will try to delete the directory: " + NewFileDir - app.rmDir NewFileDir 'ConvertPath (gOfficePath + "user\work\LayoutTest\") - - printlog "tSaveLoadLayoutSpreadsheet ended." - '/// End the test ///' -endcase 'tSaveLoadLayoutSpreadsheet - -'------------------------------------------------------------------------------- - diff --git a/testautomation/graphics/optional/includes/impress/i_slidecopy.inc b/testautomation/graphics/optional/includes/impress/i_slidecopy.inc index d7ee257d1bb2..73971c2e889f 100644 --- a/testautomation/graphics/optional/includes/impress/i_slidecopy.inc +++ b/testautomation/graphics/optional/includes/impress/i_slidecopy.inc @@ -43,7 +43,8 @@ testcase tiSlideCopyNewPresentation Dim value13 as string printlog "This test copies one slide from one presentation to another." printlog "Make new presentation" - Call hNewDocument + Call hNewDocument + Call sSelectEmptyLayout printlog "Insert three objects: Connector, Door-plate, and Smiley." printlog "First we Insert a Connector." @@ -264,11 +265,10 @@ testcase tiSlideCopyDuplicate Dim value12 as string Dim value13 as string dim i as integer - '/// Make a duplicate of a slide. In the same presentation ///' - '/// Make new presentation ///' + printlog "Make new presentation" Call hNewDocument - '/// Insert three objects: Connector, Door-plate, and Smiley ///' - '1 Insert Connector. + Call sSelectEmptyLayout + printlog "Insert Connector." kontext "Toolbar" sleep 1 try @@ -289,11 +289,11 @@ testcase tiSlideCopyDuplicate hTypeKeys "", 1 sleep (1) - 'rename object + printlog "rename object" DocumentImpress.TypeKeys "" sleep 1 - 'Choose rename. + printlog "Choose rename" if hMenuFindSelect(27027, true, 14) = false then Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends." Call hCloseDocument @@ -307,11 +307,11 @@ testcase tiSlideCopyDuplicate kontext "DocumentImpress" hMouseClick DocumentImpress, 90, 90 - '2 Insert Door-plate. + printlog "2 Insert Door-plate" kontext "Toolbar" sleep 1 try - StarShapes.TearOff ' insert connector + StarShapes.TearOff catch warnlog "bug for GH from FHA; .tearoff doesnt tell success" endcatch @@ -328,11 +328,11 @@ testcase tiSlideCopyDuplicate hTypeKeys "", 2 sleep (1) - 'Rename object + printlog "Rename object" kontext "DocumentImpress" DocumentImpress.TypeKeys "" sleep (1) - 'Choose rename. + printlog "Choose rename." if hMenuFindSelect(27027, true, 15) = false then Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends." Call hCloseDocument @@ -346,11 +346,11 @@ testcase tiSlideCopyDuplicate kontext "DocumentImpress" hMouseClick DocumentImpress, 90, 90 - '3 Insert Smiley. + printlog "Insert Smiley." kontext "Toolbar" sleep 1 try - SymbolShapes.TearOff ' insert connector + SymbolShapes.TearOff catch warnlog "bug for GH from FHA; .tearoff doesnt tell success" endcatch @@ -366,10 +366,10 @@ testcase tiSlideCopyDuplicate hTypeKeys "", 3 sleep (1) - 'rename object + printlog "rename object" DocumentImpress.TypeKeys "" sleep (1) - 'Choose rename. + printlog "Choose rename" if hMenuFindSelect(27027, true, 15) = false then Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends." Call hCloseDocument @@ -383,7 +383,7 @@ testcase tiSlideCopyDuplicate kontext "DocumentImpress" hMouseClick DocumentImpress, 90, 90 - '/// Close the bars we opened before. ///' + printlog "Close the bars we opened before." kontext "Connectorsbar" if Connectorsbar.Exists then Connectorsbar.Close kontext "SymbolShapes" @@ -391,22 +391,22 @@ testcase tiSlideCopyDuplicate kontext "StarShapes" if StarShapes.Exists then StarShapes.Close - '/// Copy the slide to the clipboard ///' + printlog "Copy the slide to the clipboard" kontext "Slides" SlidesControl.TypeKeys "" sleep (1) SlidesControl.TypeKeys "" sleep (1) - 'Choose `Copy` + printlog "Choose `Copy`" if hMenuFindSelect(5711, true, 10) = false then Warnlog "Context-Menu-entry `Copy` was not found.Therefore the test ends." Call hCloseDocument Goto Endsub endif - '/// Paste the content from the Clipboard ///' + printlog "Paste the content from the Clipboard" kontext "Slides" - 'open context-menu choose 'paste' + printlog "open context-menu choose 'paste'" EditPaste @@ -416,31 +416,31 @@ testcase tiSlideCopyDuplicate InsertPaste.OK endif sleep (2) - '/// Check if we have two slides, and that the objects exists, and has the right values ///' + printlog "Check if we have two slides, and that the objects exists, and has the right values " kontext "Slides" SlidesControl.TypeKeys "" - for i = 1 to 2 ' we have two slides, so we do this two times to check everything. + for i = 1 to 2 Printlog "Checking objects the " + i + " + time." kontext "DocumentImpress" hMouseClick DocumentImpress, 90, 90 - DocumentImpress.TypeKeys "" 'Select the first object. + DocumentImpress.TypeKeys "" sleep (1) - 'Bring up the kontext-menu for the object + DocumentImpress.TypeKeys "" sleep 1 - 'Choose rename. + printlog "Choose rename" if hMenuFindSelect(27027, true, 14) = false then Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends." Call hCloseDocument Goto Endsub endif - 'Read out what the name is, and check if its correct. - kontext "NameDlgObject" '"LinieName" "NameDlgPage" + printlog "Read out what the name is, and check if its correct." + kontext "NameDlgObject" value1 = NameField.GetText - NameDlgObject.OK 'TypeKeys "" + NameDlgObject.OK if value1 = "First" then printlog "First object was found correctly" @@ -453,14 +453,14 @@ testcase tiSlideCopyDuplicate sleep (1) DocumentImpress.TypeKeys "" - 'Choose rename. + printlog "Choose rename" if hMenuFindSelect(27027, true, 15) = false then Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends." Call hCloseDocument Goto Endsub endif - 'Read out what the name is, and check if its correct. + printlog "Read out what the name is, and check if its correct." kontext "NameDlgObject" value12 = NameField.GetText NameDlgObject.OK @@ -472,20 +472,21 @@ testcase tiSlideCopyDuplicate endif hTypeKeys "" - hTypeKeys "", 3 'Select the third object. + printlog "Select the third object." + hTypeKeys "", 3 sleep (1) - 'Bring up the kontext-menu for the object + printlog "Bring up the kontext-menu for the object" DocumentImpress.TypeKeys "" sleep 1 - 'Choose rename. + printlog "Choose rename" if hMenuFindSelect(27027, true, 15) = false then Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends." Call hCloseDocument Goto Endsub endif - 'Read out what the name is, and check if its correct. + printlog "Read out what the name is, and check if its correct." kontext "NameDlgObject" value13 = NameField.GetText NameDlgObject.OK @@ -499,7 +500,7 @@ testcase tiSlideCopyDuplicate SlidesControl.TypeKeys "" next i - '/// Close Presentation. End testcase ///' + printlog " Close Presentation. End testcase " Call hCloseDocument endcase 'tiSlidecopyDuplicate diff --git a/testautomation/graphics/optional/includes/impress/i_slidelayer.inc b/testautomation/graphics/optional/includes/impress/i_slidelayer.inc index d7ee085de381..597762e8cf7e 100644 --- a/testautomation/graphics/optional/includes/impress/i_slidelayer.inc +++ b/testautomation/graphics/optional/includes/impress/i_slidelayer.inc @@ -49,6 +49,7 @@ testcase tiInsertExpandSlide '/// open application ///' Call hNewDocument + Call sSelectEmptyLayout '/// create presupposition /// '///+ View->Master View->Outline View ///' ViewWorkspaceOutlineView diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow2.inc b/testautomation/graphics/optional/includes/impress/i_slideshow2.inc index 0bc7e9a80654..1b88116f1b5a 100644 --- a/testautomation/graphics/optional/includes/impress/i_slideshow2.inc +++ b/testautomation/graphics/optional/includes/impress/i_slideshow2.inc @@ -44,7 +44,8 @@ testcase tPraesentationAnimation Dim i Printlog "- Slideshow/Animation" - Call hNewDocument '/// new document ///' + Call hNewDocument + Call sSelectEmptyLayout '/// new document ///' sleep 2 InsertGraphicsFromFile '/// insert graphic ///' Kontext "OeffnenDlg" @@ -411,6 +412,7 @@ testcase tSlideShowInteraction '/// open application ///' Call hNewDocument + Call sSelectEmptyLayout sleep 5 setStartCurrentPage(TRUE) '/// Set "start with current page to ON ///' @@ -839,6 +841,8 @@ endcase testcase tAendernObjektBenennen Printlog "- Context/Name object" Call hNewDocument + Call sSelectEmptyLayout '/// new document ///' + sleep 1 Kontext "DocumentImpress" if NOT DocumentImpress.Exists then diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow3.inc b/testautomation/graphics/optional/includes/impress/i_slideshow3.inc index 0f23f412bddf..0cf806cd74cd 100644 --- a/testautomation/graphics/optional/includes/impress/i_slideshow3.inc +++ b/testautomation/graphics/optional/includes/impress/i_slideshow3.inc @@ -43,6 +43,7 @@ testcase tExtrasInteraktion Printlog " - SlideShow/Interaction" Call hNewDocument + Call sSelectEmptyLayout sleep 1 Call hTextrahmenErstellen ("Seite 1",10,10,40,40) '/// create textbox ///' SlideShowPresentationSettings '/// Set slide show settings ///' @@ -77,6 +78,7 @@ testcase tExtrasInteraktion endcatch hCloseDocument Call hNewDocument + Call sSelectEmptyLayout Call hRechteckErstellen (50,50,80,80) '/// create rectangle ///' SlideShowInteraction Kontext "Interaktion" diff --git a/testautomation/graphics/optional/includes/impress/i_us2_present.inc b/testautomation/graphics/optional/includes/impress/i_us2_present.inc index a1c7ab18acb6..6c8fede6a530 100644 --- a/testautomation/graphics/optional/includes/impress/i_us2_present.inc +++ b/testautomation/graphics/optional/includes/impress/i_us2_present.inc @@ -168,6 +168,7 @@ testcase i_us2_pres1 SlidesControl.TypeKeys "" SlidesControl.TypeKeys "", 10 SlidesControl.TypeKeys "" +call sSelectEmptyLayout printlog "Insert Smiley, + two circles around the eyes, + two new pupils," printlog "placed at some interesteing place inside the circles." Kontext "Toolbar" @@ -228,8 +229,6 @@ testcase i_us2_pres1 InsertSlide printlog " Inserted new slide." kontext "DocumentImpress" - EditSelectAll - DocumentImpress.TypeKeys "" printlog "Bla bla about everything..." call hTextrahmenErstellen ("Bla bla about everything...",20,20,70,30) @@ -237,8 +236,6 @@ testcase i_us2_pres1 InsertSlide printlog " Inserted new slide." kontext "DocumentImpress" - EditSelectAll - DocumentImpress.TypeKeys "" printlog "Write text: Q & A" call hTextrahmenErstellen ("Q & A",20,20,70,30) DocumentImpress.TypeKeys "" @@ -247,8 +244,7 @@ testcase i_us2_pres1 printlog "Add a new slide." InsertSlide kontext "DocumentImpress" - EditSelectAll - DocumentImpress.TypeKeys "" + printlog "Thanks for listening, time for coffee... (ending)" call hTextrahmenErstellen ("Class dismissed...",20,20,70,30) diff --git a/testautomation/graphics/optional/includes/impress/i_us_present.inc b/testautomation/graphics/optional/includes/impress/i_us_present.inc index 9272fda4c2a7..cd6dcc265ff0 100644 --- a/testautomation/graphics/optional/includes/impress/i_us_present.inc +++ b/testautomation/graphics/optional/includes/impress/i_us_present.inc @@ -40,120 +40,118 @@ '\******************************************************************** testcase i_us_presentation1 - dim iPictures as integer - dim PresentationFile1 as string - PresentationFile1 = ConvertPath ((ConvertPath (gOfficePath + "user\work\PowerPes1.odp"))) - Call hNewDocument '/// New impress document ///' - WaitSlot (2000) - kontext "DocumentImpress" - '/// 1. ViewMaster: 2nd master - Background: picture (Gallery) ///' - '/// - 50% Transparency ///' - '/// - Mosaic 16px x 16px ///' - '/// - Close Master ///' - - '/// Add second Master-Page ///' - ViewMasterPage - kontext "Slides" - SlidesControl.OpenContextMenu(true) - sleep (2) - MenuSelect(MenuGetItemID(1)) 'New Master - sleep (1) - printlog " Inserted second Master-Slide" - - '/// - Background: picture (Gallery) ///' - Kontext "Gallery" - if Gallery.Exists(2) then - warnlog " The Gallery was already visible. Check earlier ran tests for inconsistency." - sleep (2) - else - ToolsGallery - WaitSlot (2000) - end if + dim iPictures as integer + dim PresentationFile1 as string + PresentationFile1 = ConvertPath ((ConvertPath (gOfficePath + "user\work\PowerPes1.odp"))) + printlog "New impress document" + Call hNewDocument + Call sSelectEmptyLayout + WaitSlot (2000) + kontext "DocumentImpress" + printlog "Add second Master-Page " + ViewMasterPage + kontext "Slides" + SlidesControl.OpenContextMenu(true) + sleep (2) + printlog "New master" + MenuSelect(MenuGetItemID(1)) + sleep (1) + printlog "Inserted second Master-Slide" - if gOOO = TRUE then 'OpenOffice.org - select case iSprache - case 01 : iPictures = 1 'English - case else : iPictures = 1 'Unknown - warnlog "Please insert the entrienumbers for 'Backgrounds'. Language: " + iSprache - end select - - else ' StarOffice... - select case iSprache - case 01 : iPictures = 21 'English - case 07 : iPictures = 28 'Russian - case 31 : iPictures = 04 'Netherlands - case 33 : iPictures = 22 'French - case 34 : iPictures = 12 'Spanish - case 36 : iPictures = 17 'Hungaria - case 39 : iPictures = 23 'Italian - case 46 : iPictures = 09 'Swedish - case 48 : iPictures = 20 'Polish - case 49 : iPictures = 11 'German - case 55 : iPictures = 16 'Portuguese - case 81 : iPictures = 22 'Japanese - case 82 : iPictures = 04 'Korean - case 86 : iPictures = 06 'Simplified - case 88 : iPictures = 17 'Traditional - case else : iPictures = 21 'Unknown + printlog "set background to picture(Gallery)" + Kontext "Gallery" + if Gallery.Exists(2) then + warnlog " The Gallery was already visible. Check earlier ran tests for inconsistency." + sleep (2) + else + ToolsGallery + WaitSlot (2000) + end if + + if gOOO = TRUE then 'OpenOffice.org + select case iSprache + case 01 : iPictures = 1 'English + case else : iPictures = 1 'Unknown warnlog "Please insert the entrienumbers for 'Backgrounds'. Language: " + iSprache - end select + end select + + else ' StarOffice... + select case iSprache + case 01 : iPictures = 21 'English + case 07 : iPictures = 28 'Russian + case 31 : iPictures = 04 'Netherlands + case 33 : iPictures = 22 'French + case 34 : iPictures = 12 'Spanish + case 36 : iPictures = 17 'Hungaria + case 39 : iPictures = 23 'Italian + case 46 : iPictures = 09 'Swedish + case 48 : iPictures = 20 'Polish + case 49 : iPictures = 11 'German + case 55 : iPictures = 16 'Portuguese + case 81 : iPictures = 22 'Japanese + case 82 : iPictures = 04 'Korean + case 86 : iPictures = 06 'Simplified + case 88 : iPictures = 17 'Traditional + case else : iPictures = 21 'Unknown + warnlog "Please insert the entrienumbers for 'Backgrounds'. Language: " + iSprache + end select end if - kontext "Gallery" - Gallerys.Select (iPictures) - - View.TypeKeys "" - View.TypeKeys "" 'OpenContextMenu(true) - sleep (2) - MenuSelect(MenuGetItemID(1)) 'Insert - sleep (2) - MenuSelect(MenuGetItemID(1)) 'Copy - sleep (2) - '/// Check that we really got a copy of the object ///' - kontext "DocumentImpress" - DocumentImpress.OpenContextMenu(true) - sleep (2) - MenuSelect 27353 - sleep (2) - Kontext "ExportierenDlg" - if ExportierenDlg.IsVisible(5) then - printlog " Gallery-object correctly copied into Slide." - ExportierenDlg.Close - else - warnlog " Doesn't seem like we copied anything from the Gallery... ?" - end if - kontext "GraphicObjectbar" - if GraphicObjectbar.Exists(5) = FALSE then - kontext "DocumentImpress" - ViewToolbarsPicture - end if - - '/// - 50% Transparency ///' - WaitSlot (2000) - kontext "GraphicObjectbar" ' the one with Transparency - Transparenz.SetText "50" - sleep (1) - - '/// - Mosaic 16px x 16px ///' - Filter.TearOff - sleep (1) - kontext "GraphicFilterBar" - Mosaic.Click - WaitSlot (2000) - kontext "Mosaic" - Width.SetText "16" - Height.SetText "16" - Mosaic.OK - - kontext "GraphicFilterBar" - GraphicFilterBar.Close - - ToolsGallery - WaitSlot (1000) - kontext "DocumentImpress" - gMouseClick 50,50 + kontext "Gallery" + Gallerys.Select (iPictures) + View.TypeKeys "" + printlog "OpenContextMenu" + View.TypeKeys "" + sleep (2) + MenuSelect(MenuGetItemID(1)) + sleep (2) + MenuSelect(MenuGetItemID(1)) + sleep (2) + printlog "Check that we really got a copy of the object" + kontext "DocumentImpress" + DocumentImpress.OpenContextMenu(true) + sleep (2) + MenuSelect 27353 + sleep (2) + Kontext "ExportierenDlg" + if ExportierenDlg.IsVisible(5) then + printlog " Gallery-object correctly copied into Slide." + ExportierenDlg.Close + else + warnlog " Doesn't seem like we copied anything from the Gallery... ?" + end if + kontext "GraphicObjectbar" + if GraphicObjectbar.Exists(5) = FALSE then + kontext "DocumentImpress" + ViewToolbarsPicture + end if + + printlog " 50% Transparency" + WaitSlot (2000) + kontext "GraphicObjectbar" + Transparenz.SetText "50" + sleep (1) + + printlog "Mosaic 16px x 16px" + Filter.TearOff + sleep (1) + kontext "GraphicFilterBar" + Mosaic.Click + WaitSlot (2000) + kontext "Mosaic" + Width.SetText "16" + Height.SetText "16" + Mosaic.OK + + kontext "GraphicFilterBar" + GraphicFilterBar.Close + + ToolsGallery + WaitSlot (1000) + kontext "DocumentImpress" + hTypeKeys "" + sleep (1) -' DocumentImpress.TypeKeys "", 6 FormatPositionAndSize WaitSlot (1000) kontext @@ -164,23 +162,22 @@ testcase i_us_presentation1 SizePosition.TypeKeys "" TabPositionAndSize.OK - '/// - Close Master ///' + printlog "Close Master" ViewNormal WaitSlot (1000) - '/// Save Document ///' + printlog "Save Document" call hFileSaveAsKill (PresentationFile1) printlog "OK saved at ", PresentationFile1 WaitSlot (1000) ActiveDeactivateCTLSupport (FALSE) WaitSlot (2000) - '/// Close Document ///' + printlog "Close Document" Call hCloseDocument -endcase - -'00oo...//==---...---...---...---....---...---...---...---...---...---...--..--.--.-.-.-.-....---.... +endcase 'i_us_presentation1 +'------------------------------------------------------------------------------- testcase i_us_presentation2 dim PresentationFile1 as string dim PresentationFile2 as string diff --git a/testautomation/graphics/required/d_opt.bas b/testautomation/graphics/required/d_opt.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/d_updt.bas b/testautomation/graphics/required/d_updt.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/i_opt.bas b/testautomation/graphics/required/i_opt.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/i_updt_1.bas b/testautomation/graphics/required/i_updt_1.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/i_updt_2.bas b/testautomation/graphics/required/i_updt_2.bas old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/includes/global/id_002.inc b/testautomation/graphics/required/includes/global/id_002.inc index 55dec0008ac1..8c729871cbb3 100644 --- a/testautomation/graphics/required/includes/global/id_002.inc +++ b/testautomation/graphics/required/includes/global/id_002.inc @@ -232,7 +232,7 @@ testcase tiEditFields hTypeKeys "" printlog "With a Tab we catch always the Object" - hTypeKeys "" + hTypeKeys "",3 printlog "Here we enter Edit-Mode and therefore also the right place" hTypeKeys "" printlog "Here we enter Edit-Mode and therefore also the right place" @@ -406,7 +406,7 @@ testcase tiEditObjectProperties gMouseDoubleClick 1,1 printlog " select frame " - hTypekeys "" + hTypekeys "",3 printlog " Edit->Object->Properties " kontext @@ -448,7 +448,7 @@ testcase tiEditObjectEdit gMouseClick 20,1 printlog " select object " - hTypekeys "" + hTypekeys "",3 printlog " Edit->Object->Edit " EditObjectEdit @@ -464,7 +464,7 @@ testcase tiEditObjectEdit endcatch printlog " select object " - EditSelectAll + hTypekeys "",3 printlog " Edit->Object->Save Copy As " EditObjectSaveCopyAs @@ -531,6 +531,7 @@ testcase tiEditHyperlink printlog " open application" hNewDocument + Call sSelectEmptyLayout printlog " Insert->Hyperlink" InsertHyperlink WaitSlot (5000) @@ -555,7 +556,9 @@ testcase tiEditHyperlink Uebernehmen.Click Hyperlink.Close printlog " presupposition to enable edit->hyperlink: " - hTypeKeys "" + hTypeKeys "" + hTypeKeys "" + hTypeKeys "" EditSelectAll try printlog " Edit->Hyperlink " diff --git a/testautomation/graphics/required/includes/global/id_005.inc b/testautomation/graphics/required/includes/global/id_005.inc index 8b19fd601948..654f0eac829f 100644 --- a/testautomation/graphics/required/includes/global/id_005.inc +++ b/testautomation/graphics/required/includes/global/id_005.inc @@ -960,6 +960,7 @@ testcase tiFormatGroup printlog "open application" Call hNewDocument + Call sSelectEmptyLayout printlog "create 2 rectangles" hRechteckErstellen ( 10, 10, 20, 20 ) hRechteckErstellen ( 30, 30, 40, 40 ) diff --git a/testautomation/graphics/required/includes/global/id_007.inc b/testautomation/graphics/required/includes/global/id_007.inc index 3c4c3ca5b08b..242a87f1fce4 100644 --- a/testautomation/graphics/required/includes/global/id_007.inc +++ b/testautomation/graphics/required/includes/global/id_007.inc @@ -360,6 +360,7 @@ testcase tdContextDistribution Call hNewDocument WaitSlot (3000) '/// create 3 rectangles ///' + Call sSelectEmptyLayout Call hRechteckErstellen (20,20,30,30) Call hRechteckErstellen (40,40,50,50) Call hRechteckErstellen (60,60,70,70) @@ -430,7 +431,7 @@ testcase tdContextNameObject Call hRechteckErstellen ( 30, 40, 50, 60 ) sleep 1 '/// select both by spanning a selection with the mouse ///' - gMouseMove 1,1,95,95 + gMouseMove 1,1,70,70 sleep 1 '/// Modify->Group ///' '///+ Modify->Group ///' @@ -455,6 +456,7 @@ endcase testcase tdModifyConnectBreak '/// open application ///' Call hNewDocument + Call sSelectEmptyLayout sleep 1 '/// create two rectangles ///' Call hRechteckErstellen (10,10,30,30) @@ -483,6 +485,7 @@ endcase testcase tdModifyShapes '/// open application ///' Call hNewDocument + Call sSelectEmptyLayout sleep 1 '/// create two rectangles ///' gMouseClick 50,50 @@ -551,6 +554,7 @@ endcase testcase tdModifyCombineSplit '/// open application ///' Call hNewDocument + Call sSelectEmptyLayout sleep 1 '/// create two rectangles ///' Call hRechteckErstellen (30,30,50,50) diff --git a/testautomation/graphics/required/includes/global/id_011.inc b/testautomation/graphics/required/includes/global/id_011.inc index 0cc7f22708ab..98d574c0f78c 100644 --- a/testautomation/graphics/required/includes/global/id_011.inc +++ b/testautomation/graphics/required/includes/global/id_011.inc @@ -45,6 +45,7 @@ testcase tiTextToolbar '/// open application ///' Call hNewDocument + Call sSelectEmptyLayout '/// create a textframe with text ///' hTextrahmenErstellen ("This is a Text, which will be formatted in several ways", 20,20,40,80) diff --git a/testautomation/graphics/required/includes/global/id_opt_1.inc b/testautomation/graphics/required/includes/global/id_opt_1.inc index a19a8f27b089..0f0b4bdb9069 100644 --- a/testautomation/graphics/required/includes/global/id_opt_1.inc +++ b/testautomation/graphics/required/includes/global/id_opt_1.inc @@ -557,7 +557,7 @@ testcase tToolsOptionsDrawGrid (sApplication as string) ExitRestartTheOffice printlog "opening new doc to get the Options" Call hNewDocument - hTypeKeys "OpenNewDoc!" + printlog "checking states" ToolsOptions hToolsOptions (sApplication,"Grid") diff --git a/testautomation/graphics/required/includes/impress/im_003_.inc b/testautomation/graphics/required/includes/impress/im_003_.inc index 280dae56b1d1..da2f09187694 100644 --- a/testautomation/graphics/required/includes/impress/im_003_.inc +++ b/testautomation/graphics/required/includes/impress/im_003_.inc @@ -227,7 +227,7 @@ testcase tiViewToolbar_1 end if Kontext "DocumentImpress" printlog "select graphic " - EditSelectAll + hTypeKeys "", 3 sleep 2 Kontext "GraphicObjectbar" sleep 1 diff --git a/testautomation/graphics/required/input/255chars.dxf b/testautomation/graphics/required/input/255chars.dxf old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/29secsound.wav b/testautomation/graphics/required/input/29secsound.wav old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/Blueprint.odg b/testautomation/graphics/required/input/Blueprint.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/FormatConnector.odg b/testautomation/graphics/required/input/FormatConnector.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/FormatConnector.odp b/testautomation/graphics/required/input/FormatConnector.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.PSD b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.PSD old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.bmp b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.bmp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.cgm b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.cgm old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.dxf b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.dxf old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.emf b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.emf old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.eps b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.eps old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.gif b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.gif old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.giff b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.giff old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.jpeg b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.jpeg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.jpg b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.jpg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.met b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.met old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.pbm b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.pbm old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.pcd b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.pcd old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.pct b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.pct old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.pcx b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.pcx old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.pgm b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.pgm old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.png b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.png old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.ppm b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.ppm old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.ras b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.ras old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.sgf b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.sgf old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.sgv b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.sgv old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.svm b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.svm old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.tga b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.tga old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.tif b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.tif old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.tiff b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.tiff old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.wmf b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.wmf old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.xbm b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.xbm old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.xpm b/testautomation/graphics/required/input/SaveAsPicture/SaveAsPicture.xpm old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/allshapes.odp b/testautomation/graphics/required/input/allshapes.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/allshapes2.odp b/testautomation/graphics/required/input/allshapes2.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/blip.wav b/testautomation/graphics/required/input/blip.wav old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/diashow.odp b/testautomation/graphics/required/input/diashow.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/dotNetOverview.ppt b/testautomation/graphics/required/input/dotNetOverview.ppt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/effects.odp b/testautomation/graphics/required/input/effects.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/einfg.ini b/testautomation/graphics/required/input/einfg.ini old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/engtext.odg b/testautomation/graphics/required/input/engtext.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/engtext.odp b/testautomation/graphics/required/input/engtext.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/export_graphic2.odp b/testautomation/graphics/required/input/export_graphic2.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/export_graphic3.odg b/testautomation/graphics/required/input/export_graphic3.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/export_graphic3.odp b/testautomation/graphics/required/input/export_graphic3.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/frame1.htm b/testautomation/graphics/required/input/frame1.htm old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/gallery/gal_1.txt b/testautomation/graphics/required/input/gallery/gal_1.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/gallery/gal_31.txt b/testautomation/graphics/required/input/gallery/gal_31.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/gallery/gal_33.txt b/testautomation/graphics/required/input/gallery/gal_33.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/gallery/gal_34.txt b/testautomation/graphics/required/input/gallery/gal_34.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/gallery/gal_36.txt b/testautomation/graphics/required/input/gallery/gal_36.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/gallery/gal_39.txt b/testautomation/graphics/required/input/gallery/gal_39.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/gallery/gal_46.txt b/testautomation/graphics/required/input/gallery/gal_46.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/gallery/gal_48.txt b/testautomation/graphics/required/input/gallery/gal_48.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/gallery/gal_49.txt b/testautomation/graphics/required/input/gallery/gal_49.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/gallery/gal_55.txt b/testautomation/graphics/required/input/gallery/gal_55.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/gallery/gal_7.txt b/testautomation/graphics/required/input/gallery/gal_7.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/gallery/gal_81.txt b/testautomation/graphics/required/input/gallery/gal_81.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/gallery/gal_82.txt b/testautomation/graphics/required/input/gallery/gal_82.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/gallery/gal_86.txt b/testautomation/graphics/required/input/gallery/gal_86.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/gallery/gal_88.txt b/testautomation/graphics/required/input/gallery/gal_88.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/gallery/gal_oo_1.txt b/testautomation/graphics/required/input/gallery/gal_oo_1.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/gallery/gal_oo_49.txt b/testautomation/graphics/required/input/gallery/gal_oo_49.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/gallery/gal_oo_50.txt b/testautomation/graphics/required/input/gallery/gal_oo_50.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/gallery/gal_oo_84.txt b/testautomation/graphics/required/input/gallery/gal_oo_84.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/generic_de.ppt b/testautomation/graphics/required/input/generic_de.ppt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/graphicexport.odg b/testautomation/graphics/required/input/graphicexport.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/graphicexport.odp b/testautomation/graphics/required/input/graphicexport.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/graphicexport_pdf.odg b/testautomation/graphics/required/input/graphicexport_pdf.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/graphicexport_pdf.odp b/testautomation/graphics/required/input/graphicexport_pdf.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/gridtst.odg b/testautomation/graphics/required/input/gridtst.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/gridtst.odp b/testautomation/graphics/required/input/gridtst.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/gridtst.sxd b/testautomation/graphics/required/input/gridtst.sxd old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/gridtst.sxi b/testautomation/graphics/required/input/gridtst.sxi old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/i_us_large.jpg b/testautomation/graphics/required/input/i_us_large.jpg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/imsusmap.cgm b/testautomation/graphics/required/input/imsusmap.cgm old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/leer.odg b/testautomation/graphics/required/input/leer.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/leer.odp b/testautomation/graphics/required/input/leer.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/ole.bmp b/testautomation/graphics/required/input/ole.bmp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/oletest.odg b/testautomation/graphics/required/input/oletest.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/outlinefromwriter.odt b/testautomation/graphics/required/input/outlinefromwriter.odt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/passwo52.sda b/testautomation/graphics/required/input/passwo52.sda old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/passwo52.sdd b/testautomation/graphics/required/input/passwo52.sdd old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_1.odg b/testautomation/graphics/required/input/recht_1.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_1.odp b/testautomation/graphics/required/input/recht_1.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_3.odg b/testautomation/graphics/required/input/recht_3.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_3.odp b/testautomation/graphics/required/input/recht_3.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_31.odg b/testautomation/graphics/required/input/recht_31.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_31.odp b/testautomation/graphics/required/input/recht_31.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_33.odg b/testautomation/graphics/required/input/recht_33.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_33.odp b/testautomation/graphics/required/input/recht_33.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_34.odg b/testautomation/graphics/required/input/recht_34.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_34.odp b/testautomation/graphics/required/input/recht_34.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_36.odg b/testautomation/graphics/required/input/recht_36.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_36.odp b/testautomation/graphics/required/input/recht_36.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_39.odg b/testautomation/graphics/required/input/recht_39.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_39.odp b/testautomation/graphics/required/input/recht_39.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_46.odg b/testautomation/graphics/required/input/recht_46.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_46.odp b/testautomation/graphics/required/input/recht_46.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_48.odg b/testautomation/graphics/required/input/recht_48.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_48.odp b/testautomation/graphics/required/input/recht_48.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_48.sxd b/testautomation/graphics/required/input/recht_48.sxd old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_48.sxi b/testautomation/graphics/required/input/recht_48.sxi old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_49.odg b/testautomation/graphics/required/input/recht_49.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_49.odp b/testautomation/graphics/required/input/recht_49.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_50.odg b/testautomation/graphics/required/input/recht_50.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_50.odp b/testautomation/graphics/required/input/recht_50.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_55.odg b/testautomation/graphics/required/input/recht_55.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_55.odp b/testautomation/graphics/required/input/recht_55.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_81.odg b/testautomation/graphics/required/input/recht_81.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/recht_81.odp b/testautomation/graphics/required/input/recht_81.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/rightfont.odg b/testautomation/graphics/required/input/rightfont.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/rightfont.odp b/testautomation/graphics/required/input/rightfont.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/rightfont1.odg b/testautomation/graphics/required/input/rightfont1.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/rightfont1.odp b/testautomation/graphics/required/input/rightfont1.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/rightfont33.odg b/testautomation/graphics/required/input/rightfont33.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/rightfont33.odp b/testautomation/graphics/required/input/rightfont33.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/rightfont34.odg b/testautomation/graphics/required/input/rightfont34.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/rightfont34.odp b/testautomation/graphics/required/input/rightfont34.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/rightfont36.odg b/testautomation/graphics/required/input/rightfont36.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/rightfont36.odp b/testautomation/graphics/required/input/rightfont36.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/rightfont39.odg b/testautomation/graphics/required/input/rightfont39.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/rightfont39.odp b/testautomation/graphics/required/input/rightfont39.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/rightfont46.odg b/testautomation/graphics/required/input/rightfont46.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/rightfont46.odp b/testautomation/graphics/required/input/rightfont46.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/rightfont48.odg b/testautomation/graphics/required/input/rightfont48.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/rightfont48.odp b/testautomation/graphics/required/input/rightfont48.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/rightfont49.odg b/testautomation/graphics/required/input/rightfont49.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/rightfont49.odp b/testautomation/graphics/required/input/rightfont49.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/rightfont50.odp b/testautomation/graphics/required/input/rightfont50.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/rightfont55.odg b/testautomation/graphics/required/input/rightfont55.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/rightfont55.odp b/testautomation/graphics/required/input/rightfont55.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/sample.mov b/testautomation/graphics/required/input/sample.mov old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/screen_white.wmf b/testautomation/graphics/required/input/screen_white.wmf old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/shapes/1Lines.ppt b/testautomation/graphics/required/input/shapes/1Lines.ppt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/shapes/2Connectors.ppt b/testautomation/graphics/required/input/shapes/2Connectors.ppt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/shapes/3BasicShapes.ppt b/testautomation/graphics/required/input/shapes/3BasicShapes.ppt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/shapes/4BlockArrows.ppt b/testautomation/graphics/required/input/shapes/4BlockArrows.ppt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/shapes/5Flowchart.ppt b/testautomation/graphics/required/input/shapes/5Flowchart.ppt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/shapes/6StarsBanners.ppt b/testautomation/graphics/required/input/shapes/6StarsBanners.ppt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/shapes/7Callouts.ppt b/testautomation/graphics/required/input/shapes/7Callouts.ppt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/shapes/8ActionButtons.ppt b/testautomation/graphics/required/input/shapes/8ActionButtons.ppt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/silben_1.odg b/testautomation/graphics/required/input/silben_1.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/silben_1.odp b/testautomation/graphics/required/input/silben_1.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/silben_31.odg b/testautomation/graphics/required/input/silben_31.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/silben_31.odp b/testautomation/graphics/required/input/silben_31.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/silben_31.sxd b/testautomation/graphics/required/input/silben_31.sxd old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/silben_31.sxi b/testautomation/graphics/required/input/silben_31.sxi old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/silben_33.odg b/testautomation/graphics/required/input/silben_33.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/silben_33.odp b/testautomation/graphics/required/input/silben_33.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/silben_34.odg b/testautomation/graphics/required/input/silben_34.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/silben_34.odp b/testautomation/graphics/required/input/silben_34.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/silben_36.odg b/testautomation/graphics/required/input/silben_36.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/silben_36.odp b/testautomation/graphics/required/input/silben_36.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/silben_39.odg b/testautomation/graphics/required/input/silben_39.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/silben_39.odp b/testautomation/graphics/required/input/silben_39.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/silben_46.odg b/testautomation/graphics/required/input/silben_46.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/silben_46.odp b/testautomation/graphics/required/input/silben_46.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/silben_48.odg b/testautomation/graphics/required/input/silben_48.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/silben_48.odp b/testautomation/graphics/required/input/silben_48.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/silben_49.odg b/testautomation/graphics/required/input/silben_49.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/silben_49.odp b/testautomation/graphics/required/input/silben_49.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/silben_50.odg b/testautomation/graphics/required/input/silben_50.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/silben_50.odp b/testautomation/graphics/required/input/silben_50.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/silben_55.odg b/testautomation/graphics/required/input/silben_55.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/silben_55.odp b/testautomation/graphics/required/input/silben_55.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_1.odg b/testautomation/graphics/required/input/spellb_1.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_1.odp b/testautomation/graphics/required/input/spellb_1.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_1.txt b/testautomation/graphics/required/input/spellb_1.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_31.odg b/testautomation/graphics/required/input/spellb_31.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_31.odp b/testautomation/graphics/required/input/spellb_31.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_31.txt b/testautomation/graphics/required/input/spellb_31.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_33.odg b/testautomation/graphics/required/input/spellb_33.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_33.odp b/testautomation/graphics/required/input/spellb_33.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_33.txt b/testautomation/graphics/required/input/spellb_33.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_34.odg b/testautomation/graphics/required/input/spellb_34.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_34.odp b/testautomation/graphics/required/input/spellb_34.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_34.txt b/testautomation/graphics/required/input/spellb_34.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_36.odg b/testautomation/graphics/required/input/spellb_36.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_36.odp b/testautomation/graphics/required/input/spellb_36.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_36.txt b/testautomation/graphics/required/input/spellb_36.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_39.odg b/testautomation/graphics/required/input/spellb_39.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_39.odp b/testautomation/graphics/required/input/spellb_39.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_39.txt b/testautomation/graphics/required/input/spellb_39.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_49.odg b/testautomation/graphics/required/input/spellb_49.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_49.odp b/testautomation/graphics/required/input/spellb_49.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_49.txt b/testautomation/graphics/required/input/spellb_49.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_50.odg b/testautomation/graphics/required/input/spellb_50.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_50.odp b/testautomation/graphics/required/input/spellb_50.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_50.txt b/testautomation/graphics/required/input/spellb_50.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_55.odg b/testautomation/graphics/required/input/spellb_55.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_55.odp b/testautomation/graphics/required/input/spellb_55.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_55.txt b/testautomation/graphics/required/input/spellb_55.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_7.odg b/testautomation/graphics/required/input/spellb_7.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_7.odp b/testautomation/graphics/required/input/spellb_7.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_7.txt b/testautomation/graphics/required/input/spellb_7.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_82.odg b/testautomation/graphics/required/input/spellb_82.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_82.odp b/testautomation/graphics/required/input/spellb_82.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_82.txt b/testautomation/graphics/required/input/spellb_82.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_86.odg b/testautomation/graphics/required/input/spellb_86.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_86.odp b/testautomation/graphics/required/input/spellb_86.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_86.txt b/testautomation/graphics/required/input/spellb_86.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_88.odg b/testautomation/graphics/required/input/spellb_88.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_88.odp b/testautomation/graphics/required/input/spellb_88.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/spellb_88.txt b/testautomation/graphics/required/input/spellb_88.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/tbo_alf_.odg b/testautomation/graphics/required/input/tbo_alf_.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/tbo_alf_.odp b/testautomation/graphics/required/input/tbo_alf_.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/tchinese.odg b/testautomation/graphics/required/input/tchinese.odg old mode 100755 new mode 100644 diff --git a/testautomation/graphics/required/input/tchinese.odp b/testautomation/graphics/required/input/tchinese.odp old mode 100755 new mode 100644 diff --git a/testautomation/graphics/tools/id_tools_2.inc b/testautomation/graphics/tools/id_tools_2.inc index 6cf18494915d..e5cf1a068adf 100644 --- a/testautomation/graphics/tools/id_tools_2.inc +++ b/testautomation/graphics/tools/id_tools_2.inc @@ -1064,3 +1064,18 @@ sub hWalkTheStyles (optional a as integer,optional b as integer) end sub '--------------------------------------------------------------------------------------- +sub sSelectEmptyLayout + if gApplication = "IMPRESS" then + printlog "Changing focus to TaskPane." + kontext "Tasks" + sleep (1) + printlog "Selecting first and empty layout." + LayoutsPreview.TypeKeys "" + sleep (1) + LayoutsPreview.TypeKeys "" + sleep (1) + kontext "DocumentImpress" + else + printlog "No change of Layout needed." + endif +end sub \ No newline at end of file diff --git a/testautomation/graphics/tools/locale_1.txt b/testautomation/graphics/tools/locale_1.txt old mode 100755 new mode 100644 diff --git a/testautomation/graphics/tools/makeLokaleTxt.bas b/testautomation/graphics/tools/makeLokaleTxt.bas old mode 100755 new mode 100644 -- cgit From 166383c2e76e42ebf3273cd7710252b129d6e83c Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Tue, 11 May 2010 15:10:27 +0200 Subject: #i107213# addapt cut&paste check in impress to new impress layout default --- smoketestoo_native/data/smoketestdoc.sxw | Bin 35384 -> 35550 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/smoketestoo_native/data/smoketestdoc.sxw b/smoketestoo_native/data/smoketestdoc.sxw index fa67968addec..84e1e30bfc4e 100755 Binary files a/smoketestoo_native/data/smoketestdoc.sxw and b/smoketestoo_native/data/smoketestdoc.sxw differ -- cgit From 1afc67a4f5ccace415ce76de17913a6fc8256800 Mon Sep 17 00:00:00 2001 From: Ingrid Halama Date: Wed, 12 May 2010 11:15:00 +0200 Subject: chart47: #i111552# ApiTest: LineDash Property is tested with wrong type --- qadevOOo/tests/java/ifc/drawing/_LineProperties.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/qadevOOo/tests/java/ifc/drawing/_LineProperties.java b/qadevOOo/tests/java/ifc/drawing/_LineProperties.java index a590bd5c5e1c..b6fb1f2186a1 100644 --- a/qadevOOo/tests/java/ifc/drawing/_LineProperties.java +++ b/qadevOOo/tests/java/ifc/drawing/_LineProperties.java @@ -80,21 +80,7 @@ public class _LineProperties extends MultiPropertyTest { LineDash aLineDash2 = new LineDash(); aLineDash.DashLen = 5; aLineDash2.DashLen = 1; - PropertyValue[] firstValue = new PropertyValue[2]; - firstValue[0] = new PropertyValue(); - firstValue[0].Name = "Name"; - firstValue[0].Value = "Name1"; - firstValue[1] = new PropertyValue(); - firstValue[1].Name = "LineDash"; - firstValue[1].Value = aLineDash; - PropertyValue[] secondValue = new PropertyValue[2]; - secondValue[0] = new PropertyValue(); - secondValue[0].Name = "Name"; - secondValue[0].Value = "Name2"; - secondValue[1] = new PropertyValue(); - secondValue[1].Name = "LineDash"; - secondValue[1].Value = aLineDash2; - testProperty("LineDash",firstValue,secondValue); + testProperty("LineDash",aLineDash,aLineDash2); } } -- cgit From 6417e0a10e9f7ad16342af2ed7f5ff23c0dba036 Mon Sep 17 00:00:00 2001 From: Ingrid Halama Date: Wed, 12 May 2010 20:18:15 +0200 Subject: chart47: #i111560# ApiTest: MAYBEVOID properties are handled wrongly be the api test framework if they are not set initially --- qadevOOo/runner/lib/MultiPropertyTest.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java b/qadevOOo/runner/lib/MultiPropertyTest.java index 286ddf1600a9..3a12d51c0d92 100644 --- a/qadevOOo/runner/lib/MultiPropertyTest.java +++ b/qadevOOo/runner/lib/MultiPropertyTest.java @@ -41,6 +41,7 @@ import java.lang.reflect.Method; import util.ValueChanger; import util.ValueComparer; +import util.utils; import com.sun.star.uno.Any; import com.sun.star.uno.AnyConverter; @@ -179,6 +180,19 @@ public class MultiPropertyTest extends MultiMethodTest { Object oldValue = oObj.getPropertyValue(propName); + if( (oldValue==null) || utils.isVoid(oldValue) ) + { + // #i111560# method getNewValue() does not work with an empty oldValue + Property prop = info.getPropertyByName(propName); + if( (prop.Attributes & PropertyAttribute.MAYBEVOID) != 0 ) + { + // todo: implement a new test independent from method getNewValue() + log.println("changing initially empty MAYBEVOID properties is not supported by the test framework so far - skip test of property: " + propName); + tRes.tested(propName, true); + return; + } + } + Object newValue; // trying to create new value -- cgit From 4b770dd310a1e1b37abd1728abc2e21f3fb3f129 Mon Sep 17 00:00:00 2001 From: Ingrid Halama Date: Mon, 17 May 2010 13:14:05 +0200 Subject: chart47: #i111560# report error if a property is not set and is not MAYBEVOID --- qadevOOo/runner/lib/MultiPropertyTest.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java b/qadevOOo/runner/lib/MultiPropertyTest.java index 3a12d51c0d92..a02f93c04347 100644 --- a/qadevOOo/runner/lib/MultiPropertyTest.java +++ b/qadevOOo/runner/lib/MultiPropertyTest.java @@ -191,6 +191,12 @@ public class MultiPropertyTest extends MultiMethodTest tRes.tested(propName, true); return; } + else + { + log.println( "property '"+propName+"' is not set but is not MAYBEVOID"); + tRes.tested(propName, false); + return; + } } Object newValue; -- cgit From 9f124082f800eed4f436203fd309b17fd7584f95 Mon Sep 17 00:00:00 2001 From: Ingrid Halama Date: Mon, 17 May 2010 17:04:26 +0200 Subject: chart47: #i109770# #i110253# reduce assertions 'already disposed or closed' - don't close the document twice --- qadevOOo/tests/java/mod/_sch/AccArea.java | 8 +++++--- qadevOOo/tests/java/mod/_sch/AccAxis.java | 8 +++++--- qadevOOo/tests/java/mod/_sch/AccDataPoint.java | 8 +++++--- qadevOOo/tests/java/mod/_sch/AccDataSeries.java | 8 +++++--- qadevOOo/tests/java/mod/_sch/AccDiagram.java | 8 +++++--- qadevOOo/tests/java/mod/_sch/AccFloor.java | 8 +++++--- qadevOOo/tests/java/mod/_sch/AccGrid.java | 8 +++++--- qadevOOo/tests/java/mod/_sch/AccLegend.java | 8 +++++--- qadevOOo/tests/java/mod/_sch/AccLegendEntry.java | 8 +++++--- qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java | 8 +++++--- qadevOOo/tests/java/mod/_sch/AccTitle.java | 8 +++++--- qadevOOo/tests/java/mod/_sch/AccWall.java | 8 +++++--- qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java | 7 +++++-- qadevOOo/tests/java/mod/_sch/ChXChartAxis.java | 7 +++++-- qadevOOo/tests/java/mod/_sch/ChXChartData.java | 7 +++++-- qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java | 7 +++++-- qadevOOo/tests/java/mod/_sch/ChXChartDocument.java | 14 ++++++++++---- qadevOOo/tests/java/mod/_sch/ChXChartView.java | 7 +++++-- qadevOOo/tests/java/mod/_sch/ChXDataPoint.java | 7 +++++-- qadevOOo/tests/java/mod/_sch/ChXDataRow.java | 7 +++++-- qadevOOo/tests/java/mod/_sch/ChartArea.java | 7 +++++-- qadevOOo/tests/java/mod/_sch/ChartGrid.java | 7 +++++-- qadevOOo/tests/java/mod/_sch/ChartLegend.java | 7 +++++-- qadevOOo/tests/java/mod/_sch/ChartLine.java | 7 +++++-- qadevOOo/tests/java/mod/_sch/ChartTitle.java | 7 +++++-- qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java | 7 +++++-- 26 files changed, 135 insertions(+), 66 deletions(-) diff --git a/qadevOOo/tests/java/mod/_sch/AccArea.java b/qadevOOo/tests/java/mod/_sch/AccArea.java index dae93e6d3326..b371f1950558 100644 --- a/qadevOOo/tests/java/mod/_sch/AccArea.java +++ b/qadevOOo/tests/java/mod/_sch/AccArea.java @@ -111,9 +111,11 @@ public class AccArea extends TestCase { * @param log writer to log information while testing */ protected void cleanup( TestParameters Param, PrintWriter log) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); - + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } } diff --git a/qadevOOo/tests/java/mod/_sch/AccAxis.java b/qadevOOo/tests/java/mod/_sch/AccAxis.java index e0c6b8901345..2cdecae03aca 100644 --- a/qadevOOo/tests/java/mod/_sch/AccAxis.java +++ b/qadevOOo/tests/java/mod/_sch/AccAxis.java @@ -109,9 +109,11 @@ public class AccAxis extends TestCase { * @param log writer to log information while testing */ protected void cleanup( TestParameters Param, PrintWriter log) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); - + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } } diff --git a/qadevOOo/tests/java/mod/_sch/AccDataPoint.java b/qadevOOo/tests/java/mod/_sch/AccDataPoint.java index 45bd6e3e4101..3e94364a0559 100644 --- a/qadevOOo/tests/java/mod/_sch/AccDataPoint.java +++ b/qadevOOo/tests/java/mod/_sch/AccDataPoint.java @@ -110,9 +110,11 @@ public class AccDataPoint extends TestCase { * @param log writer to log information while testing */ protected void cleanup( TestParameters Param, PrintWriter log) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); - + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } } diff --git a/qadevOOo/tests/java/mod/_sch/AccDataSeries.java b/qadevOOo/tests/java/mod/_sch/AccDataSeries.java index 4eff500ebba7..2d5ec4fde1d5 100644 --- a/qadevOOo/tests/java/mod/_sch/AccDataSeries.java +++ b/qadevOOo/tests/java/mod/_sch/AccDataSeries.java @@ -110,9 +110,11 @@ public class AccDataSeries extends TestCase { * @param log writer to log information while testing */ protected void cleanup( TestParameters Param, PrintWriter log) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); - + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } } diff --git a/qadevOOo/tests/java/mod/_sch/AccDiagram.java b/qadevOOo/tests/java/mod/_sch/AccDiagram.java index 50657c0218ac..9b7f90766fdd 100644 --- a/qadevOOo/tests/java/mod/_sch/AccDiagram.java +++ b/qadevOOo/tests/java/mod/_sch/AccDiagram.java @@ -110,9 +110,11 @@ public class AccDiagram extends TestCase { * @param log writer to log information while testing */ protected void cleanup( TestParameters Param, PrintWriter log) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); - + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } } diff --git a/qadevOOo/tests/java/mod/_sch/AccFloor.java b/qadevOOo/tests/java/mod/_sch/AccFloor.java index 9ab1f9542111..37d56815983d 100644 --- a/qadevOOo/tests/java/mod/_sch/AccFloor.java +++ b/qadevOOo/tests/java/mod/_sch/AccFloor.java @@ -135,9 +135,11 @@ public class AccFloor extends TestCase { * @param log writer to log information while testing */ protected void cleanup( TestParameters Param, PrintWriter log) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); - + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } } diff --git a/qadevOOo/tests/java/mod/_sch/AccGrid.java b/qadevOOo/tests/java/mod/_sch/AccGrid.java index f92aa0fe82a6..268f53ec8b3d 100644 --- a/qadevOOo/tests/java/mod/_sch/AccGrid.java +++ b/qadevOOo/tests/java/mod/_sch/AccGrid.java @@ -111,9 +111,11 @@ public class AccGrid extends TestCase { * @param log writer to log information while testing */ protected void cleanup( TestParameters Param, PrintWriter log) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); - + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } } diff --git a/qadevOOo/tests/java/mod/_sch/AccLegend.java b/qadevOOo/tests/java/mod/_sch/AccLegend.java index a0f29e1e0701..aa46cdb8407d 100644 --- a/qadevOOo/tests/java/mod/_sch/AccLegend.java +++ b/qadevOOo/tests/java/mod/_sch/AccLegend.java @@ -109,9 +109,11 @@ public class AccLegend extends TestCase { * @param log writer to log information while testing */ protected void cleanup( TestParameters Param, PrintWriter log) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); - + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } } diff --git a/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java b/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java index 78996d84fa2a..61c221df57e0 100644 --- a/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java +++ b/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java @@ -109,9 +109,11 @@ public class AccLegendEntry extends TestCase { * @param log writer to log information while testing */ protected void cleanup( TestParameters Param, PrintWriter log) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); - + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } } diff --git a/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java b/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java index d72723ebea62..aafe91fdd3d4 100644 --- a/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java +++ b/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java @@ -114,9 +114,11 @@ public class AccStatisticsObject extends TestCase { * @param log writer to log information while testing */ protected void cleanup( TestParameters Param, PrintWriter log) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); - + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } } diff --git a/qadevOOo/tests/java/mod/_sch/AccTitle.java b/qadevOOo/tests/java/mod/_sch/AccTitle.java index 4fa56ee8f4f1..0639f19ca4cc 100644 --- a/qadevOOo/tests/java/mod/_sch/AccTitle.java +++ b/qadevOOo/tests/java/mod/_sch/AccTitle.java @@ -109,9 +109,11 @@ public class AccTitle extends TestCase { * @param log writer to log information while testing */ protected void cleanup( TestParameters Param, PrintWriter log) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); - + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } } diff --git a/qadevOOo/tests/java/mod/_sch/AccWall.java b/qadevOOo/tests/java/mod/_sch/AccWall.java index 4dc94a173fff..66779421cc0b 100644 --- a/qadevOOo/tests/java/mod/_sch/AccWall.java +++ b/qadevOOo/tests/java/mod/_sch/AccWall.java @@ -134,9 +134,11 @@ public class AccWall extends TestCase { * @param log writer to log information while testing */ protected void cleanup( TestParameters Param, PrintWriter log) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); - + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } } diff --git a/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java b/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java index a064e7f05a09..9031680f93f1 100644 --- a/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java +++ b/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java @@ -102,8 +102,11 @@ public class AccessibleDocumentView extends TestCase { * @param log writer to log information while testing */ protected void cleanup( TestParameters Param, PrintWriter log) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } /** diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java b/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java index da12c9e6b57a..f796d5530a9c 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartAxis.java @@ -86,8 +86,11 @@ public class ChXChartAxis extends TestCase { * Disposes Chart document. */ protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } /** diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartData.java b/qadevOOo/tests/java/mod/_sch/ChXChartData.java index fe14322933a5..3236e345b8e6 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartData.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartData.java @@ -73,8 +73,11 @@ public class ChXChartData extends TestCase { * Disposes Chart document. */ protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } /** diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java b/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java index 35d15d634054..14caeefff8c1 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartDataArray.java @@ -76,8 +76,11 @@ public class ChXChartDataArray extends TestCase { * Disposes Chart document. */ protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } /** diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java b/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java index a51457d5cde1..deafa9922043 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartDocument.java @@ -77,10 +77,16 @@ public class ChXChartDocument extends TestCase { * Disposes Chart documents. */ protected void cleanup(TestParameters Param, PrintWriter log) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); - log.println( " closing xChartDoc2 " ); - util.DesktopTools.closeDoc(doc2); + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } + if( doc2!=null ) { + log.println( " closing xChartDoc2" ); + util.DesktopTools.closeDoc(doc2); + doc2 = null; + } } /** diff --git a/qadevOOo/tests/java/mod/_sch/ChXChartView.java b/qadevOOo/tests/java/mod/_sch/ChXChartView.java index 9d1ea2539bfc..f5476f2d0643 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXChartView.java +++ b/qadevOOo/tests/java/mod/_sch/ChXChartView.java @@ -84,8 +84,11 @@ public class ChXChartView extends TestCase { * Disposes Chart document. */ protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } /** diff --git a/qadevOOo/tests/java/mod/_sch/ChXDataPoint.java b/qadevOOo/tests/java/mod/_sch/ChXDataPoint.java index b6ddb94575b4..0c1647684c75 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXDataPoint.java +++ b/qadevOOo/tests/java/mod/_sch/ChXDataPoint.java @@ -101,8 +101,11 @@ public class ChXDataPoint extends TestCase { * Disposes Chart document. */ protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } /** diff --git a/qadevOOo/tests/java/mod/_sch/ChXDataRow.java b/qadevOOo/tests/java/mod/_sch/ChXDataRow.java index ffc13ad95bb7..69139ea5d902 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXDataRow.java +++ b/qadevOOo/tests/java/mod/_sch/ChXDataRow.java @@ -107,8 +107,11 @@ public class ChXDataRow extends TestCase { * Disposes Chart document. */ protected synchronized void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } diff --git a/qadevOOo/tests/java/mod/_sch/ChartArea.java b/qadevOOo/tests/java/mod/_sch/ChartArea.java index 17a04276aaca..614327f94a1e 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartArea.java +++ b/qadevOOo/tests/java/mod/_sch/ChartArea.java @@ -92,8 +92,11 @@ public class ChartArea extends TestCase { * Disposes Chart document. */ protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } /** diff --git a/qadevOOo/tests/java/mod/_sch/ChartGrid.java b/qadevOOo/tests/java/mod/_sch/ChartGrid.java index 671cfcfe86e3..73a44b810436 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartGrid.java +++ b/qadevOOo/tests/java/mod/_sch/ChartGrid.java @@ -81,8 +81,11 @@ public class ChartGrid extends TestCase { * Disposes Chart document. */ protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } /** diff --git a/qadevOOo/tests/java/mod/_sch/ChartLegend.java b/qadevOOo/tests/java/mod/_sch/ChartLegend.java index 78770c5f94b6..a0dd4fe3ec64 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartLegend.java +++ b/qadevOOo/tests/java/mod/_sch/ChartLegend.java @@ -109,8 +109,11 @@ public class ChartLegend extends TestCase { * Disposes Chart document. */ protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } /** diff --git a/qadevOOo/tests/java/mod/_sch/ChartLine.java b/qadevOOo/tests/java/mod/_sch/ChartLine.java index e2345ba7edb5..950885060f5f 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartLine.java +++ b/qadevOOo/tests/java/mod/_sch/ChartLine.java @@ -79,8 +79,11 @@ public class ChartLine extends TestCase { * Disposes Chart document. */ protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } /** diff --git a/qadevOOo/tests/java/mod/_sch/ChartTitle.java b/qadevOOo/tests/java/mod/_sch/ChartTitle.java index b1e47c0ea00b..f88c938693bc 100644 --- a/qadevOOo/tests/java/mod/_sch/ChartTitle.java +++ b/qadevOOo/tests/java/mod/_sch/ChartTitle.java @@ -91,8 +91,11 @@ public class ChartTitle extends TestCase { * Disposes Chart document. */ protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " closing xChartDoc " ); - util.DesktopTools.closeDoc(xChartDoc); + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } /** diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java index 393ddb7492ce..a5027b3f989d 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java @@ -95,8 +95,11 @@ public class XMLExporter extends TestCase { * Document disposed here. */ protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " close xChartDoc " ); - DesktopTools.closeDoc(xChartDoc); + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } /** -- cgit From 56cdcbe947f64591d04d31d6d3808db7f6f3a050 Mon Sep 17 00:00:00 2001 From: "Marc Neumann [msc]" Date: Wed, 19 May 2010 11:42:52 +0200 Subject: slidecopy: add new test extension --- .../extensions/TaskPaneComponent/TaskPaneComponent.oxt | Bin 0 -> 9884 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100755 testautomation/extensions/optional/input/extensions/TaskPaneComponent/TaskPaneComponent.oxt diff --git a/testautomation/extensions/optional/input/extensions/TaskPaneComponent/TaskPaneComponent.oxt b/testautomation/extensions/optional/input/extensions/TaskPaneComponent/TaskPaneComponent.oxt new file mode 100755 index 000000000000..5c826dd3541d Binary files /dev/null and b/testautomation/extensions/optional/input/extensions/TaskPaneComponent/TaskPaneComponent.oxt differ -- cgit From ffe6bf95e70b94f65c34ace18e93509c383dbf05 Mon Sep 17 00:00:00 2001 From: "Marc Neumann [msc]" Date: Wed, 19 May 2010 11:45:38 +0200 Subject: slidecopy: changes for the new taskpane implementation --- testautomation/global/input/officeinfo.txt | 3 +-- testautomation/global/sid/e_all.sid | 2 +- testautomation/global/win/dial_t_z.win | 4 ---- testautomation/global/win/edia_t_z.win | 4 ++-- .../optional/includes/global/export_graphic_2.inc | 21 +++++++-------------- .../optional/includes/global/g_autocorrection.inc | 2 +- .../optional/includes/global/g_customshapes.inc | 8 ++++---- .../optional/includes/global/g_demoguide.inc | 2 +- .../optional/includes/global/g_load_save.inc | 11 +++-------- testautomation/graphics/tools/id_tools.inc | 10 +++++----- 10 files changed, 25 insertions(+), 42 deletions(-) mode change 100644 => 100755 testautomation/global/input/officeinfo.txt diff --git a/testautomation/global/input/officeinfo.txt b/testautomation/global/input/officeinfo.txt old mode 100644 new mode 100755 index dc334737d048..a6b692b15f01 --- a/testautomation/global/input/officeinfo.txt +++ b/testautomation/global/input/officeinfo.txt @@ -1,6 +1,5 @@ [Current program versions] -StarOffice=9 -StarSuite=9 +Oracle Open Office=3.2 OpenOffice.org=3.1 BrOffice.org=3.1 diff --git a/testautomation/global/sid/e_all.sid b/testautomation/global/sid/e_all.sid index de68cf13f79d..2fde9b77b5a4 100755 --- a/testautomation/global/sid/e_all.sid +++ b/testautomation/global/sid/e_all.sid @@ -256,7 +256,7 @@ ViewSnapLinesFront SID_HELPLINES_FRONT ViewStatusBarVisible .uno:StatusBarVisible ViewShowImeStatusWindow .uno:ShowImeStatusWindow ViewShowRuler .uno:ShowRuler -ViewTaskPane .uno:RightPane +ViewTaskPane .uno:TaskPane ViewTaskSlide .uno:LeftPaneImpress ViewTitle SID_TITLE_MASTERPAGE ViewToolbarsOptionbar .uno:AvailableToolbars?Toolbar:string=optionsbar diff --git a/testautomation/global/win/dial_t_z.win b/testautomation/global/win/dial_t_z.win index c37ad2512873..899254eb6519 100755 --- a/testautomation/global/win/dial_t_z.win +++ b/testautomation/global/win/dial_t_z.win @@ -170,10 +170,6 @@ Vorschau sd:PushButton:DLG_VECTORIZE:BTN_PREVIEW *UndoRedoBox HID_SVXTBX_UNDO_REDO_CTRL UndoRedoList svx:ListBox:RID_SVXTBX_UNDO_REDO_CTRL:LB_SVXTBX_UNDO_REDO_CTRL -*UrlOeffnen sfx2:ModalDialog:RID_URLOPEN -URL sfx2:Edit:RID_URLOPEN:RID_URLOPEN_URL -URLText sfx2:Edit:RID_URLOPEN:RID_URLOPEN_URL - *Verbinder HID_PAGE_CONNECTION SVX:TABPAGE:RID_SVXPAGE_CONNECTION Linie1 cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1 Linie2 cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2 diff --git a/testautomation/global/win/edia_t_z.win b/testautomation/global/win/edia_t_z.win index a53038e79394..099e62675963 100755 --- a/testautomation/global/win/edia_t_z.win +++ b/testautomation/global/win/edia_t_z.win @@ -40,8 +40,8 @@ FinishBtn HID_DLGTABLE_CMDFINISH CancelBtn HID_DLGTABLE_CMDCANCEL ' not nice solved, but can't do better right now; complains -> TBO -*Tasks sd:DockingWindow:FLT_RIGHT_PANE_DOCKING_WINDOW -View HID_SD_TASK_PANE_VIEW_MENU +*Tasks sd:DockingWindow:FLT_TOOL_PANEL_DOCKING_WINDOW +View HID_TASKPANE_VIEW_MENU '? HID_SD_WIN_DOCUMENT ' Master Pages UsedInThisPresentationPreview HID_SD_TASK_PANE_PREVIEW_CURRENT diff --git a/testautomation/graphics/optional/includes/global/export_graphic_2.inc b/testautomation/graphics/optional/includes/global/export_graphic_2.inc index d4c6f46ed272..67c456201b45 100755 --- a/testautomation/graphics/optional/includes/global/export_graphic_2.inc +++ b/testautomation/graphics/optional/includes/global/export_graphic_2.inc @@ -146,7 +146,7 @@ testcase tSVM hFileOpen (sDocument) sleep (10) - sMakeReadOnlyDocumentEditable + call fMakeDocumentWritable hTypeKeys ("") fGetSizeXY sx1, sY, TRUE @@ -763,14 +763,8 @@ qaerrorlog endif ' check if the document is writable - if fIsDocumentWritable = false then - ' make the document writable and check if it's succesfull - if fMakeDocumentWritable = false then - warnlog "The document can't be make writeable. Test stopped." - goto endsub - endif - endif - + call fMakeDocumentWritable + hTypeKeys ("") fGetSizeXY sx1, sy, TRUE if hCallExport (OutputGrafikTBO + "1" , "BMP - Windows Bitmap (.bmp)", TRUE ) = TRUE then @@ -948,9 +942,8 @@ testcase tEMF Filterauswahl.Cancel goto endsub endif - printlog "making doc editable if it is readonly" - sMakeReadOnlyDocumentEditable - + printlog "making doc editable if it is readonly" + call fMakeDocumentWritable hTypeKeys ("") fGetSizeXY sx1, sY, TRUE if hCallExport (OutputGrafikTBO & "1" , sFilter, TRUE ) = TRUE then @@ -1139,7 +1132,7 @@ testcase tMET sleep (10) printlog "making doc editable if it is readonly" - sMakeReadOnlyDocumentEditable + call fMakeDocumentWritable hTypeKeys ("") fGetSizeXY sx1, sY, TRUE @@ -1341,7 +1334,7 @@ testcase tWMF sleep (10) printlog "making doc editable if it is readonly" - sMakeReadOnlyDocumentEditable + call fMakeDocumentWritable hTypeKeys ("") fGetSizeXY sx1, sY, TRUE diff --git a/testautomation/graphics/optional/includes/global/g_autocorrection.inc b/testautomation/graphics/optional/includes/global/g_autocorrection.inc index b0a0326a6f3f..e73d72b074ed 100755 --- a/testautomation/graphics/optional/includes/global/g_autocorrection.inc +++ b/testautomation/graphics/optional/includes/global/g_autocorrection.inc @@ -159,7 +159,7 @@ testcase tToolsAutocorrectCustomQuotes(bSimple as boolean) printlog "File opened: " + sFileName Sleep 3 - Call sMakeReadOnlyDocumentEditable + call fMakeDocumentWritable if bSimple then Printlog "- Tools/Autocorrect -single quotes" diff --git a/testautomation/graphics/optional/includes/global/g_customshapes.inc b/testautomation/graphics/optional/includes/global/g_customshapes.inc index 3cd31dac77b6..98fbe7bb43af 100755 --- a/testautomation/graphics/optional/includes/global/g_customshapes.inc +++ b/testautomation/graphics/optional/includes/global/g_customshapes.inc @@ -646,15 +646,15 @@ testcase tFormatPaintbrush sleep 1 else '(Impress) Kontext "DocumentImpress" - DocumentImpress.Mousedown 20, 20 - DocumentImpress.Mouseup 20, 20 + DocumentImpress.typekeys("",true) + DocumentImpress.typekeys("",true) + DocumentImpress.typekeys("",true) sleep 1 kontext "Standardbar" FormatPaintbrush.Click kontext "DocumentImpress" sleep 1 - DocumentImpress.Mousedown 80, 80 - DocumentImpress.Mouseup 80, 80 + DocumentImpress.typekeys("",true) sleep 1 endif diff --git a/testautomation/graphics/optional/includes/global/g_demoguide.inc b/testautomation/graphics/optional/includes/global/g_demoguide.inc index 56dd1f89e294..e8784eb67228 100755 --- a/testautomation/graphics/optional/includes/global/g_demoguide.inc +++ b/testautomation/graphics/optional/includes/global/g_demoguide.inc @@ -385,7 +385,7 @@ testcase t_DrawingEngine printlog "Open a drawing" hFileOpen (Convertpath (gTesttoolPath + "graphics/required/input/Blueprint.odg")) - Call sMakeReadOnlyDocumentEditable + Call fMakeDocumentWritable '///Select grouped object and enter group printlog "Select group" diff --git a/testautomation/graphics/optional/includes/global/g_load_save.inc b/testautomation/graphics/optional/includes/global/g_load_save.inc index 9bc422f99ff3..6622c9c7a452 100755 --- a/testautomation/graphics/optional/includes/global/g_load_save.inc +++ b/testautomation/graphics/optional/includes/global/g_load_save.inc @@ -302,14 +302,9 @@ testcase tFileOpenImport Dateiname.SetText (ConvertPath (gTesttoolpath + "graphics\required\input\imsusmap.cgm")) Oeffnen.Click Sleep 2 - ' check if the document is writable - if fIsDocumentWritable = false then - ' make the document writable and check if it's succesfull - if fMakeDocumentWritable = false then - warnlog "The document can't be make writeable. Test stopped." - goto endsub - endif - endif + + call fMakeDocumentWritable + kontext "DocumentImpress" if DocumentImpress.exists(5) then DocumentImpress.TypeKeys ("") diff --git a/testautomation/graphics/tools/id_tools.inc b/testautomation/graphics/tools/id_tools.inc index 117fa47725e2..e71c9f7653f0 100755 --- a/testautomation/graphics/tools/id_tools.inc +++ b/testautomation/graphics/tools/id_tools.inc @@ -289,10 +289,10 @@ end function '------------------------------------------------------------------------------- function fMakeDocumentWritable() as boolean - printlog " make a document is writeable" - printlog " parameter:" - printlog " return:" - printlog " true if the document can make writeable otherwise false" + 'make a document is writeable + 'parameter: + 'return: + 'true if the document can make writeable otherwise false Kontext "Standardbar" sleep (1) @@ -310,7 +310,7 @@ function fMakeDocumentWritable() as boolean printlog "Document is allready writable." fMakeDocumentWritable = true endif - + sleep (1) end function '------------------------------------------------------------------------------- -- cgit From 7a1224160c2f3bb63fa2d650663e0060c639792c Mon Sep 17 00:00:00 2001 From: "Marc Neumann [msc]" Date: Thu, 20 May 2010 16:47:40 +0200 Subject: slidecopy: fixes for new taskpane --- testautomation/graphics/optional/includes/global/g_demoguide.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testautomation/graphics/optional/includes/global/g_demoguide.inc b/testautomation/graphics/optional/includes/global/g_demoguide.inc index e8784eb67228..2187045f5aca 100755 --- a/testautomation/graphics/optional/includes/global/g_demoguide.inc +++ b/testautomation/graphics/optional/includes/global/g_demoguide.inc @@ -144,7 +144,8 @@ testcase t_Introduction warnlog "Tasks Panel not visible. Opening now." ViewTaskPane endif - Kontext "LayoutsPreview" + View.OpenMenu + MenuSelect(MenuGetItemId(1)) LayoutsPreview.TypeKeys " " sleep (5) '///Add a background @@ -160,7 +161,8 @@ testcase t_Introduction MenuSelect(MenuGetItemID(3)) View.OpenMenu MenuSelect(MenuGetItemID(2)) - Kontext "AvailableForUsePreview" + View.OpenMenu + MenuSelect(MenuGetItemID(1)) AvailableForUsePreview.TypeKeys " " sleep (5) '///Add a transition effect -- cgit From 7687340730f26a559367fad971f95c0bd15a995a Mon Sep 17 00:00:00 2001 From: Ingrid Halama Date: Thu, 20 May 2010 17:28:14 +0200 Subject: chart47: #i111102# close chart documents after testing --- .../tests/java/mod/_xmloff/Chart/XMLContentExporter.java | 9 ++++++--- .../tests/java/mod/_xmloff/Chart/XMLContentImporter.java | 12 ++++++++---- qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java | 2 +- qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java | 12 ++++++++---- .../tests/java/mod/_xmloff/Chart/XMLStylesExporter.java | 9 ++++++--- .../tests/java/mod/_xmloff/Chart/XMLStylesImporter.java | 14 +++++++++----- 6 files changed, 38 insertions(+), 20 deletions(-) diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java index 8ec11a9360b9..6fe4765389da 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java @@ -91,11 +91,14 @@ public class XMLContentExporter extends TestCase { } /** - * Document disposed here. + * Close document */ protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " disposing xChartDoc " ); - xChartDoc.dispose(); + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } /** diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java index 1c5970c7d5e0..5e48b073fc9f 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java @@ -91,11 +91,15 @@ public class XMLContentImporter extends TestCase { } /** - * Disposes document. - */ + * Close document + */ protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " disposing document " ); - comp.dispose(); + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + comp = null; + } } /** diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java index a5027b3f989d..c0edd4f82cda 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java @@ -92,7 +92,7 @@ public class XMLExporter extends TestCase { } /** - * Document disposed here. + * Close document */ protected void cleanup( TestParameters tParam, PrintWriter log ) { if( xChartDoc!=null ) { diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java index b8d441751540..83a422df9128 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java @@ -91,11 +91,15 @@ public class XMLImporter extends TestCase { } /** - * Disposes document. - */ + * Close document + */ protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " disposing document " ); - comp.dispose(); + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + comp = null; + } } /** diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java index 9435907adb3c..4405b5c5ac60 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java @@ -90,11 +90,14 @@ public class XMLStylesExporter extends TestCase { } /** - * Document disposed here. + * Close document */ protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " disposing xChartDoc " ); - xChartDoc.dispose(); + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + } } /** diff --git a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java index 617b2f92cbc4..7bd02228203d 100644 --- a/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java +++ b/qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java @@ -88,12 +88,16 @@ public class XMLStylesImporter extends TestCase { comp = xChartDoc; } - /** - * Disposes document. - */ + /** + * Close document + */ protected void cleanup( TestParameters tParam, PrintWriter log ) { - log.println( " disposing document " ); - comp.dispose(); + if( xChartDoc!=null ) { + log.println( " closing xChartDoc" ); + util.DesktopTools.closeDoc(xChartDoc); + xChartDoc = null; + comp = null; + } } /** -- cgit From 64c532ff3446afdb6d59d47f7c859863c7577437 Mon Sep 17 00:00:00 2001 From: "Marc Neumann [msc]" Date: Fri, 21 May 2010 08:03:36 +0200 Subject: slideshow: new files for testing the new taskpane --- testautomation/extensions/optional/e_taskpane.bas | 49 +++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 testautomation/extensions/optional/e_taskpane.bas diff --git a/testautomation/extensions/optional/e_taskpane.bas b/testautomation/extensions/optional/e_taskpane.bas new file mode 100644 index 000000000000..b6d29d22283d --- /dev/null +++ b/testautomation/extensions/optional/e_taskpane.bas @@ -0,0 +1,49 @@ +'encoding UTF-8 Do not remove or change this line! +'************************************************************************** +' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +' +' Copyright 2000, 2010 Oracle and/or its affiliates. +' +' OpenOffice.org - a multi-platform office productivity suite +' +' This file is part of OpenOffice.org. +' +' OpenOffice.org is free software: you can redistribute it and/or modify +' it under the terms of the GNU Lesser General Public License version 3 +' only, as published by the Free Software Foundation. +' +' OpenOffice.org is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU Lesser General Public License version 3 for more details +' (a copy is included in the LICENSE file that accompanied this code). +' +' You should have received a copy of the GNU Lesser General Public License +' version 3 along with OpenOffice.org. If not, see +' +' for a copy of the LGPLv3 License. +' +'/************************************************************************ +'* +'* owner : +'* +'* short description : +'* +'\*********************************************************************** + +sub main + + use "extensions/optional/includes/e_taskpane.inc" + call tTaskPane + +end sub + +sub LoadIncludeFiles + + use "global\system\includes\gvariabl.inc" + use "global\system\includes\master.inc" + use "global\tools\includes\optional\t_extension_manager_tools.inc" + gApplication = "CALC" + call GetUseFiles() + +end sub \ No newline at end of file -- cgit From 7a05ba6631bbe1f96801e446e71bf4c221e57e59 Mon Sep 17 00:00:00 2001 From: "Marc Neumann [msc]" Date: Fri, 21 May 2010 08:54:06 +0200 Subject: slidecopy: new files for testing the new taskpane --- .../extensions/optional/includes/e_taskpane.inc | 74 ++ .../extension_sources/TaskPaneComponent/build.xml | 72 ++ .../TaskPaneComponent/nbproject/build-impl.xml | 794 +++++++++++++++++++++ .../TaskPaneComponent/nbproject/build-uno-impl.xml | 462 ++++++++++++ .../nbproject/genfiles.properties | 8 + .../nbproject/private/config.properties | 0 .../nbproject/private/private.properties | 6 + .../nbproject/project-uno.properties | 18 + .../TaskPaneComponent/nbproject/project.properties | 67 ++ .../TaskPaneComponent/nbproject/project.xml | 14 + .../org/openoffice/Office/UI/CalcWindowState.xcu | 23 + .../data/org/openoffice/Office/UI/Factories.xcu | 35 + .../src/com/example/CentralRegistrationClass.java | 140 ++++ .../src/com/example/TaskPaneComponent.java | 116 +++ .../src/com/example/ToolPanel.java | 56 ++ .../src/com/example/ToolPanelUIElement.java | 153 ++++ .../TaskPaneComponent/src/description.xml | 5 + .../src/toolpanels/TaskPaneComponentUI.xdl | 8 + .../src/uno-extension-manifest.xml | 9 + 19 files changed, 2060 insertions(+) create mode 100644 testautomation/extensions/optional/includes/e_taskpane.inc create mode 100755 testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/build.xml create mode 100755 testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/build-impl.xml create mode 100755 testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/build-uno-impl.xml create mode 100755 testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/genfiles.properties create mode 100755 testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/private/config.properties create mode 100755 testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/private/private.properties create mode 100755 testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project-uno.properties create mode 100755 testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project.properties create mode 100755 testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project.xml create mode 100755 testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu create mode 100755 testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/registry/data/org/openoffice/Office/UI/Factories.xcu create mode 100755 testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/CentralRegistrationClass.java create mode 100755 testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/TaskPaneComponent.java create mode 100755 testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanel.java create mode 100755 testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanelUIElement.java create mode 100755 testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/description.xml create mode 100755 testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/toolpanels/TaskPaneComponentUI.xdl create mode 100755 testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/uno-extension-manifest.xml diff --git a/testautomation/extensions/optional/includes/e_taskpane.inc b/testautomation/extensions/optional/includes/e_taskpane.inc new file mode 100644 index 000000000000..6d1794e68456 --- /dev/null +++ b/testautomation/extensions/optional/includes/e_taskpane.inc @@ -0,0 +1,74 @@ +'encoding UTF-8 Do not remove or change this line! +'************************************************************************** +' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +' +' Copyright 2000, 2010 Oracle and/or its affiliates. +' +' OpenOffice.org - a multi-platform office productivity suite +' +' This file is part of OpenOffice.org. +' +' OpenOffice.org is free software: you can redistribute it and/or modify +' it under the terms of the GNU Lesser General Public License version 3 +' only, as published by the Free Software Foundation. +' +' OpenOffice.org is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU Lesser General Public License version 3 for more details +' (a copy is included in the LICENSE file that accompanied this code). +' +' You should have received a copy of the GNU Lesser General Public License +' version 3 along with OpenOffice.org. If not, see +' +' for a copy of the LGPLv3 License. +' +'/************************************************************************ +'* +'* owner : +'* +'* short description : +'* +'\*********************************************************************** +testcase tTaskPane + + Dim sExtensionPath as String + Dim iStatus as integer + + sExtensionPath = gTesttoolPath + "extensions/optional/input/extensions/TaskPaneComponent/TaskPaneComponent.oxt" + + iStatus = hExtensionAddGUI( sExtensionPath, "InstallForUser, NoLicense" ) + if(iStatus <= 0 ) then + warnlog "extension could not installed. ErrorCode is " + iStatus + goto endsub + endif + + call hNewDocument + + kontext "DocumentCalc" + + DocumentCalc.useMenu + + hMenuSelectNr(3) + if(hMenuItemIsChecked(11)) then + ' do nothing. The pane is displayed + else + hMenuSelectNr(11) + endif + + kontext "MSC_Special_Dialog" + if ( MSC_Special_Dialog.exists(1) ) then + printlog "task pane exists" + else + warnlog "task pane does not exists" + endif + + call hCloseDocument + + iStatus = hExtensionRemoveGUI("TaskPaneComponent.oxt") + if(iStatus <> 0 ) then + warnlog "extension could not deinstalled. ErrorCode is " + iStatus + goto endsub + endif + +endcase diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/build.xml b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/build.xml new file mode 100755 index 000000000000..4428a95f551b --- /dev/null +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/build.xml @@ -0,0 +1,72 @@ + + + + + + Builds, tests, and runs the project extension project. + + + + diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/build-impl.xml b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/build-impl.xml new file mode 100755 index 000000000000..f01ad79df06e --- /dev/null +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/build-impl.xml @@ -0,0 +1,794 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set src.dir + Must set build.dir + Must set dist.dir + Must set build.classes.dir + Must set dist.javadoc.dir + Must set build.test.classes.dir + Must set build.test.results.dir + Must set build.classes.excludes + Must set dist.jar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + To run this application from the command line without Ant, try: + + + + + + + java -cp "${run.classpath.with.dist.jar}" ${main.class} + + + + + + + + + + + + + + + + + + + + + + + To run this application from the command line without Ant, try: + + java -jar "${dist.jar.resolved}" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + Must select one file in the IDE or set run.class + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set debug.class + + + + + Must select one file in the IDE or set debug.class + + + + + Must set fix.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + Some tests failed; see details above. + + + + + + + + + Must select some files in the IDE or set test.includes + + + + Some tests failed; see details above. + + + + + Must select one file in the IDE or set test.class + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/build-uno-impl.xml b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/build-uno-impl.xml new file mode 100755 index 000000000000..25b3f25f86c7 --- /dev/null +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/build-uno-impl.xml @@ -0,0 +1,462 @@ + + + + Builds, tests, and runs an UNO project. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + This target can only run inside the NetBeans IDE. + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/genfiles.properties b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/genfiles.properties new file mode 100755 index 000000000000..e4e5fc11997d --- /dev/null +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/genfiles.properties @@ -0,0 +1,8 @@ +build.xml.data.CRC32=2b754fcd +build.xml.script.CRC32=0a20deac +build.xml.stylesheet.CRC32=d5b6853a +# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. +# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. +nbproject/build-impl.xml.data.CRC32=54a58ff4 +nbproject/build-impl.xml.script.CRC32=25927849 +nbproject/build-impl.xml.stylesheet.CRC32=576378a2@1.32.1.45 diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/private/config.properties b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/private/config.properties new file mode 100755 index 000000000000..e69de29bb2d1 diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/private/private.properties b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/private/private.properties new file mode 100755 index 000000000000..c090eb0e8f9c --- /dev/null +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/private/private.properties @@ -0,0 +1,6 @@ +compile.on.save=false +do.depend=false +do.jar=true +javac.debug=true +javadoc.preview=true +user.properties.file=/localuser/qamsc/.netbeans/6.8/build.properties diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project-uno.properties b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project-uno.properties new file mode 100755 index 000000000000..35a0535e7d02 --- /dev/null +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project-uno.properties @@ -0,0 +1,18 @@ +uno.project.type=office.component.project +project.name=TaskPaneComponent +registration.classname=com.example.TaskPaneComponent +external.jar.dir=lib +idl_types.jar=TaskPaneComponent_IDL_types.jar +central.registration.class=com.example.CentralRegistrationClass +# extensions for files that go into the .oxt package; some are also referenced in the manifest +manifest.package.extensions=**/*.xcu,**/*.xcs,**/*.xdl,**/*.xlb,**/*.xba,**/*.properties,**/*.default +imgae.extensions=**/*.png,**/*.jpg,**/*.jpeg,**/*.gif +help.content.extensions=**/*.xhp,**/*.tree,${image.extensions} +dialog.content.extensions=**/*.xdl,**/*.properties,**/*.default,${image.extensions} +office.startup.options= +images.dir=images +registry.dir=registry +help.dir=help +dialogs.dir=dialogs +licenses.dir=licenses +description.dir=description diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project.properties b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project.properties new file mode 100755 index 000000000000..b6059cf3113c --- /dev/null +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project.properties @@ -0,0 +1,67 @@ +application.args= +application.title=TaskPaneComponent +application.vendor=qamsc +build.classes.dir=${build.dir}/classes +build.classes.excludes=**/*.java,**/*.form,**/*.xcu,**/*.xcs,**/*.idl,**/*manifest.xml +# This directory is removed when the project is cleaned: +build.dir=build +build.generated.dir=${build.dir}/generated +build.generated.sources.dir=${build.dir}/generated-sources +# Only compile against the classpath explicitly listed here: +build.sysclasspath=ignore +build.test.classes.dir=${build.dir}/test/classes +build.test.results.dir=${build.dir}/test/results +debug.classpath=\ + ${run.classpath} +debug.test.classpath=\ + ${run.test.classpath} +# This directory is removed when the project is cleaned: +dist.dir=dist +dist.jar=${dist.dir}/TaskPaneComponent.jar +dist.javadoc.dir=${dist.dir}/javadoc +endorsed.classpath= +excludes= +file.reference.juh.jar=../../office/slidecopy/openoffice.org/ure/share/java/juh.jar +file.reference.jurt.jar=../../office/slidecopy/openoffice.org/ure/share/java/jurt.jar +file.reference.ridl.jar=../../office/slidecopy/openoffice.org/ure/share/java/ridl.jar +file.reference.unoil.jar=../../office/slidecopy/openoffice.org/basis3.3/program/classes/unoil.jar +includes=** +jar.compress=false +javac.classpath=\ + ${file.reference.unoil.jar}:\ + ${file.reference.juh.jar}:\ + ${file.reference.jurt.jar}:\ + ${file.reference.ridl.jar} +# Space-separated list of extra javac options +javac.compilerargs= +javac.deprecation=false +javac.source=1.5 +javac.target=1.5 +javac.test.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir}:\ + ${libs.junit.classpath} +javadoc.additionalparam= +javadoc.author=false +javadoc.encoding= +javadoc.noindex=false +javadoc.nonavbar=false +javadoc.notree=false +javadoc.private=false +javadoc.splitindex=true +javadoc.use=true +javadoc.version=false +javadoc.windowtitle= +meta.inf.dir=${src.dir}/META-INF +platform.active=default_platform +run.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +# Space-separated list of JVM arguments used when running the project +# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value +# or test-sys-prop.name=value to set system properties for unit tests): +run.jvmargs= +run.test.classpath=\ + ${javac.test.classpath}:\ + ${build.test.classes.dir} +src.dir=src diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project.xml b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project.xml new file mode 100755 index 000000000000..43c253f3c7e5 --- /dev/null +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project.xml @@ -0,0 +1,14 @@ + + + org.netbeans.modules.java.j2seproject + + + TaskPaneComponent + 1.6.5 + + + + + + + diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu new file mode 100755 index 000000000000..ba2c8c692d4e --- /dev/null +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu @@ -0,0 +1,23 @@ + + + + + + + ein Panel + + + true + + + + + noch ein Panel + + + true + + + + + diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/registry/data/org/openoffice/Office/UI/Factories.xcu b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/registry/data/org/openoffice/Office/UI/Factories.xcu new file mode 100755 index 000000000000..90dce8595a1b --- /dev/null +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/registry/data/org/openoffice/Office/UI/Factories.xcu @@ -0,0 +1,35 @@ + + + + + + + toolpanel + + + com.example.TestPanel1 + + + + + + com.example.TaskPaneComponent + + + + + toolpanel + + + com.example.TestPanel2 + + + + + + com.example.TaskPaneComponent + + + + + diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/CentralRegistrationClass.java b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/CentralRegistrationClass.java new file mode 100755 index 000000000000..5276f584aa3e --- /dev/null +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/CentralRegistrationClass.java @@ -0,0 +1,140 @@ +/************************************************************************* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package com.example; + +import com.sun.star.lang.XSingleComponentFactory; +import com.sun.star.registry.XRegistryKey; +import java.io.IOException; +import java.lang.reflect.Method; +import java.net.JarURLConnection; +import java.net.URL; +import java.util.Enumeration; +import java.util.StringTokenizer; +import java.util.jar.Attributes; +import java.util.jar.Manifest; + +/** + * + * @author Marc Neumann + */ +public class CentralRegistrationClass +{ + + public static XSingleComponentFactory __getComponentFactory(String sImplementationName) + { + String regClassesList = getRegistrationClasses(); + StringTokenizer t = new StringTokenizer(regClassesList, " "); + while (t.hasMoreTokens()) + { + String className = t.nextToken(); + if (className != null && className.length() != 0) + { + try + { + Class regClass = Class.forName(className); + Method writeRegInfo = regClass.getDeclaredMethod("__getComponentFactory", new Class[] + { + String.class + }); + Object result = writeRegInfo.invoke(regClass, sImplementationName); + if (result != null) + { + return (XSingleComponentFactory) result; + } + } + catch (Exception ex) + { + ex.printStackTrace(); + } + } + } + return null; + } + + public static boolean __writeRegistryServiceInfo(XRegistryKey xRegistryKey) + { + boolean bResult = true; + String regClassesList = getRegistrationClasses(); + StringTokenizer t = new StringTokenizer(regClassesList, " "); + while (t.hasMoreTokens()) + { + String className = t.nextToken(); + if (className != null && className.length() != 0) + { + try + { + Class regClass = Class.forName(className); + Method writeRegInfo = regClass.getDeclaredMethod("__writeRegistryServiceInfo", new Class[] + { + XRegistryKey.class + }); + Object result = writeRegInfo.invoke(regClass, xRegistryKey); + bResult &= ((Boolean) result).booleanValue(); + } + catch (Exception ex) + { + ex.printStackTrace(); + } + } + } + return bResult; + } + + private static String getRegistrationClasses() + { + CentralRegistrationClass c = new CentralRegistrationClass(); + String name = c.getClass().getCanonicalName().replace('.', '/').concat(".class"); + try + { + Enumeration urlEnum = c.getClass().getClassLoader().getResources("META-INF/MANIFEST.MF"); + while (urlEnum.hasMoreElements()) + { + URL url = urlEnum.nextElement(); + String file = url.getFile(); + JarURLConnection jarConnection = (JarURLConnection) url.openConnection(); + Manifest mf = jarConnection.getManifest(); + + Attributes attrs = (Attributes) mf.getAttributes(name); + if (attrs != null) + { + String classes = attrs.getValue("RegistrationClasses"); + return classes; + } + } + } + catch (IOException ex) + { + ex.printStackTrace(); + } + + return ""; + } + + /** Creates a new instance of CentralRegistrationClass */ + private CentralRegistrationClass() + { + } +} diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/TaskPaneComponent.java b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/TaskPaneComponent.java new file mode 100755 index 000000000000..0c5fdb782fad --- /dev/null +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/TaskPaneComponent.java @@ -0,0 +1,116 @@ +/************************************************************************* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package com.example; + +import com.sun.star.awt.XWindow; +import com.sun.star.frame.XFrame; +import com.sun.star.uno.XComponentContext; +import com.sun.star.lib.uno.helper.Factory; +import com.sun.star.lang.XSingleComponentFactory; +import com.sun.star.registry.XRegistryKey; +import com.sun.star.lib.uno.helper.WeakBase; +import com.sun.star.uno.UnoRuntime; + +public final class TaskPaneComponent extends WeakBase + implements com.sun.star.ui.XUIElementFactory, + com.sun.star.lang.XServiceInfo +{ + + private final XComponentContext m_xContext; + private static final String m_implementationName = TaskPaneComponent.class.getName(); + private static final String[] m_serviceNames = + { + "com.sun.star.ui.UIElementFactory" + }; + + public TaskPaneComponent(XComponentContext context) + { + m_xContext = context; + } + + public static XSingleComponentFactory __getComponentFactory(String sImplementationName) + { + XSingleComponentFactory xFactory = null; + + if (sImplementationName.equals(m_implementationName)) + { + xFactory = Factory.createComponentFactory(TaskPaneComponent.class, m_serviceNames); + } + return xFactory; + } + + public static boolean __writeRegistryServiceInfo(XRegistryKey xRegistryKey) + { + return Factory.writeRegistryServiceInfo(m_implementationName, + m_serviceNames, + xRegistryKey); + } + + public com.sun.star.ui.XUIElement createUIElement(String ResourceURL, com.sun.star.beans.PropertyValue[] creationArgs) throws com.sun.star.container.NoSuchElementException, com.sun.star.lang.IllegalArgumentException + { + + XFrame docFrame = null; + XWindow panelParentWindow = null; + for (int i = 0; i < creationArgs.length; ++i) + { + if (creationArgs[i].Name.equals("Frame")) + { + docFrame = UnoRuntime.queryInterface(XFrame.class, creationArgs[i].Value); + } else if (creationArgs[i].Name.equals("ParentWindow")) + { + panelParentWindow = UnoRuntime.queryInterface(XWindow.class, creationArgs[i].Value); + } + } + + return new ToolPanelUIElement(m_xContext, docFrame, panelParentWindow); + + } + + // com.sun.star.lang.XServiceInfo: + public String getImplementationName() + { + return m_implementationName; + } + + public boolean supportsService(String sService) + { + int len = m_serviceNames.length; + + for (int i = 0; i < len; i++) + { + if (sService.equals(m_serviceNames[i])) + { + return true; + } + } + return false; + } + + public String[] getSupportedServiceNames() + { + return m_serviceNames; + } +} diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanel.java b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanel.java new file mode 100755 index 000000000000..a28e07d5847b --- /dev/null +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanel.java @@ -0,0 +1,56 @@ +/************************************************************************* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +package com.example; + +import com.sun.star.accessibility.XAccessible; +import com.sun.star.awt.XWindow; +import com.sun.star.ui.XToolPanel; +import com.sun.star.uno.UnoRuntime; + +/** + * + * @author frank.schoenheit@sun.com + */ +public class ToolPanel implements XToolPanel +{ + ToolPanel( final XWindow i_panelWindow ) + { + m_panelWindow = i_panelWindow; + } + + public XWindow getWindow() + { + return m_panelWindow; + } + + public XAccessible createAccessible( XAccessible i_parentAccessible ) + { + return UnoRuntime.queryInterface( XAccessible.class, m_panelWindow ); + } + + private XWindow m_panelWindow; +} diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanelUIElement.java b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanelUIElement.java new file mode 100755 index 000000000000..6fb17d17f3d6 --- /dev/null +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/com/example/ToolPanelUIElement.java @@ -0,0 +1,153 @@ +/************************************************************************* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +package com.example; + +import com.sun.star.awt.XContainerWindowProvider; +import com.sun.star.awt.XWindow; +import com.sun.star.awt.XWindowPeer; +import com.sun.star.deployment.PackageInformationProvider; +import com.sun.star.deployment.XPackageInformationProvider; +import com.sun.star.frame.XFrame; +import com.sun.star.lang.DisposedException; +import com.sun.star.lang.XComponent; +import com.sun.star.lib.uno.helper.ComponentBase; +import com.sun.star.ui.UIElementType; +import com.sun.star.ui.XUIElement; +import com.sun.star.uno.UnoRuntime; +import com.sun.star.uno.XComponentContext; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * + * @author frank.schoenheit@sun.com + */ +public class ToolPanelUIElement extends ComponentBase implements XUIElement +{ + + protected final XFrame m_docFrame; + protected final XWindow m_parentWindow; + private XWindow m_panelRootWindow = null; + private Object m_toolPanel = null; + XComponentContext context = null; + + + protected ToolPanelUIElement( XComponentContext _context, final XFrame i_docFrame, final XWindow i_parentWindow ) + { + context = _context; + m_docFrame = i_docFrame; + m_parentWindow = i_parentWindow; + } + + public static String getResourceURLBase() + { + return "private:resource/toolpanel/com.example.TaskPaneComponent/"; + } + + // XUIElement overridables + public XFrame getFrame() { return m_docFrame; } + public short getType() { return UIElementType.TOOLPANEL; } + public String getResourceURL() { return getResourceURLBase() + getPanelResourceURLSuffix(); } + + public Object getRealInterface() + { + synchronized( this ) + { + if ( this.bDisposed || this.bInDispose ) + throw new DisposedException( new String(), this ); + + if ( m_toolPanel == null ) + m_toolPanel = new ToolPanel( getOrCreatePanelRootWindow() ); + } + return m_toolPanel; + } + + // own overridables + /** returns the name of the dialog description file of the tool panel, without .xdl suffix + */ + protected String getPanelResourceLocation() + { + return "TaskPaneComponentUI"; + + } + + /** returns the resource URL suffix to use for the tool panel + * @return + */ + protected String getPanelResourceURLSuffix() + { + return "TaskPaneComponentUI"; + } + + + // ComponentBase overridables + protected void postDisposing() + { + super.postDisposing(); + synchronized ( this ) + { + if ( m_panelRootWindow != null ) + { + XComponent panelWindowComp = UnoRuntime.queryInterface( XComponent.class, m_panelRootWindow ); + panelWindowComp.dispose(); + m_panelRootWindow = null; + + } + m_toolPanel = null; + } + } + + // helpers + synchronized private XWindow getOrCreatePanelRootWindow() + { + try + { + XPackageInformationProvider pip = PackageInformationProvider.get(context); + String s = pip.getPackageLocation("com.example.TaskPaneComponent"); + + String dialogUrl = s + "/toolpanels/" + getPanelResourceLocation() + ".xdl"; + + XContainerWindowProvider provider = UnoRuntime.queryInterface( + XContainerWindowProvider.class, + context.getServiceManager().createInstanceWithContext("com.sun.star.awt.ContainerWindowProvider",context) + ); + + m_panelRootWindow = provider.createContainerWindow( + dialogUrl, + "", + UnoRuntime.queryInterface( XWindowPeer.class, m_parentWindow ), + null + ); + + } + catch ( final Exception e ) + { + Logger.getLogger( ToolPanelUIElement.class.getName() ).log( Level.SEVERE, null, e ); + } + return m_panelRootWindow; + } +} diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/description.xml b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/description.xml new file mode 100755 index 000000000000..9e32a6e8bfed --- /dev/null +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/description.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/toolpanels/TaskPaneComponentUI.xdl b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/toolpanels/TaskPaneComponentUI.xdl new file mode 100755 index 000000000000..7820e3d52c59 --- /dev/null +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/toolpanels/TaskPaneComponentUI.xdl @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/uno-extension-manifest.xml b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/uno-extension-manifest.xml new file mode 100755 index 000000000000..d49fe3d726ee --- /dev/null +++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/uno-extension-manifest.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file -- cgit From de88dd27c8f3d4e71f120ce604c5aa4b493ab528 Mon Sep 17 00:00:00 2001 From: "Marc Neumann [msc]" Date: Fri, 21 May 2010 12:03:28 +0200 Subject: slidecopy: changes for the new taskpane implementation --- .../optional/includes/global/g_demoguide.inc | 49 ++++++++++++++++++---- 1 file changed, 41 insertions(+), 8 deletions(-) diff --git a/testautomation/graphics/optional/includes/global/g_demoguide.inc b/testautomation/graphics/optional/includes/global/g_demoguide.inc index 2187045f5aca..f073940adc97 100755 --- a/testautomation/graphics/optional/includes/global/g_demoguide.inc +++ b/testautomation/graphics/optional/includes/global/g_demoguide.inc @@ -136,7 +136,7 @@ testcase t_Introduction DocumentImpress.TypeKeys "" hOpenContextMenu '(when the object is marked) hMenuSelectNr(12) - + '///Add Layout "Title Only" Printlog "Add Layout" kontext "Tasks" @@ -144,38 +144,71 @@ testcase t_Introduction warnlog "Tasks Panel not visible. Opening now." ViewTaskPane endif + + ' enable all items in the task pane. + ' may be one item is not enabled due to a previous testrun + dim i as integer + for i = 1 to 5 + printlog i + View.OpenMenu + if ( MenuIsItemChecked(MenuGetItemID(i)) ) then + ' do nothing the item is allready displayed + else + MenuSelect(MenuGetItemId(4)) + endif + hMenuSelectNr(0) + 'sleep(1) + next + View.OpenMenu MenuSelect(MenuGetItemId(1)) + View.OpenMenu + MenuSelect(MenuGetItemId(3)) + View.OpenMenu + MenuSelect(MenuGetItemId(4)) + View.OpenMenu + MenuSelect(MenuGetItemId(5)) + + LayoutsPreview.TypeKeys " " sleep (5) '///Add a background Printlog "Add background" - + Kontext "Tasks" printlog "Deselect all tabs from view menu in task pane except the needed." View.OpenMenu - MenuSelect(MenuGetItemID(5)) + MenuSelect(MenuGetItemID(5)) View.OpenMenu - MenuSelect(MenuGetItemID(4)) + MenuSelect(MenuGetItemID(4)) View.OpenMenu MenuSelect(MenuGetItemID(3)) View.OpenMenu MenuSelect(MenuGetItemID(2)) + sleep(5) View.OpenMenu MenuSelect(MenuGetItemID(1)) + Tasks.TypeKeys "",true + Tasks.TypeKeys "",true AvailableForUsePreview.TypeKeys " " - sleep (5) + sleep (5) '///Add a transition effect Printlog "Add a transition effect" Kontext "Tasks" - View.OpenMenu - MenuSelect(MenuGetItemID(5)) + sleep(5) View.OpenMenu MenuSelect(MenuGetItemID(1)) + View.OpenMenu + MenuSelect(MenuGetItemID(2)) + View.OpenMenu + MenuSelect(MenuGetItemID(3)) + View.OpenMenu + MenuSelect(MenuGetItemID(4)) + TransitionSound.GetItemCount 'needed for select Sleep 1 TransitionSound.Select 4 - + '///Close the document Printlog "Close the document" Call hCloseDocument -- cgit From 5cbe50652eaa9fb8279d9b1cf90255ff7b1a037b Mon Sep 17 00:00:00 2001 From: Ingrid Halama Date: Wed, 26 May 2010 10:21:48 +0200 Subject: chart47: #i83868# correct test and assertion for property 'SymbolBitmapURL' --- qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java | 4 ++-- qadevOOo/tests/java/ifc/chart/_LineDiagram.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java b/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java index 99a89cf3373d..2ae9ac7fa36b 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java @@ -45,7 +45,7 @@ import com.sun.star.chart.XDiagram; *

* The following predefined files needed to complete the test: *

    -*
  • poliball.gif : +*
  • space-metal.jpg : * for test of property 'SymbolBitmapURL'
    • *

      * This test needs the following object relations : @@ -79,7 +79,7 @@ public class _ChartDataPointProperties extends MultiPropertyTest { protected PropertyTester URLTester = new PropertyTester() { protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { - return utils.getFullTestURL("poliball.gif"); + return utils.getFullTestURL("space-metal.jpg"); } }; diff --git a/qadevOOo/tests/java/ifc/chart/_LineDiagram.java b/qadevOOo/tests/java/ifc/chart/_LineDiagram.java index 37635266715d..a2555ea26f69 100644 --- a/qadevOOo/tests/java/ifc/chart/_LineDiagram.java +++ b/qadevOOo/tests/java/ifc/chart/_LineDiagram.java @@ -48,7 +48,7 @@ import com.sun.star.uno.UnoRuntime; *

    * The following predefined files needed to complete the test: *

      -*
    • poliball.gif : +*
    • space-metal.jpg : * for test of property 'SymbolBitmapURL'
      • *
    • crazy-blue.jpg : * for test of property 'SymbolBitmapURL'
      • @@ -97,9 +97,9 @@ public class _LineDiagram extends MultiPropertyTest { protected PropertyTester URLTester = new PropertyTester() { protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { - if (oldValue.equals(util.utils.getFullTestURL("poliball.gif"))) + if (oldValue.equals(util.utils.getFullTestURL("space-metal.jpg"))) return util.utils.getFullTestURL("crazy-blue.jpg"); else - return util.utils.getFullTestURL("poliball.gif"); + return util.utils.getFullTestURL("space-metal.jpg"); } } ; -- cgit From 497ecdcb53b21c41382e4873926d5f41f252e4be Mon Sep 17 00:00:00 2001 From: Thorsten Bosbach Date: Wed, 26 May 2010 16:33:49 +0200 Subject: #i111851 macos X masking --- testautomation/graphics/optional/includes/global/export_graphic.inc | 4 ++++ testautomation/math/required/includes/m_005_.inc | 4 ++++ 2 files changed, 8 insertions(+) mode change 100644 => 100755 testautomation/graphics/optional/includes/global/export_graphic.inc mode change 100644 => 100755 testautomation/math/required/includes/m_005_.inc diff --git a/testautomation/graphics/optional/includes/global/export_graphic.inc b/testautomation/graphics/optional/includes/global/export_graphic.inc old mode 100644 new mode 100755 index d60872022166..7c16129e41ae --- a/testautomation/graphics/optional/includes/global/export_graphic.inc +++ b/testautomation/graphics/optional/includes/global/export_graphic.inc @@ -119,7 +119,11 @@ testcase tEPS sleep 5 hNewDocument() sleep 5 + if ( lcase( gPlatform ) <> "osx" ) then Call hGrafikEinfuegen ( OutputGrafikTBO+sExt ) + else + qaErrorLog "#i100253# crash on MacOS X 10.4" + endif endif call hCloseDocument diff --git a/testautomation/math/required/includes/m_005_.inc b/testautomation/math/required/includes/m_005_.inc old mode 100644 new mode 100755 index 2b567c628b18..bb580b9bd9c3 --- a/testautomation/math/required/includes/m_005_.inc +++ b/testautomation/math/required/includes/m_005_.inc @@ -168,6 +168,7 @@ testcase tToolsExtensionManager dim sTemp2 as string dim x as integer + if ( lcase( gPlatform ) <> "osx" ) then sPath = convertPath(gTestToolPath+"math/required/input/") '/// open application ///' Call hNewDocument @@ -306,4 +307,7 @@ testcase tToolsExtensionManager warnlog "Couldn't call Tools -> Package manager - aborting test" endif Call hCloseDocument + else + qaErrorLog "Do not run on macosx - not reproduceable error" + endif endcase -- cgit From ab9ef20ecba8d507bfcd76e7cc35a4a84bda1c60 Mon Sep 17 00:00:00 2001 From: Thorsten Bosbach Date: Wed, 26 May 2010 17:03:41 +0200 Subject: #i111851 macos X masking --- .../optional/includes/basic_gridcontrol.inc | 79 ++++----------------- .../framework/optional/input/gridcontrol.odt | Bin 11602 -> 12063 bytes 2 files changed, 15 insertions(+), 64 deletions(-) mode change 100644 => 100755 testautomation/framework/optional/includes/basic_gridcontrol.inc diff --git a/testautomation/framework/optional/includes/basic_gridcontrol.inc b/testautomation/framework/optional/includes/basic_gridcontrol.inc old mode 100644 new mode 100755 index dc96ef30e16c..0056032435ee --- a/testautomation/framework/optional/includes/basic_gridcontrol.inc +++ b/testautomation/framework/optional/includes/basic_gridcontrol.inc @@ -54,72 +54,23 @@ testcase tGridcontrolLoad call sleep 1 printlog "Start the macro, that performs the test" - printlog "Tools->Macros->Run Macro..." - ToolsMacrosRunMacro - Kontext "ScriptSelector" - if ScriptSelector.exists(10) then - x = LibraryTreeList.getItemCount - printlog "Look for library 'gridcontrol'" - for i = 1 to x - sTemp = LibraryTreeList.getItemText(i) - 'printlog "("+i+"/"+x+"): '" + sTemp + "'" - if (instr(sTemp,"gridcontrol")>0 OR instr(sTemp,"GRIDCONTROL")) then - a = i - printlog "Found library ("+i+"/"+x+"): '" + sTemp + "'" - endif + Kontext "GridControlDialogStarter" + ShowGridcontrol.typeKeys "" + Kontext "GridControlDialog" + if GridControlDialog.exists(5) then + for i=1 to gridcontrolcontrol.getcolumncount + for a=1 to gridcontrolcontrol.getrowcount + printlog " " + i + ":"+a+": '" + gridcontrolcontrol.getitemtype (i,a) + "' '" + gridcontrolcontrol.getitemtext (i,a) + "'" + next a next i - if 0 <> a then - printlog "Select the library and unfold it" - LibraryTreeList.select(a) - LibraryTreeList.typeKeys("+") - printlog "Go to 'Standard' and unfold" - LibraryTreeList.typeKeys("") - LibraryTreeList.typeKeys("+") - printlog "Go to 'Module1'" - LibraryTreeList.typeKeys("") - - printlog "Select macro name 'VclTestTool'" - x = ScriptList.getItemCount - for i = 1 to x - sTemp = ScriptList.getItemText(i) - 'printlog "("+i+"/"+x+"): '" + sTemp + "'" - if "VclTestTool" = sTemp then - a = i - printlog "Found macro ("+i+"/"+x+"): '" + sTemp + "'" - endif - next i - if (0 <> a) then - printlog "Select the macro" - ScriptList.select(a) - printlog "Start the macro by pressing the button 'run'" - ScriptSelector.ok - printlog "sleep... at least 60 seconds" - call sleep(60) - printlog "If macro fails for whatever reason, a message comes up" - Kontext - if active.exists() then - warnlog "" + active.getText - active.ok - try - EditCopy - warnlog getclipboard() - catch - endcatch - printlog "close basic ide" - call hCloseDocument() - printlog "close document" - call hCloseDocument() - goto endsub - endif - - else - warnlog sLocation + "Macro not found: 'Main'" - endif - else - warnlog sLocation + "Library not found: 'gridcontrol'" - endif + gridcontrolcontrol.select 5 + gridcontrolcontrol.typeKeys("") + gridcontrolcontrol.typeKeys("") + gridcontrolcontrol.typeKeys("") + gridcontrolcontrol.typeKeys("") + GridControlDialog.close else - warnlog sLocation + "'Run macro dialog' didn't came up" + warnlog "Gridcontrol Dialog did not come up after pressing button" endif printlog "clean up" diff --git a/testautomation/framework/optional/input/gridcontrol.odt b/testautomation/framework/optional/input/gridcontrol.odt index b3e5c6fb40bb..eed0bbaba84c 100755 Binary files a/testautomation/framework/optional/input/gridcontrol.odt and b/testautomation/framework/optional/input/gridcontrol.odt differ -- cgit From c0df6fa7c33026ad716235ba40caf22595d494bf Mon Sep 17 00:00:00 2001 From: Thorsten Bosbach Date: Wed, 26 May 2010 18:55:09 +0200 Subject: #i111822 macos X masking --- .../required/includes/script_organizers.inc | 49 +++++++++++++++------- 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/testautomation/framework/required/includes/script_organizers.inc b/testautomation/framework/required/includes/script_organizers.inc index feb72680c9c3..6d14b7f77f6e 100755 --- a/testautomation/framework/required/includes/script_organizers.inc +++ b/testautomation/framework/required/includes/script_organizers.inc @@ -32,21 +32,39 @@ '\****************************************************************************** testcase tUpdtScriptCount + dim sDialog as string printlog( "Resource test for macros and scripts / related dialogs" ) const SCRIPTING_DIALOGS = 5 dim aScriptCount( SCRIPTING_DIALOGS ) + ' JavaScript aScriptCount( 1 ) = 10 + ' BeanShell aScriptCount( 2 ) = 14 - aScriptCount( 3 ) = 10 - if ( gOOo ) then - aScriptCount( 4 ) = 585 - aScriptCount( 5 ) = 601 - else - aScriptCount( 4 ) = 586 - aScriptCount( 5 ) = 602 - endif + if ( lcase( gPlatform ) = "osx" ) then + ' Python + aScriptCount( 3 ) = 8 + else + ' Python + aScriptCount( 3 ) = 10 + endif + if ( lcase( gPlatform ) = "osx" ) then + ' Run Macro + aScriptCount( 5 ) = 600 + else + ' Run Macro + aScriptCount( 5 ) = 602 + endif + if ( gOOo ) then + ' Makro Organizer + aScriptCount( 4 ) = 585 + ' Run Macro + aScriptCount( 5 ) = aScriptCount( 5 ) - 1 + else + ' Makro Organizer + aScriptCount( 4 ) = 586 + endif dim iCurrentDialog as integer dim iCurrentScriptCount as integer @@ -57,37 +75,39 @@ testcase tUpdtScriptCount printlog( "" ) select case iCurrentDialog - case 1: printlog( "JavaScript" ) + case 1: sDialog = "JavaScript" ToolsMacrosOrganizeMacrosJavaScript kontext "ScriptOrganizer" iCurrentScriptCount = hExpandAllNodes( ScriptTreeList ) ScriptOrganizer.cancel() - case 2: printlog( "BeanShell" ) + case 2: sDialog = "BeanShell" ToolsMacrosOrganizeMacrosBeanShell kontext "ScriptOrganizer" iCurrentScriptCount = hExpandAllNodes( ScriptTreeList ) ScriptOrganizer.cancel() - case 3: printlog( "Python" ) + case 3: sDialog = "Python" ToolsMacrosOrganizeMacrosPython kontext "ScriptOrganizer" iCurrentScriptCount = hExpandAllNodes( ScriptTreeList ) ScriptOrganizer.cancel() - case 4: printlog( "Makro Organizer" ) + case 4: sDialog = "Makro Organizer" ToolsMacro_uno Kontext "Makro" hExpandAllNodes( MakroAus ) iCurrentScriptCount = hGetScriptCount( MakroAus, MakroListe ) Makro.close() - case 5: printlog( "Run Macro" ) + case 5: sDialog = "Run Macro" ToolsMacrosRunMacro kontext "ScriptSelector" hExpandAllNodes( LibraryTreeList ) iCurrentScriptCount = hGetScriptCount( LibraryTreeList, ScriptList ) ScriptSelector.cancel() end select + + printlog sDialog if ( aScriptCount( iCurrentDialog ) <> iCurrentScriptCount ) then - warnlog( "Incorrect number of scripts for this dialog: " & iCurrentScriptCount ) + warnlog( "Incorrect number of scripts for this dialog: '" + sDialog + "' expected:" + aScriptCount( iCurrentDialog ) + ", but is:" & iCurrentScriptCount ) else printlog( "Number of scripts is ok" ) endif @@ -95,7 +115,6 @@ testcase tUpdtScriptCount next iCurrentDialog hCloseDocument() - endcase -- cgit From da1dd3a4f1f4fff933b47179cbe615958a0cdb07 Mon Sep 17 00:00:00 2001 From: Thorsten Bosbach Date: Thu, 27 May 2010 17:23:30 +0200 Subject: #i111881 new testtool script fixes --- testautomation/writer/optional/includes/regexp/search.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testautomation/writer/optional/includes/regexp/search.inc b/testautomation/writer/optional/includes/regexp/search.inc index ce3d946fe3b9..352ce5a2e35e 100755 --- a/testautomation/writer/optional/includes/regexp/search.inc +++ b/testautomation/writer/optional/includes/regexp/search.inc @@ -79,13 +79,13 @@ testcase tCheckDialog if SearchAll.IsEnabled then Warnlog "Without Search-for-entry Find-All is active!" if SearchNow.IsEnabled then Warnlog "Without Search-for-entry Find is active!" if ReplaceAll.IsEnabled then Warnlog "Without Search-for-entry Replace-All is active!" - if Replace.IsEnabled then Warnlog "Without Search-for-entry Replace is active!" + if ReplaceBtn.IsEnabled then Warnlog "Without Search-for-entry Replace is active!" if NoFormat.IsEnabled then Warnlog "Without selecting Formats , No-Format is active!" SearchFor.SetText "Hallo" if NOT SearchAll.IsEnabled then Warnlog "Containing Search-for-entry Find-All is inactive!" if NOT SearchNow.IsEnabled then Warnlog "Containing Search-for-entry Find inactive!" if NOT ReplaceAll.IsEnabled then Warnlog "Containing Search-for-entry Replace-All is inactive!" - if NOT Replace.IsEnabled then Warnlog "Containing Search-for-entry Replace is inactive!" + if NOT ReplaceBtn.IsEnabled then Warnlog "Containing Search-for-entry Replace is inactive!" Sleep 5 printlog "- Dependencies of Format-Properties" -- cgit From 39e61a783672e41ac76ba6141978c6ba98248add Mon Sep 17 00:00:00 2001 From: Thorsten Bosbach Date: Thu, 27 May 2010 19:11:42 +0200 Subject: #i111883 crash on .uncheck --- testautomation/writer/tools/includes/w_tools.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) mode change 100644 => 100755 testautomation/writer/tools/includes/w_tools.inc diff --git a/testautomation/writer/tools/includes/w_tools.inc b/testautomation/writer/tools/includes/w_tools.inc old mode 100644 new mode 100755 index 8fa05c23bbc9..122a44f7da53 --- a/testautomation/writer/tools/includes/w_tools.inc +++ b/testautomation/writer/tools/includes/w_tools.inc @@ -1052,7 +1052,10 @@ sub wOptionsUndo ( sOption$ ) Call hToolsOptions("WRITER","Autocaption") for i = 1 to ObjectList.GetItemCount ObjectList.Select i - ObjectList.UnCheck + ' uncheck only if checked, else it might crash on macosx, see issue 111883 for further information + if ObjectList.getState (i) > 1 then + ObjectList.UnCheck + endif next i end if -- cgit From f9efcb878a31f1f8f9ee3550216879966a872e55 Mon Sep 17 00:00:00 2001 From: "Marc Neumann [msc]" Date: Fri, 28 May 2010 11:47:48 +0200 Subject: dba33f: fix some coding errors --- .../dbaccess/optional/includes/ctrl_Several1.inc | 2 +- .../dbaccess/optional/includes/ctrl_Several2.inc | 9 +++---- .../dbaccess/optional/includes/db_Relations.inc | 14 ++++++---- .../optional/includes/wiz_DatabaseWizard.inc | 31 ---------------------- .../dbaccess/required/includes/MainApp.inc | 5 +++- .../dbaccess/required/includes/Query.inc | 7 +++-- .../dbaccess/required/includes/Table.inc | 5 +++- .../dbaccess/required/includes/TableDesign.inc | 5 +++- testautomation/dbaccess/tools/formtools.inc | 2 +- testautomation/dbaccess/tools/reporttools.inc | 12 ++++----- testautomation/dbaccess/tools/tabletools.inc | 9 ++++--- testautomation/global/win/edia_t_z.win | 2 +- 12 files changed, 43 insertions(+), 60 deletions(-) mode change 100644 => 100755 testautomation/dbaccess/optional/includes/ctrl_Several1.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/ctrl_Several2.inc mode change 100644 => 100755 testautomation/dbaccess/optional/includes/db_Relations.inc mode change 100644 => 100755 testautomation/dbaccess/required/includes/Query.inc mode change 100644 => 100755 testautomation/dbaccess/required/includes/Table.inc mode change 100644 => 100755 testautomation/dbaccess/required/includes/TableDesign.inc mode change 100644 => 100755 testautomation/dbaccess/tools/formtools.inc mode change 100644 => 100755 testautomation/dbaccess/tools/reporttools.inc mode change 100644 => 100755 testautomation/dbaccess/tools/tabletools.inc diff --git a/testautomation/dbaccess/optional/includes/ctrl_Several1.inc b/testautomation/dbaccess/optional/includes/ctrl_Several1.inc old mode 100644 new mode 100755 index 71a581f52cdf..0d7b24cbc0f2 --- a/testautomation/dbaccess/optional/includes/ctrl_Several1.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_Several1.inc @@ -586,7 +586,7 @@ testcase tComboBox endcase '-------------------------------------------------------------------------------------- -testcase tLabelField +testcase tLabelField '/// Open a new document, printlog "Open a new document," diff --git a/testautomation/dbaccess/optional/includes/ctrl_Several2.inc b/testautomation/dbaccess/optional/includes/ctrl_Several2.inc old mode 100644 new mode 100755 index 182be64e9ac8..4d49e459b231 --- a/testautomation/dbaccess/optional/includes/ctrl_Several2.inc +++ b/testautomation/dbaccess/optional/includes/ctrl_Several2.inc @@ -234,12 +234,9 @@ testcase tImageButton printlog "set properties" 'to activate property: scale, following properties must be active: Graphics (with choosen path) Kontext "TabGeneralControl" - if gNetzInst = false then - fsetControlProperty("ImageButton","Graphics", gOfficePath + ConvertPath("share/gallery/bullets/blkpearl.gif")) - else - fsetControlProperty("ImageButton","Graphics", gNetzOfficePath + ConvertPath("share/gallery/bullets/blkpearl.gif")) - endif - sleep(1) + fsetControlProperty("ImageButton","Graphics", gOfficePath + ConvertPath("share/gallery/bullets/blkpearl.gif")) + + sleep(1) TabGeneralControl.TypeKeys "" , true fsetControlProperty("ImageControl","Scale","1") 'listbox content: no 'fsetControlProperty("ImageControl","Frame","4") diff --git a/testautomation/dbaccess/optional/includes/db_Relations.inc b/testautomation/dbaccess/optional/includes/db_Relations.inc old mode 100644 new mode 100755 index 3d10a132d43a..e04a1be4c6d6 --- a/testautomation/dbaccess/optional/includes/db_Relations.inc +++ b/testautomation/dbaccess/optional/includes/db_Relations.inc @@ -32,8 +32,10 @@ '\*********************************************************************** function tRelation( sFileName, sPWD, sRelTable1, sRelTable2 ) '/// create an 1:1 and 1:n relation between two test tables - Dim i, j, ix as integer 'counter - Dim iNoDS as integer 'number of data source in listbox + Dim i as integer 'counter + Dim j as integer 'counter + Dim ix as integer 'counter + Dim iNoDS as integer 'number of data source in listbox Dim iNoTab as integer 'number of tables in grid Dim DSOK as boolean 'datasource present check @@ -206,8 +208,10 @@ end function function tDoubleRelation( sFileName, sPWD, sRelTable1, sRelTable2, sRelTable3 ) '/// create an 1:1 relation, close and save relation dialog, '/// reopen the dialog and add an 1:n relation with third test table - Dim i, j, ix as integer 'counter - Dim iNoDS as integer 'number of data source in listbox + Dim i as integer 'counter + Dim j as integer 'counter + Dim ix as integer 'counter + Dim iNoDS as integer 'number of data source in listbox Dim iNoTab as integer 'number of tables in grid Dim DSOK as boolean 'datasource present check @@ -351,7 +355,7 @@ function tDoubleRelation( sFileName, sPWD, sRelTable1, sRelTable2, sRelTable3 ) if breltablefound <> 1 then 'needed table not found if variable <> 1 warnlog "proper table: " + sRelTable3 + " not found - test abort" - call fCloseRealtionDesign + call fCloseRelationDesign call fCloseDatabase exit function else diff --git a/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc b/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc index eb8dd4a15c35..bd25224ba429 100755 --- a/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc +++ b/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc @@ -233,38 +233,7 @@ qaerrorlog "not yet implemented" endcase '------------------------------------------------------------------------- testcase tAdabas - - qaerrorlog "not yet implemented" - goto endsub - qaerrorlog "not yet implemented" - goto endsub - - if gPlatform = "x86" then - printlog "Adabas doesn't exists under x86." - goto endsub - elseif gOOO then - printlog "Adabas doesn't exists under Openoffice.org." - goto endsub - end if - - dim aDatabaseProperties(6) as string - aDatabaseProperties() = tools_dbtools_fgetAdabasDatabaseProperties() - - ' if and only if no properties are defined in the environment file the test is stopped - if(aDatabaseProperties(1) = "no") then - qaerrorlog "No database properties from Adabas defiened. The Test is stopped here." - goto endsub - endif - - call fCreateAdabasDatasource( sFileName, aDatabaseProperties(2), aDatabaseProperties(3), aDatabaseProperties(4)) - call fOpendatabase(gOfficePath + "user/work/tt_adabas.odb","testuser") - - Kontext "ContainerView" - ViewTables - - call fCloseDatabase(true) - endcase '------------------------------------------------------------------------- testcase tdBase diff --git a/testautomation/dbaccess/required/includes/MainApp.inc b/testautomation/dbaccess/required/includes/MainApp.inc index fa3c1a4b0a14..4d5855ac9bba 100755 --- a/testautomation/dbaccess/required/includes/MainApp.inc +++ b/testautomation/dbaccess/required/includes/MainApp.inc @@ -608,7 +608,10 @@ endcase '------------------------------------------------------------------------- function getMenuItemCount as Integer 'use this function becasue this doesn't count the pick list - Dim i, j, Ende, nID as Integer + Dim i as Integer + Dim j as Integer + Dim Ende as Integer + Dim nID as Integer Sleep 2 j=0 for i=1 to MenuGetItemCount diff --git a/testautomation/dbaccess/required/includes/Query.inc b/testautomation/dbaccess/required/includes/Query.inc old mode 100644 new mode 100755 index d981fd79656e..f6fa45acbdd7 --- a/testautomation/dbaccess/required/includes/Query.inc +++ b/testautomation/dbaccess/required/includes/Query.inc @@ -156,7 +156,7 @@ testcase tSwitchDesign sTableName = TableName.GetSelText printlog "- Add 'biblio' table to query design" if sTableName <> "biblio" then - warnlog "It should be the 'biblio'-database table but it is the '" & SelEntry & "' database table?!" + warnlog "It should be the 'biblio'-database table but it is the '" & sTableName & "' database table?!" goto endsub else AddTable.Click @@ -909,7 +909,10 @@ endcase '------------------------------------------------------------------------- function getMenuItemCount as Integer 'use this function becasue this doesn't count the pick list - Dim i, j, Ende, nID as Integer + Dim i as Integer + Dim j as Integer + Dim Ende as Integer + Dim nID as Integer Sleep 2 j=0 for i=1 to MenuGetItemCount diff --git a/testautomation/dbaccess/required/includes/Table.inc b/testautomation/dbaccess/required/includes/Table.inc old mode 100644 new mode 100755 index 93c9341d5f6a..f7a00c22fcd5 --- a/testautomation/dbaccess/required/includes/Table.inc +++ b/testautomation/dbaccess/required/includes/Table.inc @@ -588,7 +588,10 @@ endcase '------------------------------------------------------------------------- function getMenuItemCount as Integer 'use this function becasue this doesn't count the pick list - Dim i, j, Ende, nID as Integer + Dim i as Integer + Dim j as Integer + Dim Ende as Integer + Dim nID as Integer Sleep 2 j=0 for i=1 to MenuGetItemCount diff --git a/testautomation/dbaccess/required/includes/TableDesign.inc b/testautomation/dbaccess/required/includes/TableDesign.inc old mode 100644 new mode 100755 index 42d86ccd0c5f..9204d34de1b9 --- a/testautomation/dbaccess/required/includes/TableDesign.inc +++ b/testautomation/dbaccess/required/includes/TableDesign.inc @@ -467,7 +467,10 @@ endcase '------------------------------------------------------------------------- function getMenuItemCount as Integer 'use this function becasue this doesn't count the pick list - Dim i, j, Ende, nID as Integer + Dim i as Integer + Dim j as Integer + Dim Ende as Integer + Dim nID as Integer Sleep 2 j=0 for i=1 to MenuGetItemCount diff --git a/testautomation/dbaccess/tools/formtools.inc b/testautomation/dbaccess/tools/formtools.inc old mode 100644 new mode 100755 index 058fa5cb52bd..90d29b647384 --- a/testautomation/dbaccess/tools/formtools.inc +++ b/testautomation/dbaccess/tools/formtools.inc @@ -118,7 +118,7 @@ function fSaveForm( sFormName as string, optional bCloseForm as boolean ) endif fSaveForm = true else - fSaveFrom = false + fSaveForm = false end if if ( IsMissing( bCloseForm ) ) then diff --git a/testautomation/dbaccess/tools/reporttools.inc b/testautomation/dbaccess/tools/reporttools.inc old mode 100644 new mode 100755 index 32a4926edee0..89dd00b504c6 --- a/testautomation/dbaccess/tools/reporttools.inc +++ b/testautomation/dbaccess/tools/reporttools.inc @@ -138,23 +138,23 @@ function fSaveReport( sReportName as string, optional bCloseReport as boolean ) hMenuSelectNr(6) ' the Save Kontext "ReportSaveDialog" - if ReportSaveDialog.exists(3) then - ReportName.setText(sReportName) + if FormSaveDialog.exists(3) then + FormName.setText(sReportName) SaveBtn.Click 'click yes in the overwrite messages box Kontext "MessageBox" if MessageBox.exists(1) then MessageBox.Yes endif - fSaveReport = true + fSaveReport = true else - fSaveFrom = false + fSaveReport = false end if if ( IsMissing( bCloseReport ) ) then ' nothing else - call fCloseReport() + call fCloseReportDesign() end if end function @@ -167,7 +167,7 @@ function fOpenReport(sReportName as string) if ( fFindReport(sReportName) = true ) then printlog "Report found -> open" Kontext "ContainerView" - OpenReport ' uno-Slot .uno:DB/Open + OpenForm ' uno-Slot .uno:DB/Open sleep(1) fOpenReport = true else diff --git a/testautomation/dbaccess/tools/tabletools.inc b/testautomation/dbaccess/tools/tabletools.inc old mode 100644 new mode 100755 index 44887eb78c0f..fb354dcd4a75 --- a/testautomation/dbaccess/tools/tabletools.inc +++ b/testautomation/dbaccess/tools/tabletools.inc @@ -127,7 +127,7 @@ function tCompareMatrixValues(sDSName as string, sRefFileUrl as string, cTable_o endif else if cTable_or_Query = "t" then warnlog "Table: " + sTableName + " not found - Test aborted" - if cTable_or_Query = "q" then warnlog "Table: " + sQueryName + " not found - Test aborted" + if cTable_or_Query = "q" then warnlog "Query: " + sTableName + " not found - Test aborted" endif printlog "*** End Testcase" sleep 1 @@ -203,7 +203,8 @@ function fCreateRefFile(sDSName as string, cTable_or_Query as string, sTableName '/// reading out values from table, create a reference table and input values in printlog "start reading out values from table and writing in ref table" iNumber = Freefile - dim i,j as integer 'counter + dim i as integer 'counter + dim j as integer 'counter Open sRefFileUrl for Output as iNumber for i = 1 to iRowAmount for j = 1 to iColAmount @@ -708,10 +709,10 @@ function fFindTableInBeamer(sDSName1,sTableName1) next i if (bfindTable = false) then - warnlog "Datasource " + sDSName + " not found!" + warnlog "Datasource " + sDSName1 + " not found!" exit function else - printlog "Datasource " + sDSName + " found!" + printlog "Datasource " + sDSName1 + " found!" ' I set the bfindTable flag again back to false ' for the next test of the table bfindTable = false diff --git a/testautomation/global/win/edia_t_z.win b/testautomation/global/win/edia_t_z.win index a53038e79394..d526fe6a18ab 100755 --- a/testautomation/global/win/edia_t_z.win +++ b/testautomation/global/win/edia_t_z.win @@ -2,7 +2,7 @@ TableWindow HID_CTL_TABLEEDIT Fieldname HID_TABDESIGN_NAMECELL FieldType HID_TABDESIGN_TYPECELL -Description HID_TABDESIGN_COMMENTCELL +Description HID_TABDESIGN_HELPTEXT *TablesFilter HID_DSADMIN_TABLE_SUBSCRIPTION Tables HID_DSADMIN_TABLE_SELECTOR -- cgit From 7844f1e00cc847d08783f5eb2089d597fa87ddc8 Mon Sep 17 00:00:00 2001 From: Ingrid Halama Date: Mon, 31 May 2010 13:44:48 +0200 Subject: chart47: #i83866# reset to 2D to speed up following tests --- .../java/ifc/chart/_Chart3DBarProperties.java | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/qadevOOo/tests/java/ifc/chart/_Chart3DBarProperties.java b/qadevOOo/tests/java/ifc/chart/_Chart3DBarProperties.java index f289d68983ce..531ec39478ed 100644 --- a/qadevOOo/tests/java/ifc/chart/_Chart3DBarProperties.java +++ b/qadevOOo/tests/java/ifc/chart/_Chart3DBarProperties.java @@ -93,6 +93,40 @@ public class _Chart3DBarProperties extends MultiPropertyTest { throw new StatusException("Couldn't change Diagram to 3D", e); } } + + /** + * Sets the diagram back to 2D as 2D rendering is much faster for the following tests. + */ + protected void after() { + log.println("Setting Diagram back to 2D"); + XChartDocument doc = (XChartDocument) tEnv.getObjRelation("CHARTDOC"); + if (doc == null) throw new StatusException(Status.failed + ("Relation 'CHARTDOC' not found")); + + log.println("Change Diagram to 3D"); + oObj = (XPropertySet) + UnoRuntime.queryInterface( XPropertySet.class, doc.getDiagram() ); + try { + oObj.setPropertyValue("Dim3D", new Boolean(false)); + } catch(com.sun.star.lang.WrappedTargetException e) { + log.println("Couldn't change Diagram back to 2D"); + e.printStackTrace(log); + throw new StatusException("Couldn't change Diagram back to 2D", e); + } catch(com.sun.star.lang.IllegalArgumentException e) { + log.println("Couldn't change Diagram back to 2D"); + e.printStackTrace(log); + throw new StatusException("Couldn't change Diagram back to 2D", e); + } catch(com.sun.star.beans.PropertyVetoException e) { + log.println("Couldn't change Diagram back to 2D"); + e.printStackTrace(log); + throw new StatusException("Couldn't change Diagram back to 2D", e); + } catch(com.sun.star.beans.UnknownPropertyException e) { + log.println("Couldn't change Diagram back to 2D"); + e.printStackTrace(log); + throw new StatusException("Couldn't change Diagram back to 2D", e); + } + } + } // finish class _Chart3DBarProperties -- cgit From 93393d14ff84d74d2e2f022f0c19bf64bb9268b1 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Mon, 31 May 2010 15:56:59 +0200 Subject: findbar01: #i111912 - [Testautomation] Added findbar declaration to bars.win --- testautomation/global/win/bars.win | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/testautomation/global/win/bars.win b/testautomation/global/win/bars.win index dd65f825893d..525be7d897ca 100755 --- a/testautomation/global/win/bars.win +++ b/testautomation/global/win/bars.win @@ -356,6 +356,13 @@ ExtrusionLightingFloater .uno:ExtrusionLightingFloater ExtrusionSurfaceFloater .uno:ExtrusionSurfaceFloater Extrusion3DColor .uno:Extrusion3DColor '------------------------------------------------------------------------- +*FindBar .HelpId:findbar +'------------------------------------------------------------------------- +FindText .uno:FindText +DownSearch .uno:DownSearch +UpSearch .uno:UpSearch +SearchDialog .uno:SearchDialog +'------------------------------------------------------------------------- *Flowchart .HelpId:flowchartshapes '------------------------------------------------------------------------- Process .uno:FlowChartShapes.flowchart-process -- cgit From 299817c665690a67391bfa3c163296e9fffdae02 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Mon, 31 May 2010 17:47:49 +0200 Subject: findbar01: #i111912 - [Testautomation] Preliminary update test, incomplete. From a testtool POV we have a permanently visible SearchDialog button which should be fixed. --- .../global/required/includes/g_findbar.inc | 142 +++++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 testautomation/global/required/includes/g_findbar.inc diff --git a/testautomation/global/required/includes/g_findbar.inc b/testautomation/global/required/includes/g_findbar.inc new file mode 100644 index 000000000000..b193da41f963 --- /dev/null +++ b/testautomation/global/required/includes/g_findbar.inc @@ -0,0 +1,142 @@ +'encoding UTF-8 Do not remove or change this line! +'************************************************************************** +' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +' +' Copyright 2000, 2010 Oracle and/or its affiliates. +' +' OpenOffice.org - a multi-platform office productivity suite +' +' This file is part of OpenOffice.org. +' +' OpenOffice.org is free software: you can redistribute it and/or modify +' it under the terms of the GNU Lesser General Public License version 3 +' only, as published by the Free Software Foundation. +' +' OpenOffice.org is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU Lesser General Public License version 3 for more details +' (a copy is included in the LICENSE file that accompanied this code). +' +' You should have received a copy of the GNU Lesser General Public License +' version 3 along with OpenOffice.org. If not, see +' +' for a copy of the LGPLv3 License. +' +'/************************************************************************ +'* +'* owner : Joerg.Skottke@Sun.Com +'* +'* short description : Update test for the findbar +'* +'\*********************************************************************** + +testcase tUpdtFindBar() + + printlog( "Update test for the findbar" ) + + const TEST_STRING = "VCL Testtool" + + select case( gApplication ) + case "IMPRESS", "DRAW", "DATABASE" + kontext "FindBar" + if ( FindBar.exists() ) then + warnlog( "The FindBar should not be visible by default" ) + else + ' Toggle FindBar + endif + end select + + hNewDocument() + + kontext "FindBar" + if ( FindBar.exists() ) then + + printlog( "FindBar has " & FindBar.getItemCount() & " items" ) + + printlog( "Insert text into search field" ) + FindText.setText( TEST_STRING ) + + printlog( "Click (down arrow)" ) + DownSearch.click() + + kontext "Active" + if ( Active.exists( 1 ) ) then + printlog( "Expected message: " & Active.getText() + Active.ok() + else + warnlog( "Messagebox missing " ) + endif + + printlog( "Click (up arrow)" ) + kontext "FindBar" + UpSearch.click() + + kontext "Active" + if ( Active.exists( 1 ) ) then + printlog( "Expected message: " & Active.getText() + Active.ok() + else + warnlog( "Messagebox missing " ) + endif + + printlog( "Search dialog button may not be visible by default" ) + kontext "FindBar" + if ( SearchDialog.exists() ) then + if ( SearchDialog.isVisible() ) then + SearchDialog.click() + warnlog( "Button is visible" ) + else + printlog( "Button is hidden, good" ) + endif + else + warnlog( " button should not be visible" ) + endif + + printlog( "Add button to toolbar" ) + hToggleSearchDialog() + + kontext "FindBar" + SearchDialog.click() + + kontext "FindAndReplace" + if ( FindAndReplace.exists( 1 ) ) then + if ( SearchFor.getSelText() = TEST_STRING ) then + printlog( "Test string has been inserted into Listbox. Good." ) + else + warnlog( "Search string should have been copied from findbar to search dialog" ) + endif + FindAndReplace.close() + else + warnlog( "Dialog is missing" ) + endif + + printlog( "Remove button from toolbar" ) + hToggleSearchDialog() + + else + warnlog( "FindBar is not visible" ) + endif + + hCloseDocument() + +endcase + +function hToggleSearchDialog() + + printlog( "Make button visible via context menu" ) + + const MENU_VISIBLE_BUTTONS = 1 + const MENU_SEARCH_AND_REPLACE = 4 + + kontext "FindBar" + FindBar.openContextMenu() + wait( 1000 ) + + hMenuSelectNr( MENU_VISIBLE_BUTTONS ) + wait( 1000 ) + + hMenuSelectNr( MENU_SEARCH_AND_REPLACE ) + wait( 1000 ) + +end function \ No newline at end of file -- cgit From b33e252b7b41d0359539f9c867806dfc7ca2cf20 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Tue, 1 Jun 2010 01:07:21 +0200 Subject: findbar01: #i111912 - [Testautomation] Added calls to DialogTest() --- testautomation/global/required/includes/g_findbar.inc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/testautomation/global/required/includes/g_findbar.inc b/testautomation/global/required/includes/g_findbar.inc index b193da41f963..5e32b95b1b2d 100644 --- a/testautomation/global/required/includes/g_findbar.inc +++ b/testautomation/global/required/includes/g_findbar.inc @@ -63,6 +63,9 @@ testcase tUpdtFindBar() kontext "Active" if ( Active.exists( 1 ) ) then printlog( "Expected message: " & Active.getText() + call DialogTest( Active ) + + kontext "Active" Active.ok() else warnlog( "Messagebox missing " ) @@ -75,6 +78,9 @@ testcase tUpdtFindBar() kontext "Active" if ( Active.exists( 1 ) ) then printlog( "Expected message: " & Active.getText() + call DialogTest( Active ) + + kontext "Active" Active.ok() else warnlog( "Messagebox missing " ) @@ -85,7 +91,7 @@ testcase tUpdtFindBar() if ( SearchDialog.exists() ) then if ( SearchDialog.isVisible() ) then SearchDialog.click() - warnlog( "Button is visible" ) + warnlog( "Button is visible, it should be hidden by default" ) else printlog( "Button is hidden, good" ) endif @@ -101,6 +107,9 @@ testcase tUpdtFindBar() kontext "FindAndReplace" if ( FindAndReplace.exists( 1 ) ) then + call DialogTest( FindAndReplace ) + + kontext "FindAndReplace" if ( SearchFor.getSelText() = TEST_STRING ) then printlog( "Test string has been inserted into Listbox. Good." ) else @@ -122,6 +131,8 @@ testcase tUpdtFindBar() endcase +'******************************************************************************* + function hToggleSearchDialog() printlog( "Make button visible via context menu" ) -- cgit From 96db846b27248466a27113d25b090a5908bc9fbb Mon Sep 17 00:00:00 2001 From: Ingrid Halama Date: Tue, 1 Jun 2010 17:06:19 +0200 Subject: chart47: #i111966# don't use a random property - test all properties instead --- qadevOOo/tests/java/ifc/beans/_XPropertySet.java | 484 +++++++++++++---------- 1 file changed, 268 insertions(+), 216 deletions(-) diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XPropertySet.java index 54c1f3431bbf..dfc135843b44 100644 --- a/qadevOOo/tests/java/ifc/beans/_XPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XPropertySet.java @@ -27,8 +27,7 @@ package ifc.beans; -import java.util.Random; -import java.util.StringTokenizer; +import java.util.Vector; import lib.MultiMethodTest; import util.ValueChanger; @@ -102,13 +101,13 @@ public class _XPropertySet extends MultiMethodTest { private final XVetoableChangeListener VClistener = new MyVetoListener(); /** - * Structure that collects three properties of each type to test : + * Structure that collects the properties of different types to test : * Constrained, Bound and Normal. */ private final class PropsToTest { - String constrained = null; - String bound = null; - String normal = null; + Vector< String > constrained = new Vector< String >(); + Vector< String > bound = new Vector< String >(); + Vector< String > normal = new Vector< String >(); } private final PropsToTest PTT = new PropsToTest(); @@ -133,9 +132,12 @@ public class _XPropertySet extends MultiMethodTest { log.println("getPropertySetInfo() method returned null"); tRes.tested("getPropertySetInfo()", true) ; String[] ptt = (String[]) tEnv.getObjRelation("PTT"); - PTT.normal=ptt[0]; - PTT.bound=ptt[1]; - PTT.constrained=ptt[2]; + PTT.normal.clear(); + PTT.bound.clear(); + PTT.constrained.clear(); + PTT.normal.add( ptt[0] ); + PTT.bound.add( ptt[1] ); + PTT.constrained.add( ptt[2] ); } else { tRes.tested("getPropertySetInfo()", true ); getPropsToTest(propertySetInfo); @@ -161,41 +163,46 @@ public class _XPropertySet extends MultiMethodTest { requiredMethod("getPropertySetInfo()"); - propertyChanged = false; - - - if ( PTT.bound.equals("none") ) { + int count = PTT.bound.size(); + if ( count==0 || PTT.bound.get(0).equals("none") ) { log.println("*** No bound properties found ***"); tRes.tested("addPropertyChangeListener()", true) ; } else { - try { - oObj.addPropertyChangeListener(PTT.bound,PClistener); - Object gValue = oObj.getPropertyValue(PTT.bound); - oObj.setPropertyValue(PTT.bound, - ValueChanger.changePValue(gValue)); - } catch (com.sun.star.beans.PropertyVetoException e) { - log.println("Exception occured while trying to change "+ - "property '"+ PTT.bound+"'"); - e.printStackTrace(log); - } catch (com.sun.star.lang.IllegalArgumentException e) { - log.println("Exception occured while trying to change "+ - "property '"+ PTT.bound+"'"); - e.printStackTrace(log); - } catch (com.sun.star.beans.UnknownPropertyException e) { - log.println("Exception occured while trying to change "+ - "property '"+ PTT.bound+"'"); - e.printStackTrace(log); - } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("Exception occured while trying to change "+ - "property '"+ PTT.bound+"'"); - e.printStackTrace(log); - } // end of try-catch - tRes.tested("addPropertyChangeListener()", propertyChanged); - if (!propertyChanged) { - log.println("propertyChangeListener wasn't called for '"+ - PTT.bound+"'"); + boolean error = false; + for (int i = 0; i < count; i++) { + String propertyName = PTT.bound.get(i); + propertyChanged = false; + try { + oObj.addPropertyChangeListener(propertyName,PClistener); + Object gValue = oObj.getPropertyValue(propertyName); + log.println("Check bound property: " + propertyName ); + oObj.setPropertyValue(propertyName, + ValueChanger.changePValue(gValue)); + } catch (com.sun.star.beans.PropertyVetoException e) { + log.println("Exception occured while trying to change "+ + "property '"+ propertyName+"'"); + e.printStackTrace(log); + } catch (com.sun.star.lang.IllegalArgumentException e) { + log.println("Exception occured while trying to change "+ + "property '"+ propertyName+"'"); + e.printStackTrace(log); + } catch (com.sun.star.beans.UnknownPropertyException e) { + log.println("Exception occured while trying to change "+ + "property '"+ propertyName+"'"); + e.printStackTrace(log); + } catch (com.sun.star.lang.WrappedTargetException e) { + log.println("Exception occured while trying to change "+ + "property '"+ propertyName+"'"); + e.printStackTrace(log); + } // end of try-catch + error = error || !propertyChanged; + if (!propertyChanged) { + log.println("propertyChangeListener wasn't called for '"+ + propertyName+"'"); + } } - } //endif + tRes.tested("addPropertyChangeListener()", !error); + } return; @@ -217,40 +224,45 @@ public class _XPropertySet extends MultiMethodTest { requiredMethod("getPropertySetInfo()"); - vetoableChanged = false; - - if ( PTT.constrained.equals("none") ) { + int count = PTT.constrained.size(); + if ( count==0 || PTT.constrained.get(0).equals("none") ) { log.println("*** No constrained properties found ***"); tRes.tested("addVetoableChangeListener()", true) ; } else { - try { - oObj.addVetoableChangeListener(PTT.constrained,VClistener); - Object gValue = oObj.getPropertyValue(PTT.constrained); - oObj.setPropertyValue(PTT.constrained, - ValueChanger.changePValue(gValue)); - } catch (com.sun.star.beans.PropertyVetoException e) { - log.println("Exception occured while trying to change "+ - "property '"+ PTT.constrained+"'"); - e.printStackTrace(log); - } catch (com.sun.star.lang.IllegalArgumentException e) { - log.println("Exception occured while trying to change "+ - "property '"+ PTT.constrained+"'"); - e.printStackTrace(log); - } catch (com.sun.star.beans.UnknownPropertyException e) { - log.println("Exception occured while trying to change "+ - "property '"+ PTT.constrained+"'"); - e.printStackTrace(log); - } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("Exception occured while trying to change "+ - "property '"+ PTT.constrained+"'"); - e.printStackTrace(log); - } // end of try-catch - tRes.tested("addVetoableChangeListener()",vetoableChanged); - if (!vetoableChanged) { - log.println("vetoableChangeListener wasn't called for '"+ - PTT.constrained+"'"); + boolean error = false; + for (int i = 0; i < count; i++) { + String propertyName = PTT.constrained.get(i); + vetoableChanged = false; + try { + oObj.addVetoableChangeListener(propertyName,VClistener); + Object gValue = oObj.getPropertyValue(propertyName); + oObj.setPropertyValue(propertyName, + ValueChanger.changePValue(gValue)); + } catch (com.sun.star.beans.PropertyVetoException e) { + log.println("Exception occured while trying to change "+ + "property '"+ propertyName+"'"); + e.printStackTrace(log); + } catch (com.sun.star.lang.IllegalArgumentException e) { + log.println("Exception occured while trying to change "+ + "property '"+ propertyName+"'"); + e.printStackTrace(log); + } catch (com.sun.star.beans.UnknownPropertyException e) { + log.println("Exception occured while trying to change "+ + "property '"+ propertyName+"'"); + e.printStackTrace(log); + } catch (com.sun.star.lang.WrappedTargetException e) { + log.println("Exception occured while trying to change "+ + "property '"+ propertyName+"'"); + e.printStackTrace(log); + } // end of try-catch + error = error || !vetoableChanged; + if (!vetoableChanged) { + log.println("vetoableChangeListener wasn't called for '"+ + propertyName+"'"); + } } - } //endif + tRes.tested("addVetoableChangeListener()",!error); + } return; @@ -276,40 +288,72 @@ public class _XPropertySet extends MultiMethodTest { Object gValue = null; Object sValue = null; - if ( PTT.normal.equals("none") ) { + int count = PTT.normal.size(); + if ( count==0 || PTT.normal.get(0).equals("none") ) { log.println("*** No changeable properties found ***"); tRes.tested("setPropertyValue()", true) ; } else { - try { - log.println("try to cheange value of property '" + PTT.normal + "'" ); - gValue = oObj.getPropertyValue(PTT.normal); - sValue = ValueChanger.changePValue(gValue); - oObj.setPropertyValue(PTT.normal, sValue); - sValue = oObj.getPropertyValue(PTT.normal); - } catch (com.sun.star.beans.PropertyVetoException e) { - log.println("Exception occured while trying to change "+ - "property '"+ PTT.normal+"'"); - e.printStackTrace(log); - } catch (com.sun.star.lang.IllegalArgumentException e) { - log.println("Exception occured while trying to change "+ - "property '"+ PTT.normal+"'"); - e.printStackTrace(log); - } catch (com.sun.star.beans.UnknownPropertyException e) { - log.println("Exception occured while trying to change "+ - "property '"+ PTT.normal+"'"); - e.printStackTrace(log); - } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("Exception occured while trying to change "+ - "property '"+ PTT.normal+"'"); - e.printStackTrace(log); - } // end of try-catch - tRes.tested("setPropertyValue()",(! gValue.equals(sValue))); + boolean error = false; + for (int i = 0; i < count; i++) { + String propertyName = PTT.normal.get(i); + try { + log.println("try to change value of property '" + propertyName + "'" ); + gValue = oObj.getPropertyValue(propertyName); + sValue = ValueChanger.changePValue(gValue); + oObj.setPropertyValue(propertyName, sValue); + sValue = oObj.getPropertyValue(propertyName); + } catch (com.sun.star.beans.PropertyVetoException e) { + log.println("Exception occured while trying to change "+ + "property '"+ propertyName+"'"); + e.printStackTrace(log); + } catch (com.sun.star.lang.IllegalArgumentException e) { + log.println("Exception occured while trying to change "+ + "property '"+ propertyName+"'"); + e.printStackTrace(log); + } catch (com.sun.star.beans.UnknownPropertyException e) { + log.println("Exception occured while trying to change "+ + "property '"+ propertyName+"'"); + e.printStackTrace(log); + } catch (com.sun.star.lang.WrappedTargetException e) { + log.println("Exception occured while trying to change "+ + "property '"+ propertyName+"'"); + e.printStackTrace(log); + } // end of try-catch + if( gValue.equals(sValue) ) + { + log.println("setting property '"+ propertyName+"' failed"); + error = true; + } + } + tRes.tested("setPropertyValue()",!error); } //endif return; } // end of setPropertyValue() + /** + * Tests getPropertyValue method for the given property. + * Returns true if no exceptions occured + */ + private boolean getSinglePropertyValue( String propertyName ) + { + boolean runOk = false; + try { + oObj.getPropertyValue(propertyName); + runOk = true; + } catch (com.sun.star.beans.UnknownPropertyException e) { + log.println("Exception occured while trying to get property '"+ + propertyName+"'"); + e.printStackTrace(log); + } catch (com.sun.star.lang.WrappedTargetException e) { + log.println("Exception occured while trying to get property '"+ + propertyName+"'"); + e.printStackTrace(log); + } + return runOk; + } + /** * Tests getPropertyValue method. * Just call this method and checks for no exceptions

      @@ -325,29 +369,33 @@ public class _XPropertySet extends MultiMethodTest { requiredMethod("getPropertySetInfo()"); - String toCheck = PTT.normal; - - if ( PTT.normal.equals("none") ) { - toCheck = oObj.getPropertySetInfo().getProperties()[0].Name; - log.println("All properties are Read Only"); - log.println("Using: "+toCheck); + int count = PTT.normal.size(); + if ( count==0 || PTT.normal.get(0).equals("none") ) { + Property[] properties = oObj.getPropertySetInfo().getProperties(); + if( properties.length > 0 ) { + String propertyName = properties[0].Name; + log.println("All properties are Read Only"); + log.println("Using: "+propertyName); + tRes.tested("getPropertyValue()", getSinglePropertyValue( propertyName ) ); + } + else { + log.println("*** No properties found ***"); + tRes.tested("getPropertyValue()", true) ; + } + } else { + boolean error = false; + for (int i = 0; i < count; i++) { + String propertyName = PTT.normal.get(i); + boolean runOk = getSinglePropertyValue( propertyName ); + if( !runOk ) + { + error = true; + log.println("getPropertyValue() failed for property '"+propertyName+"'"); + } + } + tRes.tested("getPropertyValue()", !error) ; } - try { - oObj.getPropertyValue(toCheck); - tRes.tested("getPropertyValue()",true); - } catch (com.sun.star.beans.UnknownPropertyException e) { - log.println("Exception occured while trying to get property '"+ - PTT.normal+"'"); - e.printStackTrace(log); - tRes.tested("getPropertyValue()",false); - } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("Exception occured while trying to get property '"+ - PTT.normal+"'"); - e.printStackTrace(log); - tRes.tested("getPropertyValue()",false); - } // end of try-catch - return; } @@ -367,42 +415,60 @@ public class _XPropertySet extends MultiMethodTest { requiredMethod("addPropertyChangeListener()"); - propertyChanged = false; - - if ( PTT.bound.equals("none") ) { + int count = PTT.bound.size(); + if ( count==0 || PTT.bound.get(0).equals("none") ) { log.println("*** No bound properties found ***"); tRes.tested("removePropertyChangeListener()", true) ; } else { - try { - propertyChanged = false; - oObj.removePropertyChangeListener(PTT.bound,PClistener); - Object gValue = oObj.getPropertyValue(PTT.bound); - oObj.setPropertyValue(PTT.bound, - ValueChanger.changePValue(gValue)); - } catch (com.sun.star.beans.PropertyVetoException e) { - log.println("Exception occured while trying to change "+ - "property '"+ PTT.bound+"'"); - e.printStackTrace(log); - } catch (com.sun.star.lang.IllegalArgumentException e) { - log.println("Exception occured while trying to change "+ - "property '"+ PTT.bound+"'"); - e.printStackTrace(log); - } catch (com.sun.star.beans.UnknownPropertyException e) { - log.println("Exception occured while trying to change "+ - "property '"+ PTT.bound+"'"); - e.printStackTrace(log); - } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("Exception occured while trying to change "+ - "property '"+ PTT.bound+"'"); - e.printStackTrace(log); - } // end of try-catch - - tRes.tested("removePropertyChangeListener()",!propertyChanged); - if (propertyChanged) { - log.println("propertyChangeListener was called after removing"+ - " for '"+PTT.bound+"'"); + + //remove all listeners first + for (int i = 0; i < count; i++) { + String propertyName = PTT.bound.get(i); + try { + oObj.removePropertyChangeListener(propertyName,PClistener); + } catch (Exception e) { + log.println("Exception occured while removing change listener from"+ + "property '"+ propertyName+"'"); + e.printStackTrace(log); + } } - } //endif + + boolean error = false; + for (int i = 0; i < count; i++) { + String propertyName = PTT.bound.get(i); + try { + propertyChanged = false; + oObj.addPropertyChangeListener(propertyName,PClistener); + oObj.removePropertyChangeListener(propertyName,PClistener); + Object gValue = oObj.getPropertyValue(propertyName); + oObj.setPropertyValue(propertyName, + ValueChanger.changePValue(gValue)); + } catch (com.sun.star.beans.PropertyVetoException e) { + log.println("Exception occured while trying to change "+ + "property '"+ propertyName+"'"); + e.printStackTrace(log); + } catch (com.sun.star.lang.IllegalArgumentException e) { + log.println("Exception occured while trying to change "+ + "property '"+ propertyName+"'"); + e.printStackTrace(log); + } catch (com.sun.star.beans.UnknownPropertyException e) { + log.println("Exception occured while trying to change "+ + "property '"+ propertyName+"'"); + e.printStackTrace(log); + } catch (com.sun.star.lang.WrappedTargetException e) { + log.println("Exception occured while trying to change "+ + "property '"+ propertyName+"'"); + e.printStackTrace(log); + } // end of try-catch + + error = error || propertyChanged; + if (propertyChanged) { + log.println("propertyChangeListener was called after removing"+ + " for '"+propertyName+"'"); + } + } + tRes.tested("removePropertyChangeListener()",!error); + } return; @@ -425,47 +491,64 @@ public class _XPropertySet extends MultiMethodTest { requiredMethod("addVetoableChangeListener()"); - vetoableChanged = false; - - if ( PTT.constrained.equals("none") ) { + int count = PTT.constrained.size(); + if ( count==0 || PTT.constrained.get(0).equals("none") ) { log.println("*** No constrained properties found ***"); tRes.tested("removeVetoableChangeListener()", true) ; } else { - try { - oObj.removeVetoableChangeListener(PTT.constrained,VClistener); - Object gValue = oObj.getPropertyValue(PTT.constrained); - oObj.setPropertyValue(PTT.constrained, - ValueChanger.changePValue(gValue)); - } catch (com.sun.star.beans.PropertyVetoException e) { - log.println("Exception occured while trying to change "+ - "property '"+ PTT.constrained+"'"); - e.printStackTrace(log); - } catch (com.sun.star.lang.IllegalArgumentException e) { - log.println("Exception occured while trying to change "+ - "property '"+ PTT.constrained+"'"); - e.printStackTrace(log); - } catch (com.sun.star.beans.UnknownPropertyException e) { - log.println("Exception occured while trying to change "+ - "property '"+ PTT.constrained+"'"); - e.printStackTrace(log); - } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("Exception occured while trying to change "+ - "property '"+ PTT.constrained+"'"); - e.printStackTrace(log); - } // end of try-catch - - tRes.tested("removeVetoableChangeListener()",!vetoableChanged); - if (vetoableChanged) { - log.println("vetoableChangeListener was called after "+ - "removing for '"+PTT.constrained+"'"); + + //remove all listeners first + for (int i = 0; i < count; i++) { + String propertyName = PTT.constrained.get(i); + try { + oObj.removeVetoableChangeListener(propertyName,VClistener); + } catch (Exception e) { + log.println("Exception occured while removing veto listener from"+ + "property '"+ propertyName+"'"); + e.printStackTrace(log); + } } - } //endif + + boolean error = false; + for (int i = 0; i < count; i++) { + String propertyName = PTT.constrained.get(i); + vetoableChanged = false; + try { + oObj.addVetoableChangeListener(propertyName,VClistener); + oObj.removeVetoableChangeListener(propertyName,VClistener); + Object gValue = oObj.getPropertyValue(propertyName); + oObj.setPropertyValue(propertyName, + ValueChanger.changePValue(gValue)); + } catch (com.sun.star.beans.PropertyVetoException e) { + log.println("Exception occured while trying to change "+ + "property '"+ propertyName+"'"); + e.printStackTrace(log); + } catch (com.sun.star.lang.IllegalArgumentException e) { + log.println("Exception occured while trying to change "+ + "property '"+ propertyName+"'"); + e.printStackTrace(log); + } catch (com.sun.star.beans.UnknownPropertyException e) { + log.println("Exception occured while trying to change "+ + "property '"+ propertyName+"'"); + e.printStackTrace(log); + } catch (com.sun.star.lang.WrappedTargetException e) { + log.println("Exception occured while trying to change "+ + "property '"+ propertyName+"'"); + e.printStackTrace(log); + } // end of try-catch + error = error || vetoableChanged; + if (vetoableChanged) { + log.println("vetoableChangeListener was called after "+ + "removing for '"+propertyName+"'"); + } + } + tRes.tested("removeVetoableChangeListener()",!error); + } return; } // end of removeVetoableChangeListener() - /** * Gets the properties being tested. Searches and stores by one * property of each kind (Bound, Vetoable, Normal). @@ -473,9 +556,6 @@ public class _XPropertySet extends MultiMethodTest { public void getPropsToTest(XPropertySetInfo xPSI) { Property[] properties = xPSI.getProperties(); - String bound = ""; - String constrained = ""; - String normal = ""; // some properties should not be changed in a unspecific way String[] skip = {"PrinterName", "CharRelief", "IsLayerMode"}; @@ -522,47 +602,19 @@ public class _XPropertySet extends MultiMethodTest { if ( isWritable && isNotNull ) canChange = isChangeable(name); if ( isWritable && isNotNull && isBound && canChange) { - bound+=name+";"; + PTT.bound.add(name); } if ( isWritable && isNotNull && isConstr && canChange) { - constrained+=name+";"; + PTT.constrained.add(name); } - if ( isWritable && isNotNull && canChange) normal+=name+";"; + if ( isWritable && isNotNull && canChange) { + PTT.normal.add(name); + } } // endfor - - //get a random bound property - PTT.bound=getRandomString(bound); - log.println("Bound: "+PTT.bound); - - //get a random constrained property - PTT.constrained=getRandomString(constrained); - log.println("Constrained: "+PTT.constrained); - - //get a random normal property - PTT.normal=getRandomString(normal); - } - - /** - * Retrieves one random property name from list (property names separated - * by ';') of property names. - */ - public String getRandomString(String str) { - - String gRS = "none"; - Random rnd = new Random(); - - if (str.equals("")) str = "none"; - StringTokenizer ST=new StringTokenizer(str,";"); - int nr = rnd.nextInt(ST.countTokens()); - if (nr < 1) nr+=1; - for (int i=1; i Date: Wed, 2 Jun 2010 12:01:20 +0200 Subject: findbar01: #i111912 - Modified g_findbar.inc to make the CWS pass in reasonable timeframe. Followup-issues are #i111984 and #i112026. Integration is postponed due to massive conflicts with CWS vitomation01 --- .../global/required/includes/g_findbar.inc | 66 ++++++++++++---------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/testautomation/global/required/includes/g_findbar.inc b/testautomation/global/required/includes/g_findbar.inc index 5e32b95b1b2d..38af3edd28aa 100644 --- a/testautomation/global/required/includes/g_findbar.inc +++ b/testautomation/global/required/includes/g_findbar.inc @@ -33,6 +33,9 @@ testcase tUpdtFindBar() + ' This test is incomplete. It needs to be integrated into all update tests + ' and it needs to be added to the toolbar management functions + printlog( "Update test for the findbar" ) const TEST_STRING = "VCL Testtool" @@ -42,8 +45,6 @@ testcase tUpdtFindBar() kontext "FindBar" if ( FindBar.exists() ) then warnlog( "The FindBar should not be visible by default" ) - else - ' Toggle FindBar endif end select @@ -86,42 +87,47 @@ testcase tUpdtFindBar() warnlog( "Messagebox missing " ) endif - printlog( "Search dialog button may not be visible by default" ) - kontext "FindBar" - if ( SearchDialog.exists() ) then - if ( SearchDialog.isVisible() ) then - SearchDialog.click() - warnlog( "Button is visible, it should be hidden by default" ) + warnlog( "#i111984 - exclude button from testing" ) + goto skip_SearchDialog + + printlog( "Search dialog button may not be visible by default" ) + kontext "FindBar" + if ( SearchDialog.exists() ) then + if ( SearchDialog.isVisible() ) then + SearchDialog.click() + warnlog( "Button is visible, it should be hidden by default" ) + else + printlog( "Button is hidden, good" ) + endif else - printlog( "Button is hidden, good" ) + warnlog( " button should not be visible" ) endif - else - warnlog( " button should not be visible" ) - endif - printlog( "Add button to toolbar" ) - hToggleSearchDialog() + printlog( "Add button to toolbar" ) + hToggleSearchDialog() - kontext "FindBar" - SearchDialog.click() - - kontext "FindAndReplace" - if ( FindAndReplace.exists( 1 ) ) then - call DialogTest( FindAndReplace ) + kontext "FindBar" + SearchDialog.click() kontext "FindAndReplace" - if ( SearchFor.getSelText() = TEST_STRING ) then - printlog( "Test string has been inserted into Listbox. Good." ) + if ( FindAndReplace.exists( 1 ) ) then + call DialogTest( FindAndReplace ) + + kontext "FindAndReplace" + if ( SearchFor.getSelText() = TEST_STRING ) then + printlog( "Test string has been inserted into Listbox. Good." ) + else + warnlog( "Search string should have been copied from findbar to search dialog" ) + endif + FindAndReplace.close() else - warnlog( "Search string should have been copied from findbar to search dialog" ) + warnlog( "Dialog is missing" ) endif - FindAndReplace.close() - else - warnlog( "Dialog is missing" ) - endif - - printlog( "Remove button from toolbar" ) - hToggleSearchDialog() + + printlog( "Remove button from toolbar" ) + hToggleSearchDialog() + + skip_SearchDialog: else warnlog( "FindBar is not visible" ) -- cgit From 81c476751f6e8ee55702fe223f7e01343f8cf94e Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Thu, 3 Jun 2010 08:05:35 +0200 Subject: sw33bf04#112058#adapted testcases for numbering fixes --- .../writer/optional/includes/number/w_206_.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) mode change 100644 => 100755 testautomation/writer/optional/includes/number/w_206_.inc diff --git a/testautomation/writer/optional/includes/number/w_206_.inc b/testautomation/writer/optional/includes/number/w_206_.inc old mode 100644 new mode 100755 index 9d7750628013..c007e674d329 --- a/testautomation/writer/optional/includes/number/w_206_.inc +++ b/testautomation/writer/optional/includes/number/w_206_.inc @@ -472,12 +472,12 @@ testcase tToolsNumbering7 end if end if Case 2 - if sClipBrd(1) <> "1.My second number" then - Warnlog "#128041#First paragraph not '1.My second number' but: " & sClipBrd(1) + if sClipBrd(1) <> "1.1.My second number" then + Warnlog "#128041#First paragraph not '1.1.My second number' but: " & sClipBrd(1) end if Case 3 - if sClipBrd(2) <> "2.My third number" then - Warnlog "#128041#First paragraph not '2.My third number' but: " & sClipBrd(2) + if sClipBrd(2) <> "2.2.My third number" then + Warnlog "#128041#First paragraph not '2.2.My third number' but: " & sClipBrd(2) end if end select next i @@ -707,16 +707,16 @@ testcase tToolsNumbering11 For i = 1 to 3 Select Case i Case 1 - if sClipBrd(0) <> "1A new first paragraph" then - Warnlog "First Heading not: '1A new first paragraph' but: " & sClipBrd(0) + if sClipBrd(0) <> "11A new first paragraph" then + Warnlog "First Heading not: '11A new first paragraph' but: " & sClipBrd(0) end if Case 2 - if sClipBrd(1) <> "2" then - Warnlog "First paragraph not empty but: " & sClipBrd(1) + if sClipBrd(1) <> "22" then + Warnlog "First paragraph not '22' but: " & sClipBrd(1) end if Case 3 - if sClipBrd(2) <> "3A new third paragraph" then - Warnlog "First paragraph not '3A new third paragraph' but: " & sClipBrd(2) + if sClipBrd(2) <> "33A new third paragraph" then + Warnlog "First paragraph not '33A new third paragraph' but: " & sClipBrd(2) end if end select next i -- cgit From 2d65a58f0aaaa99f0d3bddb132c92a52bb1d3aeb Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Thu, 3 Jun 2010 16:01:52 +0200 Subject: sw33bf04#85766#adapted testcases for numbering fixes --- .../writer/optional/includes/fields/w_fields1.inc | 10 -- .../writer/optional/includes/fields/w_fields2.inc | 68 ++++----- .../writer/optional/includes/fields/w_fields4.inc | 5 +- .../writer/optional/includes/fields/w_fields5.inc | 156 +++++++++++---------- 4 files changed, 115 insertions(+), 124 deletions(-) mode change 100644 => 100755 testautomation/writer/optional/includes/fields/w_fields1.inc mode change 100644 => 100755 testautomation/writer/optional/includes/fields/w_fields2.inc mode change 100644 => 100755 testautomation/writer/optional/includes/fields/w_fields4.inc mode change 100644 => 100755 testautomation/writer/optional/includes/fields/w_fields5.inc diff --git a/testautomation/writer/optional/includes/fields/w_fields1.inc b/testautomation/writer/optional/includes/fields/w_fields1.inc old mode 100644 new mode 100755 index 9f2d872b3d89..0287fd2f1da1 --- a/testautomation/writer/optional/includes/fields/w_fields1.inc +++ b/testautomation/writer/optional/includes/fields/w_fields1.inc @@ -170,8 +170,6 @@ endcase '----------------------------------------------------------------- testcase tInsertFieldsPageNumber -qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'" -goto endsub Dim sPage1 , sPage2 as String @@ -216,8 +214,6 @@ endcase '----------------------------------------------------------------- testcase tInsertFieldsPageCount -qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'" -goto endsub Dim sPage1 , sPage2 as String @@ -273,8 +269,6 @@ endcase '----------------------------------------------------------------- testcase tInsertFieldsSubject -qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'" -goto endsub Dim sSubject as String sSubject = "This is a Subject" @@ -306,8 +300,6 @@ endcase '----------------------------------------------------------------- testcase tInsertFieldsTitle -qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'" -goto endsub Dim sTitle as String @@ -340,8 +332,6 @@ endcase '----------------------------------------------------------------- testcase tInsertFieldsAuthor -qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'" -goto endsub Dim sFirstName , sLastName as String Dim sFirstName1 , sLastName1 as String diff --git a/testautomation/writer/optional/includes/fields/w_fields2.inc b/testautomation/writer/optional/includes/fields/w_fields2.inc old mode 100644 new mode 100755 index 826d9ec769b9..0514ba5b020e --- a/testautomation/writer/optional/includes/fields/w_fields2.inc +++ b/testautomation/writer/optional/includes/fields/w_fields2.inc @@ -451,8 +451,6 @@ endcase '----------------------------------------------------------------- testcase tDocumentPage -qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'" -goto endsub Dim sTestFile as String Dim sPage() as String @@ -867,35 +865,32 @@ endcase '----------------------------------------------------------------- testcase tDocumentStatistics -qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'" -goto endsub Dim sTestFile as String + Dim sOriginalFile as string Dim sStatistics() as String + Dim sType as string Dim i as Integer - sStatistics = Array( _ - "2" , _ - "2" , _ - "2" , _ - "12" , _ - "2" , _ - "2" , _ - "1" , _ - ) + sStatistics = Array( "2", "2", "3", "13", "2", "2", "1" ) - sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\statisticsTest.sxw") + sTestFile = Convertpath (gOfficepath + "user\work\statisticsTest.sxw") + sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\statisticsTest.sxw") + ' document has to be copied to local file system to avoid opening a read-only file + ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' + FileCopy (sOriginalFile, sTestFile) + if hFileExists ( sTestFile ) = false then + Warnlog "Test document couldn't be copied to local file system. Test aborted!" + goto endsub + end if printlog "Insert/Fields/Other/Document / Statistics" '/// Insert/Fields/Other/Document / Statistics - Call hNewDocument - '/// Open test file statisticsTest.sxw which includes '/// 2 tables , 2 pictures , 22 paragraph , 1 object , '/// 2 words , 12 characters and 2 pages Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable Call wTypeKeys "" @@ -904,6 +899,7 @@ goto endsub '/// Check if the insertion is correct Call fInsertFieldsOther("TabDokumentFeldbefehle") Feldtyp.Select fGetType("Statistics") + sType = Auswahl.GetSelText for i = 0 to UBound(sStatistics) Kontext "TabDokumentFeldbefehle" Auswahl.Select i+1 @@ -916,7 +912,7 @@ goto endsub Sleep 1 EditCopy if GetClipboard <> sStatistics(i) then - Warnlog i &" - Should get " & sStatistics(i) & " but get " & GetClipboard + Warnlog "- " & sType & ": Should get " & sStatistics(i) & " but get " & GetClipboard end if Call wTypeKeys "" next i @@ -930,35 +926,39 @@ endcase '----------------------------------------------------------------- testcase tDocumentTemplate -qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'" -goto endsub - - Dim sTestFile as String - Dim sDirectory as String - Dim oDirectory as String - Dim sLanguage as String - Dim sFormat() as String - Dim sResult(6) as String - Dim i as Integer + + Dim sTestFile as String + Dim sOriginalFile as string + Dim sDirectory as String + Dim oDirectory as String + Dim sLanguage as String + Dim sFormat() as String + Dim sResult(6) as String + Dim i as Integer sLanguage = fGetDirLanguage() - sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\diploma.ott") + sTestFile = Convertpath (gOfficepath + "user\work\diploma.ott") + sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\diploma.ott") + ' document has to be copied to local file system to avoid opening a read-only file + ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' + FileCopy (sOriginalFile, sTestFile) + if hFileExists ( sTestFile ) = false then + Warnlog "Test document couldn't be copied to local file system. Test aborted!" + goto endsub + end if sResult(0) = fGetCateGory() sResult(1) = "diploma.ott" sResult(2) = "diploma" - sResult(3) = Convertpath (gTesttoolpath + "writer\optional\input\fields\") + sResult(3) = Convertpath (gOfficepath + "user\work") sResult(4) = sTestFile sResult(5) = fGetStyle() printlog "Insert/Fields/Other/Document / Template" '/// Insert/Fields/Other/Document / Template - - Call hNewDocument - + '/// Open test file diploma.ott Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable Call wTypeKeys "" diff --git a/testautomation/writer/optional/includes/fields/w_fields4.inc b/testautomation/writer/optional/includes/fields/w_fields4.inc old mode 100644 new mode 100755 index 446d5b458f0f..20069da398c1 --- a/testautomation/writer/optional/includes/fields/w_fields4.inc +++ b/testautomation/writer/optional/includes/fields/w_fields4.inc @@ -261,9 +261,8 @@ endcase '----------------------------------------------------------------- testcase tDocInformationUserDefined - qaerrorlog "#i93906# - Testcase outcommented due to bug. 'Copied field-content not pastable outside Office'" - goto endsub - + QAErrorLog "#i112077#Tabpage 'Custom properties' has no declaration" + goto endsub Dim sTestFile as String Dim sOriginalFile as string Dim sVarResult() as String diff --git a/testautomation/writer/optional/includes/fields/w_fields5.inc b/testautomation/writer/optional/includes/fields/w_fields5.inc old mode 100644 new mode 100755 index 2f4e3b0b9ecb..6c8b5e7ca12a --- a/testautomation/writer/optional/includes/fields/w_fields5.inc +++ b/testautomation/writer/optional/includes/fields/w_fields5.inc @@ -667,99 +667,101 @@ endcase '----------------------------------------------------------------- testcase tVariablesDDEFieldManual - qaerrorlog "#i93906# - tVariablesDDEFieldManual outcommented due to a problem with copying field-contents outside the office." + warnlog "#i112079#testcase must be reworked" goto endsub - Dim sDDEFile as String - Dim sContent as String - Dim sName as String - Dim sDDEStatement as String - Dim sSectionName as String + Dim sDDEFile as String + Dim sContent as String + Dim sName as String + Dim sDDEStatement as String + Dim sSectionName as String + + sDDEFile = Convertpath ( gOfficePath + "\user\work\dde_test.odt") + sContent = "DDE" + sName = "myTest" + sSectionName = "Section1" + sDDEStatement = "soffice " & sDDEFile & " " & sSectionName + + printlog "DDE field - manual" + '/// DDE field - manual + + if hFileExists ( sDDEFile ) then app.kill ( sDDEFile ) + + Call hNewDocument + + '/// Input something , insert a section , then save it and close the file + Call wTypeKeys sContent + Call wTypeKeys "" + Call fInsertSection("TabBereiche") + Bereichsliste.Settext sSectionName + TabBereiche.OK + Sleep 1 + Call hFileSaveAsKill(sDDEFile) + Call hCloseDocument + + '/// Opan a new document + Call hNewDocument + '/// Insert/Fields/Other/Variables / Select "DDE Field" + '/// Set DDE name and DDE statement , select "DDE manual" + Call fInsertFieldsOther("TabVariablen") + Feldtyp.Select 3 + Sleep 1 + NameText.SetText sName + Wert.SetText sDDEStatement + Formatliste.Select 1 + Einfuegen.Click + Sleep 2 + TabVariablen.Close + Sleep 2 - sDDEFile = Convertpath ( gNetzOfficePath + "dde_test.oxt") - sContent = "DDE" - sName = "myTest" - sSectionName = "Section1" - sDDEStatement = "soffice " & sDDEFile & " " & sSectionName - - printlog "DDE field - manual" - '/// DDE field - manual - - if hFileExists ( sDDEFile ) then app.kill ( sDDEFile ) - - Call hNewDocument - - '/// Input something , insert a section , then save it and close the file - Call wTypeKeys sContent - Call wTypeKeys "" - Call fInsertSection("TabBereiche") - Bereichsliste.Settext sSectionName - TabBereiche.OK - Sleep 1 - Call hFileSaveAsKill(sDDEFile) - Call hCloseDocument - - '/// Opan a new document - Call hNewDocument - - '/// Insert/Fields/Other/Variables / Select "DDE Field" - '/// Set DDE name and DDE statement , select "DDE manual" - Call fInsertFieldsOther("TabVariablen") - Feldtyp.Select 3 - Sleep 1 - NameText.SetText sName - Wert.SetText sDDEStatement - Formatliste.Select 1 - Einfuegen.Click - Sleep 2 - TabVariablen.Close - Sleep 2 - - Call wTypeKeys "" - Call wTypeKeys "" - if fGetFieldContent() <> sContent then - Warnlog "Should get " & sContent & " but get " & fGetFieldContent() - end if + Call wTypeKeys "" + Call wTypeKeys "" + if fGetFieldContent() <> sContent then + Warnlog "Should get " & sContent & " but get " & fGetFieldContent() + end if - '/// Open the test file which you just closed , add something , - '/// Save the file - Call hFileOpen(sDDEFile) + '/// Open the test file which you just closed , add something , + '/// Save the file + Call hFileOpen(sDDEFile) Call wTypeKeys "" Call wTypeKeys "XYZ" FileSave - Call hCloseDocument - - '/// Check if the content is changed -- Should NOT - Sleep 2 - Call wTypeKeys "" - Call wTypeKeys "" - if fGetFieldContent() <> sContent then - Warnlog "Should get " & sContent & " but get " & fGetFieldContent() - end if - - '/// Edit/Fields , press update button - EditFields - Kontext "VerknuepfungenBearbeiten" - Aktualisieren.Click - VerknuepfungenBearbeiten.Close + Call hCloseDocument + + '/// Check if the content is changed -- Should NOT + Sleep 2 + Call wTypeKeys "" + Call wTypeKeys "" + if fGetFieldContent() <> sContent then + Warnlog "Should get " & sContent & " but get " & fGetFieldContent() + end if - '/// Check if the content is changed -- Should NOT - Sleep 1 - Call wTypeKeys "" - Call wTypeKeys "" - if fGetFieldContent() <> ("XYZ" & sContent) then - Warnlog "Should get XYZ" & sContent & " but get " & fGetFieldContent() - end if + '/// Edit/Fields , press update button + EditFields + Kontext "VerknuepfungenBearbeiten" + Aktualisieren.Click + VerknuepfungenBearbeiten.Close + + '/// Check if the content is changed -- Should NOT + Sleep 1 + Call wTypeKeys "" + Call wTypeKeys "" + if fGetFieldContent() <> ("XYZ" & sContent) then + Warnlog "Should get XYZ" & sContent & " but get " & fGetFieldContent() + end if - Call hCloseDocument + Call hCloseDocument - if hFileExists ( sDDEFile ) then app.kill ( sDDEFile ) + if hFileExists ( sDDEFile ) then app.kill ( sDDEFile ) endcase '----------------------------------------------------------------- testcase tVariablesDDEFieldAutomatic + warnlog "#i112079#testcase must be reworked" + goto endsub + qaerrorlog "#i102792# - tVariablesDDEFieldAutomatic outcommented. Fields not updated." goto endsub -- cgit From a417129491bc59db3d04942939b2ff4760d413fc Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Tue, 8 Jun 2010 09:44:34 +0200 Subject: automationdev300m79: #i112207 - Fixed platform identification string in extensions/optional/input/platform/extensions.info to match global variable gtSysName. --- testautomation/extensions/optional/input/platform/extensions.info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testautomation/extensions/optional/input/platform/extensions.info b/testautomation/extensions/optional/input/platform/extensions.info index 09424d0db666..fdcda07205aa 100755 --- a/testautomation/extensions/optional/input/platform/extensions.info +++ b/testautomation/extensions/optional/input/platform/extensions.info @@ -125,7 +125,7 @@ Name=Single Platform: os2_x86 [24] File=solaris_sparc.oxt -Platform=Solaris Sparc +Platform=Solaris SPARC Name=Single Platform: solaris_sparc [25] -- cgit From 1f0b2989c6eb810058425b1ed510f4357a1f904f Mon Sep 17 00:00:00 2001 From: Thorsten Bosbach Date: Wed, 9 Jun 2010 13:46:35 +0200 Subject: #i111784 CWS gridcontrol_03: Tablecontrol.select does not trigger selection event --- .../optional/includes/basic_gridcontrol.inc | 33 +++++++++++++++++++++ .../framework/optional/input/gridcontrol.odt | Bin 12000 -> 12600 bytes 2 files changed, 33 insertions(+) diff --git a/testautomation/framework/optional/includes/basic_gridcontrol.inc b/testautomation/framework/optional/includes/basic_gridcontrol.inc index f2d2f74cbdd4..b23e2318d657 100755 --- a/testautomation/framework/optional/includes/basic_gridcontrol.inc +++ b/testautomation/framework/optional/includes/basic_gridcontrol.inc @@ -55,6 +55,7 @@ testcase tGridcontrolLoad printlog "Start the macro, that performs the test" Kontext "GridControlDialogStarter" + ' FAILS IF DOCUMENT IS READONLY.... ShowGridcontrol.typeKeys "" Kontext "GridControlDialog" if GridControlDialog.exists(5) then @@ -63,6 +64,37 @@ testcase tGridcontrolLoad printlog " " + i + ":"+a+": '" + gridcontrolcontrol.getitemtype (i,a) + "' '" + gridcontrolcontrol.getitemtext (i,a) + "'" next a next i + gridcontrolcontrol.select 5 + + kontext + if active.exists(5) then + printlog active.gettext + active.ok + else + warnlog "No selection Event by .select" + endif + + Kontext "GridControlDialog" + gridcontrolcontrol.typeKeys("") + + kontext + if active.exists(5) then + printlog active.gettext + active.ok + else + warnlog "No selection event by .typeKeys " + endif + Kontext "GridControlDialog" + gridcontrolcontrol.typeKeys("") + kontext + if active.exists(5) then + printlog active.gettext + active.ok + else + warnlog "No selection event by .typeKeys " + endif + + Kontext "GridControlDialog" GridControlDialog.close else warnlog "Gridcontrol Dialog did not come up after pressing button" @@ -75,3 +107,4 @@ testcase tGridcontrolLoad endif endcase + diff --git a/testautomation/framework/optional/input/gridcontrol.odt b/testautomation/framework/optional/input/gridcontrol.odt index d11d70cfbc09..46be0c44a065 100755 Binary files a/testautomation/framework/optional/input/gridcontrol.odt and b/testautomation/framework/optional/input/gridcontrol.odt differ -- cgit From f84dc46517c75dd04eae1e83d5ee0e4b9ab2110c Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Thu, 10 Jun 2010 13:24:15 +0200 Subject: native309: #i112273 - Adjusted version string to 3.3 --- testautomation/global/input/officeinfo.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) mode change 100755 => 100644 testautomation/global/input/officeinfo.txt diff --git a/testautomation/global/input/officeinfo.txt b/testautomation/global/input/officeinfo.txt old mode 100755 new mode 100644 index 92b4e492740d..430e4141e3dd --- a/testautomation/global/input/officeinfo.txt +++ b/testautomation/global/input/officeinfo.txt @@ -1,7 +1,5 @@ [Current program versions] -StarOffice=9 -StarSuite=9 -OpenOffice.org=3.1 -BrOffice.org=3.1 -Oracle Open Office=3.2 +OpenOffice.org=3.3 +BrOffice.org=3.3 +Oracle Open Office=3.3 -- cgit