diff options
-rw-r--r-- | writerfilter/JunitTest_writerfilter_complex.mk | 3 | ||||
-rw-r--r-- | writerfilter/Module_writerfilter.mk | 6 | ||||
-rw-r--r-- | writerfilter/qa/complex/ooxml/LoadDocuments.java | 80 | ||||
-rw-r--r-- | writerfilter/qa/complex/ooxml/TestDocument.java | 40 |
4 files changed, 98 insertions, 31 deletions
diff --git a/writerfilter/JunitTest_writerfilter_complex.mk b/writerfilter/JunitTest_writerfilter_complex.mk index 3640fc952fc1..e716921683b1 100644 --- a/writerfilter/JunitTest_writerfilter_complex.mk +++ b/writerfilter/JunitTest_writerfilter_complex.mk @@ -29,7 +29,7 @@ $(eval $(call gb_JunitTest_JunitTest,writerfilter_complex)) $(eval $(call gb_JunitTest_set_defs,writerfilter_complex,\ $$(DEFS) \ - -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/writerfilter/qa/documents \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/writerfilter/qa/complex/ooxml/testdocuments \ )) $(eval $(call gb_JunitTest_add_jars,writerfilter_complex,\ @@ -41,6 +41,7 @@ $(eval $(call gb_JunitTest_add_jars,writerfilter_complex,\ )) $(eval $(call gb_JunitTest_add_sourcefiles,writerfilter_complex,\ + writerfilter/qa/complex/ooxml/TestDocument \ writerfilter/qa/complex/ooxml/LoadDocuments \ )) diff --git a/writerfilter/Module_writerfilter.mk b/writerfilter/Module_writerfilter.mk index 280f9fc22701..0c2138c943a3 100644 --- a/writerfilter/Module_writerfilter.mk +++ b/writerfilter/Module_writerfilter.mk @@ -39,8 +39,8 @@ $(eval $(call gb_Module_add_check_targets,writerfilter,\ )) # does not run -#$(eval $(call gb_Module_add_subsequentcheck_targets,writerfilter,\ -# JunitTest_writerfilter_complex \ -#)) +$(eval $(call gb_Module_add_subsequentcheck_targets,writerfilter,\ + JunitTest_writerfilter_complex \ +)) # vim: set noet sw=4 ts=4: diff --git a/writerfilter/qa/complex/ooxml/LoadDocuments.java b/writerfilter/qa/complex/ooxml/LoadDocuments.java index 6f05391b6d21..fe9f8f81afb7 100644 --- a/writerfilter/qa/complex/ooxml/LoadDocuments.java +++ b/writerfilter/qa/complex/ooxml/LoadDocuments.java @@ -1,9 +1,19 @@ package complex.ooxml; + +import com.sun.star.lang.XComponent; import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.uno.UnoRuntime; import complexlib.ComplexTestCase; import java.io.File; -import com.sun.star.text.XTextDocument; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.openoffice.test.Argument; +import org.openoffice.test.OfficeConnection; +import static org.junit.Assert.*; /* * To change this template, choose Tools | Templates @@ -14,38 +24,54 @@ import com.sun.star.text.XTextDocument; * * @author hb137859 */ -public class LoadDocuments extends ComplexTestCase { - private XMultiServiceFactory m_xMSF; - - @Override - public String[] getTestMethodNames() { - return new String [] { - "test1" - }; - } - - public void before() throws Exception { - m_xMSF = (XMultiServiceFactory) param.getMSF(); - } - - public void test1() { - String testDocumentsPath = util.utils.getFullTestDocName(""); - log.println("Test documents in:" + testDocumentsPath); +public class LoadDocuments { + @Test public void test1() { + String testDocumentsPath = Argument.get("tdoc"); + System.out.println("Test documents in:" + testDocumentsPath); File dir = new File(testDocumentsPath); String [] files = dir.list(); - if (files != null) { - for (int i = 0; i < files.length; ++i) { - log.println(files[i]); - String url = util.utils.getFullTestURL(files[i]); - log.println(url); + try { + if (files != null) { + for (int i = 0; i < files.length; ++i) { + System.out.println(files[i]); + String url = TestDocument.getUrl(files[i]); + System.out.println(url); - XTextDocument xDoc = util.WriterTools.loadTextDoc(m_xMSF, url); - util.DesktopTools.closeDoc(xDoc); + XComponent xDoc = util.DesktopTools.loadDoc(getMSF(), url, null); + System.out.println("loaded."); + util.DesktopTools.closeDoc(xDoc); + System.out.println("done."); + } + } else { + fail("Files not found"); } - } else { - failed(); } + catch (Exception e) { + System.out.println(e); + fail("failed"); + } + } + + 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/writerfilter/qa/complex/ooxml/TestDocument.java b/writerfilter/qa/complex/ooxml/TestDocument.java new file mode 100644 index 000000000000..95c5fe50b344 --- /dev/null +++ b/writerfilter/qa/complex/ooxml/TestDocument.java @@ -0,0 +1,40 @@ +/************************************************************************* +* +* 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.ooxml; + +import java.io.File; +import org.openoffice.test.OfficeFileUrl; +import org.openoffice.test.Argument; + +final class TestDocument { + public static String getUrl(String name) { + return OfficeFileUrl.getAbsolute(new File(Argument.get("tdoc"), name)); + } + + private TestDocument() {} +} |