[Libreoffice-commits] .: 424 commits - qadevOOo/prj qadevOOo/qa qadevOOo/runner qadevOOo/tests smoketestoo_native/data smoketestoo_native/makefile.mk smoketestoo_native/smoketest.cxx testautomation/chart2 testautomation/dbaccess testautomation/extensions testautomation/framework testautomation/global testautomation/graphics testautomation/math testautomation/spreadsheet testautomation/tools testautomation/writer testautomation/xml testgraphical/prj test/inc test/prj test/source testtools/com testtools/prj testtools/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Mar 18 08:29:10 PDT 2011
dev/null |binary
qadevOOo/prj/build.lst | 3
qadevOOo/qa/complex/junitskeleton/Skeleton.java | 194
qadevOOo/qa/complex/junitskeleton/TestDocument.java | 41
qadevOOo/qa/complex/junitskeleton/justatest.java | 38
qadevOOo/qa/complex/junitskeleton/makefile.mk | 63
qadevOOo/qa/complex/junitskeleton/test_documents/README.txt | 1
qadevOOo/runner/complexlib/Assurance.java | 25
qadevOOo/runner/graphical/EnhancedComplexTestCase.java | 23
qadevOOo/runner/graphical/JPEGCreator.java | 3
qadevOOo/runner/graphical/JPEGEvaluator.java | 2
qadevOOo/runner/graphical/Office.java | 1
qadevOOo/runner/graphical/OpenOfficeDatabaseReportExtractor.java | 21
qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java | 3
qadevOOo/runner/graphical/ParameterHelper.java | 3
qadevOOo/runner/graphical/PostscriptCreator.java | 3
qadevOOo/runner/helper/OfficeProvider.java | 6
qadevOOo/runner/helper/ProcessHandler.java | 210
qadevOOo/runner/org/openoffice/Runner.java | 2
qadevOOo/runner/stats/Summarizer.java | 2
qadevOOo/tests/java/mod/_forms/GenericModelTest.java | 28
smoketestoo_native/data/Events.xml | 22
smoketestoo_native/data/Global.xml | 36
smoketestoo_native/data/OptionsDlg.xml | 19
smoketestoo_native/data/Test_10er.xml | 203
smoketestoo_native/data/content.xml | 2
smoketestoo_native/makefile.mk | 10
smoketestoo_native/smoketest.cxx | 25
test/inc/test/getargument.hxx | 47
test/inc/test/gettestargument.hxx | 46
test/inc/test/officeconnection.hxx | 12
test/inc/test/uniquepipename.hxx | 44
test/prj/build.lst | 3
test/prj/d.lst | 4
test/source/cpp/getargument.cxx | 7
test/source/cpp/getargument.hxx | 44
test/source/cpp/gettestargument.cxx | 43
test/source/cpp/makefile.mk | 11
test/source/cpp/officeconnection.cxx | 64
test/source/cpp/uniquepipename.cxx | 48
test/source/java/OfficeConnection.java | 221
test/source/java/makefile.mk | 49
test/source/java/org/openoffice/test/Argument.java | 36
test/source/java/org/openoffice/test/FileHelper.java | 62
test/source/java/org/openoffice/test/OfficeConnection.java | 222
test/source/java/org/openoffice/test/OfficeFileUrl.java | 42
test/source/java/org/openoffice/test/TestArgument.java | 39
test/source/java/org/openoffice/test/makefile.mk | 55
test/source/java/org/openoffice/test/tools/DocumentType.java | 64
test/source/java/org/openoffice/test/tools/OfficeDocument.java | 328
test/source/java/org/openoffice/test/tools/OfficeDocumentView.java | 144
test/source/java/org/openoffice/test/tools/SpreadsheetDocument.java | 73
test/source/java/org/openoffice/test/tools/SpreadsheetView.java | 72
test/source/java/org/openoffice/test/tools/makefile.mk | 49
testautomation/chart2/optional/ch2_losa_ods_to_sdc.bas | 67
testautomation/chart2/optional/ch2_losa_sxc_to_sdc.bas | 68
testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc | 19
testautomation/chart2/optional/includes/ch2_flexible_source_range_selection01.inc | 4
testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc | 2
testautomation/chart2/required/ch2_updt_calc.bas | 3
testautomation/chart2/required/includes/ch2_file.inc | 77
testautomation/chart2/required/includes/ch2_format.inc | 37
testautomation/chart2/tools/ch_tools_common.inc | 8
testautomation/dbaccess/optional/dba_rpt_Charts.bas | 47
testautomation/dbaccess/optional/includes/ctrl_General.inc | 92
testautomation/dbaccess/optional/includes/ctrl_Several2.inc | 4
testautomation/dbaccess/optional/includes/ctrl_Wizards.inc | 8
testautomation/dbaccess/optional/includes/db_JDBCMySQL.inc | 12
testautomation/dbaccess/optional/includes/db_Query.inc | 48
testautomation/dbaccess/optional/includes/rpt_Charts.inc | 94
testautomation/dbaccess/optional/includes/rpt_ExecuteReport.inc | 7
testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc | 32
testautomation/dbaccess/tools/dbcreatetools.inc | 4
testautomation/dbaccess/tools/tabletools.inc | 1
testautomation/extensions/optional/e_display_name.bas | 2
testautomation/extensions/optional/e_fileopen.bas | 2
testautomation/extensions/optional/e_help.bas | 2
testautomation/extensions/optional/e_identifiers.bas | 2
testautomation/extensions/optional/e_issues.bas | 2
testautomation/extensions/optional/e_location.bas | 2
testautomation/extensions/optional/e_meta-inf.bas | 2
testautomation/extensions/optional/e_online_update.bas | 2
testautomation/extensions/optional/e_options.bas | 2
testautomation/extensions/optional/e_platforms.bas | 2
testautomation/extensions/optional/e_publisher.bas | 2
testautomation/extensions/optional/includes/display_name.inc | 2
testautomation/extensions/optional/includes/fileopen.inc | 2
testautomation/extensions/optional/includes/help.inc | 2
testautomation/extensions/optional/includes/identifiers.inc | 2
testautomation/extensions/optional/includes/issue110083.inc | 2
testautomation/extensions/optional/includes/location.inc | 2
testautomation/extensions/optional/includes/meta-inf.inc | 2
testautomation/extensions/optional/includes/online_update.inc | 4
testautomation/extensions/optional/includes/options.inc | 2
testautomation/extensions/optional/includes/platforms.inc | 4
testautomation/extensions/optional/includes/publisher.inc | 6
testautomation/extensions/optional/input/dependencies/version34.oxt |binary
testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/src/toolpanels/TaskPaneComponentUI.xdl | 2
testautomation/extensions/required/e_update.bas | 2
testautomation/extensions/required/includes/e_update.inc | 16
testautomation/framework/optional/f_basic_dialog_i18n.bas | 2
testautomation/framework/optional/f_basic_documents.bas | 2
testautomation/framework/optional/f_basic_first.bas | 2
testautomation/framework/optional/f_basic_formcontrols.bas | 2
testautomation/framework/optional/f_basic_gridcontrol.bas | 15
testautomation/framework/optional/f_basic_issues.bas | 2
testautomation/framework/optional/f_basic_library_export_import.bas | 2
testautomation/framework/optional/f_basic_modules.bas | 2
testautomation/framework/optional/f_basic_package_export_import.bas | 2
testautomation/framework/optional/f_basic_protected_libraries.bas | 2
testautomation/framework/optional/f_basic_shared_modules.bas | 2
testautomation/framework/optional/f_basic_templatedocuments.bas | 2
testautomation/framework/optional/f_basic_vba-compat.bas | 2
testautomation/framework/optional/f_extras_labels.bas | 2
testautomation/framework/optional/f_extras_samplefileopen.bas | 2
testautomation/framework/optional/f_extras_sampleopen.bas | 2
testautomation/framework/optional/f_extras_samplepreview.bas | 2
testautomation/framework/optional/f_extras_tableautoformat.bas | 2
testautomation/framework/optional/f_extras_templatefileopen.bas | 2
testautomation/framework/optional/f_extras_templateopen.bas | 2
testautomation/framework/optional/f_extras_templatepreview.bas | 2
testautomation/framework/optional/f_filedlg_allowed_names.bas | 2
testautomation/framework/optional/f_filedlg_autocompletion.bas | 2
testautomation/framework/optional/f_filedlg_cjk_files.bas | 2
testautomation/framework/optional/f_filedlg_dialogtest.bas | 2
testautomation/framework/optional/f_filedlg_folder_navigation.bas | 2
testautomation/framework/optional/f_filedlg_forbidden_names_windows.bas | 2
testautomation/framework/optional/f_filedlg_multiselection.bas | 2
testautomation/framework/optional/f_filedlg_passwords.bas | 2
testautomation/framework/optional/f_filedlg_reserved_names_unix.bas | 2
testautomation/framework/optional/f_filedlg_reserved_names_windows.bas | 2
testautomation/framework/optional/f_help_bookmarks.bas | 2
testautomation/framework/optional/f_help_compare_applications.bas | 2
testautomation/framework/optional/f_help_compare_content.bas | 2
testautomation/framework/optional/f_help_compare_topics.bas | 2
testautomation/framework/optional/f_help_search.bas | 2
testautomation/framework/optional/f_help_view_topics.bas | 2
testautomation/framework/optional/f_scripting_organizers.bas | 2
testautomation/framework/optional/f_security_broken_signature.bas | 2
testautomation/framework/optional/f_security_certification_dialogs.bas | 2
testautomation/framework/optional/f_security_certified_docs.bas | 2
testautomation/framework/optional/f_security_evilmacro.bas | 2
testautomation/framework/optional/f_security_incorrect_password.bas | 2
testautomation/framework/optional/f_security_macrosecurity.bas | 2
testautomation/framework/optional/f_security_recommend_password.bas | 2
testautomation/framework/optional/f_security_trusted_path.bas | 2
testautomation/framework/optional/f_toolbar_items.bas | 2
testautomation/framework/optional/f_usage_tracking.bas | 2
testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc | 19
testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc | 16
testautomation/framework/optional/includes/basic_delete_modules.inc | 2
testautomation/framework/optional/includes/basic_dialog_i18n_copy_control.inc | 2
testautomation/framework/optional/includes/basic_dialog_i18n_defaults.inc | 2
testautomation/framework/optional/includes/basic_documents.inc | 2
testautomation/framework/optional/includes/basic_formcontrols.inc | 4
testautomation/framework/optional/includes/basic_gridcontrol.inc | 113
testautomation/framework/optional/includes/basic_ide.inc | 2
testautomation/framework/optional/includes/basic_issues.inc | 2
testautomation/framework/optional/includes/basic_library_export.inc | 2
testautomation/framework/optional/includes/basic_library_import.inc | 2
testautomation/framework/optional/includes/basic_macros.inc | 2
testautomation/framework/optional/includes/basic_modulehide.inc | 2
testautomation/framework/optional/includes/basic_modulenames.inc | 2
testautomation/framework/optional/includes/basic_modules.inc | 2
testautomation/framework/optional/includes/basic_package_export.inc | 2
testautomation/framework/optional/includes/basic_package_import.inc | 6
testautomation/framework/optional/includes/basic_protected_libraries.inc | 2
testautomation/framework/optional/includes/basic_shared_modules.inc | 4
testautomation/framework/optional/includes/basic_spectemplate.inc | 6
testautomation/framework/optional/includes/basic_usertemplate.inc | 2
testautomation/framework/optional/includes/basic_vba-compat_application-union.inc | 10
testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc | 2
testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc | 2
testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc | 2
testautomation/framework/optional/includes/basic_vba-compat_security_check.inc | 105
testautomation/framework/optional/includes/basic_vba-compat_thisworkbook.inc | 2
testautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc | 2
testautomation/framework/optional/includes/basic_vba_compat_tools.inc | 2
testautomation/framework/optional/includes/configuration.inc | 66
testautomation/framework/optional/includes/extras_file_open.inc | 2
testautomation/framework/optional/includes/extras_labels.inc | 2
testautomation/framework/optional/includes/extras_modify_objects.inc | 102
testautomation/framework/optional/includes/extras_preview.inc | 2
testautomation/framework/optional/includes/extras_table_autoformat.inc | 2
testautomation/framework/optional/includes/f_usage_tracking.inc | 6
testautomation/framework/optional/includes/filedlg_allowed_names.inc | 2
testautomation/framework/optional/includes/filedlg_autocomplete.inc | 2
testautomation/framework/optional/includes/filedlg_cjk_files.inc | 2
testautomation/framework/optional/includes/filedlg_cjk_folders.inc | 86
testautomation/framework/optional/includes/filedlg_document_properties.inc | 2
testautomation/framework/optional/includes/filedlg_filternames.inc | 2
testautomation/framework/optional/includes/filedlg_folders1.inc | 2
testautomation/framework/optional/includes/filedlg_folders2.inc | 2
testautomation/framework/optional/includes/filedlg_folders3.inc | 2
testautomation/framework/optional/includes/filedlg_folders4.inc | 2
testautomation/framework/optional/includes/filedlg_folders5.inc | 2
testautomation/framework/optional/includes/filedlg_folders6.inc | 2
testautomation/framework/optional/includes/filedlg_folders7.inc | 2
testautomation/framework/optional/includes/filedlg_forbidden_names_windows.inc | 2
testautomation/framework/optional/includes/filedlg_multiselection.inc | 2
testautomation/framework/optional/includes/filedlg_passwords.inc | 2
testautomation/framework/optional/includes/filedlg_rename.inc | 2
testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc | 2
testautomation/framework/optional/includes/filedlg_reserved_names_windows.inc | 2
testautomation/framework/optional/includes/filedlg_tools.inc | 2
testautomation/framework/optional/includes/filedlg_triggers.inc | 2
testautomation/framework/optional/includes/help_bookmarks.inc | 2
testautomation/framework/optional/includes/help_compare_applications.inc | 2
testautomation/framework/optional/includes/help_compare_content.inc | 2
testautomation/framework/optional/includes/help_compare_topics.inc | 2
testautomation/framework/optional/includes/help_search.inc | 2
testautomation/framework/optional/includes/help_view_topics.inc | 2
testautomation/framework/optional/includes/options_loadsave_general.inc | 106
testautomation/framework/optional/includes/options_loadsave_html.inc | 2
testautomation/framework/optional/includes/options_loadsave_msoffice.inc | 2
testautomation/framework/optional/includes/options_loadsave_vba.inc | 2
testautomation/framework/optional/includes/options_ooo_colors.inc | 21
testautomation/framework/optional/includes/options_ooo_general.inc | 256
testautomation/framework/optional/includes/options_ooo_memory.inc | 2
testautomation/framework/optional/includes/scripting_organizers.inc | 2
testautomation/framework/optional/includes/security_broken_signature.inc | 2
testautomation/framework/optional/includes/security_certification_dialogs.inc | 2
testautomation/framework/optional/includes/security_certified_docs.inc | 2
testautomation/framework/optional/includes/security_evilmacro1.inc | 2
testautomation/framework/optional/includes/security_evilmacro2.inc | 2
testautomation/framework/optional/includes/security_evilmacro3.inc | 2
testautomation/framework/optional/includes/security_incorrect_password.inc | 10
testautomation/framework/optional/includes/security_macrosecurity.inc | 2
testautomation/framework/optional/includes/security_recommend_password.inc | 2
testautomation/framework/optional/includes/security_trusted_path.inc | 3
testautomation/framework/optional/includes/standardbar2.inc | 2
testautomation/framework/optional/includes/w_grid_layout1.inc | 21
testautomation/framework/optional/input/filternames/OpenOffice.org_Filternames_en-US.txt | 2
testautomation/framework/optional/input/filternames/Oracle_Open_Office_Filternames_add_en-US.txt | 2
testautomation/framework/optional/input/filternames/Oracle_Open_Office_Filternames_en-US.txt | 2
testautomation/framework/optional/input/gridcontrol.odt |binary
testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt |21694 +++++-----
testautomation/framework/required/f_help_browser.bas | 2
testautomation/framework/required/f_printer_administration.bas | 2
testautomation/framework/required/f_programmability_dialogs.bas | 2
testautomation/framework/required/f_security_dialogs.bas | 2
testautomation/framework/required/f_standard_toolbar.bas | 2
testautomation/framework/required/f_tools_customize.bas | 2
testautomation/framework/required/f_tools_options.bas | 2
testautomation/framework/required/f_topten.bas | 2
testautomation/framework/required/f_window_functions.bas | 2
testautomation/framework/required/f_wizards.bas | 2
testautomation/framework/required/includes/basic_dialog_export.inc | 2
testautomation/framework/required/includes/basic_dialog_i18n.inc | 2
testautomation/framework/required/includes/basic_dialog_i18n_import.inc | 2
testautomation/framework/required/includes/basic_macroassignment.inc | 2
testautomation/framework/required/includes/basic_organizer.inc | 2
testautomation/framework/required/includes/first.inc | 2
testautomation/framework/required/includes/help_browser.inc | 2
testautomation/framework/required/includes/printer_administration.inc | 2
testautomation/framework/required/includes/script_organizers.inc | 2
testautomation/framework/required/includes/scripting_basics.inc | 2
testautomation/framework/required/includes/security_dialogs.inc | 2
testautomation/framework/required/includes/smoketest.inc | 4
testautomation/framework/required/includes/standard_toolbar_1.inc | 2
testautomation/framework/required/includes/standard_toolbar_3.inc | 2
testautomation/framework/required/includes/standard_toolbar_4.inc | 2
testautomation/framework/required/includes/standard_toolbar_5.inc | 2
testautomation/framework/required/includes/standard_toolbar_6.inc | 2
testautomation/framework/required/includes/tools_customize.inc | 2
testautomation/framework/required/includes/tools_options.inc | 2
testautomation/framework/required/includes/topten.inc | 107
testautomation/framework/required/includes/window_functions.inc | 10
testautomation/framework/required/includes/wizard_agenda.inc | 2
testautomation/framework/required/includes/wizard_documentconverter.inc | 2
testautomation/framework/required/includes/wizard_euroconverter.inc | 2
testautomation/framework/required/includes/wizard_fax.inc | 2
testautomation/framework/required/includes/wizard_firsttime.inc | 2
testautomation/framework/required/includes/wizard_letter.inc | 2
testautomation/framework/required/includes/wizard_mailmerge.inc | 2
testautomation/framework/required/includes/wizard_presentation.inc | 2
testautomation/framework/required/input/10erTest_680.sxw |binary
testautomation/framework/tools/includes/customize_tools.inc | 2
testautomation/framework/tools/includes/fileoperations.inc | 2
testautomation/framework/tools/includes/formcontrols.inc | 2
testautomation/framework/tools/includes/help_tools.inc | 2
testautomation/framework/tools/includes/i18n_tools.inc | 2
testautomation/framework/tools/includes/pbrowser_tools.inc | 2
testautomation/framework/tools/includes/private_environment.inc | 2
testautomation/framework/tools/includes/scriptorganizer_tools.inc | 2
testautomation/framework/tools/includes/spadmin_tools.inc | 2
testautomation/framework/tools/includes/template_tools.inc | 38
testautomation/framework/tools/includes/toolbar_tools.inc | 2
testautomation/framework/tools/includes/webtools.inc | 2
testautomation/framework/tools/includes/window_tools.inc | 2
testautomation/framework/tools/includes/wizards.inc | 2
testautomation/global/hid/hid.lst | 6
testautomation/global/hid/readme.txt | 130
testautomation/global/input/officeinfo.txt | 6
testautomation/global/required/includes/g_findbar.inc | 2
testautomation/global/required/includes/g_option.inc | 11
testautomation/global/required/includes/g_printing.inc | 8
testautomation/global/sid/all.sid | 988
testautomation/global/sid/bars.sid | 1113
testautomation/global/sid/context.sid | 36
testautomation/global/sid/e_all.sid | 1015
testautomation/global/sid/others.sid | 41
testautomation/global/system/includes/gvariabl.inc | 11
testautomation/global/system/includes/iniinfo.inc | 36
testautomation/global/system/includes/master.inc | 102
testautomation/global/tools/includes/optional/t_accels.inc | 2
testautomation/global/tools/includes/optional/t_basic_ide_tools.inc | 2
testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc | 2
testautomation/global/tools/includes/optional/t_control_objects.inc | 4
testautomation/global/tools/includes/optional/t_docfuncs.inc | 2
testautomation/global/tools/includes/optional/t_extension_manager_tools.inc | 2
testautomation/global/tools/includes/optional/t_filetools.inc | 95
testautomation/global/tools/includes/optional/t_key_tools.inc | 2
testautomation/global/tools/includes/optional/t_listfuncs.inc | 2
testautomation/global/tools/includes/optional/t_macro_tools.inc | 42
testautomation/global/tools/includes/optional/t_ole.inc | 2
testautomation/global/tools/includes/optional/t_security_tools.inc | 2
testautomation/global/tools/includes/optional/t_stringtools.inc | 2
testautomation/global/tools/includes/optional/t_treelist_tools.inc | 2
testautomation/global/tools/includes/optional/t_ui_filters.inc | 2
testautomation/global/tools/includes/optional/t_user_info.inc | 2
testautomation/global/tools/includes/required/t_dir.inc | 51
testautomation/global/tools/includes/required/t_doc1.inc | 19
testautomation/global/tools/includes/required/t_doc2.inc | 129
testautomation/global/tools/includes/required/t_files.inc | 165
testautomation/global/tools/includes/required/t_filters.inc | 2
testautomation/global/tools/includes/required/t_menu.inc | 6
testautomation/global/tools/includes/required/t_tools1.inc | 2
testautomation/global/tools/includes/required/t_tools2.inc | 26
testautomation/global/win/bars.win | 362
testautomation/global/win/dial_a_c.win | 522
testautomation/global/win/dial_d_h.win | 1126
testautomation/global/win/dial_i_o.win | 851
testautomation/global/win/dial_p_s.win | 756
testautomation/global/win/dial_t_z.win | 648
testautomation/global/win/dokument.win | 98
testautomation/global/win/e_mathop.win | 386
testautomation/global/win/edia_a_c.win | 930
testautomation/global/win/edia_d_h.win | 1005
testautomation/global/win/edia_i_o.win | 613
testautomation/global/win/edia_p_s.win | 1295
testautomation/global/win/edia_t_z.win | 551
testautomation/global/win/etab_a_d.win | 917
testautomation/global/win/etab_e_g.win | 678
testautomation/global/win/etab_h_o.win | 464
testautomation/global/win/etab_p_s.win | 216
testautomation/global/win/etab_t_z.win | 292
testautomation/global/win/etoolbox.win | 90
testautomation/global/win/mathop.win | 382
testautomation/global/win/piloten.win | 130
testautomation/global/win/reportdesigner.win | 126
testautomation/global/win/spadmin.win | 210
testautomation/global/win/sys_dial.win | 184
testautomation/global/win/tab_a_d.win | 724
testautomation/global/win/tab_e_g.win | 540
testautomation/global/win/tab_h_o.win | 946
testautomation/global/win/tab_p_s.win | 524
testautomation/global/win/tab_t_z.win | 738
testautomation/global/win/w_autop.win | 56
testautomation/graphics/optional/d_export_graphic_a.bas | 20
testautomation/graphics/optional/d_export_graphic_b.bas | 20
testautomation/graphics/optional/export_graphic_a.bas | 20
testautomation/graphics/optional/export_graphic_b.bas | 20
testautomation/graphics/optional/g_spellcheck.bas | 17
testautomation/graphics/optional/i_only_updt_1.bas | 77
testautomation/graphics/optional/i_only_updt_2.bas | 76
testautomation/graphics/optional/i_slideshow.bas | 2
testautomation/graphics/optional/i_us_presentation.bas | 9
testautomation/graphics/optional/includes/draw/d_002_.inc | 109
testautomation/graphics/optional/includes/draw/d_003_.inc | 82
testautomation/graphics/optional/includes/draw/d_005_.inc | 51
testautomation/graphics/optional/includes/draw/d_007.inc | 47
testautomation/graphics/optional/includes/global/export_graphic.inc | 287
testautomation/graphics/optional/includes/global/export_graphic_2.inc | 833
testautomation/graphics/optional/includes/global/g_area.inc | 664
testautomation/graphics/optional/includes/global/g_arrangealign.inc | 150
testautomation/graphics/optional/includes/global/g_autocorrection.inc | 22
testautomation/graphics/optional/includes/global/g_character.inc | 191
testautomation/graphics/optional/includes/global/g_clipboard.inc | 308
testautomation/graphics/optional/includes/global/g_clipexport.inc | 209
testautomation/graphics/optional/includes/global/g_clipexport2.inc | 20
testautomation/graphics/optional/includes/global/g_clipexport3.inc | 51
testautomation/graphics/optional/includes/global/g_convertto.inc | 221
testautomation/graphics/optional/includes/global/g_crossfading.inc | 259
testautomation/graphics/optional/includes/global/g_customshapes.inc | 138
testautomation/graphics/optional/includes/global/g_demoguide.inc | 119
testautomation/graphics/optional/includes/global/g_edit.inc | 322
testautomation/graphics/optional/includes/global/g_find_replace.inc | 100
testautomation/graphics/optional/includes/global/g_format.inc | 1507
testautomation/graphics/optional/includes/global/g_group.inc | 143
testautomation/graphics/optional/includes/global/g_imagemap.inc | 131
testautomation/graphics/optional/includes/global/g_line.inc | 244
testautomation/graphics/optional/includes/global/g_load_save.inc | 357
testautomation/graphics/optional/includes/global/g_mediaplayer.inc | 103
testautomation/graphics/optional/includes/global/g_paneview.inc | 4
testautomation/graphics/optional/includes/global/g_shaddow.inc | 192
testautomation/graphics/optional/includes/global/g_spellcheck.inc | 975
testautomation/graphics/optional/includes/global/g_stylist.inc | 89
testautomation/graphics/optional/includes/global/g_tables.inc | 15
testautomation/graphics/optional/includes/global/g_tools.inc | 310
testautomation/graphics/optional/includes/global/g_zoom.inc | 34
testautomation/graphics/optional/includes/global/id_001.inc | 725
testautomation/graphics/optional/includes/global/id_002.inc | 440
testautomation/graphics/optional/includes/global/id_003.inc | 264
testautomation/graphics/optional/includes/global/id_004.inc | 370
testautomation/graphics/optional/includes/global/id_005.inc | 808
testautomation/graphics/optional/includes/global/id_006.inc | 362
testautomation/graphics/optional/includes/global/id_007.inc | 426
testautomation/graphics/optional/includes/global/id_008.inc | 71
testautomation/graphics/optional/includes/global/id_009.inc | 243
testautomation/graphics/optional/includes/global/id_011.inc | 995
testautomation/graphics/optional/includes/impress/i_animation.inc | 309
testautomation/graphics/optional/includes/impress/i_headerfooter.inc | 220
testautomation/graphics/optional/includes/impress/i_pengine.inc | 884
testautomation/graphics/optional/includes/impress/i_pengine1.inc | 336
testautomation/graphics/optional/includes/impress/i_pengine2.inc | 163
testautomation/graphics/optional/includes/impress/i_slidecopy.inc | 156
testautomation/graphics/optional/includes/impress/i_slidelayer.inc | 181
testautomation/graphics/optional/includes/impress/i_slideshow.inc | 537
testautomation/graphics/optional/includes/impress/i_slideshow2.inc | 224
testautomation/graphics/optional/includes/impress/i_slideshow3.inc | 1940
testautomation/graphics/optional/includes/impress/i_stylist.inc | 39
testautomation/graphics/optional/includes/impress/i_us2_present.inc | 86
testautomation/graphics/optional/includes/impress/i_us_present.inc | 397
testautomation/graphics/optional/includes/impress/i_view.inc | 142
testautomation/graphics/optional/includes/impress/im_002_.inc | 52
testautomation/graphics/optional/includes/impress/im_003_.inc | 254
testautomation/graphics/optional/includes/impress/im_004_.inc | 58
testautomation/graphics/optional/includes/impress/im_005_.inc | 50
testautomation/graphics/optional/includes/impress/im_007_.inc | 693
testautomation/graphics/optional/includes/impress/im_011_.inc | 173
testautomation/graphics/optional/includes/impress/options.inc | 24
testautomation/graphics/required/includes/global/gallery.inc | 987
testautomation/graphics/required/includes/global/gallery2.inc | 290
testautomation/graphics/required/includes/global/id_001.inc | 197
testautomation/graphics/required/includes/global/id_002.inc | 21
testautomation/graphics/required/includes/global/id_003.inc | 15
testautomation/graphics/required/includes/global/id_004.inc | 62
testautomation/graphics/required/includes/global/id_005.inc | 31
testautomation/graphics/required/includes/global/id_006.inc | 447
testautomation/graphics/required/includes/global/id_007.inc | 514
testautomation/graphics/required/includes/global/id_008.inc | 61
testautomation/graphics/required/includes/global/id_009.inc | 408
testautomation/graphics/required/includes/global/id_011.inc | 1863
testautomation/graphics/required/includes/global/id_opt_1.inc | 1437
testautomation/graphics/required/includes/global/id_opt_2.inc | 48
testautomation/graphics/required/includes/impress/im_003_.inc | 64
testautomation/graphics/required/includes/impress/im_004_.inc | 31
testautomation/graphics/required/includes/impress/im_005_.inc | 4
testautomation/graphics/required/includes/impress/im_007_.inc | 26
testautomation/graphics/required/includes/impress/im_011_.inc | 2
testautomation/graphics/required/input/recht_1.odg |binary
testautomation/graphics/required/input/recht_1.odp |binary
testautomation/graphics/required/input/recht_3.odg |binary
testautomation/graphics/required/input/recht_3.odp |binary
testautomation/graphics/required/input/recht_31.odg |binary
testautomation/graphics/required/input/recht_31.odp |binary
testautomation/graphics/required/input/recht_33.odg |binary
testautomation/graphics/required/input/recht_33.odp |binary
testautomation/graphics/required/input/recht_34.odg |binary
testautomation/graphics/required/input/recht_34.odp |binary
testautomation/graphics/required/input/recht_36.odg |binary
testautomation/graphics/required/input/recht_36.odp |binary
testautomation/graphics/required/input/recht_39.odg |binary
testautomation/graphics/required/input/recht_39.odp |binary
testautomation/graphics/required/input/recht_46.odg |binary
testautomation/graphics/required/input/recht_46.odp |binary
testautomation/graphics/required/input/recht_48.odg |binary
testautomation/graphics/required/input/recht_48.odp |binary
testautomation/graphics/required/input/recht_49.odg |binary
testautomation/graphics/required/input/recht_49.odp |binary
testautomation/graphics/required/input/recht_55.odg |binary
testautomation/graphics/required/input/recht_55.odp |binary
testautomation/graphics/tools/id_tools.inc | 76
testautomation/graphics/tools/id_tools_2.inc | 256
testautomation/graphics/tools/makeLokaleTxt.bas | 20
testautomation/math/optional/includes/m_101_.inc | 33
testautomation/math/optional/includes/m_105.inc | 12
testautomation/math/required/includes/m_001_.inc | 6
testautomation/math/required/includes/m_005_.inc | 14
testautomation/math/required/includes/m_007_.inc | 3
testautomation/spreadsheet/optional/includes/arrayconstants/c_arrayconstants.inc | 14
testautomation/spreadsheet/optional/includes/getpivotdata/c_getpivotdata.inc | 12
testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc | 27
testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc | 101
testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_iz.inc | 156
testautomation/spreadsheet/optional/includes/solver/c_solver.inc | 8
testautomation/spreadsheet/optional/includes/validity/c_validity.inc | 574
testautomation/spreadsheet/required/includes/c_upd_datamenu.inc | 10
testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc | 5
testautomation/spreadsheet/required/includes/c_upd_filemenu.inc | 81
testautomation/spreadsheet/required/includes/c_upd_formatmenu.inc | 4
testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc | 29
testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc | 39
testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc | 34
testautomation/spreadsheet/tools/includes/c_l10n_tools.inc | 221
testautomation/spreadsheet/tools/input/Functionnames.ods |binary
testautomation/tools/hid/cons.txt | 83
testautomation/tools/hid/hid.bat | 2
testautomation/tools/hid/hid.pl | 92
testautomation/tools/hid/hid.sh | 2
testautomation/writer/optional/includes/alternative_text/w_alternative_text.inc | 9
testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc | 32
testautomation/writer/optional/includes/clipboard/clipbrd_func.inc | 4
testautomation/writer/optional/includes/clipboard/w_210_.inc | 12
testautomation/writer/optional/includes/clipboard/w_211_.inc | 18
testautomation/writer/optional/includes/clipboard/w_212_.inc | 18
testautomation/writer/optional/includes/clipboard/w_213_.inc | 18
testautomation/writer/optional/includes/clipboard/w_214_.inc | 18
testautomation/writer/optional/includes/clipboard/w_215_.inc | 36
testautomation/writer/optional/includes/clipboard/w_216_.inc | 30
testautomation/writer/optional/includes/clipboard/w_217_.inc | 34
testautomation/writer/optional/includes/clipboard/w_218_.inc | 34
testautomation/writer/optional/includes/clipboard/w_219_.inc | 34
testautomation/writer/optional/includes/clipboard/w_220_.inc | 36
testautomation/writer/optional/includes/clipboard/w_221_.inc | 42
testautomation/writer/optional/includes/clipboard/w_222_.inc | 42
testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc | 32
testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc | 67
testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc | 4
testautomation/writer/optional/includes/fields/w_fields1.inc | 12
testautomation/writer/optional/includes/fields/w_fields2.inc | 179
testautomation/writer/optional/includes/fields/w_fields3.inc | 20
testautomation/writer/optional/includes/fields/w_fields4.inc | 114
testautomation/writer/optional/includes/fields/w_fields5.inc | 4
testautomation/writer/optional/includes/fields/w_fields6.inc | 4
testautomation/writer/optional/includes/fields/w_fields7.inc | 35
testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc | 163
testautomation/writer/optional/includes/formatpage/w_formatpage1.inc | 18
testautomation/writer/optional/includes/formatpage/w_formatpage2.inc | 32
testautomation/writer/optional/includes/formatpage/w_formatpage3.inc | 38
testautomation/writer/optional/includes/formatpage/w_formatpage4.inc | 8
testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc | 56
testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc | 107
testautomation/writer/optional/includes/formatparagraph/w_formatparagraph3.inc | 44
testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion1.inc | 42
testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion2.inc | 60
testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion3.inc | 39
testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc | 16
testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc | 12
testautomation/writer/optional/includes/loadsave/w_loadsave.inc | 386
testautomation/writer/optional/includes/navigator/w_navigator.inc | 18
testautomation/writer/optional/includes/number/w_205_.inc | 8
testautomation/writer/optional/includes/number/w_205a_.inc | 18
testautomation/writer/optional/includes/number/w_206_.inc | 4
testautomation/writer/optional/includes/number/w_207_.inc | 21
testautomation/writer/optional/includes/option/wh_o_1.inc | 12
testautomation/writer/optional/includes/option/wh_o_2.inc | 22
testautomation/writer/optional/includes/option/wr_o_1.inc | 16
testautomation/writer/optional/includes/option/wr_o_2.inc | 38
testautomation/writer/optional/includes/option/wr_o_3.inc | 16
testautomation/writer/optional/includes/option/wr_o_4.inc | 5
testautomation/writer/optional/includes/option/wr_o_a.inc | 4
testautomation/writer/optional/includes/redlining/w_redlining1.inc | 4
testautomation/writer/optional/includes/regexp/regular.inc | 4
testautomation/writer/optional/includes/regexp/search.inc | 12
testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc | 22
testautomation/writer/optional/includes/section/w_section_3.inc | 4
testautomation/writer/optional/includes/section/w_section_4.inc | 12
testautomation/writer/optional/includes/shortcut/w_shortcuts.inc | 3
testautomation/writer/optional/includes/sorting/w_sorting1.inc | 39
testautomation/writer/optional/includes/sorting/w_sorting2.inc | 8
testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc | 48
testautomation/writer/optional/includes/spellcheck/w_spellcheck1.inc | 2
testautomation/writer/optional/includes/textframes/w_textframes1.inc | 36
testautomation/writer/optional/includes/textframes/w_textframes2.inc | 24
testautomation/writer/optional/includes/textframes/w_textframes3.inc | 12
testautomation/writer/optional/includes/textframes/w_textframes4.inc | 80
testautomation/writer/optional/includes/textframes/w_textframes5.inc | 40
testautomation/writer/optional/includes/tools/tools1.inc | 4
testautomation/writer/optional/includes/undo/w_undo_history_4.inc | 4
testautomation/writer/optional/w_clipbrd.bas | 48
testautomation/writer/required/includes/w_001_.inc | 6
testautomation/writer/required/includes/w_001b_.inc | 25
testautomation/writer/required/includes/w_007_.inc | 21
testautomation/writer/tools/includes/w_tool3.inc | 2
testautomation/writer/tools/includes/w_tool6.inc | 4
testautomation/writer/tools/includes/w_tools.inc | 26
testgraphical/prj/build.lst | 4
testtools/com/sun/star/comp/bridge/TestComponent.java | 19
testtools/prj/build.lst | 4
testtools/source/bridgetest/bridgetest.component | 34
testtools/source/bridgetest/bridgetest.cxx | 1074
testtools/source/bridgetest/constructors.component | 37
testtools/source/bridgetest/constructors.cxx | 7
testtools/source/bridgetest/cppobj.component | 34
testtools/source/bridgetest/cppobj.cxx | 24
testtools/source/bridgetest/currentcontextchecker.cxx | 12
testtools/source/bridgetest/makefile.mk | 91
testtools/source/bridgetest/pyuno/makefile.mk | 25
testtools/source/bridgetest/testComponent.component | 38
591 files changed, 36609 insertions(+), 43079 deletions(-)
New commits:
commit dc17789af3028be045505e2d6edb830a8a134e14
Merge: 9ad4e4e... b9e3d95...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Mar 18 15:57:12 2011 +0100
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
testtools/prj/build.lst
diff --cc qadevOOo/qa/complex/junitskeleton/TestDocument.java
index 0000000,534602d..ff140a9
mode 000000,100644..100644
--- a/qadevOOo/qa/complex/junitskeleton/TestDocument.java
+++ b/qadevOOo/qa/complex/junitskeleton/TestDocument.java
@@@ -1,0 -1,41 +1,41 @@@
+ /*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+ package complex.junitskeleton;
+
+ import java.io.File;
+ import org.openoffice.test.OfficeFileUrl;
+
+ final class TestDocument
+ {
- public static String getUrl(String name)
++ public static String getUrl(String name)
+ {
+ return OfficeFileUrl.getAbsolute(new File("test_documents", name));
+ }
+
+ private TestDocument() {}
+ }
diff --cc testtools/prj/build.lst
index c1609c6,a76ac59..0b8f340
--- a/testtools/prj/build.lst
+++ b/testtools/prj/build.lst
@@@ -1,6 -1,6 +1,6 @@@
- tt testtools : cpputools io remotebridges stoc javaunohelper PYUNO:pyuno cli_ure offapi NULL
-tt testtools : cpputools io remotebridges stoc javaunohelper pyuno cli_ure offapi ure LIBXSLT:libxslt NULL
++tt testtools : cpputools io remotebridges stoc javaunohelper PYUNO:pyuno cli_ure offapi ure LIBXSLT:libxslt NULL
tt testtools\inc nmake - all tt_inc NULL
- tt testtools\source\bridgetest nmake - all tt_bridgetest tt_bridgetest_idl tt_javaTestObjs tt_inc NULL
+ tt testtools\source\bridgetest nmake - all tt_bridgetest tt_bridgetest_idl tt_inc NULL
tt testtools\source\bridgetest\cli nmake - w,vc7 tt_cli tt_bridgetest tt_bridgetest_idl tt_inc NULL
tt testtools\source\bridgetest\idl nmake - all tt_bridgetest_idl tt_inc NULL
tt testtools\com\sun\star\comp\bridge nmake - all tt_javaTestObjs tt_bridgetest_idl tt_inc NULL
diff --cc testtools/source/bridgetest/pyuno/makefile.mk
index 04b529a,ded3cdb..417bdfc
--- a/testtools/source/bridgetest/pyuno/makefile.mk
+++ b/testtools/source/bridgetest/pyuno/makefile.mk
@@@ -104,10 -109,5 +113,6 @@@ doc .PHONY
runtest : ALL
cd $(DLLDEST) && $(TEST_ENV) && $(PYTHON) main.py
- cd $(DLLDEST) && $(TEST_ENV) && $(WRAPCMD) $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy.rdb \
- -l com.sun.star.loader.Python $(foreach,i,$(PYCOMPONENTS) -c vnd.openoffice.pymodule:$(i))
- cd $(DLLDEST) && $(TEST_ENV) && $(WRAPCMD) $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy2.rdb \
- -l com.sun.star.loader.Python -c vnd.sun.star.expand:$$FOO/samplecomponent.py
.ENDIF # L10N_framework
+.ENDIF # DISABLE_PYTHON
commit b9e3d95ced6699ce683c13821db17f231a7992ad
Merge: f9b660e... 49e5cb3...
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Mar 11 11:35:29 2011 +0000
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Conflicts:
smoketestoo_native/data/Global.xml
smoketestoo_native/data/OptionsDlg.xml
smoketestoo_native/data/Test_10er.xml
smoketestoo_native/data/content.xml
smoketestoo_native/smoketest.cxx
test/source/cpp/getargument.cxx
test/source/cpp/officeconnection.cxx
testautomation/framework/optional/includes/basic_vba-compat_security_check.inc
testautomation/framework/optional/includes/filedlg_cjk_folders.inc
testautomation/global/sid/all.sid
testautomation/global/sid/bars.sid
testautomation/global/sid/e_all.sid
testautomation/global/win/bars.win
testautomation/graphics/optional/includes/impress/i_slideshow2.inc
testautomation/graphics/optional/includes/impress/i_slideshow3.inc
testtools/source/bridgetest/bridgetest.cxx
testtools/source/bridgetest/constructors.cxx
testtools/source/bridgetest/makefile.mk
testtools/source/bridgetest/testComponent.component
diff --cc qadevOOo/qa/complex/junitskeleton/Skeleton.java
index 0000000,a8486f7..3ae5d3d
mode 000000,100644..100644
--- a/qadevOOo/qa/complex/junitskeleton/Skeleton.java
+++ b/qadevOOo/qa/complex/junitskeleton/Skeleton.java
@@@ -1,0 -1,194 +1,194 @@@
+ /*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
++ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+ package complex.junitskeleton;
+
+ import com.sun.star.io.IOException;
+ import com.sun.star.lang.IllegalArgumentException;
+ import com.sun.star.lang.XComponent;
+ import com.sun.star.lang.XMultiServiceFactory;
+ import com.sun.star.uno.UnoRuntime;
+ import com.sun.star.util.XCloseable;
+ import java.io.File;
+ import java.io.RandomAccessFile;
+
+ import lib.TestParameters;
+
+ import util.SOfficeFactory;
+
+ // ---------- junit imports -----------------
+ import org.junit.After;
+ import org.junit.AfterClass;
+ import org.junit.Before;
+ import org.junit.BeforeClass;
+ import org.junit.Test;
+ import org.openoffice.test.OfficeConnection;
+ import static org.junit.Assert.*;
+ // ------------------------------------------
+
+ public class Skeleton
+ {
+ /**
+ * The test parameters
+ */
+ private static TestParameters param = null;
+
+ @Test public void check() {
+ assertTrue("Couldn't open document", open());
+ System.out.println("check");
+ assertTrue("Couldn't close document", close());
+ String tempDirURL = util.utils.getOfficeTemp/*Dir*/(getMSF());
+ System.out.println("temp dir URL is: " + tempDirURL);
+ String tempDir = graphical.FileHelper.getSystemPathFromFileURL(tempDirURL);
+ assertTrue("Temp directory doesn't exist.", new File(tempDir).exists());
+ }
+
+ private boolean open()
+ {
+ System.out.println("open()");
+ // get multiservicefactory -----------------------------------------
+ final XMultiServiceFactory xMsf = getMSF();
+
+ SOfficeFactory SOF = SOfficeFactory.getFactory(xMsf);
+
+ // some Tests need the qadevOOo TestParameters, it is like a Hashmap for Properties.
+ param = new TestParameters();
+ param.put("ServiceFactory", xMsf); // some qadevOOo functions need the ServiceFactory
+
+ return true;
+ }
+
+ private boolean close()
+ {
+ System.out.println("close()");
+ return true;
+ }
+
+ // marked as test
+ @Test public void checkDocument()
+ {
+ System.out.println("checkDocument()");
+ final String sREADME = TestDocument.getUrl("README.txt");
+ System.out.println("README is in:" + sREADME);
+ File aFile = new File(sREADME);
+ if (! aFile.exists())
+ {
+ // It is a little bit stupid that office urls not compatible to java file urls
+ System.out.println("java.io.File can't access Office file urls.");
+ String sREADMESystemPath = graphical.FileHelper.getSystemPathFromFileURL(sREADME);
+ aFile = new File(sREADMESystemPath);
+ assertTrue("File '" + sREADMESystemPath + "' doesn't exists.", aFile.exists());
+ }
+
+ try
+ {
+ RandomAccessFile aAccess = new RandomAccessFile(aFile, "r");
+ long nLength = aAccess.length();
+ System.out.println("File length: " + nLength);
+ assertTrue("File length wrong", nLength > 0);
+ String sLine = aAccess.readLine();
+ assertTrue("Line must not be empty", sLine.length() > 0);
+ System.out.println(" Line: '" + sLine + "'");
+ System.out.println(" length: " + sLine.length());
+ assertTrue("File length not near equal to string length", sLine.length() + 2 >= nLength);
+ aAccess.close();
+ }
+ catch (java.io.FileNotFoundException e)
+ {
+ fail("Can't find file: " + sREADME + " - " + e.getMessage());
+ }
+ catch (java.io.IOException e)
+ {
+ fail("IO Exception: " + e.getMessage());
+ }
+
+ }
-
++
+ @Test public void checkOpenDocumentWithOffice()
+ {
+ // SOfficeFactory aFactory = new SOfficeFactory(getMSF());
+ SOfficeFactory SOF = SOfficeFactory.getFactory(getMSF());
+ final String sREADME = TestDocument.getUrl("README.txt");
+ try
+ {
+ XComponent aDocument = SOF.loadDocument(sREADME);
+ complex.junitskeleton.justatest.shortWait();
+ XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, aDocument);
+ xClose.close(true);
+ }
+ catch (com.sun.star.lang.IllegalArgumentException ex)
+ {
+ fail("Illegal argument exception caught: " + ex.getMessage());
+ }
+ catch (com.sun.star.io.IOException ex)
+ {
+ fail("IOException caught: " + ex.getMessage());
+ }
+ catch (com.sun.star.uno.Exception ex)
+ {
+ fail("Exception caught: " + ex.getMessage());
+ }
+ }
+
+ // marked as prepare for test, will call before every test
+ @Before public void before()
+ {
+ System.out.println("before()");
+ System.setProperty("THIS IS A TEST", "Hallo");
+ }
-
++
+
+ // marked as post for test, will call after every test
+ @After public void after()
+ {
+ System.out.println("after()");
+ String sValue = System.getProperty("THIS IS A TEST");
+ assertEquals(sValue, "Hallo");
+ }
+
+
+ private XMultiServiceFactory getMSF()
+ {
+ final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
+ return xMSF1;
+ }
+
+ // setup and close connections
+ @BeforeClass public static void setUpConnection() throws Exception {
+ System.out.println("setUpConnection()");
+ connection.setUp();
+ }
+
+ @AfterClass public static void tearDownConnection()
+ throws InterruptedException, com.sun.star.uno.Exception
+ {
+ System.out.println("tearDownConnection()");
+ connection.tearDown();
+ }
+
+ private static final OfficeConnection connection = new OfficeConnection();
+
+ }
diff --cc smoketestoo_native/data/Global.xml
index 42f4287,588b4df..c4dc766
--- a/smoketestoo_native/data/Global.xml
+++ b/smoketestoo_native/data/Global.xml
@@@ -35,7 -35,7 +35,7 @@@ const cParagraphBreak =
global const cExtensionFileName = "TestExtension.oxt"
- global const cDocNew = 0, cDocCut = 1, cDocPaste = 2, cDocSaveOpen8 = 3, cDocSaveOpenXML = 4, cDocOpen50 = 5, cDocClose = 6, cDocWrite = 7
-global const cDocNew = 0, cDocSaveOpen8 = 1, cDocSaveOpenXML = 2, cDocSaveOpen50 = 3, cDocClose = 4, cDocWrite = 5
++global const cDocNew = 0, cDocSaveOpen8 = 1, cDocSaveOpenXML = 2, cDocOpen50 = 3, cDocClose = 4, cDocWrite = 5
global const cDBService = 0, cDBOpen = 1, cDBInsert = 2, cDBDelete = 3, cDBSeek = 4, cDBClose = 5
global const cEXTService = 0, cEXTInstall = 1, cEXTUninstall = 2
global const cLogfileFailed = 255
@@@ -83,8 -83,8 +83,8 @@@ Global const cUserFieldTestWriter = &qu
Global const cUserFieldTestDraw = "Draw", cUserFieldTestMath = "Math", cUserFieldTestChart = "Chart"
Global const cUserFieldTestHTML = "HTML", cUserFieldTestJava = "Java", cUserFieldTestDatabase = "Database"
Global const cUserFieldTestExtension = "Extension"
- Global const cUserFieldTestOpenSaveXML = "SaveOpenXML", cUserFieldTestOpen50 = "Open50", cUserFieldTestCut = "Cut"
- Global const cUserFieldTestPaste = "Paste", cUserFieldTestTerminateAfterTest = "Terminate", cUserFieldTestOpenSave8 = "SaveOpen8"
-Global const cUserFieldTestOpenSaveXML = "SaveOpenXML", cUserFieldTestOpenSave50 = "SaveOpen50"
++Global const cUserFieldTestOpenSaveXML = "SaveOpenXML", cUserFieldTestOpen50 = "Open50"
+ Global const cUserFieldTestTerminateAfterTest = "Terminate", cUserFieldTestOpenSave8 = "SaveOpen8"
Global const cOptionsDialogName = "OptionsDlg", cTest10Modul = "Standard"
@@@ -100,8 -100,8 +100,8 @@@ Global bMakeWriterTest as boolean, bMak
Global bMakeDrawTest as Boolean, bMakeMathTest as boolean, bMakeChartTest as boolean
Global bMakeHTMLTest as boolean, bMakeJavaTest as boolean, bMakeDBTest as boolean
Global bMakeExtensionTest as boolean
- Global bMakeSaveOpenXMLTest as boolean, bMakeOpen50Test as boolean, bMakeCutTest as boolean
- Global bMakePasteTest as boolean, bMakeTerminateAfterTest as boolean, bShowTable as boolean
-Global bMakeSaveOpenXMLTest as boolean, bMakeSaveOpen50Test as boolean
++Global bMakeSaveOpenXMLTest as boolean, bMakeOpen50Test as boolean
+ Global bMakeTerminateAfterTest as boolean, bShowTable as boolean
Global bMakeSaveOpen8Test as boolean
global sExtensionURL as string
@@@ -156,13 -156,11 +156,11 @@@ Sub CreateStatusTabl
tableHeaders(cStHTML) = "HTML"
tableHeaders(cStJava) = "Java"
- dim tableColums(5) as string
+ dim tableColums(3) as string
tableColums(cDocNew) = "new"
- tableColums(cDocCut) = "cut"
- tableColums(cDocPaste) = "paste"
tableColums(cDocSaveOpen8) = "V8.0"
tableColums(cDocSaveOpenXML) = "XML"
- tableColums(cDocSaveOpen50) = "V5.0"
+ tableColums(cDocOpen50) = "V5.0"
' tableColums(cDocClose) = "close"
aDoc = gOutPutDoc
@@@ -507,10 -505,8 +505,8 @@@ Sub SetOption
SetUserFieldState (cUserFieldTestDatabase, -(gOptionsDialog.getControl("cbDatabaseTest").getState), gOutPutDoc)
SetUserFieldState (cUserFieldTestExtension, -(gOptionsDialog.getControl("cbExtensionTest").getState), gOutPutDoc)
SetUserFieldState (cUserFieldTestOpenSaveXML, -(gOptionsDialog.getControl("cbSaveOpenXMLTest").getState), gOutPutDoc)
- SetUserFieldState (cUserFieldTestOpenSave50, -(gOptionsDialog.getControl("cbSaveOpen50Test").getState), gOutPutDoc)
+ SetUserFieldState (cUserFieldTestOpen50, -(gOptionsDialog.getControl("cbOpen50Test").getState), gOutPutDoc)
SetUserFieldState (cUserFieldTestOpenSave8, -(gOptionsDialog.getControl("cbSaveOpen8Test").getState), gOutPutDoc)
- SetUserFieldState (cUserFieldTestCut, -(gOptionsDialog.getControl("cbCutTest").getState), gOutPutDoc)
- SetUserFieldState (cUserFieldTestPaste, -(gOptionsDialog.getControl("cbPasteTest").getState), gOutPutDoc)
SetUserFieldState (cUserFieldTestTerminateAfterTest, -(gOptionsDialog.getControl("cbTerminateAfterTest").getState), gOutPutDoc)
end Sub
@@@ -527,10 -523,8 +523,8 @@@ Sub GetOption
gOptionsDialog.getControl("cbDatabaseTest").setState( -( GetUserFieldState (cUserFieldTestDatabase, gOutPutDoc)))
gOptionsDialog.getControl("cbExtensionTest").setState( -( GetUserFieldState (cUserFieldTestExtension, gOutPutDoc)))
gOptionsDialog.getControl("cbSaveOpenXMLTest").setState( -( GetUserFieldState (cUserFieldTestOpenSaveXML, gOutPutDoc)))
- gOptionsDialog.getControl("cbSaveOpen50Test").setState( -( GetUserFieldState (cUserFieldTestOpenSave50, gOutPutDoc)))
+ gOptionsDialog.getControl("cbOpen50Test").setState( -( GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc)))
gOptionsDialog.getControl("cbSaveOpen8Test").setState( -( GetUserFieldState (cUserFieldTestOpenSave8, gOutPutDoc)))
- gOptionsDialog.getControl("cbCutTest").setState( -( GetUserFieldState (cUserFieldTestCut, gOutPutDoc)))
- gOptionsDialog.getControl("cbPasteTest").setState( -( GetUserFieldState (cUserFieldTestPaste, gOutPutDoc)))
gOptionsDialog.getControl("cbTerminateAfterTest").setState( -( GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutPutDoc)))
End Sub
@@@ -547,10 -541,8 +541,8 @@@ Sub ReadOption
bMakeDBTest = GetUserFieldState (cUserFieldTestDatabase, gOutPutDoc)
bMakeExtensionTest = GetUserFieldState (cUserFieldTestExtension, gOutPutDoc)
bMakeSaveOpenXMLTest = GetUserFieldState (cUserFieldTestOpenSaveXML, gOutPutDoc)
- bMakeSaveOpen50Test = GetUserFieldState (cUserFieldTestOpenSave50, gOutPutDoc)
+ bMakeOpen50Test = GetUserFieldState (cUserFieldTestOpen50, gOutPutDoc)
bMakeSaveOpen8Test = GetUserFieldState (cUserFieldTestOpenSave8, gOutPutDoc)
- bMakeCutTest = GetUserFieldState (cUserFieldTestCut, gOutPutDoc)
- bMakePasteTest = GetUserFieldState (cUserFieldTestPaste, gOutPutDoc)
bMakeTerminateAfterTest = GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutPutDoc)
end Sub
@@@ -574,13 -566,11 +566,11 @@@ Sub SetDefaultOption
bMakeSaveOpenXMLTest = true
REM Disable StarOffice 5.0 tests in case binfilter has not been included
if Environ("WITH_BINFILTER") = "NO" then
- bMakeSaveOpen50Test = false
+ bMakeOpen50Test = false
else
- bMakeSaveOpen50Test = true
+ bMakeOpen50Test = true
End If
bMakeSaveOpen8Test = true
- bMakeCutTest = true
- bMakePasteTest = true
bMakeTerminateAfterTest = false
end Sub
@@@ -614,13 -604,11 +604,11 @@@ Function StartTestWithDefaultOption
component(cStJava) = "Java"
component(cStDataBase) = "Base"
component(cStExtension) = "Extensions"
- dim action(5) as string
+ dim action(3) as string
action(cDocNew) = "new"
- action(cDocCut) = "cut"
- action(cDocPaste) = "paste"
action(cDocSaveOpen8) = "V8.0"
action(cDocSaveOpenXML) = "XML"
- action(cDocSaveOpen50) = "V5.0"
+ action(cDocOpen50) = "V5.0"
dim baseAction(5) as string
baseAction(cDBService) = "services"
baseAction(cDBOpen) = "open"
diff --cc smoketestoo_native/data/OptionsDlg.xml
index 716133e,213c880..c1afd7b
--- a/smoketestoo_native/data/OptionsDlg.xml
+++ b/smoketestoo_native/data/OptionsDlg.xml
@@@ -42,23 -42,21 +42,20 @@@
<dlg:checkbox dlg:id="cbMathTest" dlg:tab-index="7" dlg:left="126" dlg:top="91" dlg:width="80" dlg:height="8" dlg:value="Math" dlg:checked="false"/>
<dlg:checkbox dlg:id="cbChartTest" dlg:tab-index="8" dlg:left="126" dlg:top="105" dlg:width="80" dlg:height="8" dlg:value="Chart" dlg:checked="false"/>
<dlg:checkbox dlg:id="cbSaveOpenXMLTest" dlg:tab-index="9" dlg:left="19" dlg:top="49" dlg:width="80" dlg:height="8" dlg:value="Save / Open XML" dlg:checked="false"/>
- <dlg:checkbox dlg:id="cbSaveOpen50Test" dlg:tab-index="10" dlg:left="19" dlg:top="63" dlg:width="80" dlg:height="8" dlg:value="Save / Open V5.0" dlg:checked="false"/>
- <dlg:checkbox dlg:id="cbTerminateAfterTest" dlg:tab-index="11" dlg:disabled="true" dlg:left="19" dlg:top="174" dlg:width="190" dlg:height="8" dlg:value="Terminate Office after test" dlg:checked="false"/>
- <dlg:titledbox dlg:id="fmBroker" dlg:tab-index="12" dlg:left="7" dlg:top="169" dlg:width="208" dlg:height="17"/>
- <dlg:button dlg:id="btOk" dlg:tab-index="13" dlg:left="7" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Ok" dlg:button-type="ok">
+ <dlg:checkbox dlg:id="cbOpen50Test" dlg:tab-index="10" dlg:left="19" dlg:top="63" dlg:width="80" dlg:height="8" dlg:value="Open V5.0" dlg:checked="false"/>
- <dlg:checkbox dlg:id="cbCutTest" dlg:tab-index="11" dlg:left="19" dlg:top="77" dlg:width="80" dlg:height="8" dlg:value="Cut" dlg:checked="false"/>
- <dlg:checkbox dlg:id="cbPasteTest" dlg:tab-index="12" dlg:left="19" dlg:top="91" dlg:width="80" dlg:height="8" dlg:value="Paste" dlg:checked="false"/>
- <dlg:checkbox dlg:id="cbTerminateAfterTest" dlg:tab-index="13" dlg:disabled="true" dlg:left="19" dlg:top="174" dlg:width="190" dlg:height="8" dlg:value="Terminate Office after test" dlg:checked="false"/>
- <dlg:titledbox dlg:id="fmBroker" dlg:tab-index="14" dlg:left="7" dlg:top="169" dlg:width="208" dlg:height="17"/>
- <dlg:button dlg:id="btOk" dlg:tab-index="15" dlg:left="7" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Ok" dlg:button-type="ok">
++ <dlg:titledbox dlg:id="fmBroker" dlg:tab-index="9" dlg:left="7" dlg:top="169" dlg:width="208" dlg:height="17"/>
++ <dlg:button dlg:id="btOk" dlg:tab-index="10" dlg:left="7" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Ok" dlg:button-type="ok">
<script:event script:event-name="on-performaction" script:location="document" script:macro-name="Standard.Events.PressOk" script:language="StarBasic"/>
</dlg:button>
- <dlg:button dlg:id="btCancel" dlg:tab-index="16" dlg:left="80" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Cancel" dlg:button-type="ok">
+ <dlg:button dlg:id="btCancel" dlg:tab-index="14" dlg:left="80" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Cancel" dlg:button-type="ok">
<script:event script:event-name="on-performaction" script:location="document" script:macro-name="Standard.Events.PressCancel" script:language="StarBasic"/>
</dlg:button>
- <dlg:button dlg:id="btStart" dlg:tab-index="17" dlg:left="152" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Smoketest">
+ <dlg:button dlg:id="btStart" dlg:tab-index="15" dlg:left="152" dlg:top="193" dlg:width="65" dlg:height="15" dlg:value="Smoketest">
<script:event script:event-name="on-performaction" script:location="vnd.sun.star.script" script:macro-name="Standard.Events.PressTest?language=Basic&location=document" script:language="Script"/>
</dlg:button>
- <dlg:checkbox dlg:id="cbJavaTest" dlg:tab-index="18" dlg:left="126" dlg:top="119" dlg:width="80" dlg:height="8" dlg:value="Java" dlg:checked="false"/>
- <dlg:checkbox dlg:id="cbSaveOpen8Test" dlg:tab-index="19" dlg:left="19" dlg:top="35" dlg:width="80" dlg:height="8" dlg:value="Save / Open V8.0" dlg:checked="false"/>
- <dlg:checkbox dlg:id="cbDatabaseTest" dlg:tab-index="20" dlg:left="126" dlg:top="133" dlg:width="80" dlg:height="8" dlg:value="Database" dlg:checked="false"/>
- <dlg:checkbox dlg:id="cbExtensionTest" dlg:tab-index="21" dlg:left="126" dlg:top="147" dlg:width="80" dlg:height="8" dlg:value="Extension" dlg:checked="false"/>
+ <dlg:checkbox dlg:id="cbJavaTest" dlg:tab-index="16" dlg:left="126" dlg:top="119" dlg:width="80" dlg:height="8" dlg:value="Java" dlg:checked="false"/>
+ <dlg:checkbox dlg:id="cbSaveOpen8Test" dlg:tab-index="17" dlg:left="19" dlg:top="35" dlg:width="80" dlg:height="8" dlg:value="Save / Open V8.0" dlg:checked="false"/>
+ <dlg:checkbox dlg:id="cbDatabaseTest" dlg:tab-index="18" dlg:left="126" dlg:top="133" dlg:width="80" dlg:height="8" dlg:value="Database" dlg:checked="false"/>
+ <dlg:checkbox dlg:id="cbExtensionTest" dlg:tab-index="19" dlg:left="126" dlg:top="147" dlg:width="80" dlg:height="8" dlg:value="Extension" dlg:checked="false"/>
</dlg:bulletinboard>
</dlg:window>
diff --cc smoketestoo_native/data/Test_10er.xml
index f92d51d,e98a7a8..63bf988
--- a/smoketestoo_native/data/Test_10er.xml
+++ b/smoketestoo_native/data/Test_10er.xml
@@@ -39,11 -39,8 +39,9 @@@ const cTempFileName = "ttt"
const cMessageSaveOpen8Doc = "Save/Open open Documents (8.0)"
const cMessageSaveOpenXMLDoc = "Save/Open Document XML (6/7)"
+const cMessageOpen50Doc = "Open Document 5.0"
const cMessageNewDoc = "New Document"
const cMessageCloseDoc = "Close Document"
- const cMessageCutObj = "Cut Object"
- const cMessagePasteObj = "Paste Object"
Global sWorkPath$
Global sWorkPathURL$
diff --cc smoketestoo_native/data/content.xml
index f137efb,dcd31b1..021be89
--- a/smoketestoo_native/data/content.xml
+++ b/smoketestoo_native/data/content.xml
@@@ -25,4 -25,4 +25,4 @@@
* for a copy of the LGPLv3 License.
*
**********************************************************************-->
- <office:document-content xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form" xmlns:script="http://openoffice.org/2000/script" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xfor
ms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" office:version="1.2" grddl:transformation="http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl" office:class="text"><office:script/><office:font-decls><style:font-decl style:name="Arial Unicode MS" fo:font-family="'Arial Unicode MS'" style:font-pitch="variable"/><style:font-decl style:name="HG Mincho Light J" fo:font-family="'HG Mincho Light J', 'MS Mincho', 'HG Mincho J', 'HG Mincho L', 'HG Mincho', Mincho, 'MS PMincho', 'MS Gothic', 'HG Gothic J', 'HG Gothic
B', 'HG Gothic', Gothic, 'MS PGothic', 'Andale Sans UI', 'Arial Unicode MS', 'Lucida Sans Unicode', Tahoma" style:font-pitch="variable"/><style:font-decl style:name="Thorndale" fo:font-family="Thorndale, 'Times New Roman', Times, 'Lucida Serif', 'Lucida Bright', Timmons, 'New York', Serif" style:font-family-generic="roman" style:font-pitch="variable"/><style:font-decl style:name="Arial" fo:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable"/></office:font-decls><office:automatic-styles><style:style style:name="P1" style:family="paragraph"><style:properties fo:text-align="center"/></style:style><style:style style:name="gr1" style:family="graphics"><style:properties style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:horizontal-pos="from-left" style:horizontal-rel="paragraph"/></style:style></office:au
tomatic-styles><office:body><office:forms form:automatic-focus="false" form:apply-design-mode="false"><form:form form:name="Standard" form:apply-filter="true" form:command-type="table" form:service-name="com.sun.star.form.component.Form" office:target-frame="" xlink:href=""><form:control form:name="options" form:service-name="com.sun.star.form.component.CommandButton" form:id="control1"><form:button form:label="options" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.ShowOptionsDlg" script:location="document" script:library="document"/></office:events></form:button></form:c
ontrol><form:control form:name="start" form:service-name="com.sun.star.form.component.CommandButton" form:id="control2"><form:button form:label="start smoketest" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.StartTestByOptions" script:location="document" script:library="document"/></office:events></form:button></form:control><form:control form:name="table" form:service-name="com.sun.star.form.component.CommandButton" form:id="control3"><form:button form:label="delete table" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-
position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.ClearAllText" script:location="document" script:library="document"/></office:events></form:button></form:control></form:form></office:forms><text:sequence-decls><text:sequence-decl text:display-outline-level="0" text:name="Illustration"/><text:sequence-decl text:display-outline-level="0" text:name="Table"/><text:sequence-decl text:display-outline-level="0" text:name="Text"/><text:sequence-decl text:display-outline-level="0" text:name="Drawing"/></text:sequence-decls><text:user-field-decls><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Writer"/><text:user-field-decl text:value-type="string" t
ext:string-value="y" text:name="Calc"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Impress"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Draw"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="HTML"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Math"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Chart"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="SaveOpenXML"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Open50"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Cut"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Paste"/><text:user-field-decl text:value-type="string" text:string-value="n" text:name="Terminate"/><text:user-field-decl text:value-type="string" text:string-val
ue="y" text:name="Java"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="SaveOpen8"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Database"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Extension"/></text:user-field-decls><text:p text:style-name="Standard"><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="1" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control2"/><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="0" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control1"/><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="2" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control3"/></text:p><text:p text:style-name="Standard"/></office:body></office:document-content>
-<office:document-content xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form" xmlns:script="http://openoffice.org/2000/script" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xfor
ms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" office:version="1.2" grddl:transformation="http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl" office:class="text"><office:script/><office:font-decls><style:font-decl style:name="Arial Unicode MS" fo:font-family="'Arial Unicode MS'" style:font-pitch="variable"/><style:font-decl style:name="HG Mincho Light J" fo:font-family="'HG Mincho Light J', 'MS Mincho', 'HG Mincho J', 'HG Mincho L', 'HG Mincho', Mincho, 'MS PMincho', 'MS Gothic', 'HG Gothic J', 'HG Gothic
B', 'HG Gothic', Gothic, 'MS PGothic', 'Andale Sans UI', 'Arial Unicode MS', 'Lucida Sans Unicode', Tahoma" style:font-pitch="variable"/><style:font-decl style:name="Thorndale" fo:font-family="Thorndale, 'Times New Roman', Times, 'Lucida Serif', 'Lucida Bright', Timmons, 'New York', Serif" style:font-family-generic="roman" style:font-pitch="variable"/><style:font-decl style:name="Arial" fo:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable"/></office:font-decls><office:automatic-styles><style:style style:name="P1" style:family="paragraph"><style:properties fo:text-align="center"/></style:style><style:style style:name="gr1" style:family="graphics"><style:properties style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:horizontal-pos="from-left" style:horizontal-rel="paragraph"/></style:style></office:au
tomatic-styles><office:body><office:forms form:automatic-focus="false" form:apply-design-mode="false"><form:form form:name="Standard" form:apply-filter="true" form:command-type="table" form:service-name="com.sun.star.form.component.Form" office:target-frame="" xlink:href=""><form:control form:name="options" form:service-name="com.sun.star.form.component.CommandButton" form:id="control1"><form:button form:label="options" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.ShowOptionsDlg" script:location="document" script:library="document"/></office:events></form:button></form:c
ontrol><form:control form:name="start" form:service-name="com.sun.star.form.component.CommandButton" form:id="control2"><form:button form:label="start smoketest" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.StartTestByOptions" script:location="document" script:library="document"/></office:events></form:button></form:control><form:control form:name="table" form:service-name="com.sun.star.form.component.CommandButton" form:id="control3"><form:button form:label="delete table" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-
position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.ClearAllText" script:location="document" script:library="document"/></office:events></form:button></form:control></form:form></office:forms><text:sequence-decls><text:sequence-decl text:display-outline-level="0" text:name="Illustration"/><text:sequence-decl text:display-outline-level="0" text:name="Table"/><text:sequence-decl text:display-outline-level="0" text:name="Text"/><text:sequence-decl text:display-outline-level="0" text:name="Drawing"/></text:sequence-decls><text:user-field-decls><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Writer"/><text:user-field-decl text:value-type="string" t
ext:string-value="y" text:name="Calc"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Impress"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Draw"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="HTML"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Math"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Chart"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="SaveOpenXML"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="SaveOpen50"/><text:user-field-decl text:value-type="string" text:string-value="n" text:name="Terminate"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Java"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="SaveOpen8"/><text:user-field-decl text:value-type="string" text:s
tring-value="y" text:name="Database"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Extension"/></text:user-field-decls><text:p text:style-name="Standard"><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="1" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control2"/><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="0" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control1"/><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="2" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control3"/></text:p><text:p text:style-name="Standard"/></office:body></office:document-content>
++<office:document-content xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form" xmlns:script="http://openoffice.org/2000/script" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xfor
ms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" office:version="1.2" grddl:transformation="http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl" office:class="text"><office:script/><office:font-decls><style:font-decl style:name="Arial Unicode MS" fo:font-family="'Arial Unicode MS'" style:font-pitch="variable"/><style:font-decl style:name="HG Mincho Light J" fo:font-family="'HG Mincho Light J', 'MS Mincho', 'HG Mincho J', 'HG Mincho L', 'HG Mincho', Mincho, 'MS PMincho', 'MS Gothic', 'HG Gothic J', 'HG Gothic
B', 'HG Gothic', Gothic, 'MS PGothic', 'Andale Sans UI', 'Arial Unicode MS', 'Lucida Sans Unicode', Tahoma" style:font-pitch="variable"/><style:font-decl style:name="Thorndale" fo:font-family="Thorndale, 'Times New Roman', Times, 'Lucida Serif', 'Lucida Bright', Timmons, 'New York', Serif" style:font-family-generic="roman" style:font-pitch="variable"/><style:font-decl style:name="Arial" fo:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable"/></office:font-decls><office:automatic-styles><style:style style:name="P1" style:family="paragraph"><style:properties fo:text-align="center"/></style:style><style:style style:name="gr1" style:family="graphics"><style:properties style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:horizontal-pos="from-left" style:horizontal-rel="paragraph"/></style:style></office:au
tomatic-styles><office:body><office:forms form:automatic-focus="false" form:apply-design-mode="false"><form:form form:name="Standard" form:apply-filter="true" form:command-type="table" form:service-name="com.sun.star.form.component.Form" office:target-frame="" xlink:href=""><form:control form:name="options" form:service-name="com.sun.star.form.component.CommandButton" form:id="control1"><form:button form:label="options" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.ShowOptionsDlg" script:location="document" script:library="document"/></office:events></form:button></form:c
ontrol><form:control form:name="start" form:service-name="com.sun.star.form.component.CommandButton" form:id="control2"><form:button form:label="start smoketest" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.StartTestByOptions" script:location="document" script:library="document"/></office:events></form:button></form:control><form:control form:name="table" form:service-name="com.sun.star.form.component.CommandButton" form:id="control3"><form:button form:label="delete table" office:target-frame="" xlink:href="" form:image-data="" form:delay-for-repeat="PT0.50S" form:image-
position="center"><form:properties><form:property form:property-name="DefaultControl" form:property-type="string"><form:property-value>stardiv.one.form.control.CommandButton</form:property-value></form:property></form:properties><office:events><script:event script:language="StarBasic" script:event-name="on-performaction" script:macro-name="Standard.Global.ClearAllText" script:location="document" script:library="document"/></office:events></form:button></form:control></form:form></office:forms><text:sequence-decls><text:sequence-decl text:display-outline-level="0" text:name="Illustration"/><text:sequence-decl text:display-outline-level="0" text:name="Table"/><text:sequence-decl text:display-outline-level="0" text:name="Text"/><text:sequence-decl text:display-outline-level="0" text:name="Drawing"/></text:sequence-decls><text:user-field-decls><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Writer"/><text:user-field-decl text:value-type="string" t
ext:string-value="y" text:name="Calc"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Impress"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Draw"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="HTML"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Math"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Chart"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="SaveOpenXML"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Open50"/><text:user-field-decl text:value-type="string" text:string-value="n" text:name="Terminate"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Java"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="SaveOpen8"/><text:user-field-decl text:value-type="string" text:strin
g-value="y" text:name="Database"/><text:user-field-decl text:value-type="string" text:string-value="y" text:name="Extension"/></text:user-field-decls><text:p text:style-name="Standard"><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="1" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control2"/><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="0" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control1"/><draw:control text:anchor-type="as-char" svg:y="0cm" draw:z-index="2" draw:style-name="gr1" draw:text-style-name="P1" svg:width="2.477cm" svg:height="0.787cm" form:id="control3"/></text:p><text:p text:style-name="Standard"/></office:body></office:document-content>
diff --cc smoketestoo_native/makefile.mk
index fa01730,18f3a42..d9c4dac
--- a/smoketestoo_native/makefile.mk
+++ b/smoketestoo_native/makefile.mk
@@@ -49,12 -56,18 +56,13 @@@ ALLTAR : cpptes
cpptest : $(SHL1TARGETN)
- OOO_CPPTEST_ARGS = $(SHL1TARGETN) -env:arg-doc=$(BIN)/smoketestdoc.sxw
+ TEST_ARGUMENTS = smoketest.doc=$(BIN)/smoketestdoc.sxw
+ CPPTEST_LIBRARY = $(SHL1TARGETN)
.IF "$(OS)" != "WNT"
-$(installationtest_instpath).flag : $(shell ls \
- $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).tar.gz)
+localinstall :
$(RM) -r $(installationtest_instpath)
$(MKDIRHIER) $(installationtest_instpath)
- cd $(installationtest_instpath) && $(GNUTAR) xfz \
- $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).tar.gz
- $(MV) $(installationtest_instpath)/OOo_*_install-arc_$(defaultlangiso) \
- $(installationtest_instpath)/opt
- $(TOUCH) $@
-cpptest : $(installationtest_instpath).flag
+ ooinstall $(installationtest_instpath)/opt
+cpptest : localinstall
.END
diff --cc test/source/cpp/getargument.cxx
index d8c33b2,0db1446..d401bc9
--- a/test/source/cpp/getargument.cxx
+++ b/test/source/cpp/getargument.cxx
@@@ -42,4 -44,4 +45,6 @@@ bool getArgument(rtl::OUString const &
}
+ }
++
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc test/source/cpp/officeconnection.cxx
index e8403d3,ca62a5c..9bdddca
--- a/test/source/cpp/officeconnection.cxx
+++ b/test/source/cpp/officeconnection.cxx
@@@ -31,19 -30,20 +31,21 @@@
#include "com/sun/star/connection/NoConnectException.hpp"
#include "com/sun/star/frame/XDesktop.hpp"
#include "com/sun/star/lang/DisposedException.hpp"
- #include "com/sun/star/lang/XMultiServiceFactory.hpp"
#include "com/sun/star/uno/Reference.hxx"
+ #include "com/sun/star/uno/XComponentContext.hpp"
#include "cppuhelper/bootstrap.hxx"
-#include <preextstl.h>
+
#include "cppunit/TestAssert.h"
-#include <postextstl.h>
+
#include "osl/process.h"
#include "osl/time.h"
#include "sal/types.h"
+#include <sal/macros.h>
- #include "test/getargument.hxx"
#include "test/officeconnection.hxx"
#include "test/toabsolutefileurl.hxx"
+ #include "test/uniquepipename.hxx"
+
+ #include "getargument.hxx"
namespace {
@@@ -65,22 -65,16 +67,18 @@@ void OfficeConnection::setUp()
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("soffice")),
&argSoffice));
if (argSoffice.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("path:"))) {
- oslProcessInfo info;
- info.Size = sizeof info;
- CPPUNIT_ASSERT_EQUAL(
- osl_Process_E_None,
- osl_getProcessInfo(0, osl_Process_IDENTIFIER, &info));
- desc = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pipe,name=oootest")) +
- rtl::OUString::valueOf(static_cast< sal_Int64 >(info.Ident));
+ desc = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pipe,name=")) +
+ uniquePipeName(
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("oootest")));
rtl::OUString noquickArg(
- RTL_CONSTASCII_USTRINGPARAM("-quickstart=no"));
+ RTL_CONSTASCII_USTRINGPARAM("--quickstart=no"));
rtl::OUString nofirstArg(
- RTL_CONSTASCII_USTRINGPARAM("-nofirststartwizard"));
- rtl::OUString norestoreArg(RTL_CONSTASCII_USTRINGPARAM("-norestore"));
+ RTL_CONSTASCII_USTRINGPARAM("--nofirststartwizard"));
+ rtl::OUString norestoreArg(RTL_CONSTASCII_USTRINGPARAM("--norestore"));
+ //Disable use of the unix standalone splash screen app for the tests
+ rtl::OUString noSplashArg(RTL_CONSTASCII_USTRINGPARAM("--no-oosplash"));
rtl::OUString acceptArg(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-accept=")) + desc +
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--accept=")) + desc +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";urp")));
rtl::OUString argUser;
CPPUNIT_ASSERT(
@@@ -92,15 -86,12 +90,15 @@@
toAbsoluteFileUrl(argUser));
rtl::OUString jreArg(
RTL_CONSTASCII_USTRINGPARAM("-env:UNO_JAVA_JFW_ENV_JREHOME=true"));
+ rtl::OUString classpathArg(
+ RTL_CONSTASCII_USTRINGPARAM(
+ "-env:UNO_JAVA_JFW_ENV_CLASSPATH=true"));
rtl_uString * args[] = {
- noquickArg.pData, nofirstArg.pData, norestoreArg.pData,
- acceptArg.pData, userArg.pData, jreArg.pData };
+ noquickArg.pData, nofirstArg.pData, norestoreArg.pData, noSplashArg.pData,
+ acceptArg.pData, userArg.pData, jreArg.pData, classpathArg.pData };
rtl_uString ** envs = 0;
rtl::OUString argEnv;
- if (getArgument(
+ if (detail::getArgument(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("env")), &argEnv))
{
envs = &argEnv.pData;
diff --cc testautomation/dbaccess/tools/querytools.inc
index 7dc3d72,29416da..7dc3d72
mode 100755,100644..100644
--- a/testautomation/dbaccess/tools/querytools.inc
+++ b/testautomation/dbaccess/tools/querytools.inc
diff --cc testautomation/dbaccess/tools/tabletools.inc
index 1f6dd23,461ef8f..3fcf1ef
mode 100755,100644..100644
--- a/testautomation/dbaccess/tools/tabletools.inc
+++ b/testautomation/dbaccess/tools/tabletools.inc
@@@ -340,14 -340,16 +340,15 @@@ function fCreateTable(aFieldTypeContent
sleep 1
FieldType.TypeKeys "<RETURN>" , TRUE
Description.TypeKeys "<RETURN>" , TRUE
+ CellDescription.TypeKeys "<RETURN>" , TRUE
printlog "-------------------------------"
next
+
sleep(1)
+
Kontext "TableDesignTable"
- TableDesignTable.usemenu
- MenuSelect MenuGetItemId (1)
- sleep(1)
- menuselect MenuGetItemId (7)
- sleep(1)
+ DatabaseSaveas
+
Kontext "DatabaseTableSaveAs"
printlog "save table as "+ sTableName
TableName.setText sTableName
diff --cc testautomation/framework/optional/includes/extras_modify_objects.inc
index 59fcf17,b76782e..75bca49
mode 100755,100644..100644
--- a/testautomation/framework/optional/includes/extras_modify_objects.inc
+++ b/testautomation/framework/optional/includes/extras_modify_objects.inc
@@@ -39,24 -39,36 +39,36 @@@ private const MAX_FILE_COUNT = 3000 ' t
testcase tModifyObjects( iMode as integer, cCategory as string, sVer as string )
+ ' This test loads/saves and reloads every template or sample shipped with
+ ' the product. One of the special challenges of the test is to find out
+ ' which document type a sample/template belongs to as well as to handle
+ ' any possible dialogs the samples/documents may trigger.
+
+ ' iMode = 1 means to open the document (0 = just get its name)
+ ' cCategory may be "SAMPLES" or "TEMPLATES"
+ ' sVER is the fileformat for saving files, typically this is "current"
+
const CFN = "tModifyObjects::"
- const RESTART = 15
- const TEMPLATE_COUNT = 236 ' For en-US/Oracle Open Office, numbers may differ for Languages/Brands
- const SAMPLE_COUNT = 56 ' For en-US/Oracle Open Office, numbers may differ for Languages/Brands
+ const TEMPLATE_COUNT = 237 ' For en-US/Oracle Open Office, numbers may differ for Languages/Brands
+ const SAMPLE_COUNT = 56 ' For en-US/Oracle Open Office, numbers may differ for Languages/Brands
+ ' Varaibles needed to navigate on the Templates And Samples dialog
dim iObjectFolder as integer
dim iObjectFolders as integer
-
+
+ ' Iterators and number of documents, test values
dim iObject as integer ' Iterator
- dim iObjectCount( 20 ) as integer
+ dim iObjectCount( 100 ) as integer
dim iObjectSum as integer : iObjectSum = 0
dim iObjectCountExpected as integer
-
+
+ ' Where to store the files
dim sFile as string
- dim sPath as string
- sPath = hGetWorkPath()
+ dim sPath as string : sPath = hGetWorkPath()
+ ' Reset counter, if the office becomes unstable you might want to use it.
+ ' See further below on how to enable this feature
dim iReset as integer : iReset = 0
printlog( "" )
diff --cc testautomation/framework/optional/includes/extras_preview.inc
index 0d086c3,33b6832..cafefd2
mode 100755,100644..100644
--- a/testautomation/framework/optional/includes/extras_preview.inc
+++ b/testautomation/framework/optional/includes/extras_preview.inc
diff --cc testautomation/global/sid/e_all.sid
index c270d0d,4770eab..6d15db2
mode 100644,100755..100755
--- a/testautomation/global/sid/e_all.sid
+++ b/testautomation/global/sid/e_all.sid
@@@ -150,14 -149,15 +149,14 @@@ EditDataRanges .uno:DataRange
' ********* View Menu *********
' ****
' **** All applications
- ViewZoom SID_ATTR_ZOOM
- ViewBeamer SID_BROWSER
+ ViewZoom .uno:Zoom
+ ViewBeamer .uno:Beamer
ViewDataSources .uno:ViewDataSourceBrowser
-ViewToolbarsHyperlinkbar .uno:InsertHyperlink
ViewToolbarsConfigure .uno:ConfigureDialog
- ViewToolbarsStatusbar SID_TOGGLESTATUSBAR
- ViewFullScreen SID_WIN_FULLSCREEN
- ViewCurrentDatabase SID_VIEW_DATA_SOURCE_BROWSER
- ViewNavigator SID_NAVIGATOR
+ ViewToolbarsStatusbar .uno:StatusBarVisible
+ ViewFullScreen .uno:FullScreen
+ ViewCurrentDatabase .uno:ViewDataSourceBrowser
+ ViewNavigator .uno:Navigator
ViewToolbarsThreeDSettings .uno:AvailableToolbars?Toolbar:string=extrusionobjectbar
ViewToolbarsAlign .uno:AvailableToolbars?Toolbar:string=alignmentbar
ViewToolbarsBasicShapes .uno:AvailableToolbars?Toolbar:string=basicshapes
diff --cc testautomation/global/system/includes/master.inc
index ef9cda2,40a1f50..22c7e62
--- a/testautomation/global/system/includes/master.inc
+++ b/testautomation/global/system/includes/master.inc
@@@ -725,10 -626,9 +632,9 @@@ sub hFirstOutpu
printlog "** Build type : CWS"
end if
if isStatusEnabled() then
- 'http://wiki.services.openoffice.org/wiki/QUASTe
+ 'http://wiki.services.openoffice.org/wiki/QUASTe
printlog "** Status feature (QUASTe) : Enabled " + gLocalStatusDatabase
end if
- printlog "** HID.LST based on milestone : " + sHidVersion
printlog "----------------------------------------------------------------------------------------------------"
printlog "** Application installation path : " + gNetzOfficePath
printlog "** User configuration path : " + gOfficePath
diff --cc testautomation/global/system/includes/sysinfo.inc
index a168410,30e0058..a168410
mode 100755,100644..100644
--- a/testautomation/global/system/includes/sysinfo.inc
+++ b/testautomation/global/system/includes/sysinfo.inc
diff --cc testautomation/global/tools/includes/optional/t_security_tools.inc
index 6952f7e,bb872a6..b86894a
mode 100755,100644..100644
--- a/testautomation/global/tools/includes/optional/t_security_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_security_tools.inc
diff --cc testautomation/graphics/optional/includes/impress/i_slideshow2.inc
index 4de68a2,2df3326..6274a5e
--- a/testautomation/graphics/optional/includes/impress/i_slideshow2.inc
+++ b/testautomation/graphics/optional/includes/impress/i_slideshow2.inc
@@@ -909,10 -942,10 +942,10 @@@ testcase tSlideshowBackgroundAllSlide
Dim Background$ as string
Dim i as integer
Dim Zaehler as integer
- Background$ = ConvertPath(gOfficeBasisPath + "share\gallery\emoticons\grin.gif")
+ Background$ = ConvertPath(gOfficeBasisPath + "share\gallery\www-back\chocolate.jpg")
Datei$ = ConvertPath (gOfficePath + "user\work\background.odp")
- '/// Create a new document ///'
+ printlog "Create a new document"
Printlog "- SlideshowBackground"
Call hNewDocument
@@@ -962,10 -996,11 +996,10 @@@ testcase tSlideshowBackgroundSelectedSl
Dim Background$ as string
Dim i as integer
Dim Zaehler as integer
-
- Background$ = ConvertPath(gOfficeBasisPath + "share\gallery\emoticons\grin.gif")
+ Background$ = ConvertPath(gOfficeBasisPath + "share\gallery\www-back\chocolate.jpg")
Datei$ = ConvertPath (gOfficePath + "user\work\background.odp")
- '/// Create a new document ///'
+ printlog "Create a new document"
Printlog "- SlideshowBackground"
Call hNewDocument
@@@ -998,14 -1033,14 +1032,14 @@@
QaErrorLog "No dialogue considering if we wish to apply the background to all slides."
end if
- '/// Save the document ///'
+ printlog "Save the document"
Call hFileSaveAsKill (Datei$)
- '/// Close the document ///'
+ printlog "Close the document"
Call hCloseDocument
- '/// Open the document ///'
+ printlog "Open the document"
Call hFileOpen (Datei$)
- '/// Close the document ///'
+ printlog "Close the document"
Call hCloseDocument
- endcase
+ endcase 'tSlideshowBackgroundSelectedSlide
-'---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+'---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --cc testautomation/graphics/optional/includes/impress/i_slideshow3.inc
index e2fe410,52858e2..756eef8
--- a/testautomation/graphics/optional/includes/impress/i_slideshow3.inc
+++ b/testautomation/graphics/optional/includes/impress/i_slideshow3.inc
@@@ -529,575 -578,615 +578,616 @@@ endcase 'tExtrasPraesentationseinstellu
testcase tExtrasIndividuellePraesentation
Printlog "- Slideshow/Individual slideshow"
- Call hNewDocument '/// new impress document ///'
- '/// Deactivate "Start with current page" in ToolsOptions ///'
- setStartCurrentPage(FALSE)
- '/// check state of navigator ! expected: closed ///'
- Kontext "Navigator"
- if Navigator.exists then
- '///+ close navigator ! ///'
- Navigator.Close
- Warnlog "Navigator was open. Check earlier tests. Now closed."
- else
- printlog "Navigator: NOT available. Good."
- endif
- Printlog " - insert 3 slides for the individual slide show"
- SlideShowPresentationSettings '/// open slide show settings ///'
- Kontext "Bildschirmpraesentation"
- Fenster.Check
- Bildschirmpraesentation.OK
- InsertSlide '/// insert slide ///'
- sleep 2
- hTypekeys "<Pagedown>"
- sleep 2
- InsertSlide
- sleep 2
- hTypekeys "<Pagedown>"
- sleep 2
- InsertSlide '/// insert another slide ///'
- sleep 2
- hTypekeys "<Pagedown>"
- sleep 2
- Printlog " - Slides added"
- sleep 1
- Kontext "DocumentImpress"
- DocumentImpress.TypeKeys "<MOD1 SHIFT F5>" '/// open navigator ///'
- sleep 1
- Kontext "NavigatorDraw"
+ Call hNewDocument
+ printlog "new impress document"
+ Call sSelectEmptyLayout
+ printlog "Deactivate Start with current page in ToolsOptions"
+ setStartCurrentPage(FALSE)
+ printlog " check state of navigator ! expected: closed"
+ Kontext "Navigator"
+ if Navigator.exists then
+ printlog " close navigator !"
+ Navigator.Close
+ Warnlog "Navigator was open. Check earlier tests. Now closed."
+ else
+ printlog "Navigator: NOT available. Good."
+ endif
+ Printlog " - insert 3 slides for the individual slide show"
+ printlog "open slide show settings"
+ SlideShowPresentationSettings
+ Kontext "Bildschirmpraesentation"
+ Fenster.Check
+ Bildschirmpraesentation.OK
+ printlog "insert slide"
+ InsertSlide
+ sleep 2
+ Call sSelectEmptyLayout
+ hTypekeys "<Pagedown>"
+ sleep 2
+ InsertSlide
+ sleep 2
+ Call sSelectEmptyLayout
+ hTypekeys "<Pagedown>"
+ sleep 2
+ printlog "insert another slide"
+ InsertSlide
+ sleep 2
+ Call sSelectEmptyLayout
+ hTypekeys "<Pagedown>"
+ sleep 2
+ Printlog " - Slides added"
+ sleep 1
+ Kontext "DocumentImpress"
+ printlog "open navigator"
+ DocumentImpress.TypeKeys "<MOD1 SHIFT F5>"
+ sleep 1
+ Kontext "NavigatorDraw"
if NavigatorDraw.Exists Then
- Printlog " - Navigator exists"
- Erste.Click '/// switch to 1st slide ///'
- Kontext "DocumentImpress"
- DocumentImpress.MouseDown ( 50, 50 ) '/// Make a click onto the slide to focus onto that ///'
- DocumentImpress.MouseUp ( 50, 50 )
- hRechteckErstellen (10,10,20,20) '/// create rectangle ///'
- Kontext "NavigatorDraw"
- Naechste.Click '/// switch to 2nd slide ///'
- Kontext "DocumentImpress"
- hRechteckErstellen (30,30,40,40) '/// create another rectangle ///'
- Kontext "NavigatorDraw"
- Naechste.Click '/// switch to 3rd slide ///'
- Kontext "DocumentImpress"
- hRechteckErstellen (40,40,50,50) '/// create rectangle ///'
- Kontext "NavigatorDraw"
- Naechste.Click '/// switch to next slide ///'
- Kontext "DocumentImpress"
- hRechteckErstellen (30,30,40,40) '/// create rectangle ///'
- Printlog " - Created rectangles on all slides"
- else
- Warnlog " No Navigator"
- end if
- sleep 1
- SlideShowCustomSlideshow '/// open custom slideshow ///'
- Kontext "IndividuellePraesentation"
- Printlog " - Create new slideshow"
- Neu.Click '/// create new individual slideshow ///'
- Kontext "IndividuellePraesentationDefinieren"
- PraesentationName.SetText "Test 1" '/// set name of individiual slideshow to Test 1 ///'
- Dim i
- Dim Zaehler
- Zaehler=SeitenPraesentation.GetItemCount '/// add slides to presentation ///'
- For i=1 to Zaehler
- SeitenPraesentation.SetNoSelection
- SeitenPraesentation.Select i
- Hinzufuegen.Click
- if SelectedSlides.GetItemCount=i Then
- Printlog " - slide added to slideshow"
- else
- Warnlog " Count does not match selection. Should be: "+ i + " but is: "+ IndividuellePraesentation.GetItemCount
- end if
- next i
- Printlog " - Add slides using multiple selections"
- SeitenPraesentation.Select 1
- Hinzufuegen.Click
- SeitenPraesentation.Select 2
- Hinzufuegen.Click
- SeitenPraesentation.Select 3
- Hinzufuegen.Click
- SeitenPraesentation.Select 4
- Hinzufuegen.Click
-
- if SelectedSlides.GetItemCount=8 Then '/// control number of added slides ///'
- Printlog " - slides has been added, multiple selection is working"
- else
- Warnlog " Multiple selection does not work"
- end if
-
- IndividuellePraesentationDefinieren.OK
- sleep 2
- Kontext "IndividuellePraesentation"
- if IndividuellePraesentationBenutzen.IsChecked=False Then IndividuellePraesentationBenutzen.Check
- sleep 2
- Starten.Click '/// run presentation ///'
- Printlog " - Individual slideshow started"
- sleep 5
- Kontext "Navigator" '/// Check if the navigator exists, if so - close it ///'
- if Navigator.Exists Then
- Printlog " - Navigator exists, we close it"
- Navigator.Close '/// close navigator ///'
- sleep 2
- end if
- Kontext "DocumentPresentation"
- sleep 3
- DocumentPresentation.TypeKeys "<RETURN>"
- sleep 2
- DocumentPresentation.TypeKeys "<RETURN>"
- sleep 2
- DocumentPresentation.TypeKeys "<RETURN>"
- sleep 2
- DocumentPresentation.TypeKeys "<RETURN>"
- sleep 2
- DocumentPresentation.TypeKeys "<RETURN>"
- sleep 2
- DocumentPresentation.TypeKeys "<RETURN>"
- sleep 2
- DocumentPresentation.TypeKeys "<RETURN>"
- sleep 2
- DocumentPresentation.TypeKeys "<RETURN>"
- sleep 2
- DocumentPresentation.TypeKeys "<ESCAPE>"
- sleep 5
+ Printlog " - Navigator exists"
+ printlog "switch to 1st slide"
+ Erste.Click
+ Kontext "DocumentImpress"
+ printlog "Make a click onto the slide to focus onto that"
+ DocumentImpress.MouseDown ( 50, 50 )
+ DocumentImpress.MouseUp ( 50, 50 )
+ printlog "create rectangle"
+ hRechteckErstellen (10,10,20,20)
+ Kontext "NavigatorDraw"
+ printlog "switch to 2nd slide"
+ Naechste.Click
+ Kontext "DocumentImpress"
+ printlog "create another rectangle"
+ hRechteckErstellen (30,30,40,40)
+ Kontext "NavigatorDraw"
+ printlog "switch to 3rd slide"
+ Naechste.Click
+ Kontext "DocumentImpress"
+ printlog "create rectangle"
+ hRechteckErstellen (40,40,50,50)
+ Kontext "NavigatorDraw"
+ printlog "switch to next slide"
+ Naechste.Click
+ Kontext "DocumentImpress"
+ printlog "create rectangle"
+ hRechteckErstellen (50,50,60,60)
+ Printlog " - Created rectangles on all slides"
+ else
+ Warnlog " No Navigator"
+ end if
+ sleep 1
+ printlog "open custom slideshow"
+ SlideShowCustomSlideshow
+ Kontext "IndividuellePraesentation"
+ printlog "create new individual slideshow"
+ Neu.Click
+ Kontext "IndividuellePraesentationDefinieren"
+ printlog "set name of individiual slideshow to Test 1"
+ PraesentationName.SetText "Test 1"
+ Dim i
+ Dim Zaehler
+ printlog "add slides to presentation"
+ Zaehler=SeitenPraesentation.GetItemCount
+ For i=1 to Zaehler
+ SeitenPraesentation.SetNoSelection
+ SeitenPraesentation.Select i
+ Hinzufuegen.Click
+ if SelectedSlides.GetItemCount=i Then
+ Printlog " - slide added to slideshow"
+ else
+ Warnlog " Count does not match selection. Should be: "+ i + " but is: "+ IndividuellePraesentation.GetItemCount
+ end if
+ next i
+ Printlog " - Add slides using multiple selections"
+ SeitenPraesentation.Select 1
+ Hinzufuegen.Click
+ SeitenPraesentation.Select 2
+ Hinzufuegen.Click
+ SeitenPraesentation.Select 3
+ Hinzufuegen.Click
+ SeitenPraesentation.Select 4
+ Hinzufuegen.Click
+
+ printlog "control number of added slides"
+ if SelectedSlides.GetItemCount=8 Then
+ Printlog " - slides has been added, multiple selection is working"
+ else
+ Warnlog " Multiple selection does not work"
+ end if
+
+ IndividuellePraesentationDefinieren.OK
+ sleep 2
++>>>>>>> ooo/DEV300_m101
Kontext "IndividuellePraesentation"
- if IndividuellePraesentation.IsVisible=False Then
- Warnlog " Slideshow should have ended"
- Kontext "DocumentPresentation"
- DocumentPresentation.TypeKeys "<ESCAPE>"
- else
- printlog " Presentation seems to have ended successfully"
- end if
+ if IndividuellePraesentationBenutzen.IsChecked=False Then IndividuellePraesentationBenutzen.Check
+ sleep 2
+ printlog "run presentation"
+ Starten.Click
+ Printlog " - Individual slideshow started"
+ sleep 5
+ printlog "Check if the navigator exists, if so - close it"
+ Kontext "Navigator"
+ if Navigator.Exists Then
+ Printlog " - Navigator exists, we close it"
+ printlog "close navigator"
+ Navigator.Close
+ sleep 2
+ end if
+ Kontext "DocumentPresentation"
+ sleep 3
+ DocumentPresentation.TypeKeys "<RETURN>"
+ sleep 2
+ DocumentPresentation.TypeKeys "<RETURN>"
+ sleep 2
+ DocumentPresentation.TypeKeys "<RETURN>"
+ sleep 2
+ DocumentPresentation.TypeKeys "<RETURN>"
+ sleep 2
+ DocumentPresentation.TypeKeys "<RETURN>"
+ sleep 2
+ DocumentPresentation.TypeKeys "<RETURN>"
+ sleep 2
+ DocumentPresentation.TypeKeys "<RETURN>"
+ sleep 2
+ DocumentPresentation.TypeKeys "<RETURN>"
+ sleep 2
+ DocumentPresentation.TypeKeys "<ESCAPE>"
+ sleep 5
+ Kontext "IndividuellePraesentation"
+ if IndividuellePraesentation.IsVisible=False Then
+ Warnlog " Slideshow should have ended"
+ Kontext "DocumentPresentation"
+ DocumentPresentation.TypeKeys "<ESCAPE>"
+ else
+ printlog " Presentation seems to have ended successfully"
+ end if
+
+ sleep 2
- sleep 2
+ Kontext "IndividuellePraesentation"
+ printlog "Close custom slideshow"
+ IndividuellePraesentation.Close
+
+ printlog "Navigator: Control if right slide is displayed"
+ Kontext "NavigatorDraw"
+ printlog " Now we switch to the navigator again"
+ printlog "Unless -Start on first slide- is activated? Default = No"
+ if Liste.GetSelIndex <> 4 then
+ Warnlog " This is not the right slide, it should be 4 but is: " + Liste.GetSelIndex
+ else
+ Printlog " - Individual slideshow seems to work"
+ end if
+ printlog "open custom slideshow"
+ SlideShowCustomSlideshow
+ printlog "Set Start with current page back to default = on, in ToolsOptions"
+ Kontext "IndividuellePraesentation"
+ if IndividuellePraesentationBenutzen.IsChecked=False Then IndividuellePraesentationBenutzen.Check
+ IndividuellePraesentation.Close
+ sleep 2
+ Kontext "Navigator" 'Draw
+ if Navigator.exists then
+ printlog "Close the Navigator"
+ Navigator.Close
+ Kontext "NavigatorDraw"
+ if NavigatorDraw.exists then
+ NavigatorDraw.Close
+ endif
+ else
+ printlog "Navigator: NOT available. Good."
+ endif
+ Kontext "DocumentImpress"
+ setStartCurrentPage(TRUE)
+ printlog "close document"
+ Call hCloseDocument
+ endcase 'tExtrasIndividuellePraesentation
- Kontext "IndividuellePraesentation"
- IndividuellePraesentation.Close '/// Close custom slideshow ///'
-
- Kontext "NavigatorDraw" '/// Navigator: Control if right slide is displayed ///'
- printlog " Now we switch to the navigator again"
- if Liste.GetSelIndex <> 4 then '/// Unless -Start on first slide- is activated? Default = No ///'
- Warnlog " This is not the right slide, it should be 4 but is: " + Liste.GetSelIndex
- else
- Printlog " - Individual slideshow seems to work"
- end if
- SlideShowCustomSlideshow '/// open custom slideshow ///'
- '/// Set "Start with current page" back to default = on, in ToolsOptions ///'
- Kontext "IndividuellePraesentation"
- if IndividuellePraesentationBenutzen.IsChecked=False Then IndividuellePraesentationBenutzen.Check
- IndividuellePraesentation.Close
- sleep 2
- Kontext "Navigator" 'Draw
- if Navigator.exists then
- Navigator.Close '/// Close the Navigator ///'
- Kontext "NavigatorDraw"
- if NavigatorDraw.exists then
- NavigatorDraw.Close
- endif
- else
- printlog "Navigator: NOT available. Good."
- endif
- Kontext "DocumentImpress"
- setStartCurrentPage(TRUE)
- Call hCloseDocument '/// close document ///'
- endcase
-
- '****************************************************************************************************
+ '-------------------------------------------------------------------------------
testcase tSlideshowContextMenuOneSlide
+
qaerrorlog "Test not yet ready."
- goto endsub
- dim NumberOfEntries as Integer
- Printlog "- ContextMenu in Slideshow"
- '/// New Impress Document ///'
- Call hNewDocument
-
- '/// Start the Slideshow. ///'
- hTypeKeys "<F5>"
- '/// Check that the right mousebutton brings up the Context-Menu. ///'
- Kontext "DocumentPresentation"
- DocumentPresentation.MouseDown 50, 50, 3
- DocumentPresentation.MouseUp 50, 50, 3
- '/// Check that the right-click brought up a Context-Menu. ///'
- '/// And check the number of Menu-Positions (there should be XXX of them ) ///'
- NumberOfEntries = 0
- sleep 2
- try
- NumberOfEntries = MenuGetItemCount
- catch
- warnlog " No ContextMenu found? Please inform the Automatic Tester"
- kontext "DocumentImpress"
- hOpenContextMenu
- NumberOfEntries = MenuGetItemCount
- endcatch
- if (NumberOfEntries = 0) then
- Warnlog " the Context-Menu doesnt contain any entries, or were not up. Test ends."
- Goto Endsub
- endif
- if NumberOfEntries <> 3 then
- warnlog " Expected three entries in this Menu, but found " + NumberOfEntries
- ' if NumberOfEntries <> 6 then
- ' warnlog " Expected six entries in this Menu, but found " + NumberOfEntries
- else
- printlog " Number of Entries was: " + NumberOfEntries
- endif
- '/// Check that every position contains the expected Undermenu. ("Screen": Black/White. and "End Slideshow") ///'
- '/// And check that Menu-Item one opens an undermenu. ///'
- Printlog " We open number one: " + MenuGetItemText(MenuGetItemID(1))
- hMenuSelectNr (1)
- sleep 2
- NumberOfEntries = MenuGetItemCount
- printlog " Menu-entries: " + MenuGetItemCount
- if (NumberOfEntries <> 2) then
- Warnlog " the third Context-Menu-entry was NOT 'Screen'."
- else
- Printlog " We open the next number one: " + MenuGetItemText(MenuGetItemID(1))
- hMenuSelectNr (1)
- endif
- DocumentPresentation.MouseDown 50, 50, 3
- DocumentPresentation.MouseUp 50, 50, 3
- hMenuSelectNr (1) 'Open the Screen -menu.
- sleep 2
- Printlog " We open number two: " + MenuGetItemText(MenuGetItemID(MenuGetItemCount))
- hMenuSelectNr (2) 'Choose "White"
- sleep 2
-
- 'TODO - Due to existing bug, function not yet available.
- '/// Change to slideshow-ending. Check that the Context-Menu also comes up here. ///'
- 'DocumentPresentation.
- hTypeKeys "<SPACE>"
- Kontext "DocumentPresentation"
- DocumentPresentation.MouseDown 50, 50, 3
- DocumentPresentation.MouseUp 50, 50, 3
- sleep 2
- NumberOfEntries = 0
- NumberOfEntries = MenuGetItemCount
- if NumberOfEntries <> 0 then
- printlog " Menu-entries: " + MenuGetItemCount
- else
- warnlog " No context-menu at Slideshow-endpage."
- DocumentPresentation.TypeKeys "<ESCAPE>"
- endif
-
- '/// And that one can go back. ///'
- hMenuSelectNr (1) 'Open the Goto Slide -menu.
- sleep 2
- Printlog " We open number one (should be 'Goto First Slide'): " + MenuGetItemText(MenuGetItemID(1))
- hMenuSelectNr (2) 'Choose "Back" 'TODO ;: but now we just end the slideshow
- sleep 2
-
- Kontext "DocumentPresentation"
- DocumentPresentation.TypeKeys "<ESCAPE>"
- DocumentPresentation.TypeKeys "<ESCAPE>"
- Kontext "DocumentImpress"
- InsertSlide
-
- '/// Start the Slideshow. ///'
- hTypeKeys "<F5>"
- '/// Check that the right mousebutton brings up the Context-Menu. ///'
- Kontext "DocumentPresentation"
- DocumentPresentation.MouseDown 50, 50, 3
- DocumentPresentation.MouseUp 50, 50, 3
- sleep 2
-
- '/// Check that Menu-Item (three) really finishes the presentation. ///'
- Printlog " We open the last entry (End Show): " + MenuGetItemText(MenuGetItemID(MenuGetItemCount))
- hMenuSelectNr (4) 'MenuGetItemCount) 'End Slideshow
- if DocumentPresentation.Exists then
- Warnlog "either wrong position for 'End Slideshow', or the command didnt work."
- else
- printlog "The presentation was closed, good."
- endif
-
- '/// Check that one can step one step forward, even if there is no more than one slide. ///'
- '/// Start the Slideshow. ///'
- hTypeKeys "<F5>"
- '/// Check that the right mousebutton brings up the Context-Menu. ///'
- sleep (2)
- Kontext "DocumentPresentation"
- DocumentPresentation.MouseDown 50, 50, 3
- DocumentPresentation.MouseUp 50, 50, 3
- sleep 2
-
- hMenuSelectNr (2) 'Open the Goto Slide -menu.
-
- '/// Select the 'one step forward' -entry ///'
- hMenuSelectNr (1)
-
- '/// Check that we're on the last slide ///'
- Kontext "DocumentPresentation"
- DocumentPresentation.MouseDown 50, 50, 3
- DocumentPresentation.MouseUp 50, 50, 3
- sleep 2
-
- hMenuSelectNr (2) 'Open the Goto Slide -menu.
- if MenuIsItemEnabled (MenugetItemID(4)) then
- printlog "Jumped to the right slide"
- else
- warnlog "possibly the 'jump to slide' -menu didnt quite work"
- endif
-
- '/// Close the Context-Menu ///'
- hMenuSelectNr (0)
- Kontext "DocumentPresentation"
-
- '/// Check if the context-menu also comes up at the very last page (slideshow-ending) ///'
- DocumentPresentation.TypeKeys "<SPACE>"
- ' DocumentPresentation.TypeKeys "<SPACE>"
- sleep 1
- Kontext "DocumentPresentation"
- DocumentPresentation.MouseDown 50, 50, 3
- DocumentPresentation.MouseUp 50, 50, 3
- sleep 2
-
- if MenuGetItemText (MenuGetItemID(1)) <> "" then
- Printlog "Context-menu came up at the last page: correct."
- else
- Warnlog "Context-menu did NOT come up correctly at the last page: false."
- endif
-
- '/// Check if we from here, via the context menu, can go back to the first page ///'
- hMenuSelectNr (2) 'Open the Goto Slide -menu.
- sleep 1
- hMenuSelectNr (1) 'First Slide
-
- '/// Check that we're on the first slide ///'
- Kontext "DocumentPresentation"
- DocumentPresentation.MouseDown 50, 50, 3
- DocumentPresentation.MouseUp 50, 50, 3
- sleep 2
-
- hMenuSelectNr (2) 'Open the Goto Slide -menu.
- if MenuIsItemEnabled (MenugetItemID(3)) then
- printlog "Jumped to the right slide"
- else
- warnlog "possibly the 'jump to slide' -menu didnt quite work from the last slide"
- endif
-
- '/// Close the Context-Menu ///'
- MenuSelect (0)
- '/// Close the Presentation ///'
- hTypeKeys "<ESCAPE>"
- '/// Close Document ///'
- Call hCloseDocument
+ goto endsub
+
+ dim NumberOfEntries as Integer
+
+ Printlog "- ContextMenu in Slideshow"
+ printlog "New Impress Document"
+ Call hNewDocument
+
+ printlog "Start the Slideshow."
+ hTypeKeys "<F5>"
+ printlog "Check that the right mousebutton brings up the Context-Menu."
+ Kontext "DocumentPresentation"
+ DocumentPresentation.MouseDown 50, 50, 3
+ DocumentPresentation.MouseUp 50, 50, 3
+ printlog "Check that the right-click brought up a Context-Menu."
+ printlog "And check the number of Menu-Positions (there should be XXX of them )"
+ NumberOfEntries = 0
+ sleep 2
+ try
+ NumberOfEntries = MenuGetItemCount
+ catch
+ warnlog " No ContextMenu found? Please inform the Automatic Tester"
+ kontext "DocumentImpress"
+ hOpenContextMenu
+ NumberOfEntries = MenuGetItemCount
+ endcatch
+ if (NumberOfEntries = 0) then
+ Warnlog " the Context-Menu doesnt contain any entries, or were not up. Test ends."
+ Goto Endsub
+ endif
+ if NumberOfEntries <> 3 then
+ warnlog " Expected three entries in this Menu, but found " + NumberOfEntries
+ ' if NumberOfEntries <> 6 then
+ ' warnlog " Expected six entries in this Menu, but found " + NumberOfEntries
+ else
+ printlog " Number of Entries was: " + NumberOfEntries
+ endif
+ printlog "Check that every position contains the expected Undermenu. (Screen: Black/White. and End Slideshow)"
+ printlog "And check that Menu-Item one opens an undermenu."
+ Printlog " We open number one: " + MenuGetItemText(MenuGetItemID(1))
+ hMenuSelectNr (1)
+ sleep 2
+ NumberOfEntries = MenuGetItemCount
+ printlog " Menu-entries: " + MenuGetItemCount
+ if (NumberOfEntries <> 2) then
+ Warnlog " the third Context-Menu-entry was NOT 'Screen'."
+ else
+ Printlog " We open the next number one: " + MenuGetItemText(MenuGetItemID(1))
+ hMenuSelectNr (1)
+ endif
+ DocumentPresentation.MouseDown 50, 50, 3
+ DocumentPresentation.MouseUp 50, 50, 3
+ printlog "Open the Screen -menu."
+ hMenuSelectNr (1)
+ sleep 2
+ Printlog " We open number two: " + MenuGetItemText(MenuGetItemID(MenuGetItemCount))
+ printlog "Choose White"
+ hMenuSelectNr (2)
+ sleep 2
+
+ 'TODO - Due to existing bug, function not yet available.
+ printlog "Change to slideshow-ending. Check that the Context-Menu also comes up here."
+ 'DocumentPresentation.
+ hTypeKeys "<SPACE>"
+ Kontext "DocumentPresentation"
+ DocumentPresentation.MouseDown 50, 50, 3
+ DocumentPresentation.MouseUp 50, 50, 3
+ sleep 2
+ NumberOfEntries = 0
+ NumberOfEntries = MenuGetItemCount
+ if NumberOfEntries <> 0 then
+ printlog " Menu-entries: " + MenuGetItemCount
+ else
+ warnlog " No context-menu at Slideshow-endpage."
+ DocumentPresentation.TypeKeys "<ESCAPE>"
+ endif
+
+ printlog "And that one can go back."
+ hMenuSelectNr (1) 'Open the Goto Slide -menu.
+ sleep 2
+ Printlog " We open number one (should be 'Goto First Slide'): " + MenuGetItemText(MenuGetItemID(1))
+ hMenuSelectNr (2) 'Choose "Back" 'TODO ;: but now we just end the slideshow
+ sleep 2
+
+ Kontext "DocumentPresentation"
+ DocumentPresentation.TypeKeys "<ESCAPE>"
+ DocumentPresentation.TypeKeys "<ESCAPE>"
+ Kontext "DocumentImpress"
+ InsertSlide
+
+ printlog "Start the Slideshow."
+ hTypeKeys "<F5>"
+ printlog "Check that the right mousebutton brings up the Context-Menu."
+ Kontext "DocumentPresentation"
+ DocumentPresentation.MouseDown 50, 50, 3
+ DocumentPresentation.MouseUp 50, 50, 3
+ sleep 2
+
+ printlog "Check that Menu-Item (three) really finishes the presentation."
+ Printlog " We open the last entry (End Show): " + MenuGetItemText(MenuGetItemID(MenuGetItemCount))
+ hMenuSelectNr (4) 'MenuGetItemCount) 'End Slideshow
+ if DocumentPresentation.Exists then
+ Warnlog "either wrong position for 'End Slideshow', or the command didnt work."
+ else
+ printlog "The presentation was closed, good."
+ endif
+
+ printlog "Check that one can step one step forward, even if there is no more than one slide."
+ printlog "Start the Slideshow."
+ hTypeKeys "<F5>"
+ printlog "Check that the right mousebutton brings up the Context-Menu."
+ sleep (2)
+ Kontext "DocumentPresentation"
+ DocumentPresentation.MouseDown 50, 50, 3
+ DocumentPresentation.MouseUp 50, 50, 3
+ sleep 2
+
+ printlog "Open the Goto Slide -menu"
+ hMenuSelectNr (2)
+ printlog "Select the 'one step forward' -entry"
+ hMenuSelectNr (1)
+
+ printlog "Check that we're on the last slide"
+ Kontext "DocumentPresentation"
+ DocumentPresentation.MouseDown 50, 50, 3
+ DocumentPresentation.MouseUp 50, 50, 3
+ sleep 2
+
+ hMenuSelectNr (2)
+ if MenuIsItemEnabled (MenugetItemID(4)) then
+ printlog "Jumped to the right slide"
+ else
+ warnlog "possibly the 'jump to slide' -menu didnt quite work"
+ endif
+
+ printlog "Close the Context-Menu"
+ hMenuSelectNr (0)
+ Kontext "DocumentPresentation"
+
+ printlog "Check if the context-menu also comes up at the very last page (slideshow-ending)"
+ DocumentPresentation.TypeKeys "<SPACE>"
+ sleep 1
+ Kontext "DocumentPresentation"
+ DocumentPresentation.MouseDown 50, 50, 3
+ DocumentPresentation.MouseUp 50, 50, 3
+ sleep 2
+
+ if MenuGetItemText (MenuGetItemID(1)) <> "" then
+ Printlog "Context-menu came up at the last page: correct."
+ else
+ Warnlog "Context-menu did NOT come up correctly at the last page: false."
+ endif
+
+ printlog "Check if we from here, via the context menu, can go back to the first page"
+ hMenuSelectNr (2) 'Open the Goto Slide -menu.
+ sleep 1
+ hMenuSelectNr (1) 'First Slide
+
+ printlog "Check that we're on the first slide"
+ Kontext "DocumentPresentation"
+ DocumentPresentation.MouseDown 50, 50, 3
+ DocumentPresentation.MouseUp 50, 50, 3
+ sleep 2
+
+ hMenuSelectNr (2) 'Open the Goto Slide -menu.
+ if MenuIsItemEnabled (MenugetItemID(3)) then
+ printlog "Jumped to the right slide"
+ else
+ warnlog "possibly the 'jump to slide' -menu didnt quite work from the last slide"
+ endif
+
+ printlog "Close the Context-Menu"
+ MenuSelect (0)
+ printlog "Close the Presentation"
+ hTypeKeys "<ESCAPE>"
+ printlog "Close Document"
+ Call hCloseDocument
endcase 'tSlideshowContextMenuOneSlide
- '****************************************************************************************************
+ '-------------------------------------------------------------------------------
testcase tSlideshowContextMenuMoreSlides
+
qaerrorlog "Test not yet ready."
- goto endsub
- dim NumberOfEntries as Integer
- Printlog "- ContextMenu in Slideshow"
- '/// New Impress Document ///'
- Call hNewDocument
- '/// Insert three new Slides ///'
- InsertSlide
- InsertSlide
- InsertSlide
- '/// Start the Slideshow. ///'
- hTypeKeys "<F5>"
- sleep (3)
- '/// Check that the right mousebutton brings up the Context-Menu. ///'
- Kontext "DocumentPresentation"
- DocumentPresentation.MouseDown 50, 50, 3
- DocumentPresentation.MouseUp 50, 50, 3
- '/// Check that the right-click brought up a Context-Menu. ///'
- '/// And check the number of Menu-Positions (there should be XXX of them ) ///'
- NumberOfEntries = 0
- sleep 2
- try
- NumberOfEntries = MenuGetItemCount
- catch
- warnlog " No ContextMenu found? Please inform the Automatic Tester"
- kontext "DocumentImpress"
- hOpenContextMenu
- NumberOfEntries = MenuGetItemCount
- endcatch
- if (NumberOfEntries = 0) then
- Warnlog " the Context-Menu doesnt contain any entries, or were not up. Test ends."
- Goto Endsub
- endif
- if NumberOfEntries <> 6 then
- warnlog " Expected six entries in this Menu, but found " + NumberOfEntries
- else
- printlog " Number of Entries was: " + NumberOfEntries
- endif
- '/// Check that every position contains the expected Undermenu. ("Screen": Black/White. and "End Slideshow") ///'
- '/// And check that Menu-Item one opens an undermenu. ///'
- Printlog " We open number four: " + MenuGetItemText(MenuGetItemID(4))
- hMenuSelectNr (3)
- sleep 2
- NumberOfEntries = MenuGetItemCount
- printlog " Menu-entries: " + MenuGetItemCount
- if (NumberOfEntries <> 2) then
- Warnlog " the first Context-Menu-entry was NOT 'Screen'."
- else
- Printlog " We open the next number one: " + MenuGetItemText(MenuGetItemID(1))
- hMenuSelectNr (1)
- endif
- DocumentPresentation.MouseDown 50, 50, 3
- DocumentPresentation.MouseUp 50, 50, 3
- hMenuSelectNr (3) 'Open the Screen -menu.
- sleep 2
- Printlog " We open number two: " + MenuGetItemText(MenuGetItemID(MenuGetItemCount))
- hMenuSelectNr (2) 'Choose "White"
- sleep 2
-
- 'TODO - Due to existing bug, function not yet available.
- '/// Change to slideshow-ending. Check that the Context-Menu also comes up here. ///'
- 'DocumentPresentation.
- hTypeKeys "<SPACE>"
- Kontext "DocumentPresentation"
- DocumentPresentation.MouseDown 50, 50, 3
- DocumentPresentation.MouseUp 50, 50, 3
- sleep 2
- NumberOfEntries = 0
- NumberOfEntries = MenuGetItemCount
- if NumberOfEntries <> 0 then
- printlog " Menu-entries: " + MenuGetItemCount
- else
- warnlog " No context-menu at Slideshow-endpage."
- DocumentPresentation.TypeKeys "<ESCAPE>"
- endif
-
- '/// And that one can go back. ///'
- hMenuSelectNr (2) 'Open the Goto Slide -menu.
- sleep 2
- Printlog " We open number one (should be 'Goto First Slide'): " + MenuGetItemText(MenuGetItemID(1))
- hMenuSelectNr (2) 'Choose "Back" 'TODO ;: but now we just end the slideshow
- sleep 2
-
- Kontext "DocumentPresentation"
- DocumentPresentation.TypeKeys "<ESCAPE>"
- DocumentPresentation.TypeKeys "<ESCAPE>"
- Kontext "DocumentImpress"
-
- '/// Start the Slideshow. ///'
- hTypeKeys "<F5>"
- '/// Check that the right mousebutton brings up the Context-Menu. ///'
- Kontext "DocumentPresentation"
- DocumentPresentation.MouseDown 50, 50, 3
- DocumentPresentation.MouseUp 50, 50, 3
- sleep 2
-
- '/// Check that Menu-Item (three) really finishes the presentation. ///'
- Printlog " We open the last entry (End Show): " + MenuGetItemText(MenuGetItemID(MenuGetItemCount))
- hMenuSelectNr (4)'MenuGetItemCount) 'End Slideshow
- sleep 4
- if DocumentPresentation.Exists then
- Warnlog "either wrong position for 'End Slideshow', or the command didnt work."
- Kontext "DocumentPresentation"
- DocumentPresentation.MouseDown 50, 50, 3
- DocumentPresentation.MouseUp 50, 50, 3
- sleep 2
- Printlog " We open the last entry (End Show): " + MenuGetItemText(MenuGetItemID(MenuGetItemCount))
- hMenuSelectNr (4)'MenuGetItemCount) 'End Slideshow
- else
- printlog "The presentation was closed, good."
- endif
-
- '/// Check that one can step one step forward, even if there is no more than one slide. ///'
- '/// Start the Slideshow. ///'
- hTypeKeys "<F5>"
- sleep (3)
- '/// Check that the right mousebutton brings up the Context-Menu. ///'
- Kontext "DocumentPresentation"
- DocumentPresentation.MouseDown 50, 50, 3
- DocumentPresentation.MouseUp 50, 50, 3
- sleep 2
-
- hMenuSelectNr (2) 'Open the Goto Slide -menu.
-
- '/// Select the 'one step forward' -entry ///'
- hMenuSelectNr (1)
-
- '/// Check that we're on the last slide ///'
- Kontext "DocumentPresentation"
- DocumentPresentation.MouseDown 50, 50, 3
- DocumentPresentation.MouseUp 50, 50, 3
- sleep 2
-
- hMenuSelectNr (2) 'Open the Goto Slide -menu.
- if MenuIsItemEnabled (MenugetItemID(4)) then
- printlog "Jumped to the right slide"
- else
- warnlog "possibly the 'jump to slide' -menu didnt quite work"
- endif
-
- '/// Close the Context-Menu ///'
- hMenuSelectNr (0)
- Kontext "DocumentPresentation"
-
- '/// Check if the context-menu also comes up at the very last page (slideshow-ending) ///'
- DocumentPresentation.TypeKeys "<SPACE>"
- sleep 1
- Kontext "DocumentPresentation"
- DocumentPresentation.MouseDown 50, 50, 3
- DocumentPresentation.MouseUp 50, 50, 3
- sleep 2
-
- if MenuGetItemText (MenuGetItemID(1)) <> "" then
- Printlog "Context-menu came up at the last page: correct."
- else
- Warnlog "Context-menu did NOT come up correctly at the last page: false."
- endif
-
- '/// Check if we from here, via the context menu, can go back to the first page ///'
- hMenuSelectNr (2) 'Open the Goto Slide -menu.
- sleep 1
- hMenuSelectNr (1) 'First Slide
-
- '/// Check that we're on the first slide ///'
- Kontext "DocumentPresentation"
- DocumentPresentation.MouseDown 50, 50, 3
- DocumentPresentation.MouseUp 50, 50, 3
- sleep 2
-
- hMenuSelectNr (2) 'Open the Goto Slide -menu.
- if MenuIsItemEnabled (MenugetItemID(3)) then
- printlog "Jumped to the right slide"
- else
- warnlog "possibly the 'jump to slide' -menu didnt quite work from the last slide"
- endif
-
- '/// Close the Context-Menu ///'
- MenuSelect (0)
- '/// Close the Presentation ///'
- hTypeKeys "<ESCAPE>"
- '/// Close Document ///'
- Call hCloseDocument
+ goto endsub
+
+ dim NumberOfEntries as Integer
+
+ Printlog "- ContextMenu in Slideshow"
+ printlog "New Impress Document"
+ Call hNewDocument
+ printlog "Insert three new Slides"
+ InsertSlide
+ InsertSlide
+ InsertSlide
+ printlog "Start the Slideshow."
+ hTypeKeys "<F5>"
+ sleep (3)
+ printlog "Check that the right mousebutton brings up the Context-Menu."
+ Kontext "DocumentPresentation"
+ DocumentPresentation.MouseDown 50, 50, 3
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list