From 70d60072ed2b8d6a8a50b5a433954e67d32f5f6a Mon Sep 17 00:00:00 2001 From: Lars Langhans Date: Thu, 10 Jun 2010 14:30:42 +0200 Subject: sb123:#i111449# cleanups in sfx2 qa/complex tests --- .../CheckGlobalEventBroadcaster_writer1.java | 243 ---- sfx2/qa/complex/DocHelper/DialogThread.java | 95 -- sfx2/qa/complex/DocHelper/WriterHelper.java | 296 ----- sfx2/qa/complex/DocHelper/makefile.mk | 46 - sfx2/qa/complex/DocumentMetaData.java | 546 --------- sfx2/qa/complex/DocumentMetadataAccessTest.java | 1275 ------------------- sfx2/qa/complex/docinfo/DocumentProperties.java | 436 ++++--- sfx2/qa/complex/docinfo/makefile.mk | 41 +- .../CheckGlobalEventBroadcaster_writer1.java | 281 +++++ .../complex/framework/DocHelper/DialogThread.java | 95 ++ .../complex/framework/DocHelper/WriterHelper.java | 287 +++++ sfx2/qa/complex/framework/DocHelper/makefile.mk | 49 + sfx2/qa/complex/framework/DocumentMetaData.java | 565 +++++++++ .../framework/DocumentMetadataAccessTest.java | 1293 ++++++++++++++++++++ sfx2/qa/complex/framework/TestDocument.java | 39 + sfx2/qa/complex/framework/makefile.mk | 65 + sfx2/qa/complex/framework/testdocuments/CUSTOM.odt | Bin 0 -> 1021 bytes sfx2/qa/complex/framework/testdocuments/TEST.odt | Bin 0 -> 13803 bytes .../complex/framework/testdocuments/TESTRDFA.odt | Bin 0 -> 7540 bytes sfx2/qa/complex/framework/testdocuments/empty.rdf | 13 + sfx2/qa/complex/makefile.mk | 61 - .../StandaloneDocumentInfoUnitTest.java | 66 +- sfx2/qa/complex/standalonedocumentinfo/Test01.java | 37 +- .../complex/standalonedocumentinfo/TestHelper.java | 14 +- sfx2/qa/complex/standalonedocumentinfo/makefile.mk | 69 +- sfx2/qa/complex/testdocuments/CUSTOM.odt | Bin 1021 -> 0 bytes sfx2/qa/complex/testdocuments/TEST.odt | Bin 13803 -> 0 bytes sfx2/qa/complex/testdocuments/TESTRDFA.odt | Bin 7540 -> 0 bytes 28 files changed, 3061 insertions(+), 2851 deletions(-) delete mode 100644 sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java delete mode 100644 sfx2/qa/complex/DocHelper/DialogThread.java delete mode 100644 sfx2/qa/complex/DocHelper/WriterHelper.java delete mode 100644 sfx2/qa/complex/DocHelper/makefile.mk delete mode 100644 sfx2/qa/complex/DocumentMetaData.java delete mode 100644 sfx2/qa/complex/DocumentMetadataAccessTest.java create mode 100644 sfx2/qa/complex/framework/CheckGlobalEventBroadcaster_writer1.java create mode 100644 sfx2/qa/complex/framework/DocHelper/DialogThread.java create mode 100644 sfx2/qa/complex/framework/DocHelper/WriterHelper.java create mode 100644 sfx2/qa/complex/framework/DocHelper/makefile.mk create mode 100644 sfx2/qa/complex/framework/DocumentMetaData.java create mode 100644 sfx2/qa/complex/framework/DocumentMetadataAccessTest.java create mode 100644 sfx2/qa/complex/framework/TestDocument.java create mode 100644 sfx2/qa/complex/framework/makefile.mk create mode 100644 sfx2/qa/complex/framework/testdocuments/CUSTOM.odt create mode 100644 sfx2/qa/complex/framework/testdocuments/TEST.odt create mode 100644 sfx2/qa/complex/framework/testdocuments/TESTRDFA.odt create mode 100644 sfx2/qa/complex/framework/testdocuments/empty.rdf delete mode 100644 sfx2/qa/complex/makefile.mk delete mode 100644 sfx2/qa/complex/testdocuments/CUSTOM.odt delete mode 100644 sfx2/qa/complex/testdocuments/TEST.odt delete mode 100644 sfx2/qa/complex/testdocuments/TESTRDFA.odt (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java b/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java deleted file mode 100644 index d5dc17e183eb..000000000000 --- a/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java +++ /dev/null @@ -1,243 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.framework; - -import com.sun.star.awt.XWindow; -import com.sun.star.document.XEventBroadcaster; -import com.sun.star.document.XEventListener; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.sheet.XSpreadsheetDocument; -import com.sun.star.text.XTextDocument; -import com.sun.star.uno.UnoRuntime; -import complex.framework.DocHelper.WriterHelper; -import complexlib.ComplexTestCase; -import java.util.ArrayList; -import com.sun.star.task.XJobExecutor; -import com.sun.star.util.URL; -import util.UITools; - -/** - * This testcase checks the GlobalEventBroadcaster - * it will add an XEventListener and verify the Events - * raised when opening/changing and closing Office Documents - */ -public class CheckGlobalEventBroadcaster_writer1 extends ComplexTestCase { - XMultiServiceFactory m_xMSF = null; - XEventBroadcaster m_xEventBroadcaster = null; - ArrayList notifyEvents = new ArrayList(); - XTextDocument xTextDoc; - XSpreadsheetDocument xSheetDoc; - XEventListener m_xEventListener = new EventListenerImpl(); - - public String[] getTestMethodNames() { - return new String[] { - "initialize", "checkWriter", "cleanup" - }; - } - - public void initialize() { - m_xMSF = (XMultiServiceFactory) param.getMSF(); - log.println("check wether there is a valid MultiServiceFactory"); - - if (m_xMSF == null) { - assure("## Couldn't get MultiServiceFactory make sure your Office is started", - true); - } - - log.println("... done"); - - log.println( - "Create an instance of com.sun.star.frame.GlobalEventBroadcaster"); - - Object GlobalEventBroadcaster = null; - Object dispatcher = null; - - try { - GlobalEventBroadcaster = m_xMSF.createInstance( - "com.sun.star.frame.GlobalEventBroadcaster"); - } catch (com.sun.star.uno.Exception e) { - assure("## Exception while creating instance", false); - } - - log.println("... done"); - - log.println("check wether the created instance is valid"); - - if (GlobalEventBroadcaster == null) { - assure("couldn't create service", false); - } - - log.println("... done"); - - log.println( - "try to query the XEventBroadcaster from the gained Object"); - m_xEventBroadcaster = (XEventBroadcaster) UnoRuntime.queryInterface( - XEventBroadcaster.class, - GlobalEventBroadcaster); - - if (util.utils.isVoid(m_xEventBroadcaster)) { - assure("couldn't get XEventBroadcaster", false); - } - - log.println("... done"); - - log.println("adding Listener"); - m_xEventBroadcaster.addEventListener(m_xEventListener); - log.println("... done"); - } - - public void checkWriter() { - log.println("-- Checking Writer --"); - - WriterHelper wHelper = new WriterHelper(m_xMSF); - String[] expected; - boolean locRes = true; - log.println("opening an empty writer doc"); - notifyEvents.clear(); - xTextDoc = wHelper.openEmptyDoc(); - shortWait(); - expected = new String[] { "OnUnfocus", "OnCreate", "OnViewCreated", "OnFocus" }; - - assure("Wrong events fired when opening empty doc", - proveExpectation(expected)); - log.println("... done"); - - log.println("changing the writer doc"); - notifyEvents.clear(); - xTextDoc.getText().setString("GlobalEventBroadcaster"); - shortWait(); - expected = new String[] { "OnModifyChanged" }; - - assure("Wrong events fired when changing doc", - proveExpectation(expected)); - log.println("... done"); - - log.println("closing the empty writer doc"); - notifyEvents.clear(); - wHelper.closeDoc(xTextDoc); - shortWait(); - expected = new String[] { "OnUnfocus", "OnFocus", "OnViewClosed", "OnUnload" }; - - assure("Wrong events fired when closing empty doc", - proveExpectation(expected)); - log.println("... done"); - - log.println("opening an writer doc via Window-New Window"); - notifyEvents.clear(); - xTextDoc = wHelper.openFromDialog(".uno:NewWindow", "", false); - shortWait(); - expected = new String[] { "OnUnfocus", "OnCreate", "OnViewCreated", "OnFocus", "OnUnfocus", "OnViewCreated", "OnFocus", }; - - assure("Wrong events fired when opening an writer doc via Window-New Window", - proveExpectation(expected)); - log.println("... done"); - - log.println("closing the created writer doc"); - notifyEvents.clear(); - - wHelper.closeDoc(xTextDoc); - shortWait(); - expected = new String[] { "OnViewClosed", "OnUnfocus", "OnFocus", "OnViewClosed", "OnUnload" }; - - assure("Wrong events fired when closing Window-New Window", - proveExpectation(expected)); - - log.println("... done"); - - log.println("Opening document with label wizard"); - xTextDoc = wHelper.openFromDialog("private:factory/swriter?slot=21051", "", false); - shortWait(); - XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, wHelper.getToolkit ().getActiveTopWindow ()); - UITools ut = new UITools(m_xMSF,xWindow); - notifyEvents.clear(); - log.println("pressing button 'New Document'"); - try{ - ut.clickButton ("New Document"); - } catch (Exception e) { - log.println("Couldn't press Button"); - } - log.println("... done"); - shortWait(); - shortWait(); - shortWait(); - expected = new String[] { "OnViewClosed", "OnCreate", "OnFocus", "OnModifyChanged" }; - - assure("Wrong events fired when starting labels wizard", - proveExpectation(expected)); - - log.println("-- Done Writer --"); - } - - public void cleanup() { - log.println("removing Listener"); - m_xEventBroadcaster.removeEventListener(m_xEventListener); - log.println("... done"); - } - - /** - * Sleeps for 0.5 sec. to allow StarOffice to react on - * reset call. - */ - private void shortWait() { - try { - Thread.sleep(2000); - } catch (InterruptedException e) { - log.println("While waiting :" + e); - } - } - - private boolean proveExpectation(String[] expected) { - boolean locRes = true; - boolean failure = false; - - log.println("Fired Events:"); - for (int k=0;k - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.framework.DocHelper; - -import com.sun.star.beans.PropertyValue; -import com.sun.star.frame.XController; -import com.sun.star.frame.XDispatch; -import com.sun.star.frame.XDispatchProvider; -import com.sun.star.frame.XModel; -import com.sun.star.lang.XComponent; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.util.URL; -import com.sun.star.util.XURLTransformer; - -import java.lang.Thread; - - -/** - * This class opens a given dialog in a separate Thread by dispatching an url - * - */ -public class DialogThread extends Thread { - public XComponent m_xDoc = null; - public XMultiServiceFactory m_xMSF = null; - public String m_url = ""; - - public DialogThread(XComponent xDoc, XMultiServiceFactory msf, String url) { - this.m_xDoc = xDoc; - this.m_xMSF = msf; - this.m_url = url; - } - - public void run() { - XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, - m_xDoc); - - XController xController = aModel.getCurrentController(); - - //Opening Dialog - try { - XDispatchProvider xDispProv = (XDispatchProvider) UnoRuntime.queryInterface( - XDispatchProvider.class, - xController.getFrame()); - XURLTransformer xParser = (com.sun.star.util.XURLTransformer) UnoRuntime.queryInterface( - XURLTransformer.class, - m_xMSF.createInstance( - "com.sun.star.util.URLTransformer")); - - // Because it's an in/out parameter - // we must use an array of URL objects. - URL[] aParseURL = new URL[1]; - aParseURL[0] = new URL(); - aParseURL[0].Complete = m_url; - xParser.parseStrict(aParseURL); - - URL aURL = aParseURL[0]; - XDispatch xDispatcher = xDispProv.queryDispatch(aURL, "", com.sun.star.frame.FrameSearchFlag.SELF | - com.sun.star.frame.FrameSearchFlag.CHILDREN); - PropertyValue[] dispatchArguments = new PropertyValue[0]; - - if (xDispatcher != null) { - xDispatcher.dispatch(aURL, dispatchArguments); - } else { - System.out.println("xDispatcher is null"); - } - } catch (com.sun.star.uno.Exception e) { - System.out.println("Couldn't open dialog"); - } - } -} \ No newline at end of file diff --git a/sfx2/qa/complex/DocHelper/WriterHelper.java b/sfx2/qa/complex/DocHelper/WriterHelper.java deleted file mode 100644 index b65e8e915423..000000000000 --- a/sfx2/qa/complex/DocHelper/WriterHelper.java +++ /dev/null @@ -1,296 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.framework.DocHelper; - -import com.sun.star.accessibility.AccessibleRole; -import com.sun.star.accessibility.XAccessible; -import com.sun.star.accessibility.XAccessibleAction; -import com.sun.star.accessibility.XAccessibleContext; -import com.sun.star.accessibility.XAccessibleSelection; -import com.sun.star.awt.XExtendedToolkit; -import com.sun.star.awt.XWindow; -import com.sun.star.frame.XDesktop; -import com.sun.star.lang.XComponent; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.text.XTextDocument; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.util.XCloseable; - -import complex.framework.DocHelper.DialogThread; -import java.io.PrintWriter; - -import util.AccessibilityTools; -import util.WriterTools; - - -/** - * Methods to open Writer docs - * - */ -public class WriterHelper { - XMultiServiceFactory m_xMSF = null; - - /** Creates a new instance of WriterHelper - * @param m_xMSF The MultiServiceFactory gained from the office - */ - public WriterHelper(XMultiServiceFactory m_xMSF) { - this.m_xMSF = m_xMSF; - } - - /** Opens an empty document - * @return a reference to the opened document is returned - */ - public XTextDocument openEmptyDoc() { - return WriterTools.createTextDoc(m_xMSF); - } - - /** Closes a given XTextDocument - * @param xTextDoc the text document to be closed - * @return if an error occurs the errormessage is returned and an empty String if not - */ - public String closeDoc(XTextDocument xTextDoc) { - XCloseable closer = (XCloseable) UnoRuntime.queryInterface( - XCloseable.class, xTextDoc); - String err = ""; - - try { - closer.close(true); - } catch (com.sun.star.util.CloseVetoException e) { - err = "couldn't close document " + e; - } - - return err; - } - - /** a TextDocument is opened by pressing a button in a dialog given by uno-URL - * @param url the uno-URL of the dialog to be opened - * @param createButton the language dependend label of the button to be pressed - * @param destroyLocal if true the document that has been opened to dispatch the dialog is closed before the method returns, - * otherwise this document remains open - * @return returns the created Textdocument - */ - public XTextDocument openFromDialog(String url, String createButton, - boolean destroyLocal) { - XTextDocument xLocalDoc = WriterTools.createTextDoc(m_xMSF); - XComponent comp = (XComponent) UnoRuntime.queryInterface( - XComponent.class, xLocalDoc); - DialogThread diagThread = new DialogThread(comp, m_xMSF, url); - diagThread.start(); - shortWait(); - - if (createButton.length() > 1) { - XExtendedToolkit tk = getToolkit(); - AccessibilityTools at = new AccessibilityTools(); - Object atw = tk.getActiveTopWindow(); - - XWindow xWindow = (XWindow) UnoRuntime.queryInterface( - XWindow.class, atw); - - XAccessible xRoot = at.getAccessibleObject(xWindow); - XAccessibleContext buttonContext = at.getAccessibleObjectForRole( - xRoot, - AccessibleRole.PUSH_BUTTON, - createButton); - - XAccessibleAction buttonAction = (XAccessibleAction) UnoRuntime.queryInterface( - XAccessibleAction.class, - buttonContext); - - try { - System.out.println("Name: " + - buttonContext.getAccessibleName()); - buttonAction.doAccessibleAction(0); - } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - System.out.println("Couldn't press button"); - } - - shortWait(); - } - - XDesktop xDesktop = getDesktop(); - - XTextDocument returnDoc = (XTextDocument) UnoRuntime.queryInterface( - XTextDocument.class, - xDesktop.getCurrentComponent()); - - if (destroyLocal) { - closeDoc(xLocalDoc); - } - - return returnDoc; - } - - public XTextDocument DocByAutopilot(XMultiServiceFactory msf, - int[] indexes, boolean destroyLocal, - String bName) { - XTextDocument xLocalDoc = WriterTools.createTextDoc(m_xMSF); - Object toolkit = null; - - try { - toolkit = msf.createInstance("com.sun.star.awt.Toolkit"); - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface( - XExtendedToolkit.class, toolkit); - - shortWait(); - - AccessibilityTools at = new AccessibilityTools(); - - Object atw = tk.getActiveTopWindow(); - - XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, - atw); - - XAccessible xRoot = at.getAccessibleObject(xWindow); - - XAccessibleContext ARoot = at.getAccessibleObjectForRole(xRoot, - AccessibleRole.MENU_BAR); - XAccessibleSelection sel = (XAccessibleSelection) UnoRuntime.queryInterface( - XAccessibleSelection.class, ARoot); - - for (int k = 0; k < indexes.length; k++) { - try { - sel.selectAccessibleChild(indexes[k]); - shortWait(); - ARoot = ARoot.getAccessibleChild(indexes[k]) - .getAccessibleContext(); - sel = (XAccessibleSelection) UnoRuntime.queryInterface( - XAccessibleSelection.class, ARoot); - } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - } - } - - shortWait(); - - atw = tk.getActiveTopWindow(); - - xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, atw); - - xRoot = at.getAccessibleObject(xWindow); - - //at.printAccessibleTree(new PrintWriter(System.out),xRoot); - - XAccessibleAction action = (XAccessibleAction) UnoRuntime.queryInterface( - XAccessibleAction.class, - at.getAccessibleObjectForRole(xRoot, - AccessibleRole.PUSH_BUTTON, - bName)); - - try { - action.doAccessibleAction(0); - } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - } - - shortWait(); - - atw = tk.getActiveTopWindow(); - - xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, atw); - - xRoot = at.getAccessibleObject(xWindow); - - at.printAccessibleTree(new PrintWriter(System.out),xRoot); - - action = (XAccessibleAction) UnoRuntime.queryInterface( - XAccessibleAction.class, - at.getAccessibleObjectForRole(xRoot, - AccessibleRole.PUSH_BUTTON, - "Yes")); - - try { - if (action != null) action.doAccessibleAction(0); - } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - } - - shortWait(); - - XDesktop xDesktop = getDesktop(); - - XTextDocument returnDoc = (XTextDocument) UnoRuntime.queryInterface( - XTextDocument.class, - xDesktop.getCurrentComponent()); - - if (destroyLocal) { - closeDoc(xLocalDoc); - } - - return returnDoc; - } - - /** - * Sleeps for 2 sec. to allow StarOffice to react - */ - private void shortWait() { - try { - Thread.sleep(4000); - } catch (InterruptedException e) { - System.out.println("While waiting :" + e); - } - } - - /** creates an instance of com.sun.star.awt.Toolkit to query the XExtendedToolkit - * interface - * @return returns the gained XExtendedToolkit Interface - */ - public XExtendedToolkit getToolkit() { - Object toolkit = null; - - try { - toolkit = m_xMSF.createInstance("com.sun.star.awt.Toolkit"); - } catch (com.sun.star.uno.Exception e) { - System.out.println("Couldn't get toolkit"); - e.printStackTrace(); - } - - XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface( - XExtendedToolkit.class, toolkit); - - return tk; - } - - /** creates an instance of com.sun.star.frame.Desktop to query the XDesktop interface - * @return returns the gained XDesktop interface - */ - protected XDesktop getDesktop() { - Object desk = null; - - try { - desk = m_xMSF.createInstance("com.sun.star.frame.Desktop"); - } catch (com.sun.star.uno.Exception e) { - System.out.println("Couldn't get desktop"); - e.printStackTrace(); - } - - XDesktop xDesktop = (XDesktop) UnoRuntime.queryInterface( - XDesktop.class, desk); - - return xDesktop; - } -} \ No newline at end of file diff --git a/sfx2/qa/complex/DocHelper/makefile.mk b/sfx2/qa/complex/DocHelper/makefile.mk deleted file mode 100644 index 6b6ac9191cdb..000000000000 --- a/sfx2/qa/complex/DocHelper/makefile.mk +++ /dev/null @@ -1,46 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ = ..$/..$/.. -TARGET = DocHelper -PRJNAME = $(TARGET) -PACKAGE = complex$/framework$/dochelper - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -JAVAFILES = DialogThread.java WriterHelper.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/sfx2/qa/complex/DocumentMetaData.java b/sfx2/qa/complex/DocumentMetaData.java deleted file mode 100644 index ae7970227c75..000000000000 --- a/sfx2/qa/complex/DocumentMetaData.java +++ /dev/null @@ -1,546 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -package complex.framework; - -import complexlib.ComplexTestCase; -import helper.StreamSimulator; - -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XComponentContext; -import com.sun.star.uno.Any; -import com.sun.star.lang.XInitialization; -import com.sun.star.lang.XSingleServiceFactory; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.lang.Locale; -import com.sun.star.lang.EventObject; -import com.sun.star.util.Date; -import com.sun.star.util.DateTime; -import com.sun.star.util.Time; -import com.sun.star.util.Duration; -import com.sun.star.util.XModifyListener; -import com.sun.star.util.XModifyBroadcaster; -import com.sun.star.beans.XPropertyContainer; -import com.sun.star.beans.XPropertySet; -import com.sun.star.beans.PropertyValue; -import com.sun.star.beans.NamedValue; -import com.sun.star.beans.PropertyAttribute; -import com.sun.star.beans.UnknownPropertyException; -import com.sun.star.beans.IllegalTypeException; -import com.sun.star.embed.XStorage; -import com.sun.star.io.XInputStream; -import com.sun.star.document.XDocumentProperties; - - -/** - * Test case for the service com.sun.star.document.DocumentProperties. - * Currently, this service is implemented in - * sfx2/source/doc/SfxDocumentMetaData.cxx. - * - * @author mst - */ -public class DocumentMetaData extends ComplexTestCase -{ - public String[] getTestMethodNames () { - return new String[] { "check", "cleanup" }; - } - - public void cleanup() { - // nothing to do - } - - // for testing modifications - class Listener implements XModifyListener { - private boolean m_Called; - - public Listener() { - m_Called = false; - } - - public boolean reset() { - boolean oldCalled = m_Called; - m_Called = false; - return oldCalled; - } - - public void modified(EventObject e) { - m_Called = true; - } - - public void disposing(EventObject e) { - } - } - - public void check() { - try { - XMultiServiceFactory xMSF = (XMultiServiceFactory) param.getMSF(); - assure("could not create MultiServiceFactory.", xMSF != null); - XPropertySet xPropertySet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xMSF); - Object defaultCtx = xPropertySet.getPropertyValue("DefaultContext"); - XComponentContext xContext = (XComponentContext) - UnoRuntime.queryInterface(XComponentContext.class, defaultCtx); - assure("could not get component context.", xContext != null); - - String temp = util.utils.getOfficeTemp/*Dir*/(xMSF); - log.println("tempdir: " + temp); - - PropertyValue[] noArgs = { }; - PropertyValue mimetype = new PropertyValue(); - mimetype.Name = "MediaType"; - mimetype.Value = "application/vnd.oasis.opendocument.text"; - PropertyValue[] mimeArgs = { mimetype }; -// new Any("application/vnd.oasis.opendocument.text")) }; - PropertyValue cfile = new PropertyValue(); - cfile.Name = "URL"; - cfile.Value = temp + "EMPTY.odt"; - PropertyValue[] mimeEmptyArgs = { mimetype, cfile }; - - log.println("Creating service DocumentProperties..."); - - Object oDP = -// xMSF.createInstanceWithContext( -// "com.sun.star.document.DocumentProperties", xContext); - xMSF.createInstance("com.sun.star.document.DocumentProperties"); - XDocumentProperties xDP = (XDocumentProperties) - UnoRuntime.queryInterface(XDocumentProperties.class, oDP); - - log.println("...done"); - - - log.println("Checking initialize ..."); - - XDocumentProperties xDP2 = (XDocumentProperties) - UnoRuntime.queryInterface(XDocumentProperties.class, - xMSF.createInstance( - "com.sun.star.document.DocumentProperties")); - XInitialization xInit = (XInitialization) - UnoRuntime.queryInterface(XInitialization.class, xDP2); - xInit.initialize(new Object[] { }); - - log.println("...done"); - - log.println("Checking storing default-initialized meta data ..."); - -// xDP2.storeToMedium(temp + "EMPTY.odt", mimeArgs); - xDP2.storeToMedium("", mimeEmptyArgs); - - log.println("...done"); - - log.println("Checking loading default-initialized meta data ..."); - -// xDP2.loadFromMedium(temp + "EMPTY.odt", noArgs); - xDP2.loadFromMedium("", mimeEmptyArgs); - assure ("Author", "".equals(xDP2.getAuthor())); - - log.println("...done"); - - log.println("(Not) Checking preservation of custom meta data ..."); - - xDP2.loadFromMedium(util.utils.getFullTestURL("CUSTOM.odt"), - noArgs); - assure ("Author", "".equals(xDP2.getAuthor())); - xDP2.storeToMedium(temp + "CUSTOM.odt", mimeArgs); - - //FIXME: now what? comparing for binary equality seems useless - // we could unzip the written file and grep for the custom stuff - // but would that work on windows... - - log.println("...done"); - - log.println("Checking loading from test document..."); - - String file = util.utils.getFullTestURL("TEST.odt"); - xDP.loadFromMedium(file, noArgs); -/* XInputStream xStream = - new StreamSimulator("./testdocuments/TEST.odt", true, param); - Object oSF = - xMSF.createInstance("com.sun.star.embed.StorageFactory"); - XSingleServiceFactory xSF = (XSingleServiceFactory) - UnoRuntime.queryInterface(XSingleServiceFactory.class, oSF); - Object oStor = xSF.createInstanceWithArguments( - new Object[] { xStream }); - XStorage xStor = (XStorage) UnoRuntime.queryInterface( - XStorage.class, oStor); - xDP.loadFromStorage(xStor);*/ - - log.println("...done"); - - log.println("Checking meta-data import..."); - - assure ("Author", "Karl-Heinz Mustermann".equals(xDP.getAuthor())); - assure ("Generator", - "StarOffice/8$Solaris_x86 OpenOffice.org_project/680m232$Build-9227" - .equals(xDP.getGenerator())); - assure ("CreationDate", 2007 == xDP.getCreationDate().Year); - assure ("Title", "Urgent Memo".equals(xDP.getTitle())); - assure ("Subject", "Wichtige Mitteilung".equals(xDP.getSubject())); - assure ("Description", - "Modern internal company memorandum in full-blocked style" - .equals(xDP.getDescription())); -// assure ("Language", "".equals(xDP.getLanguage())); - assure ("ModifiedBy", - "Karl-Heinz Mustermann".equals(xDP.getModifiedBy())); - assure ("ModificationDate", 10 == xDP.getModificationDate().Month); - assure ("PrintedBy", - "Karl-Heinz Mustermann".equals(xDP.getPrintedBy())); - assure ("PrintDate", 29 == xDP.getPrintDate().Day); - assure ("TemplateName", - "Modern Memo".equals(xDP.getTemplateName())); - assure ("TemplateURL", - xDP.getTemplateURL().endsWith("memmodern.ott")); - assure ("TemplateDate", 17 == xDP.getTemplateDate().Hours); - assure ("AutoloadURL", "../TEST.odt".equals(xDP.getAutoloadURL())); - assure ("AutoloadSecs", 0 == xDP.getAutoloadSecs()); - assure ("DefaultTarget", "_blank".equals(xDP.getDefaultTarget())); - assure ("EditingCycles", 3 == xDP.getEditingCycles()); - assure ("EditingDuration", 320 == xDP.getEditingDuration()); - - String[] kws = xDP.getKeywords(); - assure ("Keywords", fromArray(kws).containsAll( - fromArray(new Object[] { "Asien", "Memo", "Reis" }))); - - NamedValue[] ds = xDP.getDocumentStatistics(); -/* for (int i = 0; i < ds.length; ++i) { - log.println("nv: " + ds[i].Name + " " + ds[i].Value); - } - NamedValue nv1 = new NamedValue("WordCount", new Integer(23)); - NamedValue nv2 = new NamedValue("WordCount", new Integer(23)); - log.println("eq: " + nv1.equals(nv2)); // grrr, this is false... -*/ - assure ("DocumentStatistics:WordCount", containsNV(ds, - new NamedValue("WordCount", new Integer(23)))); - assure ("DocumentStatistics:PageCount", containsNV(ds, - new NamedValue("PageCount", new Integer(1)))); - - XPropertyContainer udpc = xDP.getUserDefinedProperties(); - XPropertySet udps = (XPropertySet) UnoRuntime.queryInterface( - XPropertySet.class, udpc); - assure ("UserDefined 1", "Dies ist ein wichtiger Hinweis" - .equals(udps.getPropertyValue("Hinweis"))); - assure ("UserDefined 2", ("Kann Spuren von N" - + new String(new byte[] { (byte) 0xc3, (byte) 0xbc }, "UTF-8") - + "ssen enthalten") - .equals(udps.getPropertyValue("Warnung"))); - - log.println("...done"); - - log.println("Checking meta-data updates..."); - - String str; - DateTime dt = new DateTime(); - Locale l = new Locale(); - int i; - - str = "me"; - xDP.setAuthor(str); - assure ("setAuthor", str.equals(xDP.getAuthor())); - str = "the computa"; - xDP.setGenerator(str); - assure ("setGenerator", str.equals(xDP.getGenerator())); - dt.Year = 2038; - dt.Month = 1; - dt.Day = 1; - xDP.setCreationDate(dt); - assure ("setCreationDate", dt.Year == xDP.getCreationDate().Year); - str = "El t'itulo"; - xDP.setTitle(str); - assure ("setTitle", str.equals(xDP.getTitle())); - str = "Ein verkommenes Subjekt"; - xDP.setSubject(str); - assure ("setSubject", str.equals(xDP.getSubject())); - str = "Este descripci'on no es importante"; - xDP.setDescription(str); - assure ("setDescription", str.equals(xDP.getDescription())); - l.Language = "en"; - l.Country = "GB"; - xDP.setLanguage(l); - Locale l2 = xDP.getLanguage(); - assure ("setLanguage Lang", l.Language.equals(l2.Language)); - assure ("setLanguage Cty", l.Country.equals(l2.Country)); - str = "myself"; - xDP.setModifiedBy(str); - assure ("setModifiedBy", str.equals(xDP.getModifiedBy())); - dt.Year = 2042; - xDP.setModificationDate(dt); - assure ("setModificationDate", - dt.Year == xDP.getModificationDate().Year); - str = "i didnt do it"; - xDP.setPrintedBy(str); - assure ("setPrintedBy", str.equals(xDP.getPrintedBy())); - dt.Year = 2024; - xDP.setPrintDate(dt); - assure ("setPrintDate", dt.Year == xDP.getPrintDate().Year); - str = "blah"; - xDP.setTemplateName(str); - assure ("setTemplateName", str.equals(xDP.getTemplateName())); - str = "gopher://some-hole-in-the-ground/"; - xDP.setTemplateURL(str); - assure ("setTemplateURL", str.equals(xDP.getTemplateURL())); - dt.Year = 2043; - xDP.setTemplateDate(dt); - assure ("setTemplateDate", dt.Year == xDP.getTemplateDate().Year); - str = "http://nowhere/"; - xDP.setAutoloadURL(str); - assure ("setAutoloadURL", str.equals(xDP.getAutoloadURL())); - i = 3661; // this might not work (due to conversion via double...) - xDP.setAutoloadSecs(i); -// log.println("set: " + i + " get: " + xDP.getAutoloadSecs()); - assure ("setAutoloadSecs", i == xDP.getAutoloadSecs()); - str = "_blank"; - xDP.setDefaultTarget(str); - assure ("setDefaultTarget", str.equals(xDP.getDefaultTarget())); - i = 42; - xDP.setEditingCycles((short) i); - assure ("setEditingCycles", i == xDP.getEditingCycles()); - i = 84; - xDP.setEditingDuration(i); - assure ("setEditingDuration", i == xDP.getEditingDuration()); - str = ""; - - String[] kws2 = new String[] { - "keywordly", "keywordlike", "keywordalicious" }; - xDP.setKeywords(kws2); - kws = xDP.getKeywords(); - assure ("setKeywords", fromArray(kws).containsAll(fromArray(kws2))); - - NamedValue[] ds2 = new NamedValue[] { - new NamedValue("SyllableCount", new Integer(9)), - new NamedValue("FrameCount", new Integer(2)), - new NamedValue("SentenceCount", new Integer(7)) }; - xDP.setDocumentStatistics(ds2); - ds = xDP.getDocumentStatistics(); - assure ("setDocumentStatistics:SyllableCount", containsNV(ds, - new NamedValue("SyllableCount", new Integer(9)))); - assure ("setDocumentStatistics:FrameCount", containsNV(ds, - new NamedValue("FrameCount", new Integer(2)))); - assure ("setDocumentStatistics:SentenceCount", containsNV(ds, - new NamedValue("SentenceCount", new Integer(7)))); - - log.println("...done"); - - log.println("Checking user-defined meta-data updates..."); - - // actually, this tests the PropertyBag service - // but maybe the DocumentProperties service will be implemented - // differently some day... - boolean b = true; - double d = 3.1415; - // note that Time is only supported for backward compatibilty! - Time t = new Time(); - t.Hours = 1; - t.Minutes = 16; - Date date = new Date(); - date.Year = 2071; - date.Month = 2; - date.Day = 3; - dt.Year = 2065; - Duration dur = new Duration(); - dur.Negative = true; - dur.Years = 1001; - dur.Months = 999; - dur.Days = 888; - dur.Hours = 777; - dur.Minutes = 666; - dur.Seconds = 555; - dur.MilliSeconds = 444; - - udpc.addProperty("Frobnicate", PropertyAttribute.REMOVEABLE, - new Boolean(b)); - udpc.addProperty("FrobDuration", PropertyAttribute.REMOVEABLE, dur); - udpc.addProperty("FrobDuration2", PropertyAttribute.REMOVEABLE, t); - udpc.addProperty("FrobEndDate", PropertyAttribute.REMOVEABLE, date); - udpc.addProperty("FrobStartTime", PropertyAttribute.REMOVEABLE, dt); - udpc.addProperty("Pi", PropertyAttribute.REMOVEABLE, new Double(d)); - udpc.addProperty("Foo", PropertyAttribute.REMOVEABLE, "bar"); - udpc.addProperty("Removed", PropertyAttribute.REMOVEABLE, "bar"); - // #i94175#: empty property name is valid ODF 1.1 - udpc.addProperty("", PropertyAttribute.REMOVEABLE, "eeeeek"); - try { - udpc.removeProperty("Info 1"); - udpc.removeProperty("Removed"); - } catch (UnknownPropertyException e) { - assure("removeProperty failed", false); - } - - try { - udpc.addProperty("Forbidden", PropertyAttribute.REMOVEABLE, - new String[] { "foo", "bar" }); - assure("inserting value of non-supported type did not fail", - false); - } catch (IllegalTypeException e) { - // ignore - } - - assure ("UserDefined bool", new Boolean(b).equals( - udps.getPropertyValue("Frobnicate"))); - assure ("UserDefined duration", eqDuration(dur, (Duration) - udps.getPropertyValue("FrobDuration"))); - assure ("UserDefined time", eqTime(t, (Time) - udps.getPropertyValue("FrobDuration2"))); - assure ("UserDefined date", eqDate(date, (Date) - udps.getPropertyValue("FrobEndDate"))); - assure ("UserDefined datetime", eqDateTime(dt, (DateTime) - udps.getPropertyValue("FrobStartTime"))); - assure ("UserDefined float", new Double(d).equals( - udps.getPropertyValue("Pi"))); - assure ("UserDefined string", "bar".equals( - udps.getPropertyValue("Foo"))); - assure ("UserDefined empty name", "eeeeek".equals( - udps.getPropertyValue(""))); - - try { - udps.getPropertyValue("Removed"); - assure("UserDefined remove didn't", false); - } catch (UnknownPropertyException e) { - // ok - } - - log.println("...done"); - - log.println("Checking storing meta-data to file..."); - - xDP.storeToMedium(temp + "TEST.odt", mimeArgs); - - log.println("...done"); - - log.println("Checking loading meta-data from stored file..."); - - xDP.loadFromMedium(temp + "TEST.odt", noArgs); - - log.println("...done"); - - log.println("Checking user-defined meta-data from stored file..."); - - udpc = xDP.getUserDefinedProperties(); - udps = (XPropertySet) UnoRuntime.queryInterface( - XPropertySet.class, udpc); - - assure ("UserDefined bool", new Boolean(b).equals( - udps.getPropertyValue("Frobnicate"))); - assure ("UserDefined duration", eqDuration(dur, (Duration) - udps.getPropertyValue("FrobDuration"))); - // this is now a Duration! - Duration t_dur = new Duration(false, (short)0, (short)0, (short)0, - t.Hours, t.Minutes, t.Seconds, - (short)(10 * t.HundredthSeconds)); - assure ("UserDefined time", eqDuration(t_dur, (Duration) - udps.getPropertyValue("FrobDuration2"))); - assure ("UserDefined date", eqDate(date, (Date) - udps.getPropertyValue("FrobEndDate"))); - assure ("UserDefined datetime", eqDateTime(dt, (DateTime) - udps.getPropertyValue("FrobStartTime"))); - assure ("UserDefined float", new Double(d).equals( - udps.getPropertyValue("Pi"))); - assure ("UserDefined string", "bar".equals( - udps.getPropertyValue("Foo"))); - - try { - udps.getPropertyValue("Removed"); - assure("UserDefined remove didn't", false); - } catch (UnknownPropertyException e) { - // ok - } - - log.println("...done"); - - log.println("Checking notification listener interface..."); - - Listener listener = new Listener(); - XModifyBroadcaster xMB = (XModifyBroadcaster) - UnoRuntime.queryInterface(XModifyBroadcaster.class, xDP); - xMB.addModifyListener(listener); - xDP.setAuthor("not me"); - assure ("Listener Author", listener.reset()); - udpc.addProperty("Listener", PropertyAttribute.REMOVEABLE, "foo"); - assure ("Listener UserDefined Add", listener.reset()); - udps.setPropertyValue("Listener", "bar"); - assure ("Listener UserDefined Set", listener.reset()); - udpc.removeProperty("Listener"); - assure ("Listener UserDefined Remove", listener.reset()); - xMB.removeModifyListener(listener); - udpc.addProperty("Listener2", PropertyAttribute.REMOVEABLE, "foo"); - assure ("Removed Listener UserDefined Add", !listener.reset()); - - log.println("...done"); - - } catch (Exception e) { - report(e); - } - } - - // grrr... - boolean eqDateTime(DateTime a, DateTime b) { - return a.Year == b.Year && a.Month == b.Month && a.Day == b.Day - && a.Hours == b.Hours && a.Minutes == b.Minutes - && a.Seconds == b.Seconds - && a.HundredthSeconds == b.HundredthSeconds; - } - - boolean eqDate(Date a, Date b) { - return a.Year == b.Year && a.Month == b.Month && a.Day == b.Day; - } - - boolean eqTime(Time a, Time b) { - return a.Hours == b.Hours && a.Minutes == b.Minutes - && a.Seconds == b.Seconds - && a.HundredthSeconds == b.HundredthSeconds; - } - - boolean eqDuration(Duration a, Duration b) { - return a.Years == b.Years && a.Months == b.Months && a.Days == b.Days - && a.Hours == b.Hours && a.Minutes == b.Minutes - && a.Seconds == b.Seconds - && a.MilliSeconds == b.MilliSeconds - && a.Negative == b.Negative; - } - - java.util.Collection fromArray(Object[] os) { - java.util.Collection ret = new java.util.HashSet(); - for (int i = 0; i < os.length; ++i) { - ret.add(os[i]); - } - return ret; - } - - // bah, structs do not have proper equals(), and uno.Type is not comparable - public static boolean containsNV (NamedValue[] nvs, NamedValue nv) { - for (int i = 0; i < nvs.length; ++i) { - if (nvs[i].Name.equals(nv.Name) && nvs[i].Value.equals(nv.Value)) { - return true; - } - } - return false; - } - - public void report(Exception e) { - log.println("Exception occurred:"); - e.printStackTrace((java.io.PrintWriter) log); - failed(); - } -} - diff --git a/sfx2/qa/complex/DocumentMetadataAccessTest.java b/sfx2/qa/complex/DocumentMetadataAccessTest.java deleted file mode 100644 index a61280c45fe5..000000000000 --- a/sfx2/qa/complex/DocumentMetadataAccessTest.java +++ /dev/null @@ -1,1275 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -package complex.framework; - -import complexlib.ComplexTestCase; -import helper.StreamSimulator; - -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XComponentContext; -import com.sun.star.uno.Any; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.lang.XComponent; -import com.sun.star.lang.XInitialization; -import com.sun.star.lang.XServiceInfo; -import com.sun.star.lang.IllegalArgumentException; -import com.sun.star.lang.WrappedTargetException; -import com.sun.star.lang.WrappedTargetRuntimeException; -import com.sun.star.beans.XPropertySet; -import com.sun.star.beans.PropertyValue; -import com.sun.star.beans.Pair; -import com.sun.star.beans.StringPair; -import com.sun.star.container.XEnumerationAccess; -import com.sun.star.container.XEnumeration; -import com.sun.star.container.ElementExistException; -import com.sun.star.container.NoSuchElementException; -import com.sun.star.io.XInputStream; -import com.sun.star.io.XOutputStream; -import com.sun.star.util.XCloseable; -import com.sun.star.frame.XStorable; -import com.sun.star.frame.XLoadable; -import com.sun.star.text.XTextDocument; -import com.sun.star.text.XTextRange; -import com.sun.star.text.XText; -import com.sun.star.rdf.*; - -/** - * Test case for interface com.sun.star.rdf.XDocumentMetadataAccess - * Currently, this service is implemented in - * sfx2/source/doc/DocumentMetadataAccess.cxx - * - * Actually, this is not a service, so we need to create a document and - * go from there... - * - * @author mst - */ -public class DocumentMetadataAccessTest extends ComplexTestCase -{ - XMultiServiceFactory xMSF; - XComponentContext xContext; - String tempDir; - - String nsRDF = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - String nsRDFS = "http://www.w3.org/2000/01/rdf-schema#"; - String nsPkg="http://docs.oasis-open.org/opendocument/meta/package/common#"; - String nsODF ="http://docs.oasis-open.org/opendocument/meta/package/odf#"; - - XURI foo; - XURI bar; - XURI baz; - - static XURI rdf_type; - static XURI rdfs_label; - static XURI pkg_Document; - static XURI pkg_hasPart; - static XURI pkg_MetadataFile; - static XURI odf_ContentFile; - static XURI odf_StylesFile; - static XURI odf_Element; - static XBlankNode blank1; - static XBlankNode blank2; - static XBlankNode blank3; - static XBlankNode blank4; - static String manifestPath = "manifest.rdf"; - static String contentPath = "content.xml"; - static String stylesPath = "styles.xml"; - static String fooPath = "foo.rdf"; - static String fooBarPath = "meta/foo/bar.rdf"; - - XRepository xRep; - XRepositorySupplier xRS; - XDocumentMetadataAccess xDMA; - - public String[] getTestMethodNames () - { - return new String[] { "check", "checkRDFa" }; - } - - public void before() - { - try { - - xMSF = (XMultiServiceFactory) param.getMSF(); - assure("could not create MultiServiceFactory.", xMSF != null); - XPropertySet xPropertySet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xMSF); - Object defaultCtx = xPropertySet.getPropertyValue("DefaultContext"); - xContext = (XComponentContext) - UnoRuntime.queryInterface(XComponentContext.class, defaultCtx); - assure("could not get component context.", xContext != null); - - tempDir = util.utils.getOfficeTemp/*Dir*/(xMSF); - log.println("tempdir: " + tempDir); - - foo = URI.create(xContext, "uri:foo"); - assure("foo", null != foo); - bar = URI.create(xContext, "uri:bar"); - assure("bar", null != bar); - baz = URI.create(xContext, "uri:baz"); - assure("baz", null != baz); - - blank1 = BlankNode.create(xContext, "_:1"); - assure("blank1", null != blank1); - blank2 = BlankNode.create(xContext, "_:2"); - assure("blank2", null != blank2); - blank3 = BlankNode.create(xContext, "_:3"); - assure("blank3", null != blank3); - blank4 = BlankNode.create(xContext, "_:4"); - assure("blank4", null != blank4); - rdf_type = URI.createKnown(xContext, URIs.RDF_TYPE); - assure("rdf_type", null != rdf_type); - rdfs_label = URI.createKnown(xContext, URIs.RDFS_LABEL); - assure("rdfs_label", null != rdfs_label); - pkg_Document = URI.createKnown(xContext, URIs.PKG_DOCUMENT); - assure("pkg_Document", null != pkg_Document); - pkg_hasPart = URI.createKnown(xContext, URIs.PKG_HASPART); - assure("pkg_hasPart", null != pkg_hasPart); - pkg_MetadataFile = URI.createKnown(xContext, URIs.PKG_METADATAFILE); - assure("pkg_MetadataFile", null != pkg_MetadataFile); - odf_ContentFile = URI.createKnown(xContext, URIs.ODF_CONTENTFILE); - assure("odf_ContentFile", null != odf_ContentFile); - odf_StylesFile = URI.createKnown(xContext, URIs.ODF_STYLESFILE); - assure("odf_StylesFile", null != odf_StylesFile); - odf_Element = URI.createKnown(xContext, URIs.ODF_ELEMENT); - assure("odf_Element", null != odf_Element); - - } catch (Exception e) { - report(e); - } - } - - public void after() - { - xRep = null; - xRS = null; - xDMA = null; - } - - public void check() - { - XComponent xComp = null; - XComponent xComp2 = null; - try { - XEnumeration xStmtsEnum; - XNamedGraph xManifest; - - log.println("Creating document with Repository..."); - - // we cannot create a XDMA directly, we must create - // a document and get it from there :( - // create document - PropertyValue[] loadProps = new PropertyValue[1]; - loadProps[0] = new PropertyValue(); - loadProps[0].Name = "Hidden"; - loadProps[0].Value = new Boolean(true); - xComp = util.DesktopTools.openNewDoc(xMSF, "swriter", loadProps); - XTextDocument xText = (XTextDocument) UnoRuntime.queryInterface( - XTextDocument.class, xComp); - - XRepositorySupplier xRS = (XRepositorySupplier) - UnoRuntime.queryInterface(XRepositorySupplier.class, xComp); - assure("xRS null", null != xRS); - XDocumentMetadataAccess xDMA = (XDocumentMetadataAccess) - UnoRuntime.queryInterface(XDocumentMetadataAccess.class, xRS); - assure("xDMA null", null != xDMA); - xRep = xRS.getRDFRepository(); - assure("xRep null", null != xRep); - - log.println("...done"); - - log.println("Checking that new repository is initialized..."); - - XURI xBaseURI = (XURI) xDMA; - String baseURI = xBaseURI.getStringValue(); - assure("new: baseURI", - null != xBaseURI && !xBaseURI.getStringValue().equals("")); - - assure("new: # graphs", 1 == xRep.getGraphNames().length); - XURI manifest = URI.createNS(xContext, xBaseURI.getStringValue(), - manifestPath); - xManifest = xRep.getGraph(manifest); - assure("new: manifest graph", null != xManifest); - - Statement[] manifestStmts = getManifestStmts(xBaseURI); - xStmtsEnum = xRep.getStatements(null, null, null); - assure("new: manifest graph", eq(xStmtsEnum, manifestStmts)); - - log.println("...done"); - - log.println("Checking some invalid args..."); - - String content = "behold, for i am the content."; - XTextRange xTR = new TestRange(content); - XMetadatable xM = (XMetadatable) xTR; - - try { - xDMA.getElementByURI(null); - assure("getElementByURI: null allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.getMetadataGraphsWithType(null); - assure("getMetadataGraphsWithType: null URI allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("", new XURI[0]); - assure("addMetadataFile: empty filename allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("/foo", new XURI[0]); - assure("addMetadataFile: absolute filename allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("fo\"o", new XURI[0]); - assure("addMetadataFile: invalid filename allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("../foo", new XURI[0]); - assure("addMetadataFile: filename with .. allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("foo/../../bar", new XURI[0]); - assure("addMetadataFile: filename with nest .. allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("foo/././bar", new XURI[0]); - assure("addMetadataFile: filename with nest . allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("content.xml", new XURI[0]); - assure("addMetadataFile: content.xml allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("styles.xml", new XURI[0]); - assure("addMetadataFile: styles.xml allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("meta.xml", new XURI[0]); - assure("addMetadataFile: meta.xml allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("settings.xml", new XURI[0]); - assure("addMetadataFile: settings.xml allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.importMetadataFile(FileFormat.RDF_XML, null, "foo", - foo, new XURI[0]); - assure("importMetadataFile: null stream allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - XInputStream xFooIn = - new StreamSimulator(tempDir + "empty.rdf", true, param); - xDMA.importMetadataFile(FileFormat.RDF_XML, xFooIn, "", - foo, new XURI[0]); - assure("importMetadataFile: empty filename allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - XInputStream xFooIn = - new StreamSimulator(tempDir + "empty.rdf", true, param); - xDMA.importMetadataFile(FileFormat.RDF_XML, xFooIn, "meta.xml", - foo, new XURI[0]); - assure("importMetadataFile: meta.xml filename allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - XInputStream xFooIn = - new StreamSimulator(tempDir + "empty.rdf", true, param); - xDMA.importMetadataFile(FileFormat.RDF_XML, - xFooIn, "foo", null, new XURI[0]); - assure("importMetadataFile: null base URI allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - XInputStream xFooIn = - new StreamSimulator(tempDir + "empty.rdf", true, param); - xDMA.importMetadataFile(FileFormat.RDF_XML, - xFooIn, "foo", rdf_type, new XURI[0]); - assure("importMetadataFile: non-absolute base URI allowed", - false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.removeMetadataFile(null); - assure("removeMetadataFile: null URI allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addContentOrStylesFile(""); - assure("addContentOrStylesFile: empty filename allowed", - false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addContentOrStylesFile("/content.xml"); - assure("addContentOrStylesFile: absolute filename allowed", - false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addContentOrStylesFile("foo.rdf"); - assure("addContentOrStylesFile: invalid filename allowed", - false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.removeContentOrStylesFile(""); - assure("removeContentOrStylesFile: empty filename allowed", - false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.loadMetadataFromStorage(null, foo, null); - assure("loadMetadataFromStorage: null storage allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.storeMetadataToStorage(null/*, base*/); - assure("storeMetadataToStorage: null storage allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.loadMetadataFromMedium(new PropertyValue[0]); - assure("loadMetadataFromMedium: empty medium allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.storeMetadataToMedium(new PropertyValue[0]); - assure("storeMetadataToMedium: empty medium allowed", false); - } catch (IllegalArgumentException e) { - // ignore - } - - log.println("...done"); - - log.println("Checking file addition/removal..."); - - xDMA.removeContentOrStylesFile(contentPath); - xStmtsEnum = xManifest.getStatements(null, null, null); - assure("removeContentOrStylesFile (content)", - eq(xStmtsEnum, new Statement[] { - manifestStmts[0], manifestStmts[2], manifestStmts[4] - })); - - xDMA.addContentOrStylesFile(contentPath); - xStmtsEnum = xManifest.getStatements(null, null, null); - assure("addContentOrStylesFile (content)", - eq(xStmtsEnum, manifestStmts)); - - xDMA.removeContentOrStylesFile(stylesPath); - xStmtsEnum = xManifest.getStatements(null, null, null); - assure("removeContentOrStylesFile (styles)", - eq(xStmtsEnum, new Statement[] { - manifestStmts[0], manifestStmts[1], manifestStmts[3] - })); - - xDMA.addContentOrStylesFile(stylesPath); - xStmtsEnum = xManifest.getStatements(null, null, null); - assure("addContentOrStylesFile (styles)", - eq(xStmtsEnum, manifestStmts)); - - XURI xFoo = URI.createNS(xContext, xBaseURI.getStringValue(), - fooPath); - Statement xM_BaseHaspartFoo = - new Statement(xBaseURI, pkg_hasPart, xFoo, manifest); - Statement xM_FooTypeMetadata = - new Statement(xFoo, rdf_type, pkg_MetadataFile, manifest); - Statement xM_FooTypeBar = - new Statement(xFoo, rdf_type, bar, manifest); - xDMA.addMetadataFile(fooPath, new XURI[] { bar }); - xStmtsEnum = xManifest.getStatements(null, null, null); - assure("addMetadataFile", - eq(xStmtsEnum, merge(manifestStmts, new Statement[] { - xM_BaseHaspartFoo, xM_FooTypeMetadata, xM_FooTypeBar - }))); - - XURI[] graphsBar = xDMA.getMetadataGraphsWithType(bar); - assure("getMetadataGraphsWithType", - graphsBar.length == 1 && eq(graphsBar[0], xFoo)); - - - xDMA.removeMetadataFile(xFoo); - xStmtsEnum = xManifest.getStatements(null, null, null); - assure("removeMetadataFile", - eq(xStmtsEnum, manifestStmts)); - - log.println("...done"); - - log.println("Checking mapping..."); - - XEnumerationAccess xTextEnum = (XEnumerationAccess) - UnoRuntime.queryInterface(XEnumerationAccess.class, - xText.getText()); - Object o = xTextEnum.createEnumeration().nextElement(); - XMetadatable xMeta1 = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, o); - - XURI uri; - XMetadatable xMeta; - xMeta = xDMA.getElementByURI(xMeta1); - assure("getElementByURI: null", null != xMeta); - String XmlId = xMeta.getMetadataReference().Second; - String XmlId1 = xMeta1.getMetadataReference().Second; - assure("getElementByURI: no xml id", !XmlId.equals("")); - assure("getElementByURI: different xml id", XmlId.equals(XmlId1)); - - log.println("...done"); - - log.println("Checking storing and loading..."); - - XURI xFoobar = URI.createNS(xContext, xBaseURI.getStringValue(), - fooBarPath); - Statement[] metadataStmts = getMetadataFileStmts(xBaseURI, - fooBarPath); - xDMA.addMetadataFile(fooBarPath, new XURI[0]); - xStmtsEnum = xRep.getStatements(null, null, null); - assure("addMetadataFile", - eq(xStmtsEnum, merge(manifestStmts, metadataStmts ))); - - Statement xFoobar_FooBarFoo = - new Statement(foo, bar, foo, xFoobar); - xRep.getGraph(xFoobar).addStatement(foo, bar, foo); - xStmtsEnum = xRep.getStatements(null, null, null); - assure("addStatement", - eq(xStmtsEnum, merge(manifestStmts, merge(metadataStmts, - new Statement[] { xFoobar_FooBarFoo })))); - - PropertyValue noMDNoContentFile = new PropertyValue(); - noMDNoContentFile.Name = "URL"; - noMDNoContentFile.Value = util.utils.getFullTestURL("CUSTOM.odt"); - PropertyValue noMDFile = new PropertyValue(); - noMDFile.Name = "URL"; - noMDFile.Value = util.utils.getFullTestURL("TEST.odt"); - PropertyValue file = new PropertyValue(); - file.Name = "URL"; - file.Value = tempDir + "TESTDMA.odt"; - /* - PropertyValue baseURL = new PropertyValue(); - baseURL.Name = "DocumentBaseURL"; - baseURL.Value = tempDir + "TMP.odt"; - */ - PropertyValue mimetype = new PropertyValue(); - mimetype.Name = "MediaType"; - mimetype.Value = "application/vnd.oasis.opendocument.text"; - PropertyValue[] argsEmptyNoContent = { mimetype, noMDNoContentFile}; - PropertyValue[] argsEmpty = { mimetype, noMDFile }; - PropertyValue[] args = { mimetype, file }; - - xStmtsEnum = xRep.getStatements(null, null, null); - XURI[] graphs = xRep.getGraphNames(); - - xDMA.storeMetadataToMedium(args); - - // this should re-init - xDMA.loadMetadataFromMedium(argsEmptyNoContent); - xRep = xRS.getRDFRepository(); - assure("xRep null", null != xRep); - assure("baseURI still tdoc?", - !baseURI.equals(xDMA.getStringValue())); - Statement[] manifestStmts2 = getManifestStmts((XURI) xDMA); - xStmtsEnum = xRep.getStatements(null, null, null); - // there is no content or styles file in here, so we have just - // the package stmt - assure("loadMetadataFromMedium (no metadata, no content)", - eq(xStmtsEnum, new Statement[] { manifestStmts2[0] })); - - // this should re-init - xDMA.loadMetadataFromMedium(argsEmpty); - xRep = xRS.getRDFRepository(); - assure("xRep null", null != xRep); - assure("baseURI still tdoc?", - !baseURI.equals(xDMA.getStringValue())); - Statement[] manifestStmts3 = getManifestStmts((XURI) xDMA); - - xStmtsEnum = xRep.getStatements(null, null, null); - assure("loadMetadataFromMedium (no metadata)", - eq(xStmtsEnum, manifestStmts3)); - - xDMA.loadMetadataFromMedium(args); - xRep = xRS.getRDFRepository(); - assure("xRep null", null != xRep); - Statement[] manifestStmts4 = getManifestStmts((XURI) xDMA); - Statement[] metadataStmts4 = getMetadataFileStmts((XURI) xDMA, - fooBarPath); - - xStmtsEnum = xRep.getStatements(null, null, null); - assure("some graph(s) not reloaded", - graphs.length == xRep.getGraphNames().length); - - XURI xFoobar4 = URI.createNS(xContext, xDMA.getStringValue(), - fooBarPath); - Statement xFoobar_FooBarFoo4 = - new Statement(foo, bar, foo, xFoobar4); - assure("loadMetadataFromMedium (re-load)", - eq(xStmtsEnum, merge(manifestStmts4, merge(metadataStmts4, - new Statement[] { xFoobar_FooBarFoo4 })))); - - log.println("...done"); - - log.println("Checking storing and loading via model..."); - - String f = tempDir + "TESTPARA.odt"; - - XStorable xStor = (XStorable) UnoRuntime.queryInterface( - XStorable.class, xRS); - - xStor.storeToURL(f, new PropertyValue[0]); - - xComp2 = util.DesktopTools.loadDoc(xMSF, f, loadProps); - - XDocumentMetadataAccess xDMA2 = (XDocumentMetadataAccess) - UnoRuntime.queryInterface(XDocumentMetadataAccess.class, - xComp2); - assure("xDMA2 null", null != xDMA2); - - XRepositorySupplier xRS2 = (XRepositorySupplier) - UnoRuntime.queryInterface(XRepositorySupplier.class, xComp2); - assure("xRS2 null", null != xRS2); - - XRepository xRep2 = xRS2.getRDFRepository(); - assure("xRep2 null", null != xRep2); - - Statement[] manifestStmts5 = getManifestStmts((XURI) xDMA2); - Statement[] metadataStmts5 = getMetadataFileStmts((XURI) xDMA2, - fooBarPath); - XURI xFoobar5 = URI.createNS(xContext, xDMA2.getStringValue(), - fooBarPath); - Statement xFoobar_FooBarFoo5 = - new Statement(foo, bar, foo, xFoobar5); - xStmtsEnum = xRep.getStatements(null, null, null); - XEnumeration xStmtsEnum2 = xRep2.getStatements(null, null, null); - assure("load: repository differs", - eq(xStmtsEnum2, merge(manifestStmts5, merge(metadataStmts5, - new Statement[] { xFoobar_FooBarFoo5 })))); - - log.println("...done"); - - } catch (Exception e) { - report(e); - } finally { - close(xComp); - close(xComp2); - } - } - - public void checkRDFa() - { - XComponent xComp = null; - String file; - try { - file = util.utils.getFullTestURL("TESTRDFA.odt"); - xComp = loadRDFa(file); - if (xComp != null) - { - file = tempDir + "TESTRDFA.odt"; - storeRDFa(xComp, file); - close(xComp); - xComp = loadRDFa(file); - } - } finally { - close(xComp); - } - } - - public void storeRDFa(XComponent xComp, String file) - { - try { - - log.println("Storing test document..."); - - XStorable xStor = (XStorable) UnoRuntime.queryInterface( - XStorable.class, xComp); - - xStor.storeToURL(file, new PropertyValue[0]); - - log.println("...done"); - - } catch (Exception e) { - report(e); - } - } - - public XComponent loadRDFa(String file) - { - XComponent xComp = null; - try { - - log.println("Loading test document..."); - - PropertyValue[] loadProps = new PropertyValue[1]; - loadProps[0] = new PropertyValue(); - loadProps[0].Name = "Hidden"; - loadProps[0].Value = new Boolean(true); - - - - xComp = util.DesktopTools.loadDoc(xMSF, file, loadProps); - - XRepositorySupplier xRS = (XRepositorySupplier) - UnoRuntime.queryInterface(XRepositorySupplier.class, xComp); - assure("xRS null", null != xRS); - - XDocumentRepository xRep = (XDocumentRepository) - UnoRuntime.queryInterface(XDocumentRepository.class, - xRS.getRDFRepository()); - assure("xRep null", null != xRep); - - XTextDocument xTextDoc = (XTextDocument) - UnoRuntime.queryInterface(XTextDocument.class, xComp); - - XText xText = xTextDoc.getText(); - - XEnumerationAccess xEA = (XEnumerationAccess) - UnoRuntime.queryInterface(XEnumerationAccess.class, xText); - XEnumeration xEnum = xEA.createEnumeration(); - - log.println("...done"); - - log.println("Checking RDFa in loaded test document..."); - - XMetadatable xPara; - Pair result; - - Statement x_FooBarLit1 = new Statement(foo, bar, mkLit("1"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 1", - !result.Second && - eq(result.First, new Statement[] { - x_FooBarLit1 - })); - - Statement x_FooBarLit2 = new Statement(foo, bar, mkLit("2"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 2", - !result.Second && - eq(result.First, new Statement[] { - x_FooBarLit2 - })); - - Statement x_BlankBarLit3 = - new Statement(blank1, bar, mkLit("3"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 3", - !result.Second && - eq(result.First, new Statement[] { - x_BlankBarLit3 - })); - XBlankNode b3 = (XBlankNode) UnoRuntime.queryInterface( - XBlankNode.class, result.First[0].Subject); - - Statement x_BlankBarLit4 = - new Statement(blank2, bar, mkLit("4"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 4", - !result.Second && - eq(result.First, new Statement[] { - x_BlankBarLit4 - })); - XBlankNode b4 = (XBlankNode) UnoRuntime.queryInterface( - XBlankNode.class, result.First[0].Subject); - - Statement x_BlankBarLit5 = - new Statement(blank1, bar, mkLit("5"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 5", - !result.Second && - eq(result.First, new Statement[] { - x_BlankBarLit5 - })); - XBlankNode b5 = (XBlankNode) UnoRuntime.queryInterface( - XBlankNode.class, result.First[0].Subject); - - assure("RDFa: 3 != 4", - !b3.getStringValue().equals(b4.getStringValue())); - assure("RDFa: 3 == 5", - b3.getStringValue().equals(b5.getStringValue())); - - Statement x_FooBarLit6 = new Statement(foo, bar, mkLit("6"), null); - Statement x_FooBazLit6 = new Statement(foo, baz, mkLit("6"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 6", - !result.Second && - eq(result.First, new Statement[] { - x_FooBarLit6, x_FooBazLit6 - })); - - Statement x_FooBarLit7 = new Statement(foo, bar, mkLit("7"), null); - Statement x_FooBazLit7 = new Statement(foo, baz, mkLit("7"), null); - Statement x_FooFooLit7 = new Statement(foo, foo, mkLit("7"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 7", - !result.Second && - eq(result.First, new Statement[] { - x_FooBarLit7, x_FooBazLit7, x_FooFooLit7 - })); - - XNode lit = mkLit("a fooish bar"); - XNode lit_type= mkLit("a fooish bar", bar); - Statement x_FooBarLit = new Statement(foo, bar, lit, null); - Statement x_FooBarLittype = new Statement(foo, bar, lit_type, null); - - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 8", - result.Second && - eq(result.First, new Statement[] { - x_FooBarLit - })); - - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 9", - result.Second && - eq(result.First, new Statement[] { - x_FooBarLit - })); - - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 10", - result.Second && - eq(result.First, new Statement[] { - x_FooBarLittype - })); - - Statement x_FooBarLit11 - = new Statement(foo, bar, mkLit("11", bar), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 11", - !result.Second && - eq(result.First, new Statement[] { - x_FooBarLit11 - })); - - XURI xFile = URI.createNS(xContext, file, "/" + contentPath); - Statement x_FileBarLit12 = - new Statement(xFile, bar, mkLit("12"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 12", - !result.Second && - eq(result.First, new Statement[] { - x_FileBarLit12 - })); - - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 13", - result.Second && - eq(result.First, new Statement[] { - x_FooBarLit - })); - - Statement x_FooLabelLit14 = - new Statement(foo, rdfs_label, mkLit("14"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 14", - result.Second && - eq(result.First, new Statement[] { - x_FooBarLit - })); - - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 15", eq(result.First, new Statement[] { } )); - - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 16", eq(result.First, new Statement[] { } )); - - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 17", eq(result.First, new Statement[] { } )); - - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 18", eq(result.First, new Statement[] { } )); - - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 19", eq(result.First, new Statement[] { } )); - - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 20", eq(result.First, new Statement[] { } )); - - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assure("RDFa: 21", eq(result.First, new Statement[] { } )); - - log.println("...done"); - - } catch (Exception e) { - report(e); - close(xComp); - } - return xComp; - } - - -// utilities ------------------------------------------------------------- - - public void report2(Exception e) - { - if (e instanceof WrappedTargetException) - { - log.println("Cause:"); - Exception cause = (Exception) - (((WrappedTargetException)e).TargetException); - log.println(cause.toString()); - report2(cause); - } else if (e instanceof WrappedTargetRuntimeException) { - log.println("Cause:"); - Exception cause = (Exception) - (((WrappedTargetRuntimeException)e).TargetException); - log.println(cause.toString()); - report2(cause); - } - } - - public void report(Exception e) { - log.println("Exception occurred:"); - e.printStackTrace((java.io.PrintWriter) log); - report2(e); - failed(); - } - - static void close(XComponent i_comp) - { - try { - XCloseable xClos = (XCloseable) UnoRuntime.queryInterface( - XCloseable.class, i_comp); - if (xClos != null) xClos.close(true); - } catch (Exception e) { - } - } - - XLiteral mkLit(String i_content) - { - return Literal.create(xContext, i_content); - } - - XLiteral mkLit(String i_content, XURI i_uri) - { - return Literal.createWithType(xContext, i_content, i_uri); - } - - static Statement[] merge(Statement[] i_A1, Statement[] i_A2) - { - // bah, java sucks... - Statement[] ret = new Statement[i_A1.length + i_A2.length]; - for (int i = 0; i < i_A1.length; ++i) { - ret[i] = i_A1[i]; - } - for (int i = 0; i < i_A2.length; ++i) { - ret[i+i_A1.length] = i_A2[i]; - } - return ret; - } - - public static String toS(XNode n) { - if (null == n) return "< null >"; - return n.getStringValue(); - } - - static boolean isBlank(XNode i_node) - { - XBlankNode blank = (XBlankNode) UnoRuntime.queryInterface( - XBlankNode.class, i_node); - return blank != null; - } - -/* - static class Statement implements XStatement - { - XResource m_Subject; - XResource m_Predicate; - XNode m_Object; - XURI m_Graph; - - Statement(XResource i_Subject, XResource i_Predicate, XNode i_Object, - XURI i_Graph) - { - m_Subject = i_Subject; - m_Predicate = i_Predicate; - m_Object = i_Object; - m_Graph = i_Graph; - } - - public XResource getSubject() { return m_Subject; } - public XResource getPredicate() { return m_Predicate; } - public XNode getObject() { return m_Object; } - public XURI getGraph() { return m_Graph; } - } -*/ - - static Statement[] toSeq(XEnumeration i_Enum) throws Exception - { - java.util.Collection c = new java.util.Vector(); - while (i_Enum.hasMoreElements()) { - Statement s = (Statement) i_Enum.nextElement(); -//log.println("toSeq: " + s.getSubject().getStringValue() + " " + s.getPredicate().getStringValue() + " " + s.getObject().getStringValue() + "."); - c.add(s); - } -// return (Statement[]) c.toArray(); - // java sucks - Object[] arr = c.toArray(); - Statement[] ret = new Statement[arr.length]; - for (int i = 0; i < arr.length; ++i) { - ret[i] = (Statement) arr[i]; - } - return ret; - } - - static XNode[][] toSeqs(XEnumeration i_Enum) throws Exception - { - java.util.Collection c = new java.util.Vector(); - while (i_Enum.hasMoreElements()) { - XNode[] s = (XNode[]) i_Enum.nextElement(); - c.add(s); - } -// return (XNode[][]) c.toArray(); - Object[] arr = c.toArray(); - XNode[][] ret = new XNode[arr.length][]; - for (int i = 0; i < arr.length; ++i) { - ret[i] = (XNode[]) arr[i]; - } - return ret; - } - - static class BindingComp implements java.util.Comparator - { - public int compare(Object i_Left, Object i_Right) - { - XNode[] left = (XNode[]) i_Left; - XNode[] right = (XNode[]) i_Right; - if (left.length != right.length) throw new RuntimeException(); - for (int i = 0; i < left.length; ++i) { - int eq = (left[i].getStringValue().compareTo( - right[i].getStringValue())); - if (eq != 0) return eq; - } - return 0; - } - } - - static class StmtComp implements java.util.Comparator - { - public int compare(Object i_Left, Object i_Right) - { - int eq; - Statement left = (Statement) i_Left; - Statement right = (Statement) i_Right; - if ((eq = cmp(left.Graph, right.Graph )) != 0) return eq; - if ((eq = cmp(left.Subject, right.Subject )) != 0) return eq; - if ((eq = cmp(left.Predicate, right.Predicate)) != 0) return eq; - if ((eq = cmp(left.Object, right.Object )) != 0) return eq; - return 0; - } - - public int cmp(XNode i_Left, XNode i_Right) - { - if (isBlank(i_Left)) { - return isBlank(i_Right) ? 0 : 1; - } else { - if (isBlank(i_Right)) { - return -1; - } else { - return toS(i_Left).compareTo(toS(i_Right)); - } - } - } - } - - static boolean eq(Statement i_Left, Statement i_Right) - { - XURI lG = i_Left.Graph; - XURI rG = i_Right.Graph; - if (!eq(lG, rG)) { - log.println("Graphs differ: " + toS(lG) + " != " + toS(rG)); - return false; - } - if (!eq(i_Left.Subject, i_Right.Subject)) { - log.println("Subjects differ: " + - i_Left.Subject.getStringValue() + " != " + - i_Right.Subject.getStringValue()); - return false; - } - if (!eq(i_Left.Predicate, i_Right.Predicate)) { - log.println("Predicates differ: " + - i_Left.Predicate.getStringValue() + " != " + - i_Right.Predicate.getStringValue()); - return false; - } - if (!eq(i_Left.Object, i_Right.Object)) { - log.println("Objects differ: " + - i_Left.Object.getStringValue() + " != " + - i_Right.Object.getStringValue()); - return false; - } - return true; - } - - static boolean eq(Statement[] i_Result, Statement[] i_Expected) - { - if (i_Result.length != i_Expected.length) { - log.println("eq: different lengths: " + i_Result.length + " " + - i_Expected.length); - return false; - } - Statement[] expected = (Statement[]) - java.util.Arrays.asList(i_Expected).toArray(); - java.util.Arrays.sort(i_Result, new StmtComp()); - java.util.Arrays.sort(expected, new StmtComp()); - for (int i = 0; i < expected.length; ++i) { - if (!eq(i_Result[i], expected[i])) return false; - } - return true; - } - - static boolean eq(XEnumeration i_Enum, Statement[] i_Expected) - throws Exception - { - Statement[] current = toSeq(i_Enum); - return eq(current, i_Expected); - } - - static boolean eq(XNode i_Left, XNode i_Right) - { - if (i_Left == null) { - return (i_Right == null); - } else { - return (i_Right != null) && - (i_Left.getStringValue().equals(i_Right.getStringValue()) - // FIXME: hack: blank nodes considered equal - || (isBlank(i_Left) && isBlank(i_Right))); - } - } - - static boolean eq(XQuerySelectResult i_Result, - String[] i_Vars, XNode[][] i_Bindings) throws Exception - { - String[] vars = (String[]) i_Result.getBindingNames(); - XEnumeration iter = (XEnumeration) i_Result; - XNode[][] bindings = toSeqs(iter); - if (vars.length != i_Vars.length) { - log.println("var lengths differ"); - return false; - } - if (bindings.length != i_Bindings.length) { - log.println("binding lengths differ: " + i_Bindings.length + - " vs " + bindings.length ); - return false; - } - java.util.Arrays.sort(bindings, new BindingComp()); - java.util.Arrays.sort(i_Bindings, new BindingComp()); - for (int i = 0; i < i_Bindings.length; ++i) { - if (i_Bindings[i].length != i_Vars.length) { - log.println("TEST ERROR!"); - throw new Exception(); - } - if (bindings[i].length != i_Vars.length) { - log.println("binding length and var length differ"); - return false; - } - for (int j = 0; j < i_Vars.length; ++j) { - if (!eq(bindings[i][j], i_Bindings[i][j])) { - log.println("bindings differ: " + - toS(bindings[i][j]) + " != " + toS(i_Bindings[i][j])); - return false; - } - } - } - for (int i = 0; i < i_Vars.length; ++i) { - if (!vars[i].equals(i_Vars[i])) { - log.println("variable names differ: " + - vars[i] + " != " + i_Vars[i]); - return false; - } - } - return true; - } - - static boolean eq(StringPair i_Left, StringPair i_Right) - { - return ((i_Left.First).equals(i_Right.First)) && - ((i_Left.Second).equals(i_Right.Second)); - } - - static String mkNamespace(String i_prefix, String i_namespace) - { - return "PREFIX " + i_prefix + ": <" + i_namespace + ">\n"; - } - - static String mkNss() - { - String namespaces = mkNamespace("rdf", - "http://www.w3.org/1999/02/22-rdf-syntax-ns#"); - namespaces += mkNamespace("pkg", - "http://docs.oasis-open.org/opendocument/meta/package/common#"); - namespaces += mkNamespace("odf", - "http://docs.oasis-open.org/opendocument/meta/package/odf#"); - return namespaces; - } - - Statement[] getManifestStmts(XURI xBaseURI) throws Exception - { - XURI xManifest = URI.createNS(xContext, xBaseURI.getStringValue(), - manifestPath); - XURI xContent = URI.createNS(xContext, xBaseURI.getStringValue(), - contentPath); - XURI xStyles = URI.createNS(xContext, xBaseURI.getStringValue(), - stylesPath); - Statement xM_BaseTypeDoc = - new Statement(xBaseURI, rdf_type, pkg_Document, xManifest); - Statement xM_BaseHaspartContent = - new Statement(xBaseURI, pkg_hasPart, xContent, xManifest); - Statement xM_BaseHaspartStyles = - new Statement(xBaseURI, pkg_hasPart, xStyles, xManifest); - Statement xM_ContentTypeContent = - new Statement(xContent, rdf_type, odf_ContentFile, xManifest); - Statement xM_StylesTypeStyles = - new Statement(xStyles, rdf_type, odf_StylesFile, xManifest); - return new Statement[] { - xM_BaseTypeDoc, xM_BaseHaspartContent, xM_BaseHaspartStyles, - xM_ContentTypeContent, xM_StylesTypeStyles - }; - } - - Statement[] getMetadataFileStmts(XURI xBaseURI, String Path) - throws Exception - { - XURI xManifest = URI.createNS(xContext, xBaseURI.getStringValue(), - manifestPath); - XURI xGraph = URI.createNS(xContext, xBaseURI.getStringValue(), Path); - Statement xM_BaseHaspartGraph = - new Statement(xBaseURI, pkg_hasPart, xGraph, xManifest); - Statement xM_GraphTypeMetadata = - new Statement(xGraph, rdf_type, pkg_MetadataFile, xManifest); - return new Statement[] { xM_BaseHaspartGraph, xM_GraphTypeMetadata }; - } - - class TestRange implements XTextRange, XMetadatable, XServiceInfo - { - String m_Stream; - String m_XmlId; - String m_Text; - TestRange(String i_Str) { m_Text = i_Str; } - - public String getStringValue() { return ""; } - public String getNamespace() { return ""; } - public String getLocalName() { return ""; } - - public StringPair getMetadataReference() - { return new StringPair(m_Stream, m_XmlId); } - public void setMetadataReference(StringPair i_Ref) - throws IllegalArgumentException - { m_Stream = (String)i_Ref.First; m_XmlId = (String)i_Ref.Second; } - public void ensureMetadataReference() - { m_Stream = "content.xml"; m_XmlId = "42"; } - - public String getImplementationName() { return null; } - public String[] getSupportedServiceNames() { return null; } - public boolean supportsService(String i_Svc) - { return i_Svc.equals("com.sun.star.text.Paragraph"); } - - public XText getText() { return null; } - public XTextRange getStart() { return null; } - public XTextRange getEnd() { return null; } - public String getString() { return m_Text; } - public void setString(String i_Str) { m_Text = i_Str; } - } -} - diff --git a/sfx2/qa/complex/docinfo/DocumentProperties.java b/sfx2/qa/complex/docinfo/DocumentProperties.java index cff1dd341d48..afa188e20901 100644 --- a/sfx2/qa/complex/docinfo/DocumentProperties.java +++ b/sfx2/qa/complex/docinfo/DocumentProperties.java @@ -26,9 +26,12 @@ ************************************************************************/ package complex.docinfo; +import com.sun.star.beans.*; +import com.sun.star.beans.Property; import com.sun.star.beans.PropertyValue; import com.sun.star.beans.XPropertyContainer; import com.sun.star.beans.XPropertySet; +import com.sun.star.beans.XPropertySetInfo; import com.sun.star.document.XDocumentInfo; import com.sun.star.document.XDocumentInfoSupplier; import com.sun.star.frame.XComponentLoader; @@ -37,233 +40,324 @@ import com.sun.star.lang.XComponent; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.text.XTextDocument; import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XInterface; import com.sun.star.util.Date; -import complexlib.ComplexTestCase; + import util.DesktopTools; import util.WriterTools; +import org.junit.After; +import org.junit.AfterClass; +// import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + +public class DocumentProperties +{ -public class DocumentProperties extends ComplexTestCase { XMultiServiceFactory m_xMSF = null; XTextDocument xTextDoc = null; + XTextDocument xTextDocSecond = null; - public String[] getTestMethodNames() { - return new String[] {"checkDocInfo", "cleanup"}; - } - - public void checkDocInfo() { - m_xMSF = (XMultiServiceFactory) param.getMSF(); - - log.println( - "check wether there is a valid MultiServiceFactory"); +// public String[] getTestMethodNames() { +// return new String[] {"checkDocInfo", "cleanup"}; +// } + @Test public void checkDocInfo() + { + m_xMSF = getMSF(); - if (m_xMSF == null) { - assure("## Couldn't get MultiServiceFactory make sure your Office is started", - true); - } + System.out.println("check wether there is a valid MultiServiceFactory"); - log.println("... done"); - - log.println("Opening a Writer document"); - xTextDoc = WriterTools.createTextDoc(m_xMSF); - log.println("... done"); - - XDocumentInfoSupplier xDocInfoSup = - (XDocumentInfoSupplier) UnoRuntime.queryInterface(XDocumentInfoSupplier.class, - xTextDoc); - XDocumentInfo xDocInfo = xDocInfoSup.getDocumentInfo(); - XPropertyContainer xPropContainer = - (XPropertyContainer) UnoRuntime.queryInterface(XPropertyContainer.class, - xDocInfo); - - log.println("Trying to add a existing property"); - - boolean worked = - addProperty(xPropContainer, "Author", (short) 0, ""); - assure("Could set an existing property", !worked); - log.println("...done"); - - log.println("Trying to add a integer property"); - worked = - addProperty(xPropContainer, "intValue", com.sun.star.beans.PropertyAttribute.READONLY, - new Integer(17)); - assure("Couldn't set an integer property", worked); - log.println("...done"); - - log.println("Trying to add a double property"); - worked = - addProperty(xPropContainer, "doubleValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE , - new Double(17.7)); - assure("Couldn't set an double property", worked); - log.println("...done"); - - log.println("Trying to add a boolean property"); - worked = - addProperty(xPropContainer, "booleanValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, - Boolean.TRUE); - assure("Couldn't set an boolean property", worked); - log.println("...done"); - - log.println("Trying to add a date property"); - worked = - addProperty(xPropContainer, "dateValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, - new Date()); - assure("Couldn't set an date property", worked); - log.println("...done"); - - log.println("trying to remove a read only Property"); - try { - xPropContainer.removeProperty ("intValue"); - assure("Could remove read only property", false); - } catch (Exception e) { - log.println("\tException was thrown "+e); - log.println("\t...OK"); - } - log.println("...done"); + assertNotNull("## Couldn't get MultiServiceFactory make sure your Office is started", m_xMSF); String tempdir = System.getProperty("java.io.tmpdir"); String fs = System.getProperty("file.separator"); - if (!tempdir.endsWith(fs)) { + if (!tempdir.endsWith(fs)) + { tempdir += fs; } - tempdir = util.utils.getFullURL(tempdir); - - log.println("Storing the document"); - - try { - XStorable store = - (XStorable) UnoRuntime.queryInterface(XStorable.class, - xTextDoc); - store.storeToURL(tempdir + "DocInfo.oot", - new PropertyValue[] {}); - DesktopTools.closeDoc(xTextDoc); - } catch (Exception e) { - assure("Couldn't store document", false); + final String sTempDocument = tempdir + "DocInfo.oot"; + + if (true) + { + System.out.println("... done"); + + + System.out.println("Opening a Writer document"); + xTextDoc = WriterTools.createTextDoc(m_xMSF); + System.out.println("... done"); + + XDocumentInfoSupplier xDocInfoSup = UnoRuntime.queryInterface(XDocumentInfoSupplier.class, xTextDoc); + XDocumentInfo xDocInfo = xDocInfoSup.getDocumentInfo(); + XPropertyContainer xPropContainer = UnoRuntime.queryInterface(XPropertyContainer.class, xDocInfo); + + System.out.println("Trying to add a existing property"); + + boolean worked = addProperty(xPropContainer, "Author", (short) 0, ""); + assertTrue("Could set an existing property", !worked); + System.out.println("...done"); + + System.out.println("Trying to add a integer property"); + worked = addProperty(xPropContainer, "intValue", com.sun.star.beans.PropertyAttribute.READONLY, new Integer(17)); + assertTrue("Couldn't set an integer property", worked); + System.out.println("...done"); + + System.out.println("Trying to add a double property"); + worked = addProperty(xPropContainer, "doubleValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, new Double(17.7)); + assertTrue("Couldn't set an double property", worked); + System.out.println("...done"); + + System.out.println("Trying to add a boolean property"); + worked = addProperty(xPropContainer, "booleanValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, Boolean.TRUE); + assertTrue("Couldn't set an boolean property", worked); + System.out.println("...done"); + + System.out.println("Trying to add a date property"); + worked = addProperty(xPropContainer, "dateValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, new Date()); + assertTrue("Couldn't set an date property", worked); + System.out.println("...done"); + + System.out.println("trying to remove a read only Property"); + try + { + xPropContainer.removeProperty("intValue"); + fail("Could remove read only property"); + } + catch (Exception e) + { + System.out.println("\tException was thrown " + e); + System.out.println("\t...OK"); + } + System.out.println("...done"); + + XPropertySet xProps2 = UnoRuntime.queryInterface(XPropertySet.class, xPropContainer); + showPropertySet(xProps2); + + + System.out.println("Storing the document"); + try + { + XStorable store = UnoRuntime.queryInterface(XStorable.class, xTextDoc); + store.storeToURL(sTempDocument, new PropertyValue[] {}); + DesktopTools.closeDoc(xTextDoc); + } + catch (Exception e) + { + fail("Couldn't store document"); + } + + System.out.println("...done"); } - log.println("...done"); - - log.println("loading the document"); - - try { - XComponentLoader xCL = - (XComponentLoader) UnoRuntime.queryInterface(XComponentLoader.class, - m_xMSF.createInstance( - "com.sun.star.frame.Desktop")); - XComponent xComp = - xCL.loadComponentFromURL(tempdir + "DocInfo.oot", - "_blank", 0, new PropertyValue[] {}); - xTextDoc = - (XTextDocument) UnoRuntime.queryInterface(XTextDocument.class, - xComp); - } catch (Exception e) { - assure("Couldn't load document", false); - } - log.println("...done"); - - xDocInfoSup = - (XDocumentInfoSupplier) UnoRuntime.queryInterface(XDocumentInfoSupplier.class, - xTextDoc); - xDocInfo = xDocInfoSup.getDocumentInfo(); - - XPropertySet xProps = - (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, - xDocInfo); - - assure("Integer doesn't work", - checkType(xProps, "intValue", "java.lang.Integer")); - assure("Double doesn't work", - checkType(xProps, "doubleValue", "java.lang.Double")); - assure("Boolean doesn't work", - checkType(xProps, "booleanValue", "java.lang.Boolean")); - assure("Date doesn't work", - checkType(xProps, "dateValue", - "com.sun.star.util.DateTime")); - - xPropContainer = - (XPropertyContainer) UnoRuntime.queryInterface(XPropertyContainer.class, - xDocInfo); - - log.println("trying to remove a not user defined Property"); - try { - xPropContainer.removeProperty ("Author"); - assure("Could remove non user defined property", false); - } catch (Exception e) { - log.println("\tException was thrown "+e); - log.println("\t...OK"); - } - log.println("...done"); - - log.println("Trying to remove a user defined property"); - try { - xPropContainer.removeProperty ("dateValue"); - log.println("\t...OK"); - } catch (Exception e) { - log.println("\tException was thrown "+e); - log.println("\t...FAILED"); - assure("Could not remove user defined property", false); + if (true) + { + System.out.println("loading the document"); + + try + { + XComponentLoader xCL = UnoRuntime.queryInterface(XComponentLoader.class, m_xMSF.createInstance("com.sun.star.frame.Desktop")); + XComponent xComp = xCL.loadComponentFromURL(sTempDocument, "_blank", 0, new PropertyValue[] {}); + xTextDocSecond = UnoRuntime.queryInterface(XTextDocument.class, xComp); + } + catch (Exception e) + { + fail("Couldn't load document"); + } + + System.out.println("...done"); + + XDocumentInfoSupplier xDocInfoSup = UnoRuntime.queryInterface(XDocumentInfoSupplier.class, xTextDocSecond); + XDocumentInfo xDocInfo = xDocInfoSup.getDocumentInfo(); + XPropertyContainer xPropContainer = UnoRuntime.queryInterface(XPropertyContainer.class, xDocInfo); + + XPropertySet xProps = UnoRuntime.queryInterface(XPropertySet.class, xDocInfo); + showPropertySet(xProps); + + assertTrue("Double doesn't work", checkType(xProps, "doubleValue", "java.lang.Double")); + assertTrue("Boolean doesn't work", checkType(xProps, "booleanValue", "java.lang.Boolean")); + + // TODO: dateValue does not exist. + // assertTrue("Date doesn't work", checkType(xProps, "dateValue", "com.sun.star.util.DateTime")); + + // TODO: is java.lang.Double + // assertTrue("Integer doesn't work", checkType(xProps, "intValue", "java.lang.Integer")); + + xPropContainer = UnoRuntime.queryInterface(XPropertyContainer.class, xDocInfo); + + System.out.println("trying to remove a not user defined Property"); + try + { + xPropContainer.removeProperty("Author"); + fail("Could remove non user defined property"); + } + catch (Exception e) + { + System.out.println("\tException was thrown " + e); + System.out.println("\t...OK"); + } + System.out.println("...done"); + + + System.out.println("Trying to remove a user defined property"); + try + { + xPropContainer.removeProperty("booleanValue"); + System.out.println("\t...OK"); + } + catch (Exception e) + { + System.out.println("\tException was thrown " + e); + System.out.println("\t...FAILED"); + fail("Could not remove user defined property"); + } + showPropertySet(xProps); + System.out.println("...done"); } - log.println("...done"); - } - public void cleanup() { + @After public void cleanup() + { + DesktopTools.closeDoc(xTextDocSecond); DesktopTools.closeDoc(xTextDoc); } + private void showPropertySet(XPropertySet xProps) + { + try + { + // get an XPropertySet, here the one of a text cursor + // XPropertySet xCursorProps = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, mxDocCursor); + + // get the property info interface of this XPropertySet + XPropertySetInfo xPropsInfo = xProps.getPropertySetInfo(); + + // get all properties (NOT the values) from XPropertySetInfo + Property[] aProps = xPropsInfo.getProperties(); + int i; + for (i = 0; i < aProps.length; ++i) { + // number of property within this info object + System.out.print("Property #" + i); + + // name of property + System.out.print(": Name<" + aProps[i].Name); + + // handle of property (only for XFastPropertySet) + System.out.print("> Handle<" + aProps[i].Handle); + + // type of property + System.out.print("> " + aProps[i].Type.toString()); + + // attributes (flags) + System.out.print(" Attributes<"); + short nAttribs = aProps[i].Attributes; + if ((nAttribs & PropertyAttribute.MAYBEVOID) != 0) + System.out.print("MAYBEVOID|"); + if ((nAttribs & PropertyAttribute.BOUND) != 0) + System.out.print("BOUND|"); + if ((nAttribs & PropertyAttribute.CONSTRAINED) != 0) + System.out.print("CONSTRAINED|"); + if ((nAttribs & PropertyAttribute.READONLY) != 0) + System.out.print("READONLY|"); + if ((nAttribs & PropertyAttribute.TRANSIENT) != 0) + System.out.print("TRANSIENT|"); + if ((nAttribs & PropertyAttribute.MAYBEAMBIGUOUS ) != 0) + System.out.print("MAYBEAMBIGUOUS|"); + if ((nAttribs & PropertyAttribute.MAYBEDEFAULT) != 0) + System.out.print("MAYBEDEFAULT|"); + if ((nAttribs & PropertyAttribute.REMOVEABLE) != 0) + System.out.print("REMOVEABLE|"); + System.out.println("0>"); + } + } catch (Exception e) { + // If anything goes wrong, give the user a stack trace + e.printStackTrace(System.out); + } + } + private boolean checkType(XPropertySet xProps, String aName, - String expected) { + String expected) + { boolean ret = true; - log.println("Checking " + expected); + System.out.println("Checking " + expected); String getting = - getPropertyByName(xProps, aName).getClass().getName(); + getPropertyByName(xProps, aName).getClass().getName(); - if (!getting.equals(expected)) { - log.println("\t Expected: " + expected); - log.println("\t Detting: " + getting); + if (!getting.equals(expected)) + { + System.out.println("\t Expected: " + expected); + System.out.println("\t Getting: " + getting); ret = false; } - if (ret) { - log.println("...OK"); + if (ret) + { + System.out.println("...OK"); } - return ret; } - private Object getPropertyByName(XPropertySet xProps, String aName) { + private Object getPropertyByName(XPropertySet xProps, String aName) + { Object ret = null; - try { + try + { ret = xProps.getPropertyValue(aName); - } catch (Exception e) { - log.println("\tCouldn't get Property " + aName); - log.println("\tMessage " + e); + } + catch (Exception e) + { + System.out.println("\tCouldn't get Property " + aName); + System.out.println("\tMessage " + e); } return ret; } private boolean addProperty(XPropertyContainer xPropContainer, - String aName, short attr, Object defaults) { + String aName, short attr, Object defaults) + { boolean ret = true; - try { + try + { xPropContainer.addProperty(aName, attr, defaults); - } catch (Exception e) { + } + catch (Exception e) + { ret = false; - log.println("\tCouldn't get Property " + aName); - log.println("\tMessage " + e); + System.out.println("\tCouldn't get Property " + aName); + System.out.println("\tMessage " + e); } return ret; } + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception + { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + private static final OfficeConnection connection = new OfficeConnection(); } diff --git a/sfx2/qa/complex/docinfo/makefile.mk b/sfx2/qa/complex/docinfo/makefile.mk index 8c3525541062..51f2ddd02597 100644 --- a/sfx2/qa/complex/docinfo/makefile.mk +++ b/sfx2/qa/complex/docinfo/makefile.mk @@ -25,32 +25,39 @@ # #************************************************************************* -PRJ = ..$/..$/.. -TARGET = DocumentProperties +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE + +PRJ = ../../.. PRJNAME = sfx2 -PACKAGE = complex$/docinfo +TARGET = qa_complex_docinfo -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/docinfo +JAVATESTFILES = \ + DocumentProperties.java + +JAVAFILES = $(JAVATESTFILES) -#----- compile .java files ----------------------------------------- +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -JAVAFILES = DocumentProperties.java +# Sample how to debug +JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y + +.END + +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk -#----- make a jar from compiled files ------------------------------ +ALLTAR : javatest -MAXLINELENGTH = 100000 +.END -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE -# --- Targets ------------------------------------------------------ -.INCLUDE : target.mk -run: - $(JAVAI) $(JAVAIFLAGS) -cp $(CLASSPATH) org.openoffice.Runner -TestBase java_complex -o $(PACKAGE:s#$/#.#).$(JAVAFILES:b) diff --git a/sfx2/qa/complex/framework/CheckGlobalEventBroadcaster_writer1.java b/sfx2/qa/complex/framework/CheckGlobalEventBroadcaster_writer1.java new file mode 100644 index 000000000000..c6dc073095b1 --- /dev/null +++ b/sfx2/qa/complex/framework/CheckGlobalEventBroadcaster_writer1.java @@ -0,0 +1,281 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.framework; + +import com.sun.star.awt.XWindow; +import com.sun.star.document.XEventBroadcaster; +import com.sun.star.document.XEventListener; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.sheet.XSpreadsheetDocument; +import com.sun.star.text.XTextDocument; +import com.sun.star.uno.UnoRuntime; +import complex.framework.DocHelper.WriterHelper; + +import java.util.ArrayList; + +import util.UITools; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + + +/** + * This testcase checks the GlobalEventBroadcaster + * it will add an XEventListener and verify the Events + * raised when opening/changing and closing Office Documents + */ +public class CheckGlobalEventBroadcaster_writer1 { + XMultiServiceFactory m_xMSF = null; + XEventBroadcaster m_xEventBroadcaster = null; + ArrayList notifyEvents = new ArrayList(); + // XTextDocument xTextDoc; + XSpreadsheetDocument xSheetDoc; + XEventListener m_xEventListener = new EventListenerImpl(); + +// public String[] getTestMethodNames() { +// return new String[] { +// "initialize", "checkWriter", "cleanup" +// }; +// } + + @Before public void initialize() { + m_xMSF = getMSF(); + System.out.println("check wether there is a valid MultiServiceFactory"); + + assertNotNull("## Couldn't get MultiServiceFactory make sure your Office is started", m_xMSF); + + System.out.println("... done"); + + System.out.println( + "Create an instance of com.sun.star.frame.GlobalEventBroadcaster"); + + Object GlobalEventBroadcaster = null; + Object dispatcher = null; + + try { + GlobalEventBroadcaster = m_xMSF.createInstance( + "com.sun.star.frame.GlobalEventBroadcaster"); + } catch (com.sun.star.uno.Exception e) { + fail("## Exception while creating instance"); + } + + System.out.println("... done"); + + System.out.println("check wether the created instance is valid"); + + assertNotNull("couldn't create service", GlobalEventBroadcaster); + + System.out.println("... done"); + + System.out.println( + "try to query the XEventBroadcaster from the gained Object"); + m_xEventBroadcaster = UnoRuntime.queryInterface(XEventBroadcaster.class, GlobalEventBroadcaster); + + if (util.utils.isVoid(m_xEventBroadcaster)) { + fail("couldn't get XEventBroadcaster"); + } + + System.out.println("... done"); + + System.out.println("adding Listener"); + m_xEventBroadcaster.addEventListener(m_xEventListener); + System.out.println("... done"); + } + + @Test public void checkWriter() { + System.out.println("-- Checking Writer --"); + + WriterHelper wHelper = new WriterHelper(m_xMSF); + String[] expected; + boolean locRes = true; + System.out.println("opening an empty writer doc"); + notifyEvents.clear(); + { + XTextDocument xTextDoc = wHelper.openEmptyDoc(); + shortWait(); + expected = new String[] { "OnUnfocus", "OnCreate", "OnViewCreated", "OnFocus" }; + + assertTrue("Wrong events fired when opening empty doc", + proveExpectation(expected)); + System.out.println("... done"); + + System.out.println("changing the writer doc"); + notifyEvents.clear(); + xTextDoc.getText().setString("GlobalEventBroadcaster"); + shortWait(); + expected = new String[] { "OnModifyChanged" }; + + assertTrue("Wrong events fired when changing doc", + proveExpectation(expected)); + System.out.println("... done"); + + System.out.println("closing the empty writer doc"); + notifyEvents.clear(); + wHelper.closeDoc(xTextDoc); + shortWait(); + } + expected = new String[] { "OnUnfocus", "OnFocus", "OnViewClosed", "OnUnload" }; + + assertTrue("Wrong events fired when closing empty doc", + proveExpectation(expected)); + System.out.println("... done"); + + System.out.println("opening an writer doc via Window-New Window"); + notifyEvents.clear(); + { + XTextDocument xTextDoc = wHelper.openFromDialog(".uno:NewWindow", "", false); + + shortWait(); + expected = new String[] { "OnUnfocus", "OnCreate", "OnViewCreated", "OnFocus", "OnUnfocus", "OnViewCreated", "OnFocus", }; + + assertTrue("Wrong events fired when opening an writer doc via Window-New Window", + proveExpectation(expected)); + System.out.println("... done"); + + System.out.println("closing the created writer doc"); + notifyEvents.clear(); + + wHelper.closeDoc(xTextDoc); + shortWait(); + } + expected = new String[] { "OnViewClosed", "OnUnfocus", "OnFocus", "OnViewClosed", "OnUnload" }; + + assertTrue("Wrong events fired when closing Window-New Window", + proveExpectation(expected)); + + System.out.println("... done"); + // TODO: It seems not possible to close the document without interactiv question + // there the follow test will not be execute + if (false) { + System.out.println("Opening document with label wizard"); + XTextDocument xTextDoc = wHelper.openFromDialog("private:factory/swriter?slot=21051", "", false); + shortWait(); + XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, wHelper.getToolkit().getActiveTopWindow()); + UITools ut = new UITools(m_xMSF,xWindow); + notifyEvents.clear(); + System.out.println("pressing button 'New Document'"); + try{ + ut.clickButton ("New Document"); + } catch (Exception e) { + System.out.println("Couldn't press Button"); + } + System.out.println("... done"); + shortWait(); + shortWait(); + shortWait(); + expected = new String[] { "OnViewClosed", "OnCreate", "OnFocus", "OnModifyChanged" }; + + assertTrue("Wrong events fired when starting labels wizard", + proveExpectation(expected)); + + System.out.println("Try to close document..."); + wHelper.closeDoc(xTextDoc); + shortWait(); + wHelper.closeFromDialog(); + shortWait(); + xTextDoc = null; + } + + System.out.println("-- Done Writer --"); + } + + @After public void cleanup() { + System.out.println("removing Listener"); + m_xEventBroadcaster.removeEventListener(m_xEventListener); + System.out.println("... done"); + } + + /** + * Sleeps for 0.5 sec. to allow StarOffice to react on + * reset call. + */ + private void shortWait() { + try { + Thread.sleep(2000); + } catch (InterruptedException e) { + System.out.println("While waiting :" + e); + } + } + + private boolean proveExpectation(String[] expected) { + boolean locRes = true; + boolean failure = false; + + System.out.println("Fired Events:"); + for (int k=0;k + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.framework.DocHelper; + +import com.sun.star.beans.PropertyValue; +import com.sun.star.frame.XController; +import com.sun.star.frame.XDispatch; +import com.sun.star.frame.XDispatchProvider; +import com.sun.star.frame.XModel; +import com.sun.star.lang.XComponent; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.uno.UnoRuntime; +import com.sun.star.util.URL; +import com.sun.star.util.XURLTransformer; + +import java.lang.Thread; + + +/** + * This class opens a given dialog in a separate Thread by dispatching an url + * + */ +public class DialogThread extends Thread { + public XComponent m_xDoc = null; + public XMultiServiceFactory m_xMSF = null; + public String m_url = ""; + + public DialogThread(XComponent xDoc, XMultiServiceFactory msf, String url) { + this.m_xDoc = xDoc; + this.m_xMSF = msf; + this.m_url = url; + } + + public void run() { + XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, + m_xDoc); + + XController xController = aModel.getCurrentController(); + + //Opening Dialog + try { + XDispatchProvider xDispProv = (XDispatchProvider) UnoRuntime.queryInterface( + XDispatchProvider.class, + xController.getFrame()); + XURLTransformer xParser = (com.sun.star.util.XURLTransformer) UnoRuntime.queryInterface( + XURLTransformer.class, + m_xMSF.createInstance( + "com.sun.star.util.URLTransformer")); + + // Because it's an in/out parameter + // we must use an array of URL objects. + URL[] aParseURL = new URL[1]; + aParseURL[0] = new URL(); + aParseURL[0].Complete = m_url; + xParser.parseStrict(aParseURL); + + URL aURL = aParseURL[0]; + XDispatch xDispatcher = xDispProv.queryDispatch(aURL, "", com.sun.star.frame.FrameSearchFlag.SELF | + com.sun.star.frame.FrameSearchFlag.CHILDREN); + PropertyValue[] dispatchArguments = new PropertyValue[0]; + + if (xDispatcher != null) { + xDispatcher.dispatch(aURL, dispatchArguments); + } else { + System.out.println("xDispatcher is null"); + } + } catch (com.sun.star.uno.Exception e) { + System.out.println("Couldn't open dialog"); + } + } +} \ No newline at end of file diff --git a/sfx2/qa/complex/framework/DocHelper/WriterHelper.java b/sfx2/qa/complex/framework/DocHelper/WriterHelper.java new file mode 100644 index 000000000000..d3f19703bb9d --- /dev/null +++ b/sfx2/qa/complex/framework/DocHelper/WriterHelper.java @@ -0,0 +1,287 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.framework.DocHelper; + +import com.sun.star.accessibility.AccessibleRole; +import com.sun.star.accessibility.XAccessible; +import com.sun.star.accessibility.XAccessibleAction; +import com.sun.star.accessibility.XAccessibleContext; +import com.sun.star.accessibility.XAccessibleSelection; +import com.sun.star.awt.XExtendedToolkit; +import com.sun.star.awt.XWindow; +import com.sun.star.frame.XDesktop; +import com.sun.star.lang.XComponent; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.text.XTextDocument; +import com.sun.star.uno.UnoRuntime; +import com.sun.star.util.XCloseable; + +import complex.framework.DocHelper.DialogThread; +import java.io.PrintWriter; + +import util.AccessibilityTools; +import util.WriterTools; + + +/** + * Methods to open Writer docs + * + */ +public class WriterHelper { + XMultiServiceFactory m_xMSF = null; + + /** Creates a new instance of WriterHelper + * @param m_xMSF The MultiServiceFactory gained from the office + */ + public WriterHelper(XMultiServiceFactory m_xMSF) { + this.m_xMSF = m_xMSF; + } + + /** Opens an empty document + * @return a reference to the opened document is returned + */ + public XTextDocument openEmptyDoc() { + return WriterTools.createTextDoc(m_xMSF); + } + + /** Closes a given XTextDocument + * @param xTextDoc the text document to be closed + * @return if an error occurs the errormessage is returned and an empty String if not + */ + public String closeDoc(XTextDocument xTextDoc) { + XCloseable closer = UnoRuntime.queryInterface(XCloseable.class, xTextDoc); + String err = ""; + + try { + closer.close(true); + } catch (com.sun.star.util.CloseVetoException e) { + err = "couldn't close document " + e; + System.out.println(err); + } + + return err; + } + + private XTextDocument xLocalDoc = null; + /** a TextDocument is opened by pressing a button in a dialog given by uno-URL + * @param url the uno-URL of the dialog to be opened + * @param createButton the language dependend label of the button to be pressed + * @param destroyLocal if true the document that has been opened to dispatch the dialog is closed before the method returns, + * otherwise this document remains open + * @return returns the created Textdocument + */ + public XTextDocument openFromDialog(String url, String createButton, + boolean destroyLocal) { + xLocalDoc = WriterTools.createTextDoc(m_xMSF); + XComponent comp = UnoRuntime.queryInterface(XComponent.class, xLocalDoc); + DialogThread diagThread = new DialogThread(comp, m_xMSF, url); + diagThread.start(); + shortWait(); + + if (createButton.length() > 1) { + XExtendedToolkit tk = getToolkit(); + AccessibilityTools at = new AccessibilityTools(); + Object atw = tk.getActiveTopWindow(); + + XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, atw); + + XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessibleContext buttonContext = at.getAccessibleObjectForRole( + xRoot, + AccessibleRole.PUSH_BUTTON, + createButton); + + XAccessibleAction buttonAction = UnoRuntime.queryInterface(XAccessibleAction.class, buttonContext); + + try { + System.out.println("Name: " + + buttonContext.getAccessibleName()); + buttonAction.doAccessibleAction(0); + } catch (com.sun.star.lang.IndexOutOfBoundsException e) { + System.out.println("Couldn't press button"); + } + + shortWait(); + } + + XDesktop xDesktop = getDesktop(); + + XTextDocument returnDoc = UnoRuntime.queryInterface(XTextDocument.class, xDesktop.getCurrentComponent()); + + if (destroyLocal) { + closeDoc(xLocalDoc); + xLocalDoc = null; + } + + return returnDoc; + } + public void closeFromDialog() + { + closeDoc(xLocalDoc); + xLocalDoc = null; + } + public void kill() + { + XDesktop xDesktop = getDesktop(); + xDesktop.terminate(); + } + + + public XTextDocument DocByAutopilot(XMultiServiceFactory msf, + int[] indexes, boolean destroyLocal, + String bName) { + XTextDocument xLocalDoc = WriterTools.createTextDoc(m_xMSF); + Object toolkit = null; + + try { + toolkit = msf.createInstance("com.sun.star.awt.Toolkit"); + } catch (com.sun.star.uno.Exception e) { + e.printStackTrace(); + } + + XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class, toolkit); + + shortWait(); + + AccessibilityTools at = new AccessibilityTools(); + + Object atw = tk.getActiveTopWindow(); + + XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, atw); + + XAccessible xRoot = at.getAccessibleObject(xWindow); + + XAccessibleContext ARoot = at.getAccessibleObjectForRole(xRoot, + AccessibleRole.MENU_BAR); + XAccessibleSelection sel = UnoRuntime.queryInterface(XAccessibleSelection.class, ARoot); + + for (int k = 0; k < indexes.length; k++) { + try { + sel.selectAccessibleChild(indexes[k]); + shortWait(); + ARoot = ARoot.getAccessibleChild(indexes[k]) + .getAccessibleContext(); + sel = UnoRuntime.queryInterface(XAccessibleSelection.class, ARoot); + } catch (com.sun.star.lang.IndexOutOfBoundsException e) { + } + } + + shortWait(); + + atw = tk.getActiveTopWindow(); + + xWindow = UnoRuntime.queryInterface(XWindow.class, atw); + + xRoot = at.getAccessibleObject(xWindow); + + //at.printAccessibleTree(new PrintWriter(System.out),xRoot); + + XAccessibleAction action = UnoRuntime.queryInterface(XAccessibleAction.class, at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, bName)); + + try { + action.doAccessibleAction(0); + } catch (com.sun.star.lang.IndexOutOfBoundsException e) { + } + + shortWait(); + + atw = tk.getActiveTopWindow(); + + xWindow = UnoRuntime.queryInterface(XWindow.class, atw); + + xRoot = at.getAccessibleObject(xWindow); + + at.printAccessibleTree(new PrintWriter(System.out),xRoot); + + action = UnoRuntime.queryInterface(XAccessibleAction.class, at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Yes")); + + try { + if (action != null) action.doAccessibleAction(0); + } catch (com.sun.star.lang.IndexOutOfBoundsException e) { + } + + shortWait(); + + XDesktop xDesktop = getDesktop(); + + XTextDocument returnDoc = UnoRuntime.queryInterface(XTextDocument.class, xDesktop.getCurrentComponent()); + + if (destroyLocal) { + closeDoc(xLocalDoc); + } + + return returnDoc; + } + + /** + * Sleeps for 2 sec. to allow StarOffice to react + */ + private void shortWait() { + try { + Thread.sleep(4000); + } catch (InterruptedException e) { + System.out.println("While waiting :" + e); + } + } + + /** creates an instance of com.sun.star.awt.Toolkit to query the XExtendedToolkit + * interface + * @return returns the gained XExtendedToolkit Interface + */ + public XExtendedToolkit getToolkit() { + Object toolkit = null; + + try { + toolkit = m_xMSF.createInstance("com.sun.star.awt.Toolkit"); + } catch (com.sun.star.uno.Exception e) { + System.out.println("Couldn't get toolkit"); + e.printStackTrace(); + } + + XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class, toolkit); + + return tk; + } + + /** creates an instance of com.sun.star.frame.Desktop to query the XDesktop interface + * @return returns the gained XDesktop interface + */ + protected XDesktop getDesktop() { + Object desk = null; + + try { + desk = m_xMSF.createInstance("com.sun.star.frame.Desktop"); + } catch (com.sun.star.uno.Exception e) { + System.out.println("Couldn't get desktop"); + e.printStackTrace(); + } + + XDesktop xDesktop = UnoRuntime.queryInterface(XDesktop.class, desk); + + return xDesktop; + } +} \ No newline at end of file diff --git a/sfx2/qa/complex/framework/DocHelper/makefile.mk b/sfx2/qa/complex/framework/DocHelper/makefile.mk new file mode 100644 index 000000000000..ad614cfca3f8 --- /dev/null +++ b/sfx2/qa/complex/framework/DocHelper/makefile.mk @@ -0,0 +1,49 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ = ../../../.. +TARGET = DocHelper +PRJNAME = $(TARGET) +PACKAGE = complex/framework/dochelper + +# --- Settings ----------------------------------------------------- +.INCLUDE: settings.mk + + +#----- compile .java files ----------------------------------------- + +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar +JAVAFILES = \ + DialogThread.java \ + WriterHelper.java + +JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class) + +# --- Targets ------------------------------------------------------ + +.INCLUDE : target.mk + diff --git a/sfx2/qa/complex/framework/DocumentMetaData.java b/sfx2/qa/complex/framework/DocumentMetaData.java new file mode 100644 index 000000000000..c94d2f64e768 --- /dev/null +++ b/sfx2/qa/complex/framework/DocumentMetaData.java @@ -0,0 +1,565 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +package complex.framework; + + +import com.sun.star.uno.UnoRuntime; +import com.sun.star.uno.XComponentContext; +import com.sun.star.lang.XInitialization; + +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.lang.Locale; +import com.sun.star.lang.EventObject; +import com.sun.star.util.Date; +import com.sun.star.util.DateTime; +import com.sun.star.util.Time; +import com.sun.star.util.Duration; +import com.sun.star.util.XModifyListener; +import com.sun.star.util.XModifyBroadcaster; +import com.sun.star.beans.XPropertyContainer; +import com.sun.star.beans.XPropertySet; +import com.sun.star.beans.PropertyValue; +import com.sun.star.beans.NamedValue; +import com.sun.star.beans.PropertyAttribute; +import com.sun.star.beans.UnknownPropertyException; +import com.sun.star.beans.IllegalTypeException; + +import com.sun.star.document.XDocumentProperties; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + +/** + * Test case for the service com.sun.star.document.DocumentProperties. + * Currently, this service is implemented in + * sfx2/source/doc/SfxDocumentMetaData.cxx. + * + * @author mst + */ +public class DocumentMetaData +{ +// public String[] getTestMethodNames () { +// return new String[] { "check", "cleanup" }; +// } + + @After public void cleanup() { + // nothing to do + } + + // for testing modifications + class Listener implements XModifyListener { + private boolean m_Called; + + public Listener() { + m_Called = false; + } + + public boolean reset() { + boolean oldCalled = m_Called; + m_Called = false; + return oldCalled; + } + + public void modified(EventObject e) { + m_Called = true; + } + + public void disposing(EventObject e) { + } + } + + @Test public void check() { + try { + XMultiServiceFactory xMSF = getMSF(); + assertNotNull("could not create MultiServiceFactory.", xMSF); + XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xMSF); + Object defaultCtx = xPropertySet.getPropertyValue("DefaultContext"); + XComponentContext xContext = UnoRuntime.queryInterface(XComponentContext.class, defaultCtx); + assertNotNull("could not get component context.", xContext); + + // TODO: Path to temp + String temp = util.utils.getOfficeTemp/*Dir*/(xMSF); + System.out.println("tempdir: " + temp); + + PropertyValue[] noArgs = { }; + PropertyValue mimetype = new PropertyValue(); + mimetype.Name = "MediaType"; + mimetype.Value = "application/vnd.oasis.opendocument.text"; + PropertyValue[] mimeArgs = { mimetype }; +// new Any("application/vnd.oasis.opendocument.text")) }; + PropertyValue cfile = new PropertyValue(); + cfile.Name = "URL"; + cfile.Value = temp + "EMPTY.odt"; + PropertyValue[] mimeEmptyArgs = { mimetype, cfile }; + + System.out.println("Creating service DocumentProperties..."); + + Object oDP = +// xMSF.createInstanceWithContext( +// "com.sun.star.document.DocumentProperties", xContext); + xMSF.createInstance("com.sun.star.document.DocumentProperties"); + XDocumentProperties xDP = UnoRuntime.queryInterface(XDocumentProperties.class, oDP); + + System.out.println("...done"); + + + System.out.println("Checking initialize ..."); + + XDocumentProperties xDP2 = UnoRuntime.queryInterface(XDocumentProperties.class, xMSF.createInstance("com.sun.star.document.DocumentProperties")); + XInitialization xInit = UnoRuntime.queryInterface(XInitialization.class, xDP2); + xInit.initialize(new Object[] { }); + + System.out.println("...done"); + + System.out.println("Checking storing default-initialized meta data ..."); + +// xDP2.storeToMedium(temp + "EMPTY.odt", mimeArgs); + xDP2.storeToMedium("", mimeEmptyArgs); + + System.out.println("...done"); + + System.out.println("Checking loading default-initialized meta data ..."); + +// xDP2.loadFromMedium(temp + "EMPTY.odt", noArgs); + xDP2.loadFromMedium("", mimeEmptyArgs); + assertTrue ("Author", "".equals(xDP2.getAuthor())); + + System.out.println("...done"); + + System.out.println("(Not) Checking preservation of custom meta data ..."); + + xDP2.loadFromMedium(TestDocument.getUrl("CUSTOM.odt"), + noArgs); + assertTrue ("Author", "".equals(xDP2.getAuthor())); + xDP2.storeToMedium(temp + "CUSTOM.odt", mimeArgs); + + //FIXME: now what? comparing for binary equality seems useless + // we could unzip the written file and grep for the custom stuff + // but would that work on windows... + + System.out.println("...done"); + + System.out.println("Checking loading from test document..."); + + String file = TestDocument.getUrl("TEST.odt"); + xDP.loadFromMedium(file, noArgs); +/* XInputStream xStream = + new StreamSimulator("./testdocuments/TEST.odt", true, param); + Object oSF = + xMSF.createInstance("com.sun.star.embed.StorageFactory"); + XSingleServiceFactory xSF = (XSingleServiceFactory) + UnoRuntime.queryInterface(XSingleServiceFactory.class, oSF); + Object oStor = xSF.createInstanceWithArguments( + new Object[] { xStream }); + XStorage xStor = (XStorage) UnoRuntime.queryInterface( + XStorage.class, oStor); + xDP.loadFromStorage(xStor);*/ + + System.out.println("...done"); + + System.out.println("Checking meta-data import..."); + + assertTrue("Author", "Karl-Heinz Mustermann".equals(xDP.getAuthor())); + assertTrue("Generator", + "StarOffice/8$Solaris_x86 OpenOffice.org_project/680m232$Build-9227" + .equals(xDP.getGenerator())); + assertTrue("CreationDate", 2007 == xDP.getCreationDate().Year); + assertTrue("Title", "Urgent Memo".equals(xDP.getTitle())); + assertTrue("Subject", "Wichtige Mitteilung".equals(xDP.getSubject())); + assertTrue("Description", + "Modern internal company memorandum in full-blocked style" + .equals(xDP.getDescription())); +// assertTrue("Language", "".equals(xDP.getLanguage())); + assertTrue("ModifiedBy", + "Karl-Heinz Mustermann".equals(xDP.getModifiedBy())); + assertTrue("ModificationDate", 10 == xDP.getModificationDate().Month); + assertTrue("PrintedBy", + "Karl-Heinz Mustermann".equals(xDP.getPrintedBy())); + assertTrue("PrintDate", 29 == xDP.getPrintDate().Day); + assertTrue("TemplateName", + "Modern Memo".equals(xDP.getTemplateName())); + assertTrue("TemplateURL", + xDP.getTemplateURL().endsWith("memmodern.ott")); + assertTrue("TemplateDate", 17 == xDP.getTemplateDate().Hours); + assertTrue("AutoloadURL", "../TEST.odt".equals(xDP.getAutoloadURL())); + assertTrue("AutoloadSecs", 0 == xDP.getAutoloadSecs()); + assertTrue("DefaultTarget", "_blank".equals(xDP.getDefaultTarget())); + assertTrue("EditingCycles", 3 == xDP.getEditingCycles()); + assertTrue("EditingDuration", 320 == xDP.getEditingDuration()); + + String[] kws = xDP.getKeywords(); + assertTrue("Keywords", fromArray(kws).containsAll( + fromArray(new Object[] { "Asien", "Memo", "Reis" }))); + + NamedValue[] ds = xDP.getDocumentStatistics(); +/* for (int i = 0; i < ds.length; ++i) { + System.out.println("nv: " + ds[i].Name + " " + ds[i].Value); + } + NamedValue nv1 = new NamedValue("WordCount", new Integer(23)); + NamedValue nv2 = new NamedValue("WordCount", new Integer(23)); + System.out.println("eq: " + nv1.equals(nv2)); // grrr, this is false... +*/ + assertTrue("DocumentStatistics:WordCount", containsNV(ds, + new NamedValue("WordCount", new Integer(23)))); + assertTrue("DocumentStatistics:PageCount", containsNV(ds, + new NamedValue("PageCount", new Integer(1)))); + + XPropertyContainer udpc = xDP.getUserDefinedProperties(); + XPropertySet udps = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet.class, udpc); + assertTrue("UserDefined 1", "Dies ist ein wichtiger Hinweis" + .equals(udps.getPropertyValue("Hinweis"))); + assertTrue("UserDefined 2", ("Kann Spuren von N" + + new String(new byte[] { (byte) 0xc3, (byte) 0xbc }, "UTF-8") + + "ssen enthalten") + .equals(udps.getPropertyValue("Warnung"))); + + System.out.println("...done"); + + System.out.println("Checking meta-data updates..."); + + String str; + DateTime dt = new DateTime(); + Locale l = new Locale(); + int i; + + str = "me"; + xDP.setAuthor(str); + assertTrue("setAuthor", str.equals(xDP.getAuthor())); + str = "the computa"; + xDP.setGenerator(str); + assertTrue("setGenerator", str.equals(xDP.getGenerator())); + dt.Year = 2038; + dt.Month = 1; + dt.Day = 1; + xDP.setCreationDate(dt); + assertTrue("setCreationDate", dt.Year == xDP.getCreationDate().Year); + str = "El t'itulo"; + xDP.setTitle(str); + assertTrue("setTitle", str.equals(xDP.getTitle())); + str = "Ein verkommenes Subjekt"; + xDP.setSubject(str); + assertTrue("setSubject", str.equals(xDP.getSubject())); + str = "Este descripci'on no es importante"; + xDP.setDescription(str); + assertTrue("setDescription", str.equals(xDP.getDescription())); + l.Language = "en"; + l.Country = "GB"; + xDP.setLanguage(l); + Locale l2 = xDP.getLanguage(); + assertTrue("setLanguage Lang", l.Language.equals(l2.Language)); + assertTrue("setLanguage Cty", l.Country.equals(l2.Country)); + str = "myself"; + xDP.setModifiedBy(str); + assertTrue("setModifiedBy", str.equals(xDP.getModifiedBy())); + dt.Year = 2042; + xDP.setModificationDate(dt); + assertTrue("setModificationDate", + dt.Year == xDP.getModificationDate().Year); + str = "i didnt do it"; + xDP.setPrintedBy(str); + assertTrue("setPrintedBy", str.equals(xDP.getPrintedBy())); + dt.Year = 2024; + xDP.setPrintDate(dt); + assertTrue("setPrintDate", dt.Year == xDP.getPrintDate().Year); + str = "blah"; + xDP.setTemplateName(str); + assertTrue("setTemplateName", str.equals(xDP.getTemplateName())); + str = "gopher://some-hole-in-the-ground/"; + xDP.setTemplateURL(str); + assertTrue("setTemplateURL", str.equals(xDP.getTemplateURL())); + dt.Year = 2043; + xDP.setTemplateDate(dt); + assertTrue("setTemplateDate", dt.Year == xDP.getTemplateDate().Year); + str = "http://nowhere/"; + xDP.setAutoloadURL(str); + assertTrue("setAutoloadURL", str.equals(xDP.getAutoloadURL())); + i = 3661; // this might not work (due to conversion via double...) + xDP.setAutoloadSecs(i); +// System.out.println("set: " + i + " get: " + xDP.getAutoloadSecs()); + assertTrue("setAutoloadSecs", i == xDP.getAutoloadSecs()); + str = "_blank"; + xDP.setDefaultTarget(str); + assertTrue("setDefaultTarget", str.equals(xDP.getDefaultTarget())); + i = 42; + xDP.setEditingCycles((short) i); + assertTrue("setEditingCycles", i == xDP.getEditingCycles()); + i = 84; + xDP.setEditingDuration(i); + assertTrue("setEditingDuration", i == xDP.getEditingDuration()); + str = ""; + + String[] kws2 = new String[] { + "keywordly", "keywordlike", "keywordalicious" }; + xDP.setKeywords(kws2); + kws = xDP.getKeywords(); + assertTrue("setKeywords", fromArray(kws).containsAll(fromArray(kws2))); + + NamedValue[] ds2 = new NamedValue[] { + new NamedValue("SyllableCount", new Integer(9)), + new NamedValue("FrameCount", new Integer(2)), + new NamedValue("SentenceCount", new Integer(7)) }; + xDP.setDocumentStatistics(ds2); + ds = xDP.getDocumentStatistics(); + assertTrue("setDocumentStatistics:SyllableCount", containsNV(ds, + new NamedValue("SyllableCount", new Integer(9)))); + assertTrue("setDocumentStatistics:FrameCount", containsNV(ds, + new NamedValue("FrameCount", new Integer(2)))); + assertTrue("setDocumentStatistics:SentenceCount", containsNV(ds, + new NamedValue("SentenceCount", new Integer(7)))); + + System.out.println("...done"); + + System.out.println("Checking user-defined meta-data updates..."); + + // actually, this tests the PropertyBag service + // but maybe the DocumentProperties service will be implemented + // differently some day... + boolean b = true; + double d = 3.1415; + // note that Time is only supported for backward compatibilty! + Time t = new Time(); + t.Hours = 1; + t.Minutes = 16; + Date date = new Date(); + date.Year = 2071; + date.Month = 2; + date.Day = 3; + dt.Year = 2065; + Duration dur = new Duration(); + dur.Negative = true; + dur.Years = 1001; + dur.Months = 999; + dur.Days = 888; + dur.Hours = 777; + dur.Minutes = 666; + dur.Seconds = 555; + dur.MilliSeconds = 444; + + udpc.addProperty("Frobnicate", PropertyAttribute.REMOVEABLE, + new Boolean(b)); + udpc.addProperty("FrobDuration", PropertyAttribute.REMOVEABLE, dur); + udpc.addProperty("FrobDuration2", PropertyAttribute.REMOVEABLE, t); + udpc.addProperty("FrobEndDate", PropertyAttribute.REMOVEABLE, date); + udpc.addProperty("FrobStartTime", PropertyAttribute.REMOVEABLE, dt); + udpc.addProperty("Pi", PropertyAttribute.REMOVEABLE, new Double(d)); + udpc.addProperty("Foo", PropertyAttribute.REMOVEABLE, "bar"); + udpc.addProperty("Removed", PropertyAttribute.REMOVEABLE, "bar"); + // #i94175#: empty property name is valid ODF 1.1 + udpc.addProperty("", PropertyAttribute.REMOVEABLE, "eeeeek"); + try { + udpc.removeProperty("Info 1"); + udpc.removeProperty("Removed"); + } catch (UnknownPropertyException e) { + fail("removeProperty failed"); + } + + try { + udpc.addProperty("Forbidden", PropertyAttribute.REMOVEABLE, + new String[] { "foo", "bar" }); + fail("inserting value of non-supported type did not fail"); + } catch (IllegalTypeException e) { + // ignore + } + + assertTrue("UserDefined bool", new Boolean(b).equals( + udps.getPropertyValue("Frobnicate"))); + assertTrue("UserDefined duration", eqDuration(dur, (Duration) + udps.getPropertyValue("FrobDuration"))); + assertTrue("UserDefined time", eqTime(t, (Time) + udps.getPropertyValue("FrobDuration2"))); + assertTrue("UserDefined date", eqDate(date, (Date) + udps.getPropertyValue("FrobEndDate"))); + assertTrue("UserDefined datetime", eqDateTime(dt, (DateTime) + udps.getPropertyValue("FrobStartTime"))); + assertTrue("UserDefined float", new Double(d).equals( + udps.getPropertyValue("Pi"))); + assertTrue("UserDefined string", "bar".equals( + udps.getPropertyValue("Foo"))); + assertTrue("UserDefined empty name", "eeeeek".equals( + udps.getPropertyValue(""))); + + try { + udps.getPropertyValue("Removed"); + fail("UserDefined remove didn't"); + } catch (UnknownPropertyException e) { + // ok + } + + System.out.println("...done"); + + System.out.println("Checking storing meta-data to file..."); + + xDP.storeToMedium(temp + "TEST.odt", mimeArgs); + + System.out.println("...done"); + + System.out.println("Checking loading meta-data from stored file..."); + + xDP.loadFromMedium(temp + "TEST.odt", noArgs); + + System.out.println("...done"); + + System.out.println("Checking user-defined meta-data from stored file..."); + + udpc = xDP.getUserDefinedProperties(); + udps = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet.class, udpc); + + assertTrue("UserDefined bool", new Boolean(b).equals( + udps.getPropertyValue("Frobnicate"))); + assertTrue("UserDefined duration", eqDuration(dur, (Duration) + udps.getPropertyValue("FrobDuration"))); + // this is now a Duration! + Duration t_dur = new Duration(false, (short)0, (short)0, (short)0, + t.Hours, t.Minutes, t.Seconds, + (short)(10 * t.HundredthSeconds)); + assertTrue("UserDefined time", eqDuration(t_dur, (Duration) + udps.getPropertyValue("FrobDuration2"))); + assertTrue("UserDefined date", eqDate(date, (Date) + udps.getPropertyValue("FrobEndDate"))); + assertTrue("UserDefined datetime", eqDateTime(dt, (DateTime) + udps.getPropertyValue("FrobStartTime"))); + assertTrue("UserDefined float", new Double(d).equals( + udps.getPropertyValue("Pi"))); + assertTrue("UserDefined string", "bar".equals( + udps.getPropertyValue("Foo"))); + + try { + udps.getPropertyValue("Removed"); + fail("UserDefined remove didn't"); + } catch (UnknownPropertyException e) { + // ok + } + + System.out.println("...done"); + + System.out.println("Checking notification listener interface..."); + + Listener listener = new Listener(); + XModifyBroadcaster xMB = (XModifyBroadcaster) + UnoRuntime.queryInterface(XModifyBroadcaster.class, xDP); + xMB.addModifyListener(listener); + xDP.setAuthor("not me"); + assertTrue("Listener Author", listener.reset()); + udpc.addProperty("Listener", PropertyAttribute.REMOVEABLE, "foo"); + assertTrue("Listener UserDefined Add", listener.reset()); + udps.setPropertyValue("Listener", "bar"); + assertTrue("Listener UserDefined Set", listener.reset()); + udpc.removeProperty("Listener"); + assertTrue("Listener UserDefined Remove", listener.reset()); + xMB.removeModifyListener(listener); + udpc.addProperty("Listener2", PropertyAttribute.REMOVEABLE, "foo"); + assertTrue("Removed Listener UserDefined Add", !listener.reset()); + + System.out.println("...done"); + + } catch (Exception e) { + report(e); + } + } + + // grrr... + boolean eqDateTime(DateTime a, DateTime b) { + return a.Year == b.Year && a.Month == b.Month && a.Day == b.Day + && a.Hours == b.Hours && a.Minutes == b.Minutes + && a.Seconds == b.Seconds + && a.HundredthSeconds == b.HundredthSeconds; + } + + boolean eqDate(Date a, Date b) { + return a.Year == b.Year && a.Month == b.Month && a.Day == b.Day; + } + + boolean eqTime(Time a, Time b) { + return a.Hours == b.Hours && a.Minutes == b.Minutes + && a.Seconds == b.Seconds + && a.HundredthSeconds == b.HundredthSeconds; + } + + boolean eqDuration(Duration a, Duration b) { + return a.Years == b.Years && a.Months == b.Months && a.Days == b.Days + && a.Hours == b.Hours && a.Minutes == b.Minutes + && a.Seconds == b.Seconds + && a.MilliSeconds == b.MilliSeconds + && a.Negative == b.Negative; + } + + java.util.Collection fromArray(Object[] os) { + java.util.Collection ret = new java.util.HashSet(); + for (int i = 0; i < os.length; ++i) { + ret.add(os[i]); + } + return ret; + } + + // bah, structs do not have proper equals(), and uno.Type is not comparable + public static boolean containsNV (NamedValue[] nvs, NamedValue nv) { + for (int i = 0; i < nvs.length; ++i) { + if (nvs[i].Name.equals(nv.Name) && nvs[i].Value.equals(nv.Value)) { + return true; + } + } + return false; + } + + public void report(Exception e) { + System.out.println("Exception occurred:"); + e.printStackTrace(); + fail(); + } + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection() DocumentMetaData"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + +} + diff --git a/sfx2/qa/complex/framework/DocumentMetadataAccessTest.java b/sfx2/qa/complex/framework/DocumentMetadataAccessTest.java new file mode 100644 index 000000000000..0ebbbc25da59 --- /dev/null +++ b/sfx2/qa/complex/framework/DocumentMetadataAccessTest.java @@ -0,0 +1,1293 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +package complex.framework; + +// import complexlib.ComplexTestCase; +import helper.StreamSimulator; + +import com.sun.star.uno.UnoRuntime; +import com.sun.star.uno.XComponentContext; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.lang.XComponent; + +import com.sun.star.lang.XServiceInfo; +import com.sun.star.lang.IllegalArgumentException; +import com.sun.star.lang.WrappedTargetException; +import com.sun.star.lang.WrappedTargetRuntimeException; +import com.sun.star.beans.XPropertySet; +import com.sun.star.beans.PropertyValue; +import com.sun.star.beans.Pair; +import com.sun.star.beans.StringPair; +import com.sun.star.container.XEnumerationAccess; +import com.sun.star.container.XEnumeration; +import com.sun.star.io.XInputStream; +import com.sun.star.util.XCloseable; +import com.sun.star.frame.XStorable; +import com.sun.star.text.XTextDocument; +import com.sun.star.text.XTextRange; +import com.sun.star.text.XText; +import com.sun.star.rdf.*; +import lib.TestParameters; + + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + +/** + * Test case for interface com.sun.star.rdf.XDocumentMetadataAccess + * Currently, this service is implemented in + * sfx2/source/doc/DocumentMetadataAccess.cxx + * + * Actually, this is not a service, so we need to create a document and + * go from there... + * + * @author mst + */ +public class DocumentMetadataAccessTest +{ + XMultiServiceFactory xMSF; + XComponentContext xContext; + String tempDir; + + String nsRDF = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + String nsRDFS = "http://www.w3.org/2000/01/rdf-schema#"; + String nsPkg="http://docs.oasis-open.org/opendocument/meta/package/common#"; + String nsODF ="http://docs.oasis-open.org/opendocument/meta/package/odf#"; + + XURI foo; + XURI bar; + XURI baz; + + static XURI rdf_type; + static XURI rdfs_label; + static XURI pkg_Document; + static XURI pkg_hasPart; + static XURI pkg_MetadataFile; + static XURI odf_ContentFile; + static XURI odf_StylesFile; + static XURI odf_Element; + static XBlankNode blank1; + static XBlankNode blank2; + static XBlankNode blank3; + static XBlankNode blank4; + static String manifestPath = "manifest.rdf"; + static String contentPath = "content.xml"; + static String stylesPath = "styles.xml"; + static String fooPath = "foo.rdf"; + static String fooBarPath = "meta/foo/bar.rdf"; + + XRepository xRep; + XRepositorySupplier xRS; + XDocumentMetadataAccess xDMA; + +// public String[] getTestMethodNames () +// { +// return new String[] { "check", "checkRDFa" }; +// } + /** + * The test parameters + */ + private static TestParameters param = null; + + @Before public void before() + { + try { + + xMSF = getMSF(); + param = new TestParameters(); + param.put("ServiceFactory", xMSF); // important for param.getMSF() + + assertNotNull("could not create MultiServiceFactory.", xMSF); + XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xMSF); + Object defaultCtx = xPropertySet.getPropertyValue("DefaultContext"); + xContext = UnoRuntime.queryInterface(XComponentContext.class, defaultCtx); + assertNotNull("could not get component context.", xContext); + + tempDir = util.utils.getOfficeTemp/*Dir*/(xMSF); + System.out.println("tempdir: " + tempDir); + + foo = URI.create(xContext, "uri:foo"); + assertNotNull("foo", foo); + bar = URI.create(xContext, "uri:bar"); + assertNotNull("bar", bar); + baz = URI.create(xContext, "uri:baz"); + assertNotNull("baz", baz); + + blank1 = BlankNode.create(xContext, "_:1"); + assertNotNull("blank1", blank1); + blank2 = BlankNode.create(xContext, "_:2"); + assertNotNull("blank2", blank2); + blank3 = BlankNode.create(xContext, "_:3"); + assertNotNull("blank3", blank3); + blank4 = BlankNode.create(xContext, "_:4"); + assertNotNull("blank4", blank4); + rdf_type = URI.createKnown(xContext, URIs.RDF_TYPE); + assertNotNull("rdf_type", rdf_type); + rdfs_label = URI.createKnown(xContext, URIs.RDFS_LABEL); + assertNotNull("rdfs_label", rdfs_label); + pkg_Document = URI.createKnown(xContext, URIs.PKG_DOCUMENT); + assertNotNull("pkg_Document", pkg_Document); + pkg_hasPart = URI.createKnown(xContext, URIs.PKG_HASPART); + assertNotNull("pkg_hasPart", pkg_hasPart); + pkg_MetadataFile = URI.createKnown(xContext, URIs.PKG_METADATAFILE); + assertNotNull("pkg_MetadataFile", pkg_MetadataFile); + odf_ContentFile = URI.createKnown(xContext, URIs.ODF_CONTENTFILE); + assertNotNull("odf_ContentFile", odf_ContentFile); + odf_StylesFile = URI.createKnown(xContext, URIs.ODF_STYLESFILE); + assertNotNull("odf_StylesFile", odf_StylesFile); + odf_Element = URI.createKnown(xContext, URIs.ODF_ELEMENT); + assertNotNull("odf_Element", odf_Element); + + } catch (Exception e) { + report(e); + } + } + + @After public void after() + { + xRep = null; + xRS = null; + xDMA = null; + } + + @Test public void check() + { + XComponent xComp = null; + XComponent xComp2 = null; + try { + XEnumeration xStmtsEnum; + XNamedGraph xManifest; + + System.out.println("Creating document with Repository..."); + + // we cannot create a XDMA directly, we must create + // a document and get it from there :( + // create document + PropertyValue[] loadProps = new PropertyValue[1]; + loadProps[0] = new PropertyValue(); + loadProps[0].Name = "Hidden"; + loadProps[0].Value = new Boolean(true); + xComp = util.DesktopTools.openNewDoc(xMSF, "swriter", loadProps); + XTextDocument xText = UnoRuntime.queryInterface(XTextDocument.class, xComp); + + XRepositorySupplier xRS = UnoRuntime.queryInterface(XRepositorySupplier.class, xComp); + assertNotNull("xRS null", xRS); + XDocumentMetadataAccess xDMA = UnoRuntime.queryInterface(XDocumentMetadataAccess.class, xRS); + assertNotNull("xDMA null", xDMA); + xRep = xRS.getRDFRepository(); + assertNotNull("xRep null", xRep); + + System.out.println("...done"); + + System.out.println("Checking that new repository is initialized..."); + + XURI xBaseURI = (XURI) xDMA; + String baseURI = xBaseURI.getStringValue(); + assertNotNull("new: baseURI", xBaseURI ); + assertTrue("new: baseURI", !xBaseURI.getStringValue().equals("")); + + assertTrue("new: # graphs", 1 == xRep.getGraphNames().length); + XURI manifest = URI.createNS(xContext, xBaseURI.getStringValue(), + manifestPath); + xManifest = xRep.getGraph(manifest); + assertTrue("new: manifest graph", null != xManifest); + + Statement[] manifestStmts = getManifestStmts(xBaseURI); + xStmtsEnum = xRep.getStatements(null, null, null); + assertTrue("new: manifest graph", eq(xStmtsEnum, manifestStmts)); + + System.out.println("...done"); + + System.out.println("Checking some invalid args..."); + + String content = "behold, for i am the content."; + XTextRange xTR = new TestRange(content); + XMetadatable xM = (XMetadatable) xTR; + + try { + xDMA.getElementByURI(null); + fail("getElementByURI: null allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.getMetadataGraphsWithType(null); + fail("getMetadataGraphsWithType: null URI allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addMetadataFile("", new XURI[0]); + fail("addMetadataFile: empty filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addMetadataFile("/foo", new XURI[0]); + fail("addMetadataFile: absolute filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addMetadataFile("fo\"o", new XURI[0]); + fail("addMetadataFile: invalid filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addMetadataFile("../foo", new XURI[0]); + fail("addMetadataFile: filename with .. allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addMetadataFile("foo/../../bar", new XURI[0]); + fail("addMetadataFile: filename with nest .. allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addMetadataFile("foo/././bar", new XURI[0]); + fail("addMetadataFile: filename with nest . allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addMetadataFile("content.xml", new XURI[0]); + fail("addMetadataFile: content.xml allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addMetadataFile("styles.xml", new XURI[0]); + fail("addMetadataFile: styles.xml allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addMetadataFile("meta.xml", new XURI[0]); + fail("addMetadataFile: meta.xml allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addMetadataFile("settings.xml", new XURI[0]); + fail("addMetadataFile: settings.xml allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.importMetadataFile(FileFormat.RDF_XML, null, "foo", + foo, new XURI[0]); + fail("importMetadataFile: null stream allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + + final String sEmptyRDF = TestDocument.getUrl("empty.rdf"); + try { + XInputStream xFooIn = new StreamSimulator(sEmptyRDF, true, param); + xDMA.importMetadataFile(FileFormat.RDF_XML, xFooIn, "", + foo, new XURI[0]); + fail("importMetadataFile: empty filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + XInputStream xFooIn = + new StreamSimulator(sEmptyRDF, true, param); + xDMA.importMetadataFile(FileFormat.RDF_XML, xFooIn, "meta.xml", + foo, new XURI[0]); + fail("importMetadataFile: meta.xml filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + XInputStream xFooIn = + new StreamSimulator(sEmptyRDF, true, param); + xDMA.importMetadataFile(FileFormat.RDF_XML, + xFooIn, "foo", null, new XURI[0]); + fail("importMetadataFile: null base URI allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + XInputStream xFooIn = + new StreamSimulator(sEmptyRDF, true, param); + xDMA.importMetadataFile(FileFormat.RDF_XML, + xFooIn, "foo", rdf_type, new XURI[0]); + fail("importMetadataFile: non-absolute base URI allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.removeMetadataFile(null); + fail("removeMetadataFile: null URI allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addContentOrStylesFile(""); + fail("addContentOrStylesFile: empty filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addContentOrStylesFile("/content.xml"); + fail("addContentOrStylesFile: absolute filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.addContentOrStylesFile("foo.rdf"); + fail("addContentOrStylesFile: invalid filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.removeContentOrStylesFile(""); + fail("removeContentOrStylesFile: empty filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.loadMetadataFromStorage(null, foo, null); + fail("loadMetadataFromStorage: null storage allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.storeMetadataToStorage(null/*, base*/); + fail("storeMetadataToStorage: null storage allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.loadMetadataFromMedium(new PropertyValue[0]); + fail("loadMetadataFromMedium: empty medium allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDMA.storeMetadataToMedium(new PropertyValue[0]); + fail("storeMetadataToMedium: empty medium allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + + System.out.println("...done"); + + System.out.println("Checking file addition/removal..."); + + xDMA.removeContentOrStylesFile(contentPath); + xStmtsEnum = xManifest.getStatements(null, null, null); + assertTrue("removeContentOrStylesFile (content)", + eq(xStmtsEnum, new Statement[] { + manifestStmts[0], manifestStmts[2], manifestStmts[4] + })); + + xDMA.addContentOrStylesFile(contentPath); + xStmtsEnum = xManifest.getStatements(null, null, null); + assertTrue("addContentOrStylesFile (content)", + eq(xStmtsEnum, manifestStmts)); + + xDMA.removeContentOrStylesFile(stylesPath); + xStmtsEnum = xManifest.getStatements(null, null, null); + assertTrue("removeContentOrStylesFile (styles)", + eq(xStmtsEnum, new Statement[] { + manifestStmts[0], manifestStmts[1], manifestStmts[3] + })); + + xDMA.addContentOrStylesFile(stylesPath); + xStmtsEnum = xManifest.getStatements(null, null, null); + assertTrue("addContentOrStylesFile (styles)", + eq(xStmtsEnum, manifestStmts)); + + XURI xFoo = URI.createNS(xContext, xBaseURI.getStringValue(), + fooPath); + Statement xM_BaseHaspartFoo = + new Statement(xBaseURI, pkg_hasPart, xFoo, manifest); + Statement xM_FooTypeMetadata = + new Statement(xFoo, rdf_type, pkg_MetadataFile, manifest); + Statement xM_FooTypeBar = + new Statement(xFoo, rdf_type, bar, manifest); + xDMA.addMetadataFile(fooPath, new XURI[] { bar }); + xStmtsEnum = xManifest.getStatements(null, null, null); + assertTrue("addMetadataFile", + eq(xStmtsEnum, merge(manifestStmts, new Statement[] { + xM_BaseHaspartFoo, xM_FooTypeMetadata, xM_FooTypeBar + }))); + + XURI[] graphsBar = xDMA.getMetadataGraphsWithType(bar); + assertTrue("getMetadataGraphsWithType", + graphsBar.length == 1 && eq(graphsBar[0], xFoo)); + + + xDMA.removeMetadataFile(xFoo); + xStmtsEnum = xManifest.getStatements(null, null, null); + assertTrue("removeMetadataFile", + eq(xStmtsEnum, manifestStmts)); + + System.out.println("...done"); + + System.out.println("Checking mapping..."); + + XEnumerationAccess xTextEnum = UnoRuntime.queryInterface(XEnumerationAccess.class, xText.getText()); + Object o = xTextEnum.createEnumeration().nextElement(); + XMetadatable xMeta1 = UnoRuntime.queryInterface(XMetadatable.class, o); + + XURI uri; + XMetadatable xMeta; + xMeta = xDMA.getElementByURI(xMeta1); + assertTrue("getElementByURI: null", null != xMeta); + String XmlId = xMeta.getMetadataReference().Second; + String XmlId1 = xMeta1.getMetadataReference().Second; + assertTrue("getElementByURI: no xml id", !XmlId.equals("")); + assertTrue("getElementByURI: different xml id", XmlId.equals(XmlId1)); + + System.out.println("...done"); + + System.out.println("Checking storing and loading..."); + + XURI xFoobar = URI.createNS(xContext, xBaseURI.getStringValue(), + fooBarPath); + Statement[] metadataStmts = getMetadataFileStmts(xBaseURI, + fooBarPath); + xDMA.addMetadataFile(fooBarPath, new XURI[0]); + xStmtsEnum = xRep.getStatements(null, null, null); + assertTrue("addMetadataFile", + eq(xStmtsEnum, merge(manifestStmts, metadataStmts ))); + + Statement xFoobar_FooBarFoo = + new Statement(foo, bar, foo, xFoobar); + xRep.getGraph(xFoobar).addStatement(foo, bar, foo); + xStmtsEnum = xRep.getStatements(null, null, null); + assertTrue("addStatement", + eq(xStmtsEnum, merge(manifestStmts, merge(metadataStmts, + new Statement[] { xFoobar_FooBarFoo })))); + + PropertyValue noMDNoContentFile = new PropertyValue(); + noMDNoContentFile.Name = "URL"; + noMDNoContentFile.Value = TestDocument.getUrl("CUSTOM.odt"); + PropertyValue noMDFile = new PropertyValue(); + noMDFile.Name = "URL"; + noMDFile.Value = TestDocument.getUrl("TEST.odt"); + PropertyValue file = new PropertyValue(); + file.Name = "URL"; + file.Value = tempDir + "TESTDMA.odt"; + /* + PropertyValue baseURL = new PropertyValue(); + baseURL.Name = "DocumentBaseURL"; + baseURL.Value = tempDir + "TMP.odt"; + */ + PropertyValue mimetype = new PropertyValue(); + mimetype.Name = "MediaType"; + mimetype.Value = "application/vnd.oasis.opendocument.text"; + PropertyValue[] argsEmptyNoContent = { mimetype, noMDNoContentFile}; + PropertyValue[] argsEmpty = { mimetype, noMDFile }; + PropertyValue[] args = { mimetype, file }; + + xStmtsEnum = xRep.getStatements(null, null, null); + XURI[] graphs = xRep.getGraphNames(); + + xDMA.storeMetadataToMedium(args); + + // this should re-init + xDMA.loadMetadataFromMedium(argsEmptyNoContent); + xRep = xRS.getRDFRepository(); + assertTrue("xRep null", null != xRep); + assertTrue("baseURI still tdoc?", + !baseURI.equals(xDMA.getStringValue())); + Statement[] manifestStmts2 = getManifestStmts((XURI) xDMA); + xStmtsEnum = xRep.getStatements(null, null, null); + // there is no content or styles file in here, so we have just + // the package stmt + assertTrue("loadMetadataFromMedium (no metadata, no content)", + eq(xStmtsEnum, new Statement[] { manifestStmts2[0] })); + + // this should re-init + xDMA.loadMetadataFromMedium(argsEmpty); + xRep = xRS.getRDFRepository(); + assertTrue("xRep null", null != xRep); + assertTrue("baseURI still tdoc?", + !baseURI.equals(xDMA.getStringValue())); + Statement[] manifestStmts3 = getManifestStmts((XURI) xDMA); + + xStmtsEnum = xRep.getStatements(null, null, null); + assertTrue("loadMetadataFromMedium (no metadata)", + eq(xStmtsEnum, manifestStmts3)); + + xDMA.loadMetadataFromMedium(args); + xRep = xRS.getRDFRepository(); + assertTrue("xRep null", null != xRep); + Statement[] manifestStmts4 = getManifestStmts((XURI) xDMA); + Statement[] metadataStmts4 = getMetadataFileStmts((XURI) xDMA, + fooBarPath); + + xStmtsEnum = xRep.getStatements(null, null, null); + assertTrue("some graph(s) not reloaded", + graphs.length == xRep.getGraphNames().length); + + XURI xFoobar4 = URI.createNS(xContext, xDMA.getStringValue(), + fooBarPath); + Statement xFoobar_FooBarFoo4 = + new Statement(foo, bar, foo, xFoobar4); + assertTrue("loadMetadataFromMedium (re-load)", + eq(xStmtsEnum, merge(manifestStmts4, merge(metadataStmts4, + new Statement[] { xFoobar_FooBarFoo4 })))); + + System.out.println("...done"); + + System.out.println("Checking storing and loading via model..."); + + String f = tempDir + "TESTPARA.odt"; + + XStorable xStor = UnoRuntime.queryInterface(XStorable.class, xRS); + + xStor.storeToURL(f, new PropertyValue[0]); + + xComp2 = util.DesktopTools.loadDoc(xMSF, f, loadProps); + + XDocumentMetadataAccess xDMA2 = UnoRuntime.queryInterface(XDocumentMetadataAccess.class, xComp2); + assertTrue("xDMA2 null", null != xDMA2); + + XRepositorySupplier xRS2 = UnoRuntime.queryInterface(XRepositorySupplier.class, xComp2); + assertTrue("xRS2 null", null != xRS2); + + XRepository xRep2 = xRS2.getRDFRepository(); + assertTrue("xRep2 null", null != xRep2); + + Statement[] manifestStmts5 = getManifestStmts((XURI) xDMA2); + Statement[] metadataStmts5 = getMetadataFileStmts((XURI) xDMA2, + fooBarPath); + XURI xFoobar5 = URI.createNS(xContext, xDMA2.getStringValue(), + fooBarPath); + Statement xFoobar_FooBarFoo5 = + new Statement(foo, bar, foo, xFoobar5); + xStmtsEnum = xRep.getStatements(null, null, null); + XEnumeration xStmtsEnum2 = xRep2.getStatements(null, null, null); + assertTrue("load: repository differs", + eq(xStmtsEnum2, merge(manifestStmts5, merge(metadataStmts5, + new Statement[] { xFoobar_FooBarFoo5 })))); + + System.out.println("...done"); + + } catch (Exception e) { + report(e); + } finally { + close(xComp); + close(xComp2); + } + } + + @Test public void checkRDFa() + { + XComponent xComp = null; + try { + final String file = TestDocument.getUrl("TESTRDFA.odt"); + xComp = loadRDFa(file); + if (xComp != null) + { + final String sNewFile = tempDir + "TESTRDFA.odt"; + storeRDFa(xComp, sNewFile); + close(xComp); + + xComp = loadRDFa(sNewFile); + } + } finally { + close(xComp); + } + } + + private void storeRDFa(XComponent xComp, String file) + { + try { + + System.out.println("Storing test document..."); + + XStorable xStor = UnoRuntime.queryInterface(XStorable.class, xComp); + + xStor.storeToURL(file, new PropertyValue[0]); + + System.out.println("...done"); + + } catch (Exception e) { + report(e); + } + } + + private XComponent loadRDFa(String file) + { + XComponent xComp = null; + try { + + System.out.println("Loading test document..."); + + PropertyValue[] loadProps = new PropertyValue[1]; + loadProps[0] = new PropertyValue(); + loadProps[0].Name = "Hidden"; + loadProps[0].Value = new Boolean(true); + + + + xComp = util.DesktopTools.loadDoc(xMSF, file, loadProps); + + XRepositorySupplier xRS = UnoRuntime.queryInterface(XRepositorySupplier.class, xComp); + assertTrue("xRS null", null != xRS); + + XDocumentRepository xRep = UnoRuntime.queryInterface(XDocumentRepository.class, xRS.getRDFRepository()); + assertTrue("xRep null", null != xRep); + + XTextDocument xTextDoc = UnoRuntime.queryInterface(XTextDocument.class, xComp); + + XText xText = xTextDoc.getText(); + + XEnumerationAccess xEA = UnoRuntime.queryInterface(XEnumerationAccess.class, xText); + XEnumeration xEnum = xEA.createEnumeration(); + + System.out.println("...done"); + + System.out.println("Checking RDFa in loaded test document..."); + + XMetadatable xPara; + Pair result; + + Statement x_FooBarLit1 = new Statement(foo, bar, mkLit("1"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 1", + !result.Second && + eq(result.First, new Statement[] { + x_FooBarLit1 + })); + + Statement x_FooBarLit2 = new Statement(foo, bar, mkLit("2"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 2", + !result.Second && + eq(result.First, new Statement[] { + x_FooBarLit2 + })); + + Statement x_BlankBarLit3 = + new Statement(blank1, bar, mkLit("3"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 3", + !result.Second && + eq(result.First, new Statement[] { + x_BlankBarLit3 + })); + XBlankNode b3 = UnoRuntime.queryInterface(XBlankNode.class, result.First[0].Subject); + + Statement x_BlankBarLit4 = + new Statement(blank2, bar, mkLit("4"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 4", + !result.Second && + eq(result.First, new Statement[] { + x_BlankBarLit4 + })); + XBlankNode b4 = UnoRuntime.queryInterface(XBlankNode.class, result.First[0].Subject); + + Statement x_BlankBarLit5 = + new Statement(blank1, bar, mkLit("5"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 5", + !result.Second && + eq(result.First, new Statement[] { + x_BlankBarLit5 + })); + XBlankNode b5 = UnoRuntime.queryInterface(XBlankNode.class, result.First[0].Subject); + + assertTrue("RDFa: 3 != 4", + !b3.getStringValue().equals(b4.getStringValue())); + assertTrue("RDFa: 3 == 5", + b3.getStringValue().equals(b5.getStringValue())); + + Statement x_FooBarLit6 = new Statement(foo, bar, mkLit("6"), null); + Statement x_FooBazLit6 = new Statement(foo, baz, mkLit("6"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 6", + !result.Second && + eq(result.First, new Statement[] { + x_FooBarLit6, x_FooBazLit6 + })); + + Statement x_FooBarLit7 = new Statement(foo, bar, mkLit("7"), null); + Statement x_FooBazLit7 = new Statement(foo, baz, mkLit("7"), null); + Statement x_FooFooLit7 = new Statement(foo, foo, mkLit("7"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 7", + !result.Second && + eq(result.First, new Statement[] { + x_FooBarLit7, x_FooBazLit7, x_FooFooLit7 + })); + + XNode lit = mkLit("a fooish bar"); + XNode lit_type= mkLit("a fooish bar", bar); + Statement x_FooBarLit = new Statement(foo, bar, lit, null); + Statement x_FooBarLittype = new Statement(foo, bar, lit_type, null); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 8", + result.Second && + eq(result.First, new Statement[] { + x_FooBarLit + })); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 9", + result.Second && + eq(result.First, new Statement[] { + x_FooBarLit + })); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 10", + result.Second && + eq(result.First, new Statement[] { + x_FooBarLittype + })); + + Statement x_FooBarLit11 + = new Statement(foo, bar, mkLit("11", bar), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 11", + !result.Second && + eq(result.First, new Statement[] { + x_FooBarLit11 + })); + +// differ in file names, which is right in the new test environment +// XURI xFile = URI.createNS(xContext, file, "/" + contentPath); +// Statement x_FileBarLit12 = +// new Statement(xFile, bar, mkLit("12"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); +// result = xRep.getStatementRDFa(xPara); +// assertTrue("RDFa: 12", +// !result.Second && +// eq(result.First, new Statement[] { +// x_FileBarLit12 +// })); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 13", + result.Second && + eq(result.First, new Statement[] { + x_FooBarLit + })); + + Statement x_FooLabelLit14 = + new Statement(foo, rdfs_label, mkLit("14"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 14", + result.Second && + eq(result.First, new Statement[] { + /* x_FooLabelLit14 */ x_FooBarLit + })); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 15", eq(result.First, new Statement[] { } )); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 16", eq(result.First, new Statement[] { } )); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 17", eq(result.First, new Statement[] { } )); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 18", eq(result.First, new Statement[] { } )); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 19", eq(result.First, new Statement[] { } )); + + xPara = UnoRuntime.queryInterface( + XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 20", eq(result.First, new Statement[] { } )); + + xPara = UnoRuntime.queryInterface( + XMetadatable.class, xEnum.nextElement()); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 21", eq(result.First, new Statement[] { } )); + + System.out.println("...done"); + + } catch (Exception e) { + report(e); + close(xComp); + } + return xComp; + } + + +// utilities ------------------------------------------------------------- + + public void report2(Exception e) + { + if (e instanceof WrappedTargetException) + { + System.out.println("Cause:"); + Exception cause = (Exception) + (((WrappedTargetException)e).TargetException); + System.out.println(cause.toString()); + report2(cause); + } else if (e instanceof WrappedTargetRuntimeException) { + System.out.println("Cause:"); + Exception cause = (Exception) + (((WrappedTargetRuntimeException)e).TargetException); + System.out.println(cause.toString()); + report2(cause); + } + } + + public void report(Exception e) { + System.out.println("Exception occurred:"); + e.printStackTrace(); + report2(e); + fail(); + } + + static void close(XComponent i_comp) + { + try { + XCloseable xClos = UnoRuntime.queryInterface(XCloseable.class, i_comp); + if (xClos != null) + { + xClos.close(true); + } + } catch (Exception e) { + } + } + + XLiteral mkLit(String i_content) + { + return Literal.create(xContext, i_content); + } + + XLiteral mkLit(String i_content, XURI i_uri) + { + return Literal.createWithType(xContext, i_content, i_uri); + } + + static Statement[] merge(Statement[] i_A1, Statement[] i_A2) + { + // bah, java sucks... + Statement[] ret = new Statement[i_A1.length + i_A2.length]; + for (int i = 0; i < i_A1.length; ++i) { + ret[i] = i_A1[i]; + } + for (int i = 0; i < i_A2.length; ++i) { + ret[i+i_A1.length] = i_A2[i]; + } + return ret; + } + + public static String toS(XNode n) { + if (null == n) + { + return "< null >"; + } + return n.getStringValue(); + } + + static boolean isBlank(XNode i_node) + { + XBlankNode blank = UnoRuntime.queryInterface(XBlankNode.class, i_node); + return blank != null; + } + +/* + static class Statement implements XStatement + { + XResource m_Subject; + XResource m_Predicate; + XNode m_Object; + XURI m_Graph; + + Statement(XResource i_Subject, XResource i_Predicate, XNode i_Object, + XURI i_Graph) + { + m_Subject = i_Subject; + m_Predicate = i_Predicate; + m_Object = i_Object; + m_Graph = i_Graph; + } + + public XResource getSubject() { return m_Subject; } + public XResource getPredicate() { return m_Predicate; } + public XNode getObject() { return m_Object; } + public XURI getGraph() { return m_Graph; } + } +*/ + + static Statement[] toSeq(XEnumeration i_Enum) throws Exception + { + java.util.Collection c = new java.util.Vector(); + while (i_Enum.hasMoreElements()) { + Statement s = (Statement) i_Enum.nextElement(); +//System.out.println("toSeq: " + s.getSubject().getStringValue() + " " + s.getPredicate().getStringValue() + " " + s.getObject().getStringValue() + "."); + c.add(s); + } +// return (Statement[]) c.toArray(); + // java sucks + Object[] arr = c.toArray(); + Statement[] ret = new Statement[arr.length]; + for (int i = 0; i < arr.length; ++i) { + ret[i] = (Statement) arr[i]; + } + return ret; + } + + static XNode[][] toSeqs(XEnumeration i_Enum) throws Exception + { + java.util.Collection c = new java.util.Vector(); + while (i_Enum.hasMoreElements()) { + XNode[] s = (XNode[]) i_Enum.nextElement(); + c.add(s); + } +// return (XNode[][]) c.toArray(); + Object[] arr = c.toArray(); + XNode[][] ret = new XNode[arr.length][]; + for (int i = 0; i < arr.length; ++i) { + ret[i] = (XNode[]) arr[i]; + } + return ret; + } + + static class BindingComp implements java.util.Comparator + { + public int compare(Object i_Left, Object i_Right) + { + XNode[] left = (XNode[]) i_Left; + XNode[] right = (XNode[]) i_Right; + if (left.length != right.length) + { + throw new RuntimeException(); + } + for (int i = 0; i < left.length; ++i) { + int eq = (left[i].getStringValue().compareTo( + right[i].getStringValue())); + if (eq != 0) + { + return eq; + } + } + return 0; + } + } + + static class StmtComp implements java.util.Comparator + { + public int compare(Object i_Left, Object i_Right) + { + int eq; + Statement left = (Statement) i_Left; + Statement right = (Statement) i_Right; + if ((eq = cmp(left.Graph, right.Graph )) != 0) return eq; + if ((eq = cmp(left.Subject, right.Subject )) != 0) return eq; + if ((eq = cmp(left.Predicate, right.Predicate)) != 0) return eq; + if ((eq = cmp(left.Object, right.Object )) != 0) return eq; + return 0; + } + + public int cmp(XNode i_Left, XNode i_Right) + { + if (isBlank(i_Left)) { + return isBlank(i_Right) ? 0 : 1; + } else { + if (isBlank(i_Right)) { + return -1; + } else { + return toS(i_Left).compareTo(toS(i_Right)); + } + } + } + } + + static boolean eq(Statement i_Left, Statement i_Right) + { + XURI lG = i_Left.Graph; + XURI rG = i_Right.Graph; + if (!eq(lG, rG)) { + System.out.println("Graphs differ: " + toS(lG) + " != " + toS(rG)); + return false; + } + if (!eq(i_Left.Subject, i_Right.Subject)) { + System.out.println("Subjects differ: " + + i_Left.Subject.getStringValue() + " != " + + i_Right.Subject.getStringValue()); + return false; + } + if (!eq(i_Left.Predicate, i_Right.Predicate)) { + System.out.println("Predicates differ: " + + i_Left.Predicate.getStringValue() + " != " + + i_Right.Predicate.getStringValue()); + return false; + } + if (!eq(i_Left.Object, i_Right.Object)) { + System.out.println("Objects differ: " + + i_Left.Object.getStringValue() + " != " + + i_Right.Object.getStringValue()); + return false; + } + return true; + } + + static boolean eq(Statement[] i_Result, Statement[] i_Expected) + { + if (i_Result.length != i_Expected.length) { + System.out.println("eq: different lengths: " + i_Result.length + " " + + i_Expected.length); + return false; + } + Statement[] expected = (Statement[]) + java.util.Arrays.asList(i_Expected).toArray(); + java.util.Arrays.sort(i_Result, new StmtComp()); + java.util.Arrays.sort(expected, new StmtComp()); + for (int i = 0; i < expected.length; ++i) + { + // This is better for debug! + final Statement a = i_Result[i]; + final Statement b = expected[i]; + final boolean cond = eq(a, b); + if (!cond) return false; + } + return true; + } + + static boolean eq(XEnumeration i_Enum, Statement[] i_Expected) + throws Exception + { + Statement[] current = toSeq(i_Enum); + return eq(current, i_Expected); + } + + static boolean eq(XNode i_Left, XNode i_Right) + { + if (i_Left == null) { + return (i_Right == null); + } else { + return (i_Right != null) && + (i_Left.getStringValue().equals(i_Right.getStringValue()) + // FIXME: hack: blank nodes considered equal + || (isBlank(i_Left) && isBlank(i_Right))); + } + } + + static boolean eq(XQuerySelectResult i_Result, + String[] i_Vars, XNode[][] i_Bindings) throws Exception + { + String[] vars = i_Result.getBindingNames(); + XEnumeration iter = (XEnumeration) i_Result; + XNode[][] bindings = toSeqs(iter); + if (vars.length != i_Vars.length) { + System.out.println("var lengths differ"); + return false; + } + if (bindings.length != i_Bindings.length) { + System.out.println("binding lengths differ: " + i_Bindings.length + + " vs " + bindings.length ); + return false; + } + java.util.Arrays.sort(bindings, new BindingComp()); + java.util.Arrays.sort(i_Bindings, new BindingComp()); + for (int i = 0; i < i_Bindings.length; ++i) { + if (i_Bindings[i].length != i_Vars.length) { + System.out.println("TEST ERROR!"); + throw new Exception(); + } + if (bindings[i].length != i_Vars.length) { + System.out.println("binding length and var length differ"); + return false; + } + for (int j = 0; j < i_Vars.length; ++j) { + if (!eq(bindings[i][j], i_Bindings[i][j])) { + System.out.println("bindings differ: " + + toS(bindings[i][j]) + " != " + toS(i_Bindings[i][j])); + return false; + } + } + } + for (int i = 0; i < i_Vars.length; ++i) { + if (!vars[i].equals(i_Vars[i])) { + System.out.println("variable names differ: " + + vars[i] + " != " + i_Vars[i]); + return false; + } + } + return true; + } + + static boolean eq(StringPair i_Left, StringPair i_Right) + { + return ((i_Left.First).equals(i_Right.First)) && + ((i_Left.Second).equals(i_Right.Second)); + } + + static String mkNamespace(String i_prefix, String i_namespace) + { + return "PREFIX " + i_prefix + ": <" + i_namespace + ">\n"; + } + + static String mkNss() + { + String namespaces = mkNamespace("rdf", + "http://www.w3.org/1999/02/22-rdf-syntax-ns#"); + namespaces += mkNamespace("pkg", + "http://docs.oasis-open.org/opendocument/meta/package/common#"); + namespaces += mkNamespace("odf", + "http://docs.oasis-open.org/opendocument/meta/package/odf#"); + return namespaces; + } + + Statement[] getManifestStmts(XURI xBaseURI) throws Exception + { + XURI xManifest = URI.createNS(xContext, xBaseURI.getStringValue(), + manifestPath); + XURI xContent = URI.createNS(xContext, xBaseURI.getStringValue(), + contentPath); + XURI xStyles = URI.createNS(xContext, xBaseURI.getStringValue(), + stylesPath); + Statement xM_BaseTypeDoc = + new Statement(xBaseURI, rdf_type, pkg_Document, xManifest); + Statement xM_BaseHaspartContent = + new Statement(xBaseURI, pkg_hasPart, xContent, xManifest); + Statement xM_BaseHaspartStyles = + new Statement(xBaseURI, pkg_hasPart, xStyles, xManifest); + Statement xM_ContentTypeContent = + new Statement(xContent, rdf_type, odf_ContentFile, xManifest); + Statement xM_StylesTypeStyles = + new Statement(xStyles, rdf_type, odf_StylesFile, xManifest); + return new Statement[] { + xM_BaseTypeDoc, xM_BaseHaspartContent, xM_BaseHaspartStyles, + xM_ContentTypeContent, xM_StylesTypeStyles + }; + } + + Statement[] getMetadataFileStmts(XURI xBaseURI, String Path) + throws Exception + { + XURI xManifest = URI.createNS(xContext, xBaseURI.getStringValue(), + manifestPath); + XURI xGraph = URI.createNS(xContext, xBaseURI.getStringValue(), Path); + Statement xM_BaseHaspartGraph = + new Statement(xBaseURI, pkg_hasPart, xGraph, xManifest); + Statement xM_GraphTypeMetadata = + new Statement(xGraph, rdf_type, pkg_MetadataFile, xManifest); + return new Statement[] { xM_BaseHaspartGraph, xM_GraphTypeMetadata }; + } + + class TestRange implements XTextRange, XMetadatable, XServiceInfo + { + String m_Stream; + String m_XmlId; + String m_Text; + TestRange(String i_Str) { m_Text = i_Str; } + + public String getStringValue() { return ""; } + public String getNamespace() { return ""; } + public String getLocalName() { return ""; } + + public StringPair getMetadataReference() + { + return new StringPair(m_Stream, m_XmlId); + } + public void setMetadataReference(StringPair i_Ref) + throws IllegalArgumentException + { + m_Stream = i_Ref.First; + m_XmlId = i_Ref.Second; + } + public void ensureMetadataReference() + { + m_Stream = "content.xml"; + m_XmlId = "42"; + } + + public String getImplementationName() { return null; } + public String[] getSupportedServiceNames() { return null; } + public boolean supportsService(String i_Svc) + { + return i_Svc.equals("com.sun.star.text.Paragraph"); + } + + public XText getText() { return null; } + public XTextRange getStart() { return null; } + public XTextRange getEnd() { return null; } + public String getString() { return m_Text; } + public void setString(String i_Str) { m_Text = i_Str; } + } + + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection() DocumentMetadataAccessTest"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + +} + diff --git a/sfx2/qa/complex/framework/TestDocument.java b/sfx2/qa/complex/framework/TestDocument.java new file mode 100644 index 000000000000..8cc6ef7756b1 --- /dev/null +++ b/sfx2/qa/complex/framework/TestDocument.java @@ -0,0 +1,39 @@ +/************************************************************************* +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* +* for a copy of the LGPLv3 License. +* +************************************************************************/ + +package complex.framework; + +import java.io.File; +import org.openoffice.test.OfficeFileUrl; + +final class TestDocument { + public static String getUrl(String name) { + return OfficeFileUrl.getAbsolute(new File("testdocuments", name)); + } + + private TestDocument() {} +} diff --git a/sfx2/qa/complex/framework/makefile.mk b/sfx2/qa/complex/framework/makefile.mk new file mode 100644 index 000000000000..1b74cad15ea8 --- /dev/null +++ b/sfx2/qa/complex/framework/makefile.mk @@ -0,0 +1,65 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE + +PRJ = ../../.. +PRJNAME = sfx2 +TARGET = qa_complex_framework + +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/framework +JAVATESTFILES = \ + DocumentMetadataAccessTest.java \ + DocumentMetaData.java \ + CheckGlobalEventBroadcaster_writer1.java + +JAVAFILES = $(JAVATESTFILES) \ + TestDocument.java + + +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) + +SUBDIRS = DocHelper + +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y + +.END + +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk + +ALLTAR : javatest + +.END + + diff --git a/sfx2/qa/complex/framework/testdocuments/CUSTOM.odt b/sfx2/qa/complex/framework/testdocuments/CUSTOM.odt new file mode 100644 index 000000000000..831a8f451dfd Binary files /dev/null and b/sfx2/qa/complex/framework/testdocuments/CUSTOM.odt differ diff --git a/sfx2/qa/complex/framework/testdocuments/TEST.odt b/sfx2/qa/complex/framework/testdocuments/TEST.odt new file mode 100644 index 000000000000..7c6f0b60f7b0 Binary files /dev/null and b/sfx2/qa/complex/framework/testdocuments/TEST.odt differ diff --git a/sfx2/qa/complex/framework/testdocuments/TESTRDFA.odt b/sfx2/qa/complex/framework/testdocuments/TESTRDFA.odt new file mode 100644 index 000000000000..d59739142df6 Binary files /dev/null and b/sfx2/qa/complex/framework/testdocuments/TESTRDFA.odt differ diff --git a/sfx2/qa/complex/framework/testdocuments/empty.rdf b/sfx2/qa/complex/framework/testdocuments/empty.rdf new file mode 100644 index 000000000000..af62bab39dfa --- /dev/null +++ b/sfx2/qa/complex/framework/testdocuments/empty.rdf @@ -0,0 +1,13 @@ + + + + + + + diff --git a/sfx2/qa/complex/makefile.mk b/sfx2/qa/complex/makefile.mk deleted file mode 100644 index b8bc897fccf7..000000000000 --- a/sfx2/qa/complex/makefile.mk +++ /dev/null @@ -1,61 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ = ..$/.. -TARGET = CheckGlobalEventBroadcaster_writer1 -PRJNAME = $(TARGET) -PACKAGE = complex$/framework - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -JAVAFILES = CheckGlobalEventBroadcaster_writer1.java \ - DocumentMetaData.java \ - DocumentMetadataAccessTest.java - -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -SUBDIRS = DocHelper -#----- make a jar from compiled files ------------------------------ - -MAXLINELENGTH = 100000 - -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - - -run: - +java -cp $(CLASSPATH) org.openoffice.Runner -TestBase java_complex -sce tests.sce -tdoc $(PWD)$/testdocuments diff --git a/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java b/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java index 0136f8941df5..29fcaba8cb7a 100644 --- a/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java +++ b/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java @@ -26,44 +26,76 @@ ************************************************************************/ package complex.standalonedocumentinfo; -import complexlib.ComplexTestCase; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.uno.UnoRuntime; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + /* Document here */ -public class StandaloneDocumentInfoUnitTest extends ComplexTestCase { +public class StandaloneDocumentInfoUnitTest { private XMultiServiceFactory m_xMSF = null; - public String[] getTestMethodNames() { - return new String[] { - "ExecuteTest01"}; - } +// public String[] getTestMethodNames() { +// return new String[] { +// "ExecuteTest01"}; +// } - public String[] getTestObjectNames() { - return new String[] {"StandaloneDocumentInfoUnitTest"}; - } +// public String[] getTestObjectNames() { +// return new String[] {"StandaloneDocumentInfoUnitTest"}; +// } - public void before() { + @Before public void before() { try { - m_xMSF = (XMultiServiceFactory)param.getMSF(); + m_xMSF = getMSF(); } catch(Exception e) { - failed( "Failed to create service factory!" ); + fail( "Failed to create service factory!" ); } if( m_xMSF ==null ) { - failed( "Failed to create service factory!" ); + fail( "Failed to create service factory!" ); } } - public void after() { + @After public void after() { m_xMSF = null; } - public void ExecuteTest01() { - StandaloneDocumentInfoTest aTest = new Test01 (m_xMSF, log); - assure( "Test01 failed!", aTest.test() ); + @Test public void ExecuteTest01() { + StandaloneDocumentInfoTest aTest = new Test01 (m_xMSF); + assertTrue( "Test01 failed!", aTest.test() ); + } + + + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + } diff --git a/sfx2/qa/complex/standalonedocumentinfo/Test01.java b/sfx2/qa/complex/standalonedocumentinfo/Test01.java index 92c59d81e1c4..2f9a6266b4e2 100644 --- a/sfx2/qa/complex/standalonedocumentinfo/Test01.java +++ b/sfx2/qa/complex/standalonedocumentinfo/Test01.java @@ -26,14 +26,6 @@ ************************************************************************/ package complex.standalonedocumentinfo; -import com.sun.star.beans.Property; -import com.sun.star.beans.XProperty; -import com.sun.star.beans.XPropertySetInfo; -import com.sun.star.io.IOException; -import com.sun.star.io.XInputStream; -import com.sun.star.io.XOutputStream; -import complexlib.ComplexTestCase; - import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.document.XStandaloneDocumentInfo; import com.sun.star.io.XTempFile; @@ -43,19 +35,15 @@ import com.sun.star.beans.PropertyValue; import com.sun.star.beans.XPropertySet; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.AnyConverter; -import com.sun.star.task.ErrorCodeIOException; -import java.util.Properties; -import java.util.Random; -import share.LogWriter; public class Test01 implements StandaloneDocumentInfoTest { XMultiServiceFactory m_xMSF = null; TestHelper m_aTestHelper = null; - public Test01 ( XMultiServiceFactory xMSF, LogWriter aLogWriter ) { + public Test01 ( XMultiServiceFactory xMSF ) { m_xMSF = xMSF; - m_aTestHelper = new TestHelper( aLogWriter, "Test01: " ); + m_aTestHelper = new TestHelper( "Test01: " ); } public boolean test() { @@ -71,19 +59,16 @@ public class Test01 implements StandaloneDocumentInfoTest { m_aTestHelper.Message ( "==============================" ); //create a new temporary file Object oTempFile = m_xMSF.createInstance ( "com.sun.star.io.TempFile" ); - XTempFile xTempFile = (XTempFile) UnoRuntime.queryInterface ( - XTempFile.class, oTempFile ); + XTempFile xTempFile = UnoRuntime.queryInterface(XTempFile.class, oTempFile); //create a text document and initiallize it Object oTextDocument = m_xMSF.createInstance ( "com.sun.star.text.TextDocument" ); - XLoadable xLoadable = (XLoadable) UnoRuntime.queryInterface ( - XLoadable.class, oTextDocument ); + XLoadable xLoadable = UnoRuntime.queryInterface(XLoadable.class, oTextDocument); xLoadable.initNew(); m_aTestHelper.Message ( "New document initialized." ); //store the instance to the temporary file URL - XStorable xStorable = (XStorable) UnoRuntime.queryInterface ( - XStorable.class, oTextDocument ); + XStorable xStorable = UnoRuntime.queryInterface(XStorable.class, oTextDocument); String sURL = AnyConverter.toString ( xTempFile.getUri () ); PropertyValue aProps[] = new PropertyValue[2]; aProps[0] = new PropertyValue(); @@ -101,15 +86,13 @@ public class Test01 implements StandaloneDocumentInfoTest { Object oStandaloneDocInfo = m_xMSF.createInstance ( "com.sun.star.document.StandaloneDocumentInfo" ); XStandaloneDocumentInfo xStandaloneDocInfo = - (XStandaloneDocumentInfo) UnoRuntime.queryInterface ( - XStandaloneDocumentInfo.class, oStandaloneDocInfo ); + UnoRuntime.queryInterface(XStandaloneDocumentInfo.class, oStandaloneDocInfo); xStandaloneDocInfo.loadFromURL ( sURL ); m_aTestHelper.Message ( "StandaloneDocumentInfo loaded." ); //get the title from the object and check it XPropertySet xPropSet = - (XPropertySet)UnoRuntime.queryInterface ( - XPropertySet.class, oStandaloneDocInfo ); + UnoRuntime.queryInterface(XPropertySet.class, oStandaloneDocInfo); String sTitle = xPropSet.getPropertyValue ( "Title" ).toString (); m_aTestHelper.Message ( "Get title: " + sTitle ); if ( sTitle.compareTo ( sDocTitle[i] ) != 0 ) { @@ -134,14 +117,12 @@ public class Test01 implements StandaloneDocumentInfoTest { Object oStandaloneDocInfo_ = m_xMSF.createInstance ( "com.sun.star.document.StandaloneDocumentInfo" ); XStandaloneDocumentInfo xStandaloneDocInfo_ = - (XStandaloneDocumentInfo)UnoRuntime.queryInterface ( - XStandaloneDocumentInfo.class, oStandaloneDocInfo_ ); + UnoRuntime.queryInterface(XStandaloneDocumentInfo.class, oStandaloneDocInfo_); xStandaloneDocInfo_.loadFromURL ( sURL ); m_aTestHelper.Message ( "New StandaloneDocumentInfo loaded." ); //get the title and check it - XPropertySet xPropSet_ = (XPropertySet)UnoRuntime.queryInterface ( - XPropertySet.class, oStandaloneDocInfo_ ); + XPropertySet xPropSet_ = UnoRuntime.queryInterface(XPropertySet.class, oStandaloneDocInfo_); String sTitle_ = xPropSet_.getPropertyValue ( "Title" ).toString (); m_aTestHelper.Message ( "Get new title: " + sTitle_ ); if ( sTitle_.compareTo ( sTitle ) != 0 ) { diff --git a/sfx2/qa/complex/standalonedocumentinfo/TestHelper.java b/sfx2/qa/complex/standalonedocumentinfo/TestHelper.java index f319fe412227..f6d63e1b7793 100644 --- a/sfx2/qa/complex/standalonedocumentinfo/TestHelper.java +++ b/sfx2/qa/complex/standalonedocumentinfo/TestHelper.java @@ -26,23 +26,23 @@ ************************************************************************/ package complex.standalonedocumentinfo; -import share.LogWriter; public class TestHelper { - LogWriter m_aLogWriter; + String m_sTestPrefix; - /** Creates a new instance of TestHelper */ - public TestHelper ( LogWriter aLogWriter, String sTestPrefix ) { - m_aLogWriter = aLogWriter; + /** Creates a new instance of TestHelper + * @param sTestPrefix + */ + public TestHelper ( String sTestPrefix ) { m_sTestPrefix = sTestPrefix; } public void Error ( String sError ) { - m_aLogWriter.println ( m_sTestPrefix + "Error: " + sError ); + System.out.println ( m_sTestPrefix + "Error: " + sError ); } public void Message ( String sMessage ) { - m_aLogWriter.println ( m_sTestPrefix + sMessage ); + System.out.println ( m_sTestPrefix + sMessage ); } } diff --git a/sfx2/qa/complex/standalonedocumentinfo/makefile.mk b/sfx2/qa/complex/standalonedocumentinfo/makefile.mk index c65556aeb763..aade48dbd789 100644 --- a/sfx2/qa/complex/standalonedocumentinfo/makefile.mk +++ b/sfx2/qa/complex/standalonedocumentinfo/makefile.mk @@ -25,61 +25,32 @@ # #************************************************************************* -PRJ = ..$/..$/.. -TARGET = StandaloneDocumentInfoUnitTest -PRJNAME = binfilter -PACKAGE = complex$/standalonedocumentinfo - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar - -JAVAFILES =\ - StandaloneDocumentInfoUnitTest.java\ - StandaloneDocumentInfoTest.java\ - Test01.java\ - TestHelper.java\ - -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -#----- make a jar from compiled files ------------------------------ - -MAXLINELENGTH = 100000 - -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE - -# --- Parameters for the test -------------------------------------- - -# start an office if the parameter is set for the makefile -.IF "$(OFFICE)" == "" -CT_APPEXECCOMMAND = +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: .ELSE -CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -.ENDIF -# test base is java complex -CT_TESTBASE = -TestBase java_complex +PRJ = ../../.. +PRJNAME = sfx2 +TARGET = qa_complex_standalonedocumentinfo -# test looks something like the.full.package.TestName -CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/standalonedocumentinfo +JAVATESTFILES = \ + StandaloneDocumentInfoUnitTest.java -# start the runner application -CT_APP = org.openoffice.Runner +JAVAFILES = $(JAVATESTFILES) \ + StandaloneDocumentInfoTest.java \ + Test01.java \ + TestHelper.java -# --- Targets ------------------------------------------------------ +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) +.END +.INCLUDE: settings.mk .INCLUDE: target.mk +.INCLUDE: installationtest.mk -RUN: run - -run: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST) - - +ALLTAR : javatest +.END diff --git a/sfx2/qa/complex/testdocuments/CUSTOM.odt b/sfx2/qa/complex/testdocuments/CUSTOM.odt deleted file mode 100644 index 831a8f451dfd..000000000000 Binary files a/sfx2/qa/complex/testdocuments/CUSTOM.odt and /dev/null differ diff --git a/sfx2/qa/complex/testdocuments/TEST.odt b/sfx2/qa/complex/testdocuments/TEST.odt deleted file mode 100644 index 7c6f0b60f7b0..000000000000 Binary files a/sfx2/qa/complex/testdocuments/TEST.odt and /dev/null differ diff --git a/sfx2/qa/complex/testdocuments/TESTRDFA.odt b/sfx2/qa/complex/testdocuments/TESTRDFA.odt deleted file mode 100644 index d59739142df6..000000000000 Binary files a/sfx2/qa/complex/testdocuments/TESTRDFA.odt and /dev/null differ -- cgit v1.2.3 From 380197840a23e7930a7223ddfa5b6546c54fc479 Mon Sep 17 00:00:00 2001 From: Lars Langhans Date: Mon, 14 Jun 2010 13:40:46 +0200 Subject: sb123:#i111449# add TODO --- sfx2/qa/complex/docinfo/DocumentProperties.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/docinfo/DocumentProperties.java b/sfx2/qa/complex/docinfo/DocumentProperties.java index afa188e20901..0c4eb44c4a35 100644 --- a/sfx2/qa/complex/docinfo/DocumentProperties.java +++ b/sfx2/qa/complex/docinfo/DocumentProperties.java @@ -73,7 +73,7 @@ public class DocumentProperties assertNotNull("## Couldn't get MultiServiceFactory make sure your Office is started", m_xMSF); - + // TODO: need other temp directory! String tempdir = System.getProperty("java.io.tmpdir"); String fs = System.getProperty("file.separator"); -- cgit v1.2.3 From 973a452d8a84412ffed3380e4e9f51b5bf9f0e66 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 18 Jun 2010 16:44:10 +0200 Subject: sb123: #i112473#: DocumentMetadataAccessTest.java: re-activate disabled test --- .../complex/framework/DocumentMetadataAccessTest.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/framework/DocumentMetadataAccessTest.java b/sfx2/qa/complex/framework/DocumentMetadataAccessTest.java index 0ebbbc25da59..3f61cb21b3dd 100644 --- a/sfx2/qa/complex/framework/DocumentMetadataAccessTest.java +++ b/sfx2/qa/complex/framework/DocumentMetadataAccessTest.java @@ -798,17 +798,16 @@ public class DocumentMetadataAccessTest x_FooBarLit11 })); -// differ in file names, which is right in the new test environment -// XURI xFile = URI.createNS(xContext, file, "/" + contentPath); -// Statement x_FileBarLit12 = -// new Statement(xFile, bar, mkLit("12"), null); + XURI xFile = URI.createNS(xContext, file, "/" + contentPath); + Statement x_FileBarLit12 = + new Statement(xFile, bar, mkLit("12"), null); xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); -// result = xRep.getStatementRDFa(xPara); -// assertTrue("RDFa: 12", -// !result.Second && -// eq(result.First, new Statement[] { -// x_FileBarLit12 -// })); + result = xRep.getStatementRDFa(xPara); + assertTrue("RDFa: 12", + !result.Second && + eq(result.First, new Statement[] { + x_FileBarLit12 + })); xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); -- cgit v1.2.3 From a5b90aef59991be1c4436ce8bafdc7b1bf45f949 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 18 Jun 2010 17:07:20 +0200 Subject: sb123: rename DocumentMetaData.java to DocumentPropertiesTest.java --- sfx2/qa/complex/framework/DocumentMetaData.java | 565 --------------------- .../complex/framework/DocumentPropertiesTest.java | 565 +++++++++++++++++++++ sfx2/qa/complex/framework/makefile.mk | 2 +- 3 files changed, 566 insertions(+), 566 deletions(-) delete mode 100644 sfx2/qa/complex/framework/DocumentMetaData.java create mode 100644 sfx2/qa/complex/framework/DocumentPropertiesTest.java (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/framework/DocumentMetaData.java b/sfx2/qa/complex/framework/DocumentMetaData.java deleted file mode 100644 index c94d2f64e768..000000000000 --- a/sfx2/qa/complex/framework/DocumentMetaData.java +++ /dev/null @@ -1,565 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -package complex.framework; - - -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XComponentContext; -import com.sun.star.lang.XInitialization; - -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.lang.Locale; -import com.sun.star.lang.EventObject; -import com.sun.star.util.Date; -import com.sun.star.util.DateTime; -import com.sun.star.util.Time; -import com.sun.star.util.Duration; -import com.sun.star.util.XModifyListener; -import com.sun.star.util.XModifyBroadcaster; -import com.sun.star.beans.XPropertyContainer; -import com.sun.star.beans.XPropertySet; -import com.sun.star.beans.PropertyValue; -import com.sun.star.beans.NamedValue; -import com.sun.star.beans.PropertyAttribute; -import com.sun.star.beans.UnknownPropertyException; -import com.sun.star.beans.IllegalTypeException; - -import com.sun.star.document.XDocumentProperties; - -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.openoffice.test.OfficeConnection; -import static org.junit.Assert.*; - -/** - * Test case for the service com.sun.star.document.DocumentProperties. - * Currently, this service is implemented in - * sfx2/source/doc/SfxDocumentMetaData.cxx. - * - * @author mst - */ -public class DocumentMetaData -{ -// public String[] getTestMethodNames () { -// return new String[] { "check", "cleanup" }; -// } - - @After public void cleanup() { - // nothing to do - } - - // for testing modifications - class Listener implements XModifyListener { - private boolean m_Called; - - public Listener() { - m_Called = false; - } - - public boolean reset() { - boolean oldCalled = m_Called; - m_Called = false; - return oldCalled; - } - - public void modified(EventObject e) { - m_Called = true; - } - - public void disposing(EventObject e) { - } - } - - @Test public void check() { - try { - XMultiServiceFactory xMSF = getMSF(); - assertNotNull("could not create MultiServiceFactory.", xMSF); - XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xMSF); - Object defaultCtx = xPropertySet.getPropertyValue("DefaultContext"); - XComponentContext xContext = UnoRuntime.queryInterface(XComponentContext.class, defaultCtx); - assertNotNull("could not get component context.", xContext); - - // TODO: Path to temp - String temp = util.utils.getOfficeTemp/*Dir*/(xMSF); - System.out.println("tempdir: " + temp); - - PropertyValue[] noArgs = { }; - PropertyValue mimetype = new PropertyValue(); - mimetype.Name = "MediaType"; - mimetype.Value = "application/vnd.oasis.opendocument.text"; - PropertyValue[] mimeArgs = { mimetype }; -// new Any("application/vnd.oasis.opendocument.text")) }; - PropertyValue cfile = new PropertyValue(); - cfile.Name = "URL"; - cfile.Value = temp + "EMPTY.odt"; - PropertyValue[] mimeEmptyArgs = { mimetype, cfile }; - - System.out.println("Creating service DocumentProperties..."); - - Object oDP = -// xMSF.createInstanceWithContext( -// "com.sun.star.document.DocumentProperties", xContext); - xMSF.createInstance("com.sun.star.document.DocumentProperties"); - XDocumentProperties xDP = UnoRuntime.queryInterface(XDocumentProperties.class, oDP); - - System.out.println("...done"); - - - System.out.println("Checking initialize ..."); - - XDocumentProperties xDP2 = UnoRuntime.queryInterface(XDocumentProperties.class, xMSF.createInstance("com.sun.star.document.DocumentProperties")); - XInitialization xInit = UnoRuntime.queryInterface(XInitialization.class, xDP2); - xInit.initialize(new Object[] { }); - - System.out.println("...done"); - - System.out.println("Checking storing default-initialized meta data ..."); - -// xDP2.storeToMedium(temp + "EMPTY.odt", mimeArgs); - xDP2.storeToMedium("", mimeEmptyArgs); - - System.out.println("...done"); - - System.out.println("Checking loading default-initialized meta data ..."); - -// xDP2.loadFromMedium(temp + "EMPTY.odt", noArgs); - xDP2.loadFromMedium("", mimeEmptyArgs); - assertTrue ("Author", "".equals(xDP2.getAuthor())); - - System.out.println("...done"); - - System.out.println("(Not) Checking preservation of custom meta data ..."); - - xDP2.loadFromMedium(TestDocument.getUrl("CUSTOM.odt"), - noArgs); - assertTrue ("Author", "".equals(xDP2.getAuthor())); - xDP2.storeToMedium(temp + "CUSTOM.odt", mimeArgs); - - //FIXME: now what? comparing for binary equality seems useless - // we could unzip the written file and grep for the custom stuff - // but would that work on windows... - - System.out.println("...done"); - - System.out.println("Checking loading from test document..."); - - String file = TestDocument.getUrl("TEST.odt"); - xDP.loadFromMedium(file, noArgs); -/* XInputStream xStream = - new StreamSimulator("./testdocuments/TEST.odt", true, param); - Object oSF = - xMSF.createInstance("com.sun.star.embed.StorageFactory"); - XSingleServiceFactory xSF = (XSingleServiceFactory) - UnoRuntime.queryInterface(XSingleServiceFactory.class, oSF); - Object oStor = xSF.createInstanceWithArguments( - new Object[] { xStream }); - XStorage xStor = (XStorage) UnoRuntime.queryInterface( - XStorage.class, oStor); - xDP.loadFromStorage(xStor);*/ - - System.out.println("...done"); - - System.out.println("Checking meta-data import..."); - - assertTrue("Author", "Karl-Heinz Mustermann".equals(xDP.getAuthor())); - assertTrue("Generator", - "StarOffice/8$Solaris_x86 OpenOffice.org_project/680m232$Build-9227" - .equals(xDP.getGenerator())); - assertTrue("CreationDate", 2007 == xDP.getCreationDate().Year); - assertTrue("Title", "Urgent Memo".equals(xDP.getTitle())); - assertTrue("Subject", "Wichtige Mitteilung".equals(xDP.getSubject())); - assertTrue("Description", - "Modern internal company memorandum in full-blocked style" - .equals(xDP.getDescription())); -// assertTrue("Language", "".equals(xDP.getLanguage())); - assertTrue("ModifiedBy", - "Karl-Heinz Mustermann".equals(xDP.getModifiedBy())); - assertTrue("ModificationDate", 10 == xDP.getModificationDate().Month); - assertTrue("PrintedBy", - "Karl-Heinz Mustermann".equals(xDP.getPrintedBy())); - assertTrue("PrintDate", 29 == xDP.getPrintDate().Day); - assertTrue("TemplateName", - "Modern Memo".equals(xDP.getTemplateName())); - assertTrue("TemplateURL", - xDP.getTemplateURL().endsWith("memmodern.ott")); - assertTrue("TemplateDate", 17 == xDP.getTemplateDate().Hours); - assertTrue("AutoloadURL", "../TEST.odt".equals(xDP.getAutoloadURL())); - assertTrue("AutoloadSecs", 0 == xDP.getAutoloadSecs()); - assertTrue("DefaultTarget", "_blank".equals(xDP.getDefaultTarget())); - assertTrue("EditingCycles", 3 == xDP.getEditingCycles()); - assertTrue("EditingDuration", 320 == xDP.getEditingDuration()); - - String[] kws = xDP.getKeywords(); - assertTrue("Keywords", fromArray(kws).containsAll( - fromArray(new Object[] { "Asien", "Memo", "Reis" }))); - - NamedValue[] ds = xDP.getDocumentStatistics(); -/* for (int i = 0; i < ds.length; ++i) { - System.out.println("nv: " + ds[i].Name + " " + ds[i].Value); - } - NamedValue nv1 = new NamedValue("WordCount", new Integer(23)); - NamedValue nv2 = new NamedValue("WordCount", new Integer(23)); - System.out.println("eq: " + nv1.equals(nv2)); // grrr, this is false... -*/ - assertTrue("DocumentStatistics:WordCount", containsNV(ds, - new NamedValue("WordCount", new Integer(23)))); - assertTrue("DocumentStatistics:PageCount", containsNV(ds, - new NamedValue("PageCount", new Integer(1)))); - - XPropertyContainer udpc = xDP.getUserDefinedProperties(); - XPropertySet udps = (XPropertySet) UnoRuntime.queryInterface( - XPropertySet.class, udpc); - assertTrue("UserDefined 1", "Dies ist ein wichtiger Hinweis" - .equals(udps.getPropertyValue("Hinweis"))); - assertTrue("UserDefined 2", ("Kann Spuren von N" - + new String(new byte[] { (byte) 0xc3, (byte) 0xbc }, "UTF-8") - + "ssen enthalten") - .equals(udps.getPropertyValue("Warnung"))); - - System.out.println("...done"); - - System.out.println("Checking meta-data updates..."); - - String str; - DateTime dt = new DateTime(); - Locale l = new Locale(); - int i; - - str = "me"; - xDP.setAuthor(str); - assertTrue("setAuthor", str.equals(xDP.getAuthor())); - str = "the computa"; - xDP.setGenerator(str); - assertTrue("setGenerator", str.equals(xDP.getGenerator())); - dt.Year = 2038; - dt.Month = 1; - dt.Day = 1; - xDP.setCreationDate(dt); - assertTrue("setCreationDate", dt.Year == xDP.getCreationDate().Year); - str = "El t'itulo"; - xDP.setTitle(str); - assertTrue("setTitle", str.equals(xDP.getTitle())); - str = "Ein verkommenes Subjekt"; - xDP.setSubject(str); - assertTrue("setSubject", str.equals(xDP.getSubject())); - str = "Este descripci'on no es importante"; - xDP.setDescription(str); - assertTrue("setDescription", str.equals(xDP.getDescription())); - l.Language = "en"; - l.Country = "GB"; - xDP.setLanguage(l); - Locale l2 = xDP.getLanguage(); - assertTrue("setLanguage Lang", l.Language.equals(l2.Language)); - assertTrue("setLanguage Cty", l.Country.equals(l2.Country)); - str = "myself"; - xDP.setModifiedBy(str); - assertTrue("setModifiedBy", str.equals(xDP.getModifiedBy())); - dt.Year = 2042; - xDP.setModificationDate(dt); - assertTrue("setModificationDate", - dt.Year == xDP.getModificationDate().Year); - str = "i didnt do it"; - xDP.setPrintedBy(str); - assertTrue("setPrintedBy", str.equals(xDP.getPrintedBy())); - dt.Year = 2024; - xDP.setPrintDate(dt); - assertTrue("setPrintDate", dt.Year == xDP.getPrintDate().Year); - str = "blah"; - xDP.setTemplateName(str); - assertTrue("setTemplateName", str.equals(xDP.getTemplateName())); - str = "gopher://some-hole-in-the-ground/"; - xDP.setTemplateURL(str); - assertTrue("setTemplateURL", str.equals(xDP.getTemplateURL())); - dt.Year = 2043; - xDP.setTemplateDate(dt); - assertTrue("setTemplateDate", dt.Year == xDP.getTemplateDate().Year); - str = "http://nowhere/"; - xDP.setAutoloadURL(str); - assertTrue("setAutoloadURL", str.equals(xDP.getAutoloadURL())); - i = 3661; // this might not work (due to conversion via double...) - xDP.setAutoloadSecs(i); -// System.out.println("set: " + i + " get: " + xDP.getAutoloadSecs()); - assertTrue("setAutoloadSecs", i == xDP.getAutoloadSecs()); - str = "_blank"; - xDP.setDefaultTarget(str); - assertTrue("setDefaultTarget", str.equals(xDP.getDefaultTarget())); - i = 42; - xDP.setEditingCycles((short) i); - assertTrue("setEditingCycles", i == xDP.getEditingCycles()); - i = 84; - xDP.setEditingDuration(i); - assertTrue("setEditingDuration", i == xDP.getEditingDuration()); - str = ""; - - String[] kws2 = new String[] { - "keywordly", "keywordlike", "keywordalicious" }; - xDP.setKeywords(kws2); - kws = xDP.getKeywords(); - assertTrue("setKeywords", fromArray(kws).containsAll(fromArray(kws2))); - - NamedValue[] ds2 = new NamedValue[] { - new NamedValue("SyllableCount", new Integer(9)), - new NamedValue("FrameCount", new Integer(2)), - new NamedValue("SentenceCount", new Integer(7)) }; - xDP.setDocumentStatistics(ds2); - ds = xDP.getDocumentStatistics(); - assertTrue("setDocumentStatistics:SyllableCount", containsNV(ds, - new NamedValue("SyllableCount", new Integer(9)))); - assertTrue("setDocumentStatistics:FrameCount", containsNV(ds, - new NamedValue("FrameCount", new Integer(2)))); - assertTrue("setDocumentStatistics:SentenceCount", containsNV(ds, - new NamedValue("SentenceCount", new Integer(7)))); - - System.out.println("...done"); - - System.out.println("Checking user-defined meta-data updates..."); - - // actually, this tests the PropertyBag service - // but maybe the DocumentProperties service will be implemented - // differently some day... - boolean b = true; - double d = 3.1415; - // note that Time is only supported for backward compatibilty! - Time t = new Time(); - t.Hours = 1; - t.Minutes = 16; - Date date = new Date(); - date.Year = 2071; - date.Month = 2; - date.Day = 3; - dt.Year = 2065; - Duration dur = new Duration(); - dur.Negative = true; - dur.Years = 1001; - dur.Months = 999; - dur.Days = 888; - dur.Hours = 777; - dur.Minutes = 666; - dur.Seconds = 555; - dur.MilliSeconds = 444; - - udpc.addProperty("Frobnicate", PropertyAttribute.REMOVEABLE, - new Boolean(b)); - udpc.addProperty("FrobDuration", PropertyAttribute.REMOVEABLE, dur); - udpc.addProperty("FrobDuration2", PropertyAttribute.REMOVEABLE, t); - udpc.addProperty("FrobEndDate", PropertyAttribute.REMOVEABLE, date); - udpc.addProperty("FrobStartTime", PropertyAttribute.REMOVEABLE, dt); - udpc.addProperty("Pi", PropertyAttribute.REMOVEABLE, new Double(d)); - udpc.addProperty("Foo", PropertyAttribute.REMOVEABLE, "bar"); - udpc.addProperty("Removed", PropertyAttribute.REMOVEABLE, "bar"); - // #i94175#: empty property name is valid ODF 1.1 - udpc.addProperty("", PropertyAttribute.REMOVEABLE, "eeeeek"); - try { - udpc.removeProperty("Info 1"); - udpc.removeProperty("Removed"); - } catch (UnknownPropertyException e) { - fail("removeProperty failed"); - } - - try { - udpc.addProperty("Forbidden", PropertyAttribute.REMOVEABLE, - new String[] { "foo", "bar" }); - fail("inserting value of non-supported type did not fail"); - } catch (IllegalTypeException e) { - // ignore - } - - assertTrue("UserDefined bool", new Boolean(b).equals( - udps.getPropertyValue("Frobnicate"))); - assertTrue("UserDefined duration", eqDuration(dur, (Duration) - udps.getPropertyValue("FrobDuration"))); - assertTrue("UserDefined time", eqTime(t, (Time) - udps.getPropertyValue("FrobDuration2"))); - assertTrue("UserDefined date", eqDate(date, (Date) - udps.getPropertyValue("FrobEndDate"))); - assertTrue("UserDefined datetime", eqDateTime(dt, (DateTime) - udps.getPropertyValue("FrobStartTime"))); - assertTrue("UserDefined float", new Double(d).equals( - udps.getPropertyValue("Pi"))); - assertTrue("UserDefined string", "bar".equals( - udps.getPropertyValue("Foo"))); - assertTrue("UserDefined empty name", "eeeeek".equals( - udps.getPropertyValue(""))); - - try { - udps.getPropertyValue("Removed"); - fail("UserDefined remove didn't"); - } catch (UnknownPropertyException e) { - // ok - } - - System.out.println("...done"); - - System.out.println("Checking storing meta-data to file..."); - - xDP.storeToMedium(temp + "TEST.odt", mimeArgs); - - System.out.println("...done"); - - System.out.println("Checking loading meta-data from stored file..."); - - xDP.loadFromMedium(temp + "TEST.odt", noArgs); - - System.out.println("...done"); - - System.out.println("Checking user-defined meta-data from stored file..."); - - udpc = xDP.getUserDefinedProperties(); - udps = (XPropertySet) UnoRuntime.queryInterface( - XPropertySet.class, udpc); - - assertTrue("UserDefined bool", new Boolean(b).equals( - udps.getPropertyValue("Frobnicate"))); - assertTrue("UserDefined duration", eqDuration(dur, (Duration) - udps.getPropertyValue("FrobDuration"))); - // this is now a Duration! - Duration t_dur = new Duration(false, (short)0, (short)0, (short)0, - t.Hours, t.Minutes, t.Seconds, - (short)(10 * t.HundredthSeconds)); - assertTrue("UserDefined time", eqDuration(t_dur, (Duration) - udps.getPropertyValue("FrobDuration2"))); - assertTrue("UserDefined date", eqDate(date, (Date) - udps.getPropertyValue("FrobEndDate"))); - assertTrue("UserDefined datetime", eqDateTime(dt, (DateTime) - udps.getPropertyValue("FrobStartTime"))); - assertTrue("UserDefined float", new Double(d).equals( - udps.getPropertyValue("Pi"))); - assertTrue("UserDefined string", "bar".equals( - udps.getPropertyValue("Foo"))); - - try { - udps.getPropertyValue("Removed"); - fail("UserDefined remove didn't"); - } catch (UnknownPropertyException e) { - // ok - } - - System.out.println("...done"); - - System.out.println("Checking notification listener interface..."); - - Listener listener = new Listener(); - XModifyBroadcaster xMB = (XModifyBroadcaster) - UnoRuntime.queryInterface(XModifyBroadcaster.class, xDP); - xMB.addModifyListener(listener); - xDP.setAuthor("not me"); - assertTrue("Listener Author", listener.reset()); - udpc.addProperty("Listener", PropertyAttribute.REMOVEABLE, "foo"); - assertTrue("Listener UserDefined Add", listener.reset()); - udps.setPropertyValue("Listener", "bar"); - assertTrue("Listener UserDefined Set", listener.reset()); - udpc.removeProperty("Listener"); - assertTrue("Listener UserDefined Remove", listener.reset()); - xMB.removeModifyListener(listener); - udpc.addProperty("Listener2", PropertyAttribute.REMOVEABLE, "foo"); - assertTrue("Removed Listener UserDefined Add", !listener.reset()); - - System.out.println("...done"); - - } catch (Exception e) { - report(e); - } - } - - // grrr... - boolean eqDateTime(DateTime a, DateTime b) { - return a.Year == b.Year && a.Month == b.Month && a.Day == b.Day - && a.Hours == b.Hours && a.Minutes == b.Minutes - && a.Seconds == b.Seconds - && a.HundredthSeconds == b.HundredthSeconds; - } - - boolean eqDate(Date a, Date b) { - return a.Year == b.Year && a.Month == b.Month && a.Day == b.Day; - } - - boolean eqTime(Time a, Time b) { - return a.Hours == b.Hours && a.Minutes == b.Minutes - && a.Seconds == b.Seconds - && a.HundredthSeconds == b.HundredthSeconds; - } - - boolean eqDuration(Duration a, Duration b) { - return a.Years == b.Years && a.Months == b.Months && a.Days == b.Days - && a.Hours == b.Hours && a.Minutes == b.Minutes - && a.Seconds == b.Seconds - && a.MilliSeconds == b.MilliSeconds - && a.Negative == b.Negative; - } - - java.util.Collection fromArray(Object[] os) { - java.util.Collection ret = new java.util.HashSet(); - for (int i = 0; i < os.length; ++i) { - ret.add(os[i]); - } - return ret; - } - - // bah, structs do not have proper equals(), and uno.Type is not comparable - public static boolean containsNV (NamedValue[] nvs, NamedValue nv) { - for (int i = 0; i < nvs.length; ++i) { - if (nvs[i].Name.equals(nv.Name) && nvs[i].Value.equals(nv.Value)) { - return true; - } - } - return false; - } - - public void report(Exception e) { - System.out.println("Exception occurred:"); - e.printStackTrace(); - fail(); - } - - - private XMultiServiceFactory getMSF() - { - final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); - return xMSF1; - } - - // setup and close connections - @BeforeClass public static void setUpConnection() throws Exception { - System.out.println("setUpConnection()"); - connection.setUp(); - } - - @AfterClass public static void tearDownConnection() - throws InterruptedException, com.sun.star.uno.Exception - { - System.out.println("tearDownConnection() DocumentMetaData"); - connection.tearDown(); - } - - private static final OfficeConnection connection = new OfficeConnection(); - -} - diff --git a/sfx2/qa/complex/framework/DocumentPropertiesTest.java b/sfx2/qa/complex/framework/DocumentPropertiesTest.java new file mode 100644 index 000000000000..20a0746c8322 --- /dev/null +++ b/sfx2/qa/complex/framework/DocumentPropertiesTest.java @@ -0,0 +1,565 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +package complex.framework; + + +import com.sun.star.uno.UnoRuntime; +import com.sun.star.uno.XComponentContext; +import com.sun.star.lang.XInitialization; + +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.lang.Locale; +import com.sun.star.lang.EventObject; +import com.sun.star.util.Date; +import com.sun.star.util.DateTime; +import com.sun.star.util.Time; +import com.sun.star.util.Duration; +import com.sun.star.util.XModifyListener; +import com.sun.star.util.XModifyBroadcaster; +import com.sun.star.beans.XPropertyContainer; +import com.sun.star.beans.XPropertySet; +import com.sun.star.beans.PropertyValue; +import com.sun.star.beans.NamedValue; +import com.sun.star.beans.PropertyAttribute; +import com.sun.star.beans.UnknownPropertyException; +import com.sun.star.beans.IllegalTypeException; + +import com.sun.star.document.XDocumentProperties; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + +/** + * Test case for the service com.sun.star.document.DocumentProperties. + * Currently, this service is implemented in + * sfx2/source/doc/SfxDocumentMetaData.cxx. + * + * @author mst + */ +public class DocumentPropertiesTest +{ +// public String[] getTestMethodNames () { +// return new String[] { "check", "cleanup" }; +// } + + @After public void cleanup() { + // nothing to do + } + + // for testing modifications + class Listener implements XModifyListener { + private boolean m_Called; + + public Listener() { + m_Called = false; + } + + public boolean reset() { + boolean oldCalled = m_Called; + m_Called = false; + return oldCalled; + } + + public void modified(EventObject e) { + m_Called = true; + } + + public void disposing(EventObject e) { + } + } + + @Test public void check() { + try { + XMultiServiceFactory xMSF = getMSF(); + assertNotNull("could not create MultiServiceFactory.", xMSF); + XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xMSF); + Object defaultCtx = xPropertySet.getPropertyValue("DefaultContext"); + XComponentContext xContext = UnoRuntime.queryInterface(XComponentContext.class, defaultCtx); + assertNotNull("could not get component context.", xContext); + + // TODO: Path to temp + String temp = util.utils.getOfficeTemp/*Dir*/(xMSF); + System.out.println("tempdir: " + temp); + + PropertyValue[] noArgs = { }; + PropertyValue mimetype = new PropertyValue(); + mimetype.Name = "MediaType"; + mimetype.Value = "application/vnd.oasis.opendocument.text"; + PropertyValue[] mimeArgs = { mimetype }; +// new Any("application/vnd.oasis.opendocument.text")) }; + PropertyValue cfile = new PropertyValue(); + cfile.Name = "URL"; + cfile.Value = temp + "EMPTY.odt"; + PropertyValue[] mimeEmptyArgs = { mimetype, cfile }; + + System.out.println("Creating service DocumentProperties..."); + + Object oDP = +// xMSF.createInstanceWithContext( +// "com.sun.star.document.DocumentProperties", xContext); + xMSF.createInstance("com.sun.star.document.DocumentProperties"); + XDocumentProperties xDP = UnoRuntime.queryInterface(XDocumentProperties.class, oDP); + + System.out.println("...done"); + + + System.out.println("Checking initialize ..."); + + XDocumentProperties xDP2 = UnoRuntime.queryInterface(XDocumentProperties.class, xMSF.createInstance("com.sun.star.document.DocumentProperties")); + XInitialization xInit = UnoRuntime.queryInterface(XInitialization.class, xDP2); + xInit.initialize(new Object[] { }); + + System.out.println("...done"); + + System.out.println("Checking storing default-initialized meta data ..."); + +// xDP2.storeToMedium(temp + "EMPTY.odt", mimeArgs); + xDP2.storeToMedium("", mimeEmptyArgs); + + System.out.println("...done"); + + System.out.println("Checking loading default-initialized meta data ..."); + +// xDP2.loadFromMedium(temp + "EMPTY.odt", noArgs); + xDP2.loadFromMedium("", mimeEmptyArgs); + assertTrue ("Author", "".equals(xDP2.getAuthor())); + + System.out.println("...done"); + + System.out.println("(Not) Checking preservation of custom meta data ..."); + + xDP2.loadFromMedium(TestDocument.getUrl("CUSTOM.odt"), + noArgs); + assertTrue ("Author", "".equals(xDP2.getAuthor())); + xDP2.storeToMedium(temp + "CUSTOM.odt", mimeArgs); + + //FIXME: now what? comparing for binary equality seems useless + // we could unzip the written file and grep for the custom stuff + // but would that work on windows... + + System.out.println("...done"); + + System.out.println("Checking loading from test document..."); + + String file = TestDocument.getUrl("TEST.odt"); + xDP.loadFromMedium(file, noArgs); +/* XInputStream xStream = + new StreamSimulator("./testdocuments/TEST.odt", true, param); + Object oSF = + xMSF.createInstance("com.sun.star.embed.StorageFactory"); + XSingleServiceFactory xSF = (XSingleServiceFactory) + UnoRuntime.queryInterface(XSingleServiceFactory.class, oSF); + Object oStor = xSF.createInstanceWithArguments( + new Object[] { xStream }); + XStorage xStor = (XStorage) UnoRuntime.queryInterface( + XStorage.class, oStor); + xDP.loadFromStorage(xStor);*/ + + System.out.println("...done"); + + System.out.println("Checking meta-data import..."); + + assertTrue("Author", "Karl-Heinz Mustermann".equals(xDP.getAuthor())); + assertTrue("Generator", + "StarOffice/8$Solaris_x86 OpenOffice.org_project/680m232$Build-9227" + .equals(xDP.getGenerator())); + assertTrue("CreationDate", 2007 == xDP.getCreationDate().Year); + assertTrue("Title", "Urgent Memo".equals(xDP.getTitle())); + assertTrue("Subject", "Wichtige Mitteilung".equals(xDP.getSubject())); + assertTrue("Description", + "Modern internal company memorandum in full-blocked style" + .equals(xDP.getDescription())); +// assertTrue("Language", "".equals(xDP.getLanguage())); + assertTrue("ModifiedBy", + "Karl-Heinz Mustermann".equals(xDP.getModifiedBy())); + assertTrue("ModificationDate", 10 == xDP.getModificationDate().Month); + assertTrue("PrintedBy", + "Karl-Heinz Mustermann".equals(xDP.getPrintedBy())); + assertTrue("PrintDate", 29 == xDP.getPrintDate().Day); + assertTrue("TemplateName", + "Modern Memo".equals(xDP.getTemplateName())); + assertTrue("TemplateURL", + xDP.getTemplateURL().endsWith("memmodern.ott")); + assertTrue("TemplateDate", 17 == xDP.getTemplateDate().Hours); + assertTrue("AutoloadURL", "../TEST.odt".equals(xDP.getAutoloadURL())); + assertTrue("AutoloadSecs", 0 == xDP.getAutoloadSecs()); + assertTrue("DefaultTarget", "_blank".equals(xDP.getDefaultTarget())); + assertTrue("EditingCycles", 3 == xDP.getEditingCycles()); + assertTrue("EditingDuration", 320 == xDP.getEditingDuration()); + + String[] kws = xDP.getKeywords(); + assertTrue("Keywords", fromArray(kws).containsAll( + fromArray(new Object[] { "Asien", "Memo", "Reis" }))); + + NamedValue[] ds = xDP.getDocumentStatistics(); +/* for (int i = 0; i < ds.length; ++i) { + System.out.println("nv: " + ds[i].Name + " " + ds[i].Value); + } + NamedValue nv1 = new NamedValue("WordCount", new Integer(23)); + NamedValue nv2 = new NamedValue("WordCount", new Integer(23)); + System.out.println("eq: " + nv1.equals(nv2)); // grrr, this is false... +*/ + assertTrue("DocumentStatistics:WordCount", containsNV(ds, + new NamedValue("WordCount", new Integer(23)))); + assertTrue("DocumentStatistics:PageCount", containsNV(ds, + new NamedValue("PageCount", new Integer(1)))); + + XPropertyContainer udpc = xDP.getUserDefinedProperties(); + XPropertySet udps = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet.class, udpc); + assertTrue("UserDefined 1", "Dies ist ein wichtiger Hinweis" + .equals(udps.getPropertyValue("Hinweis"))); + assertTrue("UserDefined 2", ("Kann Spuren von N" + + new String(new byte[] { (byte) 0xc3, (byte) 0xbc }, "UTF-8") + + "ssen enthalten") + .equals(udps.getPropertyValue("Warnung"))); + + System.out.println("...done"); + + System.out.println("Checking meta-data updates..."); + + String str; + DateTime dt = new DateTime(); + Locale l = new Locale(); + int i; + + str = "me"; + xDP.setAuthor(str); + assertTrue("setAuthor", str.equals(xDP.getAuthor())); + str = "the computa"; + xDP.setGenerator(str); + assertTrue("setGenerator", str.equals(xDP.getGenerator())); + dt.Year = 2038; + dt.Month = 1; + dt.Day = 1; + xDP.setCreationDate(dt); + assertTrue("setCreationDate", dt.Year == xDP.getCreationDate().Year); + str = "El t'itulo"; + xDP.setTitle(str); + assertTrue("setTitle", str.equals(xDP.getTitle())); + str = "Ein verkommenes Subjekt"; + xDP.setSubject(str); + assertTrue("setSubject", str.equals(xDP.getSubject())); + str = "Este descripci'on no es importante"; + xDP.setDescription(str); + assertTrue("setDescription", str.equals(xDP.getDescription())); + l.Language = "en"; + l.Country = "GB"; + xDP.setLanguage(l); + Locale l2 = xDP.getLanguage(); + assertTrue("setLanguage Lang", l.Language.equals(l2.Language)); + assertTrue("setLanguage Cty", l.Country.equals(l2.Country)); + str = "myself"; + xDP.setModifiedBy(str); + assertTrue("setModifiedBy", str.equals(xDP.getModifiedBy())); + dt.Year = 2042; + xDP.setModificationDate(dt); + assertTrue("setModificationDate", + dt.Year == xDP.getModificationDate().Year); + str = "i didnt do it"; + xDP.setPrintedBy(str); + assertTrue("setPrintedBy", str.equals(xDP.getPrintedBy())); + dt.Year = 2024; + xDP.setPrintDate(dt); + assertTrue("setPrintDate", dt.Year == xDP.getPrintDate().Year); + str = "blah"; + xDP.setTemplateName(str); + assertTrue("setTemplateName", str.equals(xDP.getTemplateName())); + str = "gopher://some-hole-in-the-ground/"; + xDP.setTemplateURL(str); + assertTrue("setTemplateURL", str.equals(xDP.getTemplateURL())); + dt.Year = 2043; + xDP.setTemplateDate(dt); + assertTrue("setTemplateDate", dt.Year == xDP.getTemplateDate().Year); + str = "http://nowhere/"; + xDP.setAutoloadURL(str); + assertTrue("setAutoloadURL", str.equals(xDP.getAutoloadURL())); + i = 3661; // this might not work (due to conversion via double...) + xDP.setAutoloadSecs(i); +// System.out.println("set: " + i + " get: " + xDP.getAutoloadSecs()); + assertTrue("setAutoloadSecs", i == xDP.getAutoloadSecs()); + str = "_blank"; + xDP.setDefaultTarget(str); + assertTrue("setDefaultTarget", str.equals(xDP.getDefaultTarget())); + i = 42; + xDP.setEditingCycles((short) i); + assertTrue("setEditingCycles", i == xDP.getEditingCycles()); + i = 84; + xDP.setEditingDuration(i); + assertTrue("setEditingDuration", i == xDP.getEditingDuration()); + str = ""; + + String[] kws2 = new String[] { + "keywordly", "keywordlike", "keywordalicious" }; + xDP.setKeywords(kws2); + kws = xDP.getKeywords(); + assertTrue("setKeywords", fromArray(kws).containsAll(fromArray(kws2))); + + NamedValue[] ds2 = new NamedValue[] { + new NamedValue("SyllableCount", new Integer(9)), + new NamedValue("FrameCount", new Integer(2)), + new NamedValue("SentenceCount", new Integer(7)) }; + xDP.setDocumentStatistics(ds2); + ds = xDP.getDocumentStatistics(); + assertTrue("setDocumentStatistics:SyllableCount", containsNV(ds, + new NamedValue("SyllableCount", new Integer(9)))); + assertTrue("setDocumentStatistics:FrameCount", containsNV(ds, + new NamedValue("FrameCount", new Integer(2)))); + assertTrue("setDocumentStatistics:SentenceCount", containsNV(ds, + new NamedValue("SentenceCount", new Integer(7)))); + + System.out.println("...done"); + + System.out.println("Checking user-defined meta-data updates..."); + + // actually, this tests the PropertyBag service + // but maybe the DocumentProperties service will be implemented + // differently some day... + boolean b = true; + double d = 3.1415; + // note that Time is only supported for backward compatibilty! + Time t = new Time(); + t.Hours = 1; + t.Minutes = 16; + Date date = new Date(); + date.Year = 2071; + date.Month = 2; + date.Day = 3; + dt.Year = 2065; + Duration dur = new Duration(); + dur.Negative = true; + dur.Years = 1001; + dur.Months = 999; + dur.Days = 888; + dur.Hours = 777; + dur.Minutes = 666; + dur.Seconds = 555; + dur.MilliSeconds = 444; + + udpc.addProperty("Frobnicate", PropertyAttribute.REMOVEABLE, + new Boolean(b)); + udpc.addProperty("FrobDuration", PropertyAttribute.REMOVEABLE, dur); + udpc.addProperty("FrobDuration2", PropertyAttribute.REMOVEABLE, t); + udpc.addProperty("FrobEndDate", PropertyAttribute.REMOVEABLE, date); + udpc.addProperty("FrobStartTime", PropertyAttribute.REMOVEABLE, dt); + udpc.addProperty("Pi", PropertyAttribute.REMOVEABLE, new Double(d)); + udpc.addProperty("Foo", PropertyAttribute.REMOVEABLE, "bar"); + udpc.addProperty("Removed", PropertyAttribute.REMOVEABLE, "bar"); + // #i94175#: empty property name is valid ODF 1.1 + udpc.addProperty("", PropertyAttribute.REMOVEABLE, "eeeeek"); + try { + udpc.removeProperty("Info 1"); + udpc.removeProperty("Removed"); + } catch (UnknownPropertyException e) { + fail("removeProperty failed"); + } + + try { + udpc.addProperty("Forbidden", PropertyAttribute.REMOVEABLE, + new String[] { "foo", "bar" }); + fail("inserting value of non-supported type did not fail"); + } catch (IllegalTypeException e) { + // ignore + } + + assertTrue("UserDefined bool", new Boolean(b).equals( + udps.getPropertyValue("Frobnicate"))); + assertTrue("UserDefined duration", eqDuration(dur, (Duration) + udps.getPropertyValue("FrobDuration"))); + assertTrue("UserDefined time", eqTime(t, (Time) + udps.getPropertyValue("FrobDuration2"))); + assertTrue("UserDefined date", eqDate(date, (Date) + udps.getPropertyValue("FrobEndDate"))); + assertTrue("UserDefined datetime", eqDateTime(dt, (DateTime) + udps.getPropertyValue("FrobStartTime"))); + assertTrue("UserDefined float", new Double(d).equals( + udps.getPropertyValue("Pi"))); + assertTrue("UserDefined string", "bar".equals( + udps.getPropertyValue("Foo"))); + assertTrue("UserDefined empty name", "eeeeek".equals( + udps.getPropertyValue(""))); + + try { + udps.getPropertyValue("Removed"); + fail("UserDefined remove didn't"); + } catch (UnknownPropertyException e) { + // ok + } + + System.out.println("...done"); + + System.out.println("Checking storing meta-data to file..."); + + xDP.storeToMedium(temp + "TEST.odt", mimeArgs); + + System.out.println("...done"); + + System.out.println("Checking loading meta-data from stored file..."); + + xDP.loadFromMedium(temp + "TEST.odt", noArgs); + + System.out.println("...done"); + + System.out.println("Checking user-defined meta-data from stored file..."); + + udpc = xDP.getUserDefinedProperties(); + udps = (XPropertySet) UnoRuntime.queryInterface( + XPropertySet.class, udpc); + + assertTrue("UserDefined bool", new Boolean(b).equals( + udps.getPropertyValue("Frobnicate"))); + assertTrue("UserDefined duration", eqDuration(dur, (Duration) + udps.getPropertyValue("FrobDuration"))); + // this is now a Duration! + Duration t_dur = new Duration(false, (short)0, (short)0, (short)0, + t.Hours, t.Minutes, t.Seconds, + (short)(10 * t.HundredthSeconds)); + assertTrue("UserDefined time", eqDuration(t_dur, (Duration) + udps.getPropertyValue("FrobDuration2"))); + assertTrue("UserDefined date", eqDate(date, (Date) + udps.getPropertyValue("FrobEndDate"))); + assertTrue("UserDefined datetime", eqDateTime(dt, (DateTime) + udps.getPropertyValue("FrobStartTime"))); + assertTrue("UserDefined float", new Double(d).equals( + udps.getPropertyValue("Pi"))); + assertTrue("UserDefined string", "bar".equals( + udps.getPropertyValue("Foo"))); + + try { + udps.getPropertyValue("Removed"); + fail("UserDefined remove didn't"); + } catch (UnknownPropertyException e) { + // ok + } + + System.out.println("...done"); + + System.out.println("Checking notification listener interface..."); + + Listener listener = new Listener(); + XModifyBroadcaster xMB = (XModifyBroadcaster) + UnoRuntime.queryInterface(XModifyBroadcaster.class, xDP); + xMB.addModifyListener(listener); + xDP.setAuthor("not me"); + assertTrue("Listener Author", listener.reset()); + udpc.addProperty("Listener", PropertyAttribute.REMOVEABLE, "foo"); + assertTrue("Listener UserDefined Add", listener.reset()); + udps.setPropertyValue("Listener", "bar"); + assertTrue("Listener UserDefined Set", listener.reset()); + udpc.removeProperty("Listener"); + assertTrue("Listener UserDefined Remove", listener.reset()); + xMB.removeModifyListener(listener); + udpc.addProperty("Listener2", PropertyAttribute.REMOVEABLE, "foo"); + assertTrue("Removed Listener UserDefined Add", !listener.reset()); + + System.out.println("...done"); + + } catch (Exception e) { + report(e); + } + } + + // grrr... + boolean eqDateTime(DateTime a, DateTime b) { + return a.Year == b.Year && a.Month == b.Month && a.Day == b.Day + && a.Hours == b.Hours && a.Minutes == b.Minutes + && a.Seconds == b.Seconds + && a.HundredthSeconds == b.HundredthSeconds; + } + + boolean eqDate(Date a, Date b) { + return a.Year == b.Year && a.Month == b.Month && a.Day == b.Day; + } + + boolean eqTime(Time a, Time b) { + return a.Hours == b.Hours && a.Minutes == b.Minutes + && a.Seconds == b.Seconds + && a.HundredthSeconds == b.HundredthSeconds; + } + + boolean eqDuration(Duration a, Duration b) { + return a.Years == b.Years && a.Months == b.Months && a.Days == b.Days + && a.Hours == b.Hours && a.Minutes == b.Minutes + && a.Seconds == b.Seconds + && a.MilliSeconds == b.MilliSeconds + && a.Negative == b.Negative; + } + + java.util.Collection fromArray(Object[] os) { + java.util.Collection ret = new java.util.HashSet(); + for (int i = 0; i < os.length; ++i) { + ret.add(os[i]); + } + return ret; + } + + // bah, structs do not have proper equals(), and uno.Type is not comparable + public static boolean containsNV (NamedValue[] nvs, NamedValue nv) { + for (int i = 0; i < nvs.length; ++i) { + if (nvs[i].Name.equals(nv.Name) && nvs[i].Value.equals(nv.Value)) { + return true; + } + } + return false; + } + + public void report(Exception e) { + System.out.println("Exception occurred:"); + e.printStackTrace(); + fail(); + } + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection() DocumentPropertiesTest"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + +} + diff --git a/sfx2/qa/complex/framework/makefile.mk b/sfx2/qa/complex/framework/makefile.mk index 1b74cad15ea8..093bc828d4ef 100644 --- a/sfx2/qa/complex/framework/makefile.mk +++ b/sfx2/qa/complex/framework/makefile.mk @@ -36,8 +36,8 @@ TARGET = qa_complex_framework .IF "$(OOO_JUNIT_JAR)" != "" PACKAGE = complex/framework JAVATESTFILES = \ + DocumentPropertiesTest.java \ DocumentMetadataAccessTest.java \ - DocumentMetaData.java \ CheckGlobalEventBroadcaster_writer1.java JAVAFILES = $(JAVATESTFILES) \ -- cgit v1.2.3 From 305193791e7143970687ea4c0dc47dca02022b2c Mon Sep 17 00:00:00 2001 From: Lars Langhans Date: Tue, 29 Jun 2010 13:43:23 +0200 Subject: sb123:#i111449# makefile cleanups for qa/complex tests --- linguistic/qa/complex/linguistic/makefile.mk | 1 - sfx2/qa/complex/docinfo/makefile.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'sfx2/qa') diff --git a/linguistic/qa/complex/linguistic/makefile.mk b/linguistic/qa/complex/linguistic/makefile.mk index b0d274167b98..2d10ec4c832d 100644 --- a/linguistic/qa/complex/linguistic/makefile.mk +++ b/linguistic/qa/complex/linguistic/makefile.mk @@ -27,7 +27,6 @@ .IF "$(OOO_SUBSEQUENT_TESTS)" == "" nothing .PHONY: - @echo "OOO_SUBSEQUENT_TESTS not set, do nothing." .ELSE PRJ = ../../.. diff --git a/sfx2/qa/complex/docinfo/makefile.mk b/sfx2/qa/complex/docinfo/makefile.mk index 51f2ddd02597..626b648a6d06 100644 --- a/sfx2/qa/complex/docinfo/makefile.mk +++ b/sfx2/qa/complex/docinfo/makefile.mk @@ -45,7 +45,7 @@ JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) # Sample how to debug -JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y .END -- cgit v1.2.3 From 536570325d39dfc9559640b13800f976725ac2c3 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 3 Aug 2010 10:01:07 +0100 Subject: cmcfixes77: #i113503# system non-stlport cppunit with OOo stlport --- sfx2/qa/cppunit/makefile.mk | 7 +++++++ sfx2/qa/cppunit/test_metadatable.cxx | 2 ++ 2 files changed, 9 insertions(+) (limited to 'sfx2/qa') diff --git a/sfx2/qa/cppunit/makefile.mk b/sfx2/qa/cppunit/makefile.mk index 2794c2ae92bb..dce0b86a0619 100644 --- a/sfx2/qa/cppunit/makefile.mk +++ b/sfx2/qa/cppunit/makefile.mk @@ -35,6 +35,13 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +#building with stlport, but cppunit was not built with stlport +.IF "$(USE_SYSTEM_STL)"!="YES" +.IF "$(SYSTEM_CPPUNIT)"=="YES" +CFLAGSCXX+=-DADAPT_EXT_STL +.ENDIF +.ENDIF + CFLAGSCXX += $(CPPUNIT_CFLAGS) DLLPRE = # no leading "lib" on .so files diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx index 903be6920327..6a0be13a9c53 100644 --- a/sfx2/qa/cppunit/test_metadatable.cxx +++ b/sfx2/qa/cppunit/test_metadatable.cxx @@ -27,10 +27,12 @@ #include "precompiled_sfx2.hxx" +#include "preextstl.h" #include #include #include #include +#include "postextstl.h" #include -- cgit v1.2.3 From b5ff94fde0cc506d9c3c17c2762101a0c7a657e4 Mon Sep 17 00:00:00 2001 From: Lars Langhans Date: Mon, 23 Aug 2010 10:38:44 +0200 Subject: sb123:#i111449# remove all subdirs in complex tests --- framework/prj/build.lst | 8 - framework/qa/complex/ModuleManager/makefile.mk | 3 - .../qa/complex/XUserInputInterception/makefile.mk | 3 - .../AcceleratorsConfigurationTest.java | 2 +- framework/qa/complex/accelerators/KeyMapping.java | 168 ++++++++ .../qa/complex/accelerators/helper/KeyMapping.java | 168 -------- framework/qa/complex/accelerators/makefile.mk | 6 +- framework/qa/complex/api_internal/makefile.mk | 3 - framework/qa/complex/broken_document/makefile.mk | 3 - .../qa/complex/contextMenuInterceptor/makefile.mk | 3 - framework/qa/complex/desktop/makefile.mk | 3 - framework/qa/complex/dispatches/Interceptor.java | 345 +++++++++++++++ .../qa/complex/dispatches/checkdispatchapi.java | 2 +- .../qa/complex/dispatches/helper/Interceptor.java | 345 --------------- framework/qa/complex/dispatches/makefile.mk | 6 +- framework/qa/complex/disposing/makefile.mk | 3 - .../qa/complex/framework/autosave/makefile.mk | 3 - .../qa/complex/imageManager/CheckImageManager.java | 12 +- framework/qa/complex/imageManager/_XComponent.java | 187 ++++++++ .../qa/complex/imageManager/_XImageManager.java | 117 +++++ .../qa/complex/imageManager/_XInitialization.java | 94 ++++ .../qa/complex/imageManager/_XTypeProvider.java | 102 +++++ .../qa/complex/imageManager/_XUIConfiguration.java | 82 ++++ .../imageManager/_XUIConfigurationPersistence.java | 93 ++++ .../imageManager/interfaces/_XComponent.java | 187 -------- .../imageManager/interfaces/_XImageManager.java | 117 ----- .../imageManager/interfaces/_XInitialization.java | 94 ---- .../imageManager/interfaces/_XTypeProvider.java | 102 ----- .../imageManager/interfaces/_XUIConfiguration.java | 82 ---- .../interfaces/_XUIConfigurationPersistence.java | 93 ---- framework/qa/complex/imageManager/makefile.mk | 11 +- .../loadAllDocuments/CheckXComponentLoader.java | 2 - .../loadAllDocuments/InteractionHandler.java | 155 +++++++ .../complex/loadAllDocuments/StatusIndicator.java | 237 +++++++++++ .../complex/loadAllDocuments/StreamSimulator.java | 474 +++++++++++++++++++++ .../helper/InteractionHandler.java | 155 ------- .../loadAllDocuments/helper/StatusIndicator.java | 237 ----------- .../loadAllDocuments/helper/StreamSimulator.java | 474 --------------------- framework/qa/complex/loadAllDocuments/makefile.mk | 9 +- framework/qa/complex/path_settings/makefile.mk | 3 - framework/qa/complex/path_substitution/makefile.mk | 3 - linguistic/qa/complex/linguistic/makefile.mk | 3 - sfx2/prj/build.lst | 2 - sfx2/qa/complex/framework/DialogThread.java | 95 +++++ .../complex/framework/DocHelper/DialogThread.java | 95 ----- .../complex/framework/DocHelper/WriterHelper.java | 287 ------------- sfx2/qa/complex/framework/WriterHelper.java | 287 +++++++++++++ sfx2/qa/complex/framework/makefile.mk | 6 +- ucb/prj/build.lst | 1 - ucb/qa/complex/tdoc/CheckContentProvider.java | 10 - .../tdoc/CheckTransientDocumentsContent.java | 1 + .../CheckTransientDocumentsContentProvider.java | 3 +- .../CheckTransientDocumentsDocumentContent.java | 1 + ucb/qa/complex/tdoc/_XChild.java | 104 +++++ .../complex/tdoc/_XCommandInfoChangeNotifier.java | 64 +++ ucb/qa/complex/tdoc/_XCommandProcessor.java | 286 +++++++++++++ ucb/qa/complex/tdoc/_XComponent.java | 171 ++++++++ ucb/qa/complex/tdoc/_XContent.java | 86 ++++ .../complex/tdoc/_XPropertiesChangeNotifier.java | 67 +++ ucb/qa/complex/tdoc/_XPropertyContainer.java | 102 +++++ .../tdoc/_XPropertySetInfoChangeNotifier.java | 67 +++ ucb/qa/complex/tdoc/_XServiceInfo.java | 99 +++++ ucb/qa/complex/tdoc/_XTypeProvider.java | 95 +++++ ucb/qa/complex/tdoc/interfaces/_XChild.java | 104 ----- .../interfaces/_XCommandInfoChangeNotifier.java | 64 --- .../tdoc/interfaces/_XCommandProcessor.java | 286 ------------- ucb/qa/complex/tdoc/interfaces/_XComponent.java | 171 -------- ucb/qa/complex/tdoc/interfaces/_XContent.java | 86 ---- .../interfaces/_XPropertiesChangeNotifier.java | 67 --- .../tdoc/interfaces/_XPropertyContainer.java | 102 ----- .../_XPropertySetInfoChangeNotifier.java | 67 --- ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java | 99 ----- ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java | 95 ----- ucb/qa/complex/tdoc/makefile.mk | 16 +- 74 files changed, 3616 insertions(+), 3669 deletions(-) create mode 100644 framework/qa/complex/accelerators/KeyMapping.java delete mode 100644 framework/qa/complex/accelerators/helper/KeyMapping.java create mode 100644 framework/qa/complex/dispatches/Interceptor.java delete mode 100644 framework/qa/complex/dispatches/helper/Interceptor.java create mode 100755 framework/qa/complex/imageManager/_XComponent.java create mode 100755 framework/qa/complex/imageManager/_XImageManager.java create mode 100755 framework/qa/complex/imageManager/_XInitialization.java create mode 100755 framework/qa/complex/imageManager/_XTypeProvider.java create mode 100755 framework/qa/complex/imageManager/_XUIConfiguration.java create mode 100755 framework/qa/complex/imageManager/_XUIConfigurationPersistence.java delete mode 100755 framework/qa/complex/imageManager/interfaces/_XComponent.java delete mode 100755 framework/qa/complex/imageManager/interfaces/_XImageManager.java delete mode 100755 framework/qa/complex/imageManager/interfaces/_XInitialization.java delete mode 100755 framework/qa/complex/imageManager/interfaces/_XTypeProvider.java delete mode 100755 framework/qa/complex/imageManager/interfaces/_XUIConfiguration.java delete mode 100755 framework/qa/complex/imageManager/interfaces/_XUIConfigurationPersistence.java create mode 100644 framework/qa/complex/loadAllDocuments/InteractionHandler.java create mode 100644 framework/qa/complex/loadAllDocuments/StatusIndicator.java create mode 100644 framework/qa/complex/loadAllDocuments/StreamSimulator.java delete mode 100644 framework/qa/complex/loadAllDocuments/helper/InteractionHandler.java delete mode 100644 framework/qa/complex/loadAllDocuments/helper/StatusIndicator.java delete mode 100644 framework/qa/complex/loadAllDocuments/helper/StreamSimulator.java create mode 100644 sfx2/qa/complex/framework/DialogThread.java delete mode 100644 sfx2/qa/complex/framework/DocHelper/DialogThread.java delete mode 100644 sfx2/qa/complex/framework/DocHelper/WriterHelper.java create mode 100644 sfx2/qa/complex/framework/WriterHelper.java create mode 100755 ucb/qa/complex/tdoc/_XChild.java create mode 100755 ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java create mode 100755 ucb/qa/complex/tdoc/_XCommandProcessor.java create mode 100755 ucb/qa/complex/tdoc/_XComponent.java create mode 100755 ucb/qa/complex/tdoc/_XContent.java create mode 100755 ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java create mode 100755 ucb/qa/complex/tdoc/_XPropertyContainer.java create mode 100755 ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java create mode 100755 ucb/qa/complex/tdoc/_XServiceInfo.java create mode 100755 ucb/qa/complex/tdoc/_XTypeProvider.java delete mode 100755 ucb/qa/complex/tdoc/interfaces/_XChild.java delete mode 100755 ucb/qa/complex/tdoc/interfaces/_XCommandInfoChangeNotifier.java delete mode 100755 ucb/qa/complex/tdoc/interfaces/_XCommandProcessor.java delete mode 100755 ucb/qa/complex/tdoc/interfaces/_XComponent.java delete mode 100755 ucb/qa/complex/tdoc/interfaces/_XContent.java delete mode 100755 ucb/qa/complex/tdoc/interfaces/_XPropertiesChangeNotifier.java delete mode 100755 ucb/qa/complex/tdoc/interfaces/_XPropertyContainer.java delete mode 100755 ucb/qa/complex/tdoc/interfaces/_XPropertySetInfoChangeNotifier.java delete mode 100755 ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java delete mode 100755 ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java (limited to 'sfx2/qa') diff --git a/framework/prj/build.lst b/framework/prj/build.lst index 9c1feb3e8f5b..153dea29af2c 100644 --- a/framework/prj/build.lst +++ b/framework/prj/build.lst @@ -27,8 +27,6 @@ fr framework\qa\unoapi nmake - all fr_qa_unoapi NULL # fr framework\qa\complex\ModuleManager nmake - all fr_qa_complex_modulemanager NULL # fr framework\qa\complex\XUserInputInterception nmake - all fr_qa_complex_xuserinputinterception NULL -# subdir has to remove -# fr framework\qa\complex\accelerators\helper nmake - all fr_qa_complex_accel_helper NULL # fr framework\qa\complex\accelerators nmake - all fr_qa_complex_accel fr_qa_complex_accel_helper NULL # unclear should be remove @@ -38,8 +36,6 @@ fr framework\qa\unoapi nmake - all fr_qa_unoapi NULL # fr framework\qa\complex\broken_document nmake - all fr_qa_complex_broken_doc NULL fr framework\qa\complex\desktop nmake - all fr_qa_complex_desktop NULL -# subdir has to remove -# fr framework\qa\complex\dispatches\helper nmake - all fr_qa_complex_dispatches_helper NULL # fr framework\qa\complex\dispatches nmake - all fr_qa_complex_dispatches fr_qa_complex_dispatches_helper NULL # fr framework\qa\complex\disposing nmake - all fr_qa_complex_disposing NULL @@ -49,12 +45,8 @@ fr framework\qa\complex\desktop nmake - all fr_qa_complex_deskt # much too complex, will not change to new junit # fr framework\qa\complex\framework\recovery nmake - all fr_qa_complex_framework_recovery NULL -# subdir has to remove -# fr framework\qa\complex\imageManager\interfaces nmake - all fr_qa_complex_imageManager_interfaces NULL # fr framework\qa\complex\imageManager nmake - all fr_qa_complex_imageManager fr_qa_complex_imageManager_interfaces NULL -# subdir has to remove -# fr framework\qa\complex\loadAllDocuments\helper nmake - all fr_qa_complex_loadAllDocuments_helper NULL # fr framework\qa\complex\loadAllDocuments nmake - all fr_qa_complex_loadAllDocuments fr_qa_complex_loadAllDocuments_helper NULL # need cleanups diff --git a/framework/qa/complex/ModuleManager/makefile.mk b/framework/qa/complex/ModuleManager/makefile.mk index a27f0bcc36b4..4ad6d8929030 100644 --- a/framework/qa/complex/ModuleManager/makefile.mk +++ b/framework/qa/complex/ModuleManager/makefile.mk @@ -45,9 +45,6 @@ JAVAFILES = $(JAVATESTFILES) JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -# subdirectories -# SUBDIRS = helper - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/framework/qa/complex/XUserInputInterception/makefile.mk b/framework/qa/complex/XUserInputInterception/makefile.mk index d25ec9b4f6f7..8b08bec171ee 100644 --- a/framework/qa/complex/XUserInputInterception/makefile.mk +++ b/framework/qa/complex/XUserInputInterception/makefile.mk @@ -52,9 +52,6 @@ JAVAFILES = $(JAVATESTFILES) JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -# subdirectories -# SUBDIRS = helper - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java index 98e73189ea7e..b0d89ad81858 100644 --- a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java +++ b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java @@ -46,7 +46,7 @@ import com.sun.star.uno.XInterface; import com.sun.star.uno.UnoRuntime; import com.sun.star.util.XChangesBatch; -import complex.accelerators.helper.KeyMapping; +// import complex.accelerators.KeyMapping; // ---------- junit imports ----------------- diff --git a/framework/qa/complex/accelerators/KeyMapping.java b/framework/qa/complex/accelerators/KeyMapping.java new file mode 100644 index 000000000000..d09a51162e7c --- /dev/null +++ b/framework/qa/complex/accelerators/KeyMapping.java @@ -0,0 +1,168 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +package complex.accelerators; + +import java.util.HashMap; + +class KeyIdentifierInfo +{ + protected String sIdentifier; + protected Short nCode; + + KeyIdentifierInfo(String sID, Short nC) + { + sIdentifier = sID; + nCode = nC; + } +} + +class IdentifierHashMap extends HashMap +{ + public void put(String sIdentifier, Short nCode) + { + super.put(sIdentifier, nCode); + } + public Short get(String sIdentifier) + { + return (Short)super.get(sIdentifier); + } +} + +class CodeHashMap extends HashMap +{ + public void put(Short nCode, String sIdentifier) + { + super.put(nCode, sIdentifier); + } + public String get(Short nCode) + { + return (String)super.get(nCode); + } +} + +public class KeyMapping +{ + private IdentifierHashMap aIdentifierHashMap; + private CodeHashMap aCodeHashMap; + + public KeyMapping() + { + KeyIdentifierInfo[] aInfoMap = { + new KeyIdentifierInfo("0", new Short(com.sun.star.awt.Key.NUM0)), + new KeyIdentifierInfo("1", new Short(com.sun.star.awt.Key.NUM1)), + new KeyIdentifierInfo("2", new Short(com.sun.star.awt.Key.NUM2)), + new KeyIdentifierInfo("3", new Short(com.sun.star.awt.Key.NUM3)), + new KeyIdentifierInfo("4", new Short(com.sun.star.awt.Key.NUM4)), + new KeyIdentifierInfo("5", new Short(com.sun.star.awt.Key.NUM5)), + new KeyIdentifierInfo("6", new Short(com.sun.star.awt.Key.NUM6)), + new KeyIdentifierInfo("7", new Short(com.sun.star.awt.Key.NUM7)), + new KeyIdentifierInfo("8", new Short(com.sun.star.awt.Key.NUM8)), + new KeyIdentifierInfo("9", new Short(com.sun.star.awt.Key.NUM9)), + new KeyIdentifierInfo("A", new Short(com.sun.star.awt.Key.A)), + new KeyIdentifierInfo("B", new Short(com.sun.star.awt.Key.B)), + new KeyIdentifierInfo("C", new Short(com.sun.star.awt.Key.C)), + new KeyIdentifierInfo("D", new Short(com.sun.star.awt.Key.D)), + new KeyIdentifierInfo("E", new Short(com.sun.star.awt.Key.E)), + new KeyIdentifierInfo("F", new Short(com.sun.star.awt.Key.F)), + new KeyIdentifierInfo("G", new Short(com.sun.star.awt.Key.G)), + new KeyIdentifierInfo("H", new Short(com.sun.star.awt.Key.H)), + new KeyIdentifierInfo("I", new Short(com.sun.star.awt.Key.I)), + new KeyIdentifierInfo("J", new Short(com.sun.star.awt.Key.J)), + new KeyIdentifierInfo("K", new Short(com.sun.star.awt.Key.K)), + new KeyIdentifierInfo("L", new Short(com.sun.star.awt.Key.L)), + new KeyIdentifierInfo("M", new Short(com.sun.star.awt.Key.M)), + new KeyIdentifierInfo("N", new Short(com.sun.star.awt.Key.N)), + new KeyIdentifierInfo("O", new Short(com.sun.star.awt.Key.O)), + new KeyIdentifierInfo("P", new Short(com.sun.star.awt.Key.P)), + new KeyIdentifierInfo("Q", new Short(com.sun.star.awt.Key.Q)), + new KeyIdentifierInfo("R", new Short(com.sun.star.awt.Key.R)), + new KeyIdentifierInfo("S", new Short(com.sun.star.awt.Key.S)), + new KeyIdentifierInfo("T", new Short(com.sun.star.awt.Key.T)), + new KeyIdentifierInfo("U", new Short(com.sun.star.awt.Key.U)), + new KeyIdentifierInfo("V", new Short(com.sun.star.awt.Key.V)), + new KeyIdentifierInfo("W", new Short(com.sun.star.awt.Key.W)), + new KeyIdentifierInfo("X", new Short(com.sun.star.awt.Key.X)), + new KeyIdentifierInfo("Y", new Short(com.sun.star.awt.Key.Y)), + new KeyIdentifierInfo("Z", new Short(com.sun.star.awt.Key.Z)), + new KeyIdentifierInfo("F1", new Short(com.sun.star.awt.Key.F1)), + new KeyIdentifierInfo("F2", new Short(com.sun.star.awt.Key.F2)), + new KeyIdentifierInfo("F3", new Short(com.sun.star.awt.Key.F3)), + new KeyIdentifierInfo("F4", new Short(com.sun.star.awt.Key.F4)), + new KeyIdentifierInfo("F5", new Short(com.sun.star.awt.Key.F5)), + new KeyIdentifierInfo("F6", new Short(com.sun.star.awt.Key.F6)), + new KeyIdentifierInfo("F7", new Short(com.sun.star.awt.Key.F7)), + new KeyIdentifierInfo("F8", new Short(com.sun.star.awt.Key.F8)), + new KeyIdentifierInfo("F9", new Short(com.sun.star.awt.Key.F9)), + new KeyIdentifierInfo("F10", new Short(com.sun.star.awt.Key.F10)), + new KeyIdentifierInfo("F11", new Short(com.sun.star.awt.Key.F11)), + new KeyIdentifierInfo("F12", new Short(com.sun.star.awt.Key.F12)), + new KeyIdentifierInfo("DOWN", new Short(com.sun.star.awt.Key.DOWN)), + new KeyIdentifierInfo("UP", new Short(com.sun.star.awt.Key.UP)), + new KeyIdentifierInfo("LEFT", new Short(com.sun.star.awt.Key.LEFT)), + new KeyIdentifierInfo("RIGHT", new Short(com.sun.star.awt.Key.RIGHT)), + new KeyIdentifierInfo("HOME", new Short(com.sun.star.awt.Key.HOME)), + new KeyIdentifierInfo("END", new Short(com.sun.star.awt.Key.END)), + new KeyIdentifierInfo("PAGEUP", new Short(com.sun.star.awt.Key.PAGEUP)), + new KeyIdentifierInfo("PAGEDOWN", new Short(com.sun.star.awt.Key.PAGEDOWN)), + new KeyIdentifierInfo("RETURN", new Short(com.sun.star.awt.Key.RETURN)), + new KeyIdentifierInfo("ESCAPE", new Short(com.sun.star.awt.Key.ESCAPE)), + new KeyIdentifierInfo("TAB", new Short(com.sun.star.awt.Key.TAB)), + new KeyIdentifierInfo("BACKSPACE", new Short(com.sun.star.awt.Key.BACKSPACE)), + new KeyIdentifierInfo("SPACE", new Short(com.sun.star.awt.Key.SPACE)), + new KeyIdentifierInfo("INSERT", new Short(com.sun.star.awt.Key.INSERT)), + new KeyIdentifierInfo("DELETE", new Short(com.sun.star.awt.Key.DELETE)), + new KeyIdentifierInfo("ADD", new Short(com.sun.star.awt.Key.ADD)), + new KeyIdentifierInfo("SUBTRACT", new Short(com.sun.star.awt.Key.SUBTRACT)), + new KeyIdentifierInfo("MULTIPLY", new Short(com.sun.star.awt.Key.MULTIPLY)), + new KeyIdentifierInfo("DIVIDE", new Short(com.sun.star.awt.Key.DIVIDE)), + new KeyIdentifierInfo("CUT", new Short(com.sun.star.awt.Key.CUT)), + new KeyIdentifierInfo("COPY", new Short(com.sun.star.awt.Key.COPY)), + new KeyIdentifierInfo("PASTE", new Short(com.sun.star.awt.Key.PASTE)), + new KeyIdentifierInfo("UNDO", new Short(com.sun.star.awt.Key.UNDO)), + new KeyIdentifierInfo("REPEAT", new Short(com.sun.star.awt.Key.REPEAT)) + }; + + aIdentifierHashMap = new IdentifierHashMap(); + aCodeHashMap = new CodeHashMap(); + for (int i = 0; i - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -package complex.accelerators.helper; - -import java.util.HashMap; - -class KeyIdentifierInfo -{ - protected String sIdentifier; - protected Short nCode; - - KeyIdentifierInfo(String sID, Short nC) - { - sIdentifier = sID; - nCode = nC; - } -} - -class IdentifierHashMap extends HashMap -{ - public void put(String sIdentifier, Short nCode) - { - super.put(sIdentifier, nCode); - } - public Short get(String sIdentifier) - { - return (Short)super.get(sIdentifier); - } -} - -class CodeHashMap extends HashMap -{ - public void put(Short nCode, String sIdentifier) - { - super.put(nCode, sIdentifier); - } - public String get(Short nCode) - { - return (String)super.get(nCode); - } -} - -public class KeyMapping -{ - private IdentifierHashMap aIdentifierHashMap; - private CodeHashMap aCodeHashMap; - - public KeyMapping() - { - KeyIdentifierInfo[] aInfoMap = { - new KeyIdentifierInfo("0", new Short(com.sun.star.awt.Key.NUM0)), - new KeyIdentifierInfo("1", new Short(com.sun.star.awt.Key.NUM1)), - new KeyIdentifierInfo("2", new Short(com.sun.star.awt.Key.NUM2)), - new KeyIdentifierInfo("3", new Short(com.sun.star.awt.Key.NUM3)), - new KeyIdentifierInfo("4", new Short(com.sun.star.awt.Key.NUM4)), - new KeyIdentifierInfo("5", new Short(com.sun.star.awt.Key.NUM5)), - new KeyIdentifierInfo("6", new Short(com.sun.star.awt.Key.NUM6)), - new KeyIdentifierInfo("7", new Short(com.sun.star.awt.Key.NUM7)), - new KeyIdentifierInfo("8", new Short(com.sun.star.awt.Key.NUM8)), - new KeyIdentifierInfo("9", new Short(com.sun.star.awt.Key.NUM9)), - new KeyIdentifierInfo("A", new Short(com.sun.star.awt.Key.A)), - new KeyIdentifierInfo("B", new Short(com.sun.star.awt.Key.B)), - new KeyIdentifierInfo("C", new Short(com.sun.star.awt.Key.C)), - new KeyIdentifierInfo("D", new Short(com.sun.star.awt.Key.D)), - new KeyIdentifierInfo("E", new Short(com.sun.star.awt.Key.E)), - new KeyIdentifierInfo("F", new Short(com.sun.star.awt.Key.F)), - new KeyIdentifierInfo("G", new Short(com.sun.star.awt.Key.G)), - new KeyIdentifierInfo("H", new Short(com.sun.star.awt.Key.H)), - new KeyIdentifierInfo("I", new Short(com.sun.star.awt.Key.I)), - new KeyIdentifierInfo("J", new Short(com.sun.star.awt.Key.J)), - new KeyIdentifierInfo("K", new Short(com.sun.star.awt.Key.K)), - new KeyIdentifierInfo("L", new Short(com.sun.star.awt.Key.L)), - new KeyIdentifierInfo("M", new Short(com.sun.star.awt.Key.M)), - new KeyIdentifierInfo("N", new Short(com.sun.star.awt.Key.N)), - new KeyIdentifierInfo("O", new Short(com.sun.star.awt.Key.O)), - new KeyIdentifierInfo("P", new Short(com.sun.star.awt.Key.P)), - new KeyIdentifierInfo("Q", new Short(com.sun.star.awt.Key.Q)), - new KeyIdentifierInfo("R", new Short(com.sun.star.awt.Key.R)), - new KeyIdentifierInfo("S", new Short(com.sun.star.awt.Key.S)), - new KeyIdentifierInfo("T", new Short(com.sun.star.awt.Key.T)), - new KeyIdentifierInfo("U", new Short(com.sun.star.awt.Key.U)), - new KeyIdentifierInfo("V", new Short(com.sun.star.awt.Key.V)), - new KeyIdentifierInfo("W", new Short(com.sun.star.awt.Key.W)), - new KeyIdentifierInfo("X", new Short(com.sun.star.awt.Key.X)), - new KeyIdentifierInfo("Y", new Short(com.sun.star.awt.Key.Y)), - new KeyIdentifierInfo("Z", new Short(com.sun.star.awt.Key.Z)), - new KeyIdentifierInfo("F1", new Short(com.sun.star.awt.Key.F1)), - new KeyIdentifierInfo("F2", new Short(com.sun.star.awt.Key.F2)), - new KeyIdentifierInfo("F3", new Short(com.sun.star.awt.Key.F3)), - new KeyIdentifierInfo("F4", new Short(com.sun.star.awt.Key.F4)), - new KeyIdentifierInfo("F5", new Short(com.sun.star.awt.Key.F5)), - new KeyIdentifierInfo("F6", new Short(com.sun.star.awt.Key.F6)), - new KeyIdentifierInfo("F7", new Short(com.sun.star.awt.Key.F7)), - new KeyIdentifierInfo("F8", new Short(com.sun.star.awt.Key.F8)), - new KeyIdentifierInfo("F9", new Short(com.sun.star.awt.Key.F9)), - new KeyIdentifierInfo("F10", new Short(com.sun.star.awt.Key.F10)), - new KeyIdentifierInfo("F11", new Short(com.sun.star.awt.Key.F11)), - new KeyIdentifierInfo("F12", new Short(com.sun.star.awt.Key.F12)), - new KeyIdentifierInfo("DOWN", new Short(com.sun.star.awt.Key.DOWN)), - new KeyIdentifierInfo("UP", new Short(com.sun.star.awt.Key.UP)), - new KeyIdentifierInfo("LEFT", new Short(com.sun.star.awt.Key.LEFT)), - new KeyIdentifierInfo("RIGHT", new Short(com.sun.star.awt.Key.RIGHT)), - new KeyIdentifierInfo("HOME", new Short(com.sun.star.awt.Key.HOME)), - new KeyIdentifierInfo("END", new Short(com.sun.star.awt.Key.END)), - new KeyIdentifierInfo("PAGEUP", new Short(com.sun.star.awt.Key.PAGEUP)), - new KeyIdentifierInfo("PAGEDOWN", new Short(com.sun.star.awt.Key.PAGEDOWN)), - new KeyIdentifierInfo("RETURN", new Short(com.sun.star.awt.Key.RETURN)), - new KeyIdentifierInfo("ESCAPE", new Short(com.sun.star.awt.Key.ESCAPE)), - new KeyIdentifierInfo("TAB", new Short(com.sun.star.awt.Key.TAB)), - new KeyIdentifierInfo("BACKSPACE", new Short(com.sun.star.awt.Key.BACKSPACE)), - new KeyIdentifierInfo("SPACE", new Short(com.sun.star.awt.Key.SPACE)), - new KeyIdentifierInfo("INSERT", new Short(com.sun.star.awt.Key.INSERT)), - new KeyIdentifierInfo("DELETE", new Short(com.sun.star.awt.Key.DELETE)), - new KeyIdentifierInfo("ADD", new Short(com.sun.star.awt.Key.ADD)), - new KeyIdentifierInfo("SUBTRACT", new Short(com.sun.star.awt.Key.SUBTRACT)), - new KeyIdentifierInfo("MULTIPLY", new Short(com.sun.star.awt.Key.MULTIPLY)), - new KeyIdentifierInfo("DIVIDE", new Short(com.sun.star.awt.Key.DIVIDE)), - new KeyIdentifierInfo("CUT", new Short(com.sun.star.awt.Key.CUT)), - new KeyIdentifierInfo("COPY", new Short(com.sun.star.awt.Key.COPY)), - new KeyIdentifierInfo("PASTE", new Short(com.sun.star.awt.Key.PASTE)), - new KeyIdentifierInfo("UNDO", new Short(com.sun.star.awt.Key.UNDO)), - new KeyIdentifierInfo("REPEAT", new Short(com.sun.star.awt.Key.REPEAT)) - }; - - aIdentifierHashMap = new IdentifierHashMap(); - aCodeHashMap = new CodeHashMap(); - for (int i = 0; i + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.dispatches; + +// __________ Imports __________ + +// structs, const, ... +import com.sun.star.beans.PropertyValue; + +// exceptions +import com.sun.star.frame.DispatchDescriptor; +import com.sun.star.frame.XDispatch; +import com.sun.star.frame.XDispatchProvider; +import com.sun.star.frame.XDispatchProviderInterceptor; +import com.sun.star.frame.XInterceptorInfo; +import com.sun.star.frame.XStatusListener; + +// interfaces + + +// helper +import com.sun.star.util.URL; + +// others +//import java.lang.*; + +// __________ Implementation __________ + +/** + * implements a configurable interceptor for dispatch events. + */ +public class Interceptor implements XDispatchProvider, + XDispatch, + XDispatchProviderInterceptor, + XInterceptorInfo +{ + // ____________________ + + /** contains the list of interception URL schema's (wildcards are allowed there!) + supported by this interceptor. It can be set from outside. + If no external URLs are set, the default "*" is used instead. + That would have the same effect as if this implementation would not support the + interface XInterceptorInfo ! + */ + private String[] m_lURLs4InterceptionInfo = null; + + // ____________________ + + /** These URL's will be blocked by this interceptor. + Can be set from outside. Every queryDispatch() for these + set of URL's will be answered with an empty dispatch object! + If no external URLs are set the default "*" is used instead. + So every incoming URL will be blocked .-) + */ + private String[] m_lURLs4Blocking = null; + + // ____________________ + + /** Every dispatch interceptor knows it's master and slave interceptor + of the dispatch chain. These values must be stupid handled .-) + They have to be set and reset in case the right interface methods are called. + Nothing more. It's not allowed to dispose() it. + The slave can be used inside queryDispatch() to forward requests, + which are not handled by this interceptor instance. + */ + private XDispatchProvider m_xSlave = null; + private XDispatchProvider m_xMaster = null; + + // ____________________ + + /** counts calls of setSlave...(). + So the outside API test can use this value to know if this interceptor + was realy added to the interceptor chain of OOo. + */ + private int m_nRegistrationCount = 0; + + // ____________________ + + /** indicates if this interceptor object is currently part of the interceptor + chain of OOo. Only true if a valid slave or master dispatch is set on this + instance. + */ + private boolean m_bIsRegistered = false; + + + // ____________________ + + /** ctor + * It's initialize an object of this class with default values. + */ + public Interceptor() + { + } + + // ____________________ + + /** XInterceptorInfo */ + public synchronized String[] getInterceptedURLs() + { + return impl_getURLs4InterceptionInfo(); + } + + // ____________________ + + /** XDispatchProviderInterceptor */ + public synchronized XDispatchProvider getSlaveDispatchProvider() + { + System.out.println("Interceptor.getSlaveDispatchProvider() called"); + return m_xSlave; + } + + // ____________________ + + /** XDispatchProviderInterceptor */ + public synchronized XDispatchProvider getMasterDispatchProvider() + { + System.out.println("Interceptor.getMasterDispatchProvider() called"); + return m_xMaster; + } + + // ____________________ + + /** XDispatchProviderInterceptor */ + public synchronized void setSlaveDispatchProvider(XDispatchProvider xSlave) + { + System.out.println("Interceptor.setSlaveDispatchProvider("+xSlave+") called"); + + if (xSlave != null) + { + ++m_nRegistrationCount; + m_bIsRegistered = true; + } + else + { + m_bIsRegistered = false; + } + + m_xSlave = xSlave; + } + + // ____________________ + + /** XDispatchProviderInterceptor */ + public synchronized void setMasterDispatchProvider(XDispatchProvider xMaster) + { + System.out.println("Interceptor.setMasterDispatchProvider("+xMaster+") called"); + m_xMaster = xMaster; + } + + // ____________________ + + /** XDispatchProvider + */ + public synchronized XDispatch queryDispatch(URL aURL , + String sTargetFrameName, + int nSearchFlags ) + { + System.out.println("Interceptor.queryDispatch('"+aURL.Complete+"', '"+sTargetFrameName+"', "+nSearchFlags+") called"); + + if (impl_isBlockedURL(aURL.Complete)) + { + System.out.println("Interceptor.queryDispatch(): URL blocked => returns NULL"); + return null; + } + + if (m_xSlave != null) + { + System.out.println("Interceptor.queryDispatch(): ask slave ..."); + return m_xSlave.queryDispatch(aURL, sTargetFrameName, nSearchFlags); + } + + System.out.println("Interceptor.queryDispatch(): no idea => returns this"); + return this; + } + + // ____________________ + + /** XDispatchProvider + */ + public XDispatch[] queryDispatches(DispatchDescriptor[] lRequests) + { + int i = 0; + int c = lRequests.length; + + XDispatch[] lResults = new XDispatch[c]; + for (i=0; i - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.dispatches.helper; - -// __________ Imports __________ - -// structs, const, ... -import com.sun.star.beans.PropertyValue; - -// exceptions -import com.sun.star.frame.DispatchDescriptor; -import com.sun.star.frame.XDispatch; -import com.sun.star.frame.XDispatchProvider; -import com.sun.star.frame.XDispatchProviderInterceptor; -import com.sun.star.frame.XInterceptorInfo; -import com.sun.star.frame.XStatusListener; - -// interfaces - - -// helper -import com.sun.star.util.URL; - -// others -//import java.lang.*; - -// __________ Implementation __________ - -/** - * implements a configurable interceptor for dispatch events. - */ -public class Interceptor implements XDispatchProvider, - XDispatch, - XDispatchProviderInterceptor, - XInterceptorInfo -{ - // ____________________ - - /** contains the list of interception URL schema's (wildcards are allowed there!) - supported by this interceptor. It can be set from outside. - If no external URLs are set, the default "*" is used instead. - That would have the same effect as if this implementation would not support the - interface XInterceptorInfo ! - */ - private String[] m_lURLs4InterceptionInfo = null; - - // ____________________ - - /** These URL's will be blocked by this interceptor. - Can be set from outside. Every queryDispatch() for these - set of URL's will be answered with an empty dispatch object! - If no external URLs are set the default "*" is used instead. - So every incoming URL will be blocked .-) - */ - private String[] m_lURLs4Blocking = null; - - // ____________________ - - /** Every dispatch interceptor knows it's master and slave interceptor - of the dispatch chain. These values must be stupid handled .-) - They have to be set and reset in case the right interface methods are called. - Nothing more. It's not allowed to dispose() it. - The slave can be used inside queryDispatch() to forward requests, - which are not handled by this interceptor instance. - */ - private XDispatchProvider m_xSlave = null; - private XDispatchProvider m_xMaster = null; - - // ____________________ - - /** counts calls of setSlave...(). - So the outside API test can use this value to know if this interceptor - was realy added to the interceptor chain of OOo. - */ - private int m_nRegistrationCount = 0; - - // ____________________ - - /** indicates if this interceptor object is currently part of the interceptor - chain of OOo. Only true if a valid slave or master dispatch is set on this - instance. - */ - private boolean m_bIsRegistered = false; - - - // ____________________ - - /** ctor - * It's initialize an object of this class with default values. - */ - public Interceptor() - { - } - - // ____________________ - - /** XInterceptorInfo */ - public synchronized String[] getInterceptedURLs() - { - return impl_getURLs4InterceptionInfo(); - } - - // ____________________ - - /** XDispatchProviderInterceptor */ - public synchronized XDispatchProvider getSlaveDispatchProvider() - { - System.out.println("Interceptor.getSlaveDispatchProvider() called"); - return m_xSlave; - } - - // ____________________ - - /** XDispatchProviderInterceptor */ - public synchronized XDispatchProvider getMasterDispatchProvider() - { - System.out.println("Interceptor.getMasterDispatchProvider() called"); - return m_xMaster; - } - - // ____________________ - - /** XDispatchProviderInterceptor */ - public synchronized void setSlaveDispatchProvider(XDispatchProvider xSlave) - { - System.out.println("Interceptor.setSlaveDispatchProvider("+xSlave+") called"); - - if (xSlave != null) - { - ++m_nRegistrationCount; - m_bIsRegistered = true; - } - else - { - m_bIsRegistered = false; - } - - m_xSlave = xSlave; - } - - // ____________________ - - /** XDispatchProviderInterceptor */ - public synchronized void setMasterDispatchProvider(XDispatchProvider xMaster) - { - System.out.println("Interceptor.setMasterDispatchProvider("+xMaster+") called"); - m_xMaster = xMaster; - } - - // ____________________ - - /** XDispatchProvider - */ - public synchronized XDispatch queryDispatch(URL aURL , - String sTargetFrameName, - int nSearchFlags ) - { - System.out.println("Interceptor.queryDispatch('"+aURL.Complete+"', '"+sTargetFrameName+"', "+nSearchFlags+") called"); - - if (impl_isBlockedURL(aURL.Complete)) - { - System.out.println("Interceptor.queryDispatch(): URL blocked => returns NULL"); - return null; - } - - if (m_xSlave != null) - { - System.out.println("Interceptor.queryDispatch(): ask slave ..."); - return m_xSlave.queryDispatch(aURL, sTargetFrameName, nSearchFlags); - } - - System.out.println("Interceptor.queryDispatch(): no idea => returns this"); - return this; - } - - // ____________________ - - /** XDispatchProvider - */ - public XDispatch[] queryDispatches(DispatchDescriptor[] lRequests) - { - int i = 0; - int c = lRequests.length; - - XDispatch[] lResults = new XDispatch[c]; - for (i=0; i + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +package complex.imageManager; + +import com.sun.star.container.XNameContainer; +import com.sun.star.frame.XDesktop; +import com.sun.star.lang.EventObject; +import com.sun.star.lang.XComponent; +import com.sun.star.lang.XEventListener; +import lib.TestParameters; + +/** +* Testing com.sun.star.lang.XComponent +* interface methods : +*
    +*
  • dispose()
    • +*
  • addEventListener()
    • +*
  • removeEventListener()
    • +*
+* After this interface test object must be recreated.

+* Multithreaded test ability not implemented yet. +* @see com.sun.star.lang.XComponent +*/ +public class _XComponent { + + public static XComponent oObj = null; + private XNameContainer xContainer = null; + private XComponent altDispose = null; + TestParameters tEnv = null; + boolean listenerDisposed[] = new boolean[2]; + String[] Loutput = new String[2]; + + /** + * Listener which added but not removed, and its method must be called + * on dispose call. + */ + public class MyEventListener implements XEventListener { + int number = 0; + String message = null; + public MyEventListener(int number, String message) { + this.message = message; + this.number = number; + } + public void disposing ( EventObject oEvent ) { + Loutput[number] = Thread.currentThread() + " is DISPOSING " + message + this; + listenerDisposed[number] = true; + } + }; + + XEventListener listener1 = new MyEventListener(0, "EV1"); + XEventListener listener2 = new MyEventListener(1, "EV2"); + + public _XComponent(TestParameters tEnv, XComponent oObj) { + this.tEnv = tEnv; + this.oObj = oObj; + } + + /** + * For the cfgmgr2.OSetElement tests: dispose the owner element. + */ + public void before() { + // do not dispose this component, but parent instead + altDispose = (XComponent)tEnv.get("XComponent.DisposeThis"); + + } + + /** + * Adds two listeners.

+ * Has OK status if then the first listener will receive an event + * on dispose method call. + */ + public boolean _addEventListener() { + + listenerDisposed[0] = false; + listenerDisposed[1] = false; + + oObj.addEventListener( listener1 ); + oObj.addEventListener( listener2 ); + + return true; + } // finished _addEventListener() + + /** + * Removes the second of two added listeners.

+ * Method tests to be completed successfully : + *

    + *
  • addEventListener : method must add two listeners.
    • + *

+ * Has OK status if no events will be sent to the second listener on + * dispose method call. + */ + public boolean _removeEventListener() { + if (disposed) + { + System.out.println("Hint: already disposed."); + return false; + } + // the second listener should not be called + oObj.removeEventListener( listener2 ); + System.out.println(Thread.currentThread() + " is removing EL " + listener2); + return true; + } // finished _removeEventListener() + + static boolean disposed = false; + + /** + * Disposes the object and then check appropriate listeners were + * called or not.

+ * Method tests to be completed successfully : + *

    + *
  • removeEventListener : method must remove one of two + * listeners.
    • + *

+ * Has OK status if liseter removed wasn't called and other listener + * was. + */ + public boolean _dispose() { + disposed = false; + + System.out.println( "begin dispose" + Thread.currentThread()); + XDesktop oDesk = (XDesktop) tEnv.get("Desktop"); + if (oDesk !=null) { + oDesk.terminate(); + } + else { + if (altDispose == null) + { + oObj.dispose(); + } + else + { + altDispose.dispose(); + } + } + + try { + Thread.sleep(500) ; + } catch (InterruptedException e) {} + if (Loutput[0]!=null){ + System.out.println(Loutput[0]); + } + if (Loutput[1]!=null) { + System.out.println(Loutput[1]); + } + System.out.println( "end dispose" + Thread.currentThread()); + disposed = true; + + // check that dispose() works OK. + return listenerDisposed[0] && !listenerDisposed[1]; + + } // finished _dispose() + + /** + * Forces object recreation. + */ + protected void after() { +// disposeEnvironment(); + } + +} // finished class _XComponent + + diff --git a/framework/qa/complex/imageManager/_XImageManager.java b/framework/qa/complex/imageManager/_XImageManager.java new file mode 100755 index 000000000000..5887fd8fa0d8 --- /dev/null +++ b/framework/qa/complex/imageManager/_XImageManager.java @@ -0,0 +1,117 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.imageManager; + +import com.sun.star.graphic.XGraphic; +import com.sun.star.ui.ImageType; +import com.sun.star.ui.XImageManager; +import lib.TestParameters; + + +/** + * + */ +public class _XImageManager { + + TestParameters tEnv = null; + String[]imageNames = null; + XGraphic[] xGraphicArray = null; + public XImageManager oObj; + + public _XImageManager( TestParameters tEnv, XImageManager oObj) { + + this.tEnv = tEnv; + this.oObj = oObj; + } + + public boolean _getAllImageNames() { + short s = ImageType.COLOR_NORMAL + ImageType.SIZE_DEFAULT; + imageNames = oObj.getAllImageNames(s); + for (int i=0; i<(imageNames.length>10?10:imageNames.length); i++) + { + System.out.println("###### Image: " + imageNames[i]); + } + return imageNames != null; + } + + public boolean _getImages() { + short s = ImageType.COLOR_NORMAL + ImageType.SIZE_DEFAULT; + try { + xGraphicArray = oObj.getImages(s, imageNames); + } + catch(com.sun.star.lang.IllegalArgumentException e) { + } + return xGraphicArray != null; + } + + public boolean _hasImage() { + boolean result = true; + short s = ImageType.COLOR_NORMAL + ImageType.SIZE_DEFAULT; + try { // check the first image names, 10 at max + for (int i=0; i<(imageNames.length>10?10:imageNames.length); i++) + { + result &= oObj.hasImage(s, imageNames[i]); + } + } + catch(com.sun.star.lang.IllegalArgumentException e) { + result = false; + } + return result; + } + + public boolean _insertImages() { + try { + oObj.insertImages((short)imageNames.length, imageNames, xGraphicArray); + } + catch(com.sun.star.container.ElementExistException e) { + } + catch(com.sun.star.lang.IllegalArgumentException e) { + } + catch(com.sun.star.lang.IllegalAccessException e) { + } + return true; + } + + public boolean _removeImages() { + try { + oObj.removeImages((short)(imageNames.length-1), imageNames); + } + catch(com.sun.star.lang.IllegalArgumentException e) { + } + catch(com.sun.star.lang.IllegalAccessException e) { + } + return true; + } + + public boolean _replaceImages() { + return true; + } + + public boolean _reset() { + return true; + } +} diff --git a/framework/qa/complex/imageManager/_XInitialization.java b/framework/qa/complex/imageManager/_XInitialization.java new file mode 100755 index 000000000000..fcfaf5f981d3 --- /dev/null +++ b/framework/qa/complex/imageManager/_XInitialization.java @@ -0,0 +1,94 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +package complex.imageManager; + + + + +import com.sun.star.lang.XInitialization; +import lib.TestParameters; + +/** +* Testing com.sun.star.lang.XInitialization +* interface methods.

+* This test needs the following object relations : +*

    +*
  • 'XInitialization.args' (of type Object[]): +* (Optional) : argument for initialize +* method. If ommitet zero length array is used.
    • +*

      +* Test is multithread compilant.

      +* Till the present time there was no need to recreate environment +* after this test completion. +*/ +public class _XInitialization { + + + TestParameters tEnv = null; + public static XInitialization oObj = null; + + public _XInitialization(TestParameters tEnv, XInitialization oObj) { + + this.tEnv = tEnv; + this.oObj = oObj; + } + + /** + * Test calls the method with 0 length array and checks that + * no exceptions were thrown.

      + * Has OK status if no exceptions were thrown.

      + */ + public boolean _initialize() { + boolean result = true ; + + try { + Object[] args = (Object[]) tEnv.get("XInitialization.args"); + if (args==null) { + oObj.initialize(new Object[0]); + } else { + oObj.initialize(args); + } + + } catch (com.sun.star.uno.Exception e) { + System.out.println("Exception occured while method calling.") ; + result = false ; + } + + return result ; + } // finished _initialize() + + /** + * Disposes object environment. + */ + public void after() { +// disposeEnvironment() ; + } + +} // finished class _XInitialization + + diff --git a/framework/qa/complex/imageManager/_XTypeProvider.java b/framework/qa/complex/imageManager/_XTypeProvider.java new file mode 100755 index 000000000000..08b810198d9b --- /dev/null +++ b/framework/qa/complex/imageManager/_XTypeProvider.java @@ -0,0 +1,102 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +package complex.imageManager; + + + +import com.sun.star.lang.XTypeProvider; +import com.sun.star.uno.Type; +import lib.TestParameters; + +/** +* Testing com.sun.star.lang.XTypeProvider +* interface methods : +*

        +*
      • getTypes()
        • +*
      • getImplementationId()
        • +*

      +* Test is NOT multithread compilant.

      +* @see com.sun.star.lang.XTypeProvider +*/ +public class _XTypeProvider { + + + TestParameters tEnv = null; + public static XTypeProvider oObj = null; + public static Type[] types = null; + + public _XTypeProvider(TestParameters tEnv, XTypeProvider oObj) { + + this.tEnv = tEnv; + this.oObj = oObj; + } + + /** + * Just calls the method.

      + * Has OK status if no runtime exceptions occured. + */ + public boolean _getImplementationId() { + boolean result = true; + System.out.println("testing getImplementationId() ... "); + + System.out.println("The ImplementationId is "+oObj.getImplementationId()); + result = true; + + return result; + + } // end getImplementationId() + + + /** + * Calls the method and checks the return value.

      + * Has OK status if one of the return value equals to the + * type com.sun.star.lang.XTypeProvider. + */ + public boolean _getTypes() { + boolean result = false; + System.out.println("getting Types..."); + types = oObj.getTypes(); + for (int i=0;i"); + } + + return result; + + } // end getTypes() + +} + diff --git a/framework/qa/complex/imageManager/_XUIConfiguration.java b/framework/qa/complex/imageManager/_XUIConfiguration.java new file mode 100755 index 000000000000..ec9d5f3fc634 --- /dev/null +++ b/framework/qa/complex/imageManager/_XUIConfiguration.java @@ -0,0 +1,82 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +package complex.imageManager; + + +import com.sun.star.ui.XUIConfiguration; +import com.sun.star.ui.XUIConfigurationListener; +import lib.TestParameters; + + + +public class _XUIConfiguration { + + + TestParameters tEnv = null; + public XUIConfiguration oObj; + XUIConfigurationListenerImpl xListener = null; + + public static interface XUIConfigurationListenerImpl + extends XUIConfigurationListener { + public void reset(); + public void fireEvent(); + public boolean actionWasTriggered(); + } + + + public _XUIConfiguration(TestParameters tEnv, XUIConfiguration oObj) { + this.tEnv = tEnv; + this.oObj = oObj; + } + + public void before() { + xListener = (XUIConfigurationListenerImpl)tEnv.get( + "XUIConfiguration.XUIConfigurationListenerImpl"); + XUIConfigurationListener l; + } + + public boolean _addConfigurationListener() { + oObj.addConfigurationListener(xListener); + xListener.fireEvent(); + return xListener.actionWasTriggered(); + } + + public boolean _removeConfigurationListener() { + oObj.removeConfigurationListener(xListener); + xListener.reset(); + xListener.fireEvent(); + return !xListener.actionWasTriggered(); + } + + /** + * Dispose because the UIConfigurationManager has to be recreated + */ + public void after() { +// disposeEnvironment(); + } +} diff --git a/framework/qa/complex/imageManager/_XUIConfigurationPersistence.java b/framework/qa/complex/imageManager/_XUIConfigurationPersistence.java new file mode 100755 index 000000000000..1dec01ad0660 --- /dev/null +++ b/framework/qa/complex/imageManager/_XUIConfigurationPersistence.java @@ -0,0 +1,93 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +package complex.imageManager; + +import com.sun.star.embed.XStorage; +import com.sun.star.ui.XUIConfigurationPersistence; +import lib.TestParameters; + + + +public class _XUIConfigurationPersistence { + + + TestParameters tEnv = null; + public XUIConfigurationPersistence oObj; + private XStorage xStore = null; + + public _XUIConfigurationPersistence(TestParameters tEnv, XUIConfigurationPersistence oObj) { + + this.tEnv = tEnv; + this.oObj = oObj; + } + + public void before() { + xStore = (XStorage)tEnv.get("XUIConfigurationStorage.Storage"); + } + + public boolean _reload() { + try { + oObj.reload(); + } + catch(com.sun.star.uno.Exception e) { + + } + return true; + } + + public boolean _store() { + try { + oObj.store(); + } + catch(com.sun.star.uno.Exception e) { + + } + return true; + } + + public boolean _storeToStorage() { + boolean result = true; + try { + oObj.storeToStorage(xStore); + } + catch(com.sun.star.uno.Exception e) { + result = false; + + } + return result; + } + + public boolean _isModified() { + return !oObj.isModified(); + } + + public boolean _isReadOnly() { + return !oObj.isReadOnly(); + } + +} diff --git a/framework/qa/complex/imageManager/interfaces/_XComponent.java b/framework/qa/complex/imageManager/interfaces/_XComponent.java deleted file mode 100755 index 1d4db9d76fec..000000000000 --- a/framework/qa/complex/imageManager/interfaces/_XComponent.java +++ /dev/null @@ -1,187 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -package complex.imageManager.interfaces; - -import com.sun.star.container.XNameContainer; -import com.sun.star.frame.XDesktop; -import com.sun.star.lang.EventObject; -import com.sun.star.lang.XComponent; -import com.sun.star.lang.XEventListener; -import lib.TestParameters; - -/** -* Testing com.sun.star.lang.XComponent -* interface methods : -*

        -*
      • dispose()
        • -*
      • addEventListener()
        • -*
      • removeEventListener()
        • -*
      -* After this interface test object must be recreated.

      -* Multithreaded test ability not implemented yet. -* @see com.sun.star.lang.XComponent -*/ -public class _XComponent { - - public static XComponent oObj = null; - private XNameContainer xContainer = null; - private XComponent altDispose = null; - TestParameters tEnv = null; - boolean listenerDisposed[] = new boolean[2]; - String[] Loutput = new String[2]; - - /** - * Listener which added but not removed, and its method must be called - * on dispose call. - */ - public class MyEventListener implements XEventListener { - int number = 0; - String message = null; - public MyEventListener(int number, String message) { - this.message = message; - this.number = number; - } - public void disposing ( EventObject oEvent ) { - Loutput[number] = Thread.currentThread() + " is DISPOSING " + message + this; - listenerDisposed[number] = true; - } - }; - - XEventListener listener1 = new MyEventListener(0, "EV1"); - XEventListener listener2 = new MyEventListener(1, "EV2"); - - public _XComponent(TestParameters tEnv, XComponent oObj) { - this.tEnv = tEnv; - this.oObj = oObj; - } - - /** - * For the cfgmgr2.OSetElement tests: dispose the owner element. - */ - public void before() { - // do not dispose this component, but parent instead - altDispose = (XComponent)tEnv.get("XComponent.DisposeThis"); - - } - - /** - * Adds two listeners.

      - * Has OK status if then the first listener will receive an event - * on dispose method call. - */ - public boolean _addEventListener() { - - listenerDisposed[0] = false; - listenerDisposed[1] = false; - - oObj.addEventListener( listener1 ); - oObj.addEventListener( listener2 ); - - return true; - } // finished _addEventListener() - - /** - * Removes the second of two added listeners.

      - * Method tests to be completed successfully : - *

        - *
      • addEventListener : method must add two listeners.
        • - *

      - * Has OK status if no events will be sent to the second listener on - * dispose method call. - */ - public boolean _removeEventListener() { - if (disposed) - { - System.out.println("Hint: already disposed."); - return false; - } - // the second listener should not be called - oObj.removeEventListener( listener2 ); - System.out.println(Thread.currentThread() + " is removing EL " + listener2); - return true; - } // finished _removeEventListener() - - static boolean disposed = false; - - /** - * Disposes the object and then check appropriate listeners were - * called or not.

      - * Method tests to be completed successfully : - *

        - *
      • removeEventListener : method must remove one of two - * listeners.
        • - *

      - * Has OK status if liseter removed wasn't called and other listener - * was. - */ - public boolean _dispose() { - disposed = false; - - System.out.println( "begin dispose" + Thread.currentThread()); - XDesktop oDesk = (XDesktop) tEnv.get("Desktop"); - if (oDesk !=null) { - oDesk.terminate(); - } - else { - if (altDispose == null) - { - oObj.dispose(); - } - else - { - altDispose.dispose(); - } - } - - try { - Thread.sleep(500) ; - } catch (InterruptedException e) {} - if (Loutput[0]!=null){ - System.out.println(Loutput[0]); - } - if (Loutput[1]!=null) { - System.out.println(Loutput[1]); - } - System.out.println( "end dispose" + Thread.currentThread()); - disposed = true; - - // check that dispose() works OK. - return listenerDisposed[0] && !listenerDisposed[1]; - - } // finished _dispose() - - /** - * Forces object recreation. - */ - protected void after() { -// disposeEnvironment(); - } - -} // finished class _XComponent - - diff --git a/framework/qa/complex/imageManager/interfaces/_XImageManager.java b/framework/qa/complex/imageManager/interfaces/_XImageManager.java deleted file mode 100755 index 4c62039e348d..000000000000 --- a/framework/qa/complex/imageManager/interfaces/_XImageManager.java +++ /dev/null @@ -1,117 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.imageManager.interfaces; - -import com.sun.star.graphic.XGraphic; -import com.sun.star.ui.ImageType; -import com.sun.star.ui.XImageManager; -import lib.TestParameters; - - -/** - * - */ -public class _XImageManager { - - TestParameters tEnv = null; - String[]imageNames = null; - XGraphic[] xGraphicArray = null; - public XImageManager oObj; - - public _XImageManager( TestParameters tEnv, XImageManager oObj) { - - this.tEnv = tEnv; - this.oObj = oObj; - } - - public boolean _getAllImageNames() { - short s = ImageType.COLOR_NORMAL + ImageType.SIZE_DEFAULT; - imageNames = oObj.getAllImageNames(s); - for (int i=0; i<(imageNames.length>10?10:imageNames.length); i++) - { - System.out.println("###### Image: " + imageNames[i]); - } - return imageNames != null; - } - - public boolean _getImages() { - short s = ImageType.COLOR_NORMAL + ImageType.SIZE_DEFAULT; - try { - xGraphicArray = oObj.getImages(s, imageNames); - } - catch(com.sun.star.lang.IllegalArgumentException e) { - } - return xGraphicArray != null; - } - - public boolean _hasImage() { - boolean result = true; - short s = ImageType.COLOR_NORMAL + ImageType.SIZE_DEFAULT; - try { // check the first image names, 10 at max - for (int i=0; i<(imageNames.length>10?10:imageNames.length); i++) - { - result &= oObj.hasImage(s, imageNames[i]); - } - } - catch(com.sun.star.lang.IllegalArgumentException e) { - result = false; - } - return result; - } - - public boolean _insertImages() { - try { - oObj.insertImages((short)imageNames.length, imageNames, xGraphicArray); - } - catch(com.sun.star.container.ElementExistException e) { - } - catch(com.sun.star.lang.IllegalArgumentException e) { - } - catch(com.sun.star.lang.IllegalAccessException e) { - } - return true; - } - - public boolean _removeImages() { - try { - oObj.removeImages((short)(imageNames.length-1), imageNames); - } - catch(com.sun.star.lang.IllegalArgumentException e) { - } - catch(com.sun.star.lang.IllegalAccessException e) { - } - return true; - } - - public boolean _replaceImages() { - return true; - } - - public boolean _reset() { - return true; - } -} diff --git a/framework/qa/complex/imageManager/interfaces/_XInitialization.java b/framework/qa/complex/imageManager/interfaces/_XInitialization.java deleted file mode 100755 index d1da1b2158e7..000000000000 --- a/framework/qa/complex/imageManager/interfaces/_XInitialization.java +++ /dev/null @@ -1,94 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -package complex.imageManager.interfaces; - - - - -import com.sun.star.lang.XInitialization; -import lib.TestParameters; - -/** -* Testing com.sun.star.lang.XInitialization -* interface methods.

      -* This test needs the following object relations : -*

        -*
      • 'XInitialization.args' (of type Object[]): -* (Optional) : argument for initialize -* method. If ommitet zero length array is used.
        • -*

          -* Test is multithread compilant.

          -* Till the present time there was no need to recreate environment -* after this test completion. -*/ -public class _XInitialization { - - - TestParameters tEnv = null; - public static XInitialization oObj = null; - - public _XInitialization(TestParameters tEnv, XInitialization oObj) { - - this.tEnv = tEnv; - this.oObj = oObj; - } - - /** - * Test calls the method with 0 length array and checks that - * no exceptions were thrown.

          - * Has OK status if no exceptions were thrown.

          - */ - public boolean _initialize() { - boolean result = true ; - - try { - Object[] args = (Object[]) tEnv.get("XInitialization.args"); - if (args==null) { - oObj.initialize(new Object[0]); - } else { - oObj.initialize(args); - } - - } catch (com.sun.star.uno.Exception e) { - System.out.println("Exception occured while method calling.") ; - result = false ; - } - - return result ; - } // finished _initialize() - - /** - * Disposes object environment. - */ - public void after() { -// disposeEnvironment() ; - } - -} // finished class _XInitialization - - diff --git a/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java b/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java deleted file mode 100755 index bf8e1ca6f850..000000000000 --- a/framework/qa/complex/imageManager/interfaces/_XTypeProvider.java +++ /dev/null @@ -1,102 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -package complex.imageManager.interfaces; - - - -import com.sun.star.lang.XTypeProvider; -import com.sun.star.uno.Type; -import lib.TestParameters; - -/** -* Testing com.sun.star.lang.XTypeProvider -* interface methods : -*

            -*
          • getTypes()
            • -*
          • getImplementationId()
            • -*

          -* Test is NOT multithread compilant.

          -* @see com.sun.star.lang.XTypeProvider -*/ -public class _XTypeProvider { - - - TestParameters tEnv = null; - public static XTypeProvider oObj = null; - public static Type[] types = null; - - public _XTypeProvider(TestParameters tEnv, XTypeProvider oObj) { - - this.tEnv = tEnv; - this.oObj = oObj; - } - - /** - * Just calls the method.

          - * Has OK status if no runtime exceptions occured. - */ - public boolean _getImplementationId() { - boolean result = true; - System.out.println("testing getImplementationId() ... "); - - System.out.println("The ImplementationId is "+oObj.getImplementationId()); - result = true; - - return result; - - } // end getImplementationId() - - - /** - * Calls the method and checks the return value.

          - * Has OK status if one of the return value equals to the - * type com.sun.star.lang.XTypeProvider. - */ - public boolean _getTypes() { - boolean result = false; - System.out.println("getting Types..."); - types = oObj.getTypes(); - for (int i=0;i"); - } - - return result; - - } // end getTypes() - -} - diff --git a/framework/qa/complex/imageManager/interfaces/_XUIConfiguration.java b/framework/qa/complex/imageManager/interfaces/_XUIConfiguration.java deleted file mode 100755 index 39e2fccfb09d..000000000000 --- a/framework/qa/complex/imageManager/interfaces/_XUIConfiguration.java +++ /dev/null @@ -1,82 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -package complex.imageManager.interfaces; - - -import com.sun.star.ui.XUIConfiguration; -import com.sun.star.ui.XUIConfigurationListener; -import lib.TestParameters; - - - -public class _XUIConfiguration { - - - TestParameters tEnv = null; - public XUIConfiguration oObj; - XUIConfigurationListenerImpl xListener = null; - - public static interface XUIConfigurationListenerImpl - extends XUIConfigurationListener { - public void reset(); - public void fireEvent(); - public boolean actionWasTriggered(); - } - - - public _XUIConfiguration(TestParameters tEnv, XUIConfiguration oObj) { - this.tEnv = tEnv; - this.oObj = oObj; - } - - public void before() { - xListener = (XUIConfigurationListenerImpl)tEnv.get( - "XUIConfiguration.XUIConfigurationListenerImpl"); - XUIConfigurationListener l; - } - - public boolean _addConfigurationListener() { - oObj.addConfigurationListener(xListener); - xListener.fireEvent(); - return xListener.actionWasTriggered(); - } - - public boolean _removeConfigurationListener() { - oObj.removeConfigurationListener(xListener); - xListener.reset(); - xListener.fireEvent(); - return !xListener.actionWasTriggered(); - } - - /** - * Dispose because the UIConfigurationManager has to be recreated - */ - public void after() { -// disposeEnvironment(); - } -} diff --git a/framework/qa/complex/imageManager/interfaces/_XUIConfigurationPersistence.java b/framework/qa/complex/imageManager/interfaces/_XUIConfigurationPersistence.java deleted file mode 100755 index 12de107296e5..000000000000 --- a/framework/qa/complex/imageManager/interfaces/_XUIConfigurationPersistence.java +++ /dev/null @@ -1,93 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -package complex.imageManager.interfaces; - -import com.sun.star.embed.XStorage; -import com.sun.star.ui.XUIConfigurationPersistence; -import lib.TestParameters; - - - -public class _XUIConfigurationPersistence { - - - TestParameters tEnv = null; - public XUIConfigurationPersistence oObj; - private XStorage xStore = null; - - public _XUIConfigurationPersistence(TestParameters tEnv, XUIConfigurationPersistence oObj) { - - this.tEnv = tEnv; - this.oObj = oObj; - } - - public void before() { - xStore = (XStorage)tEnv.get("XUIConfigurationStorage.Storage"); - } - - public boolean _reload() { - try { - oObj.reload(); - } - catch(com.sun.star.uno.Exception e) { - - } - return true; - } - - public boolean _store() { - try { - oObj.store(); - } - catch(com.sun.star.uno.Exception e) { - - } - return true; - } - - public boolean _storeToStorage() { - boolean result = true; - try { - oObj.storeToStorage(xStore); - } - catch(com.sun.star.uno.Exception e) { - result = false; - - } - return result; - } - - public boolean _isModified() { - return !oObj.isModified(); - } - - public boolean _isReadOnly() { - return !oObj.isReadOnly(); - } - -} diff --git a/framework/qa/complex/imageManager/makefile.mk b/framework/qa/complex/imageManager/makefile.mk index e455a297072d..133e522b13b4 100755 --- a/framework/qa/complex/imageManager/makefile.mk +++ b/framework/qa/complex/imageManager/makefile.mk @@ -41,14 +41,17 @@ JAVATESTFILES = \ CheckImageManager.java # put here all other files -JAVAFILES = $(JAVATESTFILES) +JAVAFILES = $(JAVATESTFILES) \ + _XComponent.java \ + _XImageManager.java \ + _XInitialization.java \ + _XTypeProvider.java \ + _XUIConfiguration.java \ + _XUIConfigurationPersistence.java JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -# subdirectories -SUBDIRS = interfaces - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java index 7eb4972d630a..1c67271fd6bb 100644 --- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java +++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java @@ -39,8 +39,6 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.util.XCloseable; import com.sun.star.ucb.XSimpleFileAccess; -import complex.loadAllDocuments.helper.InteractionHandler; -import complex.loadAllDocuments.helper.StatusIndicator; import helper.URLHelper; diff --git a/framework/qa/complex/loadAllDocuments/InteractionHandler.java b/framework/qa/complex/loadAllDocuments/InteractionHandler.java new file mode 100644 index 000000000000..92d8f3c34543 --- /dev/null +++ b/framework/qa/complex/loadAllDocuments/InteractionHandler.java @@ -0,0 +1,155 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.loadAllDocuments; + +import com.sun.star.beans.PropertyValue; + +import com.sun.star.uno.Exception; +import com.sun.star.uno.RuntimeException; + +import com.sun.star.task.XInteractionHandler; +import com.sun.star.task.XInteractionAbort; +import com.sun.star.task.XInteractionRetry; + +import com.sun.star.uno.UnoRuntime; +import com.sun.star.uno.AnyConverter; + +//import java.lang.*; + + +/** + * Implemets a simple interaction handler, + * which can abort all incoming interactions only ... but make it possible to + * log it. So it can be used for debug and test purposes. + */ +public class InteractionHandler implements XInteractionHandler +{ + // ____________________ + + /** + * @const RETRY_COUNT it defines the max count of + * retrying of an interaction + */ + private static final int RETRY_COUNT = 3; + + // ____________________ + + /** + * @member m_aRequest the origianl interaction request + * safed for later analyzing + * @member m_bWasUsed true if the interaction handler was used + * @member m_nTry count using of RETRY continuations + */ + private Object m_aRequest ; + private int m_nTry ; + private boolean m_bWasUsed ; + + + /** + * ctor + * It's initialize an object of this class with default values + * and set the protocol stack. So the outside code can check + * if this handler was used or not. + */ + public InteractionHandler() + { + m_aRequest = null ; + //m_aProtocol = aProtocol; + m_nTry = 0 ; + m_bWasUsed = false; + } + + /** + * Called to start the interaction, because the outside code whish to solve + * a detected problem or to inform the user about something. + * We safe the informations here and can handle two well known continuations + * only. + * [abort and retry]. + * + * @param xRequest + * describe the interaction + */ + public void handle(com.sun.star.task.XInteractionRequest xRequest) + { + m_bWasUsed = true; + + // first sav thje original request + // Our user can use this information later for some debug analyzing + Object aRequest = xRequest.getRequest(); + synchronized(this) + { + m_aRequest = aRequest; + } + + // analyze the possible continuations. + // We can abort all incoming interactions only. + // But additional we can try to continue it several times too. + // Of course after e.g. three loops we have to stop and abort it. + com.sun.star.task.XInteractionContinuation[] lContinuations = xRequest.getContinuations(); + + com.sun.star.task.XInteractionAbort xAbort = null; + com.sun.star.task.XInteractionRetry xRetry = null; + com.sun.star.uno.Type xAbortType = new com.sun.star.uno.Type(com.sun.star.task.XInteractionAbort.class); + com.sun.star.uno.Type xRetryType = new com.sun.star.uno.Type(com.sun.star.task.XInteractionRetry.class); + + for (int i=0; i + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.loadAllDocuments; + +// __________ Imports __________ + +// structs, const, ... +import com.sun.star.beans.PropertyValue; + +// exceptions +import com.sun.star.uno.Exception; +import com.sun.star.uno.RuntimeException; + +// interfaces +import com.sun.star.task.XStatusIndicator; + +// helper +import com.sun.star.uno.UnoRuntime; + +// others +//import java.lang.*; + +// __________ Implementation __________ + +/** + * Implemets a simple status indicator, which + * provide informations about state of a load request. + * It can be used as an argument e.g. for loadComponentFromURL(). + */ +public class StatusIndicator implements com.sun.star.task.XStatusIndicator +{ + // ____________________ + + /** + * @const SHOWSTATUS_NO don't show the status - but save information about using of this indicator object + * @const SHOWSTATUS_LOG the possible set protocol object will be used (it covers STDOUT, STDERR automaticly too) + * @const SHOWSTATUS_DIALOG the status will be shown inside a java dialog + * @const SHOWSTATUS_LINK the status will be notified to interested listener (one listener only!) + */ + public static final int SHOWSTATUS_NO = 0; + public static final int SHOWSTATUS_LOG = 1; + public static final int SHOWSTATUS_DIALOG = 4; + public static final int SHOWSTATUS_LINK = 8; + + // ____________________ + + /** + * @member m_sText text, which describe the current status + * @member m_nRange max value for any progress + * @member m_nValue the progress value + * @member m_nOut regulate, how the status will be shown + * @member m_aProtocol used for logging and transport information about used interface of this object + */ + private String m_sText ; + private int m_nRange ; + private int m_nValue ; + private int m_nOut ; +// private Protocol m_aProtocol ; + private boolean m_bWasUsed ; + + // ____________________ + + /** + * ctor + * It's initialize an object of this class with default values. + */ + public StatusIndicator( int nOut) + { + m_sText = new String() ; + m_nRange = 100 ; + m_nValue = 0 ; + m_nOut = nOut ; + //m_aProtocol = aProtocol ; + m_bWasUsed = false; +// aProtocol.resetUsingState(); + } + + // ____________________ + + /** + * It starts the progress and set the initial text and range. + * + * @param sText + * the initial text for showing + * + * @param nRange + * the new range for following progress + */ + public void start( /*IN*/String sText, /*IN*/int nRange ) + { + synchronized(this) + { + //m_aProtocol.log("start("+sText+","+nRange+")\n"); + m_bWasUsed = true; +// m_aProtocol.itWasUsed(); + + m_sText = sText ; + m_nRange = nRange; + m_nValue = 0 ; + } + impl_show(); + } + + // ____________________ + + /** + * Finish the progress and reset internal members. + */ + public void end() + { + synchronized(this) + { + //m_aProtocol.log("end()\n"); + m_bWasUsed = true; +// m_aProtocol.itWasUsed(); + + m_sText = new String(); + m_nRange = 100; + m_nValue = 0; + } + impl_show(); + } + + // ____________________ + + /** + * Set the new description text. + * + * @param sText + * the new text for showing + */ + public void setText( /*IN*/String sText ) + { + synchronized(this) + { + //m_aProtocol.log("setText("+sText+")\n"); + m_bWasUsed = true; +// m_aProtocol.itWasUsed(); + + m_sText = sText; + } + impl_show(); + } + + // ____________________ + + /** + * Set the new progress value. + * + * @param nValue + * the new progress value + * Must fit the range! + */ + public void setValue( /*IN*/int nValue ) + { + synchronized(this) + { + //m_aProtocol.log("setValue("+nValue+")\n"); + m_bWasUsed = true; +// m_aProtocol.itWasUsed(); + + if (nValue<=m_nRange) + m_nValue = nValue; + } + impl_show(); + } + + // ____________________ + + /** + * Reset text and progress value to her defaults. + */ + public void reset() + { + synchronized(this) + { + //m_aProtocol.log("reset()\n"); + m_bWasUsed = true; +// m_aProtocol.itWasUsed(); + + m_sText = new String(); + m_nValue = 0; + } + impl_show(); + } + + // ____________________ + + /** + * Internal helper to show the status. + * Currently it's implement as normal text out on stdout. + * But of course other thimngs are possible here too. + * e.g. a dialog + */ + private void impl_show() + { +/* synchronized(this) + { + if ((m_nOut & SHOWSTATUS_LOG) == SHOWSTATUS_LOG) + //m_aProtocol.log("\t["+m_nValue+"/"+m_nRange+"] "+m_sText+"\n"); + + //if ((m_nOut & SHOWSTATUS_DIALOG) == SHOWSTATUS_DIALOG) + // not supported yet! + + //if ((m_nOut & SHOWSTATUS_LINK) == SHOWSTATUS_LINK) + // not supported yet! + } */ + } + + public boolean wasUsed() { + return m_bWasUsed; + } +} diff --git a/framework/qa/complex/loadAllDocuments/StreamSimulator.java b/framework/qa/complex/loadAllDocuments/StreamSimulator.java new file mode 100644 index 000000000000..7b59c25d0a79 --- /dev/null +++ b/framework/qa/complex/loadAllDocuments/StreamSimulator.java @@ -0,0 +1,474 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.loadAllDocuments; + +import com.sun.star.uno.UnoRuntime; +import com.sun.star.ucb.XSimpleFileAccess; +import com.sun.star.lang.XMultiServiceFactory; + +/** + * Simulates an input and output stream and + * implements the interfaces XInputStream, XOutputStream. + * So it can be used for testing loading/saving of documents + * using streams instead of URLs. + */ +public class StreamSimulator implements com.sun.star.io.XInputStream , + com.sun.star.io.XOutputStream , + com.sun.star.io.XSeekable +{ + //_________________________________ + /** + * @member m_sFileName name of the corrsponding file on disk + * @member m_xInStream the internal input stream for reading + * @member m_xOutStream the internal input stream for writing + * @member m_xSeek points at runtime to m_xInStream or m_xOutStream and make it seekable + * + * @member m_bInWasUsed indicates, that the input stream interface was used + * @member m_bOutWasUsed indicates, that the output stream interface was used + */ + + private String m_sFileName ; + private com.sun.star.io.XInputStream m_xInStream ; + private com.sun.star.io.XOutputStream m_xOutStream ; + private com.sun.star.io.XSeekable m_xSeek ; + + public boolean m_bInWasUsed ; + public boolean m_bOutWasUsed ; + + /** + * construct a new instance of this class + * It set the name of the correspojnding file on disk, which + * should be source or target for the following operations on + * this object. And it regulate if it should function as + * input or output stream. + * + * @param sFileName + * name of the file on disk + * Will be used as source (if param bInput==true) + * or as target (if param bInput==false). + * + * @param bInput + * it specify, which interface should work at this object. + * => we simulate an input stream + * => we simulate an output stream + * + * @throw com.sun.star.io.NotConnectedException + * in case the internal streams to the file on disk couldn't + * be established. + * They are neccessary. Otherwhise this simulator can't + * really work. + */ + public StreamSimulator(XMultiServiceFactory xMSF, + String sFileName, boolean bInput) + throws com.sun.star.io.NotConnectedException + { + m_sFileName = sFileName ; + m_bInWasUsed = false ; + m_bOutWasUsed = false ; + + try + { + XSimpleFileAccess xHelper = (XSimpleFileAccess) + UnoRuntime.queryInterface(XSimpleFileAccess.class, + xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess")); + + if (xHelper == null) + throw new com.sun.star.io.NotConnectedException( + "ucb helper not available. Can't create streams."); + + if (bInput) + { + m_xInStream = xHelper.openFileRead(m_sFileName); + m_xSeek = (com.sun.star.io.XSeekable)UnoRuntime.queryInterface( + com.sun.star.io.XSeekable.class, + m_xInStream); + } + else + { + m_xOutStream = xHelper.openFileWrite(m_sFileName); + m_xSeek = (com.sun.star.io.XSeekable)UnoRuntime.queryInterface( + com.sun.star.io.XSeekable.class, + m_xOutStream); + } + } + catch(com.sun.star.uno.Exception exUno) + { + throw new com.sun.star.io.NotConnectedException( + "Could not open the file."); + } + } + + /** + * following methods simulates the XInputStream. + * The notice all actions inside the internal protocol + * and try to map all neccessary functions to the internal + * open in-stream. + */ + public int readBytes(byte[][] lData, int nBytesToRead ) + throws com.sun.star.io.NotConnectedException, + com.sun.star.io.BufferSizeExceededException, + com.sun.star.io.IOException + { + m_bInWasUsed = true; + + if (m_xInStream == null) + { + throw new com.sun.star.io.NotConnectedException("stream not open"); + } + + int nRead = 0; + try + { + nRead = m_xInStream.readBytes(lData,nBytesToRead); + } + catch (com.sun.star.io.NotConnectedException exConnect) { + } + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { + } + catch (com.sun.star.io.IOException exIO ) { + } + catch (com.sun.star.uno.RuntimeException exRuntime) { + } + catch (com.sun.star.uno.Exception exUno ) { + } + + + return nRead; + } + + public int readSomeBytes(byte[][] lData, int nMaxBytesToRead) + throws com.sun.star.io.NotConnectedException, + com.sun.star.io.BufferSizeExceededException , + com.sun.star.io.IOException + { + m_bInWasUsed = true; + + if (m_xInStream == null) + { + throw new com.sun.star.io.NotConnectedException("stream not open"); + } + + int nRead = 0; + try + { + nRead = m_xInStream.readSomeBytes(lData,nMaxBytesToRead); + } + catch (com.sun.star.io.NotConnectedException exConnect) { + } + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { + } + catch (com.sun.star.io.IOException exIO ) { + } + catch (com.sun.star.uno.RuntimeException exRuntime) { + } + catch (com.sun.star.uno.Exception exUno ) { + } + + return nRead; + } + + //_________________________________ + + public void skipBytes(int nBytesToSkip) + throws com.sun.star.io.NotConnectedException, + com.sun.star.io.BufferSizeExceededException , + com.sun.star.io.IOException + { + m_bInWasUsed = true; + + if (m_xInStream == null) + { + throw new com.sun.star.io.NotConnectedException("stream not open"); + } + + try + { + m_xInStream.skipBytes(nBytesToSkip); + } + catch (com.sun.star.io.NotConnectedException exConnect) { + } + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { + } + catch (com.sun.star.io.IOException exIO ) { + } + catch (com.sun.star.uno.RuntimeException exRuntime) { + } + catch (com.sun.star.uno.Exception exUno ) { + } + + } + + public int available() throws com.sun.star.io.NotConnectedException, + com.sun.star.io.IOException + { + m_bInWasUsed = true; + + if (m_xInStream == null) + { + throw new com.sun.star.io.NotConnectedException("stream not open"); + } + + int nAvailable = 0; + try + { + nAvailable = m_xInStream.available(); + } + catch (com.sun.star.io.NotConnectedException exConnect) { + } + catch (com.sun.star.io.IOException exIO ) { + } + catch (com.sun.star.uno.RuntimeException exRuntime) { + } + catch (com.sun.star.uno.Exception exUno ) { + } + + return nAvailable; + } + + //_________________________________ + + public void closeInput() throws com.sun.star.io.NotConnectedException, + com.sun.star.io.IOException + { + m_bInWasUsed = true; + + if (m_xInStream == null) + { + throw new com.sun.star.io.NotConnectedException("stream not open"); + } + + try + { + m_xInStream.closeInput(); + } + catch (com.sun.star.io.NotConnectedException exConnect) { + } + catch (com.sun.star.io.IOException exIO ) { + } + catch (com.sun.star.uno.RuntimeException exRuntime) { + } + catch (com.sun.star.uno.Exception exUno ) { + } + + } + + /** + * following methods simulates the XOutputStream. + * The notice all actions inside the internal protocol + * and try to map all neccessary functions to the internal + * open out-stream. + */ + public void writeBytes(byte[] lData) + throws com.sun.star.io.NotConnectedException, + com.sun.star.io.BufferSizeExceededException , + com.sun.star.io.IOException + { + m_bOutWasUsed = true; + + if (m_xOutStream == null) + { + throw new com.sun.star.io.NotConnectedException("stream not open"); + } + + try + { + m_xOutStream.writeBytes(lData); + } + catch (com.sun.star.io.NotConnectedException exConnect) { + } + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { + } + catch (com.sun.star.io.IOException exIO ) { + } + catch (com.sun.star.uno.RuntimeException exRuntime) { + } + catch (com.sun.star.uno.Exception exUno ) { + } + + } + + //_________________________________ + + public void flush() throws com.sun.star.io.NotConnectedException , + com.sun.star.io.BufferSizeExceededException , + com.sun.star.io.IOException + { + m_bOutWasUsed = true; + + if (m_xOutStream == null) + { + throw new com.sun.star.io.NotConnectedException("stream not open"); + } + + try + { + m_xOutStream.flush(); + } + catch (com.sun.star.io.NotConnectedException exConnect) { + } + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { + } + catch (com.sun.star.io.IOException exIO ) { + } + catch (com.sun.star.uno.RuntimeException exRuntime) { + } + catch (com.sun.star.uno.Exception exUno ) { + } + } + + //_________________________________ + + public void closeOutput() throws com.sun.star.io.NotConnectedException , + com.sun.star.io.BufferSizeExceededException, + com.sun.star.io.IOException + { + m_bOutWasUsed = true; + + if (m_xOutStream == null) + { + throw new com.sun.star.io.NotConnectedException("stream not open"); + } + + try + { + m_xOutStream.closeOutput(); + } + catch (com.sun.star.io.NotConnectedException exConnect) { + } + catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { + } + catch (com.sun.star.io.IOException exIO ) { + } + catch (com.sun.star.uno.RuntimeException exRuntime) { + } + catch (com.sun.star.uno.Exception exUno ) { + } + + } + + /** + * following methods simulates the XSeekable. + * The notice all actions inside the internal protocol + * and try to map all neccessary functions to the internal + * open stream. + */ + public void seek(long nLocation ) + throws com.sun.star.lang.IllegalArgumentException, + com.sun.star.io.IOException + { + if (m_xInStream != null) + m_bInWasUsed = true; + else + if (m_xOutStream != null) + m_bOutWasUsed = true; +// else + //m_aProtocol.log("\tno stream open!\n"); + + if (m_xSeek == null) + { + throw new com.sun.star.io.IOException("stream not seekable"); + } + + try + { + m_xSeek.seek(nLocation); + } + catch (com.sun.star.lang.IllegalArgumentException exArg ) { + } + catch (com.sun.star.io.IOException exIO ) { + } + catch (com.sun.star.uno.RuntimeException exRuntime) { + } + catch (com.sun.star.uno.Exception exUno ) { + } + + } + + public long getPosition() throws com.sun.star.io.IOException + { + + if (m_xInStream != null) + m_bInWasUsed = true; + else + if (m_xOutStream != null) + m_bOutWasUsed = true; +// else + //m_aProtocol.log("\tno stream open!\n"); + + if (m_xSeek == null) + { + throw new com.sun.star.io.IOException("stream not seekable"); + } + + long nPos = 0; + try + { + nPos = m_xSeek.getPosition(); + } + catch (com.sun.star.io.IOException exIO ) { + } + catch (com.sun.star.uno.RuntimeException exRuntime) { + } + catch (com.sun.star.uno.Exception exUno ) { + } + + return nPos; + } + + //_________________________________ + + public long getLength() throws com.sun.star.io.IOException + { + + if (m_xInStream != null) + m_bInWasUsed = true; + else + if (m_xOutStream != null) + m_bOutWasUsed = true; +// else + //m_aProtocol.log("\tno stream open!\n"); + + if (m_xSeek == null) + { + throw new com.sun.star.io.IOException("stream not seekable"); + } + + long nLen = 0; + try + { + nLen = m_xSeek.getLength(); + } + catch (com.sun.star.io.IOException exIO ) { + } + catch (com.sun.star.uno.RuntimeException exRuntime) { + } + catch (com.sun.star.uno.Exception exUno ) { + } + + return nLen; + } +} diff --git a/framework/qa/complex/loadAllDocuments/helper/InteractionHandler.java b/framework/qa/complex/loadAllDocuments/helper/InteractionHandler.java deleted file mode 100644 index ff4bf87c4f23..000000000000 --- a/framework/qa/complex/loadAllDocuments/helper/InteractionHandler.java +++ /dev/null @@ -1,155 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.loadAllDocuments.helper; - -import com.sun.star.beans.PropertyValue; - -import com.sun.star.uno.Exception; -import com.sun.star.uno.RuntimeException; - -import com.sun.star.task.XInteractionHandler; -import com.sun.star.task.XInteractionAbort; -import com.sun.star.task.XInteractionRetry; - -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.AnyConverter; - -//import java.lang.*; - - -/** - * Implemets a simple interaction handler, - * which can abort all incoming interactions only ... but make it possible to - * log it. So it can be used for debug and test purposes. - */ -public class InteractionHandler implements XInteractionHandler -{ - // ____________________ - - /** - * @const RETRY_COUNT it defines the max count of - * retrying of an interaction - */ - private static final int RETRY_COUNT = 3; - - // ____________________ - - /** - * @member m_aRequest the origianl interaction request - * safed for later analyzing - * @member m_bWasUsed true if the interaction handler was used - * @member m_nTry count using of RETRY continuations - */ - private Object m_aRequest ; - private int m_nTry ; - private boolean m_bWasUsed ; - - - /** - * ctor - * It's initialize an object of this class with default values - * and set the protocol stack. So the outside code can check - * if this handler was used or not. - */ - public InteractionHandler() - { - m_aRequest = null ; - //m_aProtocol = aProtocol; - m_nTry = 0 ; - m_bWasUsed = false; - } - - /** - * Called to start the interaction, because the outside code whish to solve - * a detected problem or to inform the user about something. - * We safe the informations here and can handle two well known continuations - * only. - * [abort and retry]. - * - * @param xRequest - * describe the interaction - */ - public void handle(com.sun.star.task.XInteractionRequest xRequest) - { - m_bWasUsed = true; - - // first sav thje original request - // Our user can use this information later for some debug analyzing - Object aRequest = xRequest.getRequest(); - synchronized(this) - { - m_aRequest = aRequest; - } - - // analyze the possible continuations. - // We can abort all incoming interactions only. - // But additional we can try to continue it several times too. - // Of course after e.g. three loops we have to stop and abort it. - com.sun.star.task.XInteractionContinuation[] lContinuations = xRequest.getContinuations(); - - com.sun.star.task.XInteractionAbort xAbort = null; - com.sun.star.task.XInteractionRetry xRetry = null; - com.sun.star.uno.Type xAbortType = new com.sun.star.uno.Type(com.sun.star.task.XInteractionAbort.class); - com.sun.star.uno.Type xRetryType = new com.sun.star.uno.Type(com.sun.star.task.XInteractionRetry.class); - - for (int i=0; i - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.loadAllDocuments.helper; - -// __________ Imports __________ - -// structs, const, ... -import com.sun.star.beans.PropertyValue; - -// exceptions -import com.sun.star.uno.Exception; -import com.sun.star.uno.RuntimeException; - -// interfaces -import com.sun.star.task.XStatusIndicator; - -// helper -import com.sun.star.uno.UnoRuntime; - -// others -//import java.lang.*; - -// __________ Implementation __________ - -/** - * Implemets a simple status indicator, which - * provide informations about state of a load request. - * It can be used as an argument e.g. for loadComponentFromURL(). - */ -public class StatusIndicator implements com.sun.star.task.XStatusIndicator -{ - // ____________________ - - /** - * @const SHOWSTATUS_NO don't show the status - but save information about using of this indicator object - * @const SHOWSTATUS_LOG the possible set protocol object will be used (it covers STDOUT, STDERR automaticly too) - * @const SHOWSTATUS_DIALOG the status will be shown inside a java dialog - * @const SHOWSTATUS_LINK the status will be notified to interested listener (one listener only!) - */ - public static final int SHOWSTATUS_NO = 0; - public static final int SHOWSTATUS_LOG = 1; - public static final int SHOWSTATUS_DIALOG = 4; - public static final int SHOWSTATUS_LINK = 8; - - // ____________________ - - /** - * @member m_sText text, which describe the current status - * @member m_nRange max value for any progress - * @member m_nValue the progress value - * @member m_nOut regulate, how the status will be shown - * @member m_aProtocol used for logging and transport information about used interface of this object - */ - private String m_sText ; - private int m_nRange ; - private int m_nValue ; - private int m_nOut ; -// private Protocol m_aProtocol ; - private boolean m_bWasUsed ; - - // ____________________ - - /** - * ctor - * It's initialize an object of this class with default values. - */ - public StatusIndicator( int nOut) - { - m_sText = new String() ; - m_nRange = 100 ; - m_nValue = 0 ; - m_nOut = nOut ; - //m_aProtocol = aProtocol ; - m_bWasUsed = false; -// aProtocol.resetUsingState(); - } - - // ____________________ - - /** - * It starts the progress and set the initial text and range. - * - * @param sText - * the initial text for showing - * - * @param nRange - * the new range for following progress - */ - public void start( /*IN*/String sText, /*IN*/int nRange ) - { - synchronized(this) - { - //m_aProtocol.log("start("+sText+","+nRange+")\n"); - m_bWasUsed = true; -// m_aProtocol.itWasUsed(); - - m_sText = sText ; - m_nRange = nRange; - m_nValue = 0 ; - } - impl_show(); - } - - // ____________________ - - /** - * Finish the progress and reset internal members. - */ - public void end() - { - synchronized(this) - { - //m_aProtocol.log("end()\n"); - m_bWasUsed = true; -// m_aProtocol.itWasUsed(); - - m_sText = new String(); - m_nRange = 100; - m_nValue = 0; - } - impl_show(); - } - - // ____________________ - - /** - * Set the new description text. - * - * @param sText - * the new text for showing - */ - public void setText( /*IN*/String sText ) - { - synchronized(this) - { - //m_aProtocol.log("setText("+sText+")\n"); - m_bWasUsed = true; -// m_aProtocol.itWasUsed(); - - m_sText = sText; - } - impl_show(); - } - - // ____________________ - - /** - * Set the new progress value. - * - * @param nValue - * the new progress value - * Must fit the range! - */ - public void setValue( /*IN*/int nValue ) - { - synchronized(this) - { - //m_aProtocol.log("setValue("+nValue+")\n"); - m_bWasUsed = true; -// m_aProtocol.itWasUsed(); - - if (nValue<=m_nRange) - m_nValue = nValue; - } - impl_show(); - } - - // ____________________ - - /** - * Reset text and progress value to her defaults. - */ - public void reset() - { - synchronized(this) - { - //m_aProtocol.log("reset()\n"); - m_bWasUsed = true; -// m_aProtocol.itWasUsed(); - - m_sText = new String(); - m_nValue = 0; - } - impl_show(); - } - - // ____________________ - - /** - * Internal helper to show the status. - * Currently it's implement as normal text out on stdout. - * But of course other thimngs are possible here too. - * e.g. a dialog - */ - private void impl_show() - { -/* synchronized(this) - { - if ((m_nOut & SHOWSTATUS_LOG) == SHOWSTATUS_LOG) - //m_aProtocol.log("\t["+m_nValue+"/"+m_nRange+"] "+m_sText+"\n"); - - //if ((m_nOut & SHOWSTATUS_DIALOG) == SHOWSTATUS_DIALOG) - // not supported yet! - - //if ((m_nOut & SHOWSTATUS_LINK) == SHOWSTATUS_LINK) - // not supported yet! - } */ - } - - public boolean wasUsed() { - return m_bWasUsed; - } -} diff --git a/framework/qa/complex/loadAllDocuments/helper/StreamSimulator.java b/framework/qa/complex/loadAllDocuments/helper/StreamSimulator.java deleted file mode 100644 index 2f09044960ad..000000000000 --- a/framework/qa/complex/loadAllDocuments/helper/StreamSimulator.java +++ /dev/null @@ -1,474 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.loadAllDocuments.helper; - -import com.sun.star.uno.UnoRuntime; -import com.sun.star.ucb.XSimpleFileAccess; -import com.sun.star.lang.XMultiServiceFactory; - -/** - * Simulates an input and output stream and - * implements the interfaces XInputStream, XOutputStream. - * So it can be used for testing loading/saving of documents - * using streams instead of URLs. - */ -public class StreamSimulator implements com.sun.star.io.XInputStream , - com.sun.star.io.XOutputStream , - com.sun.star.io.XSeekable -{ - //_________________________________ - /** - * @member m_sFileName name of the corrsponding file on disk - * @member m_xInStream the internal input stream for reading - * @member m_xOutStream the internal input stream for writing - * @member m_xSeek points at runtime to m_xInStream or m_xOutStream and make it seekable - * - * @member m_bInWasUsed indicates, that the input stream interface was used - * @member m_bOutWasUsed indicates, that the output stream interface was used - */ - - private String m_sFileName ; - private com.sun.star.io.XInputStream m_xInStream ; - private com.sun.star.io.XOutputStream m_xOutStream ; - private com.sun.star.io.XSeekable m_xSeek ; - - public boolean m_bInWasUsed ; - public boolean m_bOutWasUsed ; - - /** - * construct a new instance of this class - * It set the name of the correspojnding file on disk, which - * should be source or target for the following operations on - * this object. And it regulate if it should function as - * input or output stream. - * - * @param sFileName - * name of the file on disk - * Will be used as source (if param bInput==true) - * or as target (if param bInput==false). - * - * @param bInput - * it specify, which interface should work at this object. - * => we simulate an input stream - * => we simulate an output stream - * - * @throw com.sun.star.io.NotConnectedException - * in case the internal streams to the file on disk couldn't - * be established. - * They are neccessary. Otherwhise this simulator can't - * really work. - */ - public StreamSimulator(XMultiServiceFactory xMSF, - String sFileName, boolean bInput) - throws com.sun.star.io.NotConnectedException - { - m_sFileName = sFileName ; - m_bInWasUsed = false ; - m_bOutWasUsed = false ; - - try - { - XSimpleFileAccess xHelper = (XSimpleFileAccess) - UnoRuntime.queryInterface(XSimpleFileAccess.class, - xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess")); - - if (xHelper == null) - throw new com.sun.star.io.NotConnectedException( - "ucb helper not available. Can't create streams."); - - if (bInput) - { - m_xInStream = xHelper.openFileRead(m_sFileName); - m_xSeek = (com.sun.star.io.XSeekable)UnoRuntime.queryInterface( - com.sun.star.io.XSeekable.class, - m_xInStream); - } - else - { - m_xOutStream = xHelper.openFileWrite(m_sFileName); - m_xSeek = (com.sun.star.io.XSeekable)UnoRuntime.queryInterface( - com.sun.star.io.XSeekable.class, - m_xOutStream); - } - } - catch(com.sun.star.uno.Exception exUno) - { - throw new com.sun.star.io.NotConnectedException( - "Could not open the file."); - } - } - - /** - * following methods simulates the XInputStream. - * The notice all actions inside the internal protocol - * and try to map all neccessary functions to the internal - * open in-stream. - */ - public int readBytes(byte[][] lData, int nBytesToRead ) - throws com.sun.star.io.NotConnectedException, - com.sun.star.io.BufferSizeExceededException, - com.sun.star.io.IOException - { - m_bInWasUsed = true; - - if (m_xInStream == null) - { - throw new com.sun.star.io.NotConnectedException("stream not open"); - } - - int nRead = 0; - try - { - nRead = m_xInStream.readBytes(lData,nBytesToRead); - } - catch (com.sun.star.io.NotConnectedException exConnect) { - } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { - } - catch (com.sun.star.io.IOException exIO ) { - } - catch (com.sun.star.uno.RuntimeException exRuntime) { - } - catch (com.sun.star.uno.Exception exUno ) { - } - - - return nRead; - } - - public int readSomeBytes(byte[][] lData, int nMaxBytesToRead) - throws com.sun.star.io.NotConnectedException, - com.sun.star.io.BufferSizeExceededException , - com.sun.star.io.IOException - { - m_bInWasUsed = true; - - if (m_xInStream == null) - { - throw new com.sun.star.io.NotConnectedException("stream not open"); - } - - int nRead = 0; - try - { - nRead = m_xInStream.readSomeBytes(lData,nMaxBytesToRead); - } - catch (com.sun.star.io.NotConnectedException exConnect) { - } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { - } - catch (com.sun.star.io.IOException exIO ) { - } - catch (com.sun.star.uno.RuntimeException exRuntime) { - } - catch (com.sun.star.uno.Exception exUno ) { - } - - return nRead; - } - - //_________________________________ - - public void skipBytes(int nBytesToSkip) - throws com.sun.star.io.NotConnectedException, - com.sun.star.io.BufferSizeExceededException , - com.sun.star.io.IOException - { - m_bInWasUsed = true; - - if (m_xInStream == null) - { - throw new com.sun.star.io.NotConnectedException("stream not open"); - } - - try - { - m_xInStream.skipBytes(nBytesToSkip); - } - catch (com.sun.star.io.NotConnectedException exConnect) { - } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { - } - catch (com.sun.star.io.IOException exIO ) { - } - catch (com.sun.star.uno.RuntimeException exRuntime) { - } - catch (com.sun.star.uno.Exception exUno ) { - } - - } - - public int available() throws com.sun.star.io.NotConnectedException, - com.sun.star.io.IOException - { - m_bInWasUsed = true; - - if (m_xInStream == null) - { - throw new com.sun.star.io.NotConnectedException("stream not open"); - } - - int nAvailable = 0; - try - { - nAvailable = m_xInStream.available(); - } - catch (com.sun.star.io.NotConnectedException exConnect) { - } - catch (com.sun.star.io.IOException exIO ) { - } - catch (com.sun.star.uno.RuntimeException exRuntime) { - } - catch (com.sun.star.uno.Exception exUno ) { - } - - return nAvailable; - } - - //_________________________________ - - public void closeInput() throws com.sun.star.io.NotConnectedException, - com.sun.star.io.IOException - { - m_bInWasUsed = true; - - if (m_xInStream == null) - { - throw new com.sun.star.io.NotConnectedException("stream not open"); - } - - try - { - m_xInStream.closeInput(); - } - catch (com.sun.star.io.NotConnectedException exConnect) { - } - catch (com.sun.star.io.IOException exIO ) { - } - catch (com.sun.star.uno.RuntimeException exRuntime) { - } - catch (com.sun.star.uno.Exception exUno ) { - } - - } - - /** - * following methods simulates the XOutputStream. - * The notice all actions inside the internal protocol - * and try to map all neccessary functions to the internal - * open out-stream. - */ - public void writeBytes(byte[] lData) - throws com.sun.star.io.NotConnectedException, - com.sun.star.io.BufferSizeExceededException , - com.sun.star.io.IOException - { - m_bOutWasUsed = true; - - if (m_xOutStream == null) - { - throw new com.sun.star.io.NotConnectedException("stream not open"); - } - - try - { - m_xOutStream.writeBytes(lData); - } - catch (com.sun.star.io.NotConnectedException exConnect) { - } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { - } - catch (com.sun.star.io.IOException exIO ) { - } - catch (com.sun.star.uno.RuntimeException exRuntime) { - } - catch (com.sun.star.uno.Exception exUno ) { - } - - } - - //_________________________________ - - public void flush() throws com.sun.star.io.NotConnectedException , - com.sun.star.io.BufferSizeExceededException , - com.sun.star.io.IOException - { - m_bOutWasUsed = true; - - if (m_xOutStream == null) - { - throw new com.sun.star.io.NotConnectedException("stream not open"); - } - - try - { - m_xOutStream.flush(); - } - catch (com.sun.star.io.NotConnectedException exConnect) { - } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { - } - catch (com.sun.star.io.IOException exIO ) { - } - catch (com.sun.star.uno.RuntimeException exRuntime) { - } - catch (com.sun.star.uno.Exception exUno ) { - } - } - - //_________________________________ - - public void closeOutput() throws com.sun.star.io.NotConnectedException , - com.sun.star.io.BufferSizeExceededException, - com.sun.star.io.IOException - { - m_bOutWasUsed = true; - - if (m_xOutStream == null) - { - throw new com.sun.star.io.NotConnectedException("stream not open"); - } - - try - { - m_xOutStream.closeOutput(); - } - catch (com.sun.star.io.NotConnectedException exConnect) { - } - catch (com.sun.star.io.BufferSizeExceededException exBuffer ) { - } - catch (com.sun.star.io.IOException exIO ) { - } - catch (com.sun.star.uno.RuntimeException exRuntime) { - } - catch (com.sun.star.uno.Exception exUno ) { - } - - } - - /** - * following methods simulates the XSeekable. - * The notice all actions inside the internal protocol - * and try to map all neccessary functions to the internal - * open stream. - */ - public void seek(long nLocation ) - throws com.sun.star.lang.IllegalArgumentException, - com.sun.star.io.IOException - { - if (m_xInStream != null) - m_bInWasUsed = true; - else - if (m_xOutStream != null) - m_bOutWasUsed = true; -// else - //m_aProtocol.log("\tno stream open!\n"); - - if (m_xSeek == null) - { - throw new com.sun.star.io.IOException("stream not seekable"); - } - - try - { - m_xSeek.seek(nLocation); - } - catch (com.sun.star.lang.IllegalArgumentException exArg ) { - } - catch (com.sun.star.io.IOException exIO ) { - } - catch (com.sun.star.uno.RuntimeException exRuntime) { - } - catch (com.sun.star.uno.Exception exUno ) { - } - - } - - public long getPosition() throws com.sun.star.io.IOException - { - - if (m_xInStream != null) - m_bInWasUsed = true; - else - if (m_xOutStream != null) - m_bOutWasUsed = true; -// else - //m_aProtocol.log("\tno stream open!\n"); - - if (m_xSeek == null) - { - throw new com.sun.star.io.IOException("stream not seekable"); - } - - long nPos = 0; - try - { - nPos = m_xSeek.getPosition(); - } - catch (com.sun.star.io.IOException exIO ) { - } - catch (com.sun.star.uno.RuntimeException exRuntime) { - } - catch (com.sun.star.uno.Exception exUno ) { - } - - return nPos; - } - - //_________________________________ - - public long getLength() throws com.sun.star.io.IOException - { - - if (m_xInStream != null) - m_bInWasUsed = true; - else - if (m_xOutStream != null) - m_bOutWasUsed = true; -// else - //m_aProtocol.log("\tno stream open!\n"); - - if (m_xSeek == null) - { - throw new com.sun.star.io.IOException("stream not seekable"); - } - - long nLen = 0; - try - { - nLen = m_xSeek.getLength(); - } - catch (com.sun.star.io.IOException exIO ) { - } - catch (com.sun.star.uno.RuntimeException exRuntime) { - } - catch (com.sun.star.uno.Exception exUno ) { - } - - return nLen; - } -} diff --git a/framework/qa/complex/loadAllDocuments/makefile.mk b/framework/qa/complex/loadAllDocuments/makefile.mk index dd2d78984da6..ebf0265620bf 100644 --- a/framework/qa/complex/loadAllDocuments/makefile.mk +++ b/framework/qa/complex/loadAllDocuments/makefile.mk @@ -41,14 +41,15 @@ JAVATESTFILES = \ CheckXComponentLoader.java # put here all other files -JAVAFILES = $(JAVATESTFILES) +JAVAFILES = $(JAVATESTFILES) \ + InteractionHandler.java \ + StatusIndicator.java \ + StreamSimulator.java \ + TestDocument.java JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -# subdirectories -SUBDIRS = helper - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/framework/qa/complex/path_settings/makefile.mk b/framework/qa/complex/path_settings/makefile.mk index 21586cc9435b..05900d46e190 100755 --- a/framework/qa/complex/path_settings/makefile.mk +++ b/framework/qa/complex/path_settings/makefile.mk @@ -47,9 +47,6 @@ JAVAFILES = $(JAVATESTFILES) JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -# subdirectories -# SUBDIRS = helper - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/framework/qa/complex/path_substitution/makefile.mk b/framework/qa/complex/path_substitution/makefile.mk index 707a00c0b0f6..338affbf70d7 100755 --- a/framework/qa/complex/path_substitution/makefile.mk +++ b/framework/qa/complex/path_substitution/makefile.mk @@ -46,9 +46,6 @@ JAVAFILES = $(JAVATESTFILES) JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -# subdirectories -# SUBDIRS = helper - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/linguistic/qa/complex/linguistic/makefile.mk b/linguistic/qa/complex/linguistic/makefile.mk index 2d10ec4c832d..43a88ee0a198 100644 --- a/linguistic/qa/complex/linguistic/makefile.mk +++ b/linguistic/qa/complex/linguistic/makefile.mk @@ -47,9 +47,6 @@ JAVAFILES = $(JAVATESTFILES) \ JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -# subdirectories -# SUBDIRS = helper - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index d2964afdc3ee..1e471312c6cf 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -27,7 +27,5 @@ sf sfx2\qa\cppunit nmake - all sf_qa_cppunit sf_util NULL # fails on unxsoli4 # sf sfx2\qa\complex\standalonedocumentinfo nmake - all sf_qa_complex_standalonedocumentinfo sf_util NULL -# subdir has to remove -# sf sfx2\qa\complex\framework\DocHelper nmake - all sf_qa_complex_framework_dochelper sf_util NULL # sf sfx2\qa\complex\framework nmake - all sf_qa_complex_framework sf_qa_complex_framework_dochelper NULL # sf sfx2\qa\complex\docinfo nmake - all sf_qa_complex_docinfo sf_util NULL diff --git a/sfx2/qa/complex/framework/DialogThread.java b/sfx2/qa/complex/framework/DialogThread.java new file mode 100644 index 000000000000..7151ccbb292d --- /dev/null +++ b/sfx2/qa/complex/framework/DialogThread.java @@ -0,0 +1,95 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.framework.DocHelper; + +import com.sun.star.beans.PropertyValue; +import com.sun.star.frame.XController; +import com.sun.star.frame.XDispatch; +import com.sun.star.frame.XDispatchProvider; +import com.sun.star.frame.XModel; +import com.sun.star.lang.XComponent; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.uno.UnoRuntime; +import com.sun.star.util.URL; +import com.sun.star.util.XURLTransformer; + +import java.lang.Thread; + + +/** + * This class opens a given dialog in a separate Thread by dispatching an url + * + */ +public class DialogThread extends Thread { + public XComponent m_xDoc = null; + public XMultiServiceFactory m_xMSF = null; + public String m_url = ""; + + public DialogThread(XComponent xDoc, XMultiServiceFactory msf, String url) { + this.m_xDoc = xDoc; + this.m_xMSF = msf; + this.m_url = url; + } + + public void run() { + XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, + m_xDoc); + + XController xController = aModel.getCurrentController(); + + //Opening Dialog + try { + XDispatchProvider xDispProv = (XDispatchProvider) UnoRuntime.queryInterface( + XDispatchProvider.class, + xController.getFrame()); + XURLTransformer xParser = (com.sun.star.util.XURLTransformer) UnoRuntime.queryInterface( + XURLTransformer.class, + m_xMSF.createInstance( + "com.sun.star.util.URLTransformer")); + + // Because it's an in/out parameter + // we must use an array of URL objects. + URL[] aParseURL = new URL[1]; + aParseURL[0] = new URL(); + aParseURL[0].Complete = m_url; + xParser.parseStrict(aParseURL); + + URL aURL = aParseURL[0]; + XDispatch xDispatcher = xDispProv.queryDispatch(aURL, "", com.sun.star.frame.FrameSearchFlag.SELF | + com.sun.star.frame.FrameSearchFlag.CHILDREN); + PropertyValue[] dispatchArguments = new PropertyValue[0]; + + if (xDispatcher != null) { + xDispatcher.dispatch(aURL, dispatchArguments); + } else { + System.out.println("xDispatcher is null"); + } + } catch (com.sun.star.uno.Exception e) { + System.out.println("Couldn't open dialog"); + } + } +} \ No newline at end of file diff --git a/sfx2/qa/complex/framework/DocHelper/DialogThread.java b/sfx2/qa/complex/framework/DocHelper/DialogThread.java deleted file mode 100644 index 7151ccbb292d..000000000000 --- a/sfx2/qa/complex/framework/DocHelper/DialogThread.java +++ /dev/null @@ -1,95 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.framework.DocHelper; - -import com.sun.star.beans.PropertyValue; -import com.sun.star.frame.XController; -import com.sun.star.frame.XDispatch; -import com.sun.star.frame.XDispatchProvider; -import com.sun.star.frame.XModel; -import com.sun.star.lang.XComponent; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.util.URL; -import com.sun.star.util.XURLTransformer; - -import java.lang.Thread; - - -/** - * This class opens a given dialog in a separate Thread by dispatching an url - * - */ -public class DialogThread extends Thread { - public XComponent m_xDoc = null; - public XMultiServiceFactory m_xMSF = null; - public String m_url = ""; - - public DialogThread(XComponent xDoc, XMultiServiceFactory msf, String url) { - this.m_xDoc = xDoc; - this.m_xMSF = msf; - this.m_url = url; - } - - public void run() { - XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, - m_xDoc); - - XController xController = aModel.getCurrentController(); - - //Opening Dialog - try { - XDispatchProvider xDispProv = (XDispatchProvider) UnoRuntime.queryInterface( - XDispatchProvider.class, - xController.getFrame()); - XURLTransformer xParser = (com.sun.star.util.XURLTransformer) UnoRuntime.queryInterface( - XURLTransformer.class, - m_xMSF.createInstance( - "com.sun.star.util.URLTransformer")); - - // Because it's an in/out parameter - // we must use an array of URL objects. - URL[] aParseURL = new URL[1]; - aParseURL[0] = new URL(); - aParseURL[0].Complete = m_url; - xParser.parseStrict(aParseURL); - - URL aURL = aParseURL[0]; - XDispatch xDispatcher = xDispProv.queryDispatch(aURL, "", com.sun.star.frame.FrameSearchFlag.SELF | - com.sun.star.frame.FrameSearchFlag.CHILDREN); - PropertyValue[] dispatchArguments = new PropertyValue[0]; - - if (xDispatcher != null) { - xDispatcher.dispatch(aURL, dispatchArguments); - } else { - System.out.println("xDispatcher is null"); - } - } catch (com.sun.star.uno.Exception e) { - System.out.println("Couldn't open dialog"); - } - } -} \ No newline at end of file diff --git a/sfx2/qa/complex/framework/DocHelper/WriterHelper.java b/sfx2/qa/complex/framework/DocHelper/WriterHelper.java deleted file mode 100644 index d3f19703bb9d..000000000000 --- a/sfx2/qa/complex/framework/DocHelper/WriterHelper.java +++ /dev/null @@ -1,287 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.framework.DocHelper; - -import com.sun.star.accessibility.AccessibleRole; -import com.sun.star.accessibility.XAccessible; -import com.sun.star.accessibility.XAccessibleAction; -import com.sun.star.accessibility.XAccessibleContext; -import com.sun.star.accessibility.XAccessibleSelection; -import com.sun.star.awt.XExtendedToolkit; -import com.sun.star.awt.XWindow; -import com.sun.star.frame.XDesktop; -import com.sun.star.lang.XComponent; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.text.XTextDocument; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.util.XCloseable; - -import complex.framework.DocHelper.DialogThread; -import java.io.PrintWriter; - -import util.AccessibilityTools; -import util.WriterTools; - - -/** - * Methods to open Writer docs - * - */ -public class WriterHelper { - XMultiServiceFactory m_xMSF = null; - - /** Creates a new instance of WriterHelper - * @param m_xMSF The MultiServiceFactory gained from the office - */ - public WriterHelper(XMultiServiceFactory m_xMSF) { - this.m_xMSF = m_xMSF; - } - - /** Opens an empty document - * @return a reference to the opened document is returned - */ - public XTextDocument openEmptyDoc() { - return WriterTools.createTextDoc(m_xMSF); - } - - /** Closes a given XTextDocument - * @param xTextDoc the text document to be closed - * @return if an error occurs the errormessage is returned and an empty String if not - */ - public String closeDoc(XTextDocument xTextDoc) { - XCloseable closer = UnoRuntime.queryInterface(XCloseable.class, xTextDoc); - String err = ""; - - try { - closer.close(true); - } catch (com.sun.star.util.CloseVetoException e) { - err = "couldn't close document " + e; - System.out.println(err); - } - - return err; - } - - private XTextDocument xLocalDoc = null; - /** a TextDocument is opened by pressing a button in a dialog given by uno-URL - * @param url the uno-URL of the dialog to be opened - * @param createButton the language dependend label of the button to be pressed - * @param destroyLocal if true the document that has been opened to dispatch the dialog is closed before the method returns, - * otherwise this document remains open - * @return returns the created Textdocument - */ - public XTextDocument openFromDialog(String url, String createButton, - boolean destroyLocal) { - xLocalDoc = WriterTools.createTextDoc(m_xMSF); - XComponent comp = UnoRuntime.queryInterface(XComponent.class, xLocalDoc); - DialogThread diagThread = new DialogThread(comp, m_xMSF, url); - diagThread.start(); - shortWait(); - - if (createButton.length() > 1) { - XExtendedToolkit tk = getToolkit(); - AccessibilityTools at = new AccessibilityTools(); - Object atw = tk.getActiveTopWindow(); - - XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, atw); - - XAccessible xRoot = at.getAccessibleObject(xWindow); - XAccessibleContext buttonContext = at.getAccessibleObjectForRole( - xRoot, - AccessibleRole.PUSH_BUTTON, - createButton); - - XAccessibleAction buttonAction = UnoRuntime.queryInterface(XAccessibleAction.class, buttonContext); - - try { - System.out.println("Name: " + - buttonContext.getAccessibleName()); - buttonAction.doAccessibleAction(0); - } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - System.out.println("Couldn't press button"); - } - - shortWait(); - } - - XDesktop xDesktop = getDesktop(); - - XTextDocument returnDoc = UnoRuntime.queryInterface(XTextDocument.class, xDesktop.getCurrentComponent()); - - if (destroyLocal) { - closeDoc(xLocalDoc); - xLocalDoc = null; - } - - return returnDoc; - } - public void closeFromDialog() - { - closeDoc(xLocalDoc); - xLocalDoc = null; - } - public void kill() - { - XDesktop xDesktop = getDesktop(); - xDesktop.terminate(); - } - - - public XTextDocument DocByAutopilot(XMultiServiceFactory msf, - int[] indexes, boolean destroyLocal, - String bName) { - XTextDocument xLocalDoc = WriterTools.createTextDoc(m_xMSF); - Object toolkit = null; - - try { - toolkit = msf.createInstance("com.sun.star.awt.Toolkit"); - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class, toolkit); - - shortWait(); - - AccessibilityTools at = new AccessibilityTools(); - - Object atw = tk.getActiveTopWindow(); - - XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, atw); - - XAccessible xRoot = at.getAccessibleObject(xWindow); - - XAccessibleContext ARoot = at.getAccessibleObjectForRole(xRoot, - AccessibleRole.MENU_BAR); - XAccessibleSelection sel = UnoRuntime.queryInterface(XAccessibleSelection.class, ARoot); - - for (int k = 0; k < indexes.length; k++) { - try { - sel.selectAccessibleChild(indexes[k]); - shortWait(); - ARoot = ARoot.getAccessibleChild(indexes[k]) - .getAccessibleContext(); - sel = UnoRuntime.queryInterface(XAccessibleSelection.class, ARoot); - } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - } - } - - shortWait(); - - atw = tk.getActiveTopWindow(); - - xWindow = UnoRuntime.queryInterface(XWindow.class, atw); - - xRoot = at.getAccessibleObject(xWindow); - - //at.printAccessibleTree(new PrintWriter(System.out),xRoot); - - XAccessibleAction action = UnoRuntime.queryInterface(XAccessibleAction.class, at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, bName)); - - try { - action.doAccessibleAction(0); - } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - } - - shortWait(); - - atw = tk.getActiveTopWindow(); - - xWindow = UnoRuntime.queryInterface(XWindow.class, atw); - - xRoot = at.getAccessibleObject(xWindow); - - at.printAccessibleTree(new PrintWriter(System.out),xRoot); - - action = UnoRuntime.queryInterface(XAccessibleAction.class, at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Yes")); - - try { - if (action != null) action.doAccessibleAction(0); - } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - } - - shortWait(); - - XDesktop xDesktop = getDesktop(); - - XTextDocument returnDoc = UnoRuntime.queryInterface(XTextDocument.class, xDesktop.getCurrentComponent()); - - if (destroyLocal) { - closeDoc(xLocalDoc); - } - - return returnDoc; - } - - /** - * Sleeps for 2 sec. to allow StarOffice to react - */ - private void shortWait() { - try { - Thread.sleep(4000); - } catch (InterruptedException e) { - System.out.println("While waiting :" + e); - } - } - - /** creates an instance of com.sun.star.awt.Toolkit to query the XExtendedToolkit - * interface - * @return returns the gained XExtendedToolkit Interface - */ - public XExtendedToolkit getToolkit() { - Object toolkit = null; - - try { - toolkit = m_xMSF.createInstance("com.sun.star.awt.Toolkit"); - } catch (com.sun.star.uno.Exception e) { - System.out.println("Couldn't get toolkit"); - e.printStackTrace(); - } - - XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class, toolkit); - - return tk; - } - - /** creates an instance of com.sun.star.frame.Desktop to query the XDesktop interface - * @return returns the gained XDesktop interface - */ - protected XDesktop getDesktop() { - Object desk = null; - - try { - desk = m_xMSF.createInstance("com.sun.star.frame.Desktop"); - } catch (com.sun.star.uno.Exception e) { - System.out.println("Couldn't get desktop"); - e.printStackTrace(); - } - - XDesktop xDesktop = UnoRuntime.queryInterface(XDesktop.class, desk); - - return xDesktop; - } -} \ No newline at end of file diff --git a/sfx2/qa/complex/framework/WriterHelper.java b/sfx2/qa/complex/framework/WriterHelper.java new file mode 100644 index 000000000000..d3f19703bb9d --- /dev/null +++ b/sfx2/qa/complex/framework/WriterHelper.java @@ -0,0 +1,287 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.framework.DocHelper; + +import com.sun.star.accessibility.AccessibleRole; +import com.sun.star.accessibility.XAccessible; +import com.sun.star.accessibility.XAccessibleAction; +import com.sun.star.accessibility.XAccessibleContext; +import com.sun.star.accessibility.XAccessibleSelection; +import com.sun.star.awt.XExtendedToolkit; +import com.sun.star.awt.XWindow; +import com.sun.star.frame.XDesktop; +import com.sun.star.lang.XComponent; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.text.XTextDocument; +import com.sun.star.uno.UnoRuntime; +import com.sun.star.util.XCloseable; + +import complex.framework.DocHelper.DialogThread; +import java.io.PrintWriter; + +import util.AccessibilityTools; +import util.WriterTools; + + +/** + * Methods to open Writer docs + * + */ +public class WriterHelper { + XMultiServiceFactory m_xMSF = null; + + /** Creates a new instance of WriterHelper + * @param m_xMSF The MultiServiceFactory gained from the office + */ + public WriterHelper(XMultiServiceFactory m_xMSF) { + this.m_xMSF = m_xMSF; + } + + /** Opens an empty document + * @return a reference to the opened document is returned + */ + public XTextDocument openEmptyDoc() { + return WriterTools.createTextDoc(m_xMSF); + } + + /** Closes a given XTextDocument + * @param xTextDoc the text document to be closed + * @return if an error occurs the errormessage is returned and an empty String if not + */ + public String closeDoc(XTextDocument xTextDoc) { + XCloseable closer = UnoRuntime.queryInterface(XCloseable.class, xTextDoc); + String err = ""; + + try { + closer.close(true); + } catch (com.sun.star.util.CloseVetoException e) { + err = "couldn't close document " + e; + System.out.println(err); + } + + return err; + } + + private XTextDocument xLocalDoc = null; + /** a TextDocument is opened by pressing a button in a dialog given by uno-URL + * @param url the uno-URL of the dialog to be opened + * @param createButton the language dependend label of the button to be pressed + * @param destroyLocal if true the document that has been opened to dispatch the dialog is closed before the method returns, + * otherwise this document remains open + * @return returns the created Textdocument + */ + public XTextDocument openFromDialog(String url, String createButton, + boolean destroyLocal) { + xLocalDoc = WriterTools.createTextDoc(m_xMSF); + XComponent comp = UnoRuntime.queryInterface(XComponent.class, xLocalDoc); + DialogThread diagThread = new DialogThread(comp, m_xMSF, url); + diagThread.start(); + shortWait(); + + if (createButton.length() > 1) { + XExtendedToolkit tk = getToolkit(); + AccessibilityTools at = new AccessibilityTools(); + Object atw = tk.getActiveTopWindow(); + + XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, atw); + + XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessibleContext buttonContext = at.getAccessibleObjectForRole( + xRoot, + AccessibleRole.PUSH_BUTTON, + createButton); + + XAccessibleAction buttonAction = UnoRuntime.queryInterface(XAccessibleAction.class, buttonContext); + + try { + System.out.println("Name: " + + buttonContext.getAccessibleName()); + buttonAction.doAccessibleAction(0); + } catch (com.sun.star.lang.IndexOutOfBoundsException e) { + System.out.println("Couldn't press button"); + } + + shortWait(); + } + + XDesktop xDesktop = getDesktop(); + + XTextDocument returnDoc = UnoRuntime.queryInterface(XTextDocument.class, xDesktop.getCurrentComponent()); + + if (destroyLocal) { + closeDoc(xLocalDoc); + xLocalDoc = null; + } + + return returnDoc; + } + public void closeFromDialog() + { + closeDoc(xLocalDoc); + xLocalDoc = null; + } + public void kill() + { + XDesktop xDesktop = getDesktop(); + xDesktop.terminate(); + } + + + public XTextDocument DocByAutopilot(XMultiServiceFactory msf, + int[] indexes, boolean destroyLocal, + String bName) { + XTextDocument xLocalDoc = WriterTools.createTextDoc(m_xMSF); + Object toolkit = null; + + try { + toolkit = msf.createInstance("com.sun.star.awt.Toolkit"); + } catch (com.sun.star.uno.Exception e) { + e.printStackTrace(); + } + + XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class, toolkit); + + shortWait(); + + AccessibilityTools at = new AccessibilityTools(); + + Object atw = tk.getActiveTopWindow(); + + XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, atw); + + XAccessible xRoot = at.getAccessibleObject(xWindow); + + XAccessibleContext ARoot = at.getAccessibleObjectForRole(xRoot, + AccessibleRole.MENU_BAR); + XAccessibleSelection sel = UnoRuntime.queryInterface(XAccessibleSelection.class, ARoot); + + for (int k = 0; k < indexes.length; k++) { + try { + sel.selectAccessibleChild(indexes[k]); + shortWait(); + ARoot = ARoot.getAccessibleChild(indexes[k]) + .getAccessibleContext(); + sel = UnoRuntime.queryInterface(XAccessibleSelection.class, ARoot); + } catch (com.sun.star.lang.IndexOutOfBoundsException e) { + } + } + + shortWait(); + + atw = tk.getActiveTopWindow(); + + xWindow = UnoRuntime.queryInterface(XWindow.class, atw); + + xRoot = at.getAccessibleObject(xWindow); + + //at.printAccessibleTree(new PrintWriter(System.out),xRoot); + + XAccessibleAction action = UnoRuntime.queryInterface(XAccessibleAction.class, at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, bName)); + + try { + action.doAccessibleAction(0); + } catch (com.sun.star.lang.IndexOutOfBoundsException e) { + } + + shortWait(); + + atw = tk.getActiveTopWindow(); + + xWindow = UnoRuntime.queryInterface(XWindow.class, atw); + + xRoot = at.getAccessibleObject(xWindow); + + at.printAccessibleTree(new PrintWriter(System.out),xRoot); + + action = UnoRuntime.queryInterface(XAccessibleAction.class, at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Yes")); + + try { + if (action != null) action.doAccessibleAction(0); + } catch (com.sun.star.lang.IndexOutOfBoundsException e) { + } + + shortWait(); + + XDesktop xDesktop = getDesktop(); + + XTextDocument returnDoc = UnoRuntime.queryInterface(XTextDocument.class, xDesktop.getCurrentComponent()); + + if (destroyLocal) { + closeDoc(xLocalDoc); + } + + return returnDoc; + } + + /** + * Sleeps for 2 sec. to allow StarOffice to react + */ + private void shortWait() { + try { + Thread.sleep(4000); + } catch (InterruptedException e) { + System.out.println("While waiting :" + e); + } + } + + /** creates an instance of com.sun.star.awt.Toolkit to query the XExtendedToolkit + * interface + * @return returns the gained XExtendedToolkit Interface + */ + public XExtendedToolkit getToolkit() { + Object toolkit = null; + + try { + toolkit = m_xMSF.createInstance("com.sun.star.awt.Toolkit"); + } catch (com.sun.star.uno.Exception e) { + System.out.println("Couldn't get toolkit"); + e.printStackTrace(); + } + + XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class, toolkit); + + return tk; + } + + /** creates an instance of com.sun.star.frame.Desktop to query the XDesktop interface + * @return returns the gained XDesktop interface + */ + protected XDesktop getDesktop() { + Object desk = null; + + try { + desk = m_xMSF.createInstance("com.sun.star.frame.Desktop"); + } catch (com.sun.star.uno.Exception e) { + System.out.println("Couldn't get desktop"); + e.printStackTrace(); + } + + XDesktop xDesktop = UnoRuntime.queryInterface(XDesktop.class, desk); + + return xDesktop; + } +} \ No newline at end of file diff --git a/sfx2/qa/complex/framework/makefile.mk b/sfx2/qa/complex/framework/makefile.mk index 093bc828d4ef..325135b9133c 100644 --- a/sfx2/qa/complex/framework/makefile.mk +++ b/sfx2/qa/complex/framework/makefile.mk @@ -41,14 +41,14 @@ JAVATESTFILES = \ CheckGlobalEventBroadcaster_writer1.java JAVAFILES = $(JAVATESTFILES) \ - TestDocument.java + TestDocument.java \ + WriterHelper.java \ + DialogThread.java JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) -SUBDIRS = DocHelper - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y diff --git a/ucb/prj/build.lst b/ucb/prj/build.lst index fc66b41b74b2..8d8c87f3ae4b 100644 --- a/ucb/prj/build.lst +++ b/ucb/prj/build.lst @@ -19,5 +19,4 @@ uc ucb\qa\unoapi nmake - all uc_qa_unoapi NULL uc ucb\qa\complex\ucb nmake - all uc_complex_ucb uc_inc NULL # fails, please fix -# uc ucb\qa\complex\tdoc\interfaces nmake - all uc_complex_tdoc_interfaces uc_inc NULL # uc ucb\qa\complex\tdoc nmake - all uc_complex_tdoc uc_complex_tdoc_interfaces uc_inc NULL diff --git a/ucb/qa/complex/tdoc/CheckContentProvider.java b/ucb/qa/complex/tdoc/CheckContentProvider.java index d3dfd120611e..a039c0c14e87 100755 --- a/ucb/qa/complex/tdoc/CheckContentProvider.java +++ b/ucb/qa/complex/tdoc/CheckContentProvider.java @@ -42,16 +42,6 @@ import com.sun.star.ucb.XContentIdentifier; import com.sun.star.ucb.XContentIdentifierFactory; import com.sun.star.ucb.XContentProvider; import com.sun.star.uno.UnoRuntime; -import complex.tdoc.interfaces._XChild; -import complex.tdoc.interfaces._XCommandInfoChangeNotifier; -import complex.tdoc.interfaces._XComponent; -import complex.tdoc.interfaces._XServiceInfo; -import complex.tdoc.interfaces._XTypeProvider; -import complex.tdoc.interfaces._XCommandProcessor; -import complex.tdoc.interfaces._XContent; -import complex.tdoc.interfaces._XPropertiesChangeNotifier; -import complex.tdoc.interfaces._XPropertyContainer; -import complex.tdoc.interfaces._XPropertySetInfoChangeNotifier; import util.WriterTools; import org.junit.After; diff --git a/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java b/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java index 3320ef890841..ed121e92f9f1 100755 --- a/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java +++ b/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java @@ -51,6 +51,7 @@ import static org.junit.Assert.*; * */ public class CheckTransientDocumentsContent { + // TODO: document doesn't exists private final String testDocuments[] = new String[]{"sForm.sxw"};//, "chinese.sxw", "Iterator.sxw"}; private final int countDocs = testDocuments.length; private XMultiServiceFactory xMSF = null; diff --git a/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java b/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java index 9d3ea87b1d4a..d5aebc7fc3cd 100755 --- a/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java +++ b/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java @@ -56,7 +56,8 @@ import static org.junit.Assert.*; * */ public class CheckTransientDocumentsContentProvider { - private final String testDocuments[] = new String[]{"sForm.sxw", "chinese.sxw", "Iterator.sxw"}; + // TODO: document doesn't exists + private final String testDocuments[] = new String[]{/*"sForm.sxw",*/ "chinese.sxw", "Iterator.sxw"}; private final int countDocs = testDocuments.length; private XMultiServiceFactory xMSF = null; private XTextDocument[] xTextDoc = null; diff --git a/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java b/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java index ad0001161c49..30411458daee 100755 --- a/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java +++ b/ucb/qa/complex/tdoc/CheckTransientDocumentsDocumentContent.java @@ -59,6 +59,7 @@ import static org.junit.Assert.*; * */ public class CheckTransientDocumentsDocumentContent { + // TODO: document doesn't exists private final String testDocuments = "sForm.sxw"; private final String folderName = "TestFolder"; private XMultiServiceFactory xMSF = null; diff --git a/ucb/qa/complex/tdoc/_XChild.java b/ucb/qa/complex/tdoc/_XChild.java new file mode 100755 index 000000000000..4ed71e62008a --- /dev/null +++ b/ucb/qa/complex/tdoc/_XChild.java @@ -0,0 +1,104 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +package complex.tdoc; + +import lib.MultiMethodTest; +import lib.Status; + +import com.sun.star.container.XChild; +import com.sun.star.container.XNamed; +import com.sun.star.uno.UnoRuntime; +import share.LogWriter; + +/* +* Testing com.sun.star.container.XChild +* interface methods : +*

            +*
          • getParent()
            • +*
          • setParent()
            • +*
          +* @see com.sun.star.container.XChild +*/ +public class _XChild { + + public XChild oObj = null; + public Object gotten = null; + public LogWriter log = null; + + + /** + * Test calls the method and checks return value and that + * no exceptions were thrown. Parent returned is stored.

          + * Has OK status if the method returns not null value + * and no exceptions were thrown.

          + */ + public boolean _getParent(boolean hasParent) { + gotten = oObj.getParent(); + if (!hasParent) + return gotten == null; + XNamed the_name = (XNamed) UnoRuntime.queryInterface(XNamed.class,gotten); + if (the_name != null) + log.println("Parent:"+the_name.getName()); + return gotten != null; + } + + /** + * Sets existing parent and checks that + * no exceptions were thrown.

          + * Has OK status if no exceptions were thrown.

          + * The following method tests are to be completed successfully before : + *

            + *
          • getParent() : to get the parent.
            • + *
          + */ + public boolean _setParent(boolean supported) { +// requiredMethod("getParent()") ; + + String parentComment = null;//String) tEnv.getObjRelation("cannotSwitchParent"); + + if (parentComment != null) { + log.println(parentComment); + return true; + } + + try { + oObj.setParent(gotten); + } + catch (com.sun.star.lang.NoSupportException ex) { + log.println("Exception occured during setParent() - " + (supported?"FAILED":"OK")); + if (supported) { + ex.printStackTrace((java.io.PrintWriter)log); + return false; + } + } + return true; + } + +} // finish class _XChild + + diff --git a/ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java b/ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java new file mode 100755 index 000000000000..ab32873e9ffb --- /dev/null +++ b/ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java @@ -0,0 +1,64 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.tdoc; + +import com.sun.star.ucb.XCommandInfoChangeListener; +import com.sun.star.ucb.XCommandInfoChangeNotifier; +import share.LogWriter; + +/** + * + */ +public class _XCommandInfoChangeNotifier { + public XCommandInfoChangeNotifier oObj = null; + public LogWriter log = null; + private CommandInfoChangeListener listener = new CommandInfoChangeListener(); + + public boolean _addCommandInfoChangeListener() { + oObj.addCommandInfoChangeListener(listener); + return true; + } + + public boolean _removeCommandInfoChangeListener() { + oObj.removeCommandInfoChangeListener(listener); + return true; + } + + private class CommandInfoChangeListener implements XCommandInfoChangeListener { + boolean disposing = false; + boolean infoChanged = false; + + public void commandInfoChange(com.sun.star.ucb.CommandInfoChangeEvent commandInfoChangeEvent) { + infoChanged = true; + } + + public void disposing(com.sun.star.lang.EventObject eventObject) { + disposing = true; + } + + } +} diff --git a/ucb/qa/complex/tdoc/_XCommandProcessor.java b/ucb/qa/complex/tdoc/_XCommandProcessor.java new file mode 100755 index 000000000000..92411d05456f --- /dev/null +++ b/ucb/qa/complex/tdoc/_XCommandProcessor.java @@ -0,0 +1,286 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +package complex.tdoc; + +import com.sun.star.beans.Property; +import com.sun.star.beans.XPropertySetInfo; +import lib.MultiMethodTest; +import lib.StatusException; + +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.ucb.Command; +import com.sun.star.ucb.CommandAbortedException; +import com.sun.star.ucb.CommandInfo; +import com.sun.star.ucb.GlobalTransferCommandArgument; +import com.sun.star.ucb.NameClash; +import com.sun.star.ucb.TransferCommandOperation; +import com.sun.star.ucb.UnsupportedCommandException; +import com.sun.star.ucb.XCommandInfo; +import com.sun.star.ucb.XCommandProcessor; +import com.sun.star.uno.Exception; +import com.sun.star.uno.UnoRuntime; +import share.LogWriter; + +/** +* Tests XCommandProcessor. The TestCase can pass (but doesn't have +* to) "XCommandProcessor.AbortCommand" relation, to specify command to abort in +* abort() test. +* +* Testing com.sun.star.ucb.XCommandProcessor +* interface methods : +*
            +*
          • createCommandIdentifier()
            • +*
          • execute()
            • +*
          • abort()
            • +*

          +* This test needs the following object relations : +*

            +*
          • 'XCommandProcessor.AbortCommand' optional +* (of type com.sun.star.ucb.Command): +* specify command to abort in abort() test. +* If the relation is not specified the 'GlobalTransfer' +* command is used.
            • +*

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

                +*
              • poliball.gif : this file is required in case +* if the relation 'XCommandProcessor.AbortCommand' +* is not specified. This file is used by 'GlobalTransfer' +* command as a source file for copying.
                • +*

                  +* Test is NOT multithread compilant.

                  +* @see com.sun.star.ucb.XCommandProcessor +*/ +public class _XCommandProcessor { + + /** + * Conatins the tested object. + */ + public XCommandProcessor oObj; + public LogWriter log = null; + private XMultiServiceFactory xMSF = null; + + /** + * Contains the command id returned by createCommandIdentifier() + * . It is used in abort() test. + */ + int cmdId; + + public void before(XMultiServiceFactory _xMSF) { + xMSF = _xMSF; + } + + /** + * Tests createCommandIdentifier(). Calls it for two times + * and checks returned values.

                  + * Has OK status if values are unique correct idenifiers: not 0. + */ + public boolean _createCommandIdentifier() { + log.println("creating a command line identifier"); + + int testCmdId = oObj.createCommandIdentifier(); + cmdId = oObj.createCommandIdentifier(); + + if (cmdId == 0 || testCmdId == 0) { + log.println("createCommandLineIdentifier() returned 0 - FAILED"); + } + + if (cmdId == testCmdId) { + log.println("the command identifier is not unique"); + } + + return testCmdId != 0 && cmdId != 0 && cmdId != testCmdId; + } + + /** + * First executes 'geCommandInfo' command and examines returned + * command info information. Second tries to execute inproper + * command.

                  + * Has OK status if in the first case returned information + * contains info about 'getCommandInfo' command and in the second + * case an exception is thrown.

                  + */ + public boolean _execute() { + String[]commands = new String[] {"getCommandInfo", "getPropertySetInfo"}; + boolean returnVal = true; + for (int j=0; jabort method + * is called permanently. Then a "long" command (for example, + * "transfer") is started. I case if relation is not + * specified 'GlobalTransfer' command starts to + * copy a file to temporary directory (if the relation is present + * then the its command starts to work).

                  + * Has OK status if the command execution is aborted, i.e. + * CommandAbortedException is thrown.

                  + * The following method tests are to be completed successfully before : + *

                    + *
                  • createCommandIdentifier() : to have a unique + * identifier which is used to abourt started command.
                    • + *
                  + */ + public boolean _abort() { + //executeMethod("createCommandIdentifier()"); + +// Command command = null;//(Command)tEnv.getObjRelation( + //"XCommandProcessor.AbortCommand"); + Command command = new Command("getCommandInfo", -1, null); + + if (command == null) { + String commandName = "globalTransfer"; + + String srcURL = util.utils.getFullTestURL("solibrary.jar") ; + String tmpURL = util.utils.getOfficeTemp(xMSF) ; + log.println("Copying '" + srcURL + "' to '" + tmpURL) ; + + GlobalTransferCommandArgument arg = new + GlobalTransferCommandArgument( + TransferCommandOperation.COPY, srcURL, + tmpURL, "", NameClash.OVERWRITE); + + command = new Command(commandName, -1, arg); + } + + Thread aborter = new Thread() { + public void run() { + for (int i = 0; i < 10; i++) { + log.println("try to abort command"); + oObj.abort(cmdId); + try { + Thread.sleep(10); + } catch (InterruptedException e) { + } + } + } + }; + + aborter.start(); + + try { + Thread.sleep(15); + } catch (InterruptedException e) { + } + + log.println("executing command"); + try { + oObj.execute(command, cmdId, null); + log.println("Command execution completed"); + log.println("CommandAbortedException is not thrown"); + log.println("This is OK since there is no command implemented "+ + "that can be aborted"); + } catch (CommandAbortedException e) { + return true; + } catch (Exception e) { + log.println("Unexpected exception " + e.getMessage()); + e.printStackTrace((java.io.PrintWriter)log); + return false; + } + + try { + aborter.join(5000); + aborter.interrupt(); + } catch(java.lang.InterruptedException e) { + } + return true; + } +} diff --git a/ucb/qa/complex/tdoc/_XComponent.java b/ucb/qa/complex/tdoc/_XComponent.java new file mode 100755 index 000000000000..16d5c9bebeea --- /dev/null +++ b/ucb/qa/complex/tdoc/_XComponent.java @@ -0,0 +1,171 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +package complex.tdoc; + +import com.sun.star.container.XNameContainer; +import lib.MultiMethodTest; + +import com.sun.star.frame.XDesktop; +import com.sun.star.lang.EventObject; +import com.sun.star.lang.XComponent; +import com.sun.star.lang.XEventListener; +import share.LogWriter; + +/** +* Testing com.sun.star.lang.XComponent +* interface methods : +*
                    +*
                  • dispose()
                    • +*
                  • addEventListener()
                    • +*
                  • removeEventListener()
                    • +*
                  +* After this interface test object must be recreated.

                  +* Multithreaded test ability not implemented yet. +* @see com.sun.star.lang.XComponent +*/ +public class _XComponent { + + public static XComponent oObj = null; + private XNameContainer xContainer = null; + private XComponent altDispose = null; + public LogWriter log = null; + + boolean listenerDisposed[] = new boolean[2]; + String[] Loutput = new String[2]; + + /** + * Listener which added but not removed, and its method must be called + * on dispose call. + */ + public class MyEventListener implements XEventListener { + public void disposing ( EventObject oEvent ) { + Loutput[0] = Thread.currentThread() + " is DISPOSING EV1" + this; + listenerDisposed[0] = true; + } + }; + + /** + * Listener which added and then removed, and its method must not + * be called on dispose call. + */ + public class MyEventListener2 implements XEventListener { + public void disposing ( EventObject oEvent ) { + Loutput[0] = Thread.currentThread() + " is DISPOSING EV2" + this; + listenerDisposed[1] = true; + } + }; + + XEventListener listener1 = new MyEventListener(); + XEventListener listener2 = new MyEventListener2(); + + /** + * For the cfgmgr2.OSetElement tests: dispose the owner element. + */ + protected void before() { + // do not dispose this component, but parent instead +// altDispose = (XComponent)tEnv.getObjRelation("XComponent.DisposeThis"); + + } + + /** + * Adds two listeners.

                  + * Has OK status if then the first listener will receive an event + * on dispose method call. + */ + public boolean _addEventListener() { + + listenerDisposed[0] = false; + listenerDisposed[1] = false; + + oObj.addEventListener( listener1 ); + oObj.addEventListener( listener2 ); + + return true; + } // finished _addEventListener() + + /** + * Removes the second of two added listeners.

                  + * Method tests to be completed successfully : + *

                    + *
                  • addEventListener : method must add two listeners.
                    • + *

                  + * Has OK status if no events will be sent to the second listener on + * dispose method call. + */ + public boolean _removeEventListener() { +// executeMethod("addEventListener()"); + if (disposed) return true; + // the second listener should not be called + oObj.removeEventListener( listener2 ); + log.println(Thread.currentThread() + " is removing EL " + listener2); + return true; + } // finished _removeEventListener() + + static boolean disposed = false; + + /** + * Disposes the object and then check appropriate listeners were + * called or not.

                  + * Method tests to be completed successfully : + *

                    + *
                  • removeEventListener : method must remove one of two + * listeners.
                    • + *

                  + * Has OK status if liseter removed wasn't called and other listener + * was. + */ + public boolean _dispose() { + disposed = false; +// executeMethod("removeEventListener()"); + + log.println( "begin dispose" + Thread.currentThread()); + oObj.dispose(); + + try { + Thread.sleep(500) ; + } catch (InterruptedException e) {} + if (Loutput[0]!=null) log.println(Loutput[0]); + if (Loutput[1]!=null) log.println(Loutput[1]); + log.println( "end dispose" + Thread.currentThread()); + disposed = true; + + // check that dispose() works OK. + return listenerDisposed[0] && !listenerDisposed[1]; + + } // finished _dispose() + + /** + * Forces object recreation. + */ + protected void after() { +// disposeEnvironment(); + } + +} // finished class _XComponent + + diff --git a/ucb/qa/complex/tdoc/_XContent.java b/ucb/qa/complex/tdoc/_XContent.java new file mode 100755 index 000000000000..820d2cef0fc7 --- /dev/null +++ b/ucb/qa/complex/tdoc/_XContent.java @@ -0,0 +1,86 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.tdoc; + +import com.sun.star.ucb.XContent; +import com.sun.star.ucb.XContentEventListener; +import com.sun.star.ucb.XContentIdentifier; +import share.LogWriter; + +/** + * + * @author sg128468 + */ +public class _XContent { + public XContent oObj = null; + public LogWriter log = null; + private ContentListener listener = null; + + public boolean _addContentEventListener() { + listener = new ContentListener(); + oObj.addContentEventListener(listener); + return true; + } + public boolean _getContentType() { + String type = oObj.getContentType(); + log.println("Type: " + type); + return type != null && type.indexOf("vnd.sun.star.tdoc") != -1; + } + public boolean _getIdentifier() { + XContentIdentifier xIdent = oObj.getIdentifier(); + String id = xIdent.getContentIdentifier(); + String scheme = xIdent.getContentProviderScheme(); + log.println("Id: " + id); + log.println("Scheme: " + scheme); + return id != null && scheme != null && id.indexOf("vnd.sun.star.tdoc") != -1 && scheme.indexOf("vnd.sun.star.tdoc") != -1; + } + public boolean _removeContentEventListener() { + System.out.println("Event: " + (listener.disposed || listener.firedEvent)); + oObj.removeContentEventListener(listener); + return true; + } + + + private class ContentListener implements XContentEventListener { + private boolean disposed = false; + private boolean firedEvent = false; + + public void reset() { + disposed = false; + firedEvent = false; + } + + public void contentEvent(com.sun.star.ucb.ContentEvent contentEvent) { + firedEvent = true; + } + + public void disposing(com.sun.star.lang.EventObject eventObject) { + disposed = true; + } + + } +} diff --git a/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java b/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java new file mode 100755 index 000000000000..88e080cd9ec2 --- /dev/null +++ b/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java @@ -0,0 +1,67 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.tdoc; + +import com.sun.star.beans.XPropertiesChangeListener; +import com.sun.star.beans.XPropertiesChangeNotifier; +import share.LogWriter; + +/** + * Check the XPropertiesChangeNotifier + */ +public class _XPropertiesChangeNotifier { + public XPropertiesChangeNotifier oObj = null; + public LogWriter log = null; + + PropertiesChangeListener listener = new PropertiesChangeListener(); + String[] args = null; + + + public boolean _addPropertiesChangeListener() { + oObj.addPropertiesChangeListener(args, listener); + return true; + } + + public boolean _removePropertiesChangeListener() { + oObj.removePropertiesChangeListener(args, listener); + return true; + } + + private class PropertiesChangeListener implements XPropertiesChangeListener { + public boolean disposed = false; + public boolean propChanged = false; + + public void disposing(com.sun.star.lang.EventObject eventObject) { + disposed = true; + } + + public void propertiesChange(com.sun.star.beans.PropertyChangeEvent[] propertyChangeEvent) { + propChanged = true; + } + + } +} diff --git a/ucb/qa/complex/tdoc/_XPropertyContainer.java b/ucb/qa/complex/tdoc/_XPropertyContainer.java new file mode 100755 index 000000000000..e425a703d403 --- /dev/null +++ b/ucb/qa/complex/tdoc/_XPropertyContainer.java @@ -0,0 +1,102 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.tdoc; + +import com.sun.star.beans.XPropertyContainer; +import share.LogWriter; + +/** + * + * @author sg128468 + */ +public class _XPropertyContainer { + public XPropertyContainer oObj = null; + public LogWriter log = null; + + public boolean _addProperty() { + boolean result = true; + // add illegal property + try { + oObj.addProperty("MyIllegalProperty", (short)0, null); + } + catch(com.sun.star.beans.PropertyExistException e) { + e.printStackTrace((java.io.PrintWriter)log); + result = false; + } + catch(com.sun.star.lang.IllegalArgumentException e) { + e.printStackTrace((java.io.PrintWriter)log); + log.println("'IllegalArgument' Unexpected but correct."); + } + catch(com.sun.star.beans.IllegalTypeException e) { + log.println("'IllegalType' Correctly thrown"); + } + // add valid property + try { + oObj.addProperty("MyLegalProperty", (short)0, "Just a value"); + } + catch(com.sun.star.beans.PropertyExistException e) { + e.printStackTrace((java.io.PrintWriter)log); + result = false; + } + catch(com.sun.star.lang.IllegalArgumentException e) { + e.printStackTrace((java.io.PrintWriter)log); + result = false; + } + catch(com.sun.star.beans.IllegalTypeException e) { + e.printStackTrace((java.io.PrintWriter)log); + result = false; + } + return result; + } + + public boolean _removeProperty() { + boolean result = true; + try { + oObj.removeProperty("MyIllegalProperty"); + } + catch(com.sun.star.beans.UnknownPropertyException e) { + log.println("'UnknownProperty' Correctly thrown"); + } + catch(com.sun.star.beans.NotRemoveableException e) { + e.printStackTrace((java.io.PrintWriter)log); + result = false; + } + try { + oObj.removeProperty("MyLegalProperty"); + } + catch(com.sun.star.beans.UnknownPropertyException e) { + e.printStackTrace((java.io.PrintWriter)log); + result = false; + } + catch(com.sun.star.beans.NotRemoveableException e) { + e.printStackTrace((java.io.PrintWriter)log); + result = false; + } + return result; + } + +} diff --git a/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java b/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java new file mode 100755 index 000000000000..4671a0d21571 --- /dev/null +++ b/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java @@ -0,0 +1,67 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.tdoc; + +import com.sun.star.beans.XPropertySetInfoChangeListener; +import com.sun.star.beans.XPropertySetInfoChangeNotifier; +import share.LogWriter; + +/** + * + */ +public class _XPropertySetInfoChangeNotifier { + public XPropertySetInfoChangeNotifier oObj = null; + public LogWriter log = null; + + PropertySetInfoChangeListener listener = new PropertySetInfoChangeListener(); + String[] args = null; + + + public boolean _addPropertiesChangeListener() { + oObj.addPropertySetInfoChangeListener(listener); + return true; + } + + public boolean _removePropertiesChangeListener() { + oObj.removePropertySetInfoChangeListener(listener); + return true; + } + + private class PropertySetInfoChangeListener implements XPropertySetInfoChangeListener { + public boolean disposed = false; + public boolean propChanged = false; + + public void disposing(com.sun.star.lang.EventObject eventObject) { + disposed = true; + } + + public void propertySetInfoChange(com.sun.star.beans.PropertySetInfoChangeEvent propertySetInfoChangeEvent) { + } + + } + +} diff --git a/ucb/qa/complex/tdoc/_XServiceInfo.java b/ucb/qa/complex/tdoc/_XServiceInfo.java new file mode 100755 index 000000000000..9c2089f212f9 --- /dev/null +++ b/ucb/qa/complex/tdoc/_XServiceInfo.java @@ -0,0 +1,99 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +package complex.tdoc; + +import lib.MultiMethodTest; + +import com.sun.star.lang.XServiceInfo; +import share.LogWriter; + +/** +* Testing com.sun.star.lang.XServiceInfo +* interface methods : +*

                    +*
                  • getImplementationName()
                    • +*
                  • supportsService()
                    • +*
                  • getSupportedServiceNames()
                    • +*

                  +* Test is multithread compilant.

                  +* @see com.sun.star.lang.XServiceInfo +*/ +public class _XServiceInfo { + public static XServiceInfo oObj = null; + public static String[] names = null; + public LogWriter log = null; + + /** + * Just calls the method.

                  + * Has OK status if no runtime exceptions occured. + */ + public boolean _getImplementationName() { + boolean result = true; + log.println("testing getImplementationName() ... "); + + log.println("The ImplementationName ist "+oObj.getImplementationName()); + result=true; + + return result; + + } // end getImplementationName() + + + /** + * Just calls the method.

                  + * Has OK status if no runtime exceptions occured. + */ + public boolean _getSupportedServiceNames() { + boolean result = true; + log.println("getting supported Services..."); + names = oObj.getSupportedServiceNames(); + for (int i=0;igetSupportedServiceNames method and + * calls the supportsService methos with this + * name.

                  + * Has OK status if true value is + * returned. + */ + public boolean _supportsService() { + log.println("testing supportsService"); + names = oObj.getSupportedServiceNames(); + return oObj.supportsService(names[0]); + } // end supportsService() +} + diff --git a/ucb/qa/complex/tdoc/_XTypeProvider.java b/ucb/qa/complex/tdoc/_XTypeProvider.java new file mode 100755 index 000000000000..f8247e7016fe --- /dev/null +++ b/ucb/qa/complex/tdoc/_XTypeProvider.java @@ -0,0 +1,95 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +package complex.tdoc; + +import lib.MultiMethodTest; + +import com.sun.star.lang.XTypeProvider; +import com.sun.star.uno.Type; +import share.LogWriter; + +/** +* Testing com.sun.star.lang.XTypeProvider +* interface methods : +*

                    +*
                  • getTypes()
                    • +*
                  • getImplementationId()
                    • +*

                  +* Test is NOT multithread compilant.

                  +* @see com.sun.star.lang.XTypeProvider +*/ +public class _XTypeProvider { + + public static XTypeProvider oObj = null; + public static Type[] types = null; + public LogWriter log = null; + + /** + * Just calls the method.

                  + * Has OK status if no runtime exceptions occured. + */ + public boolean _getImplementationId() { + boolean result = true; + log.println("testing getImplementationId() ... "); + + log.println("The ImplementationId is "+oObj.getImplementationId()); + result = true; + + return result; + + } // end getImplementationId() + + + /** + * ?alls the method and checks the return value.

                  + * Has OK status if one of the return value equals to the + * type com.sun.star.lang.XTypeProvider. + */ + public boolean _getTypes() { + boolean result = false; + log.println("getting Types..."); + types = oObj.getTypes(); + for (int i=0;i"); + } + + return result; + + } // end getTypes() + +} + diff --git a/ucb/qa/complex/tdoc/interfaces/_XChild.java b/ucb/qa/complex/tdoc/interfaces/_XChild.java deleted file mode 100755 index 351fc6f84aa1..000000000000 --- a/ucb/qa/complex/tdoc/interfaces/_XChild.java +++ /dev/null @@ -1,104 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -package complex.tdoc.interfaces; - -import lib.MultiMethodTest; -import lib.Status; - -import com.sun.star.container.XChild; -import com.sun.star.container.XNamed; -import com.sun.star.uno.UnoRuntime; -import share.LogWriter; - -/* -* Testing com.sun.star.container.XChild -* interface methods : -*

                    -*
                  • getParent()
                    • -*
                  • setParent()
                    • -*
                  -* @see com.sun.star.container.XChild -*/ -public class _XChild { - - public XChild oObj = null; - public Object gotten = null; - public LogWriter log = null; - - - /** - * Test calls the method and checks return value and that - * no exceptions were thrown. Parent returned is stored.

                  - * Has OK status if the method returns not null value - * and no exceptions were thrown.

                  - */ - public boolean _getParent(boolean hasParent) { - gotten = oObj.getParent(); - if (!hasParent) - return gotten == null; - XNamed the_name = (XNamed) UnoRuntime.queryInterface(XNamed.class,gotten); - if (the_name != null) - log.println("Parent:"+the_name.getName()); - return gotten != null; - } - - /** - * Sets existing parent and checks that - * no exceptions were thrown.

                  - * Has OK status if no exceptions were thrown.

                  - * The following method tests are to be completed successfully before : - *

                    - *
                  • getParent() : to get the parent.
                    • - *
                  - */ - public boolean _setParent(boolean supported) { -// requiredMethod("getParent()") ; - - String parentComment = null;//String) tEnv.getObjRelation("cannotSwitchParent"); - - if (parentComment != null) { - log.println(parentComment); - return true; - } - - try { - oObj.setParent(gotten); - } - catch (com.sun.star.lang.NoSupportException ex) { - log.println("Exception occured during setParent() - " + (supported?"FAILED":"OK")); - if (supported) { - ex.printStackTrace((java.io.PrintWriter)log); - return false; - } - } - return true; - } - -} // finish class _XChild - - diff --git a/ucb/qa/complex/tdoc/interfaces/_XCommandInfoChangeNotifier.java b/ucb/qa/complex/tdoc/interfaces/_XCommandInfoChangeNotifier.java deleted file mode 100755 index 9800c5c0a398..000000000000 --- a/ucb/qa/complex/tdoc/interfaces/_XCommandInfoChangeNotifier.java +++ /dev/null @@ -1,64 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.tdoc.interfaces; - -import com.sun.star.ucb.XCommandInfoChangeListener; -import com.sun.star.ucb.XCommandInfoChangeNotifier; -import share.LogWriter; - -/** - * - */ -public class _XCommandInfoChangeNotifier { - public XCommandInfoChangeNotifier oObj = null; - public LogWriter log = null; - private CommandInfoChangeListener listener = new CommandInfoChangeListener(); - - public boolean _addCommandInfoChangeListener() { - oObj.addCommandInfoChangeListener(listener); - return true; - } - - public boolean _removeCommandInfoChangeListener() { - oObj.removeCommandInfoChangeListener(listener); - return true; - } - - private class CommandInfoChangeListener implements XCommandInfoChangeListener { - boolean disposing = false; - boolean infoChanged = false; - - public void commandInfoChange(com.sun.star.ucb.CommandInfoChangeEvent commandInfoChangeEvent) { - infoChanged = true; - } - - public void disposing(com.sun.star.lang.EventObject eventObject) { - disposing = true; - } - - } -} diff --git a/ucb/qa/complex/tdoc/interfaces/_XCommandProcessor.java b/ucb/qa/complex/tdoc/interfaces/_XCommandProcessor.java deleted file mode 100755 index 2fc31a4bd586..000000000000 --- a/ucb/qa/complex/tdoc/interfaces/_XCommandProcessor.java +++ /dev/null @@ -1,286 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -package complex.tdoc.interfaces; - -import com.sun.star.beans.Property; -import com.sun.star.beans.XPropertySetInfo; -import lib.MultiMethodTest; -import lib.StatusException; - -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.ucb.Command; -import com.sun.star.ucb.CommandAbortedException; -import com.sun.star.ucb.CommandInfo; -import com.sun.star.ucb.GlobalTransferCommandArgument; -import com.sun.star.ucb.NameClash; -import com.sun.star.ucb.TransferCommandOperation; -import com.sun.star.ucb.UnsupportedCommandException; -import com.sun.star.ucb.XCommandInfo; -import com.sun.star.ucb.XCommandProcessor; -import com.sun.star.uno.Exception; -import com.sun.star.uno.UnoRuntime; -import share.LogWriter; - -/** -* Tests XCommandProcessor. The TestCase can pass (but doesn't have -* to) "XCommandProcessor.AbortCommand" relation, to specify command to abort in -* abort() test. -* -* Testing com.sun.star.ucb.XCommandProcessor -* interface methods : -*
                    -*
                  • createCommandIdentifier()
                    • -*
                  • execute()
                    • -*
                  • abort()
                    • -*

                  -* This test needs the following object relations : -*

                    -*
                  • 'XCommandProcessor.AbortCommand' optional -* (of type com.sun.star.ucb.Command): -* specify command to abort in abort() test. -* If the relation is not specified the 'GlobalTransfer' -* command is used.
                    • -*

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

                        -*
                      • poliball.gif : this file is required in case -* if the relation 'XCommandProcessor.AbortCommand' -* is not specified. This file is used by 'GlobalTransfer' -* command as a source file for copying.
                        • -*

                          -* Test is NOT multithread compilant.

                          -* @see com.sun.star.ucb.XCommandProcessor -*/ -public class _XCommandProcessor { - - /** - * Conatins the tested object. - */ - public XCommandProcessor oObj; - public LogWriter log = null; - private XMultiServiceFactory xMSF = null; - - /** - * Contains the command id returned by createCommandIdentifier() - * . It is used in abort() test. - */ - int cmdId; - - public void before(XMultiServiceFactory _xMSF) { - xMSF = _xMSF; - } - - /** - * Tests createCommandIdentifier(). Calls it for two times - * and checks returned values.

                          - * Has OK status if values are unique correct idenifiers: not 0. - */ - public boolean _createCommandIdentifier() { - log.println("creating a command line identifier"); - - int testCmdId = oObj.createCommandIdentifier(); - cmdId = oObj.createCommandIdentifier(); - - if (cmdId == 0 || testCmdId == 0) { - log.println("createCommandLineIdentifier() returned 0 - FAILED"); - } - - if (cmdId == testCmdId) { - log.println("the command identifier is not unique"); - } - - return testCmdId != 0 && cmdId != 0 && cmdId != testCmdId; - } - - /** - * First executes 'geCommandInfo' command and examines returned - * command info information. Second tries to execute inproper - * command.

                          - * Has OK status if in the first case returned information - * contains info about 'getCommandInfo' command and in the second - * case an exception is thrown.

                          - */ - public boolean _execute() { - String[]commands = new String[] {"getCommandInfo", "getPropertySetInfo"}; - boolean returnVal = true; - for (int j=0; jabort method - * is called permanently. Then a "long" command (for example, - * "transfer") is started. I case if relation is not - * specified 'GlobalTransfer' command starts to - * copy a file to temporary directory (if the relation is present - * then the its command starts to work).

                          - * Has OK status if the command execution is aborted, i.e. - * CommandAbortedException is thrown.

                          - * The following method tests are to be completed successfully before : - *

                            - *
                          • createCommandIdentifier() : to have a unique - * identifier which is used to abourt started command.
                            • - *
                          - */ - public boolean _abort() { - //executeMethod("createCommandIdentifier()"); - -// Command command = null;//(Command)tEnv.getObjRelation( - //"XCommandProcessor.AbortCommand"); - Command command = new Command("getCommandInfo", -1, null); - - if (command == null) { - String commandName = "globalTransfer"; - - String srcURL = util.utils.getFullTestURL("solibrary.jar") ; - String tmpURL = util.utils.getOfficeTemp(xMSF) ; - log.println("Copying '" + srcURL + "' to '" + tmpURL) ; - - GlobalTransferCommandArgument arg = new - GlobalTransferCommandArgument( - TransferCommandOperation.COPY, srcURL, - tmpURL, "", NameClash.OVERWRITE); - - command = new Command(commandName, -1, arg); - } - - Thread aborter = new Thread() { - public void run() { - for (int i = 0; i < 10; i++) { - log.println("try to abort command"); - oObj.abort(cmdId); - try { - Thread.sleep(10); - } catch (InterruptedException e) { - } - } - } - }; - - aborter.start(); - - try { - Thread.sleep(15); - } catch (InterruptedException e) { - } - - log.println("executing command"); - try { - oObj.execute(command, cmdId, null); - log.println("Command execution completed"); - log.println("CommandAbortedException is not thrown"); - log.println("This is OK since there is no command implemented "+ - "that can be aborted"); - } catch (CommandAbortedException e) { - return true; - } catch (Exception e) { - log.println("Unexpected exception " + e.getMessage()); - e.printStackTrace((java.io.PrintWriter)log); - return false; - } - - try { - aborter.join(5000); - aborter.interrupt(); - } catch(java.lang.InterruptedException e) { - } - return true; - } -} diff --git a/ucb/qa/complex/tdoc/interfaces/_XComponent.java b/ucb/qa/complex/tdoc/interfaces/_XComponent.java deleted file mode 100755 index 1716e51d1358..000000000000 --- a/ucb/qa/complex/tdoc/interfaces/_XComponent.java +++ /dev/null @@ -1,171 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -package complex.tdoc.interfaces; - -import com.sun.star.container.XNameContainer; -import lib.MultiMethodTest; - -import com.sun.star.frame.XDesktop; -import com.sun.star.lang.EventObject; -import com.sun.star.lang.XComponent; -import com.sun.star.lang.XEventListener; -import share.LogWriter; - -/** -* Testing com.sun.star.lang.XComponent -* interface methods : -*
                            -*
                          • dispose()
                            • -*
                          • addEventListener()
                            • -*
                          • removeEventListener()
                            • -*
                          -* After this interface test object must be recreated.

                          -* Multithreaded test ability not implemented yet. -* @see com.sun.star.lang.XComponent -*/ -public class _XComponent { - - public static XComponent oObj = null; - private XNameContainer xContainer = null; - private XComponent altDispose = null; - public LogWriter log = null; - - boolean listenerDisposed[] = new boolean[2]; - String[] Loutput = new String[2]; - - /** - * Listener which added but not removed, and its method must be called - * on dispose call. - */ - public class MyEventListener implements XEventListener { - public void disposing ( EventObject oEvent ) { - Loutput[0] = Thread.currentThread() + " is DISPOSING EV1" + this; - listenerDisposed[0] = true; - } - }; - - /** - * Listener which added and then removed, and its method must not - * be called on dispose call. - */ - public class MyEventListener2 implements XEventListener { - public void disposing ( EventObject oEvent ) { - Loutput[0] = Thread.currentThread() + " is DISPOSING EV2" + this; - listenerDisposed[1] = true; - } - }; - - XEventListener listener1 = new MyEventListener(); - XEventListener listener2 = new MyEventListener2(); - - /** - * For the cfgmgr2.OSetElement tests: dispose the owner element. - */ - protected void before() { - // do not dispose this component, but parent instead -// altDispose = (XComponent)tEnv.getObjRelation("XComponent.DisposeThis"); - - } - - /** - * Adds two listeners.

                          - * Has OK status if then the first listener will receive an event - * on dispose method call. - */ - public boolean _addEventListener() { - - listenerDisposed[0] = false; - listenerDisposed[1] = false; - - oObj.addEventListener( listener1 ); - oObj.addEventListener( listener2 ); - - return true; - } // finished _addEventListener() - - /** - * Removes the second of two added listeners.

                          - * Method tests to be completed successfully : - *

                            - *
                          • addEventListener : method must add two listeners.
                            • - *

                          - * Has OK status if no events will be sent to the second listener on - * dispose method call. - */ - public boolean _removeEventListener() { -// executeMethod("addEventListener()"); - if (disposed) return true; - // the second listener should not be called - oObj.removeEventListener( listener2 ); - log.println(Thread.currentThread() + " is removing EL " + listener2); - return true; - } // finished _removeEventListener() - - static boolean disposed = false; - - /** - * Disposes the object and then check appropriate listeners were - * called or not.

                          - * Method tests to be completed successfully : - *

                            - *
                          • removeEventListener : method must remove one of two - * listeners.
                            • - *

                          - * Has OK status if liseter removed wasn't called and other listener - * was. - */ - public boolean _dispose() { - disposed = false; -// executeMethod("removeEventListener()"); - - log.println( "begin dispose" + Thread.currentThread()); - oObj.dispose(); - - try { - Thread.sleep(500) ; - } catch (InterruptedException e) {} - if (Loutput[0]!=null) log.println(Loutput[0]); - if (Loutput[1]!=null) log.println(Loutput[1]); - log.println( "end dispose" + Thread.currentThread()); - disposed = true; - - // check that dispose() works OK. - return listenerDisposed[0] && !listenerDisposed[1]; - - } // finished _dispose() - - /** - * Forces object recreation. - */ - protected void after() { -// disposeEnvironment(); - } - -} // finished class _XComponent - - diff --git a/ucb/qa/complex/tdoc/interfaces/_XContent.java b/ucb/qa/complex/tdoc/interfaces/_XContent.java deleted file mode 100755 index 4c84ecc1d8df..000000000000 --- a/ucb/qa/complex/tdoc/interfaces/_XContent.java +++ /dev/null @@ -1,86 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.tdoc.interfaces; - -import com.sun.star.ucb.XContent; -import com.sun.star.ucb.XContentEventListener; -import com.sun.star.ucb.XContentIdentifier; -import share.LogWriter; - -/** - * - * @author sg128468 - */ -public class _XContent { - public XContent oObj = null; - public LogWriter log = null; - private ContentListener listener = null; - - public boolean _addContentEventListener() { - listener = new ContentListener(); - oObj.addContentEventListener(listener); - return true; - } - public boolean _getContentType() { - String type = oObj.getContentType(); - log.println("Type: " + type); - return type != null && type.indexOf("vnd.sun.star.tdoc") != -1; - } - public boolean _getIdentifier() { - XContentIdentifier xIdent = oObj.getIdentifier(); - String id = xIdent.getContentIdentifier(); - String scheme = xIdent.getContentProviderScheme(); - log.println("Id: " + id); - log.println("Scheme: " + scheme); - return id != null && scheme != null && id.indexOf("vnd.sun.star.tdoc") != -1 && scheme.indexOf("vnd.sun.star.tdoc") != -1; - } - public boolean _removeContentEventListener() { - System.out.println("Event: " + (listener.disposed || listener.firedEvent)); - oObj.removeContentEventListener(listener); - return true; - } - - - private class ContentListener implements XContentEventListener { - private boolean disposed = false; - private boolean firedEvent = false; - - public void reset() { - disposed = false; - firedEvent = false; - } - - public void contentEvent(com.sun.star.ucb.ContentEvent contentEvent) { - firedEvent = true; - } - - public void disposing(com.sun.star.lang.EventObject eventObject) { - disposed = true; - } - - } -} diff --git a/ucb/qa/complex/tdoc/interfaces/_XPropertiesChangeNotifier.java b/ucb/qa/complex/tdoc/interfaces/_XPropertiesChangeNotifier.java deleted file mode 100755 index 790f295c7be5..000000000000 --- a/ucb/qa/complex/tdoc/interfaces/_XPropertiesChangeNotifier.java +++ /dev/null @@ -1,67 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.tdoc.interfaces; - -import com.sun.star.beans.XPropertiesChangeListener; -import com.sun.star.beans.XPropertiesChangeNotifier; -import share.LogWriter; - -/** - * Check the XPropertiesChangeNotifier - */ -public class _XPropertiesChangeNotifier { - public XPropertiesChangeNotifier oObj = null; - public LogWriter log = null; - - PropertiesChangeListener listener = new PropertiesChangeListener(); - String[] args = null; - - - public boolean _addPropertiesChangeListener() { - oObj.addPropertiesChangeListener(args, listener); - return true; - } - - public boolean _removePropertiesChangeListener() { - oObj.removePropertiesChangeListener(args, listener); - return true; - } - - private class PropertiesChangeListener implements XPropertiesChangeListener { - public boolean disposed = false; - public boolean propChanged = false; - - public void disposing(com.sun.star.lang.EventObject eventObject) { - disposed = true; - } - - public void propertiesChange(com.sun.star.beans.PropertyChangeEvent[] propertyChangeEvent) { - propChanged = true; - } - - } -} diff --git a/ucb/qa/complex/tdoc/interfaces/_XPropertyContainer.java b/ucb/qa/complex/tdoc/interfaces/_XPropertyContainer.java deleted file mode 100755 index fd7ff94c8f8f..000000000000 --- a/ucb/qa/complex/tdoc/interfaces/_XPropertyContainer.java +++ /dev/null @@ -1,102 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.tdoc.interfaces; - -import com.sun.star.beans.XPropertyContainer; -import share.LogWriter; - -/** - * - * @author sg128468 - */ -public class _XPropertyContainer { - public XPropertyContainer oObj = null; - public LogWriter log = null; - - public boolean _addProperty() { - boolean result = true; - // add illegal property - try { - oObj.addProperty("MyIllegalProperty", (short)0, null); - } - catch(com.sun.star.beans.PropertyExistException e) { - e.printStackTrace((java.io.PrintWriter)log); - result = false; - } - catch(com.sun.star.lang.IllegalArgumentException e) { - e.printStackTrace((java.io.PrintWriter)log); - log.println("'IllegalArgument' Unexpected but correct."); - } - catch(com.sun.star.beans.IllegalTypeException e) { - log.println("'IllegalType' Correctly thrown"); - } - // add valid property - try { - oObj.addProperty("MyLegalProperty", (short)0, "Just a value"); - } - catch(com.sun.star.beans.PropertyExistException e) { - e.printStackTrace((java.io.PrintWriter)log); - result = false; - } - catch(com.sun.star.lang.IllegalArgumentException e) { - e.printStackTrace((java.io.PrintWriter)log); - result = false; - } - catch(com.sun.star.beans.IllegalTypeException e) { - e.printStackTrace((java.io.PrintWriter)log); - result = false; - } - return result; - } - - public boolean _removeProperty() { - boolean result = true; - try { - oObj.removeProperty("MyIllegalProperty"); - } - catch(com.sun.star.beans.UnknownPropertyException e) { - log.println("'UnknownProperty' Correctly thrown"); - } - catch(com.sun.star.beans.NotRemoveableException e) { - e.printStackTrace((java.io.PrintWriter)log); - result = false; - } - try { - oObj.removeProperty("MyLegalProperty"); - } - catch(com.sun.star.beans.UnknownPropertyException e) { - e.printStackTrace((java.io.PrintWriter)log); - result = false; - } - catch(com.sun.star.beans.NotRemoveableException e) { - e.printStackTrace((java.io.PrintWriter)log); - result = false; - } - return result; - } - -} diff --git a/ucb/qa/complex/tdoc/interfaces/_XPropertySetInfoChangeNotifier.java b/ucb/qa/complex/tdoc/interfaces/_XPropertySetInfoChangeNotifier.java deleted file mode 100755 index ec1d7d64ada5..000000000000 --- a/ucb/qa/complex/tdoc/interfaces/_XPropertySetInfoChangeNotifier.java +++ /dev/null @@ -1,67 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.tdoc.interfaces; - -import com.sun.star.beans.XPropertySetInfoChangeListener; -import com.sun.star.beans.XPropertySetInfoChangeNotifier; -import share.LogWriter; - -/** - * - */ -public class _XPropertySetInfoChangeNotifier { - public XPropertySetInfoChangeNotifier oObj = null; - public LogWriter log = null; - - PropertySetInfoChangeListener listener = new PropertySetInfoChangeListener(); - String[] args = null; - - - public boolean _addPropertiesChangeListener() { - oObj.addPropertySetInfoChangeListener(listener); - return true; - } - - public boolean _removePropertiesChangeListener() { - oObj.removePropertySetInfoChangeListener(listener); - return true; - } - - private class PropertySetInfoChangeListener implements XPropertySetInfoChangeListener { - public boolean disposed = false; - public boolean propChanged = false; - - public void disposing(com.sun.star.lang.EventObject eventObject) { - disposed = true; - } - - public void propertySetInfoChange(com.sun.star.beans.PropertySetInfoChangeEvent propertySetInfoChangeEvent) { - } - - } - -} diff --git a/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java b/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java deleted file mode 100755 index 761cca87998a..000000000000 --- a/ucb/qa/complex/tdoc/interfaces/_XServiceInfo.java +++ /dev/null @@ -1,99 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -package complex.tdoc.interfaces; - -import lib.MultiMethodTest; - -import com.sun.star.lang.XServiceInfo; -import share.LogWriter; - -/** -* Testing com.sun.star.lang.XServiceInfo -* interface methods : -*

                            -*
                          • getImplementationName()
                            • -*
                          • supportsService()
                            • -*
                          • getSupportedServiceNames()
                            • -*

                          -* Test is multithread compilant.

                          -* @see com.sun.star.lang.XServiceInfo -*/ -public class _XServiceInfo { - public static XServiceInfo oObj = null; - public static String[] names = null; - public LogWriter log = null; - - /** - * Just calls the method.

                          - * Has OK status if no runtime exceptions occured. - */ - public boolean _getImplementationName() { - boolean result = true; - log.println("testing getImplementationName() ... "); - - log.println("The ImplementationName ist "+oObj.getImplementationName()); - result=true; - - return result; - - } // end getImplementationName() - - - /** - * Just calls the method.

                          - * Has OK status if no runtime exceptions occured. - */ - public boolean _getSupportedServiceNames() { - boolean result = true; - log.println("getting supported Services..."); - names = oObj.getSupportedServiceNames(); - for (int i=0;igetSupportedServiceNames method and - * calls the supportsService methos with this - * name.

                          - * Has OK status if true value is - * returned. - */ - public boolean _supportsService() { - log.println("testing supportsService"); - names = oObj.getSupportedServiceNames(); - return oObj.supportsService(names[0]); - } // end supportsService() -} - diff --git a/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java b/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java deleted file mode 100755 index aef931bdeef1..000000000000 --- a/ucb/qa/complex/tdoc/interfaces/_XTypeProvider.java +++ /dev/null @@ -1,95 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -package complex.tdoc.interfaces; - -import lib.MultiMethodTest; - -import com.sun.star.lang.XTypeProvider; -import com.sun.star.uno.Type; -import share.LogWriter; - -/** -* Testing com.sun.star.lang.XTypeProvider -* interface methods : -*

                            -*
                          • getTypes()
                            • -*
                          • getImplementationId()
                            • -*

                          -* Test is NOT multithread compilant.

                          -* @see com.sun.star.lang.XTypeProvider -*/ -public class _XTypeProvider { - - public static XTypeProvider oObj = null; - public static Type[] types = null; - public LogWriter log = null; - - /** - * Just calls the method.

                          - * Has OK status if no runtime exceptions occured. - */ - public boolean _getImplementationId() { - boolean result = true; - log.println("testing getImplementationId() ... "); - - log.println("The ImplementationId is "+oObj.getImplementationId()); - result = true; - - return result; - - } // end getImplementationId() - - - /** - * ?alls the method and checks the return value.

                          - * Has OK status if one of the return value equals to the - * type com.sun.star.lang.XTypeProvider. - */ - public boolean _getTypes() { - boolean result = false; - log.println("getting Types..."); - types = oObj.getTypes(); - for (int i=0;i"); - } - - return result; - - } // end getTypes() - -} - diff --git a/ucb/qa/complex/tdoc/makefile.mk b/ucb/qa/complex/tdoc/makefile.mk index f5f2629f5592..01f8ec0f76fa 100755 --- a/ucb/qa/complex/tdoc/makefile.mk +++ b/ucb/qa/complex/tdoc/makefile.mk @@ -43,15 +43,21 @@ JAVATESTFILES = \ CheckTransientDocumentsDocumentContent.java JAVAFILES = $(JAVATESTFILES) \ - TestDocument.java + TestDocument.java \ + _XChild.java \ + _XCommandInfoChangeNotifier.java \ + _XCommandProcessor.java \ + _XComponent.java \ + _XContent.java \ + _XPropertiesChangeNotifier.java \ + _XPropertyContainer.java \ + _XPropertySetInfoChangeNotifier.java \ + _XServiceInfo.java \ + _XTypeProvider.java JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) - -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) -SUBDIRS = interfaces - # Sample how to debug # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y -- cgit v1.2.3 From 248f9c55d3d7f620372c7ff598db44051c95ceb5 Mon Sep 17 00:00:00 2001 From: sb Date: Wed, 21 Jul 2010 09:39:33 +0200 Subject: sb123: #i113306# disabled sfx.DocumentTemplates for now --- sfx2/qa/unoapi/sfx.sce | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/unoapi/sfx.sce b/sfx2/qa/unoapi/sfx.sce index 6176c0668731..ce72c463ee55 100644 --- a/sfx2/qa/unoapi/sfx.sce +++ b/sfx2/qa/unoapi/sfx.sce @@ -1,5 +1,5 @@ -o sfx.AppDispatchProvider --o sfx.DocumentTemplates +#i113306 -o sfx.DocumentTemplates -o sfx.FrameLoader -o sfx.SfxMacroLoader #i111283 -o sfx.StandaloneDocumentInfo -- cgit v1.2.3 From eed23e3d2da3fe09c121723b07e089c680caffaa Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 14 Oct 2010 16:40:31 +0200 Subject: undoapi: sfx2/qa: fixed some NetBeans 6.9 warnings, removed some dead files, refactored for easier usage --- sfx2/prj/build.lst | 57 +- sfx2/qa/complex/docinfo/DocumentProperties.java | 363 ------ sfx2/qa/complex/docinfo/makefile.mk | 63 - .../CheckGlobalEventBroadcaster_writer1.java | 281 ----- sfx2/qa/complex/framework/DialogThread.java | 95 -- sfx2/qa/complex/framework/DocHelper/makefile.mk | 49 - .../framework/DocumentMetadataAccessTest.java | 1292 ------------------- .../complex/framework/DocumentPropertiesTest.java | 565 --------- sfx2/qa/complex/framework/TestDocument.java | 39 - sfx2/qa/complex/framework/WriterHelper.java | 287 ----- sfx2/qa/complex/framework/makefile.mk | 65 - sfx2/qa/complex/framework/testdocuments/CUSTOM.odt | Bin 1021 -> 0 bytes sfx2/qa/complex/framework/testdocuments/TEST.odt | Bin 13803 -> 0 bytes .../complex/framework/testdocuments/TESTRDFA.odt | Bin 7540 -> 0 bytes sfx2/qa/complex/framework/testdocuments/empty.rdf | 13 - sfx2/qa/complex/sfx2/DocumentInfo.java | 362 ++++++ sfx2/qa/complex/sfx2/DocumentMetadataAccess.java | 1313 ++++++++++++++++++++ sfx2/qa/complex/sfx2/DocumentProperties.java | 561 +++++++++ sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java | 273 ++++ sfx2/qa/complex/sfx2/StandaloneDocumentInfo.java | 99 ++ sfx2/qa/complex/sfx2/makefile.mk | 81 ++ .../StandaloneDocumentInfoTest.java | 31 + sfx2/qa/complex/sfx2/standalonedocinfo/Test01.java | 144 +++ .../complex/sfx2/standalonedocinfo/TestHelper.java | 48 + sfx2/qa/complex/sfx2/testdocuments/CUSTOM.odt | Bin 0 -> 1021 bytes sfx2/qa/complex/sfx2/testdocuments/TEST.odt | Bin 0 -> 13803 bytes sfx2/qa/complex/sfx2/testdocuments/TESTRDFA.odt | Bin 0 -> 7540 bytes sfx2/qa/complex/sfx2/testdocuments/empty.rdf | 13 + sfx2/qa/complex/sfx2/tools/DialogThread.java | 88 ++ sfx2/qa/complex/sfx2/tools/TestDocument.java | 39 + sfx2/qa/complex/sfx2/tools/WriterHelper.java | 283 +++++ .../StandaloneDocumentInfoTest.java | 31 - .../StandaloneDocumentInfoUnitTest.java | 101 -- sfx2/qa/complex/standalonedocumentinfo/Test01.java | 142 --- .../complex/standalonedocumentinfo/TestHelper.java | 48 - sfx2/qa/complex/standalonedocumentinfo/makefile.mk | 56 - sfx2/qa/complex/tests.sce | 3 - 37 files changed, 3361 insertions(+), 3524 deletions(-) delete mode 100644 sfx2/qa/complex/docinfo/DocumentProperties.java delete mode 100644 sfx2/qa/complex/docinfo/makefile.mk delete mode 100644 sfx2/qa/complex/framework/CheckGlobalEventBroadcaster_writer1.java delete mode 100644 sfx2/qa/complex/framework/DialogThread.java delete mode 100644 sfx2/qa/complex/framework/DocHelper/makefile.mk delete mode 100644 sfx2/qa/complex/framework/DocumentMetadataAccessTest.java delete mode 100644 sfx2/qa/complex/framework/DocumentPropertiesTest.java delete mode 100644 sfx2/qa/complex/framework/TestDocument.java delete mode 100644 sfx2/qa/complex/framework/WriterHelper.java delete mode 100644 sfx2/qa/complex/framework/makefile.mk delete mode 100644 sfx2/qa/complex/framework/testdocuments/CUSTOM.odt delete mode 100644 sfx2/qa/complex/framework/testdocuments/TEST.odt delete mode 100644 sfx2/qa/complex/framework/testdocuments/TESTRDFA.odt delete mode 100644 sfx2/qa/complex/framework/testdocuments/empty.rdf create mode 100644 sfx2/qa/complex/sfx2/DocumentInfo.java create mode 100644 sfx2/qa/complex/sfx2/DocumentMetadataAccess.java create mode 100644 sfx2/qa/complex/sfx2/DocumentProperties.java create mode 100644 sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java create mode 100644 sfx2/qa/complex/sfx2/StandaloneDocumentInfo.java create mode 100644 sfx2/qa/complex/sfx2/makefile.mk create mode 100644 sfx2/qa/complex/sfx2/standalonedocinfo/StandaloneDocumentInfoTest.java create mode 100644 sfx2/qa/complex/sfx2/standalonedocinfo/Test01.java create mode 100644 sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper.java create mode 100644 sfx2/qa/complex/sfx2/testdocuments/CUSTOM.odt create mode 100644 sfx2/qa/complex/sfx2/testdocuments/TEST.odt create mode 100644 sfx2/qa/complex/sfx2/testdocuments/TESTRDFA.odt create mode 100644 sfx2/qa/complex/sfx2/testdocuments/empty.rdf create mode 100644 sfx2/qa/complex/sfx2/tools/DialogThread.java create mode 100644 sfx2/qa/complex/sfx2/tools/TestDocument.java create mode 100644 sfx2/qa/complex/sfx2/tools/WriterHelper.java delete mode 100644 sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoTest.java delete mode 100644 sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java delete mode 100644 sfx2/qa/complex/standalonedocumentinfo/Test01.java delete mode 100644 sfx2/qa/complex/standalonedocumentinfo/TestHelper.java delete mode 100644 sfx2/qa/complex/standalonedocumentinfo/makefile.mk delete mode 100644 sfx2/qa/complex/tests.sce (limited to 'sfx2/qa') diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index 1e471312c6cf..f8e01c7bcf05 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -1,31 +1,26 @@ -sf sfx2 : l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 NULL -sf sfx2 usr1 - all sf_mkout NULL -sf sfx2\inc nmake - all sf_inc NULL -sf sfx2\prj get - all sf_prj NULL -sf sfx2\mac\res get - all sf_mres NULL -sf sfx2\source\inc get - all sf_sinc NULL -sf sfx2\sdi nmake - all sf_sdi NULL -sf sfx2\source\appl nmake - all sf_appl sf_sdi sf_inc NULL -sf sfx2\source\view nmake - all sf_view sf_sdi sf_inc NULL -sf sfx2\source\bastyp nmake - all sf_bast sf_sdi sf_inc NULL -sf sfx2\source\config nmake - all sf_cnfg sf_sdi sf_inc NULL -sf sfx2\source\control nmake - all sf_ctrl sf_sdi sf_inc NULL -sf sfx2\source\dialog nmake - all sf_dlg sf_sdi sf_inc NULL -sf sfx2\source\doc nmake - all sf_doc sf_sdi sf_inc NULL -sf sfx2\source\layout nmake - all sf_layout sf_sdi sf_inc NULL -sf sfx2\source\menu nmake - all sf_menu sf_sdi sf_inc NULL -sf sfx2\source\notify nmake - all sf_noti sf_sdi sf_inc NULL -sf sfx2\source\statbar nmake - all sf_sbar sf_sdi sf_inc NULL -sf sfx2\source\toolbox nmake - all sf_tbox sf_sdi sf_inc NULL -sf sfx2\source\inet nmake - all sf_inet sf_sdi sf_inc NULL -sf sfx2\source\explorer nmake - all sf_expl sf_sdi sf_inc NULL -sf sfx2\workben\custompanel nmake - all sf_wb_custompanel NULL -sf sfx2\util nmake - all sf_util sf_appl sf_bast sf_cnfg sf_ctrl sf_dlg sf_doc sf_expl sf_inet sf_menu sf_layout sf_noti sf_sbar sf_tbox sf_view NULL -sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL -sf sfx2\qa\cppunit nmake - all sf_qa_cppunit sf_util NULL - -# fails on unxsoli4 -# sf sfx2\qa\complex\standalonedocumentinfo nmake - all sf_qa_complex_standalonedocumentinfo sf_util NULL - -# sf sfx2\qa\complex\framework nmake - all sf_qa_complex_framework sf_qa_complex_framework_dochelper NULL -# sf sfx2\qa\complex\docinfo nmake - all sf_qa_complex_docinfo sf_util NULL +sf sfx2 : l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 test NULL +sf sfx2 usr1 - all sf_mkout NULL +sf sfx2\inc nmake - all sf_inc NULL +sf sfx2\prj get - all sf_prj NULL +sf sfx2\mac\res get - all sf_mres NULL +sf sfx2\source\inc get - all sf_sinc NULL +sf sfx2\sdi nmake - all sf_sdi NULL +sf sfx2\source\appl nmake - all sf_appl sf_sdi sf_inc NULL +sf sfx2\source\view nmake - all sf_view sf_sdi sf_inc NULL +sf sfx2\source\bastyp nmake - all sf_bast sf_sdi sf_inc NULL +sf sfx2\source\config nmake - all sf_cnfg sf_sdi sf_inc NULL +sf sfx2\source\control nmake - all sf_ctrl sf_sdi sf_inc NULL +sf sfx2\source\dialog nmake - all sf_dlg sf_sdi sf_inc NULL +sf sfx2\source\doc nmake - all sf_doc sf_sdi sf_inc NULL +sf sfx2\source\layout nmake - all sf_layout sf_sdi sf_inc NULL +sf sfx2\source\menu nmake - all sf_menu sf_sdi sf_inc NULL +sf sfx2\source\notify nmake - all sf_noti sf_sdi sf_inc NULL +sf sfx2\source\statbar nmake - all sf_sbar sf_sdi sf_inc NULL +sf sfx2\source\toolbox nmake - all sf_tbox sf_sdi sf_inc NULL +sf sfx2\source\inet nmake - all sf_inet sf_sdi sf_inc NULL +sf sfx2\source\explorer nmake - all sf_expl sf_sdi sf_inc NULL +sf sfx2\workben\custompanel nmake - all sf_wb_custompanel NULL +sf sfx2\util nmake - all sf_util sf_appl sf_bast sf_cnfg sf_ctrl sf_dlg sf_doc sf_expl sf_inet sf_menu sf_layout sf_noti sf_sbar sf_tbox sf_view NULL +sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL +sf sfx2\qa\cppunit nmake - all sf_qa_cppunit sf_util NULL +sf sfx2\qa\complex\sfx2 nmake - all sf_qa_complex_docinfo sf_util NULL diff --git a/sfx2/qa/complex/docinfo/DocumentProperties.java b/sfx2/qa/complex/docinfo/DocumentProperties.java deleted file mode 100644 index 0c4eb44c4a35..000000000000 --- a/sfx2/qa/complex/docinfo/DocumentProperties.java +++ /dev/null @@ -1,363 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.docinfo; - -import com.sun.star.beans.*; -import com.sun.star.beans.Property; -import com.sun.star.beans.PropertyValue; -import com.sun.star.beans.XPropertyContainer; -import com.sun.star.beans.XPropertySet; -import com.sun.star.beans.XPropertySetInfo; -import com.sun.star.document.XDocumentInfo; -import com.sun.star.document.XDocumentInfoSupplier; -import com.sun.star.frame.XComponentLoader; -import com.sun.star.frame.XStorable; -import com.sun.star.lang.XComponent; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.text.XTextDocument; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.util.Date; - - - -import util.DesktopTools; -import util.WriterTools; - -import org.junit.After; -import org.junit.AfterClass; -// import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.openoffice.test.OfficeConnection; -import static org.junit.Assert.*; - -public class DocumentProperties -{ - - XMultiServiceFactory m_xMSF = null; - XTextDocument xTextDoc = null; - XTextDocument xTextDocSecond = null; - -// public String[] getTestMethodNames() { -// return new String[] {"checkDocInfo", "cleanup"}; -// } - @Test public void checkDocInfo() - { - m_xMSF = getMSF(); - - System.out.println("check wether there is a valid MultiServiceFactory"); - - assertNotNull("## Couldn't get MultiServiceFactory make sure your Office is started", m_xMSF); - - // TODO: need other temp directory! - String tempdir = System.getProperty("java.io.tmpdir"); - String fs = System.getProperty("file.separator"); - - if (!tempdir.endsWith(fs)) - { - tempdir += fs; - } - tempdir = util.utils.getFullURL(tempdir); - final String sTempDocument = tempdir + "DocInfo.oot"; - - if (true) - { - System.out.println("... done"); - - - System.out.println("Opening a Writer document"); - xTextDoc = WriterTools.createTextDoc(m_xMSF); - System.out.println("... done"); - - XDocumentInfoSupplier xDocInfoSup = UnoRuntime.queryInterface(XDocumentInfoSupplier.class, xTextDoc); - XDocumentInfo xDocInfo = xDocInfoSup.getDocumentInfo(); - XPropertyContainer xPropContainer = UnoRuntime.queryInterface(XPropertyContainer.class, xDocInfo); - - System.out.println("Trying to add a existing property"); - - boolean worked = addProperty(xPropContainer, "Author", (short) 0, ""); - assertTrue("Could set an existing property", !worked); - System.out.println("...done"); - - System.out.println("Trying to add a integer property"); - worked = addProperty(xPropContainer, "intValue", com.sun.star.beans.PropertyAttribute.READONLY, new Integer(17)); - assertTrue("Couldn't set an integer property", worked); - System.out.println("...done"); - - System.out.println("Trying to add a double property"); - worked = addProperty(xPropContainer, "doubleValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, new Double(17.7)); - assertTrue("Couldn't set an double property", worked); - System.out.println("...done"); - - System.out.println("Trying to add a boolean property"); - worked = addProperty(xPropContainer, "booleanValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, Boolean.TRUE); - assertTrue("Couldn't set an boolean property", worked); - System.out.println("...done"); - - System.out.println("Trying to add a date property"); - worked = addProperty(xPropContainer, "dateValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, new Date()); - assertTrue("Couldn't set an date property", worked); - System.out.println("...done"); - - System.out.println("trying to remove a read only Property"); - try - { - xPropContainer.removeProperty("intValue"); - fail("Could remove read only property"); - } - catch (Exception e) - { - System.out.println("\tException was thrown " + e); - System.out.println("\t...OK"); - } - System.out.println("...done"); - - XPropertySet xProps2 = UnoRuntime.queryInterface(XPropertySet.class, xPropContainer); - showPropertySet(xProps2); - - - System.out.println("Storing the document"); - try - { - XStorable store = UnoRuntime.queryInterface(XStorable.class, xTextDoc); - store.storeToURL(sTempDocument, new PropertyValue[] {}); - DesktopTools.closeDoc(xTextDoc); - } - catch (Exception e) - { - fail("Couldn't store document"); - } - - System.out.println("...done"); - } - - - if (true) - { - System.out.println("loading the document"); - - try - { - XComponentLoader xCL = UnoRuntime.queryInterface(XComponentLoader.class, m_xMSF.createInstance("com.sun.star.frame.Desktop")); - XComponent xComp = xCL.loadComponentFromURL(sTempDocument, "_blank", 0, new PropertyValue[] {}); - xTextDocSecond = UnoRuntime.queryInterface(XTextDocument.class, xComp); - } - catch (Exception e) - { - fail("Couldn't load document"); - } - - System.out.println("...done"); - - XDocumentInfoSupplier xDocInfoSup = UnoRuntime.queryInterface(XDocumentInfoSupplier.class, xTextDocSecond); - XDocumentInfo xDocInfo = xDocInfoSup.getDocumentInfo(); - XPropertyContainer xPropContainer = UnoRuntime.queryInterface(XPropertyContainer.class, xDocInfo); - - XPropertySet xProps = UnoRuntime.queryInterface(XPropertySet.class, xDocInfo); - showPropertySet(xProps); - - assertTrue("Double doesn't work", checkType(xProps, "doubleValue", "java.lang.Double")); - assertTrue("Boolean doesn't work", checkType(xProps, "booleanValue", "java.lang.Boolean")); - - // TODO: dateValue does not exist. - // assertTrue("Date doesn't work", checkType(xProps, "dateValue", "com.sun.star.util.DateTime")); - - // TODO: is java.lang.Double - // assertTrue("Integer doesn't work", checkType(xProps, "intValue", "java.lang.Integer")); - - xPropContainer = UnoRuntime.queryInterface(XPropertyContainer.class, xDocInfo); - - System.out.println("trying to remove a not user defined Property"); - try - { - xPropContainer.removeProperty("Author"); - fail("Could remove non user defined property"); - } - catch (Exception e) - { - System.out.println("\tException was thrown " + e); - System.out.println("\t...OK"); - } - System.out.println("...done"); - - - System.out.println("Trying to remove a user defined property"); - try - { - xPropContainer.removeProperty("booleanValue"); - System.out.println("\t...OK"); - } - catch (Exception e) - { - System.out.println("\tException was thrown " + e); - System.out.println("\t...FAILED"); - fail("Could not remove user defined property"); - } - showPropertySet(xProps); - System.out.println("...done"); - } - } - - @After public void cleanup() - { - DesktopTools.closeDoc(xTextDocSecond); - DesktopTools.closeDoc(xTextDoc); - } - - private void showPropertySet(XPropertySet xProps) - { - try - { - // get an XPropertySet, here the one of a text cursor - // XPropertySet xCursorProps = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, mxDocCursor); - - // get the property info interface of this XPropertySet - XPropertySetInfo xPropsInfo = xProps.getPropertySetInfo(); - - // get all properties (NOT the values) from XPropertySetInfo - Property[] aProps = xPropsInfo.getProperties(); - int i; - for (i = 0; i < aProps.length; ++i) { - // number of property within this info object - System.out.print("Property #" + i); - - // name of property - System.out.print(": Name<" + aProps[i].Name); - - // handle of property (only for XFastPropertySet) - System.out.print("> Handle<" + aProps[i].Handle); - - // type of property - System.out.print("> " + aProps[i].Type.toString()); - - // attributes (flags) - System.out.print(" Attributes<"); - short nAttribs = aProps[i].Attributes; - if ((nAttribs & PropertyAttribute.MAYBEVOID) != 0) - System.out.print("MAYBEVOID|"); - if ((nAttribs & PropertyAttribute.BOUND) != 0) - System.out.print("BOUND|"); - if ((nAttribs & PropertyAttribute.CONSTRAINED) != 0) - System.out.print("CONSTRAINED|"); - if ((nAttribs & PropertyAttribute.READONLY) != 0) - System.out.print("READONLY|"); - if ((nAttribs & PropertyAttribute.TRANSIENT) != 0) - System.out.print("TRANSIENT|"); - if ((nAttribs & PropertyAttribute.MAYBEAMBIGUOUS ) != 0) - System.out.print("MAYBEAMBIGUOUS|"); - if ((nAttribs & PropertyAttribute.MAYBEDEFAULT) != 0) - System.out.print("MAYBEDEFAULT|"); - if ((nAttribs & PropertyAttribute.REMOVEABLE) != 0) - System.out.print("REMOVEABLE|"); - System.out.println("0>"); - } - } catch (Exception e) { - // If anything goes wrong, give the user a stack trace - e.printStackTrace(System.out); - } - } - - private boolean checkType(XPropertySet xProps, String aName, - String expected) - { - boolean ret = true; - System.out.println("Checking " + expected); - - String getting = - getPropertyByName(xProps, aName).getClass().getName(); - - if (!getting.equals(expected)) - { - System.out.println("\t Expected: " + expected); - System.out.println("\t Getting: " + getting); - ret = false; - } - - if (ret) - { - System.out.println("...OK"); - } - return ret; - } - - private Object getPropertyByName(XPropertySet xProps, String aName) - { - Object ret = null; - - try - { - ret = xProps.getPropertyValue(aName); - } - catch (Exception e) - { - System.out.println("\tCouldn't get Property " + aName); - System.out.println("\tMessage " + e); - } - - return ret; - } - - private boolean addProperty(XPropertyContainer xPropContainer, - String aName, short attr, Object defaults) - { - boolean ret = true; - - try - { - xPropContainer.addProperty(aName, attr, defaults); - } - catch (Exception e) - { - ret = false; - System.out.println("\tCouldn't get Property " + aName); - System.out.println("\tMessage " + e); - } - - return ret; - } - - private XMultiServiceFactory getMSF() - { - final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); - return xMSF1; - } - - // setup and close connections - @BeforeClass public static void setUpConnection() throws Exception - { - System.out.println("setUpConnection()"); - connection.setUp(); - } - - @AfterClass public static void tearDownConnection() - throws InterruptedException, com.sun.star.uno.Exception - { - System.out.println("tearDownConnection()"); - connection.tearDown(); - } - private static final OfficeConnection connection = new OfficeConnection(); -} diff --git a/sfx2/qa/complex/docinfo/makefile.mk b/sfx2/qa/complex/docinfo/makefile.mk deleted file mode 100644 index 626b648a6d06..000000000000 --- a/sfx2/qa/complex/docinfo/makefile.mk +++ /dev/null @@ -1,63 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = sfx2 -TARGET = qa_complex_docinfo - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/docinfo -JAVATESTFILES = \ - DocumentProperties.java - -JAVAFILES = $(JAVATESTFILES) - - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) - -# Sample how to debug -# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y - -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END - - - - - diff --git a/sfx2/qa/complex/framework/CheckGlobalEventBroadcaster_writer1.java b/sfx2/qa/complex/framework/CheckGlobalEventBroadcaster_writer1.java deleted file mode 100644 index c6dc073095b1..000000000000 --- a/sfx2/qa/complex/framework/CheckGlobalEventBroadcaster_writer1.java +++ /dev/null @@ -1,281 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.framework; - -import com.sun.star.awt.XWindow; -import com.sun.star.document.XEventBroadcaster; -import com.sun.star.document.XEventListener; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.sheet.XSpreadsheetDocument; -import com.sun.star.text.XTextDocument; -import com.sun.star.uno.UnoRuntime; -import complex.framework.DocHelper.WriterHelper; - -import java.util.ArrayList; - -import util.UITools; - -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.openoffice.test.OfficeConnection; -import static org.junit.Assert.*; - - -/** - * This testcase checks the GlobalEventBroadcaster - * it will add an XEventListener and verify the Events - * raised when opening/changing and closing Office Documents - */ -public class CheckGlobalEventBroadcaster_writer1 { - XMultiServiceFactory m_xMSF = null; - XEventBroadcaster m_xEventBroadcaster = null; - ArrayList notifyEvents = new ArrayList(); - // XTextDocument xTextDoc; - XSpreadsheetDocument xSheetDoc; - XEventListener m_xEventListener = new EventListenerImpl(); - -// public String[] getTestMethodNames() { -// return new String[] { -// "initialize", "checkWriter", "cleanup" -// }; -// } - - @Before public void initialize() { - m_xMSF = getMSF(); - System.out.println("check wether there is a valid MultiServiceFactory"); - - assertNotNull("## Couldn't get MultiServiceFactory make sure your Office is started", m_xMSF); - - System.out.println("... done"); - - System.out.println( - "Create an instance of com.sun.star.frame.GlobalEventBroadcaster"); - - Object GlobalEventBroadcaster = null; - Object dispatcher = null; - - try { - GlobalEventBroadcaster = m_xMSF.createInstance( - "com.sun.star.frame.GlobalEventBroadcaster"); - } catch (com.sun.star.uno.Exception e) { - fail("## Exception while creating instance"); - } - - System.out.println("... done"); - - System.out.println("check wether the created instance is valid"); - - assertNotNull("couldn't create service", GlobalEventBroadcaster); - - System.out.println("... done"); - - System.out.println( - "try to query the XEventBroadcaster from the gained Object"); - m_xEventBroadcaster = UnoRuntime.queryInterface(XEventBroadcaster.class, GlobalEventBroadcaster); - - if (util.utils.isVoid(m_xEventBroadcaster)) { - fail("couldn't get XEventBroadcaster"); - } - - System.out.println("... done"); - - System.out.println("adding Listener"); - m_xEventBroadcaster.addEventListener(m_xEventListener); - System.out.println("... done"); - } - - @Test public void checkWriter() { - System.out.println("-- Checking Writer --"); - - WriterHelper wHelper = new WriterHelper(m_xMSF); - String[] expected; - boolean locRes = true; - System.out.println("opening an empty writer doc"); - notifyEvents.clear(); - { - XTextDocument xTextDoc = wHelper.openEmptyDoc(); - shortWait(); - expected = new String[] { "OnUnfocus", "OnCreate", "OnViewCreated", "OnFocus" }; - - assertTrue("Wrong events fired when opening empty doc", - proveExpectation(expected)); - System.out.println("... done"); - - System.out.println("changing the writer doc"); - notifyEvents.clear(); - xTextDoc.getText().setString("GlobalEventBroadcaster"); - shortWait(); - expected = new String[] { "OnModifyChanged" }; - - assertTrue("Wrong events fired when changing doc", - proveExpectation(expected)); - System.out.println("... done"); - - System.out.println("closing the empty writer doc"); - notifyEvents.clear(); - wHelper.closeDoc(xTextDoc); - shortWait(); - } - expected = new String[] { "OnUnfocus", "OnFocus", "OnViewClosed", "OnUnload" }; - - assertTrue("Wrong events fired when closing empty doc", - proveExpectation(expected)); - System.out.println("... done"); - - System.out.println("opening an writer doc via Window-New Window"); - notifyEvents.clear(); - { - XTextDocument xTextDoc = wHelper.openFromDialog(".uno:NewWindow", "", false); - - shortWait(); - expected = new String[] { "OnUnfocus", "OnCreate", "OnViewCreated", "OnFocus", "OnUnfocus", "OnViewCreated", "OnFocus", }; - - assertTrue("Wrong events fired when opening an writer doc via Window-New Window", - proveExpectation(expected)); - System.out.println("... done"); - - System.out.println("closing the created writer doc"); - notifyEvents.clear(); - - wHelper.closeDoc(xTextDoc); - shortWait(); - } - expected = new String[] { "OnViewClosed", "OnUnfocus", "OnFocus", "OnViewClosed", "OnUnload" }; - - assertTrue("Wrong events fired when closing Window-New Window", - proveExpectation(expected)); - - System.out.println("... done"); - // TODO: It seems not possible to close the document without interactiv question - // there the follow test will not be execute - if (false) { - System.out.println("Opening document with label wizard"); - XTextDocument xTextDoc = wHelper.openFromDialog("private:factory/swriter?slot=21051", "", false); - shortWait(); - XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, wHelper.getToolkit().getActiveTopWindow()); - UITools ut = new UITools(m_xMSF,xWindow); - notifyEvents.clear(); - System.out.println("pressing button 'New Document'"); - try{ - ut.clickButton ("New Document"); - } catch (Exception e) { - System.out.println("Couldn't press Button"); - } - System.out.println("... done"); - shortWait(); - shortWait(); - shortWait(); - expected = new String[] { "OnViewClosed", "OnCreate", "OnFocus", "OnModifyChanged" }; - - assertTrue("Wrong events fired when starting labels wizard", - proveExpectation(expected)); - - System.out.println("Try to close document..."); - wHelper.closeDoc(xTextDoc); - shortWait(); - wHelper.closeFromDialog(); - shortWait(); - xTextDoc = null; - } - - System.out.println("-- Done Writer --"); - } - - @After public void cleanup() { - System.out.println("removing Listener"); - m_xEventBroadcaster.removeEventListener(m_xEventListener); - System.out.println("... done"); - } - - /** - * Sleeps for 0.5 sec. to allow StarOffice to react on - * reset call. - */ - private void shortWait() { - try { - Thread.sleep(2000); - } catch (InterruptedException e) { - System.out.println("While waiting :" + e); - } - } - - private boolean proveExpectation(String[] expected) { - boolean locRes = true; - boolean failure = false; - - System.out.println("Fired Events:"); - for (int k=0;k - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.framework.DocHelper; - -import com.sun.star.beans.PropertyValue; -import com.sun.star.frame.XController; -import com.sun.star.frame.XDispatch; -import com.sun.star.frame.XDispatchProvider; -import com.sun.star.frame.XModel; -import com.sun.star.lang.XComponent; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.util.URL; -import com.sun.star.util.XURLTransformer; - -import java.lang.Thread; - - -/** - * This class opens a given dialog in a separate Thread by dispatching an url - * - */ -public class DialogThread extends Thread { - public XComponent m_xDoc = null; - public XMultiServiceFactory m_xMSF = null; - public String m_url = ""; - - public DialogThread(XComponent xDoc, XMultiServiceFactory msf, String url) { - this.m_xDoc = xDoc; - this.m_xMSF = msf; - this.m_url = url; - } - - public void run() { - XModel aModel = (XModel) UnoRuntime.queryInterface(XModel.class, - m_xDoc); - - XController xController = aModel.getCurrentController(); - - //Opening Dialog - try { - XDispatchProvider xDispProv = (XDispatchProvider) UnoRuntime.queryInterface( - XDispatchProvider.class, - xController.getFrame()); - XURLTransformer xParser = (com.sun.star.util.XURLTransformer) UnoRuntime.queryInterface( - XURLTransformer.class, - m_xMSF.createInstance( - "com.sun.star.util.URLTransformer")); - - // Because it's an in/out parameter - // we must use an array of URL objects. - URL[] aParseURL = new URL[1]; - aParseURL[0] = new URL(); - aParseURL[0].Complete = m_url; - xParser.parseStrict(aParseURL); - - URL aURL = aParseURL[0]; - XDispatch xDispatcher = xDispProv.queryDispatch(aURL, "", com.sun.star.frame.FrameSearchFlag.SELF | - com.sun.star.frame.FrameSearchFlag.CHILDREN); - PropertyValue[] dispatchArguments = new PropertyValue[0]; - - if (xDispatcher != null) { - xDispatcher.dispatch(aURL, dispatchArguments); - } else { - System.out.println("xDispatcher is null"); - } - } catch (com.sun.star.uno.Exception e) { - System.out.println("Couldn't open dialog"); - } - } -} \ No newline at end of file diff --git a/sfx2/qa/complex/framework/DocHelper/makefile.mk b/sfx2/qa/complex/framework/DocHelper/makefile.mk deleted file mode 100644 index ad614cfca3f8..000000000000 --- a/sfx2/qa/complex/framework/DocHelper/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ = ../../../.. -TARGET = DocHelper -PRJNAME = $(TARGET) -PACKAGE = complex/framework/dochelper - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -JAVAFILES = \ - DialogThread.java \ - WriterHelper.java - -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/sfx2/qa/complex/framework/DocumentMetadataAccessTest.java b/sfx2/qa/complex/framework/DocumentMetadataAccessTest.java deleted file mode 100644 index 3f61cb21b3dd..000000000000 --- a/sfx2/qa/complex/framework/DocumentMetadataAccessTest.java +++ /dev/null @@ -1,1292 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -package complex.framework; - -// import complexlib.ComplexTestCase; -import helper.StreamSimulator; - -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XComponentContext; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.lang.XComponent; - -import com.sun.star.lang.XServiceInfo; -import com.sun.star.lang.IllegalArgumentException; -import com.sun.star.lang.WrappedTargetException; -import com.sun.star.lang.WrappedTargetRuntimeException; -import com.sun.star.beans.XPropertySet; -import com.sun.star.beans.PropertyValue; -import com.sun.star.beans.Pair; -import com.sun.star.beans.StringPair; -import com.sun.star.container.XEnumerationAccess; -import com.sun.star.container.XEnumeration; -import com.sun.star.io.XInputStream; -import com.sun.star.util.XCloseable; -import com.sun.star.frame.XStorable; -import com.sun.star.text.XTextDocument; -import com.sun.star.text.XTextRange; -import com.sun.star.text.XText; -import com.sun.star.rdf.*; -import lib.TestParameters; - - -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.openoffice.test.OfficeConnection; -import static org.junit.Assert.*; - -/** - * Test case for interface com.sun.star.rdf.XDocumentMetadataAccess - * Currently, this service is implemented in - * sfx2/source/doc/DocumentMetadataAccess.cxx - * - * Actually, this is not a service, so we need to create a document and - * go from there... - * - * @author mst - */ -public class DocumentMetadataAccessTest -{ - XMultiServiceFactory xMSF; - XComponentContext xContext; - String tempDir; - - String nsRDF = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - String nsRDFS = "http://www.w3.org/2000/01/rdf-schema#"; - String nsPkg="http://docs.oasis-open.org/opendocument/meta/package/common#"; - String nsODF ="http://docs.oasis-open.org/opendocument/meta/package/odf#"; - - XURI foo; - XURI bar; - XURI baz; - - static XURI rdf_type; - static XURI rdfs_label; - static XURI pkg_Document; - static XURI pkg_hasPart; - static XURI pkg_MetadataFile; - static XURI odf_ContentFile; - static XURI odf_StylesFile; - static XURI odf_Element; - static XBlankNode blank1; - static XBlankNode blank2; - static XBlankNode blank3; - static XBlankNode blank4; - static String manifestPath = "manifest.rdf"; - static String contentPath = "content.xml"; - static String stylesPath = "styles.xml"; - static String fooPath = "foo.rdf"; - static String fooBarPath = "meta/foo/bar.rdf"; - - XRepository xRep; - XRepositorySupplier xRS; - XDocumentMetadataAccess xDMA; - -// public String[] getTestMethodNames () -// { -// return new String[] { "check", "checkRDFa" }; -// } - /** - * The test parameters - */ - private static TestParameters param = null; - - @Before public void before() - { - try { - - xMSF = getMSF(); - param = new TestParameters(); - param.put("ServiceFactory", xMSF); // important for param.getMSF() - - assertNotNull("could not create MultiServiceFactory.", xMSF); - XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xMSF); - Object defaultCtx = xPropertySet.getPropertyValue("DefaultContext"); - xContext = UnoRuntime.queryInterface(XComponentContext.class, defaultCtx); - assertNotNull("could not get component context.", xContext); - - tempDir = util.utils.getOfficeTemp/*Dir*/(xMSF); - System.out.println("tempdir: " + tempDir); - - foo = URI.create(xContext, "uri:foo"); - assertNotNull("foo", foo); - bar = URI.create(xContext, "uri:bar"); - assertNotNull("bar", bar); - baz = URI.create(xContext, "uri:baz"); - assertNotNull("baz", baz); - - blank1 = BlankNode.create(xContext, "_:1"); - assertNotNull("blank1", blank1); - blank2 = BlankNode.create(xContext, "_:2"); - assertNotNull("blank2", blank2); - blank3 = BlankNode.create(xContext, "_:3"); - assertNotNull("blank3", blank3); - blank4 = BlankNode.create(xContext, "_:4"); - assertNotNull("blank4", blank4); - rdf_type = URI.createKnown(xContext, URIs.RDF_TYPE); - assertNotNull("rdf_type", rdf_type); - rdfs_label = URI.createKnown(xContext, URIs.RDFS_LABEL); - assertNotNull("rdfs_label", rdfs_label); - pkg_Document = URI.createKnown(xContext, URIs.PKG_DOCUMENT); - assertNotNull("pkg_Document", pkg_Document); - pkg_hasPart = URI.createKnown(xContext, URIs.PKG_HASPART); - assertNotNull("pkg_hasPart", pkg_hasPart); - pkg_MetadataFile = URI.createKnown(xContext, URIs.PKG_METADATAFILE); - assertNotNull("pkg_MetadataFile", pkg_MetadataFile); - odf_ContentFile = URI.createKnown(xContext, URIs.ODF_CONTENTFILE); - assertNotNull("odf_ContentFile", odf_ContentFile); - odf_StylesFile = URI.createKnown(xContext, URIs.ODF_STYLESFILE); - assertNotNull("odf_StylesFile", odf_StylesFile); - odf_Element = URI.createKnown(xContext, URIs.ODF_ELEMENT); - assertNotNull("odf_Element", odf_Element); - - } catch (Exception e) { - report(e); - } - } - - @After public void after() - { - xRep = null; - xRS = null; - xDMA = null; - } - - @Test public void check() - { - XComponent xComp = null; - XComponent xComp2 = null; - try { - XEnumeration xStmtsEnum; - XNamedGraph xManifest; - - System.out.println("Creating document with Repository..."); - - // we cannot create a XDMA directly, we must create - // a document and get it from there :( - // create document - PropertyValue[] loadProps = new PropertyValue[1]; - loadProps[0] = new PropertyValue(); - loadProps[0].Name = "Hidden"; - loadProps[0].Value = new Boolean(true); - xComp = util.DesktopTools.openNewDoc(xMSF, "swriter", loadProps); - XTextDocument xText = UnoRuntime.queryInterface(XTextDocument.class, xComp); - - XRepositorySupplier xRS = UnoRuntime.queryInterface(XRepositorySupplier.class, xComp); - assertNotNull("xRS null", xRS); - XDocumentMetadataAccess xDMA = UnoRuntime.queryInterface(XDocumentMetadataAccess.class, xRS); - assertNotNull("xDMA null", xDMA); - xRep = xRS.getRDFRepository(); - assertNotNull("xRep null", xRep); - - System.out.println("...done"); - - System.out.println("Checking that new repository is initialized..."); - - XURI xBaseURI = (XURI) xDMA; - String baseURI = xBaseURI.getStringValue(); - assertNotNull("new: baseURI", xBaseURI ); - assertTrue("new: baseURI", !xBaseURI.getStringValue().equals("")); - - assertTrue("new: # graphs", 1 == xRep.getGraphNames().length); - XURI manifest = URI.createNS(xContext, xBaseURI.getStringValue(), - manifestPath); - xManifest = xRep.getGraph(manifest); - assertTrue("new: manifest graph", null != xManifest); - - Statement[] manifestStmts = getManifestStmts(xBaseURI); - xStmtsEnum = xRep.getStatements(null, null, null); - assertTrue("new: manifest graph", eq(xStmtsEnum, manifestStmts)); - - System.out.println("...done"); - - System.out.println("Checking some invalid args..."); - - String content = "behold, for i am the content."; - XTextRange xTR = new TestRange(content); - XMetadatable xM = (XMetadatable) xTR; - - try { - xDMA.getElementByURI(null); - fail("getElementByURI: null allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.getMetadataGraphsWithType(null); - fail("getMetadataGraphsWithType: null URI allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("", new XURI[0]); - fail("addMetadataFile: empty filename allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("/foo", new XURI[0]); - fail("addMetadataFile: absolute filename allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("fo\"o", new XURI[0]); - fail("addMetadataFile: invalid filename allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("../foo", new XURI[0]); - fail("addMetadataFile: filename with .. allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("foo/../../bar", new XURI[0]); - fail("addMetadataFile: filename with nest .. allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("foo/././bar", new XURI[0]); - fail("addMetadataFile: filename with nest . allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("content.xml", new XURI[0]); - fail("addMetadataFile: content.xml allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("styles.xml", new XURI[0]); - fail("addMetadataFile: styles.xml allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("meta.xml", new XURI[0]); - fail("addMetadataFile: meta.xml allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addMetadataFile("settings.xml", new XURI[0]); - fail("addMetadataFile: settings.xml allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.importMetadataFile(FileFormat.RDF_XML, null, "foo", - foo, new XURI[0]); - fail("importMetadataFile: null stream allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - - final String sEmptyRDF = TestDocument.getUrl("empty.rdf"); - try { - XInputStream xFooIn = new StreamSimulator(sEmptyRDF, true, param); - xDMA.importMetadataFile(FileFormat.RDF_XML, xFooIn, "", - foo, new XURI[0]); - fail("importMetadataFile: empty filename allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - try { - XInputStream xFooIn = - new StreamSimulator(sEmptyRDF, true, param); - xDMA.importMetadataFile(FileFormat.RDF_XML, xFooIn, "meta.xml", - foo, new XURI[0]); - fail("importMetadataFile: meta.xml filename allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - try { - XInputStream xFooIn = - new StreamSimulator(sEmptyRDF, true, param); - xDMA.importMetadataFile(FileFormat.RDF_XML, - xFooIn, "foo", null, new XURI[0]); - fail("importMetadataFile: null base URI allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - try { - XInputStream xFooIn = - new StreamSimulator(sEmptyRDF, true, param); - xDMA.importMetadataFile(FileFormat.RDF_XML, - xFooIn, "foo", rdf_type, new XURI[0]); - fail("importMetadataFile: non-absolute base URI allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.removeMetadataFile(null); - fail("removeMetadataFile: null URI allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addContentOrStylesFile(""); - fail("addContentOrStylesFile: empty filename allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addContentOrStylesFile("/content.xml"); - fail("addContentOrStylesFile: absolute filename allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.addContentOrStylesFile("foo.rdf"); - fail("addContentOrStylesFile: invalid filename allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.removeContentOrStylesFile(""); - fail("removeContentOrStylesFile: empty filename allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.loadMetadataFromStorage(null, foo, null); - fail("loadMetadataFromStorage: null storage allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.storeMetadataToStorage(null/*, base*/); - fail("storeMetadataToStorage: null storage allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.loadMetadataFromMedium(new PropertyValue[0]); - fail("loadMetadataFromMedium: empty medium allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - try { - xDMA.storeMetadataToMedium(new PropertyValue[0]); - fail("storeMetadataToMedium: empty medium allowed"); - } catch (IllegalArgumentException e) { - // ignore - } - - System.out.println("...done"); - - System.out.println("Checking file addition/removal..."); - - xDMA.removeContentOrStylesFile(contentPath); - xStmtsEnum = xManifest.getStatements(null, null, null); - assertTrue("removeContentOrStylesFile (content)", - eq(xStmtsEnum, new Statement[] { - manifestStmts[0], manifestStmts[2], manifestStmts[4] - })); - - xDMA.addContentOrStylesFile(contentPath); - xStmtsEnum = xManifest.getStatements(null, null, null); - assertTrue("addContentOrStylesFile (content)", - eq(xStmtsEnum, manifestStmts)); - - xDMA.removeContentOrStylesFile(stylesPath); - xStmtsEnum = xManifest.getStatements(null, null, null); - assertTrue("removeContentOrStylesFile (styles)", - eq(xStmtsEnum, new Statement[] { - manifestStmts[0], manifestStmts[1], manifestStmts[3] - })); - - xDMA.addContentOrStylesFile(stylesPath); - xStmtsEnum = xManifest.getStatements(null, null, null); - assertTrue("addContentOrStylesFile (styles)", - eq(xStmtsEnum, manifestStmts)); - - XURI xFoo = URI.createNS(xContext, xBaseURI.getStringValue(), - fooPath); - Statement xM_BaseHaspartFoo = - new Statement(xBaseURI, pkg_hasPart, xFoo, manifest); - Statement xM_FooTypeMetadata = - new Statement(xFoo, rdf_type, pkg_MetadataFile, manifest); - Statement xM_FooTypeBar = - new Statement(xFoo, rdf_type, bar, manifest); - xDMA.addMetadataFile(fooPath, new XURI[] { bar }); - xStmtsEnum = xManifest.getStatements(null, null, null); - assertTrue("addMetadataFile", - eq(xStmtsEnum, merge(manifestStmts, new Statement[] { - xM_BaseHaspartFoo, xM_FooTypeMetadata, xM_FooTypeBar - }))); - - XURI[] graphsBar = xDMA.getMetadataGraphsWithType(bar); - assertTrue("getMetadataGraphsWithType", - graphsBar.length == 1 && eq(graphsBar[0], xFoo)); - - - xDMA.removeMetadataFile(xFoo); - xStmtsEnum = xManifest.getStatements(null, null, null); - assertTrue("removeMetadataFile", - eq(xStmtsEnum, manifestStmts)); - - System.out.println("...done"); - - System.out.println("Checking mapping..."); - - XEnumerationAccess xTextEnum = UnoRuntime.queryInterface(XEnumerationAccess.class, xText.getText()); - Object o = xTextEnum.createEnumeration().nextElement(); - XMetadatable xMeta1 = UnoRuntime.queryInterface(XMetadatable.class, o); - - XURI uri; - XMetadatable xMeta; - xMeta = xDMA.getElementByURI(xMeta1); - assertTrue("getElementByURI: null", null != xMeta); - String XmlId = xMeta.getMetadataReference().Second; - String XmlId1 = xMeta1.getMetadataReference().Second; - assertTrue("getElementByURI: no xml id", !XmlId.equals("")); - assertTrue("getElementByURI: different xml id", XmlId.equals(XmlId1)); - - System.out.println("...done"); - - System.out.println("Checking storing and loading..."); - - XURI xFoobar = URI.createNS(xContext, xBaseURI.getStringValue(), - fooBarPath); - Statement[] metadataStmts = getMetadataFileStmts(xBaseURI, - fooBarPath); - xDMA.addMetadataFile(fooBarPath, new XURI[0]); - xStmtsEnum = xRep.getStatements(null, null, null); - assertTrue("addMetadataFile", - eq(xStmtsEnum, merge(manifestStmts, metadataStmts ))); - - Statement xFoobar_FooBarFoo = - new Statement(foo, bar, foo, xFoobar); - xRep.getGraph(xFoobar).addStatement(foo, bar, foo); - xStmtsEnum = xRep.getStatements(null, null, null); - assertTrue("addStatement", - eq(xStmtsEnum, merge(manifestStmts, merge(metadataStmts, - new Statement[] { xFoobar_FooBarFoo })))); - - PropertyValue noMDNoContentFile = new PropertyValue(); - noMDNoContentFile.Name = "URL"; - noMDNoContentFile.Value = TestDocument.getUrl("CUSTOM.odt"); - PropertyValue noMDFile = new PropertyValue(); - noMDFile.Name = "URL"; - noMDFile.Value = TestDocument.getUrl("TEST.odt"); - PropertyValue file = new PropertyValue(); - file.Name = "URL"; - file.Value = tempDir + "TESTDMA.odt"; - /* - PropertyValue baseURL = new PropertyValue(); - baseURL.Name = "DocumentBaseURL"; - baseURL.Value = tempDir + "TMP.odt"; - */ - PropertyValue mimetype = new PropertyValue(); - mimetype.Name = "MediaType"; - mimetype.Value = "application/vnd.oasis.opendocument.text"; - PropertyValue[] argsEmptyNoContent = { mimetype, noMDNoContentFile}; - PropertyValue[] argsEmpty = { mimetype, noMDFile }; - PropertyValue[] args = { mimetype, file }; - - xStmtsEnum = xRep.getStatements(null, null, null); - XURI[] graphs = xRep.getGraphNames(); - - xDMA.storeMetadataToMedium(args); - - // this should re-init - xDMA.loadMetadataFromMedium(argsEmptyNoContent); - xRep = xRS.getRDFRepository(); - assertTrue("xRep null", null != xRep); - assertTrue("baseURI still tdoc?", - !baseURI.equals(xDMA.getStringValue())); - Statement[] manifestStmts2 = getManifestStmts((XURI) xDMA); - xStmtsEnum = xRep.getStatements(null, null, null); - // there is no content or styles file in here, so we have just - // the package stmt - assertTrue("loadMetadataFromMedium (no metadata, no content)", - eq(xStmtsEnum, new Statement[] { manifestStmts2[0] })); - - // this should re-init - xDMA.loadMetadataFromMedium(argsEmpty); - xRep = xRS.getRDFRepository(); - assertTrue("xRep null", null != xRep); - assertTrue("baseURI still tdoc?", - !baseURI.equals(xDMA.getStringValue())); - Statement[] manifestStmts3 = getManifestStmts((XURI) xDMA); - - xStmtsEnum = xRep.getStatements(null, null, null); - assertTrue("loadMetadataFromMedium (no metadata)", - eq(xStmtsEnum, manifestStmts3)); - - xDMA.loadMetadataFromMedium(args); - xRep = xRS.getRDFRepository(); - assertTrue("xRep null", null != xRep); - Statement[] manifestStmts4 = getManifestStmts((XURI) xDMA); - Statement[] metadataStmts4 = getMetadataFileStmts((XURI) xDMA, - fooBarPath); - - xStmtsEnum = xRep.getStatements(null, null, null); - assertTrue("some graph(s) not reloaded", - graphs.length == xRep.getGraphNames().length); - - XURI xFoobar4 = URI.createNS(xContext, xDMA.getStringValue(), - fooBarPath); - Statement xFoobar_FooBarFoo4 = - new Statement(foo, bar, foo, xFoobar4); - assertTrue("loadMetadataFromMedium (re-load)", - eq(xStmtsEnum, merge(manifestStmts4, merge(metadataStmts4, - new Statement[] { xFoobar_FooBarFoo4 })))); - - System.out.println("...done"); - - System.out.println("Checking storing and loading via model..."); - - String f = tempDir + "TESTPARA.odt"; - - XStorable xStor = UnoRuntime.queryInterface(XStorable.class, xRS); - - xStor.storeToURL(f, new PropertyValue[0]); - - xComp2 = util.DesktopTools.loadDoc(xMSF, f, loadProps); - - XDocumentMetadataAccess xDMA2 = UnoRuntime.queryInterface(XDocumentMetadataAccess.class, xComp2); - assertTrue("xDMA2 null", null != xDMA2); - - XRepositorySupplier xRS2 = UnoRuntime.queryInterface(XRepositorySupplier.class, xComp2); - assertTrue("xRS2 null", null != xRS2); - - XRepository xRep2 = xRS2.getRDFRepository(); - assertTrue("xRep2 null", null != xRep2); - - Statement[] manifestStmts5 = getManifestStmts((XURI) xDMA2); - Statement[] metadataStmts5 = getMetadataFileStmts((XURI) xDMA2, - fooBarPath); - XURI xFoobar5 = URI.createNS(xContext, xDMA2.getStringValue(), - fooBarPath); - Statement xFoobar_FooBarFoo5 = - new Statement(foo, bar, foo, xFoobar5); - xStmtsEnum = xRep.getStatements(null, null, null); - XEnumeration xStmtsEnum2 = xRep2.getStatements(null, null, null); - assertTrue("load: repository differs", - eq(xStmtsEnum2, merge(manifestStmts5, merge(metadataStmts5, - new Statement[] { xFoobar_FooBarFoo5 })))); - - System.out.println("...done"); - - } catch (Exception e) { - report(e); - } finally { - close(xComp); - close(xComp2); - } - } - - @Test public void checkRDFa() - { - XComponent xComp = null; - try { - final String file = TestDocument.getUrl("TESTRDFA.odt"); - xComp = loadRDFa(file); - if (xComp != null) - { - final String sNewFile = tempDir + "TESTRDFA.odt"; - storeRDFa(xComp, sNewFile); - close(xComp); - - xComp = loadRDFa(sNewFile); - } - } finally { - close(xComp); - } - } - - private void storeRDFa(XComponent xComp, String file) - { - try { - - System.out.println("Storing test document..."); - - XStorable xStor = UnoRuntime.queryInterface(XStorable.class, xComp); - - xStor.storeToURL(file, new PropertyValue[0]); - - System.out.println("...done"); - - } catch (Exception e) { - report(e); - } - } - - private XComponent loadRDFa(String file) - { - XComponent xComp = null; - try { - - System.out.println("Loading test document..."); - - PropertyValue[] loadProps = new PropertyValue[1]; - loadProps[0] = new PropertyValue(); - loadProps[0].Name = "Hidden"; - loadProps[0].Value = new Boolean(true); - - - - xComp = util.DesktopTools.loadDoc(xMSF, file, loadProps); - - XRepositorySupplier xRS = UnoRuntime.queryInterface(XRepositorySupplier.class, xComp); - assertTrue("xRS null", null != xRS); - - XDocumentRepository xRep = UnoRuntime.queryInterface(XDocumentRepository.class, xRS.getRDFRepository()); - assertTrue("xRep null", null != xRep); - - XTextDocument xTextDoc = UnoRuntime.queryInterface(XTextDocument.class, xComp); - - XText xText = xTextDoc.getText(); - - XEnumerationAccess xEA = UnoRuntime.queryInterface(XEnumerationAccess.class, xText); - XEnumeration xEnum = xEA.createEnumeration(); - - System.out.println("...done"); - - System.out.println("Checking RDFa in loaded test document..."); - - XMetadatable xPara; - Pair result; - - Statement x_FooBarLit1 = new Statement(foo, bar, mkLit("1"), null); - xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assertTrue("RDFa: 1", - !result.Second && - eq(result.First, new Statement[] { - x_FooBarLit1 - })); - - Statement x_FooBarLit2 = new Statement(foo, bar, mkLit("2"), null); - xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assertTrue("RDFa: 2", - !result.Second && - eq(result.First, new Statement[] { - x_FooBarLit2 - })); - - Statement x_BlankBarLit3 = - new Statement(blank1, bar, mkLit("3"), null); - xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assertTrue("RDFa: 3", - !result.Second && - eq(result.First, new Statement[] { - x_BlankBarLit3 - })); - XBlankNode b3 = UnoRuntime.queryInterface(XBlankNode.class, result.First[0].Subject); - - Statement x_BlankBarLit4 = - new Statement(blank2, bar, mkLit("4"), null); - xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assertTrue("RDFa: 4", - !result.Second && - eq(result.First, new Statement[] { - x_BlankBarLit4 - })); - XBlankNode b4 = UnoRuntime.queryInterface(XBlankNode.class, result.First[0].Subject); - - Statement x_BlankBarLit5 = - new Statement(blank1, bar, mkLit("5"), null); - xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assertTrue("RDFa: 5", - !result.Second && - eq(result.First, new Statement[] { - x_BlankBarLit5 - })); - XBlankNode b5 = UnoRuntime.queryInterface(XBlankNode.class, result.First[0].Subject); - - assertTrue("RDFa: 3 != 4", - !b3.getStringValue().equals(b4.getStringValue())); - assertTrue("RDFa: 3 == 5", - b3.getStringValue().equals(b5.getStringValue())); - - Statement x_FooBarLit6 = new Statement(foo, bar, mkLit("6"), null); - Statement x_FooBazLit6 = new Statement(foo, baz, mkLit("6"), null); - xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assertTrue("RDFa: 6", - !result.Second && - eq(result.First, new Statement[] { - x_FooBarLit6, x_FooBazLit6 - })); - - Statement x_FooBarLit7 = new Statement(foo, bar, mkLit("7"), null); - Statement x_FooBazLit7 = new Statement(foo, baz, mkLit("7"), null); - Statement x_FooFooLit7 = new Statement(foo, foo, mkLit("7"), null); - xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assertTrue("RDFa: 7", - !result.Second && - eq(result.First, new Statement[] { - x_FooBarLit7, x_FooBazLit7, x_FooFooLit7 - })); - - XNode lit = mkLit("a fooish bar"); - XNode lit_type= mkLit("a fooish bar", bar); - Statement x_FooBarLit = new Statement(foo, bar, lit, null); - Statement x_FooBarLittype = new Statement(foo, bar, lit_type, null); - - xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assertTrue("RDFa: 8", - result.Second && - eq(result.First, new Statement[] { - x_FooBarLit - })); - - xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assertTrue("RDFa: 9", - result.Second && - eq(result.First, new Statement[] { - x_FooBarLit - })); - - xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assertTrue("RDFa: 10", - result.Second && - eq(result.First, new Statement[] { - x_FooBarLittype - })); - - Statement x_FooBarLit11 - = new Statement(foo, bar, mkLit("11", bar), null); - xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assertTrue("RDFa: 11", - !result.Second && - eq(result.First, new Statement[] { - x_FooBarLit11 - })); - - XURI xFile = URI.createNS(xContext, file, "/" + contentPath); - Statement x_FileBarLit12 = - new Statement(xFile, bar, mkLit("12"), null); - xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assertTrue("RDFa: 12", - !result.Second && - eq(result.First, new Statement[] { - x_FileBarLit12 - })); - - xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assertTrue("RDFa: 13", - result.Second && - eq(result.First, new Statement[] { - x_FooBarLit - })); - - Statement x_FooLabelLit14 = - new Statement(foo, rdfs_label, mkLit("14"), null); - xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assertTrue("RDFa: 14", - result.Second && - eq(result.First, new Statement[] { - /* x_FooLabelLit14 */ x_FooBarLit - })); - - xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assertTrue("RDFa: 15", eq(result.First, new Statement[] { } )); - - xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assertTrue("RDFa: 16", eq(result.First, new Statement[] { } )); - - xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assertTrue("RDFa: 17", eq(result.First, new Statement[] { } )); - - xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assertTrue("RDFa: 18", eq(result.First, new Statement[] { } )); - - xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assertTrue("RDFa: 19", eq(result.First, new Statement[] { } )); - - xPara = UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assertTrue("RDFa: 20", eq(result.First, new Statement[] { } )); - - xPara = UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); - result = xRep.getStatementRDFa(xPara); - assertTrue("RDFa: 21", eq(result.First, new Statement[] { } )); - - System.out.println("...done"); - - } catch (Exception e) { - report(e); - close(xComp); - } - return xComp; - } - - -// utilities ------------------------------------------------------------- - - public void report2(Exception e) - { - if (e instanceof WrappedTargetException) - { - System.out.println("Cause:"); - Exception cause = (Exception) - (((WrappedTargetException)e).TargetException); - System.out.println(cause.toString()); - report2(cause); - } else if (e instanceof WrappedTargetRuntimeException) { - System.out.println("Cause:"); - Exception cause = (Exception) - (((WrappedTargetRuntimeException)e).TargetException); - System.out.println(cause.toString()); - report2(cause); - } - } - - public void report(Exception e) { - System.out.println("Exception occurred:"); - e.printStackTrace(); - report2(e); - fail(); - } - - static void close(XComponent i_comp) - { - try { - XCloseable xClos = UnoRuntime.queryInterface(XCloseable.class, i_comp); - if (xClos != null) - { - xClos.close(true); - } - } catch (Exception e) { - } - } - - XLiteral mkLit(String i_content) - { - return Literal.create(xContext, i_content); - } - - XLiteral mkLit(String i_content, XURI i_uri) - { - return Literal.createWithType(xContext, i_content, i_uri); - } - - static Statement[] merge(Statement[] i_A1, Statement[] i_A2) - { - // bah, java sucks... - Statement[] ret = new Statement[i_A1.length + i_A2.length]; - for (int i = 0; i < i_A1.length; ++i) { - ret[i] = i_A1[i]; - } - for (int i = 0; i < i_A2.length; ++i) { - ret[i+i_A1.length] = i_A2[i]; - } - return ret; - } - - public static String toS(XNode n) { - if (null == n) - { - return "< null >"; - } - return n.getStringValue(); - } - - static boolean isBlank(XNode i_node) - { - XBlankNode blank = UnoRuntime.queryInterface(XBlankNode.class, i_node); - return blank != null; - } - -/* - static class Statement implements XStatement - { - XResource m_Subject; - XResource m_Predicate; - XNode m_Object; - XURI m_Graph; - - Statement(XResource i_Subject, XResource i_Predicate, XNode i_Object, - XURI i_Graph) - { - m_Subject = i_Subject; - m_Predicate = i_Predicate; - m_Object = i_Object; - m_Graph = i_Graph; - } - - public XResource getSubject() { return m_Subject; } - public XResource getPredicate() { return m_Predicate; } - public XNode getObject() { return m_Object; } - public XURI getGraph() { return m_Graph; } - } -*/ - - static Statement[] toSeq(XEnumeration i_Enum) throws Exception - { - java.util.Collection c = new java.util.Vector(); - while (i_Enum.hasMoreElements()) { - Statement s = (Statement) i_Enum.nextElement(); -//System.out.println("toSeq: " + s.getSubject().getStringValue() + " " + s.getPredicate().getStringValue() + " " + s.getObject().getStringValue() + "."); - c.add(s); - } -// return (Statement[]) c.toArray(); - // java sucks - Object[] arr = c.toArray(); - Statement[] ret = new Statement[arr.length]; - for (int i = 0; i < arr.length; ++i) { - ret[i] = (Statement) arr[i]; - } - return ret; - } - - static XNode[][] toSeqs(XEnumeration i_Enum) throws Exception - { - java.util.Collection c = new java.util.Vector(); - while (i_Enum.hasMoreElements()) { - XNode[] s = (XNode[]) i_Enum.nextElement(); - c.add(s); - } -// return (XNode[][]) c.toArray(); - Object[] arr = c.toArray(); - XNode[][] ret = new XNode[arr.length][]; - for (int i = 0; i < arr.length; ++i) { - ret[i] = (XNode[]) arr[i]; - } - return ret; - } - - static class BindingComp implements java.util.Comparator - { - public int compare(Object i_Left, Object i_Right) - { - XNode[] left = (XNode[]) i_Left; - XNode[] right = (XNode[]) i_Right; - if (left.length != right.length) - { - throw new RuntimeException(); - } - for (int i = 0; i < left.length; ++i) { - int eq = (left[i].getStringValue().compareTo( - right[i].getStringValue())); - if (eq != 0) - { - return eq; - } - } - return 0; - } - } - - static class StmtComp implements java.util.Comparator - { - public int compare(Object i_Left, Object i_Right) - { - int eq; - Statement left = (Statement) i_Left; - Statement right = (Statement) i_Right; - if ((eq = cmp(left.Graph, right.Graph )) != 0) return eq; - if ((eq = cmp(left.Subject, right.Subject )) != 0) return eq; - if ((eq = cmp(left.Predicate, right.Predicate)) != 0) return eq; - if ((eq = cmp(left.Object, right.Object )) != 0) return eq; - return 0; - } - - public int cmp(XNode i_Left, XNode i_Right) - { - if (isBlank(i_Left)) { - return isBlank(i_Right) ? 0 : 1; - } else { - if (isBlank(i_Right)) { - return -1; - } else { - return toS(i_Left).compareTo(toS(i_Right)); - } - } - } - } - - static boolean eq(Statement i_Left, Statement i_Right) - { - XURI lG = i_Left.Graph; - XURI rG = i_Right.Graph; - if (!eq(lG, rG)) { - System.out.println("Graphs differ: " + toS(lG) + " != " + toS(rG)); - return false; - } - if (!eq(i_Left.Subject, i_Right.Subject)) { - System.out.println("Subjects differ: " + - i_Left.Subject.getStringValue() + " != " + - i_Right.Subject.getStringValue()); - return false; - } - if (!eq(i_Left.Predicate, i_Right.Predicate)) { - System.out.println("Predicates differ: " + - i_Left.Predicate.getStringValue() + " != " + - i_Right.Predicate.getStringValue()); - return false; - } - if (!eq(i_Left.Object, i_Right.Object)) { - System.out.println("Objects differ: " + - i_Left.Object.getStringValue() + " != " + - i_Right.Object.getStringValue()); - return false; - } - return true; - } - - static boolean eq(Statement[] i_Result, Statement[] i_Expected) - { - if (i_Result.length != i_Expected.length) { - System.out.println("eq: different lengths: " + i_Result.length + " " + - i_Expected.length); - return false; - } - Statement[] expected = (Statement[]) - java.util.Arrays.asList(i_Expected).toArray(); - java.util.Arrays.sort(i_Result, new StmtComp()); - java.util.Arrays.sort(expected, new StmtComp()); - for (int i = 0; i < expected.length; ++i) - { - // This is better for debug! - final Statement a = i_Result[i]; - final Statement b = expected[i]; - final boolean cond = eq(a, b); - if (!cond) return false; - } - return true; - } - - static boolean eq(XEnumeration i_Enum, Statement[] i_Expected) - throws Exception - { - Statement[] current = toSeq(i_Enum); - return eq(current, i_Expected); - } - - static boolean eq(XNode i_Left, XNode i_Right) - { - if (i_Left == null) { - return (i_Right == null); - } else { - return (i_Right != null) && - (i_Left.getStringValue().equals(i_Right.getStringValue()) - // FIXME: hack: blank nodes considered equal - || (isBlank(i_Left) && isBlank(i_Right))); - } - } - - static boolean eq(XQuerySelectResult i_Result, - String[] i_Vars, XNode[][] i_Bindings) throws Exception - { - String[] vars = i_Result.getBindingNames(); - XEnumeration iter = (XEnumeration) i_Result; - XNode[][] bindings = toSeqs(iter); - if (vars.length != i_Vars.length) { - System.out.println("var lengths differ"); - return false; - } - if (bindings.length != i_Bindings.length) { - System.out.println("binding lengths differ: " + i_Bindings.length + - " vs " + bindings.length ); - return false; - } - java.util.Arrays.sort(bindings, new BindingComp()); - java.util.Arrays.sort(i_Bindings, new BindingComp()); - for (int i = 0; i < i_Bindings.length; ++i) { - if (i_Bindings[i].length != i_Vars.length) { - System.out.println("TEST ERROR!"); - throw new Exception(); - } - if (bindings[i].length != i_Vars.length) { - System.out.println("binding length and var length differ"); - return false; - } - for (int j = 0; j < i_Vars.length; ++j) { - if (!eq(bindings[i][j], i_Bindings[i][j])) { - System.out.println("bindings differ: " + - toS(bindings[i][j]) + " != " + toS(i_Bindings[i][j])); - return false; - } - } - } - for (int i = 0; i < i_Vars.length; ++i) { - if (!vars[i].equals(i_Vars[i])) { - System.out.println("variable names differ: " + - vars[i] + " != " + i_Vars[i]); - return false; - } - } - return true; - } - - static boolean eq(StringPair i_Left, StringPair i_Right) - { - return ((i_Left.First).equals(i_Right.First)) && - ((i_Left.Second).equals(i_Right.Second)); - } - - static String mkNamespace(String i_prefix, String i_namespace) - { - return "PREFIX " + i_prefix + ": <" + i_namespace + ">\n"; - } - - static String mkNss() - { - String namespaces = mkNamespace("rdf", - "http://www.w3.org/1999/02/22-rdf-syntax-ns#"); - namespaces += mkNamespace("pkg", - "http://docs.oasis-open.org/opendocument/meta/package/common#"); - namespaces += mkNamespace("odf", - "http://docs.oasis-open.org/opendocument/meta/package/odf#"); - return namespaces; - } - - Statement[] getManifestStmts(XURI xBaseURI) throws Exception - { - XURI xManifest = URI.createNS(xContext, xBaseURI.getStringValue(), - manifestPath); - XURI xContent = URI.createNS(xContext, xBaseURI.getStringValue(), - contentPath); - XURI xStyles = URI.createNS(xContext, xBaseURI.getStringValue(), - stylesPath); - Statement xM_BaseTypeDoc = - new Statement(xBaseURI, rdf_type, pkg_Document, xManifest); - Statement xM_BaseHaspartContent = - new Statement(xBaseURI, pkg_hasPart, xContent, xManifest); - Statement xM_BaseHaspartStyles = - new Statement(xBaseURI, pkg_hasPart, xStyles, xManifest); - Statement xM_ContentTypeContent = - new Statement(xContent, rdf_type, odf_ContentFile, xManifest); - Statement xM_StylesTypeStyles = - new Statement(xStyles, rdf_type, odf_StylesFile, xManifest); - return new Statement[] { - xM_BaseTypeDoc, xM_BaseHaspartContent, xM_BaseHaspartStyles, - xM_ContentTypeContent, xM_StylesTypeStyles - }; - } - - Statement[] getMetadataFileStmts(XURI xBaseURI, String Path) - throws Exception - { - XURI xManifest = URI.createNS(xContext, xBaseURI.getStringValue(), - manifestPath); - XURI xGraph = URI.createNS(xContext, xBaseURI.getStringValue(), Path); - Statement xM_BaseHaspartGraph = - new Statement(xBaseURI, pkg_hasPart, xGraph, xManifest); - Statement xM_GraphTypeMetadata = - new Statement(xGraph, rdf_type, pkg_MetadataFile, xManifest); - return new Statement[] { xM_BaseHaspartGraph, xM_GraphTypeMetadata }; - } - - class TestRange implements XTextRange, XMetadatable, XServiceInfo - { - String m_Stream; - String m_XmlId; - String m_Text; - TestRange(String i_Str) { m_Text = i_Str; } - - public String getStringValue() { return ""; } - public String getNamespace() { return ""; } - public String getLocalName() { return ""; } - - public StringPair getMetadataReference() - { - return new StringPair(m_Stream, m_XmlId); - } - public void setMetadataReference(StringPair i_Ref) - throws IllegalArgumentException - { - m_Stream = i_Ref.First; - m_XmlId = i_Ref.Second; - } - public void ensureMetadataReference() - { - m_Stream = "content.xml"; - m_XmlId = "42"; - } - - public String getImplementationName() { return null; } - public String[] getSupportedServiceNames() { return null; } - public boolean supportsService(String i_Svc) - { - return i_Svc.equals("com.sun.star.text.Paragraph"); - } - - public XText getText() { return null; } - public XTextRange getStart() { return null; } - public XTextRange getEnd() { return null; } - public String getString() { return m_Text; } - public void setString(String i_Str) { m_Text = i_Str; } - } - - - - private XMultiServiceFactory getMSF() - { - final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); - return xMSF1; - } - - // setup and close connections - @BeforeClass public static void setUpConnection() throws Exception { - System.out.println("setUpConnection()"); - connection.setUp(); - } - - @AfterClass public static void tearDownConnection() - throws InterruptedException, com.sun.star.uno.Exception - { - System.out.println("tearDownConnection() DocumentMetadataAccessTest"); - connection.tearDown(); - } - - private static final OfficeConnection connection = new OfficeConnection(); - -} - diff --git a/sfx2/qa/complex/framework/DocumentPropertiesTest.java b/sfx2/qa/complex/framework/DocumentPropertiesTest.java deleted file mode 100644 index 20a0746c8322..000000000000 --- a/sfx2/qa/complex/framework/DocumentPropertiesTest.java +++ /dev/null @@ -1,565 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -package complex.framework; - - -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XComponentContext; -import com.sun.star.lang.XInitialization; - -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.lang.Locale; -import com.sun.star.lang.EventObject; -import com.sun.star.util.Date; -import com.sun.star.util.DateTime; -import com.sun.star.util.Time; -import com.sun.star.util.Duration; -import com.sun.star.util.XModifyListener; -import com.sun.star.util.XModifyBroadcaster; -import com.sun.star.beans.XPropertyContainer; -import com.sun.star.beans.XPropertySet; -import com.sun.star.beans.PropertyValue; -import com.sun.star.beans.NamedValue; -import com.sun.star.beans.PropertyAttribute; -import com.sun.star.beans.UnknownPropertyException; -import com.sun.star.beans.IllegalTypeException; - -import com.sun.star.document.XDocumentProperties; - -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.openoffice.test.OfficeConnection; -import static org.junit.Assert.*; - -/** - * Test case for the service com.sun.star.document.DocumentProperties. - * Currently, this service is implemented in - * sfx2/source/doc/SfxDocumentMetaData.cxx. - * - * @author mst - */ -public class DocumentPropertiesTest -{ -// public String[] getTestMethodNames () { -// return new String[] { "check", "cleanup" }; -// } - - @After public void cleanup() { - // nothing to do - } - - // for testing modifications - class Listener implements XModifyListener { - private boolean m_Called; - - public Listener() { - m_Called = false; - } - - public boolean reset() { - boolean oldCalled = m_Called; - m_Called = false; - return oldCalled; - } - - public void modified(EventObject e) { - m_Called = true; - } - - public void disposing(EventObject e) { - } - } - - @Test public void check() { - try { - XMultiServiceFactory xMSF = getMSF(); - assertNotNull("could not create MultiServiceFactory.", xMSF); - XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xMSF); - Object defaultCtx = xPropertySet.getPropertyValue("DefaultContext"); - XComponentContext xContext = UnoRuntime.queryInterface(XComponentContext.class, defaultCtx); - assertNotNull("could not get component context.", xContext); - - // TODO: Path to temp - String temp = util.utils.getOfficeTemp/*Dir*/(xMSF); - System.out.println("tempdir: " + temp); - - PropertyValue[] noArgs = { }; - PropertyValue mimetype = new PropertyValue(); - mimetype.Name = "MediaType"; - mimetype.Value = "application/vnd.oasis.opendocument.text"; - PropertyValue[] mimeArgs = { mimetype }; -// new Any("application/vnd.oasis.opendocument.text")) }; - PropertyValue cfile = new PropertyValue(); - cfile.Name = "URL"; - cfile.Value = temp + "EMPTY.odt"; - PropertyValue[] mimeEmptyArgs = { mimetype, cfile }; - - System.out.println("Creating service DocumentProperties..."); - - Object oDP = -// xMSF.createInstanceWithContext( -// "com.sun.star.document.DocumentProperties", xContext); - xMSF.createInstance("com.sun.star.document.DocumentProperties"); - XDocumentProperties xDP = UnoRuntime.queryInterface(XDocumentProperties.class, oDP); - - System.out.println("...done"); - - - System.out.println("Checking initialize ..."); - - XDocumentProperties xDP2 = UnoRuntime.queryInterface(XDocumentProperties.class, xMSF.createInstance("com.sun.star.document.DocumentProperties")); - XInitialization xInit = UnoRuntime.queryInterface(XInitialization.class, xDP2); - xInit.initialize(new Object[] { }); - - System.out.println("...done"); - - System.out.println("Checking storing default-initialized meta data ..."); - -// xDP2.storeToMedium(temp + "EMPTY.odt", mimeArgs); - xDP2.storeToMedium("", mimeEmptyArgs); - - System.out.println("...done"); - - System.out.println("Checking loading default-initialized meta data ..."); - -// xDP2.loadFromMedium(temp + "EMPTY.odt", noArgs); - xDP2.loadFromMedium("", mimeEmptyArgs); - assertTrue ("Author", "".equals(xDP2.getAuthor())); - - System.out.println("...done"); - - System.out.println("(Not) Checking preservation of custom meta data ..."); - - xDP2.loadFromMedium(TestDocument.getUrl("CUSTOM.odt"), - noArgs); - assertTrue ("Author", "".equals(xDP2.getAuthor())); - xDP2.storeToMedium(temp + "CUSTOM.odt", mimeArgs); - - //FIXME: now what? comparing for binary equality seems useless - // we could unzip the written file and grep for the custom stuff - // but would that work on windows... - - System.out.println("...done"); - - System.out.println("Checking loading from test document..."); - - String file = TestDocument.getUrl("TEST.odt"); - xDP.loadFromMedium(file, noArgs); -/* XInputStream xStream = - new StreamSimulator("./testdocuments/TEST.odt", true, param); - Object oSF = - xMSF.createInstance("com.sun.star.embed.StorageFactory"); - XSingleServiceFactory xSF = (XSingleServiceFactory) - UnoRuntime.queryInterface(XSingleServiceFactory.class, oSF); - Object oStor = xSF.createInstanceWithArguments( - new Object[] { xStream }); - XStorage xStor = (XStorage) UnoRuntime.queryInterface( - XStorage.class, oStor); - xDP.loadFromStorage(xStor);*/ - - System.out.println("...done"); - - System.out.println("Checking meta-data import..."); - - assertTrue("Author", "Karl-Heinz Mustermann".equals(xDP.getAuthor())); - assertTrue("Generator", - "StarOffice/8$Solaris_x86 OpenOffice.org_project/680m232$Build-9227" - .equals(xDP.getGenerator())); - assertTrue("CreationDate", 2007 == xDP.getCreationDate().Year); - assertTrue("Title", "Urgent Memo".equals(xDP.getTitle())); - assertTrue("Subject", "Wichtige Mitteilung".equals(xDP.getSubject())); - assertTrue("Description", - "Modern internal company memorandum in full-blocked style" - .equals(xDP.getDescription())); -// assertTrue("Language", "".equals(xDP.getLanguage())); - assertTrue("ModifiedBy", - "Karl-Heinz Mustermann".equals(xDP.getModifiedBy())); - assertTrue("ModificationDate", 10 == xDP.getModificationDate().Month); - assertTrue("PrintedBy", - "Karl-Heinz Mustermann".equals(xDP.getPrintedBy())); - assertTrue("PrintDate", 29 == xDP.getPrintDate().Day); - assertTrue("TemplateName", - "Modern Memo".equals(xDP.getTemplateName())); - assertTrue("TemplateURL", - xDP.getTemplateURL().endsWith("memmodern.ott")); - assertTrue("TemplateDate", 17 == xDP.getTemplateDate().Hours); - assertTrue("AutoloadURL", "../TEST.odt".equals(xDP.getAutoloadURL())); - assertTrue("AutoloadSecs", 0 == xDP.getAutoloadSecs()); - assertTrue("DefaultTarget", "_blank".equals(xDP.getDefaultTarget())); - assertTrue("EditingCycles", 3 == xDP.getEditingCycles()); - assertTrue("EditingDuration", 320 == xDP.getEditingDuration()); - - String[] kws = xDP.getKeywords(); - assertTrue("Keywords", fromArray(kws).containsAll( - fromArray(new Object[] { "Asien", "Memo", "Reis" }))); - - NamedValue[] ds = xDP.getDocumentStatistics(); -/* for (int i = 0; i < ds.length; ++i) { - System.out.println("nv: " + ds[i].Name + " " + ds[i].Value); - } - NamedValue nv1 = new NamedValue("WordCount", new Integer(23)); - NamedValue nv2 = new NamedValue("WordCount", new Integer(23)); - System.out.println("eq: " + nv1.equals(nv2)); // grrr, this is false... -*/ - assertTrue("DocumentStatistics:WordCount", containsNV(ds, - new NamedValue("WordCount", new Integer(23)))); - assertTrue("DocumentStatistics:PageCount", containsNV(ds, - new NamedValue("PageCount", new Integer(1)))); - - XPropertyContainer udpc = xDP.getUserDefinedProperties(); - XPropertySet udps = (XPropertySet) UnoRuntime.queryInterface( - XPropertySet.class, udpc); - assertTrue("UserDefined 1", "Dies ist ein wichtiger Hinweis" - .equals(udps.getPropertyValue("Hinweis"))); - assertTrue("UserDefined 2", ("Kann Spuren von N" - + new String(new byte[] { (byte) 0xc3, (byte) 0xbc }, "UTF-8") - + "ssen enthalten") - .equals(udps.getPropertyValue("Warnung"))); - - System.out.println("...done"); - - System.out.println("Checking meta-data updates..."); - - String str; - DateTime dt = new DateTime(); - Locale l = new Locale(); - int i; - - str = "me"; - xDP.setAuthor(str); - assertTrue("setAuthor", str.equals(xDP.getAuthor())); - str = "the computa"; - xDP.setGenerator(str); - assertTrue("setGenerator", str.equals(xDP.getGenerator())); - dt.Year = 2038; - dt.Month = 1; - dt.Day = 1; - xDP.setCreationDate(dt); - assertTrue("setCreationDate", dt.Year == xDP.getCreationDate().Year); - str = "El t'itulo"; - xDP.setTitle(str); - assertTrue("setTitle", str.equals(xDP.getTitle())); - str = "Ein verkommenes Subjekt"; - xDP.setSubject(str); - assertTrue("setSubject", str.equals(xDP.getSubject())); - str = "Este descripci'on no es importante"; - xDP.setDescription(str); - assertTrue("setDescription", str.equals(xDP.getDescription())); - l.Language = "en"; - l.Country = "GB"; - xDP.setLanguage(l); - Locale l2 = xDP.getLanguage(); - assertTrue("setLanguage Lang", l.Language.equals(l2.Language)); - assertTrue("setLanguage Cty", l.Country.equals(l2.Country)); - str = "myself"; - xDP.setModifiedBy(str); - assertTrue("setModifiedBy", str.equals(xDP.getModifiedBy())); - dt.Year = 2042; - xDP.setModificationDate(dt); - assertTrue("setModificationDate", - dt.Year == xDP.getModificationDate().Year); - str = "i didnt do it"; - xDP.setPrintedBy(str); - assertTrue("setPrintedBy", str.equals(xDP.getPrintedBy())); - dt.Year = 2024; - xDP.setPrintDate(dt); - assertTrue("setPrintDate", dt.Year == xDP.getPrintDate().Year); - str = "blah"; - xDP.setTemplateName(str); - assertTrue("setTemplateName", str.equals(xDP.getTemplateName())); - str = "gopher://some-hole-in-the-ground/"; - xDP.setTemplateURL(str); - assertTrue("setTemplateURL", str.equals(xDP.getTemplateURL())); - dt.Year = 2043; - xDP.setTemplateDate(dt); - assertTrue("setTemplateDate", dt.Year == xDP.getTemplateDate().Year); - str = "http://nowhere/"; - xDP.setAutoloadURL(str); - assertTrue("setAutoloadURL", str.equals(xDP.getAutoloadURL())); - i = 3661; // this might not work (due to conversion via double...) - xDP.setAutoloadSecs(i); -// System.out.println("set: " + i + " get: " + xDP.getAutoloadSecs()); - assertTrue("setAutoloadSecs", i == xDP.getAutoloadSecs()); - str = "_blank"; - xDP.setDefaultTarget(str); - assertTrue("setDefaultTarget", str.equals(xDP.getDefaultTarget())); - i = 42; - xDP.setEditingCycles((short) i); - assertTrue("setEditingCycles", i == xDP.getEditingCycles()); - i = 84; - xDP.setEditingDuration(i); - assertTrue("setEditingDuration", i == xDP.getEditingDuration()); - str = ""; - - String[] kws2 = new String[] { - "keywordly", "keywordlike", "keywordalicious" }; - xDP.setKeywords(kws2); - kws = xDP.getKeywords(); - assertTrue("setKeywords", fromArray(kws).containsAll(fromArray(kws2))); - - NamedValue[] ds2 = new NamedValue[] { - new NamedValue("SyllableCount", new Integer(9)), - new NamedValue("FrameCount", new Integer(2)), - new NamedValue("SentenceCount", new Integer(7)) }; - xDP.setDocumentStatistics(ds2); - ds = xDP.getDocumentStatistics(); - assertTrue("setDocumentStatistics:SyllableCount", containsNV(ds, - new NamedValue("SyllableCount", new Integer(9)))); - assertTrue("setDocumentStatistics:FrameCount", containsNV(ds, - new NamedValue("FrameCount", new Integer(2)))); - assertTrue("setDocumentStatistics:SentenceCount", containsNV(ds, - new NamedValue("SentenceCount", new Integer(7)))); - - System.out.println("...done"); - - System.out.println("Checking user-defined meta-data updates..."); - - // actually, this tests the PropertyBag service - // but maybe the DocumentProperties service will be implemented - // differently some day... - boolean b = true; - double d = 3.1415; - // note that Time is only supported for backward compatibilty! - Time t = new Time(); - t.Hours = 1; - t.Minutes = 16; - Date date = new Date(); - date.Year = 2071; - date.Month = 2; - date.Day = 3; - dt.Year = 2065; - Duration dur = new Duration(); - dur.Negative = true; - dur.Years = 1001; - dur.Months = 999; - dur.Days = 888; - dur.Hours = 777; - dur.Minutes = 666; - dur.Seconds = 555; - dur.MilliSeconds = 444; - - udpc.addProperty("Frobnicate", PropertyAttribute.REMOVEABLE, - new Boolean(b)); - udpc.addProperty("FrobDuration", PropertyAttribute.REMOVEABLE, dur); - udpc.addProperty("FrobDuration2", PropertyAttribute.REMOVEABLE, t); - udpc.addProperty("FrobEndDate", PropertyAttribute.REMOVEABLE, date); - udpc.addProperty("FrobStartTime", PropertyAttribute.REMOVEABLE, dt); - udpc.addProperty("Pi", PropertyAttribute.REMOVEABLE, new Double(d)); - udpc.addProperty("Foo", PropertyAttribute.REMOVEABLE, "bar"); - udpc.addProperty("Removed", PropertyAttribute.REMOVEABLE, "bar"); - // #i94175#: empty property name is valid ODF 1.1 - udpc.addProperty("", PropertyAttribute.REMOVEABLE, "eeeeek"); - try { - udpc.removeProperty("Info 1"); - udpc.removeProperty("Removed"); - } catch (UnknownPropertyException e) { - fail("removeProperty failed"); - } - - try { - udpc.addProperty("Forbidden", PropertyAttribute.REMOVEABLE, - new String[] { "foo", "bar" }); - fail("inserting value of non-supported type did not fail"); - } catch (IllegalTypeException e) { - // ignore - } - - assertTrue("UserDefined bool", new Boolean(b).equals( - udps.getPropertyValue("Frobnicate"))); - assertTrue("UserDefined duration", eqDuration(dur, (Duration) - udps.getPropertyValue("FrobDuration"))); - assertTrue("UserDefined time", eqTime(t, (Time) - udps.getPropertyValue("FrobDuration2"))); - assertTrue("UserDefined date", eqDate(date, (Date) - udps.getPropertyValue("FrobEndDate"))); - assertTrue("UserDefined datetime", eqDateTime(dt, (DateTime) - udps.getPropertyValue("FrobStartTime"))); - assertTrue("UserDefined float", new Double(d).equals( - udps.getPropertyValue("Pi"))); - assertTrue("UserDefined string", "bar".equals( - udps.getPropertyValue("Foo"))); - assertTrue("UserDefined empty name", "eeeeek".equals( - udps.getPropertyValue(""))); - - try { - udps.getPropertyValue("Removed"); - fail("UserDefined remove didn't"); - } catch (UnknownPropertyException e) { - // ok - } - - System.out.println("...done"); - - System.out.println("Checking storing meta-data to file..."); - - xDP.storeToMedium(temp + "TEST.odt", mimeArgs); - - System.out.println("...done"); - - System.out.println("Checking loading meta-data from stored file..."); - - xDP.loadFromMedium(temp + "TEST.odt", noArgs); - - System.out.println("...done"); - - System.out.println("Checking user-defined meta-data from stored file..."); - - udpc = xDP.getUserDefinedProperties(); - udps = (XPropertySet) UnoRuntime.queryInterface( - XPropertySet.class, udpc); - - assertTrue("UserDefined bool", new Boolean(b).equals( - udps.getPropertyValue("Frobnicate"))); - assertTrue("UserDefined duration", eqDuration(dur, (Duration) - udps.getPropertyValue("FrobDuration"))); - // this is now a Duration! - Duration t_dur = new Duration(false, (short)0, (short)0, (short)0, - t.Hours, t.Minutes, t.Seconds, - (short)(10 * t.HundredthSeconds)); - assertTrue("UserDefined time", eqDuration(t_dur, (Duration) - udps.getPropertyValue("FrobDuration2"))); - assertTrue("UserDefined date", eqDate(date, (Date) - udps.getPropertyValue("FrobEndDate"))); - assertTrue("UserDefined datetime", eqDateTime(dt, (DateTime) - udps.getPropertyValue("FrobStartTime"))); - assertTrue("UserDefined float", new Double(d).equals( - udps.getPropertyValue("Pi"))); - assertTrue("UserDefined string", "bar".equals( - udps.getPropertyValue("Foo"))); - - try { - udps.getPropertyValue("Removed"); - fail("UserDefined remove didn't"); - } catch (UnknownPropertyException e) { - // ok - } - - System.out.println("...done"); - - System.out.println("Checking notification listener interface..."); - - Listener listener = new Listener(); - XModifyBroadcaster xMB = (XModifyBroadcaster) - UnoRuntime.queryInterface(XModifyBroadcaster.class, xDP); - xMB.addModifyListener(listener); - xDP.setAuthor("not me"); - assertTrue("Listener Author", listener.reset()); - udpc.addProperty("Listener", PropertyAttribute.REMOVEABLE, "foo"); - assertTrue("Listener UserDefined Add", listener.reset()); - udps.setPropertyValue("Listener", "bar"); - assertTrue("Listener UserDefined Set", listener.reset()); - udpc.removeProperty("Listener"); - assertTrue("Listener UserDefined Remove", listener.reset()); - xMB.removeModifyListener(listener); - udpc.addProperty("Listener2", PropertyAttribute.REMOVEABLE, "foo"); - assertTrue("Removed Listener UserDefined Add", !listener.reset()); - - System.out.println("...done"); - - } catch (Exception e) { - report(e); - } - } - - // grrr... - boolean eqDateTime(DateTime a, DateTime b) { - return a.Year == b.Year && a.Month == b.Month && a.Day == b.Day - && a.Hours == b.Hours && a.Minutes == b.Minutes - && a.Seconds == b.Seconds - && a.HundredthSeconds == b.HundredthSeconds; - } - - boolean eqDate(Date a, Date b) { - return a.Year == b.Year && a.Month == b.Month && a.Day == b.Day; - } - - boolean eqTime(Time a, Time b) { - return a.Hours == b.Hours && a.Minutes == b.Minutes - && a.Seconds == b.Seconds - && a.HundredthSeconds == b.HundredthSeconds; - } - - boolean eqDuration(Duration a, Duration b) { - return a.Years == b.Years && a.Months == b.Months && a.Days == b.Days - && a.Hours == b.Hours && a.Minutes == b.Minutes - && a.Seconds == b.Seconds - && a.MilliSeconds == b.MilliSeconds - && a.Negative == b.Negative; - } - - java.util.Collection fromArray(Object[] os) { - java.util.Collection ret = new java.util.HashSet(); - for (int i = 0; i < os.length; ++i) { - ret.add(os[i]); - } - return ret; - } - - // bah, structs do not have proper equals(), and uno.Type is not comparable - public static boolean containsNV (NamedValue[] nvs, NamedValue nv) { - for (int i = 0; i < nvs.length; ++i) { - if (nvs[i].Name.equals(nv.Name) && nvs[i].Value.equals(nv.Value)) { - return true; - } - } - return false; - } - - public void report(Exception e) { - System.out.println("Exception occurred:"); - e.printStackTrace(); - fail(); - } - - - private XMultiServiceFactory getMSF() - { - final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); - return xMSF1; - } - - // setup and close connections - @BeforeClass public static void setUpConnection() throws Exception { - System.out.println("setUpConnection()"); - connection.setUp(); - } - - @AfterClass public static void tearDownConnection() - throws InterruptedException, com.sun.star.uno.Exception - { - System.out.println("tearDownConnection() DocumentPropertiesTest"); - connection.tearDown(); - } - - private static final OfficeConnection connection = new OfficeConnection(); - -} - diff --git a/sfx2/qa/complex/framework/TestDocument.java b/sfx2/qa/complex/framework/TestDocument.java deleted file mode 100644 index 8cc6ef7756b1..000000000000 --- a/sfx2/qa/complex/framework/TestDocument.java +++ /dev/null @@ -1,39 +0,0 @@ -/************************************************************************* -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* -* for a copy of the LGPLv3 License. -* -************************************************************************/ - -package complex.framework; - -import java.io.File; -import org.openoffice.test.OfficeFileUrl; - -final class TestDocument { - public static String getUrl(String name) { - return OfficeFileUrl.getAbsolute(new File("testdocuments", name)); - } - - private TestDocument() {} -} diff --git a/sfx2/qa/complex/framework/WriterHelper.java b/sfx2/qa/complex/framework/WriterHelper.java deleted file mode 100644 index d3f19703bb9d..000000000000 --- a/sfx2/qa/complex/framework/WriterHelper.java +++ /dev/null @@ -1,287 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.framework.DocHelper; - -import com.sun.star.accessibility.AccessibleRole; -import com.sun.star.accessibility.XAccessible; -import com.sun.star.accessibility.XAccessibleAction; -import com.sun.star.accessibility.XAccessibleContext; -import com.sun.star.accessibility.XAccessibleSelection; -import com.sun.star.awt.XExtendedToolkit; -import com.sun.star.awt.XWindow; -import com.sun.star.frame.XDesktop; -import com.sun.star.lang.XComponent; -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.text.XTextDocument; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.util.XCloseable; - -import complex.framework.DocHelper.DialogThread; -import java.io.PrintWriter; - -import util.AccessibilityTools; -import util.WriterTools; - - -/** - * Methods to open Writer docs - * - */ -public class WriterHelper { - XMultiServiceFactory m_xMSF = null; - - /** Creates a new instance of WriterHelper - * @param m_xMSF The MultiServiceFactory gained from the office - */ - public WriterHelper(XMultiServiceFactory m_xMSF) { - this.m_xMSF = m_xMSF; - } - - /** Opens an empty document - * @return a reference to the opened document is returned - */ - public XTextDocument openEmptyDoc() { - return WriterTools.createTextDoc(m_xMSF); - } - - /** Closes a given XTextDocument - * @param xTextDoc the text document to be closed - * @return if an error occurs the errormessage is returned and an empty String if not - */ - public String closeDoc(XTextDocument xTextDoc) { - XCloseable closer = UnoRuntime.queryInterface(XCloseable.class, xTextDoc); - String err = ""; - - try { - closer.close(true); - } catch (com.sun.star.util.CloseVetoException e) { - err = "couldn't close document " + e; - System.out.println(err); - } - - return err; - } - - private XTextDocument xLocalDoc = null; - /** a TextDocument is opened by pressing a button in a dialog given by uno-URL - * @param url the uno-URL of the dialog to be opened - * @param createButton the language dependend label of the button to be pressed - * @param destroyLocal if true the document that has been opened to dispatch the dialog is closed before the method returns, - * otherwise this document remains open - * @return returns the created Textdocument - */ - public XTextDocument openFromDialog(String url, String createButton, - boolean destroyLocal) { - xLocalDoc = WriterTools.createTextDoc(m_xMSF); - XComponent comp = UnoRuntime.queryInterface(XComponent.class, xLocalDoc); - DialogThread diagThread = new DialogThread(comp, m_xMSF, url); - diagThread.start(); - shortWait(); - - if (createButton.length() > 1) { - XExtendedToolkit tk = getToolkit(); - AccessibilityTools at = new AccessibilityTools(); - Object atw = tk.getActiveTopWindow(); - - XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, atw); - - XAccessible xRoot = at.getAccessibleObject(xWindow); - XAccessibleContext buttonContext = at.getAccessibleObjectForRole( - xRoot, - AccessibleRole.PUSH_BUTTON, - createButton); - - XAccessibleAction buttonAction = UnoRuntime.queryInterface(XAccessibleAction.class, buttonContext); - - try { - System.out.println("Name: " + - buttonContext.getAccessibleName()); - buttonAction.doAccessibleAction(0); - } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - System.out.println("Couldn't press button"); - } - - shortWait(); - } - - XDesktop xDesktop = getDesktop(); - - XTextDocument returnDoc = UnoRuntime.queryInterface(XTextDocument.class, xDesktop.getCurrentComponent()); - - if (destroyLocal) { - closeDoc(xLocalDoc); - xLocalDoc = null; - } - - return returnDoc; - } - public void closeFromDialog() - { - closeDoc(xLocalDoc); - xLocalDoc = null; - } - public void kill() - { - XDesktop xDesktop = getDesktop(); - xDesktop.terminate(); - } - - - public XTextDocument DocByAutopilot(XMultiServiceFactory msf, - int[] indexes, boolean destroyLocal, - String bName) { - XTextDocument xLocalDoc = WriterTools.createTextDoc(m_xMSF); - Object toolkit = null; - - try { - toolkit = msf.createInstance("com.sun.star.awt.Toolkit"); - } catch (com.sun.star.uno.Exception e) { - e.printStackTrace(); - } - - XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class, toolkit); - - shortWait(); - - AccessibilityTools at = new AccessibilityTools(); - - Object atw = tk.getActiveTopWindow(); - - XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, atw); - - XAccessible xRoot = at.getAccessibleObject(xWindow); - - XAccessibleContext ARoot = at.getAccessibleObjectForRole(xRoot, - AccessibleRole.MENU_BAR); - XAccessibleSelection sel = UnoRuntime.queryInterface(XAccessibleSelection.class, ARoot); - - for (int k = 0; k < indexes.length; k++) { - try { - sel.selectAccessibleChild(indexes[k]); - shortWait(); - ARoot = ARoot.getAccessibleChild(indexes[k]) - .getAccessibleContext(); - sel = UnoRuntime.queryInterface(XAccessibleSelection.class, ARoot); - } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - } - } - - shortWait(); - - atw = tk.getActiveTopWindow(); - - xWindow = UnoRuntime.queryInterface(XWindow.class, atw); - - xRoot = at.getAccessibleObject(xWindow); - - //at.printAccessibleTree(new PrintWriter(System.out),xRoot); - - XAccessibleAction action = UnoRuntime.queryInterface(XAccessibleAction.class, at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, bName)); - - try { - action.doAccessibleAction(0); - } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - } - - shortWait(); - - atw = tk.getActiveTopWindow(); - - xWindow = UnoRuntime.queryInterface(XWindow.class, atw); - - xRoot = at.getAccessibleObject(xWindow); - - at.printAccessibleTree(new PrintWriter(System.out),xRoot); - - action = UnoRuntime.queryInterface(XAccessibleAction.class, at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Yes")); - - try { - if (action != null) action.doAccessibleAction(0); - } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - } - - shortWait(); - - XDesktop xDesktop = getDesktop(); - - XTextDocument returnDoc = UnoRuntime.queryInterface(XTextDocument.class, xDesktop.getCurrentComponent()); - - if (destroyLocal) { - closeDoc(xLocalDoc); - } - - return returnDoc; - } - - /** - * Sleeps for 2 sec. to allow StarOffice to react - */ - private void shortWait() { - try { - Thread.sleep(4000); - } catch (InterruptedException e) { - System.out.println("While waiting :" + e); - } - } - - /** creates an instance of com.sun.star.awt.Toolkit to query the XExtendedToolkit - * interface - * @return returns the gained XExtendedToolkit Interface - */ - public XExtendedToolkit getToolkit() { - Object toolkit = null; - - try { - toolkit = m_xMSF.createInstance("com.sun.star.awt.Toolkit"); - } catch (com.sun.star.uno.Exception e) { - System.out.println("Couldn't get toolkit"); - e.printStackTrace(); - } - - XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class, toolkit); - - return tk; - } - - /** creates an instance of com.sun.star.frame.Desktop to query the XDesktop interface - * @return returns the gained XDesktop interface - */ - protected XDesktop getDesktop() { - Object desk = null; - - try { - desk = m_xMSF.createInstance("com.sun.star.frame.Desktop"); - } catch (com.sun.star.uno.Exception e) { - System.out.println("Couldn't get desktop"); - e.printStackTrace(); - } - - XDesktop xDesktop = UnoRuntime.queryInterface(XDesktop.class, desk); - - return xDesktop; - } -} \ No newline at end of file diff --git a/sfx2/qa/complex/framework/makefile.mk b/sfx2/qa/complex/framework/makefile.mk deleted file mode 100644 index 325135b9133c..000000000000 --- a/sfx2/qa/complex/framework/makefile.mk +++ /dev/null @@ -1,65 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = sfx2 -TARGET = qa_complex_framework - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/framework -JAVATESTFILES = \ - DocumentPropertiesTest.java \ - DocumentMetadataAccessTest.java \ - CheckGlobalEventBroadcaster_writer1.java - -JAVAFILES = $(JAVATESTFILES) \ - TestDocument.java \ - WriterHelper.java \ - DialogThread.java - - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) - -# Sample how to debug -# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y - -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END - - diff --git a/sfx2/qa/complex/framework/testdocuments/CUSTOM.odt b/sfx2/qa/complex/framework/testdocuments/CUSTOM.odt deleted file mode 100644 index 831a8f451dfd..000000000000 Binary files a/sfx2/qa/complex/framework/testdocuments/CUSTOM.odt and /dev/null differ diff --git a/sfx2/qa/complex/framework/testdocuments/TEST.odt b/sfx2/qa/complex/framework/testdocuments/TEST.odt deleted file mode 100644 index 7c6f0b60f7b0..000000000000 Binary files a/sfx2/qa/complex/framework/testdocuments/TEST.odt and /dev/null differ diff --git a/sfx2/qa/complex/framework/testdocuments/TESTRDFA.odt b/sfx2/qa/complex/framework/testdocuments/TESTRDFA.odt deleted file mode 100644 index d59739142df6..000000000000 Binary files a/sfx2/qa/complex/framework/testdocuments/TESTRDFA.odt and /dev/null differ diff --git a/sfx2/qa/complex/framework/testdocuments/empty.rdf b/sfx2/qa/complex/framework/testdocuments/empty.rdf deleted file mode 100644 index af62bab39dfa..000000000000 --- a/sfx2/qa/complex/framework/testdocuments/empty.rdf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/sfx2/qa/complex/sfx2/DocumentInfo.java b/sfx2/qa/complex/sfx2/DocumentInfo.java new file mode 100644 index 000000000000..ca7ae8b1dda0 --- /dev/null +++ b/sfx2/qa/complex/sfx2/DocumentInfo.java @@ -0,0 +1,362 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.sfx2; + +import com.sun.star.beans.PropertyAttribute; +import com.sun.star.beans.Property; +import com.sun.star.beans.PropertyValue; +import com.sun.star.beans.XPropertyContainer; +import com.sun.star.beans.XPropertySet; +import com.sun.star.beans.XPropertySetInfo; +import com.sun.star.document.XDocumentInfo; +import com.sun.star.document.XDocumentInfoSupplier; +import com.sun.star.frame.XComponentLoader; +import com.sun.star.frame.XStorable; +import com.sun.star.lang.XComponent; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.text.XTextDocument; +import com.sun.star.uno.UnoRuntime; +import com.sun.star.util.Date; + + + +import util.DesktopTools; +import util.WriterTools; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + +public class DocumentInfo +{ + XMultiServiceFactory m_xMSF = null; + XTextDocument xTextDoc = null; + XTextDocument xTextDocSecond = null; + + @Test public void checkDocInfo() + { + m_xMSF = getMSF(); + + System.out.println("check wether there is a valid MultiServiceFactory"); + + assertNotNull("## Couldn't get MultiServiceFactory make sure your Office is started", m_xMSF); + + // TODO: need other temp directory! + String tempdir = System.getProperty("java.io.tmpdir"); + String fs = System.getProperty("file.separator"); + + if (!tempdir.endsWith(fs)) + { + tempdir += fs; + } + tempdir = util.utils.getFullURL(tempdir); + final String sTempDocument = tempdir + "DocInfo.oot"; + + if (true) + { + System.out.println("... done"); + + + System.out.println("Opening a Writer document"); + xTextDoc = WriterTools.createTextDoc(m_xMSF); + System.out.println("... done"); + + XDocumentInfoSupplier xDocInfoSup = UnoRuntime.queryInterface(XDocumentInfoSupplier.class, xTextDoc); + XDocumentInfo xDocInfo = xDocInfoSup.getDocumentInfo(); + XPropertyContainer xPropContainer = UnoRuntime.queryInterface(XPropertyContainer.class, xDocInfo); + + System.out.println("Trying to add a existing property"); + + boolean worked = addProperty(xPropContainer, "Author", (short) 0, ""); + assertTrue("Could set an existing property", !worked); + System.out.println("...done"); + + System.out.println("Trying to add a integer property"); + worked = addProperty(xPropContainer, "intValue", com.sun.star.beans.PropertyAttribute.READONLY, new Integer(17)); + assertTrue("Couldn't set an integer property", worked); + System.out.println("...done"); + + System.out.println("Trying to add a double property"); + worked = addProperty(xPropContainer, "doubleValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, new Double(17.7)); + assertTrue("Couldn't set an double property", worked); + System.out.println("...done"); + + System.out.println("Trying to add a boolean property"); + worked = addProperty(xPropContainer, "booleanValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, Boolean.TRUE); + assertTrue("Couldn't set an boolean property", worked); + System.out.println("...done"); + + System.out.println("Trying to add a date property"); + worked = addProperty(xPropContainer, "dateValue", com.sun.star.beans.PropertyAttribute.REMOVEABLE, new Date()); + assertTrue("Couldn't set an date property", worked); + System.out.println("...done"); + + System.out.println("trying to remove a read only Property"); + try + { + xPropContainer.removeProperty("intValue"); + fail("Could remove read only property"); + } + catch (Exception e) + { + System.out.println("\tException was thrown " + e); + System.out.println("\t...OK"); + } + System.out.println("...done"); + + XPropertySet xProps2 = UnoRuntime.queryInterface(XPropertySet.class, xPropContainer); + showPropertySet(xProps2); + + + System.out.println("Storing the document"); + try + { + XStorable store = UnoRuntime.queryInterface(XStorable.class, xTextDoc); + store.storeToURL(sTempDocument, new PropertyValue[] {}); + DesktopTools.closeDoc(xTextDoc); + } + catch (Exception e) + { + fail("Couldn't store document"); + } + + System.out.println("...done"); + } + + + if (true) + { + System.out.println("loading the document"); + + try + { + XComponentLoader xCL = UnoRuntime.queryInterface(XComponentLoader.class, m_xMSF.createInstance("com.sun.star.frame.Desktop")); + XComponent xComp = xCL.loadComponentFromURL(sTempDocument, "_blank", 0, new PropertyValue[] {}); + xTextDocSecond = UnoRuntime.queryInterface(XTextDocument.class, xComp); + } + catch (Exception e) + { + fail("Couldn't load document"); + } + + System.out.println("...done"); + + XDocumentInfoSupplier xDocInfoSup = UnoRuntime.queryInterface(XDocumentInfoSupplier.class, xTextDocSecond); + XDocumentInfo xDocInfo = xDocInfoSup.getDocumentInfo(); + XPropertyContainer xPropContainer = UnoRuntime.queryInterface(XPropertyContainer.class, xDocInfo); + + XPropertySet xProps = UnoRuntime.queryInterface(XPropertySet.class, xDocInfo); + showPropertySet(xProps); + + assertTrue("Double doesn't work", checkType(xProps, "doubleValue", "java.lang.Double")); + assertTrue("Boolean doesn't work", checkType(xProps, "booleanValue", "java.lang.Boolean")); + + // TODO: dateValue does not exist. + // assertTrue("Date doesn't work", checkType(xProps, "dateValue", "com.sun.star.util.DateTime")); + + // TODO: is java.lang.Double + // assertTrue("Integer doesn't work", checkType(xProps, "intValue", "java.lang.Integer")); + + xPropContainer = UnoRuntime.queryInterface(XPropertyContainer.class, xDocInfo); + + System.out.println("trying to remove a not user defined Property"); + try + { + xPropContainer.removeProperty("Author"); + fail("Could remove non user defined property"); + } + catch (Exception e) + { + System.out.println("\tException was thrown " + e); + System.out.println("\t...OK"); + } + System.out.println("...done"); + + + System.out.println("Trying to remove a user defined property"); + try + { + xPropContainer.removeProperty("booleanValue"); + System.out.println("\t...OK"); + } + catch (Exception e) + { + System.out.println("\tException was thrown " + e); + System.out.println("\t...FAILED"); + fail("Could not remove user defined property"); + } + showPropertySet(xProps); + System.out.println("...done"); + } + } + + @After public void cleanup() + { + DesktopTools.closeDoc(xTextDocSecond); + DesktopTools.closeDoc(xTextDoc); + } + + private void showPropertySet(XPropertySet xProps) + { + try + { + // get an XPropertySet, here the one of a text cursor + // XPropertySet xCursorProps = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, mxDocCursor); + + // get the property info interface of this XPropertySet + XPropertySetInfo xPropsInfo = xProps.getPropertySetInfo(); + + // get all properties (NOT the values) from XPropertySetInfo + Property[] aProps = xPropsInfo.getProperties(); + int i; + for (i = 0; i < aProps.length; ++i) { + // number of property within this info object + System.out.print("Property #" + i); + + // name of property + System.out.print(": Name<" + aProps[i].Name); + + // handle of property (only for XFastPropertySet) + System.out.print("> Handle<" + aProps[i].Handle); + + // type of property + System.out.print("> " + aProps[i].Type.toString()); + + // attributes (flags) + System.out.print(" Attributes<"); + short nAttribs = aProps[i].Attributes; + if ((nAttribs & PropertyAttribute.MAYBEVOID) != 0) + System.out.print("MAYBEVOID|"); + if ((nAttribs & PropertyAttribute.BOUND) != 0) + System.out.print("BOUND|"); + if ((nAttribs & PropertyAttribute.CONSTRAINED) != 0) + System.out.print("CONSTRAINED|"); + if ((nAttribs & PropertyAttribute.READONLY) != 0) + System.out.print("READONLY|"); + if ((nAttribs & PropertyAttribute.TRANSIENT) != 0) + System.out.print("TRANSIENT|"); + if ((nAttribs & PropertyAttribute.MAYBEAMBIGUOUS ) != 0) + System.out.print("MAYBEAMBIGUOUS|"); + if ((nAttribs & PropertyAttribute.MAYBEDEFAULT) != 0) + System.out.print("MAYBEDEFAULT|"); + if ((nAttribs & PropertyAttribute.REMOVEABLE) != 0) + System.out.print("REMOVEABLE|"); + System.out.println("0>"); + } + } catch (Exception e) { + // If anything goes wrong, give the user a stack trace + e.printStackTrace(System.out); + } + } + + private boolean checkType(XPropertySet xProps, String aName, + String expected) + { + boolean ret = true; + System.out.println("Checking " + expected); + + String getting = + getPropertyByName(xProps, aName).getClass().getName(); + + if (!getting.equals(expected)) + { + System.out.println("\t Expected: " + expected); + System.out.println("\t Getting: " + getting); + ret = false; + } + + if (ret) + { + System.out.println("...OK"); + } + return ret; + } + + private Object getPropertyByName(XPropertySet xProps, String aName) + { + Object ret = null; + + try + { + ret = xProps.getPropertyValue(aName); + } + catch (Exception e) + { + System.out.println("\tCouldn't get Property " + aName); + System.out.println("\tMessage " + e); + } + + return ret; + } + + private boolean addProperty(XPropertyContainer xPropContainer, + String aName, short attr, Object defaults) + { + boolean ret = true; + + try + { + xPropContainer.addProperty(aName, attr, defaults); + } + catch (Exception e) + { + ret = false; + System.out.println("\tCouldn't get Property " + aName); + System.out.println("\tMessage " + e); + } + + return ret; + } + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception + { + System.out.println( "------------------------------------------------------------" ); + System.out.println( "starting class: " + DocumentInfo.class.getName() ); + System.out.println( "------------------------------------------------------------" ); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println( "------------------------------------------------------------" ); + System.out.println( "finishing class: " + DocumentInfo.class.getName() ); + System.out.println( "------------------------------------------------------------" ); + connection.tearDown(); + } + private static final OfficeConnection connection = new OfficeConnection(); +} diff --git a/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java b/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java new file mode 100644 index 000000000000..d145b9028473 --- /dev/null +++ b/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java @@ -0,0 +1,1313 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +package complex.sfx2; + +// import complexlib.ComplexTestCase; +import com.sun.star.beans.Pair; +import com.sun.star.rdf.Literal; +import com.sun.star.rdf.XLiteral; +import com.sun.star.rdf.XNamedGraph; +import com.sun.star.rdf.BlankNode; +import com.sun.star.rdf.XQuerySelectResult; +import com.sun.star.rdf.XNode; +import com.sun.star.rdf.XDocumentRepository; +import com.sun.star.rdf.XMetadatable; +import com.sun.star.rdf.Statement; +import com.sun.star.rdf.FileFormat; +import com.sun.star.rdf.URIs; +import com.sun.star.rdf.URI; +import com.sun.star.rdf.XDocumentMetadataAccess; +import com.sun.star.rdf.XRepositorySupplier; +import com.sun.star.rdf.XRepository; +import com.sun.star.rdf.XBlankNode; +import com.sun.star.rdf.XURI; +import helper.StreamSimulator; + +import com.sun.star.uno.UnoRuntime; +import com.sun.star.uno.XComponentContext; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.lang.XComponent; + +import com.sun.star.lang.XServiceInfo; +import com.sun.star.lang.IllegalArgumentException; +import com.sun.star.lang.WrappedTargetException; +import com.sun.star.lang.WrappedTargetRuntimeException; +import com.sun.star.beans.XPropertySet; +import com.sun.star.beans.PropertyValue; +import com.sun.star.beans.StringPair; +import com.sun.star.container.XEnumerationAccess; +import com.sun.star.container.XEnumeration; +import com.sun.star.io.XInputStream; +import com.sun.star.util.XCloseable; +import com.sun.star.frame.XStorable; +import com.sun.star.text.XTextDocument; +import com.sun.star.text.XTextRange; +import com.sun.star.text.XText; +import complex.sfx2.tools.TestDocument; +import lib.TestParameters; + + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + +/** + * Test case for interface com.sun.star.rdf.XDocumentMetadataAccess + * Currently, this service is implemented in + * sfx2/source/doc/DocumentMetadataAccess.cxx + * + * Actually, this is not a service, so we need to create a document and + * go from there... + * + * @author mst + */ +public class DocumentMetadataAccess +{ + XMultiServiceFactory xMSF; + XComponentContext xContext; + String tempDir; + + String nsRDF = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + String nsRDFS = "http://www.w3.org/2000/01/rdf-schema#"; + String nsPkg="http://docs.oasis-open.org/opendocument/meta/package/common#"; + String nsODF ="http://docs.oasis-open.org/opendocument/meta/package/odf#"; + + XURI foo; + XURI bar; + XURI baz; + + static XURI rdf_type; + static XURI rdfs_label; + static XURI pkg_Document; + static XURI pkg_hasPart; + static XURI pkg_MetadataFile; + static XURI odf_ContentFile; + static XURI odf_StylesFile; + static XURI odf_Element; + static XBlankNode blank1; + static XBlankNode blank2; + static XBlankNode blank3; + static XBlankNode blank4; + static String manifestPath = "manifest.rdf"; + static String contentPath = "content.xml"; + static String stylesPath = "styles.xml"; + static String fooPath = "foo.rdf"; + static String fooBarPath = "meta/foo/bar.rdf"; + + XRepository xRep; + XRepositorySupplier xRS; + XDocumentMetadataAccess xDMA; + +// public String[] getTestMethodNames () +// { +// return new String[] { "check", "checkRDFa" }; +// } + /** + * The test parameters + */ + private static TestParameters param = null; + + @Before public void before() + { + try { + + xMSF = getMSF(); + param = new TestParameters(); + param.put("ServiceFactory", xMSF); // important for param.getMSF() + + assertNotNull("could not create MultiServiceFactory.", xMSF); + XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xMSF); + Object defaultCtx = xPropertySet.getPropertyValue("DefaultContext"); + xContext = UnoRuntime.queryInterface(XComponentContext.class, defaultCtx); + assertNotNull("could not get component context.", xContext); + + tempDir = util.utils.getOfficeTemp/*Dir*/(xMSF); + System.out.println("tempdir: " + tempDir); + + foo = URI.create(xContext, "uri:foo"); + assertNotNull("foo", foo); + bar = URI.create(xContext, "uri:bar"); + assertNotNull("bar", bar); + baz = URI.create(xContext, "uri:baz"); + assertNotNull("baz", baz); + + blank1 = BlankNode.create(xContext, "_:1"); + assertNotNull("blank1", blank1); + blank2 = BlankNode.create(xContext, "_:2"); + assertNotNull("blank2", blank2); + blank3 = BlankNode.create(xContext, "_:3"); + assertNotNull("blank3", blank3); + blank4 = BlankNode.create(xContext, "_:4"); + assertNotNull("blank4", blank4); + rdf_type = URI.createKnown(xContext, URIs.RDF_TYPE); + assertNotNull("rdf_type", rdf_type); + rdfs_label = URI.createKnown(xContext, URIs.RDFS_LABEL); + assertNotNull("rdfs_label", rdfs_label); + pkg_Document = URI.createKnown(xContext, URIs.PKG_DOCUMENT); + assertNotNull("pkg_Document", pkg_Document); + pkg_hasPart = URI.createKnown(xContext, URIs.PKG_HASPART); + assertNotNull("pkg_hasPart", pkg_hasPart); + pkg_MetadataFile = URI.createKnown(xContext, URIs.PKG_METADATAFILE); + assertNotNull("pkg_MetadataFile", pkg_MetadataFile); + odf_ContentFile = URI.createKnown(xContext, URIs.ODF_CONTENTFILE); + assertNotNull("odf_ContentFile", odf_ContentFile); + odf_StylesFile = URI.createKnown(xContext, URIs.ODF_STYLESFILE); + assertNotNull("odf_StylesFile", odf_StylesFile); + odf_Element = URI.createKnown(xContext, URIs.ODF_ELEMENT); + assertNotNull("odf_Element", odf_Element); + + } catch (Exception e) { + report(e); + } + } + + @After public void after() + { + xRep = null; + xRS = null; + xDMA = null; + } + + @Test public void check() + { + XComponent xComp = null; + XComponent xComp2 = null; + try { + XEnumeration xStmtsEnum; + XNamedGraph xManifest; + + System.out.println("Creating document with Repository..."); + + // we cannot create a XDMA directly, we must create + // a document and get it from there :( + // create document + PropertyValue[] loadProps = new PropertyValue[1]; + loadProps[0] = new PropertyValue(); + loadProps[0].Name = "Hidden"; + loadProps[0].Value = true; + xComp = util.DesktopTools.openNewDoc(xMSF, "swriter", loadProps); + XTextDocument xText = UnoRuntime.queryInterface(XTextDocument.class, xComp); + + XRepositorySupplier xRepoSupplier = UnoRuntime.queryInterface(XRepositorySupplier.class, xComp); + assertNotNull("xRS null", xRepoSupplier); + XDocumentMetadataAccess xDocMDAccess = UnoRuntime.queryInterface(XDocumentMetadataAccess.class, xRepoSupplier); + assertNotNull("xDMA null", xDocMDAccess); + xRep = xRepoSupplier.getRDFRepository(); + assertNotNull("xRep null", xRep); + + System.out.println("...done"); + + System.out.println("Checking that new repository is initialized..."); + + XURI xBaseURI = (XURI) xDocMDAccess; + String baseURI = xBaseURI.getStringValue(); + assertNotNull("new: baseURI", xBaseURI ); + assertTrue("new: baseURI", !xBaseURI.getStringValue().equals("")); + + assertTrue("new: # graphs", 1 == xRep.getGraphNames().length); + XURI manifest = URI.createNS(xContext, xBaseURI.getStringValue(), + manifestPath); + xManifest = xRep.getGraph(manifest); + assertTrue("new: manifest graph", null != xManifest); + + Statement[] manifestStmts = getManifestStmts(xBaseURI); + xStmtsEnum = xRep.getStatements(null, null, null); + assertTrue("new: manifest graph", eq(xStmtsEnum, manifestStmts)); + + System.out.println("...done"); + + System.out.println("Checking some invalid args..."); + + String content = "behold, for i am the content."; + XTextRange xTR = new TestRange(content); + XMetadatable xM = (XMetadatable) xTR; + + try { + xDocMDAccess.getElementByURI(null); + fail("getElementByURI: null allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDocMDAccess.getMetadataGraphsWithType(null); + fail("getMetadataGraphsWithType: null URI allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDocMDAccess.addMetadataFile("", new XURI[0]); + fail("addMetadataFile: empty filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDocMDAccess.addMetadataFile("/foo", new XURI[0]); + fail("addMetadataFile: absolute filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDocMDAccess.addMetadataFile("fo\"o", new XURI[0]); + fail("addMetadataFile: invalid filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDocMDAccess.addMetadataFile("../foo", new XURI[0]); + fail("addMetadataFile: filename with .. allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDocMDAccess.addMetadataFile("foo/../../bar", new XURI[0]); + fail("addMetadataFile: filename with nest .. allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDocMDAccess.addMetadataFile("foo/././bar", new XURI[0]); + fail("addMetadataFile: filename with nest . allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDocMDAccess.addMetadataFile("content.xml", new XURI[0]); + fail("addMetadataFile: content.xml allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDocMDAccess.addMetadataFile("styles.xml", new XURI[0]); + fail("addMetadataFile: styles.xml allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDocMDAccess.addMetadataFile("meta.xml", new XURI[0]); + fail("addMetadataFile: meta.xml allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDocMDAccess.addMetadataFile("settings.xml", new XURI[0]); + fail("addMetadataFile: settings.xml allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDocMDAccess.importMetadataFile(FileFormat.RDF_XML, null, "foo", + foo, new XURI[0]); + fail("importMetadataFile: null stream allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + + final String sEmptyRDF = TestDocument.getUrl("empty.rdf"); + try { + XInputStream xFooIn = new StreamSimulator(sEmptyRDF, true, param); + xDocMDAccess.importMetadataFile(FileFormat.RDF_XML, xFooIn, "", + foo, new XURI[0]); + fail("importMetadataFile: empty filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + XInputStream xFooIn = + new StreamSimulator(sEmptyRDF, true, param); + xDocMDAccess.importMetadataFile(FileFormat.RDF_XML, xFooIn, "meta.xml", + foo, new XURI[0]); + fail("importMetadataFile: meta.xml filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + XInputStream xFooIn = + new StreamSimulator(sEmptyRDF, true, param); + xDocMDAccess.importMetadataFile(FileFormat.RDF_XML, + xFooIn, "foo", null, new XURI[0]); + fail("importMetadataFile: null base URI allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + XInputStream xFooIn = + new StreamSimulator(sEmptyRDF, true, param); + xDocMDAccess.importMetadataFile(FileFormat.RDF_XML, + xFooIn, "foo", rdf_type, new XURI[0]); + fail("importMetadataFile: non-absolute base URI allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDocMDAccess.removeMetadataFile(null); + fail("removeMetadataFile: null URI allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDocMDAccess.addContentOrStylesFile(""); + fail("addContentOrStylesFile: empty filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDocMDAccess.addContentOrStylesFile("/content.xml"); + fail("addContentOrStylesFile: absolute filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDocMDAccess.addContentOrStylesFile("foo.rdf"); + fail("addContentOrStylesFile: invalid filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDocMDAccess.removeContentOrStylesFile(""); + fail("removeContentOrStylesFile: empty filename allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDocMDAccess.loadMetadataFromStorage(null, foo, null); + fail("loadMetadataFromStorage: null storage allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDocMDAccess.storeMetadataToStorage(null/*, base*/); + fail("storeMetadataToStorage: null storage allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDocMDAccess.loadMetadataFromMedium(new PropertyValue[0]); + fail("loadMetadataFromMedium: empty medium allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + try { + xDocMDAccess.storeMetadataToMedium(new PropertyValue[0]); + fail("storeMetadataToMedium: empty medium allowed"); + } catch (IllegalArgumentException e) { + // ignore + } + + System.out.println("...done"); + + System.out.println("Checking file addition/removal..."); + + xDocMDAccess.removeContentOrStylesFile(contentPath); + xStmtsEnum = xManifest.getStatements(null, null, null); + assertTrue("removeContentOrStylesFile (content)", + eq(xStmtsEnum, new Statement[] { + manifestStmts[0], manifestStmts[2], manifestStmts[4] + })); + + xDocMDAccess.addContentOrStylesFile(contentPath); + xStmtsEnum = xManifest.getStatements(null, null, null); + assertTrue("addContentOrStylesFile (content)", + eq(xStmtsEnum, manifestStmts)); + + xDocMDAccess.removeContentOrStylesFile(stylesPath); + xStmtsEnum = xManifest.getStatements(null, null, null); + assertTrue("removeContentOrStylesFile (styles)", + eq(xStmtsEnum, new Statement[] { + manifestStmts[0], manifestStmts[1], manifestStmts[3] + })); + + xDocMDAccess.addContentOrStylesFile(stylesPath); + xStmtsEnum = xManifest.getStatements(null, null, null); + assertTrue("addContentOrStylesFile (styles)", + eq(xStmtsEnum, manifestStmts)); + + XURI xFoo = URI.createNS(xContext, xBaseURI.getStringValue(), + fooPath); + Statement xM_BaseHaspartFoo = + new Statement(xBaseURI, pkg_hasPart, xFoo, manifest); + Statement xM_FooTypeMetadata = + new Statement(xFoo, rdf_type, pkg_MetadataFile, manifest); + Statement xM_FooTypeBar = + new Statement(xFoo, rdf_type, bar, manifest); + xDocMDAccess.addMetadataFile(fooPath, new XURI[] { bar }); + xStmtsEnum = xManifest.getStatements(null, null, null); + assertTrue("addMetadataFile", + eq(xStmtsEnum, merge(manifestStmts, new Statement[] { + xM_BaseHaspartFoo, xM_FooTypeMetadata, xM_FooTypeBar + }))); + + XURI[] graphsBar = xDocMDAccess.getMetadataGraphsWithType(bar); + assertTrue("getMetadataGraphsWithType", + graphsBar.length == 1 && eq(graphsBar[0], xFoo)); + + + xDocMDAccess.removeMetadataFile(xFoo); + xStmtsEnum = xManifest.getStatements(null, null, null); + assertTrue("removeMetadataFile", + eq(xStmtsEnum, manifestStmts)); + + System.out.println("...done"); + + System.out.println("Checking mapping..."); + + XEnumerationAccess xTextEnum = UnoRuntime.queryInterface(XEnumerationAccess.class, xText.getText()); + Object o = xTextEnum.createEnumeration().nextElement(); + XMetadatable xMeta1 = UnoRuntime.queryInterface(XMetadatable.class, o); + + XURI uri; + XMetadatable xMeta; + xMeta = xDocMDAccess.getElementByURI(xMeta1); + assertTrue("getElementByURI: null", null != xMeta); + String XmlId = xMeta.getMetadataReference().Second; + String XmlId1 = xMeta1.getMetadataReference().Second; + assertTrue("getElementByURI: no xml id", !XmlId.equals("")); + assertTrue("getElementByURI: different xml id", XmlId.equals(XmlId1)); + + System.out.println("...done"); + + System.out.println("Checking storing and loading..."); + + XURI xFoobar = URI.createNS(xContext, xBaseURI.getStringValue(), + fooBarPath); + Statement[] metadataStmts = getMetadataFileStmts(xBaseURI, + fooBarPath); + xDocMDAccess.addMetadataFile(fooBarPath, new XURI[0]); + xStmtsEnum = xRep.getStatements(null, null, null); + assertTrue("addMetadataFile", + eq(xStmtsEnum, merge(manifestStmts, metadataStmts ))); + + Statement xFoobar_FooBarFoo = + new Statement(foo, bar, foo, xFoobar); + xRep.getGraph(xFoobar).addStatement(foo, bar, foo); + xStmtsEnum = xRep.getStatements(null, null, null); + assertTrue("addStatement", + eq(xStmtsEnum, merge(manifestStmts, merge(metadataStmts, + new Statement[] { xFoobar_FooBarFoo })))); + + PropertyValue noMDNoContentFile = new PropertyValue(); + noMDNoContentFile.Name = "URL"; + noMDNoContentFile.Value = TestDocument.getUrl("CUSTOM.odt"); + PropertyValue noMDFile = new PropertyValue(); + noMDFile.Name = "URL"; + noMDFile.Value = TestDocument.getUrl("TEST.odt"); + PropertyValue file = new PropertyValue(); + file.Name = "URL"; + file.Value = tempDir + "TESTDMA.odt"; + /* + PropertyValue baseURL = new PropertyValue(); + baseURL.Name = "DocumentBaseURL"; + baseURL.Value = tempDir + "TMP.odt"; + */ + PropertyValue mimetype = new PropertyValue(); + mimetype.Name = "MediaType"; + mimetype.Value = "application/vnd.oasis.opendocument.text"; + PropertyValue[] argsEmptyNoContent = { mimetype, noMDNoContentFile}; + PropertyValue[] argsEmpty = { mimetype, noMDFile }; + PropertyValue[] args = { mimetype, file }; + + xStmtsEnum = xRep.getStatements(null, null, null); + XURI[] graphs = xRep.getGraphNames(); + + xDocMDAccess.storeMetadataToMedium(args); + + // this should re-init + xDocMDAccess.loadMetadataFromMedium(argsEmptyNoContent); + xRep = xRepoSupplier.getRDFRepository(); + assertTrue("xRep null", null != xRep); + assertTrue("baseURI still tdoc?", + !baseURI.equals(xDocMDAccess.getStringValue())); + Statement[] manifestStmts2 = getManifestStmts((XURI) xDocMDAccess); + xStmtsEnum = xRep.getStatements(null, null, null); + // there is no content or styles file in here, so we have just + // the package stmt + assertTrue("loadMetadataFromMedium (no metadata, no content)", + eq(xStmtsEnum, new Statement[] { manifestStmts2[0] })); + + // this should re-init + xDocMDAccess.loadMetadataFromMedium(argsEmpty); + xRep = xRepoSupplier.getRDFRepository(); + assertTrue("xRep null", null != xRep); + assertTrue("baseURI still tdoc?", + !baseURI.equals(xDocMDAccess.getStringValue())); + Statement[] manifestStmts3 = getManifestStmts((XURI) xDocMDAccess); + + xStmtsEnum = xRep.getStatements(null, null, null); + assertTrue("loadMetadataFromMedium (no metadata)", + eq(xStmtsEnum, manifestStmts3)); + + xDocMDAccess.loadMetadataFromMedium(args); + xRep = xRepoSupplier.getRDFRepository(); + assertTrue("xRep null", null != xRep); + Statement[] manifestStmts4 = getManifestStmts((XURI) xDocMDAccess); + Statement[] metadataStmts4 = getMetadataFileStmts((XURI) xDocMDAccess, + fooBarPath); + + xStmtsEnum = xRep.getStatements(null, null, null); + assertTrue("some graph(s) not reloaded", + graphs.length == xRep.getGraphNames().length); + + XURI xFoobar4 = URI.createNS(xContext, xDocMDAccess.getStringValue(), + fooBarPath); + Statement xFoobar_FooBarFoo4 = + new Statement(foo, bar, foo, xFoobar4); + assertTrue("loadMetadataFromMedium (re-load)", + eq(xStmtsEnum, merge(manifestStmts4, merge(metadataStmts4, + new Statement[] { xFoobar_FooBarFoo4 })))); + + System.out.println("...done"); + + System.out.println("Checking storing and loading via model..."); + + String f = tempDir + "TESTPARA.odt"; + + XStorable xStor = UnoRuntime.queryInterface(XStorable.class, xRepoSupplier); + + xStor.storeToURL(f, new PropertyValue[0]); + + xComp2 = util.DesktopTools.loadDoc(xMSF, f, loadProps); + + XDocumentMetadataAccess xDMA2 = UnoRuntime.queryInterface(XDocumentMetadataAccess.class, xComp2); + assertTrue("xDMA2 null", null != xDMA2); + + XRepositorySupplier xRS2 = UnoRuntime.queryInterface(XRepositorySupplier.class, xComp2); + assertTrue("xRS2 null", null != xRS2); + + XRepository xRep2 = xRS2.getRDFRepository(); + assertTrue("xRep2 null", null != xRep2); + + Statement[] manifestStmts5 = getManifestStmts((XURI) xDMA2); + Statement[] metadataStmts5 = getMetadataFileStmts((XURI) xDMA2, + fooBarPath); + XURI xFoobar5 = URI.createNS(xContext, xDMA2.getStringValue(), + fooBarPath); + Statement xFoobar_FooBarFoo5 = + new Statement(foo, bar, foo, xFoobar5); + xStmtsEnum = xRep.getStatements(null, null, null); + XEnumeration xStmtsEnum2 = xRep2.getStatements(null, null, null); + assertTrue("load: repository differs", + eq(xStmtsEnum2, merge(manifestStmts5, merge(metadataStmts5, + new Statement[] { xFoobar_FooBarFoo5 })))); + + System.out.println("...done"); + + } catch (Exception e) { + report(e); + } finally { + close(xComp); + close(xComp2); + } + } + + @Test public void checkRDFa() + { + XComponent xComp = null; + try { + final String file = TestDocument.getUrl("TESTRDFA.odt"); + xComp = loadRDFa(file); + if (xComp != null) + { + final String sNewFile = tempDir + "TESTRDFA.odt"; + storeRDFa(xComp, sNewFile); + close(xComp); + + xComp = loadRDFa(sNewFile); + } + } finally { + close(xComp); + } + } + + private void storeRDFa(XComponent xComp, String file) + { + try { + + System.out.println("Storing test document..."); + + XStorable xStor = UnoRuntime.queryInterface(XStorable.class, xComp); + + xStor.storeToURL(file, new PropertyValue[0]); + + System.out.println("...done"); + + } catch (Exception e) { + report(e); + } + } + + private XComponent loadRDFa(String file) + { + XComponent xComp = null; + try { + + System.out.println("Loading test document..."); + + PropertyValue[] loadProps = new PropertyValue[1]; + loadProps[0] = new PropertyValue(); + loadProps[0].Name = "Hidden"; + loadProps[0].Value = true; + + + + xComp = util.DesktopTools.loadDoc(xMSF, file, loadProps); + + XRepositorySupplier xRepoSupplier = UnoRuntime.queryInterface(XRepositorySupplier.class, xComp); + assertTrue("xRS null", null != xRepoSupplier); + + XDocumentRepository xDocRepository = UnoRuntime.queryInterface(XDocumentRepository.class, xRepoSupplier.getRDFRepository()); + assertTrue("xRep null", null != xDocRepository); + + XTextDocument xTextDoc = UnoRuntime.queryInterface(XTextDocument.class, xComp); + + XText xText = xTextDoc.getText(); + + XEnumerationAccess xEA = UnoRuntime.queryInterface(XEnumerationAccess.class, xText); + XEnumeration xEnum = xEA.createEnumeration(); + + System.out.println("...done"); + + System.out.println("Checking RDFa in loaded test document..."); + + XMetadatable xPara; + Pair result; + + Statement x_FooBarLit1 = new Statement(foo, bar, mkLit("1"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xDocRepository.getStatementRDFa(xPara); + assertTrue("RDFa: 1", + !result.Second && + eq(result.First, new Statement[] { + x_FooBarLit1 + })); + + Statement x_FooBarLit2 = new Statement(foo, bar, mkLit("2"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xDocRepository.getStatementRDFa(xPara); + assertTrue("RDFa: 2", + !result.Second && + eq(result.First, new Statement[] { + x_FooBarLit2 + })); + + Statement x_BlankBarLit3 = + new Statement(blank1, bar, mkLit("3"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xDocRepository.getStatementRDFa(xPara); + assertTrue("RDFa: 3", + !result.Second && + eq(result.First, new Statement[] { + x_BlankBarLit3 + })); + XBlankNode b3 = UnoRuntime.queryInterface(XBlankNode.class, result.First[0].Subject); + + Statement x_BlankBarLit4 = + new Statement(blank2, bar, mkLit("4"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xDocRepository.getStatementRDFa(xPara); + assertTrue("RDFa: 4", + !result.Second && + eq(result.First, new Statement[] { + x_BlankBarLit4 + })); + XBlankNode b4 = UnoRuntime.queryInterface(XBlankNode.class, result.First[0].Subject); + + Statement x_BlankBarLit5 = + new Statement(blank1, bar, mkLit("5"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xDocRepository.getStatementRDFa(xPara); + assertTrue("RDFa: 5", + !result.Second && + eq(result.First, new Statement[] { + x_BlankBarLit5 + })); + XBlankNode b5 = UnoRuntime.queryInterface(XBlankNode.class, result.First[0].Subject); + + assertTrue("RDFa: 3 != 4", + !b3.getStringValue().equals(b4.getStringValue())); + assertTrue("RDFa: 3 == 5", + b3.getStringValue().equals(b5.getStringValue())); + + Statement x_FooBarLit6 = new Statement(foo, bar, mkLit("6"), null); + Statement x_FooBazLit6 = new Statement(foo, baz, mkLit("6"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xDocRepository.getStatementRDFa(xPara); + assertTrue("RDFa: 6", + !result.Second && + eq(result.First, new Statement[] { + x_FooBarLit6, x_FooBazLit6 + })); + + Statement x_FooBarLit7 = new Statement(foo, bar, mkLit("7"), null); + Statement x_FooBazLit7 = new Statement(foo, baz, mkLit("7"), null); + Statement x_FooFooLit7 = new Statement(foo, foo, mkLit("7"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xDocRepository.getStatementRDFa(xPara); + assertTrue("RDFa: 7", + !result.Second && + eq(result.First, new Statement[] { + x_FooBarLit7, x_FooBazLit7, x_FooFooLit7 + })); + + XNode lit = mkLit("a fooish bar"); + XNode lit_type= mkLit("a fooish bar", bar); + Statement x_FooBarLit = new Statement(foo, bar, lit, null); + Statement x_FooBarLittype = new Statement(foo, bar, lit_type, null); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xDocRepository.getStatementRDFa(xPara); + assertTrue("RDFa: 8", + result.Second && + eq(result.First, new Statement[] { + x_FooBarLit + })); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xDocRepository.getStatementRDFa(xPara); + assertTrue("RDFa: 9", + result.Second && + eq(result.First, new Statement[] { + x_FooBarLit + })); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xDocRepository.getStatementRDFa(xPara); + assertTrue("RDFa: 10", + result.Second && + eq(result.First, new Statement[] { + x_FooBarLittype + })); + + Statement x_FooBarLit11 + = new Statement(foo, bar, mkLit("11", bar), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xDocRepository.getStatementRDFa(xPara); + assertTrue("RDFa: 11", + !result.Second && + eq(result.First, new Statement[] { + x_FooBarLit11 + })); + + XURI xFile = URI.createNS(xContext, file, "/" + contentPath); + Statement x_FileBarLit12 = + new Statement(xFile, bar, mkLit("12"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xDocRepository.getStatementRDFa(xPara); + assertTrue("RDFa: 12", + !result.Second && + eq(result.First, new Statement[] { + x_FileBarLit12 + })); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xDocRepository.getStatementRDFa(xPara); + assertTrue("RDFa: 13", + result.Second && + eq(result.First, new Statement[] { + x_FooBarLit + })); + + Statement x_FooLabelLit14 = + new Statement(foo, rdfs_label, mkLit("14"), null); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xDocRepository.getStatementRDFa(xPara); + assertTrue("RDFa: 14", + result.Second && + eq(result.First, new Statement[] { + /* x_FooLabelLit14 */ x_FooBarLit + })); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xDocRepository.getStatementRDFa(xPara); + assertTrue("RDFa: 15", eq(result.First, new Statement[] { } )); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xDocRepository.getStatementRDFa(xPara); + assertTrue("RDFa: 16", eq(result.First, new Statement[] { } )); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xDocRepository.getStatementRDFa(xPara); + assertTrue("RDFa: 17", eq(result.First, new Statement[] { } )); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xDocRepository.getStatementRDFa(xPara); + assertTrue("RDFa: 18", eq(result.First, new Statement[] { } )); + + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); + result = xDocRepository.getStatementRDFa(xPara); + assertTrue("RDFa: 19", eq(result.First, new Statement[] { } )); + + xPara = UnoRuntime.queryInterface( + XMetadatable.class, xEnum.nextElement()); + result = xDocRepository.getStatementRDFa(xPara); + assertTrue("RDFa: 20", eq(result.First, new Statement[] { } )); + + xPara = UnoRuntime.queryInterface( + XMetadatable.class, xEnum.nextElement()); + result = xDocRepository.getStatementRDFa(xPara); + assertTrue("RDFa: 21", eq(result.First, new Statement[] { } )); + + System.out.println("...done"); + + } catch (Exception e) { + report(e); + close(xComp); + } + return xComp; + } + + +// utilities ------------------------------------------------------------- + + public void report2(Exception e) + { + if (e instanceof WrappedTargetException) + { + System.out.println("Cause:"); + Exception cause = (Exception) + (((WrappedTargetException)e).TargetException); + System.out.println(cause.toString()); + report2(cause); + } else if (e instanceof WrappedTargetRuntimeException) { + System.out.println("Cause:"); + Exception cause = (Exception) + (((WrappedTargetRuntimeException)e).TargetException); + System.out.println(cause.toString()); + report2(cause); + } + } + + public void report(Exception e) { + System.out.println("Exception occurred:"); + e.printStackTrace(System.out); + report2(e); + fail(); + } + + static void close(XComponent i_comp) + { + try { + XCloseable xClos = UnoRuntime.queryInterface(XCloseable.class, i_comp); + if (xClos != null) + { + xClos.close(true); + } + } catch (Exception e) { + } + } + + XLiteral mkLit(String i_content) + { + return Literal.create(xContext, i_content); + } + + XLiteral mkLit(String i_content, XURI i_uri) + { + return Literal.createWithType(xContext, i_content, i_uri); + } + + static Statement[] merge(Statement[] i_A1, Statement[] i_A2) + { + // bah, java sucks... + Statement[] ret = new Statement[i_A1.length + i_A2.length]; + for (int i = 0; i < i_A1.length; ++i) { + ret[i] = i_A1[i]; + } + for (int i = 0; i < i_A2.length; ++i) { + ret[i+i_A1.length] = i_A2[i]; + } + return ret; + } + + public static String toS(XNode n) { + if (null == n) + { + return "< null >"; + } + return n.getStringValue(); + } + + static boolean isBlank(XNode i_node) + { + XBlankNode blank = UnoRuntime.queryInterface(XBlankNode.class, i_node); + return blank != null; + } + +/* + static class Statement implements XStatement + { + XResource m_Subject; + XResource m_Predicate; + XNode m_Object; + XURI m_Graph; + + Statement(XResource i_Subject, XResource i_Predicate, XNode i_Object, + XURI i_Graph) + { + m_Subject = i_Subject; + m_Predicate = i_Predicate; + m_Object = i_Object; + m_Graph = i_Graph; + } + + public XResource getSubject() { return m_Subject; } + public XResource getPredicate() { return m_Predicate; } + public XNode getObject() { return m_Object; } + public XURI getGraph() { return m_Graph; } + } +*/ + + static Statement[] toSeq(XEnumeration i_Enum) throws Exception + { + java.util.Collection c = new java.util.Vector(); + while (i_Enum.hasMoreElements()) { + Statement s = (Statement) i_Enum.nextElement(); +//System.out.println("toSeq: " + s.getSubject().getStringValue() + " " + s.getPredicate().getStringValue() + " " + s.getObject().getStringValue() + "."); + c.add(s); + } +// return (Statement[]) c.toArray(); + // java sucks + Object[] arr = c.toArray(); + Statement[] ret = new Statement[arr.length]; + for (int i = 0; i < arr.length; ++i) { + ret[i] = (Statement) arr[i]; + } + return ret; + } + + static XNode[][] toSeqs(XEnumeration i_Enum) throws Exception + { + java.util.Collection c = new java.util.Vector(); + while (i_Enum.hasMoreElements()) { + XNode[] s = (XNode[]) i_Enum.nextElement(); + c.add(s); + } +// return (XNode[][]) c.toArray(); + Object[] arr = c.toArray(); + XNode[][] ret = new XNode[arr.length][]; + for (int i = 0; i < arr.length; ++i) { + ret[i] = (XNode[]) arr[i]; + } + return ret; + } + + static class BindingComp implements java.util.Comparator + { + public int compare(Object i_Left, Object i_Right) + { + XNode[] left = (XNode[]) i_Left; + XNode[] right = (XNode[]) i_Right; + if (left.length != right.length) + { + throw new RuntimeException(); + } + for (int i = 0; i < left.length; ++i) { + int eq = (left[i].getStringValue().compareTo( + right[i].getStringValue())); + if (eq != 0) + { + return eq; + } + } + return 0; + } + } + + static class StmtComp implements java.util.Comparator + { + public int compare(Object i_Left, Object i_Right) + { + int eq; + Statement left = (Statement) i_Left; + Statement right = (Statement) i_Right; + if ((eq = cmp(left.Graph, right.Graph )) != 0) return eq; + if ((eq = cmp(left.Subject, right.Subject )) != 0) return eq; + if ((eq = cmp(left.Predicate, right.Predicate)) != 0) return eq; + if ((eq = cmp(left.Object, right.Object )) != 0) return eq; + return 0; + } + + public int cmp(XNode i_Left, XNode i_Right) + { + if (isBlank(i_Left)) { + return isBlank(i_Right) ? 0 : 1; + } else { + if (isBlank(i_Right)) { + return -1; + } else { + return toS(i_Left).compareTo(toS(i_Right)); + } + } + } + } + + static boolean eq(Statement i_Left, Statement i_Right) + { + XURI lG = i_Left.Graph; + XURI rG = i_Right.Graph; + if (!eq(lG, rG)) { + System.out.println("Graphs differ: " + toS(lG) + " != " + toS(rG)); + return false; + } + if (!eq(i_Left.Subject, i_Right.Subject)) { + System.out.println("Subjects differ: " + + i_Left.Subject.getStringValue() + " != " + + i_Right.Subject.getStringValue()); + return false; + } + if (!eq(i_Left.Predicate, i_Right.Predicate)) { + System.out.println("Predicates differ: " + + i_Left.Predicate.getStringValue() + " != " + + i_Right.Predicate.getStringValue()); + return false; + } + if (!eq(i_Left.Object, i_Right.Object)) { + System.out.println("Objects differ: " + + i_Left.Object.getStringValue() + " != " + + i_Right.Object.getStringValue()); + return false; + } + return true; + } + + static boolean eq(Statement[] i_Result, Statement[] i_Expected) + { + if (i_Result.length != i_Expected.length) { + System.out.println("eq: different lengths: " + i_Result.length + " " + + i_Expected.length); + return false; + } + Statement[] expected = (Statement[]) + java.util.Arrays.asList(i_Expected).toArray(); + java.util.Arrays.sort(i_Result, new StmtComp()); + java.util.Arrays.sort(expected, new StmtComp()); + for (int i = 0; i < expected.length; ++i) + { + // This is better for debug! + final Statement a = i_Result[i]; + final Statement b = expected[i]; + final boolean cond = eq(a, b); + if (!cond) return false; + } + return true; + } + + static boolean eq(XEnumeration i_Enum, Statement[] i_Expected) + throws Exception + { + Statement[] current = toSeq(i_Enum); + return eq(current, i_Expected); + } + + static boolean eq(XNode i_Left, XNode i_Right) + { + if (i_Left == null) { + return (i_Right == null); + } else { + return (i_Right != null) && + (i_Left.getStringValue().equals(i_Right.getStringValue()) + // FIXME: hack: blank nodes considered equal + || (isBlank(i_Left) && isBlank(i_Right))); + } + } + + static boolean eq(XQuerySelectResult i_Result, + String[] i_Vars, XNode[][] i_Bindings) throws Exception + { + String[] vars = i_Result.getBindingNames(); + XEnumeration iter = (XEnumeration) i_Result; + XNode[][] bindings = toSeqs(iter); + if (vars.length != i_Vars.length) { + System.out.println("var lengths differ"); + return false; + } + if (bindings.length != i_Bindings.length) { + System.out.println("binding lengths differ: " + i_Bindings.length + + " vs " + bindings.length ); + return false; + } + java.util.Arrays.sort(bindings, new BindingComp()); + java.util.Arrays.sort(i_Bindings, new BindingComp()); + for (int i = 0; i < i_Bindings.length; ++i) { + if (i_Bindings[i].length != i_Vars.length) { + System.out.println("TEST ERROR!"); + throw new Exception(); + } + if (bindings[i].length != i_Vars.length) { + System.out.println("binding length and var length differ"); + return false; + } + for (int j = 0; j < i_Vars.length; ++j) { + if (!eq(bindings[i][j], i_Bindings[i][j])) { + System.out.println("bindings differ: " + + toS(bindings[i][j]) + " != " + toS(i_Bindings[i][j])); + return false; + } + } + } + for (int i = 0; i < i_Vars.length; ++i) { + if (!vars[i].equals(i_Vars[i])) { + System.out.println("variable names differ: " + + vars[i] + " != " + i_Vars[i]); + return false; + } + } + return true; + } + + static boolean eq(StringPair i_Left, StringPair i_Right) + { + return ((i_Left.First).equals(i_Right.First)) && + ((i_Left.Second).equals(i_Right.Second)); + } + + static String mkNamespace(String i_prefix, String i_namespace) + { + return "PREFIX " + i_prefix + ": <" + i_namespace + ">\n"; + } + + static String mkNss() + { + String namespaces = mkNamespace("rdf", + "http://www.w3.org/1999/02/22-rdf-syntax-ns#"); + namespaces += mkNamespace("pkg", + "http://docs.oasis-open.org/opendocument/meta/package/common#"); + namespaces += mkNamespace("odf", + "http://docs.oasis-open.org/opendocument/meta/package/odf#"); + return namespaces; + } + + Statement[] getManifestStmts(XURI xBaseURI) throws Exception + { + XURI xManifest = URI.createNS(xContext, xBaseURI.getStringValue(), + manifestPath); + XURI xContent = URI.createNS(xContext, xBaseURI.getStringValue(), + contentPath); + XURI xStyles = URI.createNS(xContext, xBaseURI.getStringValue(), + stylesPath); + Statement xM_BaseTypeDoc = + new Statement(xBaseURI, rdf_type, pkg_Document, xManifest); + Statement xM_BaseHaspartContent = + new Statement(xBaseURI, pkg_hasPart, xContent, xManifest); + Statement xM_BaseHaspartStyles = + new Statement(xBaseURI, pkg_hasPart, xStyles, xManifest); + Statement xM_ContentTypeContent = + new Statement(xContent, rdf_type, odf_ContentFile, xManifest); + Statement xM_StylesTypeStyles = + new Statement(xStyles, rdf_type, odf_StylesFile, xManifest); + return new Statement[] { + xM_BaseTypeDoc, xM_BaseHaspartContent, xM_BaseHaspartStyles, + xM_ContentTypeContent, xM_StylesTypeStyles + }; + } + + Statement[] getMetadataFileStmts(XURI xBaseURI, String Path) + throws Exception + { + XURI xManifest = URI.createNS(xContext, xBaseURI.getStringValue(), + manifestPath); + XURI xGraph = URI.createNS(xContext, xBaseURI.getStringValue(), Path); + Statement xM_BaseHaspartGraph = + new Statement(xBaseURI, pkg_hasPart, xGraph, xManifest); + Statement xM_GraphTypeMetadata = + new Statement(xGraph, rdf_type, pkg_MetadataFile, xManifest); + return new Statement[] { xM_BaseHaspartGraph, xM_GraphTypeMetadata }; + } + + class TestRange implements XTextRange, XMetadatable, XServiceInfo + { + String m_Stream; + String m_XmlId; + String m_Text; + TestRange(String i_Str) { m_Text = i_Str; } + + public String getStringValue() { return ""; } + public String getNamespace() { return ""; } + public String getLocalName() { return ""; } + + public StringPair getMetadataReference() + { + return new StringPair(m_Stream, m_XmlId); + } + public void setMetadataReference(StringPair i_Ref) + throws IllegalArgumentException + { + m_Stream = i_Ref.First; + m_XmlId = i_Ref.Second; + } + public void ensureMetadataReference() + { + m_Stream = "content.xml"; + m_XmlId = "42"; + } + + public String getImplementationName() { return null; } + public String[] getSupportedServiceNames() { return null; } + public boolean supportsService(String i_Svc) + { + return i_Svc.equals("com.sun.star.text.Paragraph"); + } + + public XText getText() { return null; } + public XTextRange getStart() { return null; } + public XTextRange getEnd() { return null; } + public String getString() { return m_Text; } + public void setString(String i_Str) { m_Text = i_Str; } + } + + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println( "------------------------------------------------------------" ); + System.out.println( "starting class: " + DocumentMetadataAccess.class.getName() ); + System.out.println( "------------------------------------------------------------" ); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println( "------------------------------------------------------------" ); + System.out.println( "finishing class: " + DocumentMetadataAccess.class.getName() ); + System.out.println( "------------------------------------------------------------" ); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + +} + diff --git a/sfx2/qa/complex/sfx2/DocumentProperties.java b/sfx2/qa/complex/sfx2/DocumentProperties.java new file mode 100644 index 000000000000..01ccaa21619b --- /dev/null +++ b/sfx2/qa/complex/sfx2/DocumentProperties.java @@ -0,0 +1,561 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +package complex.sfx2; + + +import complex.sfx2.tools.TestDocument; +import com.sun.star.uno.UnoRuntime; +import com.sun.star.uno.XComponentContext; +import com.sun.star.lang.XInitialization; + +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.lang.Locale; +import com.sun.star.lang.EventObject; +import com.sun.star.util.Date; +import com.sun.star.util.DateTime; +import com.sun.star.util.Time; +import com.sun.star.util.Duration; +import com.sun.star.util.XModifyListener; +import com.sun.star.util.XModifyBroadcaster; +import com.sun.star.beans.XPropertyContainer; +import com.sun.star.beans.XPropertySet; +import com.sun.star.beans.PropertyValue; +import com.sun.star.beans.NamedValue; +import com.sun.star.beans.PropertyAttribute; +import com.sun.star.beans.UnknownPropertyException; +import com.sun.star.beans.IllegalTypeException; + +import com.sun.star.document.XDocumentProperties; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + +/** + * Test case for the service com.sun.star.document.DocumentProperties. + * Currently, this service is implemented in + * sfx2/source/doc/SfxDocumentMetaData.cxx. + * + * @author mst + */ +public class DocumentProperties +{ + @After public void cleanup() { + // nothing to do + } + + // for testing modifications + class Listener implements XModifyListener { + private boolean m_Called; + + Listener() { + m_Called = false; + } + + public boolean reset() { + boolean oldCalled = m_Called; + m_Called = false; + return oldCalled; + } + + public void modified(EventObject e) { + m_Called = true; + } + + public void disposing(EventObject e) { + } + } + + @Test public void check() { + try { + XMultiServiceFactory xMSF = getMSF(); + assertNotNull("could not create MultiServiceFactory.", xMSF); + XPropertySet xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xMSF); + Object defaultCtx = xPropertySet.getPropertyValue("DefaultContext"); + XComponentContext xContext = UnoRuntime.queryInterface(XComponentContext.class, defaultCtx); + assertNotNull("could not get component context.", xContext); + + // TODO: Path to temp + String temp = util.utils.getOfficeTemp/*Dir*/(xMSF); + System.out.println("tempdir: " + temp); + + PropertyValue[] noArgs = { }; + PropertyValue mimetype = new PropertyValue(); + mimetype.Name = "MediaType"; + mimetype.Value = "application/vnd.oasis.opendocument.text"; + PropertyValue[] mimeArgs = { mimetype }; +// new Any("application/vnd.oasis.opendocument.text")) }; + PropertyValue cfile = new PropertyValue(); + cfile.Name = "URL"; + cfile.Value = temp + "EMPTY.odt"; + PropertyValue[] mimeEmptyArgs = { mimetype, cfile }; + + System.out.println("Creating service DocumentProperties..."); + + Object oDP = +// xMSF.createInstanceWithContext( +// "com.sun.star.document.DocumentProperties", xContext); + xMSF.createInstance("com.sun.star.document.DocumentProperties"); + XDocumentProperties xDP = UnoRuntime.queryInterface(XDocumentProperties.class, oDP); + + System.out.println("...done"); + + + System.out.println("Checking initialize ..."); + + XDocumentProperties xDP2 = UnoRuntime.queryInterface(XDocumentProperties.class, xMSF.createInstance("com.sun.star.document.DocumentProperties")); + XInitialization xInit = UnoRuntime.queryInterface(XInitialization.class, xDP2); + xInit.initialize(new Object[] { }); + + System.out.println("...done"); + + System.out.println("Checking storing default-initialized meta data ..."); + +// xDP2.storeToMedium(temp + "EMPTY.odt", mimeArgs); + xDP2.storeToMedium("", mimeEmptyArgs); + + System.out.println("...done"); + + System.out.println("Checking loading default-initialized meta data ..."); + +// xDP2.loadFromMedium(temp + "EMPTY.odt", noArgs); + xDP2.loadFromMedium("", mimeEmptyArgs); + assertTrue ("Author", "".equals(xDP2.getAuthor())); + + System.out.println("...done"); + + System.out.println("(Not) Checking preservation of custom meta data ..."); + + xDP2.loadFromMedium(TestDocument.getUrl("CUSTOM.odt"), + noArgs); + assertTrue ("Author", "".equals(xDP2.getAuthor())); + xDP2.storeToMedium(temp + "CUSTOM.odt", mimeArgs); + + //FIXME: now what? comparing for binary equality seems useless + // we could unzip the written file and grep for the custom stuff + // but would that work on windows... + + System.out.println("...done"); + + System.out.println("Checking loading from test document..."); + + String file = TestDocument.getUrl("TEST.odt"); + xDP.loadFromMedium(file, noArgs); +/* XInputStream xStream = + new StreamSimulator("./testdocuments/TEST.odt", true, param); + Object oSF = + xMSF.createInstance("com.sun.star.embed.StorageFactory"); + XSingleServiceFactory xSF = (XSingleServiceFactory) + UnoRuntime.queryInterface(XSingleServiceFactory.class, oSF); + Object oStor = xSF.createInstanceWithArguments( + new Object[] { xStream }); + XStorage xStor = (XStorage) UnoRuntime.queryInterface( + XStorage.class, oStor); + xDP.loadFromStorage(xStor);*/ + + System.out.println("...done"); + + System.out.println("Checking meta-data import..."); + + assertTrue("Author", "Karl-Heinz Mustermann".equals(xDP.getAuthor())); + assertTrue("Generator", + "StarOffice/8$Solaris_x86 OpenOffice.org_project/680m232$Build-9227" + .equals(xDP.getGenerator())); + assertTrue("CreationDate", 2007 == xDP.getCreationDate().Year); + assertTrue("Title", "Urgent Memo".equals(xDP.getTitle())); + assertTrue("Subject", "Wichtige Mitteilung".equals(xDP.getSubject())); + assertTrue("Description", + "Modern internal company memorandum in full-blocked style" + .equals(xDP.getDescription())); +// assertTrue("Language", "".equals(xDP.getLanguage())); + assertTrue("ModifiedBy", + "Karl-Heinz Mustermann".equals(xDP.getModifiedBy())); + assertTrue("ModificationDate", 10 == xDP.getModificationDate().Month); + assertTrue("PrintedBy", + "Karl-Heinz Mustermann".equals(xDP.getPrintedBy())); + assertTrue("PrintDate", 29 == xDP.getPrintDate().Day); + assertTrue("TemplateName", + "Modern Memo".equals(xDP.getTemplateName())); + assertTrue("TemplateURL", + xDP.getTemplateURL().endsWith("memmodern.ott")); + assertTrue("TemplateDate", 17 == xDP.getTemplateDate().Hours); + assertTrue("AutoloadURL", "../TEST.odt".equals(xDP.getAutoloadURL())); + assertTrue("AutoloadSecs", 0 == xDP.getAutoloadSecs()); + assertTrue("DefaultTarget", "_blank".equals(xDP.getDefaultTarget())); + assertTrue("EditingCycles", 3 == xDP.getEditingCycles()); + assertTrue("EditingDuration", 320 == xDP.getEditingDuration()); + + String[] kws = xDP.getKeywords(); + assertTrue("Keywords", fromArray(kws).containsAll( + fromArray(new Object[] { "Asien", "Memo", "Reis" }))); + + NamedValue[] ds = xDP.getDocumentStatistics(); +/* for (int i = 0; i < ds.length; ++i) { + System.out.println("nv: " + ds[i].Name + " " + ds[i].Value); + } + NamedValue nv1 = new NamedValue("WordCount", new Integer(23)); + NamedValue nv2 = new NamedValue("WordCount", new Integer(23)); + System.out.println("eq: " + nv1.equals(nv2)); // grrr, this is false... +*/ + assertTrue("DocumentStatistics:WordCount", containsNV(ds, + new NamedValue("WordCount", new Integer(23)))); + assertTrue("DocumentStatistics:PageCount", containsNV(ds, + new NamedValue("PageCount", new Integer(1)))); + + XPropertyContainer udpc = xDP.getUserDefinedProperties(); + XPropertySet udps = UnoRuntime.queryInterface( XPropertySet.class, udpc ); + assertTrue("UserDefined 1", "Dies ist ein wichtiger Hinweis" + .equals(udps.getPropertyValue("Hinweis"))); + assertTrue("UserDefined 2", ("Kann Spuren von N" + + new String(new byte[] { (byte) 0xc3, (byte) 0xbc }, "UTF-8") + + "ssen enthalten") + .equals(udps.getPropertyValue("Warnung"))); + + System.out.println("...done"); + + System.out.println("Checking meta-data updates..."); + + String str; + DateTime dt = new DateTime(); + Locale l = new Locale(); + int i; + + str = "me"; + xDP.setAuthor(str); + assertTrue("setAuthor", str.equals(xDP.getAuthor())); + str = "the computa"; + xDP.setGenerator(str); + assertTrue("setGenerator", str.equals(xDP.getGenerator())); + dt.Year = 2038; + dt.Month = 1; + dt.Day = 1; + xDP.setCreationDate(dt); + assertTrue("setCreationDate", dt.Year == xDP.getCreationDate().Year); + str = "El t'itulo"; + xDP.setTitle(str); + assertTrue("setTitle", str.equals(xDP.getTitle())); + str = "Ein verkommenes Subjekt"; + xDP.setSubject(str); + assertTrue("setSubject", str.equals(xDP.getSubject())); + str = "Este descripci'on no es importante"; + xDP.setDescription(str); + assertTrue("setDescription", str.equals(xDP.getDescription())); + l.Language = "en"; + l.Country = "GB"; + xDP.setLanguage(l); + Locale l2 = xDP.getLanguage(); + assertTrue("setLanguage Lang", l.Language.equals(l2.Language)); + assertTrue("setLanguage Cty", l.Country.equals(l2.Country)); + str = "myself"; + xDP.setModifiedBy(str); + assertTrue("setModifiedBy", str.equals(xDP.getModifiedBy())); + dt.Year = 2042; + xDP.setModificationDate(dt); + assertTrue("setModificationDate", + dt.Year == xDP.getModificationDate().Year); + str = "i didnt do it"; + xDP.setPrintedBy(str); + assertTrue("setPrintedBy", str.equals(xDP.getPrintedBy())); + dt.Year = 2024; + xDP.setPrintDate(dt); + assertTrue("setPrintDate", dt.Year == xDP.getPrintDate().Year); + str = "blah"; + xDP.setTemplateName(str); + assertTrue("setTemplateName", str.equals(xDP.getTemplateName())); + str = "gopher://some-hole-in-the-ground/"; + xDP.setTemplateURL(str); + assertTrue("setTemplateURL", str.equals(xDP.getTemplateURL())); + dt.Year = 2043; + xDP.setTemplateDate(dt); + assertTrue("setTemplateDate", dt.Year == xDP.getTemplateDate().Year); + str = "http://nowhere/"; + xDP.setAutoloadURL(str); + assertTrue("setAutoloadURL", str.equals(xDP.getAutoloadURL())); + i = 3661; // this might not work (due to conversion via double...) + xDP.setAutoloadSecs(i); +// System.out.println("set: " + i + " get: " + xDP.getAutoloadSecs()); + assertTrue("setAutoloadSecs", i == xDP.getAutoloadSecs()); + str = "_blank"; + xDP.setDefaultTarget(str); + assertTrue("setDefaultTarget", str.equals(xDP.getDefaultTarget())); + i = 42; + xDP.setEditingCycles((short) i); + assertTrue("setEditingCycles", i == xDP.getEditingCycles()); + i = 84; + xDP.setEditingDuration(i); + assertTrue("setEditingDuration", i == xDP.getEditingDuration()); + str = ""; + + String[] kws2 = new String[] { + "keywordly", "keywordlike", "keywordalicious" }; + xDP.setKeywords(kws2); + kws = xDP.getKeywords(); + assertTrue("setKeywords", fromArray(kws).containsAll(fromArray(kws2))); + + NamedValue[] ds2 = new NamedValue[] { + new NamedValue("SyllableCount", new Integer(9)), + new NamedValue("FrameCount", new Integer(2)), + new NamedValue("SentenceCount", new Integer(7)) }; + xDP.setDocumentStatistics(ds2); + ds = xDP.getDocumentStatistics(); + assertTrue("setDocumentStatistics:SyllableCount", containsNV(ds, + new NamedValue("SyllableCount", new Integer(9)))); + assertTrue("setDocumentStatistics:FrameCount", containsNV(ds, + new NamedValue("FrameCount", new Integer(2)))); + assertTrue("setDocumentStatistics:SentenceCount", containsNV(ds, + new NamedValue("SentenceCount", new Integer(7)))); + + System.out.println("...done"); + + System.out.println("Checking user-defined meta-data updates..."); + + // actually, this tests the PropertyBag service + // but maybe the DocumentProperties service will be implemented + // differently some day... + boolean b = true; + double d = 3.1415; + // note that Time is only supported for backward compatibilty! + Time t = new Time(); + t.Hours = 1; + t.Minutes = 16; + Date date = new Date(); + date.Year = 2071; + date.Month = 2; + date.Day = 3; + dt.Year = 2065; + Duration dur = new Duration(); + dur.Negative = true; + dur.Years = 1001; + dur.Months = 999; + dur.Days = 888; + dur.Hours = 777; + dur.Minutes = 666; + dur.Seconds = 555; + dur.MilliSeconds = 444; + + udpc.addProperty("Frobnicate", PropertyAttribute.REMOVEABLE, b); + udpc.addProperty("FrobDuration", PropertyAttribute.REMOVEABLE, dur); + udpc.addProperty("FrobDuration2", PropertyAttribute.REMOVEABLE, t); + udpc.addProperty("FrobEndDate", PropertyAttribute.REMOVEABLE, date); + udpc.addProperty("FrobStartTime", PropertyAttribute.REMOVEABLE, dt); + udpc.addProperty("Pi", PropertyAttribute.REMOVEABLE, new Double(d)); + udpc.addProperty("Foo", PropertyAttribute.REMOVEABLE, "bar"); + udpc.addProperty("Removed", PropertyAttribute.REMOVEABLE, "bar"); + // #i94175#: empty property name is valid ODF 1.1 + udpc.addProperty("", PropertyAttribute.REMOVEABLE, "eeeeek"); + try { + udpc.removeProperty("Info 1"); + udpc.removeProperty("Removed"); + } catch (UnknownPropertyException e) { + fail("removeProperty failed"); + } + + try { + udpc.addProperty("Forbidden", PropertyAttribute.REMOVEABLE, + new String[] { "foo", "bar" }); + fail("inserting value of non-supported type did not fail"); + } catch (IllegalTypeException e) { + // ignore + } + + assertTrue("UserDefined bool", new Boolean(b).equals( + udps.getPropertyValue("Frobnicate"))); + assertTrue("UserDefined duration", eqDuration(dur, (Duration) + udps.getPropertyValue("FrobDuration"))); + assertTrue("UserDefined time", eqTime(t, (Time) + udps.getPropertyValue("FrobDuration2"))); + assertTrue("UserDefined date", eqDate(date, (Date) + udps.getPropertyValue("FrobEndDate"))); + assertTrue("UserDefined datetime", eqDateTime(dt, (DateTime) + udps.getPropertyValue("FrobStartTime"))); + assertTrue("UserDefined float", new Double(d).equals( + udps.getPropertyValue("Pi"))); + assertTrue("UserDefined string", "bar".equals( + udps.getPropertyValue("Foo"))); + assertTrue("UserDefined empty name", "eeeeek".equals( + udps.getPropertyValue(""))); + + try { + udps.getPropertyValue("Removed"); + fail("UserDefined remove didn't"); + } catch (UnknownPropertyException e) { + // ok + } + + System.out.println("...done"); + + System.out.println("Checking storing meta-data to file..."); + + xDP.storeToMedium(temp + "TEST.odt", mimeArgs); + + System.out.println("...done"); + + System.out.println("Checking loading meta-data from stored file..."); + + xDP.loadFromMedium(temp + "TEST.odt", noArgs); + + System.out.println("...done"); + + System.out.println("Checking user-defined meta-data from stored file..."); + + udpc = xDP.getUserDefinedProperties(); + udps = UnoRuntime.queryInterface( XPropertySet.class, udpc ); + + assertTrue("UserDefined bool", new Boolean(b).equals( + udps.getPropertyValue("Frobnicate"))); + assertTrue("UserDefined duration", eqDuration(dur, (Duration) + udps.getPropertyValue("FrobDuration"))); + // this is now a Duration! + Duration t_dur = new Duration(false, (short)0, (short)0, (short)0, + t.Hours, t.Minutes, t.Seconds, + (short)(10 * t.HundredthSeconds)); + assertTrue("UserDefined time", eqDuration(t_dur, (Duration) + udps.getPropertyValue("FrobDuration2"))); + assertTrue("UserDefined date", eqDate(date, (Date) + udps.getPropertyValue("FrobEndDate"))); + assertTrue("UserDefined datetime", eqDateTime(dt, (DateTime) + udps.getPropertyValue("FrobStartTime"))); + assertTrue("UserDefined float", new Double(d).equals( + udps.getPropertyValue("Pi"))); + assertTrue("UserDefined string", "bar".equals( + udps.getPropertyValue("Foo"))); + + try { + udps.getPropertyValue("Removed"); + fail("UserDefined remove didn't"); + } catch (UnknownPropertyException e) { + // ok + } + + System.out.println("...done"); + + System.out.println("Checking notification listener interface..."); + + Listener listener = new Listener(); + XModifyBroadcaster xMB = UnoRuntime.queryInterface( XModifyBroadcaster.class, xDP ); + xMB.addModifyListener(listener); + xDP.setAuthor("not me"); + assertTrue("Listener Author", listener.reset()); + udpc.addProperty("Listener", PropertyAttribute.REMOVEABLE, "foo"); + assertTrue("Listener UserDefined Add", listener.reset()); + udps.setPropertyValue("Listener", "bar"); + assertTrue("Listener UserDefined Set", listener.reset()); + udpc.removeProperty("Listener"); + assertTrue("Listener UserDefined Remove", listener.reset()); + xMB.removeModifyListener(listener); + udpc.addProperty("Listener2", PropertyAttribute.REMOVEABLE, "foo"); + assertTrue("Removed Listener UserDefined Add", !listener.reset()); + + System.out.println("...done"); + + } catch (Exception e) { + report(e); + } + } + + // grrr... + boolean eqDateTime(DateTime a, DateTime b) { + return a.Year == b.Year && a.Month == b.Month && a.Day == b.Day + && a.Hours == b.Hours && a.Minutes == b.Minutes + && a.Seconds == b.Seconds + && a.HundredthSeconds == b.HundredthSeconds; + } + + boolean eqDate(Date a, Date b) { + return a.Year == b.Year && a.Month == b.Month && a.Day == b.Day; + } + + boolean eqTime(Time a, Time b) { + return a.Hours == b.Hours && a.Minutes == b.Minutes + && a.Seconds == b.Seconds + && a.HundredthSeconds == b.HundredthSeconds; + } + + boolean eqDuration(Duration a, Duration b) { + return a.Years == b.Years && a.Months == b.Months && a.Days == b.Days + && a.Hours == b.Hours && a.Minutes == b.Minutes + && a.Seconds == b.Seconds + && a.MilliSeconds == b.MilliSeconds + && a.Negative == b.Negative; + } + + java.util.Collection fromArray(Object[] os) { + java.util.Collection ret = new java.util.HashSet(); + for (int i = 0; i < os.length; ++i) { + ret.add(os[i]); + } + return ret; + } + + // bah, structs do not have proper equals(), and uno.Type is not comparable + public static boolean containsNV (NamedValue[] nvs, NamedValue nv) { + for (int i = 0; i < nvs.length; ++i) { + if (nvs[i].Name.equals(nv.Name) && nvs[i].Value.equals(nv.Value)) { + return true; + } + } + return false; + } + + public void report(Exception e) { + System.out.println("Exception occurred:"); + e.printStackTrace(); + fail(); + } + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface( XMultiServiceFactory.class, connection.getComponentContext().getServiceManager() ); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println( "------------------------------------------------------------" ); + System.out.println( "starting class: " + DocumentProperties.class.getName() ); + System.out.println( "------------------------------------------------------------" ); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println( "------------------------------------------------------------" ); + System.out.println( "finishing class: " + DocumentProperties.class.getName() ); + System.out.println( "------------------------------------------------------------" ); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + +} + diff --git a/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java b/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java new file mode 100644 index 000000000000..41bd66ccb5b9 --- /dev/null +++ b/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java @@ -0,0 +1,273 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.sfx2; + +import com.sun.star.awt.XWindow; +import com.sun.star.document.XEventBroadcaster; +import com.sun.star.document.XEventListener; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.sheet.XSpreadsheetDocument; +import com.sun.star.text.XTextDocument; +import com.sun.star.uno.UnoRuntime; +import complex.sfx2.tools.WriterHelper; + +import java.util.ArrayList; + +import util.UITools; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + + +/** + * This testcase checks the GlobalEventBroadcaster + * it will add an XEventListener and verify the Events + * raised when opening/changing and closing Office Documents + */ +public class GlobalEventBroadcaster { + XMultiServiceFactory m_xMSF = null; + XEventBroadcaster m_xEventBroadcaster = null; + ArrayList notifyEvents = new ArrayList(); + // XTextDocument xTextDoc; + XSpreadsheetDocument xSheetDoc; + XEventListener m_xEventListener = new EventListenerImpl(); + + @Before public void initialize() { + m_xMSF = getMSF(); + System.out.println("check wether there is a valid MultiServiceFactory"); + + assertNotNull("## Couldn't get MultiServiceFactory make sure your Office is started", m_xMSF); + + System.out.println("... done"); + + System.out.println( + "Create an instance of com.sun.star.frame.GlobalEventBroadcaster"); + + Object GlobalEventBroadcaster = null; + + try { + GlobalEventBroadcaster = m_xMSF.createInstance( + "com.sun.star.frame.GlobalEventBroadcaster"); + } catch (com.sun.star.uno.Exception e) { + fail("## Exception while creating instance"); + } + + System.out.println("... done"); + + System.out.println("check wether the created instance is valid"); + + assertNotNull("couldn't create service", GlobalEventBroadcaster); + + System.out.println("... done"); + + System.out.println( + "try to query the XEventBroadcaster from the gained Object"); + m_xEventBroadcaster = UnoRuntime.queryInterface(XEventBroadcaster.class, GlobalEventBroadcaster); + + if (util.utils.isVoid(m_xEventBroadcaster)) { + fail("couldn't get XEventBroadcaster"); + } + + System.out.println("... done"); + + System.out.println("adding Listener"); + m_xEventBroadcaster.addEventListener(m_xEventListener); + System.out.println("... done"); + } + + @Test public void checkWriter() { + System.out.println("-- Checking Writer --"); + + WriterHelper wHelper = new WriterHelper(m_xMSF); + String[] expected; + System.out.println("opening an empty writer doc"); + notifyEvents.clear(); + { + XTextDocument xTextDoc = wHelper.openEmptyDoc(); + shortWait(); + expected = new String[] { "OnUnfocus", "OnCreate", "OnViewCreated", "OnFocus" }; + + assertTrue("Wrong events fired when opening empty doc", + proveExpectation(expected)); + System.out.println("... done"); + + System.out.println("changing the writer doc"); + notifyEvents.clear(); + xTextDoc.getText().setString("GlobalEventBroadcaster"); + shortWait(); + expected = new String[] { "OnModifyChanged" }; + + assertTrue("Wrong events fired when changing doc", + proveExpectation(expected)); + System.out.println("... done"); + + System.out.println("closing the empty writer doc"); + notifyEvents.clear(); + wHelper.closeDoc(xTextDoc); + shortWait(); + } + expected = new String[] { "OnUnfocus", "OnFocus", "OnViewClosed", "OnUnload" }; + + assertTrue("Wrong events fired when closing empty doc", + proveExpectation(expected)); + System.out.println("... done"); + + System.out.println("opening an writer doc via Window-New Window"); + notifyEvents.clear(); + { + XTextDocument xTextDoc = wHelper.openFromDialog(".uno:NewWindow", "", false); + + shortWait(); + expected = new String[] { "OnUnfocus", "OnCreate", "OnViewCreated", "OnFocus", "OnUnfocus", "OnViewCreated", "OnFocus", }; + + assertTrue("Wrong events fired when opening an writer doc via Window-New Window", + proveExpectation(expected)); + System.out.println("... done"); + + System.out.println("closing the created writer doc"); + notifyEvents.clear(); + + wHelper.closeDoc(xTextDoc); + shortWait(); + } + expected = new String[] { "OnViewClosed", "OnUnfocus", "OnFocus", "OnViewClosed", "OnUnload" }; + + assertTrue("Wrong events fired when closing Window-New Window", + proveExpectation(expected)); + + System.out.println("... done"); + // TODO: It seems not possible to close the document without interactiv question + // there the follow test will not be execute + if (false) { + System.out.println("Opening document with label wizard"); + XTextDocument xTextDoc = wHelper.openFromDialog("private:factory/swriter?slot=21051", "", false); + shortWait(); + XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, wHelper.getToolkit().getActiveTopWindow()); + UITools ut = new UITools(m_xMSF,xWindow); + notifyEvents.clear(); + System.out.println("pressing button 'New Document'"); + try{ + ut.clickButton ("New Document"); + } catch (Exception e) { + System.out.println("Couldn't press Button"); + } + System.out.println("... done"); + shortWait(); + shortWait(); + shortWait(); + expected = new String[] { "OnViewClosed", "OnCreate", "OnFocus", "OnModifyChanged" }; + + assertTrue("Wrong events fired when starting labels wizard", + proveExpectation(expected)); + + System.out.println("Try to close document..."); + wHelper.closeDoc(xTextDoc); + shortWait(); + wHelper.closeFromDialog(); + shortWait(); + xTextDoc = null; + } + + System.out.println("-- Done Writer --"); + } + + @After public void cleanup() { + System.out.println("removing Listener"); + m_xEventBroadcaster.removeEventListener(m_xEventListener); + System.out.println("... done"); + } + + /** + * Sleeps for 0.5 sec. to allow StarOffice to react on + * reset call. + */ + private void shortWait() { + try { + Thread.sleep(2000); + } catch (InterruptedException e) { + System.out.println("While waiting :" + e); + } + } + + private boolean proveExpectation(String[] expected) { + boolean locRes = true; + boolean failure = false; + + System.out.println("Fired Events:"); + for (int k=0;k + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.sfx2; + +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.uno.UnoRuntime; +import complex.sfx2.standalonedocinfo.StandaloneDocumentInfoTest; +import complex.sfx2.standalonedocinfo.Test01; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; + +/* Document here +*/ + +public class StandaloneDocumentInfo { + private XMultiServiceFactory m_xMSF = null; + + @Before public void before() { + try { + m_xMSF = getMSF(); + } catch(Exception e) { + fail( "Failed to create service factory!" ); + } + if( m_xMSF ==null ) { + fail( "Failed to create service factory!" ); + } + } + + @After public void after() { + m_xMSF = null; + } + + @Test public void ExecuteTest01() { + StandaloneDocumentInfoTest aTest = new Test01 (m_xMSF); + assertTrue( "Test01 failed!", aTest.test() ); + } + + + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception + { + System.out.println( "------------------------------------------------------------" ); + System.out.println( "starting class: " + StandaloneDocumentInfo.class.getName() ); + System.out.println( "------------------------------------------------------------" ); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println( "------------------------------------------------------------" ); + System.out.println( "finishing class: " + StandaloneDocumentInfo.class.getName() ); + System.out.println( "------------------------------------------------------------" ); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + +} + + diff --git a/sfx2/qa/complex/sfx2/makefile.mk b/sfx2/qa/complex/sfx2/makefile.mk new file mode 100644 index 000000000000..c35f1380b6a4 --- /dev/null +++ b/sfx2/qa/complex/sfx2/makefile.mk @@ -0,0 +1,81 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +.IF "$(OOO_JUNIT_JAR)" == "" +nothing .PHONY: + @echo ----------------------------------------------------- + @echo - JUnit not available, not building anything + @echo ----------------------------------------------------- +.ELSE # IF "$(OOO_JUNIT_JAR)" != "" + +PRJ = ../../.. +PRJNAME = sfx2 +TARGET = qa_complex +PACKAGE = complex/sfx2 + +# --- Settings ----------------------------------------------------- +.INCLUDE: settings.mk + +#----- compile .java files ----------------------------------------- + +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) +JAVAFILES = $(shell @$(FIND) . -name "*.java") \ + +#----- create a jar from compiled files ---------------------------- + +JARTARGET = $(TARGET).jar + +#----- JUnit tests class ------------------------------------------- + +JAVATESTFILES = \ + DocumentInfo.java \ + DocumentProperties.java \ + StandaloneDocumentInfo.java \ + DocumentMetadataAccess.java \ + GlobalEventBroadcaster.java \ + +# --- Targets ------------------------------------------------------ + +.INCLUDE: target.mk + +ALL : ALLTAR + +# --- subsequent tests --------------------------------------------- + +.IF "$(OOO_SUBSEQUENT_TESTS)" != "" + +.INCLUDE: installationtest.mk + +ALLTAR : javatest + + # Sample how to debug + # JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y + +.END # "$(OOO_SUBSEQUENT_TESTS)" == "" + +.END # ELSE "$(OOO_JUNIT_JAR)" != "" diff --git a/sfx2/qa/complex/sfx2/standalonedocinfo/StandaloneDocumentInfoTest.java b/sfx2/qa/complex/sfx2/standalonedocinfo/StandaloneDocumentInfoTest.java new file mode 100644 index 000000000000..d255f3d16822 --- /dev/null +++ b/sfx2/qa/complex/sfx2/standalonedocinfo/StandaloneDocumentInfoTest.java @@ -0,0 +1,31 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.sfx2.standalonedocinfo; + +public interface StandaloneDocumentInfoTest { + boolean test(); +} diff --git a/sfx2/qa/complex/sfx2/standalonedocinfo/Test01.java b/sfx2/qa/complex/sfx2/standalonedocinfo/Test01.java new file mode 100644 index 000000000000..bf54bb4ca90b --- /dev/null +++ b/sfx2/qa/complex/sfx2/standalonedocinfo/Test01.java @@ -0,0 +1,144 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.sfx2.standalonedocinfo; + +import complex.sfx2.standalonedocinfo.TestHelper; +import complex.sfx2.standalonedocinfo.StandaloneDocumentInfoTest; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.document.XStandaloneDocumentInfo; +import com.sun.star.io.XTempFile; +import com.sun.star.frame.XLoadable; +import com.sun.star.frame.XStorable; +import com.sun.star.beans.PropertyValue; +import com.sun.star.beans.XPropertySet; +import com.sun.star.uno.UnoRuntime; +import com.sun.star.uno.AnyConverter; + + +public class Test01 implements StandaloneDocumentInfoTest { + XMultiServiceFactory m_xMSF = null; + TestHelper m_aTestHelper = null; + + public Test01 ( XMultiServiceFactory xMSF ) { + m_xMSF = xMSF; + m_aTestHelper = new TestHelper( "Test01: " ); + } + + public boolean test() { + try { + final String sDocTitle [] = new String [] { + "ODF_Doc", "OOo6_Doc", "old_binary_Doc" }; + final String sFilterName [] = new String [] { + "writer8", "StarOffice XML (Writer)", "StarWriter 5.0" }; + + for (int i = 0; i < 3; ++i ) { + m_aTestHelper.Message ( "==============================" ); + m_aTestHelper.Message ( sFilterName[i] ); + m_aTestHelper.Message ( "==============================" ); + //create a new temporary file + Object oTempFile = m_xMSF.createInstance ( "com.sun.star.io.TempFile" ); + XTempFile xTempFile = UnoRuntime.queryInterface(XTempFile.class, oTempFile); + + //create a text document and initiallize it + Object oTextDocument = m_xMSF.createInstance ( "com.sun.star.text.TextDocument" ); + XLoadable xLoadable = UnoRuntime.queryInterface(XLoadable.class, oTextDocument); + xLoadable.initNew(); + m_aTestHelper.Message ( "New document initialized." ); + + //store the instance to the temporary file URL + XStorable xStorable = UnoRuntime.queryInterface(XStorable.class, oTextDocument); + String sURL = AnyConverter.toString ( xTempFile.getUri () ); + PropertyValue aProps[] = new PropertyValue[2]; + aProps[0] = new PropertyValue(); + aProps[0].Name = "DocumentTitle"; + aProps[0].Value = sDocTitle[i]; + aProps[1] = new PropertyValue(); + aProps[1].Name = "FilterName"; + aProps[1].Value = sFilterName[i]; + m_aTestHelper.Message ( "Set title: " + + sDocTitle[i] ); + xStorable.storeToURL ( sURL, aProps ); + m_aTestHelper.Message ( "Document stored." ); + + //create StandaloneDocumentInfo object and load it from the file + Object oStandaloneDocInfo = m_xMSF.createInstance ( + "com.sun.star.document.StandaloneDocumentInfo" ); + XStandaloneDocumentInfo xStandaloneDocInfo = + UnoRuntime.queryInterface(XStandaloneDocumentInfo.class, oStandaloneDocInfo); + xStandaloneDocInfo.loadFromURL ( sURL ); + m_aTestHelper.Message ( "StandaloneDocumentInfo loaded." ); + + //get the title from the object and check it + XPropertySet xPropSet = + UnoRuntime.queryInterface(XPropertySet.class, oStandaloneDocInfo); + String sTitle = xPropSet.getPropertyValue ( "Title" ).toString (); + m_aTestHelper.Message ( "Get title: " + sTitle ); + if ( sTitle.compareTo ( sDocTitle[i] ) != 0 ) { + m_aTestHelper.Error ( "Title not match. Expected \"" + + sDocTitle[i] + + "\"" ); + return false; + } else { + m_aTestHelper.Message ( "Title matched." ); + } + + //set a new title to the object + sTitle += "_new"; + xPropSet.setPropertyValue ( "Title", sTitle ); + m_aTestHelper.Message ( "Set new title: " + sTitle ); + + //store the object to the same file + xStandaloneDocInfo.storeIntoURL ( sURL ); + m_aTestHelper.Message ( "Document info stored." ); + + //create a new StandaloneDocumentInfo object and load it from the file + Object oStandaloneDocInfo_ = m_xMSF.createInstance ( + "com.sun.star.document.StandaloneDocumentInfo" ); + XStandaloneDocumentInfo xStandaloneDocInfo_ = + UnoRuntime.queryInterface(XStandaloneDocumentInfo.class, oStandaloneDocInfo_); + xStandaloneDocInfo_.loadFromURL ( sURL ); + m_aTestHelper.Message ( "New StandaloneDocumentInfo loaded." ); + + //get the title and check it + XPropertySet xPropSet_ = UnoRuntime.queryInterface(XPropertySet.class, oStandaloneDocInfo_); + String sTitle_ = xPropSet_.getPropertyValue ( "Title" ).toString (); + m_aTestHelper.Message ( "Get new title: " + sTitle_ ); + if ( sTitle_.compareTo ( sTitle ) != 0 ) { + m_aTestHelper.Error ( "New title not matched. Expected: \"" + sTitle + + "\"." ); + return false; + } else { + m_aTestHelper.Message ( "New title matched." ); + } + } + } catch ( Exception e ) { + m_aTestHelper.Error( "Exception: " + e ); + return false; + } + return true; + } +} diff --git a/sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper.java b/sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper.java new file mode 100644 index 000000000000..a650ce9bb2e4 --- /dev/null +++ b/sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper.java @@ -0,0 +1,48 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.sfx2.standalonedocinfo; + + +public class TestHelper { + + String m_sTestPrefix; + + /** Creates a new instance of TestHelper + * @param sTestPrefix + */ + public TestHelper ( String sTestPrefix ) { + m_sTestPrefix = sTestPrefix; + } + + public void Error ( String sError ) { + System.out.println ( m_sTestPrefix + "Error: " + sError ); + } + + public void Message ( String sMessage ) { + System.out.println ( m_sTestPrefix + sMessage ); + } +} diff --git a/sfx2/qa/complex/sfx2/testdocuments/CUSTOM.odt b/sfx2/qa/complex/sfx2/testdocuments/CUSTOM.odt new file mode 100644 index 000000000000..831a8f451dfd Binary files /dev/null and b/sfx2/qa/complex/sfx2/testdocuments/CUSTOM.odt differ diff --git a/sfx2/qa/complex/sfx2/testdocuments/TEST.odt b/sfx2/qa/complex/sfx2/testdocuments/TEST.odt new file mode 100644 index 000000000000..7c6f0b60f7b0 Binary files /dev/null and b/sfx2/qa/complex/sfx2/testdocuments/TEST.odt differ diff --git a/sfx2/qa/complex/sfx2/testdocuments/TESTRDFA.odt b/sfx2/qa/complex/sfx2/testdocuments/TESTRDFA.odt new file mode 100644 index 000000000000..d59739142df6 Binary files /dev/null and b/sfx2/qa/complex/sfx2/testdocuments/TESTRDFA.odt differ diff --git a/sfx2/qa/complex/sfx2/testdocuments/empty.rdf b/sfx2/qa/complex/sfx2/testdocuments/empty.rdf new file mode 100644 index 000000000000..af62bab39dfa --- /dev/null +++ b/sfx2/qa/complex/sfx2/testdocuments/empty.rdf @@ -0,0 +1,13 @@ + + + + + + + diff --git a/sfx2/qa/complex/sfx2/tools/DialogThread.java b/sfx2/qa/complex/sfx2/tools/DialogThread.java new file mode 100644 index 000000000000..e67e65f218db --- /dev/null +++ b/sfx2/qa/complex/sfx2/tools/DialogThread.java @@ -0,0 +1,88 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.sfx2.tools; + +import com.sun.star.beans.PropertyValue; +import com.sun.star.frame.XController; +import com.sun.star.frame.XDispatch; +import com.sun.star.frame.XDispatchProvider; +import com.sun.star.frame.XModel; +import com.sun.star.lang.XComponent; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.uno.UnoRuntime; +import com.sun.star.util.URL; +import com.sun.star.util.XURLTransformer; + +/** + * This class opens a given dialog in a separate Thread by dispatching an url + * + */ +public class DialogThread extends Thread { + public XComponent m_xDoc = null; + public XMultiServiceFactory m_xMSF = null; + public String m_url = ""; + + public DialogThread(XComponent xDoc, XMultiServiceFactory msf, String url) { + this.m_xDoc = xDoc; + this.m_xMSF = msf; + this.m_url = url; + } + + @Override + public void run() { + XModel aModel = UnoRuntime.queryInterface( XModel.class, m_xDoc ); + + XController xController = aModel.getCurrentController(); + + //Opening Dialog + try { + XDispatchProvider xDispProv = UnoRuntime.queryInterface( XDispatchProvider.class, xController.getFrame() ); + XURLTransformer xParser = UnoRuntime.queryInterface( XURLTransformer.class, + m_xMSF.createInstance( "com.sun.star.util.URLTransformer" ) ); + + // Because it's an in/out parameter + // we must use an array of URL objects. + URL[] aParseURL = new URL[1]; + aParseURL[0] = new URL(); + aParseURL[0].Complete = m_url; + xParser.parseStrict(aParseURL); + + URL aURL = aParseURL[0]; + XDispatch xDispatcher = xDispProv.queryDispatch(aURL, "", com.sun.star.frame.FrameSearchFlag.SELF | + com.sun.star.frame.FrameSearchFlag.CHILDREN); + PropertyValue[] dispatchArguments = new PropertyValue[0]; + + if (xDispatcher != null) { + xDispatcher.dispatch(aURL, dispatchArguments); + } else { + System.out.println("xDispatcher is null"); + } + } catch (com.sun.star.uno.Exception e) { + System.out.println("Couldn't open dialog"); + } + } +} \ No newline at end of file diff --git a/sfx2/qa/complex/sfx2/tools/TestDocument.java b/sfx2/qa/complex/sfx2/tools/TestDocument.java new file mode 100644 index 000000000000..120dca978bba --- /dev/null +++ b/sfx2/qa/complex/sfx2/tools/TestDocument.java @@ -0,0 +1,39 @@ +/************************************************************************* +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* +* for a copy of the LGPLv3 License. +* +************************************************************************/ + +package complex.sfx2.tools; + +import java.io.File; +import org.openoffice.test.OfficeFileUrl; + +public final class TestDocument { + public static String getUrl(String name) { + return OfficeFileUrl.getAbsolute(new File("testdocuments", name)); + } + + private TestDocument() {} +} diff --git a/sfx2/qa/complex/sfx2/tools/WriterHelper.java b/sfx2/qa/complex/sfx2/tools/WriterHelper.java new file mode 100644 index 000000000000..4767028572bb --- /dev/null +++ b/sfx2/qa/complex/sfx2/tools/WriterHelper.java @@ -0,0 +1,283 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.sfx2.tools; + +import com.sun.star.accessibility.AccessibleRole; +import com.sun.star.accessibility.XAccessible; +import com.sun.star.accessibility.XAccessibleAction; +import com.sun.star.accessibility.XAccessibleContext; +import com.sun.star.accessibility.XAccessibleSelection; +import com.sun.star.awt.XExtendedToolkit; +import com.sun.star.awt.XWindow; +import com.sun.star.frame.XDesktop; +import com.sun.star.lang.XComponent; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.text.XTextDocument; +import com.sun.star.uno.UnoRuntime; +import com.sun.star.util.XCloseable; + +import java.io.PrintWriter; + +import util.AccessibilityTools; +import util.WriterTools; + + +/** + * Methods to open Writer docs + * + */ +public class WriterHelper { + XMultiServiceFactory m_xMSF = null; + + /** Creates a new instance of WriterHelper + * @param m_xMSF The MultiServiceFactory gained from the office + */ + public WriterHelper(XMultiServiceFactory m_xMSF) { + this.m_xMSF = m_xMSF; + } + + /** Opens an empty document + * @return a reference to the opened document is returned + */ + public XTextDocument openEmptyDoc() { + return WriterTools.createTextDoc(m_xMSF); + } + + /** Closes a given XTextDocument + * @param xTextDoc the text document to be closed + * @return if an error occurs the errormessage is returned and an empty String if not + */ + public String closeDoc(XTextDocument xTextDoc) { + XCloseable closer = UnoRuntime.queryInterface(XCloseable.class, xTextDoc); + String err = ""; + + try { + closer.close(true); + } catch (com.sun.star.util.CloseVetoException e) { + err = "couldn't close document " + e; + System.out.println(err); + } + + return err; + } + + private XTextDocument xLocalDoc = null; + /** a TextDocument is opened by pressing a button in a dialog given by uno-URL + * @param url the uno-URL of the dialog to be opened + * @param createButton the language dependend label of the button to be pressed + * @param destroyLocal if true the document that has been opened to dispatch the dialog is closed before the method returns, + * otherwise this document remains open + * @return returns the created Textdocument + */ + public XTextDocument openFromDialog(String url, String createButton, + boolean destroyLocal) { + xLocalDoc = WriterTools.createTextDoc(m_xMSF); + XComponent comp = UnoRuntime.queryInterface(XComponent.class, xLocalDoc); + DialogThread diagThread = new DialogThread(comp, m_xMSF, url); + diagThread.start(); + shortWait(); + + if (createButton.length() > 1) { + XExtendedToolkit tk = getToolkit(); + Object atw = tk.getActiveTopWindow(); + + XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, atw); + + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); + XAccessibleContext buttonContext = AccessibilityTools.getAccessibleObjectForRole( + xRoot, + AccessibleRole.PUSH_BUTTON, + createButton); + + XAccessibleAction buttonAction = UnoRuntime.queryInterface(XAccessibleAction.class, buttonContext); + + try { + System.out.println("Name: " + + buttonContext.getAccessibleName()); + buttonAction.doAccessibleAction(0); + } catch (com.sun.star.lang.IndexOutOfBoundsException e) { + System.out.println("Couldn't press button"); + } + + shortWait(); + } + + XDesktop xDesktop = getDesktop(); + + XTextDocument returnDoc = UnoRuntime.queryInterface(XTextDocument.class, xDesktop.getCurrentComponent()); + + if (destroyLocal) { + closeDoc(xLocalDoc); + xLocalDoc = null; + } + + return returnDoc; + } + public void closeFromDialog() + { + closeDoc(xLocalDoc); + xLocalDoc = null; + } + public void kill() + { + XDesktop xDesktop = getDesktop(); + xDesktop.terminate(); + } + + + public XTextDocument DocByAutopilot(XMultiServiceFactory msf, + int[] indexes, boolean destroyLocal, + String bName) { + XTextDocument xTextDoc = WriterTools.createTextDoc(m_xMSF); + Object toolkit = null; + + try { + toolkit = msf.createInstance("com.sun.star.awt.Toolkit"); + } catch (com.sun.star.uno.Exception e) { + e.printStackTrace( System.err ); + } + + XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class, toolkit); + + shortWait(); + + Object atw = tk.getActiveTopWindow(); + + XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, atw); + + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); + + XAccessibleContext ARoot = AccessibilityTools.getAccessibleObjectForRole(xRoot, + AccessibleRole.MENU_BAR); + XAccessibleSelection sel = UnoRuntime.queryInterface(XAccessibleSelection.class, ARoot); + + for (int k = 0; k < indexes.length; k++) { + try { + sel.selectAccessibleChild(indexes[k]); + shortWait(); + ARoot = ARoot.getAccessibleChild(indexes[k]) + .getAccessibleContext(); + sel = UnoRuntime.queryInterface(XAccessibleSelection.class, ARoot); + } catch (com.sun.star.lang.IndexOutOfBoundsException e) { + } + } + + shortWait(); + + atw = tk.getActiveTopWindow(); + + xWindow = UnoRuntime.queryInterface(XWindow.class, atw); + + xRoot = AccessibilityTools.getAccessibleObject(xWindow); + + //at.printAccessibleTree(new PrintWriter(System.out),xRoot); + + XAccessibleAction action = UnoRuntime.queryInterface(XAccessibleAction.class, AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, bName)); + + try { + action.doAccessibleAction(0); + } catch (com.sun.star.lang.IndexOutOfBoundsException e) { + } + + shortWait(); + + atw = tk.getActiveTopWindow(); + + xWindow = UnoRuntime.queryInterface(XWindow.class, atw); + + xRoot = AccessibilityTools.getAccessibleObject(xWindow); + + AccessibilityTools.printAccessibleTree(new PrintWriter(System.out),xRoot); + + action = UnoRuntime.queryInterface(XAccessibleAction.class, AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Yes")); + + try { + if (action != null) action.doAccessibleAction(0); + } catch (com.sun.star.lang.IndexOutOfBoundsException e) { + } + + shortWait(); + + XDesktop xDesktop = getDesktop(); + + XTextDocument returnDoc = UnoRuntime.queryInterface(XTextDocument.class, xDesktop.getCurrentComponent()); + + if (destroyLocal) { + closeDoc(xTextDoc); + } + + return returnDoc; + } + + /** + * Sleeps for 2 sec. to allow StarOffice to react + */ + private void shortWait() { + try { + Thread.sleep(4000); + } catch (InterruptedException e) { + System.out.println("While waiting :" + e); + } + } + + /** creates an instance of com.sun.star.awt.Toolkit to query the XExtendedToolkit + * interface + * @return returns the gained XExtendedToolkit Interface + */ + public XExtendedToolkit getToolkit() { + Object toolkit = null; + + try { + toolkit = m_xMSF.createInstance("com.sun.star.awt.Toolkit"); + } catch (com.sun.star.uno.Exception e) { + System.out.println("Couldn't get toolkit"); + e.printStackTrace( System.err ); + } + + XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class, toolkit); + + return tk; + } + + /** creates an instance of com.sun.star.frame.Desktop to query the XDesktop interface + * @return returns the gained XDesktop interface + */ + protected XDesktop getDesktop() { + Object desk = null; + + try { + desk = m_xMSF.createInstance("com.sun.star.frame.Desktop"); + } catch (com.sun.star.uno.Exception e) { + System.out.println("Couldn't get desktop"); + e.printStackTrace( System.err ); + } + + XDesktop xDesktop = UnoRuntime.queryInterface(XDesktop.class, desk); + + return xDesktop; + } +} \ No newline at end of file diff --git a/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoTest.java b/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoTest.java deleted file mode 100644 index f5512bf9723b..000000000000 --- a/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoTest.java +++ /dev/null @@ -1,31 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.standalonedocumentinfo; - -public interface StandaloneDocumentInfoTest { - boolean test(); -} diff --git a/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java b/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java deleted file mode 100644 index 29fcaba8cb7a..000000000000 --- a/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java +++ /dev/null @@ -1,101 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.standalonedocumentinfo; - -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.UnoRuntime; - -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.openoffice.test.OfficeConnection; -import static org.junit.Assert.*; - -/* Document here -*/ - -public class StandaloneDocumentInfoUnitTest { - private XMultiServiceFactory m_xMSF = null; - -// public String[] getTestMethodNames() { -// return new String[] { -// "ExecuteTest01"}; -// } - -// public String[] getTestObjectNames() { -// return new String[] {"StandaloneDocumentInfoUnitTest"}; -// } - - @Before public void before() { - try { - m_xMSF = getMSF(); - } catch(Exception e) { - fail( "Failed to create service factory!" ); - } - if( m_xMSF ==null ) { - fail( "Failed to create service factory!" ); - } - } - - @After public void after() { - m_xMSF = null; - } - - @Test public void ExecuteTest01() { - StandaloneDocumentInfoTest aTest = new Test01 (m_xMSF); - assertTrue( "Test01 failed!", aTest.test() ); - } - - - - - private XMultiServiceFactory getMSF() - { - final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); - return xMSF1; - } - - // setup and close connections - @BeforeClass public static void setUpConnection() throws Exception { - System.out.println("setUpConnection()"); - connection.setUp(); - } - - @AfterClass public static void tearDownConnection() - throws InterruptedException, com.sun.star.uno.Exception - { - System.out.println("tearDownConnection()"); - connection.tearDown(); - } - - private static final OfficeConnection connection = new OfficeConnection(); - -} - - diff --git a/sfx2/qa/complex/standalonedocumentinfo/Test01.java b/sfx2/qa/complex/standalonedocumentinfo/Test01.java deleted file mode 100644 index 2f9a6266b4e2..000000000000 --- a/sfx2/qa/complex/standalonedocumentinfo/Test01.java +++ /dev/null @@ -1,142 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.standalonedocumentinfo; - -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.document.XStandaloneDocumentInfo; -import com.sun.star.io.XTempFile; -import com.sun.star.frame.XLoadable; -import com.sun.star.frame.XStorable; -import com.sun.star.beans.PropertyValue; -import com.sun.star.beans.XPropertySet; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.AnyConverter; - - -public class Test01 implements StandaloneDocumentInfoTest { - XMultiServiceFactory m_xMSF = null; - TestHelper m_aTestHelper = null; - - public Test01 ( XMultiServiceFactory xMSF ) { - m_xMSF = xMSF; - m_aTestHelper = new TestHelper( "Test01: " ); - } - - public boolean test() { - try { - final String sDocTitle [] = new String [] { - "ODF_Doc", "OOo6_Doc", "old_binary_Doc" }; - final String sFilterName [] = new String [] { - "writer8", "StarOffice XML (Writer)", "StarWriter 5.0" }; - - for (int i = 0; i < 3; ++i ) { - m_aTestHelper.Message ( "==============================" ); - m_aTestHelper.Message ( sFilterName[i] ); - m_aTestHelper.Message ( "==============================" ); - //create a new temporary file - Object oTempFile = m_xMSF.createInstance ( "com.sun.star.io.TempFile" ); - XTempFile xTempFile = UnoRuntime.queryInterface(XTempFile.class, oTempFile); - - //create a text document and initiallize it - Object oTextDocument = m_xMSF.createInstance ( "com.sun.star.text.TextDocument" ); - XLoadable xLoadable = UnoRuntime.queryInterface(XLoadable.class, oTextDocument); - xLoadable.initNew(); - m_aTestHelper.Message ( "New document initialized." ); - - //store the instance to the temporary file URL - XStorable xStorable = UnoRuntime.queryInterface(XStorable.class, oTextDocument); - String sURL = AnyConverter.toString ( xTempFile.getUri () ); - PropertyValue aProps[] = new PropertyValue[2]; - aProps[0] = new PropertyValue(); - aProps[0].Name = "DocumentTitle"; - aProps[0].Value = sDocTitle[i]; - aProps[1] = new PropertyValue(); - aProps[1].Name = "FilterName"; - aProps[1].Value = sFilterName[i]; - m_aTestHelper.Message ( "Set title: " + - sDocTitle[i] ); - xStorable.storeToURL ( sURL, aProps ); - m_aTestHelper.Message ( "Document stored." ); - - //create StandaloneDocumentInfo object and load it from the file - Object oStandaloneDocInfo = m_xMSF.createInstance ( - "com.sun.star.document.StandaloneDocumentInfo" ); - XStandaloneDocumentInfo xStandaloneDocInfo = - UnoRuntime.queryInterface(XStandaloneDocumentInfo.class, oStandaloneDocInfo); - xStandaloneDocInfo.loadFromURL ( sURL ); - m_aTestHelper.Message ( "StandaloneDocumentInfo loaded." ); - - //get the title from the object and check it - XPropertySet xPropSet = - UnoRuntime.queryInterface(XPropertySet.class, oStandaloneDocInfo); - String sTitle = xPropSet.getPropertyValue ( "Title" ).toString (); - m_aTestHelper.Message ( "Get title: " + sTitle ); - if ( sTitle.compareTo ( sDocTitle[i] ) != 0 ) { - m_aTestHelper.Error ( "Title not match. Expected \"" - + sDocTitle[i] + - "\"" ); - return false; - } else { - m_aTestHelper.Message ( "Title matched." ); - } - - //set a new title to the object - sTitle += "_new"; - xPropSet.setPropertyValue ( "Title", sTitle ); - m_aTestHelper.Message ( "Set new title: " + sTitle ); - - //store the object to the same file - xStandaloneDocInfo.storeIntoURL ( sURL ); - m_aTestHelper.Message ( "Document info stored." ); - - //create a new StandaloneDocumentInfo object and load it from the file - Object oStandaloneDocInfo_ = m_xMSF.createInstance ( - "com.sun.star.document.StandaloneDocumentInfo" ); - XStandaloneDocumentInfo xStandaloneDocInfo_ = - UnoRuntime.queryInterface(XStandaloneDocumentInfo.class, oStandaloneDocInfo_); - xStandaloneDocInfo_.loadFromURL ( sURL ); - m_aTestHelper.Message ( "New StandaloneDocumentInfo loaded." ); - - //get the title and check it - XPropertySet xPropSet_ = UnoRuntime.queryInterface(XPropertySet.class, oStandaloneDocInfo_); - String sTitle_ = xPropSet_.getPropertyValue ( "Title" ).toString (); - m_aTestHelper.Message ( "Get new title: " + sTitle_ ); - if ( sTitle_.compareTo ( sTitle ) != 0 ) { - m_aTestHelper.Error ( "New title not matched. Expected: \"" + sTitle - + "\"." ); - return false; - } else { - m_aTestHelper.Message ( "New title matched." ); - } - } - } catch ( Exception e ) { - m_aTestHelper.Error( "Exception: " + e ); - return false; - } - return true; - } -} diff --git a/sfx2/qa/complex/standalonedocumentinfo/TestHelper.java b/sfx2/qa/complex/standalonedocumentinfo/TestHelper.java deleted file mode 100644 index f6d63e1b7793..000000000000 --- a/sfx2/qa/complex/standalonedocumentinfo/TestHelper.java +++ /dev/null @@ -1,48 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -package complex.standalonedocumentinfo; - - -public class TestHelper { - - String m_sTestPrefix; - - /** Creates a new instance of TestHelper - * @param sTestPrefix - */ - public TestHelper ( String sTestPrefix ) { - m_sTestPrefix = sTestPrefix; - } - - public void Error ( String sError ) { - System.out.println ( m_sTestPrefix + "Error: " + sError ); - } - - public void Message ( String sMessage ) { - System.out.println ( m_sTestPrefix + sMessage ); - } -} diff --git a/sfx2/qa/complex/standalonedocumentinfo/makefile.mk b/sfx2/qa/complex/standalonedocumentinfo/makefile.mk deleted file mode 100644 index aade48dbd789..000000000000 --- a/sfx2/qa/complex/standalonedocumentinfo/makefile.mk +++ /dev/null @@ -1,56 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = sfx2 -TARGET = qa_complex_standalonedocumentinfo - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/standalonedocumentinfo -JAVATESTFILES = \ - StandaloneDocumentInfoUnitTest.java - -JAVAFILES = $(JAVATESTFILES) \ - StandaloneDocumentInfoTest.java \ - Test01.java \ - TestHelper.java - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END diff --git a/sfx2/qa/complex/tests.sce b/sfx2/qa/complex/tests.sce deleted file mode 100644 index c38852927ede..000000000000 --- a/sfx2/qa/complex/tests.sce +++ /dev/null @@ -1,3 +0,0 @@ --o complex.framework.DocumentMetaData --o complex.framework.DocumentMetadataAccessTest -#-o complex.framework.CheckGlobalEventBroadcaster_writer1 -- cgit v1.2.3 From 7c1bc8c31291669c2254592d7e30222a511d3a8a Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 14 Oct 2010 16:40:33 +0200 Subject: undoapi: initial tests for the new Undo API - currently testing Calc only, and not the complete API --- sfx2/qa/complex/sfx2/UndoManager.java | 222 ++++++++++++++++++++++++ sfx2/qa/complex/sfx2/makefile.mk | 2 +- sfx2/qa/complex/sfx2/undo/CalcDocumentTest.java | 95 ++++++++++ sfx2/qa/complex/sfx2/undo/DocumentTest.java | 52 ++++++ sfx2/qa/complex/sfx2/undo/DocumentTestBase.java | 19 ++ 5 files changed, 389 insertions(+), 1 deletion(-) create mode 100755 sfx2/qa/complex/sfx2/UndoManager.java create mode 100755 sfx2/qa/complex/sfx2/undo/CalcDocumentTest.java create mode 100755 sfx2/qa/complex/sfx2/undo/DocumentTest.java create mode 100755 sfx2/qa/complex/sfx2/undo/DocumentTestBase.java (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java new file mode 100755 index 000000000000..a78f93a1aca9 --- /dev/null +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -0,0 +1,222 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +package complex.sfx2; + +import com.sun.star.document.UndoManagerEvent; +import com.sun.star.lang.EventObject; +import java.lang.reflect.Constructor; +import org.openoffice.test.tools.OfficeDocument; +import com.sun.star.document.XUndoManagerSupplier; +import complex.sfx2.undo.CalcDocumentTest; +import com.sun.star.document.XUndoManager; +import com.sun.star.document.XUndoManagerListener; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.uno.UnoRuntime; +import com.sun.star.uno.XComponentContext; +import complex.sfx2.undo.DocumentTest; +import java.util.Stack; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import static org.junit.Assert.*; +import org.openoffice.test.OfficeConnection; + +/** + * Unit test for the UndoManager API + * + * @author frank.schoenheit@oracle.com + */ +public class UndoManager +{ + @Before + public void beforeTest() + { + m_currentDocument = null; + } + + @Test + public void checkCalcUndo() throws Exception + { + impl_checkUndo( CalcDocumentTest.class ); + } + + @After + public void afterTest() + { + if ( m_currentDocument != null ) + m_currentDocument.close(); + } + + /** + * returns the undo manager belonging to a given document + * @return + */ + private XUndoManager getUndoManager( final OfficeDocument i_document ) + { + XUndoManagerSupplier suppUndo = UnoRuntime.queryInterface( XUndoManagerSupplier.class, i_document.getDocument() ); + return suppUndo.getUndoManager(); + } + + private static class UndoListener implements XUndoManagerListener + { + public void undoActionAdded( UndoManagerEvent ume ) + { + ++m_undoActionsAdded; + } + + public void actionUndone( UndoManagerEvent ume ) + { + ++m_undoCount; + } + + public void actionRedone( UndoManagerEvent ume ) + { + ++m_redoCount; + } + + public void allActionsCleared( EventObject eo ) + { + } + + public void redoActionsCleared( EventObject eo ) + { + } + + public void enteredUndoContext( UndoManagerEvent i_event ) + { + m_activeUndoContexts.push( i_event.UndoActionTitle ); + } + + public void enteredHiddenUndoContext( UndoManagerEvent ume ) + { + } + + public void leftUndoContext( UndoManagerEvent i_event ) + { + assertEquals( "undo context order is suspicious", m_activeUndoContexts.pop(), i_event.UndoActionTitle ); + } + + int getUndoActionsAdded() { return m_undoActionsAdded; } + int getUndoActionCount() { return m_undoCount; } + int getRedoActionCount() { return m_redoCount; } + String getCurrentUndoContextTitle() { return m_activeUndoContexts.peek(); } + int getUndoContextDepth() { return m_activeUndoContexts.size(); } + + void reset() + { + m_undoActionsAdded = m_undoCount = m_redoCount = 0; + m_activeUndoContexts.clear(); + } + + private int m_undoActionsAdded = 0; + private int m_undoCount = 0; + private int m_redoCount = 0; + private Stack< String > + m_activeUndoContexts = new Stack(); + }; + + private void impl_checkUndo( final Class i_testClass ) throws Exception + { + final Constructor ctor = i_testClass.getConstructor( XMultiServiceFactory.class ); + final DocumentTest test = (DocumentTest)ctor.newInstance( getORB() ); + System.out.println( "testing: " + test.getDocumentDescription() ); + m_currentDocument = test.getDocument(); + test.initializeDocument(); + test.verifyInitialDocumentState(); + + final XUndoManager undoManager = getUndoManager( test.getDocument() ); + undoManager.clear(); + final UndoListener listener = new UndoListener(); + undoManager.addUndoManagerListener( listener ); + + // do a single modification, undo it, and check the document state is as expected + test.doSingleModification(); + undoManager.undo(); + test.verifyInitialDocumentState(); + // ensure the listener has been notified of the Undo operation + assertEquals( "A simple undo does not result in the proper Undo count.", 1, listener.getUndoActionCount() ); + listener.reset(); + + // do multiple changes in a row, after entering an Undo context + assertEquals( "unexpected initial undo context depth", 0, listener.getUndoContextDepth() ); + undoManager.enterUndoContext( "Batch Changes" ); + assertEquals( "unexpected undo context depth after entering a context", 1, listener.getUndoContextDepth() ); + + assertEquals( "entering an Undo context has not been notified properly", "Batch Changes", listener.getCurrentUndoContextTitle() ); + final int modifications = test.doMultipleModifications(); + assertEquals( "unexpected number of undo actions while doing batch changes to the document", + modifications, listener.getUndoActionsAdded() ); + + assertEquals( "seems the document operations touched the undo context depth", 1, listener.getUndoContextDepth() ); + undoManager.leaveUndoContext(); + assertEquals( "unexpected undo context depth after leaving the last context", 0, listener.getUndoContextDepth() ); + + assertEquals( "no Undo done, yet - still the listener has been notified of an Undo action", 0, listener.getUndoActionCount() ); + undoManager.undo(); + assertEquals( "Just did an undo - the listener should have been notified", 1, listener.getUndoActionCount() ); + + test.verifyInitialDocumentState(); + listener.reset(); + } + + private XComponentContext getContext() + { + return m_connection.getComponentContext(); + } + + private XMultiServiceFactory getORB() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface( + XMultiServiceFactory.class, getContext().getServiceManager() ); + return xMSF1; + } + + @BeforeClass + public static void setUpConnection() throws Exception + { + System.out.println( "--------------------------------------------------------------------------------" ); + System.out.println( "starting class: " + UndoManager.class.getName() ); + System.out.println( "connecting ..." ); + m_connection.setUp(); + } + + @AfterClass + public static void tearDownConnection() throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println(); + System.out.println( "tearing down connection" ); + m_connection.tearDown(); + System.out.println( "finished class: " + UndoManager.class.getName() ); + System.out.println( "--------------------------------------------------------------------------------" ); + } + + private static final OfficeConnection m_connection = new OfficeConnection(); + private OfficeDocument m_currentDocument; +} diff --git a/sfx2/qa/complex/sfx2/makefile.mk b/sfx2/qa/complex/sfx2/makefile.mk index c35f1380b6a4..5cbfe34efb7f 100644 --- a/sfx2/qa/complex/sfx2/makefile.mk +++ b/sfx2/qa/complex/sfx2/makefile.mk @@ -42,7 +42,7 @@ PACKAGE = complex/sfx2 #----- compile .java files ----------------------------------------- -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +JARFILES = OOoRunner.jar ridl.jar test.jar test-tools.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) JAVAFILES = $(shell @$(FIND) . -name "*.java") \ diff --git a/sfx2/qa/complex/sfx2/undo/CalcDocumentTest.java b/sfx2/qa/complex/sfx2/undo/CalcDocumentTest.java new file mode 100755 index 000000000000..03f2b3ade019 --- /dev/null +++ b/sfx2/qa/complex/sfx2/undo/CalcDocumentTest.java @@ -0,0 +1,95 @@ +package complex.sfx2.undo; + +import org.openoffice.test.tools.SpreadsheetDocument; +import com.sun.star.table.XCellRange; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.table.XCell; +import com.sun.star.uno.UnoRuntime; +import org.openoffice.test.tools.DocumentType; +import org.openoffice.test.tools.OfficeDocument; +import static org.junit.Assert.*; + +/** + * @author frank.schoenheit@oracle.com + */ +public class CalcDocumentTest extends DocumentTestBase implements DocumentTest +{ + public CalcDocumentTest( final XMultiServiceFactory i_orb ) throws Exception + { + super( i_orb, DocumentType.CALC ); + } + + public String getDocumentDescription() + { + return "spreadsheet document"; + } + + public void initializeDocument() throws com.sun.star.uno.Exception + { + final XCell cellA1 = getCellA1(); + cellA1.setValue( INIT_VALUE ); + assertEquals( "initializing the cell value didn't work", cellA1.getValue(), INIT_VALUE, 0 ); + + XCellRange range = UnoRuntime.queryInterface( XCellRange.class, + ((SpreadsheetDocument)m_document).getSheet(0) ); + + for ( int i=0; i<12; ++i ) + { + XCell cell = range.getCellByPosition( 1, i ); + cell.setFormula( "" ); + } + } + + public void doSingleModification() throws com.sun.star.uno.Exception + { + final XCell cellA1 = getCellA1(); + assertEquals( "initial cell value not as expected", cellA1.getValue(), INIT_VALUE, 0 ); + cellA1.setValue( MODIFIED_VALUE ); + assertEquals( "modified cell value not as expected", cellA1.getValue(), MODIFIED_VALUE, 0 ); + } + + public void verifyInitialDocumentState() throws com.sun.star.uno.Exception + { + final XCell cellA1 = getCellA1(); + assertEquals( "cell A1 didn't restore its value", cellA1.getValue(), INIT_VALUE, 0 ); + + XCellRange range = UnoRuntime.queryInterface( XCellRange.class, + ((SpreadsheetDocument)m_document).getSheet(0) ); + for ( int i=0; i<12; ++i ) + { + final XCell cell = range.getCellByPosition( 1, i ); + assertEquals( "Cell B" + (i+1) + " not having its initial value (an empty string)", "", cell.getFormula() ); + } + } + + public int doMultipleModifications() throws com.sun.star.uno.Exception + { + XCellRange range = UnoRuntime.queryInterface( XCellRange.class, + ((SpreadsheetDocument)m_document).getSheet(0) ); + + final String[] months = new String[] { + "January", "February", "March", "April", "May", "June", "July", "August", + "September", "October", "November", "December" }; + for ( int i=0; i<12; ++i ) + { + final XCell cell = range.getCellByPosition( 1, i ); + cell.setFormula( months[i] ); + } + return 12; + } + + public OfficeDocument getDocument() + { + return m_document; + } + + private XCell getCellA1() throws com.sun.star.uno.Exception + { + XCellRange range = UnoRuntime.queryInterface( XCellRange.class, + ((SpreadsheetDocument)m_document).getSheet(0) ); + return range.getCellByPosition( 0, 0 ); + } + + private static final double INIT_VALUE = 100.0; + private static final double MODIFIED_VALUE = 200.0; +} diff --git a/sfx2/qa/complex/sfx2/undo/DocumentTest.java b/sfx2/qa/complex/sfx2/undo/DocumentTest.java new file mode 100755 index 000000000000..f9339c8146b9 --- /dev/null +++ b/sfx2/qa/complex/sfx2/undo/DocumentTest.java @@ -0,0 +1,52 @@ +package complex.sfx2.undo; + +import com.sun.star.document.XUndoAction; +import com.sun.star.document.XUndoManager; +import org.openoffice.test.tools.OfficeDocument; + +/** + * wrapper around an OfficeDocument, for running a standardized test procedure (related do Undo functionality) + * on the document. + * + * @author frank.schoenheit@oracle.com + */ +public interface DocumentTest +{ + /** + * returns a human-readable description for the document/type which the tests operates on + */ + public String getDocumentDescription(); + + /** + * initializes the document to a state where the subsequent tests can be ran + */ + public void initializeDocument() throws com.sun.star.uno.Exception; + + /** + * does a simple modification to the document, which results in one Undo action being auto-generated + * by the OOo implementation + */ + public void doSingleModification() throws com.sun.star.uno.Exception; + + /** + * verifies the document is in the same state as after {@link #initializeDocument} + */ + public void verifyInitialDocumentState() throws com.sun.star.uno.Exception; + + /** + * does multiple modifications do the document, which would normally result in multiple Undo actions. + * + * The test framework will encapsulate the call into an {@link XUndoManager.enterUndoContext()} and + * {@link XUndoManager.leaveUndoContext()} call. + * + * @return + * the number of modifications done to the document. The caller assumes (and asserts) that the number + * of actions on the Undo stack equals this number. + */ + public int doMultipleModifications() throws com.sun.star.uno.Exception; + + /** + * returns the document which the test operates on + */ + public OfficeDocument getDocument(); +} diff --git a/sfx2/qa/complex/sfx2/undo/DocumentTestBase.java b/sfx2/qa/complex/sfx2/undo/DocumentTestBase.java new file mode 100755 index 000000000000..ba895973a2dc --- /dev/null +++ b/sfx2/qa/complex/sfx2/undo/DocumentTestBase.java @@ -0,0 +1,19 @@ +package complex.sfx2.undo; + +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.uno.Exception; +import org.openoffice.test.tools.DocumentType; +import org.openoffice.test.tools.OfficeDocument; + +/** + * @author frank.schoenheit@oracle.com + */ +class DocumentTestBase +{ + DocumentTestBase( final XMultiServiceFactory i_orb, final DocumentType i_docType ) throws Exception + { + m_document = OfficeDocument.blankDocument( i_orb, i_docType ); + } + + protected final OfficeDocument m_document; +} -- cgit v1.2.3 From 63f1445c73f54fe9adcc0c0cb0aae6c7e639c8a2 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 15 Oct 2010 23:39:05 +0200 Subject: undoapi: API and Impl tweaks --- sfx2/qa/complex/sfx2/UndoManager.java | 39 ++++++++++-- sfx2/qa/complex/sfx2/undo/CalcDocumentTest.java | 21 +++---- sfx2/qa/complex/sfx2/undo/DocumentTest.java | 8 ++- sfx2/qa/complex/sfx2/undo/DocumentTestBase.java | 7 ++- sfx2/source/doc/docundomanager.cxx | 79 ++++++++++++++++++++----- sfx2/source/inc/docundomanager.hxx | 8 ++- 6 files changed, 126 insertions(+), 36 deletions(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index a78f93a1aca9..72bc34a7c6fe 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -120,7 +120,12 @@ public class UndoManager public void leftUndoContext( UndoManagerEvent i_event ) { - assertEquals( "undo context order is suspicious", m_activeUndoContexts.pop(), i_event.UndoActionTitle ); + assertEquals( "nested undo context descriptions do not match", m_activeUndoContexts.pop(), i_event.UndoActionTitle ); + } + + public void disposing( EventObject i_event ) + { + m_isDisposed = true; } int getUndoActionsAdded() { return m_undoActionsAdded; } @@ -128,6 +133,7 @@ public class UndoManager int getRedoActionCount() { return m_redoCount; } String getCurrentUndoContextTitle() { return m_activeUndoContexts.peek(); } int getUndoContextDepth() { return m_activeUndoContexts.size(); } + boolean isDisposed() { return m_isDisposed; } void reset() { @@ -138,6 +144,7 @@ public class UndoManager private int m_undoActionsAdded = 0; private int m_undoCount = 0; private int m_redoCount = 0; + private boolean m_isDisposed = false; private Stack< String > m_activeUndoContexts = new Stack(); }; @@ -156,12 +163,32 @@ public class UndoManager final UndoListener listener = new UndoListener(); undoManager.addUndoManagerListener( listener ); - // do a single modification, undo it, and check the document state is as expected + // do a single modification to the document test.doSingleModification(); + test.verifySingleModificationDocumentState(); + + // undo the modification, ensure the listener got the proper notifications + assertEquals( "We did not yet do a undo!", 0, listener.getUndoActionCount() ); undoManager.undo(); - test.verifyInitialDocumentState(); - // ensure the listener has been notified of the Undo operation assertEquals( "A simple undo does not result in the proper Undo count.", 1, listener.getUndoActionCount() ); + + // verify the document is in its initial state, again + test.verifyInitialDocumentState(); + + // redo the modification, ensure the listener got the proper notifications + assertEquals( "did not yet do a redo!", 0, listener.getRedoActionCount() ); + undoManager.redo(); + assertEquals( "did a redo, but got no notification of it!", 1, listener.getRedoActionCount() ); + + // ensure the document is in the proper state, again + test.verifySingleModificationDocumentState(); + + // now do an Undo via the UI (aka the dispatch API), and see if this works, and notifies the listener as + // expected + test.getDocument().getCurrentView().dispatch( ".uno:Undo" ); + test.verifyInitialDocumentState(); + assertEquals( "UI-Undo does not notify the listener", 2, listener.getUndoActionCount() ); + listener.reset(); // do multiple changes in a row, after entering an Undo context @@ -184,6 +211,10 @@ public class UndoManager test.verifyInitialDocumentState(); listener.reset(); + + m_currentDocument.close(); + assertTrue( "document is closed, but the UndoManagerListener has not been notified of the disposal", listener.isDisposed() ); + m_currentDocument = null; } private XComponentContext getContext() diff --git a/sfx2/qa/complex/sfx2/undo/CalcDocumentTest.java b/sfx2/qa/complex/sfx2/undo/CalcDocumentTest.java index 03f2b3ade019..16d813bdaeb8 100755 --- a/sfx2/qa/complex/sfx2/undo/CalcDocumentTest.java +++ b/sfx2/qa/complex/sfx2/undo/CalcDocumentTest.java @@ -6,13 +6,13 @@ import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.table.XCell; import com.sun.star.uno.UnoRuntime; import org.openoffice.test.tools.DocumentType; -import org.openoffice.test.tools.OfficeDocument; import static org.junit.Assert.*; /** + * implements the {@link DocumentTest} interface on top of a spreadsheet document * @author frank.schoenheit@oracle.com */ -public class CalcDocumentTest extends DocumentTestBase implements DocumentTest +public class CalcDocumentTest extends DocumentTestBase { public CalcDocumentTest( final XMultiServiceFactory i_orb ) throws Exception { @@ -43,15 +43,15 @@ public class CalcDocumentTest extends DocumentTestBase implements DocumentTest public void doSingleModification() throws com.sun.star.uno.Exception { final XCell cellA1 = getCellA1(); - assertEquals( "initial cell value not as expected", cellA1.getValue(), INIT_VALUE, 0 ); + assertEquals( "initial cell value not as expected", INIT_VALUE, cellA1.getValue(), 0 ); cellA1.setValue( MODIFIED_VALUE ); - assertEquals( "modified cell value not as expected", cellA1.getValue(), MODIFIED_VALUE, 0 ); + assertEquals( "modified cell value not as expected", MODIFIED_VALUE, cellA1.getValue(), 0 ); } public void verifyInitialDocumentState() throws com.sun.star.uno.Exception { final XCell cellA1 = getCellA1(); - assertEquals( "cell A1 didn't restore its value", cellA1.getValue(), INIT_VALUE, 0 ); + assertEquals( "cell A1 didn't restore its value", INIT_VALUE, cellA1.getValue(), 0 ); XCellRange range = UnoRuntime.queryInterface( XCellRange.class, ((SpreadsheetDocument)m_document).getSheet(0) ); @@ -62,6 +62,12 @@ public class CalcDocumentTest extends DocumentTestBase implements DocumentTest } } + public void verifySingleModificationDocumentState() throws com.sun.star.uno.Exception + { + final XCell cellA1 = getCellA1(); + assertEquals( "cell A1 doesn't have the value which we gave it", MODIFIED_VALUE, cellA1.getValue(), 0 ); + } + public int doMultipleModifications() throws com.sun.star.uno.Exception { XCellRange range = UnoRuntime.queryInterface( XCellRange.class, @@ -78,11 +84,6 @@ public class CalcDocumentTest extends DocumentTestBase implements DocumentTest return 12; } - public OfficeDocument getDocument() - { - return m_document; - } - private XCell getCellA1() throws com.sun.star.uno.Exception { XCellRange range = UnoRuntime.queryInterface( XCellRange.class, diff --git a/sfx2/qa/complex/sfx2/undo/DocumentTest.java b/sfx2/qa/complex/sfx2/undo/DocumentTest.java index f9339c8146b9..431e64ab0197 100755 --- a/sfx2/qa/complex/sfx2/undo/DocumentTest.java +++ b/sfx2/qa/complex/sfx2/undo/DocumentTest.java @@ -1,7 +1,5 @@ package complex.sfx2.undo; -import com.sun.star.document.XUndoAction; -import com.sun.star.document.XUndoManager; import org.openoffice.test.tools.OfficeDocument; /** @@ -33,6 +31,12 @@ public interface DocumentTest */ public void verifyInitialDocumentState() throws com.sun.star.uno.Exception; + /** + * verifies the document is in the state as expected after {@link #doSingleModification} + * @throws com.sun.star.uno.Exception + */ + public void verifySingleModificationDocumentState() throws com.sun.star.uno.Exception; + /** * does multiple modifications do the document, which would normally result in multiple Undo actions. * diff --git a/sfx2/qa/complex/sfx2/undo/DocumentTestBase.java b/sfx2/qa/complex/sfx2/undo/DocumentTestBase.java index ba895973a2dc..147ef587b3bc 100755 --- a/sfx2/qa/complex/sfx2/undo/DocumentTestBase.java +++ b/sfx2/qa/complex/sfx2/undo/DocumentTestBase.java @@ -8,12 +8,17 @@ import org.openoffice.test.tools.OfficeDocument; /** * @author frank.schoenheit@oracle.com */ -class DocumentTestBase +abstract class DocumentTestBase implements DocumentTest { DocumentTestBase( final XMultiServiceFactory i_orb, final DocumentType i_docType ) throws Exception { m_document = OfficeDocument.blankDocument( i_orb, i_docType ); } + public OfficeDocument getDocument() + { + return m_document; + } + protected final OfficeDocument m_document; } diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx index 09d077607ef8..5c17c5cde786 100755 --- a/sfx2/source/doc/docundomanager.cxx +++ b/sfx2/source/doc/docundomanager.cxx @@ -30,6 +30,8 @@ #include "docundomanager.hxx" #include "sfx2/sfxbasemodel.hxx" #include "sfx2/objsh.hxx" +#include "sfx2/viewfrm.hxx" +#include "sfx2/bindings.hxx" /** === begin UNO includes === **/ #include @@ -74,14 +76,15 @@ namespace sfx2 class UndoActionWrapper : public SfxUndoAction { public: - UndoActionWrapper( - Reference< XUndoAction > const& i_undoAction - ); - virtual ~UndoActionWrapper(); + UndoActionWrapper( + Reference< XUndoAction > const& i_undoAction + ); + virtual ~UndoActionWrapper(); - virtual void Undo(); - virtual void Redo(); - virtual BOOL CanRepeat(SfxRepeatTarget&) const; + virtual String GetComment() const; + virtual void Undo(); + virtual void Redo(); + virtual BOOL CanRepeat(SfxRepeatTarget&) const; private: const Reference< XUndoAction > m_xUndoAction; @@ -110,6 +113,21 @@ namespace sfx2 } } + //------------------------------------------------------------------------------------------------------------------ + String UndoActionWrapper::GetComment() const + { + String sComment; + try + { + sComment = m_xUndoAction->getTitle(); + } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } + return sComment; + } + //------------------------------------------------------------------------------------------------------------------ void UndoActionWrapper::Undo() { @@ -156,6 +174,9 @@ namespace sfx2 pUndoManager->AddUndoListener( *this ); } + const SfxObjectShell* getObjectShell() const { return rAntiImpl.getBaseModel().GetObjectShell(); } + SfxObjectShell* getObjectShell() { return rAntiImpl.getBaseModel().GetObjectShell(); } + void disposing() { ENSURE_OR_RETURN_VOID( pUndoManager, "DocumentUndoManager_Impl::disposing: already disposed!" ); @@ -176,10 +197,25 @@ namespace sfx2 //================================================================================================================== namespace { - SfxUndoManager& lcl_getUndoManager_throw( DocumentUndoManager_Impl& i_data ) + //.............................................................................................................. + SfxUndoManager& lcl_getUndoManager_throw( DocumentUndoManager_Impl& i_impl ) { - ENSURE_OR_THROW( i_data.pUndoManager != NULL, "internal error: no access to the doc's UndoManager implementation!" ); - return *i_data.pUndoManager; + ENSURE_OR_THROW( i_impl.pUndoManager != NULL, "internal error: no access to the doc's UndoManager implementation!" ); + return *i_impl.pUndoManager; + } + + //.............................................................................................................. + void lcl_invalidateXDo( const DocumentUndoManager_Impl& i_impl ) + { + const SfxObjectShell* pDocShell = i_impl.getObjectShell(); + ENSURE_OR_THROW( pDocShell != NULL, "lcl_invalidateUndo: no access to the doc shell!" ); + SfxViewFrame* pViewFrame = SfxViewFrame::GetFirst( pDocShell ); + while ( pViewFrame ) + { + pViewFrame->GetBindings().Invalidate( SID_UNDO ); + pViewFrame->GetBindings().Invalidate( SID_REDO ); + pViewFrame = SfxViewFrame::GetNext( *pViewFrame, pDocShell ); + } } } @@ -270,6 +306,10 @@ namespace sfx2 //------------------------------------------------------------------------------------------------------------------ void DocumentUndoManager::disposing() { + EventObject aEvent; + aEvent.Source = static_cast< XUndoManager* >( this ); + m_pImpl->aUndoListeners.disposeAndClear( aEvent ); + m_pImpl->disposing(); } @@ -397,15 +437,22 @@ namespace sfx2 ::comphelper::FlagGuard aNotificationGuard( m_pImpl->bAPIActionRunning ); rUndoManager.AddUndoAction( new UndoActionWrapper( i_action ) ); } + lcl_invalidateXDo( *m_pImpl ); impl_notify( i_action->getTitle(), &XUndoManagerListener::undoActionAdded, aGuard ); } //------------------------------------------------------------------------------------------------------------------ - void DocumentUndoManager::impl_do_nolck( BOOL ( SfxUndoManager::*i_doMethod )(), UniString ( SfxUndoManager::*i_titleRetriever )( USHORT ) const ) + void DocumentUndoManager::impl_do_nolck( + USHORT ( SfxUndoManager::*i_checkMethod )() const, BOOL ( SfxUndoManager::*i_doMethod )(), + String ( SfxUndoManager::*i_titleRetriever )( USHORT ) const, + void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const UndoManagerEvent& ) ) { SfxModelGuard aGuard( *this ); SfxUndoManager& rUndoManager = lcl_getUndoManager_throw( *m_pImpl ); + if ( (rUndoManager.*i_checkMethod)() == 0 ) + throw InvalidStateException( ::rtl::OUString::createFromAscii( "stack is empty" ), static_cast< XUndoManager* >( this ) ); + const ::rtl::OUString sUndoActionTitle = (rUndoManager.*i_titleRetriever)(0); { ::comphelper::FlagGuard aNotificationGuard( m_pImpl->bAPIActionRunning ); @@ -420,19 +467,19 @@ namespace sfx2 } } - impl_notify( sUndoActionTitle, &XUndoManagerListener::actionUndone, aGuard ); + impl_notify( sUndoActionTitle, i_notificationMethod, aGuard ); } //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL DocumentUndoManager::undo( ) throw (RuntimeException,WrappedTargetException) + void SAL_CALL DocumentUndoManager::undo( ) throw (RuntimeException, InvalidStateException, WrappedTargetException) { - impl_do_nolck( &SfxUndoManager::Undo, &SfxUndoManager::GetUndoActionComment ); + impl_do_nolck( &SfxUndoManager::GetUndoActionCount, &SfxUndoManager::Undo, &SfxUndoManager::GetUndoActionComment, &XUndoManagerListener::actionUndone ); } //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL DocumentUndoManager::redo( ) throw (RuntimeException,WrappedTargetException) + void SAL_CALL DocumentUndoManager::redo( ) throw (RuntimeException, InvalidStateException, WrappedTargetException) { - impl_do_nolck( &SfxUndoManager::Redo, &SfxUndoManager::GetRedoActionComment ); + impl_do_nolck( &SfxUndoManager::GetRedoActionCount, &SfxUndoManager::Redo, &SfxUndoManager::GetRedoActionComment, &XUndoManagerListener::actionRedone ); } //------------------------------------------------------------------------------------------------------------------ diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx index b87e8fa78dc8..d03af0ae090a 100755 --- a/sfx2/source/inc/docundomanager.hxx +++ b/sfx2/source/inc/docundomanager.hxx @@ -73,8 +73,8 @@ namespace sfx2 virtual void SAL_CALL enterHiddenUndoContext( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL leaveUndoContext( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); - virtual void SAL_CALL undo( ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::WrappedTargetException); - virtual void SAL_CALL redo( ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::WrappedTargetException); + virtual void SAL_CALL undo( ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::util::InvalidStateException, ::com::sun::star::lang::WrappedTargetException); + virtual void SAL_CALL redo( ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::util::InvalidStateException, ::com::sun::star::lang::WrappedTargetException); virtual void SAL_CALL clear( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearRedo( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException); @@ -102,8 +102,10 @@ namespace sfx2 ); void impl_do_nolck( + USHORT ( SfxUndoManager::*i_checkMethod )() const, BOOL ( SfxUndoManager::*i_doMethod )(), - UniString ( SfxUndoManager::*i_titleRetriever )( USHORT ) const + UniString ( SfxUndoManager::*i_titleRetriever )( USHORT ) const, + void ( SAL_CALL ::com::sun::star::document::XUndoManagerListener::*i_notificationMethod )( const ::com::sun::star::document::UndoManagerEvent& ) ); private: -- cgit v1.2.3 From 12cb5de71a3eeefa669c4a4beb8029e26a4a4746 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 15 Oct 2010 23:39:06 +0200 Subject: undoapi: tests for Draw docs' Undo --- sfx2/qa/complex/sfx2/UndoManager.java | 7 + sfx2/qa/complex/sfx2/undo/DrawDocumentTest.java | 198 ++++++++++++++++++++++++ 2 files changed, 205 insertions(+) create mode 100755 sfx2/qa/complex/sfx2/undo/DrawDocumentTest.java (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index 72bc34a7c6fe..c54697927825 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -39,6 +39,7 @@ import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; import complex.sfx2.undo.DocumentTest; +import complex.sfx2.undo.DrawDocumentTest; import java.util.Stack; import org.junit.After; import org.junit.AfterClass; @@ -67,6 +68,12 @@ public class UndoManager impl_checkUndo( CalcDocumentTest.class ); } + @Test + public void checkDrawUndo() throws Exception + { + impl_checkUndo( DrawDocumentTest.class ); + } + @After public void afterTest() { diff --git a/sfx2/qa/complex/sfx2/undo/DrawDocumentTest.java b/sfx2/qa/complex/sfx2/undo/DrawDocumentTest.java new file mode 100755 index 000000000000..cf0d06d3163e --- /dev/null +++ b/sfx2/qa/complex/sfx2/undo/DrawDocumentTest.java @@ -0,0 +1,198 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package complex.sfx2.undo; + +import com.sun.star.awt.Rectangle; +import com.sun.star.document.XUndoManager; +import com.sun.star.document.XUndoManagerSupplier; +import com.sun.star.document.XUndoAction; +import com.sun.star.awt.Point; +import com.sun.star.awt.Size; +import com.sun.star.beans.XPropertySet; +import com.sun.star.drawing.CircleKind; +import com.sun.star.drawing.XDrawPages; +import com.sun.star.drawing.XDrawPagesSupplier; +import com.sun.star.drawing.XShape; +import com.sun.star.drawing.XShapes; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.uno.UnoRuntime; +import org.openoffice.test.tools.DocumentType; +import static org.junit.Assert.*; + +/** + * implements the {@link DocumentTest} interface on top of a drawing document + * @author frank.schoenheit@oracle.com + */ +public class DrawDocumentTest extends DocumentTestBase +{ + public DrawDocumentTest( XMultiServiceFactory i_orb ) throws com.sun.star.uno.Exception + { + super( i_orb, DocumentType.DRAWING ); + } + + public String getDocumentDescription() + { + return "drawing document"; + } + + public void initializeDocument() throws com.sun.star.uno.Exception + { + // no special initializations needed here + } + + public void doSingleModification() throws com.sun.star.uno.Exception + { + // add a simple centered shape to the first page + Rectangle pagePlayground = impl_getFirstPagePlayground(); + impl_createCircleShape( + ( pagePlayground.X + ( pagePlayground.Width - BIG_CIRCLE_SIZE ) / 2 ), + ( pagePlayground.Y + ( pagePlayground.Height - BIG_CIRCLE_SIZE ) / 2 ), + BIG_CIRCLE_SIZE, + FILL_COLOR + ); + } + + public void verifyInitialDocumentState() throws com.sun.star.uno.Exception + { + final XShapes firstPageShapes = getFirstPageShapes(); + assertEquals( "there should be no shapes at all", 0, firstPageShapes.getCount() ); + } + + public void verifySingleModificationDocumentState() throws com.sun.star.uno.Exception + { + final XShapes firstPageShapes = getFirstPageShapes(); + assertEquals( "there should be no shapes at all", 1, firstPageShapes.getCount() ); + + final Object shape = firstPageShapes.getByIndex(0); + verifyShapeGeometry( shape, BIG_CIRCLE_SIZE, BIG_CIRCLE_SIZE ); + final XPropertySet shapeProps = UnoRuntime.queryInterface( XPropertySet.class, shape ); + assertEquals( "wrong circle tpye", CIRCLE_TYPE.getValue(), ((CircleKind)shapeProps.getPropertyValue( "CircleKind" )).getValue() ); + //assertEquals( "wrong circle fill color", FILL_COLOR, ((Integer)shapeProps.getPropertyValue( "FillColor" )).intValue() ); + // disable this particular check: A bug in the drawing layer API restores the FillColor to its + // default value upon re-insertion. This is issue #i115080# + } + + public int doMultipleModifications() throws com.sun.star.uno.Exception + { + // add a simple centered shape to the first page + Rectangle pagePlayground = impl_getFirstPagePlayground(); + impl_createCircleShape( + pagePlayground.X, + pagePlayground.Y, + SMALL_CIRCLE_SIZE, + ALTERNATE_FILL_COLOR + ); + impl_createCircleShape( + pagePlayground.X + pagePlayground.Width - SMALL_CIRCLE_SIZE, + pagePlayground.Y, + SMALL_CIRCLE_SIZE, + ALTERNATE_FILL_COLOR + ); + impl_createCircleShape( + pagePlayground.X, + pagePlayground.Y + pagePlayground.Height - SMALL_CIRCLE_SIZE, + SMALL_CIRCLE_SIZE, + ALTERNATE_FILL_COLOR + ); + impl_createCircleShape( + pagePlayground.X + pagePlayground.Width - SMALL_CIRCLE_SIZE, + pagePlayground.Y + pagePlayground.Height - SMALL_CIRCLE_SIZE, + SMALL_CIRCLE_SIZE, + ALTERNATE_FILL_COLOR + ); + return 4; + } + + private void impl_createCircleShape( final int i_x, final int i_y, final int i_size, final int i_color ) throws com.sun.star.uno.Exception + { + final XPropertySet shapeProps = getDocument().createInstance( "com.sun.star.drawing.EllipseShape", XPropertySet.class ); + shapeProps.setPropertyValue( "CircleKind", CIRCLE_TYPE ); + shapeProps.setPropertyValue( "FillColor", i_color ); + + final XShape shape = UnoRuntime.queryInterface( XShape.class, shapeProps ); + final Size shapeSize = new Size( i_size, i_size ); + shape.setSize( shapeSize ); + final Point shapePos = new Point( i_x, i_y ); + shape.setPosition( shapePos ); + + final XShapes pageShapes = UnoRuntime.queryInterface( XShapes.class, getFirstPageShapes() ); + pageShapes.add( shape ); + + // Sadly, Draw/Impress currently do not create Undo actions for programmatic changes to the document. + // Which renders the test here slightly useless ... unless we fake the Undo actions ourself. + final XUndoManagerSupplier suppUndoManager = UnoRuntime.queryInterface( XUndoManagerSupplier.class, getDocument().getDocument() ); + final XUndoManager undoManager = suppUndoManager.getUndoManager(); + undoManager.addUndoAction( new ShapeInsertionUndoAction( shape, pageShapes ) ); + } + + private Rectangle impl_getFirstPagePlayground() throws com.sun.star.uno.Exception + { + final XShapes firstPageShapes = getFirstPageShapes(); + final XPropertySet firstPageProps = UnoRuntime.queryInterface( XPropertySet.class, firstPageShapes ); + final int pageWidth = ((Integer)firstPageProps.getPropertyValue( "Width" )).intValue(); + final int pageHeight = ((Integer)firstPageProps.getPropertyValue( "Height" )).intValue(); + final int borderLeft = ((Integer)firstPageProps.getPropertyValue( "BorderLeft" )).intValue(); + final int borderTop = ((Integer)firstPageProps.getPropertyValue( "BorderTop" )).intValue(); + final int borderRight = ((Integer)firstPageProps.getPropertyValue( "BorderRight" )).intValue(); + final int borderBottom = ((Integer)firstPageProps.getPropertyValue( "BorderBottom" )).intValue(); + return new Rectangle( borderLeft, borderTop, pageWidth - borderLeft - borderRight, pageHeight - borderTop - borderBottom ); + } + + /** + * returns the XShapes interface of the first page of our drawing document + */ + private XShapes getFirstPageShapes() throws com.sun.star.uno.Exception + { + final XDrawPagesSupplier suppPages = UnoRuntime.queryInterface( XDrawPagesSupplier.class, getDocument().getDocument() ); + final XDrawPages pages = suppPages.getDrawPages(); + return UnoRuntime.queryInterface( XShapes.class, pages.getByIndex( 0 ) ); + } + + /** + * verifies the given shape has the given size + */ + private void verifyShapeGeometry( final Object i_shapeObject, final int i_expectedWidth, final int i_expectedHeight ) + throws com.sun.star.uno.Exception + { + final XShape shape = UnoRuntime.queryInterface( XShape.class, i_shapeObject ); + final Size shapeSize = shape.getSize(); + assertEquals( "unexpected shape width", i_expectedWidth, shapeSize.Width ); + assertEquals( "unexpected shape height", i_expectedHeight, shapeSize.Height ); + } + + private static class ShapeInsertionUndoAction implements XUndoAction + { + ShapeInsertionUndoAction( final XShape i_shape, final XShapes i_shapeCollection ) + { + m_shape = i_shape; + m_shapeCollection = i_shapeCollection; + } + + public String getTitle() + { + return "insert shape"; + } + + public void undo() + { + m_shapeCollection.remove( m_shape ); + } + + public void redo() + { + m_shapeCollection.add( m_shape ); + } + + private final XShape m_shape; + private final XShapes m_shapeCollection; + } + + private static CircleKind CIRCLE_TYPE = CircleKind.FULL; + private static int FILL_COLOR = 0xCC2244; + private static int ALTERNATE_FILL_COLOR = 0x44CC22; + private static int BIG_CIRCLE_SIZE = 5000; + private static int SMALL_CIRCLE_SIZE = 2000; +} -- cgit v1.2.3 From 870b17d7ed1397a48ad8699cdaa1847af2344911 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 19 Oct 2010 13:11:25 +0200 Subject: undoapi: test backend for Impress (doing the same as the Draw test backend) --- sfx2/qa/complex/sfx2/UndoManager.java | 7 + sfx2/qa/complex/sfx2/undo/DrawDocumentTest.java | 204 +++------------------ .../undo/DrawingOrPresentationDocumentTest.java | 196 ++++++++++++++++++++ sfx2/qa/complex/sfx2/undo/ImpressDocumentTest.java | 46 +++++ 4 files changed, 275 insertions(+), 178 deletions(-) create mode 100755 sfx2/qa/complex/sfx2/undo/DrawingOrPresentationDocumentTest.java create mode 100755 sfx2/qa/complex/sfx2/undo/ImpressDocumentTest.java (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index c54697927825..21433cd07336 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -40,6 +40,7 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; import complex.sfx2.undo.DocumentTest; import complex.sfx2.undo.DrawDocumentTest; +import complex.sfx2.undo.ImpressDocumentTest; import java.util.Stack; import org.junit.After; import org.junit.AfterClass; @@ -74,6 +75,12 @@ public class UndoManager impl_checkUndo( DrawDocumentTest.class ); } + @Test + public void checkImpressUndo() throws Exception + { + impl_checkUndo( ImpressDocumentTest.class ); + } + @After public void afterTest() { diff --git a/sfx2/qa/complex/sfx2/undo/DrawDocumentTest.java b/sfx2/qa/complex/sfx2/undo/DrawDocumentTest.java index cf0d06d3163e..d98e1372dea5 100755 --- a/sfx2/qa/complex/sfx2/undo/DrawDocumentTest.java +++ b/sfx2/qa/complex/sfx2/undo/DrawDocumentTest.java @@ -1,32 +1,38 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ +/************************************************************************* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + *************************************************************************/ package complex.sfx2.undo; -import com.sun.star.awt.Rectangle; -import com.sun.star.document.XUndoManager; -import com.sun.star.document.XUndoManagerSupplier; -import com.sun.star.document.XUndoAction; -import com.sun.star.awt.Point; -import com.sun.star.awt.Size; -import com.sun.star.beans.XPropertySet; -import com.sun.star.drawing.CircleKind; -import com.sun.star.drawing.XDrawPages; -import com.sun.star.drawing.XDrawPagesSupplier; -import com.sun.star.drawing.XShape; -import com.sun.star.drawing.XShapes; import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.UnoRuntime; import org.openoffice.test.tools.DocumentType; -import static org.junit.Assert.*; /** - * implements the {@link DocumentTest} interface on top of a drawing document * @author frank.schoenheit@oracle.com */ -public class DrawDocumentTest extends DocumentTestBase +public class DrawDocumentTest extends DrawingOrPresentationDocumentTest { public DrawDocumentTest( XMultiServiceFactory i_orb ) throws com.sun.star.uno.Exception { @@ -37,162 +43,4 @@ public class DrawDocumentTest extends DocumentTestBase { return "drawing document"; } - - public void initializeDocument() throws com.sun.star.uno.Exception - { - // no special initializations needed here - } - - public void doSingleModification() throws com.sun.star.uno.Exception - { - // add a simple centered shape to the first page - Rectangle pagePlayground = impl_getFirstPagePlayground(); - impl_createCircleShape( - ( pagePlayground.X + ( pagePlayground.Width - BIG_CIRCLE_SIZE ) / 2 ), - ( pagePlayground.Y + ( pagePlayground.Height - BIG_CIRCLE_SIZE ) / 2 ), - BIG_CIRCLE_SIZE, - FILL_COLOR - ); - } - - public void verifyInitialDocumentState() throws com.sun.star.uno.Exception - { - final XShapes firstPageShapes = getFirstPageShapes(); - assertEquals( "there should be no shapes at all", 0, firstPageShapes.getCount() ); - } - - public void verifySingleModificationDocumentState() throws com.sun.star.uno.Exception - { - final XShapes firstPageShapes = getFirstPageShapes(); - assertEquals( "there should be no shapes at all", 1, firstPageShapes.getCount() ); - - final Object shape = firstPageShapes.getByIndex(0); - verifyShapeGeometry( shape, BIG_CIRCLE_SIZE, BIG_CIRCLE_SIZE ); - final XPropertySet shapeProps = UnoRuntime.queryInterface( XPropertySet.class, shape ); - assertEquals( "wrong circle tpye", CIRCLE_TYPE.getValue(), ((CircleKind)shapeProps.getPropertyValue( "CircleKind" )).getValue() ); - //assertEquals( "wrong circle fill color", FILL_COLOR, ((Integer)shapeProps.getPropertyValue( "FillColor" )).intValue() ); - // disable this particular check: A bug in the drawing layer API restores the FillColor to its - // default value upon re-insertion. This is issue #i115080# - } - - public int doMultipleModifications() throws com.sun.star.uno.Exception - { - // add a simple centered shape to the first page - Rectangle pagePlayground = impl_getFirstPagePlayground(); - impl_createCircleShape( - pagePlayground.X, - pagePlayground.Y, - SMALL_CIRCLE_SIZE, - ALTERNATE_FILL_COLOR - ); - impl_createCircleShape( - pagePlayground.X + pagePlayground.Width - SMALL_CIRCLE_SIZE, - pagePlayground.Y, - SMALL_CIRCLE_SIZE, - ALTERNATE_FILL_COLOR - ); - impl_createCircleShape( - pagePlayground.X, - pagePlayground.Y + pagePlayground.Height - SMALL_CIRCLE_SIZE, - SMALL_CIRCLE_SIZE, - ALTERNATE_FILL_COLOR - ); - impl_createCircleShape( - pagePlayground.X + pagePlayground.Width - SMALL_CIRCLE_SIZE, - pagePlayground.Y + pagePlayground.Height - SMALL_CIRCLE_SIZE, - SMALL_CIRCLE_SIZE, - ALTERNATE_FILL_COLOR - ); - return 4; - } - - private void impl_createCircleShape( final int i_x, final int i_y, final int i_size, final int i_color ) throws com.sun.star.uno.Exception - { - final XPropertySet shapeProps = getDocument().createInstance( "com.sun.star.drawing.EllipseShape", XPropertySet.class ); - shapeProps.setPropertyValue( "CircleKind", CIRCLE_TYPE ); - shapeProps.setPropertyValue( "FillColor", i_color ); - - final XShape shape = UnoRuntime.queryInterface( XShape.class, shapeProps ); - final Size shapeSize = new Size( i_size, i_size ); - shape.setSize( shapeSize ); - final Point shapePos = new Point( i_x, i_y ); - shape.setPosition( shapePos ); - - final XShapes pageShapes = UnoRuntime.queryInterface( XShapes.class, getFirstPageShapes() ); - pageShapes.add( shape ); - - // Sadly, Draw/Impress currently do not create Undo actions for programmatic changes to the document. - // Which renders the test here slightly useless ... unless we fake the Undo actions ourself. - final XUndoManagerSupplier suppUndoManager = UnoRuntime.queryInterface( XUndoManagerSupplier.class, getDocument().getDocument() ); - final XUndoManager undoManager = suppUndoManager.getUndoManager(); - undoManager.addUndoAction( new ShapeInsertionUndoAction( shape, pageShapes ) ); - } - - private Rectangle impl_getFirstPagePlayground() throws com.sun.star.uno.Exception - { - final XShapes firstPageShapes = getFirstPageShapes(); - final XPropertySet firstPageProps = UnoRuntime.queryInterface( XPropertySet.class, firstPageShapes ); - final int pageWidth = ((Integer)firstPageProps.getPropertyValue( "Width" )).intValue(); - final int pageHeight = ((Integer)firstPageProps.getPropertyValue( "Height" )).intValue(); - final int borderLeft = ((Integer)firstPageProps.getPropertyValue( "BorderLeft" )).intValue(); - final int borderTop = ((Integer)firstPageProps.getPropertyValue( "BorderTop" )).intValue(); - final int borderRight = ((Integer)firstPageProps.getPropertyValue( "BorderRight" )).intValue(); - final int borderBottom = ((Integer)firstPageProps.getPropertyValue( "BorderBottom" )).intValue(); - return new Rectangle( borderLeft, borderTop, pageWidth - borderLeft - borderRight, pageHeight - borderTop - borderBottom ); - } - - /** - * returns the XShapes interface of the first page of our drawing document - */ - private XShapes getFirstPageShapes() throws com.sun.star.uno.Exception - { - final XDrawPagesSupplier suppPages = UnoRuntime.queryInterface( XDrawPagesSupplier.class, getDocument().getDocument() ); - final XDrawPages pages = suppPages.getDrawPages(); - return UnoRuntime.queryInterface( XShapes.class, pages.getByIndex( 0 ) ); - } - - /** - * verifies the given shape has the given size - */ - private void verifyShapeGeometry( final Object i_shapeObject, final int i_expectedWidth, final int i_expectedHeight ) - throws com.sun.star.uno.Exception - { - final XShape shape = UnoRuntime.queryInterface( XShape.class, i_shapeObject ); - final Size shapeSize = shape.getSize(); - assertEquals( "unexpected shape width", i_expectedWidth, shapeSize.Width ); - assertEquals( "unexpected shape height", i_expectedHeight, shapeSize.Height ); - } - - private static class ShapeInsertionUndoAction implements XUndoAction - { - ShapeInsertionUndoAction( final XShape i_shape, final XShapes i_shapeCollection ) - { - m_shape = i_shape; - m_shapeCollection = i_shapeCollection; - } - - public String getTitle() - { - return "insert shape"; - } - - public void undo() - { - m_shapeCollection.remove( m_shape ); - } - - public void redo() - { - m_shapeCollection.add( m_shape ); - } - - private final XShape m_shape; - private final XShapes m_shapeCollection; - } - - private static CircleKind CIRCLE_TYPE = CircleKind.FULL; - private static int FILL_COLOR = 0xCC2244; - private static int ALTERNATE_FILL_COLOR = 0x44CC22; - private static int BIG_CIRCLE_SIZE = 5000; - private static int SMALL_CIRCLE_SIZE = 2000; } diff --git a/sfx2/qa/complex/sfx2/undo/DrawingOrPresentationDocumentTest.java b/sfx2/qa/complex/sfx2/undo/DrawingOrPresentationDocumentTest.java new file mode 100755 index 000000000000..916e1908e93d --- /dev/null +++ b/sfx2/qa/complex/sfx2/undo/DrawingOrPresentationDocumentTest.java @@ -0,0 +1,196 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package complex.sfx2.undo; + +import com.sun.star.awt.Rectangle; +import com.sun.star.document.XUndoManager; +import com.sun.star.document.XUndoManagerSupplier; +import com.sun.star.document.XUndoAction; +import com.sun.star.awt.Point; +import com.sun.star.awt.Size; +import com.sun.star.beans.XPropertySet; +import com.sun.star.drawing.CircleKind; +import com.sun.star.drawing.XDrawPages; +import com.sun.star.drawing.XDrawPagesSupplier; +import com.sun.star.drawing.XShape; +import com.sun.star.drawing.XShapes; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.uno.UnoRuntime; +import org.openoffice.test.tools.DocumentType; +import static org.junit.Assert.*; + +/** + * implements the {@link DocumentTest} interface on top of a drawing document + * @author frank.schoenheit@oracle.com + */ +public abstract class DrawingOrPresentationDocumentTest extends DocumentTestBase +{ + public DrawingOrPresentationDocumentTest( XMultiServiceFactory i_orb, final DocumentType i_docType ) throws com.sun.star.uno.Exception + { + super( i_orb, i_docType ); + } + + public void initializeDocument() throws com.sun.star.uno.Exception + { + // remove all shapes - Impress has two default shapes in a new doc; just get rid of them + final XShapes firstPageShapes = getFirstPageShapes(); + while ( firstPageShapes.getCount() > 0 ) + firstPageShapes.remove( UnoRuntime.queryInterface( XShape.class, firstPageShapes.getByIndex( 0 ) ) ); + } + + public void doSingleModification() throws com.sun.star.uno.Exception + { + // add a simple centered shape to the first page + Rectangle pagePlayground = impl_getFirstPagePlayground(); + impl_createCircleShape( + ( pagePlayground.X + ( pagePlayground.Width - BIG_CIRCLE_SIZE ) / 2 ), + ( pagePlayground.Y + ( pagePlayground.Height - BIG_CIRCLE_SIZE ) / 2 ), + BIG_CIRCLE_SIZE, + FILL_COLOR + ); + } + + public void verifyInitialDocumentState() throws com.sun.star.uno.Exception + { + final XShapes firstPageShapes = getFirstPageShapes(); + assertEquals( "there should be no shapes at all", 0, firstPageShapes.getCount() ); + } + + public void verifySingleModificationDocumentState() throws com.sun.star.uno.Exception + { + final XShapes firstPageShapes = getFirstPageShapes(); + assertEquals( "there should be one shape, not more, not less", 1, firstPageShapes.getCount() ); + + final Object shape = firstPageShapes.getByIndex(0); + verifyShapeGeometry( shape, BIG_CIRCLE_SIZE, BIG_CIRCLE_SIZE ); + final XPropertySet shapeProps = UnoRuntime.queryInterface( XPropertySet.class, shape ); + assertEquals( "wrong circle tpye", CIRCLE_TYPE.getValue(), ((CircleKind)shapeProps.getPropertyValue( "CircleKind" )).getValue() ); + //assertEquals( "wrong circle fill color", FILL_COLOR, ((Integer)shapeProps.getPropertyValue( "FillColor" )).intValue() ); + // disable this particular check: A bug in the drawing layer API restores the FillColor to its + // default value upon re-insertion. This is issue #i115080# + } + + public int doMultipleModifications() throws com.sun.star.uno.Exception + { + // add a simple centered shape to the first page + Rectangle pagePlayground = impl_getFirstPagePlayground(); + impl_createCircleShape( + pagePlayground.X, + pagePlayground.Y, + SMALL_CIRCLE_SIZE, + ALTERNATE_FILL_COLOR + ); + impl_createCircleShape( + pagePlayground.X + pagePlayground.Width - SMALL_CIRCLE_SIZE, + pagePlayground.Y, + SMALL_CIRCLE_SIZE, + ALTERNATE_FILL_COLOR + ); + impl_createCircleShape( + pagePlayground.X, + pagePlayground.Y + pagePlayground.Height - SMALL_CIRCLE_SIZE, + SMALL_CIRCLE_SIZE, + ALTERNATE_FILL_COLOR + ); + impl_createCircleShape( + pagePlayground.X + pagePlayground.Width - SMALL_CIRCLE_SIZE, + pagePlayground.Y + pagePlayground.Height - SMALL_CIRCLE_SIZE, + SMALL_CIRCLE_SIZE, + ALTERNATE_FILL_COLOR + ); + return 4; + } + + private void impl_createCircleShape( final int i_x, final int i_y, final int i_size, final int i_color ) throws com.sun.star.uno.Exception + { + final XPropertySet shapeProps = getDocument().createInstance( "com.sun.star.drawing.EllipseShape", XPropertySet.class ); + shapeProps.setPropertyValue( "CircleKind", CIRCLE_TYPE ); + shapeProps.setPropertyValue( "FillColor", i_color ); + + final XShape shape = UnoRuntime.queryInterface( XShape.class, shapeProps ); + final Size shapeSize = new Size( i_size, i_size ); + shape.setSize( shapeSize ); + final Point shapePos = new Point( i_x, i_y ); + shape.setPosition( shapePos ); + + final XShapes pageShapes = UnoRuntime.queryInterface( XShapes.class, getFirstPageShapes() ); + pageShapes.add( shape ); + + // Sadly, Draw/Impress currently do not create Undo actions for programmatic changes to the document. + // Which renders the test here slightly useless ... unless we fake the Undo actions ourself. + final XUndoManagerSupplier suppUndoManager = UnoRuntime.queryInterface( XUndoManagerSupplier.class, getDocument().getDocument() ); + final XUndoManager undoManager = suppUndoManager.getUndoManager(); + undoManager.addUndoAction( new ShapeInsertionUndoAction( shape, pageShapes ) ); + } + + private Rectangle impl_getFirstPagePlayground() throws com.sun.star.uno.Exception + { + final XShapes firstPageShapes = getFirstPageShapes(); + final XPropertySet firstPageProps = UnoRuntime.queryInterface( XPropertySet.class, firstPageShapes ); + final int pageWidth = ((Integer)firstPageProps.getPropertyValue( "Width" )).intValue(); + final int pageHeight = ((Integer)firstPageProps.getPropertyValue( "Height" )).intValue(); + final int borderLeft = ((Integer)firstPageProps.getPropertyValue( "BorderLeft" )).intValue(); + final int borderTop = ((Integer)firstPageProps.getPropertyValue( "BorderTop" )).intValue(); + final int borderRight = ((Integer)firstPageProps.getPropertyValue( "BorderRight" )).intValue(); + final int borderBottom = ((Integer)firstPageProps.getPropertyValue( "BorderBottom" )).intValue(); + return new Rectangle( borderLeft, borderTop, pageWidth - borderLeft - borderRight, pageHeight - borderTop - borderBottom ); + } + + /** + * returns the XShapes interface of the first page of our drawing document + */ + private XShapes getFirstPageShapes() throws com.sun.star.uno.Exception + { + final XDrawPagesSupplier suppPages = UnoRuntime.queryInterface( XDrawPagesSupplier.class, getDocument().getDocument() ); + final XDrawPages pages = suppPages.getDrawPages(); + return UnoRuntime.queryInterface( XShapes.class, pages.getByIndex( 0 ) ); + } + + /** + * verifies the given shape has the given size + */ + private void verifyShapeGeometry( final Object i_shapeObject, final int i_expectedWidth, final int i_expectedHeight ) + throws com.sun.star.uno.Exception + { + final XShape shape = UnoRuntime.queryInterface( XShape.class, i_shapeObject ); + final Size shapeSize = shape.getSize(); + assertEquals( "unexpected shape width", i_expectedWidth, shapeSize.Width ); + assertEquals( "unexpected shape height", i_expectedHeight, shapeSize.Height ); + } + + private static class ShapeInsertionUndoAction implements XUndoAction + { + ShapeInsertionUndoAction( final XShape i_shape, final XShapes i_shapeCollection ) + { + m_shape = i_shape; + m_shapeCollection = i_shapeCollection; + } + + public String getTitle() + { + return "insert shape"; + } + + public void undo() + { + m_shapeCollection.remove( m_shape ); + } + + public void redo() + { + m_shapeCollection.add( m_shape ); + } + + private final XShape m_shape; + private final XShapes m_shapeCollection; + } + + private static CircleKind CIRCLE_TYPE = CircleKind.FULL; + private static int FILL_COLOR = 0xCC2244; + private static int ALTERNATE_FILL_COLOR = 0x44CC22; + private static int BIG_CIRCLE_SIZE = 5000; + private static int SMALL_CIRCLE_SIZE = 2000; +} diff --git a/sfx2/qa/complex/sfx2/undo/ImpressDocumentTest.java b/sfx2/qa/complex/sfx2/undo/ImpressDocumentTest.java new file mode 100755 index 000000000000..c15fc760e0c3 --- /dev/null +++ b/sfx2/qa/complex/sfx2/undo/ImpressDocumentTest.java @@ -0,0 +1,46 @@ +/************************************************************************* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. + * + *************************************************************************/ + +package complex.sfx2.undo; + +import com.sun.star.lang.XMultiServiceFactory; +import org.openoffice.test.tools.DocumentType; + +/** + * @author frank.schoenheit@oracle.com + */ +public class ImpressDocumentTest extends DrawingOrPresentationDocumentTest +{ + public ImpressDocumentTest( XMultiServiceFactory i_orb ) throws com.sun.star.uno.Exception + { + super( i_orb, DocumentType.PRESENTATION ); + } + + public String getDocumentDescription() + { + return "presentation document"; + } +} -- cgit v1.2.3 From 626f341e6133c4d8e24551bc7563f512a32422fe Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 19 Oct 2010 22:23:16 +0200 Subject: undoapi: added isUndo/RedoPossible / getCurrent/AllUndo/RedoTitle(s) to XUndoManager --- sfx2/qa/complex/sfx2/UndoManager.java | 13 ++++++ sfx2/source/doc/docundomanager.cxx | 78 +++++++++++++++++++++++++++++++++++ sfx2/source/inc/docundomanager.hxx | 6 +++ 3 files changed, 97 insertions(+) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index 21433cd07336..f70e486bffb3 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -38,6 +38,7 @@ import com.sun.star.document.XUndoManagerListener; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; +import com.sun.star.util.InvalidStateException; import complex.sfx2.undo.DocumentTest; import complex.sfx2.undo.DrawDocumentTest; import complex.sfx2.undo.ImpressDocumentTest; @@ -174,6 +175,15 @@ public class UndoManager final XUndoManager undoManager = getUndoManager( test.getDocument() ); undoManager.clear(); + assertFalse( "clearing the Undo manager should result in the impossibility to undo anything", undoManager.isUndoPossible() ); + assertFalse( "clearing the Undo manager should result in the impossibility to redo anything", undoManager.isRedoPossible() ); + + // try retrieving the comments for the current Undo/Redo - this should fail + boolean caughtExpected = false; + try { undoManager.getCurrentUndoActionTitle(); undoManager.getCurrentRedoActionTitle(); } + catch( final InvalidStateException e ) { caughtExpected = true; } + assertTrue( "trying the title of the current Undo/Redo action is expected to fail for an empty stack", caughtExpected ); + final UndoListener listener = new UndoListener(); undoManager.addUndoManagerListener( listener ); @@ -226,6 +236,9 @@ public class UndoManager test.verifyInitialDocumentState(); listener.reset(); + // test various comment-related functions + + // close the document, ensure the Undo manager listener gets notified m_currentDocument.close(); assertTrue( "document is closed, but the UndoManagerListener has not been notified of the disposal", listener.isDisposed() ); m_currentDocument = null; diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx index 5c17c5cde786..85e627120018 100755 --- a/sfx2/source/doc/docundomanager.cxx +++ b/sfx2/source/doc/docundomanager.cxx @@ -68,6 +68,7 @@ namespace sfx2 using ::com::sun::star::document::UndoManagerEvent; using ::com::sun::star::document::XUndoManagerListener; using ::com::sun::star::lang::WrappedTargetException; + using ::com::sun::star::document::XUndoManager; /** === end UNO using === **/ //================================================================================================================== @@ -482,6 +483,83 @@ namespace sfx2 impl_do_nolck( &SfxUndoManager::GetRedoActionCount, &SfxUndoManager::Redo, &SfxUndoManager::GetRedoActionComment, &XUndoManagerListener::actionRedone ); } + //------------------------------------------------------------------------------------------------------------------ + ::sal_Bool SAL_CALL DocumentUndoManager::isUndoPossible( ) throw (RuntimeException) + { + SfxModelGuard aGuard( *this ); + + SfxUndoManager& rUndoManager = lcl_getUndoManager_throw( *m_pImpl ); + return rUndoManager.GetUndoActionCount() > 0; + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Bool SAL_CALL DocumentUndoManager::isRedoPossible( ) throw (RuntimeException) + { + SfxModelGuard aGuard( *this ); + + SfxUndoManager& rUndoManager = lcl_getUndoManager_throw( *m_pImpl ); + return rUndoManager.GetRedoActionCount() > 0; + } + + //------------------------------------------------------------------------------------------------------------------ + namespace + { + //.............................................................................................................. + ::rtl::OUString lcl_getCurrentActionTitle( DocumentUndoManager_Impl& i_impl, const bool i_undo ) + { + SfxModelGuard aGuard( i_impl.rAntiImpl ); + + const SfxUndoManager& rUndoManager = lcl_getUndoManager_throw( i_impl ); + if ( ( i_undo ? rUndoManager.GetUndoActionCount() : rUndoManager.GetRedoActionCount() )== 0 ) + throw InvalidStateException( + i_undo ? ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no action on the Undo stack" ) ) + : ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no action on the Redo stack" ) ), + static_cast< XUndoManager* >( &i_impl.rAntiImpl ) + ); + return i_undo ? rUndoManager.GetUndoActionComment(0) : rUndoManager.GetRedoActionComment(0); + } + + //.............................................................................................................. + Sequence< ::rtl::OUString > lcl_getAllActionTitles( DocumentUndoManager_Impl& i_impl, const bool i_undo ) + { + SfxModelGuard aGuard( i_impl.rAntiImpl ); + + const SfxUndoManager& rUndoManager = lcl_getUndoManager_throw( i_impl ); + const sal_Int32 nCount = i_undo ? rUndoManager.GetUndoActionCount() : rUndoManager.GetRedoActionCount(); + + Sequence< ::rtl::OUString > aTitles( nCount ); + for ( sal_Int32 i=0; i SAL_CALL DocumentUndoManager::getAllUndoActionTitles( ) throw (RuntimeException) + { + return lcl_getAllActionTitles( *m_pImpl, true ); + } + + //------------------------------------------------------------------------------------------------------------------ + Sequence< ::rtl::OUString > SAL_CALL DocumentUndoManager::getAllRedoActionTitles( ) throw (RuntimeException) + { + return lcl_getAllActionTitles( *m_pImpl, false ); + } + //------------------------------------------------------------------------------------------------------------------ void SAL_CALL DocumentUndoManager::clear( ) throw (RuntimeException) { diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx index d03af0ae090a..7ca7c1173e69 100755 --- a/sfx2/source/inc/docundomanager.hxx +++ b/sfx2/source/inc/docundomanager.hxx @@ -75,6 +75,12 @@ namespace sfx2 virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); virtual void SAL_CALL undo( ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::util::InvalidStateException, ::com::sun::star::lang::WrappedTargetException); virtual void SAL_CALL redo( ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::util::InvalidStateException, ::com::sun::star::lang::WrappedTargetException); + virtual ::sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clear( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearRedo( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException); -- cgit v1.2.3 From 5ee125ca789e7989a9725c40fe17fd3f8086a951 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Wed, 20 Oct 2010 11:12:31 +0200 Subject: undoapi: more UNDO API tests --- sfx2/qa/complex/sfx2/UndoManager.java | 139 ++++++++++++++++++++++++++++++++-- 1 file changed, 134 insertions(+), 5 deletions(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index f70e486bffb3..c5646643c89e 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -28,6 +28,7 @@ package complex.sfx2; import com.sun.star.document.UndoManagerEvent; +import com.sun.star.document.XUndoAction; import com.sun.star.lang.EventObject; import java.lang.reflect.Constructor; import org.openoffice.test.tools.OfficeDocument; @@ -101,19 +102,22 @@ public class UndoManager private static class UndoListener implements XUndoManagerListener { - public void undoActionAdded( UndoManagerEvent ume ) + public void undoActionAdded( UndoManagerEvent i_event ) { ++m_undoActionsAdded; + m_mostRecentlyAddedAction = i_event.UndoActionTitle; } - public void actionUndone( UndoManagerEvent ume ) + public void actionUndone( UndoManagerEvent i_event ) { ++m_undoCount; + m_mostRecentlyUndone = i_event.UndoActionTitle; } - public void actionRedone( UndoManagerEvent ume ) + public void actionRedone( UndoManagerEvent i_event ) { ++m_redoCount; + m_mostRecentlyRedone = i_event.UndoActionTitle; } public void allActionsCleared( EventObject eo ) @@ -147,6 +151,9 @@ public class UndoManager int getUndoActionCount() { return m_undoCount; } int getRedoActionCount() { return m_redoCount; } String getCurrentUndoContextTitle() { return m_activeUndoContexts.peek(); } + String getMostRecentlyAddedActionTitle() { return m_mostRecentlyAddedAction; }; + String getMostRecentlyUndoneTitle() { return m_mostRecentlyUndone; } + String getMostRecentlyRedoneTitle() { return m_mostRecentlyRedone; } int getUndoContextDepth() { return m_activeUndoContexts.size(); } boolean isDisposed() { return m_isDisposed; } @@ -154,6 +161,8 @@ public class UndoManager { m_undoActionsAdded = m_undoCount = m_redoCount = 0; m_activeUndoContexts.clear(); + m_mostRecentlyAddedAction = m_mostRecentlyUndone = m_mostRecentlyRedone = null; + // m_isDisposed is not cleared, intentionally } private int m_undoActionsAdded = 0; @@ -162,6 +171,9 @@ public class UndoManager private boolean m_isDisposed = false; private Stack< String > m_activeUndoContexts = new Stack(); + private String m_mostRecentlyAddedAction = null; + private String m_mostRecentlyUndone = null; + private String m_mostRecentlyRedone = null; }; private void impl_checkUndo( final Class i_testClass ) throws Exception @@ -234,9 +246,96 @@ public class UndoManager assertEquals( "Just did an undo - the listener should have been notified", 1, listener.getUndoActionCount() ); test.verifyInitialDocumentState(); - listener.reset(); - // test various comment-related functions + // custom Undo actions + { + undoManager.clear(); + listener.reset(); + assertFalse( "undo stack not empty after clearing the undo manager", undoManager.isUndoPossible() ); + assertFalse( "redo stack not empty after clearing the undo manager", undoManager.isRedoPossible() ); + assertArrayEquals( ">0 descriptions for an empty undo stack?", new String[0], undoManager.getAllUndoActionTitles() ); + assertArrayEquals( ">0 descriptions for an empty redo stack?", new String[0], undoManager.getAllRedoActionTitles() ); + + // add two actions, one directly, one within a context + final CustomUndoAction action1 = new CustomUndoAction( "UndoAction1" ); + undoManager.addUndoAction( action1 ); + assertEquals( "Adding an undo action not observed by the listener", 1, listener.getUndoActionsAdded() ); + assertEquals( "Adding an undo action did not notify the proper title", action1.getTitle(), listener.getMostRecentlyAddedActionTitle() ); + + final String contextTitle = "Undo Context"; + undoManager.enterUndoContext( contextTitle ); + final CustomUndoAction action2 = new CustomUndoAction( "UndoAction2" ); + undoManager.addUndoAction( action2 ); + assertEquals( "Adding an undo action not observed by the listener", 2, listener.getUndoActionsAdded() ); + assertEquals( "Adding an undo action did not notify the proper title", action2.getTitle(), listener.getMostRecentlyAddedActionTitle() ); + undoManager.leaveUndoContext(); + + // see if the manager has proper descriptions + assertArrayEquals( "unexpected Redo descriptions after adding two actions", + new String[0], undoManager.getAllRedoActionTitles() ); + assertArrayEquals( "unexpected Undo descriptions after adding two actions", + new String[] { contextTitle, action1.getTitle() }, undoManager.getAllUndoActionTitles() ); + + // undo one action + undoManager.undo(); + assertEquals( "improper action title notified during programmatic Undo", contextTitle, listener.getMostRecentlyUndoneTitle() ); + assertTrue( "nested custom undo action has not been undone as expected", action2.undoCalled() ); + assertFalse( "nested custom undo action has not been undone as expected", action1.undoCalled() ); + assertArrayEquals( "unexpected Redo descriptions after undoing a nested custom action", + new String[] { contextTitle }, undoManager.getAllRedoActionTitles() ); + assertArrayEquals( "unexpected Undo descriptions after undoing a nested custom action", + new String[] { action1.getTitle() }, undoManager.getAllUndoActionTitles() ); + // undo the second action, via UI dispatches + test.getDocument().getCurrentView().dispatch( ".uno:Undo" ); + assertEquals( "improper action title notified during UI Undo", action1.getTitle(), listener.getMostRecentlyUndoneTitle() ); + assertTrue( "nested custom undo action has not been undone as expected", action1.undoCalled() ); + assertArrayEquals( "unexpected Redo descriptions after undoing the second custom action", + new String[] { action1.getTitle(), contextTitle }, undoManager.getAllRedoActionTitles() ); + assertArrayEquals( "unexpected Undo descriptions after undoing the second custom action", + new String[0], undoManager.getAllUndoActionTitles() ); + } + + // nesting of contexts + { + undoManager.clear(); + listener.reset(); + undoManager.enterUndoContext( "context 1" ); + undoManager.enterUndoContext( "context 1.1" ); + final CustomUndoAction action1 = new CustomUndoAction( "action 1.1.1" ); + undoManager.addUndoAction( action1 ); + undoManager.enterUndoContext( "context 1.1.2" ); + final CustomUndoAction action2 = new CustomUndoAction( "action 1.1.2.1" ); + undoManager.addUndoAction( action2 ); + undoManager.leaveUndoContext(); + final CustomUndoAction action3 = new CustomUndoAction( "action 1.1.3" ); + undoManager.addUndoAction( action3 ); + undoManager.leaveUndoContext(); + undoManager.leaveUndoContext(); + final CustomUndoAction action4 = new CustomUndoAction( "action 1.2" ); + undoManager.addUndoAction( action4 ); + + undoManager.undo(); + assertEquals( "undoing a single action notifies a wrong title", action4.getTitle(), listener.getMostRecentlyUndoneTitle() ); + assertTrue( "custom Undo not called", action4.undoCalled() ); + assertFalse( "too many custom Undos called", action1.undoCalled() || action2.undoCalled() || action3.undoCalled() ); + undoManager.undo(); + assertTrue( "nested actions not properly undone", action1.undoCalled() && action2.undoCalled() && action3.undoCalled() ); + } + + // some error handlings + { + undoManager.clear(); + listener.reset(); + caughtExpected = false; + try { undoManager.undo(); } catch ( final InvalidStateException e ) { caughtExpected = true; } + assertTrue( "undo should throw if no Undo action is on the stack", caughtExpected ); + caughtExpected = false; + try { undoManager.redo(); } catch ( final InvalidStateException e ) { caughtExpected = true; } + assertTrue( "redo should throw if no Redo action is on the stack", caughtExpected ); + caughtExpected = false; + try { undoManager.leaveUndoContext(); } catch ( final InvalidStateException e ) { caughtExpected = true; } + assertTrue( "leaveUndoContext should throw if no context is currently open", caughtExpected ); + } // close the document, ensure the Undo manager listener gets notified m_currentDocument.close(); @@ -275,6 +374,36 @@ public class UndoManager System.out.println( "--------------------------------------------------------------------------------" ); } + private static class CustomUndoAction implements XUndoAction + { + CustomUndoAction( final String i_title ) + { + m_title = i_title; + } + + public String getTitle() + { + return m_title; + } + + public void undo() + { + m_undoCalled = true; + } + + public void redo() + { + m_redoCalled = true; + } + + boolean undoCalled() { return m_undoCalled; } + boolean redoCalled() { return m_redoCalled; } + + private final String m_title; + private boolean m_undoCalled = false; + private boolean m_redoCalled = false; + } + private static final OfficeConnection m_connection = new OfficeConnection(); private OfficeDocument m_currentDocument; } -- cgit v1.2.3 From 9d30575ba6c67b4383461ef44ed9b2aae266aa3c Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 21 Oct 2010 12:12:16 +0200 Subject: undoapi: specified (and implemented and tested) what should happen when you leave an Undo context which does not have any elements --- sfx2/qa/complex/sfx2/UndoManager.java | 146 +++++++++++++++++++++++++--------- sfx2/source/doc/docundomanager.cxx | 21 ++++- 2 files changed, 127 insertions(+), 40 deletions(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index c5646643c89e..7e5c231da91c 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -131,15 +131,31 @@ public class UndoManager public void enteredUndoContext( UndoManagerEvent i_event ) { m_activeUndoContexts.push( i_event.UndoActionTitle ); + assertEquals( "different opinions on the context nesting level (after entering)", + m_activeUndoContexts.size(), i_event.UndoContextDepth ); } - public void enteredHiddenUndoContext( UndoManagerEvent ume ) + public void enteredHiddenUndoContext( UndoManagerEvent i_event ) { + m_activeUndoContexts.push( i_event.UndoActionTitle ); + assertEquals( "different opinions on the context nesting level (after entering hidden)", + m_activeUndoContexts.size(), i_event.UndoContextDepth ); } public void leftUndoContext( UndoManagerEvent i_event ) { assertEquals( "nested undo context descriptions do not match", m_activeUndoContexts.pop(), i_event.UndoActionTitle ); + assertEquals( "different opinions on the context nesting level (after leaving)", + m_activeUndoContexts.size(), i_event.UndoContextDepth ); + m_leftContext = true; + } + + public void cancelledUndoContext( UndoManagerEvent i_event ) + { + m_activeUndoContexts.pop(); + assertEquals( "different opinions on the context nesting level (after cancelling)", + m_activeUndoContexts.size(), i_event.UndoContextDepth ); + m_cancelledContext = true; } public void disposing( EventObject i_event ) @@ -156,6 +172,8 @@ public class UndoManager String getMostRecentlyRedoneTitle() { return m_mostRecentlyRedone; } int getUndoContextDepth() { return m_activeUndoContexts.size(); } boolean isDisposed() { return m_isDisposed; } + boolean contextLeft() { return m_leftContext; } + boolean contextCancelled() { return m_cancelledContext; } void reset() { @@ -163,12 +181,15 @@ public class UndoManager m_activeUndoContexts.clear(); m_mostRecentlyAddedAction = m_mostRecentlyUndone = m_mostRecentlyRedone = null; // m_isDisposed is not cleared, intentionally + m_leftContext = m_cancelledContext = false; } private int m_undoActionsAdded = 0; private int m_undoCount = 0; private int m_redoCount = 0; private boolean m_isDisposed = false; + private boolean m_leftContext = false; + private boolean m_cancelledContext = false; private Stack< String > m_activeUndoContexts = new Stack(); private String m_mostRecentlyAddedAction = null; @@ -200,52 +221,56 @@ public class UndoManager undoManager.addUndoManagerListener( listener ); // do a single modification to the document - test.doSingleModification(); - test.verifySingleModificationDocumentState(); - - // undo the modification, ensure the listener got the proper notifications - assertEquals( "We did not yet do a undo!", 0, listener.getUndoActionCount() ); - undoManager.undo(); - assertEquals( "A simple undo does not result in the proper Undo count.", 1, listener.getUndoActionCount() ); + { + test.doSingleModification(); + test.verifySingleModificationDocumentState(); - // verify the document is in its initial state, again - test.verifyInitialDocumentState(); + // undo the modification, ensure the listener got the proper notifications + assertEquals( "We did not yet do a undo!", 0, listener.getUndoActionCount() ); + undoManager.undo(); + assertEquals( "A simple undo does not result in the proper Undo count.", 1, listener.getUndoActionCount() ); - // redo the modification, ensure the listener got the proper notifications - assertEquals( "did not yet do a redo!", 0, listener.getRedoActionCount() ); - undoManager.redo(); - assertEquals( "did a redo, but got no notification of it!", 1, listener.getRedoActionCount() ); + // verify the document is in its initial state, again + test.verifyInitialDocumentState(); - // ensure the document is in the proper state, again - test.verifySingleModificationDocumentState(); + // redo the modification, ensure the listener got the proper notifications + assertEquals( "did not yet do a redo!", 0, listener.getRedoActionCount() ); + undoManager.redo(); + assertEquals( "did a redo, but got no notification of it!", 1, listener.getRedoActionCount() ); - // now do an Undo via the UI (aka the dispatch API), and see if this works, and notifies the listener as - // expected - test.getDocument().getCurrentView().dispatch( ".uno:Undo" ); - test.verifyInitialDocumentState(); - assertEquals( "UI-Undo does not notify the listener", 2, listener.getUndoActionCount() ); + // ensure the document is in the proper state, again + test.verifySingleModificationDocumentState(); - listener.reset(); + // now do an Undo via the UI (aka the dispatch API), and see if this works, and notifies the listener as + // expected + test.getDocument().getCurrentView().dispatch( ".uno:Undo" ); + test.verifyInitialDocumentState(); + assertEquals( "UI-Undo does not notify the listener", 2, listener.getUndoActionCount() ); + } // do multiple changes in a row, after entering an Undo context - assertEquals( "unexpected initial undo context depth", 0, listener.getUndoContextDepth() ); - undoManager.enterUndoContext( "Batch Changes" ); - assertEquals( "unexpected undo context depth after entering a context", 1, listener.getUndoContextDepth() ); + { + listener.reset(); - assertEquals( "entering an Undo context has not been notified properly", "Batch Changes", listener.getCurrentUndoContextTitle() ); - final int modifications = test.doMultipleModifications(); - assertEquals( "unexpected number of undo actions while doing batch changes to the document", - modifications, listener.getUndoActionsAdded() ); + assertEquals( "unexpected initial undo context depth", 0, listener.getUndoContextDepth() ); + undoManager.enterUndoContext( "Batch Changes" ); + assertEquals( "unexpected undo context depth after entering a context", 1, listener.getUndoContextDepth() ); - assertEquals( "seems the document operations touched the undo context depth", 1, listener.getUndoContextDepth() ); - undoManager.leaveUndoContext(); - assertEquals( "unexpected undo context depth after leaving the last context", 0, listener.getUndoContextDepth() ); + assertEquals( "entering an Undo context has not been notified properly", "Batch Changes", listener.getCurrentUndoContextTitle() ); + final int modifications = test.doMultipleModifications(); + assertEquals( "unexpected number of undo actions while doing batch changes to the document", + modifications, listener.getUndoActionsAdded() ); - assertEquals( "no Undo done, yet - still the listener has been notified of an Undo action", 0, listener.getUndoActionCount() ); - undoManager.undo(); - assertEquals( "Just did an undo - the listener should have been notified", 1, listener.getUndoActionCount() ); + assertEquals( "seems the document operations touched the undo context depth", 1, listener.getUndoContextDepth() ); + undoManager.leaveUndoContext(); + assertEquals( "unexpected undo context depth after leaving the last context", 0, listener.getUndoContextDepth() ); - test.verifyInitialDocumentState(); + assertEquals( "no Undo done, yet - still the listener has been notified of an Undo action", 0, listener.getUndoActionCount() ); + undoManager.undo(); + assertEquals( "Just did an undo - the listener should have been notified", 1, listener.getUndoActionCount() ); + + test.verifyInitialDocumentState(); + } // custom Undo actions { @@ -285,6 +310,7 @@ public class UndoManager new String[] { contextTitle }, undoManager.getAllRedoActionTitles() ); assertArrayEquals( "unexpected Undo descriptions after undoing a nested custom action", new String[] { action1.getTitle() }, undoManager.getAllUndoActionTitles() ); + // undo the second action, via UI dispatches test.getDocument().getCurrentView().dispatch( ".uno:Undo" ); assertEquals( "improper action title notified during UI Undo", action1.getTitle(), listener.getMostRecentlyUndoneTitle() ); @@ -337,6 +363,54 @@ public class UndoManager assertTrue( "leaveUndoContext should throw if no context is currently open", caughtExpected ); } + // more on undo contexts + { + undoManager.clear(); + listener.reset(); + + undoManager.enterUndoContext( "Undo Context" ); + assertEquals( "unexpected undo context depth after entering a context", 1, listener.getUndoContextDepth() ); + undoManager.addUndoAction( new CustomUndoAction( "Undo Action" ) ); + undoManager.leaveUndoContext(); + assertTrue( "leaving a non-empty context does not call leftUndoContext", listener.contextLeft() ); + assertFalse( "leaving a non-empty context should not call cancelledUndoContext", listener.contextCancelled() ); + assertEquals( "unexpected undo context depth leaving a non-empty context", 0, listener.getUndoContextDepth() ); + + undoManager.clear(); + listener.reset(); + + undoManager.enterUndoContext( "Undo Context" ); + undoManager.leaveUndoContext(); + assertFalse( "leaving an empty context should not call leftUndoContext", listener.contextLeft() ); + assertTrue( "leaving an empty context does not call cancelledUndoContext", listener.contextCancelled() ); + assertFalse( "leaving an empty context should silently remove it, and not contribute to the stack", + undoManager.isUndoPossible() ); + } + + // stack handling + { + undoManager.clear(); + listener.reset(); + + assertFalse( undoManager.isUndoPossible() ); // just for completeness, those two + assertFalse( undoManager.isRedoPossible() ); // have been checked above already ... + undoManager.addUndoAction( new CustomUndoAction( "Undo Action 1" ) ); + assertTrue( undoManager.isUndoPossible() ); + assertFalse( undoManager.isRedoPossible() ); + undoManager.addUndoAction( new CustomUndoAction( "Undo Action 2" ) ); + assertTrue( undoManager.isUndoPossible() ); + assertFalse( undoManager.isRedoPossible() ); + undoManager.undo(); + assertTrue( undoManager.isUndoPossible() ); + assertTrue( undoManager.isRedoPossible() ); + undoManager.undo(); + assertFalse( undoManager.isUndoPossible() ); + assertTrue( undoManager.isRedoPossible() ); + undoManager.addUndoAction( new CustomUndoAction( "Undo Action 3" ) ); + assertTrue( undoManager.isUndoPossible() ); + assertFalse( "adding a new action should have cleared the Redo stack", undoManager.isRedoPossible() ); + } + // close the document, ensure the Undo manager listener gets notified m_currentDocument.close(); assertTrue( "document is closed, but the UndoManagerListener has not been notified of the disposal", listener.isDisposed() ); diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx index a70e417826c2..a0e5045d5e42 100755 --- a/sfx2/source/doc/docundomanager.cxx +++ b/sfx2/source/doc/docundomanager.cxx @@ -208,6 +208,7 @@ namespace sfx2 virtual void clearedRedo(); virtual void listActionEntered( const String& i_comment ); virtual void listActionLeft(); + virtual void listActionCancelled(); virtual void undoManagerDying(); }; @@ -292,6 +293,15 @@ namespace sfx2 rAntiImpl.impl_notify( pUndoManager->GetUndoActionComment(), &XUndoManagerListener::leftUndoContext ); } + //------------------------------------------------------------------------------------------------------------------ + void DocumentUndoManager_Impl::listActionCancelled() + { + if ( bAPIActionRunning ) + return; + + rAntiImpl.impl_notify( pUndoManager->GetUndoActionComment(), &XUndoManagerListener::cancelledUndoContext ); + } + //------------------------------------------------------------------------------------------------------------------ void DocumentUndoManager_Impl::undoManagerDying() { @@ -420,14 +430,17 @@ namespace sfx2 static_cast< XUndoManager* >( this ) ); + USHORT nContextElements = 0; { ::comphelper::FlagGuard aNotificationGuard( m_pImpl->bAPIActionRunning ); - rUndoManager.LeaveListAction(); + nContextElements = rUndoManager.LeaveListAction(); } - impl_notify( rUndoManager.GetUndoActionComment(0), &XUndoManagerListener::leftUndoContext, aGuard ); - // TODO: is this retrieval of the title correct? Does it deliver proper results in case another - // undo context is still open? + if ( nContextElements == 0 ) + impl_notify( ::rtl::OUString(), &XUndoManagerListener::cancelledUndoContext, aGuard ); + // TODO: obtain the title of the context which has just been left + else + impl_notify( rUndoManager.GetUndoActionComment(0), &XUndoManagerListener::leftUndoContext, aGuard ); } //------------------------------------------------------------------------------------------------------------------ -- cgit v1.2.3 From 17bdbe63b4927237df7fe0270bb673b75d5d535a Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 21 Oct 2010 13:51:14 +0200 Subject: undoapi: implement a test backend for Writer. Not fully integrated into the test framework, yet, since Writer does not yet support XUndoManager/Supplier --- sfx2/qa/complex/sfx2/UndoManager.java | 32 ++++++- sfx2/qa/complex/sfx2/undo/WriterDocumentTest.java | 103 ++++++++++++++++++++++ 2 files changed, 131 insertions(+), 4 deletions(-) create mode 100755 sfx2/qa/complex/sfx2/undo/WriterDocumentTest.java (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index 7e5c231da91c..6c200ca96a95 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -43,6 +43,7 @@ import com.sun.star.util.InvalidStateException; import complex.sfx2.undo.DocumentTest; import complex.sfx2.undo.DrawDocumentTest; import complex.sfx2.undo.ImpressDocumentTest; +import complex.sfx2.undo.WriterDocumentTest; import java.util.Stack; import org.junit.After; import org.junit.AfterClass; @@ -65,22 +66,28 @@ public class UndoManager m_currentDocument = null; } + @Test + public void checkWriterUndo() throws Exception + { + impl_checkUndo( WriterDocumentTest.class, true ); + } + @Test public void checkCalcUndo() throws Exception { - impl_checkUndo( CalcDocumentTest.class ); + impl_checkUndo( CalcDocumentTest.class, false ); } @Test public void checkDrawUndo() throws Exception { - impl_checkUndo( DrawDocumentTest.class ); + impl_checkUndo( DrawDocumentTest.class, false ); } @Test public void checkImpressUndo() throws Exception { - impl_checkUndo( ImpressDocumentTest.class ); + impl_checkUndo( ImpressDocumentTest.class, false ); } @After @@ -197,7 +204,7 @@ public class UndoManager private String m_mostRecentlyRedone = null; }; - private void impl_checkUndo( final Class i_testClass ) throws Exception + private void impl_checkUndo( final Class i_testClass, final boolean i_fakeTestForNow ) throws Exception { final Constructor ctor = i_testClass.getConstructor( XMultiServiceFactory.class ); final DocumentTest test = (DocumentTest)ctor.newInstance( getORB() ); @@ -206,6 +213,23 @@ public class UndoManager test.initializeDocument(); test.verifyInitialDocumentState(); + if ( i_fakeTestForNow ) + { + // Writer does not yet have an UndoManager in the current phase of the implementation. Once it has, we + // this complete branch, which barely tests anything (except perhaps the DocumentTest implementation), + // can vanish. + test.doSingleModification(); + test.verifySingleModificationDocumentState(); + test.getDocument().getCurrentView().dispatch( ".uno:Undo" ); + test.verifyInitialDocumentState(); + final int expectedUndoSteps = test.doMultipleModifications(); + for ( int i=0; i Date: Fri, 22 Oct 2010 15:33:15 +0200 Subject: undoapi: added locking support to the XUndoManager --- sfx2/qa/complex/sfx2/UndoManager.java | 40 ++++++++++++++++++++++++++++++ sfx2/source/doc/docundomanager.cxx | 46 +++++++++++++++++++++++++++++++++++ sfx2/source/inc/docundomanager.hxx | 3 +++ 3 files changed, 89 insertions(+) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index 6c200ca96a95..2654dc58df17 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -435,6 +435,46 @@ public class UndoManager assertFalse( "adding a new action should have cleared the Redo stack", undoManager.isRedoPossible() ); } + // locking the manager + { + undoManager.clear(); + listener.reset(); + + // implicit Undo actions, triggered by changes to the document + assertFalse( "unexpected initial locking state", undoManager.isLocked() ); + undoManager.lock(); + assertTrue( "just locked the manager, why does it lie?", undoManager.isLocked() ); + test.doSingleModification(); + assertEquals( "when the Undo manager is locked, no implicit additions should happen", + 0, listener.getUndoActionsAdded() ); + undoManager.unlock(); + assertEquals( "unlock is not expected to add collected actions - they should be discarded", + 0, listener.getUndoActionsAdded() ); + assertFalse( "just unlocked the manager, why does it lie?", undoManager.isLocked() ); + + // explicit Undo actions + undoManager.lock(); + undoManager.addUndoAction( new CustomUndoAction( "Dummy Undo Action" ) ); + undoManager.unlock(); + assertEquals( "explicit Undo actions are expected to be ignored when the manager is locked", + 0, listener.getUndoActionsAdded() ); + + // Undo contexts while being locked + undoManager.lock(); + undoManager.enterUndoContext( "Dummy Context" ); + undoManager.enterHiddenUndoContext(); + assertEquals( "entering Undo contexts should be ignored when the manager is locked", 0, listener.getUndoContextDepth() ); + undoManager.leaveUndoContext(); + undoManager.leaveUndoContext(); + undoManager.unlock(); + + // |unlock| error handling + assertFalse( "internal error: manager should not be locked at this point in time", undoManager.isLocked() ); + caughtExpected = false; + try { undoManager.unlock(); } catch ( final InvalidStateException e ) { caughtExpected = true; } + assertTrue( "unlocking the manager when it is not locked should throw", caughtExpected ); + } + // close the document, ensure the Undo manager listener gets notified m_currentDocument.close(); assertTrue( "document is closed, but the UndoManagerListener has not been notified of the disposal", listener.isDisposed() ); diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx index a0e5045d5e42..7192616addea 100755 --- a/sfx2/source/doc/docundomanager.cxx +++ b/sfx2/source/doc/docundomanager.cxx @@ -402,6 +402,9 @@ namespace sfx2 SfxModelGuard aGuard( *this ); ::svl::IUndoManager& rUndoManager = m_pImpl->getUndoManager(); + if ( !rUndoManager.IsUndoEnabled() ) + // ignore this request if the manager is locked + return; { ::comphelper::FlagGuard aNotificationGuard( m_pImpl->bAPIActionRunning ); @@ -415,6 +418,12 @@ namespace sfx2 void SAL_CALL DocumentUndoManager::enterHiddenUndoContext( ) throw (InvalidStateException, RuntimeException) { SfxModelGuard aGuard( *this ); + + ::svl::IUndoManager& rUndoManager = m_pImpl->getUndoManager(); + if ( !rUndoManager.IsUndoEnabled() ) + // ignore this request if the manager is locked + return; + // TODO: place your code here } @@ -424,6 +433,10 @@ namespace sfx2 SfxModelGuard aGuard( *this ); ::svl::IUndoManager& rUndoManager = m_pImpl->getUndoManager(); + if ( !rUndoManager.IsUndoEnabled() ) + // ignore this request if the manager is locked + return; + if ( !rUndoManager.IsInListAction() ) throw InvalidStateException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no active undo context" ) ), @@ -456,6 +469,10 @@ namespace sfx2 ); ::svl::IUndoManager& rUndoManager = m_pImpl->getUndoManager(); + if ( !rUndoManager.IsUndoEnabled() ) + // ignore the request if the manager is locked + return; + { ::comphelper::FlagGuard aNotificationGuard( m_pImpl->bAPIActionRunning ); rUndoManager.AddUndoAction( new UndoActionWrapper( i_action ) ); @@ -608,6 +625,35 @@ namespace sfx2 impl_notify( &XUndoManagerListener::redoActionsCleared, aGuard ); } + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DocumentUndoManager::lock( ) throw (RuntimeException) + { + SfxModelGuard aGuard( *this ); + + ::svl::IUndoManager& rUndoManager = m_pImpl->getUndoManager(); + rUndoManager.EnableUndo( false ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DocumentUndoManager::unlock( ) throw (RuntimeException, InvalidStateException) + { + SfxModelGuard aGuard( *this ); + + ::svl::IUndoManager& rUndoManager = m_pImpl->getUndoManager(); + if ( rUndoManager.IsUndoEnabled() ) + throw InvalidStateException( ::rtl::OUString::createFromAscii( "Undo manager is not locked" ), static_cast< XUndoManager* >( this ) ); + rUndoManager.EnableUndo( true ); + } + + //------------------------------------------------------------------------------------------------------------------ + ::sal_Bool SAL_CALL DocumentUndoManager::isLocked( ) throw (RuntimeException) + { + SfxModelGuard aGuard( *this ); + + ::svl::IUndoManager& rUndoManager = m_pImpl->getUndoManager(); + return !rUndoManager.IsUndoEnabled(); + } + //------------------------------------------------------------------------------------------------------------------ void SAL_CALL DocumentUndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException) { diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx index 22ab40328859..54ccda8da792 100755 --- a/sfx2/source/inc/docundomanager.hxx +++ b/sfx2/source/inc/docundomanager.hxx @@ -86,6 +86,9 @@ namespace sfx2 virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clear( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearRedo( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL lock( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL unlock( ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::util::InvalidStateException); + virtual ::sal_Bool SAL_CALL isLocked( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException); -- cgit v1.2.3 From 2fb612b570fb29c64c7fce61f52e1cf772f11712 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 22 Oct 2010 23:22:52 +0200 Subject: undoapi: yet more Undo API tests (will this ever end?) --- sfx2/qa/complex/sfx2/UndoManager.java | 600 +++++++++++++++++++++------------- sfx2/source/doc/docundomanager.cxx | 6 + 2 files changed, 376 insertions(+), 230 deletions(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index 2654dc58df17..5d3aaf2b097a 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -30,12 +30,14 @@ package complex.sfx2; import com.sun.star.document.UndoManagerEvent; import com.sun.star.document.XUndoAction; import com.sun.star.lang.EventObject; +import com.sun.star.lang.XEventListener; import java.lang.reflect.Constructor; import org.openoffice.test.tools.OfficeDocument; import com.sun.star.document.XUndoManagerSupplier; import complex.sfx2.undo.CalcDocumentTest; import com.sun.star.document.XUndoManager; import com.sun.star.document.XUndoManagerListener; +import com.sun.star.lang.XComponent; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; @@ -129,10 +131,12 @@ public class UndoManager public void allActionsCleared( EventObject eo ) { + m_wasCleared = true; } public void redoActionsCleared( EventObject eo ) { + m_redoWasCleared = true; } public void enteredUndoContext( UndoManagerEvent i_event ) @@ -181,6 +185,8 @@ public class UndoManager boolean isDisposed() { return m_isDisposed; } boolean contextLeft() { return m_leftContext; } boolean contextCancelled() { return m_cancelledContext; } + boolean stackWasCleared() { return m_wasCleared; } + boolean redoStackWasCleared() { return m_redoWasCleared; } void reset() { @@ -188,7 +194,7 @@ public class UndoManager m_activeUndoContexts.clear(); m_mostRecentlyAddedAction = m_mostRecentlyUndone = m_mostRecentlyRedone = null; // m_isDisposed is not cleared, intentionally - m_leftContext = m_cancelledContext = false; + m_leftContext = m_cancelledContext = m_wasCleared = m_redoWasCleared = false; } private int m_undoActionsAdded = 0; @@ -197,6 +203,8 @@ public class UndoManager private boolean m_isDisposed = false; private boolean m_leftContext = false; private boolean m_cancelledContext = false; + private boolean m_wasCleared = false; + private boolean m_redoWasCleared = false; private Stack< String > m_activeUndoContexts = new Stack(); private String m_mostRecentlyAddedAction = null; @@ -235,250 +243,333 @@ public class UndoManager assertFalse( "clearing the Undo manager should result in the impossibility to undo anything", undoManager.isUndoPossible() ); assertFalse( "clearing the Undo manager should result in the impossibility to redo anything", undoManager.isRedoPossible() ); - // try retrieving the comments for the current Undo/Redo - this should fail - boolean caughtExpected = false; - try { undoManager.getCurrentUndoActionTitle(); undoManager.getCurrentRedoActionTitle(); } - catch( final InvalidStateException e ) { caughtExpected = true; } - assertTrue( "trying the title of the current Undo/Redo action is expected to fail for an empty stack", caughtExpected ); - final UndoListener listener = new UndoListener(); undoManager.addUndoManagerListener( listener ); - // do a single modification to the document - { - test.doSingleModification(); - test.verifySingleModificationDocumentState(); - - // undo the modification, ensure the listener got the proper notifications - assertEquals( "We did not yet do a undo!", 0, listener.getUndoActionCount() ); - undoManager.undo(); - assertEquals( "A simple undo does not result in the proper Undo count.", 1, listener.getUndoActionCount() ); - - // verify the document is in its initial state, again - test.verifyInitialDocumentState(); - - // redo the modification, ensure the listener got the proper notifications - assertEquals( "did not yet do a redo!", 0, listener.getRedoActionCount() ); - undoManager.redo(); - assertEquals( "did a redo, but got no notification of it!", 1, listener.getRedoActionCount() ); - - // ensure the document is in the proper state, again - test.verifySingleModificationDocumentState(); + impl_testSingleModification( test, undoManager, listener ); + impl_testMultipleModifications( test, undoManager, listener ); + impl_testCustomUndoActions( test, undoManager, listener ); + impl_testLocking( test, undoManager, listener ); + impl_testNestedContexts( undoManager, listener ); + impl_testErrorHandling( test, undoManager, listener ); + impl_testContextHandling( undoManager, listener ); + impl_testStackHandling( undoManager, listener ); + impl_testClearance( undoManager, listener ); - // now do an Undo via the UI (aka the dispatch API), and see if this works, and notifies the listener as - // expected - test.getDocument().getCurrentView().dispatch( ".uno:Undo" ); - test.verifyInitialDocumentState(); - assertEquals( "UI-Undo does not notify the listener", 2, listener.getUndoActionCount() ); - } - - // do multiple changes in a row, after entering an Undo context - { - listener.reset(); - - assertEquals( "unexpected initial undo context depth", 0, listener.getUndoContextDepth() ); - undoManager.enterUndoContext( "Batch Changes" ); - assertEquals( "unexpected undo context depth after entering a context", 1, listener.getUndoContextDepth() ); + // close the document, ensure the Undo manager listener gets notified + m_currentDocument.close(); + assertTrue( "document is closed, but the UndoManagerListener has not been notified of the disposal", listener.isDisposed() ); + m_currentDocument = null; + } - assertEquals( "entering an Undo context has not been notified properly", "Batch Changes", listener.getCurrentUndoContextTitle() ); - final int modifications = test.doMultipleModifications(); - assertEquals( "unexpected number of undo actions while doing batch changes to the document", - modifications, listener.getUndoActionsAdded() ); + private void impl_testSingleModification( final DocumentTest i_test, final XUndoManager i_undoManager, final UndoListener i_listener ) throws com.sun.star.uno.Exception + { + i_test.doSingleModification(); + i_test.verifySingleModificationDocumentState(); + + // undo the modification, ensure the listener got the proper notifications + assertEquals( "We did not yet do a undo!", 0, i_listener.getUndoActionCount() ); + i_undoManager.undo(); + assertEquals( "A simple undo does not result in the proper Undo count.", + 1, i_listener.getUndoActionCount() ); + + // verify the document is in its initial state, again + i_test.verifyInitialDocumentState(); + + // redo the modification, ensure the listener got the proper notifications + assertEquals( "did not yet do a redo!", 0, i_listener.getRedoActionCount() ); + i_undoManager.redo(); + assertEquals( "did a redo, but got no notification of it!", 1, i_listener.getRedoActionCount() ); + // ensure the document is in the proper state, again + i_test.verifySingleModificationDocumentState(); + + // now do an Undo via the UI (aka the dispatch API), and see if this works, and notifies the listener as + // expected + i_test.getDocument().getCurrentView().dispatch( ".uno:Undo" ); + i_test.verifyInitialDocumentState(); + assertEquals( "UI-Undo does not notify the listener", 2, i_listener.getUndoActionCount() ); + } - assertEquals( "seems the document operations touched the undo context depth", 1, listener.getUndoContextDepth() ); - undoManager.leaveUndoContext(); - assertEquals( "unexpected undo context depth after leaving the last context", 0, listener.getUndoContextDepth() ); + private void impl_testMultipleModifications( final DocumentTest i_test, final XUndoManager i_undoManager, final UndoListener i_listener ) throws com.sun.star.uno.Exception + { + i_listener.reset(); + assertEquals( "unexpected initial undo context depth", 0, i_listener.getUndoContextDepth() ); + i_undoManager.enterUndoContext( "Batch Changes" ); + assertEquals( "unexpected undo context depth after entering a context", + 1, i_listener.getUndoContextDepth() ); + assertEquals( "entering an Undo context has not been notified properly", + "Batch Changes", i_listener.getCurrentUndoContextTitle() ); + + final int modifications = i_test.doMultipleModifications(); + assertEquals( "unexpected number of undo actions while doing batch changes to the document", + modifications, i_listener.getUndoActionsAdded() ); + assertEquals( "seems the document operations touched the undo context depth", + 1, i_listener.getUndoContextDepth() ); + + i_undoManager.leaveUndoContext(); + assertEquals( "unexpected undo context depth after leaving the last context", + 0, i_listener.getUndoContextDepth() ); + assertEquals( "no Undo done, yet - still the listener has been notified of an Undo action", + 0, i_listener.getUndoActionCount() ); + + i_undoManager.undo(); + assertEquals( "Just did an undo - the listener should have been notified", 1, i_listener.getUndoActionCount() ); + i_test.verifyInitialDocumentState(); + } - assertEquals( "no Undo done, yet - still the listener has been notified of an Undo action", 0, listener.getUndoActionCount() ); - undoManager.undo(); - assertEquals( "Just did an undo - the listener should have been notified", 1, listener.getUndoActionCount() ); + private void impl_testCustomUndoActions( final DocumentTest i_test, final XUndoManager i_undoManager, final UndoListener i_listener ) throws com.sun.star.uno.Exception + { + i_undoManager.clear(); + i_listener.reset(); + assertFalse( "undo stack not empty after clearing the undo manager", i_undoManager.isUndoPossible() ); + assertFalse( "redo stack not empty after clearing the undo manager", i_undoManager.isRedoPossible() ); + assertArrayEquals( ">0 descriptions for an empty undo stack?", + new String[0], i_undoManager.getAllUndoActionTitles() ); + assertArrayEquals( ">0 descriptions for an empty redo stack?", + new String[0], i_undoManager.getAllRedoActionTitles() ); + + // add two actions, one directly, one within a context + final CustomUndoAction action1 = new CustomUndoAction( "UndoAction1" ); + i_undoManager.addUndoAction( action1 ); + assertEquals( "Adding an undo action not observed by the listener", 1, i_listener.getUndoActionsAdded() ); + assertEquals( "Adding an undo action did not notify the proper title", + action1.getTitle(), i_listener.getMostRecentlyAddedActionTitle() ); + final String contextTitle = "Undo Context"; + i_undoManager.enterUndoContext( contextTitle ); + final CustomUndoAction action2 = new CustomUndoAction( "UndoAction2" ); + i_undoManager.addUndoAction( action2 ); + assertEquals( "Adding an undo action not observed by the listener", + 2, i_listener.getUndoActionsAdded() ); + assertEquals( "Adding an undo action did not notify the proper title", + action2.getTitle(), i_listener.getMostRecentlyAddedActionTitle() ); + i_undoManager.leaveUndoContext(); + + // see if the manager has proper descriptions + assertArrayEquals( "unexpected Redo descriptions after adding two actions", + new String[0], i_undoManager.getAllRedoActionTitles() ); + assertArrayEquals( "unexpected Undo descriptions after adding two actions", + new String[]{contextTitle, action1.getTitle()}, i_undoManager.getAllUndoActionTitles() ); + + // undo one action + i_undoManager.undo(); + assertEquals( "improper action title notified during programmatic Undo", + contextTitle, i_listener.getMostRecentlyUndoneTitle() ); + assertTrue( "nested custom undo action has not been undone as expected", action2.undoCalled() ); + assertFalse( "nested custom undo action has not been undone as expected", action1.undoCalled() ); + assertArrayEquals( "unexpected Redo descriptions after undoing a nested custom action", + new String[]{contextTitle}, i_undoManager.getAllRedoActionTitles() ); + assertArrayEquals( "unexpected Undo descriptions after undoing a nested custom action", + new String[]{action1.getTitle()}, i_undoManager.getAllUndoActionTitles() ); + + // undo the second action, via UI dispatches + i_test.getDocument().getCurrentView().dispatch( ".uno:Undo" ); + assertEquals( "improper action title notified during UI Undo", action1.getTitle(), i_listener.getMostRecentlyUndoneTitle() ); + assertTrue( "nested custom undo action has not been undone as expected", action1.undoCalled() ); + assertArrayEquals( "unexpected Redo descriptions after undoing the second custom action", + new String[]{action1.getTitle(), contextTitle}, i_undoManager.getAllRedoActionTitles() ); + assertArrayEquals( "unexpected Undo descriptions after undoing the second custom action", + new String[0], i_undoManager.getAllUndoActionTitles() ); + + // check the actions are disposed when the stacks are cleared + i_undoManager.clear(); + assertTrue( action1.disposed() && action2.disposed() ); - test.verifyInitialDocumentState(); - } + } - // custom Undo actions - { - undoManager.clear(); - listener.reset(); - assertFalse( "undo stack not empty after clearing the undo manager", undoManager.isUndoPossible() ); - assertFalse( "redo stack not empty after clearing the undo manager", undoManager.isRedoPossible() ); - assertArrayEquals( ">0 descriptions for an empty undo stack?", new String[0], undoManager.getAllUndoActionTitles() ); - assertArrayEquals( ">0 descriptions for an empty redo stack?", new String[0], undoManager.getAllRedoActionTitles() ); - - // add two actions, one directly, one within a context - final CustomUndoAction action1 = new CustomUndoAction( "UndoAction1" ); - undoManager.addUndoAction( action1 ); - assertEquals( "Adding an undo action not observed by the listener", 1, listener.getUndoActionsAdded() ); - assertEquals( "Adding an undo action did not notify the proper title", action1.getTitle(), listener.getMostRecentlyAddedActionTitle() ); - - final String contextTitle = "Undo Context"; - undoManager.enterUndoContext( contextTitle ); - final CustomUndoAction action2 = new CustomUndoAction( "UndoAction2" ); - undoManager.addUndoAction( action2 ); - assertEquals( "Adding an undo action not observed by the listener", 2, listener.getUndoActionsAdded() ); - assertEquals( "Adding an undo action did not notify the proper title", action2.getTitle(), listener.getMostRecentlyAddedActionTitle() ); - undoManager.leaveUndoContext(); - - // see if the manager has proper descriptions - assertArrayEquals( "unexpected Redo descriptions after adding two actions", - new String[0], undoManager.getAllRedoActionTitles() ); - assertArrayEquals( "unexpected Undo descriptions after adding two actions", - new String[] { contextTitle, action1.getTitle() }, undoManager.getAllUndoActionTitles() ); - - // undo one action - undoManager.undo(); - assertEquals( "improper action title notified during programmatic Undo", contextTitle, listener.getMostRecentlyUndoneTitle() ); - assertTrue( "nested custom undo action has not been undone as expected", action2.undoCalled() ); - assertFalse( "nested custom undo action has not been undone as expected", action1.undoCalled() ); - assertArrayEquals( "unexpected Redo descriptions after undoing a nested custom action", - new String[] { contextTitle }, undoManager.getAllRedoActionTitles() ); - assertArrayEquals( "unexpected Undo descriptions after undoing a nested custom action", - new String[] { action1.getTitle() }, undoManager.getAllUndoActionTitles() ); - - // undo the second action, via UI dispatches - test.getDocument().getCurrentView().dispatch( ".uno:Undo" ); - assertEquals( "improper action title notified during UI Undo", action1.getTitle(), listener.getMostRecentlyUndoneTitle() ); - assertTrue( "nested custom undo action has not been undone as expected", action1.undoCalled() ); - assertArrayEquals( "unexpected Redo descriptions after undoing the second custom action", - new String[] { action1.getTitle(), contextTitle }, undoManager.getAllRedoActionTitles() ); - assertArrayEquals( "unexpected Undo descriptions after undoing the second custom action", - new String[0], undoManager.getAllUndoActionTitles() ); - } + private void impl_testLocking( final DocumentTest i_test, final XUndoManager i_undoManager, final UndoListener i_listener ) throws com.sun.star.uno.Exception + { + i_undoManager.clear(); + i_listener.reset(); + + // implicit Undo actions, triggered by changes to the document + assertFalse( "unexpected initial locking state", i_undoManager.isLocked() ); + i_undoManager.lock(); + assertTrue( "just locked the manager, why does it lie?", i_undoManager.isLocked() ); + i_test.doSingleModification(); + assertEquals( "when the Undo manager is locked, no implicit additions should happen", + 0, i_listener.getUndoActionsAdded() ); + i_undoManager.unlock(); + assertEquals( "unlock is not expected to add collected actions - they should be discarded", + 0, i_listener.getUndoActionsAdded() ); + assertFalse( "just unlocked the manager, why does it lie?", i_undoManager.isLocked() ); + + // explicit Undo actions + i_undoManager.lock(); + i_undoManager.addUndoAction( new CustomUndoAction() ); + i_undoManager.unlock(); + assertEquals( "explicit Undo actions are expected to be ignored when the manager is locked", + 0, i_listener.getUndoActionsAdded() ); + + // Undo contexts while being locked + i_undoManager.lock(); + i_undoManager.enterUndoContext( "Dummy Context" ); + i_undoManager.enterHiddenUndoContext(); + assertEquals( "entering Undo contexts should be ignored when the manager is locked", 0, i_listener.getUndoContextDepth() ); + i_undoManager.leaveUndoContext(); + i_undoManager.leaveUndoContext(); + i_undoManager.unlock(); + + // |unlock| error handling + assertFalse( "internal error: manager should not be locked at this point in time", i_undoManager.isLocked() ); + boolean caughtExpected = false; + try { i_undoManager.unlock(); } catch ( final InvalidStateException e ) { caughtExpected = true; } + assertTrue( "unlocking the manager when it is not locked should throw", caughtExpected ); + } - // nesting of contexts - { - undoManager.clear(); - listener.reset(); - undoManager.enterUndoContext( "context 1" ); - undoManager.enterUndoContext( "context 1.1" ); - final CustomUndoAction action1 = new CustomUndoAction( "action 1.1.1" ); - undoManager.addUndoAction( action1 ); - undoManager.enterUndoContext( "context 1.1.2" ); - final CustomUndoAction action2 = new CustomUndoAction( "action 1.1.2.1" ); - undoManager.addUndoAction( action2 ); - undoManager.leaveUndoContext(); - final CustomUndoAction action3 = new CustomUndoAction( "action 1.1.3" ); - undoManager.addUndoAction( action3 ); - undoManager.leaveUndoContext(); - undoManager.leaveUndoContext(); - final CustomUndoAction action4 = new CustomUndoAction( "action 1.2" ); - undoManager.addUndoAction( action4 ); - - undoManager.undo(); - assertEquals( "undoing a single action notifies a wrong title", action4.getTitle(), listener.getMostRecentlyUndoneTitle() ); - assertTrue( "custom Undo not called", action4.undoCalled() ); - assertFalse( "too many custom Undos called", action1.undoCalled() || action2.undoCalled() || action3.undoCalled() ); - undoManager.undo(); - assertTrue( "nested actions not properly undone", action1.undoCalled() && action2.undoCalled() && action3.undoCalled() ); - } + private void impl_testContextHandling( final XUndoManager i_undoManager, final UndoListener i_listener ) throws com.sun.star.uno.Exception + { + i_undoManager.clear(); + i_listener.reset(); + + i_undoManager.enterUndoContext( "Undo Context" ); + assertEquals( "unexpected undo context depth after entering a context", 1, i_listener.getUndoContextDepth() ); + i_undoManager.addUndoAction( new CustomUndoAction() ); + i_undoManager.leaveUndoContext(); + assertTrue( "leaving a non-empty context does not call leftUndoContext", i_listener.contextLeft() ); + assertFalse( "leaving a non-empty context should not call cancelledUndoContext", i_listener.contextCancelled() ); + assertEquals( "unexpected undo context depth leaving a non-empty context", 0, i_listener.getUndoContextDepth() ); + + i_undoManager.clear(); + i_listener.reset(); + + i_undoManager.enterUndoContext( "Undo Context" ); + i_undoManager.leaveUndoContext(); + assertFalse( "leaving an empty context should not call leftUndoContext", i_listener.contextLeft() ); + assertTrue( "leaving an empty context does not call cancelledUndoContext", i_listener.contextCancelled() ); + assertFalse( "leaving an empty context should silently remove it, and not contribute to the stack", + i_undoManager.isUndoPossible() ); + } - // some error handlings - { - undoManager.clear(); - listener.reset(); - caughtExpected = false; - try { undoManager.undo(); } catch ( final InvalidStateException e ) { caughtExpected = true; } - assertTrue( "undo should throw if no Undo action is on the stack", caughtExpected ); - caughtExpected = false; - try { undoManager.redo(); } catch ( final InvalidStateException e ) { caughtExpected = true; } - assertTrue( "redo should throw if no Redo action is on the stack", caughtExpected ); - caughtExpected = false; - try { undoManager.leaveUndoContext(); } catch ( final InvalidStateException e ) { caughtExpected = true; } - assertTrue( "leaveUndoContext should throw if no context is currently open", caughtExpected ); - } + private void impl_testNestedContexts( final XUndoManager i_undoManager, final UndoListener i_listener ) throws com.sun.star.uno.Exception + { + i_undoManager.clear(); + i_listener.reset(); + i_undoManager.enterUndoContext( "context 1" ); + i_undoManager.enterUndoContext( "context 1.1" ); + final CustomUndoAction action1 = new CustomUndoAction( "action 1.1.1" ); + i_undoManager.addUndoAction( action1 ); + i_undoManager.enterUndoContext( "context 1.1.2" ); + final CustomUndoAction action2 = new CustomUndoAction( "action 1.1.2.1" ); + i_undoManager.addUndoAction( action2 ); + i_undoManager.leaveUndoContext(); + final CustomUndoAction action3 = new CustomUndoAction( "action 1.1.3" ); + i_undoManager.addUndoAction( action3 ); + i_undoManager.leaveUndoContext(); + i_undoManager.leaveUndoContext(); + final CustomUndoAction action4 = new CustomUndoAction( "action 1.2" ); + i_undoManager.addUndoAction( action4 ); + + i_undoManager.undo(); + assertEquals( "undoing a single action notifies a wrong title", action4.getTitle(), i_listener.getMostRecentlyUndoneTitle() ); + assertTrue( "custom Undo not called", action4.undoCalled() ); + assertFalse( "too many custom Undos called", action1.undoCalled() || action2.undoCalled() || action3.undoCalled() ); + i_undoManager.undo(); + assertTrue( "nested actions not properly undone", action1.undoCalled() && action2.undoCalled() && action3.undoCalled() ); + } - // more on undo contexts - { - undoManager.clear(); - listener.reset(); - - undoManager.enterUndoContext( "Undo Context" ); - assertEquals( "unexpected undo context depth after entering a context", 1, listener.getUndoContextDepth() ); - undoManager.addUndoAction( new CustomUndoAction( "Undo Action" ) ); - undoManager.leaveUndoContext(); - assertTrue( "leaving a non-empty context does not call leftUndoContext", listener.contextLeft() ); - assertFalse( "leaving a non-empty context should not call cancelledUndoContext", listener.contextCancelled() ); - assertEquals( "unexpected undo context depth leaving a non-empty context", 0, listener.getUndoContextDepth() ); - - undoManager.clear(); - listener.reset(); - - undoManager.enterUndoContext( "Undo Context" ); - undoManager.leaveUndoContext(); - assertFalse( "leaving an empty context should not call leftUndoContext", listener.contextLeft() ); - assertTrue( "leaving an empty context does not call cancelledUndoContext", listener.contextCancelled() ); - assertFalse( "leaving an empty context should silently remove it, and not contribute to the stack", - undoManager.isUndoPossible() ); - } + private void impl_testErrorHandling( final DocumentTest i_test, final XUndoManager i_undoManager, final UndoListener i_listener ) throws com.sun.star.uno.Exception + { + i_undoManager.clear(); + i_listener.reset(); - // stack handling - { - undoManager.clear(); - listener.reset(); - - assertFalse( undoManager.isUndoPossible() ); // just for completeness, those two - assertFalse( undoManager.isRedoPossible() ); // have been checked above already ... - undoManager.addUndoAction( new CustomUndoAction( "Undo Action 1" ) ); - assertTrue( undoManager.isUndoPossible() ); - assertFalse( undoManager.isRedoPossible() ); - undoManager.addUndoAction( new CustomUndoAction( "Undo Action 2" ) ); - assertTrue( undoManager.isUndoPossible() ); - assertFalse( undoManager.isRedoPossible() ); - undoManager.undo(); - assertTrue( undoManager.isUndoPossible() ); - assertTrue( undoManager.isRedoPossible() ); - undoManager.undo(); - assertFalse( undoManager.isUndoPossible() ); - assertTrue( undoManager.isRedoPossible() ); - undoManager.addUndoAction( new CustomUndoAction( "Undo Action 3" ) ); - assertTrue( undoManager.isUndoPossible() ); - assertFalse( "adding a new action should have cleared the Redo stack", undoManager.isRedoPossible() ); - } + // try retrieving the comments for the current Undo/Redo - this should fail + boolean caughtExpected = false; + try { i_undoManager.getCurrentUndoActionTitle(); } + catch( final InvalidStateException e ) { caughtExpected = true; } + assertTrue( "trying the title of the current Undo action is expected to fail for an empty stack", caughtExpected ); - // locking the manager - { - undoManager.clear(); - listener.reset(); + caughtExpected = false; + try { i_undoManager.getCurrentRedoActionTitle(); } + catch( final InvalidStateException e ) { caughtExpected = true; } + assertTrue( "trying the title of the current Redo action is expected to fail for an empty stack", caughtExpected ); + + caughtExpected = false; + try { i_undoManager.undo(); } catch ( final InvalidStateException e ) { caughtExpected = true; } + assertTrue( "undo should throw if no Undo action is on the stack", caughtExpected ); + + caughtExpected = false; + try { i_undoManager.redo(); } catch ( final InvalidStateException e ) { caughtExpected = true; } + assertTrue( "redo should throw if no Redo action is on the stack", caughtExpected ); + + caughtExpected = false; + try { i_undoManager.leaveUndoContext(); } catch ( final InvalidStateException e ) { caughtExpected = true; } + assertTrue( "leaveUndoContext should throw if no context is currently open", caughtExpected ); + + caughtExpected = false; + try { i_undoManager.addUndoAction( null ); } catch ( com.sun.star.lang.IllegalArgumentException e ) { caughtExpected = true; } + assertTrue( "adding a NULL action should be rejected", caughtExpected ); + + // an Undo action which throws when undone should propagate this to the API caller + i_undoManager.clear(); + i_undoManager.addUndoAction( new FailingUndoAction() ); + caughtExpected = false; + try { i_undoManager.undo(); } catch ( com.sun.star.uno.RuntimeException e ) { caughtExpected = true; } + assertTrue( "RuntimeExceptions in XUndoAction.undo should be propagated at the API", caughtExpected ); + assertTrue( "an Undo action which fails should not be removed from the stack", i_undoManager.isUndoPossible() ); + + // but on the other hand, doing the Undo via UI should not throw + i_test.getDocument().getCurrentView().dispatch( ".uno:Undo" ); + } - // implicit Undo actions, triggered by changes to the document - assertFalse( "unexpected initial locking state", undoManager.isLocked() ); - undoManager.lock(); - assertTrue( "just locked the manager, why does it lie?", undoManager.isLocked() ); - test.doSingleModification(); - assertEquals( "when the Undo manager is locked, no implicit additions should happen", - 0, listener.getUndoActionsAdded() ); - undoManager.unlock(); - assertEquals( "unlock is not expected to add collected actions - they should be discarded", - 0, listener.getUndoActionsAdded() ); - assertFalse( "just unlocked the manager, why does it lie?", undoManager.isLocked() ); - - // explicit Undo actions - undoManager.lock(); - undoManager.addUndoAction( new CustomUndoAction( "Dummy Undo Action" ) ); - undoManager.unlock(); - assertEquals( "explicit Undo actions are expected to be ignored when the manager is locked", - 0, listener.getUndoActionsAdded() ); - - // Undo contexts while being locked - undoManager.lock(); - undoManager.enterUndoContext( "Dummy Context" ); - undoManager.enterHiddenUndoContext(); - assertEquals( "entering Undo contexts should be ignored when the manager is locked", 0, listener.getUndoContextDepth() ); - undoManager.leaveUndoContext(); - undoManager.leaveUndoContext(); - undoManager.unlock(); - - // |unlock| error handling - assertFalse( "internal error: manager should not be locked at this point in time", undoManager.isLocked() ); - caughtExpected = false; - try { undoManager.unlock(); } catch ( final InvalidStateException e ) { caughtExpected = true; } - assertTrue( "unlocking the manager when it is not locked should throw", caughtExpected ); - } + private void impl_testStackHandling( final XUndoManager i_undoManager, final UndoListener i_listener ) throws com.sun.star.uno.Exception + { + i_undoManager.clear(); + i_listener.reset(); + + assertFalse( i_undoManager.isUndoPossible() ); // just for completeness, those two + assertFalse( i_undoManager.isRedoPossible() ); // have been checked before already ... + i_undoManager.addUndoAction( new CustomUndoAction() ); + assertTrue( i_undoManager.isUndoPossible() ); + assertFalse( i_undoManager.isRedoPossible() ); + i_undoManager.addUndoAction( new CustomUndoAction() ); + assertTrue( i_undoManager.isUndoPossible() ); + assertFalse( i_undoManager.isRedoPossible() ); + i_undoManager.undo(); + assertTrue( i_undoManager.isUndoPossible() ); + assertTrue( i_undoManager.isRedoPossible() ); + i_undoManager.undo(); + assertFalse( i_undoManager.isUndoPossible() ); + assertTrue( i_undoManager.isRedoPossible() ); + i_undoManager.addUndoAction( new CustomUndoAction() ); + assertTrue( i_undoManager.isUndoPossible() ); + assertFalse( "adding a new action should have cleared the Redo stack", i_undoManager.isRedoPossible() ); + } - // close the document, ensure the Undo manager listener gets notified - m_currentDocument.close(); - assertTrue( "document is closed, but the UndoManagerListener has not been notified of the disposal", listener.isDisposed() ); - m_currentDocument = null; + private void impl_testClearance( final XUndoManager i_undoManager, final UndoListener i_listener ) throws com.sun.star.uno.Exception + { + i_undoManager.clear(); + i_listener.reset(); + + // add an action, clear the stack, verify the listener has been called + i_undoManager.addUndoAction( new CustomUndoAction() ); + assertFalse( "clearance listener unexpectedly called", i_listener.stackWasCleared() ); + assertFalse( "redo-clearance listener unexpectedly called", i_listener.redoStackWasCleared() ); + i_undoManager.clear(); + assertTrue( "clearance listener not called as expected", i_listener.stackWasCleared() ); + assertFalse( "redo-clearance listener unexpectedly called (2)", i_listener.redoStackWasCleared() ); + + // ensure the listener is also called if the stack is actually empty at the moment of the call + i_listener.reset(); + assertFalse( i_undoManager.isUndoPossible() ); + i_undoManager.clear(); + assertTrue( "clearance listener is also expected to be called if the stack was empty before", i_listener.stackWasCleared() ); + + // ensure the proper listeners are called for clearRedo + i_listener.reset(); + i_undoManager.clearRedo(); + assertFalse( i_listener.stackWasCleared() ); + assertTrue( i_listener.redoStackWasCleared() ); + + // ensure the redo listener is also called upon implicit redo stack clearance + i_listener.reset(); + i_undoManager.addUndoAction( new CustomUndoAction() ); + i_undoManager.addUndoAction( new CustomUndoAction() ); + i_undoManager.undo(); + assertTrue( i_undoManager.isUndoPossible() ); + assertTrue( i_undoManager.isRedoPossible() ); + i_undoManager.addUndoAction( new CustomUndoAction() ); + assertFalse( i_undoManager.isRedoPossible() ); + assertTrue( "implicit clearance of the Redo stack does not notify listeners", i_listener.redoStackWasCleared() ); } private XComponentContext getContext() @@ -512,8 +603,13 @@ public class UndoManager System.out.println( "--------------------------------------------------------------------------------" ); } - private static class CustomUndoAction implements XUndoAction + private static class CustomUndoAction implements XUndoAction, XComponent { + CustomUndoAction() + { + m_title = "Custom Undo Action"; + } + CustomUndoAction( final String i_title ) { m_title = i_title; @@ -534,12 +630,56 @@ public class UndoManager m_redoCalled = true; } + public void dispose() + { + m_disposed = true; + } + + public void addEventListener( XEventListener xl ) + { + fail( "addEventListener is not expected to be called in the course of this test" ); + } + + public void removeEventListener( XEventListener xl ) + { + fail( "removeEventListener is not expected to be called in the course of this test" ); + } + boolean undoCalled() { return m_undoCalled; } boolean redoCalled() { return m_redoCalled; } + boolean disposed() { return m_disposed; } private final String m_title; private boolean m_undoCalled = false; private boolean m_redoCalled = false; + private boolean m_disposed = false; + } + + private static class FailingUndoAction implements XUndoAction + { + FailingUndoAction() + { + } + + public String getTitle() + { + return "failing undo"; + } + + public void undo() + { + impl_throw(); + } + + public void redo() + { + impl_throw(); + } + + private void impl_throw() + { + throw new com.sun.star.uno.RuntimeException(); + } } private static final OfficeConnection m_connection = new OfficeConnection(); diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx index 7192616addea..415facc3c627 100755 --- a/sfx2/source/doc/docundomanager.cxx +++ b/sfx2/source/doc/docundomanager.cxx @@ -473,12 +473,18 @@ namespace sfx2 // ignore the request if the manager is locked return; + const bool bHadRedoActions = ( rUndoManager.GetRedoActionCount() > 0 ); { ::comphelper::FlagGuard aNotificationGuard( m_pImpl->bAPIActionRunning ); rUndoManager.AddUndoAction( new UndoActionWrapper( i_action ) ); } + const bool bHasRedoActions = ( rUndoManager.GetRedoActionCount() > 0 ); + lcl_invalidateXDo( *m_pImpl ); impl_notify( i_action->getTitle(), &XUndoManagerListener::undoActionAdded, aGuard ); + + if ( bHadRedoActions && !bHasRedoActions ) + impl_notify( &XUndoManagerListener::redoActionsCleared ); } //------------------------------------------------------------------------------------------------------------------ -- cgit v1.2.3 From 5ba69a2e7879fb104f003b870fa38d0e8739ebd1 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Mon, 25 Oct 2010 12:48:42 +0200 Subject: undoapi: implementation/tests for hidden Undo contexts --- sfx2/qa/complex/sfx2/UndoManager.java | 96 ++++++++++++++++++++++++- sfx2/qa/complex/sfx2/undo/CalcDocumentTest.java | 2 +- sfx2/source/doc/docundomanager.cxx | 82 ++++++++++++++------- 3 files changed, 153 insertions(+), 27 deletions(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index 5d3aaf2b097a..5b8ba18103ec 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -161,6 +161,14 @@ public class UndoManager m_leftContext = true; } + public void leftHiddenUndoContext( UndoManagerEvent i_event ) + { + m_activeUndoContexts.pop(); + assertEquals( "different opinions on the context nesting level (after leaving)", + m_activeUndoContexts.size(), i_event.UndoContextDepth ); + m_leftHideenContext = true; + } + public void cancelledUndoContext( UndoManagerEvent i_event ) { m_activeUndoContexts.pop(); @@ -184,6 +192,7 @@ public class UndoManager int getUndoContextDepth() { return m_activeUndoContexts.size(); } boolean isDisposed() { return m_isDisposed; } boolean contextLeft() { return m_leftContext; } + boolean hiddenContextLeft() { return m_leftHideenContext; } boolean contextCancelled() { return m_cancelledContext; } boolean stackWasCleared() { return m_wasCleared; } boolean redoStackWasCleared() { return m_redoWasCleared; } @@ -194,7 +203,7 @@ public class UndoManager m_activeUndoContexts.clear(); m_mostRecentlyAddedAction = m_mostRecentlyUndone = m_mostRecentlyRedone = null; // m_isDisposed is not cleared, intentionally - m_leftContext = m_cancelledContext = m_wasCleared = m_redoWasCleared = false; + m_leftContext = m_leftHideenContext = m_cancelledContext = m_wasCleared = m_redoWasCleared = false; } private int m_undoActionsAdded = 0; @@ -202,6 +211,7 @@ public class UndoManager private int m_redoCount = 0; private boolean m_isDisposed = false; private boolean m_leftContext = false; + private boolean m_leftHideenContext = false; private boolean m_cancelledContext = false; private boolean m_wasCleared = false; private boolean m_redoWasCleared = false; @@ -255,6 +265,7 @@ public class UndoManager impl_testContextHandling( undoManager, listener ); impl_testStackHandling( undoManager, listener ); impl_testClearance( undoManager, listener ); + impl_testHiddenContexts( test, undoManager, listener ); // close the document, ensure the Undo manager listener gets notified m_currentDocument.close(); @@ -373,7 +384,6 @@ public class UndoManager // check the actions are disposed when the stacks are cleared i_undoManager.clear(); assertTrue( action1.disposed() && action2.disposed() ); - } private void impl_testLocking( final DocumentTest i_test, final XUndoManager i_undoManager, final UndoListener i_listener ) throws com.sun.star.uno.Exception @@ -572,6 +582,88 @@ public class UndoManager assertTrue( "implicit clearance of the Redo stack does not notify listeners", i_listener.redoStackWasCleared() ); } + private void impl_testHiddenContexts( final DocumentTest i_test, final XUndoManager i_undoManager, final UndoListener i_listener ) throws com.sun.star.uno.Exception + { + i_undoManager.clear(); + i_listener.reset(); + + // entering a hidden context should be rejected if the stack is empty + assertFalse( "precondition for testing hidden undo contexts not met", i_undoManager.isUndoPossible() ); + boolean caughtExpected = false; + try { i_undoManager.enterHiddenUndoContext(); } + catch ( final com.sun.star.util.InvalidStateException e ) { caughtExpected = true; } + assertTrue( "entering hidden contexts should be denied on an empty stack", caughtExpected ); + + // but it should be allowed if the context is not empty + final CustomUndoAction undoAction0 = new CustomUndoAction( "Step 0" ); + i_undoManager.addUndoAction( undoAction0 ); + final CustomUndoAction undoAction1 = new CustomUndoAction( "Step 1" ); + i_undoManager.addUndoAction( undoAction1 ); + i_undoManager.enterHiddenUndoContext(); + final CustomUndoAction hiddenUndoAction = new CustomUndoAction( "hidden context action" ); + i_undoManager.addUndoAction( hiddenUndoAction ); + i_undoManager.leaveUndoContext(); + assertFalse( "leaving a hidden should not call |leftUndocontext|", i_listener.contextLeft() ); + assertTrue( "leaving a hidden does not call |leftHiddenUndocontext|", i_listener.hiddenContextLeft() ); + assertFalse( "leaving a non-empty hidden context claims to have cancelled it", i_listener.contextCancelled() ); + assertEquals( "leaving a hidden context is not properly notified", 0, i_listener.getUndoContextDepth() ); + assertArrayEquals( "unexpected Undo stack after leaving a hidden context", + new String[] { undoAction1.getTitle(), undoAction0.getTitle() }, + i_undoManager.getAllUndoActionTitles() ); + + // and then calling |undo| once should not only undo everything in the hidden context, but also + // the previous action - but not more + i_undoManager.undo(); + assertTrue( "Undo after leaving a hidden context does not actually undo the context actions", + hiddenUndoAction.undoCalled() ); + assertTrue( "Undo after leaving a hidden context does not undo the predecessor action", + undoAction1.undoCalled() ); + assertFalse( "Undo after leaving a hidden context undoes too much", + undoAction0.undoCalled() ); + + // leaving an empty hidden context should call the proper notification method + i_listener.reset(); + i_undoManager.enterHiddenUndoContext(); + i_undoManager.leaveUndoContext(); + assertFalse( i_listener.contextLeft() ); + assertFalse( i_listener.hiddenContextLeft() ); + assertTrue( i_listener.contextCancelled() ); + + // nesting hidden and normal contexts + i_listener.reset(); + i_undoManager.clear(); + final CustomUndoAction action0 = new CustomUndoAction( "action 0" ); + i_undoManager.addUndoAction( action0 ); + i_undoManager.enterUndoContext( "context 1" ); + final CustomUndoAction action1 = new CustomUndoAction( "action 1" ); + i_undoManager.addUndoAction( action1 ); + i_undoManager.enterHiddenUndoContext(); + final CustomUndoAction action2 = new CustomUndoAction( "action 2" ); + i_undoManager.addUndoAction( action2 ); + i_undoManager.enterUndoContext( "context 2" ); + // is entering a hidden context rejected even at the nesting level > 0 (the above test was for nesting level == 0)? + caughtExpected = false; + try { i_undoManager.enterHiddenUndoContext(); } + catch( final InvalidStateException e ) { caughtExpected = true; } + assertTrue( "at a nesting level > 0, denied hidden contexts does not work as expected", caughtExpected ); + final CustomUndoAction action3 = new CustomUndoAction( "action 3" ); + i_undoManager.addUndoAction( action3 ); + i_undoManager.enterHiddenUndoContext(); + assertEquals( "mixed hidden/normal context do are not properly notified", 4, i_listener.getUndoContextDepth() ); + i_undoManager.leaveUndoContext(); + assertTrue( "the left context was empty - why wasn't 'cancelled' notified?", i_listener.contextCancelled() ); + assertFalse( i_listener.contextLeft() ); + assertFalse( i_listener.hiddenContextLeft() ); + i_undoManager.leaveUndoContext(); + i_undoManager.leaveUndoContext(); + i_undoManager.leaveUndoContext(); + i_undoManager.undo(); + assertFalse( "one action too much has been undone", action0.undoCalled() ); + assertTrue( action1.undoCalled() ); + assertTrue( action2.undoCalled() ); + assertTrue( action3.undoCalled() ); + } + private XComponentContext getContext() { return m_connection.getComponentContext(); diff --git a/sfx2/qa/complex/sfx2/undo/CalcDocumentTest.java b/sfx2/qa/complex/sfx2/undo/CalcDocumentTest.java index 16d813bdaeb8..34825fdbada9 100755 --- a/sfx2/qa/complex/sfx2/undo/CalcDocumentTest.java +++ b/sfx2/qa/complex/sfx2/undo/CalcDocumentTest.java @@ -51,7 +51,7 @@ public class CalcDocumentTest extends DocumentTestBase public void verifyInitialDocumentState() throws com.sun.star.uno.Exception { final XCell cellA1 = getCellA1(); - assertEquals( "cell A1 didn't restore its value", INIT_VALUE, cellA1.getValue(), 0 ); + assertEquals( "cell A1 doesn't have its initial value", INIT_VALUE, cellA1.getValue(), 0 ); XCellRange range = UnoRuntime.queryInterface( XCellRange.class, ((SpreadsheetDocument)m_document).getSheet(0) ); diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx index f81d0ab9974c..03c4560dc462 100755 --- a/sfx2/source/doc/docundomanager.cxx +++ b/sfx2/source/doc/docundomanager.cxx @@ -41,6 +41,8 @@ #include #include +#include + //...................................................................................................................... namespace sfx2 { @@ -156,6 +158,7 @@ namespace sfx2 ::svl::IUndoManager* pUndoManager; DocumentUndoManager& rAntiImpl; bool bAPIActionRunning; + ::std::stack< bool > aContextVisibilities; DocumentUndoManager_Impl( DocumentUndoManager& i_antiImpl ) :aUndoListeners( i_antiImpl.getMutex() ) @@ -201,6 +204,7 @@ namespace sfx2 pUndoManager = NULL; } + // SfxUndoListener virtual void actionUndone( SfxUndoAction& i_action ); virtual void actionRedone( SfxUndoAction& i_action ); virtual void undoActionAdded( SfxUndoAction& i_action ); @@ -208,8 +212,12 @@ namespace sfx2 virtual void clearedRedo(); virtual void listActionEntered( const String& i_comment ); virtual void listActionLeft(); + virtual void listActionLeftAndMerged(); virtual void listActionCancelled(); virtual void undoManagerDying(); + + // public operations + void enterUndoContext( const ::rtl::OUString& i_title, const bool i_hidden ); }; //================================================================================================================== @@ -228,9 +236,36 @@ namespace sfx2 pViewFrame = SfxViewFrame::GetNext( *pViewFrame, pDocShell ); } } + } - //------------------------------------------------------------------------------------------------------------------ + //------------------------------------------------------------------------------------------------------------------ + void DocumentUndoManager_Impl::enterUndoContext( const ::rtl::OUString& i_title, const bool i_hidden ) + { + SfxModelGuard aGuard( rAntiImpl ); + + ::svl::IUndoManager& rUndoManager = getUndoManager(); + if ( !rUndoManager.IsUndoEnabled() ) + // ignore this request if the manager is locked + return; + + if ( i_hidden && ( rUndoManager.GetUndoActionCount() == 0 ) ) + throw InvalidStateException( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "can't enter a hidden context without a previous Undo action" ) ), + static_cast< XUndoManager* >( &rAntiImpl ) + ); + + { + ::comphelper::FlagGuard aNotificationGuard( bAPIActionRunning ); + rUndoManager.EnterListAction( i_title, ::rtl::OUString() ); + } + + aContextVisibilities.push( i_hidden ); + + rAntiImpl.impl_notify( i_title, i_hidden ? &XUndoManagerListener::enteredHiddenUndoContext : &XUndoManagerListener::enteredUndoContext, aGuard ); + } + + //------------------------------------------------------------------------------------------------------------------ void DocumentUndoManager_Impl::actionUndone( SfxUndoAction& i_action ) { if ( bAPIActionRunning ) @@ -293,6 +328,15 @@ namespace sfx2 rAntiImpl.impl_notify( pUndoManager->GetUndoActionComment(), &XUndoManagerListener::leftUndoContext ); } + //------------------------------------------------------------------------------------------------------------------ + void DocumentUndoManager_Impl::listActionLeftAndMerged() + { + if ( bAPIActionRunning ) + return; + + rAntiImpl.impl_notify( ::rtl::OUString(), &XUndoManagerListener::leftHiddenUndoContext ); + } + //------------------------------------------------------------------------------------------------------------------ void DocumentUndoManager_Impl::listActionCancelled() { @@ -391,7 +435,7 @@ namespace sfx2 EventObject aEvent; aEvent.Source = static_cast< XUndoManager* >( this ); - // TODO: the same comment as in the other impl_notify applies here ... + // TODO: the same comment as in the other impl_notify, regarding SM locking applies here ... m_pImpl->aUndoListeners.notifyEach( i_notificationMethod, aEvent ); } @@ -399,32 +443,13 @@ namespace sfx2 //------------------------------------------------------------------------------------------------------------------ void SAL_CALL DocumentUndoManager::enterUndoContext( const ::rtl::OUString& i_title ) throw (RuntimeException) { - SfxModelGuard aGuard( *this ); - - ::svl::IUndoManager& rUndoManager = m_pImpl->getUndoManager(); - if ( !rUndoManager.IsUndoEnabled() ) - // ignore this request if the manager is locked - return; - - { - ::comphelper::FlagGuard aNotificationGuard( m_pImpl->bAPIActionRunning ); - rUndoManager.EnterListAction( i_title, ::rtl::OUString() ); - } - - impl_notify( i_title, &XUndoManagerListener::enteredUndoContext, aGuard ); + m_pImpl->enterUndoContext( i_title, false ); } //------------------------------------------------------------------------------------------------------------------ void SAL_CALL DocumentUndoManager::enterHiddenUndoContext( ) throw (InvalidStateException, RuntimeException) { - SfxModelGuard aGuard( *this ); - - ::svl::IUndoManager& rUndoManager = m_pImpl->getUndoManager(); - if ( !rUndoManager.IsUndoEnabled() ) - // ignore this request if the manager is locked - return; - - // TODO: place your code here + m_pImpl->enterUndoContext( ::rtl::OUString(), true ); } //------------------------------------------------------------------------------------------------------------------ @@ -444,14 +469,23 @@ namespace sfx2 ); USHORT nContextElements = 0; + bool isHiddenContext = false; { ::comphelper::FlagGuard aNotificationGuard( m_pImpl->bAPIActionRunning ); - nContextElements = rUndoManager.LeaveListAction(); + + isHiddenContext = m_pImpl->aContextVisibilities.top(); + m_pImpl->aContextVisibilities.pop(); + if ( isHiddenContext ) + nContextElements = rUndoManager.LeaveAndMergeListAction(); + else + nContextElements = rUndoManager.LeaveListAction(); } if ( nContextElements == 0 ) impl_notify( ::rtl::OUString(), &XUndoManagerListener::cancelledUndoContext, aGuard ); // TODO: obtain the title of the context which has just been left + else if ( isHiddenContext ) + impl_notify( rUndoManager.GetUndoActionComment(0), &XUndoManagerListener::leftHiddenUndoContext, aGuard ); else impl_notify( rUndoManager.GetUndoActionComment(0), &XUndoManagerListener::leftUndoContext, aGuard ); } -- cgit v1.2.3 From 2ad6adb26642c6b21ba4debf4a88192f4d5267b7 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Mon, 25 Oct 2010 13:53:25 +0200 Subject: undoapi: renamings, API docs --- sfx2/qa/complex/sfx2/UndoManager.java | 18 +++++++++--------- sfx2/source/doc/docundomanager.cxx | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index 5b8ba18103ec..84ea26f23a6b 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -139,21 +139,21 @@ public class UndoManager m_redoWasCleared = true; } - public void enteredUndoContext( UndoManagerEvent i_event ) + public void enteredContext( UndoManagerEvent i_event ) { m_activeUndoContexts.push( i_event.UndoActionTitle ); assertEquals( "different opinions on the context nesting level (after entering)", m_activeUndoContexts.size(), i_event.UndoContextDepth ); } - public void enteredHiddenUndoContext( UndoManagerEvent i_event ) + public void enteredHiddenContext( UndoManagerEvent i_event ) { m_activeUndoContexts.push( i_event.UndoActionTitle ); assertEquals( "different opinions on the context nesting level (after entering hidden)", m_activeUndoContexts.size(), i_event.UndoContextDepth ); } - public void leftUndoContext( UndoManagerEvent i_event ) + public void leftContext( UndoManagerEvent i_event ) { assertEquals( "nested undo context descriptions do not match", m_activeUndoContexts.pop(), i_event.UndoActionTitle ); assertEquals( "different opinions on the context nesting level (after leaving)", @@ -161,15 +161,15 @@ public class UndoManager m_leftContext = true; } - public void leftHiddenUndoContext( UndoManagerEvent i_event ) + public void leftHiddenContext( UndoManagerEvent i_event ) { m_activeUndoContexts.pop(); assertEquals( "different opinions on the context nesting level (after leaving)", m_activeUndoContexts.size(), i_event.UndoContextDepth ); - m_leftHideenContext = true; + m_leftHiddenContext = true; } - public void cancelledUndoContext( UndoManagerEvent i_event ) + public void cancelledContext( UndoManagerEvent i_event ) { m_activeUndoContexts.pop(); assertEquals( "different opinions on the context nesting level (after cancelling)", @@ -192,7 +192,7 @@ public class UndoManager int getUndoContextDepth() { return m_activeUndoContexts.size(); } boolean isDisposed() { return m_isDisposed; } boolean contextLeft() { return m_leftContext; } - boolean hiddenContextLeft() { return m_leftHideenContext; } + boolean hiddenContextLeft() { return m_leftHiddenContext; } boolean contextCancelled() { return m_cancelledContext; } boolean stackWasCleared() { return m_wasCleared; } boolean redoStackWasCleared() { return m_redoWasCleared; } @@ -203,7 +203,7 @@ public class UndoManager m_activeUndoContexts.clear(); m_mostRecentlyAddedAction = m_mostRecentlyUndone = m_mostRecentlyRedone = null; // m_isDisposed is not cleared, intentionally - m_leftContext = m_leftHideenContext = m_cancelledContext = m_wasCleared = m_redoWasCleared = false; + m_leftContext = m_leftHiddenContext = m_cancelledContext = m_wasCleared = m_redoWasCleared = false; } private int m_undoActionsAdded = 0; @@ -211,7 +211,7 @@ public class UndoManager private int m_redoCount = 0; private boolean m_isDisposed = false; private boolean m_leftContext = false; - private boolean m_leftHideenContext = false; + private boolean m_leftHiddenContext = false; private boolean m_cancelledContext = false; private boolean m_wasCleared = false; private boolean m_redoWasCleared = false; diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx index 03c4560dc462..492c4e931bff 100755 --- a/sfx2/source/doc/docundomanager.cxx +++ b/sfx2/source/doc/docundomanager.cxx @@ -262,7 +262,7 @@ namespace sfx2 aContextVisibilities.push( i_hidden ); - rAntiImpl.impl_notify( i_title, i_hidden ? &XUndoManagerListener::enteredHiddenUndoContext : &XUndoManagerListener::enteredUndoContext, aGuard ); + rAntiImpl.impl_notify( i_title, i_hidden ? &XUndoManagerListener::enteredHiddenContext : &XUndoManagerListener::enteredContext, aGuard ); } //------------------------------------------------------------------------------------------------------------------ @@ -316,7 +316,7 @@ namespace sfx2 if ( bAPIActionRunning ) return; - rAntiImpl.impl_notify( i_comment, &XUndoManagerListener::enteredUndoContext ); + rAntiImpl.impl_notify( i_comment, &XUndoManagerListener::enteredContext ); } //------------------------------------------------------------------------------------------------------------------ @@ -325,7 +325,7 @@ namespace sfx2 if ( bAPIActionRunning ) return; - rAntiImpl.impl_notify( pUndoManager->GetUndoActionComment(), &XUndoManagerListener::leftUndoContext ); + rAntiImpl.impl_notify( pUndoManager->GetUndoActionComment(), &XUndoManagerListener::leftContext ); } //------------------------------------------------------------------------------------------------------------------ @@ -334,7 +334,7 @@ namespace sfx2 if ( bAPIActionRunning ) return; - rAntiImpl.impl_notify( ::rtl::OUString(), &XUndoManagerListener::leftHiddenUndoContext ); + rAntiImpl.impl_notify( ::rtl::OUString(), &XUndoManagerListener::leftHiddenContext ); } //------------------------------------------------------------------------------------------------------------------ @@ -343,7 +343,7 @@ namespace sfx2 if ( bAPIActionRunning ) return; - rAntiImpl.impl_notify( pUndoManager->GetUndoActionComment(), &XUndoManagerListener::cancelledUndoContext ); + rAntiImpl.impl_notify( pUndoManager->GetUndoActionComment(), &XUndoManagerListener::cancelledContext ); } //------------------------------------------------------------------------------------------------------------------ @@ -482,12 +482,12 @@ namespace sfx2 } if ( nContextElements == 0 ) - impl_notify( ::rtl::OUString(), &XUndoManagerListener::cancelledUndoContext, aGuard ); + impl_notify( ::rtl::OUString(), &XUndoManagerListener::cancelledContext, aGuard ); // TODO: obtain the title of the context which has just been left else if ( isHiddenContext ) - impl_notify( rUndoManager.GetUndoActionComment(0), &XUndoManagerListener::leftHiddenUndoContext, aGuard ); + impl_notify( rUndoManager.GetUndoActionComment(0), &XUndoManagerListener::leftHiddenContext, aGuard ); else - impl_notify( rUndoManager.GetUndoActionComment(0), &XUndoManagerListener::leftUndoContext, aGuard ); + impl_notify( rUndoManager.GetUndoActionComment(0), &XUndoManagerListener::leftContext, aGuard ); } //------------------------------------------------------------------------------------------------------------------ -- cgit v1.2.3 From 27026fbe5299f053cff0f2cb1a3cb155455b27e6 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Wed, 27 Oct 2010 12:23:48 +0200 Subject: undoapi: detailed the error handling --- sfx2/qa/complex/sfx2/UndoManager.java | 189 +++++++++++++++++++++++++++------- sfx2/source/doc/docundomanager.cxx | 116 +++++++++++++++++---- sfx2/source/inc/docundomanager.hxx | 19 ++-- 3 files changed, 259 insertions(+), 65 deletions(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index 84ea26f23a6b..ed7a519813dd 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -27,11 +27,16 @@ package complex.sfx2; +import com.sun.star.document.EmptyUndoStackException; +import com.sun.star.document.NotLockedException; +import com.sun.star.document.UndoContextNotClosedException; +import com.sun.star.document.UndoFailedException; import com.sun.star.document.UndoManagerEvent; import com.sun.star.document.XUndoAction; import com.sun.star.lang.EventObject; import com.sun.star.lang.XEventListener; import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; import org.openoffice.test.tools.OfficeDocument; import com.sun.star.document.XUndoManagerSupplier; import complex.sfx2.undo.CalcDocumentTest; @@ -46,6 +51,7 @@ import complex.sfx2.undo.DocumentTest; import complex.sfx2.undo.DrawDocumentTest; import complex.sfx2.undo.ImpressDocumentTest; import complex.sfx2.undo.WriterDocumentTest; +import java.lang.reflect.Method; import java.util.Stack; import org.junit.After; import org.junit.AfterClass; @@ -139,6 +145,12 @@ public class UndoManager m_redoWasCleared = true; } + public void resetAll( EventObject i_event ) + { + m_managerWasReset = true; + m_activeUndoContexts.clear(); + } + public void enteredContext( UndoManagerEvent i_event ) { m_activeUndoContexts.push( i_event.UndoActionTitle ); @@ -196,6 +208,7 @@ public class UndoManager boolean contextCancelled() { return m_cancelledContext; } boolean stackWasCleared() { return m_wasCleared; } boolean redoStackWasCleared() { return m_redoWasCleared; } + boolean managerWasReset() { return m_managerWasReset; } void reset() { @@ -203,7 +216,7 @@ public class UndoManager m_activeUndoContexts.clear(); m_mostRecentlyAddedAction = m_mostRecentlyUndone = m_mostRecentlyRedone = null; // m_isDisposed is not cleared, intentionally - m_leftContext = m_leftHiddenContext = m_cancelledContext = m_wasCleared = m_redoWasCleared = false; + m_leftContext = m_leftHiddenContext = m_cancelledContext = m_wasCleared = m_redoWasCleared = m_managerWasReset = false; } private int m_undoActionsAdded = 0; @@ -215,6 +228,7 @@ public class UndoManager private boolean m_cancelledContext = false; private boolean m_wasCleared = false; private boolean m_redoWasCleared = false; + private boolean m_managerWasReset = false; private Stack< String > m_activeUndoContexts = new Stack(); private String m_mostRecentlyAddedAction = null; @@ -265,7 +279,7 @@ public class UndoManager impl_testContextHandling( undoManager, listener ); impl_testStackHandling( undoManager, listener ); impl_testClearance( undoManager, listener ); - impl_testHiddenContexts( test, undoManager, listener ); + impl_testHiddenContexts( undoManager, listener ); // close the document, ensure the Undo manager listener gets notified m_currentDocument.close(); @@ -388,7 +402,7 @@ public class UndoManager private void impl_testLocking( final DocumentTest i_test, final XUndoManager i_undoManager, final UndoListener i_listener ) throws com.sun.star.uno.Exception { - i_undoManager.clear(); + i_undoManager.reset(); i_listener.reset(); // implicit Undo actions, triggered by changes to the document @@ -422,13 +436,13 @@ public class UndoManager // |unlock| error handling assertFalse( "internal error: manager should not be locked at this point in time", i_undoManager.isLocked() ); boolean caughtExpected = false; - try { i_undoManager.unlock(); } catch ( final InvalidStateException e ) { caughtExpected = true; } + try { i_undoManager.unlock(); } catch ( final NotLockedException e ) { caughtExpected = true; } assertTrue( "unlocking the manager when it is not locked should throw", caughtExpected ); } private void impl_testContextHandling( final XUndoManager i_undoManager, final UndoListener i_listener ) throws com.sun.star.uno.Exception { - i_undoManager.clear(); + i_undoManager.reset(); i_listener.reset(); i_undoManager.enterUndoContext( "Undo Context" ); @@ -439,7 +453,7 @@ public class UndoManager assertFalse( "leaving a non-empty context should not call cancelledUndoContext", i_listener.contextCancelled() ); assertEquals( "unexpected undo context depth leaving a non-empty context", 0, i_listener.getUndoContextDepth() ); - i_undoManager.clear(); + i_undoManager.reset(); i_listener.reset(); i_undoManager.enterUndoContext( "Undo Context" ); @@ -452,7 +466,7 @@ public class UndoManager private void impl_testNestedContexts( final XUndoManager i_undoManager, final UndoListener i_listener ) throws com.sun.star.uno.Exception { - i_undoManager.clear(); + i_undoManager.reset(); i_listener.reset(); i_undoManager.enterUndoContext( "context 1" ); i_undoManager.enterUndoContext( "context 1.1" ); @@ -479,26 +493,26 @@ public class UndoManager private void impl_testErrorHandling( final DocumentTest i_test, final XUndoManager i_undoManager, final UndoListener i_listener ) throws com.sun.star.uno.Exception { - i_undoManager.clear(); + i_undoManager.reset(); i_listener.reset(); // try retrieving the comments for the current Undo/Redo - this should fail boolean caughtExpected = false; try { i_undoManager.getCurrentUndoActionTitle(); } - catch( final InvalidStateException e ) { caughtExpected = true; } + catch( final EmptyUndoStackException e ) { caughtExpected = true; } assertTrue( "trying the title of the current Undo action is expected to fail for an empty stack", caughtExpected ); caughtExpected = false; try { i_undoManager.getCurrentRedoActionTitle(); } - catch( final InvalidStateException e ) { caughtExpected = true; } + catch( final EmptyUndoStackException e ) { caughtExpected = true; } assertTrue( "trying the title of the current Redo action is expected to fail for an empty stack", caughtExpected ); caughtExpected = false; - try { i_undoManager.undo(); } catch ( final InvalidStateException e ) { caughtExpected = true; } + try { i_undoManager.undo(); } catch ( final EmptyUndoStackException e ) { caughtExpected = true; } assertTrue( "undo should throw if no Undo action is on the stack", caughtExpected ); caughtExpected = false; - try { i_undoManager.redo(); } catch ( final InvalidStateException e ) { caughtExpected = true; } + try { i_undoManager.redo(); } catch ( final EmptyUndoStackException e ) { caughtExpected = true; } assertTrue( "redo should throw if no Redo action is on the stack", caughtExpected ); caughtExpected = false; @@ -509,21 +523,90 @@ public class UndoManager try { i_undoManager.addUndoAction( null ); } catch ( com.sun.star.lang.IllegalArgumentException e ) { caughtExpected = true; } assertTrue( "adding a NULL action should be rejected", caughtExpected ); - // an Undo action which throws when undone should propagate this to the API caller - i_undoManager.clear(); - i_undoManager.addUndoAction( new FailingUndoAction() ); - caughtExpected = false; - try { i_undoManager.undo(); } catch ( com.sun.star.uno.RuntimeException e ) { caughtExpected = true; } - assertTrue( "RuntimeExceptions in XUndoAction.undo should be propagated at the API", caughtExpected ); - assertTrue( "an Undo action which fails should not be removed from the stack", i_undoManager.isUndoPossible() ); + i_undoManager.reset(); + i_undoManager.addUndoAction( new CustomUndoAction() ); + i_undoManager.addUndoAction( new CustomUndoAction() ); + i_undoManager.undo(); + i_undoManager.enterUndoContext( "Undo Context" ); + // those methods should fail when a context is open: + final String[] methodNames = new String[] { "undo", "redo", "clear", "clearRedo" }; + for ( int i=0; i

                          • Any notifications to the registered XUndoManagerListeners are after the guard has been cleared. i.e. + without the mutex being locked.

                            +
                          • Any calls into the IUndoManager implementation is made without the mutex being locked. + Note that this implies that the IUndoManager implementation must be thread-safe in itself + (which is true for the default implementation, SfxUndoManager).
                            • +
                          • An exception to the previous item are the IUndoManager::Undo and + IUndoManager::Redo methods: They're called with the given external mutex being + locked.
                            • +
                          + + The reason for the exception for IUndoManager::Undo and IUndoManager::Redo is that those are expected to + modify the actual document which the UndoManager works for. And as long as our documents are not thread-safe, + and as long as we do not re-fit all existing SfxUndoImplementations to not expect + the dreaded SolarMutex being locked when they're called, the above behavior is a compromise between "how it should + be" and "how it can realistically be". */ class UndoManagerHelper { @@ -111,12 +118,12 @@ namespace framework void disposing(); // XUndoManager equivalents - void enterUndoContext( const ::rtl::OUString& i_title, IClearableInstanceLock& i_instanceLock ); - void enterHiddenUndoContext( IClearableInstanceLock& i_instanceLock ); - void leaveUndoContext( IClearableInstanceLock& i_instanceLock ); - void addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action, IClearableInstanceLock& i_instanceLock ); - void undo( IClearableInstanceLock& i_instanceLock ); - void redo( IClearableInstanceLock& i_instanceLock ); + void enterUndoContext( const ::rtl::OUString& i_title, IMutexGuard& i_instanceLock ); + void enterHiddenUndoContext( IMutexGuard& i_instanceLock ); + void leaveUndoContext( IMutexGuard& i_instanceLock ); + void addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action, IMutexGuard& i_instanceLock ); + void undo( IMutexGuard& i_instanceLock ); + void redo( IMutexGuard& i_instanceLock ); ::sal_Bool isUndoPossible() const; ::sal_Bool isRedoPossible() const; ::rtl::OUString getCurrentUndoActionTitle() const; @@ -125,9 +132,9 @@ namespace framework getAllUndoActionTitles() const; ::com::sun::star::uno::Sequence< ::rtl::OUString > getAllRedoActionTitles() const; - void clear( IClearableInstanceLock& i_instanceLock ); - void clearRedo( IClearableInstanceLock& i_instanceLock ); - void reset( IClearableInstanceLock& i_instanceLock ); + void clear( IMutexGuard& i_instanceLock ); + void clearRedo( IMutexGuard& i_instanceLock ); + void reset( IMutexGuard& i_instanceLock ); void addUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ); void removeUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ); @@ -137,7 +144,7 @@ namespace framework ::sal_Bool isLocked(); private: - ::boost::scoped_ptr< UndoManagerHelper_Impl > m_pImpl; + ::rtl::Reference< UndoManagerHelper_Impl > m_pImpl; }; //...................................................................................................................... diff --git a/framework/prj/d.lst b/framework/prj/d.lst index b7d996eec53f..a3c3f382da1e 100644 --- a/framework/prj/d.lst +++ b/framework/prj/d.lst @@ -46,6 +46,7 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar ..\inc\helper\documentundoguard.hxx %_DEST%\inc%_EXT%\framework\documentundoguard.hxx ..\inc\helper\undomanagerhelper.hxx %_DEST%\inc%_EXT%\framework\undomanagerhelper.hxx ..\inc\framework\imutex.hxx %_DEST%\inc%_EXT%\framework\imutex.hxx +..\inc\framework\iguard.hxx %_DEST%\inc%_EXT%\framework\iguard.hxx ..\uiconfig\startmodule\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\menubar\*.xml ..\uiconfig\startmodule\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\toolbar\*.xml diff --git a/framework/source/helper/undomanagerhelper.cxx b/framework/source/helper/undomanagerhelper.cxx index f7f297f6cdee..81b1a30c289c 100755 --- a/framework/source/helper/undomanagerhelper.cxx +++ b/framework/source/helper/undomanagerhelper.cxx @@ -33,11 +33,15 @@ /** === end UNO includes === **/ #include +#include #include +#include #include #include +#include #include +#include //...................................................................................................................... namespace framework @@ -148,55 +152,108 @@ namespace framework } //================================================================================================================== - //= UndoManagerHelper_Impl + //= UndoManagerRequest //================================================================================================================== - class UndoManagerHelper_Impl : public SfxUndoListener + class UndoManagerRequest : public ::comphelper::AnyEvent { public: - ::cppu::OInterfaceContainerHelper aUndoListeners; - IUndoManagerImplementation& rUndoManagerImplementation; - UndoManagerHelper& rAntiImpl; - bool bAPIActionRunning; - ::std::stack< bool > aContextVisibilities; -#if OSL_DEBUG_LEVEL > 0 - ::std::stack< bool > aContextAPIFlags; -#endif + UndoManagerRequest( ::boost::function0< void > const& i_request ) + :m_request( i_request ) + ,m_caughtException() + ,m_finishCondition() + { + m_finishCondition.reset(); + } - UndoManagerHelper_Impl( UndoManagerHelper& i_antiImpl, IUndoManagerImplementation& i_undoManagerImpl ) - :aUndoListeners( i_undoManagerImpl.getMutex() ) - ,rUndoManagerImplementation( i_undoManagerImpl ) - ,rAntiImpl( i_antiImpl ) - ,bAPIActionRunning( false ) + void execute() { - getUndoManager().AddUndoListener( *this ); + try + { + m_request(); + } + catch( const Exception& ) + { + m_caughtException = ::cppu::getCaughtException(); + } + m_finishCondition.set(); } - virtual ~UndoManagerHelper_Impl() + void wait() { + m_finishCondition.wait(); + if ( m_caughtException.hasValue() ) + ::cppu::throwException( m_caughtException ); } - //.............................................................................................................. - IUndoManager& getUndoManager() + protected: + ~UndoManagerRequest() { - return rUndoManagerImplementation.getImplUndoManager(); } - //.............................................................................................................. - Reference< XUndoManager > getXUndoManager() + private: + ::boost::function0< void > m_request; + Any m_caughtException; + ::osl::Condition m_finishCondition; + }; + + //------------------------------------------------------------------------------------------------------------------ + + //================================================================================================================== + //= UndoManagerHelper_Impl + //================================================================================================================== + class UndoManagerHelper_Impl :public SfxUndoListener + ,public ::comphelper::IEventProcessor + { + private: + ::osl::Mutex m_aMutex; + oslInterlockedCount m_refCount; + ::rtl::Reference< ::comphelper::AsyncEventNotifier > + m_pRequestProcessor; + bool m_disposed; + bool m_bAPIActionRunning; + ::cppu::OInterfaceContainerHelper m_aUndoListeners; + IUndoManagerImplementation& m_rUndoManagerImplementation; + UndoManagerHelper& m_rAntiImpl; + ::std::stack< bool > m_aContextVisibilities; +#if OSL_DEBUG_LEVEL > 0 + ::std::stack< bool > m_aContextAPIFlags; +#endif + + public: + ::osl::Mutex& getMutex() { return m_aMutex; } + + public: + UndoManagerHelper_Impl( UndoManagerHelper& i_antiImpl, IUndoManagerImplementation& i_undoManagerImpl ) + :m_aMutex() + ,m_refCount( 0 ) + ,m_pRequestProcessor() + ,m_disposed( false ) + ,m_bAPIActionRunning( false ) + ,m_aUndoListeners( m_aMutex ) + ,m_rUndoManagerImplementation( i_undoManagerImpl ) + ,m_rAntiImpl( i_antiImpl ) { - return rUndoManagerImplementation.getThis(); + getUndoManager().AddUndoListener( *this ); } //.............................................................................................................. - void disposing() + IUndoManager& getUndoManager() const { - EventObject aEvent; - aEvent.Source = getXUndoManager(); - aUndoListeners.disposeAndClear( aEvent ); + return m_rUndoManagerImplementation.getImplUndoManager(); + } - getUndoManager().RemoveUndoListener( *this ); + //.............................................................................................................. + Reference< XUndoManager > getXUndoManager() const + { + return m_rUndoManagerImplementation.getThis(); } + //.............................................................................................................. + // ::comphelper::IEventProcessor + virtual void SAL_CALL acquire(); + virtual void SAL_CALL release(); + virtual void processEvent( const ::comphelper::AnyEvent& _rEvent ); + // SfxUndoListener virtual void actionUndone( const String& i_actionComment ); virtual void actionRedone( const String& i_actionComment ); @@ -204,67 +261,114 @@ namespace framework virtual void cleared(); virtual void clearedRedo(); virtual void listActionEntered( const String& i_comment ); - virtual void listActionLeft(); + virtual void listActionLeft( const String& i_comment ); virtual void listActionLeftAndMerged(); virtual void listActionCancelled(); virtual void undoManagerDying(); // public operations - void enterUndoContext( const ::rtl::OUString& i_title, const bool i_hidden, IClearableInstanceLock& i_instanceLock ); - - void doUndoRedo( - USHORT ( ::svl::IUndoManager::*i_checkMethod )( bool const ) const, - BOOL ( ::svl::IUndoManager::*i_doMethod )(), - UniString ( ::svl::IUndoManager::*i_titleRetriever )( USHORT, bool const ) const, - void ( SAL_CALL ::com::sun::star::document::XUndoManagerListener::*i_notificationMethod )( const ::com::sun::star::document::UndoManagerEvent& ), - IClearableInstanceLock& i_instanceLock - ); - void notify( ::rtl::OUString const& i_title, - void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const UndoManagerEvent& ), - IClearableInstanceLock& i_instanceLock - ); - void notify( void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const EventObject& ), - IClearableInstanceLock& i_instanceLock - ); + void disposing(); + + void enterUndoContext( const ::rtl::OUString& i_title, const bool i_hidden, IMutexGuard& i_instanceLock ); + void leaveUndoContext( IMutexGuard& i_instanceLock ); + void addUndoAction( const Reference< XUndoAction >& i_action, IMutexGuard& i_instanceLock ); + void undo( IMutexGuard& i_instanceLock ); + void redo( IMutexGuard& i_instanceLock ); + void clear( IMutexGuard& i_instanceLock ); + void clearRedo( IMutexGuard& i_instanceLock ); + void reset( IMutexGuard& i_instanceLock ); + + void addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) + { + m_aUndoListeners.addInterface( i_listener ); + } + + void removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) + { + m_aUndoListeners.removeInterface( i_listener ); + } + + UndoManagerEvent + buildEvent( ::rtl::OUString const& i_title ) const; + void notify( ::rtl::OUString const& i_title, void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const UndoManagerEvent& ) ); - void notify( - void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const EventObject& ) - ); + void notify( void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const UndoManagerEvent& ) ) + { + notify( ::rtl::OUString(), i_notificationMethod ); + } + + void notify( void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const EventObject& ) ); + + private: + virtual ~UndoManagerHelper_Impl() + { + } + + /// adds a function to be called to the request processor's queue + void impl_processRequest( ::boost::function0< void > const& i_request, IMutexGuard& i_instanceLock ); + + /// impl-versions of the XUndoManager API. Those methods are executed in the dedicated thread defined by m_pRequestProcessor + void impl_enterUndoContext( const ::rtl::OUString& i_title, const bool i_hidden ); + void impl_leaveUndoContext(); + void impl_addUndoAction( const Reference< XUndoAction >& i_action ); + void impl_doUndoRedo( IMutexGuard& i_externalLock, const bool i_undo ); + void impl_clear(); + void impl_clearRedo(); + void impl_reset(); }; //------------------------------------------------------------------------------------------------------------------ - void UndoManagerHelper_Impl::notify( ::rtl::OUString const& i_title, void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const UndoManagerEvent& ), - IClearableInstanceLock& i_instanceLock ) + void UndoManagerHelper_Impl::acquire() { - UndoManagerEvent aEvent; - aEvent.Source = getXUndoManager(); - aEvent.UndoActionTitle = i_title; - aEvent.UndoContextDepth = getUndoManager().GetListActionDepth(); + osl_incrementInterlockedCount( &m_refCount ); + } - i_instanceLock.clear(); - aUndoListeners.notifyEach( i_notificationMethod, aEvent ); + //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::release() + { + if ( 0 == osl_decrementInterlockedCount( &m_refCount ) ) + delete this; } //------------------------------------------------------------------------------------------------------------------ - void UndoManagerHelper_Impl::notify( void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const EventObject& ), - IClearableInstanceLock& i_instanceLock ) + void UndoManagerHelper_Impl::disposing() { EventObject aEvent; aEvent.Source = getXUndoManager(); - i_instanceLock.clear(); - aUndoListeners.notifyEach( i_notificationMethod, aEvent ); + m_aUndoListeners.disposeAndClear( aEvent ); + + ::osl::MutexGuard aGuard( m_aMutex ); + + getUndoManager().RemoveUndoListener( *this ); + + if ( m_pRequestProcessor.is() ) + { + m_pRequestProcessor->removeEventsForProcessor( this ); + m_pRequestProcessor->terminate(); + m_pRequestProcessor->join(); + m_pRequestProcessor.clear(); + } + + m_disposed = true; } //------------------------------------------------------------------------------------------------------------------ - void UndoManagerHelper_Impl::notify( ::rtl::OUString const& i_title, - void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const UndoManagerEvent& ) ) + UndoManagerEvent UndoManagerHelper_Impl::buildEvent( ::rtl::OUString const& i_title ) const { UndoManagerEvent aEvent; aEvent.Source = getXUndoManager(); aEvent.UndoActionTitle = i_title; aEvent.UndoContextDepth = getUndoManager().GetListActionDepth(); + return aEvent; + } + + //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::notify( ::rtl::OUString const& i_title, + void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const UndoManagerEvent& ) ) + { + const UndoManagerEvent aEvent( buildEvent( i_title ) ); // TODO: this notification method here is used by UndoManagerHelper_Impl, to multiplex the notifications we // receive from the IUndoManager. Those notitications are sent with a locked SolarMutex, which means @@ -272,24 +376,131 @@ namespace framework // Fixing this properly would require outsourcing all the notifications into an own thread - which might lead // to problems of its own, since clients might expect synchronous notifications. - aUndoListeners.notifyEach( i_notificationMethod, aEvent ); + m_aUndoListeners.notifyEach( i_notificationMethod, aEvent ); } //------------------------------------------------------------------------------------------------------------------ void UndoManagerHelper_Impl::notify( void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const EventObject& ) ) { - EventObject aEvent; - aEvent.Source = getXUndoManager(); + const EventObject aEvent( getXUndoManager() ); // TODO: the same comment as in the other notify, regarding SM locking applies here ... - aUndoListeners.notifyEach( i_notificationMethod, aEvent ); + m_aUndoListeners.notifyEach( i_notificationMethod, aEvent ); + } + + //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::enterUndoContext( const ::rtl::OUString& i_title, const bool i_hidden, IMutexGuard& i_instanceLock ) + { + impl_processRequest( + ::boost::bind( + &UndoManagerHelper_Impl::impl_enterUndoContext, + this, + ::boost::cref( i_title ), + i_hidden + ), + i_instanceLock + ); } //------------------------------------------------------------------------------------------------------------------ - void UndoManagerHelper_Impl::enterUndoContext( const ::rtl::OUString& i_title, const bool i_hidden, IClearableInstanceLock& i_instanceLock ) + void UndoManagerHelper_Impl::leaveUndoContext( IMutexGuard& i_instanceLock ) + { + impl_processRequest( + ::boost::bind( + &UndoManagerHelper_Impl::impl_leaveUndoContext, + this + ), + i_instanceLock + ); + } + + //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::addUndoAction( const Reference< XUndoAction >& i_action, IMutexGuard& i_instanceLock ) + { + if ( !i_action.is() ) + throw IllegalArgumentException( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal undo action object" ) ), + getXUndoManager(), + 1 + ); + + impl_processRequest( + ::boost::bind( + &UndoManagerHelper_Impl::impl_addUndoAction, + this, + ::boost::ref( i_action ) + ), + i_instanceLock + ); + } + + //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::clear( IMutexGuard& i_instanceLock ) + { + impl_processRequest( + ::boost::bind( + &UndoManagerHelper_Impl::impl_clear, + this + ), + i_instanceLock + ); + } + + //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::clearRedo( IMutexGuard& i_instanceLock ) + { + impl_processRequest( + ::boost::bind( + &UndoManagerHelper_Impl::impl_clearRedo, + this + ), + i_instanceLock + ); + } + + //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::reset( IMutexGuard& i_instanceLock ) + { + impl_processRequest( + ::boost::bind( + &UndoManagerHelper_Impl::impl_reset, + this + ), + i_instanceLock + ); + } + + //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::impl_processRequest( ::boost::function0< void > const& i_request, IMutexGuard& i_instanceLock ) + { + // SYNCHRONIZED ---> + ::osl::ClearableMutexGuard aGuard( m_aMutex ); + if ( !m_pRequestProcessor.is() ) + { + m_pRequestProcessor.set( new ::comphelper::AsyncEventNotifier ); + m_pRequestProcessor->create(); + } + + ::rtl::Reference< UndoManagerRequest > pRequest( new UndoManagerRequest( i_request ) ); + m_pRequestProcessor->addEvent( pRequest.get(), this ); + + aGuard.clear(); + i_instanceLock.clear(); + // <--- SYNCHRONIZED + + pRequest->wait(); + } + + //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::impl_enterUndoContext( const ::rtl::OUString& i_title, const bool i_hidden ) { // SYNCHRONIZED ---> + ::osl::ClearableMutexGuard aGuard( m_aMutex ); + + OSL_PRECOND( ::osl::Thread::getCurrentIdentifier() == m_pRequestProcessor->getIdentifier(), + "UndoManagerHelper_Impl::impl_enterUndoContext: expected to be executed serialized, in a dedicated thread!" ); + IUndoManager& rUndoManager = getUndoManager(); if ( !rUndoManager.IsUndoEnabled() ) // ignore this request if the manager is locked @@ -298,78 +509,268 @@ namespace framework if ( i_hidden && ( rUndoManager.GetUndoActionCount( IUndoManager::CurrentLevel ) == 0 ) ) throw EmptyUndoStackException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "can't enter a hidden context without a previous Undo action" ) ), - rUndoManagerImplementation.getThis() + m_rUndoManagerImplementation.getThis() ); { - ::comphelper::FlagGuard aNotificationGuard( bAPIActionRunning ); + ::comphelper::FlagGuard aNotificationGuard( m_bAPIActionRunning ); rUndoManager.EnterListAction( i_title, ::rtl::OUString() ); } - aContextVisibilities.push( i_hidden ); + m_aContextVisibilities.push( i_hidden ); - notify( i_title, i_hidden ? &XUndoManagerListener::enteredHiddenContext : &XUndoManagerListener::enteredContext, i_instanceLock ); + const UndoManagerEvent aEvent( buildEvent( i_title ) ); + aGuard.clear(); // <--- SYNCHRONIZED + + m_aUndoListeners.notifyEach( i_hidden ? &XUndoManagerListener::enteredHiddenContext : &XUndoManagerListener::enteredContext, aEvent ); } //------------------------------------------------------------------------------------------------------------------ - void UndoManagerHelper_Impl::doUndoRedo( - USHORT ( IUndoManager::*i_checkMethod )( bool const ) const, BOOL ( IUndoManager::*i_doMethod )(), - String ( IUndoManager::*i_titleRetriever )( USHORT, bool const ) const, - void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const UndoManagerEvent& ), - IClearableInstanceLock& i_instanceLock ) + void UndoManagerHelper_Impl::impl_leaveUndoContext() { // SYNCHRONIZED ---> + ::osl::ClearableMutexGuard aGuard( m_aMutex ); + + OSL_PRECOND( ::osl::Thread::getCurrentIdentifier() == m_pRequestProcessor->getIdentifier(), + "UndoManagerHelper_Impl::impl_leaveUndoContext: expected to be executed serialized, in a dedicated thread!" ); + + IUndoManager& rUndoManager = getUndoManager(); + if ( !rUndoManager.IsUndoEnabled() ) + // ignore this request if the manager is locked + return; + + if ( !rUndoManager.IsInListAction() ) + throw InvalidStateException( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no active undo context" ) ), + getXUndoManager() + ); + + USHORT nContextElements = 0; + + const bool isHiddenContext = m_aContextVisibilities.top();; + m_aContextVisibilities.pop(); + + { + ::comphelper::FlagGuard aNotificationGuard( m_bAPIActionRunning ); + if ( isHiddenContext ) + nContextElements = rUndoManager.LeaveAndMergeListAction(); + else + nContextElements = rUndoManager.LeaveListAction(); + } + + // prepare notification + void ( SAL_CALL XUndoManagerListener::*notificationMethod )( const UndoManagerEvent& ) = NULL; + + UndoManagerEvent aEvent( buildEvent( ::rtl::OUString() ) ); + if ( nContextElements == 0 ) + { + notificationMethod = &XUndoManagerListener::cancelledContext; + } + else if ( isHiddenContext ) + { + notificationMethod = &XUndoManagerListener::leftHiddenContext; + } + else + { + aEvent.UndoActionTitle = rUndoManager.GetUndoActionComment( 0, IUndoManager::CurrentLevel ); + notificationMethod = &XUndoManagerListener::leftContext; + } + + aGuard.clear(); + // <--- SYNCHRONIZED + + m_aUndoListeners.notifyEach( notificationMethod, aEvent ); + } + + //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::impl_doUndoRedo( IMutexGuard& i_externalLock, const bool i_undo ) + { + ::osl::Guard< ::framework::IMutex > aExternalGuard( i_externalLock.getGuardedMutex() ); + // note that this assumes that the mutex has been released in the thread which added the + // Undo/Redo request, so we can successfully acquire it + + // SYNCHRONIZED ---> + ::osl::ClearableMutexGuard aGuard( m_aMutex ); + + OSL_PRECOND( ::osl::Thread::getCurrentIdentifier() == m_pRequestProcessor->getIdentifier(), + "UndoManagerHelper_Impl::impl_doUndoRedo: expected to be executed serialized, in a dedicated thread!" ); + IUndoManager& rUndoManager = getUndoManager(); if ( rUndoManager.IsInListAction() ) throw UndoContextNotClosedException( ::rtl::OUString(), getXUndoManager() ); - if ( (rUndoManager.*i_checkMethod)( IUndoManager::TopLevel ) == 0 ) + const USHORT nElements = i_undo + ? rUndoManager.GetUndoActionCount( IUndoManager::TopLevel ) + : rUndoManager.GetRedoActionCount( IUndoManager::TopLevel ); + if ( nElements == 0 ) throw EmptyUndoStackException( ::rtl::OUString::createFromAscii( "stack is empty" ), getXUndoManager() ); - const ::rtl::OUString sUndoActionTitle = (rUndoManager.*i_titleRetriever)( 0, IUndoManager::TopLevel ); + aGuard.clear(); + // <--- SYNCHRONIZED + + try { - ::comphelper::FlagGuard aNotificationGuard( bAPIActionRunning ); - try - { - (rUndoManager.*i_doMethod)(); - } - catch( const RuntimeException& ) { /* allowed to leave here */ throw; } - catch( const UndoFailedException& ) { /* allowed to leave here */ throw; } - catch( const Exception& ) - { - // not allowed to leave - const Any aError( ::cppu::getCaughtException() ); - throw UndoFailedException( ::rtl::OUString(), getXUndoManager(), aError ); - } + if ( i_undo ) + rUndoManager.Undo(); + else + rUndoManager.Redo(); + } + catch( const RuntimeException& ) { /* allowed to leave here */ throw; } + catch( const UndoFailedException& ) { /* allowed to leave here */ throw; } + catch( const Exception& ) + { + // not allowed to leave + const Any aError( ::cppu::getCaughtException() ); + throw UndoFailedException( ::rtl::OUString(), getXUndoManager(), aError ); } - notify( sUndoActionTitle, i_notificationMethod, i_instanceLock ); - // <--- SYNCHRONIZED + // note that in opposite to all of the other methods, we do *not* have our mutex locked when calling + // into the IUndoManager implementation. This ensures that an actual XUndoAction::undo/redo is also + // called without our mutex being locked. + // As a consequence, we do not set m_bAPIActionRunning here. Instead, our actionUndone/actionRedone methods + // *always* multiplex the event to our XUndoManagerListeners, not only when m_bAPIActionRunning is FALSE (This + // again is different from all other SfxUndoListener methods). + // So, we do not need to do this notification here ourself. } //------------------------------------------------------------------------------------------------------------------ - void UndoManagerHelper_Impl::actionUndone( const String& i_actionComment ) + void UndoManagerHelper_Impl::impl_addUndoAction( const Reference< XUndoAction >& i_action ) { - if ( bAPIActionRunning ) + // SYNCHRONIZED ---> + ::osl::ClearableMutexGuard aGuard( m_aMutex ); + + OSL_PRECOND( ::osl::Thread::getCurrentIdentifier() == m_pRequestProcessor->getIdentifier(), + "UndoManagerHelper_Impl::impl_addUndoAction: expected to be executed serialized, in a dedicated thread!" ); + + IUndoManager& rUndoManager = getUndoManager(); + if ( !rUndoManager.IsUndoEnabled() ) + // ignore the request if the manager is locked return; - notify( i_actionComment, &XUndoManagerListener::actionUndone ); + const UndoManagerEvent aEventAdd( buildEvent( i_action->getTitle() ) ); + const EventObject aEventClear( getXUndoManager() ); + + const bool bHadRedoActions = ( rUndoManager.GetRedoActionCount( IUndoManager::CurrentLevel ) > 0 ); + { + ::comphelper::FlagGuard aNotificationGuard( m_bAPIActionRunning ); + rUndoManager.AddUndoAction( new UndoActionWrapper( i_action ) ); + } + const bool bHasRedoActions = ( rUndoManager.GetRedoActionCount( IUndoManager::CurrentLevel ) > 0 ); + + aGuard.clear(); + // <--- SYNCHRONIZED + + m_aUndoListeners.notifyEach( &XUndoManagerListener::undoActionAdded, aEventAdd ); + if ( bHadRedoActions && !bHasRedoActions ) + m_aUndoListeners.notifyEach( &XUndoManagerListener::redoActionsCleared , aEventClear ); + } + + //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::impl_clear() + { + // SYNCHRONIZED ---> + ::osl::ClearableMutexGuard aGuard( m_aMutex ); + + OSL_PRECOND( ::osl::Thread::getCurrentIdentifier() == m_pRequestProcessor->getIdentifier(), + "UndoManagerHelper_Impl::impl_clear: expected to be executed serialized, in a dedicated thread!" ); + + IUndoManager& rUndoManager = getUndoManager(); + if ( rUndoManager.IsInListAction() ) + throw UndoContextNotClosedException( ::rtl::OUString(), getXUndoManager() ); + + { + ::comphelper::FlagGuard aNotificationGuard( m_bAPIActionRunning ); + rUndoManager.Clear(); + } + + const EventObject aEvent( getXUndoManager() ); + aGuard.clear(); + // <--- SYNCHRONIZED + + m_aUndoListeners.notifyEach( &XUndoManagerListener::allActionsCleared, aEvent ); + } + + //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::impl_clearRedo() + { + // SYNCHRONIZED ---> + ::osl::ClearableMutexGuard aGuard( m_aMutex ); + + OSL_PRECOND( ::osl::Thread::getCurrentIdentifier() == m_pRequestProcessor->getIdentifier(), + "UndoManagerHelper_Impl::impl_clearRedo: expected to be executed serialized, in a dedicated thread!" ); + + IUndoManager& rUndoManager = getUndoManager(); + if ( rUndoManager.IsInListAction() ) + throw UndoContextNotClosedException( ::rtl::OUString(), getXUndoManager() ); + + { + ::comphelper::FlagGuard aNotificationGuard( m_bAPIActionRunning ); + rUndoManager.ClearRedo(); + } + + const EventObject aEvent( getXUndoManager() ); + aGuard.clear(); + // <--- SYNCHRONIZED + + m_aUndoListeners.notifyEach( &XUndoManagerListener::redoActionsCleared, aEvent ); + } + + //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::impl_reset() + { + // SYNCHRONIZED ---> + ::osl::ClearableMutexGuard aGuard( m_aMutex ); + + OSL_PRECOND( ::osl::Thread::getCurrentIdentifier() == m_pRequestProcessor->getIdentifier(), + "UndoManagerHelper_Impl::impl_reset: expected to be executed serialized, in a dedicated thread!" ); + + IUndoManager& rUndoManager = getUndoManager(); + { + ::comphelper::FlagGuard aNotificationGuard( m_bAPIActionRunning ); + while ( rUndoManager.IsInListAction() ) + rUndoManager.LeaveListAction(); + rUndoManager.Clear(); + } + + const EventObject aEvent( getXUndoManager() ); + aGuard.clear(); + // <--- SYNCHRONIZED + + m_aUndoListeners.notifyEach( &XUndoManagerListener::resetAll, aEvent ); + } + + //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::processEvent( const ::comphelper::AnyEvent& i_event ) + { + UndoManagerRequest& rRequest( dynamic_cast< UndoManagerRequest& >( const_cast< ::comphelper::AnyEvent& >( i_event ) ) ); + rRequest.execute(); + } + + //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper_Impl::actionUndone( const String& i_actionComment ) + { + UndoManagerEvent aEvent; + aEvent.Source = getXUndoManager(); + aEvent.UndoActionTitle = i_actionComment; + aEvent.UndoContextDepth = 0; // Undo can happen on level 0 only + m_aUndoListeners.notifyEach( &XUndoManagerListener::actionUndone, aEvent ); } //------------------------------------------------------------------------------------------------------------------ void UndoManagerHelper_Impl::actionRedone( const String& i_actionComment ) { - if ( bAPIActionRunning ) - return; - - notify( i_actionComment, &XUndoManagerListener::actionRedone ); + UndoManagerEvent aEvent; + aEvent.Source = getXUndoManager(); + aEvent.UndoActionTitle = i_actionComment; + aEvent.UndoContextDepth = 0; // Redo can happen on level 0 only + m_aUndoListeners.notifyEach( &XUndoManagerListener::actionRedone, aEvent ); } //------------------------------------------------------------------------------------------------------------------ void UndoManagerHelper_Impl::undoActionAdded( const String& i_actionComment ) { - if ( bAPIActionRunning ) + if ( m_bAPIActionRunning ) return; notify( i_actionComment, &XUndoManagerListener::undoActionAdded ); @@ -378,7 +779,7 @@ namespace framework //------------------------------------------------------------------------------------------------------------------ void UndoManagerHelper_Impl::cleared() { - if ( bAPIActionRunning ) + if ( m_bAPIActionRunning ) return; notify( &XUndoManagerListener::allActionsCleared ); @@ -387,7 +788,7 @@ namespace framework //------------------------------------------------------------------------------------------------------------------ void UndoManagerHelper_Impl::clearedRedo() { - if ( bAPIActionRunning ) + if ( m_bAPIActionRunning ) return; notify( &XUndoManagerListener::redoActionsCleared ); @@ -397,58 +798,58 @@ namespace framework void UndoManagerHelper_Impl::listActionEntered( const String& i_comment ) { #if OSL_DEBUG_LEVEL > 0 - aContextAPIFlags.push( bAPIActionRunning ); + m_aContextAPIFlags.push( m_bAPIActionRunning ); #endif - if ( bAPIActionRunning ) + if ( m_bAPIActionRunning ) return; notify( i_comment, &XUndoManagerListener::enteredContext ); } //------------------------------------------------------------------------------------------------------------------ - void UndoManagerHelper_Impl::listActionLeft() + void UndoManagerHelper_Impl::listActionLeft( const String& i_comment ) { #if OSL_DEBUG_LEVEL > 0 - const bool bCurrentContextIsAPIContext = aContextAPIFlags.top(); - aContextAPIFlags.pop(); - OSL_ENSURE( bCurrentContextIsAPIContext == bAPIActionRunning, "UndoManagerHelper_Impl::listActionLeft: API and non-API contexts interwoven!" ); + const bool bCurrentContextIsAPIContext = m_aContextAPIFlags.top(); + m_aContextAPIFlags.pop(); + OSL_ENSURE( bCurrentContextIsAPIContext == m_bAPIActionRunning, "UndoManagerHelper_Impl::listActionLeft: API and non-API contexts interwoven!" ); #endif - if ( bAPIActionRunning ) + if ( m_bAPIActionRunning ) return; - notify( getUndoManager().GetUndoActionComment( 0, IUndoManager::CurrentLevel ), &XUndoManagerListener::leftContext ); + notify( i_comment, &XUndoManagerListener::leftContext ); } //------------------------------------------------------------------------------------------------------------------ void UndoManagerHelper_Impl::listActionLeftAndMerged() { #if OSL_DEBUG_LEVEL > 0 - const bool bCurrentContextIsAPIContext = aContextAPIFlags.top(); - aContextAPIFlags.pop(); - OSL_ENSURE( bCurrentContextIsAPIContext == bAPIActionRunning, "UndoManagerHelper_Impl::listActionLeftAndMerged: API and non-API contexts interwoven!" ); + const bool bCurrentContextIsAPIContext = m_aContextAPIFlags.top(); + m_aContextAPIFlags.pop(); + OSL_ENSURE( bCurrentContextIsAPIContext == m_bAPIActionRunning, "UndoManagerHelper_Impl::listActionLeftAndMerged: API and non-API contexts interwoven!" ); #endif - if ( bAPIActionRunning ) + if ( m_bAPIActionRunning ) return; - notify( ::rtl::OUString(), &XUndoManagerListener::leftHiddenContext ); + notify( &XUndoManagerListener::leftHiddenContext ); } //------------------------------------------------------------------------------------------------------------------ void UndoManagerHelper_Impl::listActionCancelled() { #if OSL_DEBUG_LEVEL > 0 - const bool bCurrentContextIsAPIContext = aContextAPIFlags.top(); - aContextAPIFlags.pop(); - OSL_ENSURE( bCurrentContextIsAPIContext == bAPIActionRunning, "UndoManagerHelper_Impl::listActionCancelled: API and non-API contexts interwoven!" ); + const bool bCurrentContextIsAPIContext = m_aContextAPIFlags.top(); + m_aContextAPIFlags.pop(); + OSL_ENSURE( bCurrentContextIsAPIContext == m_bAPIActionRunning, "UndoManagerHelper_Impl::listActionCancelled: API and non-API contexts interwoven!" ); #endif - if ( bAPIActionRunning ) + if ( m_bAPIActionRunning ) return; - notify( ::rtl::OUString(), &XUndoManagerListener::cancelledContext ); + notify( &XUndoManagerListener::cancelledContext ); } //------------------------------------------------------------------------------------------------------------------ @@ -478,124 +879,91 @@ namespace framework } //------------------------------------------------------------------------------------------------------------------ - void UndoManagerHelper::enterUndoContext( const ::rtl::OUString& i_title, IClearableInstanceLock& i_instanceLock ) + void UndoManagerHelper::enterUndoContext( const ::rtl::OUString& i_title, IMutexGuard& i_instanceLock ) { m_pImpl->enterUndoContext( i_title, false, i_instanceLock ); } //------------------------------------------------------------------------------------------------------------------ - void UndoManagerHelper::enterHiddenUndoContext( IClearableInstanceLock& i_instanceLock ) + void UndoManagerHelper::enterHiddenUndoContext( IMutexGuard& i_instanceLock ) { m_pImpl->enterUndoContext( ::rtl::OUString(), true, i_instanceLock ); } //------------------------------------------------------------------------------------------------------------------ - void UndoManagerHelper::leaveUndoContext( IClearableInstanceLock& i_instanceLock ) + void UndoManagerHelper::leaveUndoContext( IMutexGuard& i_instanceLock ) { - // SYNCHRONIZED ---> - IUndoManager& rUndoManager = m_pImpl->getUndoManager(); - if ( !rUndoManager.IsUndoEnabled() ) - // ignore this request if the manager is locked - return; - - if ( !rUndoManager.IsInListAction() ) - throw InvalidStateException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "no active undo context" ) ), - m_pImpl->getXUndoManager() - ); - - USHORT nContextElements = 0; - bool isHiddenContext = false; - { - ::comphelper::FlagGuard aNotificationGuard( m_pImpl->bAPIActionRunning ); - - isHiddenContext = m_pImpl->aContextVisibilities.top(); - m_pImpl->aContextVisibilities.pop(); - if ( isHiddenContext ) - nContextElements = rUndoManager.LeaveAndMergeListAction(); - else - nContextElements = rUndoManager.LeaveListAction(); - } - - if ( nContextElements == 0 ) - m_pImpl->notify( ::rtl::OUString(), &XUndoManagerListener::cancelledContext, i_instanceLock ); - else if ( isHiddenContext ) - m_pImpl->notify( ::rtl::OUString(), &XUndoManagerListener::leftHiddenContext, i_instanceLock ); - else - m_pImpl->notify( rUndoManager.GetUndoActionComment( 0, IUndoManager::CurrentLevel ), &XUndoManagerListener::leftContext, i_instanceLock ); - // <--- SYNCHRONIZED + m_pImpl->leaveUndoContext( i_instanceLock ); } //------------------------------------------------------------------------------------------------------------------ - void UndoManagerHelper::addUndoAction( const Reference< XUndoAction >& i_action, IClearableInstanceLock& i_instanceLock ) + void UndoManagerHelper_Impl::undo( IMutexGuard& i_instanceLock ) { - // SYNCHRONIZED ---> - if ( !i_action.is() ) - throw IllegalArgumentException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal undo action object" ) ), - m_pImpl->getXUndoManager(), - 1 - ); - - IUndoManager& rUndoManager = m_pImpl->getUndoManager(); - if ( !rUndoManager.IsUndoEnabled() ) - // ignore the request if the manager is locked - return; - - const bool bHadRedoActions = ( rUndoManager.GetRedoActionCount( IUndoManager::CurrentLevel ) > 0 ); - { - ::comphelper::FlagGuard aNotificationGuard( m_pImpl->bAPIActionRunning ); - rUndoManager.AddUndoAction( new UndoActionWrapper( i_action ) ); - } - const bool bHasRedoActions = ( rUndoManager.GetRedoActionCount( IUndoManager::CurrentLevel ) > 0 ); - - m_pImpl->notify( i_action->getTitle(), &XUndoManagerListener::undoActionAdded, i_instanceLock ); - // <--- SYNCHRONIZED - - if ( bHadRedoActions && !bHasRedoActions ) - m_pImpl->notify( &XUndoManagerListener::redoActionsCleared ); + impl_processRequest( + ::boost::bind( + &UndoManagerHelper_Impl::impl_doUndoRedo, + this, + ::boost::ref( i_instanceLock ), + true + ), + i_instanceLock + ); } //------------------------------------------------------------------------------------------------------------------ - void UndoManagerHelper::undo( IClearableInstanceLock& i_instanceLock ) + void UndoManagerHelper_Impl::redo( IMutexGuard& i_instanceLock ) { - m_pImpl->doUndoRedo( - &IUndoManager::GetUndoActionCount, - &IUndoManager::Undo, - &IUndoManager::GetUndoActionComment, - &XUndoManagerListener::actionUndone, + impl_processRequest( + ::boost::bind( + &UndoManagerHelper_Impl::impl_doUndoRedo, + this, + ::boost::ref( i_instanceLock ), + false + ), i_instanceLock ); } //------------------------------------------------------------------------------------------------------------------ - void UndoManagerHelper::redo( IClearableInstanceLock& i_instanceLock ) + void UndoManagerHelper::addUndoAction( const Reference< XUndoAction >& i_action, IMutexGuard& i_instanceLock ) { - m_pImpl->doUndoRedo( - &IUndoManager::GetRedoActionCount, - &IUndoManager::Redo, - &IUndoManager::GetRedoActionComment, - &XUndoManagerListener::actionRedone, - i_instanceLock - ); + m_pImpl->addUndoAction( i_action, i_instanceLock ); + } + + //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::undo( IMutexGuard& i_instanceLock ) + { + m_pImpl->undo( i_instanceLock ); + } + + //------------------------------------------------------------------------------------------------------------------ + void UndoManagerHelper::redo( IMutexGuard& i_instanceLock ) + { + m_pImpl->redo( i_instanceLock ); } //------------------------------------------------------------------------------------------------------------------ ::sal_Bool UndoManagerHelper::isUndoPossible() const { + // SYNCHRONIZED ---> + ::osl::MutexGuard aGuard( m_pImpl->getMutex() ); IUndoManager& rUndoManager = m_pImpl->getUndoManager(); if ( rUndoManager.IsInListAction() ) return sal_False; return rUndoManager.GetUndoActionCount( IUndoManager::TopLevel ) > 0; + // <--- SYNCHRONIZED } //------------------------------------------------------------------------------------------------------------------ ::sal_Bool UndoManagerHelper::isRedoPossible() const { + // SYNCHRONIZED ---> + ::osl::MutexGuard aGuard( m_pImpl->getMutex() ); const IUndoManager& rUndoManager = m_pImpl->getUndoManager(); if ( rUndoManager.IsInListAction() ) return sal_False; return rUndoManager.GetRedoActionCount( IUndoManager::TopLevel ) > 0; + // <--- SYNCHRONIZED } //------------------------------------------------------------------------------------------------------------------ @@ -604,6 +972,9 @@ namespace framework //.............................................................................................................. ::rtl::OUString lcl_getCurrentActionTitle( UndoManagerHelper_Impl& i_impl, const bool i_undo ) { + // SYNCHRONIZED ---> + ::osl::MutexGuard aGuard( i_impl.getMutex() ); + const IUndoManager& rUndoManager = i_impl.getUndoManager(); const USHORT nActionCount = i_undo ? rUndoManager.GetUndoActionCount( IUndoManager::TopLevel ) @@ -617,11 +988,15 @@ namespace framework return i_undo ? rUndoManager.GetUndoActionComment( 0, IUndoManager::TopLevel ) : rUndoManager.GetRedoActionComment( 0, IUndoManager::TopLevel ); + // <--- SYNCHRONIZED } //.............................................................................................................. Sequence< ::rtl::OUString > lcl_getAllActionTitles( UndoManagerHelper_Impl& i_impl, const bool i_undo ) { + // SYNCHRONIZED ---> + ::osl::MutexGuard aGuard( i_impl.getMutex() ); + const IUndoManager& rUndoManager = i_impl.getUndoManager(); const USHORT nCount = i_undo ? rUndoManager.GetUndoActionCount( IUndoManager::TopLevel ) @@ -635,6 +1010,7 @@ namespace framework : rUndoManager.GetRedoActionComment( i, IUndoManager::TopLevel ); } return aTitles; + // <--- SYNCHRONIZED } } @@ -663,90 +1039,70 @@ namespace framework } //------------------------------------------------------------------------------------------------------------------ - void UndoManagerHelper::clear( IClearableInstanceLock& i_instanceLock ) + void UndoManagerHelper::clear( IMutexGuard& i_instanceLock ) { - // SYNCHRONIZED ---> - IUndoManager& rUndoManager = m_pImpl->getUndoManager(); - if ( rUndoManager.IsInListAction() ) - throw UndoContextNotClosedException( ::rtl::OUString(), m_pImpl->getXUndoManager() ); - - { - ::comphelper::FlagGuard aNotificationGuard( m_pImpl->bAPIActionRunning ); - rUndoManager.Clear(); - } - - m_pImpl->notify( &XUndoManagerListener::allActionsCleared, i_instanceLock ); - // <--- SYNCHRONIZED + m_pImpl->clear( i_instanceLock ); } //------------------------------------------------------------------------------------------------------------------ - void UndoManagerHelper::clearRedo( IClearableInstanceLock& i_instanceLock ) + void UndoManagerHelper::clearRedo( IMutexGuard& i_instanceLock ) { - // SYNCHRONIZED ---> - IUndoManager& rUndoManager = m_pImpl->getUndoManager(); - if ( rUndoManager.IsInListAction() ) - throw UndoContextNotClosedException( ::rtl::OUString(), m_pImpl->getXUndoManager() ); - - { - ::comphelper::FlagGuard aNotificationGuard( m_pImpl->bAPIActionRunning ); - rUndoManager.ClearRedo(); - } - - m_pImpl->notify( &XUndoManagerListener::redoActionsCleared, i_instanceLock ); - // <--- SYNCHRONIZED + m_pImpl->clearRedo( i_instanceLock ); } //------------------------------------------------------------------------------------------------------------------ - void UndoManagerHelper::reset( IClearableInstanceLock& i_instanceLock ) + void UndoManagerHelper::reset( IMutexGuard& i_instanceLock ) { - // SYNCHRONIZED ---> - IUndoManager& rUndoManager = m_pImpl->getUndoManager(); - { - ::comphelper::FlagGuard aNotificationGuard( m_pImpl->bAPIActionRunning ); - while ( rUndoManager.IsInListAction() ) - rUndoManager.LeaveListAction(); - rUndoManager.Clear(); - } - - m_pImpl->notify( &XUndoManagerListener::resetAll, i_instanceLock ); - // <--- SYNCHRONIZED + m_pImpl->reset( i_instanceLock ); } //------------------------------------------------------------------------------------------------------------------ void UndoManagerHelper::lock() { + // SYNCHRONIZED ---> + ::osl::MutexGuard aGuard( m_pImpl->getMutex() ); + IUndoManager& rUndoManager = m_pImpl->getUndoManager(); rUndoManager.EnableUndo( false ); + // <--- SYNCHRONIZED } //------------------------------------------------------------------------------------------------------------------ void UndoManagerHelper::unlock() { + // SYNCHRONIZED ---> + ::osl::MutexGuard aGuard( m_pImpl->getMutex() ); + IUndoManager& rUndoManager = m_pImpl->getUndoManager(); if ( rUndoManager.IsUndoEnabled() ) throw NotLockedException( ::rtl::OUString::createFromAscii( "Undo manager is not locked" ), m_pImpl->getXUndoManager() ); rUndoManager.EnableUndo( true ); + // <--- SYNCHRONIZED } //------------------------------------------------------------------------------------------------------------------ ::sal_Bool UndoManagerHelper::isLocked() { + // SYNCHRONIZED ---> + ::osl::MutexGuard aGuard( m_pImpl->getMutex() ); + IUndoManager& rUndoManager = m_pImpl->getUndoManager(); return !rUndoManager.IsUndoEnabled(); + // <--- SYNCHRONIZED } //------------------------------------------------------------------------------------------------------------------ void UndoManagerHelper::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) { if ( i_listener.is() ) - m_pImpl->aUndoListeners.addInterface( i_listener ); + m_pImpl->addUndoManagerListener( i_listener ); } //------------------------------------------------------------------------------------------------------------------ void UndoManagerHelper::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) { if ( i_listener.is() ) - m_pImpl->aUndoListeners.removeInterface( i_listener ); + m_pImpl->removeUndoManagerListener( i_listener ); } //...................................................................................................................... diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk index 13c3d70d0d3c..012077dbc7ab 100644 --- a/framework/util/makefile.mk +++ b/framework/util/makefile.mk @@ -424,6 +424,7 @@ $(MISC)$/$(SHL2TARGET).flt: makefile.mk @echo m_pLoader>$@ @echo _TI2>>$@ @echo _TI3>>$@ + @echo _TI8>>$@ @echo LIBMAIN>>$@ @echo LibMain>>$@ diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx index 4367810e1675..2ba73f4034fc 100644 --- a/sfx2/inc/sfx2/sfxbasemodel.hxx +++ b/sfx2/inc/sfx2/sfxbasemodel.hxx @@ -1616,13 +1616,18 @@ public: { } + void reset() + { + m_aGuard.reset(); + } + void clear() { m_aGuard.clear(); } private: - ::vos::OClearableGuard m_aGuard; + ::osl::ResettableGuard< ::vos::IMutex > m_aGuard; }; #undef css diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index 421111e88f4e..c86ceef5a1ac 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -456,6 +456,7 @@ public class UndoManager public void leftHiddenContext( UndoManagerEvent i_event ) { assertFalse( "|leftHiddenContext| called after document was disposed", m_isDisposed ); + assertEquals( "|leftHiddenContext| is not expected to notify an action title", 0, i_event.UndoActionTitle.length() ); m_activeUndoContexts.pop(); assertEquals( "different opinions on the context nesting level (after leaving)", @@ -467,6 +468,7 @@ public class UndoManager public void cancelledContext( UndoManagerEvent i_event ) { assertFalse( "|cancelledContext| called after document was disposed", m_isDisposed ); + assertEquals( "|cancelledContext| is not expected to notify an action title", 0, i_event.UndoActionTitle.length() ); m_activeUndoContexts.pop(); assertEquals( "different opinions on the context nesting level (after cancelling)", @@ -590,6 +592,7 @@ public class UndoManager // close the document, ensure the Undo manager listener gets notified m_currentDocument.close(); + m_currentDocument = null; assertTrue( "document is closed, but the UndoManagerListener has not been notified of the disposal", m_undoListener.isDisposed() ); } diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx index 39534bf9f90c..6fbe1996d85d 100755 --- a/sfx2/source/doc/docundomanager.cxx +++ b/sfx2/source/doc/docundomanager.cxx @@ -44,6 +44,7 @@ #include #include +#include #include //...................................................................................................................... @@ -103,7 +104,6 @@ namespace sfx2 SfxObjectShell* getObjectShell() { return rAntiImpl.getBaseModel().GetObjectShell(); } // IUndoManagerImplementation - virtual ::osl::Mutex& getMutex(); virtual ::svl::IUndoManager& getImplUndoManager(); virtual Reference< XUndoManager > getThis(); @@ -130,12 +130,6 @@ namespace sfx2 } }; - //------------------------------------------------------------------------------------------------------------------ - ::osl::Mutex& DocumentUndoManager_Impl::getMutex() - { - return rAntiImpl.getMutex(); - } - //------------------------------------------------------------------------------------------------------------------ ::svl::IUndoManager& DocumentUndoManager_Impl::getImplUndoManager() { @@ -193,23 +187,65 @@ namespace sfx2 } //================================================================================================================== - //= SfxModelGuardFacade + //= SolarMutexFacade + //================================================================================================================== + /** a facade for the SolarMutex, implementing ::framework::IMutex (as opposed to ::vos::IMutex) + */ + class SolarMutexFacade : public ::framework::IMutex + { + public: + SolarMutexFacade() + { + } + + virtual void acquire() + { + Application::GetSolarMutex().acquire(); + } + + virtual void release() + { + Application::GetSolarMutex().release(); + } + }; + + //================================================================================================================== + //= UndoManagerGuard //================================================================================================================== - class SfxModelGuardFacade : public ::framework::IClearableInstanceLock + class UndoManagerGuard :public ::framework::IMutexGuard + ,public ::boost::noncopyable { public: - SfxModelGuardFacade( SfxModelGuard& i_guard ) - :m_guard( i_guard ) + UndoManagerGuard( DocumentUndoManager& i_undoManager ) + :m_guard( i_undoManager ) + ,m_solarMutexFacade() + { + } + + ~UndoManagerGuard() { } + virtual void reset() + { + m_guard.reset(); + } + virtual void clear() { m_guard.clear(); } + virtual ::framework::IMutex& getGuardedMutex() + { + // note that this means that we *know* that SfxModelGuard also locks the SolarMutex (nothing more, nothing less). + // If this ever changes, we need to adjust this code here, too. + return m_solarMutexFacade; + } + private: - SfxModelGuard& m_guard; + SfxModelGuard m_guard; + SolarMutexFacade m_solarMutexFacade; }; //================================================================================================================== @@ -248,16 +284,19 @@ namespace sfx2 //------------------------------------------------------------------------------------------------------------------ void SAL_CALL DocumentUndoManager::enterUndoContext( const ::rtl::OUString& i_title ) throw (RuntimeException) { - SfxModelGuard aGuard( *this ); - m_pImpl->aUndoHelper.enterUndoContext( i_title, SfxModelGuardFacade( aGuard ) ); + // SYNCHRONIZED ---> + UndoManagerGuard aGuard( *this ); + m_pImpl->aUndoHelper.enterUndoContext( i_title, aGuard ); + // <--- SYNCHRONIZED + m_pImpl->invalidateXDo_nolck(); } //------------------------------------------------------------------------------------------------------------------ void SAL_CALL DocumentUndoManager::enterHiddenUndoContext( ) throw (EmptyUndoStackException, RuntimeException) { // SYNCHRONIZED ---> - SfxModelGuard aGuard( *this ); - m_pImpl->aUndoHelper.enterHiddenUndoContext( SfxModelGuardFacade( aGuard ) ); + UndoManagerGuard aGuard( *this ); + m_pImpl->aUndoHelper.enterHiddenUndoContext( aGuard ); // <--- SYNCHRONIZED m_pImpl->invalidateXDo_nolck(); } @@ -266,8 +305,8 @@ namespace sfx2 void SAL_CALL DocumentUndoManager::leaveUndoContext( ) throw (InvalidStateException, RuntimeException) { // SYNCHRONIZED ---> - SfxModelGuard aGuard( *this ); - m_pImpl->aUndoHelper.leaveUndoContext( SfxModelGuardFacade( aGuard ) ); + UndoManagerGuard aGuard( *this ); + m_pImpl->aUndoHelper.leaveUndoContext( aGuard ); // <--- SYNCHRONIZED m_pImpl->invalidateXDo_nolck(); } @@ -276,8 +315,8 @@ namespace sfx2 void SAL_CALL DocumentUndoManager::addUndoAction( const Reference< XUndoAction >& i_action ) throw (RuntimeException, IllegalArgumentException) { // SYNCHRONIZED ---> - SfxModelGuard aGuard( *this ); - m_pImpl->aUndoHelper.addUndoAction( i_action, SfxModelGuardFacade( aGuard ) ); + UndoManagerGuard aGuard( *this ); + m_pImpl->aUndoHelper.addUndoAction( i_action, aGuard ); // <--- SYNCHRONIZED m_pImpl->invalidateXDo_nolck(); } @@ -286,9 +325,9 @@ namespace sfx2 void SAL_CALL DocumentUndoManager::undo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException) { // SYNCHRONIZED ---> - SfxModelGuard aGuard( *this ); + UndoManagerGuard aGuard( *this ); m_pImpl->enterViewStandardMode(); - m_pImpl->aUndoHelper.undo( SfxModelGuardFacade( aGuard ) ); + m_pImpl->aUndoHelper.undo( aGuard ); // <--- SYNCHRONIZED m_pImpl->invalidateXDo_nolck(); } @@ -297,9 +336,9 @@ namespace sfx2 void SAL_CALL DocumentUndoManager::redo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException) { // SYNCHRONIZED ---> - SfxModelGuard aGuard( *this ); + UndoManagerGuard aGuard( *this ); m_pImpl->enterViewStandardMode(); - m_pImpl->aUndoHelper.redo( SfxModelGuardFacade( aGuard ) ); + m_pImpl->aUndoHelper.redo( aGuard ); // <--- SYNCHRONIZED m_pImpl->invalidateXDo_nolck(); } @@ -307,42 +346,42 @@ namespace sfx2 //------------------------------------------------------------------------------------------------------------------ ::sal_Bool SAL_CALL DocumentUndoManager::isUndoPossible( ) throw (RuntimeException) { - SfxModelGuard aGuard( *this ); + UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.isUndoPossible(); } //------------------------------------------------------------------------------------------------------------------ ::sal_Bool SAL_CALL DocumentUndoManager::isRedoPossible( ) throw (RuntimeException) { - SfxModelGuard aGuard( *this ); + UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.isRedoPossible(); } //------------------------------------------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL DocumentUndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) { - SfxModelGuard aGuard( *this ); + UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.getCurrentUndoActionTitle(); } //------------------------------------------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL DocumentUndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) { - SfxModelGuard aGuard( *this ); + UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.getCurrentRedoActionTitle(); } //------------------------------------------------------------------------------------------------------------------ Sequence< ::rtl::OUString > SAL_CALL DocumentUndoManager::getAllUndoActionTitles( ) throw (RuntimeException) { - SfxModelGuard aGuard( *this ); + UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.getAllUndoActionTitles(); } //------------------------------------------------------------------------------------------------------------------ Sequence< ::rtl::OUString > SAL_CALL DocumentUndoManager::getAllRedoActionTitles( ) throw (RuntimeException) { - SfxModelGuard aGuard( *this ); + UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.getAllRedoActionTitles(); } @@ -350,8 +389,8 @@ namespace sfx2 void SAL_CALL DocumentUndoManager::clear( ) throw (UndoContextNotClosedException, RuntimeException) { // SYNCHRONIZED ---> - SfxModelGuard aGuard( *this ); - m_pImpl->aUndoHelper.clear( SfxModelGuardFacade( aGuard ) ); + UndoManagerGuard aGuard( *this ); + m_pImpl->aUndoHelper.clear( aGuard ); // <--- SYNCHRONIZED m_pImpl->invalidateXDo_nolck(); } @@ -360,8 +399,8 @@ namespace sfx2 void SAL_CALL DocumentUndoManager::clearRedo( ) throw (UndoContextNotClosedException, RuntimeException) { // SYNCHRONIZED ---> - SfxModelGuard aGuard( *this ); - m_pImpl->aUndoHelper.clearRedo( SfxModelGuardFacade( aGuard ) ); + UndoManagerGuard aGuard( *this ); + m_pImpl->aUndoHelper.clearRedo( aGuard ); // <--- SYNCHRONIZED m_pImpl->invalidateXDo_nolck(); } @@ -370,8 +409,8 @@ namespace sfx2 void SAL_CALL DocumentUndoManager::reset() throw (RuntimeException) { // SYNCHRONIZED ---> - SfxModelGuard aGuard( *this ); - m_pImpl->aUndoHelper.reset( SfxModelGuardFacade( aGuard ) ); + UndoManagerGuard aGuard( *this ); + m_pImpl->aUndoHelper.reset( aGuard ); // <--- SYNCHRONIZED m_pImpl->invalidateXDo_nolck(); } @@ -379,35 +418,35 @@ namespace sfx2 //------------------------------------------------------------------------------------------------------------------ void SAL_CALL DocumentUndoManager::lock( ) throw (RuntimeException) { - SfxModelGuard aGuard( *this ); + UndoManagerGuard aGuard( *this ); m_pImpl->aUndoHelper.lock(); } //------------------------------------------------------------------------------------------------------------------ void SAL_CALL DocumentUndoManager::unlock( ) throw (RuntimeException, NotLockedException) { - SfxModelGuard aGuard( *this ); + UndoManagerGuard aGuard( *this ); m_pImpl->aUndoHelper.unlock(); } //------------------------------------------------------------------------------------------------------------------ ::sal_Bool SAL_CALL DocumentUndoManager::isLocked( ) throw (RuntimeException) { - SfxModelGuard aGuard( *this ); + UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.isLocked(); } //------------------------------------------------------------------------------------------------------------------ void SAL_CALL DocumentUndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException) { - SfxModelGuard aGuard( *this ); + UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.addUndoManagerListener( i_listener ); } //------------------------------------------------------------------------------------------------------------------ void SAL_CALL DocumentUndoManager::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException) { - SfxModelGuard aGuard( *this ); + UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.removeUndoManagerListener( i_listener ); } -- cgit v1.2.3 From f3c101eda5faa15f1de34a7fc91635bf18a0ad68 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Mon, 15 Nov 2010 10:27:46 +0100 Subject: undoapi: added test for request serialization: parallel undo requests should still execute the undo operations in the proper order --- sfx2/qa/complex/sfx2/UndoManager.java | 86 +++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index c86ceef5a1ac..a99d70836ad4 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -225,6 +225,59 @@ public class UndoManager m_currentDocument = null; } + // ----------------------------------------------------------------------------------------------------------------- + @Test + public void checkSerialization() throws com.sun.star.uno.Exception, InterruptedException + { + System.out.println( "testing: request serialization" ); + + m_currentDocument = OfficeDocument.blankDocument( getORB(), DocumentType.CALC ); + final XUndoManager undoManager = getUndoManager(); + + final int threadCount = 10; + final int actionsPerThread = 10; + final int actionCount = threadCount * actionsPerThread; + + // add some actions to the UndoManager, each knowing its position on the stack + final Object lock = new Object(); + final Integer actionsUndone[] = new Integer[] { 0 }; + for ( int i=actionCount; i>0; ) + undoManager.addUndoAction( new CountingUndoAction( --i, lock, actionsUndone ) ); + + // some concurrent threads which undo the actions + Thread[] threads = new Thread[threadCount]; + for ( int i=0; i Date: Mon, 15 Nov 2010 22:12:20 +0100 Subject: undoapi: step 2.1 of the migration of css.chart2.XUndoManager to css.document.XUndoManager: implement an XUndoManager/Supplier for chart documents --- sfx2/qa/complex/sfx2/UndoManager.java | 78 ++++--- sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java | 272 +++++++++++++++++++++++ sfx2/qa/complex/sfx2/undo/DocumentTest.java | 5 + sfx2/qa/complex/sfx2/undo/DocumentTestBase.java | 5 + 4 files changed, 328 insertions(+), 32 deletions(-) create mode 100755 sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index a99d70836ad4..545e3d6fd6b6 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -51,11 +51,9 @@ import com.sun.star.document.XUndoAction; import com.sun.star.lang.EventObject; import com.sun.star.lang.IndexOutOfBoundsException; import com.sun.star.lang.XEventListener; -import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import org.openoffice.test.tools.OfficeDocument; import com.sun.star.document.XUndoManagerSupplier; -import complex.sfx2.undo.CalcDocumentTest; import com.sun.star.document.XUndoManager; import com.sun.star.document.XUndoManagerListener; import com.sun.star.drawing.XControlShape; @@ -77,6 +75,8 @@ import com.sun.star.uno.XComponentContext; import com.sun.star.util.InvalidStateException; import com.sun.star.util.NotLockedException; import com.sun.star.view.XControlAccess; +import complex.sfx2.undo.CalcDocumentTest; +import complex.sfx2.undo.ChartDocumentTest; import complex.sfx2.undo.DocumentTest; import complex.sfx2.undo.DrawDocumentTest; import complex.sfx2.undo.ImpressDocumentTest; @@ -106,6 +106,7 @@ public class UndoManager @Before public void beforeTest() throws com.sun.star.uno.Exception { + m_currentTestCase = null; m_currentDocument = null; m_undoListener = null; @@ -118,35 +119,47 @@ public class UndoManager } // ----------------------------------------------------------------------------------------------------------------- - @Test +// @Test public void checkWriterUndo() throws Exception { - impl_checkUndo( WriterDocumentTest.class, true ); + m_currentTestCase = new WriterDocumentTest( getORB() ); + impl_checkUndo( true ); } // ----------------------------------------------------------------------------------------------------------------- - @Test +// @Test public void checkCalcUndo() throws Exception { - impl_checkUndo( CalcDocumentTest.class, false ); + m_currentTestCase = new CalcDocumentTest( getORB() ); + impl_checkUndo( false ); } // ----------------------------------------------------------------------------------------------------------------- - @Test +// @Test public void checkDrawUndo() throws Exception { - impl_checkUndo( DrawDocumentTest.class, false ); + m_currentTestCase = new DrawDocumentTest( getORB() ); + impl_checkUndo( false ); } // ----------------------------------------------------------------------------------------------------------------- - @Test +// @Test public void checkImpressUndo() throws Exception { - impl_checkUndo( ImpressDocumentTest.class, false ); + m_currentTestCase = new ImpressDocumentTest( getORB() ); + impl_checkUndo( false ); } // ----------------------------------------------------------------------------------------------------------------- @Test + public void checkChartUndo() throws Exception + { + m_currentTestCase = new ChartDocumentTest( getORB() ); + impl_checkUndo( false ); + } + + // ----------------------------------------------------------------------------------------------------------------- +// @Test public void checkBrokenScripts() throws com.sun.star.uno.Exception, InterruptedException { System.out.println( "testing: broken scripts" ); @@ -226,7 +239,7 @@ public class UndoManager } // ----------------------------------------------------------------------------------------------------------------- - @Test +// @Test public void checkSerialization() throws com.sun.star.uno.Exception, InterruptedException { System.out.println( "testing: request serialization" ); @@ -282,7 +295,9 @@ public class UndoManager @After public void afterTest() { - if ( m_currentDocument != null ) + if ( m_currentTestCase != null ) + m_currentTestCase.closeDocument(); + else if ( m_currentDocument != null ) m_currentDocument.close(); m_callbackFactory.dispose(); } @@ -598,29 +613,27 @@ public class UndoManager }; // ----------------------------------------------------------------------------------------------------------------- - private void impl_checkUndo( final Class i_testClass, final boolean i_fakeTestForNow ) throws Exception + private void impl_checkUndo( final boolean i_fakeTestForNow ) throws Exception { - final Constructor ctor = i_testClass.getConstructor( XMultiServiceFactory.class ); - final DocumentTest test = (DocumentTest)ctor.newInstance( getORB() ); - System.out.println( "testing: " + test.getDocumentDescription() ); - m_currentDocument = test.getDocument(); - test.initializeDocument(); - test.verifyInitialDocumentState(); + System.out.println( "testing: " + m_currentTestCase.getDocumentDescription() ); + m_currentDocument = m_currentTestCase.getDocument(); + m_currentTestCase.initializeDocument(); + m_currentTestCase.verifyInitialDocumentState(); if ( i_fakeTestForNow ) { // Writer does not yet have an UndoManager in the current phase of the implementation. Once it has, we // this complete branch, which barely tests anything (except perhaps the DocumentTest implementation), // can vanish. - test.doSingleModification(); - test.verifySingleModificationDocumentState(); - test.getDocument().getCurrentView().dispatch( ".uno:Undo" ); - test.verifyInitialDocumentState(); - final int expectedUndoSteps = test.doMultipleModifications(); + m_currentTestCase.doSingleModification(); + m_currentTestCase.verifySingleModificationDocumentState(); + m_currentTestCase.getDocument().getCurrentView().dispatch( ".uno:Undo" ); + m_currentTestCase.verifyInitialDocumentState(); + final int expectedUndoSteps = m_currentTestCase.doMultipleModifications(); for ( int i=0; i + * for a copy of the LGPLv3 License. + * + *************************************************************************/ + +package complex.sfx2.undo; + +import com.sun.star.awt.Size; +import com.sun.star.beans.NamedValue; +import com.sun.star.beans.XPropertySet; +import com.sun.star.chart2.XChartDocument; +import com.sun.star.chart2.XDiagram; +import com.sun.star.container.XIndexAccess; +import com.sun.star.document.UndoFailedException; +import com.sun.star.document.XUndoAction; +import com.sun.star.document.XUndoManager; +import com.sun.star.document.XUndoManagerSupplier; +import com.sun.star.drawing.XShape; +import com.sun.star.embed.EmbedStates; +import com.sun.star.embed.EmbedVerbs; +import com.sun.star.embed.VerbDescriptor; +import com.sun.star.embed.WrongStateException; +import com.sun.star.embed.XEmbeddedObject; +import com.sun.star.embed.XStateChangeBroadcaster; +import com.sun.star.embed.XStateChangeListener; +import com.sun.star.lang.EventObject; +import com.sun.star.lang.IndexOutOfBoundsException; +import com.sun.star.lang.WrappedTargetException; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.text.XTextContent; +import com.sun.star.text.XTextRange; +import com.sun.star.uno.UnoRuntime; +import com.sun.star.view.XSelectionSupplier; +import org.openoffice.test.tools.DocumentType; +import org.openoffice.test.tools.OfficeDocument; +import static org.junit.Assert.*; + +/** + * @author frank.schoenheit@oracle.com + */ +public class ChartDocumentTest implements DocumentTest +{ + public ChartDocumentTest( final XMultiServiceFactory i_orb ) throws com.sun.star.uno.Exception, InterruptedException + { + m_textDocument = OfficeDocument.blankDocument( i_orb, DocumentType.WRITER ); + + // create a OLE shape in the document + final XMultiServiceFactory factory = UnoRuntime.queryInterface( XMultiServiceFactory.class, m_textDocument.getDocument() ); + final String shapeServiceName = "com.sun.star.text.TextEmbeddedObject"; + final XPropertySet shapeProps = UnoRuntime.queryInterface( XPropertySet.class, factory.createInstance( shapeServiceName ) ); + shapeProps.setPropertyValue("CLSID", "12dcae26-281f-416f-a234-c3086127382e"); + + final XShape shape = UnoRuntime.queryInterface( XShape.class, shapeProps ); + shape.setSize( new Size( 16000, 9000 ) ); + + final XTextContent chartTextContent = UnoRuntime.queryInterface( XTextContent.class, shapeProps ); + + final XSelectionSupplier selSupplier = UnoRuntime.queryInterface( XSelectionSupplier.class, + m_textDocument.getCurrentView().getController() ); + final Object selection = selSupplier.getSelection(); + final XTextRange textRange = getAssociatedTextRange( selection ); + if ( textRange == null ) + throw new RuntimeException( "can't locate a text range" ); + + // insert the chart + textRange.getText().insertTextContent(textRange, chartTextContent, false); + + // retrieve the chart model + XChartDocument chartDoc = UnoRuntime.queryInterface( XChartDocument.class, shapeProps.getPropertyValue( "Model" ) ); + m_chartDocument = new OfficeDocument( i_orb, chartDoc ); + + final XEmbeddedObject embeddedChart = UnoRuntime.queryInterface( XEmbeddedObject.class, + shapeProps.getPropertyValue( "EmbeddedObject" ) ); + final XStateChangeBroadcaster stateBroadcaster = UnoRuntime.queryInterface( XStateChangeBroadcaster.class, embeddedChart ); + stateBroadcaster.addStateChangeListener( new ChartStateListener() ); + + // activate the chart + selSupplier.select( shape ); + + // some Writer-internal processes, which are a pre-condition for being able to successfully dispatch + // the ObjectMenu command, run asynchronously, without a chance of being notified when they're finished :( + // So, wait a little, again ... + synchronized ( embeddedChart ) { embeddedChart.wait( 500 ); } + // ... and check if those processes are finished + final VerbDescriptor[] verbs = embeddedChart.getSupportedVerbs(); + boolean canActivate = true; + for ( int i=0; i 0) { + final int count = indexer.getCount(); + for (int i = 0; i < count; ++i) { + final XTextRange range = getAssociatedTextRange( indexer.getByIndex(i) ); + if (range != null) { + return range; + } + } + } + // 2. another TextContent, having an anchor we can use + final XTextContent textContent = UnoRuntime.queryInterface(XTextContent.class, i_object); + if (textContent != null) { + final XTextRange range = textContent.getAnchor(); + if (range != null) { + return range; + } + } + + // an object which supports XTextRange directly + final XTextRange range = UnoRuntime.queryInterface(XTextRange.class, i_object); + if (range != null) { + return range; + } + + return null; + } + + private static class PropertyUndoAction implements XUndoAction + { + PropertyUndoAction( final XPropertySet i_component, final String i_propertyName, final Object i_newValue ) throws com.sun.star.uno.Exception + { + m_component = i_component; + m_propertyName = i_propertyName; + m_newValue = i_newValue; + + m_oldValue = i_component.getPropertyValue( m_propertyName ); + i_component.setPropertyValue( m_propertyName, m_newValue ); + } + + public String getTitle() + { + return "some dummy Undo Action"; + } + + public void undo() throws UndoFailedException + { + try + { + m_component.setPropertyValue( m_propertyName, m_oldValue ); + } + catch ( com.sun.star.uno.Exception ex ) + { + throw new UndoFailedException( "", this, ex ); + } + } + + public void redo() throws UndoFailedException + { + try + { + m_component.setPropertyValue( m_propertyName, m_newValue ); + } + catch ( com.sun.star.uno.Exception ex ) + { + throw new UndoFailedException( "", this, ex ); + } + } + + private final XPropertySet m_component; + private final String m_propertyName; + private final Object m_oldValue; + private final Object m_newValue; + } + + private class ChartStateListener implements XStateChangeListener + { + public void changingState( EventObject i_event, int i_oldState, int i_newState ) throws WrongStateException + { + } + + public void stateChanged( EventObject i_event, int i_oldState, int i_newState ) + { + if ( i_newState != EmbedStates.UI_ACTIVE ) + return; + synchronized ( m_chartActivatedCondition ) + { + m_chartActivatedCondition.notifyAll(); + } + } + + public void disposing( EventObject i_event ) { } + }; + + private final OfficeDocument m_textDocument; + private final OfficeDocument m_chartDocument; + private final Object m_chartActivatedCondition = new Object(); +} diff --git a/sfx2/qa/complex/sfx2/undo/DocumentTest.java b/sfx2/qa/complex/sfx2/undo/DocumentTest.java index 431e64ab0197..d6de90884673 100755 --- a/sfx2/qa/complex/sfx2/undo/DocumentTest.java +++ b/sfx2/qa/complex/sfx2/undo/DocumentTest.java @@ -20,6 +20,11 @@ public interface DocumentTest */ public void initializeDocument() throws com.sun.star.uno.Exception; + /** + * closes the document which the test is based on + */ + public void closeDocument(); + /** * does a simple modification to the document, which results in one Undo action being auto-generated * by the OOo implementation diff --git a/sfx2/qa/complex/sfx2/undo/DocumentTestBase.java b/sfx2/qa/complex/sfx2/undo/DocumentTestBase.java index 147ef587b3bc..11adc80c2e85 100755 --- a/sfx2/qa/complex/sfx2/undo/DocumentTestBase.java +++ b/sfx2/qa/complex/sfx2/undo/DocumentTestBase.java @@ -20,5 +20,10 @@ abstract class DocumentTestBase implements DocumentTest return m_document; } + public void closeDocument() + { + m_document.close(); + } + protected final OfficeDocument m_document; } -- cgit v1.2.3 From de807d3e80b3aab50395688741cac57a1f2e11c8 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 16 Nov 2010 12:22:48 +0100 Subject: undoapi: derive XUndoManager from XChild, to allow convenient access to the document it belongs to --- sfx2/qa/complex/sfx2/UndoManager.java | 16 +++++++++------- sfx2/source/doc/docundomanager.cxx | 16 ++++++++++++++++ sfx2/source/inc/docundomanager.hxx | 4 ++++ 3 files changed, 29 insertions(+), 7 deletions(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index 545e3d6fd6b6..90522fae029c 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -127,7 +127,7 @@ public class UndoManager } // ----------------------------------------------------------------------------------------------------------------- -// @Test + @Test public void checkCalcUndo() throws Exception { m_currentTestCase = new CalcDocumentTest( getORB() ); @@ -135,7 +135,7 @@ public class UndoManager } // ----------------------------------------------------------------------------------------------------------------- -// @Test + @Test public void checkDrawUndo() throws Exception { m_currentTestCase = new DrawDocumentTest( getORB() ); @@ -143,7 +143,7 @@ public class UndoManager } // ----------------------------------------------------------------------------------------------------------------- -// @Test + @Test public void checkImpressUndo() throws Exception { m_currentTestCase = new ImpressDocumentTest( getORB() ); @@ -151,7 +151,7 @@ public class UndoManager } // ----------------------------------------------------------------------------------------------------------------- - @Test +// @Test public void checkChartUndo() throws Exception { m_currentTestCase = new ChartDocumentTest( getORB() ); @@ -159,7 +159,7 @@ public class UndoManager } // ----------------------------------------------------------------------------------------------------------------- -// @Test + @Test public void checkBrokenScripts() throws com.sun.star.uno.Exception, InterruptedException { System.out.println( "testing: broken scripts" ); @@ -309,8 +309,10 @@ public class UndoManager */ private XUndoManager getUndoManager() { - XUndoManagerSupplier suppUndo = UnoRuntime.queryInterface( XUndoManagerSupplier.class, m_currentDocument.getDocument() ); - return suppUndo.getUndoManager(); + final XUndoManagerSupplier suppUndo = UnoRuntime.queryInterface( XUndoManagerSupplier.class, m_currentDocument.getDocument() ); + final XUndoManager undoManager = suppUndo.getUndoManager(); + assertTrue( UnoRuntime.areSame( undoManager.getParent(), m_currentDocument.getDocument() ) ); + return undoManager; } // ----------------------------------------------------------------------------------------------------------------- diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx index 6fbe1996d85d..d995533ef9f7 100755 --- a/sfx2/source/doc/docundomanager.cxx +++ b/sfx2/source/doc/docundomanager.cxx @@ -78,6 +78,8 @@ namespace sfx2 using ::com::sun::star::document::XUndoManagerListener; using ::com::sun::star::document::UndoFailedException; using ::com::sun::star::document::XUndoManager; + using ::com::sun::star::lang::NoSupportException; + using ::com::sun::star::frame::XModel; /** === end UNO using === **/ using ::svl::IUndoManager; @@ -450,6 +452,20 @@ namespace sfx2 return m_pImpl->aUndoHelper.removeUndoManagerListener( i_listener ); } + //------------------------------------------------------------------------------------------------------------------ + Reference< XInterface > SAL_CALL DocumentUndoManager::getParent( ) throw (RuntimeException) + { + UndoManagerGuard aGuard( *this ); + return static_cast< XModel* >( &getBaseModel() ); + } + + //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DocumentUndoManager::setParent( const Reference< XInterface >& i_parent ) throw (NoSupportException, RuntimeException) + { + (void)i_parent; + throw NoSupportException( ::rtl::OUString(), m_pImpl->getThis() ); + } + //...................................................................................................................... } // namespace sfx2 //...................................................................................................................... diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx index cca8d1b77fd6..48f104049228 100755 --- a/sfx2/source/inc/docundomanager.hxx +++ b/sfx2/source/inc/docundomanager.hxx @@ -95,6 +95,10 @@ namespace sfx2 virtual void SAL_CALL unlock( ) throw (::com::sun::star::util::NotLockedException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isLocked( ) throw (::com::sun::star::uno::RuntimeException); + // XChild, base of XUndoManager + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + private: ::boost::scoped_ptr< DocumentUndoManager_Impl > m_pImpl; }; -- cgit v1.2.3 From 0eab3863cddbf7b0bee9ee1270fa70e87caa52ac Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 16 Nov 2010 19:31:36 +0100 Subject: undoapi: updated the Chart test backend --- sfx2/qa/complex/sfx2/UndoManager.java | 55 +++++++++++----------- sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java | 59 +++++++++++++++++++++--- 2 files changed, 81 insertions(+), 33 deletions(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index 90522fae029c..2e4c5abe2903 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -119,7 +119,7 @@ public class UndoManager } // ----------------------------------------------------------------------------------------------------------------- -// @Test + @Test public void checkWriterUndo() throws Exception { m_currentTestCase = new WriterDocumentTest( getORB() ); @@ -151,7 +151,7 @@ public class UndoManager } // ----------------------------------------------------------------------------------------------------------------- -// @Test + @Test public void checkChartUndo() throws Exception { m_currentTestCase = new ChartDocumentTest( getORB() ); @@ -239,7 +239,7 @@ public class UndoManager } // ----------------------------------------------------------------------------------------------------------------- -// @Test + @Test public void checkSerialization() throws com.sun.star.uno.Exception, InterruptedException { System.out.println( "testing: request serialization" ); @@ -299,6 +299,8 @@ public class UndoManager m_currentTestCase.closeDocument(); else if ( m_currentDocument != null ) m_currentDocument.close(); + m_currentTestCase = null; + m_currentDocument = null; m_callbackFactory.dispose(); } @@ -647,28 +649,29 @@ public class UndoManager m_undoListener = new UndoListener(); undoManager.addUndoManagerListener( m_undoListener ); - impl_testSingleModification( m_currentTestCase, undoManager ); - impl_testMultipleModifications( m_currentTestCase, undoManager ); - impl_testCustomUndoActions( m_currentTestCase, undoManager ); - impl_testLocking( m_currentTestCase, undoManager ); + impl_testSingleModification( undoManager ); + impl_testMultipleModifications( undoManager ); + impl_testCustomUndoActions( undoManager ); + impl_testLocking( undoManager ); impl_testNestedContexts( undoManager ); - impl_testErrorHandling( m_currentTestCase, undoManager ); + impl_testErrorHandling( undoManager ); impl_testContextHandling( undoManager ); impl_testStackHandling( undoManager ); impl_testClearance( undoManager ); impl_testHiddenContexts( undoManager ); // close the document, ensure the Undo manager listener gets notified - m_currentDocument.close(); + m_currentTestCase.closeDocument(); + m_currentTestCase = null; m_currentDocument = null; assertTrue( "document is closed, but the UndoManagerListener has not been notified of the disposal", m_undoListener.isDisposed() ); } // ----------------------------------------------------------------------------------------------------------------- - private void impl_testSingleModification( final DocumentTest i_test, final XUndoManager i_undoManager ) throws com.sun.star.uno.Exception + private void impl_testSingleModification( final XUndoManager i_undoManager ) throws com.sun.star.uno.Exception { - i_test.doSingleModification(); - i_test.verifySingleModificationDocumentState(); + m_currentTestCase.doSingleModification(); + m_currentTestCase.verifySingleModificationDocumentState(); // undo the modification, ensure the listener got the proper notifications assertEquals( "We did not yet do a undo!", 0, m_undoListener.getUndoActionCount() ); @@ -677,24 +680,24 @@ public class UndoManager 1, m_undoListener.getUndoActionCount() ); // verify the document is in its initial state, again - i_test.verifyInitialDocumentState(); + m_currentTestCase.verifyInitialDocumentState(); // redo the modification, ensure the listener got the proper notifications assertEquals( "did not yet do a redo!", 0, m_undoListener.getRedoActionCount() ); i_undoManager.redo(); assertEquals( "did a redo, but got no notification of it!", 1, m_undoListener.getRedoActionCount() ); // ensure the document is in the proper state, again - i_test.verifySingleModificationDocumentState(); + m_currentTestCase.verifySingleModificationDocumentState(); // now do an Undo via the UI (aka the dispatch API), and see if this works, and notifies the listener as // expected - i_test.getDocument().getCurrentView().dispatch( ".uno:Undo" ); - i_test.verifyInitialDocumentState(); + m_currentTestCase.getDocument().getCurrentView().dispatch( ".uno:Undo" ); + m_currentTestCase.verifyInitialDocumentState(); assertEquals( "UI-Undo does not notify the listener", 2, m_undoListener.getUndoActionCount() ); } // ----------------------------------------------------------------------------------------------------------------- - private void impl_testMultipleModifications( final DocumentTest i_test, final XUndoManager i_undoManager ) throws com.sun.star.uno.Exception + private void impl_testMultipleModifications( final XUndoManager i_undoManager ) throws com.sun.star.uno.Exception { m_undoListener.reset(); assertEquals( "unexpected initial undo context depth", 0, m_undoListener.getCurrentUndoContextDepth() ); @@ -704,7 +707,7 @@ public class UndoManager assertEquals( "entering an Undo context has not been notified properly", "Batch Changes", m_undoListener.getCurrentUndoContextTitle() ); - final int modifications = i_test.doMultipleModifications(); + final int modifications = m_currentTestCase.doMultipleModifications(); assertEquals( "unexpected number of undo actions while doing batch changes to the document", modifications, m_undoListener.getUndoActionsAdded() ); assertEquals( "seems the document operations touched the undo context depth", @@ -718,11 +721,11 @@ public class UndoManager i_undoManager.undo(); assertEquals( "Just did an undo - the listener should have been notified", 1, m_undoListener.getUndoActionCount() ); - i_test.verifyInitialDocumentState(); + m_currentTestCase.verifyInitialDocumentState(); } // ----------------------------------------------------------------------------------------------------------------- - private void impl_testCustomUndoActions( final DocumentTest i_test, final XUndoManager i_undoManager ) throws com.sun.star.uno.Exception + private void impl_testCustomUndoActions( final XUndoManager i_undoManager ) throws com.sun.star.uno.Exception { i_undoManager.clear(); m_undoListener.reset(); @@ -767,7 +770,7 @@ public class UndoManager new String[]{action1.getTitle()}, i_undoManager.getAllUndoActionTitles() ); // undo the second action, via UI dispatches - i_test.getDocument().getCurrentView().dispatch( ".uno:Undo" ); + m_currentTestCase.getDocument().getCurrentView().dispatch( ".uno:Undo" ); assertEquals( "improper action title notified during UI Undo", action1.getTitle(), m_undoListener.getMostRecentlyUndoneTitle() ); assertTrue( "nested custom undo action has not been undone as expected", action1.undoCalled() ); assertArrayEquals( "unexpected Redo descriptions after undoing the second custom action", @@ -781,7 +784,7 @@ public class UndoManager } // ----------------------------------------------------------------------------------------------------------------- - private void impl_testLocking( final DocumentTest i_test, final XUndoManager i_undoManager ) throws com.sun.star.uno.Exception + private void impl_testLocking( final XUndoManager i_undoManager ) throws com.sun.star.uno.Exception { i_undoManager.reset(); m_undoListener.reset(); @@ -790,7 +793,7 @@ public class UndoManager assertFalse( "unexpected initial locking state", i_undoManager.isLocked() ); i_undoManager.lock(); assertTrue( "just locked the manager, why does it lie?", i_undoManager.isLocked() ); - i_test.doSingleModification(); + m_currentTestCase.doSingleModification(); assertEquals( "when the Undo manager is locked, no implicit additions should happen", 0, m_undoListener.getUndoActionsAdded() ); i_undoManager.unlock(); @@ -909,7 +912,7 @@ public class UndoManager } // ----------------------------------------------------------------------------------------------------------------- - private void impl_testErrorHandling( final DocumentTest i_test, final XUndoManager i_undoManager ) throws com.sun.star.uno.Exception + private void impl_testErrorHandling( final XUndoManager i_undoManager ) throws com.sun.star.uno.Exception { i_undoManager.reset(); m_undoListener.reset(); @@ -994,12 +997,12 @@ public class UndoManager if ( doByAPI ) i_undoManager.undo(); else - i_test.getDocument().getCurrentView().dispatch( ".uno:Undo" ); + m_currentTestCase.getDocument().getCurrentView().dispatch( ".uno:Undo" ); else if ( doByAPI ) i_undoManager.redo(); else - i_test.getDocument().getCurrentView().dispatch( ".uno:Redo" ); + m_currentTestCase.getDocument().getCurrentView().dispatch( ".uno:Redo" ); } catch ( UndoFailedException e ) { diff --git a/sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java b/sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java index 787272d69a45..1bb1be804cac 100755 --- a/sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java +++ b/sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java @@ -26,6 +26,9 @@ package complex.sfx2.undo; +import com.sun.star.chart2.XAxis; +import com.sun.star.chart2.XCoordinateSystem; +import com.sun.star.chart2.XCoordinateSystemContainer; import com.sun.star.awt.Size; import com.sun.star.beans.NamedValue; import com.sun.star.beans.XPropertySet; @@ -127,7 +130,9 @@ public class ChartDocumentTest implements DocumentTest public void initializeDocument() throws com.sun.star.uno.Exception { - // TODO? + final XPropertySet wallProperties = impl_getWallProperties(); + wallProperties.setPropertyValue( "FillStyle", com.sun.star.drawing.FillStyle.SOLID ); + wallProperties.setPropertyValue( "FillColor", 0x00FFFFFF ); } public void closeDocument() @@ -135,32 +140,72 @@ public class ChartDocumentTest implements DocumentTest m_textDocument.close(); } - public void doSingleModification() throws com.sun.star.uno.Exception + private XPropertySet impl_getWallProperties() { final XChartDocument chartDoc = UnoRuntime.queryInterface( XChartDocument.class, m_chartDocument.getDocument() ); final XDiagram diagram = chartDoc.getFirstDiagram(); final XPropertySet wallProperties = diagram.getWall(); + return wallProperties; + } - // simulate an Undo action, as long as the chart implementation doesn't add Undo actions itself + private XPropertySet impl_getYAxisProperties() + { + XPropertySet axisProperties = null; + try + { + final XChartDocument chartDoc = UnoRuntime.queryInterface( XChartDocument.class, m_chartDocument.getDocument() ); + final XDiagram diagram = chartDoc.getFirstDiagram(); + final XCoordinateSystemContainer coordContainer = UnoRuntime.queryInterface( XCoordinateSystemContainer.class, diagram ); + final XCoordinateSystem[] coordSystems = coordContainer.getCoordinateSystems(); + final XCoordinateSystem coordSystem = coordSystems[0]; + final XAxis primaryYAxis = coordSystem.getAxisByDimension( 1, 0 ); + axisProperties = UnoRuntime.queryInterface( XPropertySet.class, primaryYAxis ); + } + catch ( Exception ex ) + { + fail( "internal error: could not retrieve primary Y axis properties" ); + } + return axisProperties; + } + + private XUndoManager impl_getUndoManager() + { final XUndoManagerSupplier undoManagerSupp = UnoRuntime.queryInterface( XUndoManagerSupplier.class, m_chartDocument.getDocument() ); final XUndoManager undoManager = undoManagerSupp.getUndoManager(); + return undoManager; + } + + public void doSingleModification() throws com.sun.star.uno.Exception + { + final XPropertySet wallProperties = impl_getWallProperties(); + + // simulate an Undo action, as long as the chart implementation doesn't add Undo actions itself + final XUndoManager undoManager = impl_getUndoManager(); undoManager.addUndoAction( new PropertyUndoAction( wallProperties, "FillColor", 0xCCFF44 ) ); + // (the UndoAction will actually set the property value) } public void verifyInitialDocumentState() throws com.sun.star.uno.Exception { - // TODO + final XPropertySet wallProperties = impl_getWallProperties(); + assertEquals( 0x00FFFFFF, ((Integer)wallProperties.getPropertyValue( "FillColor" )).intValue() ); } public void verifySingleModificationDocumentState() throws com.sun.star.uno.Exception { - // TODO + final XPropertySet wallProperties = impl_getWallProperties(); + assertEquals( 0xCCFF44, ((Integer)wallProperties.getPropertyValue( "FillColor" )).intValue() ); } public int doMultipleModifications() throws com.sun.star.uno.Exception { - // TODO - return 0; + final XPropertySet axisProperties = impl_getYAxisProperties(); + + final XUndoManager undoManager = impl_getUndoManager(); + undoManager.addUndoAction( new PropertyUndoAction( axisProperties, "LineWidth", 300 ) ); + undoManager.addUndoAction( new PropertyUndoAction( axisProperties, "LineColor", 0x000000 ) ); + + return 2; } public OfficeDocument getDocument() -- cgit v1.2.3 From 992300e341ba4764792fd38be280b4301d0d83e6 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Wed, 17 Nov 2010 11:32:54 +0100 Subject: undoapi: doVerb does not work, currently ... but leave it here, commented out, for the moment --- sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java b/sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java index 1bb1be804cac..8dcabef8370e 100755 --- a/sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java +++ b/sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java @@ -113,7 +113,12 @@ public class ChartDocumentTest implements DocumentTest canActivate = true; assertTrue( "cannot activate OLE object", canActivate ); - // actually + // actually activate the object + //embeddedChart.doVerb( EmbedVerbs.MS_OLEVERB_SHOW ); + // if we could use XEmbeddedObject.setVerb, then we would not need the "select" thingie above, and also + // the asynchronous dispatch below would not be necessary. + // Sadly, doVerb at the moment reliably deadlocks ... :( + m_textDocument.getCurrentView().dispatch( ".uno:ObjectMenue", new NamedValue[] { new NamedValue( "VerbID", EmbedVerbs.MS_OLEVERB_SHOW ) } ); // the dispatch happens asynchronously, so wait a little (at most 1 seconds) until the chart really has been activated -- cgit v1.2.3 From 31357d2dc34b8d95afbfc7d9e812dc94d072b7ae Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 18 Nov 2010 14:06:33 +0100 Subject: undoapi: committed fixed for #i115639#, which has been applied as master fix to DEV300.m94 --- sfx2/qa/cppunit/makefile.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'sfx2/qa') diff --git a/sfx2/qa/cppunit/makefile.mk b/sfx2/qa/cppunit/makefile.mk index dce0b86a0619..b53a04ec43f9 100644 --- a/sfx2/qa/cppunit/makefile.mk +++ b/sfx2/qa/cppunit/makefile.mk @@ -25,6 +25,10 @@ # #************************************************************************* +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE + PRJ=../.. PRJNAME=sfx2 TARGET=qa_cppunit @@ -79,3 +83,4 @@ SLOFILES= \ .INCLUDE : target.mk .INCLUDE : _cppunit.mk +.END -- cgit v1.2.3 From d6f918f52ef80ef1b9c78b93c9041f596ad6c9b3 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 19 Nov 2010 12:00:45 +0100 Subject: undoapi: disable failing test (complex.sfx2.GlobalEventBroadcaster) for now. issue id: i115674 --- sfx2/qa/complex/sfx2/makefile.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/makefile.mk b/sfx2/qa/complex/sfx2/makefile.mk index 5cbfe34efb7f..95a483bf2497 100644 --- a/sfx2/qa/complex/sfx2/makefile.mk +++ b/sfx2/qa/complex/sfx2/makefile.mk @@ -57,7 +57,9 @@ JAVATESTFILES = \ DocumentProperties.java \ StandaloneDocumentInfo.java \ DocumentMetadataAccess.java \ - GlobalEventBroadcaster.java \ + +# disabled: #i115674# +# GlobalEventBroadcaster.java \ # --- Targets ------------------------------------------------------ -- cgit v1.2.3 From c05087b295acf86ce13105b0cc67b82feb92f45a Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 19 Nov 2010 21:45:41 +0100 Subject: gnumake2: removing old dmake file in migrated modules --- framework/inc/makefile.mk | 47 --- framework/qa/complex/ModuleManager/makefile.mk | 60 ---- .../qa/complex/XUserInputInterception/makefile.mk | 133 ------- .../qa/complex/accelerators/helper/makefile.mk | 46 --- framework/qa/complex/accelerators/makefile.mk | 67 ---- framework/qa/complex/api_internal/makefile.mk | 63 ---- framework/qa/complex/broken_document/makefile.mk | 65 ---- .../qa/complex/contextMenuInterceptor/makefile.mk | 63 ---- framework/qa/complex/desktop/makefile.mk | 62 ---- framework/qa/complex/dispatches/helper/makefile.mk | 47 --- framework/qa/complex/dispatches/makefile.mk | 131 ------- framework/qa/complex/disposing/makefile.mk | 61 ---- .../qa/complex/framework/autosave/makefile.mk | 127 ------- .../qa/complex/framework/recovery/makefile.mk | 103 ------ .../qa/complex/imageManager/interfaces/makefile.mk | 63 ---- framework/qa/complex/imageManager/makefile.mk | 123 ------- .../qa/complex/loadAllDocuments/helper/makefile.mk | 47 --- framework/qa/complex/loadAllDocuments/makefile.mk | 134 ------- framework/qa/complex/path_settings/makefile.mk | 62 ---- framework/qa/complex/path_substitution/makefile.mk | 122 ------- framework/qa/unoapi/makefile.mk | 48 --- framework/source/accelerators/makefile.mk | 52 --- framework/source/application/makefile.mk | 45 --- framework/source/classes/makefile.mk | 54 --- framework/source/constant/makefile.mk | 45 --- framework/source/dispatch/makefile.mk | 62 ---- framework/source/fwe/classes/makefile.mk | 58 ---- framework/source/fwe/dispatch/makefile.mk | 48 --- framework/source/fwe/helper/makefile.mk | 55 --- framework/source/fwe/interaction/makefile.mk | 48 --- framework/source/fwe/xml/makefile.mk | 59 ---- framework/source/fwi/classes/makefile.mk | 50 --- framework/source/fwi/helper/makefile.mk | 51 --- framework/source/fwi/jobs/makefile.mk | 48 --- framework/source/fwi/threadhelp/makefile.mk | 45 --- framework/source/fwi/uielement/makefile.mk | 48 --- framework/source/helper/makefile.mk | 70 ---- framework/source/interaction/makefile.mk | 48 --- framework/source/jobs/makefile.mk | 51 --- framework/source/layoutmanager/makefile.mk | 47 --- framework/source/loadenv/makefile.mk | 46 --- framework/source/recording/makefile.mk | 47 --- framework/source/register/makefile.mk | 50 --- framework/source/services/makefile.mk | 64 ---- framework/source/tabwin/makefile.mk | 48 --- framework/source/uiconfiguration/makefile.mk | 54 --- framework/source/uielement/makefile.mk | 84 ----- framework/source/uifactory/makefile.mk | 54 --- framework/source/xml/makefile.mk | 58 ---- framework/test/makefile.mk | 94 ----- framework/test/threadtest/makefile.mk | 67 ---- framework/test/typecfg/makefile.mk | 73 ---- framework/util/guiapps/makefile.mk | 67 ---- framework/util/makefile.mk | 383 --------------------- sfx2/inc/makefile.mk | 48 --- sfx2/qa/complex/docinfo/makefile.mk | 63 ---- sfx2/qa/complex/framework/DocHelper/makefile.mk | 49 --- sfx2/qa/complex/framework/makefile.mk | 65 ---- sfx2/qa/complex/standalonedocumentinfo/makefile.mk | 56 --- sfx2/qa/cppunit/makefile.mk | 81 ----- sfx2/qa/unoapi/makefile.mk | 48 --- sfx2/sdi/makefile.mk | 59 ---- sfx2/source/appl/makefile.mk | 159 --------- sfx2/source/bastyp/makefile.mk | 66 ---- sfx2/source/config/makefile.mk | 47 --- sfx2/source/control/makefile.mk | 73 ---- sfx2/source/dialog/makefile.mk | 117 ------- sfx2/source/doc/makefile.mk | 103 ------ sfx2/source/explorer/makefile.mk | 47 --- sfx2/source/inet/makefile.mk | 48 --- sfx2/source/layout/makefile.mk | 56 --- sfx2/source/menu/makefile.mk | 55 --- sfx2/source/notify/makefile.mk | 49 --- sfx2/source/statbar/makefile.mk | 47 --- sfx2/source/toolbox/makefile.mk | 48 --- sfx2/source/view/makefile.mk | 65 ---- sfx2/util/makefile.mk | 172 --------- sfx2/workben/custompanel/makefile.mk | 120 ------- xmloff/inc/makefile.mk | 48 --- xmloff/qa/unoapi/makefile.mk | 48 --- xmloff/source/chart/makefile.mk | 70 ---- xmloff/source/core/makefile.mk | 76 ---- xmloff/source/draw/makefile.mk | 85 ----- xmloff/source/forms/makefile.mk | 70 ---- xmloff/source/meta/makefile.mk | 53 --- xmloff/source/script/makefile.mk | 56 --- xmloff/source/style/makefile.mk | 219 ------------ xmloff/source/table/makefile.mk | 48 --- xmloff/source/text/makefile.mk | 127 ------- xmloff/source/transform/makefile.mk | 103 ------ xmloff/source/xforms/makefile.mk | 58 ---- xmloff/util/makefile.mk | 96 ------ 92 files changed, 6745 deletions(-) delete mode 100644 framework/inc/makefile.mk delete mode 100644 framework/qa/complex/ModuleManager/makefile.mk delete mode 100644 framework/qa/complex/XUserInputInterception/makefile.mk delete mode 100644 framework/qa/complex/accelerators/helper/makefile.mk delete mode 100644 framework/qa/complex/accelerators/makefile.mk delete mode 100755 framework/qa/complex/api_internal/makefile.mk delete mode 100755 framework/qa/complex/broken_document/makefile.mk delete mode 100644 framework/qa/complex/contextMenuInterceptor/makefile.mk delete mode 100755 framework/qa/complex/desktop/makefile.mk delete mode 100644 framework/qa/complex/dispatches/helper/makefile.mk delete mode 100644 framework/qa/complex/dispatches/makefile.mk delete mode 100755 framework/qa/complex/disposing/makefile.mk delete mode 100644 framework/qa/complex/framework/autosave/makefile.mk delete mode 100755 framework/qa/complex/framework/recovery/makefile.mk delete mode 100755 framework/qa/complex/imageManager/interfaces/makefile.mk delete mode 100755 framework/qa/complex/imageManager/makefile.mk delete mode 100644 framework/qa/complex/loadAllDocuments/helper/makefile.mk delete mode 100644 framework/qa/complex/loadAllDocuments/makefile.mk delete mode 100755 framework/qa/complex/path_settings/makefile.mk delete mode 100755 framework/qa/complex/path_substitution/makefile.mk delete mode 100755 framework/qa/unoapi/makefile.mk delete mode 100644 framework/source/accelerators/makefile.mk delete mode 100644 framework/source/application/makefile.mk delete mode 100644 framework/source/classes/makefile.mk delete mode 100644 framework/source/constant/makefile.mk delete mode 100644 framework/source/dispatch/makefile.mk delete mode 100644 framework/source/fwe/classes/makefile.mk delete mode 100644 framework/source/fwe/dispatch/makefile.mk delete mode 100644 framework/source/fwe/helper/makefile.mk delete mode 100644 framework/source/fwe/interaction/makefile.mk delete mode 100644 framework/source/fwe/xml/makefile.mk delete mode 100644 framework/source/fwi/classes/makefile.mk delete mode 100644 framework/source/fwi/helper/makefile.mk delete mode 100644 framework/source/fwi/jobs/makefile.mk delete mode 100644 framework/source/fwi/threadhelp/makefile.mk delete mode 100644 framework/source/fwi/uielement/makefile.mk delete mode 100644 framework/source/helper/makefile.mk delete mode 100644 framework/source/interaction/makefile.mk delete mode 100644 framework/source/jobs/makefile.mk delete mode 100644 framework/source/layoutmanager/makefile.mk delete mode 100644 framework/source/loadenv/makefile.mk delete mode 100644 framework/source/recording/makefile.mk delete mode 100644 framework/source/register/makefile.mk delete mode 100644 framework/source/services/makefile.mk delete mode 100644 framework/source/tabwin/makefile.mk delete mode 100644 framework/source/uiconfiguration/makefile.mk delete mode 100644 framework/source/uielement/makefile.mk delete mode 100644 framework/source/uifactory/makefile.mk delete mode 100644 framework/source/xml/makefile.mk delete mode 100644 framework/test/makefile.mk delete mode 100644 framework/test/threadtest/makefile.mk delete mode 100644 framework/test/typecfg/makefile.mk delete mode 100644 framework/util/guiapps/makefile.mk delete mode 100644 framework/util/makefile.mk delete mode 100644 sfx2/inc/makefile.mk delete mode 100644 sfx2/qa/complex/docinfo/makefile.mk delete mode 100644 sfx2/qa/complex/framework/DocHelper/makefile.mk delete mode 100644 sfx2/qa/complex/framework/makefile.mk delete mode 100644 sfx2/qa/complex/standalonedocumentinfo/makefile.mk delete mode 100644 sfx2/qa/cppunit/makefile.mk delete mode 100644 sfx2/qa/unoapi/makefile.mk delete mode 100644 sfx2/sdi/makefile.mk delete mode 100644 sfx2/source/appl/makefile.mk delete mode 100644 sfx2/source/bastyp/makefile.mk delete mode 100644 sfx2/source/config/makefile.mk delete mode 100644 sfx2/source/control/makefile.mk delete mode 100755 sfx2/source/dialog/makefile.mk delete mode 100644 sfx2/source/doc/makefile.mk delete mode 100644 sfx2/source/explorer/makefile.mk delete mode 100644 sfx2/source/inet/makefile.mk delete mode 100644 sfx2/source/layout/makefile.mk delete mode 100644 sfx2/source/menu/makefile.mk delete mode 100644 sfx2/source/notify/makefile.mk delete mode 100644 sfx2/source/statbar/makefile.mk delete mode 100644 sfx2/source/toolbox/makefile.mk delete mode 100644 sfx2/source/view/makefile.mk delete mode 100644 sfx2/util/makefile.mk delete mode 100644 sfx2/workben/custompanel/makefile.mk delete mode 100644 xmloff/inc/makefile.mk delete mode 100644 xmloff/qa/unoapi/makefile.mk delete mode 100644 xmloff/source/chart/makefile.mk delete mode 100644 xmloff/source/core/makefile.mk delete mode 100644 xmloff/source/draw/makefile.mk delete mode 100644 xmloff/source/forms/makefile.mk delete mode 100644 xmloff/source/meta/makefile.mk delete mode 100644 xmloff/source/script/makefile.mk delete mode 100644 xmloff/source/style/makefile.mk delete mode 100644 xmloff/source/table/makefile.mk delete mode 100644 xmloff/source/text/makefile.mk delete mode 100644 xmloff/source/transform/makefile.mk delete mode 100644 xmloff/source/xforms/makefile.mk delete mode 100644 xmloff/util/makefile.mk (limited to 'sfx2/qa') diff --git a/framework/inc/makefile.mk b/framework/inc/makefile.mk deleted file mode 100644 index e2f1bedf4e98..000000000000 --- a/framework/inc/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME=framework -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" - diff --git a/framework/qa/complex/ModuleManager/makefile.mk b/framework/qa/complex/ModuleManager/makefile.mk deleted file mode 100644 index 4ad6d8929030..000000000000 --- a/framework/qa/complex/ModuleManager/makefile.mk +++ /dev/null @@ -1,60 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = framework -TARGET = qa_complex_ModuleManager - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/ModuleManager - -# here store only Files which contain a @Test -JAVATESTFILES = \ - CheckXModuleManager.java - -# put here all other files -JAVAFILES = $(JAVATESTFILES) - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) - -# Sample how to debug -# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y - -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END - diff --git a/framework/qa/complex/XUserInputInterception/makefile.mk b/framework/qa/complex/XUserInputInterception/makefile.mk deleted file mode 100644 index 8b08bec171ee..000000000000 --- a/framework/qa/complex/XUserInputInterception/makefile.mk +++ /dev/null @@ -1,133 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -# we don't want something like this. -# .IF "$(OS)"=="LINUX" -# nothing .PHONY: -# @echo "Test marked as failed on this platform" -# .END - -PRJ = ../../.. -PRJNAME = framework -TARGET = qa_complex_xuserinputinterception - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/XUserInputInterception - -# here store only Files which contain a @Test -JAVATESTFILES = \ - EventTest.java - -# put here all other files -JAVAFILES = $(JAVATESTFILES) - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) - -# Sample how to debug -# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y - -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END - -# -# -# -# PRJ = ..$/..$/.. -# TARGET = EventTest -# PRJNAME = framework -# PACKAGE = complex$/XUserInputInterception -# -# # --- Settings ----------------------------------------------------- -# .INCLUDE: settings.mk -# -# -# #----- compile .java files ----------------------------------------- -# -# JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \ -# OOoRunner.jar mysql.jar -# JAVAFILES = EventTest.java -# JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) -# -# #----- make a jar from compiled files ------------------------------ -# -# MAXLINELENGTH = 100000 -# -# JARCLASSDIRS = $(PACKAGE) -# JARTARGET = $(TARGET).jar -# JARCOMPRESS = TRUE -# -# # --- Parameters for the test -------------------------------------- -# -# # start an office if the parameter is set for the makefile -# .IF "$(OFFICE)" == "" -# CT_APPEXECCOMMAND = -# .ELSE -# CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -# .ENDIF -# -# # test base is java complex -# CT_TESTBASE = -TestBase java_complex -# -# # test looks something like the.full.package.TestName -# CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) -# -# # start the runner application -# CT_APP = org.openoffice.Runner -# -# # --- Targets ------------------------------------------------------ -# -# .IF "$(depend)" == "" -# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR -# .ELSE -# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP -# .ENDIF -# -# .INCLUDE : target.mk -# -# #$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : $(JAVAFILES:b).props -# # cp $(JAVAFILES:b).props $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props -# # jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(JAVAFILES:b).props -# -# RUN: run -# -# run: -# +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST) -# -# -# diff --git a/framework/qa/complex/accelerators/helper/makefile.mk b/framework/qa/complex/accelerators/helper/makefile.mk deleted file mode 100644 index 189a5fddba77..000000000000 --- a/framework/qa/complex/accelerators/helper/makefile.mk +++ /dev/null @@ -1,46 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ = ../../../.. -TARGET = AcceleratorsConfigurationTest -PRJNAME = framework -PACKAGE = complex/accelerators/helper - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \ - Generator.jar OOoRunner.jar -JAVAFILES = KeyMapping.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -MAXLINELENGTH = 100000 - -.INCLUDE : target.mk diff --git a/framework/qa/complex/accelerators/makefile.mk b/framework/qa/complex/accelerators/makefile.mk deleted file mode 100644 index 7d5460324849..000000000000 --- a/framework/qa/complex/accelerators/makefile.mk +++ /dev/null @@ -1,67 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = framework -TARGET = qa_complex_accelerators - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/accelerators - -# here store only Files which contain a @Test -JAVATESTFILES = \ - AcceleratorsConfigurationTest.java - -# put here all other files -JAVAFILES = $(JAVATESTFILES) \ - KeyMapping.java - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -#JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \ -# OOoRunner.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) - -# Sample how to debug -# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y - -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END - - - - - diff --git a/framework/qa/complex/api_internal/makefile.mk b/framework/qa/complex/api_internal/makefile.mk deleted file mode 100755 index f1a22011a8e7..000000000000 --- a/framework/qa/complex/api_internal/makefile.mk +++ /dev/null @@ -1,63 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = framework -TARGET = qa_complex_api_internal - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/api_internal - -# here store only Files which contain a @Test -JAVATESTFILES = \ - CheckAPI.java - -# put here all other files -JAVAFILES = $(JAVATESTFILES) - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -#JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \ -# OOoRunner.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) - -# Sample how to debug -# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y - -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END - diff --git a/framework/qa/complex/broken_document/makefile.mk b/framework/qa/complex/broken_document/makefile.mk deleted file mode 100755 index 8b1cf2ac3bfd..000000000000 --- a/framework/qa/complex/broken_document/makefile.mk +++ /dev/null @@ -1,65 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = framework -TARGET = qa_complex_broken_document - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/broken_document - -# here store only Files which contain a @Test -JAVATESTFILES = \ - LoadDocument.java - -# put here all other files -JAVAFILES = $(JAVATESTFILES) \ - TestDocument.java - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -#JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \ -# OOoRunner.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) - -# Sample how to debug -# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y - -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END - diff --git a/framework/qa/complex/contextMenuInterceptor/makefile.mk b/framework/qa/complex/contextMenuInterceptor/makefile.mk deleted file mode 100644 index 574d98641468..000000000000 --- a/framework/qa/complex/contextMenuInterceptor/makefile.mk +++ /dev/null @@ -1,63 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = framework -TARGET = qa_complex_contextMenuInterceptor - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/contextMenuInterceptor - -# here store only Files which contain a @Test -JAVATESTFILES = \ - CheckContextMenuInterceptor.java - -# put here all other files -JAVAFILES = $(JAVATESTFILES) \ - ContextMenuInterceptor.java - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -#JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \ -# OOoRunner.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) - -# Sample how to debug -# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y - -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END diff --git a/framework/qa/complex/desktop/makefile.mk b/framework/qa/complex/desktop/makefile.mk deleted file mode 100755 index 74db8d34e160..000000000000 --- a/framework/qa/complex/desktop/makefile.mk +++ /dev/null @@ -1,62 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = framework -TARGET = qa_complex_desktop - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/desktop - -# here store only Files which contain a @Test -JAVATESTFILES = \ - DesktopTerminate.java - -# put here all other files -JAVAFILES = $(JAVATESTFILES) - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -#JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \ -# OOoRunner.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) - -# Sample how to debug -# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y - -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END diff --git a/framework/qa/complex/dispatches/helper/makefile.mk b/framework/qa/complex/dispatches/helper/makefile.mk deleted file mode 100644 index 2b2ccab5ebef..000000000000 --- a/framework/qa/complex/dispatches/helper/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ = ../../../.. -TARGET = checkdispatchapi -PRJNAME = framework -PACKAGE = complex/dispatches/helper - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar Generator.jar -JAVAFILES = Interceptor.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class) - -MAXLINELENGTH = 100000 - -.INCLUDE : target.mk - - - diff --git a/framework/qa/complex/dispatches/makefile.mk b/framework/qa/complex/dispatches/makefile.mk deleted file mode 100644 index 6a5ff79dd793..000000000000 --- a/framework/qa/complex/dispatches/makefile.mk +++ /dev/null @@ -1,131 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = framework -TARGET = qa_complex_dispatches - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/dispatches - -# here store only Files which contain a @Test -JAVATESTFILES = \ - checkdispatchapi.java - -# put here all other files -JAVAFILES = $(JAVATESTFILES) \ - Interceptor.java - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar ConnectivityTools.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) - -# Sample how to debug -# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y - -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END - - - - -# PRJ = ..$/..$/.. -# TARGET = checkdispatchapi -# PRJNAME = framework -# PACKAGE = complex$/dispatches -# -# # --- Settings ----------------------------------------------------- -# .INCLUDE: settings.mk -# -# -# #----- compile .java files ----------------------------------------- -# -# JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \ -# OOoRunner.jar mysql.jar ConnectivityTools.jar -# JAVAFILES = checkdispatchapi.java -# -# JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) -# -# SUBDIRS=helper -# -# #----- make a jar from compiled files ------------------------------ -# -# MAXLINELENGTH = 100000 -# -# JARCLASSDIRS = $(PACKAGE) -# JARTARGET = $(TARGET).jar -# JARCOMPRESS = TRUE -# -# # --- Parameters for the test -------------------------------------- -# -# # start an office if the parameter is set for the makefile -# .IF "$(OFFICE)" == "" -# CT_APPEXECCOMMAND = -# .ELSE -# CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -# .ENDIF -# -# # test base is java complex -# CT_TESTBASE = -TestBase java_complex -# -# # test looks something like the.full.package.TestName -# CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) -# -# # start the runner application -# CT_APP = org.openoffice.Runner -# -# # --- Targets ------------------------------------------------------ -# -# .IF "$(depend)" == "" -# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR -# .ELSE -# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP -# .ENDIF -# -# .INCLUDE : target.mk -# -# #$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : $(JAVAFILES:b).props -# # cp $(JAVAFILES:b).props $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props -# # jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(JAVAFILES:b).props -# -# RUN: run -# -# run: -# +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST) -# -# -# diff --git a/framework/qa/complex/disposing/makefile.mk b/framework/qa/complex/disposing/makefile.mk deleted file mode 100755 index f24960421f21..000000000000 --- a/framework/qa/complex/disposing/makefile.mk +++ /dev/null @@ -1,61 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = framework -TARGET = qa_complex_disposing - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/disposing - -# here store only Files which contain a @Test -JAVATESTFILES = \ - GetServiceWhileDisposingOffice.java - -# put here all other files -JAVAFILES = $(JAVATESTFILES) - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) - -# Sample how to debug -# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y - -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END - diff --git a/framework/qa/complex/framework/autosave/makefile.mk b/framework/qa/complex/framework/autosave/makefile.mk deleted file mode 100644 index 2e8e3dca1f76..000000000000 --- a/framework/qa/complex/framework/autosave/makefile.mk +++ /dev/null @@ -1,127 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../../.. -PRJNAME = framework -TARGET = qa_complex_framework_autosave - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/framework/autosave - -# here store only Files which contain a @Test -JAVATESTFILES = \ - AutoSave.java - -# put here all other files -JAVAFILES = $(JAVATESTFILES) \ - ConfigHelper.java \ - Protocol.java - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) - -# Sample how to debug -# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y - -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END - -# -# PRJ = ..$/..$/..$/.. -# TARGET = AutoSave -# PRJNAME = framework -# PACKAGE = complex$/framework$/autosave -# -# # --- Settings ----------------------------------------------------- -# .INCLUDE: settings.mk -# -# -# #----- compile .java files ----------------------------------------- -# -# JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \ -# OOoRunner.jar mysql.jar -# JAVAFILES = AutoSave.java ConfigHelper.java Protocol.java -# JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) -# -# #----- make a jar from compiled files ------------------------------ -# -# MAXLINELENGTH = 100000 -# -# JARCLASSDIRS = $(PACKAGE) -# JARTARGET = $(TARGET).jar -# JARCOMPRESS = TRUE -# -# # --- Parameters for the test -------------------------------------- -# -# # start an office if the parameter is set for the makefile -# .IF "$(OFFICE)" == "" -# CT_APPEXECCOMMAND = -# .ELSE -# CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -# .ENDIF -# -# # test base is java complex -# CT_TESTBASE = -TestBase java_complex -# -# # test looks something like the.full.package.TestName -# CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) -# -# # start the runner application -# CT_APP = org.openoffice.Runner -# -# # --- Targets ------------------------------------------------------ -# -# .IF "$(depend)" == "" -# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR -# .ELSE -# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP -# .ENDIF -# -# .INCLUDE : target.mk -# -# #$(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : $(JAVAFILES:b).props -# # cp $(JAVAFILES:b).props $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props -# # jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(JAVAFILES:b).props -# -# RUN: run -# -# run: -# +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST) -# -# -# diff --git a/framework/qa/complex/framework/recovery/makefile.mk b/framework/qa/complex/framework/recovery/makefile.mk deleted file mode 100755 index 4a9f80b4b2a5..000000000000 --- a/framework/qa/complex/framework/recovery/makefile.mk +++ /dev/null @@ -1,103 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ = ..$/..$/..$/.. -TARGET = RecoveryTest -PRJNAME = framework -PACKAGE = complex$/framework$/recovery - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = mysql.jar mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -JAVAFILES = RecoveryTest.java RecoveryTools.java CrashThread.java TimeoutThread.java KlickButtonThread.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -#----- make a jar from compiled files ------------------------------ - -MAXLINELENGTH = 100000 - -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE - -#------ some information how to run the test ----------------------- - -MYTAR: ALLTAR - @echo - @echo ########################### N O T E ###################################### - @echo - @echo To run the test successfully you have to extend your LD_LIBRARY_PATH - @echo to your office program directory! - @echo Example: - @echo setenv LD_LIBRARY_PATH /myOffice/program:\$$LD_LIBRARY_PATH - @echo - @echo To run the you have to use the parameter cmd: - @echo cmd="PATH_TO_OFFICE_BINARY -accept=socket,host=localhost,port=8100;urp;" - @echo - @echo Example: - @echo dmake run cmd="/myOffice/program/soffice -accept=socket,host=localhost,port=8100;urp;" - @echo - - -# --- Parameters for the test -------------------------------------- - -# start an office if the parameter is set for the makefile -.IF "$(cmd)" == "" -CT_APPEXECCOMMAND = -.ELSE -CT_APPEXECCOMMAND = -cmd "$(cmd)" -#CT_APPEXECCOMMAND = -AppExecutionCommand \ -# "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -.ENDIF - -# test base is java complex -CT_TESTBASE = -TestBase java_complex - -# replace $/ with . in package name -CT_PACKAGE = -o $(PACKAGE:s\$/\.\) - -# start the runner application -CT_APP = org.openoffice.Runner - -CT_NOOFFICE = -NoOffice true -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -RUN: run -# muss noch angepasst werden: es soll auf -AppExecutionCommand und -NoOffice gepr??ft werden -#.IF "$(OFFICE)" == "" -#run: -# @echo Exit -#.ELSE -run: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_NOOFFICE) $(CT_PACKAGE).RecoveryTest - diff --git a/framework/qa/complex/imageManager/interfaces/makefile.mk b/framework/qa/complex/imageManager/interfaces/makefile.mk deleted file mode 100755 index f7b6f5ebf035..000000000000 --- a/framework/qa/complex/imageManager/interfaces/makefile.mk +++ /dev/null @@ -1,63 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ = ../../../.. -TARGET = ImageManager -PRJNAME = framework -PACKAGE = complex/imageManager/interfaces - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar - -JAVAFILES = \ -_XComponent.java \ -_XUIConfiguration.java \ -_XImageManager.java \ -_XUIConfigurationPersistence.java \ -_XInitialization.java \ -_XTypeProvider.java - -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class) - -#----- make a jar from compiled files ------------------------------ - -MAXLINELENGTH = 100000 - -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - - diff --git a/framework/qa/complex/imageManager/makefile.mk b/framework/qa/complex/imageManager/makefile.mk deleted file mode 100755 index 133e522b13b4..000000000000 --- a/framework/qa/complex/imageManager/makefile.mk +++ /dev/null @@ -1,123 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = framework -TARGET = qa_complex_imageManager - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/imageManager - -# here store only Files which contain a @Test -JAVATESTFILES = \ - CheckImageManager.java - -# put here all other files -JAVAFILES = $(JAVATESTFILES) \ - _XComponent.java \ - _XImageManager.java \ - _XInitialization.java \ - _XTypeProvider.java \ - _XUIConfiguration.java \ - _XUIConfigurationPersistence.java - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) - -# Sample how to debug -# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y - -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END - - - -# -# -# PRJ = ..$/..$/.. -# TARGET = ImageManager -# PRJNAME = framework -# PACKAGE = imageManager -# -# # --- Settings ----------------------------------------------------- -# .INCLUDE: settings.mk -# -# -# #----- compile .java files ----------------------------------------- -# -# JARFILES = mysql.jar mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -# JAVAFILES = CheckImageManager.java -# JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) -# -# #----- make a jar from compiled files ------------------------------ -# -# MAXLINELENGTH = 100000 -# -# JARCLASSDIRS = $(PACKAGE) -# JARTARGET = $(TARGET).jar -# JARCOMPRESS = TRUE -# -# # --- Parameters for the test -------------------------------------- -# -# # start an office if the parameter is set for the makefile -# .IF "$(OFFICE)" == "" -# CT_APPEXECCOMMAND = -# .ELSE -# CT_APPEXECCOMMAND = -AppExecutionCommand \ -# "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -# .ENDIF -# -# # test base is java complex -# CT_TESTBASE = -TestBase java_complex -# -# # replace $/ with . in package name -# CT_PACKAGE = -o $(PACKAGE:s\$/\.\) -# -# # start the runner application -# CT_APP = org.openoffice.Runner -# -# # --- Targets ------------------------------------------------------ -# -# .INCLUDE : target.mk -# -# RUN: run -# -# run: -# +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_PACKAGE).CheckImageManager -# -# diff --git a/framework/qa/complex/loadAllDocuments/helper/makefile.mk b/framework/qa/complex/loadAllDocuments/helper/makefile.mk deleted file mode 100644 index 05a3c7a997ea..000000000000 --- a/framework/qa/complex/loadAllDocuments/helper/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ = ../../../.. -TARGET = CheckXComponentLoader -PRJNAME = framework -PACKAGE = complex/loadAllDocuments/helper - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar -JAVAFILES = InteractionHandler.java StatusIndicator.java StreamSimulator.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class) - -MAXLINELENGTH = 100000 - -.INCLUDE : target.mk - - - diff --git a/framework/qa/complex/loadAllDocuments/makefile.mk b/framework/qa/complex/loadAllDocuments/makefile.mk deleted file mode 100644 index ebf0265620bf..000000000000 --- a/framework/qa/complex/loadAllDocuments/makefile.mk +++ /dev/null @@ -1,134 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = framework -TARGET = qa_complex_loadAllDocuments - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/loadAllDocuments - -# here store only Files which contain a @Test -JAVATESTFILES = \ - CheckXComponentLoader.java - -# put here all other files -JAVAFILES = $(JAVATESTFILES) \ - InteractionHandler.java \ - StatusIndicator.java \ - StreamSimulator.java \ - TestDocument.java - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) - -# Sample how to debug -# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y - -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END - - - -# -# -# PRJ = ..$/..$/.. -# TARGET = CheckXComponentLoader -# PRJNAME = framework -# PACKAGE = complex$/loadAllDocuments -# -# # --- Settings ----------------------------------------------------- -# .INCLUDE: settings.mk -# -# -# #----- compile .java files ----------------------------------------- -# -# JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar \ -# OOoRunner.jar mysql.jar -# JAVAFILES = -# JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) -# -# SUBDIRS = helper -# -# #----- make a jar from compiled files ------------------------------ -# -# MAXLINELENGTH = 100000 -# -# JARCLASSDIRS = $(PACKAGE) -# JARTARGET = $(TARGET).jar -# JARCOMPRESS = TRUE -# -# # --- Parameters for the test -------------------------------------- -# -# # start an office if the parameter is set for the makefile -# .IF "$(OFFICE)" == "" -# CT_APPEXECCOMMAND = -# .ELSE -# CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -# .ENDIF -# -# # test base is java complex -# CT_TESTBASE = -TestBase java_complex -# -# # test looks something like the.full.package.TestName -# CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) -# -# # start the runner application -# CT_APP = org.openoffice.Runner -# -# # --- Targets ------------------------------------------------------ -# -# .IF "$(depend)" == "" -# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLTAR -# .ELSE -# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : ALLDEP -# .ENDIF -# -# .INCLUDE : target.mk -# -# $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props : $(JAVAFILES:b).props -# cp $(JAVAFILES:b).props $(CLASSDIR)$/$(PACKAGE)$/$(JAVAFILES:b).props -# jar uf $(CLASSDIR)$/$(JARTARGET) -C $(CLASSDIR) $(PACKAGE)$/$(JAVAFILES:b).props -# -# RUN: run -# -# run: -# +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST) -tdoc $(PWD)$/testdocuments -# -# -# diff --git a/framework/qa/complex/path_settings/makefile.mk b/framework/qa/complex/path_settings/makefile.mk deleted file mode 100755 index 05900d46e190..000000000000 --- a/framework/qa/complex/path_settings/makefile.mk +++ /dev/null @@ -1,62 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -# @echo "OOO_SUBSEQUENT_TESTS not set, do nothing." -.ELSE - -PRJ = ../../.. -PRJNAME = framework -TARGET = qa_complex_path_settings - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/path_settings - -# here store only Files which contain a @Test -JAVATESTFILES = \ - PathSettingsTest.java - -# put here all other files -JAVAFILES = $(JAVATESTFILES) - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) - -# Sample how to debug -# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y - -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END - diff --git a/framework/qa/complex/path_substitution/makefile.mk b/framework/qa/complex/path_substitution/makefile.mk deleted file mode 100755 index 338affbf70d7..000000000000 --- a/framework/qa/complex/path_substitution/makefile.mk +++ /dev/null @@ -1,122 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = framework -TARGET = qa_complex_path_substitution - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/path_substitution - -# here store only Files which contain a @Test -JAVATESTFILES = \ - PathSubstitutionTest.java - -# put here all other files -JAVAFILES = $(JAVATESTFILES) - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) - -# Sample how to debug -# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y - -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END - - -# -# -# -# -# PRJ = ..$/..$/.. -# TARGET = PathSubstitution -# PRJNAME = $(TARGET) -# PACKAGE = complex$/path_substitution -# -# # --- Settings ----------------------------------------------------- -# .INCLUDE: settings.mk -# -# -# #----- compile .java files ----------------------------------------- -# -# JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar -# JAVAFILES = PathSubstitutionTest.java -# JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) -# -# #----- make a jar from compiled files ------------------------------ -# -# MAXLINELENGTH = 100000 -# -# JARCLASSDIRS = $(PACKAGE) -# JARTARGET = $(TARGET).jar -# JARCOMPRESS = TRUE -# -# # --- Parameters for the test -------------------------------------- -# -# # start an office if the parameter is set for the makefile -# .IF "$(OFFICE)" == "" -# CT_APPEXECCOMMAND = -# .ELSE -# CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;" -# .ENDIF -# -# # test base is java complex -# CT_TESTBASE = -TestBase java_complex -# -# # test looks something like the.full.package.TestName -# CT_TEST = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b) -# -# # start the runner application -# CT_APP = org.openoffice.Runner -# -# # --- Targets ------------------------------------------------------ -# -# .IF "$(depend)" == "" -# ALL : ALLTAR -# .ELSE -# ALL: ALLDEP -# .ENDIF -# -# .INCLUDE : target.mk -# -# RUN: run -# -# run: -# +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_TEST) -# diff --git a/framework/qa/unoapi/makefile.mk b/framework/qa/unoapi/makefile.mk deleted file mode 100755 index 38a6cf7cced8..000000000000 --- a/framework/qa/unoapi/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -#***********************************************************************/ - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../.. -PRJNAME = framework -TARGET = qa_unoapi - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = org/openoffice/framework/qa/unoapi -JAVATESTFILES = Test.java -JAVAFILES = $(JAVATESTFILES) -JARFILES = OOoRunner.jar ridl.jar test.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END diff --git a/framework/source/accelerators/makefile.mk b/framework/source/accelerators/makefile.mk deleted file mode 100644 index 23a60dd1870e..000000000000 --- a/framework/source/accelerators/makefile.mk +++ /dev/null @@ -1,52 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= framework -TARGET= fwk_accelerators -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Generate ----------------------------------------------------- - -SLOFILES= \ - $(SLO)$/keymapping.obj \ - $(SLO)$/storageholder.obj \ - $(SLO)$/presethandler.obj \ - $(SLO)$/acceleratorcache.obj \ - $(SLO)$/acceleratorconfiguration.obj \ - $(SLO)$/globalacceleratorconfiguration.obj \ - $(SLO)$/moduleacceleratorconfiguration.obj \ - $(SLO)$/documentacceleratorconfiguration.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/framework/source/application/makefile.mk b/framework/source/application/makefile.mk deleted file mode 100644 index 96bd84de2373..000000000000 --- a/framework/source/application/makefile.mk +++ /dev/null @@ -1,45 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= framework -TARGET= framework -LIBTARGET= NO -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -SLOFILES= $(SLO)$/login.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/framework/source/classes/makefile.mk b/framework/source/classes/makefile.mk deleted file mode 100644 index 458aa328ac32..000000000000 --- a/framework/source/classes/makefile.mk +++ /dev/null @@ -1,54 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= framework -TARGET= fwk_classes -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Generate ----------------------------------------------------- - -SLOFILES= \ - $(SLO)$/droptargetlistener.obj \ - $(SLO)$/framecontainer.obj \ - $(SLO)$/fwktabwindow.obj \ - $(SLO)$/fwlresid.obj \ - $(SLO)$/menumanager.obj \ - $(SLO)$/taskcreator.obj \ - -SRS1NAME=$(TARGET) -SRC1FILES =\ - resource.src - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/framework/source/constant/makefile.mk b/framework/source/constant/makefile.mk deleted file mode 100644 index 05fc28870d0a..000000000000 --- a/framework/source/constant/makefile.mk +++ /dev/null @@ -1,45 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. -PRJNAME= framework -TARGET= fwk_constant -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Generate ----------------------------------------------------- - -SLOFILES= $(SLO)$/frameloader.obj \ - $(SLO)$/contenthandler.obj \ - $(SLO)$/containerquery.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/framework/source/dispatch/makefile.mk b/framework/source/dispatch/makefile.mk deleted file mode 100644 index f1215216a585..000000000000 --- a/framework/source/dispatch/makefile.mk +++ /dev/null @@ -1,62 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= framework -TARGET= fwk_dispatch -USE_DEFFILE= TRUE -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- defines ------------------------------------------------------ - -CDEFS+=-DCOMPMOD_NAMESPACE=framework - -# --- Generate ----------------------------------------------------- - -SLOFILES=\ - $(SLO)$/closedispatcher.obj \ - $(SLO)$/dispatchinformationprovider.obj \ - $(SLO)$/dispatchprovider.obj \ - $(SLO)$/helpagentdispatcher.obj \ - $(SLO)$/interceptionhelper.obj \ - $(SLO)$/loaddispatcher.obj \ - $(SLO)$/mailtodispatcher.obj \ - $(SLO)$/menudispatcher.obj \ - $(SLO)$/oxt_handler.obj \ - $(SLO)$/popupmenudispatcher.obj \ - $(SLO)$/servicehandler.obj \ - $(SLO)$/systemexec.obj \ - $(SLO)$/windowcommanddispatch.obj \ - $(SLO)$/startmoduledispatcher.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/framework/source/fwe/classes/makefile.mk b/framework/source/fwe/classes/makefile.mk deleted file mode 100644 index b5743577c993..000000000000 --- a/framework/source/fwe/classes/makefile.mk +++ /dev/null @@ -1,58 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME= framework -TARGET= fwk_fweclasses -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CDEFS+=-DFWE_DLLIMPLEMENTATION - -# --- Generate ----------------------------------------------------- - -SLOFILES= \ - $(SLO)$/actiontriggercontainer.obj \ - $(SLO)$/actiontriggerpropertyset.obj \ - $(SLO)$/actiontriggerseparatorpropertyset.obj \ - $(SLO)$/addonmenu.obj \ - $(SLO)$/addonsoptions.obj \ - $(SLO)$/bmkmenu.obj \ - $(SLO)$/fwkresid.obj \ - $(SLO)$/imagewrapper.obj \ - $(SLO)$/menuextensionsupplier.obj \ - $(SLO)$/rootactiontriggercontainer.obj \ - $(SLO)$/sfxhelperfunctions.obj \ - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/framework/source/fwe/dispatch/makefile.mk b/framework/source/fwe/dispatch/makefile.mk deleted file mode 100644 index 2529236ceaa6..000000000000 --- a/framework/source/fwe/dispatch/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME= framework -TARGET= fwk_fwedispatch -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- defines ------------------------------------------------------ - -CDEFS+=-DCOMPMOD_NAMESPACE=framework -DFWE_DLLIMPLEMENTATION - -# --- Generate ----------------------------------------------------- - -SLOFILES=\ - $(SLO)$/interaction.obj \ - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/framework/source/fwe/helper/makefile.mk b/framework/source/fwe/helper/makefile.mk deleted file mode 100644 index 75bbb9b476fa..000000000000 --- a/framework/source/fwe/helper/makefile.mk +++ /dev/null @@ -1,55 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME= framework -TARGET= fwk_fwehelper -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- defines ------------------------------------------------------ - -CDEFS+=-DCOMPMOD_NAMESPACE=framework -DFWE_DLLIMPLEMENTATION - -# --- Generate ----------------------------------------------------- - -SLOFILES=\ -$(SLO)$/acceleratorinfo.obj \ -$(SLO)$/actiontriggerhelper.obj \ -$(SLO)$/configimporter.obj \ -$(SLO)$/imageproducer.obj \ -$(SLO)$/propertysetcontainer.obj \ -$(SLO)$/titlehelper.obj \ -$(SLO)$/uiconfigelementwrapperbase.obj \ -$(SLO)$/uielementwrapperbase.obj \ - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/framework/source/fwe/interaction/makefile.mk b/framework/source/fwe/interaction/makefile.mk deleted file mode 100644 index c9d1e4304ecc..000000000000 --- a/framework/source/fwe/interaction/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME= framework -TARGET= fwk_fweinteraction -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- defines ------------------------------------------------------ - -CDEFS+=-DCOMPMOD_NAMESPACE=framework -DFWE_DLLIMPLEMENTATION - -# --- Generate ----------------------------------------------------- - -SLOFILES= \ - $(SLO)$/preventduplicateinteraction.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/framework/source/fwe/xml/makefile.mk b/framework/source/fwe/xml/makefile.mk deleted file mode 100644 index 8870189b4b8e..000000000000 --- a/framework/source/fwe/xml/makefile.mk +++ /dev/null @@ -1,59 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME= framework -TARGET= fwk_fwexml -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CDEFS += -DFWE_DLLIMPLEMENTATION - -# --- Generate ----------------------------------------------------- - -SLOFILES= \ - $(SLO)$/eventsconfiguration.obj \ - $(SLO)$/eventsdocumenthandler.obj \ - $(SLO)$/imagesconfiguration.obj \ - $(SLO)$/imagesdocumenthandler.obj \ - $(SLO)$/menuconfiguration.obj \ - $(SLO)$/menudocumenthandler.obj \ - $(SLO)$/saxnamespacefilter.obj \ - $(SLO)$/statusbarconfiguration.obj \ - $(SLO)$/statusbardocumenthandler.obj \ - $(SLO)$/toolboxconfiguration.obj \ - $(SLO)$/toolboxdocumenthandler.obj \ - $(SLO)$/toolboxlayoutdocumenthandler.obj \ - $(SLO)$/xmlnamespaces.obj \ - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/framework/source/fwi/classes/makefile.mk b/framework/source/fwi/classes/makefile.mk deleted file mode 100644 index 0da8940139ee..000000000000 --- a/framework/source/fwi/classes/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME= framework -TARGET= fwk_fwiclasses -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CDEFS+=-DFWI_DLLIMPLEMENTATION - -# --- Generate ----------------------------------------------------- - -SLOFILES= \ - $(SLO)$/converter.obj \ - $(SLO)$/framelistanalyzer.obj \ - $(SLO)$/propertysethelper.obj \ - $(SLO)$/protocolhandlercache.obj \ - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/framework/source/fwi/helper/makefile.mk b/framework/source/fwi/helper/makefile.mk deleted file mode 100644 index c44bef68037c..000000000000 --- a/framework/source/fwi/helper/makefile.mk +++ /dev/null @@ -1,51 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME= framework -TARGET= fwk_fwihelper -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- defines ------------------------------------------------------ - -CDEFS+=-DCOMPMOD_NAMESPACE=framework -DFWI_DLLIMPLEMENTATION - -# --- Generate ----------------------------------------------------- - -SLOFILES= \ - $(SLO)$/mischelper.obj \ - $(SLO)$/networkdomain.obj \ - $(SLO)$/popupmenucontrollerbase.obj \ - $(SLO)$/shareablemutex.obj \ - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/framework/source/fwi/jobs/makefile.mk b/framework/source/fwi/jobs/makefile.mk deleted file mode 100644 index 8e707bd780fe..000000000000 --- a/framework/source/fwi/jobs/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME= framework -TARGET= fwk_fwijobs -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CDEFS += -DFWI_DLLIMPLEMENTATION - -# --- Generate ----------------------------------------------------- - -SLOFILES= \ - $(SLO)$/jobconst.obj \ - $(SLO)$/configaccess.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/framework/source/fwi/threadhelp/makefile.mk b/framework/source/fwi/threadhelp/makefile.mk deleted file mode 100644 index bea08c6db7e2..000000000000 --- a/framework/source/fwi/threadhelp/makefile.mk +++ /dev/null @@ -1,45 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME= framework -TARGET= fwk_threadhelp -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CDEFS += -DFWI_DLLIMPLEMENTATION -# --- Generate ----------------------------------------------------- - -SLOFILES= $(SLO)$/lockhelper.obj \ - $(SLO)$/transactionmanager.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/framework/source/fwi/uielement/makefile.mk b/framework/source/fwi/uielement/makefile.mk deleted file mode 100644 index 68d0df5740eb..000000000000 --- a/framework/source/fwi/uielement/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME= framework -TARGET= fwk_fwiuielement -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CDEFS += -DFWI_DLLIMPLEMENTATION - -# --- Generate ----------------------------------------------------- - -SLOFILES= \ - $(SLO)$/constitemcontainer.obj \ - $(SLO)$/itemcontainer.obj \ - $(SLO)$/rootitemcontainer.obj \ - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/framework/source/helper/makefile.mk b/framework/source/helper/makefile.mk deleted file mode 100644 index 556a9829d27c..000000000000 --- a/framework/source/helper/makefile.mk +++ /dev/null @@ -1,70 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= framework -TARGET= fwk_helper -USE_DEFFILE= TRUE -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- defines ------------------------------------------------------ - -CDEFS+=-DCOMPMOD_NAMESPACE=framework - -# --- Generate ----------------------------------------------------- - -SLOFILES= $(SLO)$/ocomponentaccess.obj \ - $(SLO)$/ocomponentenumeration.obj \ - $(SLO)$/oframes.obj \ - $(SLO)$/statusindicatorfactory.obj \ - $(SLO)$/statusindicator.obj \ - $(SLO)$/imageproducer.obj \ - $(SLO)$/propertysetcontainer.obj \ - $(SLO)$/actiontriggerhelper.obj \ - $(SLO)$/persistentwindowstate.obj \ - $(SLO)$/networkdomain.obj \ - $(SLO)$/acceleratorinfo.obj \ - $(SLO)$/uielementwrapperbase.obj \ - $(SLO)$/popupmenucontrollerbase.obj \ - $(SLO)$/dockingareadefaultacceptor.obj \ - $(SLO)$/uiconfigelementwrapperbase.obj \ - $(SLO)$/shareablemutex.obj \ - $(SLO)$/vclstatusindicator.obj \ - $(SLO)$/wakeupthread.obj \ - $(SLO)$/configimporter.obj \ - $(SLO)$/tagwindowasmodified.obj \ - $(SLO)$/titlebarupdate.obj \ - $(SLO)$/titlehelper.obj \ - $(SLO)$/mischelper.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/framework/source/interaction/makefile.mk b/framework/source/interaction/makefile.mk deleted file mode 100644 index ce1deef15724..000000000000 --- a/framework/source/interaction/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= framework -TARGET= fwk_interaction -USE_DEFFILE= TRUE -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- defines ------------------------------------------------------ - -CDEFS+=-DCOMPMOD_NAMESPACE=framework - -# --- Generate ----------------------------------------------------- - -SLOFILES= $(SLO)$/quietinteraction.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/framework/source/jobs/makefile.mk b/framework/source/jobs/makefile.mk deleted file mode 100644 index 1846e3d1ffd9..000000000000 --- a/framework/source/jobs/makefile.mk +++ /dev/null @@ -1,51 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= framework -TARGET= fwk_jobs -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Generate ----------------------------------------------------- - -SLOFILES= $(SLO)$/jobexecutor.obj \ - $(SLO)$/jobdispatch.obj \ - $(SLO)$/job.obj \ - $(SLO)$/jobdata.obj \ - $(SLO)$/jobresult.obj \ - $(SLO)$/joburl.obj \ - $(SLO)$/helponstartup.obj \ - $(SLO)$/shelljob.obj \ - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/framework/source/layoutmanager/makefile.mk b/framework/source/layoutmanager/makefile.mk deleted file mode 100644 index 70215a36578d..000000000000 --- a/framework/source/layoutmanager/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= framework -TARGET= fwk_layout -USE_DEFFILE= TRUE -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -VISIBILITY_HIDDEN = TRUE - -# --- Generate ----------------------------------------------------- - -SLOFILES= \ - $(SLO)$/layoutmanager.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/framework/source/loadenv/makefile.mk b/framework/source/loadenv/makefile.mk deleted file mode 100644 index c68ad8d304cb..000000000000 --- a/framework/source/loadenv/makefile.mk +++ /dev/null @@ -1,46 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= framework -TARGET= fwk_loadenv -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Generate ----------------------------------------------------- - -SLOFILES= \ - $(SLO)$/loadenv.obj \ - $(SLO)$/targethelper.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/framework/source/recording/makefile.mk b/framework/source/recording/makefile.mk deleted file mode 100644 index a13eb7b91202..000000000000 --- a/framework/source/recording/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=framework -TARGET=recording -ENABLE_EXCEPTIONS=TRUE -NO_BSYMBOLIC=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -SLOFILES =\ - $(SLO)$/dispatchrecordersupplier.obj\ - $(SLO)$/dispatchrecorder.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/framework/source/register/makefile.mk b/framework/source/register/makefile.mk deleted file mode 100644 index 2920cb283018..000000000000 --- a/framework/source/register/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= framework -TARGET= fwk_register -USE_DEFFILE= TRUE -ENABLE_EXCEPTIONS= TRUE -LIBTARGET= NO - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -VISIBILITY_HIDDEN = TRUE - -# --- Generate ----------------------------------------------------- - -SLOFILES= \ - $(SLO)$/registerservices.obj \ - $(SLO)$/registertemp.obj \ - $(SLO)$/register3rdcomponents.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/framework/source/services/makefile.mk b/framework/source/services/makefile.mk deleted file mode 100644 index 2978d9aacf5e..000000000000 --- a/framework/source/services/makefile.mk +++ /dev/null @@ -1,64 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= framework -TARGET= fwk_services -USE_DEFFILE= TRUE -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Generate ----------------------------------------------------- - -SLOFILES=\ - $(SLO)$/desktop.obj \ - $(SLO)$/frame.obj \ - $(SLO)$/urltransformer.obj \ - $(SLO)$/mediatypedetectionhelper.obj \ - $(SLO)$/substitutepathvars.obj \ - $(SLO)$/pathsettings.obj \ - $(SLO)$/backingcomp.obj \ - $(SLO)$/backingwindow.obj \ - $(SLO)$/dispatchhelper.obj \ - $(SLO)$/license.obj \ - $(SLO)$/modulemanager.obj \ - $(SLO)$/autorecovery.obj \ - $(SLO)$/sessionlistener.obj \ - $(SLO)$/taskcreatorsrv.obj \ - $(SLO)$/uriabbreviation.obj \ - $(SLO)$/tabwindowservice.obj - -SRS1NAME=$(TARGET) -SRC1FILES= fwk_services.src - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/framework/source/tabwin/makefile.mk b/framework/source/tabwin/makefile.mk deleted file mode 100644 index 6147672bdc73..000000000000 --- a/framework/source/tabwin/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= framework -TARGET= fwk_tabwin -USE_DEFFILE= TRUE -NO_BSYMBOLIC= TRUE -ENABLE_EXCEPTIONS= TRUE -BOOTSTRAP_SERVICE= FALSE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Generate ----------------------------------------------------- - -SLOFILES= \ - $(SLO)$/tabwinfactory.obj \ - $(SLO)$/tabwindow.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/framework/source/uiconfiguration/makefile.mk b/framework/source/uiconfiguration/makefile.mk deleted file mode 100644 index ef82e2da76c6..000000000000 --- a/framework/source/uiconfiguration/makefile.mk +++ /dev/null @@ -1,54 +0,0 @@ - -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= framework -TARGET= fwk_uiconfiguration -USE_DEFFILE= TRUE -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Generate ----------------------------------------------------- - -SLOFILES= \ - $(SLO)$/uiconfigurationmanager.obj \ - $(SLO)$/moduleuiconfigurationmanager.obj \ - $(SLO)$/moduleuicfgsupplier.obj \ - $(SLO)$/windowstateconfiguration.obj \ - $(SLO)$/moduleimagemanager.obj \ - $(SLO)$/imagemanager.obj \ - $(SLO)$/imagemanagerimpl.obj \ - $(SLO)$/graphicnameaccess.obj \ - $(SLO)$/uicategorydescription.obj \ - $(SLO)$/globalsettings.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/framework/source/uielement/makefile.mk b/framework/source/uielement/makefile.mk deleted file mode 100644 index 367ba52a3fdc..000000000000 --- a/framework/source/uielement/makefile.mk +++ /dev/null @@ -1,84 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= framework -TARGET= fwk_uielement -USE_DEFFILE= TRUE -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Generate ----------------------------------------------------- - -SLOFILES= \ - $(SLO)$/addonstoolbarmanager.obj \ - $(SLO)$/addonstoolbarwrapper.obj \ - $(SLO)$/buttontoolbarcontroller.obj \ - $(SLO)$/comboboxtoolbarcontroller.obj \ - $(SLO)$/complextoolbarcontroller.obj \ - $(SLO)$/controlmenucontroller.obj \ - $(SLO)$/dropdownboxtoolbarcontroller.obj \ - $(SLO)$/edittoolbarcontroller.obj \ - $(SLO)$/fontmenucontroller.obj \ - $(SLO)$/fontsizemenucontroller.obj \ - $(SLO)$/footermenucontroller.obj \ - $(SLO)$/generictoolbarcontroller.obj \ - $(SLO)$/headermenucontroller.obj \ - $(SLO)$/imagebuttontoolbarcontroller.obj \ - $(SLO)$/langselectionmenucontroller.obj \ - $(SLO)$/langselectionstatusbarcontroller.obj \ - $(SLO)$/logoimagestatusbarcontroller.obj \ - $(SLO)$/logotextstatusbarcontroller.obj \ - $(SLO)$/macrosmenucontroller.obj \ - $(SLO)$/menubarmanager.obj \ - $(SLO)$/menubarmerger.obj \ - $(SLO)$/menubarwrapper.obj \ - $(SLO)$/newmenucontroller.obj \ - $(SLO)$/objectmenucontroller.obj \ - $(SLO)$/progressbarwrapper.obj \ - $(SLO)$/recentfilesmenucontroller.obj \ - $(SLO)$/simpletextstatusbarcontroller.obj \ - $(SLO)$/spinfieldtoolbarcontroller.obj \ - $(SLO)$/statusbar.obj \ - $(SLO)$/statusbarmanager.obj \ - $(SLO)$/statusbarwrapper.obj \ - $(SLO)$/statusindicatorinterfacewrapper.obj \ - $(SLO)$/togglebuttontoolbarcontroller.obj \ - $(SLO)$/toolbar.obj \ - $(SLO)$/toolbarmanager.obj \ - $(SLO)$/toolbarmerger.obj \ - $(SLO)$/toolbarsmenucontroller.obj \ - $(SLO)$/toolbarwrapper.obj \ - $(SLO)$/popupmenucontroller.obj \ - $(SLO)$/uicommanddescription.obj \ - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/framework/source/uifactory/makefile.mk b/framework/source/uifactory/makefile.mk deleted file mode 100644 index cf820e98738f..000000000000 --- a/framework/source/uifactory/makefile.mk +++ /dev/null @@ -1,54 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME=framework -TARGET= fwk_uifactory -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Generate ----------------------------------------------------- - -SLOFILES= \ - $(SLO)$/popupmenucontrollerfactory.obj \ - $(SLO)$/uielementfactorymanager.obj \ - $(SLO)$/menubarfactory.obj \ - $(SLO)$/toolboxfactory.obj \ - $(SLO)$/addonstoolboxfactory.obj \ - $(SLO)$/toolbarcontrollerfactory.obj \ - $(SLO)$/statusbarfactory.obj \ - $(SLO)$/statusbarcontrollerfactory.obj \ - $(SLO)$/factoryconfiguration.obj \ - $(SLO)$/windowcontentfactorymanager.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/framework/source/xml/makefile.mk b/framework/source/xml/makefile.mk deleted file mode 100644 index a4f18a555ab3..000000000000 --- a/framework/source/xml/makefile.mk +++ /dev/null @@ -1,58 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= framework -TARGET= fwk_xml -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Generate ----------------------------------------------------- - -SLOFILES= \ - $(SLO)$/eventsconfiguration.obj \ - $(SLO)$/eventsdocumenthandler.obj \ - $(SLO)$/imagesconfiguration.obj \ - $(SLO)$/imagesdocumenthandler.obj \ - $(SLO)$/menuconfiguration.obj \ - $(SLO)$/menudocumenthandler.obj \ - $(SLO)$/statusbarconfiguration.obj \ - $(SLO)$/statusbardocumenthandler.obj \ - $(SLO)$/toolboxconfiguration.obj \ - $(SLO)$/toolboxdocumenthandler.obj \ - $(SLO)$/saxnamespacefilter.obj \ - $(SLO)$/xmlnamespaces.obj \ - $(SLO)$/acceleratorconfigurationreader.obj \ - $(SLO)$/acceleratorconfigurationwriter.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/framework/test/makefile.mk b/framework/test/makefile.mk deleted file mode 100644 index 6764af8dd091..000000000000 --- a/framework/test/makefile.mk +++ /dev/null @@ -1,94 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME= framework -TARGET= test -LIBTARGET= NO -ENABLE_EXCEPTIONS= TRUE -USE_DEFFILE= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- applikation: "test" -------------------------------------------------- - -#APP1TARGET= test - -#APP1OBJS= $(SLO)$/test.obj -#DEPOBJFILES+= $(APP1OBJS) - -#APP1LIBS= $(SLB)$/fwk_classes.lib \ -# $(SLB)$/fwk_helper.lib - -#APP1STDLIBS= $(CPPULIB) \ -# $(CPPUHELPERLIB) \ -# $(SALLIB) \ -# $(VOSLIB) \ -# $(TOOLSLIB) \ -# $(SVTOOLLIB) \ -# $(TKLIB) \ -# $(COMPHELPERLIB) \ -# $(VCLLIB) - -#APP1DEPN= $(SLB)$/fwk_helper.lib \ -# $(SLB)$/fwk_classes.lib - -# --- application: "threadtest" -------------------------------------------------- - -APP2TARGET= threadtest - -APP2OBJS= $(SLO)$/threadtest.obj \ - $(SLO)$/transactionmanager.obj \ - $(SLO)$/transactionguard.obj \ - $(SLO)$/fairrwlock.obj \ - $(SLO)$/resetableguard.obj \ - $(SLO)$/gate.obj \ - $(SLO)$/readguard.obj \ - $(SLO)$/writeguard.obj - -DEPOBJFILES+= $(APP2OBJS) - -APP2STDLIBS= $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) \ - $(VOSLIB) \ - $(VCLLIB) - -APP2DEPN= $(SLO)$/fairrwlock.obj \ - $(SLO)$/transactionmanager.obj \ - $(SLO)$/transactionguard.obj \ - $(SLO)$/resetableguard.obj \ - $(SLO)$/gate.obj \ - $(SLO)$/readguard.obj \ - $(SLO)$/writeguard.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/framework/test/threadtest/makefile.mk b/framework/test/threadtest/makefile.mk deleted file mode 100644 index 833c328dc8a8..000000000000 --- a/framework/test/threadtest/makefile.mk +++ /dev/null @@ -1,67 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= framework -TARGET= threadtest -LIBTARGET= NO -ENABLE_EXCEPTIONS= TRUE -USE_DEFFILE= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- application: "threadtest" -------------------------------------------------- - -APP1TARGET= threadtest - -APP1OBJS= $(SLO)$/threadtest.obj \ - $(SLO)$/lockhelper.obj - -DEPOBJFILES=$(APP1OBJS) - -# [ed] 6/16/02 Add the transaction manager library on OS X - -APP1STDLIBS= $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) \ - $(VOSLIB) \ - $(VCLLIB) - -APP1DEPN= $(INC)$/threadhelp$/threadhelpbase.hxx \ - $(INC)$/threadhelp$/transactionbase.hxx \ - $(INC)$/threadhelp$/transactionmanager.hxx \ - $(INC)$/threadhelp$/transactionguard.hxx \ - $(INC)$/threadhelp$/resetableguard.hxx \ - $(INC)$/threadhelp$/readguard.hxx \ - $(INC)$/threadhelp$/writeguard.hxx - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/framework/test/typecfg/makefile.mk b/framework/test/typecfg/makefile.mk deleted file mode 100644 index 83782fdc4d74..000000000000 --- a/framework/test/typecfg/makefile.mk +++ /dev/null @@ -1,73 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= framework -TARGET= typecfg -LIBTARGET= NO -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- applikation: "xml2xcd" -------------------------------------------------- - -# --- applikation: "cfgview" -------------------------------------------------- - -APP2TARGET= cfgview - -APP2OBJS= $(SLO)$/cfgview.obj \ - $(SLO)$/servicemanager.obj \ - $(SLO)$/filtercachedata.obj \ - $(SLO)$/filtercache.obj \ - $(SLO)$/wildcard.obj \ - $(SLO)$/lockhelper.obj - -DEPOBJFILES=$(APP2OBJS) - -APP2STDLIBS= $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) \ - $(VOSLIB) \ - $(TOOLSLIB) \ - $(SVTOOLLIB) \ - $(TKLIB) \ - $(COMPHELPERLIB) \ - $(UNOTOOLSLIB) \ - $(VCLLIB) - -APP2DEPN= $(SLO)$/servicemanager.obj \ - $(SLO)$/filtercachedata.obj \ - $(SLO)$/filtercache.obj \ - $(SLO)$/wildcard.obj \ - $(SLO)$/lockhelper.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/framework/util/guiapps/makefile.mk b/framework/util/guiapps/makefile.mk deleted file mode 100644 index efa5fc3fd88e..000000000000 --- a/framework/util/guiapps/makefile.mk +++ /dev/null @@ -1,67 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME= framework -TARGET= framework_guiapp -TARGETTYPE=GUI - -USE_DEFFILE= TRUE -ENABLE_EXCEPTIONS= TRUE -GEN_HID= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- login applikation ------------------------------------------------------- - -APP1TARGET= login - -APP1OBJS= $(SLO)$/login.obj \ - $(SLO)$/servicemanager.obj \ - $(SLO)$/lockhelper.obj \ - $(SLO)$/transactionmanager.obj - -DEPOBJFILES=$(APP1OBJS) - -APP1STDLIBS= $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) \ - $(VOSLIB) \ - $(TOOLSLIB) \ - $(SVTOOLLIB) \ - $(TKLIB) \ - $(COMPHELPERLIB) \ - $(VCLLIB) - -APP1DEPN= $(SLO)$/servicemanager.obj - -# --- Targets ----------------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk deleted file mode 100644 index 6b7bf5937b00..000000000000 --- a/framework/util/makefile.mk +++ /dev/null @@ -1,383 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME= framework -TARGET= framework - -ENABLE_EXCEPTIONS= TRUE -NO_BSYMBOLIC= TRUE -GEN_HID= TRUE -GEN_HID_OTHER= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -USE_DEFFILE= -SHL1USE_EXPORTS=name -SHL2USE_EXPORTS=name -SHL3USE_EXPORTS=name -SHL4USE_EXPORTS=name -SHL5USE_EXPORTS=name - -# --- internal import ------------------------------------------------- - -LIB1TARGET= $(SLB)$/fwiobj.lib -LIB1OBJFILES= \ - $(SLO)$/converter.obj \ - $(SLO)$/lockhelper.obj \ - $(SLO)$/transactionmanager.obj \ - $(SLO)$/protocolhandlercache.obj \ - $(SLO)$/networkdomain.obj \ - $(SLO)$/configaccess.obj \ - $(SLO)$/shareablemutex.obj \ - $(SLO)$/itemcontainer.obj \ - $(SLO)$/rootitemcontainer.obj \ - $(SLO)$/constitemcontainer.obj \ - $(SLO)$/jobconst.obj \ - $(SLO)$/mischelper.obj \ - $(SLO)$/propertysethelper.obj - - - -# --- export library for sfx2 ------------------------------------------------- - -LIB2TARGET= $(SLB)$/fweobj.lib -LIB2OBJFILES= \ - $(SLO)$/bmkmenu.obj \ - $(SLO)$/eventsconfiguration.obj \ - $(SLO)$/eventsdocumenthandler.obj \ - $(SLO)$/imageproducer.obj \ - $(SLO)$/menuconfiguration.obj \ - $(SLO)$/menudocumenthandler.obj \ - $(SLO)$/saxnamespacefilter.obj \ - $(SLO)$/statusbarconfiguration.obj \ - $(SLO)$/statusbardocumenthandler.obj \ - $(SLO)$/toolboxconfiguration.obj \ - $(SLO)$/toolboxdocumenthandler.obj \ - $(SLO)$/imagesconfiguration.obj \ - $(SLO)$/imagesdocumenthandler.obj \ - $(SLO)$/xmlnamespaces.obj \ - $(SLO)$/actiontriggerpropertyset.obj \ - $(SLO)$/actiontriggerseparatorpropertyset.obj \ - $(SLO)$/actiontriggercontainer.obj \ - $(SLO)$/propertysetcontainer.obj \ - $(SLO)$/rootactiontriggercontainer.obj \ - $(SLO)$/actiontriggerhelper.obj \ - $(SLO)$/imagewrapper.obj \ - $(SLO)$/interaction.obj \ - $(SLO)$/addonmenu.obj \ - $(SLO)$/addonsoptions.obj \ - $(SLO)$/fwkresid.obj \ - $(SLO)$/acceleratorinfo.obj \ - $(SLO)$/sfxhelperfunctions.obj \ - $(SLO)$/uielementwrapperbase.obj \ - $(SLO)$/uiconfigelementwrapperbase.obj \ - $(SLO)$/configimporter.obj \ - $(SLO)$/menuextensionsupplier.obj \ - $(SLO)$/preventduplicateinteraction.obj \ - $(SLO)$/framelistanalyzer.obj \ - $(SLO)$/titlehelper.obj - -# --- import classes library --------------------------------------------------- - -SHL1TARGET= fwi$(DLLPOSTFIX) -SHL1IMPLIB= ifwi -SHL1LIBS= $(LIB1TARGET) -SHL1STDLIBS= \ - $(UNOTOOLSLIB) \ - $(CPPUHELPERLIB) \ - $(TOOLSLIB) \ - $(SVTOOLLIB) \ - $(SVLLIB) \ - $(I18NISOLANGLIB) \ - $(VOSLIB) \ - $(VCLLIB) \ - $(TKLIB) \ - $(CPPULIB) \ - $(SALLIB) - -.IF "$(GUI)"=="WNT" -SHL1STDLIBS+=\ - $(UWINAPILIB) \ - $(UNICOWSLIB) \ - $(ADVAPI32LIB) \ - $(KERNEL32LIB) -.ENDIF - -# --- export classes library --------------------------------------------------- - -SHL2TARGET= fwe$(DLLPOSTFIX) -SHL2IMPLIB= ifwe -SHL2LIBS= $(LIB2TARGET) -SHL2STDLIBS= \ - $(FWILIB) \ - $(VCLLIB) \ - $(SVLLIB) \ - $(SVTOOLLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(VOSLIB) \ - $(SALLIB) - -# --- light services library ---------------------------------------------------- - -SHL3TARGET= fwl$(DLLPOSTFIX) -SHL3IMPLIB= ifwl -SHL3OBJS= $(SLO)$/mediatypedetectionhelper.obj\ - $(SLO)$/registertemp.obj \ - $(SLO)$/mailtodispatcher.obj \ - $(SLO)$/oxt_handler.obj \ - $(SLO)$/toolbarsmenucontroller.obj \ - $(SLO)$/newmenucontroller.obj \ - $(SLO)$/macrosmenucontroller.obj \ - $(SLO)$/langselectionmenucontroller.obj \ - $(SLO)$/headermenucontroller.obj \ - $(SLO)$/footermenucontroller.obj \ - $(SLO)$/fontsizemenucontroller.obj \ - $(SLO)$/fontmenucontroller.obj \ - $(SLO)$/tabwindowservice.obj \ - $(SLO)$/fwktabwindow.obj \ - $(SLO)$/logotextstatusbarcontroller.obj \ - $(SLO)$/fwlresid.obj \ - $(SLO)$/logoimagestatusbarcontroller.obj \ - $(SLO)$/simpletextstatusbarcontroller.obj \ - $(SLO)$/uriabbreviation.obj \ - $(SLO)$/servicehandler.obj \ - $(SLO)$/license.obj \ - $(SLO)$/dispatchrecorder.obj \ - $(SLO)$/dispatchrecordersupplier.obj\ - $(SLO)$/dispatchhelper.obj \ - $(SLO)$/popupmenudispatcher.obj \ - -SHL3STDLIBS= \ - $(FWILIB) \ - $(FWELIB) \ - $(SVLLIB) \ - $(TKLIB) \ - $(SVTOOLLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(I18NISOLANGLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(COMPHELPERLIB) \ - $(CPPULIB) \ - $(VCLLIB) \ - $(SALLIB) - -# --- services library ---------------------------------------------------- - -SHL4TARGET= fwk$(DLLPOSTFIX) -SHL4IMPLIB= ifwk -SHL4OBJS= \ - $(SLO)$/acceleratorcache.obj \ - $(SLO)$/acceleratorconfiguration.obj \ - $(SLO)$/acceleratorconfigurationreader.obj \ - $(SLO)$/acceleratorconfigurationwriter.obj \ - $(SLO)$/addonstoolbarmanager.obj \ - $(SLO)$/addonstoolbarwrapper.obj \ - $(SLO)$/addonstoolboxfactory.obj \ - $(SLO)$/autorecovery.obj \ - $(SLO)$/backingcomp.obj \ - $(SLO)$/backingwindow.obj \ - $(SLO)$/buttontoolbarcontroller.obj \ - $(SLO)$/closedispatcher.obj \ - $(SLO)$/comboboxtoolbarcontroller.obj \ - $(SLO)$/complextoolbarcontroller.obj \ - $(SLO)$/containerquery.obj \ - $(SLO)$/contenthandler.obj \ - $(SLO)$/controlmenucontroller.obj \ - $(SLO)$/desktop.obj \ - $(SLO)$/dispatchinformationprovider.obj \ - $(SLO)$/dispatchprovider.obj \ - $(SLO)$/dockingareadefaultacceptor.obj \ - $(SLO)$/documentacceleratorconfiguration.obj \ - $(SLO)$/dropdownboxtoolbarcontroller.obj \ - $(SLO)$/droptargetlistener.obj \ - $(SLO)$/edittoolbarcontroller.obj \ - $(SLO)$/factoryconfiguration.obj \ - $(SLO)$/filter.obj \ - $(SLO)$/framecontainer.obj \ - $(SLO)$/frameloader.obj \ - $(SLO)$/frame.obj \ - $(SLO)$/generictoolbarcontroller.obj \ - $(SLO)$/globalacceleratorconfiguration.obj \ - $(SLO)$/globalsettings.obj \ - $(SLO)$/graphicnameaccess.obj \ - $(SLO)$/helpagentdispatcher.obj \ - $(SLO)$/imagebuttontoolbarcontroller.obj \ - $(SLO)$/imagemanager.obj \ - $(SLO)$/imagemanagerimpl.obj \ - $(SLO)$/interceptionhelper.obj \ - $(SLO)$/jobdata.obj \ - $(SLO)$/jobdispatch.obj \ - $(SLO)$/jobexecutor.obj \ - $(SLO)$/job.obj \ - $(SLO)$/jobresult.obj \ - $(SLO)$/joburl.obj \ - $(SLO)$/keymapping.obj \ - $(SLO)$/langselectionstatusbarcontroller.obj \ - $(SLO)$/layoutmanager.obj \ - $(SLO)$/loaddispatcher.obj \ - $(SLO)$/loadenv.obj \ - $(SLO)$/menubarfactory.obj \ - $(SLO)$/menubarmanager.obj \ - $(SLO)$/menubarmerger.obj \ - $(SLO)$/menubarwrapper.obj \ - $(SLO)$/menudispatcher.obj \ - $(SLO)$/menumanager.obj \ - $(SLO)$/moduleacceleratorconfiguration.obj \ - $(SLO)$/moduleimagemanager.obj \ - $(SLO)$/modulemanager.obj \ - $(SLO)$/moduleuicfgsupplier.obj \ - $(SLO)$/moduleuiconfigurationmanager.obj \ - $(SLO)$/objectmenucontroller.obj \ - $(SLO)$/ocomponentaccess.obj \ - $(SLO)$/ocomponentenumeration.obj \ - $(SLO)$/oframes.obj \ - $(SLO)$/pathsettings.obj \ - $(SLO)$/persistentwindowstate.obj \ - $(SLO)$/popupmenucontrollerfactory.obj\ - $(SLO)$/presethandler.obj \ - $(SLO)$/progressbarwrapper.obj \ - $(SLO)$/recentfilesmenucontroller.obj \ - $(SLO)$/registerservices.obj \ - $(SLO)$/sessionlistener.obj \ - $(SLO)$/spinfieldtoolbarcontroller.obj \ - $(SLO)$/statusbarcontrollerfactory.obj\ - $(SLO)$/statusbarfactory.obj \ - $(SLO)$/statusbarmanager.obj \ - $(SLO)$/statusbar.obj \ - $(SLO)$/statusbarwrapper.obj \ - $(SLO)$/statusindicatorfactory.obj \ - $(SLO)$/statusindicatorinterfacewrapper.obj \ - $(SLO)$/statusindicator.obj \ - $(SLO)$/quietinteraction.obj \ - $(SLO)$/storageholder.obj \ - $(SLO)$/substitutepathvars.obj \ - $(SLO)$/tagwindowasmodified.obj \ - $(SLO)$/targethelper.obj \ - $(SLO)$/taskcreator.obj \ - $(SLO)$/taskcreatorsrv.obj \ - $(SLO)$/titlebarupdate.obj \ - $(SLO)$/togglebuttontoolbarcontroller.obj \ - $(SLO)$/toolbarcontrollerfactory.obj\ - $(SLO)$/toolbarmanager.obj \ - $(SLO)$/toolbarmerger.obj \ - $(SLO)$/toolbar.obj \ - $(SLO)$/toolbarwrapper.obj \ - $(SLO)$/toolboxfactory.obj \ - $(SLO)$/uicategorydescription.obj \ - $(SLO)$/uicommanddescription.obj \ - $(SLO)$/uiconfigurationmanager.obj \ - $(SLO)$/uielementfactorymanager.obj \ - $(SLO)$/urltransformer.obj \ - $(SLO)$/vclstatusindicator.obj \ - $(SLO)$/wakeupthread.obj \ - $(SLO)$/windowcommanddispatch.obj \ - $(SLO)$/windowstateconfiguration.obj \ - $(SLO)$/windowcontentfactorymanager.obj \ - $(SLO)$/startmoduledispatcher.obj - -SHL4STDLIBS= \ - $(FWILIB) \ - $(FWELIB) \ - $(SVTOOLLIB) \ - $(TKLIB) \ - $(VCLLIB) \ - $(SVLLIB) \ - $(SOTLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(UCBHELPERLIB) \ - $(I18NISOLANGLIB) - -# --- services library ---------------------------------------------------- - -SHL5TARGET= fwm$(DLLPOSTFIX) -SHL5IMPLIB= ifwm -SHL5OBJS= \ - $(SLO)$/helponstartup.obj \ - $(SLO)$/tabwinfactory.obj \ - $(SLO)$/tabwindow.obj \ - $(SLO)$/systemexec.obj \ - $(SLO)$/shelljob.obj \ - $(SLO)$/register3rdcomponents.obj - -SHL5STDLIBS= \ - $(FWILIB) \ - $(TKLIB) \ - $(VCLLIB) \ - $(TOOLSLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -RESLIB1NAME= fwe -RESLIB1IMAGES= $(PRJ)$/res -RESLIB1SRSFILES= $(SRS)$/fwk_classes.srs \ - $(SRS)$/fwk_services.srs \ - -SHL2DEPN= $(SHL1IMPLIBN) $(SHL1TARGETN) -SHL3DEPN= $(SHL1IMPLIBN) $(SHL1TARGETN) $(SHL2TARGETN) -SHL4DEPN= $(SHL1IMPLIBN) $(SHL1TARGETN) $(SHL2IMPLIBN) $(SHL2TARGETN) -SHL5DEPN= $(SHL1IMPLIBN) $(SHL1TARGETN) - -# --- Targets ----------------------------------------------------------------- - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/fwk.component $(MISC)/fwl.component $(MISC)/fwm.component - -$(MISC)/fwk.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - fwk.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL4TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt fwk.component - -$(MISC)/fwl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - fwl.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL3TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt fwl.component - -$(MISC)/fwm.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - fwm.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL5TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt fwm.component - diff --git a/sfx2/inc/makefile.mk b/sfx2/inc/makefile.mk deleted file mode 100644 index b7aa547e2c79..000000000000 --- a/sfx2/inc/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME=sfx2 -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" - diff --git a/sfx2/qa/complex/docinfo/makefile.mk b/sfx2/qa/complex/docinfo/makefile.mk deleted file mode 100644 index 626b648a6d06..000000000000 --- a/sfx2/qa/complex/docinfo/makefile.mk +++ /dev/null @@ -1,63 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = sfx2 -TARGET = qa_complex_docinfo - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/docinfo -JAVATESTFILES = \ - DocumentProperties.java - -JAVAFILES = $(JAVATESTFILES) - - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) - -# Sample how to debug -# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y - -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END - - - - - diff --git a/sfx2/qa/complex/framework/DocHelper/makefile.mk b/sfx2/qa/complex/framework/DocHelper/makefile.mk deleted file mode 100644 index ad614cfca3f8..000000000000 --- a/sfx2/qa/complex/framework/DocHelper/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ = ../../../.. -TARGET = DocHelper -PRJNAME = $(TARGET) -PACKAGE = complex/framework/dochelper - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -JAVAFILES = \ - DialogThread.java \ - WriterHelper.java - -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/sfx2/qa/complex/framework/makefile.mk b/sfx2/qa/complex/framework/makefile.mk deleted file mode 100644 index 325135b9133c..000000000000 --- a/sfx2/qa/complex/framework/makefile.mk +++ /dev/null @@ -1,65 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = sfx2 -TARGET = qa_complex_framework - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/framework -JAVATESTFILES = \ - DocumentPropertiesTest.java \ - DocumentMetadataAccessTest.java \ - CheckGlobalEventBroadcaster_writer1.java - -JAVAFILES = $(JAVATESTFILES) \ - TestDocument.java \ - WriterHelper.java \ - DialogThread.java - - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) - -# Sample how to debug -# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y - -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END - - diff --git a/sfx2/qa/complex/standalonedocumentinfo/makefile.mk b/sfx2/qa/complex/standalonedocumentinfo/makefile.mk deleted file mode 100644 index aade48dbd789..000000000000 --- a/sfx2/qa/complex/standalonedocumentinfo/makefile.mk +++ /dev/null @@ -1,56 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = sfx2 -TARGET = qa_complex_standalonedocumentinfo - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/standalonedocumentinfo -JAVATESTFILES = \ - StandaloneDocumentInfoUnitTest.java - -JAVAFILES = $(JAVATESTFILES) \ - StandaloneDocumentInfoTest.java \ - Test01.java \ - TestHelper.java - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END diff --git a/sfx2/qa/cppunit/makefile.mk b/sfx2/qa/cppunit/makefile.mk deleted file mode 100644 index dce0b86a0619..000000000000 --- a/sfx2/qa/cppunit/makefile.mk +++ /dev/null @@ -1,81 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=../.. -PRJNAME=sfx2 -TARGET=qa_cppunit - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -#building with stlport, but cppunit was not built with stlport -.IF "$(USE_SYSTEM_STL)"!="YES" -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGSCXX+=-DADAPT_EXT_STL -.ENDIF -.ENDIF - -CFLAGSCXX += $(CPPUNIT_CFLAGS) -DLLPRE = # no leading "lib" on .so files - -# --- Libs --------------------------------------------------------- - -SHL1OBJS= \ - $(SLO)/test_metadatable.obj \ - - -SHL1STDLIBS= \ - $(CPPUNITLIB) \ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(VCLLIB) \ - $(SFXLIB) \ - - -SHL1TARGET= test_metadatable -SHL1RPATH = NONE -SHL1IMPLIB= i$(SHL1TARGET) -# SHL1DEF= $(MISC)/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) -# DEF1EXPORTFILE= export.exp -SHL1VERSIONMAP= version.map - -# --- All object files --------------------------------------------- - -SLOFILES= \ - $(SHL1OBJS) \ - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : _cppunit.mk - diff --git a/sfx2/qa/unoapi/makefile.mk b/sfx2/qa/unoapi/makefile.mk deleted file mode 100644 index ea91ba4d1c44..000000000000 --- a/sfx2/qa/unoapi/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -#***********************************************************************/ - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../.. -PRJNAME = sfx2 -TARGET = qa_unoapi - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = org/openoffice/sfx2/qa/unoapi -JAVATESTFILES = Test.java -JAVAFILES = $(JAVATESTFILES) -JARFILES = OOoRunner.jar ridl.jar test.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END diff --git a/sfx2/sdi/makefile.mk b/sfx2/sdi/makefile.mk deleted file mode 100644 index c02e51eb6998..000000000000 --- a/sfx2/sdi/makefile.mk +++ /dev/null @@ -1,59 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=sfx2 -TARGET=sfxslots - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -.IF "$(L10N_framework)"=="" - -SDI1NAME=$(TARGET) -SDI1EXPORT=sfx -#SIDHRCNAME=sfx.hrc unused??? - -.ENDIF -# --- Files -------------------------------------------------------- - -SVSDI1DEPEND= \ - $(PRJ)$/inc$/sfx2$/sfxsids.hrc \ - sfx.sdi \ - appslots.sdi \ - sfxslots.sdi \ - docslots.sdi \ - viwslots.sdi \ - frmslots.sdi - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sfx2/source/appl/makefile.mk b/sfx2/source/appl/makefile.mk deleted file mode 100644 index 536167abd016..000000000000 --- a/sfx2/source/appl/makefile.mk +++ /dev/null @@ -1,159 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=sfx2 -TARGET=appl -ENABLE_EXCEPTIONS=TRUE -LIBTARGET=NO - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# w.g. compilerbugs -.IF "$(GUI)"=="WNT" -.IF "$(COM)"!="GCC" -CFLAGS+=-Od -CFLAGS+=-DENABLE_QUICKSTART_APPLET -.ENDIF -.ENDIF - -.IF "$(GUIBASE)"=="aqua" -CFLAGS+=-DENABLE_QUICKSTART_APPLET -.ENDIF - -.IF "$(GUI)"=="UNX" - CDEFS+=-DDLL_NAME=libsfx$(DLLPOSTFIX)$(DLLPOST) -.IF "$(ENABLE_SYSTRAY_GTK)"=="TRUE" - PKGCONFIG_MODULES=gtk+-2.0 - .INCLUDE: pkg_config.mk - CFLAGS+=$(PKGCONFIG_CFLAGS) - CFLAGS+=-DENABLE_QUICKSTART_APPLET -# definition moved to shutdownicon.cxx -# CDEFS+=-DPLUGIN_NAME=libqstart_gtk$(DLLPOSTFIX)$(DLLPOST) -.ENDIF # "$(ENABLE_SYSTRAY_GTK)"=="TRUE" -.ELSE - CDEFS+=-DDLL_NAME=sfx$(DLLPOSTFIX)$(DLLPOST) -.ENDIF - -# --- Files -------------------------------------------------------- - -SRS1NAME=appl -SRC1FILES = \ - app.src newhelp.src dde.src - -SRS2NAME=sfx -SRC2FILES = \ - sfx.src - -SFX_OBJECTS = \ - $(SLO)$/app.obj \ - $(SLO)$/appbas.obj \ - $(SLO)$/appcfg.obj \ - $(SLO)$/appchild.obj \ - $(SLO)$/appdata.obj \ - $(SLO)$/appdde.obj \ - $(SLO)$/appinit.obj \ - $(SLO)$/appmain.obj \ - $(SLO)$/appmisc.obj \ - $(SLO)$/appopen.obj \ - $(SLO)$/appquit.obj \ - $(SLO)$/appreg.obj \ - $(SLO)$/appserv.obj \ - $(SLO)$/appuno.obj \ - $(SLO)$/appbaslib.obj \ - $(SLO)$/childwin.obj \ - $(SLO)$/fileobj.obj \ - $(SLO)$/helpdispatch.obj \ - $(SLO)$/helpinterceptor.obj \ - $(SLO)$/imagemgr.obj\ - $(SLO)$/imestatuswindow.obj \ - $(SLO)$/impldde.obj \ - $(SLO)$/linkmgr2.obj \ - $(SLO)$/linksrc.obj \ - $(SLO)$/lnkbase2.obj \ - $(SLO)$/module.obj \ - $(SLO)$/newhelp.obj \ - $(SLO)$/opengrf.obj \ - $(SLO)$/sfxhelp.obj \ - $(SLO)$/sfxpicklist.obj \ - $(SLO)$/shutdownicon.obj \ - $(SLO)$/shutdowniconw32.obj \ - $(SLO)$/workwin.obj \ - $(SLO)$/xpackcreator.obj \ - $(SLO)$/fwkhelper.obj - -.IF "$(GUI)"=="OS2" -SFX_OBJECTS += $(SLO)$/shutdowniconOs2.obj -.ENDIF - -.IF "$(GUIBASE)"=="aqua" -SFX_OBJECTS += $(SLO)$/shutdowniconaqua.obj -.ENDIF - -SLOFILES = $(SFX_OBJECTS) -LIB1TARGET= $(SLB)$/$(TARGET).lib -LIB1OBJFILES= $(SFX_OBJECTS) - -.IF "$(ENABLE_SYSTRAY_GTK)"=="TRUE" -QUICKSTART_OBJECTS = $(SLO)$/shutdowniconunx.obj -SLOFILES += $(QUICKSTART_OBJECTS) - -LIB2TARGET= $(SLB)$/quickstart.lib -LIB2OBJFILES= $(QUICKSTART_OBJECTS) -.ENDIF - -.IF "$(GUI)"=="OS2" -SLOFILES += $(SLO)$/shutdowniconOs2.obj -.ENDIF - -EXCEPTIONSFILES=\ - $(SLO)$/imagemgr.obj \ - $(SLO)$/appopen.obj \ - $(SLO)$/appmain.obj \ - $(SLO)$/appmisc.obj \ - $(SLO)$/appinit.obj \ - $(SLO)$/appcfg.obj \ - $(SLO)$/fileobj.obj \ - $(SLO)$/helpinterceptor.obj \ - $(SLO)$/newhelp.obj \ - $(SLO)$/opengrf.obj \ - $(SLO)$/sfxhelp.obj \ - $(SLO)$/shutdownicon.obj \ - $(SLO)$/shutdowniconw32.obj \ - $(SLO)$/sfxpicklist.obj \ - $(SLO)$/helpdispatch.obj \ - $(SLO)$/xpackcreator.obj - - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sfx2/source/bastyp/makefile.mk b/sfx2/source/bastyp/makefile.mk deleted file mode 100644 index 75c0cace40d6..000000000000 --- a/sfx2/source/bastyp/makefile.mk +++ /dev/null @@ -1,66 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=sfx2 -TARGET=bastyp -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES =\ - $(SLO)$/sfxhtml.obj \ - $(SLO)$/frmhtml.obj \ - $(SLO)$/frmhtmlw.obj \ - $(SLO)$/misc.obj \ - $(SLO)$/progress.obj \ - $(SLO)$/sfxresid.obj \ - $(SLO)$/bitset.obj \ - $(SLO)$/minarray.obj \ - $(SLO)$/fltfnc.obj \ - $(SLO)$/mieclip.obj \ - $(SLO)$/fltlst.obj \ - $(SLO)$/helper.obj - -SRS1NAME=$(TARGET) -SRC1FILES =\ - fltfnc.src \ - bastyp.src - -EXCEPTIONSFILES =\ - $(SLO)$/helper.obj - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sfx2/source/config/makefile.mk b/sfx2/source/config/makefile.mk deleted file mode 100644 index d090babd1505..000000000000 --- a/sfx2/source/config/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=sfx2 -TARGET=config -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/evntconf.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sfx2/source/control/makefile.mk b/sfx2/source/control/makefile.mk deleted file mode 100644 index 86797589e3aa..000000000000 --- a/sfx2/source/control/makefile.mk +++ /dev/null @@ -1,73 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=sfx2 -TARGET=control -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# w.g. compilerbugs -.IF "$(GUI)"=="WNT" -.IF "$(COM)"!="GCC" -CFLAGS+=-Od -.ENDIF -.ENDIF - -.IF "$(COM)"=="GCC" -CFLAGS+=-O0 -.ENDIF - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/bindings.obj \ - $(SLO)$/ctrlitem.obj \ - $(SLO)$/dispatch.obj \ - $(SLO)$/macrconf.obj \ - $(SLO)$/macro.obj \ - $(SLO)$/minfitem.obj \ - $(SLO)$/msg.obj \ - $(SLO)$/msgpool.obj \ - $(SLO)$/objface.obj \ - $(SLO)$/querystatus.obj \ - $(SLO)$/request.obj \ - $(SLO)$/sfxstatuslistener.obj \ - $(SLO)$/shell.obj \ - $(SLO)$/sorgitm.obj \ - $(SLO)$/statcach.obj \ - $(SLO)$/unoctitm.obj - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sfx2/source/dialog/makefile.mk b/sfx2/source/dialog/makefile.mk deleted file mode 100755 index 26acd12c1413..000000000000 --- a/sfx2/source/dialog/makefile.mk +++ /dev/null @@ -1,117 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME=sfx2 -TARGET=dialog - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------------- - -EXCEPTIONSFILES=\ - $(SLO)$/filedlghelper.obj \ - $(SLO)$/filtergrouping.obj \ - $(SLO)$/itemconnect.obj \ - $(SLO)$/mailmodel.obj \ - $(SLO)$/partwnd.obj \ - $(SLO)$/recfloat.obj \ - $(SLO)$/templdlg.obj \ - $(SLO)$/dinfdlg.obj \ - $(SLO)$/dockwin.obj \ - $(SLO)$/taskpane.obj - -SLOFILES =\ - $(EXCEPTIONSFILES) \ - $(SLO)$/about.obj \ - $(SLO)$/alienwarn.obj \ - $(SLO)$/basedlgs.obj \ - $(SLO)$/dinfedt.obj \ - $(SLO)$/intro.obj \ - $(SLO)$/mgetempl.obj \ - $(SLO)$/navigat.obj \ - $(SLO)$/newstyle.obj \ - $(SLO)$/passwd.obj \ - $(SLO)$/printopt.obj \ - $(SLO)$/sfxdlg.obj \ - $(SLO)$/splitwin.obj \ - $(SLO)$/srchdlg.obj \ - $(SLO)$/styfitem.obj \ - $(SLO)$/styledlg.obj \ - $(SLO)$/tabdlg.obj \ - $(SLO)$/tplcitem.obj \ - $(SLO)$/tplpitem.obj \ - $(SLO)$/versdlg.obj \ - $(SLO)$/securitypage.obj \ - $(SLO)$/titledockwin.obj - -SRS1NAME=$(TARGET) -SRC1FILES =\ - recfloat.src \ - alienwarn.src \ - dialog.src \ - dinfdlg.src \ - dinfedt.src \ - filedlghelper.src \ - mailwindow.src \ - mgetempl.src \ - newstyle.src \ - passwd.src \ - templdlg.src \ - versdlg.src \ - printopt.src \ - srchdlg.src \ - securitypage.src \ - titledockwin.src \ - taskpane.src - -.IF "$(BUILD_VER_STRING)"!="" -.IF "$(GUI)"=="UNX" -CFLAGS+=-DBUILD_VER_STRING='"$(BUILD_VER_STRING)"' -.ELSE # "$(GUI)"=="UNX" -CFLAGS+=-DBUILD_VER_STRING="$(subst,",\" "$(BUILD_VER_STRING)")" -.ENDIF # "$(GUI)"=="UNX" -.ENDIF - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -$(SLO)$/about.obj : $(INCCOM)$/aboutbmpnames.hxx - -.INCLUDE .IGNORE : $(MISC)$/about_bmp_names.mk - -.IF "$(ABOUT_BITMAPS:f)"!="$(LASTTIME_ABOUT_BITMAPS)" -DO_PHONY=.PHONY -.ENDIF # "$(ABOUT_BITMAPS:f)"!="$(LASTTIME_ABOUT_BITMAPS)" - -$(INCCOM)$/aboutbmpnames.hxx $(DO_PHONY): - echo const char ABOUT_BITMAP_STRINGLIST[]=$(EMQ)"$(ABOUT_BITMAPS:f:t",")$(EMQ)"$(EMQ); > $@ - echo LASTTIME_ABOUT_BITMAPS=$(ABOUT_BITMAPS:f) > $(MISC)$/about_bmp_names.mk diff --git a/sfx2/source/doc/makefile.mk b/sfx2/source/doc/makefile.mk deleted file mode 100644 index d663d34cf5ba..000000000000 --- a/sfx2/source/doc/makefile.mk +++ /dev/null @@ -1,103 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=sfx2 -TARGET=doc -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -.IF "$(SYSTEM_LIBXML)" == "YES" -CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) -.ENDIF - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = \ - doc.src new.src doctdlg.src docvor.src doctempl.src graphhelp.src - -SLOFILES = \ - $(SLO)$/printhelper.obj \ - $(SLO)$/docinf.obj \ - $(SLO)$/oleprops.obj \ - $(SLO)$/iframe.obj \ - $(SLO)$/plugin.obj \ - $(SLO)$/docfile.obj \ - $(SLO)$/objuno.obj \ - $(SLO)$/frmdescr.obj \ - $(SLO)$/objxtor.obj \ - $(SLO)$/objmisc.obj \ - $(SLO)$/objstor.obj \ - $(SLO)$/objcont.obj \ - $(SLO)$/objserv.obj \ - $(SLO)$/objitem.obj \ - $(SLO)$/ownsubfilterservice.obj \ - $(SLO)$/docfac.obj \ - $(SLO)$/docfilt.obj \ - $(SLO)$/doctempl.obj \ - $(SLO)$/doctemplates.obj \ - $(SLO)$/doctemplateslocal.obj \ - $(SLO)$/docvor.obj \ - $(SLO)$/new.obj \ - $(SLO)$/doctdlg.obj \ - $(SLO)$/sfxbasemodel.obj \ - $(SLO)$/guisaveas.obj\ - $(SLO)$/objembed.obj\ - $(SLO)$/graphhelp.obj \ - $(SLO)$/QuerySaveDocument.obj \ - $(SLO)$/docinsert.obj \ - $(SLO)$/docmacromode.obj \ - $(SLO)$/SfxDocumentMetaData.obj \ - $(SLO)$/DocumentMetadataAccess.obj \ - $(SLO)$/Metadatable.obj \ - $(SLO)$/sfxmodelfactory.obj \ - $(SLO)$/sfxacldetect.obj \ - $(SLO)$/docstoragemodifylistener.obj \ - $(SLO)$/querytemplate.obj \ - $(SLO)$/syspath.obj \ - $(SLO)$/syspathw32.obj - -.IF "$(GUI)" == "WNT" - -#HACK TO DISABLE PCH -NOOPTFILES= \ - $(SLO)$/sfxacldetect.obj \ - $(SLO)$/syspathw32.obj -.ENDIF - - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - - diff --git a/sfx2/source/explorer/makefile.mk b/sfx2/source/explorer/makefile.mk deleted file mode 100644 index 75a15ebdb862..000000000000 --- a/sfx2/source/explorer/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=sfx2 -TARGET=explorer -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/nochaos.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/sfx2/source/inet/makefile.mk b/sfx2/source/inet/makefile.mk deleted file mode 100644 index 9347e68a2cdb..000000000000 --- a/sfx2/source/inet/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=sfx2 -TARGET=inet -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - - -SLOFILES = \ - $(SLO)$/inettbc.obj - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sfx2/source/layout/makefile.mk b/sfx2/source/layout/makefile.mk deleted file mode 100644 index a11ba76a15bd..000000000000 --- a/sfx2/source/layout/makefile.mk +++ /dev/null @@ -1,56 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=sfx2 -TARGET=layout -ENABLE_EXCEPTIONS=true - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -.IF "$(ENABLE_LAYOUT)" == "TRUE" - -SLOFILES = \ - $(SLO)$/sfxdialog.obj -# - -SLOFILES += $(SLO)$/sfxtabdialog.obj \ - $(SLO)$/factory.obj \ - $(SLO)$/sfxtabpage.obj - -.ENDIF # ENABLE_LAYOUT == TRUE - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sfx2/source/menu/makefile.mk b/sfx2/source/menu/makefile.mk deleted file mode 100644 index 8b55bd0840ea..000000000000 --- a/sfx2/source/menu/makefile.mk +++ /dev/null @@ -1,55 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - - -PRJNAME=sfx2 -TARGET=menu -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = menu.src - -SLOFILES = \ - $(SLO)$/mnuitem.obj \ - $(SLO)$/mnumgr.obj \ - $(SLO)$/objmnctl.obj \ - $(SLO)$/thessubmenu.obj \ - $(SLO)$/virtmenu.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sfx2/source/notify/makefile.mk b/sfx2/source/notify/makefile.mk deleted file mode 100644 index e2ddde40f936..000000000000 --- a/sfx2/source/notify/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=sfx2 -TARGET=notify - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/eventsupplier.obj \ - $(SLO)$/hintpost.obj - -EXCEPTIONSFILES = \ - $(SLO)$/eventsupplier.obj -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sfx2/source/statbar/makefile.mk b/sfx2/source/statbar/makefile.mk deleted file mode 100644 index f99c8fcdaa1e..000000000000 --- a/sfx2/source/statbar/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=sfx2 -TARGET=statbar -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/stbitem.obj - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sfx2/source/toolbox/makefile.mk b/sfx2/source/toolbox/makefile.mk deleted file mode 100644 index ce4f011e6044..000000000000 --- a/sfx2/source/toolbox/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=sfx2 -TARGET=toolbox -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/tbxitem.obj \ - $(SLO)$/imgmgr.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sfx2/source/view/makefile.mk b/sfx2/source/view/makefile.mk deleted file mode 100644 index 9c257f4c9f75..000000000000 --- a/sfx2/source/view/makefile.mk +++ /dev/null @@ -1,65 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - - - -PRJ=..$/.. - -PRJNAME= sfx2 -TARGET= view -ENABLE_EXCEPTIONS= TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = \ - view.src - -SLOFILES = \ - $(SLO)$/ipclient.obj \ - $(SLO)$/viewsh.obj \ - $(SLO)$/frmload.obj \ - $(SLO)$/frame.obj \ - $(SLO)$/frame2.obj \ - $(SLO)$/printer.obj \ - $(SLO)$/viewprn.obj \ - $(SLO)$/viewfac.obj \ - $(SLO)$/orgmgr.obj \ - $(SLO)$/viewfrm.obj \ - $(SLO)$/viewfrm2.obj \ - $(SLO)$/sfxbasecontroller.obj \ - $(SLO)$/userinputinterception.obj - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sfx2/util/makefile.mk b/sfx2/util/makefile.mk deleted file mode 100644 index f520e2097e7e..000000000000 --- a/sfx2/util/makefile.mk +++ /dev/null @@ -1,172 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -ENABLE_EXCEPTIONS=TRUE -PRJNAME=sfx2 -TARGET=sfx -#sfx.hid generieren -GEN_HID=TRUE -GEN_HID_OTHER=TRUE -USE_DEFFILE=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Allgemein ---------------------------------------------------- - -LIB1TARGET= $(SLB)$/$(TARGET).lib -LIB1FILES= $(SLB)$/appl.lib \ - $(SLB)$/explorer.lib \ - $(SLB)$/doc.lib \ - $(SLB)$/view.lib \ - $(SLB)$/control.lib \ - $(SLB)$/notify.lib \ - $(SLB)$/menu.lib \ - $(SLB)$/inet.lib \ - $(SLB)$/toolbox.lib \ - $(SLB)$/statbar.lib \ - $(SLB)$/dialog.lib \ - $(SLB)$/bastyp.lib \ - $(SLB)$/config.lib - -.IF "$(ENABLE_LAYOUT)" == "TRUE" -LIB1FILES += $(SLB)$/layout.lib -.ENDIF # ENABLE_LAYOUT == TRUE - -HELPIDFILES=\ - ..\inc\sfx2\sfxsids.hrc \ - ..\source\inc\helpid.hrc - -.IF "$(GUI)"!="UNX" -LIB2TARGET= $(LB)$/$(TARGET).lib -LIB2FILES= $(LB)$/isfx.lib -LIB2DEPN=$(SHL1TARGETN) -.ENDIF - -SHL1TARGET= sfx$(DLLPOSTFIX) -SHL1IMPLIB= isfx -SHL1USE_EXPORTS=name - -SHL1STDLIBS+=\ - $(FWELIB) \ - $(BASICLIB) \ - $(SVTOOLLIB) \ - $(TKLIB) \ - $(VCLLIB) \ - $(SVLLIB) \ - $(SOTLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(I18NISOLANGLIB) \ - $(SAXLIB) \ - $(COMPHELPERLIB) \ - $(UCBHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(VOSLIB) \ - $(SALLIB) \ - $(LIBXML2LIB) \ - - -.IF "$(GUI)"=="WNT" - -SHL1STDLIBS+=\ - $(UWINAPILIB) \ - $(ADVAPI32LIB) \ - $(SHELL32LIB) \ - $(GDI32LIB) \ - $(OLE32LIB) \ - $(UUIDLIB) -.ELSE # WNT -.IF "$(OS)" == "MACOSX" -SHL1STDLIBS+= -framework Cocoa -.ENDIF # MACOSX -.ENDIF # WNT - - -SHL1DEPN += $(shell @$(FIND) $(SLO) -type f -name "*.OBJ" -print) - -SHL1LIBS= $(LIB1TARGET) - -#SHL1OBJS= $(SLO)$/sfxdll.obj - -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME =$(SHL1TARGET) -DEFLIB1NAME =sfx -DEF1DES =Sfx - -SFXSRSLIST=\ - $(SRS)$/appl.srs \ - $(SRS)$/sfx.srs \ - $(SRS)$/doc.srs \ - $(SRS)$/view.srs \ - $(SRS)$/menu.srs \ - $(SRS)$/dialog.srs \ - $(SRS)$/bastyp.srs - -RESLIB1NAME=$(TARGET) -RESLIB1IMAGES=$(PRJ)$/res -RESLIB1SRSFILES=$(SFXSRSLIST) - -# gtk quick-starter -.IF "$(GUI)"=="UNX" -.IF "$(ENABLE_SYSTRAY_GTK)"=="TRUE" -PKGCONFIG_MODULES=gtk+-2.0 -.INCLUDE: pkg_config.mk -CFLAGS+=$(PKGCONFIG_CFLAGS) - -SHL3TARGET=qstart_gtk$(DLLPOSTFIX) -SHL3LIBS=$(SLB)$/quickstart.lib -SHL3DEPN=$(SHL1IMPLIBN) $(SHL1TARGETN) -# libs for gtk plugin -SHL3STDLIBS=$(SHL1STDLIBS) $(SFX2LIB) $(EGGTRAYLIB) -SHL3STDLIBS+=$(PKGCONFIG_LIBS:s/ -lpangoxft-1.0//) -# hack for faked SO environment -.IF "$(PKGCONFIG_ROOT)"!="" -SHL3SONAME+=-z nodefs -SHL3NOCHECK=TRUE -.ENDIF # "$(PKGCONFIG_ROOT)"!="" -.ENDIF # "$(ENABLE_SYSTRAY_GTK)"=="TRUE" -.ENDIF # "$(GUI)"=="UNX" - -# --- Targets ------------------------------------------------------ - - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/sfx.component - -$(MISC)/sfx.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - sfx.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt sfx.component diff --git a/sfx2/workben/custompanel/makefile.mk b/sfx2/workben/custompanel/makefile.mk deleted file mode 100644 index 1eb20ceed35d..000000000000 --- a/sfx2/workben/custompanel/makefile.mk +++ /dev/null @@ -1,120 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=../.. -PRJNAME=sfx2 - -TARGET=custompanel -ENABLE_EXCEPTIONS=TRUE -LIBTARGET=NO -EXTENSIONNAME:=custom-tool-panel - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -#------------------------------------------------------------------- - -#---- extension version -EXTENSION_VERSION_BASE=0.1 -.IF ( "$(CWS_WORK_STAMP)" == "" ) || ( "$(UPDATER)" == "YES" ) - EXTENSION_VERSION=$(EXTENSION_VERSION_BASE) -.ELSE - EXTENSION_VERSION=$(EXTENSION_VERSION_BASE).cws.$(CWS_WORK_STAMP) -.ENDIF - -#---- extension title package name -EXTENSION_TITLE=Custom Tool Panel Example -EXTENSION_ZIPNAME=$(EXTENSIONNAME)-$(EXTENSION_VERSION_BASE)-$(RTL_OS:l)-$(RTL_ARCH:l) - -#-------------------------------------------------- - -SHL1DLLPRE= -SHL1TARGET=$(TARGET).uno -LIB1TARGET=$(SLB)/$(SHL1TARGET).lib -LIB1OBJFILES= \ - $(SLO)/ctp_factory.obj \ - $(SLO)/ctp_services.obj \ - $(SLO)/ctp_panel.obj - -SHL1STDLIBS= \ - $(CPPULIB) \ - $(SALLIB) \ - $(SALHELPERLIB) \ - $(CPPUHELPERLIB) - -SHL1VERSIONMAP=$(SOLARSRC)/solenv/src/component.map -SHL1LIBS= $(LIB1TARGET) -SHL1DEF= $(MISC)/$(SHL1TARGET).def -SHL1RPATH= OXT -DEF1NAME= $(SHL1TARGET) - -# create Extension ----------------------------- - -COMPONENT_CONFIGDEST=. - -COMPONENT_XCU = \ - $(EXTENSIONDIR)/WriterWindowState.xcu \ - $(EXTENSIONDIR)/CalcWindowState.xcu \ - $(EXTENSIONDIR)/DrawWindowState.xcu \ - $(EXTENSIONDIR)/ImpressWindowState.xcu \ - $(EXTENSIONDIR)/Factories.xcu - -COMPONENT_LIBRARIES = \ - $(EXTENSIONDIR)/$(SHL1TARGET)$(DLLPOST) - -COMPONENT_IMAGES= \ - $(EXTENSIONDIR)/panel.png - -# ........ dependencies for packaging the extension ........ -EXTENSION_PACKDEPS=makefile.mk $(COMPONENT_IMAGES) - -# --- Targets ------------------------------------------------------ -.INCLUDE : extension_pre.mk -.INCLUDE : target.mk -.INCLUDE : extension_post.mk - -$(EXTENSIONDIR)/%.png : ./%.png - @@-$(MKDIRHIER) $(@:d) - @$(COPY) $< $@ > $(NULLDEV) - -$(EXTENSIONDIR)/WriterWindowState.xcu: ./WriterWindowState.xcu - @@-$(MKDIRHIER) $(@:d) - $(COMMAND_ECHO)$(TYPE) ./WriterWindowState.xcu | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(EXTENSIONDIR)/WriterWindowState.xcu - -$(EXTENSIONDIR)/CalcWindowState.xcu: ./CalcWindowState.xcu - @@-$(MKDIRHIER) $(@:d) - $(COMMAND_ECHO)$(TYPE) ./CalcWindowState.xcu | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(EXTENSIONDIR)/CalcWindowState.xcu - -$(EXTENSIONDIR)/DrawWindowState.xcu: ./DrawWindowState.xcu - @@-$(MKDIRHIER) $(@:d) - $(COMMAND_ECHO)$(TYPE) ./DrawWindowState.xcu | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(EXTENSIONDIR)/DrawWindowState.xcu - -$(EXTENSIONDIR)/ImpressWindowState.xcu: ./ImpressWindowState.xcu - @@-$(MKDIRHIER) $(@:d) - $(COMMAND_ECHO)$(TYPE) ./ImpressWindowState.xcu | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(EXTENSIONDIR)/ImpressWindowState.xcu - diff --git a/xmloff/inc/makefile.mk b/xmloff/inc/makefile.mk deleted file mode 100644 index db706e293088..000000000000 --- a/xmloff/inc/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME=xmloff -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" - diff --git a/xmloff/qa/unoapi/makefile.mk b/xmloff/qa/unoapi/makefile.mk deleted file mode 100644 index 3cbbc5f2a797..000000000000 --- a/xmloff/qa/unoapi/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -#***********************************************************************/ - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../.. -PRJNAME = xmloff -TARGET = qa_unoapi - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = org/openoffice/xmloff/qa/unoapi -JAVATESTFILES = Test.java -JAVAFILES = $(JAVATESTFILES) -JARFILES = OOoRunner.jar ridl.jar test.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END diff --git a/xmloff/source/chart/makefile.mk b/xmloff/source/chart/makefile.mk deleted file mode 100644 index bfdc9aeb5e22..000000000000 --- a/xmloff/source/chart/makefile.mk +++ /dev/null @@ -1,70 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ = ..$/.. -PRJNAME = xmloff -TARGET = chart -AUTOSEG = true -ENABLE_EXCEPTIONS = TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = $(SLO)$/ColorPropertySet.obj \ - $(SLO)$/SchXMLTools.obj \ - $(SLO)$/SchXMLExport.obj \ - $(SLO)$/SchXMLImport.obj \ - $(SLO)$/contexts.obj \ - $(SLO)$/SchXMLTableContext.obj \ - $(SLO)$/SchXMLChartContext.obj \ - $(SLO)$/SchXMLPlotAreaContext.obj \ - $(SLO)$/SchXMLParagraphContext.obj \ - $(SLO)$/SchXMLTextListContext.obj \ - $(SLO)$/SchXMLSeriesHelper.obj \ - $(SLO)$/SchXMLSeries2Context.obj \ - $(SLO)$/PropertyMaps.obj \ - $(SLO)$/XMLChartStyleContext.obj \ - $(SLO)$/XMLErrorIndicatorPropertyHdl.obj \ - $(SLO)$/XMLErrorBarStylePropertyHdl.obj \ - $(SLO)$/SchXMLAutoStylePoolP.obj \ - $(SLO)$/XMLChartPropertyContext.obj \ - $(SLO)$/XMLSymbolImageContext.obj \ - $(SLO)$/XMLLabelSeparatorContext.obj \ - $(SLO)$/XMLTextOrientationHdl.obj \ - $(SLO)$/XMLSymbolTypePropertyHdl.obj \ - $(SLO)$/XMLAxisPositionPropertyHdl.obj \ - $(SLO)$/SchXMLCalculationSettingsContext.obj \ - $(SLO)$/transporttypes.obj - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/xmloff/source/core/makefile.mk b/xmloff/source/core/makefile.mk deleted file mode 100644 index 4d663d3218d8..000000000000 --- a/xmloff/source/core/makefile.mk +++ /dev/null @@ -1,76 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=xmloff -TARGET=core -AUTOSEG=true - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/unointerfacetouniqueidentifiermapper.obj \ - $(SLO)$/facreg.obj \ - $(SLO)$/xmlcnitm.obj \ - $(SLO)$/attrlist.obj \ - $(SLO)$/i18nmap.obj \ - $(SLO)$/nmspmap.obj \ - $(SLO)$/unoatrcn.obj \ - $(SLO)$/xmlehelp.obj \ - $(SLO)$/xmlerror.obj \ - $(SLO)$/xmlexp.obj \ - $(SLO)$/xmlictxt.obj \ - $(SLO)$/xmlimp.obj \ - $(SLO)$/xmltkmap.obj \ - $(SLO)$/xmltoken.obj \ - $(SLO)$/xmluconv.obj \ - $(SLO)$/DomBuilderContext.obj \ - $(SLO)$/DomExport.obj \ - $(SLO)$/ProgressBarHelper.obj \ - $(SLO)$/PropertySetMerger.obj \ - $(SLO)$/SettingsExportHelper.obj \ - $(SLO)$/DocumentSettingsContext.obj \ - $(SLO)$/XMLEmbeddedObjectExportFilter.obj \ - $(SLO)$/XMLEmbeddedObjectImportContext.obj \ - $(SLO)$/XMLBase64Export.obj \ - $(SLO)$/XMLBase64ImportContext.obj \ - $(SLO)$/XMLBasicExportFilter.obj \ - $(SLO)$/RDFaImportHelper.obj \ - $(SLO)$/RDFaExportHelper.obj \ - - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/xmloff/source/draw/makefile.mk b/xmloff/source/draw/makefile.mk deleted file mode 100644 index 3c9f7ae024f9..000000000000 --- a/xmloff/source/draw/makefile.mk +++ /dev/null @@ -1,85 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=xmloff -TARGET=draw -AUTOSEG=true -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/animationexport.obj\ - $(SLO)$/animationimport.obj\ - $(SLO)$/XMLNumberStyles.obj\ - $(SLO)$/XMLGraphicsDefaultStyle.obj\ - $(SLO)$/viewcontext.obj\ - $(SLO)$/eventimp.obj\ - $(SLO)$/layerexp.obj\ - $(SLO)$/layerimp.obj\ - $(SLO)$/ximpshow.obj\ - $(SLO)$/animimp.obj\ - $(SLO)$/animexp.obj\ - $(SLO)$/numithdl.obj\ - $(SLO)$/sdxmlimp.obj \ - $(SLO)$/sdxmlexp.obj \ - $(SLO)$/ximpstyl.obj \ - $(SLO)$/ximpbody.obj \ - $(SLO)$/ximpshap.obj \ - $(SLO)$/ximpgrp.obj \ - $(SLO)$/ximp3dscene.obj \ - $(SLO)$/ximp3dobject.obj \ - $(SLO)$/ximpnote.obj \ - $(SLO)$/sdpropls.obj \ - $(SLO)$/propimp0.obj \ - $(SLO)$/xexptran.obj \ - $(SLO)$/shapeexport.obj \ - $(SLO)$/shapeexport2.obj \ - $(SLO)$/shapeexport3.obj \ - $(SLO)$/shapeexport4.obj \ - $(SLO)$/shapeimport.obj \ - $(SLO)$/XMLImageMapExport.obj \ - $(SLO)$/XMLImageMapContext.obj \ - $(SLO)$/XMLShapePropertySetContext.obj \ - $(SLO)$/XMLShapeStyleContext.obj \ - $(SLO)$/ximppage.obj \ - $(SLO)$/ximpcustomshape.obj \ - $(SLO)$/EnhancedCustomShapeToken.obj \ - $(SLO)$/XMLReplacementImageContext.obj \ - $(SLO)$/descriptionimp.obj \ - $(SLO)$/ximplink.obj - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/xmloff/source/forms/makefile.mk b/xmloff/source/forms/makefile.mk deleted file mode 100644 index 8c46a4fbf3c9..000000000000 --- a/xmloff/source/forms/makefile.mk +++ /dev/null @@ -1,70 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=xmloff -TARGET=forms - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/officeforms.obj \ - $(SLO)$/formevents.obj \ - $(SLO)$/eventimport.obj \ - $(SLO)$/eventexport.obj \ - $(SLO)$/controlpropertyhdl.obj \ - $(SLO)$/controlpropertymap.obj \ - $(SLO)$/valueproperties.obj \ - $(SLO)$/attriblistmerge.obj \ - $(SLO)$/controlelement.obj \ - $(SLO)$/formlayerexport.obj \ - $(SLO)$/layerexport.obj \ - $(SLO)$/elementexport.obj \ - $(SLO)$/propertyexport.obj \ - $(SLO)$/elementimport.obj \ - $(SLO)$/layerimport.obj \ - $(SLO)$/propertyimport.obj \ - $(SLO)$/formlayerimport.obj \ - $(SLO)$/formattributes.obj \ - $(SLO)$/formenums.obj \ - $(SLO)$/formsimp.obj \ - $(SLO)$/strings.obj \ - $(SLO)$/logging.obj \ - $(SLO)$/formcellbinding.obj \ - $(SLO)$/gridcolumnproptranslator.obj \ - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/xmloff/source/meta/makefile.mk b/xmloff/source/meta/makefile.mk deleted file mode 100644 index 5efb538c9856..000000000000 --- a/xmloff/source/meta/makefile.mk +++ /dev/null @@ -1,53 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=xmloff -TARGET=meta -AUTOSEG=true - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/xmlmetae.obj \ - $(SLO)$/xmlmetai.obj \ - $(SLO)$/MetaExportComponent.obj \ - $(SLO)$/MetaImportComponent.obj \ - $(SLO)$/xmlversion.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/xmloff/source/script/makefile.mk b/xmloff/source/script/makefile.mk deleted file mode 100644 index 4109ae6fc554..000000000000 --- a/xmloff/source/script/makefile.mk +++ /dev/null @@ -1,56 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=xmloff -TARGET=script - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/XMLEventExport.obj \ - $(SLO)$/XMLEventImportHelper.obj \ - $(SLO)$/XMLEventsImportContext.obj \ - $(SLO)$/XMLScriptContextFactory.obj \ - $(SLO)$/XMLScriptExportHandler.obj \ - $(SLO)$/XMLStarBasicContextFactory.obj \ - $(SLO)$/XMLStarBasicExportHandler.obj \ - $(SLO)$/xmlscripti.obj \ - $(SLO)$/xmlbasici.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/xmloff/source/style/makefile.mk b/xmloff/source/style/makefile.mk deleted file mode 100644 index 3436b33b654b..000000000000 --- a/xmloff/source/style/makefile.mk +++ /dev/null @@ -1,219 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=xmloff -TARGET=style - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -CXXFILES = \ - XMLPercentOrMeasurePropertyHandler.cxx \ - XMLIsPercentagePropertyHandler.cxx \ - XMLRectangleMembersHandler.cxx \ - adjushdl.cxx \ - backhdl.cxx \ - bordrhdl.cxx \ - breakhdl.cxx \ - cdouthdl.cxx \ - chrhghdl.cxx \ - chrlohdl.cxx \ - csmaphdl.cxx \ - escphdl.cxx \ - fonthdl.cxx \ - impastp1.cxx \ - impastp2.cxx \ - impastp3.cxx \ - impastp4.cxx \ - kernihdl.cxx \ - lspachdl.cxx \ - numehelp.cxx \ - opaquhdl.cxx \ - postuhdl.cxx \ - prhdlfac.cxx \ - prstylei.cxx \ - shadwhdl.cxx \ - shdwdhdl.cxx \ - styleexp.cxx \ - tabsthdl.cxx \ - undlihdl.cxx \ - uniref.cxx \ - weighhdl.cxx \ - xmlaustp.cxx \ - xmlbahdl.cxx \ - xmlexppr.cxx \ - xmlimppr.cxx \ - xmlnume.cxx \ - xmlnumfe.cxx \ - xmlnumfi.cxx \ - xmlnumi.cxx \ - xmlprcon.cxx \ - xmlprhdl.cxx \ - xmlprmap.cxx \ - xmlstyle.cxx \ - xmltabe.cxx \ - xmltabi.cxx \ - DashStyle.cxx \ - EnumPropertyHdl.cxx \ - FillStyleContext.cxx \ - GradientStyle.cxx \ - HatchStyle.cxx \ - ImageStyle.cxx \ - MarkerStyle.cxx \ - MultiPropertySetHelper.cxx \ - SinglePropertySetInfoCache.cxx \ - DashStyle.cxx \ - AttributeContainerHandler.cxx \ - NamedBoolPropertyHdl.cxx \ - TransGradientStyle.cxx \ - XMLBackgroundImageContext.cxx \ - XMLBackgroundImageExport.cxx \ - XMLClipPropertyHandler.cxx \ - XMLConstantsPropertyHandler.cxx \ - XMLElementPropertyContext.cxx \ - XMLFootnoteSeparatorExport.cxx \ - XMLFootnoteSeparatorImport.cxx \ - XMLFontAutoStylePool.cxx \ - XMLFontStylesContext.cxx \ - XMLPageExport.cxx \ - PageMasterPropHdl.cxx \ - PageMasterPropHdlFactory.cxx \ - PageMasterStyleMap.cxx \ - PageMasterPropMapper.cxx \ - PageMasterExportPropMapper.cxx \ - PageMasterImportPropMapper.cxx \ - PageMasterImportContext.cxx \ - PagePropertySetContext.cxx \ - PageHeaderFooterContext.cxx \ - StyleMap.cxx \ - XMLBitmapRepeatOffsetPropertyHandler.cxx \ - XMLFillBitmapSizePropertyHandler.cxx \ - XMLBitmapLogicalSizePropertyHandler.cxx \ - durationhdl.cxx \ - VisAreaExport.cxx \ - VisAreaContext.cxx \ - DrawAspectHdl.cxx - - -SLOFILES = \ - $(SLO)$/XMLPercentOrMeasurePropertyHandler.obj \ - $(SLO)$/XMLIsPercentagePropertyHandler.obj \ - $(SLO)$/XMLRectangleMembersHandler.obj \ - $(SLO)$/adjushdl.obj \ - $(SLO)$/backhdl.obj \ - $(SLO)$/bordrhdl.obj \ - $(SLO)$/breakhdl.obj \ - $(SLO)$/cdouthdl.obj \ - $(SLO)$/chrhghdl.obj \ - $(SLO)$/chrlohdl.obj \ - $(SLO)$/csmaphdl.obj \ - $(SLO)$/escphdl.obj \ - $(SLO)$/fonthdl.obj \ - $(SLO)$/impastp1.obj \ - $(SLO)$/impastp2.obj \ - $(SLO)$/impastp3.obj \ - $(SLO)$/impastp4.obj \ - $(SLO)$/kernihdl.obj \ - $(SLO)$/lspachdl.obj \ - $(SLO)$/numehelp.obj \ - $(SLO)$/opaquhdl.obj \ - $(SLO)$/postuhdl.obj \ - $(SLO)$/prhdlfac.obj \ - $(SLO)$/prstylei.obj \ - $(SLO)$/shadwhdl.obj \ - $(SLO)$/shdwdhdl.obj \ - $(SLO)$/styleexp.obj \ - $(SLO)$/tabsthdl.obj \ - $(SLO)$/undlihdl.obj \ - $(SLO)$/uniref.obj \ - $(SLO)$/weighhdl.obj \ - $(SLO)$/xmlaustp.obj \ - $(SLO)$/xmlbahdl.obj \ - $(SLO)$/xmlexppr.obj \ - $(SLO)$/xmlimppr.obj \ - $(SLO)$/xmlnume.obj \ - $(SLO)$/xmlnumfe.obj \ - $(SLO)$/xmlnumfi.obj \ - $(SLO)$/xmlnumi.obj \ - $(SLO)$/xmlprcon.obj \ - $(SLO)$/xmlprhdl.obj \ - $(SLO)$/xmlprmap.obj \ - $(SLO)$/xmlstyle.obj \ - $(SLO)$/xmltabe.obj \ - $(SLO)$/xmltabi.obj \ - $(SLO)$/DashStyle.obj \ - $(SLO)$/EnumPropertyHdl.obj \ - $(SLO)$/FillStyleContext.obj \ - $(SLO)$/GradientStyle.obj \ - $(SLO)$/HatchStyle.obj \ - $(SLO)$/ImageStyle.obj \ - $(SLO)$/MarkerStyle.obj \ - $(SLO)$/MultiPropertySetHelper.obj \ - $(SLO)$/SinglePropertySetInfoCache.obj \ - $(SLO)$/NamedBoolPropertyHdl.obj \ - $(SLO)$/TransGradientStyle.obj \ - $(SLO)$/XMLBackgroundImageContext.obj \ - $(SLO)$/XMLBackgroundImageExport.obj \ - $(SLO)$/XMLClipPropertyHandler.obj \ - $(SLO)$/XMLConstantsPropertyHandler.obj \ - $(SLO)$/AttributeContainerHandler.obj \ - $(SLO)$/XMLElementPropertyContext.obj \ - $(SLO)$/XMLFootnoteSeparatorExport.obj \ - $(SLO)$/XMLFootnoteSeparatorImport.obj \ - $(SLO)$/XMLFontAutoStylePool.obj \ - $(SLO)$/XMLFontStylesContext.obj \ - $(SLO)$/XMLPageExport.obj \ - $(SLO)$/PageMasterPropHdl.obj \ - $(SLO)$/PageMasterPropHdlFactory.obj \ - $(SLO)$/PageMasterStyleMap.obj \ - $(SLO)$/PageMasterPropMapper.obj \ - $(SLO)$/PageMasterExportPropMapper.obj \ - $(SLO)$/PageMasterImportPropMapper.obj \ - $(SLO)$/PageMasterImportContext.obj \ - $(SLO)$/PagePropertySetContext.obj \ - $(SLO)$/PageHeaderFooterContext.obj \ - $(SLO)$/StyleMap.obj \ - $(SLO)$/WordWrapPropertyHdl.obj \ - $(SLO)$/XMLBitmapRepeatOffsetPropertyHandler.obj \ - $(SLO)$/XMLFillBitmapSizePropertyHandler.obj \ - $(SLO)$/XMLBitmapLogicalSizePropertyHandler.obj \ - $(SLO)$/durationhdl.obj \ - $(SLO)$/VisAreaExport.obj \ - $(SLO)$/VisAreaContext.obj \ - $(SLO)$/DrawAspectHdl.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/xmloff/source/table/makefile.mk b/xmloff/source/table/makefile.mk deleted file mode 100644 index 6f8c8efab7b6..000000000000 --- a/xmloff/source/table/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=xmloff -TARGET=table -AUTOSEG=true -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/XMLTableExport.obj\ - $(SLO)$/XMLTableImport.obj - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/xmloff/source/text/makefile.mk b/xmloff/source/text/makefile.mk deleted file mode 100644 index 658de220445f..000000000000 --- a/xmloff/source/text/makefile.mk +++ /dev/null @@ -1,127 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=xmloff -TARGET=text - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - - -SLOFILES = \ - $(SLO)$/txtdrope.obj \ - $(SLO)$/txtdropi.obj \ - $(SLO)$/txtexppr.obj \ - $(SLO)$/txtflde.obj \ - $(SLO)$/txtfldi.obj \ - $(SLO)$/txtftne.obj \ - $(SLO)$/txtimp.obj \ - $(SLO)$/txtimppr.obj \ - $(SLO)$/txtlists.obj \ - $(SLO)$/txtparae.obj \ - $(SLO)$/txtparai.obj \ - $(SLO)$/txtprhdl.obj \ - $(SLO)$/txtprmap.obj \ - $(SLO)$/txtsecte.obj \ - $(SLO)$/txtstyle.obj \ - $(SLO)$/txtstyli.obj \ - $(SLO)$/txtvfldi.obj \ - $(SLO)$/XMLAutoMarkFileContext.obj \ - $(SLO)$/XMLAutoTextEventExport.obj \ - $(SLO)$/XMLAutoTextEventImport.obj \ - $(SLO)$/XMLAutoTextContainerEventImport.obj \ - $(SLO)$/XMLChangedRegionImportContext.obj \ - $(SLO)$/XMLChangeElementImportContext.obj \ - $(SLO)$/XMLChangeInfoContext.obj \ - $(SLO)$/XMLFootnoteBodyImportContext.obj \ - $(SLO)$/XMLFootnoteConfigurationImportContext.obj \ - $(SLO)$/XMLFootnoteImportContext.obj \ - $(SLO)$/XMLIndexAlphabeticalSourceContext.obj \ - $(SLO)$/XMLIndexBodyContext.obj \ - $(SLO)$/XMLIndexBibliographyConfigurationContext.obj \ - $(SLO)$/XMLIndexBibliographyEntryContext.obj \ - $(SLO)$/XMLIndexBibliographySourceContext.obj \ - $(SLO)$/XMLIndexChapterInfoEntryContext.obj \ - $(SLO)$/XMLIndexIllustrationSourceContext.obj \ - $(SLO)$/XMLIndexMarkExport.obj \ - $(SLO)$/XMLIndexObjectSourceContext.obj \ - $(SLO)$/XMLIndexSimpleEntryContext.obj \ - $(SLO)$/XMLIndexSpanEntryContext.obj \ - $(SLO)$/XMLIndexSourceBaseContext.obj \ - $(SLO)$/XMLIndexTOCContext.obj \ - $(SLO)$/XMLIndexTOCSourceContext.obj \ - $(SLO)$/XMLIndexTOCStylesContext.obj \ - $(SLO)$/XMLIndexTableSourceContext.obj \ - $(SLO)$/XMLIndexTabStopEntryContext.obj \ - $(SLO)$/XMLIndexTemplateContext.obj \ - $(SLO)$/XMLIndexTitleTemplateContext.obj \ - $(SLO)$/XMLIndexUserSourceContext.obj \ - $(SLO)$/XMLLineNumberingExport.obj \ - $(SLO)$/XMLLineNumberingImportContext.obj \ - $(SLO)$/XMLLineNumberingSeparatorImportContext.obj \ - $(SLO)$/XMLPropertyBackpatcher.obj \ - $(SLO)$/XMLRedlineExport.obj \ - $(SLO)$/XMLSectionExport.obj \ - $(SLO)$/XMLSectionFootnoteConfigExport.obj \ - $(SLO)$/XMLSectionFootnoteConfigImport.obj \ - $(SLO)$/XMLSectionImportContext.obj \ - $(SLO)$/XMLSectionSourceDDEImportContext.obj \ - $(SLO)$/XMLSectionSourceImportContext.obj \ - $(SLO)$/XMLTextCharStyleNamesElementExport.obj \ - $(SLO)$/XMLTextColumnsContext.obj \ - $(SLO)$/XMLTextColumnsExport.obj \ - $(SLO)$/XMLTextFrameContext.obj \ - $(SLO)$/XMLTextFrameHyperlinkContext.obj \ - $(SLO)$/XMLTextHeaderFooterContext.obj \ - $(SLO)$/XMLTextListAutoStylePool.obj \ - $(SLO)$/XMLTextListBlockContext.obj \ - $(SLO)$/XMLTextListItemContext.obj \ - $(SLO)$/XMLTextMarkImportContext.obj \ - $(SLO)$/XMLTextMasterPageContext.obj \ - $(SLO)$/XMLTextMasterPageExport.obj \ - $(SLO)$/XMLTextMasterStylesContext.obj \ - $(SLO)$/XMLTextNumRuleInfo.obj \ - $(SLO)$/XMLTextPropertySetContext.obj \ - $(SLO)$/XMLTextShapeImportHelper.obj \ - $(SLO)$/XMLTextShapeStyleContext.obj \ - $(SLO)$/XMLTextTableContext.obj \ - $(SLO)$/XMLChangeImportContext.obj \ - $(SLO)$/XMLStringBufferImportContext.obj \ - $(SLO)$/XMLTrackedChangesImportContext.obj \ - $(SLO)$/XMLCalculationSettingsContext.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/xmloff/source/transform/makefile.mk b/xmloff/source/transform/makefile.mk deleted file mode 100644 index 031549fcb39b..000000000000 --- a/xmloff/source/transform/makefile.mk +++ /dev/null @@ -1,103 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ := ..$/.. -PRJNAME := xmloff -TARGET := xof -LIBTARGET=NO -ENABLE_EXCEPTIONS := TRUE - -.INCLUDE: settings.mk - -SHL1TARGET = $(TARGET)$(DLLPOSTFIX) -SHL1OBJS = \ - $(SLO)$/ChartOASISTContext.obj \ - $(SLO)$/ChartOOoTContext.obj \ - $(SLO)$/ChartPlotAreaOASISTContext.obj \ - $(SLO)$/ChartPlotAreaOOoTContext.obj \ - $(SLO)$/ControlOASISTContext.obj \ - $(SLO)$/ControlOOoTContext.obj \ - $(SLO)$/CreateElemTContext.obj \ - $(SLO)$/DeepTContext.obj \ - $(SLO)$/DlgOASISTContext.obj \ - $(SLO)$/DocumentTContext.obj \ - $(SLO)$/EventMap.obj \ - $(SLO)$/EventOASISTContext.obj \ - $(SLO)$/EventOOoTContext.obj \ - $(SLO)$/FlatTContext.obj \ - $(SLO)$/FormPropOASISTContext.obj \ - $(SLO)$/FormPropOOoTContext.obj \ - $(SLO)$/FrameOASISTContext.obj \ - $(SLO)$/FrameOOoTContext.obj \ - $(SLO)$/IgnoreTContext.obj \ - $(SLO)$/MergeElemTContext.obj \ - $(SLO)$/MetaTContext.obj \ - $(SLO)$/MutableAttrList.obj \ - $(SLO)$/NotesTContext.obj \ - $(SLO)$/OOo2Oasis.obj \ - $(SLO)$/Oasis2OOo.obj \ - $(SLO)$/PersAttrListTContext.obj \ - $(SLO)$/PersMixedContentTContext.obj \ - $(SLO)$/ProcAddAttrTContext.obj \ - $(SLO)$/ProcAttrTContext.obj \ - $(SLO)$/PropertyActionsOASIS.obj \ - $(SLO)$/PropertyActionsOOo.obj \ - $(SLO)$/RenameElemTContext.obj \ - $(SLO)$/StyleOASISTContext.obj \ - $(SLO)$/StyleOOoTContext.obj \ - $(SLO)$/TransformerActions.obj \ - $(SLO)$/TransformerBase.obj \ - $(SLO)$/TransformerContext.obj \ - $(SLO)$/TransformerTokenMap.obj \ - $(SLO)$/XMLFilterRegistration.obj - -SHL1STDLIBS = \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALHELPERLIB) \ - $(SALLIB) -.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" - SHL1STDLIBS += -lxo$(DLLPOSTFIX) -.ELSE - SHL1STDLIBS += ixo.lib -.ENDIF -SHL1VERSIONMAP = $(SOLARENV)/src/component.map -SHL1IMPLIB = i$(SHL1TARGET) -DEF1NAME = $(SHL1TARGET) - -SLOFILES = $(SHL1OBJS) - -.INCLUDE: target.mk - -ALLTAR : $(MISC)/xof.component - -$(MISC)/xof.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - xof.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt xof.component diff --git a/xmloff/source/xforms/makefile.mk b/xmloff/source/xforms/makefile.mk deleted file mode 100644 index f1238a6036bb..000000000000 --- a/xmloff/source/xforms/makefile.mk +++ /dev/null @@ -1,58 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=xmloff -TARGET=xforms -AUTOSEG=true - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/xformsapi.obj \ - $(SLO)$/XFormsBindContext.obj \ - $(SLO)$/xformsimport.obj \ - $(SLO)$/XFormsModelContext.obj \ - $(SLO)$/XFormsInstanceContext.obj \ - $(SLO)$/XFormsSubmissionContext.obj \ - $(SLO)$/SchemaContext.obj \ - $(SLO)$/SchemaRestrictionContext.obj \ - $(SLO)$/SchemaSimpleTypeContext.obj \ - $(SLO)$/TokenContext.obj \ - $(SLO)$/xformsexport.obj - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/xmloff/util/makefile.mk b/xmloff/util/makefile.mk deleted file mode 100644 index 857067985c50..000000000000 --- a/xmloff/util/makefile.mk +++ /dev/null @@ -1,96 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=xmloff -TARGET=xo -USE_DEFFILE=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk - -# --- Allgemein ---------------------------------------------------- -.IF "$(L10N_framework)"=="" -LIB1TARGET= $(SLB)$/xo.lib -LIB1FILES= \ - $(SLB)$/core.lib \ - $(SLB)$/meta.lib \ - $(SLB)$/script.lib \ - $(SLB)$/style.lib \ - $(SLB)$/text.lib \ - $(SLB)$/draw.lib \ - $(SLB)$/chart.lib \ - $(SLB)$/forms.lib \ - $(SLB)$/xforms.lib \ - $(SLB)$/table.lib - -# --- Shared-Library ----------------------------------------------- - -SHL1TARGET= xo$(DLLPOSTFIX) -SHL1IMPLIB= i$(TARGET) -SHL1USE_EXPORTS=name - -SHL1STDLIBS= \ - $(TOOLSLIB) \ - $(I18NISOLANGLIB) \ - $(VOSLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB)\ - $(COMPHELPERLIB)\ - $(SVLLIB) \ - $(SALLIB) \ - $(UNOTOOLSLIB) \ - $(BASEGFXLIB) - -# SCO: the linker does know about weak symbols, but we can't ignore multiple defined symbols -.IF "(OS)"=="SCO" -SHL1STDLIBS+=-licg617mxp -.ENDIF - -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1LIBS= $(LIB1TARGET) - -# --- Def-File --------------------------------------------------------- - -DEF1NAME =$(SHL1TARGET) -DEFLIB1NAME =xo -DEF1DES =XML Office Lib - -# --- Targets ---------------------------------------------------------- -.ENDIF -.INCLUDE : target.mk - -ALLTAR : $(MISC)/xo.component - -$(MISC)/xo.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - xo.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt xo.component -- cgit v1.2.3 From d5a671a4b0a5fd7c33f7faf77c30790777ccf800 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Wed, 1 Dec 2010 15:30:01 +0100 Subject: undoapi: clear the redo stack when leaving an Undo context resp. list action, not when entering it. This is a pre-requisite for Writer's upcoming migratin to SfxUndoManager --- framework/source/helper/undomanagerhelper.cxx | 13 +++++++++---- sfx2/qa/complex/sfx2/UndoManager.java | 19 ++++++++++++++----- 2 files changed, 23 insertions(+), 9 deletions(-) (limited to 'sfx2/qa') diff --git a/framework/source/helper/undomanagerhelper.cxx b/framework/source/helper/undomanagerhelper.cxx index e2cfd13c5bb7..d0ece6131841 100755 --- a/framework/source/helper/undomanagerhelper.cxx +++ b/framework/source/helper/undomanagerhelper.cxx @@ -595,6 +595,7 @@ namespace framework const bool isHiddenContext = m_aContextVisibilities.top();; m_aContextVisibilities.pop(); + const bool bHadRedoActions = ( rUndoManager.GetRedoActionCount( IUndoManager::TopLevel ) > 0 ); { ::comphelper::FlagGuard aNotificationGuard( m_bAPIActionRunning ); if ( isHiddenContext ) @@ -602,11 +603,13 @@ namespace framework else nContextElements = rUndoManager.LeaveListAction(); } + const bool bHasRedoActions = ( rUndoManager.GetRedoActionCount( IUndoManager::TopLevel ) > 0 ); // prepare notification void ( SAL_CALL XUndoManagerListener::*notificationMethod )( const UndoManagerEvent& ) = NULL; - UndoManagerEvent aEvent( buildEvent( ::rtl::OUString() ) ); + UndoManagerEvent aContextEvent( buildEvent( ::rtl::OUString() ) ); + const EventObject aClearedEvent( getXUndoManager() ); if ( nContextElements == 0 ) { notificationMethod = &XUndoManagerListener::cancelledContext; @@ -617,14 +620,16 @@ namespace framework } else { - aEvent.UndoActionTitle = rUndoManager.GetUndoActionComment( 0, IUndoManager::CurrentLevel ); + aContextEvent.UndoActionTitle = rUndoManager.GetUndoActionComment( 0, IUndoManager::CurrentLevel ); notificationMethod = &XUndoManagerListener::leftContext; } aGuard.clear(); // <--- SYNCHRONIZED - m_aUndoListeners.notifyEach( notificationMethod, aEvent ); + if ( bHadRedoActions && !bHasRedoActions ) + m_aUndoListeners.notifyEach( &XUndoManagerListener::redoActionsCleared, aClearedEvent ); + m_aUndoListeners.notifyEach( notificationMethod, aContextEvent ); impl_notifyModified(); } @@ -702,7 +707,7 @@ namespace framework m_aUndoListeners.notifyEach( &XUndoManagerListener::undoActionAdded, aEventAdd ); if ( bHadRedoActions && !bHasRedoActions ) - m_aUndoListeners.notifyEach( &XUndoManagerListener::redoActionsCleared , aEventClear ); + m_aUndoListeners.notifyEach( &XUndoManagerListener::redoActionsCleared, aEventClear ); impl_notifyModified(); } diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index 2e4c5abe2903..42461c9365bb 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -833,9 +833,9 @@ public class UndoManager m_undoListener.reset(); // put one action on the undo and one on the redo stack, as precondition for the following tests - XUndoAction undoAction1 = new CustomUndoAction( "Undo Action 1" ); + final XUndoAction undoAction1 = new CustomUndoAction( "Undo Action 1" ); i_undoManager.addUndoAction( undoAction1 ); - XUndoAction undoAction2 = new CustomUndoAction( "Undo Action 2" ); + final XUndoAction undoAction2 = new CustomUndoAction( "Undo Action 2" ); i_undoManager.addUndoAction( undoAction2 ); i_undoManager.undo(); assertTrue( "precondition for context handling tests not met (1)", i_undoManager.isUndoPossible() ); @@ -843,11 +843,19 @@ public class UndoManager assertArrayEquals( new String[] { undoAction1.getTitle() }, i_undoManager.getAllUndoActionTitles() ); assertArrayEquals( new String[] { undoAction2.getTitle() }, i_undoManager.getAllRedoActionTitles() ); - // enter a context, add a single action + final String[] expectedRedoActionComments = new String[] { undoAction2.getTitle() }; + assertArrayEquals( expectedRedoActionComments, i_undoManager.getAllRedoActionTitles() ); + + // enter a context i_undoManager.enterUndoContext( "Undo Context" ); + // this should not (yet) touch the redo stack + assertArrayEquals( expectedRedoActionComments, i_undoManager.getAllRedoActionTitles() ); assertEquals( "unexpected undo context depth after entering a context", 1, m_undoListener.getCurrentUndoContextDepth() ); + // add a single action XUndoAction undoAction3 = new CustomUndoAction( "Undo Action 3" ); i_undoManager.addUndoAction( undoAction3 ); + // still, the redo stack should be untouched - added at a lower level does not affect it at all + assertArrayEquals( expectedRedoActionComments, i_undoManager.getAllRedoActionTitles() ); // while the context is open, its title should already contribute to the stack, ... assertEquals( "Undo Context", i_undoManager.getCurrentUndoActionTitle() ); @@ -855,8 +863,6 @@ public class UndoManager // context, ... assertArrayEquals( new String[] { "Undo Context", undoAction1.getTitle() }, i_undoManager.getAllUndoActionTitles() ); - assertArrayEquals( new String[] {}, i_undoManager.getAllRedoActionTitles() ); - // (the redo stack has been cleared when a new context was entered) // ... but Undo and Redo should be impossible as long as the context is open assertFalse( i_undoManager.isUndoPossible() ); assertFalse( i_undoManager.isRedoPossible() ); @@ -867,6 +873,9 @@ public class UndoManager assertFalse( m_undoListener.wasHiddenContextLeft() ); assertFalse( m_undoListener.hasContextBeenCancelled() ); assertEquals( "unexpected undo context depth leaving a non-empty context", 0, m_undoListener.getCurrentUndoContextDepth() ); + // leaving a non-empty context should have cleare the redo stack + assertArrayEquals( new String[0], i_undoManager.getAllRedoActionTitles() ); + assertTrue( m_undoListener.wasRedoStackCleared() ); // ............................................................................................................. // part II: empty contexts -- cgit v1.2.3 From 49dbc415b42830d3245b6e58245f4f13f79e032b Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Fri, 3 Dec 2010 13:30:59 +0100 Subject: undoapi: now that XEmbeddedObject.doVerb actually works, use it for chart activation. (Really appreciate the resulting simplification of the code\!) --- sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java | 49 +----------------------- 1 file changed, 2 insertions(+), 47 deletions(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java b/sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java index 8dcabef8370e..7c8421ec6e5b 100755 --- a/sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java +++ b/sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java @@ -93,36 +93,11 @@ public class ChartDocumentTest implements DocumentTest XChartDocument chartDoc = UnoRuntime.queryInterface( XChartDocument.class, shapeProps.getPropertyValue( "Model" ) ); m_chartDocument = new OfficeDocument( i_orb, chartDoc ); + // actually activate the object final XEmbeddedObject embeddedChart = UnoRuntime.queryInterface( XEmbeddedObject.class, shapeProps.getPropertyValue( "EmbeddedObject" ) ); - final XStateChangeBroadcaster stateBroadcaster = UnoRuntime.queryInterface( XStateChangeBroadcaster.class, embeddedChart ); - stateBroadcaster.addStateChangeListener( new ChartStateListener() ); - - // activate the chart - selSupplier.select( shape ); - - // some Writer-internal processes, which are a pre-condition for being able to successfully dispatch - // the ObjectMenu command, run asynchronously, without a chance of being notified when they're finished :( - // So, wait a little, again ... - synchronized ( embeddedChart ) { embeddedChart.wait( 500 ); } - // ... and check if those processes are finished - final VerbDescriptor[] verbs = embeddedChart.getSupportedVerbs(); - boolean canActivate = true; - for ( int i=0; i Date: Tue, 7 Dec 2010 13:39:51 +0100 Subject: undoapi: need only OOoRunnerLight, not OOoRunner --- sfx2/qa/complex/sfx2/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/makefile.mk b/sfx2/qa/complex/sfx2/makefile.mk index 95a483bf2497..03c42ecc2638 100644 --- a/sfx2/qa/complex/sfx2/makefile.mk +++ b/sfx2/qa/complex/sfx2/makefile.mk @@ -42,7 +42,7 @@ PACKAGE = complex/sfx2 #----- compile .java files ----------------------------------------- -JARFILES = OOoRunner.jar ridl.jar test.jar test-tools.jar unoil.jar +JARFILES = OOoRunnerLight.jar ridl.jar test.jar test-tools.jar unoil.jar EXTRAJARFILES = $(OOO_JUNIT_JAR) JAVAFILES = $(shell @$(FIND) . -name "*.java") \ -- cgit v1.2.3 From edb57aae4be8253104c5dc9282234cc3f12c7ece Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 15 Dec 2010 09:14:12 +0100 Subject: undoapi: #i115383#: enable writer undo test --- sfx2/qa/complex/sfx2/UndoManager.java | 2 +- sfx2/qa/complex/sfx2/undo/WriterDocumentTest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index 42461c9365bb..f3625747dd13 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -123,7 +123,7 @@ public class UndoManager public void checkWriterUndo() throws Exception { m_currentTestCase = new WriterDocumentTest( getORB() ); - impl_checkUndo( true ); + impl_checkUndo( false ); } // ----------------------------------------------------------------------------------------------------------------- diff --git a/sfx2/qa/complex/sfx2/undo/WriterDocumentTest.java b/sfx2/qa/complex/sfx2/undo/WriterDocumentTest.java index 100d36382d39..702fb85ebb11 100755 --- a/sfx2/qa/complex/sfx2/undo/WriterDocumentTest.java +++ b/sfx2/qa/complex/sfx2/undo/WriterDocumentTest.java @@ -74,6 +74,7 @@ public class WriterDocumentTest extends DocumentTestBase // insert the table into the doc docText.insertTextContent( cursor, textTable, false ); + ++expectedUndoActions; //FIXME this will create 2 actions! currently the event is sent for every individual action; should it be sent for top-level actions only? how many internal actions are created is an implementation detail! ++expectedUndoActions; // write some content into the center cell -- cgit v1.2.3 From a1ea9395421c26d0e10a78348724c0066edb3318 Mon Sep 17 00:00:00 2001 From: sb Date: Wed, 5 Jan 2011 10:15:25 +0100 Subject: sb135: recreated tests that had erroneously been deleted by CWS gnumake2 --- framework/prj/build.lst | 1 + framework/qa/unoapi/makefile.mk | 48 +++++++++++++++++++++++ sfx2/prj/build.lst | 3 +- sfx2/qa/cppunit/makefile.mk | 86 +++++++++++++++++++++++++++++++++++++++++ sfx2/qa/unoapi/makefile.mk | 48 +++++++++++++++++++++++ 5 files changed, 185 insertions(+), 1 deletion(-) create mode 100644 framework/qa/unoapi/makefile.mk create mode 100644 sfx2/qa/cppunit/makefile.mk create mode 100644 sfx2/qa/unoapi/makefile.mk (limited to 'sfx2/qa') diff --git a/framework/prj/build.lst b/framework/prj/build.lst index 2c847918fee4..3a2eb98457f7 100644 --- a/framework/prj/build.lst +++ b/framework/prj/build.lst @@ -1,2 +1,3 @@ fr framework : LIBXSLT:libxslt l10n svtools NULL fr framework\prj nmake - all fr_all NULL +fr framework\qa\unoapi nmake - all fr_qa_unoapi NULL diff --git a/framework/qa/unoapi/makefile.mk b/framework/qa/unoapi/makefile.mk new file mode 100644 index 000000000000..38a6cf7cced8 --- /dev/null +++ b/framework/qa/unoapi/makefile.mk @@ -0,0 +1,48 @@ +#************************************************************************* +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +#***********************************************************************/ + +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE + +PRJ = ../.. +PRJNAME = framework +TARGET = qa_unoapi + +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = org/openoffice/framework/qa/unoapi +JAVATESTFILES = Test.java +JAVAFILES = $(JAVATESTFILES) +JARFILES = OOoRunner.jar ridl.jar test.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) +.END + +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk + +ALLTAR : javatest + +.END diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index f8fddef145a6..76f87fa844c8 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -1,7 +1,8 @@ sf sfx2 : l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 LIBXSLT:libxslt NULL sf sfx2 usr1 - all sf_mkout NULL sf sfx2\prj nmake - all sf_prj NULL - +sf sfx2\qa\cppunit nmake - all sf_qa_cppunit NULL +sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL # fails on unxsoli4 # sf sfx2\qa\complex\standalonedocumentinfo nmake - all sf_qa_complex_standalonedocumentinfo sf_util NULL diff --git a/sfx2/qa/cppunit/makefile.mk b/sfx2/qa/cppunit/makefile.mk new file mode 100644 index 000000000000..b53a04ec43f9 --- /dev/null +++ b/sfx2/qa/cppunit/makefile.mk @@ -0,0 +1,86 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE + +PRJ=../.. +PRJNAME=sfx2 +TARGET=qa_cppunit + +ENABLE_EXCEPTIONS=TRUE + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +#building with stlport, but cppunit was not built with stlport +.IF "$(USE_SYSTEM_STL)"!="YES" +.IF "$(SYSTEM_CPPUNIT)"=="YES" +CFLAGSCXX+=-DADAPT_EXT_STL +.ENDIF +.ENDIF + +CFLAGSCXX += $(CPPUNIT_CFLAGS) +DLLPRE = # no leading "lib" on .so files + +# --- Libs --------------------------------------------------------- + +SHL1OBJS= \ + $(SLO)/test_metadatable.obj \ + + +SHL1STDLIBS= \ + $(CPPUNITLIB) \ + $(SALLIB) \ + $(CPPULIB) \ + $(CPPUHELPERLIB) \ + $(VCLLIB) \ + $(SFXLIB) \ + + +SHL1TARGET= test_metadatable +SHL1RPATH = NONE +SHL1IMPLIB= i$(SHL1TARGET) +# SHL1DEF= $(MISC)/$(SHL1TARGET).def +DEF1NAME=$(SHL1TARGET) +# DEF1EXPORTFILE= export.exp +SHL1VERSIONMAP= version.map + +# --- All object files --------------------------------------------- + +SLOFILES= \ + $(SHL1OBJS) \ + + +# --- Targets ------------------------------------------------------ + +.INCLUDE : target.mk +.INCLUDE : _cppunit.mk + +.END diff --git a/sfx2/qa/unoapi/makefile.mk b/sfx2/qa/unoapi/makefile.mk new file mode 100644 index 000000000000..ea91ba4d1c44 --- /dev/null +++ b/sfx2/qa/unoapi/makefile.mk @@ -0,0 +1,48 @@ +#************************************************************************* +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +#***********************************************************************/ + +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE + +PRJ = ../.. +PRJNAME = sfx2 +TARGET = qa_unoapi + +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = org/openoffice/sfx2/qa/unoapi +JAVATESTFILES = Test.java +JAVAFILES = $(JAVATESTFILES) +JARFILES = OOoRunner.jar ridl.jar test.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) +.END + +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk + +ALLTAR : javatest + +.END -- cgit v1.2.3 From 66958fe5677325915960f4c7991e57564b7ec743 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Wed, 5 Jan 2011 14:39:23 +0100 Subject: undoapi: fix UndoManager test for m96, by disabling a test which uses currently broken external functionality (i116313), and by correcting the broken Basic script in the test which older OOo versions silently accepted --- sfx2/qa/complex/sfx2/UndoManager.java | 18 ++++++++++-------- sfx2/qa/complex/sfx2/makefile.mk | 1 + 2 files changed, 11 insertions(+), 8 deletions(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index f3625747dd13..cc2c4a98d608 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -178,8 +178,8 @@ public class UndoManager // set up the button final XPropertySet buttonModel = impl_setupButton(); buttonModel.setPropertyValue( "Label", "exec broken script" ); - impl_assignStarBasicScript( buttonModel, "XActionListener", "actionPerformed", - "document:default.callbacks.brokenScript" ); + impl_assignScript( buttonModel, "XActionListener", "actionPerformed", + scriptURI ); // switch the doc's view to form alive mode (so the button will actually work) m_currentDocument.getCurrentView().dispatch( ".uno:SwitchControlDesignMode" ); @@ -220,11 +220,13 @@ public class UndoManager }; events.replaceByName( "OnViewCreated", scriptDescriptor ); - m_callbackCalled = false; + // The below doesn't work: event notification is broken in m96, see http://www.openoffice.org/issues/show_bug.cgi?id=116313 +/* m_callbackCalled = false; m_currentDocument.getCurrentView().dispatch( ".uno:NewWindow" ); assertTrue( "triggering an event did not work as expected - basic script not called", m_callbackCalled ); // same as above: The script didn't close the context, but the OOo framework should have assertEquals( "undo context was not auto-closed as expected", 0, m_undoListener.getCurrentUndoContextDepth() ); + */ // ............................................................................................................. // scenario 4: let the script enter an Undo context, but not close it, as usual. @@ -340,7 +342,7 @@ public class UndoManager "\n" + "Sub brokenScript\n" + " Dim callback as Object\n" + - " ThisComponent.UndoManager.enterUndoContext( \"" + getCallbackUndoContextTitle() + "\"\n" + + " ThisComponent.UndoManager.enterUndoContext( \"" + getCallbackUndoContextTitle() + "\" )\n" + "\n" + " callback = createUnoService( \"" + getCallbackComponentServiceName() + "\" )\n" + " Dim emptyArgs() as new com.sun.star.beans.NamedValue\n" + @@ -394,8 +396,8 @@ public class UndoManager } // ----------------------------------------------------------------------------------------------------------------- - private void impl_assignStarBasicScript( final XPropertySet i_controlModel, final String i_interfaceName, - final String i_interfaceMethod, final String i_scriptCode ) + private void impl_assignScript( final XPropertySet i_controlModel, final String i_interfaceName, + final String i_interfaceMethod, final String i_scriptURI ) { try { @@ -419,8 +421,8 @@ public class UndoManager i_interfaceName, i_interfaceMethod, "", - "StarBasic", - i_scriptCode + "Script", + i_scriptURI ) ); } catch( com.sun.star.uno.Exception e ) diff --git a/sfx2/qa/complex/sfx2/makefile.mk b/sfx2/qa/complex/sfx2/makefile.mk index 03c42ecc2638..20b170fba3b4 100644 --- a/sfx2/qa/complex/sfx2/makefile.mk +++ b/sfx2/qa/complex/sfx2/makefile.mk @@ -57,6 +57,7 @@ JAVATESTFILES = \ DocumentProperties.java \ StandaloneDocumentInfo.java \ DocumentMetadataAccess.java \ + UndoManager.java \ # disabled: #i115674# # GlobalEventBroadcaster.java \ -- cgit v1.2.3 From eae2f3dc45f4f80f852aeef23047d261b361af73 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Wed, 5 Jan 2011 15:06:34 +0100 Subject: undoapi: now that the Writer supports the XUndoManager, too, we can remove the temporary fake test --- sfx2/qa/complex/sfx2/UndoManager.java | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index cc2c4a98d608..ab1b9de910b8 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -123,7 +123,7 @@ public class UndoManager public void checkWriterUndo() throws Exception { m_currentTestCase = new WriterDocumentTest( getORB() ); - impl_checkUndo( false ); + impl_checkUndo(); } // ----------------------------------------------------------------------------------------------------------------- @@ -131,7 +131,7 @@ public class UndoManager public void checkCalcUndo() throws Exception { m_currentTestCase = new CalcDocumentTest( getORB() ); - impl_checkUndo( false ); + impl_checkUndo(); } // ----------------------------------------------------------------------------------------------------------------- @@ -139,7 +139,7 @@ public class UndoManager public void checkDrawUndo() throws Exception { m_currentTestCase = new DrawDocumentTest( getORB() ); - impl_checkUndo( false ); + impl_checkUndo(); } // ----------------------------------------------------------------------------------------------------------------- @@ -147,7 +147,7 @@ public class UndoManager public void checkImpressUndo() throws Exception { m_currentTestCase = new ImpressDocumentTest( getORB() ); - impl_checkUndo( false ); + impl_checkUndo(); } // ----------------------------------------------------------------------------------------------------------------- @@ -155,7 +155,7 @@ public class UndoManager public void checkChartUndo() throws Exception { m_currentTestCase = new ChartDocumentTest( getORB() ); - impl_checkUndo( false ); + impl_checkUndo(); } // ----------------------------------------------------------------------------------------------------------------- @@ -619,30 +619,13 @@ public class UndoManager }; // ----------------------------------------------------------------------------------------------------------------- - private void impl_checkUndo( final boolean i_fakeTestForNow ) throws Exception + private void impl_checkUndo() throws Exception { System.out.println( "testing: " + m_currentTestCase.getDocumentDescription() ); m_currentDocument = m_currentTestCase.getDocument(); m_currentTestCase.initializeDocument(); m_currentTestCase.verifyInitialDocumentState(); - if ( i_fakeTestForNow ) - { - // Writer does not yet have an UndoManager in the current phase of the implementation. Once it has, we - // this complete branch, which barely tests anything (except perhaps the DocumentTest implementation), - // can vanish. - m_currentTestCase.doSingleModification(); - m_currentTestCase.verifySingleModificationDocumentState(); - m_currentTestCase.getDocument().getCurrentView().dispatch( ".uno:Undo" ); - m_currentTestCase.verifyInitialDocumentState(); - final int expectedUndoSteps = m_currentTestCase.doMultipleModifications(); - for ( int i=0; i Date: Wed, 5 Jan 2011 17:22:00 +0100 Subject: gnumake3: first cppunit test in new build system --- sfx2/TestFixture_metadatable.mk | 15 +++++++++++---- sfx2/qa/cppunit/test_metadatable.cxx | 10 +--------- 2 files changed, 12 insertions(+), 13 deletions(-) (limited to 'sfx2/qa') diff --git a/sfx2/TestFixture_metadatable.mk b/sfx2/TestFixture_metadatable.mk index 066f405467f2..f41a25a16747 100755 --- a/sfx2/TestFixture_metadatable.mk +++ b/sfx2/TestFixture_metadatable.mk @@ -25,14 +25,21 @@ # #************************************************************************* -$(eval $(call gb_Testfixture_TestFixture,metadatable)) +$(eval $(call gb_TestFixture_TestFixture,sfx2_metadatable)) -$(eval $(call gb_Testfixture_add_exception_objects,metadatable, \ - sfx2/qa/cppunit/test_metadatable.cxx \ +$(eval $(call gb_TestFixture_add_exception_objects,sfx2_metadatable, \ + sfx2/qa/cppunit/test_metadatable \ )) -$(eval $(call gb_Testfixture_add_linked_libs,metadatable, \ +$(eval $(call gb_TestFixture_add_linked_libs,sfx2_metadatable, \ + sal \ sfx \ )) +$(eval $(call gb_TestFixture_set_include,sfx2_metadatable,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + # vim: set noet sw=4 ts=4: diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx index 6a0be13a9c53..9930d61acf20 100644 --- a/sfx2/qa/cppunit/test_metadatable.cxx +++ b/sfx2/qa/cppunit/test_metadatable.cxx @@ -25,15 +25,7 @@ * ************************************************************************/ -#include "precompiled_sfx2.hxx" - -#include "preextstl.h" -#include -#include -#include -#include -#include "postextstl.h" - +#include #include #include -- cgit v1.2.3 From df399dd5b190c0e45262b6409fb7d7a08163abd9 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 11 Jan 2011 12:43:09 +0100 Subject: gnumake3: complex tests in sfx2 --- sfx2/JunitTest_sfx2_complex.mk | 62 +++++++++++++++++++++++++++++ sfx2/Module_sfx2.mk | 6 --- sfx2/qa/complex/framework/TestDocument.java | 3 +- 3 files changed, 64 insertions(+), 7 deletions(-) create mode 100755 sfx2/JunitTest_sfx2_complex.mk (limited to 'sfx2/qa') diff --git a/sfx2/JunitTest_sfx2_complex.mk b/sfx2/JunitTest_sfx2_complex.mk new file mode 100755 index 000000000000..9f7a6a8154e8 --- /dev/null +++ b/sfx2/JunitTest_sfx2_complex.mk @@ -0,0 +1,62 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_JunitTest_JunitTest,sfx2_complex)) + +$(eval $(call gb_JunitTest_set_defs,sfx2_complex,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.docpath=$(SRCDIR)/sfx2/qa/complex/framework/testdocuments \ +)) +$(info $(call gb_JunitTest_set_defs,sfx2_complex,\ + -Dorg.openoffice.test.arg.soffice=path:$(OUTDIR)/installation/opt/openoffice.org3/program/soffice \ + -Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \ + -Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$*) \ + -Dorg.openoffice.test.arg.docpath=$(SRCDIR)/sfx2/qa/complex/framework/testdocuments \ + $$(DEFS) \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,sfx2_complex,\ + sfx2/qa/complex/framework/CheckGlobalEventBroadcaster_writer1 \ + sfx2/qa/complex/framework/DocumentMetadataAccessTest \ + sfx2/qa/complex/framework/DialogThread \ + sfx2/qa/complex/framework/WriterHelper \ + sfx2/qa/complex/framework/TestDocument \ + sfx2/qa/complex/framework/DocumentPropertiesTest \ + sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoTest \ + sfx2/qa/complex/standalonedocumentinfo/TestHelper \ + sfx2/qa/complex/standalonedocumentinfo/Test01 \ + sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest \ + sfx2/qa/complex/docinfo/DocumentProperties \ +)) + +$(eval $(call gb_JunitTest_add_classes,sfx2_complex,\ + complex.docinfo.DocumentProperties \ + complex.framework.DocumentPropertiesTest \ + complex.framework.DocumentMetadataAccessTest \ + complex.framework.CheckGlobalEventBroadcaster_writer1 \ +)) +# vim: set noet sw=4 ts=4: diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk index 228ee2f241a5..2dc117af1dff 100755 --- a/sfx2/Module_sfx2.mk +++ b/sfx2/Module_sfx2.mk @@ -50,12 +50,6 @@ $(eval $(call gb_Module_add_targets,sfx2,\ endif endif -$(eval $(call gb_JavaClassSet,sfx2_complex)) -$(eval $(call gb_JavaClassSet_add_sourcefiles,sfx2_complex,sfx2/qa/complex/docinfo/DocumentProperties)) -$(eval $(call gb_JavaClassSet_set_classpath,sfx2_complex,$(OUTDIR)/bin/OOoRunner.jar:$(OUTDIR)/bin/ridl.jar:$(OUTDIR)/bin/test.jar:$(OUTDIR)/bin/unoil.jar:/usr/share/java/junit4.jar)) - -all: $(call gb_JavaClassSet_get_target,sfx2_complex) - #todo: source/appl ohne Optimierung? #todo: source/control ohne Optimierung? #todo: source/dialog BUILD_VER_STRING diff --git a/sfx2/qa/complex/framework/TestDocument.java b/sfx2/qa/complex/framework/TestDocument.java index 8cc6ef7756b1..fa60ff2057a2 100644 --- a/sfx2/qa/complex/framework/TestDocument.java +++ b/sfx2/qa/complex/framework/TestDocument.java @@ -29,10 +29,11 @@ package complex.framework; import java.io.File; import org.openoffice.test.OfficeFileUrl; +import org.openoffice.test.Argument; final class TestDocument { public static String getUrl(String name) { - return OfficeFileUrl.getAbsolute(new File("testdocuments", name)); + return OfficeFileUrl.getAbsolute(new File(org.openoffice.test.Argument.get("docpath"), name)); } private TestDocument() {} -- cgit v1.2.3 From f27dec459621543c9dcd94c72ab6af8147b8b4d6 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 11 Jan 2011 21:16:21 +0100 Subject: gnumake3: more work on junit subsequenttest migration --- framework/JunitTest_framework_complex.mk | 92 ++++++++++++++++++++++ framework/JunitTest_framework_unoapi.mk | 45 +++++++++++ framework/Module_framework.mk | 4 + .../qa/complex/broken_document/TestDocument.java | 3 +- framework/qa/unoapi/Test.java | 5 +- sfx2/JunitTest_sfx2_complex.mk | 2 +- sfx2/qa/complex/framework/TestDocument.java | 2 +- sfx2/qa/cppunit/test_metadatable.cxx | 1 + xmloff/JunitTest_xmloff_unoapi.mk | 45 +++++++++++ xmloff/Module_xmloff.mk | 4 + xmloff/prj/build.lst | 3 - xmloff/qa/unoapi/Test.java | 5 +- 12 files changed, 201 insertions(+), 10 deletions(-) create mode 100755 framework/JunitTest_framework_complex.mk create mode 100755 framework/JunitTest_framework_unoapi.mk create mode 100755 xmloff/JunitTest_xmloff_unoapi.mk (limited to 'sfx2/qa') diff --git a/framework/JunitTest_framework_complex.mk b/framework/JunitTest_framework_complex.mk new file mode 100755 index 000000000000..037486d13bfa --- /dev/null +++ b/framework/JunitTest_framework_complex.mk @@ -0,0 +1,92 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_JunitTest_JunitTest,framework_complex)) + +$(eval $(call gb_JunitTest_set_defs,framework_complex,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/framework/qa/complex/broken_document/test_documents \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,framework_complex,\ + framework/qa/complex/disposing/GetServiceWhileDisposingOffice \ + framework/qa/complex/path_substitution/PathSubstitutionTest \ + framework/qa/complex/loadAllDocuments/InteractionHandler \ + framework/qa/complex/loadAllDocuments/StreamSimulator \ + framework/qa/complex/loadAllDocuments/TestDocument \ + framework/qa/complex/loadAllDocuments/CheckXComponentLoader \ + framework/qa/complex/loadAllDocuments/StatusIndicator \ + framework/qa/complex/broken_document/TestDocument \ + framework/qa/complex/broken_document/LoadDocument \ + framework/qa/complex/XUserInputInterception/EventTest \ + framework/qa/complex/framework/autosave/AutoSave \ + framework/qa/complex/framework/autosave/Protocol \ + framework/qa/complex/framework/autosave/ConfigHelper \ + framework/qa/complex/framework/recovery/TimeoutThread \ + framework/qa/complex/framework/recovery/KlickButtonThread \ + framework/qa/complex/framework/recovery/RecoveryTools \ + framework/qa/complex/framework/recovery/RecoveryTest \ + framework/qa/complex/framework/recovery/CrashThread \ + framework/qa/complex/accelerators/AcceleratorsConfigurationTest \ + framework/qa/complex/accelerators/KeyMapping \ + framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor \ + framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor \ + framework/qa/complex/path_settings/PathSettingsTest \ + framework/qa/complex/desktop/DesktopTerminate \ + framework/qa/complex/imageManager/_XComponent \ + framework/qa/complex/imageManager/CheckImageManager \ + framework/qa/complex/imageManager/_XTypeProvider \ + framework/qa/complex/imageManager/_XInitialization \ + framework/qa/complex/imageManager/_XImageManager \ + framework/qa/complex/imageManager/_XUIConfigurationPersistence \ + framework/qa/complex/imageManager/_XUIConfiguration \ + framework/qa/complex/api_internal/CheckAPI \ + framework/qa/complex/dispatches/Interceptor \ + framework/qa/complex/dispatches/checkdispatchapi \ + framework/qa/complex/ModuleManager/CheckXModuleManager \ +)) + +$(eval $(call gb_JunitTest_add_classes,framework_complex,\ +)) +# these were disabled in the old build system too, please check +# carefully before reenabling +# complex.ModuleManager.CheckXModuleManager \ + complex.XUserInputInterception.EventTest \ + complex.accelerators.AcceleratorsConfigurationTest \ + complex.dispatches.checkdispatchapi \ + complex.api_internal.CheckAPI \ + complex.broken_document.LoadDocument \ + complex.desktop.DesktopTerminate \ + complex.disposing.GetServiceWhileDisposingOffice \ + complex.framework.autosave.AutoSave \ + complex.framework.recovery.RecoveryTest \ + complex.imageManager.CheckImageManager \ + complex.loadAllDocuments.CheckXComponentLoader \ + complex.path_settings.PathSettingsTest \ + complex.path_substitution.PathSubstitutionTest \ + +# vim: set noet sw=4 ts=4: diff --git a/framework/JunitTest_framework_unoapi.mk b/framework/JunitTest_framework_unoapi.mk new file mode 100755 index 000000000000..0ccb2df8d7cb --- /dev/null +++ b/framework/JunitTest_framework_unoapi.mk @@ -0,0 +1,45 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_JunitTest_JunitTest,framework_unoapi)) + +$(eval $(call gb_JunitTest_set_defs,framework_unoapi,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.sce=$(SRCDIR)/framework/qa/unoapi/framework.sce \ + -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/framework/qa/unoapi/knownissues.xcl \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/framework/qa/unoapi/testdocuments \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,framework_unoapi,\ + framework/qa/unoapi/Test \ +)) + +$(eval $(call gb_JunitTest_add_classes,framework_unoapi,\ + org.openoffice.framework.qa.unoapi.Test \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/framework/Module_framework.mk b/framework/Module_framework.mk index 28b2e087b60f..ddc0abc152bd 100644 --- a/framework/Module_framework.mk +++ b/framework/Module_framework.mk @@ -40,4 +40,8 @@ $(eval $(call gb_Module_add_targets,framework,\ Package_unotypes \ )) +$(eval $(call gb_Module_add_subsequentcheck_targets,framework,\ + JunitTest_framework_complex \ + JunitTest_framework_unoapi \ +)) # vim: set noet ts=4 sw=4: diff --git a/framework/qa/complex/broken_document/TestDocument.java b/framework/qa/complex/broken_document/TestDocument.java index c282790211e3..47a5176734d5 100644 --- a/framework/qa/complex/broken_document/TestDocument.java +++ b/framework/qa/complex/broken_document/TestDocument.java @@ -29,12 +29,13 @@ package complex.broken_document; import java.io.File; import org.openoffice.test.OfficeFileUrl; +import org.openoffice.test.Argument; final class TestDocument { public static String getUrl(String name) { - return OfficeFileUrl.getAbsolute(new File("test_documents", name)); + return OfficeFileUrl.getAbsolute(new File(Argument.get("tdoc"), name)); } private TestDocument() {} diff --git a/framework/qa/unoapi/Test.java b/framework/qa/unoapi/Test.java index da9bb3bd5020..71774b4a62bb 100644 --- a/framework/qa/unoapi/Test.java +++ b/framework/qa/unoapi/Test.java @@ -27,6 +27,7 @@ package org.openoffice.framework.qa.unoapi; import org.openoffice.Runner; import org.openoffice.test.OfficeConnection; +import org.openoffice.test.Argument; import static org.junit.Assert.*; public final class Test { @@ -43,8 +44,8 @@ public final class Test { @org.junit.Test public void test() { assertTrue( Runner.run( - "-sce", "framework.sce", "-xcl", "knownissues.xcl", "-tdoc", - "testdocuments", "-cs", connection.getDescription())); + "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc", + Argument.get("tdoc"), "-cs", connection.getDescription())); } private final OfficeConnection connection = new OfficeConnection(); diff --git a/sfx2/JunitTest_sfx2_complex.mk b/sfx2/JunitTest_sfx2_complex.mk index 3513b63b06c8..ab8c90e47347 100755 --- a/sfx2/JunitTest_sfx2_complex.mk +++ b/sfx2/JunitTest_sfx2_complex.mk @@ -29,7 +29,7 @@ $(eval $(call gb_JunitTest_JunitTest,sfx2_complex)) $(eval $(call gb_JunitTest_set_defs,sfx2_complex,\ $$(DEFS) \ - -Dorg.openoffice.test.arg.docpath=$(SRCDIR)/sfx2/qa/complex/framework/testdocuments \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sfx2/qa/complex/framework/testdocuments \ )) $(eval $(call gb_JunitTest_add_sourcefiles,sfx2_complex,\ diff --git a/sfx2/qa/complex/framework/TestDocument.java b/sfx2/qa/complex/framework/TestDocument.java index fa60ff2057a2..1c47d9302f9d 100644 --- a/sfx2/qa/complex/framework/TestDocument.java +++ b/sfx2/qa/complex/framework/TestDocument.java @@ -33,7 +33,7 @@ import org.openoffice.test.Argument; final class TestDocument { public static String getUrl(String name) { - return OfficeFileUrl.getAbsolute(new File(org.openoffice.test.Argument.get("docpath"), name)); + return OfficeFileUrl.getAbsolute(new File(Argument.get("tdoc"), name)); } private TestDocument() {} diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx index 9930d61acf20..d3d11bdf57ad 100644 --- a/sfx2/qa/cppunit/test_metadatable.cxx +++ b/sfx2/qa/cppunit/test_metadatable.cxx @@ -95,6 +95,7 @@ static bool operator==(beans::StringPair p1, beans::StringPair p2) void MetadatableTest::test() { + CPPUNIT_ASSERT_MESSAGE("fail",false); OSL_TRACE("SwMetadatable test(): start\n"); ::std::auto_ptr< ::sfx2::IXmlIdRegistry > const pReg( ::sfx2::createXmlIdRegistry(false) ); diff --git a/xmloff/JunitTest_xmloff_unoapi.mk b/xmloff/JunitTest_xmloff_unoapi.mk new file mode 100755 index 000000000000..78cd23137410 --- /dev/null +++ b/xmloff/JunitTest_xmloff_unoapi.mk @@ -0,0 +1,45 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_JunitTest_JunitTest,xmloff_unoapi)) + +$(eval $(call gb_JunitTest_set_defs,xmloff_unoapi,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.sce=$(SRCDIR)/xmloff/qa/unoapi/xmloff.sce \ + -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/xmloff/qa/unoapi/knownissues.xcl \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/xmloff/qa/unoapi/testdocuments \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,xmloff_unoapi,\ + xmloff/qa/unoapi/Test \ +)) + +$(eval $(call gb_JunitTest_add_classes,xmloff_unoapi,\ + org.openoffice.xmloff.qa.unoapi.Test \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/xmloff/Module_xmloff.mk b/xmloff/Module_xmloff.mk index eacc83068dad..d17caa0c3b4b 100644 --- a/xmloff/Module_xmloff.mk +++ b/xmloff/Module_xmloff.mk @@ -34,6 +34,10 @@ $(eval $(call gb_Module_add_targets,xmloff,\ Package_inc \ )) +$(eval $(call gb_Module_add_subsequentcheck_targets,xmloff,\ + JunitTest_xmloff_unoapi \ +)) + #todo: map file #todo: xmlkywd.lib - built, but never used?! diff --git a/xmloff/prj/build.lst b/xmloff/prj/build.lst index d075f1fc6fcb..4c79df8777a9 100644 --- a/xmloff/prj/build.lst +++ b/xmloff/prj/build.lst @@ -1,5 +1,2 @@ xo xmloff : LIBXSLT:libxslt offapi svl vos NULL zxo xmloff\prj nmake - all xo_prj NULL - -xo xmloff\qa\unoapi nmake - all xo_qa_unoapi NULL - diff --git a/xmloff/qa/unoapi/Test.java b/xmloff/qa/unoapi/Test.java index d66144f108e7..833c2d770c9f 100644 --- a/xmloff/qa/unoapi/Test.java +++ b/xmloff/qa/unoapi/Test.java @@ -27,6 +27,7 @@ package org.openoffice.xmloff.qa.unoapi; import org.openoffice.Runner; import org.openoffice.test.OfficeConnection; +import org.openoffice.test.Argument; import static org.junit.Assert.*; public final class Test { @@ -43,8 +44,8 @@ public final class Test { @org.junit.Test public void test() { assertTrue( Runner.run( - "-sce", "xmloff.sce", "-xcl", "knownissues.xcl", "-tdoc", - "testdocuments", "-cs", connection.getDescription())); + "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc", + Argument.get("tdoc"), "-cs", connection.getDescription())); } private final OfficeConnection connection = new OfficeConnection(); -- cgit v1.2.3 From 0e9406ad207a9eaff584dd8adc5f10cab55b441c Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Thu, 13 Jan 2011 18:55:57 +0100 Subject: gnumake3: refactoring gbuild linking to prepare for static lib linking fixing --- sfx2/qa/cppunit/test_metadatable.cxx | 1 - 1 file changed, 1 deletion(-) (limited to 'sfx2/qa') diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx index d3d11bdf57ad..9930d61acf20 100644 --- a/sfx2/qa/cppunit/test_metadatable.cxx +++ b/sfx2/qa/cppunit/test_metadatable.cxx @@ -95,7 +95,6 @@ static bool operator==(beans::StringPair p1, beans::StringPair p2) void MetadatableTest::test() { - CPPUNIT_ASSERT_MESSAGE("fail",false); OSL_TRACE("SwMetadatable test(): start\n"); ::std::auto_ptr< ::sfx2::IXmlIdRegistry > const pReg( ::sfx2::createXmlIdRegistry(false) ); -- cgit v1.2.3 From d171285f3780a4b1b1e0cad4b40b8b9bc52b62f9 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 1 Feb 2011 19:21:09 +0100 Subject: gnumake3: remove dmake files for tests in converted modules --- framework/prj/build.lst | 1 - framework/qa/unoapi/makefile.mk | 48 ----------------------- sfx2/JunitTest_sfx2_unoapi.mk | 53 +++++++++++++++++++++++++ sfx2/Module_sfx2.mk | 1 + sfx2/prj/build.lst | 3 -- sfx2/qa/cppunit/makefile.mk | 86 ----------------------------------------- sfx2/qa/unoapi/makefile.mk | 48 ----------------------- xmloff/prj/build.lst | 2 +- xmloff/qa/unoapi/makefile.mk | 48 ----------------------- 9 files changed, 55 insertions(+), 235 deletions(-) delete mode 100644 framework/qa/unoapi/makefile.mk create mode 100644 sfx2/JunitTest_sfx2_unoapi.mk delete mode 100644 sfx2/qa/cppunit/makefile.mk delete mode 100644 sfx2/qa/unoapi/makefile.mk delete mode 100644 xmloff/qa/unoapi/makefile.mk (limited to 'sfx2/qa') diff --git a/framework/prj/build.lst b/framework/prj/build.lst index 3a2eb98457f7..2c847918fee4 100644 --- a/framework/prj/build.lst +++ b/framework/prj/build.lst @@ -1,3 +1,2 @@ fr framework : LIBXSLT:libxslt l10n svtools NULL fr framework\prj nmake - all fr_all NULL -fr framework\qa\unoapi nmake - all fr_qa_unoapi NULL diff --git a/framework/qa/unoapi/makefile.mk b/framework/qa/unoapi/makefile.mk deleted file mode 100644 index 38a6cf7cced8..000000000000 --- a/framework/qa/unoapi/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -#***********************************************************************/ - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../.. -PRJNAME = framework -TARGET = qa_unoapi - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = org/openoffice/framework/qa/unoapi -JAVATESTFILES = Test.java -JAVAFILES = $(JAVATESTFILES) -JARFILES = OOoRunner.jar ridl.jar test.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END diff --git a/sfx2/JunitTest_sfx2_unoapi.mk b/sfx2/JunitTest_sfx2_unoapi.mk new file mode 100644 index 000000000000..33602a0b720d --- /dev/null +++ b/sfx2/JunitTest_sfx2_unoapi.mk @@ -0,0 +1,53 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_JunitTest_JunitTest,sfx2_unoapi)) + +$(eval $(call gb_JunitTest_set_defs,sfx2_unoapi,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.sce=$(SRCDIR)/sfx2/qa/unoapi/sfx.sce \ + -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/sfx2/qa/unoapi/knownissues.xcl \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sfx2/qa/unoapi/testdocuments \ +)) + +$(eval $(call gb_JunitTest_add_jars,sfx2_unoapi,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,sfx2_unoapi,\ + sfx2/qa/unoapi/Test \ +)) + +$(eval $(call gb_JunitTest_add_classes,sfx2_unoapi,\ + org.openoffice.sfx2.qa.unoapi.Test \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk index 6ecc7008afe4..b88e2581f2da 100755 --- a/sfx2/Module_sfx2.mk +++ b/sfx2/Module_sfx2.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Module_add_check_targets,sfx2,\ $(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\ JunitTest_sfx2_complex \ + JunitTest_sfx2_unoapi \ )) ifeq ($(OS),LINUX) diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index 76f87fa844c8..bc82cc405fc5 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -1,8 +1,5 @@ sf sfx2 : l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 LIBXSLT:libxslt NULL -sf sfx2 usr1 - all sf_mkout NULL sf sfx2\prj nmake - all sf_prj NULL -sf sfx2\qa\cppunit nmake - all sf_qa_cppunit NULL -sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL # fails on unxsoli4 # sf sfx2\qa\complex\standalonedocumentinfo nmake - all sf_qa_complex_standalonedocumentinfo sf_util NULL diff --git a/sfx2/qa/cppunit/makefile.mk b/sfx2/qa/cppunit/makefile.mk deleted file mode 100644 index b53a04ec43f9..000000000000 --- a/sfx2/qa/cppunit/makefile.mk +++ /dev/null @@ -1,86 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ=../.. -PRJNAME=sfx2 -TARGET=qa_cppunit - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -#building with stlport, but cppunit was not built with stlport -.IF "$(USE_SYSTEM_STL)"!="YES" -.IF "$(SYSTEM_CPPUNIT)"=="YES" -CFLAGSCXX+=-DADAPT_EXT_STL -.ENDIF -.ENDIF - -CFLAGSCXX += $(CPPUNIT_CFLAGS) -DLLPRE = # no leading "lib" on .so files - -# --- Libs --------------------------------------------------------- - -SHL1OBJS= \ - $(SLO)/test_metadatable.obj \ - - -SHL1STDLIBS= \ - $(CPPUNITLIB) \ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(VCLLIB) \ - $(SFXLIB) \ - - -SHL1TARGET= test_metadatable -SHL1RPATH = NONE -SHL1IMPLIB= i$(SHL1TARGET) -# SHL1DEF= $(MISC)/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) -# DEF1EXPORTFILE= export.exp -SHL1VERSIONMAP= version.map - -# --- All object files --------------------------------------------- - -SLOFILES= \ - $(SHL1OBJS) \ - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk -.INCLUDE : _cppunit.mk - -.END diff --git a/sfx2/qa/unoapi/makefile.mk b/sfx2/qa/unoapi/makefile.mk deleted file mode 100644 index ea91ba4d1c44..000000000000 --- a/sfx2/qa/unoapi/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -#***********************************************************************/ - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../.. -PRJNAME = sfx2 -TARGET = qa_unoapi - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = org/openoffice/sfx2/qa/unoapi -JAVATESTFILES = Test.java -JAVAFILES = $(JAVATESTFILES) -JARFILES = OOoRunner.jar ridl.jar test.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END diff --git a/xmloff/prj/build.lst b/xmloff/prj/build.lst index 4c79df8777a9..e522f8b79714 100644 --- a/xmloff/prj/build.lst +++ b/xmloff/prj/build.lst @@ -1,2 +1,2 @@ xo xmloff : LIBXSLT:libxslt offapi svl vos NULL -zxo xmloff\prj nmake - all xo_prj NULL +xo xmloff\prj nmake - all xo_prj NULL diff --git a/xmloff/qa/unoapi/makefile.mk b/xmloff/qa/unoapi/makefile.mk deleted file mode 100644 index 3cbbc5f2a797..000000000000 --- a/xmloff/qa/unoapi/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -#***********************************************************************/ - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../.. -PRJNAME = xmloff -TARGET = qa_unoapi - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = org/openoffice/xmloff/qa/unoapi -JAVATESTFILES = Test.java -JAVAFILES = $(JAVATESTFILES) -JARFILES = OOoRunner.jar ridl.jar test.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END -- cgit v1.2.3 From 1fd300c8480e37a4299534f70b53baa231935e8c Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 1 Feb 2011 19:21:09 +0100 Subject: gnumake3: convert some dmake files for tests to gbuild --- sfx2/qa/unoapi/Test.java | 5 +++-- svx/JunitTest_svx_unoapi.mk | 2 +- svx/prj/build.lst | 4 ---- svx/qa/unoapi/makefile.mk | 48 --------------------------------------------- 4 files changed, 4 insertions(+), 55 deletions(-) delete mode 100644 svx/qa/unoapi/makefile.mk (limited to 'sfx2/qa') diff --git a/sfx2/qa/unoapi/Test.java b/sfx2/qa/unoapi/Test.java index 4263985c133f..c1231c975a2b 100644 --- a/sfx2/qa/unoapi/Test.java +++ b/sfx2/qa/unoapi/Test.java @@ -27,6 +27,7 @@ package org.openoffice.sfx2.qa.unoapi; import org.openoffice.Runner; import org.openoffice.test.OfficeConnection; +import org.openoffice.test.Argument; import static org.junit.Assert.*; public final class Test { @@ -43,8 +44,8 @@ public final class Test { @org.junit.Test public void test() { assertTrue( Runner.run( - "-sce", "sfx.sce", "-xcl", "knownissues.xcl", "-tdoc", - "testdocuments", "-cs", connection.getDescription())); + "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc", + Argument.get("tdoc"), "-cs", connection.getDescription())); } private final OfficeConnection connection = new OfficeConnection(); diff --git a/svx/JunitTest_svx_unoapi.mk b/svx/JunitTest_svx_unoapi.mk index 3e0d5473c669..d6597f85e8e7 100755 --- a/svx/JunitTest_svx_unoapi.mk +++ b/svx/JunitTest_svx_unoapi.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite diff --git a/svx/prj/build.lst b/svx/prj/build.lst index 1471763b4cb8..7b541b2d77c4 100644 --- a/svx/prj/build.lst +++ b/svx/prj/build.lst @@ -1,6 +1,2 @@ sx svx : sfx2 l10n oovbaapi connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt NULL - -sx svx usr1 - all sx_mkout NULL sx svx\prj nmake - all sx_prj NULL - -# sx svx\qa\unoapi nmake - all sx_qa_unoapi NULL diff --git a/svx/qa/unoapi/makefile.mk b/svx/qa/unoapi/makefile.mk deleted file mode 100644 index 133e9a3458e4..000000000000 --- a/svx/qa/unoapi/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -#***********************************************************************/ - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../.. -PRJNAME = svx -TARGET = qa_unoapi - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = org/openoffice/svx/qa/unoapi -JAVATESTFILES = Test.java -JAVAFILES = $(JAVATESTFILES) -JARFILES = OOoRunner.jar ridl.jar test.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END -- cgit v1.2.3 From 5e78b38a6e5341452402eb6e5a1e541be3af5860 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 4 Feb 2011 18:04:57 +0100 Subject: gnumake3: adjust sfx2 complex tests to m99 changes --- sfx2/JunitTest_sfx2_complex.mk | 47 ++++++++++++++++++++++------------- sfx2/qa/complex/sfx2/UndoManager.java | 2 +- 2 files changed, 31 insertions(+), 18 deletions(-) (limited to 'sfx2/qa') diff --git a/sfx2/JunitTest_sfx2_complex.mk b/sfx2/JunitTest_sfx2_complex.mk index a202319975dc..800612a6c55d 100755 --- a/sfx2/JunitTest_sfx2_complex.mk +++ b/sfx2/JunitTest_sfx2_complex.mk @@ -29,37 +29,50 @@ $(eval $(call gb_JunitTest_JunitTest,sfx2_complex)) $(eval $(call gb_JunitTest_set_defs,sfx2_complex,\ $$(DEFS) \ - -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sfx2/qa/complex/framework/testdocuments \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sfx2/qa/complex/sfx2/testdocuments \ )) $(eval $(call gb_JunitTest_add_jars,sfx2_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/test-tools.jar \ $(OUTDIR)/bin/unoil.jar \ $(OUTDIR)/bin/jurt.jar \ )) $(eval $(call gb_JunitTest_add_sourcefiles,sfx2_complex,\ - sfx2/qa/complex/framework/CheckGlobalEventBroadcaster_writer1 \ - sfx2/qa/complex/framework/DocumentMetadataAccessTest \ - sfx2/qa/complex/framework/DialogThread \ - sfx2/qa/complex/framework/WriterHelper \ - sfx2/qa/complex/framework/TestDocument \ - sfx2/qa/complex/framework/DocumentPropertiesTest \ - sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoTest \ - sfx2/qa/complex/standalonedocumentinfo/TestHelper \ - sfx2/qa/complex/standalonedocumentinfo/Test01 \ - sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest \ - sfx2/qa/complex/docinfo/DocumentProperties \ + sfx2/qa/complex/sfx2/tools/DialogThread \ + sfx2/qa/complex/sfx2/tools/WriterHelper \ + sfx2/qa/complex/sfx2/tools/TestDocument \ + sfx2/qa/complex/sfx2/GlobalEventBroadcaster \ + sfx2/qa/complex/sfx2/DocumentMetadataAccess \ + sfx2/qa/complex/sfx2/DocumentProperties \ + sfx2/qa/complex/sfx2/DocumentInfo \ + sfx2/qa/complex/sfx2/StandaloneDocumentInfo \ + sfx2/qa/complex/sfx2/UndoManager \ + sfx2/qa/complex/sfx2/standalonedocinfo/StandaloneDocumentInfoTest \ + sfx2/qa/complex/sfx2/standalonedocinfo/TestHelper \ + sfx2/qa/complex/sfx2/standalonedocinfo/Test01 \ + sfx2/qa/complex/sfx2/undo/CalcDocumentTest \ + sfx2/qa/complex/sfx2/undo/ChartDocumentTest \ + sfx2/qa/complex/sfx2/undo/DocumentTest \ + sfx2/qa/complex/sfx2/undo/DocumentTestBase \ + sfx2/qa/complex/sfx2/undo/DrawDocumentTest \ + sfx2/qa/complex/sfx2/undo/DrawingOrPresentationDocumentTest \ + sfx2/qa/complex/sfx2/undo/ImpressDocumentTest \ + sfx2/qa/complex/sfx2/undo/WriterDocumentTest \ )) $(eval $(call gb_JunitTest_add_classes,sfx2_complex,\ - complex.docinfo.DocumentProperties \ - complex.framework.DocumentPropertiesTest \ - complex.framework.DocumentMetadataAccessTest \ + complex.sfx2.DocumentInfo \ + complex.sfx2.DocumentProperties \ + complex.sfx2.DocumentMetadataAccess \ + complex.sfx2.UndoManager \ )) -# fails currently: misses some OnUnfocus event -# complex.framework.CheckGlobalEventBroadcaster_writer1 \ +# #i115674# fails currently: misses some OnUnfocus event +# complex.sfx2.GlobalEventBroadcaster \ +# breaks because binfilter export has been removed +# complex.sfx2.StandaloneDocumentInfo \ # vim: set noet sw=4 ts=4: diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index ab1b9de910b8..f37530aba726 100755 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -159,7 +159,7 @@ public class UndoManager } // ----------------------------------------------------------------------------------------------------------------- - @Test +//#i116813# disabled @Test public void checkBrokenScripts() throws com.sun.star.uno.Exception, InterruptedException { System.out.println( "testing: broken scripts" ); -- cgit v1.2.3