Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kio: testing build fix

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-06-04 03:17:56 +03:00
parent e5be0d5a2a
commit 2eda09625a
3 changed files with 7 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
kio/tests/jobtest.cpp
View file

@ -1018,11 +1018,8 @@ void JobTest::deleteDirectory()
QVERIFY(!QFile::exists(dest)); QVERIFY(!QFile::exists(dest));
} }
void JobTest::deleteSymlink(bool using_fast_path) void JobTest::deleteSymlink()
{ {
extern KIO_EXPORT bool kio_resolve_local_urls;
kio_resolve_local_urls = !using_fast_path;
const QString src = homeTmpDir() + "dirFromHome"; const QString src = homeTmpDir() + "dirFromHome";
createTestDirectory(src); createTestDirectory(src);
QVERIFY(QDir(src).exists()); QVERIFY(QDir(src).exists());
@ -1039,22 +1036,10 @@ void JobTest::deleteSymlink(bool using_fast_path)
QVERIFY(ok); QVERIFY(ok);
QVERIFY(!QDir(dest).exists()); QVERIFY(!QDir(dest).exists());
QVERIFY(QDir(src).exists()); QVERIFY(QDir(src).exists());
kio_resolve_local_urls = true;
} }
void JobTest::deleteManyDirs()
void JobTest::deleteSymlink()
{ {
deleteSymlink(true);
deleteSymlink(false);
}
void JobTest::deleteManyDirs(bool using_fast_path)
{
extern KIO_EXPORT bool kio_resolve_local_urls;
kio_resolve_local_urls = !using_fast_path;
const int numDirs = 50; const int numDirs = 50;
KUrl::List dirs; KUrl::List dirs;
for (int i = 0; i < numDirs; ++i) { for (int i = 0; i < numDirs; ++i) {
@ -1073,13 +1058,6 @@ void JobTest::deleteManyDirs(bool using_fast_path)
} }
kDebug() << "Deleted" << numDirs << "dirs in" << dt.elapsed() << "milliseconds"; kDebug() << "Deleted" << numDirs << "dirs in" << dt.elapsed() << "milliseconds";
kio_resolve_local_urls = true;
}
void JobTest::deleteManyDirs()
{
deleteManyDirs(true);
deleteManyDirs(false);
} }
static void createManyFiles(const QString& baseDir, int numFiles) static void createManyFiles(const QString& baseDir, int numFiles)
@ -1112,11 +1090,8 @@ void JobTest::deleteManyFilesIndependently()
kDebug() << "Deleted" << numFiles << "files in" << dt.elapsed() << "milliseconds"; kDebug() << "Deleted" << numFiles << "files in" << dt.elapsed() << "milliseconds";
} }
void JobTest::deleteManyFilesTogether(bool using_fast_path) void JobTest::deleteManyFilesTogether()
{ {
extern KIO_EXPORT bool kio_resolve_local_urls;
kio_resolve_local_urls = !using_fast_path;
QElapsedTimer dt; QElapsedTimer dt;
dt.start(); dt.start();
const int numFiles = 100; // Use 1000 for performance testing const int numFiles = 100; // Use 1000 for performance testing
@ -1135,14 +1110,6 @@ void JobTest::deleteManyFilesTogether(bool using_fast_path)
bool ok = KIO::NetAccess::synchronousRun(job, 0); bool ok = KIO::NetAccess::synchronousRun(job, 0);
QVERIFY(ok); QVERIFY(ok);
kDebug() << "Deleted" << numFiles << "files in" << dt.elapsed() << "milliseconds"; kDebug() << "Deleted" << numFiles << "files in" << dt.elapsed() << "milliseconds";
kio_resolve_local_urls = true;
}
void JobTest::deleteManyFilesTogether()
{
deleteManyFilesTogether(true);
deleteManyFilesTogether(false);
} }
void JobTest::rmdirEmpty() void JobTest::rmdirEmpty()

4
kio/tests/jobtest.h
View file

@ -94,10 +94,6 @@ private:
void copyLocalDirectory( const QString& src, const QString& dest, int flags = 0 ); void copyLocalDirectory( const QString& src, const QString& dest, int flags = 0 );
void moveLocalFile( const QString& src, const QString& dest ); void moveLocalFile( const QString& src, const QString& dest );
void moveLocalDirectory( const QString& src, const QString& dest ); void moveLocalDirectory( const QString& src, const QString& dest );
//void copyFileToSystem( bool resolve_local_urls );
void deleteSymlink(bool using_fast_path);
void deleteManyDirs(bool using_fast_path);
void deleteManyFilesTogether(bool using_fast_path);
void moveDestAlreadyExistsAutoRename(const QString& destDir, bool moveDirs); void moveDestAlreadyExistsAutoRename(const QString& destDir, bool moveDirs);
int m_result; int m_result;

6
kio/tests/kfileitemtest.cpp
View file

@ -122,8 +122,9 @@ void KFileItemTest::testRootDirectory()
KUrl url(rootPath); KUrl url(rootPath);
KIO::UDSEntry entry; KIO::UDSEntry entry;
entry.insert(KIO::UDSEntry::UDS_NAME, "."); entry.insert(KIO::UDSEntry::UDS_NAME, ".");
entry.insert(KIO::UDSEntry::UDS_URL, rootPath);
entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR); entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
KFileItem fileItem(entry, rootPath); KFileItem fileItem(entry);
QCOMPARE(fileItem.text(), QString(".")); QCOMPARE(fileItem.text(), QString("."));
QVERIFY(fileItem.isLocalFile()); QVERIFY(fileItem.isLocalFile());
QCOMPARE(fileItem.localPath(), url.path()); QCOMPARE(fileItem.localPath(), url.path());
@ -216,8 +217,9 @@ void KFileItemTest::testRename()
KIO::UDSEntry entry; KIO::UDSEntry entry;
const QString origName = QString::fromLatin1("foo"); const QString origName = QString::fromLatin1("foo");
entry.insert(KIO::UDSEntry::UDS_NAME, origName); entry.insert(KIO::UDSEntry::UDS_NAME, origName);
entry.insert(KIO::UDSEntry::UDS_URL, "/dir/foo");
entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR); entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
KFileItem fileItem(entry, KUrl("/dir/foo")); KFileItem fileItem(entry);
QCOMPARE(fileItem.name(), origName); QCOMPARE(fileItem.name(), origName);
QCOMPARE(fileItem.text(), origName); QCOMPARE(fileItem.text(), origName);
const QString newName = QString::fromLatin1("FiNeX_rocks"); const QString newName = QString::fromLatin1("FiNeX_rocks");