strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix many Java subsequentcheck test by using JUH

Browse source 
Splits gb_JunitTest_set_unoapi_test_class_and_jars into two
separate defines as:
- gb_JunitTest_use_unoapi_jars
- gb_JunitTest_use_unoapi_test_class

Then replaces many of the gb_JunitTest_use_jars lists with the
new gb_JunitTest_use_unoapi_jars to fix the JUH dependencies.
This probably adds some unneeded JUH dependencies to some Java
tests, but that shouldn't be a problem.

Change-Id: I0c4fce6b50f7c6eb8d62bfb2c50f056b97584794
Reviewed-on: https://gerrit.libreoffice.org/63119
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
This commit is contained in:
Jan-Marek Glogowski 2018-11-08 03:03:16 +01:00
parent 84286ac443
commit 33e47b4491
19 changed files with 30 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
comphelper/JunitTest_comphelper_complex.mk
View file

@ -19,19 +19,13 @@
$(eval $(call gb_JunitTest_JunitTest,comphelper_complex))
$(eval $(call gb_JunitTest_use_unoapi_jars,comphelper_complex))
$(eval $(call gb_JunitTest_add_sourcefiles,comphelper_complex,\
comphelper/qa/complex/comphelper/Map \
comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest \
))
$(eval $(call gb_JunitTest_use_jars,comphelper_complex,\
OOoRunner \
ridl \
test \
unoil \
jurt \
))
$(eval $(call gb_JunitTest_add_classes,comphelper_complex,\
complex.comphelper.SequenceOutputStreamUnitTest \
complex.comphelper.Map \

3
connectivity/JunitTest_complex.mk
View file

@ -9,7 +9,8 @@
$(eval $(call gb_JunitTest_JunitTest,connectivity_complex))
$(eval $(call gb_JunitTest_set_unoapi_test_class_and_jars,connectivity_complex))
$(eval $(call gb_JunitTest_use_unoapi_jars,connectivity_complex))
$(eval $(call gb_JunitTest_use_unoapi_test_class,connectivity_complex))
$(eval $(call gb_JunitTest_set_defs,connectivity_complex,\
$$(DEFS) \

8
dbaccess/JunitTest_dbaccess_complex.mk
View file

@ -9,14 +9,10 @@
$(eval $(call gb_JunitTest_JunitTest,dbaccess_complex))
$(eval $(call gb_JunitTest_use_unoapi_jars,dbaccess_complex))
$(eval $(call gb_JunitTest_use_jars,dbaccess_complex,\
ConnectivityTools \
OOoRunner \
juh \
jurt \
ridl \
test \
unoil \
))
$(eval $(call gb_JunitTest_set_defs,dbaccess_complex,\

8
filter/JunitTest_filter_complex.mk
View file

@ -18,13 +18,7 @@
$(eval $(call gb_JunitTest_JunitTest,filter_complex))
$(eval $(call gb_JunitTest_use_jars,filter_complex,\
OOoRunner \
ridl \
test \
unoil \
jurt \
))
$(eval $(call gb_JunitTest_use_unoapi_jars,filter_complex))
$(eval $(call gb_JunitTest_add_sourcefiles,filter_complex,\
filter/qa/complex/filter/misc/FinalizedMandatoryTest \

8
forms/JunitTest_forms_complex.mk
View file

@ -9,13 +9,7 @@
$(eval $(call gb_JunitTest_JunitTest,forms_complex))
$(eval $(call gb_JunitTest_use_jars,forms_complex,\
OOoRunner \
ridl \
test \
unoil \
jurt \
))
$(eval $(call gb_JunitTest_use_unoapi_jars,forms_complex))
$(eval $(call gb_JunitTest_add_sourcefiles,forms_complex,\
forms/qa/complex/forms/CheckOGroupBoxModel \

8
framework/JunitTest_framework_complex.mk
View file

@ -24,13 +24,7 @@ $(eval $(call gb_JunitTest_set_defs,framework_complex,\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/framework/qa/complex/broken_document/test_documents \
))
$(eval $(call gb_JunitTest_use_jars,framework_complex,\
OOoRunner \
ridl \
test \
unoil \
jurt \
))
$(eval $(call gb_JunitTest_use_unoapi_jars,framework_complex))
$(eval $(call gb_JunitTest_add_sourcefiles,framework_complex,\
framework/qa/complex/disposing/GetServiceWhileDisposingOffice \

2
jurt/JunitTest_java_remote.mk
View file

@ -10,7 +10,7 @@
$(eval $(call gb_JunitTest_JunitTest,jurt_java_remote))
$(eval $(call gb_JunitTest_use_jars,jurt_java_remote,\
OOoRunner \
OOoRunner \
ridl \
))

8
reportdesign/JunitTest_reportdesign_complex.mk
View file

@ -30,13 +30,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,reportdesign_complex,\
reportdesign/qa/complex/reportdesign/FileURL \
))
$(eval $(call gb_JunitTest_use_jars,reportdesign_complex,\
OOoRunner \
ridl \
test \
unoil \
jurt \
))
$(eval $(call gb_JunitTest_use_unoapi_jars,reportdesign_complex))
$(eval $(call gb_JunitTest_add_classes,reportdesign_complex,\
complex.reportdesign.ReportDesignerTest \

8
sc/JunitTest_sc_complex.mk
View file

@ -16,13 +16,7 @@ $(eval $(call gb_JunitTest_add_classes,sc_complex, \
complex.sc.CalcRTL \
))
$(eval $(call gb_JunitTest_use_jars,sc_complex, \
OOoRunner \
jurt \
ridl \
test \
unoil \
))
$(eval $(call gb_JunitTest_use_unoapi_jars,sc_complex))
$(eval $(call gb_JunitTest_add_sourcefiles,sc_complex, \
sc/qa/complex/dataPilot/_XDataPilotDescriptor \

7
sfx2/JunitTest_sfx2_complex.mk
View file

@ -24,13 +24,10 @@ $(eval $(call gb_JunitTest_set_defs,sfx2_complex,\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sfx2/qa/complex/sfx2/testdocuments \
))
$(eval $(call gb_JunitTest_use_unoapi_jars,sfx2_complex))
$(eval $(call gb_JunitTest_use_jars,sfx2_complex,\
OOoRunner \
ridl \
test \
test-tools \
unoil \
jurt \
))
$(eval $(call gb_JunitTest_add_sourcefiles,sfx2_complex,\

8
solenv/gbuild/JunitTest.mk
View file

@ -152,7 +152,7 @@ $(foreach dependency,$(2),$(call gb_JunitTest_use_customtarget,$(1),$(dependency
endef
define gb_JunitTest_set_unoapi_test_class_and_jars
define gb_JunitTest_use_unoapi_jars
$(eval $(call gb_JunitTest_use_jars,$(1),\
OOoRunner \
juh \
@ -162,6 +162,9 @@ $(eval $(call gb_JunitTest_use_jars,$(1),\
unoil \
))
endef
define gb_JunitTest_use_unoapi_test_class
$(eval $(call gb_JunitTest_add_classes,$(1),\
org.openoffice.test.UnoApiTest \
))
@ -187,7 +190,8 @@ $(eval $(call gb_JunitTest_set_defs,$(1),\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/$(gb_JunitTest__unoapi_dir)/$(if $(5),$(5),testdocuments) \
))
$(eval $(call gb_JunitTest_set_unoapi_test_class_and_jars,$(1)))
$(eval $(call gb_JunitTest_use_unoapi_jars,$(1)))
$(eval $(call gb_JunitTest_use_unoapi_test_class,$(1)))
endef

8
sot/JunitTest_sot_complex.mk
View file

@ -26,13 +26,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sot_complex,\
sot/qa/complex/olesimplestorage/TestHelper \
))
$(eval $(call gb_JunitTest_use_jars,sot_complex,\
OOoRunner \
ridl \
test \
unoil \
jurt \
))
$(eval $(call gb_JunitTest_use_unoapi_jars,sot_complex))
$(eval $(call gb_JunitTest_add_classes,sot_complex,\
complex.olesimplestorage.OLESimpleStorageUnitTest \

8
svl/JunitTest_svl_complex.mk
View file

@ -24,13 +24,9 @@ $(eval $(call gb_JunitTest_set_defs,svl_complex,\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/svl/qa/complex/broken_document/test_documents \
))
$(eval $(call gb_JunitTest_use_unoapi_jars,svl_complex))
$(eval $(call gb_JunitTest_use_jars,svl_complex,\
OOoRunner \
ridl \
test \
unoil \
jurt \
juh \
ConnectivityTools \
))

11
sw/JunitTest_sw_complex.mk
View file

@ -23,15 +23,6 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sw_complex,\
sw/qa/complex/indeterminateState/CheckIndeterminateState \
))
$(eval $(call gb_JunitTest_use_jars,sw_complex,\
OOoRunner \
ridl \
test \
unoil \
jurt \
))
$(eval $(call gb_JunitTest_add_classes,sw_complex,\
))
$(eval $(call gb_JunitTest_use_unoapi_jars,sw_complex))
# vim: set noet sw=4 ts=4:

1
toolkit/JunitTest_toolkit_complex.mk
View file

@ -20,6 +20,7 @@ $(eval $(call gb_JunitTest_JunitTest,toolkit_complex))
$(eval $(call gb_JunitTest_use_jars,toolkit_complex,\
OOoRunner \
juh \
ridl \
test \
unoil \

8
ucb/JunitTest_ucb_complex.mk
View file

@ -14,13 +14,7 @@ $(eval $(call gb_JunitTest_set_defs,ucb_complex,\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/ucb/qa/complex/testdocuments \
))
$(eval $(call gb_JunitTest_use_jars,ucb_complex,\
OOoRunner \
ridl \
test \
unoil \
jurt \
))
$(eval $(call gb_JunitTest_use_unoapi_jars,ucb_complex))
$(eval $(call gb_JunitTest_add_sourcefiles,ucb_complex,\
ucb/qa/complex/ucb/UCB \

7
unotools/JunitTest_unotools_complex.mk
View file

@ -9,13 +9,10 @@
$(eval $(call gb_JunitTest_JunitTest,unotools_complex))
$(eval $(call gb_JunitTest_use_unoapi_jars,unotools_complex))
$(eval $(call gb_JunitTest_use_jars,unotools_complex,\
OOoRunner \
jurt \
ridl \
test-tools \
test \
unoil \
))
$(eval $(call gb_JunitTest_set_defs,unotools_complex,\

8
unoxml/JunitTest_unordf_complex.mk
View file

@ -24,13 +24,7 @@ $(eval $(call gb_JunitTest_set_defs,unordf_complex,\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/unoxml/qa/complex/unoxml/testdocuments \
))
$(eval $(call gb_JunitTest_use_jars,unordf_complex,\
OOoRunner \
ridl \
test \
unoil \
jurt \
))
$(eval $(call gb_JunitTest_use_unoapi_jars,unordf_complex))
$(eval $(call gb_JunitTest_add_sourcefiles,unordf_complex,\
unoxml/qa/complex/unoxml/RDFRepositoryTest \

8
unoxml/JunitTest_unoxml_complex.mk
View file

@ -24,13 +24,7 @@ $(eval $(call gb_JunitTest_set_defs,unoxml_complex,\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/unoxml/qa/complex/unoxml/testdocuments \
))
$(eval $(call gb_JunitTest_use_jars,unoxml_complex,\
OOoRunner \
ridl \
test \
unoil \
jurt \
))
$(eval $(call gb_JunitTest_use_unoapi_jars,unoxml_complex))
$(eval $(call gb_JunitTest_add_sourcefiles,unoxml_complex,\
unoxml/qa/complex/unoxml/DOMTest \