diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 09:52:21 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 09:52:21 +0200 |
commit | e70b1417d22d22e3d5bdffb1f4b55bc83a4c36ef (patch) | |
tree | 3bd3a7fe6854916ee1afa9ee042fc91b3fb9c24e /reportdesign/qa | |
parent | fixing rebase errors (diff) | |
parent | fix tinderboxes (diff) | |
download | core-e70b1417d22d22e3d5bdffb1f4b55bc83a4c36ef.tar.gz core-e70b1417d22d22e3d5bdffb1f4b55bc83a4c36ef.zip |
Merge branch 'master' into feature/gnumake4
Conflicts:
dbaccess/AllLangResTarget_adabasui.mk
dbaccess/AllLangResTarget_dba.mk
dbaccess/AllLangResTarget_dbmm.mk
dbaccess/AllLangResTarget_sdbt.mk
dbaccess/Executable_odbcconfig.mk
dbaccess/JunitTest_dbaccess_unoapi.mk
dbaccess/Library_adabasui.mk
dbaccess/Library_dba.mk
dbaccess/Library_dbaxml.mk
dbaccess/Library_dbmm.mk
dbaccess/Library_sdbt.mk
dbaccess/Makefile
dbaccess/Module_dbaccess.mk
dbaccess/Package_inc.mk
dbaccess/Package_uiconfig.mk
dbaccess/prj/build.lst
dbaccess/qa/unoapi/Test.java
dbaccess/source/core/api/CacheSet.hxx
dbaccess/source/core/dataaccess/SharedConnection.hxx
dbaccess/source/core/dataaccess/connection.cxx
dbaccess/source/filter/xml/xmlAutoStyle.cxx
dbaccess/source/filter/xml/xmlColumn.cxx
dbaccess/source/filter/xml/xmlComponent.cxx
dbaccess/source/filter/xml/xmlConnectionData.cxx
dbaccess/source/filter/xml/xmlConnectionResource.cxx
dbaccess/source/filter/xml/xmlDataSource.cxx
dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
dbaccess/source/filter/xml/xmlDocuments.cxx
dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
dbaccess/source/filter/xml/xmlHelper.cxx
dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
dbaccess/source/filter/xml/xmlLogin.cxx
dbaccess/source/filter/xml/xmlQuery.cxx
dbaccess/source/filter/xml/xmlServerDatabase.cxx
dbaccess/source/filter/xml/xmlTable.cxx
dbaccess/source/filter/xml/xmlTableFilterList.cxx
dbaccess/source/filter/xml/xmlTableFilterPattern.cxx
dbaccess/source/ui/app/AppDetailPageHelper.cxx
dbaccess/source/ui/app/AppDetailView.cxx
dbaccess/source/ui/app/AppIconControl.cxx
dbaccess/source/ui/app/AppSwapWindow.cxx
dbaccess/source/ui/app/AppTitleWindow.cxx
dbaccess/source/ui/app/AppView.cxx
dbaccess/source/ui/browser/AsyncronousLink.cxx
dbaccess/source/ui/browser/genericcontroller.cxx
dbaccess/source/ui/control/ColumnControlWindow.cxx
dbaccess/source/ui/control/RelationControl.cxx
dbaccess/source/ui/control/SqlNameEdit.cxx
dbaccess/source/ui/control/TableGrantCtrl.cxx
dbaccess/source/ui/control/VertSplitView.cxx
dbaccess/source/ui/control/toolboxcontroller.cxx
dbaccess/source/ui/dlg/CollectionView.cxx
dbaccess/source/ui/dlg/ConnectionHelper.cxx
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
dbaccess/source/ui/dlg/RelationDlg.cxx
dbaccess/source/ui/dlg/TextConnectionHelper.cxx
dbaccess/source/ui/dlg/detailpages.cxx
dbaccess/source/ui/dlg/dlgsize.cxx
dbaccess/source/ui/dlg/queryorder.cxx
dbaccess/source/ui/dlg/tablespage.cxx
dbaccess/source/ui/misc/TableCopyHelper.cxx
dbaccess/source/ui/misc/ToolBoxHelper.cxx
dbaccess/source/ui/misc/WExtendPages.cxx
dbaccess/source/ui/misc/WNameMatch.cxx
dbaccess/source/ui/misc/WTypeSelect.cxx
dbaccess/source/ui/querydesign/ConnectionLine.cxx
dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
dbaccess/source/ui/querydesign/ConnectionLineData.cxx
dbaccess/source/ui/querydesign/JAccess.cxx
dbaccess/source/ui/querydesign/JoinController.cxx
dbaccess/source/ui/querydesign/JoinDesignView.cxx
dbaccess/source/ui/querydesign/JoinExchange.cxx
dbaccess/source/ui/querydesign/JoinTableView.cxx
dbaccess/source/ui/querydesign/QTableConnection.cxx
dbaccess/source/ui/querydesign/QTableConnectionData.cxx
dbaccess/source/ui/querydesign/QTableWindow.cxx
dbaccess/source/ui/querydesign/QTableWindowData.cxx
dbaccess/source/ui/querydesign/QueryDesignView.cxx
dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
dbaccess/source/ui/querydesign/QueryTextView.cxx
dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
dbaccess/source/ui/querydesign/TableConnection.cxx
dbaccess/source/ui/querydesign/TableConnectionData.cxx
dbaccess/source/ui/querydesign/TableWindow.cxx
dbaccess/source/ui/querydesign/TableWindowAccess.cxx
dbaccess/source/ui/querydesign/TableWindowData.cxx
dbaccess/source/ui/querydesign/TableWindowListBox.cxx
dbaccess/source/ui/querydesign/TableWindowTitle.cxx
dbaccess/source/ui/querydesign/querydlg.cxx
dbaccess/source/ui/querydesign/queryview.cxx
dbaccess/source/ui/relationdesign/RTableConnection.cxx
dbaccess/source/ui/relationdesign/RelationDesignView.cxx
dbaccess/source/ui/relationdesign/RelationTableView.cxx
dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
dbaccess/source/ui/tabledesign/TEditControl.cxx
dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
dbaccess/source/ui/tabledesign/TableDesignView.cxx
dbaccess/source/ui/tabledesign/TableFieldControl.cxx
dbaccess/source/ui/tabledesign/TableRow.cxx
dbaccess/source/ui/tabledesign/TableRowExchange.cxx
dbaccess/source/ui/tabledesign/TableUndo.cxx
dbaccess/source/ui/uno/ColumnControl.cxx
dbaccess/source/ui/uno/ColumnPeer.cxx
reportdesign/AllLangResTarget_rpt.mk
reportdesign/AllLangResTarget_rptui.mk
reportdesign/Library_rpt.mk
reportdesign/Library_rptui.mk
reportdesign/Library_rptxml.mk
reportdesign/Module_reportdesign.mk
reportdesign/Package_uiconfig.mk
reportdesign/Package_xml.mk
reportdesign/prj/build.lst
reportdesign/prj/makefile.mk
Diffstat (limited to 'reportdesign/qa')
-rw-r--r--[-rwxr-xr-x] | reportdesign/qa/complex/reportdesign/ReportDesignerTest.java | 68 | ||||
-rw-r--r--[-rwxr-xr-x] | reportdesign/qa/complex/reportdesign/test_documents/RPTCalcTests.odb | bin | 6715 -> 6715 bytes | |||
-rw-r--r--[-rwxr-xr-x] | reportdesign/qa/complex/reportdesign/test_documents/RPTWriterTests.odb | bin | 5762 -> 5762 bytes |
3 files changed, 0 insertions, 68 deletions
diff --git a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java index 346c28569929..6dfb6f719daf 100755..100644 --- a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java +++ b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java @@ -47,9 +47,6 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XInterface; import com.sun.star.util.XCloseable; -// import util.BasicMacroTools; -// import util.DesktopTools; -// import util.dbg; // import complexlib.ComplexTestCase; // import util.utils; import helper.OfficeProvider; @@ -58,24 +55,6 @@ import helper.URLHelper; import convwatch.DB; -// import java.util.Date; -// import java.text.SimpleDateFormat; -// import java.text.ParsePosition; -// import java.sql.Time; -// -// import java.io.BufferedReader; -// import java.io.File; -// import java.io.FileReader; -// import java.io.IOException; -// import java.io.FilenameFilter; -// -// import java.util.Vector; -// -// import helper.AppProvider; -// import java.text.DecimalFormat; -// import util.DynamicClassLoader; -// import java.util.StringTokenizer; - import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -84,7 +63,6 @@ import org.junit.Test; import org.openoffice.test.OfficeConnection; import static org.junit.Assert.*; - class PropertySetHelper { XPropertySet m_xPropertySet; @@ -295,18 +273,12 @@ public class ReportDesignerTest m_sUPDMinor = System.getProperty("UPDMINOR"); m_sCWS_WORK_STAMP = System.getProperty("CWS_WORK_STAMP"); - // createDBEntry(); System.out.println("Current CWS: " + m_sCWS_WORK_STAMP); System.out.println("Current MWS: " + m_sUPDMinor); - // System.exit(1); - // sAppExecutionCommand = sAppExecutionCommand.replaceAll( "\\$\\{USERNAME\\}", sUser); // System.out.println("sAppExecutionCommand='" + sAppExecutionCommand + "'"); // - // an other way to replace strings - // sAppExecutionCommand = utils.replaceAll13(sAppExecutionCommand, "${USERNAME}", sUser); - // checkIfOfficeExists(sAppExecutionCommand); // param.put("AppExecutionCommand", new String(sAppExecutionCommand)); @@ -347,15 +319,6 @@ public class ReportDesignerTest System.out.println("Load done"); assertNotNull("Can't load document ", xDocComponent); - // context = createUnoService("com.sun.star.sdb.DatabaseContext") -// oDataBase = context.getByName("hh") -// oDBDoc = oDataBase.DatabaseDocument -// -// dim args(1) as new com.sun.star.beans.PropertyValue -// args(0).Name = "ActiveConnection" -// args(0).Value = oDBDoc.getCurrentController().getPropertyValue("ActiveConnection") -// reportContainer = oDBDoc.getReportDocuments() -// report = reportContainer.loadComponentFromURL("Report40","",0,args) try { @@ -366,47 +329,26 @@ public class ReportDesignerTest XNameAccess xNameAccess = UnoRuntime.queryInterface(XNameAccess.class, x); showElements(xNameAccess); Object aObj = xNameAccess.getByName(sFileURL); -// System.out.println("1"); - // PropertySetHelper aHelper = new PropertySetHelper(aObj); XDocumentDataSource xDataSource = UnoRuntime.queryInterface(XDocumentDataSource.class, aObj); -// Object aDatabaseDocmuent = aHelper.getPropertyValueAsObject("DatabaseDocument"); XOfficeDatabaseDocument xOfficeDBDoc = xDataSource.getDatabaseDocument(); - // XOfficeDatabaseDocument xOfficeDBDoc = (XOfficeDatabaseDocument)UnoRuntime.queryInterface(XOfficeDatabaseDocument.class, aDatabaseDocument); assertNotNull("can't access DatabaseDocument", xOfficeDBDoc); -// System.out.println("2"); XModel xDBSource = UnoRuntime.queryInterface(XModel.class, xOfficeDBDoc); Object aController = xDBSource.getCurrentController(); assertNotNull("Controller of xOfficeDatabaseDocument is empty!", aController); -// System.out.println("3"); XDatabaseDocumentUI aDBDocUI = UnoRuntime.queryInterface(XDatabaseDocumentUI.class, aController); /* boolean isConnect = */ // TODO: throws an exception in DEV300m78 aDBDocUI.connect(); -// if (isConnect) -// { -// System.out.println("true"); -// } -// else -// { -// System.out.println("false"); -// } -// System.out.println("4"); - - // aHelper = new PropertySetHelper(aController); - - // Object aActiveConnectionObj = aHelper.getPropertyValueAsObject("ActiveConnection"); Object aActiveConnectionObj = aDBDocUI.getActiveConnection(); assertNotNull("ActiveConnection is empty", aActiveConnectionObj); -// System.out.println("5"); XReportDocumentsSupplier xSupplier = UnoRuntime.queryInterface(XReportDocumentsSupplier.class, xOfficeDBDoc); xNameAccess = xSupplier.getReportDocuments(); assertNotNull("xOfficeDatabaseDocument returns no Report Document", xNameAccess); -// System.out.println("5"); showElements(xNameAccess); @@ -425,11 +367,6 @@ public class ReportDesignerTest fail("ERROR: Exception caught" + e.getMessage()); } - // String mTestDocumentPath = (String) param.get("TestDocumentPath"); - // System.out.println("mTestDocumentPath: '" + mTestDocumentPath + "'"); - // // workaround for issue using deprecated "DOCPTH" prop - // System.setProperty("DOCPTH", mTestDocumentPath); - // Close the document closeComponent(xDocComponent); } @@ -462,8 +399,6 @@ public class ReportDesignerTest // sDestinationVersion, sDestinationName, sDestinationCreatorType, // sDocumentPoolDir, sDocumentPoolName, m_sMailAddress, // sSpecial); - // DB.test(); - // System.exit(1); } private void loadAndStoreReports(XNameAccess _xNameAccess, ArrayList _aPropertyList, int _nType) @@ -527,9 +462,6 @@ public class ReportDesignerTest sOutputPath += "tmp_123"; sOutputPath += System.getProperty("file.separator"); - // sOutputPath += getFileFormat(_nType); - // sOutputPath += System.getProperty("file.separator"); - File aOutputFile = new File(sOutputPath); // create the directory of the given output path aOutputFile.mkdirs(); diff --git a/reportdesign/qa/complex/reportdesign/test_documents/RPTCalcTests.odb b/reportdesign/qa/complex/reportdesign/test_documents/RPTCalcTests.odb Binary files differindex 0e91d633d4e7..0e91d633d4e7 100755..100644 --- a/reportdesign/qa/complex/reportdesign/test_documents/RPTCalcTests.odb +++ b/reportdesign/qa/complex/reportdesign/test_documents/RPTCalcTests.odb diff --git a/reportdesign/qa/complex/reportdesign/test_documents/RPTWriterTests.odb b/reportdesign/qa/complex/reportdesign/test_documents/RPTWriterTests.odb Binary files differindex 7099b1abf2b5..7099b1abf2b5 100755..100644 --- a/reportdesign/qa/complex/reportdesign/test_documents/RPTWriterTests.odb +++ b/reportdesign/qa/complex/reportdesign/test_documents/RPTWriterTests.odb |