targeted clean-up

Change-Id: I57d56ece9fd59a93d5081a394c3fe8d212290198

2 files changed, 57 insertions, 5 deletions

diff --git a/dbaccess/JunitTest_dbaccess_complex.mk b/dbaccess/JunitTest_dbaccess_complex.mk
new file mode 100644
index 000000000000..411ad9529932
--- /dev/null
+++ b/dbaccess/JunitTest_dbaccess_complex.mk
@@ -0,0 +1,52 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_JunitTest_JunitTest,dba_ju_complex))
+
+$(eval $(call gb_JunitTest_use_jars,dba_ju_complex,\
+    $(OUTDIR)/bin/ConnectivityTools.jar \
+    $(OUTDIR)/bin/OOoRunner.jar \
+    $(OUTDIR)/bin/jurt.jar \
+    $(OUTDIR)/bin/ridl.jar \
+    $(OUTDIR)/bin/test.jar \
+    $(OUTDIR)/bin/unoil.jar \
+))
+
+$(eval $(call gb_JunitTest_set_defs,dba_ju_complex,\
+    $$(DEFS) \
+    -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/dbaccess/qa/dbaccess \
+))
+
+$(eval $(call gb_JunitTest_add_classes,dba_ju_complex,\
+    complex.dbaccess.Beamer \
+    complex.dbaccess.PropertyBag \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,dba_ju_complex,\
+    dbaccess/qa/complex/dbaccess/ApplicationController \
+    dbaccess/qa/complex/dbaccess/Beamer \
+    dbaccess/qa/complex/dbaccess/CRMBasedTestCase \
+    dbaccess/qa/complex/dbaccess/CopyTableInterActionHandler \
+    dbaccess/qa/complex/dbaccess/CopyTableWizard \
+    dbaccess/qa/complex/dbaccess/DataSource \
+    dbaccess/qa/complex/dbaccess/DatabaseApplication \
+    dbaccess/qa/complex/dbaccess/DatabaseDocument \
+    dbaccess/qa/complex/dbaccess/FileHelper \
+    dbaccess/qa/complex/dbaccess/Parser \
+    dbaccess/qa/complex/dbaccess/PropertyBag \
+    dbaccess/qa/complex/dbaccess/Query \
+    dbaccess/qa/complex/dbaccess/QueryInQuery \
+    dbaccess/qa/complex/dbaccess/RowSet \
+    dbaccess/qa/complex/dbaccess/RowSetEventListener \
+    dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer \
+    dbaccess/qa/complex/dbaccess/TestCase \
+    dbaccess/qa/complex/dbaccess/UISettings \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/JunitTest_dbaccess_unoapi.mk b/dbaccess/JunitTest_dbaccess_unoapi.mk
index 369b66f75a30..6ca0c117108d 100644
--- a/dbaccess/JunitTest_dbaccess_unoapi.mk
+++ b/dbaccess/JunitTest_dbaccess_unoapi.mk
@@ -26,24 +26,24 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_JunitTest_JunitTest,dbaccess_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,dba_ju_unoapi))
 
-$(eval $(call gb_JunitTest_set_defs,dbaccess_unoapi,\
+$(eval $(call gb_JunitTest_set_defs,dba_ju_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,\
+$(eval $(call gb_JunitTest_use_jars,dba_ju_unoapi,\
     $(OUTDIR)/bin/OOoRunner.jar \
+    $(OUTDIR)/bin/jurt.jar \
     $(OUTDIR)/bin/ridl.jar \
     $(OUTDIR)/bin/test.jar \
     $(OUTDIR)/bin/unoil.jar \
-    $(OUTDIR)/bin/jurt.jar \
 ))
 
-$(eval $(call gb_JunitTest_add_classes,dbaccess_unoapi,\
+$(eval $(call gb_JunitTest_add_classes,dba_ju_unoapi,\
     org.openoffice.test.UnoApiTest \
 ))