You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/15 01:17:42 UTC
svn commit: r1409604 - in /incubator/ooo/branches/gbuild/main/dbaccess:
JunitTest_dbaccess_complex.mk JunitTest_dbaccess_unoapi.mk
qa/unoapi/Test.java
Author: arist
Date: Thu Nov 15 00:17:41 2012
New Revision: 1409604
URL: http://svn.apache.org/viewvc?rev=1409604&view=rev
Log:
gnumake4_149_ccd0baa1c81a.patch
# HG changeset patch
# User Michael Stahl <ms...@openoffice.org>
# Date 1303837973 0
# Node ID ccd0baa1c81addc17ebc465dd96edef42ccd3a89
# Parent fc9eecc5fae670447d45563ed67c5500b14a91b1
gnumake4: dbaccess: subsequent tests
Modified:
incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_complex.mk
incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_unoapi.mk
incubator/ooo/branches/gbuild/main/dbaccess/qa/unoapi/Test.java
Modified: incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_complex.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_complex.mk?rev=1409604&r1=1409603&r2=1409604&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_complex.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_complex.mk Thu Nov 15 00:17:41 2012
@@ -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,dbac
))
$(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:
Modified: incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_unoapi.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_unoapi.mk?rev=1409604&r1=1409603&r2=1409604&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_unoapi.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_unoapi.mk Thu Nov 15 00:17:41 2012
@@ -31,6 +31,7 @@ $(eval $(call gb_JunitTest_set_defs,dbac
$$(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 \
))
Modified: incubator/ooo/branches/gbuild/main/dbaccess/qa/unoapi/Test.java
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/qa/unoapi/Test.java?rev=1409604&r1=1409603&r2=1409604&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/qa/unoapi/Test.java (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/qa/unoapi/Test.java Thu Nov 15 00:17:41 2012
@@ -25,6 +25,7 @@ package org.openoffice.dbaccess.qa.unoap
import org.openoffice.Runner;
import org.openoffice.test.OfficeConnection;
+import org.openoffice.test.Argument;
import static org.junit.Assert.*;
public final class Test {
@@ -41,9 +42,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();