From de899f0b350e51b1932fa4674f7ce2ae386cd1ce Mon Sep 17 00:00:00 2001 From: Michal Kubecek Date: Thu, 2 Jun 2016 11:56:10 +0200 Subject: connectivity: firebird: use ODS12 test database for Firebird 3 Firebird 3.0 uses new database file format (ODS, On Disk Structure) so that we need to use either ODS11 or ODS12 version of test database for dbaccess_firebird test, depending on whether building against Firebird 2.5 or 3.0 libraries. Change-Id: Idecdc35b0ac87ab7f46cb79b5c044c65423a2c7e Reviewed-on: https://gerrit.libreoffice.org/25846 Reviewed-by: jan iversen Tested-by: jan iversen --- dbaccess/qa/unit/data/firebird_integer_x64le_ods12.odb | Bin 0 -> 75701 bytes dbaccess/qa/unit/firebird.cxx | 5 +++++ 2 files changed, 5 insertions(+) create mode 100644 dbaccess/qa/unit/data/firebird_integer_x64le_ods12.odb (limited to 'dbaccess') diff --git a/dbaccess/qa/unit/data/firebird_integer_x64le_ods12.odb b/dbaccess/qa/unit/data/firebird_integer_x64le_ods12.odb new file mode 100644 index 000000000000..95691ed20585 Binary files /dev/null and b/dbaccess/qa/unit/data/firebird_integer_x64le_ods12.odb differ diff --git a/dbaccess/qa/unit/firebird.cxx b/dbaccess/qa/unit/firebird.cxx index c9ee575f9b7f..da0bed760d2e 100644 --- a/dbaccess/qa/unit/firebird.cxx +++ b/dbaccess/qa/unit/firebird.cxx @@ -16,6 +16,7 @@ #include #include #include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::sdb; @@ -65,7 +66,11 @@ void FirebirdTest::testEmptyDBConnection() void FirebirdTest::testIntegerDatabase() { uno::Reference< XOfficeDatabaseDocument > xDocument = +#if HAVE_FIREBIRD_30 + getDocumentForFileName("firebird_integer_x64le_ods12.odb"); +#else getDocumentForFileName("firebird_integer_x64le.odb"); +#endif uno::Reference< XConnection > xConnection = getConnectionForDocument(xDocument); -- cgit