diff options
Diffstat (limited to 'qadevOOo')
| -rw-r--r-- | qadevOOo/prj/build.lst | 4 | ||||
| -rw-r--r-- | qadevOOo/qa/complex/junitskeleton/Skeleton.java | 194 | ||||
| -rw-r--r-- | qadevOOo/qa/complex/junitskeleton/TestDocument.java | 41 | ||||
| -rw-r--r-- | qadevOOo/qa/complex/junitskeleton/justatest.java | 38 | ||||
| -rw-r--r-- | qadevOOo/qa/complex/junitskeleton/makefile.mk | 63 | ||||
| -rw-r--r-- | qadevOOo/qa/complex/junitskeleton/test_documents/README.txt | 1 | ||||
| -rw-r--r-- | qadevOOo/runner/complexlib/Assurance.java | 25 | ||||
| -rw-r--r-- | qadevOOo/runner/stats/Summarizer.java | 2 | ||||
| -rw-r--r-- | qadevOOo/tests/java/mod/_forms/GenericModelTest.java | 28 |
9 files changed, 379 insertions, 17 deletions
diff --git a/qadevOOo/prj/build.lst b/qadevOOo/prj/build.lst index 1594d5c59f57..e159c6a7b6cc 100644 --- a/qadevOOo/prj/build.lst +++ b/qadevOOo/prj/build.lst @@ -2,4 +2,6 @@ qa qadevOOo : javaunohelper jurt ridljar unoil NULL qa qadevOOo usr1 - all qa_mkout NULL qa qadevOOo nmake - all qa_runner_ant_build NULL qa qadevOOo\runner nmake - all qa_make_package qa_runner_ant_build NULL -qa qadevOOo\qa\unoapi nmake - all qa_qa_unoapi NULL + +qa qadevOOo\qa\unoapi nmake - all qa_qa_unoapi qa_make_package NULL +qa qadevOOo\qa\complex\junitskeleton nmake - all qa_complex_junitskel qa_make_package NULL diff --git a/qadevOOo/qa/complex/junitskeleton/Skeleton.java b/qadevOOo/qa/complex/junitskeleton/Skeleton.java new file mode 100644 index 000000000000..3ae5d3dad120 --- /dev/null +++ b/qadevOOo/qa/complex/junitskeleton/Skeleton.java @@ -0,0 +1,194 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +package complex.junitskeleton; + +import com.sun.star.io.IOException; +import com.sun.star.lang.IllegalArgumentException; +import com.sun.star.lang.XComponent; +import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.uno.UnoRuntime; +import com.sun.star.util.XCloseable; +import java.io.File; +import java.io.RandomAccessFile; + +import lib.TestParameters; + +import util.SOfficeFactory; + +// ---------- junit imports ----------------- +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; +// ------------------------------------------ + +public class Skeleton +{ + /** + * The test parameters + */ + private static TestParameters param = null; + + @Test public void check() { + assertTrue("Couldn't open document", open()); + System.out.println("check"); + assertTrue("Couldn't close document", close()); + String tempDirURL = util.utils.getOfficeTemp/*Dir*/(getMSF()); + System.out.println("temp dir URL is: " + tempDirURL); + String tempDir = graphical.FileHelper.getSystemPathFromFileURL(tempDirURL); + assertTrue("Temp directory doesn't exist.", new File(tempDir).exists()); + } + + private boolean open() + { + System.out.println("open()"); + // get multiservicefactory ----------------------------------------- + final XMultiServiceFactory xMsf = getMSF(); + + SOfficeFactory SOF = SOfficeFactory.getFactory(xMsf); + + // some Tests need the qadevOOo TestParameters, it is like a Hashmap for Properties. + param = new TestParameters(); + param.put("ServiceFactory", xMsf); // some qadevOOo functions need the ServiceFactory + + return true; + } + + private boolean close() + { + System.out.println("close()"); + return true; + } + + // marked as test + @Test public void checkDocument() + { + System.out.println("checkDocument()"); + final String sREADME = TestDocument.getUrl("README.txt"); + System.out.println("README is in:" + sREADME); + File aFile = new File(sREADME); + if (! aFile.exists()) + { + // It is a little bit stupid that office urls not compatible to java file urls + System.out.println("java.io.File can't access Office file urls."); + String sREADMESystemPath = graphical.FileHelper.getSystemPathFromFileURL(sREADME); + aFile = new File(sREADMESystemPath); + assertTrue("File '" + sREADMESystemPath + "' doesn't exists.", aFile.exists()); + } + + try + { + RandomAccessFile aAccess = new RandomAccessFile(aFile, "r"); + long nLength = aAccess.length(); + System.out.println("File length: " + nLength); + assertTrue("File length wrong", nLength > 0); + String sLine = aAccess.readLine(); + assertTrue("Line must not be empty", sLine.length() > 0); + System.out.println(" Line: '" + sLine + "'"); + System.out.println(" length: " + sLine.length()); + assertTrue("File length not near equal to string length", sLine.length() + 2 >= nLength); + aAccess.close(); + } + catch (java.io.FileNotFoundException e) + { + fail("Can't find file: " + sREADME + " - " + e.getMessage()); + } + catch (java.io.IOException e) + { + fail("IO Exception: " + e.getMessage()); + } + + } + + @Test public void checkOpenDocumentWithOffice() + { + // SOfficeFactory aFactory = new SOfficeFactory(getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory(getMSF()); + final String sREADME = TestDocument.getUrl("README.txt"); + try + { + XComponent aDocument = SOF.loadDocument(sREADME); + complex.junitskeleton.justatest.shortWait(); + XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, aDocument); + xClose.close(true); + } + catch (com.sun.star.lang.IllegalArgumentException ex) + { + fail("Illegal argument exception caught: " + ex.getMessage()); + } + catch (com.sun.star.io.IOException ex) + { + fail("IOException caught: " + ex.getMessage()); + } + catch (com.sun.star.uno.Exception ex) + { + fail("Exception caught: " + ex.getMessage()); + } + } + + // marked as prepare for test, will call before every test + @Before public void before() + { + System.out.println("before()"); + System.setProperty("THIS IS A TEST", "Hallo"); + } + + + // marked as post for test, will call after every test + @After public void after() + { + System.out.println("after()"); + String sValue = System.getProperty("THIS IS A TEST"); + assertEquals(sValue, "Hallo"); + } + + + private XMultiServiceFactory getMSF() + { + final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); + return xMSF1; + } + + // setup and close connections + @BeforeClass public static void setUpConnection() throws Exception { + System.out.println("setUpConnection()"); + connection.setUp(); + } + + @AfterClass public static void tearDownConnection() + throws InterruptedException, com.sun.star.uno.Exception + { + System.out.println("tearDownConnection()"); + connection.tearDown(); + } + + private static final OfficeConnection connection = new OfficeConnection(); + +} diff --git a/qadevOOo/qa/complex/junitskeleton/TestDocument.java b/qadevOOo/qa/complex/junitskeleton/TestDocument.java new file mode 100644 index 000000000000..ff140a9991f6 --- /dev/null +++ b/qadevOOo/qa/complex/junitskeleton/TestDocument.java @@ -0,0 +1,41 @@ +/************************************************************************* +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +************************************************************************/ + +package complex.junitskeleton; + +import java.io.File; +import org.openoffice.test.OfficeFileUrl; + +final class TestDocument +{ + public static String getUrl(String name) + { + return OfficeFileUrl.getAbsolute(new File("test_documents", name)); + } + + private TestDocument() {} +} diff --git a/qadevOOo/qa/complex/junitskeleton/justatest.java b/qadevOOo/qa/complex/junitskeleton/justatest.java new file mode 100644 index 000000000000..5c11360b0717 --- /dev/null +++ b/qadevOOo/qa/complex/junitskeleton/justatest.java @@ -0,0 +1,38 @@ +/** + * @author: ll93751 + * @copyright: Sun Microsystems Inc. 2010 + */ + +package complex.junitskeleton; + +public class justatest /* extends *//* implements */ { + //public static void main( String[] argv ) { + // + // } + public void justatest() + { + System.out.println("justatest CTor."); + } + + public void testfkt() + { + System.out.println("Test called."); + } + + /** + * Sleeps for 0.5 sec. to allow StarOffice to react on <code> + * reset</code> call. + */ + public static void shortWait() + { + try + { + Thread.sleep(500) ; + } + catch (InterruptedException e) + { + System.out.println("While waiting :" + e) ; + } + } + +} diff --git a/qadevOOo/qa/complex/junitskeleton/makefile.mk b/qadevOOo/qa/complex/junitskeleton/makefile.mk new file mode 100644 index 000000000000..301b8cf88fd7 --- /dev/null +++ b/qadevOOo/qa/complex/junitskeleton/makefile.mk @@ -0,0 +1,63 @@ +#************************************************************************* +# +# 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. +# +#************************************************************************* + +.IF "$(OOO_SUBSEQUENT_TESTS)" == "" +nothing .PHONY: + @echo "OOO_SUBSEQUENT_TESTS not set, do nothing." +.ELSE + +PRJ = ../../.. +PRJNAME = sc +TARGET = qa_complex_junitskeleton + +.IF "$(OOO_JUNIT_JAR)" != "" +PACKAGE = complex/junitskeleton + +# here store only Files which contain a @Test +JAVATESTFILES = \ + Skeleton.java + +# put here all other files +JAVAFILES = $(JAVATESTFILES) \ + justatest.java \ + TestDocument.java + +JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar +EXTRAJARFILES = $(OOO_JUNIT_JAR) + +# Sample how to debug +# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y + +.END + +.INCLUDE: settings.mk +.INCLUDE: target.mk +.INCLUDE: installationtest.mk + +ALLTAR : javatest + +.END diff --git a/qadevOOo/qa/complex/junitskeleton/test_documents/README.txt b/qadevOOo/qa/complex/junitskeleton/test_documents/README.txt new file mode 100644 index 000000000000..775f01c4924d --- /dev/null +++ b/qadevOOo/qa/complex/junitskeleton/test_documents/README.txt @@ -0,0 +1 @@ +Here you can store documents. diff --git a/qadevOOo/runner/complexlib/Assurance.java b/qadevOOo/runner/complexlib/Assurance.java index 665980d792ab..980ede95f052 100644 --- a/qadevOOo/runner/complexlib/Assurance.java +++ b/qadevOOo/runner/complexlib/Assurance.java @@ -75,7 +75,7 @@ public class Assurance * @param actual specifies the actual boolean value */ protected void assureEquals( boolean expected, boolean actual ) { - assureEquals( "Equality test failed", new Boolean( expected ), new Boolean( actual ), false ); + assureEquals( "Equality test failed", expected, new Boolean( actual ), false ); } /** @@ -85,7 +85,7 @@ public class Assurance * @param actual specifies the actual boolean value */ protected void assureEquals( String message, boolean expected, boolean actual ) { - assureEquals( message, new Boolean( expected ), new Boolean( actual ), false ); + assureEquals( message, expected, actual, false ); } /** @@ -240,6 +240,27 @@ public class Assurance assureEquals( message, expected, actual, false ); } + /** + * assures the two given sequences are of equal length, and have equal content + */ + public <T> void assureEquals( String i_message, T[] i_expected, T[] i_actual, boolean i_continue ) + { + if ( i_expected.length != i_actual.length ) + failed( i_message + ": expected element count: " + i_expected.length + ", actual element count: " + i_actual.length ); + for ( int i=0; i<i_expected.length; ++i ) + { + assureEquals( i_message + ": mismatch at element pos " + i, i_expected[i], i_actual[i], i_continue ); + } + } + + /** + * assures the two given sequences are of equal length, and have equal content + */ + public <T> void assureEquals( String i_message, T[] i_expected, T[] i_actual ) + { + assureEquals( i_message, i_expected, i_actual, false ); + } + /** invokes a given method on a given object, and assures a certain exception is caught * @param _message is the message to print when the check fails * @param _object is the object to invoke the method on diff --git a/qadevOOo/runner/stats/Summarizer.java b/qadevOOo/runner/stats/Summarizer.java index b1fe5fe61dd3..5f4a58cc31f8 100644 --- a/qadevOOo/runner/stats/Summarizer.java +++ b/qadevOOo/runner/stats/Summarizer.java @@ -78,7 +78,7 @@ public class Summarizer { if (states.elementAt(j).equals("not part of the job")) { - state = "Not possible since not all Interfaces/Services have been checked"; + state = "PASSED(some interfaces/services not tested).OK"; } else { diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java index dce88234885f..5ac071c38eb5 100644 --- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java +++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java @@ -27,6 +27,7 @@ package mod._forms; import com.sun.star.beans.NamedValue; import com.sun.star.beans.PropertyValue; +import com.sun.star.container.XIndexAccess; import java.io.PrintWriter; import lib.StatusException; @@ -251,11 +252,10 @@ public class GenericModelTest extends TestCase { if (m_ConnectionColsed) return; try { + XIndexAccess forms = UnoRuntime.queryInterface( XIndexAccess.class, + FormTools.getForms( WriterTools.getDrawPage( m_xTextDoc ) ) ); XForm myForm = (XForm) AnyConverter.toObject(new Type(XForm.class), - (FormTools.getForms( - WriterTools.getDrawPage( - m_xTextDoc))) - .getByName("Standard")); + forms.getByIndex(0)); if (debug){ if (myForm == null){ @@ -269,18 +269,20 @@ public class GenericModelTest extends TestCase { } - XPropertySet xSetProp = (XPropertySet) UnoRuntime.queryInterface( - XPropertySet.class, myForm); - XConnection connection = (XConnection) AnyConverter.toObject( - new Type(XConnection.class), - xSetProp.getPropertyValue("ActiveConnection")); - if (debug && connection == null){ - log.println("ERROR: could not get property 'ActiveConnection' from the XForm"); + XPropertySet xSetProp = UnoRuntime.queryInterface( XPropertySet.class, myForm ); + XConnection connection = UnoRuntime.queryInterface( XConnection.class, xSetProp.getPropertyValue( "ActiveConnection" ) ); + if ( connection == null ) + { + if ( debug ) + log.println("ERROR: could not get property 'ActiveConnection' from the XForm"); + } + else + { + connection.close(); } - - connection.close(); } catch (Exception e) { log.println("ERROR: Can't close the connection: " + e.toString()); + e.printStackTrace( log ); } log.println("closing data source..."); |