Simplify and fix Java UNO API test makefiles

Originally I just wanted to add the juh.jar to the list of jars
of the UNO API tests, but this became tedious work, so after the
first few files I decided to replace the similiar makefiles with
a common define for the *_unoapi* tests.

This patch adds two new make defines to be used used by Java UNO
and UNO API tests:
- gb_JunitTest_set_unoapi_test_defaults
- gb_JunitTest_set_unoapi_test_class_and_jars

The first one will deduce most defaults from the test name, but
still allows to optionally override most settings.

If a test doesn't match the default at all, the 2nd define still
shares the common jar files and the main Java UNO class, so the
second define adds these to your makefile.

The real fix is to add juh.jar to gb_JunitTest_use_jars.

Change-Id: I4342fdac5e31f85ea18fb4268e13c287a7adc2b7
Reviewed-on: https://gerrit.libreoffice.org/63118
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <[email protected]>

Author: jmglogow

chart2/JunitTest_chart2_unoapi.mk

@@ -9,23 +9,6 @@
 
 $(eval $(call gb_JunitTest_JunitTest,chart2_unoapi))
 
-$(eval $(call gb_JunitTest_set_defs,chart2_unoapi,\
-    $$(DEFS) \
-    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/chart2/qa/unoapi/sch.sce \
-    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/chart2/qa/unoapi/knownissues.xcl \
-    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/chart2/qa/unoapi/testdocuments \
-))
-
-$(eval $(call gb_JunitTest_use_jars,chart2_unoapi,\
-    OOoRunner \
-    ridl \
-    test \
-    unoil \
-    jurt \
-))
-
-$(eval $(call gb_JunitTest_add_classes,chart2_unoapi,\
-    org.openoffice.test.UnoApiTest \
-))
+$(eval $(call gb_JunitTest_set_unoapi_test_defaults,chart2_unoapi,,sch.sce))
 
 # vim: set noet sw=4 ts=4:

configmgr/JunitTest_configmgr_unoapi.mk

@@ -9,23 +9,6 @@
 
 $(eval $(call gb_JunitTest_JunitTest,configmgr_unoapi))
 
-$(eval $(call gb_JunitTest_set_defs,configmgr_unoapi,\
-    $$(DEFS) \
-    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/configmgr/qa/unoapi/module.sce \
-    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/configmgr/qa/unoapi/knownissues.xcl \
-    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/configmgr/qa/unoapi/testdocuments \
-))
-
-$(eval $(call gb_JunitTest_use_jars,configmgr_unoapi,\
-    OOoRunner \
-    ridl \
-    test \
-    unoil \
-    jurt \
-))
-
-$(eval $(call gb_JunitTest_add_classes,configmgr_unoapi,\
-    org.openoffice.test.UnoApiTest \
-))
+$(eval $(call gb_JunitTest_set_unoapi_test_defaults,configmgr_unoapi,,module.sce))
 
 # vim: set noet sw=4 ts=4:

connectivity/JunitTest_complex.mk

@@ -9,27 +9,17 @@
 
 $(eval $(call gb_JunitTest_JunitTest,connectivity_complex))
 
+$(eval $(call gb_JunitTest_set_unoapi_test_class_and_jars,connectivity_complex))
+
 $(eval $(call gb_JunitTest_set_defs,connectivity_complex,\
 	$$(DEFS) \
 	-Dorg.openoffice.test.arg.sce=$(SRCDIR)/connectivity/qa/scenarios.sce \
 ))
 
-$(eval $(call gb_JunitTest_use_jars,connectivity_complex,\
-	jurt \
-	OOoRunner \
-	ridl \
-	test \
-	unoil \
-))
-
 $(eval $(call gb_JunitTest_use_externals,connectivity_complex,\
 	hsqldb \
 ))
 
-$(eval $(call gb_JunitTest_add_classes,connectivity_complex,\
-	org.openoffice.test.UnoApiTest \
-))
-
 $(eval $(call gb_JunitTest_add_sourcefiles,connectivity_complex,\
 	connectivity/qa/complex/connectivity/DBaseDriverTest \
 	connectivity/qa/complex/connectivity/FlatFileAccess \

dbaccess/JunitTest_dbaccess_unoapi.mk

@@ -9,23 +9,6 @@
 
 $(eval $(call gb_JunitTest_JunitTest,dbaccess_unoapi))
 
-$(eval $(call gb_JunitTest_set_defs,dbaccess_unoapi,\
-    $$(DEFS) \
-    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/dbaccess/qa/unoapi/dbaccess.sce \
-    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/dbaccess/qa/unoapi/knownissues.xcl \
-    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/dbaccess/qa/unoapi/testdocuments \
-))
-
-$(eval $(call gb_JunitTest_use_jars,dbaccess_unoapi,\
-    OOoRunner \
-    jurt \
-    ridl \
-    test \
-    unoil \
-))
-
-$(eval $(call gb_JunitTest_add_classes,dbaccess_unoapi,\
-    org.openoffice.test.UnoApiTest \
-))
+$(eval $(call gb_JunitTest_set_unoapi_test_defaults,dbaccess_unoapi))
 
 # vim: set noet sw=4 ts=4:

extensions/JunitTest_extensions_unoapi.mk

@@ -9,23 +9,6 @@
 
 $(eval $(call gb_JunitTest_JunitTest,extensions_unoapi))
 
-$(eval $(call gb_JunitTest_set_defs,extensions_unoapi,\
-    $$(DEFS) \
-    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/extensions/qa/unoapi/extensions.sce \
-    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/extensions/qa/unoapi/knownissues.xcl \
-    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/extensions/qa/unoapi/testdocuments \
-))
-
-$(eval $(call gb_JunitTest_use_jars,extensions_unoapi,\
-    OOoRunner \
-    ridl \
-    test \
-    unoil \
-    jurt \
-))
-
-$(eval $(call gb_JunitTest_add_classes,extensions_unoapi,\
-    org.openoffice.test.UnoApiTest \
-))
+$(eval $(call gb_JunitTest_set_unoapi_test_defaults,extensions_unoapi))
 
 # vim: set noet sw=4 ts=4:

forms/JunitTest_forms_unoapi_1.mk

@@ -9,23 +9,6 @@
 
 $(eval $(call gb_JunitTest_JunitTest,forms_unoapi_1))
 
-$(eval $(call gb_JunitTest_set_defs,forms_unoapi_1,\
-    $$(DEFS) \
-    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/forms/qa/unoapi/forms_1.sce \
-    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/forms/qa/unoapi/knownissues.xcl \
-    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/forms/qa/unoapi/testdocuments \
-))
-
-$(eval $(call gb_JunitTest_use_jars,forms_unoapi_1,\
-    OOoRunner \
-    ridl \
-    test \
-    unoil \
-    jurt \
-))
-
-$(eval $(call gb_JunitTest_add_classes,forms_unoapi_1,\
-    org.openoffice.test.UnoApiTest \
-))
+$(eval $(call gb_JunitTest_set_unoapi_test_defaults,forms_unoapi_1))
 
 # vim: set noet sw=4 ts=4:

forms/JunitTest_forms_unoapi_2.mk

@@ -9,23 +9,6 @@
 
 $(eval $(call gb_JunitTest_JunitTest,forms_unoapi_2))
 
-$(eval $(call gb_JunitTest_set_defs,forms_unoapi_2,\
-    $$(DEFS) \
-    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/forms/qa/unoapi/forms_2.sce \
-    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/forms/qa/unoapi/knownissues.xcl \
-    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/forms/qa/unoapi/testdocuments \
-))
-
-$(eval $(call gb_JunitTest_use_jars,forms_unoapi_2,\
-    OOoRunner \
-    ridl \
-    test \
-    unoil \
-    jurt \
-))
-
-$(eval $(call gb_JunitTest_add_classes,forms_unoapi_2,\
-    org.openoffice.test.UnoApiTest \
-))
+$(eval $(call gb_JunitTest_set_unoapi_test_defaults,forms_unoapi_2))
 
 # vim: set noet sw=4 ts=4:

forms/JunitTest_forms_unoapi_3.mk

@@ -9,23 +9,6 @@
 
 $(eval $(call gb_JunitTest_JunitTest,forms_unoapi_3))
 
-$(eval $(call gb_JunitTest_set_defs,forms_unoapi_3,\
-    $$(DEFS) \
-    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/forms/qa/unoapi/forms_3.sce \
-    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/forms/qa/unoapi/knownissues.xcl \
-    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/forms/qa/unoapi/testdocuments \
-))
-
-$(eval $(call gb_JunitTest_use_jars,forms_unoapi_3,\
-    OOoRunner \
-    ridl \
-    test \
-    unoil \
-    jurt \
-))
-
-$(eval $(call gb_JunitTest_add_classes,forms_unoapi_3,\
-    org.openoffice.test.UnoApiTest \
-))
+$(eval $(call gb_JunitTest_set_unoapi_test_defaults,forms_unoapi_3))
 
 # vim: set noet sw=4 ts=4:

forms/JunitTest_forms_unoapi_4.mk

@@ -9,23 +9,6 @@
 
 $(eval $(call gb_JunitTest_JunitTest,forms_unoapi_4))
 
-$(eval $(call gb_JunitTest_set_defs,forms_unoapi_4,\
-    $$(DEFS) \
-    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/forms/qa/unoapi/forms_4.sce \
-    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/forms/qa/unoapi/knownissues.xcl \
-    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/forms/qa/unoapi/testdocuments \
-))
-
-$(eval $(call gb_JunitTest_use_jars,forms_unoapi_4,\
-    OOoRunner \
-    ridl \
-    test \
-    unoil \
-    jurt \
-))
-
-$(eval $(call gb_JunitTest_add_classes,forms_unoapi_4,\
-    org.openoffice.test.UnoApiTest \
-))
+$(eval $(call gb_JunitTest_set_unoapi_test_defaults,forms_unoapi_4))
 
 # vim: set noet sw=4 ts=4:

framework/JunitTest_framework_unoapi.mk

@@ -19,23 +19,6 @@
 
 $(eval $(call gb_JunitTest_JunitTest,framework_unoapi))
 
-$(eval $(call gb_JunitTest_set_defs,framework_unoapi,\
-    $$(DEFS) \
-    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/framework/qa/unoapi/framework.sce \
-    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/framework/qa/unoapi/knownissues.xcl \
-    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/framework/qa/unoapi/testdocuments \
-))
-
-$(eval $(call gb_JunitTest_use_jars,framework_unoapi,\
-    OOoRunner \
-    ridl \
-    test \
-    unoil \
-    jurt \
-))
-
-$(eval $(call gb_JunitTest_add_classes,framework_unoapi,\
-    org.openoffice.test.UnoApiTest \
-))
+$(eval $(call gb_JunitTest_set_unoapi_test_defaults,framework_unoapi))
 
 # vim: set noet sw=4 ts=4:

linguistic/JunitTest_linguistic_unoapi.mk

@@ -19,23 +19,6 @@
 
 $(eval $(call gb_JunitTest_JunitTest,linguistic_unoapi))
 
-$(eval $(call gb_JunitTest_set_defs,linguistic_unoapi,\
-	$$(DEFS) \
-	-Dorg.openoffice.test.arg.sce=$(SRCDIR)/linguistic/qa/unoapi/lng.sce \
-	-Dorg.openoffice.test.arg.xcl=$(SRCDIR)/linguistic/qa/unoapi/knownissues.xcl \
-	-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/linguistic/qa/unoapi \
-))
-
-$(eval $(call gb_JunitTest_use_jars,linguistic_unoapi,\
-	OOoRunner \
-	ridl \
-	test \
-	unoil \
-	jurt \
-))
-
-$(eval $(call gb_JunitTest_add_classes,linguistic_unoapi,\
-	org.openoffice.test.UnoApiTest \
-))
+$(eval $(call gb_JunitTest_set_unoapi_test_defaults,linguistic_unoapi,,lng.sce,,.))
 
 # vim: set noet sw=4 ts=4:

sc/JunitTest_sc_unoapi_1.mk

@@ -9,23 +9,6 @@
 
 $(eval $(call gb_JunitTest_JunitTest,sc_unoapi_1))
 
-$(eval $(call gb_JunitTest_add_classes,sc_unoapi_1, \
-    org.openoffice.test.UnoApiTest \
-))
-
-$(eval $(call gb_JunitTest_use_jars,sc_unoapi_1, \
-    OOoRunner \
-    jurt \
-    ridl \
-    test \
-    unoil \
-))
-
-$(eval $(call gb_JunitTest_set_defs,sc_unoapi_1,\
-    $$(DEFS) \
-    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/sc/qa/unoapi/sc_1.sce \
-    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sc/qa/unoapi/testdocuments \
-    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/sc/qa/unoapi/knownissues.xcl \
-))
+$(eval $(call gb_JunitTest_set_unoapi_test_defaults,sc_unoapi_1))
 
 # vim: set noet sw=4 ts=4:

sc/JunitTest_sc_unoapi_2.mk

@@ -9,23 +9,6 @@
 
 $(eval $(call gb_JunitTest_JunitTest,sc_unoapi_2))
 
-$(eval $(call gb_JunitTest_add_classes,sc_unoapi_2, \
-    org.openoffice.test.UnoApiTest \
-))
-
-$(eval $(call gb_JunitTest_use_jars,sc_unoapi_2, \
-    OOoRunner \
-    jurt \
-    ridl \
-    test \
-    unoil \
-))
-
-$(eval $(call gb_JunitTest_set_defs,sc_unoapi_2,\
-    $$(DEFS) \
-    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/sc/qa/unoapi/sc_2.sce \
-    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sc/qa/unoapi/testdocuments \
-    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/sc/qa/unoapi/knownissues.xcl \
-))
+$(eval $(call gb_JunitTest_set_unoapi_test_defaults,sc_unoapi_2))
 
 # vim: set noet sw=4 ts=4:

sc/JunitTest_sc_unoapi_3.mk

@@ -9,23 +9,6 @@
 
 $(eval $(call gb_JunitTest_JunitTest,sc_unoapi_3))
 
-$(eval $(call gb_JunitTest_add_classes,sc_unoapi_3, \
-    org.openoffice.test.UnoApiTest \
-))
-
-$(eval $(call gb_JunitTest_use_jars,sc_unoapi_3, \
-    OOoRunner \
-    jurt \
-    ridl \
-    test \
-    unoil \
-))
-
-$(eval $(call gb_JunitTest_set_defs,sc_unoapi_3,\
-    $$(DEFS) \
-    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/sc/qa/unoapi/sc_3.sce \
-    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sc/qa/unoapi/testdocuments \
-    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/sc/qa/unoapi/knownissues.xcl \
-))
+$(eval $(call gb_JunitTest_set_unoapi_test_defaults,sc_unoapi_3))
 
 # vim: set noet sw=4 ts=4:

sc/JunitTest_sc_unoapi_4.mk

@@ -9,23 +9,6 @@
 
 $(eval $(call gb_JunitTest_JunitTest,sc_unoapi_4))
 
-$(eval $(call gb_JunitTest_add_classes,sc_unoapi_4, \
-    org.openoffice.test.UnoApiTest \
-))
-
-$(eval $(call gb_JunitTest_use_jars,sc_unoapi_4, \
-    OOoRunner \
-    jurt \
-    ridl \
-    test \
-    unoil \
-))
-
-$(eval $(call gb_JunitTest_set_defs,sc_unoapi_4,\
-    $$(DEFS) \
-    -Dorg.openoffice.test.arg.sce=$(SRCDIR)/sc/qa/unoapi/sc_4.sce \
-    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sc/qa/unoapi/testdocuments \
-    -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/sc/qa/unoapi/knownissues.xcl \
-))
+$(eval $(call gb_JunitTest_set_unoapi_test_defaults,sc_unoapi_4))
 
 # vim: set noet sw=4 ts=4: