diff options
author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-11 21:16:21 +0100 |
---|---|---|
committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-11 21:16:21 +0100 |
commit | 80ae0dcf217c23ff73b82d0c37274415012942ab (patch) | |
tree | 9ee8775e97cecbb698cfd179d2459bb35fb24f61 /sw | |
parent | 42c3881914531e6d81d6fb05bdc7b308db98146c (diff) |
gnumake3: more work on junit subsequenttest migration
Diffstat (limited to 'sw')
-rwxr-xr-x | sw/JunitTest_sw_complex.mk | 49 | ||||
-rwxr-xr-x | sw/JunitTest_sw_unoapi.mk | 45 | ||||
-rw-r--r-- | sw/Module_sw.mk | 5 | ||||
-rw-r--r-- | sw/qa/unoapi/Test.java | 5 |
4 files changed, 102 insertions, 2 deletions
diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk new file mode 100755 index 000000000000..4ecad693bbeb --- /dev/null +++ b/sw/JunitTest_sw_complex.mk @@ -0,0 +1,49 @@ +#************************************************************************* +# +# 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,sw_complex)) + +$(eval $(call gb_JunitTest_add_sourcefiles,sw_complex,\ + sw/qa/complex/checkColor/CheckChangeColor \ + sw/qa/complex/indeterminateState/CheckIndeterminateState \ + sw/qa/complex/writer/CheckCrossReferences \ + sw/qa/complex/writer/LoadSaveTest \ + sw/qa/complex/writer/CheckNamedPropertyValues \ + sw/qa/complex/writer/CheckIndexedPropertyValues \ + sw/qa/complex/writer/TestDocument \ + sw/qa/complex/writer/CheckBookmarks \ + sw/qa/complex/writer/CheckFlies \ + sw/qa/complex/writer/TextPortionEnumerationTest \ + sw/qa/complex/accessibility/AccessibleRelationSet \ +)) + +$(eval $(call gb_JunitTest_add_classes,sw_complex,\ + complex.accessibility.AccessibleRelationSet \ + complex.checkColor.CheckChangeColor \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/JunitTest_sw_unoapi.mk b/sw/JunitTest_sw_unoapi.mk new file mode 100755 index 000000000000..72e86edf89fe --- /dev/null +++ b/sw/JunitTest_sw_unoapi.mk @@ -0,0 +1,45 @@ +#************************************************************************* +# +# 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,sw_unoapi)) + +$(eval $(call gb_JunitTest_set_defs,sw_unoapi,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.sce=$(SRCDIR)/sw/qa/unoapi/sw.sce \ + -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/sw/qa/unoapi/knownissues.xcl \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sw/qa/unoapi/testdocuments \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,sw_unoapi,\ + sw/qa/unoapi/Test \ +)) + +$(eval $(call gb_JunitTest_add_classes,sw_unoapi,\ + org.openoffice.sw.qa.unoapi.Test \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index ccd570308a35..ca4868f7b867 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -39,4 +39,9 @@ $(eval $(call gb_Module_add_targets,sw,\ Package_xml \ )) +$(eval $(call gb_Module_add_subsequentcheck_targets,sw,\ + JunitTest_sw_complex \ + JunitTest_sw_unoapi \ +)) + # vim: set noet ts=4 sw=4: diff --git a/sw/qa/unoapi/Test.java b/sw/qa/unoapi/Test.java index e0311cc069bb..8a5b9b58fb95 100644 --- a/sw/qa/unoapi/Test.java +++ b/sw/qa/unoapi/Test.java @@ -27,6 +27,7 @@ package org.openoffice.sw.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", "sw.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(); |