From f4b36d28c40819800a1f06daa694d5a9ead3a9b5 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mst@openoffice.org>
Date: Tue, 26 Apr 2011 17:12:53 +0000
Subject: gnumake4: dbaccess: subsequent tests [hg:ccd0baa1c81a]

---
 dbaccess/JunitTest_dbaccess_complex.mk | 21 +++++++++++----------
 dbaccess/JunitTest_dbaccess_unoapi.mk  |  1 +
 dbaccess/qa/unoapi/Test.java           |  9 ++++++---
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/dbaccess/JunitTest_dbaccess_complex.mk b/dbaccess/JunitTest_dbaccess_complex.mk
index 0330fd75582f..652f527aad62 100644
--- a/dbaccess/JunitTest_dbaccess_complex.mk
+++ b/dbaccess/JunitTest_dbaccess_complex.mk
@@ -27,6 +27,11 @@
 
 $(eval $(call gb_JunitTest_JunitTest,dbaccess_complex,SRCDIR))
 
+$(eval $(call gb_JunitTest_set_defs,dbaccess_complex,\
+	$$(DEFS) \
+	-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/dbaccess/qa/dbaccess \
+))
+
 $(eval $(call gb_JunitTest_add_sourcefiles,dbaccess_complex,\
 	dbaccess/qa/complex/dbaccess/ApplicationController \
 	dbaccess/qa/complex/dbaccess/Beamer \
@@ -58,24 +63,20 @@ $(eval $(call gb_JunitTest_add_jars,dbaccess_complex,\
 ))
 
 $(eval $(call gb_JunitTest_add_classes,dbaccess_complex,\
-	complex.dbaccess.ApplicationController \
 	complex.dbaccess.Beamer \
-	complex.dbaccess.DataSource \
 	complex.dbaccess.DatabaseDocument \
-	complex.dbaccess.Parser \
 	complex.dbaccess.PropertyBag \
+))
+# deactivated since sb123;
+# apparently most of these fail because OOo does not find JVM?
+#	complex.dbaccess.ApplicationController \
+	complex.dbaccess.DataSource \
+	complex.dbaccess.Parser \
 	complex.dbaccess.Query \
 	complex.dbaccess.QueryInQuery \
 	complex.dbaccess.RowSet \
 	complex.dbaccess.SingleSelectQueryComposer \
 	complex.dbaccess.UISettings \
 	complex.dbaccess.CopyTableWizard \
-	complex.dbaccess.CRMBasedTestCase \
-	complex.dbaccess.CopyTableInterActionHandler \
-	complex.dbaccess.DatabaseApplication \
-	complex.dbaccess.FileHelper \
-	complex.dbaccess.RowSetEventListener \
-	complex.dbaccess.TestCase \
-))
 
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/JunitTest_dbaccess_unoapi.mk b/dbaccess/JunitTest_dbaccess_unoapi.mk
index bbae54a464d2..24bbc88c26ab 100644
--- a/dbaccess/JunitTest_dbaccess_unoapi.mk
+++ b/dbaccess/JunitTest_dbaccess_unoapi.mk
@@ -31,6 +31,7 @@ $(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.ini=$(SRCDIR)/dbaccess/qa/unoapi/dbaccess.props \
 	-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/dbaccess/qa/unoapi/testdocuments \
 ))
 
diff --git a/dbaccess/qa/unoapi/Test.java b/dbaccess/qa/unoapi/Test.java
index 4f2409fdc8bd..9871ef3403fe 100644
--- a/dbaccess/qa/unoapi/Test.java
+++ b/dbaccess/qa/unoapi/Test.java
@@ -27,6 +27,7 @@ package org.openoffice.dbaccess.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,9 +44,11 @@ public final class Test {
     @org.junit.Test public void test() {
         assertTrue(
             Runner.run(
-                "-sce", "dbaccess.sce", "-xcl", "knownissues.xcl", "-ini",
-                "dbaccess.props", "-tdoc", "testdocuments", "-cs",
-                connection.getDescription()));
+                "-sce", Argument.get("sce"),
+                "-xcl", Argument.get("xcl"),
+                "-ini", Argument.get("ini"),
+                "-tdoc", Argument.get("tdoc"),
+                "-cs", connection.getDescription()));
     }
 
     private final OfficeConnection connection = new OfficeConnection();
-- 
cgit