[Libreoffice-commits] core.git: dbaccess/qa qadevOOo/runner qadevOOo/tests
Noel Grandin
noel at peralex.com
Tue Jun 9 02:35:25 PDT 2015
dbaccess/qa/complex/dbaccess/RowSet.java | 1
qadevOOo/runner/lib/TestCase.java | 2
qadevOOo/tests/java/mod/_acceptor/Acceptor.java | 13
qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java | 19
qadevOOo/tests/java/mod/_adabas/ODriver.java | 12
qadevOOo/tests/java/mod/_ado/ODriver.java | 12
qadevOOo/tests/java/mod/_basctl/AccessibleShape.java | 49 -
qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java | 10
qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java | 10
qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java | 112 +--
qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java | 114 +--
qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java | 126 +---
qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java | 105 +--
qadevOOo/tests/java/mod/_cmdmail/SimpleCommandMail.java | 21
qadevOOo/tests/java/mod/_cnt/ChaosContentProvider.java | 20
qadevOOo/tests/java/mod/_cnt/CntUnoDataContainer.java | 39 -
qadevOOo/tests/java/mod/_cnt/PropertyMatcherFactory.java | 21
qadevOOo/tests/java/mod/_configmgr/ConfigurationProvider.java | 6
qadevOOo/tests/java/mod/_configmgr/DefaultProvider.java | 12
qadevOOo/tests/java/mod/_connector/uno/Connector.java | 20
qadevOOo/tests/java/mod/_connectr/Connector.java | 21
qadevOOo/tests/java/mod/_corefl/CoreReflection.java | 19
qadevOOo/tests/java/mod/_corereflection/uno/CoreReflection.java | 19
qadevOOo/tests/java/mod/_cpld/DLLComponentLoader.java | 18
qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java | 144 -----
qadevOOo/tests/java/mod/_dbaccess/DBContentLoader.java | 29 -
qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java | 140 +---
qadevOOo/tests/java/mod/_dbaccess/OCommandDefinition.java | 26
qadevOOo/tests/java/mod/_dbaccess/ODatabaseContext.java | 62 --
qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java | 85 --
qadevOOo/tests/java/mod/_dbaccess/ODatasourceAdministrationDialog.java | 24
qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java | 25
qadevOOo/tests/java/mod/_dbaccess/OInteractionHandler.java | 26
qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java | 84 --
qadevOOo/tests/java/mod/_dbaccess/ORowSet.java | 65 --
qadevOOo/tests/java/mod/_dbaccess/OSQLMessageDialog.java | 92 +--
qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java | 209 +++----
qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java | 84 --
qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java | 286 ++++------
qadevOOo/tests/java/mod/_dbpool/OConnectionPool.java | 10
qadevOOo/tests/java/mod/_dtrans/generic.java | 27
qadevOOo/tests/java/mod/_dynamicloader/Dynamic.java | 22
qadevOOo/tests/java/mod/_file/calc/ODriver.java | 12
qadevOOo/tests/java/mod/_file/dbase/ODriver.java | 10
qadevOOo/tests/java/mod/_file/flat/ODriver.java | 12
qadevOOo/tests/java/mod/_fileacc/SimpleFileAccess.java | 21
qadevOOo/tests/java/mod/_fop/FolderPicker.java | 20
qadevOOo/tests/java/mod/_forms/GenericModelTest.java | 78 --
qadevOOo/tests/java/mod/_forms/OButtonControl.java | 20
qadevOOo/tests/java/mod/_forms/OButtonModel.java | 13
qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java | 20
qadevOOo/tests/java/mod/_forms/OCheckBoxModel.java | 12
qadevOOo/tests/java/mod/_forms/OComboBoxControl.java | 20
qadevOOo/tests/java/mod/_forms/OComboBoxModel.java | 13
qadevOOo/tests/java/mod/_forms/OCurrencyControl.java | 20
qadevOOo/tests/java/mod/_forms/OCurrencyModel.java | 12
qadevOOo/tests/java/mod/_forms/ODatabaseForm.java | 32 -
qadevOOo/tests/java/mod/_forms/ODateControl.java | 20
qadevOOo/tests/java/mod/_forms/ODateModel.java | 13
qadevOOo/tests/java/mod/_forms/OEditControl.java | 20
qadevOOo/tests/java/mod/_forms/OEditModel.java | 12
qadevOOo/tests/java/mod/_forms/OFileControlModel.java | 34 -
qadevOOo/tests/java/mod/_forms/OFixedTextModel.java | 13
qadevOOo/tests/java/mod/_forms/OFormattedControl.java | 20
qadevOOo/tests/java/mod/_forms/OFormattedFieldWrapper.java | 12
qadevOOo/tests/java/mod/_forms/OGridControlModel.java | 95 ---
qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java | 20
qadevOOo/tests/java/mod/_forms/OGroupBoxModel.java | 13
qadevOOo/tests/java/mod/_forms/OHiddenModel.java | 36 -
qadevOOo/tests/java/mod/_forms/OImageButtonControl.java | 20
qadevOOo/tests/java/mod/_forms/OImageButtonModel.java | 13
qadevOOo/tests/java/mod/_forms/OImageControlControl.java | 20
qadevOOo/tests/java/mod/_forms/OImageControlModel.java | 12
qadevOOo/tests/java/mod/_forms/OListBoxControl.java | 20
qadevOOo/tests/java/mod/_forms/OListBoxModel.java | 7
qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java | 20
qadevOOo/tests/java/mod/_forms/ONavigationBarModel.java | 13
qadevOOo/tests/java/mod/_forms/ONumericControl.java | 20
qadevOOo/tests/java/mod/_forms/ONumericModel.java | 12
qadevOOo/tests/java/mod/_forms/OPatternControl.java | 20
qadevOOo/tests/java/mod/_forms/OPatternModel.java | 13
qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java | 20
qadevOOo/tests/java/mod/_forms/ORadioButtonModel.java | 2
qadevOOo/tests/java/mod/_forms/OTimeControl.java | 20
qadevOOo/tests/java/mod/_forms/OTimeModel.java | 2
qadevOOo/tests/java/mod/_fps/FilePicker.java | 12
qadevOOo/tests/java/mod/_fwk/ControlMenuController.java | 16
qadevOOo/tests/java/mod/_fwk/Desktop.java | 20
qadevOOo/tests/java/mod/_fwk/DispatchRecorder.java | 67 +-
qadevOOo/tests/java/mod/_fwk/DispatchRecorderSupplier.java | 12
qadevOOo/tests/java/mod/_fwk/FontMenuController.java | 14
qadevOOo/tests/java/mod/_fwk/FontSizeMenuController.java | 16
qadevOOo/tests/java/mod/_fwk/FooterMenuController.java | 16
qadevOOo/tests/java/mod/_fwk/FormatMenuController.java | 16
qadevOOo/tests/java/mod/_fwk/Frame.java | 13
qadevOOo/tests/java/mod/_fwk/HeaderMenuController.java | 16
qadevOOo/tests/java/mod/_fwk/JobExecutor.java | 16
qadevOOo/tests/java/mod/_fwk/JobHandler.java | 13
qadevOOo/tests/java/mod/_fwk/LayoutManager.java | 17
qadevOOo/tests/java/mod/_fwk/MacrosMenuController.java | 17
qadevOOo/tests/java/mod/_fwk/MailToDispatcher.java | 14
qadevOOo/tests/java/mod/_fwk/MenuBarFactory.java | 17
qadevOOo/tests/java/mod/_fwk/ModuleManager.java | 78 --
qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java | 57 -
qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManagerSupplier.java | 24
qadevOOo/tests/java/mod/_fwk/ObjectMenuController.java | 14
qadevOOo/tests/java/mod/_fwk/PopupMenuControllerFactory.java | 28
qadevOOo/tests/java/mod/_fwk/ServiceHandler.java | 14
qadevOOo/tests/java/mod/_fwk/SoundHandler.java | 12
qadevOOo/tests/java/mod/_fwk/StatusBarControllerFactory.java | 31 -
qadevOOo/tests/java/mod/_fwk/ToolBarsMenuController.java | 16
qadevOOo/tests/java/mod/_fwk/UICategoryDescription.java | 16
qadevOOo/tests/java/mod/_fwk/UICommandDescription.java | 14
qadevOOo/tests/java/mod/_fwk/UIElementFactoryManager.java | 15
qadevOOo/tests/java/mod/_fwk/URLTransformer.java | 15
qadevOOo/tests/java/mod/_fwl/ContentHandlerFactory.java | 12
qadevOOo/tests/java/mod/_fwl/FilterFactory.java | 49 -
qadevOOo/tests/java/mod/_fwl/FrameLoaderFactory.java | 25
qadevOOo/tests/java/mod/_fwl/PathSettings.java | 21
qadevOOo/tests/java/mod/_fwl/SubstituteVariables.java | 25
qadevOOo/tests/java/mod/_fwl/TypeDetection.java | 49 -
qadevOOo/tests/java/mod/_i18n/BreakIterator.java | 18
qadevOOo/tests/java/mod/_i18n/CalendarImpl.java | 21
qadevOOo/tests/java/mod/_i18n/ChapterCollator.java | 21
qadevOOo/tests/java/mod/_i18n/CharacterClassification.java | 21
qadevOOo/tests/java/mod/_i18n/Collator.java | 19
qadevOOo/tests/java/mod/_i18n/IndexEntrySupplier.java | 21
qadevOOo/tests/java/mod/_i18n/LocaleData.java | 18
qadevOOo/tests/java/mod/_i18n/NumberFormatCodeMapper.java | 22
qadevOOo/tests/java/mod/_i18n/Transliteration.java | 19
qadevOOo/tests/java/mod/_implreg/uno/ImplementationRegistration.java | 21
qadevOOo/tests/java/mod/_impreg/ImplementationRegistration.java | 22
qadevOOo/tests/java/mod/_insp/Introspection.java | 18
qadevOOo/tests/java/mod/_introspection/uno/Introspection.java | 17
qadevOOo/tests/java/mod/_inv/Invocation.java | 36 -
qadevOOo/tests/java/mod/_invadp/InvocationAdapterFactory.java | 16
qadevOOo/tests/java/mod/_invocadapt/uno/InvocationAdapterFactory.java | 16
qadevOOo/tests/java/mod/_invocation/uno/Invocation.java | 36 -
qadevOOo/tests/java/mod/_javaloader/JavaComponentLoader.java | 20
qadevOOo/tests/java/mod/_javaloader/uno/JavaComponentLoader.java | 18
qadevOOo/tests/java/mod/_javavm/uno/JavaVirtualMachine.java | 14
qadevOOo/tests/java/mod/_jdbc/JDBCDriver.java | 12
qadevOOo/tests/java/mod/_jen/JavaVirtualMachine.java | 14
qadevOOo/tests/java/mod/_lng/DicList.java | 14
qadevOOo/tests/java/mod/_lng/LinguProps.java | 14
qadevOOo/tests/java/mod/_lng/LngSvcMgr.java | 12
qadevOOo/tests/java/mod/_lnn/Hyphenator.java | 22
qadevOOo/tests/java/mod/_lnn/SpellChecker.java | 19
qadevOOo/tests/java/mod/_mcnttype/MimeContentTypeFactory.java | 19
qadevOOo/tests/java/mod/_mozab/MozabDriver.java | 12
qadevOOo/tests/java/mod/_namingservice/NamingService.java | 14
qadevOOo/tests/java/mod/_namingservice/uno/NamingService.java | 14
qadevOOo/tests/java/mod/_nestedreg/uno/NestedRegistry.java | 15
qadevOOo/tests/java/mod/_odbc/ODBCDriver.java | 12
qadevOOo/tests/java/mod/_pcr/ObjectInspector.java | 81 +-
qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java | 56 -
qadevOOo/tests/java/mod/_proxyfac/ProxyFactory.java | 17
qadevOOo/tests/java/mod/_proxyfac/uno/ProxyFactory.java | 17
qadevOOo/tests/java/mod/_remotebridge/uno/various.java | 122 +---
qadevOOo/tests/java/mod/_remotebridge/various.java | 122 +---
qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_HeaderFooter.java | 12
qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java | 66 --
qadevOOo/tests/java/mod/_sc/ScAccessibleCell.java | 11
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvCell.java | 14
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvGrid.java | 16
qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java | 12
qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java | 55 -
qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java | 74 --
qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java | 47 -
qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java | 65 --
qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java | 124 +---
qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java | 65 --
qadevOOo/tests/java/mod/_sc/ScAnnotationObj.java | 32 -
qadevOOo/tests/java/mod/_sc/ScAnnotationShapeObj.java | 34 -
qadevOOo/tests/java/mod/_sc/ScAnnotationTextCursor.java | 33 -
qadevOOo/tests/java/mod/_sc/ScAnnotationsObj.java | 36 -
qadevOOo/tests/java/mod/_sc/ScAreaLinkObj.java | 43 -
qadevOOo/tests/java/mod/_sc/ScAreaLinksObj.java | 42 -
qadevOOo/tests/java/mod/_sc/ScAutoFormatFieldObj.java | 2
qadevOOo/tests/java/mod/_sc/ScAutoFormatObj.java | 24
qadevOOo/tests/java/mod/_sc/ScCellCursorObj.java | 50 -
qadevOOo/tests/java/mod/_sc/ScCellFieldObj.java | 80 +-
qadevOOo/tests/java/mod/_sc/ScCellFieldsObj.java | 66 --
qadevOOo/tests/java/mod/_sc/ScCellFormatsEnumeration.java | 17
qadevOOo/tests/java/mod/_sc/ScCellFormatsObj.java | 17
qadevOOo/tests/java/mod/_sc/ScCellObj.java | 35 -
qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java | 33 -
qadevOOo/tests/java/mod/_sc/ScCellRangesObj.java | 60 --
qadevOOo/tests/java/mod/_sc/ScCellSearchObj.java | 17
qadevOOo/tests/java/mod/_sc/ScCellTextCursor.java | 33 -
qadevOOo/tests/java/mod/_sc/ScCellsEnumeration.java | 48 -
qadevOOo/tests/java/mod/_sc/ScCellsObj.java | 54 -
qadevOOo/tests/java/mod/_sc/ScChartObj.java | 26
qadevOOo/tests/java/mod/_sc/ScChartsObj.java | 26
qadevOOo/tests/java/mod/_sc/ScDDELinkObj.java | 82 --
qadevOOo/tests/java/mod/_sc/ScDDELinksObj.java | 80 --
qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java | 202 +------
qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java | 202 +------
qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java | 201 +------
qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java | 130 +---
qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj.java | 38 -
qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java | 131 +---
qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java | 119 +---
qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java | 93 ---
qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj.java | 40 -
qadevOOo/tests/java/mod/_sc/ScDatabaseRangeObj.java | 98 ---
qadevOOo/tests/java/mod/_sc/ScDatabaseRangesObj.java | 22
qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration.java | 10
qadevOOo/tests/java/mod/_sc/ScDrawPageObj.java | 46 -
qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java | 29 -
qadevOOo/tests/java/mod/_sc/ScFunctionDescriptionObj.java | 33 -
qadevOOo/tests/java/mod/_sc/ScFunctionListObj.java | 16
qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj.java | 71 --
qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj.java | 68 --
qadevOOo/tests/java/mod/_sc/ScHeaderFooterContentObj.java | 54 -
qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor.java | 54 -
qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextObj.java | 119 +---
qadevOOo/tests/java/mod/_sc/ScImportDescriptorBase.java | 8
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAnnotationsEnumeration.java | 29 -
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_CellAreaLinksEnumeration.java | 51 -
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java | 78 --
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotFieldsEnumeration.java | 38 -
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java | 119 +---
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotTablesEnumeration.java | 38 -
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_FunctionDescriptionEnumeration.java | 14
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_LabelRangesEnumeration.java | 34 -
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_NamedRangesEnumeration.java | 13
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_ScenariosEnumeration.java | 28
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetCellRangesEnumeration.java | 60 --
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SheetLinksEnumeration.java | 28
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SpreadsheetViewPanesEnumeration.java | 17
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_SubTotalFieldsEnumeration.java | 17
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableAutoFormatEnumeration.java | 32 -
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableChartsEnumeration.java | 29 -
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableColumnsEnumeration.java | 19
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableConditionalEntryEnumeration.java | 59 --
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TableRowsEnumeration.java | 19
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_TextFieldEnumeration.java | 66 --
qadevOOo/tests/java/mod/_sc/ScLabelRangeObj.java | 44 -
qadevOOo/tests/java/mod/_sc/ScLabelRangesObj.java | 34 -
qadevOOo/tests/java/mod/_sc/ScModelObj.java | 74 --
qadevOOo/tests/java/mod/_sc/ScNamedRangeObj.java | 28
qadevOOo/tests/java/mod/_sc/ScNamedRangesObj.java | 28
qadevOOo/tests/java/mod/_sc/ScRecentFunctionsObj.java | 25
qadevOOo/tests/java/mod/_sc/ScScenariosObj.java | 28
qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java | 43 -
qadevOOo/tests/java/mod/_sc/ScSheetLinksObj.java | 28
qadevOOo/tests/java/mod/_sc/ScSortDescriptorBase.java | 8
qadevOOo/tests/java/mod/_sc/ScSpreadsheetSettings.java | 12
qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java | 35 -
qadevOOo/tests/java/mod/_sc/ScStyleObj.java | 92 ---
qadevOOo/tests/java/mod/_sc/ScSubTotalDescriptorBase.java | 18
qadevOOo/tests/java/mod/_sc/ScSubTotalFieldObj.java | 32 -
qadevOOo/tests/java/mod/_sc/ScTabViewObj.java | 45 -
qadevOOo/tests/java/mod/_sc/ScTableColumnObj.java | 34 -
qadevOOo/tests/java/mod/_sc/ScTableColumnsObj.java | 22
qadevOOo/tests/java/mod/_sc/ScTableConditionalEntry.java | 65 --
qadevOOo/tests/java/mod/_sc/ScTableConditionalFormat.java | 34 -
qadevOOo/tests/java/mod/_sc/ScTableRowObj.java | 36 -
qadevOOo/tests/java/mod/_sc/ScTableRowsObj.java | 19
qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java | 42 -
qadevOOo/tests/java/mod/_sc/ScTableValidationObj.java | 46 -
qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java | 14
qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java | 14
qadevOOo/tests/java/mod/_sc/ScViewPaneObj.java | 32 -
qadevOOo/tests/java/mod/_sc/XMLContentExporter.java | 47 -
qadevOOo/tests/java/mod/_sc/XMLContentImporter.java | 17
qadevOOo/tests/java/mod/_sc/XMLExporter.java | 45 -
qadevOOo/tests/java/mod/_sc/XMLImporter.java | 15
qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java | 39 -
qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java | 17
qadevOOo/tests/java/mod/_sc/XMLSettingsExporter.java | 39 -
qadevOOo/tests/java/mod/_sc/XMLSettingsImporter.java | 25
qadevOOo/tests/java/mod/_sc/XMLStylesExporter.java | 51 -
qadevOOo/tests/java/mod/_sc/XMLStylesImporter.java | 17
qadevOOo/tests/java/mod/_sch/AccArea.java | 13
qadevOOo/tests/java/mod/_sch/AccAxis.java | 13
qadevOOo/tests/java/mod/_sch/AccDataPoint.java | 13
qadevOOo/tests/java/mod/_sch/AccDataSeries.java | 13
qadevOOo/tests/java/mod/_sch/AccDiagram.java | 13
qadevOOo/tests/java/mod/_sch/AccFloor.java | 33 -
qadevOOo/tests/java/mod/_sch/AccGrid.java | 13
qadevOOo/tests/java/mod/_sch/AccLegend.java | 13
qadevOOo/tests/java/mod/_sch/AccLegendEntry.java | 13
qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java | 19
qadevOOo/tests/java/mod/_sch/AccTitle.java | 13
qadevOOo/tests/java/mod/_sch/AccWall.java | 33 -
qadevOOo/tests/java/mod/_sch/ChXChartDocument.java | 18
qadevOOo/tests/java/mod/_sch/ChXDataPoint.java | 14
qadevOOo/tests/java/mod/_sch/ChXDataRow.java | 14
qadevOOo/tests/java/mod/_sch/ChXDiagram.java | 35 -
qadevOOo/tests/java/mod/_sch/ChartLine.java | 37 -
qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java | 18
qadevOOo/tests/java/mod/_sd/DrawController_DrawView.java | 45 -
qadevOOo/tests/java/mod/_sd/DrawController_HandoutView.java | 54 -
qadevOOo/tests/java/mod/_sd/DrawController_NotesView.java | 52 -
qadevOOo/tests/java/mod/_sd/DrawController_OutlineView.java | 52 -
qadevOOo/tests/java/mod/_sd/DrawController_PresentationView.java | 54 -
qadevOOo/tests/java/mod/_sd/SdDrawPage.java | 17
qadevOOo/tests/java/mod/_sd/SdGenericDrawPage.java | 11
qadevOOo/tests/java/mod/_sd/SdLayer.java | 17
qadevOOo/tests/java/mod/_sd/SdLayerManager.java | 18
qadevOOo/tests/java/mod/_sd/SdMasterPage.java | 18
qadevOOo/tests/java/mod/_sd/SdPageLinkTargets.java | 20
qadevOOo/tests/java/mod/_sd/SdUnoDrawView.java | 34 -
qadevOOo/tests/java/mod/_sd/SdUnoOutlineView.java | 27
qadevOOo/tests/java/mod/_sd/SdUnoPresView.java | 43 -
qadevOOo/tests/java/mod/_sd/SdUnoSlideView.java | 34 -
qadevOOo/tests/java/mod/_sd/SdXCustomPresentation.java | 77 --
qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java | 34 -
qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java | 35 -
qadevOOo/tests/java/mod/_sd/SdXPresentation.java | 26
qadevOOo/tests/java/mod/_sd/SdXShape.java | 53 -
qadevOOo/tests/java/mod/_servicemgr/uno/OServiceManager.java | 45 -
qadevOOo/tests/java/mod/_sfx/AppDispatchProvider.java | 12
qadevOOo/tests/java/mod/_sfx/DocumentTemplates.java | 16
qadevOOo/tests/java/mod/_sfx/FrameLoader.java | 21
qadevOOo/tests/java/mod/_sfx/SfxMacroLoader.java | 19
qadevOOo/tests/java/mod/_sm/SmEditAccessible.java | 32 -
qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java | 32 -
qadevOOo/tests/java/mod/_sm/SmModel.java | 16
qadevOOo/tests/java/mod/_sm/XMLImporter.java | 11
qadevOOo/tests/java/mod/_sm/XMLMetaExporter.java | 31 -
qadevOOo/tests/java/mod/_sm/XMLMetaImporter.java | 11
qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java | 31 -
qadevOOo/tests/java/mod/_sm/XMLSettingsImporter.java | 12
qadevOOo/tests/java/mod/_smgr/OServiceManager.java | 42 -
qadevOOo/tests/java/mod/_smplmail/SimpleSystemMail.java | 24
qadevOOo/tests/java/mod/_stm/DataInputStream.java | 46 -
qadevOOo/tests/java/mod/_stm/DataOutputStream.java | 16
qadevOOo/tests/java/mod/_stm/MarkableInputStream.java | 16
qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java | 22
qadevOOo/tests/java/mod/_stm/ObjectInputStream.java | 44 -
qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java | 40 -
qadevOOo/tests/java/mod/_stm/Pipe.java | 12
qadevOOo/tests/java/mod/_stm/Pump.java | 12
qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java | 50 -
qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java | 18
qadevOOo/tests/java/mod/_streams/uno/MarkableInputStream.java | 18
qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java | 24
qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java | 34 -
qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java | 42 -
qadevOOo/tests/java/mod/_streams/uno/Pipe.java | 14
qadevOOo/tests/java/mod/_streams/uno/Pump.java | 15
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java | 13
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java | 20
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java | 20
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java | 14
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java | 13
qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java | 36 -
qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java | 37 -
qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java | 17
qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java | 24
qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java | 24
qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java | 13
qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java | 20
qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java | 20
qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java | 12
qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java | 10
qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java | 12
qadevOOo/tests/java/mod/_svx/GraphicExporter.java | 53 -
qadevOOo/tests/java/mod/_svx/SvxDrawPage.java | 57 -
qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java | 12
qadevOOo/tests/java/mod/_svx/SvxShapeCircle.java | 21
qadevOOo/tests/java/mod/_svx/SvxShapeGroup.java | 33 -
qadevOOo/tests/java/mod/_svx/SvxUnoNumberingRules.java | 14
qadevOOo/tests/java/mod/_svx/SvxUnoTextContent.java | 58 --
qadevOOo/tests/java/mod/_svx/SvxUnoTextContentEnum.java | 54 -
qadevOOo/tests/java/mod/_svx/SvxUnoTextField.java | 40 -
qadevOOo/tests/java/mod/_sw/CharacterStyle.java | 86 ---
qadevOOo/tests/java/mod/_sw/ConditionalParagraphStyle.java | 88 ---
qadevOOo/tests/java/mod/_sw/PageStyle.java | 91 ---
qadevOOo/tests/java/mod/_sw/ParagraphStyle.java | 90 ---
qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java | 65 --
qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java | 34 -
qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java | 39 -
qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java | 55 -
qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java | 39 -
qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java | 39 -
qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java | 112 +--
qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java | 9
qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java | 9
qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java | 30 -
qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java | 8
qadevOOo/tests/java/mod/_sw/SwXAutoTextContainer.java | 18
qadevOOo/tests/java/mod/_sw/SwXAutoTextEntry.java | 23
qadevOOo/tests/java/mod/_sw/SwXAutoTextGroup.java | 37 -
qadevOOo/tests/java/mod/_sw/SwXCellRange.java | 20
qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java | 19
qadevOOo/tests/java/mod/_sw/SwXDocumentIndexMark.java | 8
qadevOOo/tests/java/mod/_sw/SwXDocumentIndexes.java | 19
qadevOOo/tests/java/mod/_sw/SwXEndnoteProperties.java | 18
qadevOOo/tests/java/mod/_sw/SwXFieldEnumeration.java | 9
qadevOOo/tests/java/mod/_sw/SwXFootnote.java | 20
qadevOOo/tests/java/mod/_sw/SwXFootnoteProperties.java | 18
qadevOOo/tests/java/mod/_sw/SwXFootnoteText.java | 18
qadevOOo/tests/java/mod/_sw/SwXFootnotes.java | 18
qadevOOo/tests/java/mod/_sw/SwXFrames.java | 22
qadevOOo/tests/java/mod/_sw/SwXHeadFootText.java | 49 -
qadevOOo/tests/java/mod/_sw/SwXMailMerge.java | 129 +---
qadevOOo/tests/java/mod/_sw/SwXModule.java | 24
qadevOOo/tests/java/mod/_sw/SwXParagraph.java | 81 --
qadevOOo/tests/java/mod/_sw/SwXPrintSettings.java | 12
qadevOOo/tests/java/mod/_sw/SwXPropertySet.java | 12
qadevOOo/tests/java/mod/_sw/SwXPropertySetInfo.java | 12
qadevOOo/tests/java/mod/_sw/SwXReferenceMark.java | 22
qadevOOo/tests/java/mod/_sw/SwXReferenceMarks.java | 34 -
qadevOOo/tests/java/mod/_sw/SwXStyle.java | 88 ---
qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java | 17
qadevOOo/tests/java/mod/_sw/SwXTableCellText.java | 8
qadevOOo/tests/java/mod/_sw/SwXTableColumns.java | 8
qadevOOo/tests/java/mod/_sw/SwXTableRows.java | 8
qadevOOo/tests/java/mod/_sw/SwXTextDefaults.java | 10
qadevOOo/tests/java/mod/_sw/SwXTextDocument.java | 275 ++++-----
qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java | 20
qadevOOo/tests/java/mod/_sw/SwXTextFrame.java | 66 +-
qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java | 87 +--
qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java | 222 +++----
qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java | 121 +---
qadevOOo/tests/java/mod/_sw/SwXTextPortion.java | 108 +--
qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java | 98 +--
qadevOOo/tests/java/mod/_sw/SwXTextSection.java | 12
qadevOOo/tests/java/mod/_sw/SwXTextSections.java | 30 -
qadevOOo/tests/java/mod/_sw/SwXTextTable.java | 8
qadevOOo/tests/java/mod/_sw/SwXTextTables.java | 31 -
qadevOOo/tests/java/mod/_sw/SwXTextView.java | 65 --
qadevOOo/tests/java/mod/_sw/XMLContentExporter.java | 29 -
qadevOOo/tests/java/mod/_sw/XMLContentImporter.java | 11
qadevOOo/tests/java/mod/_sw/XMLExporter.java | 25
qadevOOo/tests/java/mod/_sw/XMLImporter.java | 17
qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java | 31 -
qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java | 11
qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java | 34 -
qadevOOo/tests/java/mod/_sw/XMLSettingsImporter.java | 13
qadevOOo/tests/java/mod/_sw/XMLStylesExporter.java | 26
qadevOOo/tests/java/mod/_sw/XMLStylesImporter.java | 12
qadevOOo/tests/java/mod/_sysdtrans/SystemClipboard.java | 18
qadevOOo/tests/java/mod/_syssh/SystemShellExecute.java | 18
qadevOOo/tests/java/mod/_text/DefaultNumberingProvider.java | 15
qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java | 11
qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java | 20
qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java | 13
qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java | 26
qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java | 14
qadevOOo/tests/java/mod/_toolkit/AccessibleList.java | 42 -
qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java | 46 -
qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java | 42 -
qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java | 12
qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java | 13
qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java | 99 +--
qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java | 39 -
qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java | 14
qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java | 18
qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java | 14
qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java | 39 -
qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java | 38 -
qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java | 14
qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java | 18
qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java | 14
qadevOOo/tests/java/mod/_toolkit/TabControllerModel.java | 13
qadevOOo/tests/java/mod/_toolkit/Toolkit.java | 16
qadevOOo/tests/java/mod/_toolkit/UnoControlButton.java | 30 -
qadevOOo/tests/java/mod/_toolkit/UnoControlButtonModel.java | 15
qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBox.java | 30 -
qadevOOo/tests/java/mod/_toolkit/UnoControlCheckBoxModel.java | 15
qadevOOo/tests/java/mod/_toolkit/UnoControlComboBox.java | 20
qadevOOo/tests/java/mod/_toolkit/UnoControlContainer.java | 70 --
qadevOOo/tests/java/mod/_toolkit/UnoControlContainerModel.java | 16
qadevOOo/tests/java/mod/_toolkit/UnoControlCurrencyField.java | 21
qadevOOo/tests/java/mod/_toolkit/UnoControlDateField.java | 30 -
qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java | 128 ++--
qadevOOo/tests/java/mod/_toolkit/UnoControlEdit.java | 21
qadevOOo/tests/java/mod/_toolkit/UnoControlFileControl.java | 21
qadevOOo/tests/java/mod/_toolkit/UnoControlFixedText.java | 21
qadevOOo/tests/java/mod/_toolkit/UnoControlFormattedField.java | 25
qadevOOo/tests/java/mod/_toolkit/UnoControlGroupBox.java | 21
qadevOOo/tests/java/mod/_toolkit/UnoControlImageControl.java | 25
qadevOOo/tests/java/mod/_toolkit/UnoControlListBox.java | 21
qadevOOo/tests/java/mod/_toolkit/UnoControlNumericField.java | 20
qadevOOo/tests/java/mod/_toolkit/UnoControlPatternField.java | 21
qadevOOo/tests/java/mod/_toolkit/UnoControlRadioButton.java | 21
qadevOOo/tests/java/mod/_toolkit/UnoControlTimeField.java | 21
qadevOOo/tests/java/mod/_toolkit/UnoScrollBarControl.java | 23
qadevOOo/tests/java/mod/_toolkit/UnoSpinButtonControl.java | 22
qadevOOo/tests/java/mod/_ucb/UcbContentProviderProxyFactory.java | 14
qadevOOo/tests/java/mod/_ucb/UcbPropertiesManager.java | 14
qadevOOo/tests/java/mod/_ucb/UcbStore.java | 13
qadevOOo/tests/java/mod/_ucb/UniversalContentBroker.java | 14
qadevOOo/tests/java/mod/_ucpchelp/CHelpContentProvider.java | 18
qadevOOo/tests/java/mod/_ucpdav/WebDAVContentProvider.java | 28
qadevOOo/tests/java/mod/_ucpfile/FileProvider.java | 14
qadevOOo/tests/java/mod/_ucpftp/FTPContentProvider.java | 18
qadevOOo/tests/java/mod/_ucphier/HierarchyContentProvider.java | 18
qadevOOo/tests/java/mod/_ucppkg/PackageContentProvider.java | 18
qadevOOo/tests/java/mod/_ucprmt/ContentProvider.java | 24
qadevOOo/tests/java/mod/_ucprmt/ProviderAcceptor.java | 18
qadevOOo/tests/java/mod/_ucprmt/ProxyProvider.java | 26
qadevOOo/tests/java/mod/_uui/UUIInteractionHandler.java | 21
qadevOOo/tests/java/mod/_uuresolver/UnoUrlResolver.java | 54 -
qadevOOo/tests/java/mod/_uuresolver/uno/UnoUrlResolver.java | 36 -
qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentExporter.java | 27
qadevOOo/tests/java/mod/_xmloff/Chart/XMLContentImporter.java | 17
qadevOOo/tests/java/mod/_xmloff/Chart/XMLExporter.java | 25
qadevOOo/tests/java/mod/_xmloff/Chart/XMLImporter.java | 17
qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesExporter.java | 18
qadevOOo/tests/java/mod/_xmloff/Chart/XMLStylesImporter.java | 12
qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentExporter.java | 45 -
qadevOOo/tests/java/mod/_xmloff/Draw/XMLContentImporter.java | 12
qadevOOo/tests/java/mod/_xmloff/Draw/XMLExporter.java | 36 -
qadevOOo/tests/java/mod/_xmloff/Draw/XMLImporter.java | 10
qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java | 28
qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaImporter.java | 9
qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsExporter.java | 30 -
qadevOOo/tests/java/mod/_xmloff/Draw/XMLSettingsImporter.java | 12
qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesExporter.java | 45 -
qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesImporter.java | 12
qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentExporter.java | 33 -
qadevOOo/tests/java/mod/_xmloff/Impress/XMLContentImporter.java | 12
qadevOOo/tests/java/mod/_xmloff/Impress/XMLExporter.java | 34 -
qadevOOo/tests/java/mod/_xmloff/Impress/XMLImporter.java | 11
qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java | 30 -
qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java | 12
qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsExporter.java | 38 -
qadevOOo/tests/java/mod/_xmloff/Impress/XMLSettingsImporter.java | 21
qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesExporter.java | 42 -
qadevOOo/tests/java/mod/_xmloff/Impress/XMLStylesImporter.java | 12
526 files changed, 5296 insertions(+), 12641 deletions(-)
New commits:
commit 2a0dda3dfb37f0cb69842f7d569c253d82f53713
Author: Noel Grandin <noel at peralex.com>
Date: Tue Jun 9 08:52:12 2015 +0200
remove some unnecessary exception wrapping in the Java tests
Modify createTestEnvironment so that it throws Exception. This
is appropriate for unit testing.
The wrapping adds no value and the calling method already has
a catch(Exception) to handle anything.
Change-Id: I430a414f63d2cbfc3b65ecfde0285509265e5192
diff --git a/dbaccess/qa/complex/dbaccess/RowSet.java b/dbaccess/qa/complex/dbaccess/RowSet.java
index 6baee75..297469b 100644
--- a/dbaccess/qa/complex/dbaccess/RowSet.java
+++ b/dbaccess/qa/complex/dbaccess/RowSet.java
@@ -17,7 +17,6 @@
*/
package complex.dbaccess;
-import com.sun.star.beans.PropertyVetoException;
import com.sun.star.beans.UnknownPropertyException;
import com.sun.star.beans.XPropertySet;
import com.sun.star.container.XIndexAccess;
diff --git a/qadevOOo/runner/lib/TestCase.java b/qadevOOo/runner/lib/TestCase.java
index ebe175d..3a3d7e9 100644
--- a/qadevOOo/runner/lib/TestCase.java
+++ b/qadevOOo/runner/lib/TestCase.java
@@ -157,7 +157,7 @@ public abstract class TestCase {
* @see #getTestEnvironment
*/
protected abstract TestEnvironment createTestEnvironment(
- TestParameters tParam, PrintWriter log );
+ TestParameters tParam, PrintWriter log ) throws Exception;
/**
* @return the name of the object
diff --git a/qadevOOo/tests/java/mod/_acceptor/Acceptor.java b/qadevOOo/tests/java/mod/_acceptor/Acceptor.java
index 0a2a04e..662212c 100644
--- a/qadevOOo/tests/java/mod/_acceptor/Acceptor.java
+++ b/qadevOOo/tests/java/mod/_acceptor/Acceptor.java
@@ -20,7 +20,6 @@ package mod._acceptor;
import java.io.PrintWriter;
-import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
@@ -76,18 +75,14 @@ public class Acceptor extends TestCase {
*/
@Override
public synchronized TestEnvironment createTestEnvironment(
- TestParameters Param, PrintWriter log ) throws StatusException {
+ TestParameters Param, PrintWriter log ) throws Exception {
XInterface oObj = null;
XInterface acceptor = null;
- try {
- acceptor = (XInterface)
- Param.getMSF().createInstance
- ("com.sun.star.connection.Acceptor");
- } catch (com.sun.star.uno.Exception e) {
- throw new StatusException("Can't create object environment", e) ;
- }
+ acceptor = (XInterface)
+ Param.getMSF().createInstance
+ ("com.sun.star.connection.Acceptor");
// select the port
curPort = utils.getNextFreePort(basePort);
diff --git a/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java b/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java
index 8648ad5..b73c31a 100644
--- a/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java
+++ b/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java
@@ -20,7 +20,6 @@ package mod._acceptor.uno;
import com.sun.star.uno.XInterface;
import java.io.PrintWriter;
-import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
@@ -71,25 +70,17 @@ public class Acceptor extends TestCase {
* <ul>
*/
@Override
- protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) {
+ protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception {
- XInterface oObj = null;
- XInterface acceptor = null;
-
- try {
- acceptor = (XInterface)
- Param.getMSF().createInstance
- ("com.sun.star.connection.Acceptor");
- } catch (com.sun.star.uno.Exception e) {
- throw new StatusException("Can't create object environment", e) ;
- }
+ XInterface acceptor = (XInterface)
+ Param.getMSF().createInstance
+ ("com.sun.star.connection.Acceptor");
// select the port
curPort = utils.getNextFreePort(basePort);
log.println("Choose Port nr: " + curPort);
- oObj = acceptor;
- TestEnvironment tEnv = new TestEnvironment(oObj) ;
+ TestEnvironment tEnv = new TestEnvironment(acceptor) ;
// adding connection string as relation
tEnv.addObjRelation("XAcceptor.connectStr",
diff --git a/qadevOOo/tests/java/mod/_adabas/ODriver.java b/qadevOOo/tests/java/mod/_adabas/ODriver.java
index 0f3b56e..2ac7ecd 100644
--- a/qadevOOo/tests/java/mod/_adabas/ODriver.java
+++ b/qadevOOo/tests/java/mod/_adabas/ODriver.java
@@ -59,16 +59,10 @@ public class ODriver extends TestCase {
* </ul>
*/
@Override
- protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) {
+ protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception {
- XInterface oObj = null;
-
- try {
- oObj = (XInterface)Param.getMSF().
- createInstance("com.sun.star.comp.sdbcx.adabas.ODriver");
- } catch (com.sun.star.uno.Exception e) {
- throw new StatusException(e, Status.failed("Couldn't create object"));
- }
+ XInterface oObj = (XInterface)Param.getMSF().
+ createInstance("com.sun.star.comp.sdbcx.adabas.ODriver");
log.println("creating a new environment for object");
TestEnvironment tEnv = new TestEnvironment(oObj);
diff --git a/qadevOOo/tests/java/mod/_ado/ODriver.java b/qadevOOo/tests/java/mod/_ado/ODriver.java
index 7e5518c..ef1cfc7 100644
--- a/qadevOOo/tests/java/mod/_ado/ODriver.java
+++ b/qadevOOo/tests/java/mod/_ado/ODriver.java
@@ -58,16 +58,10 @@ public class ODriver extends TestCase {
* </ul>
*/
@Override
- protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) {
+ protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception {
- XInterface oObj = null;
-
- try {
- oObj = (XInterface)Param.getMSF().
- createInstance("com.sun.star.comp.sdbc.ado.ODriver");
- } catch (com.sun.star.uno.Exception e) {
- throw new StatusException(e, Status.failed("Couldn't create object"));
- }
+ XInterface oObj = (XInterface)Param.getMSF().
+ createInstance("com.sun.star.comp.sdbc.ado.ODriver");
log.println("creating a new environment for object");
TestEnvironment tEnv = new TestEnvironment(oObj);
diff --git a/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java b/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java
index daac55c..103dca483 100644
--- a/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java
+++ b/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java
@@ -35,7 +35,6 @@ import com.sun.star.text.XTextDocument;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XInterface;
import java.io.PrintWriter;
-import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
@@ -64,7 +63,7 @@ public class AccessibleShape extends TestCase {
}
@Override
- protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) {
+ protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) throws Exception {
XMultiServiceFactory xMSF = tParam.getMSF();
log.println( "creating a test environment" );
String aURL=utils.getFullTestURL("basDialog.odt");
@@ -74,37 +73,27 @@ public class AccessibleShape extends TestCase {
XDispatchProvider xDPP = UnoRuntime.queryInterface(XDispatchProvider.class, xFrame);
log.println( "opening the basic dialog editor" );
- try {
- Object o = xMSF.createInstance("com.sun.star.frame.DispatchHelper");
- XDispatchHelper xDPH = UnoRuntime.queryInterface(XDispatchHelper.class, o);
- PropertyValue[] aArgs = new PropertyValue[4];
- aArgs[0] = new PropertyValue();
- aArgs[0].Name = "Document";
- aArgs[0].Value = aURL;
- aArgs[1] = new PropertyValue();
- aArgs[1].Name = "LibName";
- aArgs[1].Value = "basctl";
- aArgs[2] = new PropertyValue();
- aArgs[2].Name = "Name";
- aArgs[2].Value = "Dialog1";
- aArgs[3] = new PropertyValue();
- aArgs[3].Name = "Type";
- aArgs[3].Value = "Dialog";
- xDPH.executeDispatch(xDPP, ".uno:BasicIDEAppear", "", 0, aArgs);
- } catch (Exception e) {
- throw new StatusException("Couldn't open Basic Dialog",e);
- }
+ Object o = xMSF.createInstance("com.sun.star.frame.DispatchHelper");
+ XDispatchHelper xDPH = UnoRuntime.queryInterface(XDispatchHelper.class, o);
+ PropertyValue[] aArgs = new PropertyValue[4];
+ aArgs[0] = new PropertyValue();
+ aArgs[0].Name = "Document";
+ aArgs[0].Value = aURL;
+ aArgs[1] = new PropertyValue();
+ aArgs[1].Name = "LibName";
+ aArgs[1].Value = "basctl";
+ aArgs[2] = new PropertyValue();
+ aArgs[2].Name = "Name";
+ aArgs[2].Value = "Dialog1";
+ aArgs[3] = new PropertyValue();
+ aArgs[3].Name = "Type";
+ aArgs[3].Value = "Dialog";
+ xDPH.executeDispatch(xDPP, ".uno:BasicIDEAppear", "", 0, aArgs);
utils.pause(3000);
- try {
- oObj = (XInterface) tParam.getMSF().createInstance
- ("com.sun.star.awt.Toolkit") ;
- } catch (com.sun.star.uno.Exception e) {
- log.println("Couldn't get toolkit");
- e.printStackTrace(log);
- throw new StatusException("Couldn't get toolkit", e );
- }
+ oObj = (XInterface) tParam.getMSF().createInstance
+ ("com.sun.star.awt.Toolkit") ;
final XWindow basicIDE = xFrame.getContainerWindow();
diff --git a/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java b/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java
index fafddfb..5cc1c49 100644
--- a/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java
+++ b/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java
@@ -68,16 +68,10 @@ public class BridgeFactory extends TestCase {
*/
@Override
public synchronized TestEnvironment createTestEnvironment(
- TestParameters Param, PrintWriter log ) throws StatusException {
+ TestParameters Param, PrintWriter log ) throws Exception {
- XInterface oObj = null ;
-
- try {
- oObj = (XInterface) Param.getMSF().createInstance
+ XInterface oObj = (XInterface) Param.getMSF().createInstance
("com.sun.star.bridge.BridgeFactory") ;
- } catch (com.sun.star.uno.Exception e) {
- throw new StatusException("Can't create object environment", e) ;
- }
if (oObj == null)
throw new StatusException("Can't create service",
diff --git a/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java b/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java
index 337da35..f4d1148 100644
--- a/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java
+++ b/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java
@@ -65,17 +65,11 @@ public class BridgeFactory extends TestCase {
* service as object to be tested.
*/
@Override
- protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) {
+ protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception {
- XInterface oObj = null ;
-
- try {
- oObj = (XInterface)
+ XInterface oObj = (XInterface)
Param.getMSF().createInstance
("com.sun.star.bridge.BridgeFactory") ;
- } catch (com.sun.star.uno.Exception e) {
- throw new StatusException("Can't create object environment", e) ;
- }
if (oObj == null)
throw new StatusException("Can't create service",
diff --git a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java
index 4596c7f..d2a2dbc 100644
--- a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java
+++ b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java
@@ -79,89 +79,71 @@ public class CachedContentResultSetFactory extends TestCase {
@Override
public TestEnvironment createTestEnvironment( TestParameters Param,
PrintWriter log )
- throws StatusException {
- XInterface oObj = null;
- Object oInterface = null;
+ throws Exception {
XMultiServiceFactory xMSF = Param.getMSF();
- try {
- oInterface = xMSF.createInstance
+ Object oInterface = xMSF.createInstance
( "com.sun.star.ucb.CachedContentResultSetFactory" );
-
- // adding one child container
- }
- catch( com.sun.star.uno.Exception e ) {
- log.println("Can't create an object." );
- throw new StatusException( "Can't create an object", e );
- }
-
- oObj = (XInterface) oInterface;
+ XInterface oObj = (XInterface) oInterface;
TestEnvironment tEnv = new TestEnvironment( oObj );
// creating relation for XCachedContentResultSetFactory
XResultSet resSetStub = null ;
- try {
- Object oUCB = xMSF.createInstanceWithArguments
- ("com.sun.star.ucb.UniversalContentBroker",
- new Object[0]) ;
-
- XContentIdentifierFactory ciFac = UnoRuntime.queryInterface(XContentIdentifierFactory.class, oUCB) ;
-
- String url = util.utils.getFullTestURL("SwXTextEmbeddedObject.sxw") ;
- String escUrl = "" ;
-
- // In base URL of a JAR file in content URL all directory
- // separators ('/') must be replaced with escape symbol '%2F'.
- int idx = url.indexOf("/") ;
- int lastIdx = -1 ;
- while (idx >= 0) {
- escUrl += url.substring(lastIdx + 1, idx) + "%2F" ;
- lastIdx = idx ;
- idx = url.indexOf("/", idx + 1) ;
- }
- escUrl += url.substring(lastIdx + 1) ;
- String cntUrl = "vnd.sun.star.pkg://" + escUrl + "/" ;
-
- XContentIdentifier CI = ciFac.createContentIdentifier(cntUrl) ;
+ Object oUCB = xMSF.createInstanceWithArguments
+ ("com.sun.star.ucb.UniversalContentBroker",
+ new Object[0]) ;
+
+ XContentIdentifierFactory ciFac = UnoRuntime.queryInterface(XContentIdentifierFactory.class, oUCB) ;
+
+ String url = util.utils.getFullTestURL("SwXTextEmbeddedObject.sxw") ;
+ String escUrl = "" ;
+
+ // In base URL of a JAR file in content URL all directory
+ // separators ('/') must be replaced with escape symbol '%2F'.
+ int idx = url.indexOf("/") ;
+ int lastIdx = -1 ;
+ while (idx >= 0) {
+ escUrl += url.substring(lastIdx + 1, idx) + "%2F" ;
+ lastIdx = idx ;
+ idx = url.indexOf("/", idx + 1) ;
+ }
+ escUrl += url.substring(lastIdx + 1) ;
+ String cntUrl = "vnd.sun.star.pkg://" + escUrl + "/" ;
- XContentProvider cntProv = UnoRuntime.queryInterface(XContentProvider.class, oUCB) ;
+ XContentIdentifier CI = ciFac.createContentIdentifier(cntUrl) ;
- XContent cnt = cntProv.queryContent(CI) ;
+ XContentProvider cntProv = UnoRuntime.queryInterface(XContentProvider.class, oUCB) ;
- XCommandProcessor cmdProc = UnoRuntime.queryInterface(XCommandProcessor.class, cnt) ;
+ XContent cnt = cntProv.queryContent(CI) ;
- Property prop = new Property() ;
- prop.Name = "Title" ;
+ XCommandProcessor cmdProc = UnoRuntime.queryInterface(XCommandProcessor.class, cnt) ;
- Command cmd = new Command("open", -1, new OpenCommandArgument2
- (OpenMode.ALL, 10000, null, new Property[] {prop},
- new NumberedSortingInfo[0])) ;
+ Property prop = new Property() ;
+ prop.Name = "Title" ;
- XDynamicResultSet dynResSet = null;
- try {
- dynResSet = (XDynamicResultSet)
- AnyConverter.toObject(new Type(XDynamicResultSet.class),
- cmdProc.execute(cmd, 0, null));
- } catch (com.sun.star.lang.IllegalArgumentException iae) {
- throw new StatusException("Couldn't convert Any ",iae);
- }
+ Command cmd = new Command("open", -1, new OpenCommandArgument2
+ (OpenMode.ALL, 10000, null, new Property[] {prop},
+ new NumberedSortingInfo[0])) ;
- XResultSet resSet = dynResSet.getStaticResultSet() ;
+ XDynamicResultSet dynResSet = null;
+ try {
+ dynResSet = (XDynamicResultSet)
+ AnyConverter.toObject(new Type(XDynamicResultSet.class),
+ cmdProc.execute(cmd, 0, null));
+ } catch (com.sun.star.lang.IllegalArgumentException iae) {
+ throw new StatusException("Couldn't convert Any ",iae);
+ }
- Object oStubFactory = xMSF.createInstance
- ("com.sun.star.ucb.CachedContentResultSetStubFactory") ;
+ XResultSet resSet = dynResSet.getStaticResultSet() ;
- XCachedContentResultSetStubFactory xStubFactory =
- UnoRuntime.queryInterface
- (XCachedContentResultSetStubFactory.class, oStubFactory) ;
+ Object oStubFactory = xMSF.createInstance
+ ("com.sun.star.ucb.CachedContentResultSetStubFactory") ;
- resSetStub = xStubFactory.createCachedContentResultSetStub(resSet) ;
+ XCachedContentResultSetStubFactory xStubFactory =
+ UnoRuntime.queryInterface
+ (XCachedContentResultSetStubFactory.class, oStubFactory) ;
- } catch (com.sun.star.uno.Exception e) {
- log.println("Can't create relation." );
- e.printStackTrace(log) ;
- throw new StatusException( "Can't create relation", e );
- }
+ resSetStub = xStubFactory.createCachedContentResultSetStub(resSet) ;
tEnv.addObjRelation("CachedContentResultSetStub", resSetStub) ;
diff --git a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java
index 42d3c9a..8dd3b15 100644
--- a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java
+++ b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java
@@ -77,82 +77,64 @@ public class CachedContentResultSetStubFactory extends TestCase {
@Override
public TestEnvironment createTestEnvironment( TestParameters Param,
PrintWriter log )
- throws StatusException {
- XInterface oObj = null;
- Object oInterface = null;
+ throws Exception {
XMultiServiceFactory xMSF = Param.getMSF();
- try {
- oInterface = xMSF.createInstance
+ Object oInterface = xMSF.createInstance
( "com.sun.star.ucb.CachedContentResultSetStubFactory" );
-
- // adding one child container
- }
- catch( com.sun.star.uno.Exception e ) {
- log.println("Can't create an object." );
- throw new StatusException( "Can't create an object", e );
- }
-
- oObj = (XInterface) oInterface;
+ XInterface oObj = (XInterface) oInterface;
TestEnvironment tEnv = new TestEnvironment( oObj );
// creating relation for XCachedContentResultSetStubFactory
XResultSet resSet = null ;
+ Object oUCB = xMSF.createInstanceWithArguments
+ ("com.sun.star.ucb.UniversalContentBroker",
+ new Object[0]) ;
+
+ XContentIdentifierFactory ciFac = UnoRuntime.queryInterface(XContentIdentifierFactory.class, oUCB) ;
+
+ String url = util.utils.getFullTestURL("SwXTextEmbeddedObject.sxw") ;
+ String escUrl = "" ;
+
+ // In base URL of a JAR file in content URL all directory
+ // separators ('/') must be replaced with escape symbol '%2F'.
+ int idx = url.indexOf("/") ;
+ int lastIdx = -1 ;
+ while (idx >= 0) {
+ escUrl += url.substring(lastIdx + 1, idx) + "%2F" ;
+ lastIdx = idx ;
+ idx = url.indexOf("/", idx + 1) ;
+ }
+ escUrl += url.substring(lastIdx + 1) ;
+ String cntUrl = "vnd.sun.star.pkg://" + escUrl + "/" ;
+ log.println("Getting Content of '" + cntUrl + "'") ;
+
+ XContentIdentifier CI = ciFac.createContentIdentifier(cntUrl) ;
+
+ XContentProvider cntProv = UnoRuntime.queryInterface(XContentProvider.class, oUCB) ;
+
+ XContent cnt = cntProv.queryContent(CI) ;
+
+ XCommandProcessor cmdProc = UnoRuntime.queryInterface(XCommandProcessor.class, cnt) ;
+
+ Property prop = new Property() ;
+ prop.Name = "Title" ;
+
+ Command cmd = new Command("open", -1, new OpenCommandArgument2
+ (OpenMode.ALL, 10000, null, new Property[] {prop},
+ new NumberedSortingInfo[0])) ;
+
+ XDynamicResultSet dynResSet = null;
try {
- Object oUCB = xMSF.createInstanceWithArguments
- ("com.sun.star.ucb.UniversalContentBroker",
- new Object[0]) ;
-
- XContentIdentifierFactory ciFac = UnoRuntime.queryInterface(XContentIdentifierFactory.class, oUCB) ;
-
- String url = util.utils.getFullTestURL("SwXTextEmbeddedObject.sxw") ;
- String escUrl = "" ;
-
- // In base URL of a JAR file in content URL all directory
- // separators ('/') must be replaced with escape symbol '%2F'.
- int idx = url.indexOf("/") ;
- int lastIdx = -1 ;
- while (idx >= 0) {
- escUrl += url.substring(lastIdx + 1, idx) + "%2F" ;
- lastIdx = idx ;
- idx = url.indexOf("/", idx + 1) ;
- }
- escUrl += url.substring(lastIdx + 1) ;
- String cntUrl = "vnd.sun.star.pkg://" + escUrl + "/" ;
- log.println("Getting Content of '" + cntUrl + "'") ;
-
- XContentIdentifier CI = ciFac.createContentIdentifier(cntUrl) ;
-
- XContentProvider cntProv = UnoRuntime.queryInterface(XContentProvider.class, oUCB) ;
-
- XContent cnt = cntProv.queryContent(CI) ;
-
- XCommandProcessor cmdProc = UnoRuntime.queryInterface(XCommandProcessor.class, cnt) ;
-
- Property prop = new Property() ;
- prop.Name = "Title" ;
-
- Command cmd = new Command("open", -1, new OpenCommandArgument2
- (OpenMode.ALL, 10000, null, new Property[] {prop},
- new NumberedSortingInfo[0])) ;
-
- XDynamicResultSet dynResSet = null;
- try {
- dynResSet = (XDynamicResultSet)
- AnyConverter.toObject(new Type(XDynamicResultSet.class),
- cmdProc.execute(cmd, 0, null));
- } catch (com.sun.star.lang.IllegalArgumentException iae) {
- throw new StatusException("Couldn't convert Any ",iae);
- }
-
- resSet = dynResSet.getStaticResultSet() ;
-
- } catch (com.sun.star.uno.Exception e) {
- log.println("Can't create relation." );
- e.printStackTrace(log) ;
- throw new StatusException( "Can't create relation", e );
+ dynResSet = (XDynamicResultSet)
+ AnyConverter.toObject(new Type(XDynamicResultSet.class),
+ cmdProc.execute(cmd, 0, null));
+ } catch (com.sun.star.lang.IllegalArgumentException iae) {
+ throw new StatusException("Couldn't convert Any ",iae);
}
+ resSet = dynResSet.getStaticResultSet() ;
+
tEnv.addObjRelation("ContentResultSet", resSet) ;
return tEnv;
diff --git a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java
index c2ba76d..d2435b9 100644
--- a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java
+++ b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java
@@ -36,7 +36,6 @@ import com.sun.star.uno.XInterface;
import com.sun.star.uno.Type;
import com.sun.star.uno.AnyConverter;
import java.io.PrintWriter;
-import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
@@ -77,88 +76,65 @@ public class CachedDynamicResultSetFactory extends TestCase {
@Override
public TestEnvironment createTestEnvironment( TestParameters Param,
PrintWriter log )
- throws StatusException {
- XInterface oObj = null;
- Object oInterface = null;
+ throws Exception {
XMultiServiceFactory xMSF = Param.getMSF();
- try {
- oInterface = xMSF.createInstance
+ Object oInterface = xMSF.createInstance
( "com.sun.star.ucb.CachedDynamicResultSetFactory" );
-
- // adding one child container
- }
- catch( com.sun.star.uno.Exception e ) {
- log.println("Can't create an object." );
- throw new StatusException( "Can't create an object", e );
- }
-
- oObj = (XInterface) oInterface;
+ XInterface oObj = (XInterface) oInterface;
TestEnvironment tEnv = new TestEnvironment( oObj );
// creating relation for XCachedDynamicResultSetFactory
XDynamicResultSet resSetStub = null ;
- try {
- Object oUCB = xMSF.createInstanceWithArguments
- ("com.sun.star.ucb.UniversalContentBroker",
- new Object[0]) ;
-
- XContentIdentifierFactory ciFac = UnoRuntime.queryInterface(XContentIdentifierFactory.class, oUCB) ;
-
- String url = util.utils.getFullTestURL("SwXTextEmbeddedObject.sxw") ;
- String escUrl = "" ;
-
- // In base URL of a JAR file in content URL all directory
- // separators ('/') must be replaced with escape symbol '%2F'.
- int idx = url.indexOf("/") ;
- int lastIdx = -1 ;
- while (idx >= 0) {
- escUrl += url.substring(lastIdx + 1, idx) + "%2F" ;
- lastIdx = idx ;
- idx = url.indexOf("/", idx + 1) ;
- }
- escUrl += url.substring(lastIdx + 1) ;
- String cntUrl = "vnd.sun.star.pkg://" + escUrl + "/" ;
-
- XContentIdentifier CI = ciFac.createContentIdentifier(cntUrl) ;
-
- XContentProvider cntProv = UnoRuntime.queryInterface(XContentProvider.class, oUCB) ;
-
- XContent cnt = cntProv.queryContent(CI) ;
-
- XCommandProcessor cmdProc = UnoRuntime.queryInterface(XCommandProcessor.class, cnt) ;
-
- Property prop = new Property() ;
- prop.Name = "Title" ;
-
- Command cmd = new Command("open", -1, new OpenCommandArgument2
- (OpenMode.ALL, 10000, null, new Property[] {prop},
- new NumberedSortingInfo[0])) ;
-
- XDynamicResultSet dynResSet = null;
- try {
- dynResSet = (XDynamicResultSet)
- AnyConverter.toObject(new Type(XDynamicResultSet.class),
- cmdProc.execute(cmd, 0, null));
- } catch (com.sun.star.lang.IllegalArgumentException iae) {
- throw new StatusException("Couldn't convert Any ",iae);
- }
-
- Object oStubFactory = xMSF.createInstance
- ("com.sun.star.ucb.CachedDynamicResultSetStubFactory") ;
-
- XCachedDynamicResultSetStubFactory xStubFactory =
- UnoRuntime.queryInterface
- (XCachedDynamicResultSetStubFactory.class, oStubFactory) ;
-
- resSetStub =
- xStubFactory.createCachedDynamicResultSetStub(dynResSet) ;
-
- } catch (com.sun.star.uno.Exception e) {
- log.println("Can't create relation." );
- e.printStackTrace(log) ;
- throw new StatusException( "Can't create relation", e );
+ Object oUCB = xMSF.createInstanceWithArguments
+ ("com.sun.star.ucb.UniversalContentBroker",
+ new Object[0]) ;
+
+ XContentIdentifierFactory ciFac = UnoRuntime.queryInterface(XContentIdentifierFactory.class, oUCB) ;
+
+ String url = util.utils.getFullTestURL("SwXTextEmbeddedObject.sxw") ;
+ String escUrl = "" ;
+
+ // In base URL of a JAR file in content URL all directory
+ // separators ('/') must be replaced with escape symbol '%2F'.
+ int idx = url.indexOf("/") ;
+ int lastIdx = -1 ;
+ while (idx >= 0) {
+ escUrl += url.substring(lastIdx + 1, idx) + "%2F" ;
+ lastIdx = idx ;
+ idx = url.indexOf("/", idx + 1) ;
}
+ escUrl += url.substring(lastIdx + 1) ;
+ String cntUrl = "vnd.sun.star.pkg://" + escUrl + "/" ;
+
+ XContentIdentifier CI = ciFac.createContentIdentifier(cntUrl) ;
+
+ XContentProvider cntProv = UnoRuntime.queryInterface(XContentProvider.class, oUCB) ;
+
+ XContent cnt = cntProv.queryContent(CI) ;
+
+ XCommandProcessor cmdProc = UnoRuntime.queryInterface(XCommandProcessor.class, cnt) ;
+
+ Property prop = new Property() ;
+ prop.Name = "Title" ;
+
+ Command cmd = new Command("open", -1, new OpenCommandArgument2
+ (OpenMode.ALL, 10000, null, new Property[] {prop},
+ new NumberedSortingInfo[0])) ;
+
+ XDynamicResultSet dynResSet = (XDynamicResultSet)
+ AnyConverter.toObject(new Type(XDynamicResultSet.class),
+ cmdProc.execute(cmd, 0, null));
+
+ Object oStubFactory = xMSF.createInstance
+ ("com.sun.star.ucb.CachedDynamicResultSetStubFactory") ;
+
+ XCachedDynamicResultSetStubFactory xStubFactory =
+ UnoRuntime.queryInterface
+ (XCachedDynamicResultSetStubFactory.class, oStubFactory) ;
+
+ resSetStub =
+ xStubFactory.createCachedDynamicResultSetStub(dynResSet) ;
tEnv.addObjRelation("CachedDynamicResultSetStub", resSetStub) ;
diff --git a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java
index deec884..a0245b7 100644
--- a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java
+++ b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java
@@ -35,7 +35,6 @@ import com.sun.star.uno.XInterface;
import com.sun.star.uno.Type;
import com.sun.star.uno.AnyConverter;
import java.io.PrintWriter;
-import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
@@ -74,77 +73,55 @@ public class CachedDynamicResultSetStubFactory extends TestCase {
@Override
public TestEnvironment createTestEnvironment( TestParameters Param,
PrintWriter log )
- throws StatusException {
- XInterface oObj = null;
- Object oInterface = null;
+ throws Exception {
XMultiServiceFactory xMSF = Param.getMSF();
- try {
- oInterface = xMSF.createInstance
+ Object oInterface = xMSF.createInstance
( "com.sun.star.ucb.CachedDynamicResultSetStubFactory" );
-
- // adding one child container
- }
- catch( com.sun.star.uno.Exception e ) {
- log.println("Can't create an object." );
- throw new StatusException( "Can't create an object", e );
- }
-
- oObj = (XInterface) oInterface;
+ XInterface oObj = (XInterface) oInterface;
TestEnvironment tEnv = new TestEnvironment( oObj );
// creating relation for XCachedDynamicResultSetStubFactory
XDynamicResultSet dynResSet = null ;
- try {
- Object oUCB = xMSF.createInstanceWithArguments
- ("com.sun.star.ucb.UniversalContentBroker",
- new Object[0]) ;
-
- XContentIdentifierFactory ciFac = UnoRuntime.queryInterface(XContentIdentifierFactory.class, oUCB) ;
-
- String url = util.utils.getFullTestURL("SwXTextEmbeddedObject.sxw") ;
- String escUrl = "" ;
-
- // In base URL of a JAR file in content URL all directory
- // separators ('/') must be replaced with escape symbol '%2F'.
- int idx = url.indexOf("/") ;
- int lastIdx = -1 ;
- while (idx >= 0) {
- escUrl += url.substring(lastIdx + 1, idx) + "%2F" ;
- lastIdx = idx ;
- idx = url.indexOf("/", idx + 1) ;
- }
- escUrl += url.substring(lastIdx + 1) ;
- String cntUrl = "vnd.sun.star.pkg://" + escUrl + "/" ;
-
- XContentIdentifier CI = ciFac.createContentIdentifier(cntUrl) ;
-
- XContentProvider cntProv = UnoRuntime.queryInterface(XContentProvider.class, oUCB) ;
-
- XContent cnt = cntProv.queryContent(CI) ;
-
- XCommandProcessor cmdProc = UnoRuntime.queryInterface(XCommandProcessor.class, cnt) ;
-
- Property prop = new Property() ;
- prop.Name = "Title" ;
-
- Command cmd = new Command("open", -1, new OpenCommandArgument2
- (OpenMode.ALL, 10000, null, new Property[] {prop},
- new NumberedSortingInfo[0])) ;
-
- try {
- dynResSet = (XDynamicResultSet)
- AnyConverter.toObject(new Type(XDynamicResultSet.class),
- cmdProc.execute(cmd, 0, null));
- } catch (com.sun.star.lang.IllegalArgumentException iae) {
- throw new StatusException("Couldn't convert Any ",iae);
- }
-
- } catch (com.sun.star.uno.Exception e) {
- log.println("Can't create relation." );
- e.printStackTrace(log) ;
- throw new StatusException( "Can't create relation", e );
+ Object oUCB = xMSF.createInstanceWithArguments
+ ("com.sun.star.ucb.UniversalContentBroker",
+ new Object[0]) ;
+
+ XContentIdentifierFactory ciFac = UnoRuntime.queryInterface(XContentIdentifierFactory.class, oUCB) ;
+
+ String url = util.utils.getFullTestURL("SwXTextEmbeddedObject.sxw") ;
+ String escUrl = "" ;
+
+ // In base URL of a JAR file in content URL all directory
+ // separators ('/') must be replaced with escape symbol '%2F'.
+ int idx = url.indexOf("/") ;
+ int lastIdx = -1 ;
+ while (idx >= 0) {
+ escUrl += url.substring(lastIdx + 1, idx) + "%2F" ;
+ lastIdx = idx ;
+ idx = url.indexOf("/", idx + 1) ;
}
+ escUrl += url.substring(lastIdx + 1) ;
+ String cntUrl = "vnd.sun.star.pkg://" + escUrl + "/" ;
+
+ XContentIdentifier CI = ciFac.createContentIdentifier(cntUrl) ;
+
+ XContentProvider cntProv = UnoRuntime.queryInterface(XContentProvider.class, oUCB) ;
+
+ XContent cnt = cntProv.queryContent(CI) ;
+
+ XCommandProcessor cmdProc = UnoRuntime.queryInterface(XCommandProcessor.class, cnt) ;
+
+ Property prop = new Property() ;
+ prop.Name = "Title" ;
+
+ Command cmd = new Command("open", -1, new OpenCommandArgument2
+ (OpenMode.ALL, 10000, null, new Property[] {prop},
+ new NumberedSortingInfo[0])) ;
+
+ dynResSet = (XDynamicResultSet)
+ AnyConverter.toObject(new Type(XDynamicResultSet.class),
+ cmdProc.execute(cmd, 0, null));
tEnv.addObjRelation("DynamicResultSet", dynResSet) ;
diff --git a/qadevOOo/tests/java/mod/_cmdmail/SimpleCommandMail.java b/qadevOOo/tests/java/mod/_cmdmail/SimpleCommandMail.java
index 5988517..0465576 100644
--- a/qadevOOo/tests/java/mod/_cmdmail/SimpleCommandMail.java
+++ b/qadevOOo/tests/java/mod/_cmdmail/SimpleCommandMail.java
@@ -20,7 +20,6 @@ package mod._cmdmail;
import java.io.PrintWriter;
-import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
@@ -33,23 +32,13 @@ public class SimpleCommandMail extends TestCase {
@Override
public TestEnvironment createTestEnvironment( TestParameters Param,
PrintWriter log )
- throws StatusException {
- XInterface oObj = null;
- Object oInterface = null;
-
- try {
- XMultiServiceFactory xMSF = Param.getMSF();
- oInterface = xMSF.createInstance
+ throws Exception {
+ XMultiServiceFactory xMSF = Param.getMSF();
+ Object oInterface = xMSF.createInstance
( "com.sun.star.comp.system.SimpleCommandMail" );
- if (oInterface == null) log.println("!!! NULL !!!") ;
- }
- catch( com.sun.star.uno.Exception e ) {
- log.println("Can't create an object." );
- throw new StatusException( "Can't create an object", e );
- }
-
- oObj = (XInterface) oInterface;
+ if (oInterface == null) log.println("!!! NULL !!!") ;
+ XInterface oObj = (XInterface) oInterface;
log.println("ImplementationName: "+util.utils.getImplName(oObj));
diff --git a/qadevOOo/tests/java/mod/_cnt/ChaosContentProvider.java b/qadevOOo/tests/java/mod/_cnt/ChaosContentProvider.java
index b2f60ed..3d83380 100644
--- a/qadevOOo/tests/java/mod/_cnt/ChaosContentProvider.java
+++ b/qadevOOo/tests/java/mod/_cnt/ChaosContentProvider.java
@@ -20,7 +20,6 @@ package mod._cnt;
import java.io.PrintWriter;
-import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
@@ -66,24 +65,13 @@ public class ChaosContentProvider extends TestCase {
@Override
public TestEnvironment createTestEnvironment( TestParameters Param,
PrintWriter log )
- throws StatusException {
- XInterface oObj = null;
- Object oInterface = null;
+ throws Exception {
XMultiServiceFactory xMSF = Param.getMSF();
- Object cntFactory = null ;
-
- try {
- oInterface = xMSF.createInstance
+ Object oInterface = xMSF.createInstance
( "com.sun.star.ucb.ChaosContentProvider" );
- cntFactory = xMSF.createInstance
+ Object cntFactory = xMSF.createInstance
( "com.sun.star.comp.ucb.UniversalContentBroker" );
- }
- catch( com.sun.star.uno.Exception e ) {
- log.println("Can't create an object." );
- throw new StatusException( "Can't create an object", e );
- }
-
- oObj = (XInterface) oInterface;
+ XInterface oObj = (XInterface) oInterface;
TestEnvironment tEnv = new TestEnvironment( oObj );
diff --git a/qadevOOo/tests/java/mod/_cnt/CntUnoDataContainer.java b/qadevOOo/tests/java/mod/_cnt/CntUnoDataContainer.java
index ee7aebf..8fc8cd0 100644
--- a/qadevOOo/tests/java/mod/_cnt/CntUnoDataContainer.java
+++ b/qadevOOo/tests/java/mod/_cnt/CntUnoDataContainer.java
@@ -20,7 +20,6 @@ package mod._cnt;
import java.io.PrintWriter;
-import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
@@ -79,37 +78,27 @@ public class CntUnoDataContainer extends TestCase {
*/
@Override
protected TestEnvironment createTestEnvironment(
- TestParameters Param, PrintWriter log) {
- XInterface oObj = null;
- Object oInterface = null;
+ TestParameters Param, PrintWriter log) throws Exception {
XMultiServiceFactory xMSF = Param.getMSF();
- Object relationContainer = null ;
- Object xIn = null;
- try {
- oInterface = xMSF.createInstance
- ( "com.sun.star.ucb.DataContainer" );
+ Object oInterface = xMSF.createInstance
+ ( "com.sun.star.ucb.DataContainer" );
- // adding one child container
- XIndexContainer xIC = UnoRuntime.queryInterface
- (XIndexContainer.class, oInterface) ;
+ // adding one child container
+ XIndexContainer xIC = UnoRuntime.queryInterface
+ (XIndexContainer.class, oInterface) ;
- Object child = xMSF.createInstance
- ( "com.sun.star.ucb.DataContainer" );
- xIC.insertByIndex(0, child) ;
+ Object child = xMSF.createInstance
+ ( "com.sun.star.ucb.DataContainer" );
+ xIC.insertByIndex(0, child) ;
- relationContainer = xMSF.createInstance
- ( "com.sun.star.ucb.DataContainer" );
+ Object relationContainer = xMSF.createInstance
+ ( "com.sun.star.ucb.DataContainer" );
- xIn = xMSF.createInstance
- ( "com.sun.star.io.DataInputStream" );
- }
- catch( com.sun.star.uno.Exception e ) {
- log.println("Can't create an object." );
- throw new StatusException( "Can't create an object", e );
- }
+ Object xIn = xMSF.createInstance
+ ( "com.sun.star.io.DataInputStream" );
- oObj = (XInterface) oInterface;
+ XInterface oObj = (XInterface) oInterface;
TestEnvironment tEnv = new TestEnvironment( oObj );
diff --git a/qadevOOo/tests/java/mod/_cnt/PropertyMatcherFactory.java b/qadevOOo/tests/java/mod/_cnt/PropertyMatcherFactory.java
index 61ada8c..93807fe 100644
--- a/qadevOOo/tests/java/mod/_cnt/PropertyMatcherFactory.java
+++ b/qadevOOo/tests/java/mod/_cnt/PropertyMatcherFactory.java
@@ -20,7 +20,6 @@ package mod._cnt;
import java.io.PrintWriter;
-import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
@@ -51,23 +50,11 @@ public class PropertyMatcherFactory extends TestCase {
@Override
public TestEnvironment createTestEnvironment( TestParameters Param,
PrintWriter log )
- throws StatusException {
- XInterface oObj = null;
- Object oInterface = null;
+ throws Exception {
XMultiServiceFactory xMSF = Param.getMSF();
-
-
- try {
- oInterface = xMSF.createInstance
- ( "com.sun.star.ucb.PropertyMatcherFactory" );
-
- }
- catch( com.sun.star.uno.Exception e ) {
- log.println("Can't create an object." );
- throw new StatusException( "Can't create an object", e );
- }
-
- oObj = (XInterface) oInterface;
+ Object oInterface = xMSF.createInstance
+ ( "com.sun.star.ucb.PropertyMatcherFactory" );
+ XInterface oObj = (XInterface) oInterface;
TestEnvironment tEnv = new TestEnvironment( oObj );
diff --git a/qadevOOo/tests/java/mod/_configmgr/ConfigurationProvider.java b/qadevOOo/tests/java/mod/_configmgr/ConfigurationProvider.java
index df544e3..dc11480 100644
--- a/qadevOOo/tests/java/mod/_configmgr/ConfigurationProvider.java
+++ b/qadevOOo/tests/java/mod/_configmgr/ConfigurationProvider.java
@@ -29,20 +29,16 @@ public final class ConfigurationProvider extends TestCase {
@Override
protected TestEnvironment createTestEnvironment(
- TestParameters tParam, PrintWriter log)
+ TestParameters tParam, PrintWriter log) throws Exception
{
// Create a non-default ConfigurationProvider instance, so that testing
// its XComponent.dispose does not accidentally dispose the
// DefaultProvider:
XComponentContext ctxt = tParam.getComponentContext();
- try {
return ProviderTestEnvironment.create(
ctxt.getServiceManager().createInstanceWithArgumentsAndContext(
"com.sun.star.configuration.ConfigurationProvider",
new Object[] { new NamedValue("Locale", "*") },
ctxt));
- } catch (com.sun.star.uno.Exception e) {
- throw new RuntimeException(e);
- }
}
}
diff --git a/qadevOOo/tests/java/mod/_configmgr/DefaultProvider.java b/qadevOOo/tests/java/mod/_configmgr/DefaultProvider.java
index fb181d9..2a11a9b 100644
--- a/qadevOOo/tests/java/mod/_configmgr/DefaultProvider.java
+++ b/qadevOOo/tests/java/mod/_configmgr/DefaultProvider.java
@@ -32,13 +32,9 @@ public final class DefaultProvider extends TestCase {
protected TestEnvironment createTestEnvironment(
TestParameters tParam, PrintWriter log)
{
- try {
- return ProviderTestEnvironment.create(
- AnyConverter.toObject(
- XInterface.class,
- theDefaultProvider.get(tParam.getComponentContext())));
- } catch (com.sun.star.lang.IllegalArgumentException e) {
- throw new RuntimeException(e);
- }
+ return ProviderTestEnvironment.create(
+ AnyConverter.toObject(
+ XInterface.class,
+ theDefaultProvider.get(tParam.getComponentContext())));
}
}
diff --git a/qadevOOo/tests/java/mod/_connector/uno/Connector.java b/qadevOOo/tests/java/mod/_connector/uno/Connector.java
index d6a9d43..16ea749 100644
--- a/qadevOOo/tests/java/mod/_connector/uno/Connector.java
+++ b/qadevOOo/tests/java/mod/_connector/uno/Connector.java
@@ -20,7 +20,6 @@ package mod._connector.uno;
import com.sun.star.uno.XInterface;
import java.io.PrintWriter;
-import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
@@ -71,22 +70,13 @@ public class Connector extends TestCase {
* Just creates service <code>com.sun.star.connection.Connector</code>
*/
@Override
- protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) {
+ protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception {
- XInterface oObj = null ;
+ XInterface connector = (XInterface)
+ Param.getMSF().createInstance
+ ("com.sun.star.connection.Connector") ;
- try {
- XInterface connector = (XInterface)
- Param.getMSF().createInstance
- ("com.sun.star.connection.Connector") ;
-
- oObj = connector ;
- } catch (com.sun.star.uno.Exception e) {
- e.printStackTrace(log);
- throw new StatusException("Can't create object environment", e);
- }
-
- TestEnvironment tEnv = new TestEnvironment(oObj) ;
+ TestEnvironment tEnv = new TestEnvironment(connector) ;
// select the port
curPort = utils.getNextFreePort(basePort);
diff --git a/qadevOOo/tests/java/mod/_connectr/Connector.java b/qadevOOo/tests/java/mod/_connectr/Connector.java
index 4b02ff1..65fce09 100644
--- a/qadevOOo/tests/java/mod/_connectr/Connector.java
+++ b/qadevOOo/tests/java/mod/_connectr/Connector.java
@@ -20,7 +20,6 @@ package mod._connectr;
import java.io.PrintWriter;
-import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
@@ -74,22 +73,12 @@ public class Connector extends TestCase {
*/
@Override
public synchronized TestEnvironment createTestEnvironment(
- TestParameters Param, PrintWriter log) throws StatusException {
+ TestParameters Param, PrintWriter log) throws Exception {
+ XInterface connector = (XInterface)
+ Param.getMSF().createInstance
+ ("com.sun.star.connection.Connector") ;
- XInterface oObj = null ;
-
- try {
- XInterface connector = (XInterface)
- Param.getMSF().createInstance
- ("com.sun.star.connection.Connector") ;
-
- oObj = connector ;
- } catch (com.sun.star.uno.Exception e) {
- e.printStackTrace(log);
- throw new StatusException("Can't create object environment", e);
- }
-
- TestEnvironment tEnv = new TestEnvironment(oObj) ;
+ TestEnvironment tEnv = new TestEnvironment(connector) ;
// select the port
curPort = utils.getNextFreePort(basePort);
diff --git a/qadevOOo/tests/java/mod/_corefl/CoreReflection.java b/qadevOOo/tests/java/mod/_corefl/CoreReflection.java
index 7513554..4363f2f 100644
--- a/qadevOOo/tests/java/mod/_corefl/CoreReflection.java
+++ b/qadevOOo/tests/java/mod/_corefl/CoreReflection.java
@@ -20,7 +20,6 @@ package mod._corefl;
import java.io.PrintWriter;
-import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
@@ -54,21 +53,11 @@ public class CoreReflection extends TestCase {
*/
@Override
public TestEnvironment createTestEnvironment(
- TestParameters Param, PrintWriter log) throws StatusException {
- XInterface oObj = null;
- Object oInterface = null;
-
- try {
- XMultiServiceFactory xMSF = Param.getMSF();
- oInterface = xMSF.createInstance
+ TestParameters Param, PrintWriter log) throws Exception {
+ XMultiServiceFactory xMSF = Param.getMSF();
+ Object oInterface = xMSF.createInstance
("com.sun.star.reflection.CoreReflection");
- }
- catch(com.sun.star.uno.Exception e) {
- e.printStackTrace(log);
- log.println("CoreReflection Service not available" );
- }
-
- oObj = (XInterface) oInterface;
+ XInterface oObj = (XInterface) oInterface;
log.println( " creating a new environment for CoreReflection object" );
TestEnvironment tEnv = new TestEnvironment( oObj );
diff --git a/qadevOOo/tests/java/mod/_corereflection/uno/CoreReflection.java b/qadevOOo/tests/java/mod/_corereflection/uno/CoreReflection.java
index 39ea97b..029ae30 100644
--- a/qadevOOo/tests/java/mod/_corereflection/uno/CoreReflection.java
+++ b/qadevOOo/tests/java/mod/_corereflection/uno/CoreReflection.java
@@ -50,21 +50,12 @@ public class CoreReflection extends TestCase {
* Creates <code>com.sun.star.reflection.CoreReflection</code> service.
*/
@Override
- protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) {
- XInterface oObj = null;
- Object oInterface = null;
+ protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception {
- try {
- XMultiServiceFactory xMSF = Param.getMSF();
- oInterface = xMSF.createInstance
- ("com.sun.star.reflection.CoreReflection");
- }
- catch(com.sun.star.uno.Exception e) {
- e.printStackTrace(log);
- log.println("CoreReflection Service not available" );
- }
-
- oObj = (XInterface) oInterface;
+ XMultiServiceFactory xMSF = Param.getMSF();
+ Object oInterface = xMSF.createInstance
+ ("com.sun.star.reflection.CoreReflection");
+ XInterface oObj = (XInterface) oInterface;
log.println( " creating a new environment for CoreReflection object" );
TestEnvironment tEnv = new TestEnvironment( oObj );
diff --git a/qadevOOo/tests/java/mod/_cpld/DLLComponentLoader.java b/qadevOOo/tests/java/mod/_cpld/DLLComponentLoader.java
index 9b16c42..035068a 100644
--- a/qadevOOo/tests/java/mod/_cpld/DLLComponentLoader.java
+++ b/qadevOOo/tests/java/mod/_cpld/DLLComponentLoader.java
@@ -66,20 +66,12 @@ public class DLLComponentLoader extends TestCase {
*/
@Override
protected TestEnvironment createTestEnvironment
- (TestParameters Param, PrintWriter log) {
- XInterface oObj = null;
- Object oInterface = null;
+ (TestParameters Param, PrintWriter log) throws Exception {
- try {
- XMultiServiceFactory xMSF = Param.getMSF();
- oInterface = xMSF.createInstance
- ( "com.sun.star.comp.stoc.DLLComponentLoader" );
- }
- catch( Exception e ) {
- log.println("DLLComponentLoader Service not available" );
- }
-
- oObj = (XInterface) oInterface;
+ XMultiServiceFactory xMSF = Param.getMSF();
+ Object oInterface = xMSF.createInstance
+ ( "com.sun.star.comp.stoc.DLLComponentLoader" );
+ XInterface oObj = (XInterface) oInterface;
log.println( " creating a new environment for DLLComponentLoader object" );
TestEnvironment tEnv = new TestEnvironment( oObj );
diff --git a/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java
index bfffdfd..2025e9b 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java
@@ -94,7 +94,7 @@ public class ConnectionLineAccessibility extends TestCase
*/
@Override
protected TestEnvironment createTestEnvironment(TestParameters Param,
- PrintWriter log)
+ PrintWriter log) throws Exception
{
XInterface oObj = null;
@@ -102,21 +102,10 @@ public class ConnectionLineAccessibility extends TestCase
Object newQuery = null;
XStorable store = null;
- try
- {
- Param.getMSF()
- .createInstance("com.sun.star.sdb.DatabaseContext");
- oDBSource = Param.getMSF()
- .createInstance("com.sun.star.sdb.DataSource");
- newQuery = Param.getMSF()
- .createInstance("com.sun.star.sdb.QueryDefinition");
- Param.getMSF()
- .createInstance("com.sun.star.awt.Toolkit");
- }
- catch (com.sun.star.uno.Exception e)
- {
- throw new StatusException(e, Status.failed("Couldn't create instance"));
- }
+ Param.getMSF().createInstance("com.sun.star.sdb.DatabaseContext");
+ oDBSource = Param.getMSF().createInstance("com.sun.star.sdb.DataSource");
+ newQuery = Param.getMSF().createInstance("com.sun.star.sdb.QueryDefinition");
+ Param.getMSF().createInstance("com.sun.star.awt.Toolkit");
String mysqlURL = (String) Param.get("mysql.url");
@@ -146,49 +135,19 @@ public class ConnectionLineAccessibility extends TestCase
XPropertySet propSetDBSource = UnoRuntime.queryInterface(
XPropertySet.class, oDBSource);
- try
- {
- propSetDBSource.setPropertyValue("URL", mysqlURL);
- propSetDBSource.setPropertyValue("Info", info);
- }
- catch (com.sun.star.lang.WrappedTargetException e)
- {
- throw new StatusException(e, Status.failed(
- "Couldn't set property value"));
- }
- catch (com.sun.star.lang.IllegalArgumentException e)
- {
- throw new StatusException(e, Status.failed(
- "Couldn't set property value"));
- }
- catch (com.sun.star.beans.PropertyVetoException e)
- {
- throw new StatusException(e, Status.failed(
- "Couldn't set property value"));
- }
- catch (com.sun.star.beans.UnknownPropertyException e)
- {
- throw new StatusException(e, Status.failed(
- "Couldn't set property value"));
- }
+ propSetDBSource.setPropertyValue("URL", mysqlURL);
+ propSetDBSource.setPropertyValue("Info", info);
- try
- {
- log.println("writing database file ...");
- XDocumentDataSource xDDS = UnoRuntime.queryInterface(XDocumentDataSource.class, oDBSource);
- store = UnoRuntime.queryInterface(XStorable.class,
- xDDS.getDatabaseDocument());
-
- aFile = utils.getOfficeTemp(Param.getMSF())+"ConnectionLine.odb";
- log.println("... filename will be "+aFile);
- store.storeAsURL(aFile,new PropertyValue[]
- {});
- log.println("... done");
- }
- catch (com.sun.star.uno.Exception e)
- {
- throw new StatusException(e, Status.failed("Couldn't register object"));
- }
+ log.println("writing database file ...");
+ XDocumentDataSource xDDS = UnoRuntime.queryInterface(XDocumentDataSource.class, oDBSource);
+ store = UnoRuntime.queryInterface(XStorable.class,
+ xDDS.getDatabaseDocument());
+
+ aFile = utils.getOfficeTemp(Param.getMSF())+"ConnectionLine.odb";
+ log.println("... filename will be "+aFile);
+ store.storeAsURL(aFile,new PropertyValue[]
+ {});
+ log.println("... done");
isolConnection = UnoRuntime.queryInterface(
XIsolatedConnection.class,
@@ -215,8 +174,6 @@ public class ConnectionLineAccessibility extends TestCase
}
catch (com.sun.star.sdbc.SQLException e)
{
- try
- {
util.utils.pause(1500);
connection = isolConnection.getIsolatedConnection(user,
password);
@@ -227,11 +184,6 @@ public class ConnectionLineAccessibility extends TestCase
col_name1 + " int)");
statement.executeUpdate("create table " + tbl_name2 + " (" +
col_name2 + " int)");
- }
- catch (com.sun.star.sdbc.SQLException e2)
- {
- throw new StatusException(e2, Status.failed("SQLException"));
- }
}
XQueryDefinitionsSupplier querySuppl = UnoRuntime.queryInterface(
@@ -243,65 +195,19 @@ public class ConnectionLineAccessibility extends TestCase
XPropertySet queryProp = UnoRuntime.queryInterface(
XPropertySet.class, newQuery);
- try
- {
- final String query = "select * from " + tbl_name1 + ", " +
- tbl_name2 + " where " + tbl_name1 + "." +
- col_name1 + "=" + tbl_name2 + "." +
- col_name2;
- queryProp.setPropertyValue("Command", query);
- }
- catch (com.sun.star.lang.WrappedTargetException e)
- {
- throw new StatusException(e, Status.failed(
- "Couldn't set property value"));
- }
- catch (com.sun.star.lang.IllegalArgumentException e)
- {
- throw new StatusException(e, Status.failed(
- "Couldn't set property value"));
- }
- catch (com.sun.star.beans.PropertyVetoException e)
- {
- throw new StatusException(e, Status.failed(
- "Couldn't set property value"));
- }
- catch (com.sun.star.beans.UnknownPropertyException e)
- {
- throw new StatusException(e, Status.failed(
- "Couldn't set property value"));
- }
+ final String query = "select * from " + tbl_name1 + ", " +
+ tbl_name2 + " where " + tbl_name1 + "." +
+ col_name1 + "=" + tbl_name2 + "." +
+ col_name2;
+ queryProp.setPropertyValue("Command", query);
XNameContainer queryContainer = UnoRuntime.queryInterface(
XNameContainer.class,
defContainer);
- try
- {
- queryContainer.insertByName("Query1", newQuery);
- store.store();
- connection.close();
- }
- catch (com.sun.star.lang.WrappedTargetException e)
- {
- throw new StatusException(e, Status.failed("Couldn't insert query"));
- }
- catch (com.sun.star.container.ElementExistException e)
- {
- throw new StatusException(e, Status.failed("Couldn't insert query"));
- }
- catch (com.sun.star.lang.IllegalArgumentException e)
- {
- throw new StatusException(e, Status.failed("Couldn't insert query"));
- }
- catch (com.sun.star.io.IOException e)
- {
- throw new StatusException(e, Status.failed("Couldn't insert query"));
- }
- catch (com.sun.star.sdbc.SQLException e)
- {
- throw new StatusException(e, Status.failed("Couldn't insert query"));
- }
+ queryContainer.insertByName("Query1", newQuery);
+ store.store();
+ connection.close();
PropertyValue[] loadProps = new PropertyValue[3];
loadProps[0] = new PropertyValue();
diff --git a/qadevOOo/tests/java/mod/_dbaccess/DBContentLoader.java b/qadevOOo/tests/java/mod/_dbaccess/DBContentLoader.java
index 924270d..b373897 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/DBContentLoader.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/DBContentLoader.java
@@ -20,8 +20,6 @@ package mod._dbaccess;
import java.io.PrintWriter;
-import lib.Status;
-import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
@@ -64,35 +62,18 @@ public class DBContentLoader extends TestCase {
@Override
public TestEnvironment createTestEnvironment( TestParameters Param,
PrintWriter log )
- throws StatusException {
- XInterface oObj = null;
- Object oInterface = null ;
+ throws Exception {
- //now get the OButtonControl
- try {
- oInterface = Param.getMSF().createInstance
- ("com.sun.star.sdb.ContentLoader") ;
- } catch (com.sun.star.uno.Exception e) {
- log.println("Couldn't get service");
- e.printStackTrace(log);
- throw new StatusException("Couldn't get GridControl", e );
- }
-
- if (oInterface == null) {
- log.println("Service wasn't created") ;
- throw new StatusException(Status.failed("Service wasn't created")) ;
- }
-
- oObj = (XInterface) oInterface ;
+ Object oInterface = Param.getMSF().createInstance
+ ("com.sun.star.sdb.ContentLoader");
+ XInterface oObj = (XInterface) oInterface ;
log.println("ImplementationName " + util.utils.getImplName(oObj));
log.println( "creating a new environment for object" );
TestEnvironment tEnv = new TestEnvironment( oObj );
// adding relation for XFrameLoader
- tEnv.addObjRelation("FrameLoader.URL",
- ".component:DB/DataSourceBrowser") ;
-
+ tEnv.addObjRelation("FrameLoader.URL", ".component:DB/DataSourceBrowser") ;
return tEnv;
} // finish method getTestEnvironment
diff --git a/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java
index 4d94423..aef85b4 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java
@@ -93,7 +93,7 @@ public class JoinViewAccessibility extends TestCase {
*/
@Override
protected TestEnvironment createTestEnvironment (TestParameters Param,
- PrintWriter log)
+ PrintWriter log) throws Exception
{
XInterface oObj = null;
@@ -101,20 +101,12 @@ public class JoinViewAccessibility extends TestCase {
Object newQuery = null;
XStorable store = null;
- try
- {
- Param.getMSF ()
- .createInstance ("com.sun.star.sdb.DatabaseContext");
- oDBSource = Param.getMSF ()
- .createInstance ("com.sun.star.sdb.DataSource");
- newQuery = Param.getMSF ()
- .createInstance ("com.sun.star.sdb.QueryDefinition");
- Param.getMSF ()
- .createInstance ("com.sun.star.awt.Toolkit");
- } catch (com.sun.star.uno.Exception e)
- {
- throw new StatusException(e, Status.failed ("Couldn't create instance"));
- }
+ Param.getMSF().createInstance("com.sun.star.sdb.DatabaseContext");
+ oDBSource = Param.getMSF()
+ .createInstance("com.sun.star.sdb.DataSource");
+ newQuery = Param.getMSF().createInstance(
+ "com.sun.star.sdb.QueryDefinition");
+ Param.getMSF().createInstance("com.sun.star.awt.Toolkit");
String mysqlURL = (String) Param.get ("mysql.url");
@@ -144,39 +136,18 @@ public class JoinViewAccessibility extends TestCase {
XPropertySet propSetDBSource = UnoRuntime.queryInterface (
XPropertySet.class, oDBSource);
- try
- {
- propSetDBSource.setPropertyValue ("URL", mysqlURL);
- propSetDBSource.setPropertyValue ("Info", info);
- } catch (com.sun.star.lang.WrappedTargetException e)
- {
- throw new StatusException(e, Status.failed("Couldn't set property value"));
- } catch (com.sun.star.lang.IllegalArgumentException e)
- {
- throw new StatusException(e, Status.failed("Couldn't set property value"));
- } catch (com.sun.star.beans.PropertyVetoException e)
- {
- throw new StatusException(e, Status.failed("Couldn't set property value"));
- } catch (com.sun.star.beans.UnknownPropertyException e)
- {
- throw new StatusException(e, Status.failed("Couldn't set property value"));
- }
+ propSetDBSource.setPropertyValue ("URL", mysqlURL);
+ propSetDBSource.setPropertyValue ("Info", info);
- try
- {
- log.println ("writing database file ...");
- XDocumentDataSource xDDS = UnoRuntime.queryInterface(XDocumentDataSource.class, oDBSource);
- store = UnoRuntime.queryInterface(XStorable.class,
- xDDS.getDatabaseDocument());
- aFile = utils.getOfficeTemp (Param.getMSF ())+"JoinView.odb";
- log.println ("... filename will be "+aFile);
- store.storeAsURL (aFile,new PropertyValue[]
- {});
- log.println ("... done");
- } catch (com.sun.star.uno.Exception e)
- {
- throw new StatusException(e, Status.failed ("Couldn't register object"));
- }
+ log.println ("writing database file ...");
+ XDocumentDataSource xDDS = UnoRuntime.queryInterface(XDocumentDataSource.class, oDBSource);
+ store = UnoRuntime.queryInterface(XStorable.class,
+ xDDS.getDatabaseDocument());
+ aFile = utils.getOfficeTemp (Param.getMSF ())+"JoinView.odb";
+ log.println ("... filename will be "+aFile);
+ store.storeAsURL (aFile,new PropertyValue[]
+ {});
+ log.println ("... done");
isolConnection = UnoRuntime.queryInterface (
XIsolatedConnection.class,
@@ -202,22 +173,16 @@ public class JoinViewAccessibility extends TestCase {
col_name2 + " int)");
} catch (com.sun.star.sdbc.SQLException e)
{
- try
- {
- util.utils.pause(1500);
- connection = isolConnection.getIsolatedConnection (user,
- password);
- statement = connection.createStatement ();
- statement.executeUpdate ("drop table if exists " + tbl_name1);
- statement.executeUpdate ("drop table if exists " + tbl_name2);
- statement.executeUpdate ("create table " + tbl_name1 + " (" +
- col_name1 + " int)");
- statement.executeUpdate ("create table " + tbl_name2 + " (" +
- col_name2 + " int)");
- } catch (com.sun.star.sdbc.SQLException e2)
- {
- throw new StatusException(e, Status.failed ("SQLException"));
- }
+ util.utils.pause(1500);
+ connection = isolConnection.getIsolatedConnection (user,
+ password);
+ statement = connection.createStatement ();
+ statement.executeUpdate ("drop table if exists " + tbl_name1);
+ statement.executeUpdate ("drop table if exists " + tbl_name2);
+ statement.executeUpdate ("create table " + tbl_name1 + " (" +
+ col_name1 + " int)");
+ statement.executeUpdate ("create table " + tbl_name2 + " (" +
+ col_name2 + " int)");
}
XQueryDefinitionsSupplier querySuppl = UnoRuntime.queryInterface (
@@ -229,52 +194,19 @@ public class JoinViewAccessibility extends TestCase {
XPropertySet queryProp = UnoRuntime.queryInterface (
XPropertySet.class, newQuery);
- try
- {
- final String query = "select * from " + tbl_name1 + ", " +
- tbl_name2 + " where " + tbl_name1 + "." +
- col_name1 + "=" + tbl_name2 + "." +
- col_name2;
- queryProp.setPropertyValue ("Command", query);
- } catch (com.sun.star.lang.WrappedTargetException e)
- {
- throw new StatusException(e, Status.failed("Couldn't set property value"));
- } catch (com.sun.star.lang.IllegalArgumentException e)
- {
- throw new StatusException(e, Status.failed("Couldn't set property value"));
- } catch (com.sun.star.beans.PropertyVetoException e)
- {
- throw new StatusException(e, Status.failed("Couldn't set property value"));
- } catch (com.sun.star.beans.UnknownPropertyException e)
- {
- throw new StatusException(e, Status.failed("Couldn't set property value"));
- }
+ final String query = "select * from " + tbl_name1 + ", " +
+ tbl_name2 + " where " + tbl_name1 + "." +
+ col_name1 + "=" + tbl_name2 + "." +
+ col_name2;
+ queryProp.setPropertyValue ("Command", query);
XNameContainer queryContainer = UnoRuntime.queryInterface (
XNameContainer.class,
defContainer);
- try
- {
- queryContainer.insertByName ("Query1", newQuery);
- store.store ();
- connection.close ();
- } catch (com.sun.star.lang.WrappedTargetException e)
- {
- throw new StatusException(e, Status.failed ("Couldn't insert query"));
- } catch (com.sun.star.container.ElementExistException e)
- {
- throw new StatusException(e, Status.failed ("Couldn't insert query"));
- } catch (com.sun.star.lang.IllegalArgumentException e)
- {
- throw new StatusException(e, Status.failed ("Couldn't insert query"));
- } catch (com.sun.star.io.IOException e)
- {
- throw new StatusException(e, Status.failed ("Couldn't insert query"));
- } catch (com.sun.star.sdbc.SQLException e)
- {
- throw new StatusException(e, Status.failed ("Couldn't insert query"));
- }
+ queryContainer.insertByName ("Query1", newQuery);
+ store.store ();
+ connection.close ();
PropertyValue[] loadProps = new PropertyValue[3];
loadProps[0] = new PropertyValue ();
diff --git a/qadevOOo/tests/java/mod/_dbaccess/OCommandDefinition.java b/qadevOOo/tests/java/mod/_dbaccess/OCommandDefinition.java
index 537e817..895df26 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/OCommandDefinition.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/OCommandDefinition.java
@@ -20,8 +20,6 @@ package mod._dbaccess;
import java.io.PrintWriter;
-import lib.Status;
-import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
@@ -53,26 +51,10 @@ public class OCommandDefinition extends TestCase {
@Override
public TestEnvironment createTestEnvironment( TestParameters Param,
PrintWriter log )
- throws StatusException {
- XInterface oObj = null;
- Object oInterface = null;
- XMultiServiceFactory xMSF = null ;
-
- try {
- xMSF = Param.getMSF();
- oInterface = xMSF.createInstance( "com.sun.star.sdb.QueryDefinition" );
- }
- catch( com.sun.star.uno.Exception e ) {
- log.println("Service not available" );
- throw new StatusException("Service not available", e) ;
- }
-
- if (oInterface == null) {
- log.println("Service wasn't created") ;
- throw new StatusException(Status.failed("Service wasn't created")) ;
- }
-
- oObj = (XInterface) oInterface;
+ throws Exception {
+ XMultiServiceFactory xMSF = Param.getMSF();
+ Object oInterface = xMSF.createInstance( "com.sun.star.sdb.QueryDefinition" );
+ XInterface oObj = (XInterface) oInterface;
log.println( " creating a new environment for object" );
TestEnvironment tEnv = new TestEnvironment( oObj );
diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatabaseContext.java b/qadevOOo/tests/java/mod/_dbaccess/ODatabaseContext.java
index 163ce0e..ab5d55e 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/ODatabaseContext.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/ODatabaseContext.java
@@ -21,8 +21,6 @@ package mod._dbaccess;
import com.sun.star.beans.PropertyValue;
import java.io.PrintWriter;
-import lib.Status;
-import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
@@ -80,59 +78,35 @@ public class ODatabaseContext extends TestCase {
* </ul>
*/
@Override
- protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) {
- XInterface oObj = null;
- Object oInterface = null;
- XMultiServiceFactory xMSF = null ;
-
- try {
- xMSF = Param.getMSF();
- oInterface = xMSF.createInstance( "com.sun.star.sdb.DatabaseContext" );
- }
- catch( com.sun.star.uno.Exception e ) {
- log.println("Service not available" );
- throw new StatusException("Service not available", e) ;
- }
-
- if (oInterface == null) {
- log.println("Service wasn't created") ;
- throw new StatusException(Status.failed("Service wasn't created")) ;
- }
-
- oObj = (XInterface) oInterface;
+ protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception {
+ XMultiServiceFactory xMSF = Param.getMSF();
+ Object oInterface = xMSF.createInstance( "com.sun.star.sdb.DatabaseContext" );
+ XInterface oObj = (XInterface) oInterface;
log.println( " creating a new environment for object" );
TestEnvironment tEnv = new TestEnvironment( oObj );
// adding obj relation for XNamingService
- try {
- xMSF = Param.getMSF();
- oInterface = xMSF.createInstance( "com.sun.star.sdb.DataSource" );
+ oInterface = xMSF.createInstance( "com.sun.star.sdb.DataSource" );
- XPropertySet xDSProps = UnoRuntime.queryInterface(XPropertySet.class, oInterface) ;
+ XPropertySet xDSProps = UnoRuntime.queryInterface(XPropertySet.class, oInterface) ;
- xDSProps.setPropertyValue("URL", "sdbc:dbase:file:///.") ;
+ xDSProps.setPropertyValue("URL", "sdbc:dbase:file:///.") ;
- XDocumentDataSource xDDS = UnoRuntime.queryInterface(XDocumentDataSource.class, oInterface);
- XStorable store = UnoRuntime.queryInterface(XStorable.class,
- xDDS.getDatabaseDocument ());
- String aFile = utils.getOfficeTemp (Param.getMSF ())+"DatabaseContext.odb";
- log.println("store to '" + aFile + "'");
- store.storeAsURL(aFile,new PropertyValue[]{});
+ XDocumentDataSource xDDS = UnoRuntime.queryInterface(XDocumentDataSource.class, oInterface);
+ XStorable store = UnoRuntime.queryInterface(XStorable.class,
+ xDDS.getDatabaseDocument ());
+ String aFile = utils.getOfficeTemp (Param.getMSF ())+"DatabaseContext.odb";
+ log.println("store to '" + aFile + "'");
+ store.storeAsURL(aFile,new PropertyValue[]{});
- tEnv.addObjRelation("XNamingService.RegisterObject", oInterface) ;
+ tEnv.addObjRelation("XNamingService.RegisterObject", oInterface) ;
- tEnv.addObjRelation("INSTANCE", oInterface);
+ tEnv.addObjRelation("INSTANCE", oInterface);
- tEnv.addObjRelation("XContainer.Container",
- UnoRuntime.queryInterface(
- XNamingService.class, oObj));
-
- } catch (com.sun.star.uno.Exception e) {
- throw new StatusException("Can't create object relation", e) ;
- } catch (NullPointerException e) {
- throw new StatusException("Can't create object relation", e) ;
- }
+ tEnv.addObjRelation("XContainer.Container",
+ UnoRuntime.queryInterface(
+ XNamingService.class, oObj));
return tEnv;
} // finish method getTestEnvironment
diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java b/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java
index 22fb022..aa20c34 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/ODatabaseSource.java
@@ -19,8 +19,6 @@
package mod._dbaccess;
import com.sun.star.beans.PropertyValue;
-import com.sun.star.beans.PropertyVetoException;
-import com.sun.star.beans.UnknownPropertyException;
import com.sun.star.beans.XPropertySet;
import com.sun.star.frame.XStorable;
@@ -37,9 +35,6 @@ import lib.TestParameters;
import util.DesktopTools;
import util.utils;
-import com.sun.star.io.IOException;
-import com.sun.star.lang.IllegalArgumentException;
-import com.sun.star.lang.WrappedTargetException;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.sdb.XOfficeDatabaseDocument;
import com.sun.star.task.XInteractionHandler;
@@ -116,23 +111,9 @@ public class ODatabaseSource extends TestCase {
* @see com.sun.star.sdb.DataSource
*/
@Override
- protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) {
- XInterface oObj = null;
- Object oInterface = null;
- XMultiServiceFactory xMSF = null ;
-
- xMSF = Param.getMSF();
- try{
- oInterface = xMSF.createInstance( "com.sun.star.sdb.DatabaseContext" );
-
- if (oInterface == null)
- throw new StatusException("Could not get service 'com.sun.star.sdb.DatabaseContext'", new Exception());
-
- }catch( Exception e ) {
- log.println("Could not get service 'com.sun.star.sdb.DatabaseContext'" );
- e.printStackTrace ();
- throw new StatusException("Service not available", e) ;
- }
+ protected TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception {
+ XMultiServiceFactory xMSF = Param.getMSF();
+ Object oInterface = xMSF.createInstance( "com.sun.star.sdb.DatabaseContext" );
XNamingService xDBContextNameServ = UnoRuntime.queryInterface(XNamingService.class, oInterface) ;
@@ -141,41 +122,23 @@ public class ODatabaseSource extends TestCase {
tmpDatabaseUrl = "sdbc:dbase:file:///" + tmpDatabaseUrl ;
- try{
- XInterface oDatabaseDoc = (XInterface) xMSF.createInstance
- ("com.sun.star.sdb.OfficeDatabaseDocument") ;
+ XInterface oDatabaseDoc = (XInterface) xMSF.createInstance
+ ("com.sun.star.sdb.OfficeDatabaseDocument") ;
- if (oDatabaseDoc == null)
- throw new StatusException("Could not get service 'com.sun.star.sdb.OfficeDatabaseDocument'", new Exception());
+ if (oDatabaseDoc == null)
+ throw new StatusException("Could not get service 'com.sun.star.sdb.OfficeDatabaseDocument'", new Exception());
- xDBDoc = UnoRuntime.queryInterface(
- XOfficeDatabaseDocument.class,
- oDatabaseDoc);
- }
- catch( Exception e ) {
- log.println("Could not get service 'com.sun.star.sdb.OfficeDatabaseDocument'" );
- e.printStackTrace ();
- throw new StatusException("Service not available", e) ;
- }
-
- oObj = xDBDoc.getDataSource();
+ xDBDoc = UnoRuntime.queryInterface(
+ XOfficeDatabaseDocument.class,
+ oDatabaseDoc);
+ XInterface oObj = xDBDoc.getDataSource();
log.println("ImplementationName: " + utils.getImplName(oObj));
// Creating new DBase data source in the TEMP directory
XPropertySet xSrcProp = UnoRuntime.queryInterface(XPropertySet.class, oObj);
- try{
- xSrcProp.setPropertyValue("URL", tmpDatabaseUrl) ;
- } catch ( UnknownPropertyException e){
- throw new StatusException("Could not set property 'URL' ", e) ;
- } catch ( PropertyVetoException e){
- throw new StatusException("Could not set property 'URL' ", e) ;
- } catch ( IllegalArgumentException e){
- throw new StatusException("Could not set property 'URL' ", e) ;
- } catch ( WrappedTargetException e){
- throw new StatusException("Could not set property 'URL' ", e) ;
- }
+ xSrcProp.setPropertyValue("URL", tmpDatabaseUrl) ;
String databaseName = "NewDatabaseSource" + uniqueSuffix ;
@@ -189,34 +152,16 @@ public class ODatabaseSource extends TestCase {
// registering source in DatabaseContext
XStorable store = UnoRuntime.queryInterface(XStorable.class, xDBDoc);
String aFile = utils.getOfficeTemp (Param.getMSF ())+"DataSource.odb";
- try{
- store.storeAsURL(aFile,new PropertyValue[]{});
- } catch (IOException e){
- log.println("Could not store datasource 'aFile'" );
- e.printStackTrace ();
- throw new StatusException("Could not save ", e) ;
- }
+ store.storeAsURL(aFile,new PropertyValue[]{});
- try{
- xDBContextNameServ.registerObject(databaseName, oObj) ;
- } catch (Exception e){
- log.println("Could not register data source" );
- e.printStackTrace ();
- throw new StatusException("Could not register ", e) ;
- }
+ xDBContextNameServ.registerObject(databaseName, oObj) ;
log.println( " creating a new environment for object" );
TestEnvironment tEnv = new TestEnvironment( oObj );
// adding obj relation for interface XCompletedConnection
- Object handler = null ;
- try {
- handler = Param.getMSF().createInstance
+ Object handler = Param.getMSF().createInstance
("com.sun.star.sdb.InteractionHandler") ;
- } catch (Exception e) {
- log.println("Relation for XCompletedConnection wasn't created") ;
- e.printStackTrace(log) ;
- }
// dbase does not need user and password
tEnv.addObjRelation("UserAndPassword", new String[]{"",""}) ;
diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceAdministrationDialog.java b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceAdministrationDialog.java
index 52cd1d0..d229d3e 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceAdministrationDialog.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceAdministrationDialog.java
@@ -20,8 +20,6 @@ package mod._dbaccess;
import java.io.PrintWriter;
-import lib.Status;
-import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
@@ -62,24 +60,10 @@ public class ODatasourceAdministrationDialog extends TestCase {
@Override
public TestEnvironment createTestEnvironment( TestParameters Param,
PrintWriter log )
- throws StatusException {
- XInterface oObj = null;
- Object oInterface = null;
-
- try {
- oInterface = Param.getMSF().createInstance
- ("com.sun.star.sdb.DatasourceAdministrationDialog" );
- } catch( com.sun.star.uno.Exception e ) {
- log.println("Service not available" );
- throw new StatusException("Service not available", e) ;
- }
-
- if (oInterface == null) {
- log.println("Service wasn't created") ;
- throw new StatusException(Status.failed("Service wasn't created")) ;
- }
-
- oObj = (XInterface) oInterface;
+ throws Exception {
+ Object oInterface = Param.getMSF().createInstance
+ ("com.sun.star.sdb.DatasourceAdministrationDialog" );
+ XInterface oObj = (XInterface) oInterface;
log.println( " creating a new environment for object" );
TestEnvironment tEnv = new TestEnvironment( oObj );
diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java
index 616c04b..b6b6cc0 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java
@@ -19,7 +19,6 @@ package mod._dbaccess;
import java.io.PrintWriter;
-import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
@@ -175,7 +174,7 @@ public class ODatasourceBrowser extends TestCase {
*/
@Override
protected synchronized TestEnvironment createTestEnvironment(TestParameters Param,
- PrintWriter log) {
+ PrintWriter log) throws Exception {
log.println("creating a test environment");
if (xTextDoc != null) {
@@ -195,14 +194,8 @@ public class ODatasourceBrowser extends TestCase {
// get a soffice factory object
SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
- try {
- log.println("creating a text document");
- xTextDoc = SOF.createTextDoc(null);
- } catch (com.sun.star.uno.Exception e) {
- // Some exception occurs.FAILED
- e.printStackTrace(log);
- throw new StatusException("Couldn't create document", e);
- }
+ log.println("creating a text document");
+ xTextDoc = SOF.createTextDoc(null);
util.utils.pause(5000);
@@ -253,15 +246,9 @@ public class ODatasourceBrowser extends TestCase {
param3.Value = "biblio";
params[2] = param3;
- try {
- XInitialization xInit = UnoRuntime.queryInterface(
- XInitialization.class, oObj);
- xInit.initialize(params);
- } catch (com.sun.star.uno.Exception e) {
- // Some exception occurs.FAILED
- e.printStackTrace(log);
- throw new StatusException("Couldn't initialize document", e);
- }
+ XInitialization xInit = UnoRuntime.queryInterface(
+ XInitialization.class, oObj);
+ xInit.initialize(params);
util.utils.pause(5000);
diff --git a/qadevOOo/tests/java/mod/_dbaccess/OInteractionHandler.java b/qadevOOo/tests/java/mod/_dbaccess/OInteractionHandler.java
index 5641c92..a5ec54f 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/OInteractionHandler.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/OInteractionHandler.java
@@ -20,8 +20,6 @@ package mod._dbaccess;
import java.io.PrintWriter;
-import lib.Status;
-import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
import lib.TestParameters;
@@ -75,26 +73,10 @@ public class OInteractionHandler extends TestCase {
@Override
public TestEnvironment createTestEnvironment( TestParameters Param,
PrintWriter log )
- throws StatusException {
- XInterface oObj = null;
- Object oInterface = null;
-
- try {
- oInterface = Param.getMSF().createInstance(
- "com.sun.star.sdb.InteractionHandler" );
-
- }
- catch( com.sun.star.uno.Exception e ) {
- log.println("Service not available" );
- throw new StatusException("Service not available", e) ;
- }
-
- if (oInterface == null) {
- log.println("Service wasn't created") ;
- throw new StatusException(Status.failed("Service wasn't created")) ;
- }
-
- oObj = (XInterface) oInterface;
+ throws Exception {
+ Object oInterface = Param.getMSF().createInstance(
+ "com.sun.star.sdb.InteractionHandler" );
+ XInterface oObj = (XInterface) oInterface;
log.println( " creating a new environment for object" );
TestEnvironment tEnv = new TestEnvironment( oObj );
diff --git a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java
index 255b7f9..d310dfd 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java
@@ -17,9 +17,6 @@
*/
package mod._dbaccess;
-import com.sun.star.container.NoSuchElementException;
-import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.sdbc.SQLException;
import com.sun.star.sdbc.XConnection;
import com.sun.star.uno.Exception;
import java.io.PrintWriter;
@@ -67,7 +64,7 @@ public class OQueryDesign extends TestCase {
}
@Override
- protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) {
+ protected synchronized TestEnvironment createTestEnvironment(TestParameters Param, PrintWriter log) throws Exception {
log.println( "creating a test environment" );
@@ -78,45 +75,22 @@ public class OQueryDesign extends TestCase {
XDispatch getting = null;
XMultiServiceFactory xMSF = Param.getMSF();
- XNameAccess xNameAccess = null;
+ XNameAccess xNameAccess = null;
- // we use the first datasource
- XDataSource xDS = null;
- try {
- xNameAccess = UnoRuntime.queryInterface(
- XNameAccess.class,
- xMSF.createInstance("com.sun.star.sdb.DatabaseContext"));
- } catch (Exception ex) {
- ex.printStackTrace( log );
- throw new StatusException( "Could not get Databasecontext", ex );
- }
- try {
- xDS = UnoRuntime.queryInterface(
- XDataSource.class, xNameAccess.getByName( "Bibliography" ));
- } catch (NoSuchElementException ex) {
- ex.printStackTrace( log );
- throw new StatusException( "Could not get XDataSource", ex );
- } catch (WrappedTargetException ex) {
- ex.printStackTrace( log );
- throw new StatusException( "Could not get XDataSource", ex );
- }
- try {
- xNameAccess = UnoRuntime.queryInterface(
- XNameAccess.class,
- xMSF.createInstance("com.sun.star.sdb.DatabaseContext"));
- } catch (Exception ex) {
- ex.printStackTrace( log );
- throw new StatusException( "Could not get DatabaseConext", ex );
- }
+ // we use the first datasource
+ XDataSource xDS = null;
+ xNameAccess = UnoRuntime.queryInterface(
+ XNameAccess.class,
+ xMSF.createInstance("com.sun.star.sdb.DatabaseContext"));
+ xDS = UnoRuntime.queryInterface(
+ XDataSource.class, xNameAccess.getByName( "Bibliography" ));
+ xNameAccess = UnoRuntime.queryInterface(
+ XNameAccess.class,
+ xMSF.createInstance("com.sun.star.sdb.DatabaseContext"));
- log.println("check XMultiServiceFactory");
+ log.println("check XMultiServiceFactory");
- try {
- xConn = xDS.getConnection("", "");
- } catch (SQLException ex) {
- ex.printStackTrace( log );
- throw new StatusException( "Could not get XConnection", ex );
- }
+ xConn = xDS.getConnection("", "");
log.println( "opening QueryDesign" );
URL the_url = new URL();
@@ -138,38 +112,20 @@ public class OQueryDesign extends TestCase {
util.utils.pause(5000);
- Object oDBC = null;
-
- try {
- oDBC = xMSF.createInstance( "com.sun.star.sdb.DatabaseContext" );
- }
- catch( com.sun.star.uno.Exception e ) {
- throw new StatusException("Could not instantiate DatabaseContext", e) ;
- }
+ Object oDBC = xMSF.createInstance( "com.sun.star.sdb.DatabaseContext" );
Object oDataSource = null;
- try{
- XNameAccess xNA = UnoRuntime.queryInterface(XNameAccess.class, oDBC);
- oDataSource = xNA.getByName(sDataSourceName);
- } catch ( com.sun.star.container.NoSuchElementException e){
- throw new StatusException("could not get '" + sDataSourceName + "'" , e) ;
- } catch ( com.sun.star.lang.WrappedTargetException e){
- throw new StatusException("could not get '" + sDataSourceName + "'" , e) ;
- }
+ XNameAccess xNA = UnoRuntime.queryInterface(XNameAccess.class, oDBC);
+ oDataSource = xNA.getByName(sDataSourceName);
UnoRuntime.queryInterface(XDocumentDataSource.class, oDataSource);
xFrame = DesktopTools.getCurrentFrame(xMSF);
- SOfficeFactory SOF = null;
+ SOfficeFactory SOF = null;
SOF = SOfficeFactory.getFactory( xMSF );
- try {
- log.println( "creating a textdocument" );
- xTextDoc = SOF.createTextDoc( null );
- } catch ( com.sun.star.uno.Exception e ) {
- e.printStackTrace( log );
- throw new StatusException( "Could not create document", e );
- }
+ log.println( "creating a textdocument" );
+ xTextDoc = SOF.createTextDoc( null );
XModel xDocMod = UnoRuntime.queryInterface(XModel.class, xTextDoc);
diff --git a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
index f92516b..594f0f5 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java
@@ -22,7 +22,6 @@ import ifc.sdb._XCompletedExecution;
import java.io.PrintWriter;
import java.util.ArrayList;
-import lib.Status;
import lib.StatusException;
import lib.TestCase;
import lib.TestEnvironment;
@@ -242,7 +241,7 @@ public class ORowSet extends TestCase {
*/
@Override
protected TestEnvironment createTestEnvironment(TestParameters Param,
- PrintWriter log)
+ PrintWriter log) throws Exception
{
XMultiServiceFactory orb = Param.getMSF();
uniqueSuffix++;
@@ -251,27 +250,14 @@ public class ORowSet extends TestCase {
//initialize test table
if (isMySQLDB)
{
- try
- {
- DBTools.DataSourceInfo legacyDescriptor = dbTools.newDataSourceInfo();
- legacyDescriptor.Name = srcInf.Name;
- legacyDescriptor.User = srcInf.User;
- legacyDescriptor.Password = srcInf.Password;
- legacyDescriptor.Info = srcInf.Info;
- legacyDescriptor.URL = srcInf.URL;
- legacyDescriptor.IsPasswordRequired = srcInf.IsPasswordRequired;
- dbTools.initTestTableUsingJDBC(tableName, legacyDescriptor);
- }
- catch(java.sql.SQLException e)
- {
- throw new StatusException(e, Status.failed("Couldn't " +
- " init test table. SQLException..."));
- }
- catch(java.lang.ClassNotFoundException e)
- {
- throw new StatusException(e, Status.failed("Couldn't " +
- "register mysql driver"));
- }
+ DBTools.DataSourceInfo legacyDescriptor = dbTools.newDataSourceInfo();
+ legacyDescriptor.Name = srcInf.Name;
+ legacyDescriptor.User = srcInf.User;
+ legacyDescriptor.Password = srcInf.Password;
+ legacyDescriptor.Info = srcInf.Info;
+ legacyDescriptor.URL = srcInf.URL;
+ legacyDescriptor.IsPasswordRequired = srcInf.IsPasswordRequired;
+ dbTools.initTestTableUsingJDBC(tableName, legacyDescriptor);
}
else
{
@@ -398,19 +384,12 @@ public class ORowSet extends TestCase {
// Adding relation for XCompletedExecution
tEnv.addObjRelation( "InteractionHandlerChecker", new InteractionHandlerImpl() );
- try
- {
- String sqlCommand = isMySQLDB
- ? "SELECT Column0 FROM soffice_test_table WHERE ( ( Column0 = :param1 ) )"
- : "SELECT \"_TEXT\" FROM \"" + tableName + "\" WHERE ( ( \"_TEXT\" = :param1 ) )";
- rowSetProps.setPropertyValue( "DataSourceName", dbSourceName );
- rowSetProps.setPropertyValue( "Command", sqlCommand );
- rowSetProps.setPropertyValue( "CommandType", Integer.valueOf(CommandType.COMMAND) );
- }
- catch(Exception e)
- {
- throw new StatusException( "setting up the RowSet with a parametrized command failed", e );
- }
+ String sqlCommand = isMySQLDB
+ ? "SELECT Column0 FROM soffice_test_table WHERE ( ( Column0 = :param1 ) )"
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list