diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2019-08-28 22:13:13 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2019-08-29 20:54:47 +0200 |
| commit | 2252aba08121566e834dc530f31339e15bd94dec (patch) | |
| tree | 22ae5c0a613036dd13b2c196b65f9dbbdb620ef9 /dbaccess/qa | |
| parent | 3ac01f89239cec912e19c591033df638fa5f6c2d (diff) | |
tdf#127180: Propose migration + Firebird by default only in experimental
See:
http://document-foundation-mail-archive.969070.n3.nabble.com/About-putting-back-Firebird-experimental-td4265392.html#a4265519
Change-Id: I651baa78d345ce56e8d38d56aba096d04a225c5c
Reviewed-on: https://gerrit.libreoffice.org/78240
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'dbaccess/qa')
| -rw-r--r-- | dbaccess/qa/unit/hsql_binary_import.cxx | 6 | ||||
| -rw-r--r-- | dbaccess/qa/unit/tdf119625.cxx | 7 | ||||
| -rw-r--r-- | dbaccess/qa/unit/tdf126268.cxx | 7 |
3 files changed, 20 insertions, 0 deletions
diff --git a/dbaccess/qa/unit/hsql_binary_import.cxx b/dbaccess/qa/unit/hsql_binary_import.cxx index 2c1c332629cb..5b0249a9497f 100644 --- a/dbaccess/qa/unit/hsql_binary_import.cxx +++ b/dbaccess/qa/unit/hsql_binary_import.cxx @@ -45,6 +45,10 @@ void HsqlBinaryImportTest::setUp() void HsqlBinaryImportTest::testBinaryImport() { + SvtMiscOptions aMiscOptions; + bool oldValue = aMiscOptions.IsExperimentalMode(); + + aMiscOptions.SetExperimentalMode(true); // the migration requires the file to be writable utl::TempFile const temp(createTempCopy("hsqldb_migration_test.odb")); uno::Reference<XOfficeDatabaseDocument> const xDocument = getDocumentForUrl(temp.GetURL()); @@ -87,6 +91,8 @@ void HsqlBinaryImportTest::testBinaryImport() CPPUNIT_ASSERT_EQUAL(sal_Int16{ 1998 }, date.Year); closeDocument(uno::Reference<lang::XComponent>(xDocument, uno::UNO_QUERY)); + if (!oldValue) + aMiscOptions.SetExperimentalMode(false); } CPPUNIT_TEST_SUITE_REGISTRATION(HsqlBinaryImportTest); diff --git a/dbaccess/qa/unit/tdf119625.cxx b/dbaccess/qa/unit/tdf119625.cxx index d38e85bb75a3..e1bb46b087f7 100644 --- a/dbaccess/qa/unit/tdf119625.cxx +++ b/dbaccess/qa/unit/tdf119625.cxx @@ -63,6 +63,11 @@ static const expect_t expect[] void Tdf119625Test::testTime() { + SvtMiscOptions aMiscOptions; + bool oldValue = aMiscOptions.IsExperimentalMode(); + + aMiscOptions.SetExperimentalMode(true); + // the migration requires the file to be writable utl::TempFile const temp(createTempCopy("tdf119625.odb")); uno::Reference<XOfficeDatabaseDocument> const xDocument = getDocumentForUrl(temp.GetURL()); @@ -106,6 +111,8 @@ void Tdf119625Test::testTime() CPPUNIT_ASSERT(!xRes->next()); closeDocument(uno::Reference<lang::XComponent>(xDocument, uno::UNO_QUERY)); + if (!oldValue) + aMiscOptions.SetExperimentalMode(false); } CPPUNIT_TEST_SUITE_REGISTRATION(Tdf119625Test); diff --git a/dbaccess/qa/unit/tdf126268.cxx b/dbaccess/qa/unit/tdf126268.cxx index ffbe6361a231..9d41b95809aa 100644 --- a/dbaccess/qa/unit/tdf126268.cxx +++ b/dbaccess/qa/unit/tdf126268.cxx @@ -56,6 +56,11 @@ static const expect_t expect[] = { void Tdf126268Test::testNumbers() { + SvtMiscOptions aMiscOptions; + bool oldValue = aMiscOptions.IsExperimentalMode(); + + aMiscOptions.SetExperimentalMode(true); + // the migration requires the file to be writable utl::TempFile const temp(createTempCopy("tdf126268.odb")); uno::Reference<XOfficeDatabaseDocument> const xDocument = getDocumentForUrl(temp.GetURL()); @@ -80,6 +85,8 @@ void Tdf126268Test::testNumbers() CPPUNIT_ASSERT(!xRes->next()); closeDocument(uno::Reference<lang::XComponent>(xDocument, uno::UNO_QUERY)); + if (!oldValue) + aMiscOptions.SetExperimentalMode(false); } CPPUNIT_TEST_SUITE_REGISTRATION(Tdf126268Test); |