summaryrefslogtreecommitdiff
path: root/dbaccess/qa
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/qa')
-rw-r--r--dbaccess/qa/extras/dialog-save.cxx2
-rw-r--r--dbaccess/qa/extras/empty-stdlib-save.cxx2
-rw-r--r--dbaccess/qa/extras/macros-test.cxx2
-rw-r--r--dbaccess/qa/extras/nolib-save.cxx2
-rw-r--r--dbaccess/qa/extras/rowsetclones.cxx2
-rw-r--r--dbaccess/qa/unit/dbaccess-dialogs-test.cxx2
-rw-r--r--dbaccess/qa/unit/dbtest_base.cxx10
-rw-r--r--dbaccess/qa/unit/embeddeddb_performancetest.cxx2
-rw-r--r--dbaccess/qa/unit/firebird-regression.cxx4
-rw-r--r--dbaccess/qa/unit/firebird.cxx4
-rw-r--r--dbaccess/qa/unit/hsql_binary_import.cxx2
-rw-r--r--dbaccess/qa/unit/hsqldb.cxx2
-rw-r--r--dbaccess/qa/unit/tdf119625.cxx2
-rw-r--r--dbaccess/qa/unit/tdf126268.cxx2
14 files changed, 21 insertions, 19 deletions
diff --git a/dbaccess/qa/extras/dialog-save.cxx b/dbaccess/qa/extras/dialog-save.cxx
index af7b9fda3f8e..5eac41e67041 100644
--- a/dbaccess/qa/extras/dialog-save.cxx
+++ b/dbaccess/qa/extras/dialog-save.cxx
@@ -55,7 +55,7 @@ void DialogSaveTest::test()
// be locked anyway:
SolarMutexReleaser rel;
- const OUString aFileName(m_directories.getURLFromWorkdir("CppunitTest/testDialogSave.odb"));
+ const OUString aFileName(m_directories.getURLFromWorkdir(u"CppunitTest/testDialogSave.odb"));
{
uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName);
CPPUNIT_ASSERT(xComponent.is());
diff --git a/dbaccess/qa/extras/empty-stdlib-save.cxx b/dbaccess/qa/extras/empty-stdlib-save.cxx
index ea9c660a4e87..aa7dd293004f 100644
--- a/dbaccess/qa/extras/empty-stdlib-save.cxx
+++ b/dbaccess/qa/extras/empty-stdlib-save.cxx
@@ -53,7 +53,7 @@ void DialogSaveTest::test()
// be locked anyway:
SolarMutexReleaser rel;
- const OUString aFileName(m_directories.getURLFromWorkdir("CppunitTest/testEmptyStdlibSave.odb"));
+ const OUString aFileName(m_directories.getURLFromWorkdir(u"CppunitTest/testEmptyStdlibSave.odb"));
{
uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName);
CPPUNIT_ASSERT(xComponent.is());
diff --git a/dbaccess/qa/extras/macros-test.cxx b/dbaccess/qa/extras/macros-test.cxx
index 5d65133664b3..e102c75896b3 100644
--- a/dbaccess/qa/extras/macros-test.cxx
+++ b/dbaccess/qa/extras/macros-test.cxx
@@ -35,7 +35,7 @@ DBAccessTest::DBAccessTest()
void DBAccessTest::test()
{
OUString aFileName;
- createFileURL("testdb.odb", aFileName);
+ createFileURL(u"testdb.odb", aFileName);
uno::Reference<lang::XComponent> xComponent = loadFromDesktop(aFileName);
CPPUNIT_ASSERT(xComponent.is());
xComponent->dispose();
diff --git a/dbaccess/qa/extras/nolib-save.cxx b/dbaccess/qa/extras/nolib-save.cxx
index 5914511e6dbe..e191402425f9 100644
--- a/dbaccess/qa/extras/nolib-save.cxx
+++ b/dbaccess/qa/extras/nolib-save.cxx
@@ -53,7 +53,7 @@ void DialogSaveTest::test()
// be locked anyway:
SolarMutexReleaser rel;
- const OUString aFileName(m_directories.getURLFromWorkdir("CppunitTest/testNolibSave.odb"));
+ const OUString aFileName(m_directories.getURLFromWorkdir(u"CppunitTest/testNolibSave.odb"));
{
uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName);
CPPUNIT_ASSERT(xComponent.is());
diff --git a/dbaccess/qa/extras/rowsetclones.cxx b/dbaccess/qa/extras/rowsetclones.cxx
index f62314205be3..d4637c5d8ae6 100644
--- a/dbaccess/qa/extras/rowsetclones.cxx
+++ b/dbaccess/qa/extras/rowsetclones.cxx
@@ -48,7 +48,7 @@ RowSetClones::RowSetClones()
void RowSetClones::test()
{
- const OUString sFilePath(m_directories.getURLFromWorkdir("CppunitTest/RowSetClones.odb"));
+ const OUString sFilePath(m_directories.getURLFromWorkdir(u"CppunitTest/RowSetClones.odb"));
uno::Reference< lang::XComponent > xComponent (loadFromDesktop(sFilePath));
CPPUNIT_ASSERT(xComponent.is());
diff --git a/dbaccess/qa/unit/dbaccess-dialogs-test.cxx b/dbaccess/qa/unit/dbaccess-dialogs-test.cxx
index 49eff86ecd9a..0551b31187a5 100644
--- a/dbaccess/qa/unit/dbaccess-dialogs-test.cxx
+++ b/dbaccess/qa/unit/dbaccess-dialogs-test.cxx
@@ -51,7 +51,7 @@ VclPtr<VclAbstractDialog> DbaccessDialogsTest::createDialogByID(sal_uInt32 /*nID
void DbaccessDialogsTest::openAnyDialog()
{
/// process input file containing the UXMLDescriptions of the dialogs to dump
- processDialogBatchFile("dbaccess/qa/unit/data/dbaccess-dialogs-test.txt");
+ processDialogBatchFile(u"dbaccess/qa/unit/data/dbaccess-dialogs-test.txt");
}
CPPUNIT_TEST_SUITE_REGISTRATION(DbaccessDialogsTest);
diff --git a/dbaccess/qa/unit/dbtest_base.cxx b/dbaccess/qa/unit/dbtest_base.cxx
index f0b276cbb1ea..caee25fa70ac 100644
--- a/dbaccess/qa/unit/dbtest_base.cxx
+++ b/dbaccess/qa/unit/dbtest_base.cxx
@@ -9,6 +9,8 @@
#include <sal/config.h>
+#include <string_view>
+
#include <cppunit/TestAssert.h>
#include <test/unoapi_test.hxx>
@@ -28,10 +30,10 @@ class DBTestBase
public:
DBTestBase() : UnoApiTest("dbaccess/qa/unit/data") {};
- utl::TempFile createTempCopy(OUString const & pathname);
+ utl::TempFile createTempCopy(std::u16string_view pathname);
uno::Reference< XOfficeDatabaseDocument >
- getDocumentForFileName(const OUString &sFileName);
+ getDocumentForFileName(std::u16string_view sFileName);
uno::Reference<XOfficeDatabaseDocument> getDocumentForUrl(OUString const & url);
@@ -40,7 +42,7 @@ public:
uno::Reference< XOfficeDatabaseDocument > const & xDocument);
};
-utl::TempFile DBTestBase::createTempCopy(OUString const & pathname) {
+utl::TempFile DBTestBase::createTempCopy(std::u16string_view pathname) {
OUString url;
createFileURL(pathname, url);
utl::TempFile tmp;
@@ -56,7 +58,7 @@ utl::TempFile DBTestBase::createTempCopy(OUString const & pathname) {
}
uno::Reference< XOfficeDatabaseDocument >
- DBTestBase::getDocumentForFileName(const OUString &sFileName)
+ DBTestBase::getDocumentForFileName(std::u16string_view sFileName)
{
OUString sFilePath;
createFileURL(sFileName, sFilePath);
diff --git a/dbaccess/qa/unit/embeddeddb_performancetest.cxx b/dbaccess/qa/unit/embeddeddb_performancetest.cxx
index abd72db66fe4..e4119804d3b1 100644
--- a/dbaccess/qa/unit/embeddeddb_performancetest.cxx
+++ b/dbaccess/qa/unit/embeddeddb_performancetest.cxx
@@ -125,7 +125,7 @@ public:
SvFileStream* EmbeddedDBPerformanceTest::getWordListStream()
{
OUString wlPath;
- createFileURL("wordlist", wlPath);
+ createFileURL(u"wordlist", wlPath);
return new SvFileStream(wlPath, StreamMode::READ);
}
diff --git a/dbaccess/qa/unit/firebird-regression.cxx b/dbaccess/qa/unit/firebird-regression.cxx
index faf0a834b9c4..d5c53b93a64d 100644
--- a/dbaccess/qa/unit/firebird-regression.cxx
+++ b/dbaccess/qa/unit/firebird-regression.cxx
@@ -43,7 +43,7 @@ void FirebirdTest::testEmptyDBConnection()
#ifdef OSL_BIGENDIAN
auto const tmp = createTempCopy("firebird_empty_be.odb");
#else
- auto const tmp = createTempCopy("firebird_empty_le.odb");
+ auto const tmp = createTempCopy(u"firebird_empty_le.odb");
#endif
uno::Reference< XOfficeDatabaseDocument > xDocument =
getDocumentForUrl(tmp.GetURL());
@@ -64,7 +64,7 @@ void FirebirdTest::testIntegerDatabase()
getDocumentForFileName("firebird_integer_be_ods12.odb");
#else
uno::Reference< XOfficeDatabaseDocument > xDocument =
- getDocumentForFileName("firebird_integer_le_ods12.odb");
+ getDocumentForFileName(u"firebird_integer_le_ods12.odb");
#endif
uno::Reference< XConnection > xConnection =
diff --git a/dbaccess/qa/unit/firebird.cxx b/dbaccess/qa/unit/firebird.cxx
index 95581332466a..e67a4d10c097 100644
--- a/dbaccess/qa/unit/firebird.cxx
+++ b/dbaccess/qa/unit/firebird.cxx
@@ -40,7 +40,7 @@ public:
*/
void FirebirdTest::testEmptyDBConnection()
{
- auto const tmp = createTempCopy("firebird_empty.odb");
+ auto const tmp = createTempCopy(u"firebird_empty.odb");
uno::Reference< XOfficeDatabaseDocument > xDocument =
getDocumentForUrl(tmp.GetURL());
@@ -56,7 +56,7 @@ void FirebirdTest::testEmptyDBConnection()
void FirebirdTest::testIntegerDatabase()
{
uno::Reference< XOfficeDatabaseDocument > xDocument =
- getDocumentForFileName("firebird_integer_ods12.odb");
+ getDocumentForFileName(u"firebird_integer_ods12.odb");
uno::Reference< XConnection > xConnection =
getConnectionForDocument(xDocument);
diff --git a/dbaccess/qa/unit/hsql_binary_import.cxx b/dbaccess/qa/unit/hsql_binary_import.cxx
index 842e03e74621..4eac0cdc4130 100644
--- a/dbaccess/qa/unit/hsql_binary_import.cxx
+++ b/dbaccess/qa/unit/hsql_binary_import.cxx
@@ -46,7 +46,7 @@ void HsqlBinaryImportTest::testBinaryImport()
}
// the migration requires the file to be writable
- utl::TempFile const temp(createTempCopy("hsqldb_migration_test.odb"));
+ utl::TempFile const temp(createTempCopy(u"hsqldb_migration_test.odb"));
uno::Reference<XOfficeDatabaseDocument> const xDocument = getDocumentForUrl(temp.GetURL());
uno::Reference<XConnection> xConnection = getConnectionForDocument(xDocument);
diff --git a/dbaccess/qa/unit/hsqldb.cxx b/dbaccess/qa/unit/hsqldb.cxx
index 0e3c2494bc5b..5ee011af276e 100644
--- a/dbaccess/qa/unit/hsqldb.cxx
+++ b/dbaccess/qa/unit/hsqldb.cxx
@@ -32,7 +32,7 @@ public:
*/
void HSQLDBTest::testEmptyDBConnection()
{
- auto const file = createTempCopy("hsqldb_empty.odb");
+ auto const file = createTempCopy(u"hsqldb_empty.odb");
uno::Reference<XOfficeDatabaseDocument> xDocument = getDocumentForUrl(file.GetURL());
getConnectionForDocument(xDocument);
diff --git a/dbaccess/qa/unit/tdf119625.cxx b/dbaccess/qa/unit/tdf119625.cxx
index 632089f94e9e..22fb5849305e 100644
--- a/dbaccess/qa/unit/tdf119625.cxx
+++ b/dbaccess/qa/unit/tdf119625.cxx
@@ -66,7 +66,7 @@ void Tdf119625Test::testTime()
}
// the migration requires the file to be writable
- utl::TempFile const temp(createTempCopy("tdf119625.odb"));
+ utl::TempFile const temp(createTempCopy(u"tdf119625.odb"));
uno::Reference<XOfficeDatabaseDocument> const xDocument = getDocumentForUrl(temp.GetURL());
uno::Reference<XConnection> xConnection = getConnectionForDocument(xDocument);
diff --git a/dbaccess/qa/unit/tdf126268.cxx b/dbaccess/qa/unit/tdf126268.cxx
index 5cba7c1923f7..a4ed9dc3b868 100644
--- a/dbaccess/qa/unit/tdf126268.cxx
+++ b/dbaccess/qa/unit/tdf126268.cxx
@@ -60,7 +60,7 @@ void Tdf126268Test::testNumbers()
}
// the migration requires the file to be writable
- utl::TempFile const temp(createTempCopy("tdf126268.odb"));
+ utl::TempFile const temp(createTempCopy(u"tdf126268.odb"));
uno::Reference<XOfficeDatabaseDocument> const xDocument = getDocumentForUrl(temp.GetURL());
uno::Reference<XConnection> xConnection = getConnectionForDocument(xDocument);
generated by cgit (git 2.34.1) at 2024-06-29 10:05:14 +0000