diff options
Diffstat (limited to 'sfx2/qa/complex')
19 files changed, 1219 insertions, 1010 deletions
diff --git a/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java b/sfx2/qa/complex/CheckGlobalEventBroadcaster_writer1.java deleted file mode 100644 index 6ab5400ec4..0000000000 --- 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 - * <http://www.openoffice.org/license.html> - * 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 <code> - * reset</code> 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<notifyEvents.size();k++) { - System.out.println("\t- "+notifyEvents.get(k)); - } - - for (int i = 0; i < expected.length; i++) { - locRes = notifyEvents.contains(expected[i]); - - if (!locRes) { - log.println("The event " + expected[i] + " isn't fired"); - failure = true; - } - } - - return !failure; - } - - public class EventListenerImpl implements XEventListener { - public void disposing(com.sun.star.lang.EventObject eventObject) { - log.println("disposing: " + eventObject.Source.toString()); - } - - public void notifyEvent(com.sun.star.document.EventObject eventObject) { - notifyEvents.add(eventObject.EventName); - } - } -} diff --git a/sfx2/qa/complex/docinfo/DocumentProperties.java b/sfx2/qa/complex/docinfo/DocumentProperties.java index 2f818b972b..e5043ddcc3 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); + // TODO: need other temp directory! 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"); + 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"); - - 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); - } - 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 8c35255410..626b648a6d 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 0000000000..139c0e5a9e --- /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 + * <http://www.openoffice.org/license.html> + * 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 <code> + * reset</code> 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<notifyEvents.size();k++) { + System.out.println("\t- "+notifyEvents.get(k)); + } + + for (int i = 0; i < expected.length; i++) { + locRes = notifyEvents.contains(expected[i]); + + if (!locRes) { + System.out.println("The event " + expected[i] + " isn't fired"); + failure = true; + } + } + + return !failure; + } + + public class EventListenerImpl implements XEventListener { + public void disposing(com.sun.star.lang.EventObject eventObject) { + System.out.println("disposing: " + eventObject.Source.toString()); + } + + public void notifyEvent(com.sun.star.document.EventObject eventObject) { + notifyEvents.add(eventObject.EventName); + } + } + + 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() CheckGlobalEventBroadcaster_writer1"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + +} diff --git a/sfx2/qa/complex/DocHelper/DialogThread.java b/sfx2/qa/complex/framework/DialogThread.java index 19f5b32d3e..19f5b32d3e 100644 --- a/sfx2/qa/complex/DocHelper/DialogThread.java +++ b/sfx2/qa/complex/framework/DialogThread.java diff --git a/sfx2/qa/complex/DocHelper/makefile.mk b/sfx2/qa/complex/framework/DocHelper/makefile.mk index 6b6ac9191c..ad614cfca3 100644 --- a/sfx2/qa/complex/DocHelper/makefile.mk +++ b/sfx2/qa/complex/framework/DocHelper/makefile.mk @@ -25,10 +25,10 @@ # #************************************************************************* -PRJ = ..$/..$/.. +PRJ = ../../../.. TARGET = DocHelper PRJNAME = $(TARGET) -PACKAGE = complex$/framework$/dochelper +PACKAGE = complex/framework/dochelper # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk @@ -37,8 +37,11 @@ PACKAGE = complex$/framework$/dochelper #----- 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) +JAVAFILES = \ + DialogThread.java \ + WriterHelper.java + +JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:b).class) # --- Targets ------------------------------------------------------ diff --git a/sfx2/qa/complex/DocumentMetadataAccessTest.java b/sfx2/qa/complex/framework/DocumentMetadataAccessTest.java index da9cfd6cf7..8fd1d3d1a0 100644 --- a/sfx2/qa/complex/DocumentMetadataAccessTest.java +++ b/sfx2/qa/complex/framework/DocumentMetadataAccessTest.java @@ -27,15 +27,14 @@ package complex.framework; -import complexlib.ComplexTestCase; +// 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; @@ -46,17 +45,23 @@ 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.*; +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 @@ -68,7 +73,7 @@ import com.sun.star.rdf.*; * * @author mst */ -public class DocumentMetadataAccessTest extends ComplexTestCase +public class DocumentMetadataAccessTest { XMultiServiceFactory xMSF; XComponentContext xContext; @@ -105,72 +110,77 @@ public class DocumentMetadataAccessTest extends ComplexTestCase XRepositorySupplier xRS; XDocumentMetadataAccess xDMA; - public String[] getTestMethodNames () - { - return new String[] { "check", "checkRDFa" }; - } +// public String[] getTestMethodNames () +// { +// return new String[] { "check", "checkRDFa" }; +// } + /** + * The test parameters + */ + private static TestParameters param = null; - public void before() + @Before public void before() { try { - xMSF = (XMultiServiceFactory) param.getMSF(); - assure("could not create MultiServiceFactory.", xMSF != null); - XPropertySet xPropertySet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xMSF); + 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 = (XComponentContext) - UnoRuntime.queryInterface(XComponentContext.class, defaultCtx); - assure("could not get component context.", xContext != null); + xContext = UnoRuntime.queryInterface(XComponentContext.class, defaultCtx); + assertNotNull("could not get component context.", xContext); tempDir = util.utils.getOfficeTemp/*Dir*/(xMSF); - log.println("tempdir: " + tempDir); + System.out.println("tempdir: " + tempDir); foo = URI.create(xContext, "uri:foo"); - assure("foo", null != foo); + assertNotNull("foo", foo); bar = URI.create(xContext, "uri:bar"); - assure("bar", null != bar); + assertNotNull("bar", bar); baz = URI.create(xContext, "uri:baz"); - assure("baz", null != baz); + assertNotNull("baz", baz); blank1 = BlankNode.create(xContext, "_:1"); - assure("blank1", null != blank1); + assertNotNull("blank1", blank1); blank2 = BlankNode.create(xContext, "_:2"); - assure("blank2", null != blank2); + assertNotNull("blank2", blank2); blank3 = BlankNode.create(xContext, "_:3"); - assure("blank3", null != blank3); + assertNotNull("blank3", blank3); blank4 = BlankNode.create(xContext, "_:4"); - assure("blank4", null != blank4); + assertNotNull("blank4", blank4); rdf_type = URI.createKnown(xContext, URIs.RDF_TYPE); - assure("rdf_type", null != rdf_type); + assertNotNull("rdf_type", rdf_type); rdfs_label = URI.createKnown(xContext, URIs.RDFS_LABEL); - assure("rdfs_label", null != rdfs_label); + assertNotNull("rdfs_label", rdfs_label); pkg_Document = URI.createKnown(xContext, URIs.PKG_DOCUMENT); - assure("pkg_Document", null != pkg_Document); + assertNotNull("pkg_Document", pkg_Document); pkg_hasPart = URI.createKnown(xContext, URIs.PKG_HASPART); - assure("pkg_hasPart", null != pkg_hasPart); + assertNotNull("pkg_hasPart", pkg_hasPart); pkg_MetadataFile = URI.createKnown(xContext, URIs.PKG_METADATAFILE); - assure("pkg_MetadataFile", null != pkg_MetadataFile); + assertNotNull("pkg_MetadataFile", pkg_MetadataFile); odf_ContentFile = URI.createKnown(xContext, URIs.ODF_CONTENTFILE); - assure("odf_ContentFile", null != odf_ContentFile); + assertNotNull("odf_ContentFile", odf_ContentFile); odf_StylesFile = URI.createKnown(xContext, URIs.ODF_STYLESFILE); - assure("odf_StylesFile", null != odf_StylesFile); + assertNotNull("odf_StylesFile", odf_StylesFile); odf_Element = URI.createKnown(xContext, URIs.ODF_ELEMENT); - assure("odf_Element", null != odf_Element); + assertNotNull("odf_Element", odf_Element); } catch (Exception e) { report(e); } } - public void after() + @After public void after() { xRep = null; xRS = null; xDMA = null; } - public void check() + @Test public void check() { XComponent xComp = null; XComponent xComp2 = null; @@ -178,7 +188,7 @@ public class DocumentMetadataAccessTest extends ComplexTestCase XEnumeration xStmtsEnum; XNamedGraph xManifest; - log.println("Creating document with Repository..."); + System.out.println("Creating document with Repository..."); // we cannot create a XDMA directly, we must create // a document and get it from there :( @@ -188,40 +198,37 @@ public class DocumentMetadataAccessTest extends ComplexTestCase 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); + 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(); - assure("xRep null", null != xRep); + assertNotNull("xRep null", xRep); - log.println("...done"); + System.out.println("...done"); - log.println("Checking that new repository is initialized..."); + System.out.println("Checking that new repository is initialized..."); XURI xBaseURI = (XURI) xDMA; String baseURI = xBaseURI.getStringValue(); - assure("new: baseURI", - null != xBaseURI && !xBaseURI.getStringValue().equals("")); + assertNotNull("new: baseURI", xBaseURI ); + assertTrue("new: baseURI", !xBaseURI.getStringValue().equals("")); - assure("new: # graphs", 1 == xRep.getGraphNames().length); + assertTrue("new: # graphs", 1 == xRep.getGraphNames().length); XURI manifest = URI.createNS(xContext, xBaseURI.getStringValue(), manifestPath); xManifest = xRep.getGraph(manifest); - assure("new: manifest graph", null != xManifest); + assertTrue("new: manifest graph", null != xManifest); Statement[] manifestStmts = getManifestStmts(xBaseURI); xStmtsEnum = xRep.getStatements(null, null, null); - assure("new: manifest graph", eq(xStmtsEnum, manifestStmts)); + assertTrue("new: manifest graph", eq(xStmtsEnum, manifestStmts)); - log.println("...done"); + System.out.println("...done"); - log.println("Checking some invalid args..."); + System.out.println("Checking some invalid args..."); String content = "behold, for i am the content."; XTextRange xTR = new TestRange(content); @@ -229,205 +236,201 @@ public class DocumentMetadataAccessTest extends ComplexTestCase try { xDMA.getElementByURI(null); - assure("getElementByURI: null allowed", false); + fail("getElementByURI: null allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.getMetadataGraphsWithType(null); - assure("getMetadataGraphsWithType: null URI allowed", false); + fail("getMetadataGraphsWithType: null URI allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addMetadataFile("", new XURI[0]); - assure("addMetadataFile: empty filename allowed", false); + fail("addMetadataFile: empty filename allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addMetadataFile("/foo", new XURI[0]); - assure("addMetadataFile: absolute filename allowed", false); + fail("addMetadataFile: absolute filename allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addMetadataFile("fo\"o", new XURI[0]); - assure("addMetadataFile: invalid filename allowed", false); + fail("addMetadataFile: invalid filename allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addMetadataFile("../foo", new XURI[0]); - assure("addMetadataFile: filename with .. allowed", false); + fail("addMetadataFile: filename with .. allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addMetadataFile("foo/../../bar", new XURI[0]); - assure("addMetadataFile: filename with nest .. allowed", false); + fail("addMetadataFile: filename with nest .. allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addMetadataFile("foo/././bar", new XURI[0]); - assure("addMetadataFile: filename with nest . allowed", false); + fail("addMetadataFile: filename with nest . allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addMetadataFile("content.xml", new XURI[0]); - assure("addMetadataFile: content.xml allowed", false); + fail("addMetadataFile: content.xml allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addMetadataFile("styles.xml", new XURI[0]); - assure("addMetadataFile: styles.xml allowed", false); + fail("addMetadataFile: styles.xml allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addMetadataFile("meta.xml", new XURI[0]); - assure("addMetadataFile: meta.xml allowed", false); + fail("addMetadataFile: meta.xml allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addMetadataFile("settings.xml", new XURI[0]); - assure("addMetadataFile: settings.xml allowed", false); + fail("addMetadataFile: settings.xml allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.importMetadataFile(FileFormat.RDF_XML, null, "foo", foo, new XURI[0]); - assure("importMetadataFile: null stream allowed", false); + fail("importMetadataFile: null stream allowed"); } catch (IllegalArgumentException e) { // ignore } + + final String sEmptyRDF = TestDocument.getUrl("empty.rdf"); try { - XInputStream xFooIn = - new StreamSimulator(tempDir + "empty.rdf", true, param); + XInputStream xFooIn = new StreamSimulator(sEmptyRDF, true, param); xDMA.importMetadataFile(FileFormat.RDF_XML, xFooIn, "", foo, new XURI[0]); - assure("importMetadataFile: empty filename allowed", false); + fail("importMetadataFile: empty filename allowed"); } catch (IllegalArgumentException e) { // ignore } try { XInputStream xFooIn = - new StreamSimulator(tempDir + "empty.rdf", true, param); + new StreamSimulator(sEmptyRDF, true, param); xDMA.importMetadataFile(FileFormat.RDF_XML, xFooIn, "meta.xml", foo, new XURI[0]); - assure("importMetadataFile: meta.xml filename allowed", false); + fail("importMetadataFile: meta.xml filename allowed"); } catch (IllegalArgumentException e) { // ignore } try { XInputStream xFooIn = - new StreamSimulator(tempDir + "empty.rdf", true, param); + new StreamSimulator(sEmptyRDF, true, param); xDMA.importMetadataFile(FileFormat.RDF_XML, xFooIn, "foo", null, new XURI[0]); - assure("importMetadataFile: null base URI allowed", false); + fail("importMetadataFile: null base URI allowed"); } catch (IllegalArgumentException e) { // ignore } try { XInputStream xFooIn = - new StreamSimulator(tempDir + "empty.rdf", true, param); + new StreamSimulator(sEmptyRDF, true, param); xDMA.importMetadataFile(FileFormat.RDF_XML, xFooIn, "foo", rdf_type, new XURI[0]); - assure("importMetadataFile: non-absolute base URI allowed", - false); + fail("importMetadataFile: non-absolute base URI allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.removeMetadataFile(null); - assure("removeMetadataFile: null URI allowed", false); + fail("removeMetadataFile: null URI allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addContentOrStylesFile(""); - assure("addContentOrStylesFile: empty filename allowed", - false); + fail("addContentOrStylesFile: empty filename allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addContentOrStylesFile("/content.xml"); - assure("addContentOrStylesFile: absolute filename allowed", - false); + fail("addContentOrStylesFile: absolute filename allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.addContentOrStylesFile("foo.rdf"); - assure("addContentOrStylesFile: invalid filename allowed", - false); + fail("addContentOrStylesFile: invalid filename allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.removeContentOrStylesFile(""); - assure("removeContentOrStylesFile: empty filename allowed", - false); + fail("removeContentOrStylesFile: empty filename allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.loadMetadataFromStorage(null, foo, null); - assure("loadMetadataFromStorage: null storage allowed", false); + fail("loadMetadataFromStorage: null storage allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.storeMetadataToStorage(null/*, base*/); - assure("storeMetadataToStorage: null storage allowed", false); + fail("storeMetadataToStorage: null storage allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.loadMetadataFromMedium(new PropertyValue[0]); - assure("loadMetadataFromMedium: empty medium allowed", false); + fail("loadMetadataFromMedium: empty medium allowed"); } catch (IllegalArgumentException e) { // ignore } try { xDMA.storeMetadataToMedium(new PropertyValue[0]); - assure("storeMetadataToMedium: empty medium allowed", false); + fail("storeMetadataToMedium: empty medium allowed"); } catch (IllegalArgumentException e) { // ignore } - log.println("...done"); + System.out.println("...done"); - log.println("Checking file addition/removal..."); + System.out.println("Checking file addition/removal..."); xDMA.removeContentOrStylesFile(contentPath); xStmtsEnum = xManifest.getStatements(null, null, null); - assure("removeContentOrStylesFile (content)", + assertTrue("removeContentOrStylesFile (content)", eq(xStmtsEnum, new Statement[] { manifestStmts[0], manifestStmts[2], manifestStmts[4] })); xDMA.addContentOrStylesFile(contentPath); xStmtsEnum = xManifest.getStatements(null, null, null); - assure("addContentOrStylesFile (content)", + assertTrue("addContentOrStylesFile (content)", eq(xStmtsEnum, manifestStmts)); xDMA.removeContentOrStylesFile(stylesPath); xStmtsEnum = xManifest.getStatements(null, null, null); - assure("removeContentOrStylesFile (styles)", + assertTrue("removeContentOrStylesFile (styles)", eq(xStmtsEnum, new Statement[] { manifestStmts[0], manifestStmts[1], manifestStmts[3] })); xDMA.addContentOrStylesFile(stylesPath); xStmtsEnum = xManifest.getStatements(null, null, null); - assure("addContentOrStylesFile (styles)", + assertTrue("addContentOrStylesFile (styles)", eq(xStmtsEnum, manifestStmts)); XURI xFoo = URI.createNS(xContext, xBaseURI.getStringValue(), @@ -440,44 +443,41 @@ public class DocumentMetadataAccessTest extends ComplexTestCase new Statement(xFoo, rdf_type, bar, manifest); xDMA.addMetadataFile(fooPath, new XURI[] { bar }); xStmtsEnum = xManifest.getStatements(null, null, null); - assure("addMetadataFile", + assertTrue("addMetadataFile", eq(xStmtsEnum, merge(manifestStmts, new Statement[] { xM_BaseHaspartFoo, xM_FooTypeMetadata, xM_FooTypeBar }))); XURI[] graphsBar = xDMA.getMetadataGraphsWithType(bar); - assure("getMetadataGraphsWithType", + assertTrue("getMetadataGraphsWithType", graphsBar.length == 1 && eq(graphsBar[0], xFoo)); xDMA.removeMetadataFile(xFoo); xStmtsEnum = xManifest.getStatements(null, null, null); - assure("removeMetadataFile", + assertTrue("removeMetadataFile", eq(xStmtsEnum, manifestStmts)); - log.println("...done"); + System.out.println("...done"); - log.println("Checking mapping..."); + System.out.println("Checking mapping..."); - XEnumerationAccess xTextEnum = (XEnumerationAccess) - UnoRuntime.queryInterface(XEnumerationAccess.class, - xText.getText()); + XEnumerationAccess xTextEnum = UnoRuntime.queryInterface(XEnumerationAccess.class, xText.getText()); Object o = xTextEnum.createEnumeration().nextElement(); - XMetadatable xMeta1 = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, o); + XMetadatable xMeta1 = UnoRuntime.queryInterface(XMetadatable.class, o); XURI uri; XMetadatable xMeta; xMeta = xDMA.getElementByURI(xMeta1); - assure("getElementByURI: null", null != xMeta); + assertTrue("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)); + assertTrue("getElementByURI: no xml id", !XmlId.equals("")); + assertTrue("getElementByURI: different xml id", XmlId.equals(XmlId1)); - log.println("...done"); + System.out.println("...done"); - log.println("Checking storing and loading..."); + System.out.println("Checking storing and loading..."); XURI xFoobar = URI.createNS(xContext, xBaseURI.getStringValue(), fooBarPath); @@ -485,23 +485,23 @@ public class DocumentMetadataAccessTest extends ComplexTestCase fooBarPath); xDMA.addMetadataFile(fooBarPath, new XURI[0]); xStmtsEnum = xRep.getStatements(null, null, null); - assure("addMetadataFile", + 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); - assure("addStatement", + assertTrue("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"); + noMDNoContentFile.Value = TestDocument.getUrl("CUSTOM.odt"); PropertyValue noMDFile = new PropertyValue(); noMDFile.Name = "URL"; - noMDFile.Value = util.utils.getFullTestURL("TEST.odt"); + noMDFile.Value = TestDocument.getUrl("TEST.odt"); PropertyValue file = new PropertyValue(); file.Name = "URL"; file.Value = tempDir + "TESTDMA.odt"; @@ -525,71 +525,67 @@ public class DocumentMetadataAccessTest extends ComplexTestCase // this should re-init xDMA.loadMetadataFromMedium(argsEmptyNoContent); xRep = xRS.getRDFRepository(); - assure("xRep null", null != xRep); - assure("baseURI still tdoc?", + 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 - assure("loadMetadataFromMedium (no metadata, no content)", + assertTrue("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?", + assertTrue("xRep null", null != xRep); + assertTrue("baseURI still tdoc?", !baseURI.equals(xDMA.getStringValue())); Statement[] manifestStmts3 = getManifestStmts((XURI) xDMA); xStmtsEnum = xRep.getStatements(null, null, null); - assure("loadMetadataFromMedium (no metadata)", + assertTrue("loadMetadataFromMedium (no metadata)", eq(xStmtsEnum, manifestStmts3)); xDMA.loadMetadataFromMedium(args); xRep = xRS.getRDFRepository(); - assure("xRep null", null != xRep); + assertTrue("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", + 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); - assure("loadMetadataFromMedium (re-load)", + assertTrue("loadMetadataFromMedium (re-load)", eq(xStmtsEnum, merge(manifestStmts4, merge(metadataStmts4, new Statement[] { xFoobar_FooBarFoo4 })))); - log.println("...done"); + System.out.println("...done"); - log.println("Checking storing and loading via model..."); + System.out.println("Checking storing and loading via model..."); String f = tempDir + "TESTPARA.odt"; - XStorable xStor = (XStorable) UnoRuntime.queryInterface( - XStorable.class, xRS); + XStorable xStor = 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); + XDocumentMetadataAccess xDMA2 = UnoRuntime.queryInterface(XDocumentMetadataAccess.class, xComp2); + assertTrue("xDMA2 null", null != xDMA2); - XRepositorySupplier xRS2 = (XRepositorySupplier) - UnoRuntime.queryInterface(XRepositorySupplier.class, xComp2); - assure("xRS2 null", null != xRS2); + XRepositorySupplier xRS2 = UnoRuntime.queryInterface(XRepositorySupplier.class, xComp2); + assertTrue("xRS2 null", null != xRS2); XRepository xRep2 = xRS2.getRDFRepository(); - assure("xRep2 null", null != xRep2); + assertTrue("xRep2 null", null != xRep2); Statement[] manifestStmts5 = getManifestStmts((XURI) xDMA2); Statement[] metadataStmts5 = getMetadataFileStmts((XURI) xDMA2, @@ -600,11 +596,11 @@ public class DocumentMetadataAccessTest extends ComplexTestCase new Statement(foo, bar, foo, xFoobar5); xStmtsEnum = xRep.getStatements(null, null, null); XEnumeration xStmtsEnum2 = xRep2.getStatements(null, null, null); - assure("load: repository differs", + assertTrue("load: repository differs", eq(xStmtsEnum2, merge(manifestStmts5, merge(metadataStmts5, new Statement[] { xFoobar_FooBarFoo5 })))); - log.println("...done"); + System.out.println("...done"); } catch (Exception e) { report(e); @@ -614,49 +610,48 @@ public class DocumentMetadataAccessTest extends ComplexTestCase } } - public void checkRDFa() + @Test public void checkRDFa() { XComponent xComp = null; - String file; try { - file = util.utils.getFullTestURL("TESTRDFA.odt"); + final String file = TestDocument.getUrl("TESTRDFA.odt"); xComp = loadRDFa(file); if (xComp != null) { - file = tempDir + "TESTRDFA.odt"; - storeRDFa(xComp, file); + final String sNewFile = tempDir + "TESTRDFA.odt"; + storeRDFa(xComp, sNewFile); close(xComp); - xComp = loadRDFa(file); + + xComp = loadRDFa(sNewFile); } } finally { close(xComp); } } - public void storeRDFa(XComponent xComp, String file) + private void storeRDFa(XComponent xComp, String file) { try { - log.println("Storing test document..."); + System.out.println("Storing test document..."); - XStorable xStor = (XStorable) UnoRuntime.queryInterface( - XStorable.class, xComp); + XStorable xStor = UnoRuntime.queryInterface(XStorable.class, xComp); xStor.storeToURL(file, new PropertyValue[0]); - log.println("...done"); + System.out.println("...done"); } catch (Exception e) { report(e); } } - public XComponent loadRDFa(String file) + private XComponent loadRDFa(String file) { XComponent xComp = null; try { - log.println("Loading test document..."); + System.out.println("Loading test document..."); PropertyValue[] loadProps = new PropertyValue[1]; loadProps[0] = new PropertyValue(); @@ -667,46 +662,39 @@ public class DocumentMetadataAccessTest extends ComplexTestCase xComp = util.DesktopTools.loadDoc(xMSF, file, loadProps); - XRepositorySupplier xRS = (XRepositorySupplier) - UnoRuntime.queryInterface(XRepositorySupplier.class, xComp); - assure("xRS null", null != xRS); + XRepositorySupplier xRS = UnoRuntime.queryInterface(XRepositorySupplier.class, xComp); + assertTrue("xRS null", null != xRS); - XDocumentRepository xRep = (XDocumentRepository) - UnoRuntime.queryInterface(XDocumentRepository.class, - xRS.getRDFRepository()); - assure("xRep null", null != xRep); + XDocumentRepository xRep = UnoRuntime.queryInterface(XDocumentRepository.class, xRS.getRDFRepository()); + assertTrue("xRep null", null != xRep); - XTextDocument xTextDoc = (XTextDocument) - UnoRuntime.queryInterface(XTextDocument.class, xComp); + XTextDocument xTextDoc = UnoRuntime.queryInterface(XTextDocument.class, xComp); XText xText = xTextDoc.getText(); - XEnumerationAccess xEA = (XEnumerationAccess) - UnoRuntime.queryInterface(XEnumerationAccess.class, xText); + XEnumerationAccess xEA = UnoRuntime.queryInterface(XEnumerationAccess.class, xText); XEnumeration xEnum = xEA.createEnumeration(); - log.println("...done"); + System.out.println("...done"); - log.println("Checking RDFa in loaded test document..."); + System.out.println("Checking RDFa in loaded test document..."); XMetadatable xPara; Pair<Statement[], Boolean> result; Statement x_FooBarLit1 = new Statement(foo, bar, mkLit("1"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 1", + assertTrue("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()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 2", + assertTrue("RDFa: 2", !result.Second && eq(result.First, new Statement[] { x_FooBarLit2 @@ -714,54 +702,47 @@ public class DocumentMetadataAccessTest extends ComplexTestCase Statement x_BlankBarLit3 = new Statement(blank1, bar, mkLit("3"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 3", + assertTrue("RDFa: 3", !result.Second && eq(result.First, new Statement[] { x_BlankBarLit3 })); - XBlankNode b3 = (XBlankNode) UnoRuntime.queryInterface( - XBlankNode.class, result.First[0].Subject); + XBlankNode b3 = 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()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 4", + assertTrue("RDFa: 4", !result.Second && eq(result.First, new Statement[] { x_BlankBarLit4 })); - XBlankNode b4 = (XBlankNode) UnoRuntime.queryInterface( - XBlankNode.class, result.First[0].Subject); + XBlankNode b4 = 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()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 5", + assertTrue("RDFa: 5", !result.Second && eq(result.First, new Statement[] { x_BlankBarLit5 })); - XBlankNode b5 = (XBlankNode) UnoRuntime.queryInterface( - XBlankNode.class, result.First[0].Subject); + XBlankNode b5 = UnoRuntime.queryInterface(XBlankNode.class, result.First[0].Subject); - assure("RDFa: 3 != 4", + assertTrue("RDFa: 3 != 4", !b3.getStringValue().equals(b4.getStringValue())); - assure("RDFa: 3 == 5", + 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 = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 6", + assertTrue("RDFa: 6", !result.Second && eq(result.First, new Statement[] { x_FooBarLit6, x_FooBazLit6 @@ -770,10 +751,9 @@ public class DocumentMetadataAccessTest extends ComplexTestCase 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()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 7", + assertTrue("RDFa: 7", !result.Second && eq(result.First, new Statement[] { x_FooBarLit7, x_FooBazLit7, x_FooFooLit7 @@ -784,28 +764,25 @@ public class DocumentMetadataAccessTest extends ComplexTestCase 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()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 8", + assertTrue("RDFa: 8", result.Second && eq(result.First, new Statement[] { x_FooBarLit })); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 9", + assertTrue("RDFa: 9", result.Second && eq(result.First, new Statement[] { x_FooBarLit })); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 10", + assertTrue("RDFa: 10", result.Second && eq(result.First, new Statement[] { x_FooBarLittype @@ -813,10 +790,9 @@ public class DocumentMetadataAccessTest extends ComplexTestCase Statement x_FooBarLit11 = new Statement(foo, bar, mkLit("11", bar), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 11", + assertTrue("RDFa: 11", !result.Second && eq(result.First, new Statement[] { x_FooBarLit11 @@ -825,19 +801,17 @@ public class DocumentMetadataAccessTest extends ComplexTestCase 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()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 12", + assertTrue("RDFa: 12", !result.Second && eq(result.First, new Statement[] { x_FileBarLit12 })); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 13", + assertTrue("RDFa: 13", result.Second && eq(result.First, new Statement[] { x_FooBarLit @@ -845,51 +819,45 @@ public class DocumentMetadataAccessTest extends ComplexTestCase Statement x_FooLabelLit14 = new Statement(foo, rdfs_label, mkLit("14"), null); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 14", + assertTrue("RDFa: 14", result.Second && eq(result.First, new Statement[] { - x_FooBarLit + /* x_FooLabelLit14 */ x_FooBarLit })); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 15", eq(result.First, new Statement[] { } )); + assertTrue("RDFa: 15", eq(result.First, new Statement[] { } )); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 16", eq(result.First, new Statement[] { } )); + assertTrue("RDFa: 16", eq(result.First, new Statement[] { } )); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 17", eq(result.First, new Statement[] { } )); + assertTrue("RDFa: 17", eq(result.First, new Statement[] { } )); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 18", eq(result.First, new Statement[] { } )); + assertTrue("RDFa: 18", eq(result.First, new Statement[] { } )); - xPara = (XMetadatable) UnoRuntime.queryInterface( - XMetadatable.class, xEnum.nextElement()); + xPara = UnoRuntime.queryInterface(XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 19", eq(result.First, new Statement[] { } )); + assertTrue("RDFa: 19", eq(result.First, new Statement[] { } )); - xPara = (XMetadatable) UnoRuntime.queryInterface( + xPara = UnoRuntime.queryInterface( XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 20", eq(result.First, new Statement[] { } )); + assertTrue("RDFa: 20", eq(result.First, new Statement[] { } )); - xPara = (XMetadatable) UnoRuntime.queryInterface( + xPara = UnoRuntime.queryInterface( XMetadatable.class, xEnum.nextElement()); result = xRep.getStatementRDFa(xPara); - assure("RDFa: 21", eq(result.First, new Statement[] { } )); + assertTrue("RDFa: 21", eq(result.First, new Statement[] { } )); - log.println("...done"); + System.out.println("...done"); } catch (Exception e) { report(e); @@ -905,33 +873,35 @@ public class DocumentMetadataAccessTest extends ComplexTestCase { if (e instanceof WrappedTargetException) { - log.println("Cause:"); + System.out.println("Cause:"); Exception cause = (Exception) (((WrappedTargetException)e).TargetException); - log.println(cause.toString()); + System.out.println(cause.toString()); report2(cause); } else if (e instanceof WrappedTargetRuntimeException) { - log.println("Cause:"); + System.out.println("Cause:"); Exception cause = (Exception) (((WrappedTargetRuntimeException)e).TargetException); - log.println(cause.toString()); + System.out.println(cause.toString()); report2(cause); } } public void report(Exception e) { - log.println("Exception occurred:"); - e.printStackTrace((java.io.PrintWriter) log); + System.out.println("Exception occurred:"); + e.printStackTrace(); report2(e); - failed(); + fail(); } static void close(XComponent i_comp) { try { - XCloseable xClos = (XCloseable) UnoRuntime.queryInterface( - XCloseable.class, i_comp); - if (xClos != null) xClos.close(true); + XCloseable xClos = UnoRuntime.queryInterface(XCloseable.class, i_comp); + if (xClos != null) + { + xClos.close(true); + } } catch (Exception e) { } } @@ -960,14 +930,16 @@ public class DocumentMetadataAccessTest extends ComplexTestCase } public static String toS(XNode n) { - if (null == n) return "< null >"; + if (null == n) + { + return "< null >"; + } return n.getStringValue(); } static boolean isBlank(XNode i_node) { - XBlankNode blank = (XBlankNode) UnoRuntime.queryInterface( - XBlankNode.class, i_node); + XBlankNode blank = UnoRuntime.queryInterface(XBlankNode.class, i_node); return blank != null; } @@ -1000,7 +972,7 @@ public class DocumentMetadataAccessTest extends ComplexTestCase 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() + "."); +//System.out.println("toSeq: " + s.getSubject().getStringValue() + " " + s.getPredicate().getStringValue() + " " + s.getObject().getStringValue() + "."); c.add(s); } // return (Statement[]) c.toArray(); @@ -1035,11 +1007,17 @@ public class DocumentMetadataAccessTest extends ComplexTestCase { XNode[] left = (XNode[]) i_Left; XNode[] right = (XNode[]) i_Right; - if (left.length != right.length) throw new RuntimeException(); + 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; + if (eq != 0) + { + return eq; + } } return 0; } @@ -1078,23 +1056,23 @@ public class DocumentMetadataAccessTest extends ComplexTestCase XURI lG = i_Left.Graph; XURI rG = i_Right.Graph; if (!eq(lG, rG)) { - log.println("Graphs differ: " + toS(lG) + " != " + toS(rG)); + System.out.println("Graphs differ: " + toS(lG) + " != " + toS(rG)); return false; } if (!eq(i_Left.Subject, i_Right.Subject)) { - log.println("Subjects differ: " + + System.out.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: " + + System.out.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: " + + System.out.println("Objects differ: " + i_Left.Object.getStringValue() + " != " + i_Right.Object.getStringValue()); return false; @@ -1105,7 +1083,7 @@ public class DocumentMetadataAccessTest extends ComplexTestCase static boolean eq(Statement[] i_Result, Statement[] i_Expected) { if (i_Result.length != i_Expected.length) { - log.println("eq: different lengths: " + i_Result.length + " " + + System.out.println("eq: different lengths: " + i_Result.length + " " + i_Expected.length); return false; } @@ -1113,8 +1091,13 @@ public class DocumentMetadataAccessTest extends ComplexTestCase 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; + 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; } @@ -1141,15 +1124,15 @@ public class DocumentMetadataAccessTest extends ComplexTestCase static boolean eq(XQuerySelectResult i_Result, String[] i_Vars, XNode[][] i_Bindings) throws Exception { - String[] vars = (String[]) i_Result.getBindingNames(); + String[] vars = i_Result.getBindingNames(); XEnumeration iter = (XEnumeration) i_Result; XNode[][] bindings = toSeqs(iter); if (vars.length != i_Vars.length) { - log.println("var lengths differ"); + System.out.println("var lengths differ"); return false; } if (bindings.length != i_Bindings.length) { - log.println("binding lengths differ: " + i_Bindings.length + + System.out.println("binding lengths differ: " + i_Bindings.length + " vs " + bindings.length ); return false; } @@ -1157,16 +1140,16 @@ public class DocumentMetadataAccessTest extends ComplexTestCase 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!"); + System.out.println("TEST ERROR!"); throw new Exception(); } if (bindings[i].length != i_Vars.length) { - log.println("binding length and var length differ"); + 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])) { - log.println("bindings differ: " + + System.out.println("bindings differ: " + toS(bindings[i][j]) + " != " + toS(i_Bindings[i][j])); return false; } @@ -1174,7 +1157,7 @@ public class DocumentMetadataAccessTest extends ComplexTestCase } for (int i = 0; i < i_Vars.length; ++i) { if (!vars[i].equals(i_Vars[i])) { - log.println("variable names differ: " + + System.out.println("variable names differ: " + vars[i] + " != " + i_Vars[i]); return false; } @@ -1253,17 +1236,27 @@ public class DocumentMetadataAccessTest extends ComplexTestCase public String getLocalName() { return ""; } public StringPair getMetadataReference() - { return new StringPair(m_Stream, m_XmlId); } + { + 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; } + { + m_Stream = i_Ref.First; + m_XmlId = i_Ref.Second; + } public void ensureMetadataReference() - { m_Stream = "content.xml"; m_XmlId = "42"; } + { + 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"); } + { + return i_Svc.equals("com.sun.star.text.Paragraph"); + } public XText getText() { return null; } public XTextRange getStart() { return null; } @@ -1271,5 +1264,29 @@ public class DocumentMetadataAccessTest extends ComplexTestCase 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/DocumentMetaData.java b/sfx2/qa/complex/framework/DocumentPropertiesTest.java index e4ed104c4a..20a0746c83 100644 --- a/sfx2/qa/complex/DocumentMetaData.java +++ b/sfx2/qa/complex/framework/DocumentPropertiesTest.java @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -27,14 +27,11 @@ 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; @@ -51,10 +48,16 @@ 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; +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. @@ -63,13 +66,13 @@ import com.sun.star.document.XDocumentProperties; * * @author mst */ -public class DocumentMetaData extends ComplexTestCase +public class DocumentPropertiesTest { - public String[] getTestMethodNames () { - return new String[] { "check", "cleanup" }; - } +// public String[] getTestMethodNames () { +// return new String[] { "check", "cleanup" }; +// } - public void cleanup() { + @After public void cleanup() { // nothing to do } @@ -95,19 +98,18 @@ public class DocumentMetaData extends ComplexTestCase } } - public void check() { + @Test public void check() { try { - XMultiServiceFactory xMSF = (XMultiServiceFactory) param.getMSF(); - assure("could not create MultiServiceFactory.", xMSF != null); - XPropertySet xPropertySet = (XPropertySet) - UnoRuntime.queryInterface(XPropertySet.class, xMSF); + XMultiServiceFactory xMSF = getMSF(); + assertNotNull("could not create MultiServiceFactory.", xMSF); + 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); + 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); - log.println("tempdir: " + temp); + System.out.println("tempdir: " + temp); PropertyValue[] noArgs = { }; PropertyValue mimetype = new PropertyValue(); @@ -120,61 +122,56 @@ public class DocumentMetaData extends ComplexTestCase cfile.Value = temp + "EMPTY.odt"; PropertyValue[] mimeEmptyArgs = { mimetype, cfile }; - log.println("Creating service DocumentProperties..."); + 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 = (XDocumentProperties) - UnoRuntime.queryInterface(XDocumentProperties.class, oDP); + XDocumentProperties xDP = UnoRuntime.queryInterface(XDocumentProperties.class, oDP); - log.println("...done"); + System.out.println("...done"); - log.println("Checking initialize ..."); + System.out.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); + XDocumentProperties xDP2 = UnoRuntime.queryInterface(XDocumentProperties.class, xMSF.createInstance("com.sun.star.document.DocumentProperties")); + XInitialization xInit = UnoRuntime.queryInterface(XInitialization.class, xDP2); xInit.initialize(new Object[] { }); - log.println("...done"); + System.out.println("...done"); - log.println("Checking storing default-initialized meta data ..."); + System.out.println("Checking storing default-initialized meta data ..."); // xDP2.storeToMedium(temp + "EMPTY.odt", mimeArgs); xDP2.storeToMedium("", mimeEmptyArgs); - log.println("...done"); + System.out.println("...done"); - log.println("Checking loading default-initialized meta data ..."); + System.out.println("Checking loading default-initialized meta data ..."); // xDP2.loadFromMedium(temp + "EMPTY.odt", noArgs); xDP2.loadFromMedium("", mimeEmptyArgs); - assure ("Author", "".equals(xDP2.getAuthor())); + assertTrue ("Author", "".equals(xDP2.getAuthor())); - log.println("...done"); + System.out.println("...done"); - log.println("(Not) Checking preservation of custom meta data ..."); + System.out.println("(Not) Checking preservation of custom meta data ..."); - xDP2.loadFromMedium(util.utils.getFullTestURL("CUSTOM.odt"), + xDP2.loadFromMedium(TestDocument.getUrl("CUSTOM.odt"), noArgs); - assure ("Author", "".equals(xDP2.getAuthor())); + 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... - log.println("...done"); + System.out.println("...done"); - log.println("Checking loading from test document..."); + System.out.println("Checking loading from test document..."); - String file = util.utils.getFullTestURL("TEST.odt"); + String file = TestDocument.getUrl("TEST.odt"); xDP.loadFromMedium(file, noArgs); /* XInputStream xStream = new StreamSimulator("./testdocuments/TEST.odt", true, param); @@ -188,68 +185,68 @@ public class DocumentMetaData extends ComplexTestCase XStorage.class, oStor); xDP.loadFromStorage(xStor);*/ - log.println("...done"); + System.out.println("...done"); - log.println("Checking meta-data import..."); + System.out.println("Checking meta-data import..."); - assure ("Author", "Karl-Heinz Mustermann".equals(xDP.getAuthor())); - assure ("Generator", + assertTrue("Author", "Karl-Heinz Mustermann".equals(xDP.getAuthor())); + assertTrue("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", + 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())); -// assure ("Language", "".equals(xDP.getLanguage())); - assure ("ModifiedBy", +// assertTrue("Language", "".equals(xDP.getLanguage())); + assertTrue("ModifiedBy", "Karl-Heinz Mustermann".equals(xDP.getModifiedBy())); - assure ("ModificationDate", 10 == xDP.getModificationDate().Month); - assure ("PrintedBy", + assertTrue("ModificationDate", 10 == xDP.getModificationDate().Month); + assertTrue("PrintedBy", "Karl-Heinz Mustermann".equals(xDP.getPrintedBy())); - assure ("PrintDate", 29 == xDP.getPrintDate().Day); - assure ("TemplateName", + assertTrue("PrintDate", 29 == xDP.getPrintDate().Day); + assertTrue("TemplateName", "Modern Memo".equals(xDP.getTemplateName())); - assure ("TemplateURL", + assertTrue("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()); + 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(); - assure ("Keywords", fromArray(kws).containsAll( + assertTrue("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); + 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)); - log.println("eq: " + nv1.equals(nv2)); // grrr, this is false... + System.out.println("eq: " + nv1.equals(nv2)); // grrr, this is false... */ - assure ("DocumentStatistics:WordCount", containsNV(ds, + assertTrue("DocumentStatistics:WordCount", containsNV(ds, new NamedValue("WordCount", new Integer(23)))); - assure ("DocumentStatistics:PageCount", containsNV(ds, + assertTrue("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" + assertTrue("UserDefined 1", "Dies ist ein wichtiger Hinweis" .equals(udps.getPropertyValue("Hinweis"))); - assure ("UserDefined 2", ("Kann Spuren von N" + assertTrue("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"); + System.out.println("...done"); - log.println("Checking meta-data updates..."); + System.out.println("Checking meta-data updates..."); String str; DateTime dt = new DateTime(); @@ -258,75 +255,75 @@ public class DocumentMetaData extends ComplexTestCase str = "me"; xDP.setAuthor(str); - assure ("setAuthor", str.equals(xDP.getAuthor())); + assertTrue("setAuthor", str.equals(xDP.getAuthor())); str = "the computa"; xDP.setGenerator(str); - assure ("setGenerator", str.equals(xDP.getGenerator())); + assertTrue("setGenerator", str.equals(xDP.getGenerator())); dt.Year = 2038; dt.Month = 1; dt.Day = 1; xDP.setCreationDate(dt); - assure ("setCreationDate", dt.Year == xDP.getCreationDate().Year); + assertTrue("setCreationDate", dt.Year == xDP.getCreationDate().Year); str = "El t'itulo"; xDP.setTitle(str); - assure ("setTitle", str.equals(xDP.getTitle())); + assertTrue("setTitle", str.equals(xDP.getTitle())); str = "Ein verkommenes Subjekt"; xDP.setSubject(str); - assure ("setSubject", str.equals(xDP.getSubject())); + assertTrue("setSubject", str.equals(xDP.getSubject())); str = "Este descripci'on no es importante"; xDP.setDescription(str); - assure ("setDescription", str.equals(xDP.getDescription())); + assertTrue("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)); + assertTrue("setLanguage Lang", l.Language.equals(l2.Language)); + assertTrue("setLanguage Cty", l.Country.equals(l2.Country)); str = "myself"; xDP.setModifiedBy(str); - assure ("setModifiedBy", str.equals(xDP.getModifiedBy())); + assertTrue("setModifiedBy", str.equals(xDP.getModifiedBy())); dt.Year = 2042; xDP.setModificationDate(dt); - assure ("setModificationDate", + assertTrue("setModificationDate", dt.Year == xDP.getModificationDate().Year); str = "i didnt do it"; xDP.setPrintedBy(str); - assure ("setPrintedBy", str.equals(xDP.getPrintedBy())); + assertTrue("setPrintedBy", str.equals(xDP.getPrintedBy())); dt.Year = 2024; xDP.setPrintDate(dt); - assure ("setPrintDate", dt.Year == xDP.getPrintDate().Year); + assertTrue("setPrintDate", dt.Year == xDP.getPrintDate().Year); str = "blah"; xDP.setTemplateName(str); - assure ("setTemplateName", str.equals(xDP.getTemplateName())); + assertTrue("setTemplateName", str.equals(xDP.getTemplateName())); str = "gopher://some-hole-in-the-ground/"; xDP.setTemplateURL(str); - assure ("setTemplateURL", str.equals(xDP.getTemplateURL())); + assertTrue("setTemplateURL", str.equals(xDP.getTemplateURL())); dt.Year = 2043; xDP.setTemplateDate(dt); - assure ("setTemplateDate", dt.Year == xDP.getTemplateDate().Year); + assertTrue("setTemplateDate", dt.Year == xDP.getTemplateDate().Year); str = "http://nowhere/"; xDP.setAutoloadURL(str); - assure ("setAutoloadURL", str.equals(xDP.getAutoloadURL())); + assertTrue("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()); +// System.out.println("set: " + i + " get: " + xDP.getAutoloadSecs()); + assertTrue("setAutoloadSecs", i == xDP.getAutoloadSecs()); str = "_blank"; xDP.setDefaultTarget(str); - assure ("setDefaultTarget", str.equals(xDP.getDefaultTarget())); + assertTrue("setDefaultTarget", str.equals(xDP.getDefaultTarget())); i = 42; xDP.setEditingCycles((short) i); - assure ("setEditingCycles", i == xDP.getEditingCycles()); + assertTrue("setEditingCycles", i == xDP.getEditingCycles()); i = 84; xDP.setEditingDuration(i); - assure ("setEditingDuration", i == xDP.getEditingDuration()); + assertTrue("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))); + assertTrue("setKeywords", fromArray(kws).containsAll(fromArray(kws2))); NamedValue[] ds2 = new NamedValue[] { new NamedValue("SyllableCount", new Integer(9)), @@ -334,16 +331,16 @@ public class DocumentMetaData extends ComplexTestCase new NamedValue("SentenceCount", new Integer(7)) }; xDP.setDocumentStatistics(ds2); ds = xDP.getDocumentStatistics(); - assure ("setDocumentStatistics:SyllableCount", containsNV(ds, + assertTrue("setDocumentStatistics:SyllableCount", containsNV(ds, new NamedValue("SyllableCount", new Integer(9)))); - assure ("setDocumentStatistics:FrameCount", containsNV(ds, + assertTrue("setDocumentStatistics:FrameCount", containsNV(ds, new NamedValue("FrameCount", new Integer(2)))); - assure ("setDocumentStatistics:SentenceCount", containsNV(ds, + assertTrue("setDocumentStatistics:SentenceCount", containsNV(ds, new NamedValue("SentenceCount", new Integer(7)))); - log.println("...done"); + System.out.println("...done"); - log.println("Checking user-defined meta-data updates..."); + System.out.println("Checking user-defined meta-data updates..."); // actually, this tests the PropertyBag service // but maybe the DocumentProperties service will be implemented @@ -384,109 +381,108 @@ public class DocumentMetaData extends ComplexTestCase udpc.removeProperty("Info 1"); udpc.removeProperty("Removed"); } catch (UnknownPropertyException e) { - assure("removeProperty failed", false); + fail("removeProperty failed"); } try { udpc.addProperty("Forbidden", PropertyAttribute.REMOVEABLE, new String[] { "foo", "bar" }); - assure("inserting value of non-supported type did not fail", - false); + fail("inserting value of non-supported type did not fail"); } catch (IllegalTypeException e) { // ignore } - assure ("UserDefined bool", new Boolean(b).equals( + assertTrue("UserDefined bool", new Boolean(b).equals( udps.getPropertyValue("Frobnicate"))); - assure ("UserDefined duration", eqDuration(dur, (Duration) + assertTrue("UserDefined duration", eqDuration(dur, (Duration) udps.getPropertyValue("FrobDuration"))); - assure ("UserDefined time", eqTime(t, (Time) + assertTrue("UserDefined time", eqTime(t, (Time) udps.getPropertyValue("FrobDuration2"))); - assure ("UserDefined date", eqDate(date, (Date) + assertTrue("UserDefined date", eqDate(date, (Date) udps.getPropertyValue("FrobEndDate"))); - assure ("UserDefined datetime", eqDateTime(dt, (DateTime) + assertTrue("UserDefined datetime", eqDateTime(dt, (DateTime) udps.getPropertyValue("FrobStartTime"))); - assure ("UserDefined float", new Double(d).equals( + assertTrue("UserDefined float", new Double(d).equals( udps.getPropertyValue("Pi"))); - assure ("UserDefined string", "bar".equals( + assertTrue("UserDefined string", "bar".equals( udps.getPropertyValue("Foo"))); - assure ("UserDefined empty name", "eeeeek".equals( + assertTrue("UserDefined empty name", "eeeeek".equals( udps.getPropertyValue(""))); try { udps.getPropertyValue("Removed"); - assure("UserDefined remove didn't", false); + fail("UserDefined remove didn't"); } catch (UnknownPropertyException e) { // ok } - log.println("...done"); + System.out.println("...done"); - log.println("Checking storing meta-data to file..."); + System.out.println("Checking storing meta-data to file..."); xDP.storeToMedium(temp + "TEST.odt", mimeArgs); - log.println("...done"); + System.out.println("...done"); - log.println("Checking loading meta-data from stored file..."); + System.out.println("Checking loading meta-data from stored file..."); xDP.loadFromMedium(temp + "TEST.odt", noArgs); - log.println("...done"); + System.out.println("...done"); - log.println("Checking user-defined meta-data from stored file..."); + System.out.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( + assertTrue("UserDefined bool", new Boolean(b).equals( udps.getPropertyValue("Frobnicate"))); - assure ("UserDefined duration", eqDuration(dur, (Duration) + 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)); - assure ("UserDefined time", eqDuration(t_dur, (Duration) + assertTrue("UserDefined time", eqDuration(t_dur, (Duration) udps.getPropertyValue("FrobDuration2"))); - assure ("UserDefined date", eqDate(date, (Date) + assertTrue("UserDefined date", eqDate(date, (Date) udps.getPropertyValue("FrobEndDate"))); - assure ("UserDefined datetime", eqDateTime(dt, (DateTime) + assertTrue("UserDefined datetime", eqDateTime(dt, (DateTime) udps.getPropertyValue("FrobStartTime"))); - assure ("UserDefined float", new Double(d).equals( + assertTrue("UserDefined float", new Double(d).equals( udps.getPropertyValue("Pi"))); - assure ("UserDefined string", "bar".equals( + assertTrue("UserDefined string", "bar".equals( udps.getPropertyValue("Foo"))); try { udps.getPropertyValue("Removed"); - assure("UserDefined remove didn't", false); + fail("UserDefined remove didn't"); } catch (UnknownPropertyException e) { // ok } - log.println("...done"); + System.out.println("...done"); - log.println("Checking notification listener interface..."); + 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"); - assure ("Listener Author", listener.reset()); + assertTrue("Listener Author", listener.reset()); udpc.addProperty("Listener", PropertyAttribute.REMOVEABLE, "foo"); - assure ("Listener UserDefined Add", listener.reset()); + assertTrue("Listener UserDefined Add", listener.reset()); udps.setPropertyValue("Listener", "bar"); - assure ("Listener UserDefined Set", listener.reset()); + assertTrue("Listener UserDefined Set", listener.reset()); udpc.removeProperty("Listener"); - assure ("Listener UserDefined Remove", listener.reset()); + assertTrue("Listener UserDefined Remove", listener.reset()); xMB.removeModifyListener(listener); udpc.addProperty("Listener2", PropertyAttribute.REMOVEABLE, "foo"); - assure ("Removed Listener UserDefined Add", !listener.reset()); + assertTrue("Removed Listener UserDefined Add", !listener.reset()); - log.println("...done"); + System.out.println("...done"); } catch (Exception e) { report(e); @@ -538,9 +534,32 @@ public class DocumentMetaData extends ComplexTestCase } public void report(Exception e) { - log.println("Exception occurred:"); - e.printStackTrace((java.io.PrintWriter) log); - failed(); + 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 new file mode 100644 index 0000000000..8cc6ef7756 --- /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 +* <http://www.openoffice.org/license.html> +* 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/DocHelper/WriterHelper.java b/sfx2/qa/complex/framework/WriterHelper.java index 7b393677f7..d4a8158bb0 100644 --- a/sfx2/qa/complex/DocHelper/WriterHelper.java +++ b/sfx2/qa/complex/framework/WriterHelper.java @@ -73,19 +73,20 @@ public class WriterHelper { * @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); + 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 @@ -95,9 +96,8 @@ public class WriterHelper { */ public XTextDocument openFromDialog(String url, String createButton, boolean destroyLocal) { - XTextDocument xLocalDoc = WriterTools.createTextDoc(m_xMSF); - XComponent comp = (XComponent) UnoRuntime.queryInterface( - XComponent.class, xLocalDoc); + xLocalDoc = WriterTools.createTextDoc(m_xMSF); + XComponent comp = UnoRuntime.queryInterface(XComponent.class, xLocalDoc); DialogThread diagThread = new DialogThread(comp, m_xMSF, url); diagThread.start(); shortWait(); @@ -107,8 +107,7 @@ public class WriterHelper { AccessibilityTools at = new AccessibilityTools(); Object atw = tk.getActiveTopWindow(); - XWindow xWindow = (XWindow) UnoRuntime.queryInterface( - XWindow.class, atw); + XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, atw); XAccessible xRoot = at.getAccessibleObject(xWindow); XAccessibleContext buttonContext = at.getAccessibleObjectForRole( @@ -116,9 +115,7 @@ public class WriterHelper { AccessibleRole.PUSH_BUTTON, createButton); - XAccessibleAction buttonAction = (XAccessibleAction) UnoRuntime.queryInterface( - XAccessibleAction.class, - buttonContext); + XAccessibleAction buttonAction = UnoRuntime.queryInterface(XAccessibleAction.class, buttonContext); try { System.out.println("Name: " + @@ -133,16 +130,26 @@ public class WriterHelper { XDesktop xDesktop = getDesktop(); - XTextDocument returnDoc = (XTextDocument) UnoRuntime.queryInterface( - XTextDocument.class, - xDesktop.getCurrentComponent()); + 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, @@ -156,8 +163,7 @@ public class WriterHelper { e.printStackTrace(); } - XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface( - XExtendedToolkit.class, toolkit); + XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class, toolkit); shortWait(); @@ -165,15 +171,13 @@ public class WriterHelper { Object atw = tk.getActiveTopWindow(); - XWindow xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, - atw); + 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); + XAccessibleSelection sel = UnoRuntime.queryInterface(XAccessibleSelection.class, ARoot); for (int k = 0; k < indexes.length; k++) { try { @@ -181,8 +185,7 @@ public class WriterHelper { shortWait(); ARoot = ARoot.getAccessibleChild(indexes[k]) .getAccessibleContext(); - sel = (XAccessibleSelection) UnoRuntime.queryInterface( - XAccessibleSelection.class, ARoot); + sel = UnoRuntime.queryInterface(XAccessibleSelection.class, ARoot); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { } } @@ -191,17 +194,13 @@ public class WriterHelper { atw = tk.getActiveTopWindow(); - xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, atw); + 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)); + XAccessibleAction action = UnoRuntime.queryInterface(XAccessibleAction.class, at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, bName)); try { action.doAccessibleAction(0); @@ -212,17 +211,13 @@ public class WriterHelper { atw = tk.getActiveTopWindow(); - xWindow = (XWindow) UnoRuntime.queryInterface(XWindow.class, atw); + 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")); + action = UnoRuntime.queryInterface(XAccessibleAction.class, at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Yes")); try { if (action != null) action.doAccessibleAction(0); @@ -233,9 +228,7 @@ public class WriterHelper { XDesktop xDesktop = getDesktop(); - XTextDocument returnDoc = (XTextDocument) UnoRuntime.queryInterface( - XTextDocument.class, - xDesktop.getCurrentComponent()); + XTextDocument returnDoc = UnoRuntime.queryInterface(XTextDocument.class, xDesktop.getCurrentComponent()); if (destroyLocal) { closeDoc(xLocalDoc); @@ -269,8 +262,7 @@ public class WriterHelper { e.printStackTrace(); } - XExtendedToolkit tk = (XExtendedToolkit) UnoRuntime.queryInterface( - XExtendedToolkit.class, toolkit); + XExtendedToolkit tk = UnoRuntime.queryInterface(XExtendedToolkit.class, toolkit); return tk; } @@ -288,8 +280,7 @@ public class WriterHelper { e.printStackTrace(); } - XDesktop xDesktop = (XDesktop) UnoRuntime.queryInterface( - XDesktop.class, desk); + XDesktop xDesktop = UnoRuntime.queryInterface(XDesktop.class, desk); return xDesktop; } diff --git a/sfx2/qa/complex/makefile.mk b/sfx2/qa/complex/framework/makefile.mk index b8bc897fcc..325135b913 100644 --- a/sfx2/qa/complex/makefile.mk +++ b/sfx2/qa/complex/framework/makefile.mk @@ -25,37 +25,41 @@ # #************************************************************************* -PRJ = ..$/.. -TARGET = CheckGlobalEventBroadcaster_writer1 -PRJNAME = $(TARGET) -PACKAGE = complex$/framework +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: +.ELSE -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk +PRJ = ../../.. +PRJNAME = sfx2 +TARGET = qa_complex_framework +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/framework +JAVATESTFILES = \ + DocumentPropertiesTest.java \ + DocumentMetadataAccessTest.java \ + CheckGlobalEventBroadcaster_writer1.java -#----- compile .java files ----------------------------------------- +JAVAFILES = $(JAVATESTFILES) \ + TestDocument.java \ + WriterHelper.java \ + DialogThread.java -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) +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) -SUBDIRS = DocHelper -#----- make a jar from compiled files ------------------------------ +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y -MAXLINELENGTH = 100000 +.END -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk -# --- Targets ------------------------------------------------------ +ALLTAR : javatest -.INCLUDE : target.mk +.END -run: - +java -cp $(CLASSPATH) org.openoffice.Runner -TestBase java_complex -sce tests.sce -tdoc $(PWD)$/testdocuments diff --git a/sfx2/qa/complex/testdocuments/CUSTOM.odt b/sfx2/qa/complex/framework/testdocuments/CUSTOM.odt Binary files differindex 831a8f451d..831a8f451d 100644 --- a/sfx2/qa/complex/testdocuments/CUSTOM.odt +++ b/sfx2/qa/complex/framework/testdocuments/CUSTOM.odt diff --git a/sfx2/qa/complex/testdocuments/TEST.odt b/sfx2/qa/complex/framework/testdocuments/TEST.odt Binary files differindex 7c6f0b60f7..7c6f0b60f7 100644 --- a/sfx2/qa/complex/testdocuments/TEST.odt +++ b/sfx2/qa/complex/framework/testdocuments/TEST.odt diff --git a/sfx2/qa/complex/testdocuments/TESTRDFA.odt b/sfx2/qa/complex/framework/testdocuments/TESTRDFA.odt Binary files differindex d59739142d..d59739142d 100644 --- a/sfx2/qa/complex/testdocuments/TESTRDFA.odt +++ b/sfx2/qa/complex/framework/testdocuments/TESTRDFA.odt diff --git a/sfx2/qa/complex/framework/testdocuments/empty.rdf b/sfx2/qa/complex/framework/testdocuments/empty.rdf new file mode 100644 index 0000000000..af62bab39d --- /dev/null +++ b/sfx2/qa/complex/framework/testdocuments/empty.rdf @@ -0,0 +1,13 @@ +<?xml version="1.0"?> + +<RDF + xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:s="http://www.w3.org/2000/01/rdf-schema#"> + +<!-- + This is the RDF Schema for the RDF data model as described in the + Resource Description Framework (RDF) Model and Syntax Specification + http://www.w3.org/TR/REC-rdf-syntax --> + +</RDF> diff --git a/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java b/sfx2/qa/complex/standalonedocumentinfo/StandaloneDocumentInfoUnitTest.java index 89840e1cd4..e44c8a89c5 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 16b85b3913..bcbdeccd8c 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 697bf726d9..ed4a3634c7 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 c65556aeb7..aade48dbd7 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 |