diff options
Diffstat (limited to 'dbaccess/qa/unit/hsql_binary_import.cxx')
| -rw-r--r-- | dbaccess/qa/unit/hsql_binary_import.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/dbaccess/qa/unit/hsql_binary_import.cxx b/dbaccess/qa/unit/hsql_binary_import.cxx index 4eac0cdc4130..2e8664aeccb4 100644 --- a/dbaccess/qa/unit/hsql_binary_import.cxx +++ b/dbaccess/qa/unit/hsql_binary_import.cxx @@ -32,7 +32,7 @@ public: void HsqlBinaryImportTest::setUp() { DBTestBase::setUp(); - osl_setEnvironment(OUString{ "DBACCESS_HSQL_MIGRATION" }.pData, OUString{ "1" }.pData); + osl_setEnvironment(u"DBACCESS_HSQL_MIGRATION"_ustr.pData, u"1"_ustr.pData); } void HsqlBinaryImportTest::testBinaryImport() @@ -46,8 +46,9 @@ void HsqlBinaryImportTest::testBinaryImport() } // the migration requires the file to be writable - utl::TempFile const temp(createTempCopy(u"hsqldb_migration_test.odb")); - uno::Reference<XOfficeDatabaseDocument> const xDocument = getDocumentForUrl(temp.GetURL()); + createTempCopy(u"hsqldb_migration_test.odb"); + uno::Reference<XOfficeDatabaseDocument> const xDocument + = getDocumentForUrl(maTempFile.GetURL()); uno::Reference<XConnection> xConnection = getConnectionForDocument(xDocument); // at this point migration is already done @@ -55,16 +56,16 @@ void HsqlBinaryImportTest::testBinaryImport() uno::Reference<XStatement> statement = xConnection->createStatement(); uno::Reference<XResultSet> xRes - = statement->executeQuery("SELECT \"ID\", \"Power_value\", \"Power_name\", \"Retired\", " - "\"Birth_date\" FROM \"TestTable\" ORDER BY \"ID\""); + = statement->executeQuery(u"SELECT \"ID\", \"Power_value\", \"Power_name\", \"Retired\", " + "\"Birth_date\" FROM \"TestTable\" ORDER BY \"ID\""_ustr); uno::Reference<XRow> xRow(xRes, UNO_QUERY_THROW); // assert first row CPPUNIT_ASSERT(xRes->next()); constexpr sal_Int16 idExpected = 1; CPPUNIT_ASSERT_EQUAL(idExpected, xRow->getShort(1)); - CPPUNIT_ASSERT_EQUAL(OUString{ "45.32" }, xRow->getString(2)); // numeric - CPPUNIT_ASSERT_EQUAL(OUString{ "laser eye" }, xRow->getString(3)); // varchar + CPPUNIT_ASSERT_EQUAL(u"45.32"_ustr, xRow->getString(2)); // numeric + CPPUNIT_ASSERT_EQUAL(u"laser eye"_ustr, xRow->getString(3)); // varchar CPPUNIT_ASSERT(xRow->getBoolean(4)); // boolean css::util::Date date = xRow->getDate(5); @@ -77,8 +78,8 @@ void HsqlBinaryImportTest::testBinaryImport() CPPUNIT_ASSERT(xRes->next()); constexpr sal_Int16 secondIdExpected = 2; CPPUNIT_ASSERT_EQUAL(secondIdExpected, xRow->getShort(1)); // ID - CPPUNIT_ASSERT_EQUAL(OUString{ "54.12" }, xRow->getString(2)); // numeric - CPPUNIT_ASSERT_EQUAL(OUString{ "telekinesis" }, xRow->getString(3)); // varchar + CPPUNIT_ASSERT_EQUAL(u"54.12"_ustr, xRow->getString(2)); // numeric + CPPUNIT_ASSERT_EQUAL(u"telekinesis"_ustr, xRow->getString(3)); // varchar CPPUNIT_ASSERT(!xRow->getBoolean(4)); // boolean date = xRow->getDate(5); @@ -86,7 +87,6 @@ void HsqlBinaryImportTest::testBinaryImport() CPPUNIT_ASSERT_EQUAL(sal_uInt16{ 2 }, date.Month); CPPUNIT_ASSERT_EQUAL(sal_Int16{ 1998 }, date.Year); - closeDocument(uno::Reference<lang::XComponent>(xDocument, uno::UNO_QUERY)); if (!oldValue) { std::shared_ptr<comphelper::ConfigurationChanges> xChanges( |