Kaydet (Commit) c68cd012 authored tarafından David Ostrovsky's avatar David Ostrovsky Kaydeden (comit) Norbert Thiebaud

enable ado driver unit test again

The problem is that ado driver creates a link file in the tree
leaving it dirty: tinderbox doesn't like it. Instead of reading
the mdb file direct from srcdir we copy it first to workdir and
read it from there with the new function: getPathFromWorkdir.
Thank you Norbert!

Change-Id: I504bc26b80686db55a505bac19a95cc9c6022fcc
Reviewed-on: https://gerrit.libreoffice.org/1004Reviewed-by: 's avatarNorbert Thiebaud <nthiebaud@gmail.com>
Tested-by: 's avatarNorbert Thiebaud <nthiebaud@gmail.com>
üst db8ab560
...@@ -67,4 +67,8 @@ $(eval $(call gb_CppunitTest_use_components,connectivity_ado,\ ...@@ -67,4 +67,8 @@ $(eval $(call gb_CppunitTest_use_components,connectivity_ado,\
$(eval $(call gb_CppunitTest_use_configuration,connectivity_ado)) $(eval $(call gb_CppunitTest_use_configuration,connectivity_ado))
$(call gb_CppunitTest_get_target,connectivity_ado) : $(WORKDIR)/CppunitTest/TS001018407.mdb
$(WORKDIR)/CppunitTest/TS001018407.mdb : $(SRCDIR)/connectivity/qa/connectivity/ado/TS001018407.mdb
$(call gb_Deliver_deliver,$<,$@)
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -145,12 +145,11 @@ $(eval $(call gb_Module_add_check_targets,connectivity,\ ...@@ -145,12 +145,11 @@ $(eval $(call gb_Module_add_check_targets,connectivity,\
endif endif
# FIXME: Makes tinderbox unhappy as it leaves unclean tree ifeq ($(GUI),WNT)
#ifeq ($(GUI),WNT) $(eval $(call gb_Module_add_check_targets,connectivity,\
#$(eval $(call gb_Module_add_check_targets,connectivity,\ CppunitTest_connectivity_ado \
# CppunitTest_connectivity_ado \ ))
#)) endif
#endif
ifneq ($(filter QADEVOOO,$(BUILD_TYPE)),) ifneq ($(filter QADEVOOO,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_subsequentcheck_targets,connectivity,\ $(eval $(call gb_Module_add_subsequentcheck_targets,connectivity,\
......
...@@ -65,10 +65,8 @@ void AdoDriverTest::setUp() ...@@ -65,10 +65,8 @@ void AdoDriverTest::setUp()
m_xAdoComponent = getMultiServiceFactory()->createInstance("com.sun.star.comp.sdbc.ado.ODriver"); m_xAdoComponent = getMultiServiceFactory()->createInstance("com.sun.star.comp.sdbc.ado.ODriver");
CPPUNIT_ASSERT_MESSAGE("no ado component!", m_xAdoComponent.is()); CPPUNIT_ASSERT_MESSAGE("no ado component!", m_xAdoComponent.is());
// is this the best way to pass test file through URL?
// may be take a custom Sequence< PropertyValue > route?
OUString url = OUString("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=") + OUString url = OUString("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=") +
getPathFromSrc("/connectivity/qa/connectivity/ado/TS001018407.mdb"); getPathFromWorkdir("/CppunitTest/TS001018407.mdb");
Sequence< PropertyValue > info; Sequence< PropertyValue > info;
Reference< XDriver> xDriver(m_xAdoComponent, UNO_QUERY); Reference< XDriver> xDriver(m_xAdoComponent, UNO_QUERY);
......
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