From db7ec711cfff06daa1d61fdded9d7c330d3aafc6 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 3 Jan 2013 15:52:20 +0100 Subject: writerfilter: remove Junit complex test The test just loads 4 documents and has been disabled for months. Also remove the test documents because they are duplicates and are also stored in writerfilter/qa/documents/. Change-Id: I9f51240483d800bc104c3842b8158dec90b3e69b --- writerfilter/JunitTest_writerfilter_complex.mk | 56 --------------- writerfilter/qa/complex/ooxml/LoadDocuments.java | 59 ---------------- writerfilter/qa/complex/ooxml/makefile.mk | 77 --------------------- .../ooxml/testdocuments/Table5CellBorders.docx | Bin 10420 -> 0 bytes .../ooxml/testdocuments/TableDifferentColumns.docx | Bin 10440 -> 0 bytes .../ooxml/testdocuments/TablePreferredWidth.docx | Bin 10393 -> 0 bytes .../ooxml/testdocuments/TableRowProperties.docx | Bin 10622 -> 0 bytes 7 files changed, 192 deletions(-) delete mode 100644 writerfilter/JunitTest_writerfilter_complex.mk delete mode 100644 writerfilter/qa/complex/ooxml/LoadDocuments.java delete mode 100644 writerfilter/qa/complex/ooxml/makefile.mk delete mode 100644 writerfilter/qa/complex/ooxml/testdocuments/Table5CellBorders.docx delete mode 100644 writerfilter/qa/complex/ooxml/testdocuments/TableDifferentColumns.docx delete mode 100644 writerfilter/qa/complex/ooxml/testdocuments/TablePreferredWidth.docx delete mode 100644 writerfilter/qa/complex/ooxml/testdocuments/TableRowProperties.docx (limited to 'writerfilter') diff --git a/writerfilter/JunitTest_writerfilter_complex.mk b/writerfilter/JunitTest_writerfilter_complex.mk deleted file mode 100644 index a2702246ffe4..000000000000 --- a/writerfilter/JunitTest_writerfilter_complex.mk +++ /dev/null @@ -1,56 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_JunitTest_JunitTest,writerfilter_complex)) - -$(eval $(call gb_JunitTest_set_defs,writerfilter_complex,\ - $$(DEFS) \ - -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/writerfilter/qa/complex/ooxml/testdocuments \ -)) - -$(eval $(call gb_JunitTest_use_jars,writerfilter_complex,\ - OOoRunner \ - ridl \ - test \ - unoil \ - jurt \ -)) - -$(eval $(call gb_JunitTest_add_sourcefiles,writerfilter_complex,\ - writerfilter/qa/complex/ooxml/TestDocument \ - writerfilter/qa/complex/ooxml/LoadDocuments \ -)) - -# #i113098# currently fails in non-pro -ifeq ($(gb_PRODUCT),$(true)) -$(eval $(call gb_JunitTest_add_classes,writerfilter_complex,\ - complex.ooxml.LoadDocuments \ -)) -endif - -# vim: set noet sw=4 ts=4: diff --git a/writerfilter/qa/complex/ooxml/LoadDocuments.java b/writerfilter/qa/complex/ooxml/LoadDocuments.java deleted file mode 100644 index 7515f8df24c5..000000000000 --- a/writerfilter/qa/complex/ooxml/LoadDocuments.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -package complex.ooxml; -import com.sun.star.lang.XMultiServiceFactory; -import complexlib.ComplexTestCase; -import java.io.File; -import com.sun.star.text.XTextDocument; - -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); - - 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); - - XTextDocument xDoc = util.WriterTools.loadTextDoc(m_xMSF, url); - util.DesktopTools.closeDoc(xDoc); - } - } else { - failed(); - } - } -} diff --git a/writerfilter/qa/complex/ooxml/makefile.mk b/writerfilter/qa/complex/ooxml/makefile.mk deleted file mode 100644 index 9c3467027092..000000000000 --- a/writerfilter/qa/complex/ooxml/makefile.mk +++ /dev/null @@ -1,77 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ = ..$/..$/.. -TARGET = PropertyValues -PRJNAME = $(TARGET) -PACKAGE = complex$/ooxml - -# --- Settings ----------------------------------------------------- -.INCLUDE: settings.mk - - -#----- compile .java files ----------------------------------------- - -JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -JAVAFILES = LoadDocuments.java -JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) - -#----- make a jar from compiled files ------------------------------ - -MAXLINELENGTH = 100000 - -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE - -# --- Parameters for the test -------------------------------------- - -# start an office if the parameter is set for the makefile -.IF "$(OFFICE)" == "" -CT_APPEXECCOMMAND = -.ELSE -CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice --accept=socket,host=localhost,port=8100;urp;" -.ENDIF - -# test base is java complex -CT_TESTBASE = -TestBase java_complex - -# build package name with "." instead of $/ -CT_PACKAGE = -o $(PACKAGE:s\$/\.\) - -# start the runner application -CT_APP = org.openoffice.Runner - -# --- Targets ------------------------------------------------------ - -.IF "$(depend)" == "" -ALL: ALLTAR -.ELSE -ALL: ALLDEP -.ENDIF - -.INCLUDE : target.mk - -run: \ - LoadDocuments - -RUN: run - -LoadDocuments: - +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) -tdoc $(PWD)$/testdocuments $(CT_PACKAGE).LoadDocuments - diff --git a/writerfilter/qa/complex/ooxml/testdocuments/Table5CellBorders.docx b/writerfilter/qa/complex/ooxml/testdocuments/Table5CellBorders.docx deleted file mode 100644 index 6b278175601b..000000000000 Binary files a/writerfilter/qa/complex/ooxml/testdocuments/Table5CellBorders.docx and /dev/null differ diff --git a/writerfilter/qa/complex/ooxml/testdocuments/TableDifferentColumns.docx b/writerfilter/qa/complex/ooxml/testdocuments/TableDifferentColumns.docx deleted file mode 100644 index 0503327ddecd..000000000000 Binary files a/writerfilter/qa/complex/ooxml/testdocuments/TableDifferentColumns.docx and /dev/null differ diff --git a/writerfilter/qa/complex/ooxml/testdocuments/TablePreferredWidth.docx b/writerfilter/qa/complex/ooxml/testdocuments/TablePreferredWidth.docx deleted file mode 100644 index 719b3888a018..000000000000 Binary files a/writerfilter/qa/complex/ooxml/testdocuments/TablePreferredWidth.docx and /dev/null differ diff --git a/writerfilter/qa/complex/ooxml/testdocuments/TableRowProperties.docx b/writerfilter/qa/complex/ooxml/testdocuments/TableRowProperties.docx deleted file mode 100644 index 775d63c97b34..000000000000 Binary files a/writerfilter/qa/complex/ooxml/testdocuments/TableRowProperties.docx and /dev/null differ -- cgit