diff options
| -rwxr-xr-x | svx/JunitTest_svx_unoapi.mk | 53 | ||||
| -rw-r--r-- | svx/Module_svx.mk | 7 | ||||
| -rw-r--r-- | svx/qa/unoapi/Test.java | 5 |
3 files changed, 62 insertions, 3 deletions
diff --git a/svx/JunitTest_svx_unoapi.mk b/svx/JunitTest_svx_unoapi.mk new file mode 100755 index 000000000000..3e0d5473c669 --- /dev/null +++ b/svx/JunitTest_svx_unoapi.mk @@ -0,0 +1,53 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_JunitTest_JunitTest,svx_unoapi)) + +$(eval $(call gb_JunitTest_set_defs,svx_unoapi,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.sce=$(SRCDIR)/svx/qa/unoapi/svx.sce \ + -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/svx/qa/unoapi/knownissues.xcl \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/svx/qa/unoapi/testdocuments \ +)) + +$(eval $(call gb_JunitTest_add_jars,svx_unoapi,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,svx_unoapi,\ + svx/qa/unoapi/Test \ +)) + +$(eval $(call gb_JunitTest_add_classes,svx_unoapi,\ + org.openoffice.svx.qa.unoapi.Test \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk index 51393f2980ba..f9d5273cd8f3 100644 --- a/svx/Module_svx.mk +++ b/svx/Module_svx.mk @@ -39,10 +39,15 @@ $(eval $(call gb_Module_add_targets,svx,\ Package_sdi \ )) -# Executable_gengal \ +$(eval $(call gb_Module_add_subsequentcheck_targets,svx,\ + JunitTest_svx_unoapi \ +)) + +# Executable_gengal \ #todo: noopt for EnhanceCustomShapesFunctionParser.cxx on Solaris Sparc and MacOSX #todo: -DBOOST_SPIRIT_USE_OLD_NAMESPACE only in CustomShapes ? #todo: -DUNICODE and -D_UNICODE on WNT for source/dialog #todo: globlmn.hrc #todo: component file +# vim: set noet ts=4 sw=4: diff --git a/svx/qa/unoapi/Test.java b/svx/qa/unoapi/Test.java index 90abd12776d0..2f7581e22efa 100644 --- a/svx/qa/unoapi/Test.java +++ b/svx/qa/unoapi/Test.java @@ -27,6 +27,7 @@ package org.openoffice.svx.qa.unoapi; import org.openoffice.Runner; import org.openoffice.test.OfficeConnection; +import org.openoffice.test.Argument; import static org.junit.Assert.*; public final class Test { @@ -43,8 +44,8 @@ public final class Test { @org.junit.Test public void test() { assertTrue( Runner.run( - "-sce", "svx.sce", "-xcl", "knownissues.xcl", "-tdoc", - "testdocuments", "-cs", connection.getDescription())); + "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc", + Argument.get("tdoc"), "-cs", connection.getDescription())); } private final OfficeConnection connection = new OfficeConnection(); |