Kaydet (Commit) 36befb3a authored tarafından Rene Engelhard's avatar Rene Engelhard

tdf#72987 split firebird test into a regression test and a "new" test

former with endianness and latter with the new fbk format.
Add new endianness-independent firebird test odbs

Change-Id: I29be2e6916fcca74744211dba04463376fb6b8d5
Reviewed-on: https://gerrit.libreoffice.org/60917Reviewed-by: 's avatarRene Engelhard <rene@debian.org>
Tested-by: 's avatarRene Engelhard <rene@debian.org>
üst f104b3ca
# -*- 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_CppunitTest_CppunitTest,dbaccess_firebird_regression))
$(eval $(call gb_CppunitTest_use_external,dbaccess_firebird_regression,boost_headers))
$(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_firebird_regression, \
dbaccess/qa/unit/firebird-regression \
))
$(eval $(call gb_CppunitTest_use_libraries,dbaccess_firebird_regression, \
comphelper \
cppu \
dbaxml \
firebird_sdbc \
sal \
subsequenttest \
svt \
test \
unotest \
utl \
xo \
))
$(eval $(call gb_CppunitTest_use_api,dbaccess_firebird_regression,\
offapi \
oovbaapi \
udkapi \
))
$(eval $(call gb_CppunitTest_use_ure,dbaccess_firebird_regression))
$(eval $(call gb_CppunitTest_use_vcl,dbaccess_firebird_regression))
$(eval $(call gb_CppunitTest_use_components,dbaccess_firebird_regression,\
basic/util/sb \
comphelper/util/comphelp \
configmgr/source/configmgr \
connectivity/source/drivers/firebird/firebird_sdbc \
connectivity/source/manager/sdbc2 \
dbaccess/util/dba \
dbaccess/source/filter/xml/dbaxml \
dbaccess/util/dbu \
filter/source/config/cache/filterconfig1 \
framework/util/fwk \
i18npool/util/i18npool \
linguistic/source/lng \
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
sfx2/util/sfx \
svl/source/fsstor/fsstorage \
svl/util/svl \
toolkit/util/tk \
ucb/source/core/ucb1 \
ucb/source/ucp/file/ucpfile1 \
unotools/util/utl \
uui/util/uui \
xmloff/util/xo \
))
$(eval $(call gb_CppunitTest_use_configuration,dbaccess_firebird_regression))
# vim: set noet sw=4 ts=4:
......@@ -7,15 +7,15 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_CppunitTest_CppunitTest,dbaccess_firebird_test))
$(eval $(call gb_CppunitTest_CppunitTest,dbaccess_firebird))
$(eval $(call gb_CppunitTest_use_external,dbaccess_firebird_test,boost_headers))
$(eval $(call gb_CppunitTest_use_external,dbaccess_firebird,boost_headers))
$(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_firebird_test, \
$(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_firebird, \
dbaccess/qa/unit/firebird \
))
$(eval $(call gb_CppunitTest_use_libraries,dbaccess_firebird_test, \
$(eval $(call gb_CppunitTest_use_libraries,dbaccess_firebird, \
comphelper \
cppu \
dbaxml \
......@@ -29,16 +29,16 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_firebird_test, \
xo \
))
$(eval $(call gb_CppunitTest_use_api,dbaccess_firebird_test,\
$(eval $(call gb_CppunitTest_use_api,dbaccess_firebird,\
offapi \
oovbaapi \
udkapi \
))
$(eval $(call gb_CppunitTest_use_ure,dbaccess_firebird_test))
$(eval $(call gb_CppunitTest_use_vcl,dbaccess_firebird_test))
$(eval $(call gb_CppunitTest_use_ure,dbaccess_firebird))
$(eval $(call gb_CppunitTest_use_vcl,dbaccess_firebird))
$(eval $(call gb_CppunitTest_use_components,dbaccess_firebird_test,\
$(eval $(call gb_CppunitTest_use_components,dbaccess_firebird,\
basic/util/sb \
comphelper/util/comphelp \
configmgr/source/configmgr \
......@@ -65,6 +65,6 @@ $(eval $(call gb_CppunitTest_use_components,dbaccess_firebird_test,\
xmloff/util/xo \
))
$(eval $(call gb_CppunitTest_use_configuration,dbaccess_firebird_test))
$(eval $(call gb_CppunitTest_use_configuration,dbaccess_firebird))
# vim: set noet sw=4 ts=4:
......@@ -40,9 +40,12 @@ $(eval $(call gb_Module_add_check_targets,dbaccess,\
# remove if we have a be file for this
ifeq ($(ENDIANNESS),little)
$(eval $(call gb_Module_add_check_targets,dbaccess,\
CppunitTest_dbaccess_firebird_test \
CppunitTest_dbaccess_firebird_regression_test \
))
endif
$(eval $(call gb_Module_add_check_targets,dbaccess,\
CppunitTest_dbaccess_firebird_test \
))
endif
$(eval $(call gb_Module_add_check_targets,dbaccess,\
......
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* 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/.
*/
#include "dbtest_base.cxx"
#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
#include <com/sun/star/sdbc/XColumnLocate.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XStatement.hpp>
#include <svtools/miscopt.hxx>
#include <config_firebird.h>
using namespace ::com::sun::star;
using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::uno;
class FirebirdTest
: public DBTestBase
{
public:
void testEmptyDBConnection();
void testIntegerDatabase();
CPPUNIT_TEST_SUITE(FirebirdTest);
CPPUNIT_TEST(testEmptyDBConnection);
CPPUNIT_TEST(testIntegerDatabase);
CPPUNIT_TEST_SUITE_END();
};
/**
* Test the loading of an "empty" file, i.e. the embedded database has not yet
* been initialised (as occurs when a new .odb is created and opened by base).
*/
void FirebirdTest::testEmptyDBConnection()
{
#ifdef OSL_BIGENDIAN
auto const tmp = createTempCopy("firebird_empty_be.odb");
#else
auto const tmp = createTempCopy("firebird_empty_le.odb");
#endif
uno::Reference< XOfficeDatabaseDocument > xDocument =
getDocumentForUrl(tmp.GetURL());
getConnectionForDocument(xDocument);
closeDocument(uno::Reference<lang::XComponent>(xDocument, uno::UNO_QUERY));
}
/**
* Test reading of integers from a known .odb to verify that the data
* can still be read on all systems.
*/
void FirebirdTest::testIntegerDatabase()
{
#ifdef OSL_BIGENDIAN
uno::Reference< XOfficeDatabaseDocument > xDocument =
getDocumentForFileName("firebird_integer_be_ods12.odb");
#else
uno::Reference< XOfficeDatabaseDocument > xDocument =
getDocumentForFileName("firebird_integer_le_ods12.odb");
#endif
uno::Reference< XConnection > xConnection =
getConnectionForDocument(xDocument);
uno::Reference< XStatement > xStatement = xConnection->createStatement();
CPPUNIT_ASSERT(xStatement.is());
uno::Reference< XResultSet > xResultSet = xStatement->executeQuery(
"SELECT * FROM TESTTABLE");
CPPUNIT_ASSERT(xResultSet.is());
CPPUNIT_ASSERT(xResultSet->next());
uno::Reference< XRow > xRow(xResultSet, UNO_QUERY);
CPPUNIT_ASSERT(xRow.is());
uno::Reference< XColumnLocate > xColumnLocate(xRow, UNO_QUERY);
CPPUNIT_ASSERT(xColumnLocate.is());
CPPUNIT_ASSERT_EQUAL(sal_Int16(-30000),
xRow->getShort(xColumnLocate->findColumn("_SMALLINT")));
CPPUNIT_ASSERT_EQUAL(sal_Int32(-2100000000),
xRow->getInt(xColumnLocate->findColumn("_INT")));
CPPUNIT_ASSERT_EQUAL(SAL_CONST_INT64(-9000000000000000000),
xRow->getLong(xColumnLocate->findColumn("_BIGINT")));
CPPUNIT_ASSERT_EQUAL(OUString("5"),
xRow->getString(xColumnLocate->findColumn("_CHAR")));
CPPUNIT_ASSERT_EQUAL(OUString("5"),
xRow->getString(xColumnLocate->findColumn("_VARCHAR")));
CPPUNIT_ASSERT(!xResultSet->next()); // Should only be one row
closeDocument(uno::Reference<lang::XComponent>(xDocument, uno::UNO_QUERY));
}
CPPUNIT_TEST_SUITE_REGISTRATION(FirebirdTest);
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -42,11 +42,7 @@ public:
*/
void FirebirdTest::testEmptyDBConnection()
{
#ifdef OSL_BIGENDIAN
// FIXME
#else
auto const tmp = createTempCopy("firebird_empty_le.odb");
#endif
auto const tmp = createTempCopy("firebird_empty.odb");
uno::Reference< XOfficeDatabaseDocument > xDocument =
getDocumentForUrl(tmp.GetURL());
......@@ -61,12 +57,8 @@ void FirebirdTest::testEmptyDBConnection()
*/
void FirebirdTest::testIntegerDatabase()
{
#ifdef OSL_BIGENDIAN
// FIXME
#else
uno::Reference< XOfficeDatabaseDocument > xDocument =
getDocumentForFileName("firebird_integer_le_ods12.odb");
#endif
getDocumentForFileName("firebird_integer_ods12.odb");
uno::Reference< XConnection > xConnection =
getConnectionForDocument(xDocument);
......
......@@ -3010,6 +3010,7 @@ dbaccess/qa/unit/dbaccess-dialogs-test.cxx
dbaccess/qa/unit/dbtest_base.cxx
dbaccess/qa/unit/embeddeddb_performancetest.cxx
dbaccess/qa/unit/firebird.cxx
dbaccess/qa/unit/firebird-regression.cxx
dbaccess/qa/unit/hsqldb.cxx
dbaccess/source/core/api/BookmarkSet.cxx
dbaccess/source/core/api/BookmarkSet.hxx
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment